Browse Source

BETA: Cleaned up unused power parameter from some skills.
* `GetAgro` effect should work only on `L2Attackable`.
* Reported by: Tavo22, facheme
* Fixed some skills that were using `TargetMe` effect instead of `GetAgro` effect.
* Reported by: Tavo22, Gries, thorl2

Nos 11 years ago
parent
commit
d1593e1891

+ 3 - 6
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java

@@ -20,7 +20,7 @@ package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.StatsSet;
-import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
@@ -52,12 +52,9 @@ public final class GetAgro extends AbstractEffect
 	@Override
 	public void onStart(BuffInfo info)
 	{
-		if (info.getEffected() instanceof L2NpcInstance)
+		if (info.getEffected() instanceof L2Attackable)
 		{
-			return;
+			info.getEffected().getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, info.getEffector());
 		}
-		
-		CtrlIntention intention = (info.getEffected().isInCombat() || info.getEffected().isL2Attackable()) ? CtrlIntention.AI_INTENTION_ATTACK : CtrlIntention.AI_INTENTION_FOLLOW;
-		info.getEffected().getAI().setIntention(intention, info.getEffector());
 	}
 }

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml

@@ -607,7 +607,6 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A2" />
-		<set name="power" val="-1" /> <!-- Land Always -->
 		<set name="reuseDelay" val="40000" />
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="AURA" />
@@ -849,7 +848,6 @@
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
-		<set name="power" val="-1" /> <!-- Land Always -->
 		<set name="reuseDelay" val="6000" />
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="ONE" />

+ 0 - 1
L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml

@@ -2388,7 +2388,6 @@
 		<set name="magicLvl" val="77" />
 		<set name="mpConsume" val="35" />
 		<set name="operateType" val="A3" />
-		<set name="power" val="-1" /> <!-- Land Always -->
 		<set name="reuseDelay" val="900000" />
 		<set name="targetType" val="AURA" />
 		<enchant1 name="effectPoint" val="#ench1EffectPoints" />

+ 5 - 5
L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml

@@ -63,7 +63,7 @@
 				<param RAPIER="#traits" />
 				<param DUALDAGGER="#traits" />
 			</effect>
-			<effect name="TargetMe" />
+			<effect name="GetAgro" />
 		</for>
 		<enchant2for>
 			<effect name="PhysicalAttack" />
@@ -81,7 +81,7 @@
 				<param RAPIER="-20" />
 				<param DUALDAGGER="-20" />
 			</effect>
-			<effect name="TargetMe" />
+			<effect name="GetAgro" />
 		</enchant2for>
 		<enchant3for>
 			<effect name="PhysicalAttack" />
@@ -100,7 +100,7 @@
 				<param RAPIER="-20" />
 				<param DUALDAGGER="-20" />
 			</effect>
-			<effect name="TargetMe" />
+			<effect name="GetAgro" />
 		</enchant3for>
 	</skill>
 	<skill id="401" levels="10" name="Judgment" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
@@ -168,7 +168,7 @@
 				<param RAPIER="#traits" />
 				<param DUALDAGGER="#traits" />
 			</effect>
-			<effect name="TargetMe" />
+			<effect name="GetAgro" />
 		</for>
 		<enchant3for>
 			<effect name="PhysicalAttack" />
@@ -187,7 +187,7 @@
 				<param RAPIER="-20" />
 				<param DUALDAGGER="-20" />
 			</effect>
-			<effect name="TargetMe" />
+			<effect name="GetAgro" />
 		</enchant3for>
 	</skill>
 	<skill id="402" levels="10" name="Arrest" enchantGroup1="1" enchantGroup2="1">

+ 1 - 4
L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml

@@ -1808,7 +1808,6 @@
 		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A2" />
-		<set name="power" val="-1" /> <!-- Land Always -->
 		<set name="reuseDelay" val="6000" />
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="ONE" />
@@ -1834,7 +1833,6 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A2" />
-		<set name="power" val="-1" /> <!-- Land Always -->
 		<set name="reuseDelay" val="40000" />
 		<set name="staticReuse" val="true" />
 		<set name="targetType" val="AURA" />
@@ -1941,7 +1939,7 @@
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect name="TargetMe" />
+			<effect name="GetAgro" />
 		</for>
 	</skill>
 	<skill id="985" levels="1" name="Challenge for Fate">
@@ -1956,7 +1954,6 @@
 		<set name="icon" val="icon.skill0985" />
 		<set name="magicLvl" val="83" />
 		<set name="operateType" val="A2" />
-		<set name="power" val="-1" /> <!-- Land Always -->
 		<set name="reuseDelay" val="45000" />
 		<set name="targetType" val="AREA" />
 		<for>

+ 0 - 1
L2J_DataPack_BETA/dist/game/data/stats/skills/23000-23099.xml

@@ -1159,7 +1159,6 @@
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="A2" />
-		<set name="power" val="-1" /> <!-- Land Always -->
 		<set name="targetType" val="ONE" />
 		<!-- TODO: Add new operate condition check_abnormal -->
 		<for>