From e041576547c45e4d4681d6d8a9fa30f3e2fb12b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjist=C3=B3f?= Date: Sat, 23 Apr 2016 17:15:19 +0200 Subject: [PATCH] made cosmetic changes to most of the files: unified coding style --- cicaprojekt/Field.java | 2 +- cicaprojekt/FlowOfTime.java | 3 ++- cicaprojekt/Game.java | 3 ++- cicaprojekt/Gate.java | 1 + cicaprojekt/Measurable.java | 1 - cicaprojekt/Menu.java | 1 + cicaprojekt/PlayerBase.java | 3 +-- cicaprojekt/Stargate.java | 2 +- cicaprojekt/Tile.java | 1 + cicaprojekt/Wall.java | 1 - cicaprojekt/ZPM.java | 1 - 11 files changed, 10 insertions(+), 9 deletions(-) diff --git a/cicaprojekt/Field.java b/cicaprojekt/Field.java index 206f34d..52acd0c 100644 --- a/cicaprojekt/Field.java +++ b/cicaprojekt/Field.java @@ -10,6 +10,7 @@ public class Field extends cicaprojekt.Tile private static boolean testAdjTileSet = false; private static int recursionLimit = 0; + public Field() { setItemOnTile(new Box()); @@ -53,5 +54,4 @@ public class Field extends cicaprojekt.Tile System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Field.onExit()"); Menu.removeTab(); } - } diff --git a/cicaprojekt/FlowOfTime.java b/cicaprojekt/FlowOfTime.java index 218a2dc..5f624b4 100644 --- a/cicaprojekt/FlowOfTime.java +++ b/cicaprojekt/FlowOfTime.java @@ -6,7 +6,8 @@ import java.util.TimerTask; public class FlowOfTime extends Timer{ private TimerTask timeup; private long gametime; - + + public void start() { Menu.addTab(); diff --git a/cicaprojekt/Game.java b/cicaprojekt/Game.java index 260f351..02b7c09 100644 --- a/cicaprojekt/Game.java +++ b/cicaprojekt/Game.java @@ -4,7 +4,8 @@ public class Game { private Player oneill; private Dungeon dungeon; private FlowOfTime flowoftime; - + + public void allZPMsCollected() { Menu.addTab(); System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Game.allZPMsCollected()"); diff --git a/cicaprojekt/Gate.java b/cicaprojekt/Gate.java index 6a5e94b..a985882 100644 --- a/cicaprojekt/Gate.java +++ b/cicaprojekt/Gate.java @@ -4,6 +4,7 @@ public class Gate extends cicaprojekt.Tile { private boolean open = false; + public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) { Menu.addTab(); System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.spawnStargate(" + stargate + direction + ")"); diff --git a/cicaprojekt/Measurable.java b/cicaprojekt/Measurable.java index bfc4b63..e02d5b3 100644 --- a/cicaprojekt/Measurable.java +++ b/cicaprojekt/Measurable.java @@ -1,6 +1,5 @@ package cicaprojekt; - public interface Measurable { public int weight(); } diff --git a/cicaprojekt/Menu.java b/cicaprojekt/Menu.java index b5a85da..b7a2269 100644 --- a/cicaprojekt/Menu.java +++ b/cicaprojekt/Menu.java @@ -6,6 +6,7 @@ import java.util.Scanner; public class Menu { public static String tabulator = "\t"; + public static void addTab() { tabulator += '\t'; diff --git a/cicaprojekt/PlayerBase.java b/cicaprojekt/PlayerBase.java index f0167c7..8461523 100644 --- a/cicaprojekt/PlayerBase.java +++ b/cicaprojekt/PlayerBase.java @@ -1,11 +1,11 @@ package cicaprojekt; - public class PlayerBase implements Destroyable{ protected Game game; protected Tile currentTile; protected Direction facingDirection; + public void destroy() { Menu.addTab(); System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.destroy()"); @@ -89,5 +89,4 @@ public class PlayerBase implements Destroyable{ System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.setFacingDirection()"); Menu.removeTab(); } - } diff --git a/cicaprojekt/Stargate.java b/cicaprojekt/Stargate.java index 81051d3..b43001b 100644 --- a/cicaprojekt/Stargate.java +++ b/cicaprojekt/Stargate.java @@ -1,7 +1,6 @@ package cicaprojekt; public class Stargate { - private boolean isSpawned; public static final Stargate yellowStargate = new Stargate(); @@ -10,6 +9,7 @@ public class Stargate { private cicaprojekt.Wall currentWall; + public static void init() { Menu.addTab(); System.out.println(">" + "[" + ":" + "Stargate" + "]" + Menu.tabulator + "Stargate.init()"); diff --git a/cicaprojekt/Tile.java b/cicaprojekt/Tile.java index b9381d8..30c3201 100644 --- a/cicaprojekt/Tile.java +++ b/cicaprojekt/Tile.java @@ -36,6 +36,7 @@ public abstract class Tile { 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 onEntry(); diff --git a/cicaprojekt/Wall.java b/cicaprojekt/Wall.java index f857b4d..b2dd57b 100644 --- a/cicaprojekt/Wall.java +++ b/cicaprojekt/Wall.java @@ -37,5 +37,4 @@ public class Wall extends Tile { System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Wall.onExit()"); Menu.removeTab(); } - } diff --git a/cicaprojekt/ZPM.java b/cicaprojekt/ZPM.java index bea9ff2..1c41491 100644 --- a/cicaprojekt/ZPM.java +++ b/cicaprojekt/ZPM.java @@ -2,7 +2,6 @@ package cicaprojekt; public class ZPM implements Pickable { - public void pick() { Menu.addTab();