From 734545c2b369efcefe032f12d6719d45003054a7 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 24 Sep 2021 19:43:03 -0400 Subject: [PATCH 1/2] kurbis_harvest_celebrant.txt --- .../cardsfolder/upcoming/kurbis_harvest_celebrant.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/kurbis_harvest_celebrant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kurbis_harvest_celebrant.txt b/forge-gui/res/cardsfolder/upcoming/kurbis_harvest_celebrant.txt new file mode 100644 index 00000000000..5c979f3f465 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/kurbis_harvest_celebrant.txt @@ -0,0 +1,10 @@ +Name:Kurbis, Harvest Celebrant +ManaCost:X G G +Types:Legendary Creature Treefolk +PT:0/0 +K:etbCounter:P1P1:Y:no Condition:CARDNAME enters the battlefield with a number of +1/+1 counters on it equal to the amount of mana spent to cast it. +A:AB$ Pump | Cost$ SubCounter<1/P1P1/CARDNAME/NICKNAME> | TgtPrompt$ Select another target creature with a +1/+1 counter on it | ValidTgts$ Creature.Other+counters_GE1_P1P1 | KW$ Prevent all damage that would be dealt to CARDNAME. | StackDescription$ Prevent all damage that would be dealt this turn to {c:Targeted}. | SpellDescription$ Prevent all damage that would be dealt this turn to another target creature with a +1/+1 counter on it. +SVar:X:Count$xPaid +SVar:Y:Count$CastTotalManaSpent +DeckHas:Ability$Counters +Oracle:Kurbis, Harvest Celebrant enters the battlefield with a number of +1/+1 counters on it equal to the amount of mana spent to cast it.\nRemove a +1/+1 counter from Kurbis: Prevent all damage that would be dealt this turn to another target creature with a +1/+1 counter on it. From d06de1ec85e247ceefecdef8c26a31303a73af8c Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 24 Sep 2021 19:44:13 -0400 Subject: [PATCH 2/2] CostRemoveCounter allow for NICKNAME in desc --- forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java b/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java index 28abc842c32..460a15f37ea 100644 --- a/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java +++ b/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java @@ -117,7 +117,7 @@ public class CostRemoveCounter extends CostPart { sb.append(" from "); - if (this.payCostFromSource()) { + if (this.getTypeDescription() == null && this.payCostFromSource()) { sb.append(this.getType()); } else { final String desc = this.getTypeDescription() == null ? this.getType() : this.getTypeDescription();