Merge branch 'master' into 'master'

Added puzzles PS_AFR2 - PS_AFR4. Updated GameState to support PS_AFR3, renamed PS_AFR1.

See merge request core-developers/forge!5334

forge-ai/src/main/java/forge/ai/GameState.java

@@ -1043,7 +1043,12 @@ public abstract class GameState {
             return;
         }
 
+        if (!c.getName().equals(spellDef) && c.hasAlternateState() && spellDef.equals(c.getAlternateState().getName())) {
+            sa = c.getAlternateState().getFirstSpellAbility();
+        } else {
             sa = c.getFirstSpellAbility();
+        }
+
         sa.setActivatingPlayer(activator);
 
         handleScriptedTargetingForSA(game, sa, tgtID);

forge-gui/res/puzzle/PS_AFR2.pzl

@@ -0,0 +1,20 @@
+[metadata]
+Name:Possibility Storm - Adventures in the Forgotten Realms #02
+URL:https://i0.wp.com/www.possibilitystorm.com/wp-content/uploads/2021/08/180.-AFR2-scaled.jpg
+Goal:Win
+Turns:1
+Difficulty:Rare
+Description:Win this turn. Your opponent's Mind Flayer is controlling your Treeshaker Chimera 'mutate stack'. Both players start with 12 cards remaining in their libraries. Assume whatever they are is not relevant to the solution.
+[state]
+humanlife=20
+ailife=18
+turn=1
+activeplayer=human
+activephase=MAIN1
+humanhand=Lore Drakkis;Struggle for Skemfar;Witherbloom Command
+humanlibrary=Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt
+humanbattlefield=Mordenkainen|Counters:LOYALTY=3;Pestilent Cauldron;Koma's Faithful;Vineglimmer Snarl;Vineglimmer Snarl;Vineglimmer Snarl;Temple of Deceit;Temple of Deceit;Temple of Deceit;Island;Treeshaker Chimera|MergedCards:Dreamtail Heron,Dreamtail Heron,Dreamtail Heron|Counters:P1P1=1|Id:1
+ailibrary=Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt;Opt
+aibattlefield=Mind Flayer|ExecuteScript:TrigChange->1;Cogwork Archivist|Tapped
+humanprecast=Mordenkainen:2
+removesummoningsickness=true

forge-gui/res/puzzle/PS_AFR3.pzl

@@ -0,0 +1,19 @@
+[metadata]
+Name:Possibility Storm - Adventures in the Forgotten Realms #03
+URL:https://i0.wp.com/www.possibilitystorm.com/wp-content/uploads/2021/08/181.-AFR3-scaled.jpg
+Goal:Win
+Turns:1
+Difficulty:Mythic
+Description:Start in your first main phase (with Elspeth's Nightmare chapter II ability resolving) and win this turn. You topdecked Pharika's Libation this draw step. Your opponent resolved Revel in Silence during your upkeep. Assume your opponent is tapped out.
+[state]
+humanlife=20
+ailife=3
+turn=1
+activeplayer=human
+activephase=DRAW
+activephaseadvance=MAIN1
+humanhand=Pharika's Libation
+humanbattlefield=Spare Dagger;Elspeth's Nightmare|Counters:LORE=1;Hive of the Eye Tyrant;Hive of the Eye Tyrant;Hive of the Eye Tyrant;Swamp;Swamp;Swamp;Swamp;Swamp
+aihand=Indomitable Will;Indomitable Will;Indomitable Will
+aibattlefield=Nine Lives|Counters:INCARNATION=6;Speaker of the Heavens
+aiprecast=Revel in Silence

forge-gui/res/puzzle/PS_AFR4.pzl

@@ -0,0 +1,16 @@
+[metadata]
+Name:Possibility Storm - Adventures in the Forgotten Realms #04
+URL:https://i2.wp.com/www.possibilitystorm.com/wp-content/uploads/2021/08/182.-AFR4-scaled.jpg
+Goal:Win
+Turns:1
+Difficulty:Uncommon
+Description:Win this turn. Your opponent has no cards in hand and no mana available.
+[state]
+humanlife=20
+ailife=7
+turn=1
+activeplayer=human
+activephase=MAIN1
+humanhand=Goblin Javelineer;Hulking Bugbear;You See a Pair of Goblins
+humanbattlefield=Hobgoblin Bandit Lord;Battle Cry Goblin;Mountain;Mountain;Mountain;Mountain;Mountain
+aibattlefield=Vadrok, Apex of Thunder;Yorion, Sky Nomad