From 31974b7fdbb70b87602fb856d0b562a293c7aa97 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 7 Nov 2022 15:27:49 -0500 Subject: [PATCH 1/2] transmogrants_crown.txt --- .../res/cardsfolder/upcoming/transmogrants_crown.txt | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 forge-gui/res/cardsfolder/upcoming/transmogrants_crown.txt diff --git a/forge-gui/res/cardsfolder/upcoming/transmogrants_crown.txt b/forge-gui/res/cardsfolder/upcoming/transmogrants_crown.txt new file mode 100644 index 00000000000..33fe6a5e9da --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/transmogrants_crown.txt @@ -0,0 +1,8 @@ +Name:Transmogrant's Crown +ManaCost:2 +Types:Artifact Equipment +S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | Description$ Equipped creature gets +2/+0. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.EquippedBy | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature dies, draw a card. +SVar:TrigDraw:DB$ Draw +K:Equip:2:::AlternateCost$ B +Oracle:Equipped creature gets +2/+0.\nWhenever equipped creature dies, draw a card.\nEquip {2} or {B} From 03cfbc5711b447b344dc1cf78518bad49b048c1a Mon Sep 17 00:00:00 2001 From: Northmoc Date: Mon, 7 Nov 2022 15:28:18 -0500 Subject: [PATCH 2/2] update Equip cost parsing for Transmogrant's Crown --- forge-game/src/main/java/forge/game/card/CardFactoryUtil.java | 2 +- .../src/main/java/forge/game/spellability/SpellAbility.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 6f8bf19d7f4..7100cfb2740 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -2886,7 +2886,7 @@ public class CardFactoryUtil { abilityStr.append(" ").append(vstr); } Cost cost = new Cost(equipCost, true); - if (!cost.isOnlyManaCost() || altCost) { //Something other than a mana cost + if (!cost.isOnlyManaCost() || (altCost && extra.contains("<"))) { //Something other than a mana cost abilityStr.append("—"); } else { abilityStr.append(" "); diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index 58b65519477..16627a0b61c 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -883,7 +883,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit sb.append(payCosts.toString()); sb.append(" or ").append(altOnlyMana ? alternateCost.toString() : StringUtils.uncapitalize(alternateCost.toString())); - sb.append(isEquip() ? "." : ""); + sb.append(isEquip() && !altOnlyMana ? "." : ""); } else { sb.append(payCosts.toString()); }