MACreature enum no longer has underscores. Underscores, hyphens and periods (_, -, .) will be removed upon load, so any of those can be used anywhere for convenience

src/com/garbagemule/MobArena/util/WaveUtils.java

@@ -349,7 +349,7 @@ public class WaveUtils
         {
             for (String monster : monsters)
             {
-                if (getEnumFromString(MACreature.class, monster) != null)
+                if (MACreature.fromString(monster) != null)
                     continue;
                 
                 MobArena.warning("Invalid monster type '" + monster + "' in " + path);
@@ -377,7 +377,7 @@ public class WaveUtils
             MobArena.warning("Missing monster type in '" + path);
             wellDefined = false;
         }
-        else if (getEnumFromString(MACreature.class, monster) == null)
+        else if (MACreature.fromString(monster) == null)
         {
             MobArena.warning("Invalid monster type '" + monster + "' in " + path);
             wellDefined = false;
@@ -410,7 +410,7 @@ public class WaveUtils
             MobArena.warning("Missing monster type in '" + path);
             wellDefined = false;
         }
-        else if (getEnumFromString(MACreature.class, monster) == null)
+        else if (MACreature.fromString(monster) == null)
         {
             MobArena.warning("Invalid monster type '" + monster + "' in " + path);
             wellDefined = false;
@@ -422,7 +422,7 @@ public class WaveUtils
         {
             for (String ability : abilities.split(","))
             {
-                if (BossAbility.fromString(ability.trim().replaceAll("[-_\\.]", "").toUpperCase()) != null)
+                if (BossAbility.fromString(ability.trim()) != null)
                     continue;
 
                 MobArena.warning("Invalid boss ability '" + ability + "' in " + path);

src/com/garbagemule/MobArena/waves/BossAbility.java

@@ -306,7 +306,7 @@ public enum BossAbility
     
     public static BossAbility fromString(String string)
     {
-        return WaveUtils.getEnumFromString(BossAbility.class, string);
+        return WaveUtils.getEnumFromString(BossAbility.class, string.replaceAll("[-_\\.]", ""));
     }
     
     public String toString()

src/com/garbagemule/MobArena/waves/BossWave.java

@@ -61,7 +61,7 @@ public class BossWave extends AbstractWave
         {
             for (String a : abilities.split(","))
             {
-                String ability = a.trim().replaceAll("[-_\\.]", "").toUpperCase();
+                String ability = a.trim();
                 addAbility(BossAbility.fromString(ability));
             }
         }

src/com/garbagemule/MobArena/waves/MACreature.java

@@ -22,9 +22,9 @@ public enum MACreature
     WOLF(CreatureType.WOLF),                WOLVES(CreatureType.WOLF),
     
     // Special creatures
-    ZOMBIE_PIGMAN(CreatureType.PIG_ZOMBIE), ZOMBIE_PIGMEN(CreatureType.PIG_ZOMBIE),
+    ZOMBIEPIGMAN(CreatureType.PIG_ZOMBIE),  ZOMBIEPIGMEN(CreatureType.PIG_ZOMBIE),
-    POWERED_CREEPER(CreatureType.CREEPER),  POWERED_CREEPERS(CreatureType.CREEPER),
+    POWEREDCREEPER(CreatureType.CREEPER),   POWEREDCREEPERS(CreatureType.CREEPER),
-    ANGRY_WOLF(CreatureType.WOLF),          ANGRY_WOLVES(CreatureType.WOLF),
+    ANGRYWOLF(CreatureType.WOLF),           ANGRYWOLVES(CreatureType.WOLF),
     HUMAN(CreatureType.MONSTER),            HUMANS(CreatureType.MONSTER),
     GIANT(CreatureType.GIANT),              GIANTS(CreatureType.GIANT),
     GHAST(CreatureType.GHAST),              GHASTS(CreatureType.GHAST),
@@ -37,14 +37,14 @@ public enum MACreature
     SQUID(CreatureType.SQUID),              SQUIDS(CreatureType.SQUID),
     
     // Extended creatures
-    EXPLODING_SHEEP(CreatureType.SHEEP),
+    EXPLODINGSHEEP(CreatureType.SHEEP),
     
     // Slimes
     SLIME(CreatureType.SLIME),              SLIMES(CreatureType.SLIME),
-    SLIME_TINY(CreatureType.SLIME),         SLIMES_TINY(CreatureType.SLIME),
+    SLIMETINY(CreatureType.SLIME),          SLIMESTINY(CreatureType.SLIME),
-    SLIME_SMALL(CreatureType.SLIME),        SLIMES_SMALL(CreatureType.SLIME),
+    SLIMESMALL(CreatureType.SLIME),         SLIMESSMALL(CreatureType.SLIME),
-    SLIME_BIG(CreatureType.SLIME),          SLIMES_BIG(CreatureType.SLIME),
+    SLIMEBIG(CreatureType.SLIME),           SLIMESBIG(CreatureType.SLIME),
-    SLIME_HUGE(CreatureType.SLIME),         SLIMES_HUGE(CreatureType.SLIME);
+    SLIMEHUGE(CreatureType.SLIME),          SLIMESHUGE(CreatureType.SLIME);
     
     private CreatureType type;
     
@@ -60,7 +60,7 @@ public enum MACreature
     
     public static MACreature fromString(String string)
     {
-        return WaveUtils.getEnumFromString(MACreature.class, string);
+        return WaveUtils.getEnumFromString(MACreature.class, string.replaceAll("[-_\\.]", ""));
     }
     
     public LivingEntity spawn(Arena arena, World world, Location loc)
@@ -70,33 +70,33 @@ public enum MACreature
         switch (this)
         {
             case SHEEP:
-            case EXPLODING_SHEEP:
+            case EXPLODINGSHEEP:
                 arena.addExplodingSheep(e);
                 break;
-            case POWERED_CREEPERS:
+            case POWEREDCREEPERS:
                 ((Creeper) e).setPowered(true);
                 break;
-            case ANGRY_WOLVES:
+            case ANGRYWOLVES:
                 ((Wolf) e).setAngry(true);
                 break;
             case SLIME:
             case SLIMES:
                 ((Slime) e).setSize( (1 + MobArena.random.nextInt(3)) );
                 break;
-            case SLIME_TINY:
+            case SLIMETINY:
-            case SLIMES_TINY:
+            case SLIMESTINY:
                 ((Slime) e).setSize(1);
                 break;
-            case SLIME_SMALL:
+            case SLIMESMALL:
-            case SLIMES_SMALL:
+            case SLIMESSMALL:
                 ((Slime) e).setSize(2);
                 break;
-            case SLIME_BIG:
+            case SLIMEBIG:
-            case SLIMES_BIG:
+            case SLIMESBIG:
                 ((Slime) e).setSize(3);
                 break;
-            case SLIME_HUGE:
+            case SLIMEHUGE:
-            case SLIMES_HUGE:
+            case SLIMESHUGE:
                 ((Slime) e).setSize(4);
                 break;
             default:

src/com/garbagemule/MobArena/waves/NormalWave.java

@@ -67,11 +67,12 @@ public abstract class NormalWave extends AbstractWave
             }
             else if (type == WaveType.SPECIAL)
             {
-                probabilities.put(10, MACreature.POWERED_CREEPERS);
+                probabilities.put(10, MACreature.POWEREDCREEPERS);
-                probabilities.put(20, MACreature.ANGRY_WOLVES);
+                probabilities.put(20, MACreature.ANGRYWOLVES);
-                probabilities.put(30, MACreature.ZOMBIE_PIGMEN);
+                probabilities.put(30, MACreature.ZOMBIEPIGMEN);
                 probabilities.put(40, MACreature.SLIMES);
-                totalProbability = 40;
+                probabilities.put(50, MACreature.HUMANS);
+                totalProbability = 50;
             }
         }
     }

src/com/garbagemule/MobArena/waves/SpecialWave.java

@@ -54,9 +54,9 @@ public class SpecialWave extends NormalWave
             int amount;
             switch (entry.getValue())
             {
-                case POWERED_CREEPERS:
+                case POWEREDCREEPERS:
-                case ZOMBIE_PIGMEN:
+                case ZOMBIEPIGMEN:
-                case ANGRY_WOLVES:      amount = playerCount * 2; break;
+                case ANGRYWOLVES:       amount = playerCount * 2; break;
                 case SLIMES:            amount = playerCount * 4; break;
                 case HUMANS:            amount = playerCount + 2; break;
                 case GIANTS: