external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nickname' into 'master'

Browse Source 
More Nickname

See merge request core-developers/forge!6093
This commit is contained in:
Michael Kamensky
2022-01-29 18:31:00 +00:00
parent 73889dd6a5 67626ddfc4
commit a72f897d81
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/cost/CostPart.java
View File

@@ -92,7 +92,7 @@ public abstract class CostPart implements Comparable<CostPart>, Cloneable, Seria
* @return the this * @return the this
*/ */
public final boolean payCostFromSource() { public final boolean payCostFromSource() {
return this.getType().equals("CARDNAME"); return this.getType().equals("CARDNAME") || this.getType().equals("NICKNAME");
} }
/** /**

2
forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java
View File

@@ -119,7 +119,7 @@ public class CostRemoveCounter extends CostPart {
sb.append(" from "); sb.append(" from ");
if (this.getTypeDescription() == null && this.payCostFromSource()) { if (this.payCostFromSource()) {
sb.append(this.getType()); sb.append(this.getType());
} else { } else {
final String desc = this.getTypeDescription() == null ? this.getType() : this.getTypeDescription(); final String desc = this.getTypeDescription() == null ? this.getType() : this.getTypeDescription();

3
forge-gui/res/cardsfolder/a/arashi_the_sky_asunder.txt
View File

@@ -3,7 +3,6 @@ ManaCost:3 G G
Types:Legendary Creature Spirit Types:Legendary Creature Spirit
PT:5/5 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$ 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: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. 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.

3
forge-gui/res/cardsfolder/j/jiwari_the_earth_aflame.txt
View File

@@ -3,7 +3,6 @@ ManaCost:3 R R
Types:Legendary Creature Spirit Types:Legendary Creature Spirit
PT:3/3 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$ 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: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. 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.

2
forge-gui/res/cardsfolder/k/kurbis_harvest_celebrant.txt
View File

@@ -3,7 +3,7 @@ ManaCost:X G G
Types:Legendary Creature Treefolk Types:Legendary Creature Treefolk
PT:0/0 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. 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: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:X:Count$xPaid
SVar:Y:Count$CastTotalManaSpent SVar:Y:Count$CastTotalManaSpent