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

Legger til nye roboter på brettet

Browse Source 
Flytter på søvn når transportbånd flyttes
Fikser testen for tegnbare objekter
This commit is contained in:
Kristian Knarvik 2020-03-17 22:00:56 +01:00
parent 1fec4f3136
commit 034d1e4b58
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,6 +71,11 @@ public class RoboRallyGame implements IDrawableGame {
robots.add(new Robot(RobotID.ROBOT_1, new Position(0, 16))); robots.add(new Robot(RobotID.ROBOT_1, new Position(0, 16)));
robots.add(new Robot(RobotID.ROBOT_2, new Position(1, 16))); robots.add(new Robot(RobotID.ROBOT_2, new Position(1, 16)));
robots.add(new Robot(RobotID.ROBOT_3, new Position(2, 16))); robots.add(new Robot(RobotID.ROBOT_3, new Position(2, 16)));
robots.add(new Robot(RobotID.ROBOT_4, new Position(3, 16)));
robots.add(new Robot(RobotID.ROBOT_5, new Position(4, 16)));
robots.add(new Robot(RobotID.ROBOT_6, new Position(5, 16)));
robots.add(new Robot(RobotID.ROBOT_7, new Position(6, 16)));
robots.add(new Robot(RobotID.ROBOT_8, new Position(7, 16)));
try { try {
gameBoard = BoardLoaderUtil.loadBoard("boards/all_tiles_test_board.txt", robots); gameBoard = BoardLoaderUtil.loadBoard("boards/all_tiles_test_board.txt", robots);
} catch (IOException e) { } catch (IOException e) {
@ -87,6 +92,11 @@ public class RoboRallyGame implements IDrawableGame {
robots.add(new Robot(RobotID.ROBOT_1, new Position(1, 1))); robots.add(new Robot(RobotID.ROBOT_1, new Position(1, 1)));
robots.add(new Robot(RobotID.ROBOT_2, new Position(1, 2))); robots.add(new Robot(RobotID.ROBOT_2, new Position(1, 2)));
robots.add(new Robot(RobotID.ROBOT_3, new Position(1, 3))); robots.add(new Robot(RobotID.ROBOT_3, new Position(1, 3)));
robots.add(new Robot(RobotID.ROBOT_4, new Position(4, 8)));
robots.add(new Robot(RobotID.ROBOT_5, new Position(6, 6)));
robots.add(new Robot(RobotID.ROBOT_6, new Position(7, 7)));
robots.add(new Robot(RobotID.ROBOT_7, new Position(6, 7)));
robots.add(new Robot(RobotID.ROBOT_8, new Position(6, 8)));
gameBoard = BoardLoaderUtil.loadBoard("boards/Checkmate.txt", robots); gameBoard = BoardLoaderUtil.loadBoard("boards/Checkmate.txt", robots);
cogwheels = gameBoard.getPositionsOfTileOnBoard(TileType.COGWHEEL_RIGHT, cogwheels = gameBoard.getPositionsOfTileOnBoard(TileType.COGWHEEL_RIGHT,
TileType.COGWHEEL_LEFT); TileType.COGWHEEL_LEFT);
@ -143,6 +153,8 @@ public class RoboRallyGame implements IDrawableGame {
makeMove(RobotID.ROBOT_2, Action.ROTATE_LEFT); makeMove(RobotID.ROBOT_2, Action.ROTATE_LEFT);
makeMove(RobotID.ROBOT_2, Action.U_TURN); makeMove(RobotID.ROBOT_2, Action.U_TURN);
makeMove(RobotID.ROBOT_2, Action.MOVE_1); makeMove(RobotID.ROBOT_2, Action.MOVE_1);
moveAllConveyorBelts();
makeMove(RobotID.ROBOT_7, Action.MOVE_1);
} }
/** /**
@ -242,16 +254,17 @@ public class RoboRallyGame implements IDrawableGame {
* @throws InterruptedException If disturbed during sleep * @throws InterruptedException If disturbed during sleep
*/ */
private void moveAllConveyorBelts() throws InterruptedException { private void moveAllConveyorBelts() throws InterruptedException {
sleep();
moveConveyorBelts(fastConveyorBelts); moveConveyorBelts(fastConveyorBelts);
sleep();
moveConveyorBelts(conveyorBelts); moveConveyorBelts(conveyorBelts);
} }
/** /**
* Moves all conveyor belts in the input list * Moves all conveyor belts in the input list
* @param conveyorBelts A list of conveyor belts to move * @param conveyorBelts A list of conveyor belts to move
* @throws InterruptedException If disturbed during sleep
*/ */
private void moveConveyorBelts(List<BoardElementContainer<Tile>> conveyorBelts) throws InterruptedException { private void moveConveyorBelts(List<BoardElementContainer<Tile>> conveyorBelts) {
List<BoardElementContainer<Tile>> conveyorBeltsWithRobotsThatShouldMove = List<BoardElementContainer<Tile>> conveyorBeltsWithRobotsThatShouldMove =
conveyorBeltsThatCanMoveWithoutConflict(conveyorBelts); conveyorBeltsThatCanMoveWithoutConflict(conveyorBelts);
for (BoardElementContainer<Tile> conveyorBelt : conveyorBeltsWithRobotsThatShouldMove) { for (BoardElementContainer<Tile> conveyorBelt : conveyorBeltsWithRobotsThatShouldMove) {
@ -321,19 +334,14 @@ public class RoboRallyGame implements IDrawableGame {
* @param robot The id of the robot to move * @param robot The id of the robot to move
* @param currentDirection The direction of the conveyor belt the robot is standing on * @param currentDirection The direction of the conveyor belt the robot is standing on
* @param nextTile The tile the robot is moving to * @param nextTile The tile the robot is moving to
* @throws InterruptedException If disturbed during sleep
*/ */
private void doConveyorBeltMovement(RobotID robot, Direction currentDirection, Tile nextTile) private void doConveyorBeltMovement(RobotID robot, Direction currentDirection, Tile nextTile) {
throws InterruptedException {
Direction nextDirection = nextTile.getDirection(); Direction nextDirection = nextTile.getDirection();
sleep();
gameBoard.moveRobot(robot, currentDirection); gameBoard.moveRobot(robot, currentDirection);
if (testPredicate(conveyorBelts, (container) -> container.getElement() == nextTile)) { if (testPredicate(conveyorBelts, (container) -> container.getElement() == nextTile)) {
if (Direction.getRightRotatedDirection(nextDirection) == currentDirection) { if (Direction.getRightRotatedDirection(nextDirection) == currentDirection) {
sleep();
gameBoard.rotateRobotLeft(robot); gameBoard.rotateRobotLeft(robot);
} else if (Direction.getLeftRotatedDirection(nextDirection) == currentDirection) { } else if (Direction.getLeftRotatedDirection(nextDirection) == currentDirection) {
sleep();
gameBoard.rotateRobotRight(robot); gameBoard.rotateRobotRight(robot);
} }
} }

4
src/test/java/inf112/fiasko/roborally/objects/DrawableObjectTest.java
View File

@ -16,9 +16,9 @@ import static org.junit.Assert.assertFalse;
public class DrawableObjectTest { public class DrawableObjectTest {
private static final Texture textureSheet = new Texture(Gdx.files.internal("assets/tiles.png")); private static final Texture textureSheet = new Texture(Gdx.files.internal("assets/tiles.png"));
private static final Texture robotTexture = new Texture(Gdx.files.internal("assets/Robot.png")); private static final Texture robotsTexture = new Texture(Gdx.files.internal("assets/robots.png"));
public static final TextureRegion TEXTURE_MIN_ARG = new TextureRegion(textureSheet, 4*300, 0, 300, 300); public static final TextureRegion TEXTURE_MIN_ARG = new TextureRegion(textureSheet, 4*300, 0, 300, 300);
public static final TextureRegion TEXTURE_MAX_ARG = new TextureRegion(robotTexture, 0, 0, 64, 64); public static final TextureRegion TEXTURE_MAX_ARG = new TextureRegion(robotsTexture, 0, 0, 64, 64);
public static final int X_POSITION_MIN_ARG = 5; public static final int X_POSITION_MIN_ARG = 5;
public static final int Y_POSITION_MIN_ARG = 8; public static final int Y_POSITION_MIN_ARG = 8;
public static final int X_POSITION_MAX_ARG = 6; public static final int X_POSITION_MAX_ARG = 6;