diff --git a/README.md b/README.md
index d667eaf..8262c4d 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,9 @@ Javadoc for hele prosjektet kan finnes [her](https://inf112-v20.github.io/Fiasko
- T: Denne knappen lar deg starte spillet i en modus spesialisert for manuell testing.
Denne modusen støtter bare en spiller.
+## Mer informasjon
+For mer informasjon gå til [wikien](https://github.com/inf112-v20/Fiasko/wiki).
+
## Bygging og kompilering
### Forkrav for å kunne kompilere og kjøre koden
diff --git a/docs/javadoc/allclasses-frame.html b/docs/javadoc/allclasses-frame.html
index b011fbf..679617c 100644
--- a/docs/javadoc/allclasses-frame.html
+++ b/docs/javadoc/allclasses-frame.html
@@ -2,9 +2,9 @@
-
+
Gets a list of all robots to draw
diff --git a/docs/javadoc/index-files/index-8.html b/docs/javadoc/index-files/index-8.html
index 0aaa4b9..7ba4a45 100644
--- a/docs/javadoc/index-files/index-8.html
+++ b/docs/javadoc/index-files/index-8.html
@@ -2,9 +2,9 @@
-
+
H-Index
-
+
diff --git a/docs/javadoc/index-files/index-9.html b/docs/javadoc/index-files/index-9.html
index 838be92..9a72abb 100644
--- a/docs/javadoc/index-files/index-9.html
+++ b/docs/javadoc/index-files/index-9.html
@@ -2,9 +2,9 @@
-
+
I-Index
-
+
diff --git a/docs/javadoc/index.html b/docs/javadoc/index.html
index 239ff78..600a3c8 100644
--- a/docs/javadoc/index.html
+++ b/docs/javadoc/index.html
@@ -2,7 +2,7 @@
-
+
Generated Documentation (Untitled)
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/RequestState.html b/docs/javadoc/inf112/fiasko/roborally/networking/RequestState.html
index c7c81ec..021fec5 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/RequestState.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/RequestState.html
@@ -2,9 +2,9 @@
-
+
RequestState
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/RoboRallyClient.html b/docs/javadoc/inf112/fiasko/roborally/networking/RoboRallyClient.html
index df46532..4d0d020 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/RoboRallyClient.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/RoboRallyClient.html
@@ -2,9 +2,9 @@
-
+
RoboRallyClient
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/RoboRallyServer.html b/docs/javadoc/inf112/fiasko/roborally/networking/RoboRallyServer.html
index 0f6e646..475f74a 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/RoboRallyServer.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/RoboRallyServer.html
@@ -2,9 +2,9 @@
-
+
RoboRallyServer
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/ErrorResponse.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/ErrorResponse.html
index 994ad2d..d604b80 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/ErrorResponse.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/ErrorResponse.html
@@ -2,9 +2,9 @@
-
+
ErrorResponse
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/GameStartInfoResponse.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/GameStartInfoResponse.html
index d07bb78..eddd36e 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/GameStartInfoResponse.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/GameStartInfoResponse.html
@@ -2,9 +2,9 @@
-
+
GameStartInfoResponse
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/HandResponse.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/HandResponse.html
index e56a3f2..184a968 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/HandResponse.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/HandResponse.html
@@ -2,9 +2,9 @@
-
+
HandResponse
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/HurryResponse.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/HurryResponse.html
index 77318dd..d95f0fd 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/HurryResponse.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/HurryResponse.html
@@ -2,9 +2,9 @@
-
+
HurryResponse
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/OkayResponse.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/OkayResponse.html
index 5fe016a..f22f36c 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/OkayResponse.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/OkayResponse.html
@@ -2,9 +2,9 @@
-
+
OkayResponse
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/PowerDownContainerResponse.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/PowerDownContainerResponse.html
index 64ae74a..5c46c6b 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/PowerDownContainerResponse.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/PowerDownContainerResponse.html
@@ -2,9 +2,9 @@
-
+
PowerDownContainerResponse
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/ProgramAndPowerdownRequest.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/ProgramAndPowerdownRequest.html
index 13af7ff..2766018 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/ProgramAndPowerdownRequest.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/ProgramAndPowerdownRequest.html
@@ -2,9 +2,9 @@
-
+
ProgramAndPowerdownRequest
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/ProgramsContainerResponse.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/ProgramsContainerResponse.html
index 58e167b..dd418f3 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/ProgramsContainerResponse.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/ProgramsContainerResponse.html
@@ -2,9 +2,9 @@
-
+
ProgramsContainerResponse
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/UsernameRequest.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/UsernameRequest.html
index 531a7f9..85cce95 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/UsernameRequest.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/UsernameRequest.html
@@ -2,9 +2,9 @@
-
+
UsernameRequest
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-frame.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-frame.html
index 192ae3d..43b945f 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-frame.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-frame.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.networking.containers
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-summary.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-summary.html
index eb8f72d..892a8d0 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-summary.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-summary.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.networking.containers
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-tree.html b/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-tree.html
index 8246501..6feb58e 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-tree.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/containers/package-tree.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.networking.containers Class Hierarchy
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/package-frame.html b/docs/javadoc/inf112/fiasko/roborally/networking/package-frame.html
index 8c02381..fb7ac4c 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/package-frame.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/package-frame.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.networking
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/package-summary.html b/docs/javadoc/inf112/fiasko/roborally/networking/package-summary.html
index 6b20647..ea7b26d 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/package-summary.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/package-summary.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.networking
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/networking/package-tree.html b/docs/javadoc/inf112/fiasko/roborally/networking/package-tree.html
index 1f99a3b..0ef00df 100644
--- a/docs/javadoc/inf112/fiasko/roborally/networking/package-tree.html
+++ b/docs/javadoc/inf112/fiasko/roborally/networking/package-tree.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.networking Class Hierarchy
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/AbstractDeck.html b/docs/javadoc/inf112/fiasko/roborally/objects/AbstractDeck.html
index c979214..fa837ec 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/AbstractDeck.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/AbstractDeck.html
@@ -2,9 +2,9 @@
-
+
AbstractDeck
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/Board.html b/docs/javadoc/inf112/fiasko/roborally/objects/Board.html
index 4aaf19a..e5ca978 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/Board.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/Board.html
@@ -2,9 +2,9 @@
-
+
Board
-
+
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -323,57 +323,51 @@ extends java.lang.Object
void
-respawnRobot (Robot robot)
-Re-spawns a robot at the first available position relative to its backup position
-
-
-
-void
respawnRobots ()
Moves all dead robots to their backups and makes them part of the board again, and if a robot has no lives
it will be removed from the game.
-
+
void
reverseRobot (RobotID robotID)
Moves a robot one unit backwards according to the direction it's currently facing
-
+
void
rotateRobotLeft (RobotID robotID)
Rotates a robot to the right
-
+
void
rotateRobotRight (RobotID robotID)
Rotates a robot to the left
-
+
void
setBackupPositionOfRobot (RobotID robotID,
Position position)
Sets the backup position of a given robot to a given position
-
+
void
setHasTouchedFlagThisTurn (RobotID robotID,
boolean hasTouched)
Sets a boolean for if the robot has touched a flag this turn
-
+
void
setPowerDown (RobotID robotID,
java.lang.Boolean powerDown)
Sets the power down status of the robot
-
+
void
teleportRobot (RobotID robotID,
Position newPosition)
@@ -382,23 +376,13 @@ extends java.lang.Object
Be quite careful about using this method.
-
-boolean
-tryRobotRespawn (Robot robot,
- int size,
- int startX,
- int startY,
- Direction direction)
-Tries to re-spawn a robot on one of the positions described
-
-
-
+
void
updateRobotBackups ()
Updates backup position of all robots on a repair tile
-
+
void
updateRobotFlag (RobotID robotID,
BoardElementContainer <Tile > flag)
@@ -792,44 +776,6 @@ extends java.lang.Object
it will be removed from the game.
-
-
-
-
-
-
-
-
-
-tryRobotRespawn
-public boolean tryRobotRespawn(Robot robot,
- int size,
- int startX,
- int startY,
- Direction direction)
-Tries to re-spawn a robot on one of the positions described
-
-Parameters:
-robot
- The robot to re-spawn
-size
- The size of the square relative to the robot's spawn to try
-startX
- The x coordinate of the robot's backup position
-startY
- The y coordinate of the robot's backup position
-direction
- The direction of the face of the square to check
-Returns:
-Whether the robot was re-spawned
-
-
-
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/BoardElement.html b/docs/javadoc/inf112/fiasko/roborally/objects/BoardElement.html
index 41e1155..4c74da2 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/BoardElement.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/BoardElement.html
@@ -2,9 +2,9 @@
-
+
BoardElement
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/BoardElementContainer.html b/docs/javadoc/inf112/fiasko/roborally/objects/BoardElementContainer.html
index f8ba071..0d3d637 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/BoardElementContainer.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/BoardElementContainer.html
@@ -2,9 +2,9 @@
-
+
BoardElementContainer
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/Deck.html b/docs/javadoc/inf112/fiasko/roborally/objects/Deck.html
index 989c9d1..e0ce33d 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/Deck.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/Deck.html
@@ -2,9 +2,9 @@
-
+
Deck
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/DrawableGame.html b/docs/javadoc/inf112/fiasko/roborally/objects/DrawableGame.html
index f1761d7..b57ebee 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/DrawableGame.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/DrawableGame.html
@@ -2,9 +2,9 @@
-
+
DrawableGame
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/DrawableObject.html b/docs/javadoc/inf112/fiasko/roborally/objects/DrawableObject.html
index aeb217a..4e0ed16 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/DrawableObject.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/DrawableObject.html
@@ -2,9 +2,9 @@
-
+
DrawableObject
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/Grid.html b/docs/javadoc/inf112/fiasko/roborally/objects/Grid.html
index 3d19be6..1a4edbf 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/Grid.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/Grid.html
@@ -2,9 +2,9 @@
-
+
Grid
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/InteractableGame.html b/docs/javadoc/inf112/fiasko/roborally/objects/InteractableGame.html
index e07d04e..0266f70 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/InteractableGame.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/InteractableGame.html
@@ -2,9 +2,9 @@
-
+
InteractableGame
-
+
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -155,48 +155,60 @@ var activeTableTab = "activeTableTab";
+boolean
+getRobotPowerDown ()
+Gets the power down status of the client playing this instance of the game
+
+
+
java.lang.String
getWinningPlayerName ()
Gets the name of the player who won
-
+
void
receiveAllPrograms (ProgramsContainerResponse programs)
Continues turn when programs for all players are received from the server
-
+
void
receiveStayInPowerDown (PowerDownContainerResponse powerDowns)
Continues turn when stay in power down is received from all players
-
+
+void
+runTurn ()
+Starts a turn in the game
+
+
+
void
setExtraCards (ProgrammingCardDeck extraCards)
Sets extra cards necessary when the player has no program to lock
-
+
void
setGameState (GameState gameState)
Sets the state of the game
-
+
void
setPlayerHand (ProgrammingCardDeck playerHand)
Sets the hand of this player
-
+
void
setProgram (java.util.List<ProgrammingCard > program)
Sets the program of this player
-
+
void
setWinningPlayerName (java.lang.String winningPlayerName)
Sets the name of the player that won the game
@@ -391,7 +403,7 @@ var activeTableTab = "activeTableTab";
-
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/ListGrid.html b/docs/javadoc/inf112/fiasko/roborally/objects/ListGrid.html
index 968ad57..5bc7a03 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/ListGrid.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/ListGrid.html
@@ -2,9 +2,9 @@
-
+
ListGrid
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/Particle.html b/docs/javadoc/inf112/fiasko/roborally/objects/Particle.html
index cba6f53..aa17cf5 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/Particle.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/Particle.html
@@ -2,9 +2,9 @@
-
+
Particle
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/Phase.html b/docs/javadoc/inf112/fiasko/roborally/objects/Phase.html
index 839a768..c34e766 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/Phase.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/Phase.html
@@ -2,9 +2,9 @@
-
+
Phase
-
+
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -196,10 +196,6 @@ extends java.lang.Object
Runs all programming cards for a phase
-
-void
-updateRobotRespawn ()
-
-
-
-
-
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/Player.html b/docs/javadoc/inf112/fiasko/roborally/objects/Player.html
index ce7488b..06dbe2f 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/Player.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/Player.html
@@ -2,9 +2,9 @@
-
+
Player
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/ProgrammingCard.html b/docs/javadoc/inf112/fiasko/roborally/objects/ProgrammingCard.html
index 042e343..4accd19 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/ProgrammingCard.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/ProgrammingCard.html
@@ -2,9 +2,9 @@
-
+
ProgrammingCard
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/ProgrammingCardDeck.html b/docs/javadoc/inf112/fiasko/roborally/objects/ProgrammingCardDeck.html
index daece9f..36b6e9c 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/ProgrammingCardDeck.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/ProgrammingCardDeck.html
@@ -2,9 +2,9 @@
-
+
ProgrammingCardDeck
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/RoboRallyGame.html b/docs/javadoc/inf112/fiasko/roborally/objects/RoboRallyGame.html
index 04f7a4c..adb28a9 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/RoboRallyGame.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/RoboRallyGame.html
@@ -2,9 +2,9 @@
-
+
RoboRallyGame
-
+
@@ -214,7 +214,7 @@ implements
- java.lang.Boolean
+boolean
getRobotPowerDown ()
Gets the power down status of the client playing this instance of the game
@@ -359,9 +359,12 @@ implements
getRobotPowerDown
-public java.lang.Boolean getRobotPowerDown()
+public boolean getRobotPowerDown()
+
Gets the power down status of the client playing this instance of the game
+Specified by:
+getRobotPowerDown
in interface InteractableGame
Returns:
Whether this player's robot is in power down
@@ -743,7 +746,12 @@ implements
runTurn
public void runTurn()
+
Starts a turn in the game
+
+Specified by:
+runTurn
in interface InteractableGame
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/Robot.html b/docs/javadoc/inf112/fiasko/roborally/objects/Robot.html
index e1f8645..ee8c988 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/Robot.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/Robot.html
@@ -2,9 +2,9 @@
-
+
Robot
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/Tile.html b/docs/javadoc/inf112/fiasko/roborally/objects/Tile.html
index 9281803..bd31fcd 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/Tile.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/Tile.html
@@ -2,9 +2,9 @@
-
+
Tile
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/TwoTuple.html b/docs/javadoc/inf112/fiasko/roborally/objects/TwoTuple.html
index 404b0bb..443fcaa 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/TwoTuple.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/TwoTuple.html
@@ -2,9 +2,9 @@
-
+
TwoTuple
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/Wall.html b/docs/javadoc/inf112/fiasko/roborally/objects/Wall.html
index 525aa64..9dd533e 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/Wall.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/Wall.html
@@ -2,9 +2,9 @@
-
+
Wall
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/package-frame.html b/docs/javadoc/inf112/fiasko/roborally/objects/package-frame.html
index bafa2d5..601f231 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/package-frame.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/package-frame.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.objects
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/package-summary.html b/docs/javadoc/inf112/fiasko/roborally/objects/package-summary.html
index 2bc57a0..e5eed29 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/package-summary.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/package-summary.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.objects
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/package-tree.html b/docs/javadoc/inf112/fiasko/roborally/objects/package-tree.html
index d416507..2666d1e 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/package-tree.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/package-tree.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.objects Class Hierarchy
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/properties/Action.html b/docs/javadoc/inf112/fiasko/roborally/objects/properties/Action.html
index 6426ae3..b03cbb7 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/properties/Action.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/properties/Action.html
@@ -2,9 +2,9 @@
-
+
Action
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/properties/Direction.html b/docs/javadoc/inf112/fiasko/roborally/objects/properties/Direction.html
index 020877c..6c97623 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/properties/Direction.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/properties/Direction.html
@@ -2,9 +2,9 @@
-
+
Direction
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/properties/GameState.html b/docs/javadoc/inf112/fiasko/roborally/objects/properties/GameState.html
index b43889a..a639418 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/properties/GameState.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/properties/GameState.html
@@ -2,9 +2,9 @@
-
+
GameState
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/properties/ParticleType.html b/docs/javadoc/inf112/fiasko/roborally/objects/properties/ParticleType.html
index 65fc4a0..8b6f0ef 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/properties/ParticleType.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/properties/ParticleType.html
@@ -2,9 +2,9 @@
-
+
ParticleType
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/properties/Position.html b/docs/javadoc/inf112/fiasko/roborally/objects/properties/Position.html
index 5c87a4e..41af9a5 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/properties/Position.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/properties/Position.html
@@ -2,9 +2,9 @@
-
+
Position
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/properties/RobotID.html b/docs/javadoc/inf112/fiasko/roborally/objects/properties/RobotID.html
index 5302f46..a367afd 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/properties/RobotID.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/properties/RobotID.html
@@ -2,9 +2,9 @@
-
+
RobotID
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/properties/TileType.html b/docs/javadoc/inf112/fiasko/roborally/objects/properties/TileType.html
index 00b7379..a63a043 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/properties/TileType.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/properties/TileType.html
@@ -2,9 +2,9 @@
-
+
TileType
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/properties/WallType.html b/docs/javadoc/inf112/fiasko/roborally/objects/properties/WallType.html
index 9dd0f59..5fbf13f 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/properties/WallType.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/properties/WallType.html
@@ -2,9 +2,9 @@
-
+
WallType
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-frame.html b/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-frame.html
index aa33564..62ae356 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-frame.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-frame.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.objects.properties
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-summary.html b/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-summary.html
index adbff39..2fa1031 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-summary.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-summary.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.objects.properties
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-tree.html b/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-tree.html
index 4a69fbc..f6db2c2 100644
--- a/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-tree.html
+++ b/docs/javadoc/inf112/fiasko/roborally/objects/properties/package-tree.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.objects.properties Class Hierarchy
-
+
@@ -90,13 +90,13 @@
java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
+inf112.fiasko.roborally.objects.properties.TileType
inf112.fiasko.roborally.objects.properties.RobotID
-inf112.fiasko.roborally.objects.properties.Action
-inf112.fiasko.roborally.objects.properties.ParticleType
inf112.fiasko.roborally.objects.properties.Direction
inf112.fiasko.roborally.objects.properties.GameState
inf112.fiasko.roborally.objects.properties.WallType
-inf112.fiasko.roborally.objects.properties.TileType
+inf112.fiasko.roborally.objects.properties.Action
+inf112.fiasko.roborally.objects.properties.ParticleType
diff --git a/docs/javadoc/inf112/fiasko/roborally/package-frame.html b/docs/javadoc/inf112/fiasko/roborally/package-frame.html
index f057ac7..99409cf 100644
--- a/docs/javadoc/inf112/fiasko/roborally/package-frame.html
+++ b/docs/javadoc/inf112/fiasko/roborally/package-frame.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/package-summary.html b/docs/javadoc/inf112/fiasko/roborally/package-summary.html
index 997d6da..c6591c6 100644
--- a/docs/javadoc/inf112/fiasko/roborally/package-summary.html
+++ b/docs/javadoc/inf112/fiasko/roborally/package-summary.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/package-tree.html b/docs/javadoc/inf112/fiasko/roborally/package-tree.html
index ce3ca9e..9f671ed 100644
--- a/docs/javadoc/inf112/fiasko/roborally/package-tree.html
+++ b/docs/javadoc/inf112/fiasko/roborally/package-tree.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally Class Hierarchy
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/RoboRallyUI.html b/docs/javadoc/inf112/fiasko/roborally/ui/RoboRallyUI.html
index c231bad..0527a37 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/RoboRallyUI.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/RoboRallyUI.html
@@ -2,9 +2,9 @@
-
+
RoboRallyUI
-
+
@@ -125,7 +125,7 @@ var activeTableTab = "activeTableTab";
Method and Description
-RoboRallyGame
+InteractableGame
getGame ()
Gets the robo rally game being rendered by the UI
@@ -181,7 +181,7 @@ var activeTableTab = "activeTableTab";
-RoboRallyGame
+InteractableGame
getGame ()
Gets the robo rally game being rendered by the UI
@@ -433,7 +433,7 @@ implements
getGame
-public RoboRallyGame getGame()
+public InteractableGame getGame()
Gets the robo rally game being rendered by the UI
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/ScreenManager.html b/docs/javadoc/inf112/fiasko/roborally/ui/ScreenManager.html
index fe78725..6a68146 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/ScreenManager.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/ScreenManager.html
@@ -2,9 +2,9 @@
-
+
ScreenManager
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/SimpleButton.html b/docs/javadoc/inf112/fiasko/roborally/ui/SimpleButton.html
index 3914582..c73d188 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/SimpleButton.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/SimpleButton.html
@@ -2,9 +2,9 @@
-
+
SimpleButton
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/package-frame.html b/docs/javadoc/inf112/fiasko/roborally/ui/package-frame.html
index 3cf258c..7a06d55 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/package-frame.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/package-frame.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.ui
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/package-summary.html b/docs/javadoc/inf112/fiasko/roborally/ui/package-summary.html
index f32a59c..bdaecbc 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/package-summary.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/package-summary.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.ui
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/package-tree.html b/docs/javadoc/inf112/fiasko/roborally/ui/package-tree.html
index 9ee0ceb..08290f0 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/package-tree.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/package-tree.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.ui Class Hierarchy
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/AbstractScreen.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/AbstractScreen.html
index 6d99f14..6a7509c 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/AbstractScreen.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/AbstractScreen.html
@@ -2,9 +2,9 @@
-
+
AbstractScreen
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/BoardActiveScreen.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/BoardActiveScreen.html
index 322c4ee..94d3b86 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/BoardActiveScreen.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/BoardActiveScreen.html
@@ -2,9 +2,9 @@
-
+
BoardActiveScreen
-
+
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -198,23 +198,19 @@ extends scrolled (int amount)
-void
-show ()
-
-
boolean
touchDown (int screenX,
int screenY,
int pointer,
int button)
-
+
boolean
touchDragged (int screenX,
int screenY,
int pointer)
-
+
boolean
touchUp (int screenX,
int screenY,
@@ -227,7 +223,7 @@ extends InteractiveScreen
-keyDown , mouseMoved
+keyDown , mouseMoved , show
@@ -279,21 +275,6 @@ extends
-
-
-
-
-show
-public void show()
-
-Specified by:
-show
in interface com.badlogic.gdx.Screen
-Overrides:
-show
in class InteractiveScreen
-
-
-
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/CardChoiceScreen.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/CardChoiceScreen.html
index f6feef2..414ec9c 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/CardChoiceScreen.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/CardChoiceScreen.html
@@ -2,9 +2,9 @@
-
+
CardChoiceScreen
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/CardRectangle.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/CardRectangle.html
index c87f1a8..d03e72b 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/CardRectangle.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/CardRectangle.html
@@ -2,9 +2,9 @@
-
+
CardRectangle
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/IPAddressScreen.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/IPAddressScreen.html
index bfc323d..254d816 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/IPAddressScreen.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/IPAddressScreen.html
@@ -2,9 +2,9 @@
-
+
IPAddressScreen
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/InteractiveScreen.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/InteractiveScreen.html
index fe22eef..9736234 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/InteractiveScreen.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/InteractiveScreen.html
@@ -2,9 +2,9 @@
-
+
InteractiveScreen
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/LoadingScreen.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/LoadingScreen.html
index 229483a..f55fc82 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/LoadingScreen.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/LoadingScreen.html
@@ -2,9 +2,9 @@
-
+
LoadingScreen
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/LobbyScreen.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/LobbyScreen.html
index d5b6a49..a604f13 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/LobbyScreen.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/LobbyScreen.html
@@ -2,9 +2,9 @@
-
+
LobbyScreen
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/PowerDownScreen.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/PowerDownScreen.html
index 755b531..a253fe2 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/PowerDownScreen.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/PowerDownScreen.html
@@ -2,9 +2,9 @@
-
+
PowerDownScreen
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/StartMenuScreen.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/StartMenuScreen.html
index f7e9cfb..773cbb1 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/StartMenuScreen.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/StartMenuScreen.html
@@ -2,9 +2,9 @@
-
+
StartMenuScreen
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/UsernameScreen.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/UsernameScreen.html
index 903b494..f8281ce 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/UsernameScreen.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/UsernameScreen.html
@@ -2,9 +2,9 @@
-
+
UsernameScreen
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/WinnerScreen.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/WinnerScreen.html
index d54c74f..6b45ac5 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/WinnerScreen.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/WinnerScreen.html
@@ -2,9 +2,9 @@
-
+
WinnerScreen
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-frame.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-frame.html
index 8b1a64d..6632749 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-frame.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-frame.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.ui.screens
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-summary.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-summary.html
index bc67cf9..3f0d0ef 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-summary.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-summary.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.ui.screens
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-tree.html b/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-tree.html
index 3362c57..f1bbafb 100644
--- a/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-tree.html
+++ b/docs/javadoc/inf112/fiasko/roborally/ui/screens/package-tree.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.ui.screens Class Hierarchy
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/BoardLoaderUtil.html b/docs/javadoc/inf112/fiasko/roborally/utility/BoardLoaderUtil.html
index 51d95ac..63557da 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/BoardLoaderUtil.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/BoardLoaderUtil.html
@@ -2,9 +2,9 @@
-
+
BoardLoaderUtil
-
+
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":9,"i1":9};
+var methods = {"i0":9,"i1":9,"i2":9};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -130,20 +130,24 @@ extends java.lang.Object
Method and Description
+static java.lang.String[]
+getBoardListHumanReadable ()
+Gets a list of all available boards with human-readable names
+
+
+
+static java.lang.String
+getRealBoardName (java.lang.String boardName)
+Gets the actual file name of a board given its human-readable name
+
+
+
static Board
loadBoard (java.lang.String boardFile,
java.util.List<Robot > robotList)
Loads a board described in a file
-
-static Board
-loadBoardRotated (java.lang.String boardFile,
- java.util.List<Robot > robotList,
- boolean clockwise)
-Loads and rotates a board described in a file
-
-
@@ -166,26 +170,36 @@ extends java.lang.Object
Method Detail
-
+
-loadBoardRotated
-public static Board loadBoardRotated(java.lang.String boardFile,
- java.util.List<Robot > robotList,
- boolean clockwise)
- throws java.io.IOException
-Loads and rotates a board described in a file
+getRealBoardName
+public static java.lang.String getRealBoardName(java.lang.String boardName)
+Gets the actual file name of a board given its human-readable name
Parameters:
-boardFile
- The file containing the board description
-robotList
- A list of robots on the board
-clockwise
- Whether to rotate the board clockwise
+boardName
- The human-readable name of a board
Returns:
-A board
+The file name of the board
+
+
+
+
+
+
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/DeckLoaderUtil.html b/docs/javadoc/inf112/fiasko/roborally/utility/DeckLoaderUtil.html
index 718d267..966322e 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/DeckLoaderUtil.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/DeckLoaderUtil.html
@@ -2,9 +2,9 @@
-
+
DeckLoaderUtil
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/GridUtil.html b/docs/javadoc/inf112/fiasko/roborally/utility/GridUtil.html
index dae7b55..fbf1238 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/GridUtil.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/GridUtil.html
@@ -2,9 +2,9 @@
-
+
GridUtil
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/IOUtil.html b/docs/javadoc/inf112/fiasko/roborally/utility/IOUtil.html
index cbda862..87795c9 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/IOUtil.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/IOUtil.html
@@ -2,9 +2,9 @@
-
+
IOUtil
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/LaserHelper.html b/docs/javadoc/inf112/fiasko/roborally/utility/LaserHelper.html
index 094daf8..5ac6bfa 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/LaserHelper.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/LaserHelper.html
@@ -2,9 +2,9 @@
-
+
LaserHelper
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/NetworkUtil.html b/docs/javadoc/inf112/fiasko/roborally/utility/NetworkUtil.html
index 243caf9..d12a353 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/NetworkUtil.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/NetworkUtil.html
@@ -2,9 +2,9 @@
-
+
NetworkUtil
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/ResourceUtil.html b/docs/javadoc/inf112/fiasko/roborally/utility/ResourceUtil.html
index fbbc2f1..76cc0a6 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/ResourceUtil.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/ResourceUtil.html
@@ -2,9 +2,9 @@
-
+
ResourceUtil
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/StringUtil.html b/docs/javadoc/inf112/fiasko/roborally/utility/StringUtil.html
index e83aff4..33f6c8e 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/StringUtil.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/StringUtil.html
@@ -2,9 +2,9 @@
-
+
StringUtil
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/TextureConverterUtil.html b/docs/javadoc/inf112/fiasko/roborally/utility/TextureConverterUtil.html
index e3d340d..e9e0ca8 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/TextureConverterUtil.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/TextureConverterUtil.html
@@ -2,9 +2,9 @@
-
+
TextureConverterUtil
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/package-frame.html b/docs/javadoc/inf112/fiasko/roborally/utility/package-frame.html
index 5048994..cdcb9cb 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/package-frame.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/package-frame.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.utility
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/package-summary.html b/docs/javadoc/inf112/fiasko/roborally/utility/package-summary.html
index d9c2db7..f746e75 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/package-summary.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/package-summary.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.utility
-
+
diff --git a/docs/javadoc/inf112/fiasko/roborally/utility/package-tree.html b/docs/javadoc/inf112/fiasko/roborally/utility/package-tree.html
index 0c9918c..5723476 100644
--- a/docs/javadoc/inf112/fiasko/roborally/utility/package-tree.html
+++ b/docs/javadoc/inf112/fiasko/roborally/utility/package-tree.html
@@ -2,9 +2,9 @@
-
+
inf112.fiasko.roborally.utility Class Hierarchy
-
+
diff --git a/docs/javadoc/overview-frame.html b/docs/javadoc/overview-frame.html
index eff5aa8..71b9092 100644
--- a/docs/javadoc/overview-frame.html
+++ b/docs/javadoc/overview-frame.html
@@ -2,9 +2,9 @@
-
+
Overview List
-
+
diff --git a/docs/javadoc/overview-summary.html b/docs/javadoc/overview-summary.html
index cdcd0ff..1917044 100644
--- a/docs/javadoc/overview-summary.html
+++ b/docs/javadoc/overview-summary.html
@@ -2,9 +2,9 @@
-
+
Overview
-
+
diff --git a/docs/javadoc/overview-tree.html b/docs/javadoc/overview-tree.html
index 947f1b3..fab5a3c 100644
--- a/docs/javadoc/overview-tree.html
+++ b/docs/javadoc/overview-tree.html
@@ -2,9 +2,9 @@
-
+
Class Hierarchy
-
+
@@ -170,14 +170,14 @@
java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
-inf112.fiasko.roborally.objects.properties.GameState
-inf112.fiasko.roborally.objects.properties.WallType
+inf112.fiasko.roborally.networking.RequestState
inf112.fiasko.roborally.objects.properties.Action
-inf112.fiasko.roborally.objects.properties.ParticleType
inf112.fiasko.roborally.objects.properties.Direction
+inf112.fiasko.roborally.objects.properties.GameState
+inf112.fiasko.roborally.objects.properties.ParticleType
inf112.fiasko.roborally.objects.properties.RobotID
inf112.fiasko.roborally.objects.properties.TileType
-inf112.fiasko.roborally.networking.RequestState
+inf112.fiasko.roborally.objects.properties.WallType
diff --git a/docs/team/referater/Mai_2020/referat_05_05_2020.md b/docs/team/referater/Mai_2020/referat_05_05_2020.md
new file mode 100644
index 0000000..cb11b9a
--- /dev/null
+++ b/docs/team/referater/Mai_2020/referat_05_05_2020.md
@@ -0,0 +1,14 @@
+## Oppmøte
+Tilstede: Steinar, Gabriel, Kristian, Torbjørn, Petter
+Ikke tilstede:
+
+## Agenda
+- Fortsette på innleveringsfilen
+
+- Skrive de manuelle testene som mangler
+
+## Møte
+Starter møte med å diskutere elementer osm vi mener vi må ha med i innleveringen. Dette inkluderer brukerhistoriene,
+kravene og arbeidsoppgavene.
+Begynner også på skriving og designing av de manuelle testene. Dette inkluderer beskrivelsen på hva bruker skal gjøre,
+og forventet utfall av disse handlingene.
\ No newline at end of file
diff --git a/docs/team/referater/referat_30_04_2020.md b/docs/team/referater/april_2020/referat_30_04_2020.md
similarity index 100%
rename from docs/team/referater/referat_30_04_2020.md
rename to docs/team/referater/april_2020/referat_30_04_2020.md
diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java
index 44bf07d..c1807de 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/Board.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java
@@ -463,7 +463,7 @@ public class Board {
*
* @param robot The robot to re-spawn
*/
- public void respawnRobot(Robot robot) {
+ private void respawnRobot(Robot robot) {
Position backupPosition = robot.getBackupPosition();
int startX = backupPosition.getXCoordinate();
int startY = backupPosition.getYCoordinate();
@@ -499,7 +499,7 @@ public class Board {
* @param direction The direction of the face of the square to check
* @return Whether the robot was re-spawned
*/
- public boolean tryRobotRespawn(Robot robot, int size, int startX, int startY, Direction direction) {
+ private boolean tryRobotRespawn(Robot robot, int size, int startX, int startY, Direction direction) {
int axis;
for (int i = 1; i <= size; i++) {
if (direction == Direction.NORTH || direction == Direction.SOUTH) {
diff --git a/src/main/java/inf112/fiasko/roborally/objects/InteractableGame.java b/src/main/java/inf112/fiasko/roborally/objects/InteractableGame.java
index a5ec132..42fd0ac 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/InteractableGame.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/InteractableGame.java
@@ -102,4 +102,15 @@ public interface InteractableGame {
*/
void setProgram(List program);
+ /**
+ * Starts a turn in the game
+ */
+ void runTurn();
+
+ /**
+ * Gets the power down status of the client playing this instance of the game
+ *
+ * @return Whether this player's robot is in power down
+ */
+ boolean getRobotPowerDown();
}
diff --git a/src/main/java/inf112/fiasko/roborally/objects/Phase.java b/src/main/java/inf112/fiasko/roborally/objects/Phase.java
index e5b4d7c..183dd31 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/Phase.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/Phase.java
@@ -62,10 +62,13 @@ public class Phase {
fireAllLasers();
checkAllFlags();
- updateRobotRespawn();
+ updateRobotBackups();
}
- public void updateRobotRespawn() {
+ /**
+ * Updates backups for all robots standing on a repair tile
+ */
+ private void updateRobotBackups() {
gameBoard.updateRobotBackups();
}
diff --git a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
index 7ac6ebd..463b34d 100644
--- a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
+++ b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
@@ -34,7 +34,7 @@ public class RoboRallyGame implements DrawableGame, InteractableGame {
private List program;
private ProgrammingCardDeck playerHand;
private ProgrammingCardDeck extraCards;
- private Boolean testingMode;
+ private final Boolean testingMode;
/**
* Instantiates a new Robo Rally game
@@ -55,12 +55,8 @@ public class RoboRallyGame implements DrawableGame, InteractableGame {
initializeGame(boardName);
}
- /**
- * Gets the power down status of the client playing this instance of the game
- *
- * @return Whether this player's robot is in power down
- */
- public Boolean getRobotPowerDown() {
+ @Override
+ public boolean getRobotPowerDown() {
Player player = getPlayerFromName(this.playerName);
if (player != null) {
return gameBoard.getPowerDown(player.getRobotID());
@@ -279,9 +275,7 @@ public class RoboRallyGame implements DrawableGame, InteractableGame {
}
}
- /**
- * Starts a turn in the game
- */
+ @Override
public void runTurn() {
// Sets the power down status to true on robots that have players who planned one this turn.
// Resets players power down for next turn to false.
diff --git a/src/main/java/inf112/fiasko/roborally/ui/RoboRallyUI.java b/src/main/java/inf112/fiasko/roborally/ui/RoboRallyUI.java
index fd3fe4a..8165311 100644
--- a/src/main/java/inf112/fiasko/roborally/ui/RoboRallyUI.java
+++ b/src/main/java/inf112/fiasko/roborally/ui/RoboRallyUI.java
@@ -1,6 +1,7 @@
package inf112.fiasko.roborally.ui;
import inf112.fiasko.roborally.networking.RoboRallyServer;
+import inf112.fiasko.roborally.objects.InteractableGame;
import inf112.fiasko.roborally.objects.RoboRallyGame;
/**
@@ -12,7 +13,7 @@ public interface RoboRallyUI {
*
* @return The game used by the UI
*/
- RoboRallyGame getGame();
+ InteractableGame getGame();
/**
* Sets the robo rally game being rendered by the UI
diff --git a/src/main/java/inf112/fiasko/roborally/ui/RoboRallyWrapper.java b/src/main/java/inf112/fiasko/roborally/ui/RoboRallyWrapper.java
index 92eeae3..eb83a6e 100644
--- a/src/main/java/inf112/fiasko/roborally/ui/RoboRallyWrapper.java
+++ b/src/main/java/inf112/fiasko/roborally/ui/RoboRallyWrapper.java
@@ -6,6 +6,7 @@ import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import inf112.fiasko.roborally.networking.RoboRallyClient;
import inf112.fiasko.roborally.networking.RoboRallyServer;
+import inf112.fiasko.roborally.objects.InteractableGame;
import inf112.fiasko.roborally.objects.RoboRallyGame;
/**
@@ -37,7 +38,7 @@ public class RoboRallyWrapper extends Game implements RoboRallyUI {
}
@Override
- public RoboRallyGame getGame() {
+ public InteractableGame getGame() {
return roboRallyGame;
}
diff --git a/src/main/java/inf112/fiasko/roborally/ui/screens/CardChoiceScreen.java b/src/main/java/inf112/fiasko/roborally/ui/screens/CardChoiceScreen.java
index bd46f68..da42f69 100644
--- a/src/main/java/inf112/fiasko/roborally/ui/screens/CardChoiceScreen.java
+++ b/src/main/java/inf112/fiasko/roborally/ui/screens/CardChoiceScreen.java
@@ -13,6 +13,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.utils.viewport.FitViewport;
import inf112.fiasko.roborally.networking.containers.ProgramAndPowerdownRequest;
+import inf112.fiasko.roborally.objects.InteractableGame;
import inf112.fiasko.roborally.objects.ProgrammingCard;
import inf112.fiasko.roborally.objects.ProgrammingCardDeck;
import inf112.fiasko.roborally.objects.properties.GameState;
@@ -39,6 +40,7 @@ public class CardChoiceScreen extends InteractiveScreen {
private final List chosenCards;
private final int maxCards;
private long timerStarted;
+ private final InteractableGame game;
/**
* Instantiates a new card choice screen
@@ -46,9 +48,10 @@ public class CardChoiceScreen extends InteractiveScreen {
* @param roboRallyWrapper The Robo Rally wrapper which is parent of this screen
*/
public CardChoiceScreen(final RoboRallyWrapper roboRallyWrapper) {
- ProgrammingCardDeck deck = roboRallyWrapper.roboRallyGame.getPlayerHand();
+ game = roboRallyWrapper.getGame();
+ ProgrammingCardDeck deck = game.getPlayerHand();
this.roboRallyWrapper = roboRallyWrapper;
- maxCards = roboRallyWrapper.roboRallyGame.getProgramSize();
+ maxCards = game.getProgramSize();
if (maxCards == -1) {
throw new IllegalArgumentException("This player should not be able to choose any cards at this point in " +
"time.");
@@ -125,8 +128,8 @@ public class CardChoiceScreen extends InteractiveScreen {
roboRallyWrapper.shouldHurry = false;
List newProgram = getChosenAndLockedCards();
//Save the program to get locked cards later
- roboRallyWrapper.roboRallyGame.setProgram(newProgram);
- roboRallyWrapper.roboRallyGame.setGameState(GameState.WAITING_FOR_OTHER_PLAYERS_PROGRAMS);
+ game.setProgram(newProgram);
+ game.setGameState(GameState.WAITING_FOR_OTHER_PLAYERS_PROGRAMS);
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getLoadingScreen(this.roboRallyWrapper));
roboRallyWrapper.client.sendElement(new ProgramAndPowerdownRequest(requestPowerDown, newProgram));
} else {
@@ -182,9 +185,9 @@ public class CardChoiceScreen extends InteractiveScreen {
* @return The player's old program
*/
private List getOldProgram() {
- List oldProgram = roboRallyWrapper.roboRallyGame.getProgram();
+ List oldProgram = game.getProgram();
if (oldProgram != null && oldProgram.size() == 0) {
- oldProgram = roboRallyWrapper.roboRallyGame.getExtraCards().getCards();
+ oldProgram = game.getExtraCards().getCards();
int nulls = 5 - oldProgram.size();
for (int i = 0; i < nulls; i++) {
oldProgram.add(0, null);
diff --git a/src/test/java/inf112/fiasko/roborally/objects/FakeGame.java b/src/test/java/inf112/fiasko/roborally/objects/FakeGame.java
index 413e26c..60b8a16 100644
--- a/src/test/java/inf112/fiasko/roborally/objects/FakeGame.java
+++ b/src/test/java/inf112/fiasko/roborally/objects/FakeGame.java
@@ -76,4 +76,14 @@ public class FakeGame implements InteractableGame {
public void setProgram(List program) {
//Not needed for testing
}
+
+ @Override
+ public void runTurn() {
+ //Not needed for testing
+ }
+
+ @Override
+ public boolean getRobotPowerDown() {
+ return false;
+ }
}