diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java index 48f059d..04c9988 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java +++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java @@ -93,12 +93,12 @@ public class CardChoiceScreen extends InputAdapter implements Screen { public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) { if (chosenCards.size() == maxCards) { List oldProgram = roboRallyWrapper.roboRallyGame.getProgram(); - int lockedCardsInt = 5-maxCards; + int lockedCardsInt = 5 - maxCards; List newProgram = getCards(); - for(int i = 4; i>(4-lockedCardsInt);i--){ - newProgram.add(oldProgram.get(i)); + for (int i = 4; i > (4 - lockedCardsInt); i--) { + newProgram.add(oldProgram.get(i)); } - System.out.println("fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuasdasdasda234234234: "+newProgram.size()); + System.out.println("fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuasdasdasda234234234: " + newProgram.size()); System.out.println(newProgram); roboRallyWrapper.roboRallyGame.setProgram(newProgram); diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/PowerDownScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/PowerDownScreen.java index 6e344b4..0d01851 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/PowerDownScreen.java +++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/PowerDownScreen.java @@ -58,10 +58,9 @@ public class PowerDownScreen extends AbstractScreen { camera.update(); roboRallyWrapper.batch.setProjectionMatrix(camera.combined); String descriptiontext; - if(roboRallyWrapper.roboRallyGame.getGameState()==GameState.CHOOSING_POWER_DOWN){ + if (roboRallyWrapper.roboRallyGame.getGameState() == GameState.CHOOSING_POWER_DOWN) { descriptiontext = "click the button to enter powerdown next round"; - } - else{ + } else { descriptiontext = "continue powerdown?"; } int elapsedTime = (int) Math.floor((System.currentTimeMillis() - startTime) / 1000f); diff --git a/src/main/java/inf112/fiasko/roborally/networking/containers/ErrorResponse.java b/src/main/java/inf112/fiasko/roborally/networking/containers/ErrorResponse.java index e88ff17..ca9b17b 100644 --- a/src/main/java/inf112/fiasko/roborally/networking/containers/ErrorResponse.java +++ b/src/main/java/inf112/fiasko/roborally/networking/containers/ErrorResponse.java @@ -16,7 +16,8 @@ public class ErrorResponse { this.errorMessage = errorMessage; this.critical = false; } - public ErrorResponse(){ + + public ErrorResponse() { } diff --git a/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java b/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java index fb79226..f5daffb 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java @@ -202,7 +202,6 @@ public class PhaseTest { } - @Test public void robotFiresLaserAndHitsARobotDoesNotDamageRobotOnOtherSide() throws InterruptedException { FakeGame testGame = new FakeGame();