From e62044ef041ff3d5daa0e2d7d197e3d2fea9f841 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sat, 25 Sep 2021 09:36:55 -0400 Subject: [PATCH 1/4] shadow_kin.txt --- forge-gui/res/cardsfolder/upcoming/shadow_kin.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/shadow_kin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shadow_kin.txt b/forge-gui/res/cardsfolder/upcoming/shadow_kin.txt new file mode 100644 index 00000000000..d7cdd6f4327 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/shadow_kin.txt @@ -0,0 +1,12 @@ +Name:Shadow Kin +ManaCost:3 U +Types:Creature Shapeshifter +PT:2/2 +K:Flash +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigMillSK | TriggerDescription$ At the beginning of your upkeep, each player mills three cards. You may exile a creature card from among the cards milled this way. If you do, CARDNAME becomes a copy of that card, except it has this ability. +SVar:TrigMillSK:DB$ Mill | Defined$ Player | NumCards$ 3 | RememberMilled$ True | SubAbility$ DBExileSK +SVar:DBExileSK:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Hidden$ True | ChangeType$ Creature.IsRemembered | ChangeNum$ 1 | Imprint$ True | ForgetOtherRemembered$ True | SelectPrompt$ You may exile a creature card from among the cards milled this way. | SubAbility$ DBCloneSK +SVar:DBCloneSK:DB$ Clone | ConditionDefined$ Imprinted | ConditionZone$ Exile | ConditionPresent$ Card | Defined$ Imprinted | GainThisAbility$ True +DeckHas:Ability$Mill +DeckHints:Ability$Graveyard +Oracle:Flash\nAt the beginning of your upkeep, each player mills three cards. You may exile a creature card from among the cards milled this way. If you do, Shadow Kin becomes a copy of that card, except it has this ability. From 3799505e3517cec4e6c341a9c08b9896605881d6 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 26 Sep 2021 08:48:42 -0400 Subject: [PATCH 2/4] cleaver_skaab.txt --- forge-gui/res/cardsfolder/upcoming/cleaver_skaab.txt | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/cleaver_skaab.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cleaver_skaab.txt b/forge-gui/res/cardsfolder/upcoming/cleaver_skaab.txt new file mode 100644 index 00000000000..ac3aaffa743 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/cleaver_skaab.txt @@ -0,0 +1,8 @@ +Name:Cleaver Skaab +ManaCost:3 U +Types:Creature Zombie Horror +PT:2/4 +A:AB$ CopyPermanent | Cost$ 3 T Sac<1/Zombie.Other/another zombie> | Defined$ Sacrificed | NumCopies$ 2 +DeckNeeds:Type$Zombie +DeckHas:Ability$Sacrifice & Ability$Token +Oracle:{3}, {T}, Sacrifice another Zombie: Create two tokens that are copies of the sacrificed creature. From 6894a2cca55e52d7696dd4b7f4dc40f1a1196a20 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 26 Sep 2021 08:56:30 -0400 Subject: [PATCH 3/4] enable Charm mode StackDescriptions --- .../main/java/forge/game/ability/effects/CharmEffect.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java index ff5dc1db2d1..830cbbd2457 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java @@ -147,7 +147,7 @@ public class CharmEffect extends SpellAbilityEffect { @Override protected String getStackDescription(SpellAbility sa) { - // TODO Build StackDescription based on Chosen SubAbilities + // StackDescription based on Chosen SubAbilities allowed in chainAbilities return ""; } @@ -228,8 +228,10 @@ public class CharmEffect extends SpellAbilityEffect { // update ActivatingPlayer clone.setActivatingPlayer(sa.getActivatingPlayer()); - // make StackDescription be the SpellDescription - clone.putParam("StackDescription", "SpellDescription"); + // make StackDescription be the SpellDescription if it doesn't already have one + if (!clone.hasParam("StackDescription")) { + clone.putParam("StackDescription", "SpellDescription"); + } // do not forget what was targeted by the subability SpellAbility ssa = sub; From 82c06711e5e0805543d8ebb6d844a853b6874875 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 26 Sep 2021 08:57:37 -0400 Subject: [PATCH 4/4] drown_in_dreams.txt --- .../res/cardsfolder/upcoming/drown_in_dreams.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/drown_in_dreams.txt diff --git a/forge-gui/res/cardsfolder/upcoming/drown_in_dreams.txt b/forge-gui/res/cardsfolder/upcoming/drown_in_dreams.txt new file mode 100644 index 00000000000..d681e4b4a84 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/drown_in_dreams.txt @@ -0,0 +1,11 @@ +Name:Drown in Dreams +ManaCost:X 2 U +Types:Instant +A:SP$ Charm | MinCharmNum$ 1 | CharmNum$ W | Choices$ DBDraw,DBMill | AdditionalDescription$ . If you control a commander as you cast this spell, you may choose both. +SVar:DBDraw:DB$ Draw | ValidTgts$ Player | TgtPrompt$ Select target player to draw cards | NumCards$ X | StackDescription$ {p:ThisTargetedPlayer} draws X cards. | SpellDescription$ Target player draws X cards. +SVar:DBMill:DB$ Mill | ValidTgts$ Player | TgtPrompt$ Select target player to mill cards | NumCards$ Z | StackDescription$ {p:ThisTargetedPlayer} mills twice X cards. | SpellDescription$ Target player mills twice X cards. +SVar:W:Count$Compare Y GE1.2.1 +SVar:X:Count$xPaid +SVar:Y:Count$Valid Card.IsCommander+YouCtrl +SVar:Z:Count$xPaid/Twice +Oracle:Choose one. If you control a commander as you cast this spell, you may choose both.\n• Target player draws X cards.\n• Target player mills twice X cards.