From 0a4b00aad35607ac1ff158da945ecdb5e869d3d6 Mon Sep 17 00:00:00 2001 From: ericnerdo Date: Sun, 24 Apr 2016 21:19:35 +0200 Subject: [PATCH] Tile-attributes changed Tile.itemOnTile no longer exists, it was replaced by boxStack and zpmOnTile. Getter-Setter methods were added. --- cicaprojekt/Tile.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/cicaprojekt/Tile.java b/cicaprojekt/Tile.java index 8ba3c6d..05f9868 100644 --- a/cicaprojekt/Tile.java +++ b/cicaprojekt/Tile.java @@ -2,10 +2,12 @@ package cicaprojekt; import java.util.HashMap; import java.util.Map; +import java.util.Stack; public abstract class Tile { protected Map adjacentTile; - private Pickable itemOnTile; + protected ZPM zpmOnTile; + protected Stack boxStack; public Tile(){ @@ -15,7 +17,7 @@ public abstract class Tile { adjacentTile.put(Direction.EAST, Field.testField); adjacentTile.put(Direction.SOUTH, Field.testField); adjacentTile.put(Direction.WEST, Field.testField); - itemOnTile = new Box(); + zpmOnTile = new ZPM(); } public Tile getAdjacentTile(Direction direction) { @@ -32,13 +34,17 @@ public abstract class Tile { public abstract void onExit(PlayerBase playerBase); - public Pickable removeItemFromTile() { - Pickable item = itemOnTile; - itemOnTile = null; - return item; + public ZPM getZPMFromTile() { + ZPM zpm = zpmOnTile; + zpmOnTile = null; + return zpm; } - public void setItemOnTile(Pickable item) { - itemOnTile = item; + public void putABox(Box box) { + boxStack.push(box); + } + + public Box getABox(){ + return boxStack.pop(); } }