Addition of ReplaceSkillBySkill effect.

Contributed by nasseka.
This commit is contained in:
MobiusDevelopment 2021-12-18 00:17:04 +00:00
parent ce94e51c74
commit 45412cf64b
8 changed files with 242 additions and 0 deletions

View File

@ -300,6 +300,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("ReflectSkill", ReflectSkill::new);
EffectHandler.getInstance().registerHandler("RefuelAirship", RefuelAirship::new);
EffectHandler.getInstance().registerHandler("Relax", Relax::new);
EffectHandler.getInstance().registerHandler("ReplaceSkillBySkill", ReplaceSkillBySkill::new);
EffectHandler.getInstance().registerHandler("ResetInstanceEntry", ResetInstanceEntry::new);
EffectHandler.getInstance().registerHandler("ResistAbnormalByCategory", ResistAbnormalByCategory::new);
EffectHandler.getInstance().registerHandler("ResistDDMagic", ResistDDMagic::new);

View File

@ -0,0 +1,111 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.effecthandlers;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
/**
* @author Mobius
*/
public class ReplaceSkillBySkill extends AbstractEffect
{
private final SkillHolder _existingSkill;
private final SkillHolder _replacementSkill;
public ReplaceSkillBySkill(StatSet params)
{
_existingSkill = new SkillHolder(params.getInt("existingSkillId"), params.getInt("existingSkillLevel", -1));
_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
if (effected.isPlayer())
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
{
return;
}
final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
player.addSkill(addedSkill, false);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
{
final int slot = shortcut.getSlot();
final int page = shortcut.getPage();
final int characterType = shortcut.getCharacterType();
player.deleteShortCut(slot, page);
final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
player.registerShortCut(newShortcut);
player.sendPacket(new ShortCutRegister(newShortcut));
}
}
player.removeSkill(knownSkill, false);
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_replacementSkill.getSkillId());
if (knownSkill == null)
{
return;
}
final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
player.addSkill(addedSkill, false);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
{
final int slot = shortcut.getSlot();
final int page = shortcut.getPage();
final int characterType = shortcut.getCharacterType();
player.deleteShortCut(slot, page);
final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
player.registerShortCut(newShortcut);
player.sendPacket(new ShortCutRegister(newShortcut));
}
}
player.removeSkill(knownSkill, false);
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}

View File

@ -2686,5 +2686,11 @@
<!-- Enhances a blow. The Dual Blow skill is upgraded to Triple Blow. -->
<icon>icon.additional_hit</icon>
<operateType>P</operateType>
<effects>
<effect name="ReplaceSkillBySkill">
<existingSkillId>47002</existingSkillId> <!-- Dual Blow-->
<replacementSkillId>47005</replacementSkillId> <!-- Tripple Blow -->
</effect>
</effects>
</skill>
</list>

View File

@ -1660,7 +1660,10 @@
</xs:element>
<xs:element name="zoneId" type="xs:unsignedByte" />
<xs:element name="instanceId" type="xs:string" />
<xs:element name="existingSkillId" type="xs:unsignedShort" />
<xs:element name="existingSkillLevel" type="xs:unsignedByte" />
<xs:element name="skills" type="xs:string" />
<xs:element name="replacementSkillId" type="xs:unsignedShort" />
<xs:element name="level">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">

View File

@ -300,6 +300,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("ReflectSkill", ReflectSkill::new);
EffectHandler.getInstance().registerHandler("RefuelAirship", RefuelAirship::new);
EffectHandler.getInstance().registerHandler("Relax", Relax::new);
EffectHandler.getInstance().registerHandler("ReplaceSkillBySkill", ReplaceSkillBySkill::new);
EffectHandler.getInstance().registerHandler("ResetInstanceEntry", ResetInstanceEntry::new);
EffectHandler.getInstance().registerHandler("ResistAbnormalByCategory", ResistAbnormalByCategory::new);
EffectHandler.getInstance().registerHandler("ResistDDMagic", ResistDDMagic::new);

View File

