engine.TileSet/Zone are dead: welcome game.HexSet/Zone

5 files changed, 8 insertions, 49 deletions

diff --git a/core/src/ch/asynk/tankontank/engine/Board.java b/core/src/ch/asynk/tankontank/engine/Board.java
index 8dd0ce9..cc3b08f 100644
--- a/core/src/ch/asynk/tankontank/engine/Board.java
+++ b/core/src/ch/asynk/tankontank/engine/Board.java
@@ -32,12 +32,6 @@ public abstract class Board implements Disposable
         public Tile getNewTile(float x, float y, int col, int row, boolean offmap);
     }
 
-    public interface TileCollection extends Collection<Tile>
-    {
-        public Tile first();
-        public void enable(int i, boolean enable);
-    }
-
     public interface PawnCollection extends Collection<Pawn>
     {
         public Pawn first();
@@ -293,7 +287,7 @@ public abstract class Board implements Disposable
             debugShapes.setTransformMatrix(prevTransform);
     }
 
-    protected int collectPossibleMoves(Pawn pawn, TileCollection moves)
+    protected int collectPossibleMoves(Pawn pawn, Collection<Tile> moves)
     {
         return searchBoard.possibleMovesFrom(pawn, moves);
     }
diff --git a/core/src/ch/asynk/tankontank/engine/PossiblePaths.java b/core/src/ch/asynk/tankontank/engine/PossiblePaths.java
index 91038da..30f63fd 100644
--- a/core/src/ch/asynk/tankontank/engine/PossiblePaths.java
+++ b/core/src/ch/asynk/tankontank/engine/PossiblePaths.java
@@ -1,9 +1,11 @@
 package ch.asynk.tankontank.engine;
 
-import java.util.List;
 import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.LinkedList;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
 
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.math.Vector3;
@@ -20,12 +22,12 @@ public class PossiblePaths implements Iterable<Vector3>
     private List<Tile> ctrlTiles;
     private List<ArrayList<Tile>> paths;
     private List<ArrayList<Tile>> filteredPaths;
-    private Board.TileCollection tiles;
+    private HashSet<Tile> tiles;
 
     public PossiblePaths(Board board, int tSize, int stSize, int ftSize, int vectSize)
     {
         this.board = board;
-        this.tiles = new TileSet(board, tSize);
+        this.tiles = new LinkedHashSet<Tile>(tSize);
         this.stack = new ArrayList<Tile>(stSize);
         this.ctrlTiles = new ArrayList<Tile>(ftSize);
         this.paths = new LinkedList<ArrayList<Tile>>();
diff --git a/core/src/ch/asynk/tankontank/engine/SearchBoard.java b/core/src/ch/asynk/tankontank/engine/SearchBoard.java
index a93bd67..227d19a 100644
--- a/core/src/ch/asynk/tankontank/engine/SearchBoard.java
+++ b/core/src/ch/asynk/tankontank/engine/SearchBoard.java
@@ -7,6 +7,7 @@ import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.ArrayDeque;
 import java.util.Iterator;
+import java.util.Collection;
 
 public class SearchBoard
 {
@@ -110,7 +111,7 @@ public class SearchBoard
         a[5] = getNode((src.col - 1), (src.row - 1));
     }
 
-    public int possibleMovesFrom(Pawn pawn, Board.TileCollection moves)
+    public int possibleMovesFrom(Pawn pawn, Collection<Tile> moves)
     {
         moves.clear();
         searchCount += 1;
diff --git a/core/src/ch/asynk/tankontank/engine/TileSet.java b/core/src/ch/asynk/tankontank/engine/TileSet.java
deleted file mode 100644
index c8897f3..0000000
--- a/core/src/ch/asynk/tankontank/engine/TileSet.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package ch.asynk.tankontank.engine;
-
-import java.util.LinkedHashSet;
-
-public class TileSet extends LinkedHashSet<Tile> implements Board.TileCollection
-{
-    private final Board board;
-
-    public TileSet(Board board, int n)
-    {
-        super(n);
-        this.board = board;
-    }
-
-    public Tile first()
-    {
-        if (isEmpty()) return null;
-        return iterator().next();
-    }
-
-    public void enable(int i, boolean enable)
-    {
-        for (Tile tile : this)
-            board.enableOverlayOn(tile, i, enable);
-    }
-}
diff --git a/core/src/ch/asynk/tankontank/engine/Zone.java b/core/src/ch/asynk/tankontank/engine/Zone.java
deleted file mode 100644
index f0c957b..0000000
--- a/core/src/ch/asynk/tankontank/engine/Zone.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package ch.asynk.tankontank.engine;
-
-public class Zone extends TileSet
-{
-    public int allowedMoves;
-    public Orientation orientation;
-
-    public Zone(Board board, int n)
-    {
-        super(board, n);
-    }
-}