From 3c07bfb659f799cdf59381b2a78d15dcf45012a9 Mon Sep 17 00:00:00 2001 From: Sol Date: Sat, 20 Feb 2016 22:26:35 +0000 Subject: [PATCH] - Fixing description for Ninjutsu --- forge-game/src/main/java/forge/game/cost/CostReturn.java | 2 +- forge-gui/res/cardsfolder/h/higure_the_still_wind.txt | 2 +- forge-gui/res/cardsfolder/i/ink_eyes_servant_of_oni.txt | 2 +- forge-gui/res/cardsfolder/m/mistblade_shinobi.txt | 2 +- forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt | 2 +- forge-gui/res/cardsfolder/o/okiba_gang_shinobi.txt | 2 +- forge-gui/res/cardsfolder/s/sakashimas_student.txt | 2 +- forge-gui/res/cardsfolder/s/silent_blade_oni.txt | 2 +- forge-gui/res/cardsfolder/s/skullsnatcher.txt | 2 +- forge-gui/res/cardsfolder/t/throat_slitter.txt | 2 +- forge-gui/res/cardsfolder/w/walker_of_secret_ways.txt | 2 +- forge-gui/src/main/java/forge/player/HumanCostDecision.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/forge-game/src/main/java/forge/game/cost/CostReturn.java b/forge-game/src/main/java/forge/game/cost/CostReturn.java index 436880cf9af..be8fa487b74 100644 --- a/forge-game/src/main/java/forge/game/cost/CostReturn.java +++ b/forge-game/src/main/java/forge/game/cost/CostReturn.java @@ -60,7 +60,7 @@ public class CostReturn extends CostPartWithList { if (this.payCostFromSource()) { sb.append(this.getType()); } else { - final String desc = this.getTypeDescription() == null ? this.getType() : this.getTypeDescription(); + final String desc = this.getDescriptiveType(); if (i != null) { sb.append(Cost.convertIntAndTypeToWords(i, desc)); if (i > 1) { diff --git a/forge-gui/res/cardsfolder/h/higure_the_still_wind.txt b/forge-gui/res/cardsfolder/h/higure_the_still_wind.txt index bbddc652e78..b6eba5d71df 100644 --- a/forge-gui/res/cardsfolder/h/higure_the_still_wind.txt +++ b/forge-gui/res/cardsfolder/h/higure_the_still_wind.txt @@ -2,7 +2,7 @@ Name:Higure, the Still Wind ManaCost:3 U U Types:Legendary Creature Human Ninja PT:3/4 -A:AB$ ChangeZone | Cost$ 2 U U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 2 U U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({2}{U}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) +A:AB$ ChangeZone | Cost$ 2 U U Return<1/Creature.attacking+unblocked/unblocked attacker> | CostDesc$ Ninjutsu 2 U U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({2}{U}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigSearch | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may search your library for a Ninja card, reveal it, and put it into your hand. If you do, shuffle your library. SVar:TrigSearch:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Ninja | ChangeNum$ 1 | ShuffleNonMandatory$ True A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature.Ninja | KW$ HIDDEN Unblockable | SpellDescription$ Target Ninja creature can't be blocked this turn. | TgtPrompt$ Select target Ninja creature diff --git a/forge-gui/res/cardsfolder/i/ink_eyes_servant_of_oni.txt b/forge-gui/res/cardsfolder/i/ink_eyes_servant_of_oni.txt index 820cbe0f97a..0b3518a9437 100644 --- a/forge-gui/res/cardsfolder/i/ink_eyes_servant_of_oni.txt +++ b/forge-gui/res/cardsfolder/i/ink_eyes_servant_of_oni.txt @@ -2,7 +2,7 @@ Name:Ink-Eyes, Servant of Oni ManaCost:4 B B Types:Legendary Creature Rat Ninja PT:5/4 -A:AB$ ChangeZone | Cost$ 3 B B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 3 B B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({3}{B}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) +A:AB$ ChangeZone | Cost$ 3 B B Return<1/Creature.attacking+unblocked/unblocked attacker> | CostDesc$ Ninjutsu 3 B B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({3}{B}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigAnimate | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may put target creature card from that player's graveyard onto the battlefield under your control. SVar:TrigAnimate:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | TgtPrompt$ Choose target creature card in an opponent's graveyard | ValidTgts$ Creature.DefenderCtrl | SpellDescription$ Put target creature card from an opponent's graveyard onto the battlefield under your control. A:AB$ Regenerate | Cost$ 1 B | SpellDescription$ Regenerate CARDNAME. diff --git a/forge-gui/res/cardsfolder/m/mistblade_shinobi.txt b/forge-gui/res/cardsfolder/m/mistblade_shinobi.txt index 72b61c71ff4..6935bb35111 100644 --- a/forge-gui/res/cardsfolder/m/mistblade_shinobi.txt +++ b/forge-gui/res/cardsfolder/m/mistblade_shinobi.txt @@ -2,7 +2,7 @@ Name:Mistblade Shinobi ManaCost:2 U Types:Creature Human Ninja PT:1/1 -A:AB$ ChangeZone | Cost$ U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (U, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) +A:AB$ ChangeZone | Cost$ U Return<1/Creature.attacking+unblocked/unblocked attacker> | CostDesc$ Ninjutsu U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (U, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigBounce | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may return target creature that player controls to its owner's hand. SVar:TrigBounce:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Creature.DefenderCtrl | TgtPrompt$ Choose target creature your opponent controls. | Origin$ Battlefield | Destination$ Hand SVar:Picture:http://www.wizards.com/global/images/magic/general/mistblade_shinobi.jpg diff --git a/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt b/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt index e50592a53c2..050ab4c7778 100644 --- a/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt +++ b/forge-gui/res/cardsfolder/n/ninja_of_the_deep_hours.txt @@ -2,7 +2,7 @@ Name:Ninja of the Deep Hours ManaCost:3 U Types:Creature Human Ninja PT:2/2 -A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) +A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked/unblocked attacker> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDraw | OptionalDecider$ You | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card. SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1 SVar:Picture:http://www.wizards.com/global/images/magic/general/ninja_of_the_deep_hours.jpg diff --git a/forge-gui/res/cardsfolder/o/okiba_gang_shinobi.txt b/forge-gui/res/cardsfolder/o/okiba_gang_shinobi.txt index 91a6b09f4ea..661e05dcba3 100644 --- a/forge-gui/res/cardsfolder/o/okiba_gang_shinobi.txt +++ b/forge-gui/res/cardsfolder/o/okiba_gang_shinobi.txt @@ -2,7 +2,7 @@ Name:Okiba-Gang Shinobi ManaCost:3 B B Types:Creature Rat Ninja PT:3/2 -A:AB$ ChangeZone | Cost$ 3 B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu {3}{B} | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({3}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) +A:AB$ ChangeZone | Cost$ 3 B Return<1/Creature.attacking+unblocked/unblocked attacker> | CostDesc$ Ninjutsu {3}{B} | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({3}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDiscard | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player discards two cards. SVar:TrigDiscard:AB$ Discard | Cost$ 0 | Defined$ TriggeredTarget | NumCards$ 2 | Mode$ TgtChoose SVar:Picture:http://www.wizards.com/global/images/magic/general/okiba_gang_shinobi.jpg diff --git a/forge-gui/res/cardsfolder/s/sakashimas_student.txt b/forge-gui/res/cardsfolder/s/sakashimas_student.txt index 3311112a10e..6a05320785e 100644 --- a/forge-gui/res/cardsfolder/s/sakashimas_student.txt +++ b/forge-gui/res/cardsfolder/s/sakashimas_student.txt @@ -2,7 +2,7 @@ Name:Sakashima's Student ManaCost:2 U U Types:Creature Human Ninja PT:0/0 -A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) +A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked/unblocked attacker> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) K:ETBReplacement:Copy:ChooseCreature:Optional SVar:ChooseCreature:DB$ ChooseCard | Cost$ 0 | Defined$ You | Amount$ 1 | Choices$ Creature.Other | SubAbility$ DBCopy | RememberChosen$ True | AILogic$ Clone | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it's still a Ninja in addition to its other creature types. SVar:DBCopy:DB$ Clone | Defined$ Remembered | AddTypes$ Ninja diff --git a/forge-gui/res/cardsfolder/s/silent_blade_oni.txt b/forge-gui/res/cardsfolder/s/silent_blade_oni.txt index 4b9ef667b99..48f519d2e25 100644 --- a/forge-gui/res/cardsfolder/s/silent_blade_oni.txt +++ b/forge-gui/res/cardsfolder/s/silent_blade_oni.txt @@ -2,7 +2,7 @@ Name:Silent-Blade Oni ManaCost:3 U U B B Types:Creature Demon Ninja PT:6/5 -A:AB$ ChangeZone | Cost$ 4 U B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 4 U B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({4}{U}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) +A:AB$ ChangeZone | Cost$ 4 U B Return<1/Creature.attacking+unblocked/unblocked attacker> | CostDesc$ Ninjutsu 4 U B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({4}{U}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigReveal | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, look at that player's hand. You may cast a nonland card in it without paying that card's mana cost. SVar:TrigReveal:DB$ RevealHand | Defined$ TriggeredTarget | SubAbility$ TrigPlay SVar:TrigPlay:DB$ Play | Valid$ Card.nonLand+DefenderCtrl | ValidZone$ Hand | WithoutManaCost$ True | Optional$ True diff --git a/forge-gui/res/cardsfolder/s/skullsnatcher.txt b/forge-gui/res/cardsfolder/s/skullsnatcher.txt index 227d0027c06..8a6f830e66a 100644 --- a/forge-gui/res/cardsfolder/s/skullsnatcher.txt +++ b/forge-gui/res/cardsfolder/s/skullsnatcher.txt @@ -2,7 +2,7 @@ Name:Skullsnatcher ManaCost:1 B Types:Creature Rat Ninja PT:2/1 -A:AB$ ChangeZone | Cost$ B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (B, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) +A:AB$ ChangeZone | Cost$ B Return<1/Creature.attacking+unblocked/unblocked attacker> | CostDesc$ Ninjutsu B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ (B, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigExile | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, exile up to two target cards from that player's graveyard. SVar:TrigExile:AB$ ChangeZone | Cost$ 0 | ValidTgts$ Card.DefenderCtrl | TgtPrompt$ Select target card | TargetMin$ 0 | TargetMax$ 2 | Origin$ Graveyard | Destination$ Exile | IsCurse$ True SVar:Picture:http://www.wizards.com/global/images/magic/general/skullsnatcher.jpg diff --git a/forge-gui/res/cardsfolder/t/throat_slitter.txt b/forge-gui/res/cardsfolder/t/throat_slitter.txt index 44599b00797..21f258cef10 100644 --- a/forge-gui/res/cardsfolder/t/throat_slitter.txt +++ b/forge-gui/res/cardsfolder/t/throat_slitter.txt @@ -2,7 +2,7 @@ Name:Throat Slitter ManaCost:4 B Types:Creature Rat Ninja PT:2/2 -A:AB$ ChangeZone | Cost$ 2 B Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 2 B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({2}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) +A:AB$ ChangeZone | Cost$ 2 B Return<1/Creature.attacking+unblocked/unblocked attacker> | CostDesc$ Ninjutsu 2 B | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({2}{B}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDestroy | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, destroy target nonblack creature that player controls. SVar:TrigDestroy:AB$ Destroy | Cost$ 0 | ValidTgts$ Creature.nonBlack+DefenderCtrl | TgtPrompt$ Select target nonblack creature defending player controls SVar:MustBeBlocked:True diff --git a/forge-gui/res/cardsfolder/w/walker_of_secret_ways.txt b/forge-gui/res/cardsfolder/w/walker_of_secret_ways.txt index 35eff8e8eee..ca4b38e9481 100644 --- a/forge-gui/res/cardsfolder/w/walker_of_secret_ways.txt +++ b/forge-gui/res/cardsfolder/w/walker_of_secret_ways.txt @@ -2,7 +2,7 @@ Name:Walker of Secret Ways ManaCost:2 U Types:Creature Human Ninja PT:1/2 -A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) +A:AB$ ChangeZone | Cost$ 1 U Return<1/Creature.attacking+unblocked/unblocked attacker> | CostDesc$ Ninjutsu 1 U | ActivationZone$ Hand | Origin$ Hand | Ninjutsu$ True | Destination$ Battlefield | Defined$ Self | SpellDescription$ ({1}{U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.) T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigReveal | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, look at that player's hand. SVar:TrigReveal:AB$ RevealHand | Cost$ 0 | Defined$ TriggeredTarget A:AB$ ChangeZone | Cost$ 1 U | ValidTgts$ Ninja.YouCtrl | TgtPrompt$ Select target Ninja you control | Origin$ Battlefield | Destination$ Hand | PlayerTurn$ True | SpellDescription$ Return target Ninja you control to its owner's hand. Activate this ability only during your turn. diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java index 908d48ecf82..8381c008948 100644 --- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java @@ -731,7 +731,7 @@ public class HumanCostDecision extends CostDecisionMakerBase { final InputSelectCardsFromList inp = new InputSelectCardsFromList(controller, c, c, validCards); inp.setCancelAllowed(true); - inp.setMessage("Return %d " + cost.getType() + " " + cost.getType() + " card(s) to hand"); + inp.setMessage("Return %d " + cost.getDescriptiveType() + " card(s) to hand"); inp.showAndWait(); if (inp.hasCancelled()) { return null;