Эх сурвалжийг харах

BETA: Datapack part for [L5995]:
* Toggle skills don't need abnormal time -1 to last for ever.
* Fixed calculation in "over time" skills for points consumption.

Zoey76 12 жил өмнө
parent
commit
b83883d517
28 өөрчлөгдсөн 86 нэмэгдсэн , 96 устгасан
  1. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChanceSkillTrigger.java
  2. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java
  3. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java
  4. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java
  5. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java
  6. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java
  7. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java
  8. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHealOverTime.java
  9. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java
  10. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Relax.java
  11. 2 3
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetAntiSummon.java
  12. 3 7
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetMDam.java
  13. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SignetNoise.java
  14. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SilentMove.java
  15. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml
  16. 2 2
      L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml
  17. 10 10
      L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
  18. 23 23
      L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml
  19. 10 10
      L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
  20. 3 3
      L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
  21. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
  22. 2 2
      L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml
  23. 4 4
      L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml
  24. 0 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml
  25. 7 7
      L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml
  26. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/05000-05099.xml
  27. 3 3
      L2J_DataPack_BETA/dist/game/data/stats/skills/05200-05299.xml
  28. 1 1
      L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml

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

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

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

@@ -73,7 +73,7 @@ public class CpHealOverTime extends L2Effect
 			return false;
 		}
 		
-		cp += calc() * getTickCount();
+		cp += calc() * getEffectTemplate().getTotalTickCount();
 		cp = Math.min(cp, maxcp);
 		getEffected().setCurrentCp(cp);
 		return false;

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

@@ -48,7 +48,7 @@ public class DamOverTime extends L2Effect
 			return false;
 		}
 		
-		double damage = calc() * getTickCount();
+		double damage = calc() * getEffectTemplate().getTotalTickCount();
 		if (damage >= (getEffected().getCurrentHp() - 1))
 		{
 			if (getSkill().isToggle())
@@ -65,7 +65,6 @@ public class DamOverTime extends L2Effect
 				{
 					return true;
 				}
-				
 				damage = getEffected().getCurrentHp() - 1;
 			}
 		}

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

@@ -49,8 +49,7 @@ public class DamOverTimePercent extends L2Effect
 			return false;
 		}
 		
-		double damage = getEffected().getCurrentHp() * calc() * getTickCount();
-		
+		double damage = getEffected().getCurrentHp() * calc() * getEffectTemplate().getTotalTickCount();
 		if (damage >= (getEffected().getCurrentHp() - 1))
 		{
 			if (getSkill().isToggle())

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

@@ -51,8 +51,7 @@ public class FakeDeath extends L2Effect
 			return false;
 		}
 		
-		double manaDam = calc() * getTickCount();
-		
+		final double manaDam = calc() * getEffectTemplate().getTotalTickCount();
 		if (manaDam > getEffected().getCurrentMp())
 		{
 			if (getSkill().isToggle())

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

@@ -74,7 +74,7 @@ public class HealOverTime extends L2Effect
 			return false;
 		}
 		
-		hp += calc() * getTickCount();
+		hp += calc() * getEffectTemplate().getTotalTickCount();
 		hp = Math.min(hp, maxhp);
 		getEffected().setCurrentHp(hp);
 		return false;
@@ -85,7 +85,7 @@ public class HealOverTime extends L2Effect
 	{
 		if (getEffected().isPlayer())
 		{
-			getEffected().sendPacket(new ExRegMax(calc(), getTickCount() * getAbnormalTime(), getAbnormalTime()));
+			getEffected().sendPacket(new ExRegMax(calc(), getEffectTemplate().getTotalTickCount() * getAbnormalTime(), getAbnormalTime()));
 		}
 		return true;
 	}

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

@@ -48,7 +48,7 @@ public class ManaDamOverTime extends L2Effect
 			return false;
 		}
 		
-		double manaDam = calc() * getTickCount();
+		final double manaDam = calc() * getEffectTemplate().getTotalTickCount();
 		if (manaDam > getEffected().getCurrentMp())
 		{
 			if (getSkill().isToggle())

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

@@ -67,7 +67,7 @@ public class ManaHealOverTime extends L2Effect
 			return true;
 		}
 		
-		mp += calc() * getTickCount();
+		mp += calc() * getEffectTemplate().getTotalTickCount();
 		mp = Math.min(mp, maxmp);
 		getEffected().setCurrentMp(mp);
 		return true;

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

