EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2024-10-17 02:33:38 +02:00
Code Issues Projects Releases Wiki Activity

Refaktorerer moveConveyorBelts() for bedre leselighet

Browse Source
This commit is contained in:
Kristian Knarvik 2020-03-25 14:41:05 +01:00
parent 1667e72113
commit b2f8abd28c
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
View File

@ -296,21 +296,7 @@ public class RoboRallyGame implements IDrawableGame {
Direction conveyorBeltDirection = conveyorBelt.getElement().getDirection(); Direction conveyorBeltDirection = conveyorBelt.getElement().getDirection();
if (gameBoard.conveyorBeltCanMove(conveyorBelt) && if (gameBoard.conveyorBeltCanMove(conveyorBelt) &&
gameBoard.hasRobotOnPosition(conveyorBeltPosition)) { gameBoard.hasRobotOnPosition(conveyorBeltPosition)) {
RobotID robotAtConveyorBelt = gameBoard.getRobotOnPosition(conveyorBeltPosition); updateConveyorBeltMaps(conveyorBeltPosition, conveyorBeltDirection, newPositions, moveNormally);
Position newPosition = gameBoard.getNewPosition(conveyorBeltPosition, conveyorBeltDirection);
if (gameBoard.isConveyorBelt(gameBoard.getTileOnPosition(newPosition))) {
newPositions.put(robotAtConveyorBelt, newPosition);
moveNormally.put(robotAtConveyorBelt, false);
Direction newDirection = gameBoard.getTileOnPosition(newPosition).getDirection();
if (Direction.getRightRotatedDirection(newDirection) == conveyorBeltDirection) {
gameBoard.rotateRobotLeft(robotAtConveyorBelt);
} else if (Direction.getLeftRotatedDirection(newDirection) == conveyorBeltDirection) {
gameBoard.rotateRobotRight(robotAtConveyorBelt);
}
} else {
newPositions.put(robotAtConveyorBelt, conveyorBeltPosition);
moveNormally.put(robotAtConveyorBelt, true);
}
} }
} }
//Updates position for all robots affected by conveyor belts //Updates position for all robots affected by conveyor belts
@ -326,6 +312,32 @@ public class RoboRallyGame implements IDrawableGame {
} }
} }
/**
* Updates maps containing information about what a robot on a conveyor belt should do
* @param conveyorBeltPosition The position of the conveyor belt the robot stands on
* @param conveyorBeltDirection The direction of the conveyor belt the robot stands on
* @param newPositions The map containing new positions for robots
* @param moveNormally The map containing whether a robot should move normally following normal rules
*/
private void updateConveyorBeltMaps(Position conveyorBeltPosition, Direction conveyorBeltDirection,
Map<RobotID, Position> newPositions, Map<RobotID, Boolean> moveNormally) {
RobotID robotAtConveyorBelt = gameBoard.getRobotOnPosition(conveyorBeltPosition);
Position newPosition = gameBoard.getNewPosition(conveyorBeltPosition, conveyorBeltDirection);
if (gameBoard.isConveyorBelt(gameBoard.getTileOnPosition(newPosition))) {
newPositions.put(robotAtConveyorBelt, newPosition);
moveNormally.put(robotAtConveyorBelt, false);
Direction newDirection = gameBoard.getTileOnPosition(newPosition).getDirection();
if (Direction.getRightRotatedDirection(newDirection) == conveyorBeltDirection) {
gameBoard.rotateRobotLeft(robotAtConveyorBelt);
} else if (Direction.getLeftRotatedDirection(newDirection) == conveyorBeltDirection) {
gameBoard.rotateRobotRight(robotAtConveyorBelt);
}
} else {
newPositions.put(robotAtConveyorBelt, conveyorBeltPosition);
moveNormally.put(robotAtConveyorBelt, true);
}
}
/** /**
* Checks all flags for robots. Tries to update the flag of the robot. * Checks all flags for robots. Tries to update the flag of the robot.
*/ */