EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-02-01 07:39:35 +01:00
Code Issues Projects Releases Wiki Activity

Adds helper method for conveyor belt method

Browse Source
This commit is contained in:
torlunjen 2020-03-16 17:51:06 +01:00
parent 62d887fa76
commit df180bf372
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.*; import inf112.fiasko.roborally.element_properties.*;
import inf112.fiasko.roborally.utility.BoardLoaderUtil; import inf112.fiasko.roborally.utility.BoardLoaderUtil;
@ -210,6 +211,17 @@ public class RoboRallyGame implements IDrawableGame {
} }
} }
private Boolean listContainsTile(Tile tile) {
boolean containsTile = false;
for (BoardElementContainer<Tile> conveyorBelt : conveyorBelts) {
if (conveyorBelt.getObject() == tile) {
containsTile = true;
break;
}
}
return containsTile;
}
/** /**
* Moves robots standing on conveyor belts in the direction of the conveyor belt. * Moves robots standing on conveyor belts in the direction of the conveyor belt.
* Rotates robots being moved to a turn on the conveyor belt. * Rotates robots being moved to a turn on the conveyor belt.
@ -226,7 +238,7 @@ public class RoboRallyGame implements IDrawableGame {
Direction currentDirection = conveyorBelt.getObject().getDirection(); Direction currentDirection = conveyorBelt.getObject().getDirection();
Direction nextDirection = nextTile.getDirection(); Direction nextDirection = nextTile.getDirection();
RobotID robot = gameBoard.getRobotOnPosition(conveyorBelt.getPosition()); RobotID robot = gameBoard.getRobotOnPosition(conveyorBelt.getPosition());
if (conveyorBelts.contains(nextTile) && currentDirection != nextDirection) { if (listContainsTile(nextTile) && currentDirection != nextDirection) {
if (currentDirection.equals(Direction.NORTH)) { if (currentDirection.equals(Direction.NORTH)) {
if (nextDirection.equals(Direction.WEST)) { if (nextDirection.equals(Direction.WEST)) {
sleep(); sleep();