Deleted echoes from all classes.
This commit is contained in:
parent
12fd837aa3
commit
3ec53d55c8
@ -6,32 +6,16 @@ public class Box implements cicaprojekt.Pickable, cicaprojekt.Destroyable
|
|||||||
|
|
||||||
|
|
||||||
public Box(){
|
public Box(){
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Box.Box()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Box.Box()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void destroy() {
|
public void destroy() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Box.destroy()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Box.destroy()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void pick() {
|
public void pick() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Box.pick()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Box.pick()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int weight() {
|
public int weight() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Box.weight()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Box.weight()");
|
|
||||||
Menu.removeTab();
|
|
||||||
return this.weight;
|
return this.weight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,9 +5,6 @@ import java.io.*;
|
|||||||
public class Dungeon {
|
public class Dungeon {
|
||||||
cicaprojekt.Tile buildDungeon(File input) throws IOException
|
cicaprojekt.Tile buildDungeon(File input) throws IOException
|
||||||
{
|
{
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Dungeon.buildDungeon(" + input + ")");
|
|
||||||
|
|
||||||
Tile oneilllocation = null;
|
Tile oneilllocation = null;
|
||||||
Tile jaffalocation = null;
|
Tile jaffalocation = null;
|
||||||
try(BufferedReader reader = new BufferedReader(new FileReader(input)))
|
try(BufferedReader reader = new BufferedReader(new FileReader(input)))
|
||||||
@ -103,9 +100,6 @@ public class Dungeon {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Dungeon.buildDungeon()");
|
|
||||||
Menu.removeTab();
|
|
||||||
return oneilllocation;
|
return oneilllocation;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,6 @@ public class Field extends cicaprojekt.Tile
|
|||||||
|
|
||||||
public Field() {
|
public Field() {
|
||||||
setItemOnTile(new Box());
|
setItemOnTile(new Box());
|
||||||
|
|
||||||
adjacentTile = testAdjacentTile;
|
adjacentTile = testAdjacentTile;
|
||||||
setTestAdjacentTile();
|
setTestAdjacentTile();
|
||||||
}
|
}
|
||||||
@ -30,28 +29,14 @@ public class Field extends cicaprojekt.Tile
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
|
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Field.spawnStargate(Stargate stargate, Direction direction)");
|
|
||||||
|
|
||||||
if (recursionLimit++ >= 10)
|
if (recursionLimit++ >= 10)
|
||||||
this.adjacentTile.put(direction, new Wall());
|
this.adjacentTile.put(direction, new Wall());
|
||||||
|
|
||||||
adjacentTile.get(direction).spawnStargate(stargate, direction);
|
adjacentTile.get(direction).spawnStargate(stargate, direction);
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Field.spawnStargate(Stargate stargate, Direction direction)");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onEntry() {
|
public void onEntry() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Field.onEntry()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Field.onEntry()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onExit() {
|
public void onExit() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Field.onExit()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Field.onExit()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,9 +10,5 @@ public class FlowOfTime extends Timer{
|
|||||||
|
|
||||||
public void start()
|
public void start()
|
||||||
{
|
{
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "FlowOfTime.start()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "FlowOfTime.start()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,25 +7,13 @@ public class Game {
|
|||||||
|
|
||||||
|
|
||||||
public void allZPMsCollected() {
|
public void allZPMsCollected() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Game.allZPMsCollected()");
|
|
||||||
this.stopGame();
|
this.stopGame();
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Game.allZPMsCollected()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void startGame() {
|
public void startGame() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Game.startGame()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Game.startGame()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void stopGame() {
|
public void stopGame() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Game.stopGame()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Game.stopGame()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {}
|
public static void main(String[] args) {}
|
||||||
|
@ -4,25 +4,13 @@ public class Gap extends cicaprojekt.Tile
|
|||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
|
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gap.spawnStargate(stargate" + direction.name() + ")");
|
|
||||||
adjacentTile.get(direction).spawnStargate(stargate, direction);
|
adjacentTile.get(direction).spawnStargate(stargate, direction);
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gap.spawnStargate()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onEntry() {
|
public void onEntry() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gap.onEntry()");
|
|
||||||
this.removeItemFromTile().destroy();
|
this.removeItemFromTile().destroy();
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gap.onEntry()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onExit() {
|
public void onExit() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gap.onExit()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gap.onExit()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,41 +6,20 @@ public class Gate extends cicaprojekt.Tile
|
|||||||
|
|
||||||
|
|
||||||
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
|
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.spawnStargate(" + stargate + direction + ")");
|
|
||||||
if(this.open) adjacentTile.get(direction).spawnStargate(stargate, direction);
|
if(this.open) adjacentTile.get(direction).spawnStargate(stargate, direction);
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.spawnStargate()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onEntry() {
|
public void onEntry() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.onEntry()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.onEntry()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onExit() {
|
public void onExit() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.onExit()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.onExit()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isOpen() {
|
public boolean isOpen() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.isOpen()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.isOpen()");
|
|
||||||
Menu.removeTab();
|
|
||||||
return open;
|
return open;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setOpen(boolean gateState) {
|
public void setOpen(boolean gateState) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.setOpen(" + gateState + ")");
|
|
||||||
this.open = gateState;
|
this.open = gateState;
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.setOpen()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,36 +8,20 @@ public class Player extends PlayerBase{
|
|||||||
|
|
||||||
|
|
||||||
public Player(Tile startTile, Direction startDirection){
|
public Player(Tile startTile, Direction startDirection){
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.Player(" + startTile + startDirection + ")");
|
|
||||||
currentTile = startTile;
|
currentTile = startTile;
|
||||||
facingDirection = startDirection; /* Be lehetne állítani egy defaultot is, nem tudom, mennyire kéne */
|
facingDirection = startDirection; /* Be lehetne állítani egy defaultot is, nem tudom, mennyire kéne */
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.Player()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void boxLift() {
|
public void boxLift() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.boxLift()");
|
|
||||||
boxLifted = (Box) currentTile.getAdjacentTile(facingDirection).removeItemFromTile();
|
boxLifted = (Box) currentTile.getAdjacentTile(facingDirection).removeItemFromTile();
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.boxLift()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void boxDrop() {
|
public void boxDrop() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.boxDrop()");
|
|
||||||
currentTile.getAdjacentTile(facingDirection).setItemOnTile(boxLifted);
|
currentTile.getAdjacentTile(facingDirection).setItemOnTile(boxLifted);
|
||||||
boxLifted = null;
|
boxLifted = null;
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.boxDrop()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void shootStargate(Stargate stargate) {
|
public void shootStargate(Stargate stargate) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.shootStargate(stargate)");
|
|
||||||
this.currentTile.getAdjacentTile(facingDirection).spawnStargate(stargate, facingDirection);
|
this.currentTile.getAdjacentTile(facingDirection).spawnStargate(stargate, facingDirection);
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.shootStargate()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -7,37 +7,21 @@ public class PlayerBase implements Destroyable{
|
|||||||
|
|
||||||
|
|
||||||
public void destroy() {
|
public void destroy() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.destroy()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.destroy()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Tile getCurrentTile() {
|
public Tile getCurrentTile() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.getCurrentTile()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.getCurrentTile()");
|
|
||||||
Menu.removeTab();
|
|
||||||
return currentTile;
|
return currentTile;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCurrentTile(Tile newCurrentTile) {
|
public void setCurrentTile(Tile newCurrentTile) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.setCurrentTile()");
|
|
||||||
currentTile = newCurrentTile;
|
currentTile = newCurrentTile;
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.setCurrentTile()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void move(Direction direction) {
|
public void move(Direction direction) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Oneill.move(" + direction.name() + ")");
|
|
||||||
this.setFacingDirection(direction);
|
this.setFacingDirection(direction);
|
||||||
Tile tile = this.getCurrentTile().getAdjacentTile(direction);
|
Tile tile = this.getCurrentTile().getAdjacentTile(direction);
|
||||||
tile.onEntry();
|
tile.onEntry();
|
||||||
setCurrentTile(tile);
|
setCurrentTile(tile);
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Oneill.move()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void rotateLeft() {
|
public void rotateLeft() {
|
||||||
@ -75,18 +59,10 @@ public class PlayerBase implements Destroyable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Direction getFacingDirection() {
|
public Direction getFacingDirection() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.getFacingDirection()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.getFacingDirection()");
|
|
||||||
Menu.removeTab();
|
|
||||||
return facingDirection;
|
return facingDirection;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setFacingDirection(Direction direction) {
|
public void setFacingDirection(Direction direction) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.setFacingDirection(" + direction.name() + ")");
|
|
||||||
facingDirection = direction;
|
facingDirection = direction;
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.setFacingDirection()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,29 +10,17 @@ public class Scale extends Field {
|
|||||||
|
|
||||||
|
|
||||||
public Scale(Gate gate, int threshold){
|
public Scale(Gate gate, int threshold){
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Scale.Scale(" + gate + ")");
|
|
||||||
gateConnected = gate;
|
gateConnected = gate;
|
||||||
this.threshold = threshold;
|
this.threshold = threshold;
|
||||||
itemsOnTile = new Stack<Pickable>();
|
itemsOnTile = new Stack<Pickable>();
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Scale.Scale()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onEntry() {
|
public void onEntry() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Scale.onEntry()");
|
|
||||||
gateConnected.setOpen(true);
|
gateConnected.setOpen(true);
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Scale.onEntry()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onExit() {
|
public void onExit() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Scale.onExit()");
|
|
||||||
gateConnected.setOpen(false);
|
gateConnected.setOpen(false);
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Scale.onExit()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -50,11 +38,7 @@ public class Scale extends Field {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
|
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Scale.spawnStarGate(stargate," + direction.name() + ")");
|
|
||||||
adjacentTile.get(direction).spawnStargate(stargate, direction);
|
adjacentTile.get(direction).spawnStargate(stargate, direction);
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Scale.spawnStarGate()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void stackChanged() {
|
private void stackChanged() {
|
||||||
|
@ -11,42 +11,22 @@ public class Stargate {
|
|||||||
|
|
||||||
|
|
||||||
public static void init() {
|
public static void init() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + "Stargate" + "]" + Menu.tabulator + "Stargate.init()");
|
|
||||||
yellowStargate.other = blueStargate;
|
yellowStargate.other = blueStargate;
|
||||||
blueStargate.other = yellowStargate;
|
blueStargate.other = yellowStargate;
|
||||||
System.out.println("<" + "[" + ":" + "Stargate" + "]" + Menu.tabulator + "Stargate.init()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public cicaprojekt.Wall getCurrentWall() {
|
public cicaprojekt.Wall getCurrentWall() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Stargate.getCurrentWall()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Stargate.getCurrentWall()");
|
|
||||||
Menu.removeTab();
|
|
||||||
return currentWall;
|
return currentWall;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCurrentWall(cicaprojekt.Wall wall) {
|
public void setCurrentWall(cicaprojekt.Wall wall) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Stargate.setCurrentWall(" + "wall" + ")");
|
|
||||||
currentWall = wall;
|
currentWall = wall;
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Stargate.setCurrentWall(" + "wall" + ")");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isOpen() {
|
public boolean isOpen() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Stargate.isOpen()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Stargate.isOpen()");
|
|
||||||
Menu.removeTab();
|
|
||||||
return isSpawned;
|
return isSpawned;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void teleport(Direction incomingDirection) {
|
public void teleport(Direction incomingDirection) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Stargate.teleport(" + incomingDirection.name() + ")");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Stargate.teleport(" + incomingDirection.name() + ")");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,8 +9,6 @@ public abstract class Tile {
|
|||||||
|
|
||||||
|
|
||||||
public Tile(){
|
public Tile(){
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Tile.Tile()");
|
|
||||||
adjacentTile = new HashMap<Direction, Tile>();
|
adjacentTile = new HashMap<Direction, Tile>();
|
||||||
|
|
||||||
adjacentTile.put(Direction.NORTH, Field.testField);
|
adjacentTile.put(Direction.NORTH, Field.testField);
|
||||||
@ -18,23 +16,13 @@ public abstract class Tile {
|
|||||||
adjacentTile.put(Direction.SOUTH, Field.testField);
|
adjacentTile.put(Direction.SOUTH, Field.testField);
|
||||||
adjacentTile.put(Direction.WEST, Field.testField);
|
adjacentTile.put(Direction.WEST, Field.testField);
|
||||||
itemOnTile = new Box();
|
itemOnTile = new Box();
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Tile.Tile()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Tile getAdjacentTile(Direction direction) {
|
public Tile getAdjacentTile(Direction direction) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Tile.getAdjacentTile(" + direction.name() + ")");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Tile.getAdjacentTile(" + direction.name() + ")");
|
|
||||||
Menu.removeTab();
|
|
||||||
return adjacentTile.get(direction);
|
return adjacentTile.get(direction);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setAdajacentTile(Tile newTile, Direction direction) {
|
public void setAdajacentTile(Tile newTile, Direction direction) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Tile.setAdjacentTile(" + "newTile, " + direction.name() + ")");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Tile.setAdjacentTile(" + "newTile, " + direction.name() + ")");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract void spawnStargate(Stargate stargate, Direction direction);
|
public abstract void spawnStargate(Stargate stargate, Direction direction);
|
||||||
@ -44,20 +32,11 @@ public abstract class Tile {
|
|||||||
public abstract void onExit();
|
public abstract void onExit();
|
||||||
|
|
||||||
public Pickable removeItemFromTile() {
|
public Pickable removeItemFromTile() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Tile.removeItemFromTile()");
|
|
||||||
Pickable item = itemOnTile;
|
Pickable item = itemOnTile;
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Tile.removeItemFromTile()");
|
|
||||||
Menu.removeTab();
|
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setItemOnTile(Pickable item) {
|
public void setItemOnTile(Pickable item) {
|
||||||
Menu.addTab();
|
itemOnTile = item;
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Tile.setItemOnTile(" + "item" + ")");
|
|
||||||
itemOnTile = item;
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Tile.setItemOnTile(" + "item" + ")");
|
|
||||||
Menu.removeTab();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,36 +5,19 @@ public class Wall extends Tile {
|
|||||||
|
|
||||||
|
|
||||||
public void spawnStargate(Stargate stargate, Direction direction) {
|
public void spawnStargate(Stargate stargate, Direction direction) {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Wall.spawnStargate(stargate," + direction.name() + ")");
|
|
||||||
if(sg == null)
|
if(sg == null)
|
||||||
sg = stargate;
|
sg = stargate;
|
||||||
else
|
else
|
||||||
return;
|
return;
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Wall.spawnStargate()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clearStargate(){
|
public void clearStargate(){
|
||||||
Menu.addTab();
|
sg = null;
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Wall.clearStargate()");
|
|
||||||
sg = null;
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Wall.clearStargate()");
|
|
||||||
Menu.removeTab();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onEntry() {
|
public void onEntry() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Wall.onEntry()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Wall.onEntry()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onExit() {
|
public void onExit() {
|
||||||
Menu.addTab();
|
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Wall.onExit()");
|
|
||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Wall.onExit()");
|
|
||||||
Menu.removeTab();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,13 +2,11 @@ package cicaprojekt;
|
|||||||
|
|
||||||
public class ZPM implements Pickable
|
public class ZPM implements Pickable
|
||||||
{
|
{
|
||||||
public void pick()
|
public void pick(){
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void destroy()
|
public void destroy(){
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user