From eec8b7a42a17a04dbbef58d9ce764b232c68950b Mon Sep 17 00:00:00 2001 From: Wendell Wilkerson Date: Sun, 11 Jul 2021 22:31:58 -0500 Subject: [PATCH 1/3] add AFR artifact and updated counter enum list to support HARMONY counters --- .../main/java/forge/game/card/CounterEnumType.java | 2 ++ .../cardsfolder/upcoming/instrument_of_the_bards.txt | 11 +++++++++++ forge-gui/res/cardsfolder/upcoming/spare_dagger.txt | 8 ++++++++ forge-gui/res/cardsfolder/upcoming/thieves_tools.txt | 9 +++++++++ 4 files changed, 30 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/spare_dagger.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/thieves_tools.txt diff --git a/forge-game/src/main/java/forge/game/card/CounterEnumType.java b/forge-game/src/main/java/forge/game/card/CounterEnumType.java index dd097d4a44e..8821fe46376 100644 --- a/forge-game/src/main/java/forge/game/card/CounterEnumType.java +++ b/forge-game/src/main/java/forge/game/card/CounterEnumType.java @@ -139,6 +139,8 @@ public enum CounterEnumType { GROWTH("GRWTH", 87, 226, 32), + HARMONY("HRMNY", 0, 230, 155), + HATCHLING("HATCH", 201, 199, 186), HEALING("HEAL", 255, 166, 236), diff --git a/forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt b/forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt new file mode 100644 index 00000000000..b1307411788 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt @@ -0,0 +1,11 @@ +Name:Instrument of the Bards +ManaCost:G +Types:Legendary Artifact +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, you may put a charge counter on CARDNAME. +SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ HARMONY | CounterNum$ 1 +A:AB$ ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Hand | ChangeType$ Creature.cmcLEX | ChangeNum$ 1 | RememberChanged$ True | SubAbility$ DBToken | StackDescription$ SpellDescription | SpellDescription$ Search your library for a creature card with mana value equal to the number of harmony counters on CARDNAME, reveal it, and put it into your hand. If that card is legendary, create a Treasure token. Then shuffle. +SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | ConditionDefined$ Remembered | ConditionPresent$ Card.Legendary | ConditionCompare$ GE1 | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:X:Count$CardCounters.HARMONY +DeckHas:Ability$Token +Oracle:At the beginning of your upkeep, you may put a harmony counter on Instrument of the Bards.\n{3}{G}, {T}: Search your library for a creature card with mana value equal to the number of harmony counters on Instrument of the Bards, reveal it, and put it into your hand. If that card is legendary, create a Treasure token. Then shuffle. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/spare_dagger.txt b/forge-gui/res/cardsfolder/upcoming/spare_dagger.txt new file mode 100644 index 00000000000..7340af9788d --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/spare_dagger.txt @@ -0,0 +1,8 @@ +Name:Spare Dagger +ManaCost:1 +Types:Artifact Equipment +K:Equip:1 +S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddTrigger$ AttackTrigger | Description$ Equipped creature gets +1/+0 and has "Whenever this creature attacks, you may sacrifice Spare Dagger. When you do, this creature deals 1 damage to any target." +SVar:AttackTrigger:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever this creature attacks, you may sacrifice ORIGINALHOST. When you do, this creature deals 1 damage to any target. +SVar:TrigDealDamage:AB$ DealDamage | Cost$ Sac<1/OriginalHost/Spare Dagger> | ValidTgts$ Player,Creature,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 +Oracle:Equipped creature gets +1/+0 and has "Whenever this creature attacks, you may sacrifice Spare Dagger. When you do, this creature deals 1 damage to any target."\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/thieves_tools.txt b/forge-gui/res/cardsfolder/upcoming/thieves_tools.txt new file mode 100644 index 00000000000..7b51a68340c --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/thieves_tools.txt @@ -0,0 +1,9 @@ +Name:Thieves' Tools +ManaCost:1 B +Types:Artifact Equipment +K:Equip:3 +T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBToken | TriggerDescription$ When CARDNAME enters the battlefield, create a Treasure token. +SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You +S:Mode$ Continuous | Affected$ Creature.EquippedBy+powerLE3 | AddHiddenKeyword$ Unblockable | Description$ nEquipped creature can't be blocked as long as its power is 3 or less. +DeckHas:Ability$Token +Oracle:When Thieves' Tools enters the battlefield, create a Treasure token. (It's an artifact with \"{T}, Sacrifice this artifact: Add one mana of any color.\")\nEquipped creature can't be blocked as long as its power is 3 or less.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.) \ No newline at end of file From fd54ecb571351babb62bf3cb0bba917e3a0ed221 Mon Sep 17 00:00:00 2001 From: Wendell Wilkerson Date: Sun, 11 Jul 2021 23:25:59 -0500 Subject: [PATCH 2/3] add Trickster's Talisman and fixed stack descriptions --- forge-gui/res/cardsfolder/upcoming/spare_dagger.txt | 2 +- .../res/cardsfolder/upcoming/tricksters_talisman.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 forge-gui/res/cardsfolder/upcoming/tricksters_talisman.txt diff --git a/forge-gui/res/cardsfolder/upcoming/spare_dagger.txt b/forge-gui/res/cardsfolder/upcoming/spare_dagger.txt index 7340af9788d..5a503666173 100644 --- a/forge-gui/res/cardsfolder/upcoming/spare_dagger.txt +++ b/forge-gui/res/cardsfolder/upcoming/spare_dagger.txt @@ -3,6 +3,6 @@ ManaCost:1 Types:Artifact Equipment K:Equip:1 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddTrigger$ AttackTrigger | Description$ Equipped creature gets +1/+0 and has "Whenever this creature attacks, you may sacrifice Spare Dagger. When you do, this creature deals 1 damage to any target." -SVar:AttackTrigger:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever this creature attacks, you may sacrifice ORIGINALHOST. When you do, this creature deals 1 damage to any target. +SVar:AttackTrigger:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever this creature attacks, you may sacrifice CARDNAME. When you do, this creature deals 1 damage to any target. SVar:TrigDealDamage:AB$ DealDamage | Cost$ Sac<1/OriginalHost/Spare Dagger> | ValidTgts$ Player,Creature,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 Oracle:Equipped creature gets +1/+0 and has "Whenever this creature attacks, you may sacrifice Spare Dagger. When you do, this creature deals 1 damage to any target."\nEquip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.) \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/tricksters_talisman.txt b/forge-gui/res/cardsfolder/upcoming/tricksters_talisman.txt new file mode 100644 index 00000000000..0ff72679426 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/tricksters_talisman.txt @@ -0,0 +1,8 @@ +Name:Trickster's Talisman +ManaCost:U +Types:Artifact Equipment +K:Equip:2 +S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ AttackTrigger | Description$ Equipped creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature." +SVar:AttackTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature. +SVar:TrigCopy:AB$ CopyPermanent | Cost$ Sac<1/OriginalHost/Trickster's Talisman> | Defined$ Self | NumCopies$ 1 | AILogic$ DuplicatePerms +Oracle:Equipped creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature."\nEquip {2} \ No newline at end of file From a6bf79500daaf5bc04c8877723b81bcc26659946 Mon Sep 17 00:00:00 2001 From: Wendell Wilkerson Date: Mon, 12 Jul 2021 00:32:18 -0500 Subject: [PATCH 3/3] fixes from comments --- .../res/cardsfolder/upcoming/instrument_of_the_bards.txt | 4 ++-- forge-gui/res/cardsfolder/upcoming/tricksters_talisman.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt b/forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt index b1307411788..66b549a2b37 100644 --- a/forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt +++ b/forge-gui/res/cardsfolder/upcoming/instrument_of_the_bards.txt @@ -7,5 +7,5 @@ A:AB$ ChangeZone | Cost$ 3 G T | Origin$ Library | Destination$ Hand | ChangeTyp SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | ConditionDefined$ Remembered | ConditionPresent$ Card.Legendary | ConditionCompare$ GE1 | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Count$CardCounters.HARMONY -DeckHas:Ability$Token -Oracle:At the beginning of your upkeep, you may put a harmony counter on Instrument of the Bards.\n{3}{G}, {T}: Search your library for a creature card with mana value equal to the number of harmony counters on Instrument of the Bards, reveal it, and put it into your hand. If that card is legendary, create a Treasure token. Then shuffle. \ No newline at end of file +DeckHas:Ability$Token & Ability$Counters +Oracle:At the beginning of your upkeep, you may put a harmony counter on Instrument of the Bards.\n{3}{G}, {T}: Search your library for a creature card with mana value equal to the number of harmony counters on Instrument of the Bards, reveal it, and put it into your hand. If that card is legendary, create a Treasure token. Then shuffle. diff --git a/forge-gui/res/cardsfolder/upcoming/tricksters_talisman.txt b/forge-gui/res/cardsfolder/upcoming/tricksters_talisman.txt index 0ff72679426..80a6bfa66ac 100644 --- a/forge-gui/res/cardsfolder/upcoming/tricksters_talisman.txt +++ b/forge-gui/res/cardsfolder/upcoming/tricksters_talisman.txt @@ -5,4 +5,5 @@ K:Equip:2 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ AttackTrigger | Description$ Equipped creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature." SVar:AttackTrigger:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigCopy | TriggerDescription$ Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature. SVar:TrigCopy:AB$ CopyPermanent | Cost$ Sac<1/OriginalHost/Trickster's Talisman> | Defined$ Self | NumCopies$ 1 | AILogic$ DuplicatePerms -Oracle:Equipped creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature."\nEquip {2} \ No newline at end of file +DeckHas:Ability$Token +Oracle:Equipped creature gets +1/+1 and has "Whenever this creature deals combat damage to a player, you may sacrifice Trickster's Talisman. If you do, create a token that's a copy of this creature."\nEquip {2}