minions from previous waves that were still on the field can also be …

…attacked now
juleskreutzer · Nov 2, 2015 · 4953138 · 4953138
1 parent 9c07e1c
commit 4953138
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/HackAttackFX/src/hackattackfx/Defense.java b/HackAttackFX/src/hackattackfx/Defense.java
@@ -367,7 +367,11 @@ else if(this.level == 3)
     public Minion findTarget(){
         ArrayList<Minion> inrange = new ArrayList<Minion>();
         GameEngine engine = GameEngine.getInstance();
+        ArrayList<Wave> waves = engine.getActiveWaves();
         ArrayList<Minion> minions = engine.getActiveWave().minionsAsList();
+        for (Wave w : waves) {
+            minions.addAll(w.minionsAsList());
+        }
         for(Minion m : minions){
             if(targetInRange(m)){
                 inrange.add(m);

diff --git a/HackAttackFX/src/hackattackfx/GameEngine.java b/HackAttackFX/src/hackattackfx/GameEngine.java
@@ -385,6 +385,14 @@ public Wave getActiveWave(){
         return currentWave;
     }
 
+    public ArrayList<Wave> getActiveWaves() {
+        ArrayList<Wave> result = new ArrayList<Wave>();
+        for (Wave w : this.waveList) {
+            if (w.waveActive()) result.add(w);
+        }
+        return result;
+    }
+
     private Wave generateNextWave(){
         // calculates how strong this wave should be and ups  waveNumber by one
         int waveStrongness = 5 + (int)(0.5 * ++waveNumber * waveNumber);

diff --git a/HackAttackFX/src/hackattackfx/Wave.java b/HackAttackFX/src/hackattackfx/Wave.java
@@ -158,7 +158,7 @@ public ArrayList<Minion> minionsAsList(){
     }
 
     public boolean waveActive(){
-        return minionList.size() > 0 ? true : false;
+        return (minionList.size() > 0);
     }
 
     /**