EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2024-10-16 18:23:38 +02:00
Code Issues Projects Releases Wiki Activity

Autoformaterer klasser med formateringsfeil

Browse Source
This commit is contained in:
Kristian Knarvik 2020-04-22 12:48:33 +02:00
parent fada713d19
commit 6394bd9655
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java
View File

@ -93,12 +93,12 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) { public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
if (chosenCards.size() == maxCards) { if (chosenCards.size() == maxCards) {
List<ProgrammingCard> oldProgram = roboRallyWrapper.roboRallyGame.getProgram(); List<ProgrammingCard> oldProgram = roboRallyWrapper.roboRallyGame.getProgram();
int lockedCardsInt = 5-maxCards; int lockedCardsInt = 5 - maxCards;
List<ProgrammingCard> newProgram = getCards(); List<ProgrammingCard> newProgram = getCards();
for(int i = 4; i>(4-lockedCardsInt);i--){ for (int i = 4; i > (4 - lockedCardsInt); i--) {
newProgram.add(oldProgram.get(i)); newProgram.add(oldProgram.get(i));
} }
System.out.println("fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuasdasdasda234234234: "+newProgram.size()); System.out.println("fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuasdasdasda234234234: " + newProgram.size());
System.out.println(newProgram); System.out.println(newProgram);
roboRallyWrapper.roboRallyGame.setProgram(newProgram); roboRallyWrapper.roboRallyGame.setProgram(newProgram);

5
src/main/java/inf112/fiasko/roborally/gamewrapper/screens/PowerDownScreen.java
View File

@ -58,10 +58,9 @@ public class PowerDownScreen extends AbstractScreen {
camera.update(); camera.update();
roboRallyWrapper.batch.setProjectionMatrix(camera.combined); roboRallyWrapper.batch.setProjectionMatrix(camera.combined);
String descriptiontext; 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"; descriptiontext = "click the button to enter powerdown next round";
} } else {
else{
descriptiontext = "continue powerdown?"; descriptiontext = "continue powerdown?";
} }
int elapsedTime = (int) Math.floor((System.currentTimeMillis() - startTime) / 1000f); int elapsedTime = (int) Math.floor((System.currentTimeMillis() - startTime) / 1000f);

3
src/main/java/inf112/fiasko/roborally/networking/containers/ErrorResponse.java
View File

@ -16,7 +16,8 @@ public class ErrorResponse {
this.errorMessage = errorMessage; this.errorMessage = errorMessage;
this.critical = false; this.critical = false;
} }
public ErrorResponse(){
public ErrorResponse() {
} }

1
src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java
View File

@ -202,7 +202,6 @@ public class PhaseTest {
} }
@Test @Test
public void robotFiresLaserAndHitsARobotDoesNotDamageRobotOnOtherSide() throws InterruptedException { public void robotFiresLaserAndHitsARobotDoesNotDamageRobotOnOtherSide() throws InterruptedException {
FakeGame testGame = new FakeGame(); FakeGame testGame = new FakeGame();