EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-01-31 23:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Utfører små endringer. Fikser en manglende vegg i Vault Assault

Browse Source
This commit is contained in:
Kristian Knarvik 2020-04-27 18:40:23 +02:00
parent cc71a50370
commit 3530ed2b41
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java
View File

@ -81,8 +81,8 @@ public class BoardActiveScreen extends InteractiveScreen {
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getPowerDownScreen(roboRallyWrapper)); roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getPowerDownScreen(roboRallyWrapper));
break; break;
case SKIP_STAY_IN_POWER_DOWN: case SKIP_STAY_IN_POWER_DOWN:
roboRallyWrapper.client.sendElement(false);
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getLoadingScreen(roboRallyWrapper)); roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getLoadingScreen(roboRallyWrapper));
roboRallyWrapper.client.sendElement(false);
break; break;
default: default:
//Ignored //Ignored

1
src/main/java/inf112/fiasko/roborally/networking/RoboRallyClientListener.java
View File

@ -110,6 +110,7 @@ class RoboRallyClientListener extends Listener {
*/ */
private void receiveHand(ProgrammingCardDeck newHand) { private void receiveHand(ProgrammingCardDeck newHand) {
new Thread(() -> { new Thread(() -> {
//Prevents a bug where the game
while (wrapper.roboRallyGame.getGameState() != GameState.WAITING_FOR_CARDS_FROM_SERVER) { while (wrapper.roboRallyGame.getGameState() != GameState.WAITING_FOR_CARDS_FROM_SERVER) {
try { try {
TimeUnit.MILLISECONDS.sleep(100); TimeUnit.MILLISECONDS.sleep(100);

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

@ -869,8 +869,8 @@ public class Board {
case WALL_LASER_TRIPLE: case WALL_LASER_TRIPLE:
laserParticleType = ParticleType.LASER_BEAM_TRIPLE; laserParticleType = ParticleType.LASER_BEAM_TRIPLE;
break; break;
default: default:
throw new IllegalArgumentException("Invalid laser type encountered."); throw new IllegalArgumentException("Invalid laser type encountered.");
} }
Particle laserParticle = new Particle(laserParticleType, laserDirection); Particle laserParticle = new Particle(laserParticleType, laserDirection);
int positionX = addPosition.getXCoordinate(); int positionX = addPosition.getXCoordinate();

2
src/main/resources/boards/Vault_Assault.txt
View File

@ -23,7 +23,7 @@
0 0 1;3 0 0 0 0 0 0 5;7 0 0 0 0 1;3 0 0 0 0 0 0 5;7 0 0
0 0 5;3 0 0 0 0 0 0 6;7 0 0 0 0 5;3 0 0 0 0 0 0 6;7 0 0
3;7 0 0 0 2;6 0 0 2;4 0 0 0 3;3 3;7 0 0 0 2;6 0 0 2;4 0 0 0 3;3
0 0 0 0 0 0 0 0 0 0 0 0 0 0 1;5 0 0 0 0 0 0 0 0 0
1;7 0 0 0 0 1;1 5;1 0 0 0 0 1;3 1;7 0 0 0 0 1;1 5;1 0 0 0 0 1;3
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
0 0 3;5 0 1;5 0 0 1;5 0 1;5 0 0 0 0 3;5 0 1;5 0 0 1;5 0 1;5 0 0