BETA: CORE-Part for [DP9206].

L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Weapon.java

@@ -60,8 +60,8 @@ public final class L2Weapon extends L2Item
 	private final int _changeWeaponId;
 	
 	// Attached skills for Special Abilities
-	private SkillHolder _skillsOnCast;
-	private Condition _skillsOnCastCondition = null;
+	private SkillHolder _skillsOnMagic;
+	private Condition _skillsOnMagicCondition = null;
 	private SkillHolder _skillsOnCrit;
 	private Condition _skillsOnCritCondition = null;
 	
@@ -125,11 +125,11 @@ public final class L2Weapon extends L2Item
 			}
 		}
 		
-		skill = set.getString("oncast_skill", null);
+		skill = set.getString("onmagic_skill", null);
 		if (skill != null)
 		{
 			String[] info = skill.split("-");
-			final int chance = set.getInteger("oncast_chance", 100);
+			final int chance = set.getInteger("onmagic_chance", 100);
 			if ((info != null) && (info.length == 2))
 			{
 				int id = 0;
@@ -142,12 +142,12 @@ public final class L2Weapon extends L2Item
 				catch (Exception nfe)
 				{
 					// Incorrect syntax, don't add new skill
-					_log.info(StringUtil.concat("> Couldnt parse ", skill, " in weapon oncast skills! item ", toString()));
+					_log.info(StringUtil.concat("> Couldnt parse ", skill, " in weapon onmagic skills! item ", toString()));
 				}
 				if ((id > 0) && (level > 0) && (chance > 0))
 				{
-					_skillsOnCast = new SkillHolder(id, level);
-					_skillsOnCastCondition = new ConditionGameChance(chance);
+					_skillsOnMagic = new SkillHolder(id, level);
+					_skillsOnMagicCondition = new ConditionGameChance(chance);
 				}
 			}
 		}
@@ -409,48 +409,48 @@ public final class L2Weapon extends L2Item
 	 * @param caster the L2Character pointing out the caster
 	 * @param target the L2Character pointing out the target
 	 * @param trigger the L2Skill pointing out the skill triggering this action
-	 * @return the effects of skills associated with the item to be triggered onCast.
+	 * @return the effects of skills associated with the item to be triggered onMagic.
 	 */
 	public L2Effect[] getSkillEffects(L2Character caster, L2Character target, L2Skill trigger)
 	{
-		if (_skillsOnCast == null)
+		if (_skillsOnMagic == null)
 		{
 			return _emptyEffectSet;
 		}
 		
-		final L2Skill onCastSkill = _skillsOnCast.getSkill();
+		final L2Skill onMagicSkill = _skillsOnMagic.getSkill();
 		// No Trigger if Offensive Skill
-		if (trigger.isOffensive() && onCastSkill.isOffensive())
+		if (trigger.isOffensive() && onMagicSkill.isOffensive())
 		{
 			return _emptyEffectSet;
 		}
 		// No Trigger if not Magic Skill
-		if (!trigger.isMagic() && !onCastSkill.isMagic())
+		if (!trigger.isMagic() && !onMagicSkill.isMagic())
 		{
 			return _emptyEffectSet;
 		}
 		
-		if (_skillsOnCastCondition != null)
+		if (_skillsOnMagicCondition != null)
 		{
 			Env env = new Env();
 			env.setCharacter(caster);
 			env.setTarget(target);
-			env.setSkill(onCastSkill);
-			if (!_skillsOnCastCondition.test(env))
+			env.setSkill(onMagicSkill);
+			if (!_skillsOnMagicCondition.test(env))
 			{
 				// Chance not met
 				return _emptyEffectSet;
 			}
 		}
 		
-		if (!onCastSkill.checkCondition(caster, target, false))
+		if (!onMagicSkill.checkCondition(caster, target, false))
 		{
 			// Skill condition not met
 			return _emptyEffectSet;
 		}
 		
-		final byte shld = Formulas.calcShldUse(caster, target, onCastSkill);
-		if (onCastSkill.isOffensive() && !Formulas.calcSkillSuccess(caster, target, onCastSkill, shld, false, false, false))
+		final byte shld = Formulas.calcShldUse(caster, target, onMagicSkill);
+		if (onMagicSkill.isOffensive() && !Formulas.calcSkillSuccess(caster, target, onMagicSkill, shld, false, false, false))
 		{
 			return _emptyEffectSet;
 		}
@@ -462,14 +462,14 @@ public final class L2Weapon extends L2Item
 		
 		// Launch the magic skill and calculate its effects
 		// Get the skill handler corresponding to the skill type
-		final ISkillHandler handler = SkillHandler.getInstance().getHandler(onCastSkill.getSkillType());
+		final ISkillHandler handler = SkillHandler.getInstance().getHandler(onMagicSkill.getSkillType());
 		if (handler != null)
 		{
-			handler.useSkill(caster, onCastSkill, targets);
+			handler.useSkill(caster, onMagicSkill, targets);
 		}
 		else
 		{
-			onCastSkill.useSkill(caster, targets);
+			onMagicSkill.useSkill(caster, targets);
 		}
 		
 		// notify quests of a skill use
@@ -486,7 +486,7 @@ public final class L2Weapon extends L2Item
 					{
 						for (Quest quest : npcMob.getTemplate().getEventQuests(QuestEventType.ON_SKILL_SEE))
 						{
-							quest.notifySkillSee(npcMob, caster.getActingPlayer(), onCastSkill, targets, false);
+							quest.notifySkillSee(npcMob, caster.getActingPlayer(), onMagicSkill, targets, false);
 						}
 					}
 				}