From ba9121329e19f9a3a96407e7e7b9ba6e614925c2 Mon Sep 17 00:00:00 2001
From: Sabvente <sabvente@mail.com>
Date: Fri, 9 May 2014 15:53:42 +0200
Subject: [PATCH] =?UTF-8?q?k=C3=B6nnyebb=20legyett?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/world/Enemy.java | 19 ++++++++-----------
src/world/Tower.java | 8 ++++----
2 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/world/Enemy.java b/src/world/Enemy.java
index 286c2e5..2fcd2a2 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 5a1b333..18b8602 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;
--
GitLab