made cosmetic changes to most of the files: unified coding style
This commit is contained in:
parent
7eeeefa3e2
commit
e041576547
@ -10,6 +10,7 @@ public class Field extends cicaprojekt.Tile
|
|||||||
private static boolean testAdjTileSet = false;
|
private static boolean testAdjTileSet = false;
|
||||||
private static int recursionLimit = 0;
|
private static int recursionLimit = 0;
|
||||||
|
|
||||||
|
|
||||||
public Field() {
|
public Field() {
|
||||||
setItemOnTile(new Box());
|
setItemOnTile(new Box());
|
||||||
|
|
||||||
@ -53,5 +54,4 @@ public class Field extends cicaprojekt.Tile
|
|||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Field.onExit()");
|
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Field.onExit()");
|
||||||
Menu.removeTab();
|
Menu.removeTab();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,8 @@ import java.util.TimerTask;
|
|||||||
public class FlowOfTime extends Timer{
|
public class FlowOfTime extends Timer{
|
||||||
private TimerTask timeup;
|
private TimerTask timeup;
|
||||||
private long gametime;
|
private long gametime;
|
||||||
|
|
||||||
|
|
||||||
public void start()
|
public void start()
|
||||||
{
|
{
|
||||||
Menu.addTab();
|
Menu.addTab();
|
||||||
|
@ -4,7 +4,8 @@ public class Game {
|
|||||||
private Player oneill;
|
private Player oneill;
|
||||||
private Dungeon dungeon;
|
private Dungeon dungeon;
|
||||||
private FlowOfTime flowoftime;
|
private FlowOfTime flowoftime;
|
||||||
|
|
||||||
|
|
||||||
public void allZPMsCollected() {
|
public void allZPMsCollected() {
|
||||||
Menu.addTab();
|
Menu.addTab();
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Game.allZPMsCollected()");
|
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Game.allZPMsCollected()");
|
||||||
|
@ -4,6 +4,7 @@ public class Gate extends cicaprojekt.Tile
|
|||||||
{
|
{
|
||||||
private boolean open = false;
|
private boolean open = false;
|
||||||
|
|
||||||
|
|
||||||
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
|
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
|
||||||
Menu.addTab();
|
Menu.addTab();
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.spawnStargate(" + stargate + direction + ")");
|
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Gate.spawnStargate(" + stargate + direction + ")");
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
package cicaprojekt;
|
package cicaprojekt;
|
||||||
|
|
||||||
|
|
||||||
public interface Measurable {
|
public interface Measurable {
|
||||||
public int weight();
|
public int weight();
|
||||||
}
|
}
|
||||||
|
@ -6,6 +6,7 @@ import java.util.Scanner;
|
|||||||
public class Menu {
|
public class Menu {
|
||||||
public static String tabulator = "\t";
|
public static String tabulator = "\t";
|
||||||
|
|
||||||
|
|
||||||
public static void addTab()
|
public static void addTab()
|
||||||
{
|
{
|
||||||
tabulator += '\t';
|
tabulator += '\t';
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
package cicaprojekt;
|
package cicaprojekt;
|
||||||
|
|
||||||
|
|
||||||
public class PlayerBase implements Destroyable{
|
public class PlayerBase implements Destroyable{
|
||||||
protected Game game;
|
protected Game game;
|
||||||
protected Tile currentTile;
|
protected Tile currentTile;
|
||||||
protected Direction facingDirection;
|
protected Direction facingDirection;
|
||||||
|
|
||||||
|
|
||||||
public void destroy() {
|
public void destroy() {
|
||||||
Menu.addTab();
|
Menu.addTab();
|
||||||
System.out.println(">" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.destroy()");
|
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()");
|
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Player.setFacingDirection()");
|
||||||
Menu.removeTab();
|
Menu.removeTab();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
package cicaprojekt;
|
package cicaprojekt;
|
||||||
|
|
||||||
public class Stargate {
|
public class Stargate {
|
||||||
|
|
||||||
private boolean isSpawned;
|
private boolean isSpawned;
|
||||||
|
|
||||||
public static final Stargate yellowStargate = new Stargate();
|
public static final Stargate yellowStargate = new Stargate();
|
||||||
@ -10,6 +9,7 @@ public class Stargate {
|
|||||||
|
|
||||||
private cicaprojekt.Wall currentWall;
|
private cicaprojekt.Wall currentWall;
|
||||||
|
|
||||||
|
|
||||||
public static void init() {
|
public static void init() {
|
||||||
Menu.addTab();
|
Menu.addTab();
|
||||||
System.out.println(">" + "[" + ":" + "Stargate" + "]" + Menu.tabulator + "Stargate.init()");
|
System.out.println(">" + "[" + ":" + "Stargate" + "]" + Menu.tabulator + "Stargate.init()");
|
||||||
|
@ -36,6 +36,7 @@ public abstract class Tile {
|
|||||||
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();
|
Menu.removeTab();
|
||||||
}
|
}
|
||||||
|
|
||||||
public abstract void spawnStargate(Stargate stargate, Direction direction);
|
public abstract void spawnStargate(Stargate stargate, Direction direction);
|
||||||
|
|
||||||
public abstract void onEntry();
|
public abstract void onEntry();
|
||||||
|
@ -37,5 +37,4 @@ public class Wall extends Tile {
|
|||||||
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Wall.onExit()");
|
System.out.println("<" + "[" + ":" + this.getClass().getSimpleName() + "]" + Menu.tabulator + "Wall.onExit()");
|
||||||
Menu.removeTab();
|
Menu.removeTab();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,6 @@ package cicaprojekt;
|
|||||||
|
|
||||||
public class ZPM implements Pickable
|
public class ZPM implements Pickable
|
||||||
{
|
{
|
||||||
|
|
||||||
public void pick()
|
public void pick()
|
||||||
{
|
{
|
||||||
Menu.addTab();
|
Menu.addTab();
|
||||||
|
Loading…
Reference in New Issue
Block a user