Check effect mode where possible.

This commit is contained in:
MobiusDevelopment
2019-05-23 11:52:10 +00:00
parent 12a8e6ab99
commit 8f1c260c79
1119 changed files with 1082 additions and 2814 deletions

View File

@@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -34,6 +35,10 @@ public class AbstractStatAddEffect extends AbstractEffect
{
_stat = stat;
_amount = params.getDouble("amount", 0);
if (params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF) != StatModifierType.DIFF)
{
LOGGER.warning(getClass().getSimpleName() + " can only use DIFF mode.");
}
}
@Override

View File

@@ -0,0 +1,49 @@
/*
* 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.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
import org.l2jmobius.gameserver.model.skills.Skill;
import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Mobius
*/
public class AbstractStatPercentEffect extends AbstractEffect
{
private final Stats _stat;
protected final double _amount;
public AbstractStatPercentEffect(StatsSet params, Stats stat)
{
_stat = stat;
_amount = params.getDouble("amount", 1);
if (params.getEnum("mode", StatModifierType.class, StatModifierType.PER) != StatModifierType.PER)
{
LOGGER.warning(getClass().getSimpleName() + " can only use PER mode.");
}
}
@Override
public void pump(Creature effected, Skill skill)
{
effected.getStat().mergeMul(_stat, (_amount / 100) + 1);
}
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class AreaDamage extends AbstractStatEffect
public class AreaDamage extends AbstractStatAddEffect
{
public AreaDamage(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Mobius
*/
public class BonusDropAmount extends AbstractStatEffect
public class BonusDropAmount extends AbstractStatPercentEffect
{
public BonusDropAmount(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Mobius
*/
public class BonusDropRate extends AbstractStatEffect
public class BonusDropRate extends AbstractStatPercentEffect
{
public BonusDropRate(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Mobius
*/
public class BonusSpoilRate extends AbstractStatEffect
public class BonusSpoilRate extends AbstractStatPercentEffect
{
public BonusSpoilRate(StatsSet params)
{

View File

@@ -26,6 +26,6 @@ public class DefenceMagicCriticalDamage extends AbstractStatEffect
{
public DefenceMagicCriticalDamage(StatsSet params)
{
super(params, Stats.DEFENCE_MAGIC_CRITICAL_DAMAGE);
super(params, Stats.DEFENCE_MAGIC_CRITICAL_DAMAGE, Stats.DEFENCE_MAGIC_CRITICAL_DAMAGE_ADD);
}
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class ExpModify extends AbstractStatEffect
public class ExpModify extends AbstractStatAddEffect
{
public ExpModify(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class HateAttack extends AbstractStatEffect
public class HateAttack extends AbstractStatPercentEffect
{
public HateAttack(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PveMagicalSkillDamageBonus extends AbstractStatEffect
public class PveMagicalSkillDamageBonus extends AbstractStatPercentEffect
{
public PveMagicalSkillDamageBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PveMagicalSkillDefenceBonus extends AbstractStatEffect
public class PveMagicalSkillDefenceBonus extends AbstractStatPercentEffect
{
public PveMagicalSkillDefenceBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PvePhysicalAttackDamageBonus extends AbstractStatEffect
public class PvePhysicalAttackDamageBonus extends AbstractStatPercentEffect
{
public PvePhysicalAttackDamageBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PvePhysicalAttackDefenceBonus extends AbstractStatEffect
public class PvePhysicalAttackDefenceBonus extends AbstractStatPercentEffect
{
public PvePhysicalAttackDefenceBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PvePhysicalSkillDamageBonus extends AbstractStatEffect
public class PvePhysicalSkillDamageBonus extends AbstractStatPercentEffect
{
public PvePhysicalSkillDamageBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PvePhysicalSkillDefenceBonus extends AbstractStatEffect
public class PvePhysicalSkillDefenceBonus extends AbstractStatPercentEffect
{
public PvePhysicalSkillDefenceBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PveRaidMagicalSkillDefenceBonus extends AbstractStatEffect
public class PveRaidMagicalSkillDefenceBonus extends AbstractStatPercentEffect
{
public PveRaidMagicalSkillDefenceBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatEffect
public class PveRaidPhysicalAttackDefenceBonus extends AbstractStatPercentEffect
{
public PveRaidPhysicalAttackDefenceBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatEffect
public class PveRaidPhysicalSkillDefenceBonus extends AbstractStatPercentEffect
{
public PveRaidPhysicalSkillDefenceBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PvpMagicalSkillDamageBonus extends AbstractStatEffect
public class PvpMagicalSkillDamageBonus extends AbstractStatPercentEffect
{
public PvpMagicalSkillDamageBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PvpMagicalSkillDefenceBonus extends AbstractStatEffect
public class PvpMagicalSkillDefenceBonus extends AbstractStatPercentEffect
{
public PvpMagicalSkillDefenceBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PvpPhysicalAttackDamageBonus extends AbstractStatEffect
public class PvpPhysicalAttackDamageBonus extends AbstractStatPercentEffect
{
public PvpPhysicalAttackDamageBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PvpPhysicalAttackDefenceBonus extends AbstractStatEffect
public class PvpPhysicalAttackDefenceBonus extends AbstractStatPercentEffect
{
public PvpPhysicalAttackDefenceBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PvpPhysicalSkillDamageBonus extends AbstractStatEffect
public class PvpPhysicalSkillDamageBonus extends AbstractStatPercentEffect
{
public PvpPhysicalSkillDamageBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class PvpPhysicalSkillDefenceBonus extends AbstractStatEffect
public class PvpPhysicalSkillDefenceBonus extends AbstractStatPercentEffect
{
public PvpPhysicalSkillDefenceBonus(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Mobius
*/
public class RearDamage extends AbstractStatEffect
public class RearDamage extends AbstractStatPercentEffect
{
public RearDamage(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class ResistDDMagic extends AbstractStatEffect
public class ResistDDMagic extends AbstractStatPercentEffect
{
public ResistDDMagic(StatsSet params)
{

View File

@@ -26,6 +26,6 @@ public class SkillCriticalDamage extends AbstractStatEffect
{
public SkillCriticalDamage(StatsSet params)
{
super(params, Stats.CRITICAL_DAMAGE_SKILL);
super(params, Stats.CRITICAL_DAMAGE_SKILL, Stats.CRITICAL_DAMAGE_SKILL_ADD);
}
}

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class SkillCriticalProbability extends AbstractStatEffect
public class SkillCriticalProbability extends AbstractStatPercentEffect
{
public SkillCriticalProbability(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Mobius
*/
public class SkillPowerAdd extends AbstractStatEffect
public class SkillPowerAdd extends AbstractStatAddEffect
{
public SkillPowerAdd(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class SpModify extends AbstractStatEffect
public class SpModify extends AbstractStatAddEffect
{
public SpModify(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Mobius
*/
public class VitalityExpRate extends AbstractStatEffect
public class VitalityExpRate extends AbstractStatPercentEffect
{
public VitalityExpRate(StatsSet params)
{

View File

@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.stats.Stats;
/**
* @author Sdw
*/
public class VitalityPointsRate extends AbstractStatEffect
public class VitalityPointsRate extends AbstractStatPercentEffect
{
public VitalityPointsRate(StatsSet params)
{