Skip to content
Snippets Groups Projects
Commit d0dab0ad authored by Laczó Dávid Bence's avatar Laczó Dávid Bence
Browse files

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

parents f9e5f656 f8618b16
Branches
No related tags found
No related merge requests found
...@@ -23,10 +23,14 @@ public class Enemy extends Placeable implements ITickable { ...@@ -23,10 +23,14 @@ public class Enemy extends Placeable implements ITickable {
moveTimes.put(EnemyType.ELF, 2); moveTimes.put(EnemyType.ELF, 2);
moveTimes.put(EnemyType.HOBBIT, 5); moveTimes.put(EnemyType.HOBBIT, 5);
} }
/**
* public Enemy(EnemyType p_type) {
* @param dmg type = p_type;
*/ reset();
prevField = null;
hp = 100;
}
public void hurt(int dmg) { public void hurt(int dmg) {
Random rand = new Random(); Random rand = new Random();
...@@ -87,13 +91,6 @@ public class Enemy extends Placeable implements ITickable { ...@@ -87,13 +91,6 @@ public class Enemy extends Placeable implements ITickable {
return moveTries; return moveTries;
} }
public Enemy(EnemyType p_type) {
type = p_type;
reset();
prevField = null;
hp = 100;
}
public void tick() { public void tick() {
if (moveTimeLeft <= 0 && hp>0) if (moveTimeLeft <= 0 && hp>0)
move(); move();
......
...@@ -37,12 +37,12 @@ public class Tower extends Placeable implements ITickable, IEnemyObserver, ...@@ -37,12 +37,12 @@ public class Tower extends Placeable implements ITickable, IEnemyObserver,
public Tower() { public Tower() {
damage = new HashMap<EnemyType, Integer>(); damage = new HashMap<EnemyType, Integer>();
damage.put(EnemyType.HUMAN, 20); damage.put(EnemyType.HUMAN, 30);
damage.put(EnemyType.DWARF, 20); damage.put(EnemyType.DWARF, 30);
damage.put(EnemyType.ELF, 20); damage.put(EnemyType.ELF, 30);
damage.put(EnemyType.HOBBIT, 20); damage.put(EnemyType.HOBBIT, 30);
enemiesInRange = new ArrayList<Enemy>(); enemiesInRange = new ArrayList<Enemy>();
recoilTime = 5; recoilTime = 4;
range = 1; range = 1;
} }
...@@ -115,7 +115,7 @@ public class Tower extends Placeable implements ITickable, IEnemyObserver, ...@@ -115,7 +115,7 @@ public class Tower extends Placeable implements ITickable, IEnemyObserver,
if (!fogDescends) { if (!fogDescends) {
if ((new Random()).nextInt(50) == 0) { if ((new Random()).nextInt(50) == 0) {
fogDescends = true; fogDescends = true;
fogTimeLeft = 3 + (new Random()).nextInt(20); fogTimeLeft = 3 + (new Random()).nextInt(10);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment