From 6a49c26b582a15066dcfbc30fe2a67a977fe53df Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Tue, 26 Jan 2021 09:32:48 +0800 Subject: [PATCH] [Mobile] use order GUI for discarding --- .../java/forge/player/PlayerControllerHuman.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index b504a659971..2c9175605be 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -990,7 +990,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont @Override public CardCollectionView chooseCardsToDiscardFrom(final Player p, final SpellAbility sa, final CardCollection valid, final int min, final int max) { - if (p != player) { + if (p != player || GuiBase.getInterface().isLibgdxPort()) { tempShowCards(valid); GameEntityViewMap gameCacheDiscard = GameEntityView.getMap(valid); List views = getGui().many(String.format(localizer.getMessage("lblChooseMinCardToDiscard"), min), @@ -1367,6 +1367,17 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont public CardCollection chooseCardsToDiscardToMaximumHandSize(final int nDiscard) { final int max = player.getMaxHandSize(); + if (GuiBase.getInterface().isLibgdxPort()) { + tempShowCards(player.getCardsIn(ZoneType.Hand)); + GameEntityViewMap gameCacheDiscard = GameEntityView.getMap(player.getCardsIn(ZoneType.Hand)); + List views = getGui().many(String.format(localizer.getMessage("lblChooseMinCardToDiscard"), nDiscard), + localizer.getMessage("lblDiscarded"), nDiscard, nDiscard, gameCacheDiscard.getTrackableKeys(), null); + endTempShowCards(); + final CardCollection choices = new CardCollection(); + gameCacheDiscard.addToList(views, choices); + return choices; + } + @SuppressWarnings("serial") final InputSelectCardsFromList inp = new InputSelectCardsFromList(this, nDiscard, nDiscard, player.getZone(ZoneType.Hand).getCards()) {