Merge branch 'master' of https://github.com/inf112-v20/Fiasko

src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java

@@ -161,8 +161,8 @@ public class CardChoiceScreen extends InteractiveScreen implements Screen {
      */
     private void generateCards(ProgrammingCardDeck deck) {
         List<ProgrammingCard> cardList = deck.getCards();
-        float cardWidth = viewport.getWorldWidth() / 3;
+        float cardWidth = viewport.getWorldWidth() / 3.2f;
-        float cardHeight = (viewport.getWorldHeight() - 30) / 3;
+        float cardHeight = (viewport.getWorldHeight() - 30) / 3.2f;
         for (int i = 0; i < cardList.size(); i++) {
             ProgrammingCard programmingCard = cardList.get(i);
             generateCardRectangle(i, cardWidth, cardHeight, programmingCard, true);
@@ -211,6 +211,8 @@ public class CardChoiceScreen extends InteractiveScreen implements Screen {
         renderCards();
         shapeRenderer.end();
         roboRallyWrapper.batch.begin();
+        roboRallyWrapper.font.draw(roboRallyWrapper.batch, "Press TAB to toggle the board", 10,
+                viewport.getWorldHeight() - 50);
         renderCardText();
         roboRallyWrapper.batch.end();
         stage.draw();
@@ -255,7 +257,7 @@ public class CardChoiceScreen extends InteractiveScreen implements Screen {
     private void renderCardText() {
         roboRallyWrapper.font.setColor(YELLOW);
         for (CardRectangle cardRectangle : cardRectangles) {
-            roboRallyWrapper.font.getData().setScale(0.8f);
+            roboRallyWrapper.font.getData().setScale(0.7f);
             GlyphLayout layout = new GlyphLayout(roboRallyWrapper.font,
                     Integer.toString(cardRectangle.card.getPriority()));
             float fontX = (int) (cardRectangle.rectangle.x + (cardRectangle.rectangle.width - layout.width) - 28);

src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java

@@ -34,7 +34,7 @@ public class LoadingScreen extends AbstractScreen {
         roboRallyWrapper.batch.setProjectionMatrix(camera.combined);
 
         roboRallyWrapper.batch.begin();
-        roboRallyWrapper.font.draw(roboRallyWrapper.batch, "Loading...", applicationWidth / 2f - 380 / 2f,
+        roboRallyWrapper.font.draw(roboRallyWrapper.batch, getLoadingText(), applicationWidth / 2f - 380 / 2f,
                 applicationHeight / 2f, 380, 1, true);
         roboRallyWrapper.batch.end();
 
@@ -44,6 +44,36 @@ public class LoadingScreen extends AbstractScreen {
         }
     }
 
+    /**
+     * Returns the correct loading text to display according to the game's state
+     *
+     * @return Text explaining what the game is waiting for
+     */
+    private String getLoadingText() {
+        if (roboRallyWrapper.roboRallyGame == null) {
+            if (roboRallyWrapper.server == null) {
+                return "Waiting for host to start the game...";
+            }
+            return "Loading...";
+        }
+        System.out.println(roboRallyWrapper.roboRallyGame.getGameState());
+        switch (roboRallyWrapper.roboRallyGame.getGameState()) {
+            case WAITING_FOR_OTHER_PLAYERS_PROGRAMS:
+                return "Waiting for other players to finish programming...";
+            case WAITING_FOR_CARDS_FROM_SERVER:
+                return "Waiting for new cards from the server...";
+            case BEGINNING_OF_GAME:
+                return "Initializing new turn...";
+            case CHOOSING_CARDS:
+                return "Waiting for screen change...";
+            case SKIP_STAY_IN_POWER_DOWN:
+                return "Waiting for players to choose whether to stay in power down...";
+            default:
+                return "Waiting for something...";
+        }
+
+    }
+
     /**
      * Changes to another screen depending on which state the game is in
      *