diff --git a/src/world/Enemy.java b/src/world/Enemy.java index 286c2e5932b9545125553b3d92e5504eb0ceaace..2fcd2a2ec42eecb6371af0c6f5011ae8b3b459f2 100644 --- a/src/world/Enemy.java +++ b/src/world/Enemy.java @@ -23,10 +23,14 @@ public class Enemy extends Placeable implements ITickable { moveTimes.put(EnemyType.ELF, 2); moveTimes.put(EnemyType.HOBBIT, 5); } - /** - * - * @param dmg - */ + + public Enemy(EnemyType p_type) { + type = p_type; + reset(); + prevField = null; + hp = 100; + } + public void hurt(int dmg) { Random rand = new Random(); @@ -87,13 +91,6 @@ public class Enemy extends Placeable implements ITickable { return moveTries; } - public Enemy(EnemyType p_type) { - type = p_type; - reset(); - prevField = null; - hp = 100; - } - public void tick() { if (moveTimeLeft <= 0 && hp>0) move(); diff --git a/src/world/Tower.java b/src/world/Tower.java index 5a1b333258cfcb5fdf68f43b96bf66a440326764..18b860255c773b80c624e6f6b3bf64c1c92b732d 100644 --- a/src/world/Tower.java +++ b/src/world/Tower.java @@ -37,10 +37,10 @@ public class Tower extends Placeable implements ITickable, IEnemyObserver, public Tower() { damage = new HashMap<EnemyType, Integer>(); - damage.put(EnemyType.HUMAN, 20); - damage.put(EnemyType.DWARF, 20); - damage.put(EnemyType.ELF, 20); - damage.put(EnemyType.HOBBIT, 20); + damage.put(EnemyType.HUMAN, 30); + damage.put(EnemyType.DWARF, 30); + damage.put(EnemyType.ELF, 30); + damage.put(EnemyType.HOBBIT, 30); enemiesInRange = new ArrayList<Enemy>(); recoilTime = 5; range = 1;