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

Update support for Meld in GameState/Puzzle Mode. (#3078)

Browse Source 
* - Simplify MeldedWith support in GameState (as a parameter for Meld).

* - Maintain support for old-style "|Meld" game states just in case.
This commit is contained in:
Agetian
2023-05-08 15:12:33 +03:00
committed by GitHub
parent 80cf74d26c
commit 71362ce82b
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-ai/src/main/java/forge/ai/GameState.java
View File

@@ -304,7 +304,7 @@ public abstract class GameState {
} else if (c.getCurrentStateName().equals(CardStateName.Meld)) { } else if (c.getCurrentStateName().equals(CardStateName.Meld)) {
newText.append("|Meld"); newText.append("|Meld");
if (c.getMeldedWith() != null) { if (c.getMeldedWith() != null) {
newText.append("|MeldedWith:"); newText.append(":");
newText.append(c.getMeldedWith().getName()); newText.append(c.getMeldedWith().getName());
} }
} else if (c.getCurrentStateName().equals(CardStateName.Modal)) { } else if (c.getCurrentStateName().equals(CardStateName.Modal)) {
@@ -1249,7 +1249,8 @@ public abstract class GameState {
c.setBackSide(true); c.setBackSide(true);
} else if (info.startsWith("Flipped")) { } else if (info.startsWith("Flipped")) {
c.setState(CardStateName.Flipped, true); c.setState(CardStateName.Flipped, true);
} else if (info.startsWith("MeldedWith")) { } else if (info.startsWith("Meld")) {
if (info.indexOf(':') > 0) {
String meldCardName = info.substring(info.indexOf(':') + 1).replace("^", ","); String meldCardName = info.substring(info.indexOf(':') + 1).replace("^", ",");
Card meldTarget; Card meldTarget;
PaperCard pc = StaticData.instance().getCommonCards().getCard(meldCardName); PaperCard pc = StaticData.instance().getCommonCards().getCard(meldCardName);
@@ -1259,7 +1260,7 @@ public abstract class GameState {
} }
meldTarget = Card.fromPaperCard(pc, c.getOwner()); meldTarget = Card.fromPaperCard(pc, c.getOwner());
c.setMeldedWith(meldTarget); c.setMeldedWith(meldTarget);
} else if (info.startsWith("Meld")) { }
c.setState(CardStateName.Meld, true); c.setState(CardStateName.Meld, true);
c.setBackSide(true); c.setBackSide(true);
} else if (info.startsWith("Modal")) { } else if (info.startsWith("Modal")) {

2
forge-gui/res/puzzle/PS_ONE3.pzl
View File

@@ -13,7 +13,7 @@ p0life=20
p0landsplayed=0 p0landsplayed=0
p0landsplayedlastturn=0 p0landsplayedlastturn=0
p0hand=Cement Shoes;Prophetic Prism p0hand=Cement Shoes;Prophetic Prism
p0battlefield=Kaito, Dancing Shadow|Counters:LOYALTY=3;Tezzeret, Betrayer of Flesh|Counters:LOYALTY=2;Urza, Planeswalker|Meld|MeldedWith:The Mightstone and Weakstone|Counters:LOYALTY=7;Levitating Statue;Ichormoon Gauntlet p0battlefield=Kaito, Dancing Shadow|Counters:LOYALTY=3;Tezzeret, Betrayer of Flesh|Counters:LOYALTY=2;Urza, Planeswalker|Meld:The Mightstone and Weakstone|Counters:LOYALTY=7;Levitating Statue;Ichormoon Gauntlet
p0library=Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt p0library=Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt
p1life=21 p1life=21
p1landsplayed=0 p1landsplayed=0