mrtoth
/
cicaprojekt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reformatted code

This commit is contained in:
Bokros Bálint 2016-04-24 23:01:34 +02:00
parent d0d656452c
commit 1ab13398bb
19 changed files with 365 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cicaprojekt/Box.java
View File

@ -1,21 +1,20 @@
package cicaprojekt;
public class Box implements Pickable, Destroyable
{
public class Box implements Pickable, Destroyable {
private int weight = 5;
public Box(){
public Box() {
}
public void destroy() {
}
public void destroy() {
}
public void pick() {
}
public void pick() {
}
@Override
public int weight() {
@Override
public int weight() {
return this.weight;
}
}
}

2
cicaprojekt/Destroyable.java
View File

@ -1,5 +1,5 @@
package cicaprojekt;
public interface Destroyable {
public void destroy();
public void destroy();
}

2
cicaprojekt/Direction.java
View File

@ -1,5 +1,5 @@
package cicaprojekt;
public enum Direction {
NORTH, SOUTH, EAST, WEST;
NORTH, SOUTH, EAST, WEST;
}

36
cicaprojekt/Dungeon.java
View File

@ -3,12 +3,10 @@ package cicaprojekt;
import java.io.*;
public class Dungeon {
cicaprojekt.Tile buildDungeon(File input) throws IOException
{
cicaprojekt.Tile buildDungeon(File input) throws IOException {
Tile oneilllocation = null;
Tile jaffalocation = null;
try(BufferedReader reader = new BufferedReader(new FileReader(input)))
{
try (BufferedReader reader = new BufferedReader(new FileReader(input))) {
String[] sizedata = reader.readLine().split("x"); // read size data at beginning of file
reader.readLine(); // throw empty line away
int width = Integer.parseInt(sizedata[0]);
@ -19,11 +17,9 @@ public class Dungeon {
String line = null;
Gate gate = new Gate();
Gate lastgate = gate;
for (int y = 0; y < height; ++y)
{
line = reader.readLine().replaceAll("\\s",""); // read line and remove whitespaces
for (int x = 0; x < width; ++x)
{
for (int y = 0; y < height; ++y) {
line = reader.readLine().replaceAll("\\s", ""); // read line and remove whitespaces
for (int x = 0; x < width; ++x) {
switch (line.charAt(x)) // set the dungeon up
{
case 'W':
@ -74,27 +70,25 @@ public class Dungeon {
// NOTE: code seems to be correct till this point based on a debugger run-through
/* setting up Tile cross references */
for (int y = 0; y < height; ++y)
{
for (int x = 0; x < width; ++x)
{
if (x-1 >= 0) // leftwards Tile reference
dungeon[y][x].setAdajacentTile(dungeon[y][x-1], Direction.WEST);
for (int y = 0; y < height; ++y) {
for (int x = 0; x < width; ++x) {
if (x - 1 >= 0) // leftwards Tile reference
dungeon[y][x].setAdajacentTile(dungeon[y][x - 1], Direction.WEST);
else
dungeon[y][x].setAdajacentTile(null, Direction.WEST);
if (x+1 < width) // rightwards Tile reference
dungeon[y][x].setAdajacentTile(dungeon[y][x+1], Direction.EAST);
if (x + 1 < width) // rightwards Tile reference
dungeon[y][x].setAdajacentTile(dungeon[y][x + 1], Direction.EAST);
else
dungeon[y][x].setAdajacentTile(null, Direction.EAST);
if (y+1 < height) // upwards Tile reference
dungeon[y][x].setAdajacentTile(dungeon[y+1][x], Direction.NORTH);
if (y + 1 < height) // upwards Tile reference
dungeon[y][x].setAdajacentTile(dungeon[y + 1][x], Direction.NORTH);
else
dungeon[y][x].setAdajacentTile(null, Direction.NORTH);
if (y-1 >= 0) // downwards Tile reference
dungeon[y][x].setAdajacentTile(dungeon[y-1][x], Direction.SOUTH);
if (y - 1 >= 0) // downwards Tile reference
dungeon[y][x].setAdajacentTile(dungeon[y - 1][x], Direction.SOUTH);
else
dungeon[y][x].setAdajacentTile(null, Direction.SOUTH);
}

43
cicaprojekt/Field.java
View File

@ -3,32 +3,31 @@ package cicaprojekt;
import java.util.HashMap;
import java.util.Map;
public class Field extends cicaprojekt.Tile
{
private static int recursionLimit = 0;
public class Field extends cicaprojekt.Tile {
private static int recursionLimit = 0;
public Field() {
super();
}
public Field() {
super();
}
@Override
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
if (recursionLimit++ >= 10)
this.adjacentTile.put(direction, new Wall());
adjacentTile.get(direction).spawnStargate(stargate, direction);
}
@Override
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
if (recursionLimit++ >= 10)
this.adjacentTile.put(direction, new Wall());
adjacentTile.get(direction).spawnStargate(stargate, direction);
}
public void onEntry(PlayerBase playerBase) {
if(boxStack.size() > 0)
return;
playerBase.setCurrentTile(this);
if(zpmOnTile != null)
playerBase.pickZPM(this);
}
public void onEntry(PlayerBase playerBase) {
if (boxStack.size() > 0)
return;
playerBase.setCurrentTile(this);
if (zpmOnTile != null)
playerBase.pickZPM(this);
}
public void onExit(PlayerBase playerBase) {
return;
}
public void onExit(PlayerBase playerBase) {
return;
}
}

11
cicaprojekt/FlowOfTime.java
View File

@ -3,12 +3,11 @@ package cicaprojekt;
import java.util.Timer;
import java.util.TimerTask;
public class FlowOfTime extends Timer{
private TimerTask timeup;
private long gametime;
public class FlowOfTime extends Timer {
private TimerTask timeup;
private long gametime;
public void start()
{
}
public void start() {
}
}

27
cicaprojekt/Game.java
View File

@ -1,20 +1,21 @@
package cicaprojekt;
public class Game {
private Player oneill;
private Dungeon dungeon;
private FlowOfTime flowoftime;
private Player oneill;
private Dungeon dungeon;
private FlowOfTime flowoftime;
public void allZPMsCollected() {
this.stopGame();
}
public void startGame() {
}
public void stopGame() {
}
public static void main(String[] args) {
}
public static void main(String[] args) {}
public void allZPMsCollected() {
this.stopGame();
}
public void startGame() {
}
public void stopGame() {
}
}

41
cicaprojekt/Gap.java
View File

@ -1,26 +1,25 @@
package cicaprojekt;
public class Gap extends cicaprojekt.Tile
{
public Gap(){
super();
}
@Override
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
adjacentTile.get(direction).spawnStargate(stargate, direction);
}
public class Gap extends cicaprojekt.Tile {
public Gap() {
super();
}
public void onEntry(PlayerBase playerBase) {
playerBase.destroy();
}
@Override
public void spawnStargate(cicaprojekt.Stargate stargate, Direction direction) {
adjacentTile.get(direction).spawnStargate(stargate, direction);
}
public void onExit(PlayerBase playerBase) throws IllegalStateException {
throw new IllegalStateException("Hiba! A szakadékból nem jut ki semmi!");
}
@Override
public void putABox(Box box) {
box.destroy();
}
public void onEntry(PlayerBase playerBase) {
playerBase.destroy();
}
public void onExit(PlayerBase playerBase) throws IllegalStateException {
throw new IllegalStateException("Hiba! A szakadékból nem jut ki semmi!");
}
@Override
public void putABox(Box box) {
box.destroy();
}
}

50
cicaprojekt/Gate.java
View File

@ -1,36 +1,34 @@
package cicaprojekt;
public class Gate extends Tile
{
private boolean open = false;
public class Gate extends Tile {
private boolean open = false;
public Gate(){
super();
}
public void spawnStargate(Stargate stargate, Direction direction) {
if(this.open) adjacentTile.get(direction).spawnStargate(stargate, direction);
}
public Gate() {
super();
}
public void onEntry(PlayerBase playerBase) {
if(open){
playerBase.setCurrentTile(this);
}
else
return;
}
public void spawnStargate(Stargate stargate, Direction direction) {
if (this.open) adjacentTile.get(direction).spawnStargate(stargate, direction);
}
public void onExit(PlayerBase playerBase) throws IllegalStateException {
if(!open){
throw new IllegalStateException("Hiba! Te hogy kerültél a csukott ajtóba?");
}
}
public void onEntry(PlayerBase playerBase) {
if (open) {
playerBase.setCurrentTile(this);
} else
return;
}
public boolean isOpen() {
public void onExit(PlayerBase playerBase) throws IllegalStateException {
if (!open) {
throw new IllegalStateException("Hiba! Te hogy kerültél a csukott ajtóba?");
}
}
public boolean isOpen() {
return open;
}
}
public void setOpen(boolean gateState) {
public void setOpen(boolean gateState) {
this.open = gateState;
}
}
}

2
cicaprojekt/Measurable.java
View File

@ -1,5 +1,5 @@
package cicaprojekt;
public interface Measurable {
public int weight();
public int weight();
}

58
cicaprojekt/Menu.java
View File

@ -7,22 +7,20 @@ public class Menu {
public static String tabulator = "\t";
public static void addTab()
{
public static void addTab() {
tabulator += '\t';
}
public static void removeTab()
{
tabulator = tabulator.substring(0, tabulator.length()-1);
public static void removeTab() {
tabulator = tabulator.substring(0, tabulator.length() - 1);
}
public static void main (String[] args) throws IOException{
public static void main(String[] args) throws IOException {
System.out.println("Continuously Integrated Cica Projekt - Skeleton");
System.out.println("Üdvözöllek a Babylon Simulator 2000 játékban! Kérlek válassz egy menüpontot!");
boolean isExiting = false;
while(!isExiting) {
while (!isExiting) {
System.out.println("1. Lépés");
System.out.println("2. Doboz felvétele");
System.out.println("3. Doboz lerakása");
@ -36,90 +34,90 @@ public class Menu {
Scanner sc = new Scanner(System.in);
switch (sc.nextLine().charAt(0)) {
case '1' :
case '1':
System.out.println("O’Neill [északi|nyugati|déli|keleti] irányba lép egyet,");
System.out.println("Elfogadott bemenet: W, A, S, D");
switch (sc.nextLine().charAt(0)) {
case 'W' :
case 'W':
oNeill.move(Direction.NORTH);
break;
case 'A' :
case 'A':
oNeill.move(Direction.WEST);
break;
case 'S' :
case 'S':
oNeill.move(Direction.SOUTH);
break;
case 'D' :
case 'D':
oNeill.move(Direction.EAST);
break;
case 'X' :
case 'X':
break;
}
break;
case '2' :
case '2':
System.out.println("Doboz felvétele");
System.out.println("Elfogadott bemenet: L");
switch (sc.nextLine().charAt(0)) {
case 'L' :
case 'L':
oNeill.boxLift();
break;
case 'X' :
case 'X':
break;
}
break;
case '3' :
case '3':
System.out.println("Doboz lerakása");
System.out.println("Elfogadott bemenet: D");
switch (sc.nextLine().charAt(0)) {
case 'D':
oNeill.boxDrop();
break;
case 'X' :
case 'X':
break;
}
break;
case '4' :
case '4':
System.out.println("Elforgás");
System.out.println("Elfogadott bemenet: L, R");
switch (sc.nextLine().charAt(0)) {
case 'L' :
case 'L':
oNeill.rotateLeft();
break;
case 'D' :
case 'D':
oNeill.rotateRight();
break;
case 'X' :
case 'X':
break;
}
break;
case '5' :
case '5':
System.out.println("Nézés");
System.out.println("Elfogadott bemenet: W");
switch (sc.nextLine().charAt(0)) {
case 'W' :
case 'W':
Tile t = oNeill.getCurrentTile().getAdjacentTile(oNeill.getFacingDirection());
System.out.println("O'Neill előtt egy " + t.toString() + "mező található");
break;
case 'X' :
case 'X':
break;
}
break;
case '6' :
case '6':
System.out.println("Csillagkapu lövés");
System.out.println("Elfogadott bemenet: Y, B");
Tile t = oNeill.getCurrentTile();
switch (sc.nextLine().charAt(0)) {
case 'Y' :
case 'Y':
t.spawnStargate(Stargate.yellowStargate, oNeill.getFacingDirection());
break;
case 'B' :
case 'B':
t.spawnStargate(Stargate.blueStargate, oNeill.getFacingDirection());
break;
case 'X' :
case 'X':
break;
}
break;
case 'X' :
case 'X':
System.out.println("Kilépés");
isExiting = true;
break;

2
cicaprojekt/Pickable.java
View File

@ -1,5 +1,5 @@
package cicaprojekt;
public interface Pickable extends Destroyable, Measurable {
public void pick();
public void pick();
}

37
cicaprojekt/Player.java
View File

@ -3,33 +3,32 @@ package cicaprojekt;
import java.util.ArrayList;
import java.util.List;
public class Player extends PlayerBase{
private List<ZPM> zpmContainer;
private Box boxLifted;
public Player(Tile startTile, Direction startDirection){
public class Player extends PlayerBase {
private List<ZPM> zpmContainer;
private Box boxLifted;
public Player(Tile startTile, Direction startDirection) {
zpmContainer = new ArrayList<>();
currentTile = startTile;
facingDirection = startDirection; /* Be lehetne állítani egy defaultot is, nem tudom, mennyire kéne */
}
currentTile = startTile;
facingDirection = startDirection; /* Be lehetne állítani egy defaultot is, nem tudom, mennyire kéne */
}
public void boxLift() {
public void boxLift() {
boxLifted = (Box) currentTile.getAdjacentTile(facingDirection).getABox();
}
}
public void boxDrop() {
currentTile.getAdjacentTile(facingDirection).putABox(boxLifted);
boxLifted = null;
}
public void boxDrop() {
currentTile.getAdjacentTile(facingDirection).putABox(boxLifted);
boxLifted = null;
}
@Override
public void pickZPM(Tile tile)
{
public void pickZPM(Tile tile) {
zpmContainer.add(tile.getZPMFromTile());
}
public void shootStargate(Stargate stargate) {
this.currentTile.getAdjacentTile(facingDirection).spawnStargate(stargate, facingDirection);
}
this.currentTile.getAdjacentTile(facingDirection).spawnStargate(stargate, facingDirection);
}
}

111
cicaprojekt/PlayerBase.java
View File

@ -1,69 +1,70 @@
package cicaprojekt;
public class PlayerBase implements Destroyable{
protected Game game;
protected Tile currentTile;
protected Direction facingDirection;
public class PlayerBase implements Destroyable {
protected Game game;
protected Tile currentTile;
protected Direction facingDirection;
public void destroy() {}
public void destroy() {
}
public Tile getCurrentTile() {
return currentTile;
}
public Tile getCurrentTile() {
return currentTile;
}
public void setCurrentTile(Tile newCurrentTile) {
currentTile = newCurrentTile;
}
public void setCurrentTile(Tile newCurrentTile) {
currentTile = newCurrentTile;
}
public void move(Direction direction) {
this.setFacingDirection(direction);
Tile tile = this.getCurrentTile().getAdjacentTile(direction);
tile.onEntry(this);
setCurrentTile(tile);
}
public void move(Direction direction) {
this.setFacingDirection(direction);
Tile tile = this.getCurrentTile().getAdjacentTile(direction);
tile.onEntry(this);
setCurrentTile(tile);
}
public void pickZPM(Tile tile) { /* PlayerBase does not collect ZPM modules */ }
public void rotateLeft() {
switch (facingDirection) {
case NORTH:
facingDirection = Direction.WEST;
break;
case WEST:
facingDirection = Direction.SOUTH;
break;
case SOUTH:
facingDirection = Direction.EAST;
break;
case EAST:
facingDirection = Direction.NORTH;
break;
}
}
public void rotateLeft() {
switch (facingDirection) {
case NORTH:
facingDirection = Direction.WEST;
break;
case WEST:
facingDirection = Direction.SOUTH;
break;
case SOUTH:
facingDirection = Direction.EAST;
break;
case EAST:
facingDirection = Direction.NORTH;
break;
}
}
public void rotateRight() {
switch (facingDirection) {
case NORTH:
facingDirection = Direction.EAST;
break;
case EAST:
facingDirection = Direction.SOUTH;
break;
case SOUTH:
facingDirection = Direction.WEST;
break;
case WEST:
facingDirection = Direction.NORTH;
break;
}
}
public void rotateRight() {
switch (facingDirection) {
case NORTH:
facingDirection = Direction.EAST;
break;
case EAST:
facingDirection = Direction.SOUTH;
break;
case SOUTH:
facingDirection = Direction.WEST;
break;
case WEST:
facingDirection = Direction.NORTH;
break;
}
}
public Direction getFacingDirection() {
return facingDirection;
}
public Direction getFacingDirection() {
return facingDirection;
}
public void setFacingDirection(Direction direction) {
facingDirection = direction;
}
public void setFacingDirection(Direction direction) {
facingDirection = direction;
}
}

86
cicaprojekt/Scale.java
View File

@ -3,53 +3,53 @@ package cicaprojekt;
import java.util.Stack;
public class Scale extends Field {
private Gate gateConnected;
private int threshold;
private int weight;
private Gate gateConnected;
private int threshold;
private int weight;
public Scale(Gate gate, int threshold){
gateConnected = gate;
this.threshold = threshold;
boxStack = new Stack<Box>();
}
@Override
public void onEntry(PlayerBase playerBase) {
gateConnected.setOpen(true);
}
@Override
public void onExit(PlayerBase playerBase) {
gateConnected.setOpen(false);
}
public Scale(Gate gate, int threshold) {
gateConnected = gate;
this.threshold = threshold;
boxStack = new Stack<Box>();
}
@Override
public Box getABox() {
if(boxStack.isEmpty())
return null;
weight -= boxStack.peek().weight();
stackChanged();
return boxStack.pop();
}
@Override
public void onEntry(PlayerBase playerBase) {
gateConnected.setOpen(true);
}
@Override
public void putABox(Box box) {
if(box == null)
return;
boxStack.push(box);
weight += box.weight();
stackChanged();
}
@Override
public void onExit(PlayerBase playerBase) {
gateConnected.setOpen(false);
}
public void spawnStargate(Stargate stargate, Direction direction) {
adjacentTile.get(direction).spawnStargate(stargate, direction);
}
@Override
public Box getABox() {
if (boxStack.isEmpty())
return null;
weight -= boxStack.peek().weight();
stackChanged();
return boxStack.pop();
}
private void stackChanged() {
if(weight > threshold)
gateConnected.setOpen(true);
else
gateConnected.setOpen(false);
}
@Override
public void putABox(Box box) {
if (box == null)
return;
boxStack.push(box);
weight += box.weight();
stackChanged();
}
public void spawnStargate(Stargate stargate, Direction direction) {
adjacentTile.get(direction).spawnStargate(stargate, direction);
}
private void stackChanged() {
if (weight > threshold)
gateConnected.setOpen(true);
else
gateConnected.setOpen(false);
}
}

64
cicaprojekt/Stargate.java
View File

@ -1,40 +1,38 @@
package cicaprojekt;
public class Stargate {
private boolean isSpawned;
public static final Stargate yellowStargate = new Stargate();
public static final Stargate blueStargate = new Stargate();
public static final Stargate redStargate = new Stargate();
public static final Stargate greenStargate = new Stargate();
public /*final*/ Stargate other; //TODO find better ways to do this
private Wall currentWall;
public static final Stargate yellowStargate = new Stargate();
public static final Stargate blueStargate = new Stargate();
public static final Stargate redStargate = new Stargate();
public static final Stargate greenStargate = new Stargate();
public /*final*/ Stargate other; //TODO find better ways to do this
private boolean isSpawned;
private Wall currentWall;
private Stargate() {
isSpawned = false;
}
private Stargate() {
isSpawned = false;
}
public static void init() {
yellowStargate.other = blueStargate;
blueStargate.other = yellowStargate;
redStargate.other = greenStargate;
greenStargate.other = redStargate;
}
public Wall getCurrentWall() {
return currentWall;
}
public void setCurrentWall(Wall wall) {
currentWall = wall;
}
public boolean isOpen() {
return isSpawned;
}
public void teleport(Direction incomingDirection) {
}
public static void init() {
yellowStargate.other = blueStargate;
blueStargate.other = yellowStargate;
redStargate.other = greenStargate;
greenStargate.other = redStargate;
}
public Wall getCurrentWall() {
return currentWall;
}
public void setCurrentWall(Wall wall) {
currentWall = wall;
}
public boolean isOpen() {
return isSpawned;
}
public void teleport(Direction incomingDirection) {
}
}

84
cicaprojekt/Tile.java
View File

@ -5,48 +5,48 @@ import java.util.Map;
import java.util.Stack;
public abstract class Tile {
protected Map<Direction, Tile> adjacentTile;
protected ZPM zpmOnTile;
protected Stack<Box> boxStack;
public Tile(){
adjacentTile = new HashMap<Direction, Tile>();
}
public Tile getAdjacentTile(Direction direction) {
return adjacentTile.get(direction);
}
protected Map<Direction, Tile> adjacentTile;
protected ZPM zpmOnTile;
protected Stack<Box> boxStack;
public void setAdajacentTile(Tile newTile, Direction direction) {
adjacentTile.put(direction, newTile);
}
public abstract void spawnStargate(Stargate stargate, Direction direction);
public abstract void onEntry(PlayerBase playerBase);
public abstract void onExit(PlayerBase playerBase);
public void setZPMOnTile(ZPM zpm) {
zpmOnTile = zpm;
}
public ZPM getZPMFromTile() {
ZPM zpm = zpmOnTile;
zpmOnTile = null;
return zpm;
}
public void putABox(Box box) {
if(box == null)
return;
boxStack.push(box);
}
public Box getABox(){
if(boxStack.isEmpty())
return null;
return boxStack.pop();
}
public Tile() {
adjacentTile = new HashMap<Direction, Tile>();
}
public Tile getAdjacentTile(Direction direction) {
return adjacentTile.get(direction);
}
public void setAdajacentTile(Tile newTile, Direction direction) {
adjacentTile.put(direction, newTile);
}
public abstract void spawnStargate(Stargate stargate, Direction direction);
public abstract void onEntry(PlayerBase playerBase);
public abstract void onExit(PlayerBase playerBase);
public void setZPMOnTile(ZPM zpm) {
zpmOnTile = zpm;
}
public ZPM getZPMFromTile() {
ZPM zpm = zpmOnTile;
zpmOnTile = null;
return zpm;
}
public void putABox(Box box) {
if (box == null)
return;
boxStack.push(box);
}
public Box getABox() {
if (boxStack.isEmpty())
return null;
return boxStack.pop();
}
}

51
cicaprojekt/Wall.java
View File

@ -1,33 +1,32 @@
package cicaprojekt;
public class Wall extends Tile {
private Stargate sg;
private Stargate sg;
public Wall(){
super();
}
public void spawnStargate(Stargate stargate, Direction direction) {
if(sg == null)
sg = stargate;
else
return;
}
public Wall() {
super();
}
public void clearStargate() {
sg = null;
}
public void onEntry(PlayerBase playerBase) {
if(sg == null) {
return;
}
else {
sg.teleport(playerBase.facingDirection);
}
}
public void spawnStargate(Stargate stargate, Direction direction) {
if (sg == null)
sg = stargate;
else
return;
}
public void onExit(PlayerBase playerBase) throws IllegalStateException {
throw new IllegalStateException("Hiba! Te hogy kerültél a falba?");
}
public void clearStargate() {
sg = null;
}
public void onEntry(PlayerBase playerBase) {
if (sg == null) {
return;
} else {
sg.teleport(playerBase.facingDirection);
}
}
public void onExit(PlayerBase playerBase) throws IllegalStateException {
throw new IllegalStateException("Hiba! Te hogy kerültél a falba?");
}
}

21
cicaprojekt/ZPM.java
View File

@ -1,16 +1,15 @@
package cicaprojekt;
public class ZPM implements Pickable
{
public void pick(){
}
public class ZPM implements Pickable {
public void pick() {
}
@Override
public void destroy(){
}
@Override
public void destroy() {
}
@Override
public int weight() {
return 0;
}
@Override
public int weight() {
return 0;
}
}