Переглянути джерело

Implemented Aura Undead Enemy target type.

Adry85 7 роки тому
батько
коміт
136d15bf82

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

@@ -1371,7 +1371,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				else if (canAOE(sk))
 				{
-					if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB))
+					if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB) || (sk.getTargetType() == L2TargetType.AURA_UNDEAD_ENEMY))
 					{
 						clientStopMoving(null);
 						caster.doCast(sk);
@@ -1643,7 +1643,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			}
 			else if (canAOE(sk))
 			{
-				if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB))
+				if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB) || (sk.getTargetType() == L2TargetType.AURA_UNDEAD_ENEMY))
 				{
 					clientStopMoving(null);
 					caster.doCast(sk);

+ 3 - 3
src/main/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

@@ -1509,7 +1509,7 @@ public class L2CharacterAI extends AbstractAI
 	
 	public boolean canAura(Skill sk)
 	{
-		if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB))
+		if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB) || (sk.getTargetType() == L2TargetType.AURA_UNDEAD_ENEMY))
 		{
 			for (L2Object target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
 			{
@@ -1526,7 +1526,7 @@ public class L2CharacterAI extends AbstractAI
 	{
 		if (sk.hasEffectType(L2EffectType.DISPEL))
 		{
-			if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB))
+			if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB) || (sk.getTargetType() == L2TargetType.AURA_UNDEAD_ENEMY))
 			{
 				boolean cancast = true;
 				for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
@@ -1587,7 +1587,7 @@ public class L2CharacterAI extends AbstractAI
 		}
 		else
 		{
-			if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB))
+			if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB) || (sk.getTargetType() == L2TargetType.AURA_UNDEAD_ENEMY))
 			{
 				boolean cancast = false;
 				for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))

+ 2 - 0
src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -1658,6 +1658,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 			case BEHIND_AURA:
 			case GROUND:
 			case AURA_FRIENDLY:
+			case AURA_UNDEAD_ENEMY:
 				target = this;
 				break;
 			case SELF:
@@ -5381,6 +5382,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				case BEHIND_AURA:
 				case AURA_CORPSE_MOB:
 				case AURA_FRIENDLY:
+				case AURA_UNDEAD_ENEMY:
 					break;
 				default:
 					abortCast();

+ 1 - 0
src/main/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -635,6 +635,7 @@ public abstract class L2Summon extends L2Playable
 			case BEHIND_AURA:
 			case SELF:
 			case AURA_CORPSE_MOB:
+			case AURA_UNDEAD_ENEMY:
 			case COMMAND_CHANNEL:
 				target = this;
 				break;

+ 4 - 1
src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -4596,7 +4596,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		else
 		{
-			// if item is instance of L2ArmorType or L2WeaponType broadcast an "Attention" system message
+			// if item is instance of ArmorType or WeaponType broadcast an "Attention" system message
 			if ((target.getItemType() instanceof ArmorType) || (target.getItemType() instanceof WeaponType))
 			{
 				if (target.getEnchantLevel() > 0)
@@ -7572,6 +7572,7 @@ public final class L2PcInstance extends L2Playable
 			case AURA_CORPSE_MOB:
 			case COMMAND_CHANNEL:
 			case AURA_FRIENDLY:
+			case AURA_UNDEAD_ENEMY:
 				target = this;
 				break;
 			default:
@@ -7676,6 +7677,7 @@ public final class L2PcInstance extends L2Playable
 			case AURA_CORPSE_MOB:
 			case COMMAND_CHANNEL:
 			case AURA_FRIENDLY:
+			case AURA_UNDEAD_ENEMY:
 				target = this;
 				break;
 			case PET:
@@ -7847,6 +7849,7 @@ public final class L2PcInstance extends L2Playable
 					case AREA_SUMMON:
 					case UNLOCKABLE:
 					case AURA_FRIENDLY:
+					case AURA_UNDEAD_ENEMY:
 						break;
 					default: // Send a Server->Client packet ActionFailed to the L2PcInstance
 						sendPacket(ActionFailed.STATIC_PACKET);

+ 1 - 0
src/main/java/com/l2jserver/gameserver/model/skills/targets/L2TargetType.java

@@ -31,6 +31,7 @@ public enum L2TargetType
 	AURA,
 	AURA_CORPSE_MOB,
 	AURA_FRIENDLY,
+	AURA_UNDEAD_ENEMY,
 	BEHIND_AREA,
 	BEHIND_AURA,
 	CLAN,