From b121cae8b0ca2aebd1911111ecedc1a23eae0e8b Mon Sep 17 00:00:00 2001 From: GabrielMagnus Date: Thu, 23 Apr 2020 10:46:18 +0200 Subject: [PATCH 1/9] Laget vegg blokker flytting av brett senario --- src/test/resources/boards/test_board.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/resources/boards/test_board.txt b/src/test/resources/boards/test_board.txt index 2eaf55c..0f8531a 100644 --- a/src/test/resources/boards/test_board.txt +++ b/src/test/resources/boards/test_board.txt @@ -1,5 +1,5 @@ 12 12 -01;01 01;01 01;01 01;01 01;01 01;01 01;01 05;01 01;01 01;01 01;01 01;01 +05;01 01;01 01;01 01;01 01;01 01;01 01;01 05;01 01;01 01;01 01;01 01;01 01;01 05;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 02;01 01;01 01;01 01;01 05;01 01;01 05;07 01;01 01;01 01;01 01;01 01;01 05;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 @@ -11,7 +11,7 @@ 01;01 07;03 07;01 01;01 11;01 05;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 11;01 05;01 01;01 05;03 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 05;01 01;01 01;01 01;01 -0 1;5 0 0 0 0 0 0 0 0 0 0 +1;5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 From 7961d32a2f2a969b4a744b8f75c87ab107c17122 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Thu, 23 Apr 2020 10:49:27 +0200 Subject: [PATCH 2/9] =?UTF-8?q?Gj=C3=B8r=20noen=20kosmetiske=20endringer?= =?UTF-8?q?=20p=C3=A5=20vinneskjermen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roborally/gamewrapper/screens/WinnerScreen.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java index f1975f3..c5c3c8a 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java +++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/WinnerScreen.java @@ -50,18 +50,17 @@ public class WinnerScreen extends AbstractScreen { @Override public void render(float delta) { - Gdx.gl.glClearColor(0.2f, 1f, 0.2f, 1); + Gdx.gl.glClearColor(0.2f, 0.2f, 0.2f, 1); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); camera.update(); roboRallyWrapper.batch.setProjectionMatrix(camera.combined); roboRallyWrapper.batch.begin(); - roboRallyWrapper.font.draw(roboRallyWrapper.batch, "The winner is: " + - roboRallyWrapper.roboRallyGame.getWinningPlayerName(), applicationWidth / 2f - 380 / 2f, - applicationHeight / 2f + 100, 380, 1, + roboRallyWrapper.font.draw(roboRallyWrapper.batch, "The winner is: ", applicationWidth / 2f - 380 / 2f, + applicationHeight / 2f + 300, 380, 1, true); roboRallyWrapper.font.draw(roboRallyWrapper.batch, "Click the button to exit the game", - applicationWidth / 2f - 380 / 2f, applicationHeight / 2f + 100, 380, 1, + applicationWidth / 2f - 380 / 2f, applicationHeight / 2f + 150, 380, 1, true); roboRallyWrapper.batch.end(); stage.draw(); From 7da8ba7a9c4199960aca591598325342254320d8 Mon Sep 17 00:00:00 2001 From: GabrielMagnus Date: Thu, 23 Apr 2020 10:50:02 +0200 Subject: [PATCH 3/9] =?UTF-8?q?Lager=20test=20for=20at=20en=20vegg=20stopp?= =?UTF-8?q?er=20en=20robot=20=C3=A5=20bli=20skubbet=20av=20brettet=20av=20?= =?UTF-8?q?et=20transportb=C3=A5nd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: torlunjen --- .../inf112/fiasko/roborally/objects/PhaseTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java b/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java index 9b2bd43..36d8642 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java @@ -461,4 +461,17 @@ public class PhaseTest { assertFalse(board.isRobotAlive(RobotID.ROBOT_1)); assertNull(board.getRobotOnPosition(new Position(7, 0))); } + + @Test + public void robotOnConveyorBeltFacingOutOfMapMovesIntoWallIsBlocked() throws IOException, InterruptedException { + List robots = new ArrayList<>(); + List players = new ArrayList<>(); + robots.add(new Robot(RobotID.ROBOT_1, new Position(0, 0))); + players.add(new Player(RobotID.ROBOT_1, "Player 1")); + + Phase testPhase = createPhaseAndLoadBoard(players, robots); + testPhase.moveAllConveyorBelts(); + + assertNull(board.getRobotOnPosition(new Position(0, 0))); + } } From 1f31f66c70379c8d0b764739fbd613be5306bc04 Mon Sep 17 00:00:00 2001 From: torlunjen Date: Thu, 23 Apr 2020 10:58:58 +0200 Subject: [PATCH 4/9] =?UTF-8?q?Endrer=20en=20test=20s=C3=A5=20den=20tester?= =?UTF-8?q?=20det=20den=20skal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: gabrielmagnus --- src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java | 3 ++- src/test/resources/boards/test_board.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java b/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java index 36d8642..92cb7eb 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java @@ -472,6 +472,7 @@ public class PhaseTest { Phase testPhase = createPhaseAndLoadBoard(players, robots); testPhase.moveAllConveyorBelts(); - assertNull(board.getRobotOnPosition(new Position(0, 0))); + assertTrue(board.isRobotAlive(RobotID.ROBOT_1)); + assertEquals(RobotID.ROBOT_1, board.getRobotOnPosition(new Position(0, 0))); } } diff --git a/src/test/resources/boards/test_board.txt b/src/test/resources/boards/test_board.txt index 0f8531a..6640cf6 100644 --- a/src/test/resources/boards/test_board.txt +++ b/src/test/resources/boards/test_board.txt @@ -11,7 +11,7 @@ 01;01 07;03 07;01 01;01 11;01 05;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 11;01 05;01 01;01 05;03 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 05;01 01;01 01;01 01;01 -1;5 0 0 0 0 0 0 0 0 0 0 0 +1;1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 From 3921f27b58e34c6896933a129fe10c73c49e8eb0 Mon Sep 17 00:00:00 2001 From: GabrielMagnus Date: Thu, 23 Apr 2020 11:22:50 +0200 Subject: [PATCH 5/9] La til vegg der testen trenger den --- src/test/resources/boards/test_board.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/boards/test_board.txt b/src/test/resources/boards/test_board.txt index 6640cf6..6dd8715 100644 --- a/src/test/resources/boards/test_board.txt +++ b/src/test/resources/boards/test_board.txt @@ -11,7 +11,7 @@ 01;01 07;03 07;01 01;01 11;01 05;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 11;01 05;01 01;01 05;03 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 05;01 01;01 01;01 01;01 -1;1 0 0 0 0 0 0 0 0 0 0 0 +1;1 1;5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 From 6ac96d73e236b41dccb27031ff4399c9f5cfba46 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Thu, 23 Apr 2020 11:30:28 +0200 Subject: [PATCH 6/9] =?UTF-8?q?Fikser=20et=20problem=20med=20roboter=20som?= =?UTF-8?q?=20st=C3=A5r=20p=C3=A5=20transportb=C3=A5nd=20med=20en=20tile?= =?UTF-8?q?=20mellom=20seg=20og=20enden=20av=20kartet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inf112/fiasko/roborally/objects/Board.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java index 0b86cc3..4f74a52 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Board.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java @@ -401,20 +401,20 @@ public class Board { private boolean hasCrossingConflict(Position crossingPosition, Direction conveyorBeltDirection) { Position frontLeftPosition = getNewPosition(crossingPosition, Direction.getLeftRotatedDirection(conveyorBeltDirection)); - Tile frontLeftTile = getTileOnPosition(frontLeftPosition); Position frontRightPosition = getNewPosition(crossingPosition, Direction.getRightRotatedDirection(conveyorBeltDirection)); - Tile frontRightTile = getTileOnPosition(frontRightPosition); Position twoForwardPosition = getNewPosition(crossingPosition, conveyorBeltDirection); - Tile twoForwardTile = getTileOnPosition(twoForwardPosition); //If another robot is standing on a conveyor belt pointing to the tile in front, a conflict happens - return (isValidPosition(frontLeftPosition) && isConveyorBelt(frontLeftTile) && frontLeftTile.getDirection() == + return (isValidPosition(frontLeftPosition) && isConveyorBelt(getTileOnPosition(frontLeftPosition)) && + getTileOnPosition(frontLeftPosition).getDirection() == Direction.getRightRotatedDirection(conveyorBeltDirection) && hasRobotOnPosition(frontLeftPosition)) || - (isValidPosition(frontRightPosition) && isConveyorBelt(frontRightTile) - && frontRightTile.getDirection() == Direction.getLeftRotatedDirection(conveyorBeltDirection) + (isValidPosition(frontRightPosition) && isConveyorBelt(getTileOnPosition(frontRightPosition)) + && getTileOnPosition(frontRightPosition).getDirection() == + Direction.getLeftRotatedDirection(conveyorBeltDirection) && hasRobotOnPosition(frontRightPosition)) || - (isValidPosition(twoForwardPosition) && isConveyorBelt(twoForwardTile) - && twoForwardTile.getDirection() == Direction.getReverseDirection(conveyorBeltDirection) + (isValidPosition(twoForwardPosition) && isConveyorBelt(getTileOnPosition(twoForwardPosition)) + && getTileOnPosition(twoForwardPosition).getDirection() == + Direction.getReverseDirection(conveyorBeltDirection) && hasRobotOnPosition(twoForwardPosition)); } From 76b89f81d9aa8038262b1922ebd4a8d913ccc053 Mon Sep 17 00:00:00 2001 From: GabrielMagnus Date: Thu, 23 Apr 2020 11:32:09 +0200 Subject: [PATCH 7/9] =?UTF-8?q?La=20til=20vegg=20for=20=C3=A5=20stoppe=20r?= =?UTF-8?q?oboter=20til=20bruk=20av=20testing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/resources/boards/test_board.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/boards/test_board.txt b/src/test/resources/boards/test_board.txt index 6dd8715..4fe6cf5 100644 --- a/src/test/resources/boards/test_board.txt +++ b/src/test/resources/boards/test_board.txt @@ -9,7 +9,7 @@ 01;01 01;01 01;01 01;01 11;01 05;01 05;03 02;01 01;01 03;01 01;01 01;01 01;01 07;05 07;07 01;01 11;01 05;01 01;01 05;01 01;01 01;01 01;01 01;01 01;01 07;03 07;01 01;01 11;01 05;01 01;01 01;01 01;01 01;01 01;01 01;01 -01;01 01;01 01;01 01;01 11;01 05;01 01;01 05;03 01;01 01;01 01;01 01;01 +01;01 01;01 01;01 01;01 11;01 05;01 01;01 05;03 01;01 01;01 05;05 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 01;01 05;01 01;01 01;01 01;01 1;1 1;5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 From a0cd4baa4409a9864f9e8e2feb7e8822731b6691 Mon Sep 17 00:00:00 2001 From: GabrielMagnus Date: Thu, 23 Apr 2020 11:32:53 +0200 Subject: [PATCH 8/9] =?UTF-8?q?Lager=20test=20for=20=C3=A5=20se=20om=20en?= =?UTF-8?q?=20robot=20kan=20bli=20flyttet=20av=20transportb=C3=A5nd=20n?= =?UTF-8?q?=C3=A5r=20den=20st=C3=A5r=20med=20en=20tile=20mellom=20seg=20og?= =?UTF-8?q?=20utenfor=20brettet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inf112/fiasko/roborally/objects/PhaseTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java b/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java index 92cb7eb..ed9ae08 100644 --- a/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java +++ b/src/test/java/inf112/fiasko/roborally/objects/PhaseTest.java @@ -475,4 +475,18 @@ public class PhaseTest { assertTrue(board.isRobotAlive(RobotID.ROBOT_1)); assertEquals(RobotID.ROBOT_1, board.getRobotOnPosition(new Position(0, 0))); } + + @Test + public void robotOnConveyorBeltFacingOutOfMapWithOneTileBetweenCanBeMoved() throws IOException, InterruptedException { + List robots = new ArrayList<>(); + List players = new ArrayList<>(); + robots.add(new Robot(RobotID.ROBOT_1, new Position(10, 10))); + players.add(new Player(RobotID.ROBOT_1, "Player 1")); + + Phase testPhase = createPhaseAndLoadBoard(players, robots); + testPhase.moveAllConveyorBelts(); + + assertTrue(board.isRobotAlive(RobotID.ROBOT_1)); + assertEquals(RobotID.ROBOT_1, board.getRobotOnPosition(new Position(10, 11))); + } } From 2b6303ea8fe3bdd2a08f25884eeda631dd7317fa Mon Sep 17 00:00:00 2001 From: Steinar Aalstad Lillesund Date: Thu, 23 Apr 2020 11:55:14 +0200 Subject: [PATCH 9/9] referat --- docs/team/referater/referat_23_04_2020.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 docs/team/referater/referat_23_04_2020.md diff --git a/docs/team/referater/referat_23_04_2020.md b/docs/team/referater/referat_23_04_2020.md new file mode 100644 index 0000000..326b21f --- /dev/null +++ b/docs/team/referater/referat_23_04_2020.md @@ -0,0 +1,9 @@ +## Oppmøte +Tilstede: Steinar, Gabriel, Kristian, Torbjørn, Petter +Ikke tilstede: + +## Agenda +- Fortsette arbeidet med MVP + +## Møte +Started med engang å fortsette med arbeidet vi har på prosjekt tavlen. \ No newline at end of file