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 'dom-puzzles' into 'master'

Browse Source 
Added puzzle PS_DOM7.

See merge request core-developers/forge!634
This commit is contained in:
Michael Kamensky
2018-06-12 06:32:33 +00:00
parent 47b9b226e1 07d2b0aaf3
commit d25a2774d3
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,6 +85,8 @@ public abstract class GameState {
private String tChangePlayer = "NONE"; private String tChangePlayer = "NONE";
private String tChangePhase = "NONE"; private String tChangePhase = "NONE";
private String tAdvancePhase = "NONE";
private String precastHuman = null; private String precastHuman = null;
private String precastAI = null; private String precastAI = null;
@@ -409,8 +411,10 @@ public abstract class GameState {
if (categoryName.startsWith("active")) { if (categoryName.startsWith("active")) {
if (categoryName.endsWith("player")) if (categoryName.endsWith("player"))
tChangePlayer = categoryValue.trim().toLowerCase(); tChangePlayer = categoryValue.trim().toLowerCase();
if (categoryName.endsWith("phase")) else if (categoryName.endsWith("phase"))
tChangePhase = categoryValue.trim().toUpperCase(); tChangePhase = categoryValue.trim().toUpperCase();
else if (categoryName.endsWith("phaseadvance"))
tAdvancePhase = categoryValue.trim().toUpperCase();
return; return;
} }
@@ -523,8 +527,9 @@ public abstract class GameState {
cardToScript.clear(); cardToScript.clear();
cardAttackMap.clear(); cardAttackMap.clear();
Player newPlayerTurn = tChangePlayer.equals("human") ? human : tChangePlayer.equals("ai") ? ai : null; Player newPlayerTurn = tChangePlayer.equalsIgnoreCase("human") ? human : tChangePlayer.equalsIgnoreCase("ai") ? ai : null;
PhaseType newPhase = tChangePhase.equals("none") ? null : PhaseType.smartValueOf(tChangePhase); PhaseType newPhase = tChangePhase.equalsIgnoreCase("none") ? null : PhaseType.smartValueOf(tChangePhase);
PhaseType advPhase = tAdvancePhase.equalsIgnoreCase("none") ? null : PhaseType.smartValueOf(tAdvancePhase);
// Set stack to resolving so things won't trigger/effects be checked right away // Set stack to resolving so things won't trigger/effects be checked right away
game.getStack().setResolving(true); game.getStack().setResolving(true);
@@ -564,6 +569,11 @@ public abstract class GameState {
game.getStack().setResolving(false); game.getStack().setResolving(false);
// Advance to a certain phase, activating all triggered abilities
if (advPhase != null) {
game.getPhaseHandler().devAdvanceToPhase(advPhase);
}
game.getAction().checkStateEffects(true); //ensure state based effects and triggers are updated game.getAction().checkStateEffects(true); //ensure state based effects and triggers are updated
} }

18
forge-gui/res/puzzle/PS_DOM7.pzl Normal file
View File

@@ -0,0 +1,18 @@
[metadata]
Name:Possibility Storm - Dominaria #07
URL:http://www.possibilitystorm.com/wp-content/uploads/2018/06/066.-DOM7.jpg
Goal:Win
Turns:1
Difficulty:Uncommon
Description:Win this turn. You just put Lore counters on your Sagas. Put their abilities on the stack and choose targets before doing anything else.
[state]
humanlife=20
ailife=4
turn=1
activeplayer=human
activephase=DRAW
activephaseadvance=MAIN1
humanhand=Shivan Fire;Kazarov, Sengir Pureblood;Dreamcaller Siren;Soul Salvage
humangraveyard=Thran Temporal Gateway;Neheb, the Worthy;Rona, Disciple of Gix
humanbattlefield=The Eldest Reborn|Counters:LORE=2;The First Eruption|Counters:LORE=1;Keldon Warcaller;Minotaur Sureshot;Frontline Devastator;Canyon Slough;Canyon Slough;Canyon Slough;Drowned Catacomb;Drowned Catacomb
aibattlefield=Cataclysmic Gearhulk|Set:KLD;Verdurous Gearhulk|Set:KLD|Counters:P1P1=2;Noxious Gearhulk|Set:KLD|Counters:P1P1=2