From fd093e6ef8cc888019bf5eb318c86ec33e8465b8 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 24 Mar 2020 11:53:41 +0100 Subject: [PATCH 1/6] Legger til informasjon om manuell testing i README.md --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index 8b08a5c..3bb6284 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,20 @@ Alle regler er hentet fra 2005 utgaven av spillguiden fra Wizards of the Coast, ## Spillstatus Ved kjøring av .jar filen blir det kjørt en demo, uten mulighet for bruker å bevege robot. +## Manuell testing +Demoen er definert i RoboRallyGame sin metode runGameLoop(). Metodene som kan brukes for testing er: +- makeMove(Robot id, Korthandling) //Utfører en handling på en robot +- fireAllLasers() //Fyrer av alle lasere inkludert robotlasere +- moveAllConveyorBelts() //Flytter alle transportbånd +- checkAllFlags() //Oppdaterer roboter som besøker flagg +- rotateCogwheels() //Roterer tannhjul + +Robot id blir representert ved enumen RobotID +Korthandling blir representert ved enumen Action + +Ved å bruke metodene over kan alt i en eller flere faser testes og simuleres. Den store forskjellen fra MVP er at all +bruker-input blir hardkodet før programmet kjører. + ## Knapper og kontrollmekanismer ### Knapper - Q: Tilbakestiller kamera og kamerarotasjon From 29bf09dd7d30532dd1ef2b9f7b0e99c7717d453b Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 24 Mar 2020 11:57:59 +0100 Subject: [PATCH 2/6] Rydder opp i Player klassen --- .../fiasko/roborally/objects/Player.java | 57 ++++++++++--------- .../fiasko/roborally/objects/PlayerTest.java | 8 +-- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/objects/Player.java b/src/main/java/inf112/fiasko/roborally/objects/Player.java index 10c4b93..6141910 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Player.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Player.java @@ -28,65 +28,68 @@ public class Player { /** * Gives you the RobotID of a player - * @return An RobotID + * @return A RobotID */ - public RobotID getRobotID(){return robotID;} + public RobotID getRobotID() { + return robotID; + } /** * Set the players deck to the given deck - * @param playerDeck a deck of cards given to the player + * @param playerDeck A deck of cards given to the player */ - public void setPlayerDeck(ProgrammingCardDeck playerDeck){ - this.playerDeck=playerDeck; + public void setPlayerDeck(ProgrammingCardDeck playerDeck) { + this.playerDeck = playerDeck; } /** * Gives you the Name of the player - * @return a player Name + * @return A player Name */ - public String getName() {return name;} + public String getName() { + return name; + } /** * Gives you the players program - * @return a list + * @return A list of programming cards */ - public List getProgram() {return program;} + public List getProgram() { + return program; + } /** * Gives you the player hand/deck * @return a deck */ - public ProgrammingCardDeck getPlayerDeck() {return playerDeck;} + public ProgrammingCardDeck getPlayerDeck() { + return playerDeck; + } /** - * Gives you the players powerdown status - * @return a boolean + * Gives you the players power down status + * @return Whether the player is to power down */ - public boolean getPowerDownNextRound() { return powerDownNextRound;} + public boolean getPowerDownNextRound() { + return powerDownNextRound; + } /** - * Sets the prowerdown status - * @param powerDownStatus the boolean that determines if it goes to a powerdown or not + * Sets the power down status + * @param powerDownStatus Whether the player is to take power down next round */ - public void setPowerDownNextRound(boolean powerDownStatus) { this.powerDownNextRound = powerDownStatus;} - - /** - * Gets the program from the player - * @return List of programing cards - */ - public List getProgramFromPlayer(){ - return program; + public void setPowerDownNextRound(boolean powerDownStatus) { + this.powerDownNextRound = powerDownStatus; } /** * Sets the Players program to the given list of programing cards * @param cardList list the size of 5 with programing cards */ - public void setInProgram(List cardList){ - if(cardList.size() != 5){ + public void setInProgram(List cardList) { + if (cardList.size() != 5) { throw new IllegalArgumentException("list must contain 5 programing cards"); - } - else { + } else { program = new ArrayList<>(cardList); } } diff --git a/src/test/java/inf112/fiasko/roborally/objects/PlayerTest.java b/src/test/java/inf112/fiasko/roborally/objects/PlayerTest.java index 3bdce6e..7996a2f 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/PlayerTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/PlayerTest.java @@ -42,10 +42,10 @@ public class PlayerTest { @Test public void testSetInProgram() { playerTest.setInProgram(cards); - assertEquals(Action.MOVE_1, playerTest.getProgramFromPlayer().get(0).getAction()); - assertEquals(Action.MOVE_2, playerTest.getProgramFromPlayer().get(1).getAction()); - assertEquals(Action.MOVE_3, playerTest.getProgramFromPlayer().get(2).getAction()); - assertEquals(Action.BACK_UP, playerTest.getProgramFromPlayer().get(3).getAction()); + assertEquals(Action.MOVE_1, playerTest.getProgram().get(0).getAction()); + assertEquals(Action.MOVE_2, playerTest.getProgram().get(1).getAction()); + assertEquals(Action.MOVE_3, playerTest.getProgram().get(2).getAction()); + assertEquals(Action.BACK_UP, playerTest.getProgram().get(3).getAction()); } @Test (expected = IllegalArgumentException.class) From 86edea6c11e85c9705bc0221df8f6dff56a5b113 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 24 Mar 2020 12:03:17 +0100 Subject: [PATCH 3/6] Fjerner ubrukte importeringer --- .../java/inf112/fiasko/roborally/objects/RoboRallyGame.java | 6 +++++- .../fiasko/roborally/element_properties/TileTypeTest.java | 2 -- .../java/inf112/fiasko/roborally/objects/ParticleTest.java | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java index ae456ed..f19ce13 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java +++ b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java @@ -1,6 +1,10 @@ package inf112.fiasko.roborally.objects; -import inf112.fiasko.roborally.element_properties.*; +import inf112.fiasko.roborally.element_properties.Action; +import inf112.fiasko.roborally.element_properties.Direction; +import inf112.fiasko.roborally.element_properties.Position; +import inf112.fiasko.roborally.element_properties.RobotID; +import inf112.fiasko.roborally.element_properties.TileType; import inf112.fiasko.roborally.utility.BoardLoaderUtil; import java.io.IOException; diff --git a/src/test/java/inf112/fiasko/roborally/element_properties/TileTypeTest.java b/src/test/java/inf112/fiasko/roborally/element_properties/TileTypeTest.java index c685d4b..6542daf 100644 --- a/src/test/java/inf112/fiasko/roborally/element_properties/TileTypeTest.java +++ b/src/test/java/inf112/fiasko/roborally/element_properties/TileTypeTest.java @@ -1,6 +1,5 @@ package inf112.fiasko.roborally.element_properties; -import inf112.fiasko.roborally.objects.Tile; import org.junit.Test; import java.util.ArrayList; @@ -9,7 +8,6 @@ import java.util.List; import java.util.Set; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; public class TileTypeTest { diff --git a/src/test/java/inf112/fiasko/roborally/objects/ParticleTest.java b/src/test/java/inf112/fiasko/roborally/objects/ParticleTest.java index a96804e..c2c079e 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/ParticleTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/ParticleTest.java @@ -2,7 +2,6 @@ package inf112.fiasko.roborally.objects; import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.element_properties.ParticleType; -import inf112.fiasko.roborally.element_properties.TileType; import org.junit.Before; import org.junit.Test; From f1ddf7847d38c65e86b74c5be0eb27dc612629a1 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 24 Mar 2020 12:03:47 +0100 Subject: [PATCH 4/6] Fikser sjekk av rotert tekstur for partikler --- src/main/java/inf112/fiasko/roborally/utility/IOUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java b/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java index 76195b0..8fecadb 100644 --- a/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java +++ b/src/main/java/inf112/fiasko/roborally/utility/IOUtil.java @@ -126,7 +126,7 @@ public final class IOUtil { direction = wall.getDirection(); } else if (element.getClass().isAssignableFrom(Particle.class)) { Particle particle = (Particle) element; - hasRotatedTexture = true; + hasRotatedTexture = TextureConverterUtil.hasRotatedTexture(particle); direction = particle.getDirection(); } else { throw new IllegalArgumentException("Unknown element type passed to function."); From 97688887b255c0aa0b0f5840b1be24e9ebafd560 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 24 Mar 2020 12:08:05 +0100 Subject: [PATCH 5/6] Legger til manglende mellomrom i README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3bb6284..17a88af 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@ Ved kjøring av .jar filen blir det kjørt en demo, uten mulighet for bruker å ## Manuell testing Demoen er definert i RoboRallyGame sin metode runGameLoop(). Metodene som kan brukes for testing er: -- makeMove(Robot id, Korthandling) //Utfører en handling på en robot -- fireAllLasers() //Fyrer av alle lasere inkludert robotlasere -- moveAllConveyorBelts() //Flytter alle transportbånd -- checkAllFlags() //Oppdaterer roboter som besøker flagg -- rotateCogwheels() //Roterer tannhjul +- makeMove(Robot id, Korthandling) //Utfører en handling på en robot +- fireAllLasers() //Fyrer av alle lasere inkludert robotlasere +- moveAllConveyorBelts() //Flytter alle transportbånd +- checkAllFlags() //Oppdaterer roboter som besøker flagg +- rotateCogwheels() //Roterer tannhjul Robot id blir representert ved enumen RobotID Korthandling blir representert ved enumen Action From d2356477836b45f1effc426cd7f6420933d208bb Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 24 Mar 2020 12:09:26 +0100 Subject: [PATCH 6/6] Fjerner whitespace fra Oblig3.md --- Deliverables/Oblig3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Deliverables/Oblig3.md b/Deliverables/Oblig3.md index 3698548..0e39f21 100644 --- a/Deliverables/Oblig3.md +++ b/Deliverables/Oblig3.md @@ -78,7 +78,7 @@ Implementere fase og alt av funksjoner en fase kommer til trenge. * Som spiller trenger jeg å kunne registrere flagg for å kunne vinne spillet. * Ved slutten av en fase vil roboter som står på et flagg få oppdatert currentflagg verdien sin, gitt at den har besøkt det forige flagget. - + * Spilleren vinner når alle flagg er besøkt i rett rekkefølge. ### Arbeidsoppgaver