From 67626ddfc44cc9b72900d65ac507625501f6af66 Mon Sep 17 00:00:00 2001 From: Tim Mocny Date: Sat, 29 Jan 2022 18:31:00 +0000 Subject: [PATCH] More Nickname --- forge-game/src/main/java/forge/game/cost/CostPart.java | 2 +- .../src/main/java/forge/game/cost/CostRemoveCounter.java | 2 +- forge-gui/res/cardsfolder/a/arashi_the_sky_asunder.txt | 3 +-- forge-gui/res/cardsfolder/j/jiwari_the_earth_aflame.txt | 3 +-- forge-gui/res/cardsfolder/k/kurbis_harvest_celebrant.txt | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/forge-game/src/main/java/forge/game/cost/CostPart.java b/forge-game/src/main/java/forge/game/cost/CostPart.java index 34d5028497c..b5a4ef19db9 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPart.java +++ b/forge-game/src/main/java/forge/game/cost/CostPart.java @@ -92,7 +92,7 @@ public abstract class CostPart implements Comparable, Cloneable, Seria * @return the this */ public final boolean payCostFromSource() { - return this.getType().equals("CARDNAME"); + return this.getType().equals("CARDNAME") || this.getType().equals("NICKNAME"); } /** 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 5906759cbad..ad143a8cc36 100644 --- a/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java +++ b/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java @@ -119,7 +119,7 @@ public class CostRemoveCounter extends CostPart { sb.append(" from "); - if (this.getTypeDescription() == null && this.payCostFromSource()) { + if (this.payCostFromSource()) { sb.append(this.getType()); } else { final String desc = this.getTypeDescription() == null ? this.getType() : this.getTypeDescription(); diff --git a/forge-gui/res/cardsfolder/a/arashi_the_sky_asunder.txt b/forge-gui/res/cardsfolder/a/arashi_the_sky_asunder.txt index 41c81b066c1..13fe40f6f1c 100644 --- a/forge-gui/res/cardsfolder/a/arashi_the_sky_asunder.txt +++ b/forge-gui/res/cardsfolder/a/arashi_the_sky_asunder.txt @@ -3,7 +3,6 @@ ManaCost:3 G G Types:Legendary Creature Spirit PT:5/5 A:AB$ DealDamage | Cost$ X G T | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target flying creature. | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to target creature with flying. -A:AB$ DamageAll | PrecostDesc$ Channel — | Cost$ X G G Discard<1/CARDNAME> | ActivationZone$ Hand | ValidCards$ Creature.withFlying | NumDmg$ X | ValidDescription$ each creature with flying. | SpellDescription$ CARDNAME deals X damage to each creature with flying. +A:AB$ DamageAll | PrecostDesc$ Channel — | Cost$ X G G Discard<1/NICKNAME> | ActivationZone$ Hand | ValidCards$ Creature.withFlying | NumDmg$ X | ValidDescription$ each creature with flying. | SpellDescription$ NICKNAME deals X damage to each creature with flying. SVar:X:Count$xPaid -SVar:Picture:http://resources.wizards.com/magic/cards/sok/en-us/card87333.jpg Oracle:{X}{G}, {T}: Arashi, the Sky Asunder deals X damage to target creature with flying.\nChannel — {X}{G}{G}, Discard Arashi: Arashi deals X damage to each creature with flying. diff --git a/forge-gui/res/cardsfolder/j/jiwari_the_earth_aflame.txt b/forge-gui/res/cardsfolder/j/jiwari_the_earth_aflame.txt index 5aed9e3c0d8..837c6305126 100644 --- a/forge-gui/res/cardsfolder/j/jiwari_the_earth_aflame.txt +++ b/forge-gui/res/cardsfolder/j/jiwari_the_earth_aflame.txt @@ -3,7 +3,6 @@ ManaCost:3 R R Types:Legendary Creature Spirit PT:3/3 A:AB$ DealDamage | Cost$ X R T | ValidTgts$ Creature.withoutFlying | TgtPrompt$ Select target creature without flying. | NumDmg$ X | SpellDescription$ CARDNAME deals X damage to target creature without flying. -A:AB$ DamageAll | PrecostDesc$ Channel — | Cost$ X R R R Discard<1/CARDNAME> | ActivationZone$ Hand | ValidCards$ Creature.withoutFlying | NumDmg$ X | ValidDescription$ each creature without flying. | SpellDescription$ CARDNAME deals X damage to each creature without flying. +A:AB$ DamageAll | PrecostDesc$ Channel — | Cost$ X R R R Discard<1/NICKNAME> | ActivationZone$ Hand | ValidCards$ Creature.withoutFlying | NumDmg$ X | ValidDescription$ each creature without flying. | SpellDescription$ NICKNAME deals X damage to each creature without flying. SVar:X:Count$xPaid -SVar:Picture:http://www.wizards.com/global/images/magic/general/jiwari_the_earth_aflame.jpg Oracle:{X}{R}, {T}: Jiwari, the Earth Aflame deals X damage to target creature without flying.\nChannel — {X}{R}{R}{R}, Discard Jiwari: Jiwari deals X damage to each creature without flying. diff --git a/forge-gui/res/cardsfolder/k/kurbis_harvest_celebrant.txt b/forge-gui/res/cardsfolder/k/kurbis_harvest_celebrant.txt index 4cccc017486..760b22439f2 100644 --- a/forge-gui/res/cardsfolder/k/kurbis_harvest_celebrant.txt +++ b/forge-gui/res/cardsfolder/k/kurbis_harvest_celebrant.txt @@ -3,7 +3,7 @@ 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$ Effect | Cost$ SubCounter<1/P1P1/CARDNAME/NICKNAME> | TgtPrompt$ Select another target creature with a +1/+1 counter on it | ValidTgts$ Creature.Other+counters_GE1_P1P1 | RememberObjects$ Targeted | ReplacementEffects$ RPrevent | 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. +A:AB$ Effect | Cost$ SubCounter<1/P1P1/NICKNAME> | TgtPrompt$ Select another target creature with a +1/+1 counter on it | ValidTgts$ Creature.Other+counters_GE1_P1P1 | RememberObjects$ Targeted | ReplacementEffects$ RPrevent | 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:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidTarget$ Creature.IsRemembered | Description$ Prevent all damage that would be dealt to this creature this turn. SVar:X:Count$xPaid SVar:Y:Count$CastTotalManaSpent