src/main/java/controller/GameController.java

@@ -4,11 +4,12 @@ import model.GameModel;
 import model.GameSaver;
 import model.Item;
 import model.items.ITEM_NAME;
+import model.tiles.InteractiveTile;
 import util.GAMESTATE;
 import view.GamePanel;
-import view.tile.interactive.Hut;
-import view.tile.interactive.InteractiveTile;
+import view.tile.interactive.*;
 
+import java.awt.*;
 import java.io.Serializable;
 import java.util.ArrayList;
 
@@ -33,8 +34,23 @@ public class GameController implements Runnable, Serializable {
     }
 
     private void setupInteractiveTiles() {
-        Hut hut = new Hut(23, 20, this);
-        view.tileManager.addInteractiveTile(hut);
+        Lighthouse lighthouse = new Lighthouse(24, 20, this);
+        view.tileManager.addInteractiveTile(lighthouse);
+
+        Mine mine = new Mine(25, 20, this);
+        view.tileManager.addInteractiveTile(mine);
+
+        Barracks barracks = new Barracks(26, 20, this);
+        view.tileManager.addInteractiveTile(barracks);
+
+        IronMine ironMine = new IronMine(27, 20, this);
+        view.tileManager.addInteractiveTile(ironMine);
+
+        AnimalEnclosure animalEnclosure = new AnimalEnclosure(28, 20, this);
+        view.tileManager.addInteractiveTile(animalEnclosure);
+
+        Sawmill sawmill = new Sawmill(29, 20, this);
+        view.tileManager.addInteractiveTile(sawmill);
     }
 
     private void setStartInventory() {

src/main/java/view/UI.java

@@ -4,8 +4,8 @@ import util.GAMESTATE;
 import util.Translator;
 import view.components.Button;
 import view.popUpMenu.PopupMenu;
-import view.tile.interactive.InteractiveTile;
-import view.tile.interactive.ONCLICKTYPE;
+import view.tile.InteractiveTile;
+import view.tile.ONCLICKTYPE;
 
 import java.awt.*;
 import java.util.ArrayList;

src/main/java/view/tile/interactive/InteractiveTile.java → src/main/java/view/tile/InteractiveTile.java

@@ -1,4 +1,4 @@
-package view.tile.interactive;
+package view.tile;
 
 import model.Tile;
 import java.awt.*;

src/main/java/view/tile/interactive/ONCLICKTYPE.java → src/main/java/view/tile/ONCLICKTYPE.java

@@ -1,4 +1,4 @@
-package view.tile.interactive;
+package view.tile;
 
 public enum ONCLICKTYPE {
     RUNNABLE,

src/main/java/view/tile/TileManager.java

@@ -1,10 +1,8 @@
 package view.tile;
 
-import controller.GameController;
 import model.Tile;
 import model.tiles.BackgroundTile;
 import view.GamePanel;
-import view.tile.interactive.InteractiveTile;
 
 import java.awt.*;
 import java.io.BufferedReader;

src/main/java/view/tile/interactive/AnimalEnclosure.java

@@ -0,0 +1,27 @@
+package view.tile.interactive;
+
+import controller.GameController;
+import view.Camera;
+import view.popUpMenu.PopupMenu;
+import view.popUpMenu.UpgradeMenu;
+import view.tile.InteractiveTile;
+
+import java.awt.*;
+
+public class AnimalEnclosure extends InteractiveTile {
+
+    public AnimalEnclosure(int worldGridX, int worldGridY, GameController gc) {
+        super(worldGridX, worldGridY, gc.getView().tileSize, gc.getView().tileSize, gc);
+        PopupMenu popup = new UpgradeMenu(100, 100);
+
+        setPopupOnClick(popup);
+    }
+
+    @Override
+    public void drawTile(Graphics2D g2, Camera camera) {
+        int size = gameController.getView().tileSize;
+        g2.setColor(new Color(0, 0, 0, 160));
+        setImage("/tiles/animalEnclosureTest.png");
+        g2.drawImage(image, screenX, screenY, gameController.getView().tileSize, gameController.getView().tileSize, null);
+    }
+}

src/main/java/view/tile/interactive/Barracks.java

@@ -0,0 +1,27 @@
+package view.tile.interactive;
+
+import controller.GameController;
+import view.Camera;
+import view.popUpMenu.PopupMenu;
+import view.popUpMenu.UpgradeMenu;
+import view.tile.InteractiveTile;
+
+import java.awt.*;
+
+public class Barracks extends InteractiveTile {
+
+    public Barracks(int worldGridX, int worldGridY, GameController gc) {
+        super(worldGridX, worldGridY, gc.getView().tileSize, gc.getView().tileSize, gc);
+        PopupMenu popup = new UpgradeMenu(100, 100);
+
+        setPopupOnClick(popup);
+    }
+
+    @Override
+    public void drawTile(Graphics2D g2, Camera camera) {
+        int size = gameController.getView().tileSize;
+        g2.setColor(new Color(0, 0, 0, 160));
+        setImage("/tiles/barracksTest.png");
+        g2.drawImage(image, screenX, screenY, gameController.getView().tileSize, gameController.getView().tileSize, null);
+    }
+}

src/main/java/view/tile/interactive/IronMine.java

@@ -0,0 +1,27 @@
+package view.tile.interactive;
+
+import controller.GameController;
+import view.Camera;
+import view.popUpMenu.PopupMenu;
+import view.popUpMenu.UpgradeMenu;
+import view.tile.InteractiveTile;
+
+import java.awt.*;
+
+public class IronMine extends InteractiveTile {
+
+    public IronMine(int worldGridX, int worldGridY, GameController gc) {
+        super(worldGridX, worldGridY, gc.getView().tileSize, gc.getView().tileSize, gc);
+        PopupMenu popup = new UpgradeMenu(100, 100);
+
+        setPopupOnClick(popup);
+    }
+
+    @Override
+    public void drawTile(Graphics2D g2, Camera camera) {
+        int size = gameController.getView().tileSize;
+        g2.setColor(new Color(0, 0, 0, 160));
+        setImage("/tiles/mineIronTest.png");
+        g2.drawImage(image, screenX, screenY, gameController.getView().tileSize, gameController.getView().tileSize, null);
+    }
+}

src/main/java/view/tile/interactive/Lighthouse.java

@@ -0,0 +1,29 @@
+package view.tile.interactive;
+
+import controller.GameController;
+import view.Camera;
+import view.popUpMenu.PopupMenu;
+import view.popUpMenu.UpgradeMenu;
+import view.tile.InteractiveTile;
+
+import java.awt.*;
+
+public class Lighthouse extends InteractiveTile {
+
+    public Lighthouse(int worldGridX, int worldGridY, GameController gc) {
+        super(worldGridX, worldGridY, gc.getView().tileSize, gc.getView().tileSize, gc);
+        PopupMenu popup = new UpgradeMenu(100, 100);
+
+        setPopupOnClick(popup);
+    }
+
+    @Override
+    public void drawTile(Graphics2D g2, Camera camera) {
+        int size = gameController.getView().tileSize;
+        g2.setColor(new Color(0, 0, 0, 160));
+        setImage("/tiles/lighthouseTest.png");
+        g2.drawImage(image, screenX, screenY, gameController.getView().tileSize, gameController.getView().tileSize, null);
+
+    }
+
+}

src/main/java/view/tile/interactive/Mine.java

@@ -0,0 +1,30 @@
+package view.tile.interactive;
+
+import controller.GameController;
+import view.Camera;
+import view.popUpMenu.PopupMenu;
+import view.popUpMenu.UpgradeMenu;
+import view.tile.InteractiveTile;
+
+import java.awt.*;
+import java.io.Serializable;
+
+public class Mine extends InteractiveTile implements Serializable {
+
+    public Mine(int worldGridX, int worldGridY, GameController gc) {
+        super(worldGridX, worldGridY, gc.getView().tileSize, gc.getView().tileSize, gc);
+        PopupMenu popup = new UpgradeMenu(100, 100);
+
+        setPopupOnClick(popup);
+    }
+
+    @Override
+    public void drawTile(Graphics2D g2, Camera camera) {
+        int size = gameController.getView().tileSize;
+        g2.setColor(new Color(0, 0, 0, 160));
+        setImage("/tiles/mineTest.png");
+        g2.drawImage(image, screenX, screenY, gameController.getView().tileSize, gameController.getView().tileSize, null);
+
+    }
+
+}

src/main/java/view/tile/interactive/Hut.java → src/main/java/view/tile/interactive/Sawmill.java

@@ -4,13 +4,13 @@ import controller.GameController;
 import view.Camera;
 import view.popUpMenu.PopupMenu;
 import view.popUpMenu.UpgradeMenu;
+import view.tile.InteractiveTile;
 
 import java.awt.*;
-import java.io.Serializable;
 
-public class Hut extends InteractiveTile implements Serializable {
+public class Sawmill extends InteractiveTile {
 
-    public Hut(int worldGridX, int worldGridY, GameController gc) {
+    public Sawmill(int worldGridX, int worldGridY, GameController gc) {
         super(worldGridX, worldGridY, gc.getView().tileSize, gc.getView().tileSize, gc);
         PopupMenu popup = new UpgradeMenu(100, 100);
 
@@ -21,8 +21,8 @@ public class Hut extends InteractiveTile implements Serializable {
     public void drawTile(Graphics2D g2, Camera camera) {
         int size = gameController.getView().tileSize;
         g2.setColor(new Color(0, 0, 0, 160));
-        setImage("/sprites/hut.png");
+        setImage("/tiles/sawmillTest.png");
         g2.drawImage(image, screenX, screenY, gameController.getView().tileSize, gameController.getView().tileSize, null);
-
     }
-}
+
+}