diff --git a/dist/game/data/scripts/handlers/EffectMasterHandler.java b/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 6c6b0ca52e4f37bdecb2d59cc34f936e52aa0456..2b140d27b4c87e9d4ad95dab2a0c6bc668d629ee 100644
--- a/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -82,7 +82,6 @@ public final class EffectMasterHandler
DispelBySlot.class,
DispelBySlotProbability.class,
EnableCloak.class,
- EnemyCharge.class,
EnergyAttack.class,
Escape.class,
FakeDeath.class,
@@ -90,6 +89,7 @@ public final class EffectMasterHandler
Fear.class,
Fishing.class,
Flag.class,
+ FlySelf.class,
FocusEnergy.class,
FocusMaxEnergy.class,
FocusSouls.class,
diff --git a/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java b/dist/game/data/scripts/handlers/effecthandlers/FlySelf.java
similarity index 91%
rename from dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java
rename to dist/game/data/scripts/handlers/effecthandlers/FlySelf.java
index 8f083dcd0d6038b49ad7912becfc132ce6e61366..b7b693b6cf33b35d1d77398e38e88cb7d6ae0cbf 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/EnemyCharge.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/FlySelf.java
@@ -30,13 +30,13 @@ import com.l2jserver.gameserver.network.serverpackets.FlyToLocation.FlyType;
import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
/**
- * Enemy Charge effect implementation.
+ * Fly Self effect implementation.
*/
-public final class EnemyCharge extends AbstractEffect
+public final class FlySelf extends AbstractEffect
{
private final int _flyRadius;
- public EnemyCharge(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
+ public FlySelf(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
diff --git a/dist/game/data/stats/skills/00400-00499.xml b/dist/game/data/stats/skills/00400-00499.xml
index 8ee3054460d019a1486872e9ba0e379e71dc750f..f05ce73baeb3ff3b530944a8d1f48fecfa76ed48 100644
--- a/dist/game/data/stats/skills/00400-00499.xml
+++ b/dist/game/data/stats/skills/00400-00499.xml
@@ -2873,7 +2873,6 @@
<set name="coolTime" val="200" />
<set name="effectPoint" val="-303" />
<set name="effectRange" val="600" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0484" />
<set name="magicLvl" val="32" />
@@ -2888,11 +2887,6 @@
<target mindistance="200" />
</and>
</cond>
- <effects>
- <effect name="EnemyCharge">
- <param flyRadius="200" />
- </effect>
- </effects>
</skill>
<skill id="485" levels="7" name="Disarm" enchantGroup1="1" enchantGroup2="1">
<!-- Confirmed CT2.5 -->
@@ -3125,7 +3119,6 @@
<set name="coolTime" val="200" />
<set name="effectPoint" val="#effectPoints" />
<set name="effectRange" val="#effectRange" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0493" />
<set name="magicLvl" val="#magicLvl" />
@@ -3208,7 +3201,6 @@
<set name="coolTime" val="200" />
<set name="effectPoint" val="#effectPoints" />
<set name="effectRange" val="#effectRange" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0494" />
<set name="isDebuff" val="true" />
@@ -3250,18 +3242,12 @@
<param power="1" />
</effect>
<effect name="Stun" />
- <effect name="EnemyCharge">
- <param flyRadius="200" />
- </effect>
</effects>
<enchant1Effects>
<effect name="PhysicalSoulAttack">
<param power="#ench1Power" />
</effect>
<effect name="Stun" />
- <effect name="EnemyCharge">
- <param flyRadius="200" />
- </effect>
</enchant1Effects>
<enchant7Effects>
</enchant7Effects>
@@ -3270,18 +3256,12 @@
<param power="#ench7Duel" />
</effect>
<effect name="Stun" />
- <effect name="EnemyCharge">
- <param flyRadius="200" />
- </effect>
</enchant7pvpEffects>
<enchant7pveEffects>
<effect name="PhysicalSoulAttack">
<param power="1" />
</effect>
<effect name="Stun" />
- <effect name="EnemyCharge">
- <param flyRadius="200" />
- </effect>
</enchant7pveEffects>
</skill>
<skill id="495" levels="10" name="Blade Rush" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
@@ -3311,7 +3291,6 @@
<set name="effectPoint" val="#effectPoints" />
<set name="effectRange" val="#effectRange" />
<set name="fanRange" val="0,0,300,100" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0495" />
<set name="isDebuff" val="true" />
diff --git a/dist/game/data/stats/skills/00500-00599.xml b/dist/game/data/stats/skills/00500-00599.xml
index e50cbcb8fb21c0c87d4e73f74b3544f45d18b497..2c09e413a8aacb2060b627a3827526da6b4b202f 100644
--- a/dist/game/data/stats/skills/00500-00599.xml
+++ b/dist/game/data/stats/skills/00500-00599.xml
@@ -1593,7 +1593,6 @@
<set name="coolTime" val="200" />
<set name="effectPoint" val="-676" />
<set name="effectRange" val="600" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0540" />
<set name="magicLvl" val="79" />
diff --git a/dist/game/data/stats/skills/00600-00699.xml b/dist/game/data/stats/skills/00600-00699.xml
index 2087e78351133bd9f9f68cbec0c93eaf99485c2b..25cd109cd592d6f94bf92005659081a25edfc41b 100644
--- a/dist/game/data/stats/skills/00600-00699.xml
+++ b/dist/game/data/stats/skills/00600-00699.xml
@@ -541,7 +541,6 @@
<!-- High Five Confirmed -->
<set name="affectScope" val="SINGLE" />
<set name="coolTime" val="200" />
- <set name="flyType" val="DUMMY" />
<set name="hitTime" val="100" />
<set name="icon" val="icon.skill0484" />
<set name="isMagic" val="1" />
diff --git a/dist/game/data/stats/skills/00700-00799.xml b/dist/game/data/stats/skills/00700-00799.xml
index 429bb40543377e106b1d3f61529ba26f07895ed5..0924674999d9176fe2cfcb3776c0e583ec2b7f3b 100644
--- a/dist/game/data/stats/skills/00700-00799.xml
+++ b/dist/game/data/stats/skills/00700-00799.xml
@@ -2570,7 +2570,6 @@
<set name="effectPoint" val="-669" />
<set name="effectRange" val="800" />
<set name="fanRange" val="0,0,600,60" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0793" />
<set name="isDebuff" val="true" />
diff --git a/dist/game/data/stats/skills/00800-00899.xml b/dist/game/data/stats/skills/00800-00899.xml
index 4e42dbc755bad52d74b8512e86e4ff082307af3f..348e52623f847a98689b4582bea1aeb7cc42d3be 100644
--- a/dist/game/data/stats/skills/00800-00899.xml
+++ b/dist/game/data/stats/skills/00800-00899.xml
@@ -1911,7 +1911,6 @@
<set name="castRange" val="2500" />
<set name="coolTime" val="200" />
<set name="effectPoint" val="-1378" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill_transform_etc" />
<set name="magicLvl" val="#magicLvl" />
@@ -1938,7 +1937,6 @@
<set name="affectScope" val="POINT_BLANK" />
<set name="coolTime" val="200" />
<set name="effectPoint" val="-659" />
- <set name="flyType" val="DUMMY" />
<set name="hitTime" val="100" />
<set name="icon" val="icon.skill_transform_etc" />
<set name="magicLvl" val="75" />
diff --git a/dist/game/data/stats/skills/00900-00999.xml b/dist/game/data/stats/skills/00900-00999.xml
index 5055b7421ac140c61b24a51bd986779ce125b995..b8a663370282bc4e09be85e8ebed2a10f72dcb69 100644
--- a/dist/game/data/stats/skills/00900-00999.xml
+++ b/dist/game/data/stats/skills/00900-00999.xml
@@ -1313,7 +1313,6 @@
<set name="coolTime" val="200" />
<set name="effectPoint" val="-676" />
<set name="effectRange" val="600" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0540" />
<set name="magicLvl" val="#magicLvl" />
@@ -1980,7 +1979,6 @@
<set name="coolTime" val="200" />
<set name="effectPoint" val="#effectPoints" />
<set name="effectRange" val="800" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0494" />
<set name="isDebuff" val="true" />
@@ -2002,9 +2000,6 @@
<param power="1" />
</effect>
<effect name="Stun" />
- <effect name="EnemyCharge">
- <param flyRadius="200" />
- </effect>
</effects>
</skill>
<skill id="979" levels="6" name="Aggression">
@@ -2444,7 +2439,6 @@
<set name="coolTime" val="200" />
<set name="effectPoint" val="-379" />
<set name="effectRange" val="600" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0484" />
<set name="magicLvl" val="40" />
@@ -2460,11 +2454,6 @@
<target mindistance="200" />
</and>
</cond>
- <effects>
- <effect name="EnemyCharge">
- <param flyRadius="200" />
- </effect>
- </effects>
</skill>
<skill id="995" levels="1" name="Rush Impact">
<!-- High Five Confirmed -->
@@ -2481,7 +2470,6 @@
<set name="effectPoint" val="-681" />
<set name="effectRange" val="800" />
<set name="fanRange" val="0,0,600,60" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0793" />
<set name="isDebuff" val="true" />
@@ -2587,7 +2575,6 @@
<set name="coolTime" val="200" />
<set name="effectPoint" val="-630" />
<set name="effectRange" val="600" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill0998" />
<set name="magicLvl" val="40" />
@@ -2603,10 +2590,5 @@
<target mindistance="200" />
</and>
</cond>
- <effects>
- <effect name="EnemyCharge">
- <param flyRadius="200" />
- </effect>
- </effects>
</skill>
</list>
diff --git a/dist/game/data/stats/skills/01400-01499.xml b/dist/game/data/stats/skills/01400-01499.xml
index f038f84f1a9496a03fa4c8a053255532ec18cd6f..f03c51a80591d4d3f6b6a71609dfb608a73f89c2 100644
--- a/dist/game/data/stats/skills/01400-01499.xml
+++ b/dist/game/data/stats/skills/01400-01499.xml
@@ -1830,7 +1830,6 @@
<set name="basicProperty" val="CON" />
<set name="coolTime" val="200" />
<set name="effectPoint" val="-575" />
- <set name="flyType" val="DUMMY" />
<set name="hitTime" val="300" />
<set name="icon" val="icon.skill1448" />
<set name="isDebuff" val="true" />
diff --git a/dist/game/data/stats/skills/04100-04199.xml b/dist/game/data/stats/skills/04100-04199.xml
index 3d5f6c4e70900fb1821e9409f2dbb86ebd21d884..94314d8b0ef582f2665c36737a77a91876b73e65 100644
--- a/dist/game/data/stats/skills/04100-04199.xml
+++ b/dist/game/data/stats/skills/04100-04199.xml
@@ -200,7 +200,6 @@
<set name="element" val="0" /> <!-- Fire -->
<set name="elementPower" val="180" />
<set name="fanRange" val="0,180,1500,400" />
- <set name="flyType" val="THROW_UP" />
<set name="hitTime" val="4000" />
<set name="icon" val="icon.skill4107" />
<set name="isDebuff" val="true" />
diff --git a/dist/game/data/stats/skills/04600-04699.xml b/dist/game/data/stats/skills/04600-04699.xml
index 8aa1004207a6c2b38f4d2004418f0e204a340639..11ce15dbf16e2b437cce6dc199107953d555f89d 100644
--- a/dist/game/data/stats/skills/04600-04699.xml
+++ b/dist/game/data/stats/skills/04600-04699.xml
@@ -2192,7 +2192,6 @@
<set name="element" val="0" /> <!-- Fire -->
<set name="elementPower" val="180" />
<set name="fanRange" val="0,180,250,500" />
- <set name="flyType" val="THROW_UP" />
<set name="hitTime" val="3000" />
<set name="icon" val="icon.skill4688" />
<set name="isDebuff" val="true" />
diff --git a/dist/game/data/stats/skills/05000-05099.xml b/dist/game/data/stats/skills/05000-05099.xml
index 7cfa4e77ec780b0e3dd84cfa8fd3f471ce6ee515..b9e53983cf671a0e9cb7693165759910d83db778 100644
--- a/dist/game/data/stats/skills/05000-05099.xml
+++ b/dist/game/data/stats/skills/05000-05099.xml
@@ -85,7 +85,6 @@
<set name="effectPoint" val="-100" />
<set name="element" val="5" /> <!-- Dark -->
<set name="elementPower" val="180" />
- <set name="flyType" val="THROW_UP" />
<set name="hitTime" val="5800" />
<set name="icon" val="icon.skill0100" />
<set name="isDebuff" val="true" />
@@ -338,7 +337,6 @@
<set name="element" val="5" /> <!-- Dark -->
<set name="elementPower" val="180" />
<set name="fanRange" val="#fanRange" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="1500" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
@@ -351,7 +349,7 @@
<effect name="PhysicalAttack">
<param power="#power" />
</effect>
- <effect name="EnemyCharge">
+ <effect name="FlySelf">
<param flyRadius="#radius" />
</effect>
</effects>
diff --git a/dist/game/data/stats/skills/05100-05199.xml b/dist/game/data/stats/skills/05100-05199.xml
index 7222447b085095c3a1773f9ddb1e5478247419ee..5c4679ad391d0c92a5c15ebe7ecf05c8646374d8 100644
--- a/dist/game/data/stats/skills/05100-05199.xml
+++ b/dist/game/data/stats/skills/05100-05199.xml
@@ -1764,7 +1764,6 @@
<!-- Confirmed CT2.5 -->
<set name="affectRange" val="300" />
<set name="effectPoint" val="-100" />
- <set name="flyType" val="THROW_UP" />
<set name="icon" val="icon.skill0100" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
diff --git a/dist/game/data/stats/skills/05200-05299.xml b/dist/game/data/stats/skills/05200-05299.xml
index e4314ddc24bd1edcdb39590b09302140c8c1af64..f5772940316fdd0bd9c1903ace3976772630045f 100644
--- a/dist/game/data/stats/skills/05200-05299.xml
+++ b/dist/game/data/stats/skills/05200-05299.xml
@@ -606,7 +606,6 @@
<set name="castRange" val="600" />
<set name="effectPoint" val="-100" />
<set name="effectRange" val="1100" />
- <set name="flyType" val="THROW_UP" />
<set name="hitTime" val="2800" />
<set name="icon" val="icon.skill0100" />
<set name="isDebuff" val="true" />
diff --git a/dist/game/data/stats/skills/05400-05499.xml b/dist/game/data/stats/skills/05400-05499.xml
index 923084e67be1dec5e7c9c947b0a8c60d048c5e13..30f8764fefb2f2b62fa882404224fe4f110aa1a7 100644
--- a/dist/game/data/stats/skills/05400-05499.xml
+++ b/dist/game/data/stats/skills/05400-05499.xml
@@ -21,7 +21,6 @@
<set name="affectRange" val="300" />
<set name="affectScope" val="POINT_BLANK" />
<set name="effectPoint" val="-100" />
- <set name="flyType" val="THROW_UP" />
<set name="hitTime" val="5800" />
<set name="icon" val="icon.skill0100" />
<set name="isDebuff" val="true" />
@@ -1292,7 +1291,6 @@
<skill id="5494" levels="1" name="Gust">
<!-- Confirmed CT2.5 -->
<set name="effectPoint" val="1" />
- <set name="flyType" val="THROW_UP" />
<set name="magicLvl" val="86" />
<set name="operateType" val="A1" />
<set name="rideState" val="NONE" />
diff --git a/dist/game/data/stats/skills/06000-06099.xml b/dist/game/data/stats/skills/06000-06099.xml
index a58c4a2972722fe2f39c774a78ab407c2bc6a20e..7d18b75e3056a1222804a6042e550dacda5cab11 100644
--- a/dist/game/data/stats/skills/06000-06099.xml
+++ b/dist/game/data/stats/skills/06000-06099.xml
@@ -413,7 +413,6 @@
<set name="coolTime" val="200" />
<set name="effectPoint" val="-679" />
<set name="effectRange" val="600" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="800" />
<set name="icon" val="icon.skill6041" />
<set name="magicLvl" val="81" />
@@ -429,9 +428,6 @@
<effect name="PhysicalAttack">
<param power="2372" />
</effect>
- <effect name="EnemyCharge">
- <param flyRadius="200" />
- </effect>
</effects>
</skill>
<skill id="6042" levels="1" name="Phoenix Cleanse">
diff --git a/dist/game/data/stats/skills/06200-06299.xml b/dist/game/data/stats/skills/06200-06299.xml
index 65d81c758d76c717db56842423fc43c73ce18aa8..bc46d7fd4187658b001de4f8cc88be72b7cae90d 100644
--- a/dist/game/data/stats/skills/06200-06299.xml
+++ b/dist/game/data/stats/skills/06200-06299.xml
@@ -1298,7 +1298,6 @@
<set name="effectRange" val="1100" />
<set name="element" val="1" /> <!-- Water -->
<set name="elementPower" val="20" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="500" />
<set name="magicLvl" val="85" />
<set name="mpConsume1" val="20" />
@@ -1313,9 +1312,6 @@
<effect name="PhysicalAttack">
<param power="4563" />
</effect>
- <effect name="EnemyCharge">
- <param flyRadius="250" />
- </effect>
</effects>
</skill>
<skill id="6293" levels="1" name="Power Strike">
@@ -1387,7 +1383,6 @@
<set name="effectRange" val="1100" />
<set name="element" val="1" /> <!-- Water -->
<set name="elementPower" val="20" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="500" />
<set name="magicLvl" val="85" />
<set name="mpConsume1" val="20" />
@@ -1402,9 +1397,6 @@
<effect name="PhysicalAttack">
<param power="4563" />
</effect>
- <effect name="EnemyCharge">
- <param flyRadius="250" />
- </effect>
</effects>
</skill>
<skill id="6297" levels="1" name="Cylinder Throw">
diff --git a/dist/game/data/stats/skills/06600-06699.xml b/dist/game/data/stats/skills/06600-06699.xml
index a15f9698b3f28ba6ab58b5b385dee8a988dd8ba0..d52411a9e423d8d13264ee16737cff49489dd026 100644
--- a/dist/game/data/stats/skills/06600-06699.xml
+++ b/dist/game/data/stats/skills/06600-06699.xml
@@ -678,7 +678,6 @@
<set name="effectRange" val="900" />
<set name="element" val="0" /> <!-- Fire -->
<set name="elementPower" val="20" />
- <set name="flyType" val="CHARGE" />
<set name="hitTime" val="500" />
<set name="magicLvl" val="85" />
<set name="mpConsume2" val="83" />
@@ -693,9 +692,6 @@
<effect name="PhysicalAttack">
<param power="2319" />
</effect>
- <effect name="EnemyCharge">
- <param flyRadius="200" />
- </effect>
</effects>
</skill>
<skill id="6643" levels="1" name="Holy Strike">
diff --git a/dist/game/data/stats/skills/07000-07099.xml b/dist/game/data/stats/skills/07000-07099.xml
index 23042400788d3dca16eed6cf8c88991db214cd34..beed03f3d089dd7e80c7b98927cda22c5621db13 100644
--- a/dist/game/data/stats/skills/07000-07099.xml
+++ b/dist/game/data/stats/skills/07000-07099.xml
@@ -1164,7 +1164,6 @@
<set name="affectScope" val="RANGE" />
<set name="basicProperty" val="CON" />
<set name="coolTime" val="200" />
- <set name="flyType" val="DUMMY" />
<set name="hitTime" val="300" />
<set name="isMagic" val="1" />
<set name="lvlBonusRate" val="1" />
diff --git a/dist/game/data/xsd/skills.xsd b/dist/game/data/xsd/skills.xsd
index bee3f81315e42800de761654934bb4bef326997c..59cdfb73f8c5126c18dfc5ede4e51ff1a48bfcf2 100644
--- a/dist/game/data/xsd/skills.xsd
+++ b/dist/game/data/xsd/skills.xsd
@@ -40,7 +40,6 @@
<xs:enumeration value="elementPower" />
<xs:enumeration value="excludedFromCheck" />
<xs:enumeration value="fanRange" />
- <xs:enumeration value="flyType" />
<xs:enumeration value="hitTime" />
<xs:enumeration value="hpConsume" />
<xs:enumeration value="icon" />
@@ -540,7 +539,6 @@
<xs:enumeration value="DispelBySlot" />
<xs:enumeration value="DispelBySlotProbability" />
<xs:enumeration value="EnableCloak" />
- <xs:enumeration value="EnemyCharge" />
<xs:enumeration value="EnergyAttack" />
<xs:enumeration value="Escape" />
<xs:enumeration value="FakeDeath" />
@@ -548,6 +546,7 @@
<xs:enumeration value="Fear" />
<xs:enumeration value="Fishing" />
<xs:enumeration value="Flag" />
+ <xs:enumeration value="FlySelf" />
<xs:enumeration value="FocusEnergy" />
<xs:enumeration value="FocusMaxEnergy" />
<xs:enumeration value="FocusSouls" />