Support for multiple TargetRace skill condition.

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java

@@ -16,6 +16,10 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -24,15 +28,23 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class TargetRaceSkillCondition implements ISkillCondition
 {
-	private final Race _race;
+	private final Set<Race> _races = EnumSet.noneOf(Race.class);
 	
 	public TargetRaceSkillCondition(StatSet params)
 	{
-		_race = params.getEnum("race", Race.class);
+		final List<Race> races = params.getEnumList("race", Race.class);
+		if (races != null)
+		{
+			_races.addAll(races);
+		}
+		else
+		{
+			_races.add(params.getEnum("race", Race.class));
+		}
 	}
 	
 	@Override
@@ -42,7 +54,7 @@ public class TargetRaceSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		final Creature targetCreature = (Creature) target;
+		
-		return targetCreature.getRace() == _race;
+		return _races.contains(((Creature) target).getRace());
 	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java

@@ -16,6 +16,10 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -24,15 +28,23 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class TargetRaceSkillCondition implements ISkillCondition
 {
-	private final Race _race;
+	private final Set<Race> _races = EnumSet.noneOf(Race.class);
 	
 	public TargetRaceSkillCondition(StatSet params)
 	{
-		_race = params.getEnum("race", Race.class);
+		final List<Race> races = params.getEnumList("race", Race.class);
+		if (races != null)
+		{
+			_races.addAll(races);
+		}
+		else
+		{
+			_races.add(params.getEnum("race", Race.class));
+		}
 	}
 	
 	@Override
@@ -42,7 +54,7 @@ public class TargetRaceSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		final Creature targetCreature = (Creature) target;
+		
-		return targetCreature.getRace() == _race;
+		return _races.contains(((Creature) target).getRace());
 	}
 }

L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java

@@ -16,6 +16,10 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -24,15 +28,23 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class TargetRaceSkillCondition implements ISkillCondition
 {
-	private final Race _race;
+	private final Set<Race> _races = EnumSet.noneOf(Race.class);
 	
 	public TargetRaceSkillCondition(StatSet params)
 	{
-		_race = params.getEnum("race", Race.class);
+		final List<Race> races = params.getEnumList("race", Race.class);
+		if (races != null)
+		{
+			_races.addAll(races);
+		}
+		else
+		{
+			_races.add(params.getEnum("race", Race.class));
+		}
 	}
 	
 	@Override
@@ -42,7 +54,7 @@ public class TargetRaceSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		final Creature targetCreature = (Creature) target;
+		
-		return targetCreature.getRace() == _race;
+		return _races.contains(((Creature) target).getRace());
 	}
 }

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java

@@ -16,6 +16,10 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -24,15 +28,23 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class TargetRaceSkillCondition implements ISkillCondition
 {
-	private final Race _race;
+	private final Set<Race> _races = EnumSet.noneOf(Race.class);
 	
 	public TargetRaceSkillCondition(StatSet params)
 	{
-		_race = params.getEnum("race", Race.class);
+		final List<Race> races = params.getEnumList("race", Race.class);
+		if (races != null)
+		{
+			_races.addAll(races);
+		}
+		else
+		{
+			_races.add(params.getEnum("race", Race.class));
+		}
 	}
 	
 	@Override
@@ -42,7 +54,7 @@ public class TargetRaceSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		final Creature targetCreature = (Creature) target;
+		
-		return targetCreature.getRace() == _race;
+		return _races.contains(((Creature) target).getRace());
 	}
 }

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java

@@ -16,6 +16,10 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -24,15 +28,23 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class TargetRaceSkillCondition implements ISkillCondition
 {
-	private final Race _race;
+	private final Set<Race> _races = EnumSet.noneOf(Race.class);
 	
 	public TargetRaceSkillCondition(StatSet params)
 	{
-		_race = params.getEnum("race", Race.class);
+		final List<Race> races = params.getEnumList("race", Race.class);
+		if (races != null)
+		{
+			_races.addAll(races);
+		}
+		else
+		{
+			_races.add(params.getEnum("race", Race.class));
+		}
 	}
 	
 	@Override
@@ -42,7 +54,7 @@ public class TargetRaceSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		final Creature targetCreature = (Creature) target;
+		
-		return targetCreature.getRace() == _race;
+		return _races.contains(((Creature) target).getRace());
 	}
 }

L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/skillconditionhandlers/TargetRaceSkillCondition.java

@@ -16,6 +16,10 @@
  */
 package handlers.skillconditionhandlers;
 
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.enums.Race;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -24,15 +28,23 @@ import org.l2jmobius.gameserver.model.skill.ISkillCondition;
 import org.l2jmobius.gameserver.model.skill.Skill;
 
 /**
- * @author UnAfraid
+ * @author UnAfraid, Mobius
  */
 public class TargetRaceSkillCondition implements ISkillCondition
 {
-	private final Race _race;
+	private final Set<Race> _races = EnumSet.noneOf(Race.class);
 	
 	public TargetRaceSkillCondition(StatSet params)
 	{
-		_race = params.getEnum("race", Race.class);
+		final List<Race> races = params.getEnumList("race", Race.class);
+		if (races != null)
+		{
+			_races.addAll(races);
+		}
+		else
+		{
+			_races.add(params.getEnum("race", Race.class));
+		}
 	}
 	
 	@Override
@@ -42,7 +54,7 @@ public class TargetRaceSkillCondition implements ISkillCondition
 		{
 			return false;
 		}
-		final Creature targetCreature = (Creature) target;
+		
-		return targetCreature.getRace() == _race;
+		return _races.contains(((Creature) target).getRace());
 	}
 }