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

fixed some bugs with locked cards

Browse Source
This commit is contained in:
Tobydrama 2020-04-21 16:44:13 +02:00
parent 05a92ff9a0
commit d36ff8192b
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java
View File

@ -95,9 +95,12 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
List<ProgrammingCard> oldProgram = roboRallyWrapper.roboRallyGame.getProgram(); List<ProgrammingCard> oldProgram = roboRallyWrapper.roboRallyGame.getProgram();
int lockedCardsInt = 5-maxCards; int lockedCardsInt = 5-maxCards;
List<ProgrammingCard> newProgram = getCards(); List<ProgrammingCard> newProgram = getCards();
for(int i = 5; i>(5-lockedCardsInt);i--){ for(int i = 4; i>(4-lockedCardsInt);i--){
newProgram.add(oldProgram.get(i)); newProgram.add(oldProgram.get(i));
} }
System.out.println("fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuasdasdasda234234234: "+newProgram.size());
System.out.println(newProgram);
roboRallyWrapper.roboRallyGame.setProgram(newProgram); roboRallyWrapper.roboRallyGame.setProgram(newProgram);
roboRallyWrapper.roboRallyGame.setGameState(GameState.CHOOSING_POWER_DOWN); roboRallyWrapper.roboRallyGame.setGameState(GameState.CHOOSING_POWER_DOWN);
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getPowerDownScreen(roboRallyWrapper)); roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getPowerDownScreen(roboRallyWrapper));

1
src/main/java/inf112/fiasko/roborally/gamewrapper/screens/LoadingScreen.java
View File

@ -46,6 +46,7 @@ public class LoadingScreen extends AbstractScreen {
if (roboRallyWrapper.roboRallyGame != null) { if (roboRallyWrapper.roboRallyGame != null) {
GameState gameState = roboRallyWrapper.roboRallyGame.getGameState(); GameState gameState = roboRallyWrapper.roboRallyGame.getGameState();
System.out.println(gameState);
if (gameState != GameState.LOADING) { if (gameState != GameState.LOADING) {
handleScreenChange(gameState); handleScreenChange(gameState);
} }

7
src/main/java/inf112/fiasko/roborally/networking/RoboRallyServerListener.java
View File

@ -110,7 +110,9 @@ class RoboRallyServerListener extends Listener {
*/ */
private void receiveContinuePowerDown(Connection connection, Boolean bool) { private void receiveContinuePowerDown(Connection connection, Boolean bool) {
stayInPowerDown.put(connection, bool); stayInPowerDown.put(connection, bool);
System.out.println("fuuuuuuuuuuuuuuuuu");
if (receivedDataFromAllConnections(stayInPowerDown)) { if (receivedDataFromAllConnections(stayInPowerDown)) {
System.out.println("fuuuuuuuuuuuuuuuuasdasdasdasdasdasdasdu");
Map<String, Boolean> powerDowns = new HashMap<>(); Map<String, Boolean> powerDowns = new HashMap<>();
for (Connection connected : stayInPowerDown.keySet()) { for (Connection connected : stayInPowerDown.keySet()) {
powerDowns.put(playerNames.get(connected), stayInPowerDown.get(connected)); powerDowns.put(playerNames.get(connected), stayInPowerDown.get(connected));
@ -149,8 +151,11 @@ class RoboRallyServerListener extends Listener {
*/ */
private <K> boolean receivedDataFromAllConnections(Map<Connection, K> data) { private <K> boolean receivedDataFromAllConnections(Map<Connection, K> data) {
Set<Connection> connections = clients.keySet(); Set<Connection> connections = clients.keySet();
System.out.println("keys "+data.keySet());
System.out.println(connections);
connections.removeAll(deadPlayers); connections.removeAll(deadPlayers);
return connections.containsAll(data.keySet()) && data.keySet().containsAll(connections); System.out.println(connections);
return data.keySet().containsAll(connections);
} }
@Override @Override