diff --git a/MobArena.jar b/MobArena.jar index 8fc0c1d..38b1170 100644 Binary files a/MobArena.jar and b/MobArena.jar differ diff --git a/resources/plugin.yml b/resources/plugin.yml index 8734f7f..5608139 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,6 +1,6 @@ name: MobArena main: com.garbagemule.MobArena.MobArena -version: 0.94.3.24 +version: 0.94.4 softdepend: [Spout,Permissions,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells] commands: ma: diff --git a/src/com/garbagemule/MobArena/waves/MACreature.java b/src/com/garbagemule/MobArena/waves/MACreature.java index 3da9c17..4d5d6c3 100644 --- a/src/com/garbagemule/MobArena/waves/MACreature.java +++ b/src/com/garbagemule/MobArena/waves/MACreature.java @@ -25,13 +25,19 @@ public enum MACreature ZOMBIEPIGMAN(CreatureType.PIG_ZOMBIE), ZOMBIEPIGMEN(CreatureType.PIG_ZOMBIE), POWEREDCREEPER(CreatureType.CREEPER), POWEREDCREEPERS(CreatureType.CREEPER), ANGRYWOLF(CreatureType.WOLF), ANGRYWOLVES(CreatureType.WOLF), - //HUMAN(CreatureType.MONSTER), HUMANS(CreatureType.MONSTER), <-- InstantiationException - HUMAN(CreatureType.ZOMBIE), HUMANS(CreatureType.ZOMBIE), + //HUMAN(CreatureType.VILLAGER), HUMANS(CreatureType.VILLAGER), GIANT(CreatureType.GIANT), GIANTS(CreatureType.GIANT), GHAST(CreatureType.GHAST), GHASTS(CreatureType.GHAST), ENDERMAN(CreatureType.ENDERMAN), ENDERMEN(CreatureType.ENDERMAN), CAVESPIDER(CreatureType.CAVE_SPIDER), CAVESPIDERS(CreatureType.CAVE_SPIDER), - SILVERFISH(CreatureType.SILVERFISH), + SILVERFISH(CreatureType.SILVERFISH), + + // 1.0 creatures + BLAZE(CreatureType.BLAZE), BLAZES(CreatureType.BLAZE), + ENDERDRAGON(CreatureType.ENDER_DRAGON), ENDERDRAGONS(CreatureType.ENDER_DRAGON), + SNOWMAN(CreatureType.SNOWMAN), SNOWMEN(CreatureType.SNOWMAN), + MUSHROOMCOW(CreatureType.MUSHROOM_COW), MUSHROOMCOWS(CreatureType.MUSHROOM_COW), + VILLAGER(CreatureType.VILLAGER), VILLAGERS(CreatureType.VILLAGER), // Passive creatures CHICKEN(CreatureType.CHICKEN), CHICKENS(CreatureType.CHICKEN), @@ -48,7 +54,14 @@ public enum MACreature SLIMETINY(CreatureType.SLIME), SLIMESTINY(CreatureType.SLIME), SLIMESMALL(CreatureType.SLIME), SLIMESSMALL(CreatureType.SLIME), SLIMEBIG(CreatureType.SLIME), SLIMESBIG(CreatureType.SLIME), - SLIMEHUGE(CreatureType.SLIME), SLIMESHUGE(CreatureType.SLIME); + SLIMEHUGE(CreatureType.SLIME), SLIMESHUGE(CreatureType.SLIME), + + // Magma cubes + MAGMACUBE(CreatureType.MAGMA_CUBE), MAGMACUBES(CreatureType.MAGMA_CUBE), + MAGMACUBETINY(CreatureType.MAGMA_CUBE), MAGMACUBESTINY(CreatureType.MAGMA_CUBE), + MAGMACUBESMALL(CreatureType.MAGMA_CUBE),MAGMACUBESSMALL(CreatureType.MAGMA_CUBE), + MAGMACUBEBIG(CreatureType.MAGMA_CUBE), MAGMACUBESBIG(CreatureType.MAGMA_CUBE), + MAGMACUBEHUGE(CreatureType.MAGMA_CUBE), MAGMACUBESHUGE(CreatureType.MAGMA_CUBE); private CreatureType type; @@ -84,22 +97,32 @@ public enum MACreature break; case SLIME: case SLIMES: + case MAGMACUBE: + case MAGMACUBES: ((Slime) e).setSize( (1 + MobArena.random.nextInt(3)) ); break; case SLIMETINY: case SLIMESTINY: + case MAGMACUBETINY: + case MAGMACUBESTINY: ((Slime) e).setSize(1); break; case SLIMESMALL: case SLIMESSMALL: + case MAGMACUBESMALL: + case MAGMACUBESSMALL: ((Slime) e).setSize(2); break; case SLIMEBIG: case SLIMESBIG: + case MAGMACUBEBIG: + case MAGMACUBESBIG: ((Slime) e).setSize(3); break; case SLIMEHUGE: case SLIMESHUGE: + case MAGMACUBEHUGE: + case MAGMACUBESHUGE: ((Slime) e).setSize(4); break; default: diff --git a/src/com/garbagemule/MobArena/waves/NormalWave.java b/src/com/garbagemule/MobArena/waves/NormalWave.java index 65e6dd8..8f40c2a 100644 --- a/src/com/garbagemule/MobArena/waves/NormalWave.java +++ b/src/com/garbagemule/MobArena/waves/NormalWave.java @@ -72,8 +72,7 @@ public abstract class NormalWave extends AbstractWave probabilities.put(20, MACreature.ANGRYWOLVES); probabilities.put(30, MACreature.ZOMBIEPIGMEN); probabilities.put(40, MACreature.SLIMES); - probabilities.put(50, MACreature.HUMANS); - totalProbability = 50; + totalProbability = 40; } } diff --git a/src/com/garbagemule/MobArena/waves/SpecialWave.java b/src/com/garbagemule/MobArena/waves/SpecialWave.java index 24ab2bd..dc47bc6 100644 --- a/src/com/garbagemule/MobArena/waves/SpecialWave.java +++ b/src/com/garbagemule/MobArena/waves/SpecialWave.java @@ -63,7 +63,6 @@ public class SpecialWave extends NormalWave case ZOMBIEPIGMEN: case ANGRYWOLVES: amount = playerCount * 2; break; case SLIMES: amount = playerCount * 4; break; - case HUMANS: amount = playerCount + 2; break; case GIANTS: case GHASTS: amount = 2; default: amount = playerCount + 1; break;