Improved AttackAttribute and DefenceAttribute logic.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,10 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Set;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -27,12 +26,13 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final Set<AttributeType> _attributes = new HashSet<>();
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
@@ -40,55 +40,32 @@ public class AttackAttribute extends AbstractEffect
 		final String attributes = params.getString("attribute", "FIRE");
 		if (attributes.contains(","))
 		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
 			for (String attribute : attributes.split(","))
 			{
-				_attributes.add(AttributeType.findByName(attribute.trim()));
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
 			}
 		}
 		else
 		{
-			_attributes.add(AttributeType.findByName(attributes));
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
 		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		for (AttributeType attribute : _attributes)
+		if (_singleStat != null)
 		{
-			switch (attribute)
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				case FIRE:
+		}
-				{
+		
-					effected.getStat().mergeAdd(Stat.FIRE_POWER, _amount);
+		for (Stat stat : _multipleStats)
-					break;
+		{
-				}
+			effected.getStat().mergeAdd(stat, _amount);
-				case WATER:
-				{
-					effected.getStat().mergeAdd(Stat.WATER_POWER, _amount);
-					break;
-				}
-				case WIND:
-				{
-					effected.getStat().mergeAdd(Stat.WIND_POWER, _amount);
-					break;
-				}
-				case EARTH:
-				{
-					effected.getStat().mergeAdd(Stat.EARTH_POWER, _amount);
-					break;
-				}
-				case HOLY:
-				{
-					effected.getStat().mergeAdd(Stat.HOLY_POWER, _amount);
-					break;
-				}
-				case DARK:
-				{
-					effected.getStat().mergeAdd(Stat.DARK_POWER, _amount);
-					break;
-				}
-			}
 		}
 	}
 }

L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,10 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Set;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -27,12 +26,13 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final Set<AttributeType> _attributes = new HashSet<>();
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
@@ -40,55 +40,32 @@ public class DefenceAttribute extends AbstractEffect
 		final String attributes = params.getString("attribute", "FIRE");
 		if (attributes.contains(","))
 		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
 			for (String attribute : attributes.split(","))
 			{
-				_attributes.add(AttributeType.findByName(attribute.trim()));
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
 			}
 		}
 		else
 		{
-			_attributes.add(AttributeType.findByName(attributes));
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
 		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		for (AttributeType attribute : _attributes)
+		if (_singleStat != null)
 		{
-			switch (attribute)
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				case FIRE:
+		}
-				{
+		
-					effected.getStat().mergeAdd(Stat.FIRE_RES, _amount);
+		for (Stat stat : _multipleStats)
-					break;
+		{
-				}
+			effected.getStat().mergeAdd(stat, _amount);
-				case WATER:
-				{
-					effected.getStat().mergeAdd(Stat.WATER_RES, _amount);
-					break;
-				}
-				case WIND:
-				{
-					effected.getStat().mergeAdd(Stat.WIND_RES, _amount);
-					break;
-				}
-				case EARTH:
-				{
-					effected.getStat().mergeAdd(Stat.EARTH_RES, _amount);
-					break;
-				}
-				case HOLY:
-				{
-					effected.getStat().mergeAdd(Stat.HOLY_RES, _amount);
-					break;
-				}
-				case DARK:
-				{
-					effected.getStat().mergeAdd(Stat.DARK_RES, _amount);
-					break;
-				}
-			}
 		}
 	}
 }

L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_POWER;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_POWER;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_POWER;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_POWER;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_POWER;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_POWER;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AttackAttributeAdd.java

@@ -54,6 +54,11 @@ public class AttackAttributeAdd extends AbstractEffect
 		
 		switch (maxAttribute)
 		{
+			case FIRE:
+			{
+				stat = Stat.FIRE_POWER;
+				break;
+			}
 			case WATER:
 			{
 				stat = Stat.WATER_POWER;

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,7 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
+import java.util.EnumSet;
+import java.util.Set;
+
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -24,52 +26,46 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final AttributeType _attribute;
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
 		_amount = params.getDouble("amount", 0);
-		_attribute = params.getEnum("attribute", AttributeType.class, AttributeType.FIRE);
+		final String attributes = params.getString("attribute", "FIRE");
+		if (attributes.contains(","))
+		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
+			for (String attribute : attributes.split(","))
+			{
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
+			}
+		}
+		else
+		{
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
+		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		Stat stat = Stat.FIRE_RES;
+		if (_singleStat != null)
-		
-		switch (_attribute)
 		{
-			case WATER:
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				stat = Stat.WATER_RES;
+		}
-				break;
+		
-			}
+		for (Stat stat : _multipleStats)
-			case WIND:
+		{
-			{
+			effected.getStat().mergeAdd(stat, _amount);
-				stat = Stat.WIND_RES;
-				break;
-			}
-			case EARTH:
-			{
-				stat = Stat.EARTH_RES;
-				break;
-			}
-			case HOLY:
-			{
-				stat = Stat.HOLY_RES;
-				break;
-			}
-			case DARK:
-			{
-				stat = Stat.DARK_RES;
-				break;
-			}
 		}
-		effected.getStat().mergeAdd(stat, _amount);
 	}
 }

