diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java index 893f1b9..e145f72 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java +++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/CardChoiceScreen.java @@ -92,7 +92,13 @@ public class CardChoiceScreen extends InputAdapter implements Screen { @Override public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) { if (chosenCards.size() == maxCards) { - roboRallyWrapper.roboRallyGame.setProgram(getCards()); + List oldProgram = roboRallyWrapper.roboRallyGame.getProgram(); + int lockedCardsInt = 5-maxCards; + List newProgram = getCards(); + for(int i = 5; i>(5-lockedCardsInt);i--){ + newProgram.add(oldProgram.get(i)); + } + roboRallyWrapper.roboRallyGame.setProgram(newProgram); roboRallyWrapper.roboRallyGame.setGameState(GameState.CHOOSING_POWER_DOWN); roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getPowerDownScreen(roboRallyWrapper)); return true;