From 2cf197e9debb0ce2e01be61038bf09489e2a2839 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 5 Nov 2021 10:53:57 -0400 Subject: [PATCH 1/2] thirst_for_discovery.txt --- forge-gui/res/cardsfolder/upcoming/thirst_for_discovery.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/thirst_for_discovery.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thirst_for_discovery.txt b/forge-gui/res/cardsfolder/upcoming/thirst_for_discovery.txt new file mode 100644 index 00000000000..fea1b0a56b2 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/thirst_for_discovery.txt @@ -0,0 +1,6 @@ +Name:Thirst for Discovery +ManaCost:2 U +Types:Instant +A:SP$ Draw | NumCards$ 3 | SubAbility$ DBDiscard | SpellDescription$ Draw three cards. +SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 2 | Mode$ TgtChoose | UnlessType$ Basic Land | StackDescription$ SpellDescription | SpellDescription$ Then discard two cards unless you discard a basic land card. +Oracle:Draw three cards. Then discard two cards unless you discard a basic land card. From 4875ae5d8f3c2213b968effe9288964bb5398ae0 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 5 Nov 2021 10:55:22 -0400 Subject: [PATCH 2/2] support Basic Land as uType --- .../src/main/java/forge/player/PlayerControllerHuman.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index a2960771422..6546810ffb0 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1191,6 +1191,10 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont for (String part : splitUTypes) { if (c.getType().hasStringType(part)) { return true; + } else if (part.equals("Basic Land")) { + if (c.isBasicLand()) { + return true; + } } } } @@ -1201,9 +1205,9 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont StringBuilder promptType = new StringBuilder(); for (String part : splitUTypes) { if (n==1) { - promptType.append(part); + promptType.append(part.toLowerCase()); } else { - promptType.append(" or ").append(part); + promptType.append(" or ").append(part.toLowerCase()); } n++; }