L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/AttackAttribute.java

@@ -16,10 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Set;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -27,12 +26,13 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class AttackAttribute extends AbstractEffect
 {
-	private final Set<AttributeType> _attributes = new HashSet<>();
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public AttackAttribute(StatSet params)
 	{
@@ -40,55 +40,32 @@ public class AttackAttribute extends AbstractEffect
 		final String attributes = params.getString("attribute", "FIRE");
 		if (attributes.contains(","))
 		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
 			for (String attribute : attributes.split(","))
 			{
-				_attributes.add(AttributeType.findByName(attribute.trim()));
+				_multipleStats.add(Stat.valueOf(attribute + "_POWER"));
 			}
 		}
 		else
 		{
-			_attributes.add(AttributeType.findByName(attributes));
+			_singleStat = Stat.valueOf(attributes + "_POWER");
+			_multipleStats = null;
 		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		for (AttributeType attribute : _attributes)
+		if (_singleStat != null)
 		{
-			switch (attribute)
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				case FIRE:
+		}
-				{
+		
-					effected.getStat().mergeAdd(Stat.FIRE_POWER, _amount);
+		for (Stat stat : _multipleStats)
-					break;
+		{
-				}
+			effected.getStat().mergeAdd(stat, _amount);
-				case WATER:
-				{
-					effected.getStat().mergeAdd(Stat.WATER_POWER, _amount);
-					break;
-				}
-				case WIND:
-				{
-					effected.getStat().mergeAdd(Stat.WIND_POWER, _amount);
-					break;
-				}
-				case EARTH:
-				{
-					effected.getStat().mergeAdd(Stat.EARTH_POWER, _amount);
-					break;
-				}
-				case HOLY:
-				{
-					effected.getStat().mergeAdd(Stat.HOLY_POWER, _amount);
-					break;
-				}
-				case DARK:
-				{
-					effected.getStat().mergeAdd(Stat.DARK_POWER, _amount);
-					break;
-				}
-			}
 		}
 	}
 }

L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/effecthandlers/DefenceAttribute.java

@@ -16,10 +16,9 @@
  */
 package handlers.effecthandlers;
 
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Set;
 
-import org.l2jmobius.gameserver.enums.AttributeType;
 import org.l2jmobius.gameserver.model.StatSet;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -27,12 +26,13 @@ import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.stats.Stat;
 
 /**
- * @author Sdw
+ * @author Mobius
  */
 public class DefenceAttribute extends AbstractEffect
 {
-	private final Set<AttributeType> _attributes = new HashSet<>();
 	private final double _amount;
+	private final Stat _singleStat;
+	private final Set<Stat> _multipleStats;
 	
 	public DefenceAttribute(StatSet params)
 	{
@@ -40,55 +40,32 @@ public class DefenceAttribute extends AbstractEffect
 		final String attributes = params.getString("attribute", "FIRE");
 		if (attributes.contains(","))
 		{
+			_singleStat = null;
+			_multipleStats = EnumSet.noneOf(Stat.class);
 			for (String attribute : attributes.split(","))
 			{
-				_attributes.add(AttributeType.findByName(attribute.trim()));
+				_multipleStats.add(Stat.valueOf(attribute + "_RES"));
 			}
 		}
 		else
 		{
-			_attributes.add(AttributeType.findByName(attributes));
+			_singleStat = Stat.valueOf(attributes + "_RES");
+			_multipleStats = null;
 		}
 	}
 	
 	@Override
 	public void pump(Creature effected, Skill skill)
 	{
-		for (AttributeType attribute : _attributes)
+		if (_singleStat != null)
 		{
-			switch (attribute)
+			effected.getStat().mergeAdd(_singleStat, _amount);
-			{
+			return;
-				case FIRE:
+		}
-				{
+		
-					effected.getStat().mergeAdd(Stat.FIRE_RES, _amount);
+		for (Stat stat : _multipleStats)
-					break;
+		{
-				}
+			effected.getStat().mergeAdd(stat, _amount);
-				case WATER:
-				{
-					effected.getStat().mergeAdd(Stat.WATER_RES, _amount);
-					break;
-				}
-				case WIND:
-				{
-					effected.getStat().mergeAdd(Stat.WIND_RES, _amount);
-					break;
-				}
-				case EARTH:
-				{
-					effected.getStat().mergeAdd(Stat.EARTH_RES, _amount);
-					break;
-				}
-				case HOLY:
-				{
-					effected.getStat().mergeAdd(Stat.HOLY_RES, _amount);
-					break;
-				}
-				case DARK:
-				{
-					effected.getStat().mergeAdd(Stat.DARK_RES, _amount);
-					break;
-				}
-			}
 		}
 	}
 }