@@ -48,7 +48,7 @@ public class MpConsumePerLevel extends L2Effect
 			return false;
 		}
 		
-		double base = calc() * getTickCount();
+		final double base = calc() * getEffectTemplate().getTotalTickCount();
 		double consume = ((getEffected().getLevel() - 1) / 7.5) * base * getAbnormalTime();
 		if (consume > getEffected().getCurrentMp())
 		{

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

@@ -73,8 +73,7 @@ public class Relax extends L2Effect
 			}
 		}
 		
-		double manaDam = calc() * getTickCount();
-		
+		final double manaDam = calc() * getEffectTemplate().getTotalTickCount();
 		if (manaDam > getEffected().getCurrentMp())
 		{
 			if (getSkill().isToggle())

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

@@ -48,14 +48,13 @@ public class SignetAntiSummon extends L2Effect
 	@Override
 	public boolean onActionTime()
 	{
-		if (getTickCount() == (getTotalTickCount() - 1))
+		if (getTickCount() == 1)
 		{
 			return true; // do nothing first time
 		}
-		int mpConsume = getSkill().getMpConsume();
 		
+		int mpConsume = getSkill().getMpConsume();
 		L2PcInstance caster = getEffector().getActingPlayer();
-		
 		for (L2Character cha : getEffected().getKnownList().getKnownCharactersInRadius(getSkill().getAffectRange()))
 		{
 			if (cha == null)

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

@@ -65,21 +65,17 @@ public class SignetMDam extends L2Effect
 	@Override
 	public boolean onActionTime()
 	{
-		if (getTickCount() >= (getTotalTickCount() - 2))
+		if (getTickCount() <= 2)
 		{
 			return true; // do nothing first 2 times
 		}
-		int mpConsume = getSkill().getMpConsume();
 		
+		int mpConsume = getSkill().getMpConsume();
 		final L2PcInstance activeChar = getEffector().getActingPlayer();
-		
 		activeChar.rechargeShots(getSkill().useSoulShot(), getSkill().useSpiritShot());
-		
 		boolean sps = getSkill().useSpiritShot() && getEffector().isChargedShot(ShotType.SPIRITSHOTS);
 		boolean bss = getSkill().useSpiritShot() && getEffector().isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
-		
-		List<L2Character> targets = new ArrayList<>();
-		
+		final List<L2Character> targets = new ArrayList<>();
 		for (L2Character cha : _actor.getKnownList().getKnownCharactersInRadius(getSkill().getAffectRange()))
 		{
 			if ((cha == null) || (cha == activeChar))

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

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

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

@@ -73,7 +73,7 @@ public class SilentMove extends L2Effect
 			return false;
 		}
 		
-		double manaDam = calc() * getTickCount();
+		final double manaDam = calc() * getEffectTemplate().getTotalTickCount();
 		if (manaDam > getEffected().getCurrentMp())
 		{
 			getEffected().sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);

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

@@ -1418,7 +1418,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="FakeDeath" ticks="3" abnormalTime="-1" val="10" />
+			<effect name="FakeDeath" ticks="3" val="10" />
 		</for>
 	</skill>
 	<skill id="61" levels="3" name="Cure Bleeding">

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

@@ -1375,7 +1375,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<add order="0x40" stat="holyPower" val="10" />
 			</effect>
 		</for>
@@ -1389,7 +1389,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<add order="0x40" stat="darkRes" val="#darkRes" />
 			</effect>
 		</for>

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

@@ -341,12 +341,12 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="SilentMove" ticks="3" abnormalTime="-1" abnormalVisualEffect="stealth" val="9">
+			<effect name="SilentMove" ticks="3" abnormalVisualEffect="stealth" val="9">
 				<mul order="0x30" stat="runSpd" val="0.6" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="SilentMove" ticks="3" abnormalTime="-1" abnormalVisualEffect="stealth" val="9">
+			<effect name="SilentMove" ticks="3" abnormalVisualEffect="stealth" val="9">
 				<mul order="0x30" stat="runSpd" val="#ench1Penalty" />
 			</effect>
 		</enchant1for>
@@ -358,7 +358,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="DamOverTime" ticks="2" abnormalTime="-1" val="12">
+			<effect name="DamOverTime" ticks="2" val="12">
 				<mul order="0x30" stat="pAtkSpd" val="1.25" />
 			</effect>
 		</for>
@@ -431,7 +431,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Relax" ticks="3" abnormalTime="-1" val="1">
+			<effect name="Relax" ticks="3" val="1">
 				<add order="0x40" stat="regHp" val="5" />
 			</effect>
 		</for>
@@ -1175,12 +1175,12 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.4">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.4">
 				<add order="0x40" stat="accCombat" val="3" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="#ench1val">
+			<effect name="MpConsumePerLevel" ticks="3" val="#ench1val">
 				<add order="0x40" stat="accCombat" val="3" />
 			</effect>
 		</enchant1for>
@@ -2411,19 +2411,19 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="2">
+			<effect name="MpConsumePerLevel" ticks="3" val="2">
 				<add order="0x40" stat="pDef" val="#pDef" />
 				<mul order="0x30" stat="rShld" val="1.5" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="2">
+			<effect name="MpConsumePerLevel" ticks="3" val="2">
 				<add order="0x40" stat="pDef" val="#ench1pDef" />
 				<mul order="0x30" stat="rShld" val="1.5" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="#ench2val">
+			<effect name="MpConsumePerLevel" ticks="3" val="#ench2val">
 				<add order="0x40" stat="pDef" val="256" />
 				<mul order="0x30" stat="rShld" val="1.5" />
 			</effect>
@@ -2602,7 +2602,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChameleonRest" abnormalVisualEffect="stealth" ticks="3" abnormalTime="-1" val="2" />
+			<effect name="ChameleonRest" abnormalVisualEffect="stealth" ticks="3" val="2" />
 		</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

@@ -436,17 +436,17 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.8">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.8">
 				<add order="0x40" stat="cAtkAdd" val="#crit" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.8">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.8">
 				<add order="0x40" stat="cAtkAdd" val="#ench1crit" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="#ench2val">
+			<effect name="MpConsumePerLevel" ticks="3" val="#ench2val">
 				<add order="0x40" stat="cAtkAdd" val="609" />
 			</effect>
 		</enchant2for>
@@ -644,7 +644,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<mul order="0x30" stat="cAtk" val="#cAtk">
 					<using kind="Pole" />
 				</mul>
@@ -664,13 +664,13 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<mul order="0x30" stat="sDef" val="0.7" />
 				<set order="0x10" stat="shieldDefAngle" val="360" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<mul order="0x30" stat="sDef" val="#ench1sDef" />
 				<set order="0x10" stat="shieldDefAngle" val="360" />
 			</effect>
@@ -799,17 +799,17 @@
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpConsume" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.8">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.8">
 				<add order="0x40" stat="sDef" val="#sDef" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.8">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.8">
 				<add order="0x40" stat="sDef" val="#ench1sDef" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="#ench2val">
+			<effect name="MpConsumePerLevel" ticks="3" val="#ench2val">
 				<add order="0x40" stat="sDef" val="560" />
 			</effect>
 		</enchant2for>
@@ -1019,7 +1019,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="2">
+			<effect name="MpConsumePerLevel" ticks="3" val="2">
 				<mul order="0x30" stat="skillMastery" val="2" />
 			</effect>
 		</for>
@@ -1034,19 +1034,19 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="1">
+			<effect name="MpConsumePerLevel" ticks="3" val="1">
 				<sub order="0x40" stat="paralyzeVuln" val="30" />
 				<sub order="0x40" stat="stunVuln" val="30" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="1">
+			<effect name="MpConsumePerLevel" ticks="3" val="1">
 				<sub order="0x40" stat="paralyzeVuln" val="30" />
 				<sub order="0x40" stat="stunVuln" val="#enchVuln" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="1">
+			<effect name="MpConsumePerLevel" ticks="3" val="1">
 				<sub order="0x40" stat="paralyzeVuln" val="#enchVuln" />
 				<sub order="0x40" stat="stunVuln" val="30" />
 			</effect>
@@ -1061,13 +1061,13 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="DamOverTime" ticks="3" abnormalTime="-1" val="50">
+			<effect name="DamOverTime" ticks="3" val="50">
 				<mul order="0x30" stat="mAtkSpd" val="0.9" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="0.7" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="DamOverTime" ticks="3" abnormalTime="-1" val="50">
+			<effect name="DamOverTime" ticks="3" val="50">
 				<mul order="0x30" stat="mAtkSpd" val="0.9" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="#ench1mpConsume" />
 			</effect>
@@ -1082,13 +1082,13 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="DamOverTime" ticks="3" abnormalTime="-1" val="50">
+			<effect name="DamOverTime" ticks="3" val="50">
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
 				<mul order="0x30" stat="mAtk" val="1.3" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="DamOverTime" ticks="3" abnormalTime="-1" val="50">
+			<effect name="DamOverTime" ticks="3" val="50">
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
 				<mul order="0x30" stat="mAtk" val="#ench1mAtk" />
 			</effect>
@@ -1105,21 +1105,21 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="DamOverTime" ticks="3" abnormalTime="-1" val="50">
+			<effect name="DamOverTime" ticks="3" val="50">
 				<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 name="DamOverTime" ticks="3" abnormalTime="-1" val="50">
+			<effect name="DamOverTime" ticks="3" val="50">
 				<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 name="DamOverTime" ticks="3" abnormalTime="-1" val="50">
+			<effect name="DamOverTime" ticks="3" val="50">
 				<mul order="0x30" stat="mAtkSpd" val="1.2" />
 				<mul order="0x30" stat="mReuse" val="#ench2mReuse" />
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="1.1" />
@@ -1135,7 +1135,7 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="1">
+			<effect name="MpConsumePerLevel" ticks="3" val="1">
 				<mul order="0x30" stat="pDef" val="1.25" />
 				<mul order="0x30" stat="mDef" val="1.25" />
 				<mul order="0x30" stat="pAtkSpd" val="0.8" />
@@ -1144,7 +1144,7 @@
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="1">
+			<effect name="MpConsumePerLevel" ticks="3" val="1">
 				<mul order="0x30" stat="pDef" val="#enchDef" />
 				<mul order="0x30" stat="mDef" val="#enchDef" />
 				<mul order="0x30" stat="pAtkSpd" val="0.8" />
@@ -1159,7 +1159,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="1">
+			<effect name="MpConsumePerLevel" ticks="3" val="1">
 				<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

@@ -1056,21 +1056,21 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.5">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.5">
 				<add order="0x40" stat="accCombat" val="#accCombat">
 					<using kind="Pole" />
 				</add>
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.5">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.5">
 				<add order="0x40" stat="accCombat" val="#ench1accCombat">
 					<using kind="Pole" />
 				</add>
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="#ench2mpConsume">
+			<effect name="MpConsumePerLevel" ticks="3" val="#ench2mpConsume">
 				<add order="0x40" stat="accCombat" val="4">
 					<using kind="Pole" />
 				</add>
@@ -1113,19 +1113,19 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="1">
+			<effect name="MpConsumePerLevel" ticks="3" val="1">
 				<sub order="0x40" stat="stunVuln" val="#stunVuln" />
 				<sub order="0x40" stat="sleepVuln" val="#sleepVuln" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="1">
+			<effect name="MpConsumePerLevel" ticks="3" val="1">
 				<sub order="0x40" stat="stunVuln" val="#ench1stunVuln" />
 				<sub order="0x40" stat="sleepVuln" val="#ench1sleepVuln" />
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="#ench2mpConsume">
+			<effect name="MpConsumePerLevel" ticks="3" val="#ench2mpConsume">
 				<sub order="0x40" stat="stunVuln" val="25" />
 				<sub order="0x40" stat="sleepVuln" val="40" />
 			</effect>
@@ -2321,7 +2321,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.2">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.2">
 				<add order="0x40" stat="vengeancePdam" val="3" />
 			</effect>
 		</for>
@@ -2427,7 +2427,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.4">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.4">
 				<add order="0x40" stat="runSpd" val="20" />
 			</effect>
 		</for>
@@ -2438,7 +2438,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<add order="0x40" stat="darkPower" val="10" />
 			</effect>
 		</for>
@@ -2451,7 +2451,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<add order="0x40" stat="darkRes" val="#darkRes" />
 			</effect>
 		</for>

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

@@ -15,7 +15,7 @@
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.4">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.4">
 				<mul order="0x30" stat="pAtk" val="#amount" />
 				<mul order="0x30" stat="pAtkSpd" val="#amount" />
 				<add order="0x40" stat="accCombat" val="#amount2" />
@@ -24,7 +24,7 @@
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.4">
+			<effect name="MpConsumePerLevel" ticks="3" 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" />
@@ -33,7 +33,7 @@
 			</effect>
 		</enchant1for>
 		<enchant2for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="#ench2Cost">
+			<effect name="MpConsumePerLevel" ticks="3" 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

@@ -279,7 +279,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.4">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.4">
 				<add order="0x40" stat="transDam" val="50" />
 			</effect>
 		</for>

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

@@ -14,12 +14,12 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="ManaDamOverTime" ticks="3" abnormalTime="-1" val="#mdot">
+			<effect name="ManaDamOverTime" ticks="3" val="#mdot">
 				<add order="0x40" stat="pAtk" val="#pAtk" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="ManaDamOverTime" ticks="3" abnormalTime="-1" val="4">
+			<effect name="ManaDamOverTime" ticks="3" val="4">
 				<add order="0x40" stat="pAtk" val="#ench1patk" />
 			</effect>
 		</enchant1for>

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

@@ -2057,12 +2057,12 @@
 		<set name="targetType" val="SELF" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.2">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.2">
 				<add order="0x40" stat="transDam" val="#power" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="MpConsumePerLevel" ticks="3" abnormalTime="-1" val="0.2">
+			<effect name="MpConsumePerLevel" ticks="3" val="0.2">
 				<add order="0x40" stat="transDam" val="#ench1power" />
 			</effect>
 		</enchant1for>
@@ -2720,12 +2720,12 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ManaDamOverTime" ticks="3" abnormalTime="-1" val="#mdot">
+			<effect name="ManaDamOverTime" ticks="3" val="#mdot">
 				<add order="0x40" stat="pDef" val="#def" />
 			</effect>
 		</for>
 		<enchant1for>
-			<effect name="ManaDamOverTime" ticks="3" abnormalTime="-1" val="10">
+			<effect name="ManaDamOverTime" ticks="3" val="10">
 				<add order="0x40" stat="pDef" val="#ench1def" />
 			</effect>
 		</enchant1for>

+ 0 - 1
L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml

@@ -489,7 +489,6 @@
 	</skill>
 	<skill id="3436" levels="1" name="Blue Talisman - Self destruction">
 		<!-- Confirmed CT2.5 -->
-		<!-- set name="affectLimit = "6;12" / -->
 		<set name="affectLimit" val="6-12" />
 		<set name="affectRange" val="200" />
 		<set name="hitTime" val="3000" />

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

@@ -129,7 +129,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" 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" />
@@ -141,7 +141,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" 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" />
@@ -153,7 +153,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<mul order="0x30" stat="runSpd" val="0.5" />
 				<mul order="0x30" stat="bowWpnVuln" val="0.1" />
 			</effect>
@@ -164,7 +164,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<mul order="0x30" stat="runSpd" val="0.7" />
 				<mul order="0x30" stat="bowWpnVuln" val="1.1" />
 			</effect>
@@ -241,7 +241,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<mul order="0x30" stat="pDef" val="10" />
 				<mul order="0x30" stat="mDef" val="10" />
 				<sub order="0x40" stat="sleepVuln" val="70" />
@@ -334,7 +334,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<add order="0x40" stat="reflectDam" val="100" />
 				<mul order="0x30" stat="mDef" val="10" />
 			</effect>
@@ -576,7 +576,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<add order="0x40" stat="reflectDam" val="100" />
 				<mul order="0x30" stat="pDef" val="10" />
 				<mul order="0x30" stat="runSpd" val="0.7" />

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/stats/skills/05000-05099.xml

@@ -1226,7 +1226,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<mul order="0x30" stat="pAtkSpd" val="#pAtkSpd" />
 				<mul order="0x30" stat="pAtk" val="#pAtk" />
 				<mul order="0x30" stat="pDef" val="#pDef" />

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

@@ -423,7 +423,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" 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" />
@@ -443,7 +443,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<mul order="0x30" stat="bowWpnVuln" val="1.7" />
 			</effect>
 		</for>
@@ -455,7 +455,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Buff" abnormalTime="-1" val="0">
+			<effect name="Buff" val="0">
 				<mul order="0x30" stat="mDef" val="0.3" />
 			</effect>
 		</for>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/stats/skills/05900-05999.xml

@@ -423,7 +423,7 @@
 		<set name="operateType" val="T" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="Invincible" abnormalTime="-1" val="0" />
+			<effect name="Invincible" val="0" />
 		</for>
 	</skill>
 	<skill id="5932" levels="1" name="Dark Blade">