瀏覽代碼

Removed power from skills that have PhysicalAttackHpLink effect handler.

Reviewed by: Zoey76
Adry85 7 年之前
父節點
當前提交
3ec79608b3

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

@@ -1521,7 +1521,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			}
 		}
 		
-		if (sk.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN))
+		if (sk.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN))
 		{
 			if (!canAura(sk))
 			{

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

@@ -552,7 +552,7 @@ public class NpcData implements IXmlReader
 										{
 											aiSkillScopes.add(AISkillScope.HEAL);
 										}
-										else if (skill.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN))
+										else if (skill.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN))
 										{
 											aiSkillScopes.add(AISkillScope.ATTACK);
 											aiSkillScopes.add(AISkillScope.UNIVERSAL);

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

@@ -55,7 +55,6 @@ public enum L2EffectType
 	NONE,
 	PARALYZE,
 	PHYSICAL_ATTACK,
-	PHYSICAL_ATTACK_HP_LINK,
 	REBALANCE_HP,
 	REFUEL_AIRSHIP,
 	RELAXING,

+ 2 - 7
src/main/java/com/l2jserver/gameserver/model/skills/Skill.java

@@ -436,7 +436,7 @@ public class Skill implements IIdentifiable
 	
 	public boolean isDamage()
 	{
-		return hasEffectType(L2EffectType.MAGICAL_ATTACK, L2EffectType.HP_DRAIN, L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK);
+		return hasEffectType(L2EffectType.MAGICAL_ATTACK, L2EffectType.HP_DRAIN, L2EffectType.PHYSICAL_ATTACK);
 	}
 	
 	public boolean isOverhit()
@@ -468,11 +468,6 @@ public class Skill implements IIdentifiable
 		{
 			return getPower(isPvP, isPvE) * (-((activeChar.getCurrentHp() * 2) / activeChar.getMaxHp()) + 2);
 		}
-		
-		if (hasEffectType(L2EffectType.PHYSICAL_ATTACK_HP_LINK))
-		{
-			return getPower(isPvP, isPvE) * (-((target.getCurrentHp() * 2) / target.getMaxHp()) + 2);
-		}
 		return getPower(isPvP, isPvE);
 	}
 	
@@ -915,7 +910,7 @@ public class Skill implements IIdentifiable
 	
 	public boolean useSoulShot()
 	{
-		return hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK);
+		return hasEffectType(L2EffectType.PHYSICAL_ATTACK);
 	}
 	
 	public boolean useSpiritShot()