bugfixes

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/actions/overlay/MakePredictionOverlay.java

@@ -1,21 +1,28 @@
 package eu.jonahbauer.wizard.client.libgdx.actions.overlay;
 
 import com.badlogic.gdx.scenes.scene2d.Actor;
+import com.badlogic.gdx.scenes.scene2d.Group;
 import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup;
 import com.badlogic.gdx.scenes.scene2d.ui.Label;
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
 import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
+import eu.jonahbauer.wizard.client.libgdx.actors.PadOfTruth;
 import eu.jonahbauer.wizard.client.libgdx.screens.GameScreen;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Objects;
 import java.util.stream.IntStream;
 
+import static com.badlogic.gdx.scenes.scene2d.actions.Actions.run;
+
 public class MakePredictionOverlay extends Overlay implements InteractionOverlay {
 
     private final int[] values;
     private final TextButton[] buttons;
 
+    private final @NotNull PadOfTruth padOfTruth;
+
     public MakePredictionOverlay(@NotNull GameScreen gameScreen, long timeout, int round) {
         this(gameScreen, timeout, IntStream.range(0, round + 2).toArray());
     }
@@ -24,6 +31,7 @@ public class MakePredictionOverlay extends Overlay implements InteractionOverlay
         super(gameScreen, timeout);
         this.values = values;
         this.buttons = new TextButton[values.length];
+        this.padOfTruth = Objects.requireNonNull(gameScreen.getPadOfTruth());
     }
 
     @Override
@@ -57,4 +65,18 @@ public class MakePredictionOverlay extends Overlay implements InteractionOverlay
 
         return root;
     }
+
+    @Override
+    protected void show(Group parent) {
+        super.show(parent);
+
+        padOfTruth.addAction(run(() -> screen.getOverlayRoot().addActor(padOfTruth)));
+    }
+
+    @Override
+    protected void onClosing() {
+        super.onClosing();
+
+        padOfTruth.addAction(run(() -> screen.getContentRoot().addActor(padOfTruth)));
+    }
 }

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/screens/GameScreen.java

@@ -487,7 +487,7 @@ public class GameScreen extends WizardScreen {
     /**
      * Removes the card from the players hand and puts it into the {@linkplain #cardStack stack}.
      */
-    public void playCard(@NotNull UUID player, @NotNull Card card) {
+    public void playCard(@NotNull UUID player, @NotNull Card handCard, @NotNull Card card) {
         if (isSelf(player)) {
             addMessage("game.action.play_card.self");
         } else {
@@ -501,11 +501,13 @@ public class GameScreen extends WizardScreen {
         sequence.addAction(run(() -> {
             CardActor actor = null;
             if (isSelf(player)) {
-                actor = handCards.remove(card);
+                actor = handCards.remove(handCard);
             }
 
             if (actor == null) {
                 actor = seat.createHandCard(card, atlas);
+            } else if (handCard != card) {
+                actor.setCard(card);
             }
 
             cardStack.add(seat, actor);

wizard-client/wizard-client-libgdx/core/src/main/java/eu/jonahbauer/wizard/client/libgdx/state/Game.java

@@ -252,7 +252,7 @@ public final class Game extends BaseState {
             hand.remove(handCard);
         }
 
-        if (gameScreen != null) gameScreen.playCard(player, card);
+        if (gameScreen != null) gameScreen.playCard(player, handCard, card);
     }
 
     private void onScoreMessage(@Unmodifiable Map<@NotNull UUID, @NotNull Integer> points) {