From 64c2709bf952e0ec393be4a6df5a26c812758b33 Mon Sep 17 00:00:00 2001
From: Adry85 <adrya85@hotmail.it>
Date: Wed, 4 Oct 2017 19:52:14 +0200
Subject: [PATCH] Added ThrowUp effect parameters.
---
.../scripts/handlers/effecthandlers/ThrowUp.java | 6 +++++-
dist/game/data/stats/skills/04100-04199.xml | 6 +++---
dist/game/data/stats/skills/04600-04699.xml | 6 +++---
dist/game/data/stats/skills/05000-05099.xml | 6 +++---
dist/game/data/stats/skills/05100-05199.xml | 6 +++---
dist/game/data/stats/skills/05200-05299.xml | 6 +++---
dist/game/data/stats/skills/05400-05499.xml | 15 ++++++++-------
7 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java b/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java
index b34a1aefd4..fc79b6854e 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/ThrowUp.java
@@ -35,9 +35,13 @@ import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
*/
public final class ThrowUp extends AbstractEffect
{
+ private final int _flyRadius;
+
public ThrowUp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
+
+ _flyRadius = params.getInt("flyRadius", 0);
}
@Override
@@ -73,7 +77,7 @@ public final class ThrowUp extends AbstractEffect
_log.info("EffectThrow was going to use invalid coordinates for characters, getEffected: " + curX + "," + curY + " and getEffector: " + activeChar.getX() + "," + activeChar.getY());
return;
}
- int offset = Math.min((int) distance + info.getSkill().getFlyRadius(), 1400);
+ int offset = Math.min((int) distance + _flyRadius, 1400);
// approximation for moving futher when z coordinates are different
// TODO: handle Z axis movement better
diff --git a/dist/game/data/stats/skills/04100-04199.xml b/dist/game/data/stats/skills/04100-04199.xml
index c81954ad10..363b0cc2c6 100644
--- a/dist/game/data/stats/skills/04100-04199.xml
+++ b/dist/game/data/stats/skills/04100-04199.xml
@@ -198,8 +198,6 @@
<set name="element" val="0" /> <!-- Fire -->
<set name="elementPower" val="180" />
<set name="fanRange" val="0,180,1500,400" />
- <set name="flyRadius" val="600" />
- <set name="flyType" val="THROW_UP" />
<set name="hitTime" val="4000" />
<set name="icon" val="icon.skill4107" />
<set name="isDebuff" val="true" />
@@ -212,7 +210,9 @@
<effect name="PhysicalAttack">
<param power="28600" />
</effect>
- <effect name="ThrowUp" />
+ <effect name="ThrowUp">
+ <param flyRadius="600" />
+ </effect>
<effect name="Stun" />
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/04600-04699.xml b/dist/game/data/stats/skills/04600-04699.xml
index e2e73f019d..acaac47450 100644
--- a/dist/game/data/stats/skills/04600-04699.xml
+++ b/dist/game/data/stats/skills/04600-04699.xml
@@ -2181,8 +2181,6 @@
<set name="element" val="0" /> <!-- Fire -->
<set name="elementPower" val="180" />
<set name="fanRange" val="0,180,250,500" />
- <set name="flyRadius" val="600" />
- <set name="flyType" val="THROW_UP" />
<set name="hitTime" val="3000" />
<set name="icon" val="icon.skill4688" />
<set name="isDebuff" val="true" />
@@ -2197,7 +2195,9 @@
<param power="27849" />
<param criticalChance="10" />
</effect>
- <effect name="ThrowUp" />
+ <effect name="ThrowUp">
+ <param flyRadius="600" />
+ </effect>
<effect name="Stun" />
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/05000-05099.xml b/dist/game/data/stats/skills/05000-05099.xml
index 3665ed772e..ca65ed5024 100644
--- a/dist/game/data/stats/skills/05000-05099.xml
+++ b/dist/game/data/stats/skills/05000-05099.xml
@@ -85,8 +85,6 @@
<set name="effectPoint" val="-100" />
<set name="element" val="5" /> <!-- Dark -->
<set name="elementPower" val="180" />
- <set name="flyRadius" val="300" />
- <set name="flyType" val="THROW_UP" />
<set name="hitTime" val="5800" />
<set name="icon" val="icon.skill0100" />
<set name="isDebuff" val="true" />
@@ -99,7 +97,9 @@
<effect name="PhysicalAttack">
<param power="5964" />
</effect>
- <effect name="ThrowUp" />
+ <effect name="ThrowUp">
+ <param flyRadius="300" />
+ </effect>
<effect name="Stun" />
</effects>
</skill>
diff --git a/dist/game/data/stats/skills/05100-05199.xml b/dist/game/data/stats/skills/05100-05199.xml
index a570b7d164..565263cbc0 100644
--- a/dist/game/data/stats/skills/05100-05199.xml
+++ b/dist/game/data/stats/skills/05100-05199.xml
@@ -1750,8 +1750,6 @@
<!-- Confirmed CT2.5 -->
<set name="affectRange" val="300" />
<set name="effectPoint" val="-100" />
- <set name="flyRadius" val="300" />
- <set name="flyType" val="THROW_UP" />
<set name="icon" val="icon.skill0100" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
@@ -1759,7 +1757,9 @@
<set name="targetType" val="AURA" />
<set name="trait" val="SHOCK" />
<effects>
- <effect name="ThrowUp" />
+ <effect name="ThrowUp">
+ <param flyRadius="300" />
+ </effect>
</effects>
</skill>
<skill id="5184" levels="1" name="Production: Valakas Dragon Breath">
diff --git a/dist/game/data/stats/skills/05200-05299.xml b/dist/game/data/stats/skills/05200-05299.xml
index 610628da76..c413936395 100644
--- a/dist/game/data/stats/skills/05200-05299.xml
+++ b/dist/game/data/stats/skills/05200-05299.xml
@@ -604,8 +604,6 @@
<set name="castRange" val="600" />
<set name="effectPoint" val="-100" />
<set name="effectRange" val="1100" />
- <set name="flyRadius" val="300" />
- <set name="flyType" val="THROW_UP" />
<set name="hitTime" val="2800" />
<set name="icon" val="icon.skill0100" />
<set name="isDebuff" val="true" />
@@ -622,7 +620,9 @@
<param criticalChance="20" />
</effect>
<effect name="Stun" />
- <effect name="ThrowUp" />
+ <effect name="ThrowUp">
+ <param flyRadius="300" />
+ </effect>
</effects>
</skill>
<skill id="5230" levels="1" name="Stun">
diff --git a/dist/game/data/stats/skills/05400-05499.xml b/dist/game/data/stats/skills/05400-05499.xml
index f41b64f2df..30f8764fef 100644
--- a/dist/game/data/stats/skills/05400-05499.xml
+++ b/dist/game/data/stats/skills/05400-05499.xml
@@ -14,14 +14,13 @@
<set name="targetType" val="ONE" />
</skill>
<skill id="5401" levels="1" name="Stun">
- <!-- Temporarily gets thrown into a state of shock and immobilized. -->
+ <!-- High Five Confirmed -->
<set name="abnormalLvl" val="1" />
<set name="abnormalTime" val="2" />
<set name="abnormalType" val="FLY_AWAY" />
<set name="affectRange" val="300" />
+ <set name="affectScope" val="POINT_BLANK" />
<set name="effectPoint" val="-100" />
- <set name="flyRadius" val="300" />
- <set name="flyType" val="THROW_UP" />
<set name="hitTime" val="5800" />
<set name="icon" val="icon.skill0100" />
<set name="isDebuff" val="true" />
@@ -31,7 +30,9 @@
<set name="targetType" val="AURA" />
<set name="trait" val="SHOCK" />
<effects>
- <effect name="ThrowUp" />
+ <effect name="ThrowUp">
+ <param flyRadius="300" />
+ </effect>
<effect name="Stun" />
</effects>
</skill>
@@ -1290,14 +1291,14 @@
<skill id="5494" levels="1" name="Gust">
<!-- Confirmed CT2.5 -->
<set name="effectPoint" val="1" />
- <set name="flyRadius" val="300" />
- <set name="flyType" val="THROW_UP" />
<set name="magicLvl" val="86" />
<set name="operateType" val="A1" />
<set name="rideState" val="NONE" />
<set name="targetType" val="SELF" />
<effects>
- <effect name="ThrowUp" />
+ <effect name="ThrowUp">
+ <param flyRadius="300" />
+ </effect>
</effects>
</skill>
<skill id="5495" levels="1" name="Bleed">
--
GitLab