Addition of ReplaceSkillBySkill effect.

This commit is contained in:
MobiusDevelopment
2019-06-29 13:09:07 +00:00
parent 97a686a23e
commit d3d4f5881a
17 changed files with 428 additions and 19 deletions

View File

@@ -285,6 +285,7 @@ public final class EffectMasterHandler
EffectHandler.getInstance().registerHandler("RefuelAirship", RefuelAirship::new);
EffectHandler.getInstance().registerHandler("Relax", Relax::new);
EffectHandler.getInstance().registerHandler("RemoveEquipPenalty", RemoveEquipPenalty::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,117 @@
/*
* 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.concurrent.ThreadPool;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.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(StatsSet 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, ItemInstance item)
{
if (effected.isPlayer())
{
final PlayerInstance 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 PlayerInstance 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

@@ -1034,6 +1034,14 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<effects>
<effect name="ReplaceSkillBySkill">
<existingSkillId>11509</existingSkillId> <!-- Radiant Crash (Single)-->
<replacementSkillId>11513</replacementSkillId> <!-- Radiant Crash (AOE) -->
</effect>
<effect name="ReplaceSkillBySkill">
<existingSkillId>11510</existingSkillId> <!-- Resolving Bash (Single)-->
<replacementSkillId>11514</replacementSkillId> <!-- Resolving Bash (AOE) -->
</effect>
<effect name="PAtk">
<amount>
<value level="1">300</value>

View File

@@ -254,6 +254,7 @@ ReflectSkill: Deflects physical/magical debuffs back to the attacker.
RefuelAirship: Increases Airship's fuel.
Relax: Sits down and increases HP regeneration until full.
RemoveEquipPenalty: Removes equipment grade penalty. Its the base effect for the grade penalty mechanics.
ReplaceSkillBySkill: While active replaces a skill with an alternative skill. (l2jmobius)
ResetInstanceEntry: Resets instance re-entry time. (l2jmobius)
ResistAbnormalByCategory: Buff/debuff resist stat.
ResistDDMagic: Magic resist stat (magic attack 50% effective or 1 damage)

View File

@@ -2068,6 +2068,8 @@
</xs:element>
<xs:element name="existingSkillId" type="xs:unsignedShort" />
<xs:element name="existingSkillLevel" type="xs:unsignedByte" />
<xs:element name="replacementSkillId" type="xs:unsignedShort" />
<xs:element name="replacementSkillLevel" type="xs:unsignedByte" />
<xs:element name="addedSkillId" type="xs:unsignedShort" />
<xs:element name="addedSkillLevel" type="xs:unsignedByte" />
<xs:element name="skills" type="xs:string" />

View File

@@ -286,6 +286,7 @@ public final class EffectMasterHandler
EffectHandler.getInstance().registerHandler("RefuelAirship", RefuelAirship::new);
EffectHandler.getInstance().registerHandler("Relax", Relax::new);
EffectHandler.getInstance().registerHandler("RemoveEquipPenalty", RemoveEquipPenalty::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,117 @@
/*
* 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.concurrent.ThreadPool;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.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(StatsSet 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, ItemInstance item)
{
if (effected.isPlayer())
{
final PlayerInstance 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 PlayerInstance 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

@@ -389,15 +389,15 @@
</effect>
</effects>
</skill>
<skill id="11508" toLevel="9" name="Assault Rush">
<skill id="11508" toLevel="11" name="Assault Rush">
<icon>icon.skill11513</icon>
<abnormalLvl>1</abnormalLvl>
<abnormalTime>3</abnormalTime>
<abnormalType>STUN</abnormalType>
<abnormalVisualEffect>STUN</abnormalVisualEffect>
<activateRate>
<value fromLevel="1" toLevel="9">150</value>
<value fromLevel="5" toLevel="9" fromSubLevel="1001" toSubLevel="1020">{base + base / 100 * subIndex}</value>
<value fromLevel="1" toLevel="11">150</value>
<value fromLevel="5" toLevel="11" fromSubLevel="1001" toSubLevel="1020">{base + (base / 100 * subIndex)}</value>
</activateRate>
<basicProperty>NONE</basicProperty>
<nextAction>ATTACK</nextAction>
@@ -413,10 +413,12 @@
<value level="7">49</value>
<value level="8">51</value>
<value level="9">53</value>
<value level="10">55</value>
<value level="11">57</value>
</mpConsume>
<castRange>
<value fromLevel="1" toLevel="9">600</value>
<value fromLevel="5" toLevel="9" fromSubLevel="2001" toSubLevel="2020">{base + 10 * subIndex}</value>
<value fromLevel="1" toLevel="11">600</value>
<value fromLevel="5" toLevel="11" fromSubLevel="2001" toSubLevel="2020">{base + (10 * subIndex)}</value>
</castRange>
<hitTime>800</hitTime>
<coolTime>200</coolTime>
@@ -432,6 +434,8 @@
<value level="7">-712</value>
<value level="8">-712</value>
<value level="9">-712</value>
<value level="10">-712</value>
<value level="11">-712</value>
</effectPoint>
<magicCriticalRate>5</magicCriticalRate>
<effectRange>800</effectRange>
@@ -445,6 +449,8 @@
<value level="7">101</value>
<value level="8">102</value>
<value level="9">105</value>
<value level="10">107</value>
<value level="11">109</value>
</magicLvl>
<trait>SHOCK</trait>
<targetType>ENEMY</targetType>
@@ -460,8 +466,8 @@
</condition>
<condition name="OpCheckCastRange">
<distance>
<value fromLevel="1" toLevel="9">200</value>
<value fromLevel="5" toLevel="9" fromSubLevel="3001" toSubLevel="3020">{base - (3 * subIndex)}</value>
<value fromLevel="1" toLevel="11">200</value>
<value fromLevel="5" toLevel="11" fromSubLevel="3001" toSubLevel="3020">{base - (3 * subIndex)}</value>
</distance>
</condition>
</conditions>

View File

@@ -1038,6 +1038,14 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<effects>
<effect name="ReplaceSkillBySkill">
<existingSkillId>11509</existingSkillId> <!-- Radiant Crash (Single)-->
<replacementSkillId>11513</replacementSkillId> <!-- Radiant Crash (AOE) -->
</effect>
<effect name="ReplaceSkillBySkill">
<existingSkillId>11510</existingSkillId> <!-- Resolving Bash (Single)-->
<replacementSkillId>11514</replacementSkillId> <!-- Resolving Bash (AOE) -->
</effect>
<effect name="PAtk">
<amount>
<value level="1">300</value>

View File

@@ -255,6 +255,7 @@ ReflectSkill: Deflects physical/magical debuffs back to the attacker.
RefuelAirship: Increases Airship's fuel.
Relax: Sits down and increases HP regeneration until full.
RemoveEquipPenalty: Removes equipment grade penalty. Its the base effect for the grade penalty mechanics.
ReplaceSkillBySkill: While active replaces a skill with an alternative skill. (l2jmobius)
ResetInstanceEntry: Resets instance re-entry time. (l2jmobius)
ResistAbnormalByCategory: Buff/debuff resist stat.
ResistDDMagic: Magic resist stat (magic attack 50% effective or 1 damage)

View File

@@ -2068,6 +2068,8 @@
</xs:element>
<xs:element name="existingSkillId" type="xs:unsignedShort" />
<xs:element name="existingSkillLevel" type="xs:unsignedByte" />
<xs:element name="replacementSkillId" type="xs:unsignedShort" />
<xs:element name="replacementSkillLevel" type="xs:unsignedByte" />
<xs:element name="addedSkillId" type="xs:unsignedShort" />
<xs:element name="addedSkillLevel" type="xs:unsignedByte" />
<xs:element name="skills" type="xs:string" />

View File

@@ -286,6 +286,7 @@ public final class EffectMasterHandler
EffectHandler.getInstance().registerHandler("RefuelAirship", RefuelAirship::new);
EffectHandler.getInstance().registerHandler("Relax", Relax::new);
EffectHandler.getInstance().registerHandler("RemoveEquipPenalty", RemoveEquipPenalty::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,117 @@
/*
* 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.concurrent.ThreadPool;
import org.l2jmobius.gameserver.data.xml.impl.SkillData;
import org.l2jmobius.gameserver.enums.ShortcutType;
import org.l2jmobius.gameserver.model.Shortcut;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.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(StatsSet 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, ItemInstance item)
{
if (effected.isPlayer())
{
final PlayerInstance 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 PlayerInstance 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

@@ -883,15 +883,15 @@
</effect>
</effects>
</skill>
<skill id="11513" toLevel="11" name="Radiant Crash">
<skill id="11513" toLevel="13" name="Radiant Crash">
<!-- Attacks target and nearby enemies with $s1 Power added to P. Atk. for $s2, target's P./ M. Def. -$s3. Requires a sword/ blunt/ dual sword/ dual blunt to be equipped. Over-hit. Critical. -->
<icon>icon.skill11514</icon>
<abnormalLvl>5</abnormalLvl>
<abnormalTime>20</abnormalTime>
<abnormalType>ULTIMATE_DEBUFF</abnormalType>
<activateRate>
<value fromLevel="1" toLevel="11">99</value>
<value fromLevel="7" toLevel="11" fromSubLevel="1001" toSubLevel="1020">{base + (base / 100 * subIndex)}</value>
<value fromLevel="1" toLevel="13">99</value>
<value fromLevel="7" toLevel="13" fromSubLevel="1001" toSubLevel="1020">{base + (base / 100 * subIndex)}</value>
</activateRate>
<affectLimit>5-12</affectLimit>
<affectRange>200</affectRange>
@@ -910,6 +910,8 @@
<value level="9">101</value>
<value level="10">103</value>
<value level="11">105</value>
<value level="12">107</value>
<value level="13">109</value>
</magicLvl>
<mpConsume>
<value level="1">130</value>
@@ -923,6 +925,8 @@
<value level="9">164</value>
<value level="10">168</value>
<value level="11">172</value>
<value level="12">176</value>
<value level="13">180</value>
</mpConsume>
<nextAction>ATTACK</nextAction>
<operateType>A2</operateType>
@@ -939,6 +943,8 @@
<value level="9">-712</value>
<value level="10">-712</value>
<value level="11">-712</value>
<value level="12">-712</value>
<value level="13">-712</value>
</effectPoint>
<basicProperty>NONE</basicProperty>
<magicCriticalRate>5</magicCriticalRate>
@@ -971,13 +977,15 @@
<value level="9">19113</value>
<value level="10">20045</value>
<value level="11">20977</value>
<value fromLevel="7" toLevel="11" fromSubLevel="1001" toSubLevel="1020">{base + (base / 100 * subIndex)}</value>
<value level="12">21964</value>
<value level="13">22952</value>
<value fromLevel="7" toLevel="13" fromSubLevel="1001" toSubLevel="1020">{base + (base / 100 * subIndex)}</value>
</power>
<overHit>true</overHit>
<criticalChance>5</criticalChance>
<pDefMod>
<value fromLevel="1" toLevel="11">1</value>
<value fromLevel="7" toLevel="11" fromSubLevel="3001" toSubLevel="3020">{0.99 - 0.006 * (subIndex - 1)}</value>
<value fromLevel="1" toLevel="13">1</value>
<value fromLevel="7" toLevel="13" fromSubLevel="3001" toSubLevel="3020">{0.99 - 0.006 * (subIndex - 1)}</value>
</pDefMod>
</effect>
<effect name="MagicalDefence">
@@ -1001,15 +1009,15 @@
</effect>
</selfEffects>
</skill>
<skill id="11514" toLevel="11" name="Resolving Bash">
<skill id="11514" toLevel="13" name="Resolving Bash">
<!-- Attacks target and nearby enemies with $s1 Power added to P. Atk. For $s2, P./ M. Atk. -$s3. Requires a sword/ blunt/ dual sword/ dual blunt to be equipped. Over-hit. Critical. -->
<icon>icon.skill11509</icon>
<abnormalLvl>5</abnormalLvl>
<abnormalTime>20</abnormalTime>
<abnormalType>CRITICAL_PROB_DOWN</abnormalType>
<activateRate>
<value fromLevel="1" toLevel="11">99</value>
<value fromLevel="7" toLevel="11" fromSubLevel="1001" toSubLevel="1020">{base + (base / 100 * subIndex)}</value>
<value fromLevel="1" toLevel="13">99</value>
<value fromLevel="7" toLevel="13" fromSubLevel="1001" toSubLevel="1020">{base + (base / 100 * subIndex)}</value>
</activateRate>
<affectLimit>5-12</affectLimit>
<affectRange>200</affectRange>
@@ -1028,6 +1036,8 @@
<value level="9">101</value>
<value level="10">103</value>
<value level="11">105</value>
<value level="12">107</value>
<value level="13">109</value>
</magicLvl>
<mpConsume>
<value level="1">146</value>
@@ -1041,6 +1051,8 @@
<value level="9">188</value>
<value level="10">194</value>
<value level="11">200</value>
<value level="12">204</value>
<value level="13">208</value>
</mpConsume>
<nextAction>ATTACK</nextAction>
<operateType>A2</operateType>
@@ -1057,6 +1069,8 @@
<value level="9">-712</value>
<value level="10">-712</value>
<value level="11">-712</value>
<value level="12">-712</value>
<value level="13">-712</value>
</effectPoint>
<basicProperty>NONE</basicProperty>
<magicCriticalRate>5</magicCriticalRate>
@@ -1089,13 +1103,15 @@
<value level="9">21340</value>
<value level="10">22380</value>
<value level="11">23420</value>
<value fromLevel="7" toLevel="11" fromSubLevel="1001" toSubLevel="1020">{base + (base / 100 * subIndex)}</value>
<value level="12">24522</value>
<value level="13">25624</value>
<value fromLevel="7" toLevel="13" fromSubLevel="1001" toSubLevel="1020">{base + (base / 100 * subIndex)}</value>
</power>
<overHit>true</overHit>
<criticalChance>5</criticalChance>
<pDefMod>
<value fromLevel="1" toLevel="11">1</value>
<value fromLevel="7" toLevel="11" fromSubLevel="3001" toSubLevel="3020">{0.99 - 0.006 * (subIndex - 1)}</value>
<value fromLevel="1" toLevel="13">1</value>
<value fromLevel="7" toLevel="13" fromSubLevel="3001" toSubLevel="3020">{0.99 - 0.006 * (subIndex - 1)}</value>
</pDefMod>
</effect>
<effect name="PAtk">

View File

@@ -1058,6 +1058,14 @@
<targetType>SELF</targetType>
<affectScope>SINGLE</affectScope>
<effects>
<effect name="ReplaceSkillBySkill">
<existingSkillId>11509</existingSkillId> <!-- Radiant Crash (Single)-->
<replacementSkillId>11513</replacementSkillId> <!-- Radiant Crash (AOE) -->
</effect>
<effect name="ReplaceSkillBySkill">
<existingSkillId>11510</existingSkillId> <!-- Resolving Bash (Single)-->
<replacementSkillId>11514</replacementSkillId> <!-- Resolving Bash (AOE) -->
</effect>
<effect name="PAtk">
<amount>
<value level="1">300</value>

View File

@@ -255,6 +255,7 @@ ReflectSkill: Deflects physical/magical debuffs back to the attacker.
RefuelAirship: Increases Airship's fuel.
Relax: Sits down and increases HP regeneration until full.
RemoveEquipPenalty: Removes equipment grade penalty. Its the base effect for the grade penalty mechanics.
ReplaceSkillBySkill: While active replaces a skill with an alternative skill. (l2jmobius)
ResetInstanceEntry: Resets instance re-entry time. (l2jmobius)
ResistAbnormalByCategory: Buff/debuff resist stat.
ResistDDMagic: Magic resist stat (magic attack 50% effective or 1 damage)

View File

@@ -2068,6 +2068,8 @@
</xs:element>
<xs:element name="existingSkillId" type="xs:unsignedShort" />
<xs:element name="existingSkillLevel" type="xs:unsignedByte" />
<xs:element name="replacementSkillId" type="xs:unsignedShort" />
<xs:element name="replacementSkillLevel" type="xs:unsignedByte" />
<xs:element name="addedSkillId" type="xs:unsignedShort" />
<xs:element name="addedSkillLevel" type="xs:unsignedByte" />
<xs:element name="skills" type="xs:string" />