Parcourir la source

BETA: Datapack part for [L5966]:
* Now "infinite" ticks are represented with count="-1" instead of count="0x7fffffff", better implementation will be done later.
* Reverting classpath "update".

Zoey76 il y a 12 ans
Parent
commit
94fc583065
19 fichiers modifiés avec 83 ajouts et 83 suppressions
  1. 8 8
      L2J_DataPack_BETA/.classpath
  2. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChanceSkillTrigger.java
  3. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java
  4. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/IncreaseCharges.java
  5. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetAntiSummon.java
  6. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java
  7. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetNoise.java
  8. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml
  9. 2 2
      L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml
  10. 10 10
      L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
  11. 23 23
      L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml
  12. 10 10
      L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
  13. 3 3
      L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
  14. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
  15. 2 2
      L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml
  16. 4 4
      L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml
  17. 7 7
      L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml
  18. 3 3
      L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml
  19. 3 3
      L2J_DataPack_BETA/dist/game/data/stats/skills/05200-05299.xml

+ 8 - 8
L2J_DataPack_BETA/.classpath

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" path="dist/game/data/scripts"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/L2J_Server_BETA3"/>
-	<classpathentry kind="lib" path="/L2J_Server_BETA3/dist/libs/javolution-5.5.1.jar" sourcepath="/L2J_Server_BETA3/dist/libs/javolution-5.5.1-src.zip"/>
-	<classpathentry kind="lib" path="/L2J_Server_BETA3/dist/libs/mmocore.jar"/>
-	<classpathentry kind="lib" path="/L2J_Server_BETA3/dist/libs/netcon-1.7.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+	<classpathentry including="**/*.java" kind="src" path="dist/game/data/scripts" />
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
+	<classpathentry combineaccessrules="false" kind="src" path="/L2J_Server_BETA" />
+	<classpathentry kind="lib" path="/L2J_Server_BETA/dist/libs/javolution-5.5.1.jar" />
+	<classpathentry kind="lib" path="/L2J_Server_BETA/dist/libs/mmocore.jar" />
+	<classpathentry kind="lib" path="/L2J_Server_BETA/dist/libs/netcon-1.7.jar" />
+	<classpathentry kind="output" path="bin" />
+</classpath>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChanceSkillTrigger.java

@@ -67,7 +67,7 @@ public class ChanceSkillTrigger extends L2Effect
 	public void onExit()
 	{
 		// trigger only if effect in use and successfully ticked to the end
-		if (isInUse() && (getCount() == 0))
+		if (isInUse() && (getTickCount() == 0))
 		{
 			getEffected().onExitChanceEffect(getSkill().getElement());
 		}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java

@@ -55,7 +55,7 @@ public class HealOverTime extends L2Effect
 	{
 		if (getEffected().isPlayer())
 		{
-			getEffected().sendPacket(new ExRegMax(calc(), getTotalCount() * getAbnormalTime(), getAbnormalTime()));
+			getEffected().sendPacket(new ExRegMax(calc(), getTickCount() * getAbnormalTime(), getAbnormalTime()));
 		}
 		return true;
 	}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/IncreaseCharges.java

@@ -54,7 +54,7 @@ public class IncreaseCharges extends L2Effect
 			return false;
 		}
 		
-		getEffected().getActingPlayer().increaseCharges((int) calc(), getCount());
+		getEffected().getActingPlayer().increaseCharges((int) calc(), getTickCount());
 		return true;
 	}
 	

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetAntiSummon.java

@@ -57,7 +57,7 @@ public class SignetAntiSummon extends L2Effect
 	@Override
 	public boolean onActionTime()
 	{
-		if (getCount() == (getTotalCount() - 1))
+		if (getTickCount() == (getTotalTickCount() - 1))
 		{
 			return true; // do nothing first time
 		}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java

@@ -102,7 +102,7 @@ public class SignetMDam extends L2Effect
 	@Override
 	public boolean onActionTime()
 	{
-		if (getCount() >= (getTotalCount() - 2))
+		if (getTickCount() >= (getTotalTickCount() - 2))
 		{
 			return true; // do nothing first 2 times
 		}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetNoise.java

@@ -56,7 +56,7 @@ public class SignetNoise extends L2Effect
 	@Override
 	public boolean onActionTime()
 	{
-		if (getCount() == (getTotalCount() - 1))
+		if (getTickCount() == (getTotalTickCount() - 1))
 		{
 			return true; // do nothing first time
 		}

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

@@ -1383,7 +1383,7 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<!-- retail value: 10MP/sec; stat update every 3 sec -->
-			<effect count="0x7fffffff" name="FakeDeath" val="30" />
+			<effect count="-1" name="FakeDeath" val="30" />
 		</for>
 	</skill>
 	<skill id="61" levels="3" name="Cure Bleeding">

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml

@@ -1372,7 +1372,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<add order="0x40" stat="holyPower" val="10" />
 			</effect>
 		</for>
@@ -1387,7 +1387,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<add order="0x40" stat="darkRes" val="#darkRes" />
 			</effect>
 		</for>

+ 10 - 10
L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml

@@ -343,13 +343,13 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
 			<!-- 9MP * 5 during active time -->
-			<effect count="0x7fffffff" name="SilentMove" abnormalVisualEffect="stealth" val="45">
+			<effect count="-1" name="SilentMove" abnormalVisualEffect="stealth" val="45">
 				<mul order="0x30" stat="runSpd" val="0.6" />
 			</effect>
 		</for>
 		<enchant1for>
 			<!-- 9MP * 5 during active time -->
-			<effect count="0x7fffffff" name="SilentMove" abnormalVisualEffect="stealth" val="45">
+			<effect count="-1" name="SilentMove" abnormalVisualEffect="stealth" val="45">
 				<mul order="0x30" stat="runSpd" val="#ench1Penalty" />
 			</effect>
 		</enchant1for>
@@ -363,7 +363,7 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<!-- 12HP * 2 during active time -->
-			<effect count="0x7fffffff" name="DamOverTime" val="24">
+			<effect count="-1" name="DamOverTime" val="24">
 				<mul order="0x30" stat="pAtkSpd" val="1.25" />
 			</effect>
 		</for>
@@ -438,7 +438,7 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<!-- retail value: 1MP/sec; stat update every 2 sec -->
-			<effect count="0x7fffffff" name="Relax" val="2">
+			<effect count="-1" name="Relax" val="2">
 				<add order="0x40" stat="regHp" val="5" />
 			</effect>
 		</for>
@@ -1177,12 +1177,12 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.2">
+			<effect count="-1" name="MpConsumePerLevel" val="0.2">
 				<add order="0x40" stat="accCombat" val="3" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="#ench1val">
+			<effect count="-1" name="MpConsumePerLevel" val="#ench1val">
 				<add order="0x40" stat="accCombat" val="3" />
 			</effect>
 		</enchant1for>
@@ -2400,19 +2400,19 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="1">
+			<effect count="-1" name="MpConsumePerLevel" val="1">
 				<add order="0x40" stat="pDef" val="#pDef" />
 				<mul order="0x30" stat="rShld" val="1.5" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="1">
+			<effect count="-1" name="MpConsumePerLevel" val="1">
 				<add order="0x40" stat="pDef" val="#ench1pDef" />
 				<mul order="0x30" stat="rShld" val="1.5" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="#ench2val">
+			<effect count="-1" name="MpConsumePerLevel" val="#ench2val">
 				<add order="0x40" stat="pDef" val="256" />
 				<mul order="0x30" stat="rShld" val="1.5" />
 			</effect>
@@ -2591,7 +2591,7 @@
 		<for>
 			<!-- retail value: 2MP/sec; stat update every 3 sec -->
 			<!-- Verified by slyce - Interlude - 12th Aug 2007 -->
-			<effect count="0x7fffffff" name="ChameleonRest" abnormalVisualEffect="stealth" val="6" />
+			<effect count="-1" name="ChameleonRest" abnormalVisualEffect="stealth" val="6" />
 		</for>
 	</skill>
 	<skill id="297" levels="2" name="Duelist Spirit" enchantGroup1="1" enchantGroup2="1">

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

@@ -435,17 +435,17 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.8">
+			<effect count="-1" name="MpConsumePerLevel" val="0.8">
 				<add order="0x40" stat="cAtkAdd" val="#crit" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.8">
+			<effect count="-1" name="MpConsumePerLevel" val="0.8">
 				<add order="0x40" stat="cAtkAdd" val="#ench1crit" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="#ench2val">
+			<effect count="-1" name="MpConsumePerLevel" val="#ench2val">
 				<add order="0x40" stat="cAtkAdd" val="609" />
 			</effect>
 		</enchant2for>
@@ -640,7 +640,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<mul order="0x30" stat="cAtk" val="#cAtk">
 					<using kind="Pole" />
 				</mul>
@@ -661,13 +661,13 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<mul order="0x30" stat="sDef" val="0.7" />
 				<set order="0x10" stat="shieldDefAngle" val="360" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<mul order="0x30" stat="sDef" val="#ench1sDef" />
 				<set order="0x10" stat="shieldDefAngle" val="360" />
 			</effect>
@@ -795,17 +795,17 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpConsume" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.4">
+			<effect count="-1" name="MpConsumePerLevel" val="0.4">
 				<add order="0x40" stat="sDef" val="#sDef" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.4">
+			<effect count="-1" name="MpConsumePerLevel" val="0.4">
 				<add order="0x40" stat="sDef" val="#ench1sDef" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="#ench2val">
+			<effect count="-1" name="MpConsumePerLevel" val="#ench2val">
 				<add order="0x40" stat="sDef" val="560" />
 			</effect>
 		</enchant2for>
@@ -1014,7 +1014,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="1">
+			<effect count="-1" name="MpConsumePerLevel" val="1">
 				<mul order="0x30" stat="skillMastery" val="2" />
 			</effect>
 		</for>
@@ -1030,19 +1030,19 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.5">
+			<effect count="-1" name="MpConsumePerLevel" val="0.5">
 				<sub order="0x40" stat="paralyzeVuln" val="30" />
 				<sub order="0x40" stat="stunVuln" val="30" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.5">
+			<effect count="-1" name="MpConsumePerLevel" val="0.5">
 				<sub order="0x40" stat="paralyzeVuln" val="30" />
 				<sub order="0x40" stat="stunVuln" val="#enchVuln" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.5">
+			<effect count="-1" name="MpConsumePerLevel" val="0.5">
 				<sub order="0x40" stat="paralyzeVuln" val="#enchVuln" />
 				<sub order="0x40" stat="stunVuln" val="30" />
 			</effect>
@@ -1059,13 +1059,13 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
 			<!-- Retail Values CT2.3: 50HP * 3 Sec -->
-			<effect count="0x7fffffff" name="DamOverTime" val="150">
+			<effect count="-1" name="DamOverTime" val="150">
 				<mul order="0x30" stat="mAtkSpd" val="0.9" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="0.7" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="DamOverTime" val="150">
+			<effect count="-1" name="DamOverTime" val="150">
 				<mul order="0x30" stat="mAtkSpd" val="0.9" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="#ench1mpConsume" />
 			</effect>
@@ -1082,13 +1082,13 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
 			<!-- Retail Values CT2.3: 50HP * 3 Sec -->
-			<effect count="0x7fffffff" name="DamOverTime" val="150">
+			<effect count="-1" name="DamOverTime" val="150">
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
 				<mul order="0x30" stat="mAtk" val="1.3" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="DamOverTime" val="150">
+			<effect count="-1" name="DamOverTime" val="150">
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
 				<mul order="0x30" stat="mAtk" val="#ench1mAtk" />
 			</effect>
@@ -1107,21 +1107,21 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<for>
 			<!-- Retail Values CT2.3: 50HP * 3 Sec -->
-			<effect count="0x7fffffff" name="DamOverTime" val="150">
+			<effect count="-1" name="DamOverTime" val="150">
 				<mul order="0x30" stat="mAtkSpd" val="1.2" />
 				<mul order="0x30" stat="mReuse" val="0.9" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="DamOverTime" val="150">
+			<effect count="-1" name="DamOverTime" val="150">
 				<mul order="0x30" stat="mAtkSpd" val="#ench1mAtkSpd" />
 				<mul order="0x30" stat="mReuse" val="0.9" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect count="0x7fffffff" name="DamOverTime" val="150">
+			<effect count="-1" name="DamOverTime" val="150">
 				<mul order="0x30" stat="mAtkSpd" val="1.2" />
 				<mul order="0x30" stat="mReuse" val="#ench2mReuse" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
@@ -1138,7 +1138,7 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.5">
+			<effect count="-1" name="MpConsumePerLevel" val="0.5">
 				<mul order="0x30" stat="pDef" val="1.25" />
 				<mul order="0x30" stat="mDef" val="1.25" />
 				<mul order="0x30" stat="pAtkSpd" val="0.8" />
@@ -1147,7 +1147,7 @@
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.5">
+			<effect count="-1" name="MpConsumePerLevel" val="0.5">
 				<mul order="0x30" stat="pDef" val="#enchDef" />
 				<mul order="0x30" stat="mDef" val="#enchDef" />
 				<mul order="0x30" stat="pAtkSpd" val="0.8" />
@@ -1163,7 +1163,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.5">
+			<effect count="-1" name="MpConsumePerLevel" val="0.5">
 				<add order="0x40" stat="reflectDam" val="30" />
 				<add order="0x40" stat="reflectSkillPhysic" val="30" />
 				<add order="0x40" stat="reflectSkillMagic" val="30" />

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

@@ -1048,21 +1048,21 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.2">
+			<effect count="-1" name="MpConsumePerLevel" val="0.2">
 				<add order="0x40" stat="accCombat" val="#accCombat">
 					<using kind="Pole" />
 				</add>
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.2">
+			<effect count="-1" name="MpConsumePerLevel" val="0.2">
 				<add order="0x40" stat="accCombat" val="#ench1accCombat">
 					<using kind="Pole" />
 				</add>
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="#ench2mpConsume">
+			<effect count="-1" name="MpConsumePerLevel" val="#ench2mpConsume">
 				<add order="0x40" stat="accCombat" val="4">
 					<using kind="Pole" />
 				</add>
@@ -1106,19 +1106,19 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.2">
+			<effect count="-1" name="MpConsumePerLevel" val="0.2">
 				<sub order="0x40" stat="stunVuln" val="#stunVuln" />
 				<sub order="0x40" stat="sleepVuln" val="#sleepVuln" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.2">
+			<effect count="-1" name="MpConsumePerLevel" val="0.2">
 				<sub order="0x40" stat="stunVuln" val="#ench1stunVuln" />
 				<sub order="0x40" stat="sleepVuln" val="#ench1sleepVuln" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="#ench2mpConsume">
+			<effect count="-1" name="MpConsumePerLevel" val="#ench2mpConsume">
 				<sub order="0x40" stat="stunVuln" val="25" />
 				<sub order="0x40" stat="sleepVuln" val="40" />
 			</effect>
@@ -2304,7 +2304,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.2">
+			<effect count="-1" name="MpConsumePerLevel" val="0.2">
 				<add order="0x40" stat="vengeancePdam" val="3" />
 			</effect>
 		</for>
@@ -2405,7 +2405,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.4">
+			<effect count="-1" name="MpConsumePerLevel" val="0.4">
 				<add order="0x40" stat="runSpd" val="20" />
 			</effect>
 		</for>
@@ -2417,7 +2417,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<add order="0x40" stat="darkPower" val="10" />
 			</effect>
 		</for>
@@ -2431,7 +2431,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<add order="0x40" stat="darkRes" val="#darkRes" />
 			</effect>
 		</for>

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml

@@ -16,7 +16,7 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.4">
+			<effect count="-1" name="MpConsumePerLevel" val="0.4">
 				<mul order="0x30" stat="pAtk" val="#amount" />
 				<mul order="0x30" stat="pAtkSpd" val="#amount" />
 				<add order="0x40" stat="accCombat" val="#amount2" />
@@ -25,7 +25,7 @@
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.4">
+			<effect count="-1" name="MpConsumePerLevel" val="0.4">
 				<mul order="0x30" stat="pAtk" val="#ench1Power" />
 				<mul order="0x30" stat="pAtkSpd" val="1.08" />
 				<add order="0x40" stat="accCombat" val="#ench1Power2" />
@@ -34,7 +34,7 @@
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="#ench2Cost">
+			<effect count="-1" name="MpConsumePerLevel" val="#ench2Cost">
 				<mul order="0x30" stat="pAtk" val="1.08" />
 				<mul order="0x30" stat="pAtkSpd" val="1.08" />
 				<add order="0x40" stat="accCombat" val="4" />

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml

@@ -280,7 +280,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.2">
+			<effect count="-1" name="MpConsumePerLevel" val="0.2">
 				<add order="0x40" stat="transDam" val="50" />
 			</effect>
 		</for>

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml

@@ -15,12 +15,12 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="#mdot">
+			<effect count="-1" name="ManaDamOverTime" val="#mdot">
 				<add order="0x40" stat="pAtk" val="#pAtk" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="20">
+			<effect count="-1" name="ManaDamOverTime" val="20">
 				<add order="0x40" stat="pAtk" val="#ench1patk" />
 			</effect>
 		</enchant1for>

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml

@@ -2046,12 +2046,12 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.2">
+			<effect count="-1" name="MpConsumePerLevel" val="0.2">
 				<add order="0x40" stat="transDam" val="#power" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="MpConsumePerLevel" val="0.2">
+			<effect count="-1" name="MpConsumePerLevel" val="0.2">
 				<add order="0x40" stat="transDam" val="#ench1power" />
 			</effect>
 		</enchant1for>
@@ -2697,12 +2697,12 @@
 		<set name="targetType" val="SELF" />
 		<for>
 			<!-- Retail Values CT2.3: 5 6 6 7 8 8 8 8 9 9 9 10 10MP * 3 Sec -->
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="#mdot">
+			<effect count="-1" name="ManaDamOverTime" val="#mdot">
 				<add order="0x40" stat="pDef" val="#def" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="30">
+			<effect count="-1" name="ManaDamOverTime" val="30">
 				<add order="0x40" stat="pDef" val="#ench1def" />
 			</effect>
 		</enchant1for>

+ 7 - 7
L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml

@@ -130,7 +130,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<mul order="0x30" stat="runSpd" val="0.5" />
 				<mul order="0x30" stat="pAtk" val="0.5" />
 				<mul order="0x30" stat="pDef" val="10" />
@@ -143,7 +143,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<mul order="0x30" stat="pAtkSpd" val="1.3" />
 				<mul order="0x30" stat="pAtk" val="1.3" />
 				<mul order="0x30" stat="pDef" val="0.5" />
@@ -156,7 +156,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<mul order="0x30" stat="runSpd" val="0.5" />
 				<mul order="0x30" stat="bowWpnVuln" val="0.1" />
 			</effect>
@@ -168,7 +168,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<mul order="0x30" stat="runSpd" val="0.7" />
 				<mul order="0x30" stat="bowWpnVuln" val="1.1" />
 			</effect>
@@ -246,7 +246,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<mul order="0x30" stat="pDef" val="10" />
 				<mul order="0x30" stat="mDef" val="10" />
 				<sub order="0x40" stat="sleepVuln" val="70" />
@@ -338,7 +338,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<add order="0x40" stat="reflectDam" val="100" />
 				<mul order="0x30" stat="mDef" val="10" />
 			</effect>
@@ -581,7 +581,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<add order="0x40" stat="reflectDam" val="100" />
 				<mul order="0x30" stat="pDef" val="10" />
 				<mul order="0x30" stat="runSpd" val="0.7" />

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml

@@ -66,7 +66,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect count="0x7fffffff" name="Fusion" val="15">
+			<effect count="-1" name="Fusion" val="15">
 				<mul order="0x30" stat="runSpd" val="0.7" />
 				<mul order="0x30" stat="pAtkSpd" val="0.7" />
 			</effect>
@@ -85,7 +85,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect count="0x7fffffff" name="Fusion" val="15">
+			<effect count="-1" name="Fusion" val="15">
 				<mul order="0x30" stat="runSpd" val="0.7" />
 				<mul order="0x30" stat="pAtkSpd" val="0.7" />
 			</effect>
@@ -104,7 +104,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect count="0x7fffffff" name="Fusion" val="15">
+			<effect count="-1" name="Fusion" val="15">
 				<mul order="0x30" stat="runSpd" val="0.7" />
 				<mul order="0x30" stat="pAtkSpd" val="0.7" />
 			</effect>

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/stats/skills/05200-05299.xml

@@ -424,7 +424,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<mul order="0x30" stat="bluntWpnVuln" val="1.7" />
 				<mul order="0x30" stat="bigBluntWpnVuln" val="1.7" />
 				<mul order="0x30" stat="daggerWpnVuln" val="1.7" />
@@ -445,7 +445,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<mul order="0x30" stat="bowWpnVuln" val="1.7" />
 			</effect>
 		</for>
@@ -458,7 +458,7 @@
 		<set name="skillType" val="CONT" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect count="0x7fffffff" name="ManaDamOverTime" val="0">
+			<effect count="-1" name="ManaDamOverTime" val="0">
 				<mul order="0x30" stat="mDef" val="0.3" />
 			</effect>
 		</for>