Addition of SkillBonusRange effect handler.

Contributed by nasseka.
This commit is contained in:
MobiusDevelopment 2022-02-14 09:27:28 +00:00
parent 0b54806f52
commit 0a003846b2
29 changed files with 230 additions and 12 deletions

View File

@ -328,6 +328,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new);
EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new);
EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new);
EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new);
EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new);

View File

@ -0,0 +1,31 @@
/*
* 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.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author NasSeKa
*/
public class SkillBonusRange extends AbstractStatAddEffect
{
public SkillBonusRange(StatSet params)
{
super(params, Stat.MAGIC_ATTACK_RANGE);
}
}

View File

@ -1587,6 +1587,10 @@
<amount>80</amount>
<mode>DIFF</mode>
</effect>
<effect name="SkillBonusRange">
<amount>80</amount>
<mode>DIFF</mode>
</effect>
<effect name="DefenceCriticalDamage" fromLevel="1" toLevel="2" fromSubLevel="2001" toSubLevel="2020">
<amount>
<value fromLevel="1" toLevel="2" fromSubLevel="2001" toSubLevel="2020">{-1 - (subIndex - 1 * 0.5)}</value>

View File

@ -227,7 +227,7 @@ public class CreatureStat
{
if (skill != null)
{
return (int) getValue(Stat.MAGIC_ATTACK_RANGE, skill.getCastRange());
return skill.getCastRange() + (int) getValue(Stat.MAGIC_ATTACK_RANGE, 0);
}
return _creature.getTemplate().getBaseAttackRange();
}

View File

@ -66,6 +66,7 @@ import org.l2jmobius.gameserver.model.options.OptionsSkillHolder;
import org.l2jmobius.gameserver.model.options.OptionsSkillType;
import org.l2jmobius.gameserver.model.skill.targets.TargetType;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@ -175,7 +176,7 @@ public class SkillCaster implements Runnable
return null;
}
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange(), caster, target, false))
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange() + (int) caster.getStat().getValue(Stat.MAGIC_ATTACK_RANGE, 0), caster, target, false))
{
return null;
}

View File

@ -329,6 +329,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new);
EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new);
EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new);
EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new);
EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new);

View File

@ -0,0 +1,31 @@
/*
* 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.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author NasSeKa
*/
public class SkillBonusRange extends AbstractStatAddEffect
{
public SkillBonusRange(StatSet params)
{
super(params, Stat.MAGIC_ATTACK_RANGE);
}
}

View File

@ -1587,6 +1587,10 @@
<amount>80</amount>
<mode>DIFF</mode>
</effect>
<effect name="SkillBonusRange">
<amount>80</amount>
<mode>DIFF</mode>
</effect>
<effect name="DefenceCriticalDamage" fromLevel="1" toLevel="2" fromSubLevel="2001" toSubLevel="2020">
<amount>
<value fromLevel="1" toLevel="2" fromSubLevel="2001" toSubLevel="2020">{-1 - (subIndex - 1 * 0.5)}</value>

View File

@ -649,6 +649,10 @@
<amount>40</amount>
<mode>DIFF</mode>
</effect>
<effect name="SkillBonusRange">
<amount>40</amount>
<mode>DIFF</mode>
</effect>
</effects>
</skill>
<skill id="30933" toLevel="3" name="Test Skill - Skill Acquisition Requirements">

View File

@ -227,7 +227,7 @@ public class CreatureStat
{
if (skill != null)
{
return (int) getValue(Stat.MAGIC_ATTACK_RANGE, skill.getCastRange());
return skill.getCastRange() + (int) getValue(Stat.MAGIC_ATTACK_RANGE, 0);
}
return _creature.getTemplate().getBaseAttackRange();
}

View File

@ -66,6 +66,7 @@ import org.l2jmobius.gameserver.model.options.OptionsSkillHolder;
import org.l2jmobius.gameserver.model.options.OptionsSkillType;
import org.l2jmobius.gameserver.model.skill.targets.TargetType;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@ -175,7 +176,7 @@ public class SkillCaster implements Runnable
return null;
}
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange(), caster, target, false))
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange() + (int) caster.getStat().getValue(Stat.MAGIC_ATTACK_RANGE, 0), caster, target, false))
{
return null;
}

View File

@ -331,6 +331,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new);
EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new);
EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new);
EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new);
EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new);

View File

@ -0,0 +1,31 @@
/*
* 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.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author NasSeKa
*/
public class SkillBonusRange extends AbstractStatAddEffect
{
public SkillBonusRange(StatSet params)
{
super(params, Stat.MAGIC_ATTACK_RANGE);
}
}

View File

@ -1587,6 +1587,10 @@
<amount>80</amount>
<mode>DIFF</mode>
</effect>
<effect name="SkillBonusRange">
<amount>80</amount>
<mode>DIFF</mode>
</effect>
<effect name="DefenceCriticalDamage" fromLevel="1" toLevel="2" fromSubLevel="2001" toSubLevel="2020">
<amount>
<value fromLevel="1" toLevel="2" fromSubLevel="2001" toSubLevel="2020">{-1 - (subIndex - 1 * 0.5)}</value>

View File

@ -667,6 +667,10 @@
<amount>40</amount>
<mode>DIFF</mode>
</effect>
<effect name="SkillBonusRange">
<amount>40</amount>
<mode>DIFF</mode>
</effect>
</effects>
</skill>
<skill id="30933" toLevel="3" name="Test Skill - Skill Acquisition Requirements">

