Explorar el Código

Removed useless effect type.

Adry85 hace 7 años
padre
commit
4256a7ec7b

+ 1 - 1
src/main/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -1630,7 +1630,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			}
 		}
 		
-		if (sk.hasEffectType(L2EffectType.DMG_OVER_TIME, L2EffectType.DMG_OVER_TIME_PERCENT))
+		if (sk.hasEffectType(L2EffectType.DMG_OVER_TIME))
 		{
 			if (GeoData.getInstance().canSeeTarget(caster, attackTarget) && !canAOE(sk) && !attackTarget.isDead() && (dist2 <= srange))
 			{

+ 1 - 1
src/main/java/com/l2jserver/gameserver/data/xml/impl/NpcData.java

@@ -577,7 +577,7 @@ public class NpcData implements IXmlReader
 											aiSkillScopes.add(AISkillScope.IMMOBILIZE);
 											aiSkillScopes.add(shortOrLongRangeScope);
 										}
-										else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME, L2EffectType.DMG_OVER_TIME_PERCENT))
+										else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME))
 										{
 											aiSkillScopes.add(shortOrLongRangeScope);
 										}

+ 1 - 1
src/main/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicAction.java

@@ -194,7 +194,7 @@ public final class CubicAction implements Runnable
 						}
 						_cubic.useCubicDisabler(skill, targets);
 					}
-					else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME, L2EffectType.DMG_OVER_TIME_PERCENT))
+					else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME))
 					{
 						if (Config.DEBUG)
 						{

+ 10 - 2
src/main/java/com/l2jserver/gameserver/model/effects/AbstractEffect.java

@@ -56,7 +56,7 @@ public abstract class AbstractEffect
 	/** Effect name. */
 	private final String _name;
 	/** Ticks. */
-	private final int _ticks;
+	private int _ticks;
 	
 	/**
 	 * Abstract effect constructor.
@@ -70,7 +70,6 @@ public abstract class AbstractEffect
 		_attachCond = attachCond;
 		// _applyCond = applyCond;
 		_name = set.getString("name");
-		_ticks = set.getInt("ticks", 0);
 	}
 	
 	/**
@@ -156,6 +155,15 @@ public abstract class AbstractEffect
 		return _ticks;
 	}
 	
+	/**
+	 * Sets the effect ticks
+	 * @param ticks the ticks
+	 */
+	protected void setTicks(int ticks)
+	{
+		_ticks = ticks;
+	}
+	
 	public double getTicksMultiplier()
 	{
 		return (getTicks() * Config.EFFECT_TICK_RATIO) / 1000f;

+ 0 - 9
src/main/java/com/l2jserver/gameserver/model/effects/L2EffectType.java

@@ -25,17 +25,12 @@ package com.l2jserver.gameserver.model.effects;
 public enum L2EffectType
 {
 	AGGRESSION,
-	BLOCK_BUFF,
-	BLOCK_DAMAGE,
-	BLOCK_DEBUFF,
 	BUFF,
-	CHARM_OF_LUCK,
 	CHAT_BLOCK,
 	CP,
 	DEBUFF,
 	DISPEL,
 	DMG_OVER_TIME,
-	DMG_OVER_TIME_PERCENT,
 	FAKE_DEATH,
 	FEAR,
 	FISHING,
@@ -44,7 +39,6 @@ public enum L2EffectType
 	HP,
 	HP_DRAIN,
 	MAGICAL_ATTACK,
-	MAGICAL_ATTACK_MP,
 	MANAHEAL_BY_LEVEL,
 	MANAHEAL_PERCENT,
 	MUTE,
@@ -62,10 +56,7 @@ public enum L2EffectType
 	SLEEP,
 	STEAL_ABNORMAL,
 	STUN,
-	SINGLE_TARGET,
 	SUMMON,
-	SUMMON_PET,
 	SUMMON_NPC,
 	TELEPORT,
-	TELEPORT_TO_TARGET
 }