BETA: Core-Part for [DP10017].

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -162,7 +162,7 @@ public abstract class L2Skill implements IChanceSkillTrigger, IIdentifiable
 	private final byte _element;
 	private final int _elementPower;
 	
-	private final BaseStats _saveVs;
+	private final BaseStats _basicProperty;
 	
 	private final boolean _overhit;
 	
@@ -326,7 +326,7 @@ public abstract class L2Skill implements IChanceSkillTrigger, IIdentifiable
 		_element = set.getByte("element", (byte) -1);
 		_elementPower = set.getInt("elementPower", 0);
 		
-		_saveVs = set.getEnum("saveVs", BaseStats.class, BaseStats.NULL);
+		_basicProperty = set.getEnum("basicProperty", BaseStats.class, BaseStats.NONE);
 		
 		_overhit = set.getBoolean("overHit", false);
 		_isSuicideAttack = set.getBoolean("isSuicideAttack", false);
@@ -624,12 +624,12 @@ public abstract class L2Skill implements IChanceSkillTrigger, IIdentifiable
 	}
 	
 	/**
-	 * Return skill saveVs base stat (STR, INT ...).
+	 * Return skill basicProperty base stat (STR, INT ...).
 	 * @return
 	 */
-	public final BaseStats getSaveVs()
+	public final BaseStats getBasicProperty()
 	{
-		return _saveVs;
+		return _basicProperty;
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/BaseStats.java

@@ -43,7 +43,7 @@ public enum BaseStats
 	WIT(new WIT()),
 	CON(new CON()),
 	MEN(new MEN()),
-	NULL(new NULL());
+	NONE(new NONE());
 	
 	private static final Logger _log = Logger.getLogger(BaseStats.class.getName());
 	
@@ -150,7 +150,7 @@ public enum BaseStats
 		}
 	}
 	
-	protected static final class NULL implements BaseStat
+	protected static final class NONE implements BaseStat
 	{
 		@Override
 		public final double calcBonus(L2Character actor)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/stats/Formulas.java

@@ -1297,11 +1297,6 @@ public final class Formulas
 		return d > 0;
 	}
 	
-	public static double calcSkillStatMod(L2Skill skill, L2Character target)
-	{
-		return skill.getSaveVs() != null ? skill.getSaveVs().calcBonus(target) : 1;
-	}
-	
 	public static double calcLvlBonusMod(L2Character attacker, L2Character target, L2Skill skill)
 	{
 		int attackerLvl = skill.getMagicLevel() > 0 ? skill.getMagicLevel() : attacker.getLevel();
@@ -1321,7 +1316,7 @@ public final class Formulas
 		final L2Character target = env.getTarget();
 		final L2Skill skill = env.getSkill();
 		final int activateRate = skill.getActivateRate();
-		if ((activateRate == -1) || (skill.getSaveVs() == BaseStats.NULL))
+		if ((activateRate == -1) || (skill.getBasicProperty() == BaseStats.NONE))
 		{
 			return true;
 		}
@@ -1333,7 +1328,7 @@ public final class Formulas
 		}
 		
 		int targetBaseStat = 0;
-		switch (skill.getSaveVs())
+		switch (skill.getBasicProperty())
 		{
 			case STR:
 				targetBaseStat = target.getSTR();
@@ -1432,7 +1427,7 @@ public final class Formulas
 		
 		// Calculate BaseRate.
 		double baseRate = skill.getPower();
-		double statMod = calcSkillStatMod(skill, target);
+		double statMod = skill.getBasicProperty().calcBonus(target);
 		double rate = (baseRate / statMod);
 		
 		// Lvl Bonus Modifier.
@@ -1489,7 +1484,7 @@ public final class Formulas
 		
 		// Calculate BaseRate.
 		double baseRate = skill.getPower();
-		double statMod = calcSkillStatMod(skill, target);
+		double statMod = skill.getBasicProperty().calcBonus(target);
 		double rate = (baseRate / statMod);
 		
 		// Resist Modifier.
@@ -2078,7 +2073,7 @@ public final class Formulas
 		// Debuffs Duration Affected by Resistances.
 		if ((caster != null) && (target != null) && skill.isDebuff())
 		{
-			double statMod = calcSkillStatMod(skill, target);
+			double statMod = skill.getBasicProperty().calcBonus(target);
 			double resMod = calcGeneralTraitBonus(caster, target, skill.getTraitType(), false);
 			double lvlBonusMod = calcLvlBonusMod(caster, target, skill);
 			double elementMod = calcAttributeBonus(caster, target, skill);