View File

@ -227,7 +227,7 @@ public class CreatureStat
{
if (skill != null)
{
return (int) getValue(Stat.MAGIC_ATTACK_RANGE, skill.getCastRange());
return skill.getCastRange() + (int) getValue(Stat.MAGIC_ATTACK_RANGE, 0);
}
return _creature.getTemplate().getBaseAttackRange();
}

View File

@ -66,6 +66,7 @@ import org.l2jmobius.gameserver.model.options.OptionsSkillHolder;
import org.l2jmobius.gameserver.model.options.OptionsSkillType;
import org.l2jmobius.gameserver.model.skill.targets.TargetType;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@ -175,7 +176,7 @@ public class SkillCaster implements Runnable
return null;
}
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange(), caster, target, false))
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange() + (int) caster.getStat().getValue(Stat.MAGIC_ATTACK_RANGE, 0), caster, target, false))
{
return null;
}

View File

@ -325,6 +325,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new);
EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new);
EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new);
EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new);
EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new);

View File

@ -0,0 +1,31 @@
/*
* 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.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author NasSeKa
*/
public class SkillBonusRange extends AbstractStatAddEffect
{
public SkillBonusRange(StatSet params)
{
super(params, Stat.MAGIC_ATTACK_RANGE);
}
}

View File

@ -227,7 +227,7 @@ public class CreatureStat
{
if (skill != null)
{
return (int) getValue(Stat.MAGIC_ATTACK_RANGE, skill.getCastRange());
return skill.getCastRange() + (int) getValue(Stat.MAGIC_ATTACK_RANGE, 0);
}
return _creature.getTemplate().getBaseAttackRange();
}

View File

@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.options.OptionsSkillHolder;
import org.l2jmobius.gameserver.model.options.OptionsSkillType;
import org.l2jmobius.gameserver.model.skill.targets.TargetType;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@ -176,7 +177,7 @@ public class SkillCaster implements Runnable
return null;
}
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange(), caster, target, false))
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange() + (int) caster.getStat().getValue(Stat.MAGIC_ATTACK_RANGE, 0), caster, target, false))
{
return null;
}

View File

@ -327,6 +327,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new);
EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new);
EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new);
EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new);
EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new);

View File

@ -0,0 +1,31 @@
/*
* 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.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author NasSeKa
*/
public class SkillBonusRange extends AbstractStatAddEffect
{
public SkillBonusRange(StatSet params)
{
super(params, Stat.MAGIC_ATTACK_RANGE);
}
}

View File

@ -227,7 +227,7 @@ public class CreatureStat
{
if (skill != null)
{
return (int) getValue(Stat.MAGIC_ATTACK_RANGE, skill.getCastRange());
return skill.getCastRange() + (int) getValue(Stat.MAGIC_ATTACK_RANGE, 0);
}
return _creature.getTemplate().getBaseAttackRange();
}

View File

@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.options.OptionsSkillHolder;
import org.l2jmobius.gameserver.model.options.OptionsSkillType;
import org.l2jmobius.gameserver.model.skill.targets.TargetType;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@ -176,7 +177,7 @@ public class SkillCaster implements Runnable
return null;
}
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange(), caster, target, false))
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange() + (int) caster.getStat().getValue(Stat.MAGIC_ATTACK_RANGE, 0), caster, target, false))
{
return null;
}

View File

@ -329,6 +329,7 @@ public class EffectMasterHandler
EffectHandler.getInstance().registerHandler("ShieldDefenceRate", ShieldDefenceRate::new);
EffectHandler.getInstance().registerHandler("ShotsBonus", ShotsBonus::new);
EffectHandler.getInstance().registerHandler("SilentMove", SilentMove::new);
EffectHandler.getInstance().registerHandler("SkillBonusRange", SkillBonusRange::new);
EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
EffectHandler.getInstance().registerHandler("SkillMastery", SkillMastery::new);

View File

@ -0,0 +1,31 @@
/*
* 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.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.stats.Stat;
/**
* @author NasSeKa
*/
public class SkillBonusRange extends AbstractStatAddEffect
{
public SkillBonusRange(StatSet params)
{
super(params, Stat.MAGIC_ATTACK_RANGE);
}
}

View File

@ -227,7 +227,7 @@ public class CreatureStat
{
if (skill != null)
{
return (int) getValue(Stat.MAGIC_ATTACK_RANGE, skill.getCastRange());
return skill.getCastRange() + (int) getValue(Stat.MAGIC_ATTACK_RANGE, 0);
}
return _creature.getTemplate().getBaseAttackRange();
}

View File

@ -67,6 +67,7 @@ import org.l2jmobius.gameserver.model.options.OptionsSkillHolder;
import org.l2jmobius.gameserver.model.options.OptionsSkillType;
import org.l2jmobius.gameserver.model.skill.targets.TargetType;
import org.l2jmobius.gameserver.model.stats.Formulas;
import org.l2jmobius.gameserver.model.stats.Stat;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
@ -176,7 +177,7 @@ public class SkillCaster implements Runnable
return null;
}
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange(), caster, target, false))
if ((skill.getCastRange() > 0) && !Util.checkIfInRange(skill.getCastRange() + (int) caster.getStat().getValue(Stat.MAGIC_ATTACK_RANGE, 0), caster, target, false))
{
return null;
}