Merge branch 'master' of git.sch.bme.hu:sabvente/akettorony

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();

src/world/Tower.java

@@ -37,12 +37,12 @@ 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;
+		recoilTime = 4;
 		range = 1;
 	}
 
@@ -115,7 +115,7 @@ public class Tower extends Placeable implements ITickable, IEnemyObserver,
 		if (!fogDescends) {
 			if ((new Random()).nextInt(50) == 0) {
 				fogDescends = true;
-				fogTimeLeft = 3 + (new Random()).nextInt(20);
+				fogTimeLeft = 3 + (new Random()).nextInt(10);
 			}
 		}