Implement plant remove and undo select.

antonrufino · Jun 2, 2016 · 8c569c3 · 8c569c3
1 parent ef758f4
commit 8c569c3
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 5 deletions.
diff --git a/src/Banga.java b/src/Banga.java
@@ -66,8 +66,7 @@ public void run() {
             this.kill();
             Game.getInstance().getGrid().setPlant(this.getRow(), this.getCol(), null);
         } catch (InterruptedException e) {
-            System.out.println(e.getMessage());
-            e.printStackTrace();
+            return;
         }
     }
 

diff --git a/src/Game.java b/src/Game.java
@@ -102,6 +102,26 @@ public void placePlant(Point p) {
         }
     }
 
+    public void removePlant(Point p) {
+        for (int i = 0; i < Grid.ROWS; ++i) {
+            for (int j = 0; j < Grid.COLS; ++j) {
+                Rectangle rect = grid.getRectangle(i, j);
+                if (rect.contains(p)) {
+                    if (grid.hasPlant(i, j)) {
+                        grid.getPlant(i, j).kill();
+                        grid.setPlant(i, j, null);
+                    }
+                    return;
+                }
+            }
+        }
+    }
+
+    public void undoSelectPlant() {
+        this.setPendingButton(null);
+        this.selectPlant(null);
+    }
+
     public void collectEnergy(Point p) {
         for (int i = 0; i < energyList.size(); ++i) {
             Energy e = energyList.get(i);

diff --git a/src/GamePanel.java b/src/GamePanel.java
@@ -99,8 +99,16 @@ public void mousePressed(MouseEvent me){}
             public void mouseClicked(MouseEvent me){
                 // A mouse click can collect energy or place a plant on the grid.
                 Point p = me.getPoint();
-                if (game.getSelectedPlant() != null) game.placePlant(p);
-                game.collectEnergy(p);
+
+                if (p == null) return;
+
+                if (SwingUtilities.isLeftMouseButton(me)) {
+                    if (game.getSelectedPlant() != null)game.placePlant(p);
+                    else game.collectEnergy(p);
+                } else if (SwingUtilities.isRightMouseButton(me)) {
+                    if (game.getSelectedPlant() != null) game.undoSelectPlant();
+                    else game.removePlant(p);
+                }
             }
         });
     }

diff --git a/src/Grid.java b/src/Grid.java
@@ -52,7 +52,7 @@ public boolean hasPlant(int row, int col) {
     }
 
     // Get the plant contained by a tile.
-    public Plant getPlant(int row, int col) {
+    public synchronized Plant getPlant(int row, int col) {
         return plants[row][col];
     }