From f644386586106e10d6eb98025d21e5706b54e53a Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Thu, 30 Apr 2020 11:22:21 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Legger=20til=20tekst=20p=C3=A5=20CardChoice?= =?UTF-8?q?Screen=20om=20=C3=A5=20bruke=20TAB=20for=20=C3=A5=20vise=20bret?= =?UTF-8?q?tet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roborally/gamewrapper/screens/CardChoiceScreen.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 b0aeb63..badb1f3 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java +++ b/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 cardList = deck.getCards(); - float cardWidth = viewport.getWorldWidth() / 3; - float cardHeight = (viewport.getWorldHeight() - 30) / 3; + float cardWidth = viewport.getWorldWidth() / 3.2f; + 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); From 4ea44a163ea0132883e8f19c380aadc7b3b1f7f4 Mon Sep 17 00:00:00 2001 From: Steinar Aalstad Lillesund Date: Thu, 30 Apr 2020 11:23:43 +0200 Subject: [PATCH 2/3] referat --- docs/team/referater/referat_30_04_2020.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 docs/team/referater/referat_30_04_2020.md diff --git a/docs/team/referater/referat_30_04_2020.md b/docs/team/referater/referat_30_04_2020.md new file mode 100644 index 0000000..3196632 --- /dev/null +++ b/docs/team/referater/referat_30_04_2020.md @@ -0,0 +1,15 @@ +## Oppmøte +Tilstede: Steinar, Gabriel, Kristian, Torbjørn, Petter +Ikke tilstede: + +## Agenda +- Fortsette arbeidet med MVP + +- Begynne på innleveringsdokumentet + +## Møte +Fortsetter arbeidet på MVP og begynner å ta fatt på presentasjonen som skal holdes på mandag. Bestemmer oss og +for å dele oss opp i arbeidsgrupper ettersom oppgavene på MVP ikke lengre er så mange, samtidig som vi må få +gjort presentasjonen. Diskuterer de forskjellige punktene som må være med på presentasjonen. +Bestemmer oss for å ha et test møte på zoom for å passse på at alt fungerer som det skal fram mot +mandag. \ No newline at end of file From dbf07745864884d3ff35dcc3bb3b86bcbee18ef6 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Thu, 30 Apr 2020 11:44:03 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Legger=20til=20bedre=20beskrivelser=20av=20?= =?UTF-8?q?hva=20som=20blir=20ventet=20p=C3=A5=20p=C3=A5=20LoadingScreen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gamewrapper/screens/LoadingScreen.java | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java index 440cffc..224089d 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java +++ b/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 *