Neue Texturen implementiert, Tile size angepasst und Graphik change bei upgrade.

src/main/java/controller/tiles/interactive/upgradeable/AnimalEnclosureController.java

@@ -12,7 +12,7 @@ public class AnimalEnclosureController extends InteractiveTileController {
 
     public AnimalEnclosureController(GameController gc, InteractiveTileModel model) {
         super(model, null, gc);
-        setView(new AnimalEnclosureView(gc, this));
+        setView(new AnimalEnclosureView(2, 2, gc, this));
         PopupMenu popup = new UpgradeMenu(100, 100, Translator.translate("popup.title.animal_enclosure"), this);
         setPopupOnClick(popup);
     }

src/main/java/controller/tiles/interactive/upgradeable/BarracksController.java

@@ -12,7 +12,7 @@ public class BarracksController extends InteractiveTileController {
 
     public BarracksController(GameController gc, InteractiveTileModel model) {
         super(model, null, gc);
-        setView(new BarracksView(gc, this));
+        setView(new BarracksView(2, 2,gc, this));
         PopupMenu popup = new UpgradeMenu(100, 100, Translator.translate("popup.title.barracks"), this);
         setPopupOnClick(popup);
     }

src/main/java/controller/tiles/interactive/upgradeable/IronMineController.java

@@ -10,20 +10,22 @@ import view.tile.interactive.IronMineView;
 
 public class IronMineController extends InteractiveTileController {
 
+    private GameController gc;
+
     public IronMineController(GameController gc, InteractiveTileModel model) {
         super(model, null, gc);
-        setView(new IronMineView(gc, this));
-        PopupMenu popup = new UpgradeMenu(100, 100, Translator.translate("popup.title.iron_mine"), this);
+        setView(new IronMineView(2, 2,gc, this, 1));
+        PopupMenu popup = new UpgradeMenu(100, 100, Translator.translate("popup.title.ironmine"), this);
 
         setPopupOnClick(popup);
+        this.gc = gc;
     }
 
     @Override
     public void upgrade() {
-        boolean condition = false;
-        if(condition){
-            getModel().upgrade();
-        }
+        setView(new IronMineView(2, 2,gc, this, 2));
+        PopupMenu popup = new UpgradeMenu(100, 100, Translator.translate("popup.title.ironmine"), this);
+        setPopupOnClick(popup);
     }
 
     @Override

src/main/java/controller/tiles/interactive/upgradeable/LighthouseController.java

@@ -6,20 +6,25 @@ import model.tiles.InteractiveTileModel;
 import util.Translator;
 import view.popUpMenu.PopupMenu;
 import view.popUpMenu.UpgradeMenu;
+import view.tile.interactive.IronMineView;
 import view.tile.interactive.LighthouseView;
 
 public class LighthouseController extends InteractiveTileController {
-
+    GameController gc;
     public LighthouseController(GameController gc, InteractiveTileModel model) {
         super(model, null, gc);
-        setView(new LighthouseView(2, 2, gc, this));
+        setView(new LighthouseView(2, 2, gc, this, 1));
         PopupMenu popup = new UpgradeMenu(100, 110, Translator.translate("popup.title.lighthouse"), this);
         setPopupOnClick(popup);
+        this.gc = gc;
     }
 
     @Override
     public void upgrade() {
-
+        int level = getModel().getLevel();
+        setView(new LighthouseView(2, 2,gc, this, level + 1));
+        PopupMenu popup = new UpgradeMenu(100, 100, Translator.translate("popup.title.lighthouse"), this);
+        setPopupOnClick(popup);
     }
 
     @Override

src/main/java/controller/tiles/interactive/upgradeable/MineController.java

@@ -10,19 +10,21 @@ import view.tile.interactive.MineView;
 
 public class MineController extends InteractiveTileController {
 
+    GameController gc;
+
     public MineController(GameController gc, InteractiveTileModel model) {
         super(model, null, gc);
-        setView(new MineView(2, 2,gc, this));
+        setView(new MineView(2, 2,gc, this, 1));
         PopupMenu popup = new UpgradeMenu(100, 100, Translator.translate("popup.title.mine"), this);
         setPopupOnClick(popup);
+        this.gc = gc;
     }
 
     @Override
     public void upgrade() {
-        boolean condition = false;
-        if(condition){
-            getModel().upgrade();
-        }
+        setView(new MineView(2, 2,gc, this, 2));
+        PopupMenu popup = new UpgradeMenu(100, 100, Translator.translate("popup.title.mine"),  this);
+        setPopupOnClick(popup);
     }
 
     @Override

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

@@ -147,13 +147,16 @@ public class TileManager implements RenderingManager {
     public void getTileImage(){
         try{
             setupTile(0, "grass");
-            setupTile(1, "wall");
+            setupTile(1, "path_left_down");
             setupTile(2, "water", false);
-            setupTile(3, "earth");
+            setupTile(3, "path_crossing");
 
-            setupTile(4, "tree", false);
+            setupTile(4, "grass_tree", false);
 
-            setupTile(5, "sand");
+            setupTile(5, "path_straight");
+            setupTile(6, "path_left_up");
+            setupTile(7, "path_right_up");
+            setupTile(8, "path_right_down");
 
         }catch (IOException e){
             e.printStackTrace();

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

@@ -5,8 +5,8 @@ import controller.tiles.interactive.InteractiveTileController;
 
 public class AnimalEnclosureView extends InteractiveTileView {
 
-    public AnimalEnclosureView(GameController gc, InteractiveTileController controller) {
-        super( 1, 1, controller, gc.getView().tileManager);
+    public AnimalEnclosureView(int scaleX, int scaleY, GameController gc, InteractiveTileController controller) {
+        super( scaleX, scaleY, controller, gc.getView().tileManager);
         setImage("/tiles/animal_enclosure/animal_enclosureTest.png");
     }
 }

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

@@ -5,8 +5,8 @@ import controller.tiles.interactive.InteractiveTileController;
 
 public class BarracksView extends InteractiveTileView {
 
-    public BarracksView(GameController gc, InteractiveTileController controller) {
-        super( 1,1, controller, gc.getView().tileManager);
-        setImage("/tiles/barracks/barracksTest.png");
+    public BarracksView(int scaleX, int scaleY, GameController gc, InteractiveTileController controller) {
+        super( scaleX, scaleY, controller, gc.getView().tileManager);
+        setImage("/tiles/barracks/barracks.png");
     }
 }

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

@@ -5,8 +5,12 @@ import controller.tiles.interactive.InteractiveTileController;
 
 public class IronMineView extends InteractiveTileView {
 
-    public IronMineView(GameController gc, InteractiveTileController controller) {
-        super( 1,1, controller, gc.getView().tileManager);
-        setImage("/tiles/iron_mine/iron_mine_lvl1.png");
+    public IronMineView(int scaleX, int scaleY, GameController gc, InteractiveTileController controller, int level) {
+        super( scaleX, scaleY, controller, gc.getView().tileManager);
+        if(level == 1){
+            setImage("/tiles/iron_mine/ironmine_1.png");
+        } else if(level == 2) {
+            setImage("/tiles/iron_mine/ironmine_2.png");
+        }
     }
 }

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

@@ -5,9 +5,18 @@ import controller.tiles.interactive.InteractiveTileController;
 
 public class LighthouseView extends InteractiveTileView {
 
-    public LighthouseView(int scaleX, int scaleY, GameController gc, InteractiveTileController controller) {
+    public LighthouseView(int scaleX, int scaleY, GameController gc, InteractiveTileController controller, int level) {
         super( scaleX, scaleY, controller, gc.getView().tileManager);
-        setImage("/tiles/lighthouse/lighthouse_5.png");
+        if(level == 1){
+            setImage("/tiles/lighthouse/lighthouse_5.png");
+        } else if(level == 2) {
+            setImage("/tiles/lighthouse/lighthouse_5.png");
+        } else if (level ==3){
+            setImage("/tiles/lighthouse/lighthouse_5.png");
+        } else if (level == 4) {
+            setImage("/tiles/lighthouse/lighthouse_5.png");
+        } else if (level == 5) {
+            setImage("/tiles/lighthouse/lighthouse_5.png");
+        }
     }
-
 }

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

@@ -5,9 +5,13 @@ import controller.tiles.interactive.InteractiveTileController;
 
 public class MineView extends InteractiveTileView {
 
-    public MineView(int scaleX, int scaleY,GameController gc, InteractiveTileController controller) {
+    public MineView(int scaleX, int scaleY,GameController gc, InteractiveTileController controller, int level) {
         super( scaleX, scaleY, controller, gc.getView().tileManager );
-        setImage("/tiles/mine/mine_lvl1.png");
+        if(level == 1){
+            setImage("/tiles/mine/stonemine_1.png");
+        } else if(level == 2) {
+            setImage("/tiles/mine/stonemine_2.png");
+        }
     }
 
 }

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

@@ -7,7 +7,7 @@ public class SawmillView extends InteractiveTileView {
 
     public SawmillView(int scaleX, int scaleY, GameController gc, InteractiveTileController controller) {
         super( scaleX,scaleY, controller, gc.getView().tileManager);
-        setImage("/tiles/sawmill/sawmillTest.png");
+        setImage("/tiles/sawmill/sawmill_1.png");
     }
 
 }

src/main/java/view/ui/InventoryView.java

@@ -53,7 +53,7 @@ public class InventoryView {
         String itemName = item.getItemName().toString();
 
         int offset = 20;
-        g2.drawImage(getImage("/items/" + itemName + ".png"), x + offset/2, y + offset/2, slotSize - offset, slotSize -offset, null);
+        g2.drawImage(getImage("/items/" + "iron_item" + ".png"), x + offset/2, y + offset/2, slotSize - offset, slotSize -offset, null);
 
         //g2.drawString(Translator.translate("item."+itemName), x + slotSpacing/4, y + slotSize / 2 + 5);