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

Merge branch 'sojourn' into 'master'

Browse Source 
MH2: Sojourner's Companion w/ updates to TypeCycling to parse "Artifact.Land"

See merge request core-developers/forge!4810
This commit is contained in:
Michael Kamensky
2021-06-03 05:15:34 +00:00
parent df35468771 da2a92b74a
commit 7a3c9c5b49
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -3208,6 +3208,8 @@ public class CardFactoryUtil {
String desc = type;
if (type.equals("Basic")) {
desc = "Basic land";
} else if (type.equals("Land.Artifact")) {
desc = "Artifact land";
}
sb.append(" Discard<1/CARDNAME> | ActivationZone$ Hand | PrecostDesc$ ").append(desc).append("cycling ");

2
forge-game/src/main/java/forge/game/keyword/KeywordWithCostAndType.java
View File

@@ -24,6 +24,8 @@ public class KeywordWithCostAndType extends KeywordInstance<KeywordWithCostAndTy
n[i] = n[i].toLowerCase();
} else if (n[i].equals("Basic")) {
n[i] = "basic land";
} else if (n[i].equals("Land.Artifact")) {
n[i] = "artifact land";
}
}

7
forge-gui/res/cardsfolder/upcoming/sojourners_companion.txt Normal file
View File

@@ -0,0 +1,7 @@
Name:Sojourner's Companion
ManaCost:7
Types:Artifact Creature Salamander
PT:4/4
K:Affinity:Artifact
K:TypeCycling:Land.Artifact:2
Oracle:Affinity for artifacts\nArtifact landcycling {2} (({2}, Discard this card: Search your library for an artifact land card, reveal it, put it into your hand, then shuffle.)