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

Merge branch 'thirst' into 'master'

Browse Source 
VOW: Thirst for Discovery and support

See merge request core-developers/forge!5746
This commit is contained in:
Michael Kamensky
2021-11-09 15:25:30 +00:00
parent 68219dbeae 4875ae5d8f
commit 326ca7026f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui/res/cardsfolder/upcoming/thirst_for_discovery.txt Normal file
View File

@@ -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.

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

@@ -1191,6 +1191,10 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
for (String part : splitUTypes) { for (String part : splitUTypes) {
if (c.getType().hasStringType(part)) { if (c.getType().hasStringType(part)) {
return true; 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(); StringBuilder promptType = new StringBuilder();
for (String part : splitUTypes) { for (String part : splitUTypes) {
if (n==1) { if (n==1) {
promptType.append(part); promptType.append(part.toLowerCase());
} else { } else {
promptType.append(" or ").append(part); promptType.append(" or ").append(part.toLowerCase());
} }
n++; n++;
} }