external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 02:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
[Mobile] use order GUI for discarding

See merge request core-developers/forge!3650
This commit is contained in:
Anthony Calosa
2021-01-26 02:11:23 +00:00
parent f46ac4e8b3 6a49c26b58
commit d44e2ac1d2
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -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<Card, CardView> gameCacheDiscard = GameEntityView.getMap(valid);
List<CardView> 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<Card, CardView> gameCacheDiscard = GameEntityView.getMap(player.getCardsIn(ZoneType.Hand));
List<CardView> 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()) {