Finished basic features

.gitignore

@@ -1,2 +1,3 @@
-/build/
-/nbproject/private/
+/build/
+/nbproject/private/
+/dist/

src/mygame/Main.java

@@ -50,23 +50,13 @@ public void simpleInitApp() {
         //Create the View
         View v = new View(this);
         g.register(v);
-        v.construct();
+        v.construct(p1, p2);
     }
 
     public void initMappings() {
         inputManager.addMapping("Pick", new MouseButtonTrigger(MouseInput.BUTTON_LEFT));
         inputManager.addListener(click, "Pick");
     }
 
-    public static Material getRandomMat() {
-        Material mat =  new Material(shortcut, "Common/MatDefs/Misc/Unshaded.j3md");
-        mat.setColor("Color", ColorRGBA.randomColor());
-        return mat;
-    }
 
-    public static Material getColoredMaterial(ColorRGBA color) {
-        Material mat = new Material(shortcut, "Common/MatDefs/Misc/Unshaded.j3md");
-        mat.setColor("Color", color);
-        return mat;
-    }
 }

src/nl/ibe/hex/game/HexCoordinate.java

@@ -63,7 +63,6 @@ public HexCoordinate getNeighbor(int i)
     public ArrayList<HexCoordinate> ring(int radius)
     {
 
-        System.out.println("this: " + this.toString());
         ArrayList<HexCoordinate> result = new ArrayList();
         HexCoordinate neigh4 = this.getNeighbor(4);
         //HexCoordinate cube = this.add(neigh4.scale(radius));
@@ -78,7 +77,6 @@ public ArrayList<HexCoordinate> ring(int radius)
         {
             for (int j =0; j < radius; j++)
             {
-                System.out.println("cube: " + cube.toString());
                 result.add(cube);
                 cube = cube.getNeighbor(i);
             }

src/nl/ibe/hex/game/HexGame.java

@@ -193,9 +193,8 @@ private void executeMove(HexMove move)
             {
                 neighTile.setOwner(currPlayer);
 
-                HexTile src = bord.get(move.getFrom());
                 HexTile dst = bord.get(move.getTo());
-                HexChange change = new HexChange(src, dst, HexChange.Type.CONQUEST);
+                HexChange change = new HexChange(dst, neighTile, HexChange.Type.CONQUEST);
                 changedTiles.add(change);
             }
         }

src/nl/ibe/hex/view/HexSpatial.java

@@ -89,7 +89,7 @@ public void setOwner(HexPlayer.Type type) {
         //Attach the stuff
         if(type != null) {
             ownerNode.attachChild(ModelSupplier.getPlayerShape(type));
-            ownerNode.attachChild(ParticleSupplier.getFire(ColorSupplier.getPlayerColor(type), ColorRGBA.White));
+            //ownerNode.attachChild(ParticleSupplier.getFire(ColorSupplier.getPlayerColor(type), ColorRGBA.White));
         }
     }
 
@@ -107,6 +107,10 @@ public void placeCorrectly() {
     public HexCoordinate getCoord() {
         return coord;
     }
+
+    public HexPlayer.Type getOwnerType() {
+        return ownerType;
+    }
 
     public Node getOwnerAttach() {
         return ownerNode;

src/nl/ibe/hex/view/View.java

@@ -70,7 +70,7 @@ public View(SimpleApplication app) {
      * It will populate the ViewGrid using the board from 
      * the game. It will also create and register a clicker.
      */
-    public void construct() {
+    public void construct(HexPlayer p1, HexPlayer p2) {
         //Is there a game?
         if(game == null) {
             //No
@@ -85,6 +85,16 @@ public void construct() {
             app.getInputManager().addMapping(Clicker.mapping, new MouseButtonTrigger(MouseInput.BUTTON_LEFT));
             app.getInputManager().addListener(click, Clicker.mapping);
         }
+
+        //Load the starters.
+        ArrayList<HexCoordinate> p1POS = game.getBoard().getPlayerPositions(p1);
+        for (HexCoordinate hexCoordinate : p1POS) {
+            grid.getGrid().get(hexCoordinate).setOwner(p1.getType());
+        }
+        ArrayList<HexCoordinate> p2POS = game.getBoard().getPlayerPositions(p2);
+        for (HexCoordinate hexCoordinate : p2POS) {
+            grid.getGrid().get(hexCoordinate).setOwner(p2.getType());
+        }
     }
 
     /**
@@ -105,27 +115,38 @@ public void tilesChanged(ArrayList<HexChange> hexagons) {
 
                     HexCoordinate c = change.getEnd().getCoordinate();
                     grid.getGrid().get(c).setOwner(change.getStart().getOwner().getType());
+                    break;
                 }
                 case JUMP: {
                     //A certain blob has to jump (through the air)
                     //To the end position.
 
-                    HexPlayer.Type jumper = change.getStart().getOwner().getType();
+
+                    HexPlayer.Type jumper = change.getEnd().getOwner().getType();
 
                     HexCoordinate s = change.getStart().getCoordinate();
                     HexCoordinate e = change.getEnd().getCoordinate();
 
+                    ///test
                     grid.getGrid().get(s).setOwner(null);
                     grid.getGrid().get(e).setOwner(jumper);
+
+                    break;
                 }
                 case CONQUEST: {
                     //Some blob has been conquered by another blob.
 
                     HexPlayer.Type conqueror = change.getStart().getOwner().getType();
-                    HexPlayer.Type ded = change.getStart().getOwner().getType();
+                    System.out.println(conqueror);
+
+                    HexSpatial s = grid.getGrid().get(change.getEnd().getCoordinate());
+                    System.out.println("spatial" + s.getOwnerType());
+
+                            s.setOwner(conqueror);
 
-                    grid.getGrid().get(change.getStart().getCoordinate()).setOwner(conqueror);
+                    break;
                 }
+
             }
 
         }
@@ -188,6 +209,9 @@ public void onClick(HexSpatial hex) {
             HexMove move = new HexMove(p, c1, c2);
 
             boolean canItMove = game.move(move);
+            if(canItMove) {
+                game.nextTurn();
+            }
 
             LOG.log(Level.INFO, "Can it move? {0}", canItMove);
             selected = false;
@@ -200,6 +224,7 @@ public void onClick(HexSpatial hex) {
                 value.setMaterial(MaterialSupplier.getColoredMaterial(ColorSupplier.getBoardColor()));
             }
 
+
         } else {    //!selected
             //Select what we have here
             selection = hex;
@@ -236,6 +261,9 @@ public void onClick(HexSpatial hex) {
 
             LOG.log(Level.INFO, "HexCoord(!selected): {0}", hex.getCoord());
         }
+
+
+
     }
 
     /**