BETA: Renamed ("lvlDepend" -> "lvlBonusRate") and ("skillRadius" -> "affectRange").

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -852,7 +852,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 		if (!_skillrender.getSuicideSkills().isEmpty() && ((int) ((npc.getCurrentHp() / npc.getMaxHp()) * 100) < 30))
 		{
 			final L2Skill skill = _skillrender.getSuicideSkills().get(Rnd.nextInt(_skillrender.getSuicideSkills().size()));
-			if (Util.checkIfInRange(skill.getSkillRadius(), getActiveChar(), mostHate, false) && (Rnd.get(100) < Rnd.get(npc.getMinSkillChance(), npc.getMaxSkillChance())))
+			if (Util.checkIfInRange(skill.getAffectRange(), getActiveChar(), mostHate, false) && (Rnd.get(100) < Rnd.get(npc.getMinSkillChance(), npc.getMaxSkillChance())))
 			{
 				if (cast(skill))
 				{
@@ -1484,7 +1484,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				if (isParty(sk))
 				{
-					for (L2Character obj : caster.getKnownList().getKnownCharactersInRadius(sk.getSkillRadius() + caster.getTemplate().getCollisionRadius()))
+					for (L2Character obj : caster.getKnownList().getKnownCharactersInRadius(sk.getAffectRange() + caster.getTemplate().getCollisionRadius()))
 					{
 						if (!(obj instanceof L2Attackable))
 						{
@@ -1554,7 +1554,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				else if (isParty(sk))
 				{
-					for (L2Character obj : caster.getKnownList().getKnownCharactersInRadius(sk.getSkillRadius() + caster.getTemplate().getCollisionRadius()))
+					for (L2Character obj : caster.getKnownList().getKnownCharactersInRadius(sk.getAffectRange() + caster.getTemplate().getCollisionRadius()))
 					{
 						if (!(obj instanceof L2Attackable))
 						{

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

@@ -1200,7 +1200,7 @@ public class L2CharacterAI extends AbstractAI
 			setIntention(AI_INTENTION_ACTIVE);
 			return true;
 		}
-		if ((_actor != null) && (_skill != null) && _skill.isOffensive() && (_skill.getSkillRadius() > 0) && (Config.GEODATA > 0) && !GeoData.getInstance().canSeeTarget(_actor, target))
+		if ((_actor != null) && (_skill != null) && _skill.isOffensive() && (_skill.getAffectRange() > 0) && (Config.GEODATA > 0) && !GeoData.getInstance().canSeeTarget(_actor, target))
 		{
 			setIntention(AI_INTENTION_ACTIVE);
 			return true;
@@ -1464,7 +1464,7 @@ public class L2CharacterAI extends AbstractAI
 	{
 		if ((sk.getTargetType() == L2TargetType.TARGET_AURA) || (sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA) || (sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA) || (sk.getTargetType() == L2TargetType.TARGET_AURA_CORPSE_MOB))
 		{
-			for (L2Object target : _actor.getKnownList().getKnownCharactersInRadius(sk.getSkillRadius()))
+			for (L2Object target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
 			{
 				if (target == getAttackTarget())
 				{
@@ -1482,7 +1482,7 @@ public class L2CharacterAI extends AbstractAI
 			if ((sk.getTargetType() == L2TargetType.TARGET_AURA) || (sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA) || (sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA) || (sk.getTargetType() == L2TargetType.TARGET_AURA_CORPSE_MOB))
 			{
 				boolean cancast = true;
-				for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getSkillRadius()))
+				for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
 				{
 					if (!GeoData.getInstance().canSeeTarget(_actor, target))
 					{
@@ -1517,7 +1517,7 @@ public class L2CharacterAI extends AbstractAI
 			else if ((sk.getTargetType() == L2TargetType.TARGET_AREA) || (sk.getTargetType() == L2TargetType.TARGET_BEHIND_AREA) || (sk.getTargetType() == L2TargetType.TARGET_FRONT_AREA))
 			{
 				boolean cancast = true;
-				for (L2Character target : getAttackTarget().getKnownList().getKnownCharactersInRadius(sk.getSkillRadius()))
+				for (L2Character target : getAttackTarget().getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
 				{
 					if (!GeoData.getInstance().canSeeTarget(_actor, target) || (target == null))
 					{
@@ -1549,7 +1549,7 @@ public class L2CharacterAI extends AbstractAI
 			if ((sk.getTargetType() == L2TargetType.TARGET_AURA) || (sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA) || (sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA) || (sk.getTargetType() == L2TargetType.TARGET_AURA_CORPSE_MOB))
 			{
 				boolean cancast = false;
-				for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getSkillRadius()))
+				for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
 				{
 					if (!GeoData.getInstance().canSeeTarget(_actor, target))
 					{
@@ -1578,7 +1578,7 @@ public class L2CharacterAI extends AbstractAI
 			else if ((sk.getTargetType() == L2TargetType.TARGET_AREA) || (sk.getTargetType() == L2TargetType.TARGET_BEHIND_AREA) || (sk.getTargetType() == L2TargetType.TARGET_FRONT_AREA))
 			{
 				boolean cancast = true;
-				for (L2Character target : getAttackTarget().getKnownList().getKnownCharactersInRadius(sk.getSkillRadius()))
+				for (L2Character target : getAttackTarget().getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
 				{
 					if (!GeoData.getInstance().canSeeTarget(_actor, target))
 					{
@@ -1619,7 +1619,7 @@ public class L2CharacterAI extends AbstractAI
 		{
 			int count = 0;
 			int ccount = 0;
-			for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getSkillRadius()))
+			for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
 			{
 				if (!(target instanceof L2Attackable) || !GeoData.getInstance().canSeeTarget(_actor, target))
 				{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -6375,9 +6375,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 		{
 			escapeRange = skill.getEffectRange();
 		}
-		else if ((skill.getCastRange() < 0) && (skill.getSkillRadius() > 80))
+		else if ((skill.getCastRange() < 0) && (skill.getAffectRange() > 80))
 		{
-			escapeRange = skill.getSkillRadius();
+			escapeRange = skill.getAffectRange();
 		}
 		
 		if ((targets.length > 0) && (escapeRange > 0))

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Trap.java

@@ -287,7 +287,7 @@ public class L2Trap extends L2Character
 						}
 					}
 					
-					for (L2Character target : getKnownList().getKnownCharactersInRadius(_skill.getSkillRadius()))
+					for (L2Character target : getKnownList().getKnownCharactersInRadius(_skill.getAffectRange()))
 					{
 						if (!checkTarget(target))
 						{

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

@@ -160,7 +160,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	private final double _pvpPower;
 	private final double _pvePower;
 	private final int _magicLevel;
-	private final int _levelDepend;
+	private final int _lvlBonusRate;
 	private final boolean _ignoreResists;
 	private final int _minChance;
 	private final int _maxChance;
@@ -170,7 +170,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	// Effecting area of the skill, in radius.
 	// The radius center varies according to the _targetType:
 	// "caster" if targetType = AURA/PARTY/CLAN or "target" if targetType = AREA
-	private final int _skillRadius;
+	private final int _affectRange;
 	
 	private final L2SkillType _skillType;
 	private final L2SkillType _effectType; // additional effect has a type
@@ -417,14 +417,14 @@ public abstract class L2Skill implements IChanceSkillTrigger
 			_reuseDelay = set.getInteger("reuseDelay", 0);
 		}
 		
-		_skillRadius = set.getInteger("skillRadius", 0);
+		_affectRange = set.getInteger("affectRange", 0);
 		
 		_targetType = set.getEnum("target", L2TargetType.class);
 		_power = set.getFloat("power", 0.f);
 		_pvpPower = set.getFloat("pvpPower", (float) getPower());
 		_pvePower = set.getFloat("pvePower", (float) getPower());
 		_magicLevel = set.getInteger("magicLvl", 0);
-		_levelDepend = set.getInteger("lvlDepend", 0);
+		_lvlBonusRate = set.getInteger("lvlBonusRate", 0);
 		_ignoreResists = set.getBool("ignoreResists", false);
 		_minChance = set.getInteger("minChance", Config.MIN_ABNORMAL_STATE_SUCCESS_RATE);
 		_maxChance = set.getInteger("maxChance", Config.MAX_ABNORMAL_STATE_SUCCESS_RATE);
@@ -688,9 +688,9 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		return _maxNegatedEffects;
 	}
 	
-	public final int getLevelDepend()
+	public final int getLvlBonusRate()
 	{
-		return _levelDepend;
+		return _lvlBonusRate;
 	}
 	
 	/**
@@ -1026,9 +1026,9 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		return _coolTime;
 	}
 	
-	public final int getSkillRadius()
+	public final int getAffectRange()
 	{
-		return _skillRadius;
+		return _affectRange;
 	}
 	
 	public final boolean isActive()

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

@@ -1902,7 +1902,7 @@ public final class Formulas
 	
 	public static int calcLvlDependModifier(L2Character attacker, L2Character target, L2Skill skill)
 	{
-		if (skill.getLevelDepend() == 0)
+		if (skill.getLvlBonusRate() == 0)
 		{
 			return 0;
 		}
@@ -1917,7 +1917,7 @@ public final class Formulas
 			attackerMod = attacker.getLevel();
 		}
 		
-		return skill.getLevelDepend() * (attackerMod - target.getLevel());
+		return skill.getLvlBonusRate() * (attackerMod - target.getLevel());
 	}
 	
 	public static int calcElementModifier(L2Character attacker, L2Character target, L2Skill skill)