@ -0,0 +1,111 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.effecthandlers;
import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.item.instance.Item;
import org.l2jmobius.gameserver.model.skill.Skill;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutInit;
import org.l2jmobius.gameserver.network.serverpackets.ShortCutRegister;
/**
* @author Mobius
*/
public class ReplaceSkillBySkill extends AbstractEffect
{
private final SkillHolder _existingSkill;
private final SkillHolder _replacementSkill;
public ReplaceSkillBySkill(StatSet params)
{
_existingSkill = new SkillHolder(params.getInt("existingSkillId"), params.getInt("existingSkillLevel", -1));
_replacementSkill = new SkillHolder(params.getInt("replacementSkillId"), params.getInt("replacementSkillLevel", -1));
}
@Override
public void onStart(Creature effector, Creature effected, Skill skill, Item item)
{
if (effected.isPlayer())
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_existingSkill.getSkillId());
if ((knownSkill == null) || (knownSkill.getLevel() < _existingSkill.getSkillLevel()))
{
return;
}
final Skill addedSkill = SkillData.getInstance().getSkill(_replacementSkill.getSkillId(), _replacementSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _replacementSkill.getSkillLevel(), knownSkill.getSubLevel());
player.addSkill(addedSkill, false);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
{
final int slot = shortcut.getSlot();
final int page = shortcut.getPage();
final int characterType = shortcut.getCharacterType();
player.deleteShortCut(slot, page);
final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
player.registerShortCut(newShortcut);
player.sendPacket(new ShortCutRegister(newShortcut));
}
}
player.removeSkill(knownSkill, false);
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
final Player player = effected.getActingPlayer();
final Skill knownSkill = player.getKnownSkill(_replacementSkill.getSkillId());
if (knownSkill == null)
{
return;
}
final Skill addedSkill = SkillData.getInstance().getSkill(_existingSkill.getSkillId(), _existingSkill.getSkillLevel() < 1 ? knownSkill.getLevel() : _existingSkill.getSkillLevel(), knownSkill.getSubLevel());
player.addSkill(addedSkill, false);
for (Shortcut shortcut : player.getAllShortCuts())
{
if ((shortcut.getType() == ShortcutType.SKILL) && (shortcut.getId() == knownSkill.getId()) && (shortcut.getLevel() == knownSkill.getLevel()))
{
final int slot = shortcut.getSlot();
final int page = shortcut.getPage();
final int characterType = shortcut.getCharacterType();
player.deleteShortCut(slot, page);
final Shortcut newShortcut = new Shortcut(slot, page, ShortcutType.SKILL, addedSkill.getId(), addedSkill.getLevel(), addedSkill.getSubLevel(), characterType);
player.registerShortCut(newShortcut);
player.sendPacket(new ShortCutRegister(newShortcut));
}
}
player.removeSkill(knownSkill, false);
player.sendSkillList();
ThreadPool.schedule(() -> player.sendPacket(new ShortCutInit(player)), 1100);
}
}

View File

@ -2686,5 +2686,11 @@
<!-- Enhances a blow. The Dual Blow skill is upgraded to Triple Blow. -->
<icon>icon.additional_hit</icon>
<operateType>P</operateType>
<effects>
<effect name="ReplaceSkillBySkill">
<existingSkillId>47002</existingSkillId> <!-- Dual Blow-->
<replacementSkillId>47005</replacementSkillId> <!-- Tripple Blow -->
</effect>
</effects>
</skill>
</list>

View File

@ -1660,7 +1660,10 @@
</xs:element>
<xs:element name="zoneId" type="xs:unsignedByte" />
<xs:element name="instanceId" type="xs:string" />
<xs:element name="existingSkillId" type="xs:unsignedShort" />
<xs:element name="existingSkillLevel" type="xs:unsignedByte" />
<xs:element name="skills" type="xs:string" />
<xs:element name="replacementSkillId" type="xs:unsignedShort" />
<xs:element name="level">
<xs:complexType mixed="true">
<xs:sequence minOccurs="0">