From ea3c3b46c4e29014b5500c6d43ddf09216df81c3 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Sun, 3 May 2020 16:15:33 +0200 Subject: [PATCH] Legger til manglende kommentarer og fikser filnavn --- .../roborally/objects/RoboRallyGame.java | 1 + .../fiasko/roborally/ui/RoboRallyUI.java | 5 +++++ .../roborally/ui/screens/LobbyScreen.java | 12 ++++++++++-- .../roborally/utility/DeckLoaderUtil.java | 19 ++++++++++++++++--- ...Manuall_testing.txt => manual_testing.txt} | 0 ...t => programming_cards_manual_testing.txt} | 0 6 files changed, 32 insertions(+), 5 deletions(-) rename src/main/resources/boards/{Manuall_testing.txt => manual_testing.txt} (100%) rename src/main/resources/{programming_cards_manuall_testing.txt => programming_cards_manual_testing.txt} (100%) diff --git a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java index 063978d..7ac6ebd 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java +++ b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java @@ -43,6 +43,7 @@ public class RoboRallyGame implements DrawableGame, InteractableGame { * @param boardName The playerName of the board to use * @param playerName The name of the player of this instance of the game * @param server The server if this player is host. Should be null otherwise + * @param testingMode Whether the game should use the test deck rather than the proper deck */ public RoboRallyGame(List playerList, String boardName, String playerName, RoboRallyServer server, Boolean testingMode) { diff --git a/src/main/java/inf112/fiasko/roborally/ui/RoboRallyUI.java b/src/main/java/inf112/fiasko/roborally/ui/RoboRallyUI.java index d61d27e..fd3fe4a 100644 --- a/src/main/java/inf112/fiasko/roborally/ui/RoboRallyUI.java +++ b/src/main/java/inf112/fiasko/roborally/ui/RoboRallyUI.java @@ -42,5 +42,10 @@ public interface RoboRallyUI { */ void setShouldHurry(boolean shouldHurry); + /** + * Gets whether the game should be started in test mode + * + * @return Whether the game should be started in test mode + */ boolean isTesting(); } diff --git a/src/main/java/inf112/fiasko/roborally/ui/screens/LobbyScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/LobbyScreen.java index 2a870de..3880513 100644 --- a/src/main/java/inf112/fiasko/roborally/ui/screens/LobbyScreen.java +++ b/src/main/java/inf112/fiasko/roborally/ui/screens/LobbyScreen.java @@ -2,6 +2,7 @@ package inf112.fiasko.roborally.ui.screens; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; +import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.ui.SelectBox; import com.badlogic.gdx.scenes.scene2d.ui.Skin; @@ -66,6 +67,9 @@ public class LobbyScreen extends InteractiveScreen { stage.setViewport(viewport); } + /** + * Makes the server send information to players about the selected map and connected players + */ private void startGame() { roboRallyWrapper.server.startGame(); Map playerNames = roboRallyWrapper.server.getPlayerNames(); @@ -97,7 +101,7 @@ public class LobbyScreen extends InteractiveScreen { return true; } else if (keyCode == Input.Keys.T) { roboRallyWrapper.isTesting = true; - String testBoard = "Manuall_testing"; + String testBoard = "manual_testing"; selectBox.getItems().add(testBoard); selectBox.setSelected(testBoard); startGame(); @@ -107,7 +111,9 @@ public class LobbyScreen extends InteractiveScreen { @Override public void render(float delta) { - super.render(delta); + Gdx.gl.glClearColor(0.5f, 0.5f, 0.5f, 0.5f); + Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); + camera.update(); roboRallyWrapper.batch.setProjectionMatrix(camera.combined); roboRallyWrapper.batch.begin(); @@ -119,6 +125,8 @@ public class LobbyScreen extends InteractiveScreen { applicationWidth / 2f - 380 / 2f, applicationHeight / 2f + 100, 380, 1, true); roboRallyWrapper.batch.end(); + stage.draw(); + stage.act(); } } diff --git a/src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java b/src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java index f6b3f3d..c291057 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java +++ b/src/main/java/inf112/fiasko/roborally/utility/DeckLoaderUtil.java @@ -22,14 +22,27 @@ public final class DeckLoaderUtil { * @throws IOException If the programming cards file is invalid */ public static ProgrammingCardDeck loadProgrammingCardsDeck() throws IOException { - return loadCards("programming_cards.txt"); + return loadProgrammingCardsDeck("programming_cards.txt"); } + /** + * Returns a programming card deck containing nine cards to use for testing + * + * @return A programming card deck with nine programming cards + * @throws IOException If the programming cards file is invalid + */ public static ProgrammingCardDeck loadProgrammingCardsTestDeck() throws IOException { - return loadCards("programming_cards_manuall_testing.txt"); + return loadProgrammingCardsDeck("programming_cards_manual_testing.txt"); } - private static ProgrammingCardDeck loadCards(String cardFile) throws IOException { + /** + * Loads programming cards from a file + * + * @param cardFile The file containing the cards to load + * @return A deck of programming cards + * @throws IOException If the programming cards file is invalid + */ + private static ProgrammingCardDeck loadProgrammingCardsDeck(String cardFile) throws IOException { BufferedReader reader = new BufferedReader(new InputStreamReader( ResourceUtil.getResourceAsInputStream(cardFile))); int numberOfCards = Integer.parseInt(reader.readLine()); diff --git a/src/main/resources/boards/Manuall_testing.txt b/src/main/resources/boards/manual_testing.txt similarity index 100% rename from src/main/resources/boards/Manuall_testing.txt rename to src/main/resources/boards/manual_testing.txt diff --git a/src/main/resources/programming_cards_manuall_testing.txt b/src/main/resources/programming_cards_manual_testing.txt similarity index 100% rename from src/main/resources/programming_cards_manuall_testing.txt rename to src/main/resources/programming_cards_manual_testing.txt