From 330a811dd050d4c95e88437dd1e4bc7cd8180585 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 3 Jul 2019 13:53:35 +0300 Subject: [PATCH 1/2] - Fix ChangeZone UI for Sideboard->Library (and possibly other cases going through this code path) --- .../src/main/java/forge/screens/match/CMatchUI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java index fb9a3ee19be..1d6b5532257 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java @@ -1042,7 +1042,7 @@ public final class CMatchUI if (delayedReveal != null) { reveal(delayedReveal.getMessagePrefix(), delayedReveal.getCards()); //TODO: Merge this into search dialog } - return (List) order(title,"Selected", min, max, optionList, null, null, false); + return (List) order(title,"Selected", optionList.size() - max, optionList.size() - min, optionList, null, null, false); } @Override From 510ec7d7b468bcbbfe687bb800f584e2ffd92363 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 3 Jul 2019 13:56:50 +0300 Subject: [PATCH 2/2] - Fixed Diviner's Lockbox. --- forge-gui/res/cardsfolder/upcoming/diviners_lockbox.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/diviners_lockbox.txt b/forge-gui/res/cardsfolder/upcoming/diviners_lockbox.txt index 4fbdd00a174..53f4aa23bed 100644 --- a/forge-gui/res/cardsfolder/upcoming/diviners_lockbox.txt +++ b/forge-gui/res/cardsfolder/upcoming/diviners_lockbox.txt @@ -2,7 +2,7 @@ Name:Diviner's Lockbox ManaCost:4 Types:Artifact A:AB$ NameCard | Cost$ 1 T | Defined$ You | SubAbility$ DBReveal | SorcerySpeed$ True | SpellDescription$ Choose a card name, then reveal the top card of your library. If that card has the chosen name, sacrifice CARDNAME and draw three cards. Activate this ability only any time you could cast a sorcery. -SVar:DBReveal:DB$ PeekAndReveal | NoPeek$ True | RememberRevealed$ True | SubAbility$ DBSac +SVar:DBReveal:DB$ PeekAndReveal | RememberRevealed$ True | SubAbility$ DBSac SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionDefined$ Remembered | ConditionPresent$ Card.NamedCard | ConditionCompare$ GE1 | SubAbility$ DBDraw SVar:DBDraw:DB$ Draw | NumCards$ 3 | ConditionDefined$ Remembered | ConditionPresent$ Card.NamedCard | ConditionCompare$ GE1 | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True