Merge branch 'master' into newmaster2

forge-gui/res/cardsfolder/a/awaken_the_woods.txt

@@ -1,7 +1,7 @@
 Name:Awaken the Woods
 ManaCost:X G G
 Types:Sorcery
-A:SP$ Token | TokenAmount$ X | TokenScript$ g_1_1_forest_dryad_land | TokenOwner$ You | SpellDescription$ Create X 1/1 green Forest Dryad land creature tokens.
+A:SP$ Token | TokenAmount$ X | TokenScript$ g_1_1_forest_dryad | TokenOwner$ You | SpellDescription$ Create X 1/1 green Forest Dryad land creature tokens.
 SVar:X:Count$xPaid
 DeckHas:Type$Dryad & Ability$Token
 Oracle:Create X 1/1 green Forest Dryad land creature tokens.

forge-gui/res/cardsfolder/s/sharktocrab.txt

@@ -3,9 +3,8 @@ ManaCost:2 G U
 Types:Creature Shark Octopus Crab
 PT:4/4
 K:Adapt:1:2 G U
-DeckHas:Ability$Counters
 T:Mode$ CounterAddedOnce | ValidCard$ Card.Self | TriggerZones$ Battlefield | CounterType$ P1P1 | Execute$ TrigTap | TriggerDescription$ Whenever one or more +1/+1 counters are put on CARDNAME, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose target creature an opponent controls. | SubAbility$ DBPump
 SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Duration$ Permanent
-SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Counters
 Oracle:{2}{G}{U}: Adapt 1. (If this creature has no +1/+1 counters on it, put a +1/+1 counter on it.)\nWhenever one or more +1/+1 counters are put on Sharktocrab, tap target creature an opponent controls. That creature doesn't untap during its controller's next untap step.

forge-gui/res/cardsfolder/s/staff_of_titania.txt

@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact Equipment
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddSVar$ AE | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +X/+X, where X is the number of Forests you control. 
 T:Mode$ Attacks | ValidCard$ Creature.EquippedBy | Execute$ TrigToken | TriggerDescription$ Whenever equipped creature attacks, create a 1/1 green Forest Dryad land creature token. (It's affected by summoning sickness.)
-SVar:TrigToken:DB$ Token | TokenScript$ g_1_1_forest_dryad_land
+SVar:TrigToken:DB$ Token | TokenScript$ g_1_1_forest_dryad
 K:Equip:3
 SVar:AE:SVar:HasAttackEffect:TRUE
 SVar:X:Count$TypeYouCtrl.Forest

forge-gui/res/editions/The Brothers War.txt

@@ -437,6 +437,6 @@ c_2_2_a_construct
 c_3_3_a_zombie
 c_a_powerstone
 c_x_x_a_golem
-g_1_1_forest_dryad_land
+g_1_1_forest_dryad
 g_2_2_bear
 u_2_2_spirit_vigilance_drawcounter

forge-gui/res/puzzle/PS_ONE1.pzl

@@ -0,0 +1,17 @@
+[metadata]
+Name:Possibility Storm - Phyrexia: All Will Be One #01
+URL:https://i0.wp.com/www.possibilitystorm.com/wp-content/uploads/2023/01/latest-3-scaled.jpg?ssl=1
+Goal:Win
+Turns:1
+Difficulty:Mythic
+Description:Win this turn. You have 20 life and seven poison counters. Good luck! 
+[state]
+humanlife=20
+humancounters=POISON=7
+ailife=11
+turn=1
+activeplayer=human
+activephase=MAIN1
+humanhand=Sawblade Scamp;Claim the Firstborn;Dismember;Gleeful Demolition;Roar of Resistance
+humanbattlefield=Dauthi Voidwalker;Fable of the Mirror-Breaker|Transformed;Swamp;Swamp;Mountain;Mountain;T:c_a_treasure_sac
+aibattlefield=Venerated Rotpriest;Spellskite

forge-gui/res/tokenscripts/g_1_1_forest_dryad.txt

@@ -0,0 +1,7 @@
+Name:Forest Dryad Token
+ManaCost:no cost
+Types:Land Creature Forest Dryad
+Colors:green
+PT:1/1
+Oracle:({T}: Add {G}.)
+

forge-gui/res/tokenscripts/g_1_1_forest_dryad_land.txt

@@ -1,6 +0,0 @@
-Name:Forest Dryad Land Token
-ManaCost:no cost
-Types:Creature Forest Dryad Land
-Colors:green
-PT:1/1
-Oracle:{T}: Add {G}.