From 1a33df88f9876ec9bf0e77b945d041b44569db5d Mon Sep 17 00:00:00 2001 From: swordshine Date: Sun, 24 Jul 2016 05:01:06 +0000 Subject: [PATCH] - EMN: Added Bruna, Gisela and Brisela --- .gitattributes | 2 ++ .../src/main/java/forge/game/card/Card.java | 5 ++-- .../cardsfolder/b/bruna_the_fading_light.txt | 26 +++++++++++++++++ ...oken_blade_brisela_voice_of_nightmares.txt | 28 +++++++++++++++++++ 4 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 forge-gui/res/cardsfolder/b/bruna_the_fading_light.txt create mode 100644 forge-gui/res/cardsfolder/g/gisela_the_broken_blade_brisela_voice_of_nightmares.txt diff --git a/.gitattributes b/.gitattributes index 9b411f84709..0a405d972a8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3137,6 +3137,7 @@ forge-gui/res/cardsfolder/b/browbeat.txt -text forge-gui/res/cardsfolder/b/brown_ouphe.txt svneol=native#text/plain forge-gui/res/cardsfolder/b/browse.txt svneol=native#text/plain forge-gui/res/cardsfolder/b/bruna_light_of_alabaster.txt -text +forge-gui/res/cardsfolder/b/bruna_the_fading_light.txt -text forge-gui/res/cardsfolder/b/brush_with_death.txt svneol=native#text/plain forge-gui/res/cardsfolder/b/brushland.txt svneol=native#text/plain forge-gui/res/cardsfolder/b/brushstrider.txt -text @@ -6751,6 +6752,7 @@ forge-gui/res/cardsfolder/g/gilt_leaf_winnower.txt -text forge-gui/res/cardsfolder/g/giltspire_avenger.txt svneol=native#text/plain forge-gui/res/cardsfolder/g/gisas_bidding.txt -text forge-gui/res/cardsfolder/g/gisela_blade_of_goldnight.txt -text +forge-gui/res/cardsfolder/g/gisela_the_broken_blade_brisela_voice_of_nightmares.txt -text forge-gui/res/cardsfolder/g/gitaxian_probe.txt svneol=native#text/plain forge-gui/res/cardsfolder/g/give_no_ground.txt -text forge-gui/res/cardsfolder/g/give_take.txt -text diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index ff0d0dd21f6..52e8574d68c 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -3653,9 +3653,10 @@ public class Card extends GameEntity implements Comparable { // by name can also have color names, so needs to happen before colors. if (property.startsWith("named")) { - if (!getName().equals(property.substring(5))) { + String name = property.substring(5).replace(";", ","); // for some legendary cards + if (!getName().equals(name)) { return false; - } + } } else if (property.startsWith("notnamed")) { if (getName().equals(property.substring(8))) { return false; diff --git a/forge-gui/res/cardsfolder/b/bruna_the_fading_light.txt b/forge-gui/res/cardsfolder/b/bruna_the_fading_light.txt new file mode 100644 index 00000000000..52a64f5221b --- /dev/null +++ b/forge-gui/res/cardsfolder/b/bruna_the_fading_light.txt @@ -0,0 +1,26 @@ +Name:Bruna, the Fading Light +ManaCost:5 W W +Types:Legendary Creature Angel Horror +PT:5/7 +Text:(Melds with Gisela, the Broken Blade.) +K:Flying +K:Vigilance +T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ When you cast CARDNAME, you may return target Angel or Human creature card from your graveyard to the battlefield. +SVar:TrigChange:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.Angel+YouCtrl,Creature.Human+YouCtrl +SVar:Picture:http://www.wizards.com/global/images/magic/general/bruna_the_fading_light.jpg +MeldPair:Gisela, the Broken Blade +AlternateMode:Meld +Oracle:When you cast Bruna, the Fading Light, you may return target Angel or Human creature card from your graveyard to the battlefield.\nFlying, vigilance\n(Melds with Gisela, the Broken Blade.) + +ALTERNATE + +Name:Brisela, Voice of Nightmares +Types:Legendary Creature Eldrazi Angel +PT:9/10 +K:Flying +K:First Strike +K:Vigilance +K:Lifelink +S:Mode$ CantBeCast | ValidCard$ Card.cmcLE3 | Caster$ Opponent | Description$ Your opponents can't cast spells with converted mana cost 3 or less. +SVar:Picture:http://www.wizards.com/global/images/magic/general/brisela_voice_of_nightmares.jpg +Oracle:Flying, first strike, vigilance, lifelink\nYour opponents can't cast spells with converted mana cost 3 or less. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/g/gisela_the_broken_blade_brisela_voice_of_nightmares.txt b/forge-gui/res/cardsfolder/g/gisela_the_broken_blade_brisela_voice_of_nightmares.txt new file mode 100644 index 00000000000..9ff92c4d5d7 --- /dev/null +++ b/forge-gui/res/cardsfolder/g/gisela_the_broken_blade_brisela_voice_of_nightmares.txt @@ -0,0 +1,28 @@ +Name:Gisela, the Broken Blade +ManaCost:2 W W +Types:Legendary Creature Angel Horror +PT:4/3 +K:Flying +K:First Strike +K:Lifelink +T:Mode$ Phase | Phase$ End of Turn | IsPresent$ Card.Self+YouOwn | IsPresent2$ Card.YouCtrl+YouOwn+namedBruna; the Fading Light | ValidPlayer$ You | Execute$ StartMeld | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, if you both own and control CARDNAME and a creature named Bruna, the Fading Light, exile them, then meld them into Brisela, Voice of Nightmares. +SVar:StartMeld:DB$ ChangeZone | Defined$ Self | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ ExileOther +SVar:ExileOther:DB$ ChangeZone | ChangeType$ Card.YouCtrl+YouOwn+namedBruna; the Fading Light | Hidden$ True | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | Mandatory$ True | SubAbility$ Meld +SVar:Meld:DB$ Meld | Defined$ Remembered | Name$ Brisela, Voice of Nightmares | Primary$ Gisela, the Broken Blade | Secondary$ Bruna, the Fading Light +SVar:Picture:http://www.wizards.com/global/images/magic/general/gisela_the_broken_blade.jpg +MeldPair:Bruna, the Fading Light +AlternateMode:Meld +Oracle:Flying, first strike, lifelink\nAt the beginning of your end step, if you both own and control Gisela, the Broken Blade and a creature named Bruna, the Fading Light, exile them, then meld them into Brisela, Voice of Nightmares. + +ALTERNATE + +Name:Brisela, Voice of Nightmares +Types:Legendary Creature Eldrazi Angel +PT:9/10 +K:Flying +K:First Strike +K:Vigilance +K:Lifelink +S:Mode$ CantBeCast | ValidCard$ Card.cmcLE3 | Caster$ Opponent | Description$ Your opponents can't cast spells with converted mana cost 3 or less. +SVar:Picture:http://www.wizards.com/global/images/magic/general/brisela_voice_of_nightmares.jpg +Oracle:Flying, first strike, vigilance, lifelink\nYour opponents can't cast spells with converted mana cost 3 or less. \ No newline at end of file