From 33710b7dc31ef5da876e97a72db4dad78f74216c Mon Sep 17 00:00:00 2001 From: Garbage Mule Date: Tue, 13 Sep 2011 23:44:36 +0200 Subject: [PATCH] Added health-multiplier support for swarm waves. --- MobArena.jar | Bin 246849 -> 246945 bytes .../garbagemule/MobArena/waves/SwarmWave.java | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/MobArena.jar b/MobArena.jar index 73d3c7ab7edd88c84fbcb72718f6905f455ce457..a5e8d32cb160a663d006a79f8ad09b3d98737fb4 100644 GIT binary patch delta 5351 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 diff --git a/src/com/garbagemule/MobArena/waves/SwarmWave.java b/src/com/garbagemule/MobArena/waves/SwarmWave.java index a4889ab..ca0b2fe 100644 --- a/src/com/garbagemule/MobArena/waves/SwarmWave.java +++ b/src/com/garbagemule/MobArena/waves/SwarmWave.java @@ -65,7 +65,10 @@ public class SwarmWave extends AbstractWave for (int i = 0; i < amount; i++) { LivingEntity e = spawnMonster(monster, spawnpoints.get(i % spawnpointCount)); - e.setHealth(1); + + // Boost health + int health = (int) Math.min(150D, 1 * getHealthMultiplier()); + e.setHealth(Math.max(1, health)); } } }