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

Oppdaterer visning av programmeringskort med teksturer for hver korttype Closes #80

Browse Source
This commit is contained in:
Kristian Knarvik
2020-04-28 21:13:45 +02:00
parent 0fb3c76e7e
commit 1747f1ea21
5 changed files with 63 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ import inf112.fiasko.roborally.elementproperties.TileType;
import inf112.fiasko.roborally.elementproperties.WallType;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -242,7 +241,7 @@ public class Board {
}
/**
* removes one damage for a given robot given that it has taken som damage before
* Removes one damage for a given robot given that it has taken som damage before
*
* @param robotID the ID of the robot
*/
@@ -253,7 +252,7 @@ public class Board {
}
/**
* sets the damage taken of robots in power down to 0
* Sets the damage taken of robots in power down to 0
*/
public void executePowerDown() {
for (Robot robot : robots.values()) {
@@ -316,23 +315,8 @@ public class Board {
if (tile == null) {
return false;
}
switch (tile.getTileType()) {
case CONVEYOR_BELT_SLOW:
case CONVEYOR_BELT_FAST:
case CONVEYOR_BELT_FAST_LEFT:
case CONVEYOR_BELT_FAST_RIGHT:
case CONVEYOR_BELT_FAST_SIDE_ENTRANCE_LEFT:
case CONVEYOR_BELT_FAST_SIDE_ENTRANCE_RIGHT:
case CONVEYOR_BELT_FAST_SIDE_ENTRANCES:
case CONVEYOR_BELT_SLOW_LEFT:
case CONVEYOR_BELT_SLOW_RIGHT:
case CONVEYOR_BELT_SLOW_SIDE_ENTRANCE_LEFT:
case CONVEYOR_BELT_SLOW_SIDE_ENTRANCE_RIGHT:
case CONVEYOR_BELT_SLOW_SIDE_ENTRANCES:
return true;
default:
return false;
}
int tileTypeId = tile.getTileType().getTileTypeID();
return tileTypeId >= 5 && tileTypeId <= 16;
}
/**