From 1b9ca3d1c2024b6b17387538bb4c85b08ed7022d Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 17:08:51 +0000 Subject: [PATCH] - Updated oracle text to Feb 2011 errata. - Added Fierce Empath, Daru Cavalier and Sphinx Summoner. --- .gitattributes | 3 +++ res/cardsfolder/daru_cavalier.txt | 11 +++++++++++ res/cardsfolder/elixir_of_immortality.txt | 2 +- res/cardsfolder/feast_or_famine.txt | 2 +- res/cardsfolder/fierce_empath.txt | 10 ++++++++++ res/cardsfolder/horned_kavu.txt | 1 + res/cardsfolder/impulse.txt | 2 +- res/cardsfolder/pyre_zombie.txt | 2 +- res/cardsfolder/ritual_of_the_machine.txt | 2 +- res/cardsfolder/shivan_wurm.txt | 1 + res/cardsfolder/skullclamp.txt | 2 +- res/cardsfolder/sphinx_summoner.txt | 11 +++++++++++ src/forge/CardFactory_Creatures.java | 6 +++--- 13 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 res/cardsfolder/daru_cavalier.txt create mode 100644 res/cardsfolder/fierce_empath.txt create mode 100644 res/cardsfolder/sphinx_summoner.txt diff --git a/.gitattributes b/.gitattributes index 30c196a49ae..434030d6002 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1276,6 +1276,7 @@ res/cardsfolder/darkwatch_elves.txt -text svneol=native#text/plain res/cardsfolder/darkwater_catacombs.txt -text svneol=native#text/plain res/cardsfolder/darkwater_egg.txt -text svneol=native#text/plain res/cardsfolder/darting_merfolk.txt -text svneol=native#text/plain +res/cardsfolder/daru_cavalier.txt -text svneol=native#text/plain res/cardsfolder/daru_encampment.txt -text svneol=native#text/plain res/cardsfolder/daru_lancer.txt -text svneol=native#text/plain res/cardsfolder/daru_sanctifier.txt svneol=native#text/plain @@ -1913,6 +1914,7 @@ res/cardsfolder/fevered_strength.txt -text svneol=native#text/plain res/cardsfolder/fiddlehead_kami.txt -text svneol=native#text/plain res/cardsfolder/field_marshal.txt -text svneol=native#text/plain res/cardsfolder/fieldmist_borderpost.txt -text svneol=native#text/plain +res/cardsfolder/fierce_empath.txt -text svneol=native#text/plain res/cardsfolder/fiery_conclusion.txt -text svneol=native#text/plain res/cardsfolder/fiery_fall.txt -text svneol=native#text/plain res/cardsfolder/fiery_hellhound.txt -text svneol=native#text/plain @@ -5221,6 +5223,7 @@ res/cardsfolder/sphere_of_truth.txt -text svneol=native#text/plain res/cardsfolder/sphinx_of_jwar_isle.txt -text svneol=native#text/plain res/cardsfolder/sphinx_of_magosi.txt -text svneol=native#text/plain res/cardsfolder/sphinx_of_the_steel_wind.txt -text svneol=native#text/plain +res/cardsfolder/sphinx_summoner.txt -text svneol=native#text/plain res/cardsfolder/spider_umbra.txt -text svneol=native#text/plain res/cardsfolder/spidersilk_armor.txt -text svneol=native#text/plain res/cardsfolder/spidersilk_net.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/daru_cavalier.txt b/res/cardsfolder/daru_cavalier.txt new file mode 100644 index 00000000000..9eaf4723ade --- /dev/null +++ b/res/cardsfolder/daru_cavalier.txt @@ -0,0 +1,11 @@ +Name:Daru Cavalier +ManaCost:3 W +Types:Creature Human Soldier +Text:no text +PT:2/2 +K:First Strike +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | Optional$ True | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card named Daru Cavalier, reveal it, and put it into your hand. If you do, shuffle your library. +SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedDaru Cavalier | ChangeNum$ 1 +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/daru_cavalier.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/elixir_of_immortality.txt b/res/cardsfolder/elixir_of_immortality.txt index 4b8f5389a14..c14f081c5d1 100644 --- a/res/cardsfolder/elixir_of_immortality.txt +++ b/res/cardsfolder/elixir_of_immortality.txt @@ -2,7 +2,7 @@ Name:Elixir of Immortality ManaCost:1 Types:Artifact Text:no text -A:AB$GainLife | Cost$ 2 T Sac<1/CARDNAME> | LifeAmount$ 5 | SubAbility$ SVar=DBShuffle | SpellDescription$ You gain 5 life. Shuffle Elixir of Immortality and your graveyard into your library. +A:AB$GainLife | Cost$ 2 T Sac<1/CARDNAME> | LifeAmount$ 5 | SubAbility$ SVar=DBShuffle | SpellDescription$ You gain 5 life. Shuffle Elixir of Immortality and your graveyard into their owner's library. SVar:DBShuffle:DB$ChangeZone | Origin$ Graveyard | Destination$ Library | Shuffle$ True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/elixir_of_immortality.jpg diff --git a/res/cardsfolder/feast_or_famine.txt b/res/cardsfolder/feast_or_famine.txt index 2321d9a7cae..15092bda5f9 100644 --- a/res/cardsfolder/feast_or_famine.txt +++ b/res/cardsfolder/feast_or_famine.txt @@ -3,7 +3,7 @@ ManaCost:3 B Types:Instant Text:no text A:SP$Token | Cost$ 3 B | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ Controller | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | PrecostDesc$ Choose one - | SpellDescription$ Put a 2/2 black Zombie creature token onto the battlefield; -A:SP$Destroy | Cost$ 3 B | ValidTgts$ Creature.nonBlack+nonArtifact | TgtPrompt$ Select target nonblack, nonartifact creature | NoRegen$ True | SpellDescription$ or destroy target nonblack, nonartifact creature and it can't be regenerated. +A:SP$Destroy | Cost$ 3 B | ValidTgts$ Creature.nonBlack+nonArtifact | TgtPrompt$ Select target nonblack, nonartifact creature | NoRegen$ True | SpellDescription$ or destroy target nonartifact, nonblack creature and it can't be regenerated. SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/feast_or_famine.jpg diff --git a/res/cardsfolder/fierce_empath.txt b/res/cardsfolder/fierce_empath.txt new file mode 100644 index 00000000000..fd34e54ea16 --- /dev/null +++ b/res/cardsfolder/fierce_empath.txt @@ -0,0 +1,10 @@ +Name:Fierce Empath +ManaCost:2 G +Types:Creature Elf +Text:no text +PT:1/1 +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | Optional$ True | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a creature card with converted mana cost 6 or greater, reveal it, put it into your hand, then shuffle your library. +SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Creature.cmcGE6 | ChangeNum$ 1 +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/fierce_empath.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/horned_kavu.txt b/res/cardsfolder/horned_kavu.txt index 1dd9dfba3ba..d4ba16d4478 100644 --- a/res/cardsfolder/horned_kavu.txt +++ b/res/cardsfolder/horned_kavu.txt @@ -5,6 +5,7 @@ Text:no text PT:3/4 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a red or green creature you control to its owner's hand. SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Creature.Red+YouCtrl,Creature.Green+YouCtrl +SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/horned_kavu.jpg SetInfo:PLS|Common|http://magiccards.info/scans/en/ps/110.jpg diff --git a/res/cardsfolder/impulse.txt b/res/cardsfolder/impulse.txt index bdb6ca291e3..8c66a7696d7 100644 --- a/res/cardsfolder/impulse.txt +++ b/res/cardsfolder/impulse.txt @@ -1,7 +1,7 @@ Name:Impulse ManaCost:1 U Types:Instant -Text:Look at the top four cards of your library. Put one of them into your hand and the rest on the bottom of your library. +Text:Look at the top four cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order. SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://resources.wizards.com/magic/cards/vi/en-us/card3641.jpg diff --git a/res/cardsfolder/pyre_zombie.txt b/res/cardsfolder/pyre_zombie.txt index 787b8f903c8..527753da74f 100644 --- a/res/cardsfolder/pyre_zombie.txt +++ b/res/cardsfolder/pyre_zombie.txt @@ -5,7 +5,7 @@ Text:no text PT:2/1 A:AB$DealDamage | Cost$ 1 R R Sac<1/CARDNAME> | Tgt$ TgtCP | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature or player. #The IsPresent stuff in the trigger is necessary because it must be checked on resolve as well. -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self | PresentZone$ Graveyard | PresentPlayer$ You | TriggerZones$ Graveyard | Optional$ True | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard, you may pay 1 B B. If you do, return CARDNAME from your graveyard to your hand. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Card.Self | PresentZone$ Graveyard | PresentPlayer$ You | TriggerZones$ Graveyard | Optional$ True | Execute$ TrigReturn | TriggerDescription$ At the beginning of your upkeep, if CARDNAME is in your graveyard, you may pay 1 B B. If you do, return CARDNAME to your hand. SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Graveyard | Destination$ Hand SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/pyre_zombie.jpg diff --git a/res/cardsfolder/ritual_of_the_machine.txt b/res/cardsfolder/ritual_of_the_machine.txt index a313a412c8d..beef7f600d5 100644 --- a/res/cardsfolder/ritual_of_the_machine.txt +++ b/res/cardsfolder/ritual_of_the_machine.txt @@ -2,7 +2,7 @@ Name:Ritual of the Machine ManaCost:2 B B Types:Sorcery Text:no text -A:SP$ GainControl | Cost$ 2 B B Sac<1/Creature> | ValidTgts$ Creature.nonBlack+nonArtifact | TgtPrompt$Select target nonblack, nonartifact creature | SpellDescription$ Gain control of target nonblack, nonartifact creature. +A:SP$ GainControl | Cost$ 2 B B Sac<1/Creature> | ValidTgts$ Creature.nonBlack+nonArtifact | TgtPrompt$Select target nonartifact, nonblack creature | SpellDescription$ Gain control of target nonblack, nonartifact creature. SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/ritual_of_the_machine.jpg SetInfo:ALL|Rare|http://magiccards.info/scans/en/ai/24.jpg diff --git a/res/cardsfolder/shivan_wurm.txt b/res/cardsfolder/shivan_wurm.txt index f85bce10ba2..b1680718aad 100644 --- a/res/cardsfolder/shivan_wurm.txt +++ b/res/cardsfolder/shivan_wurm.txt @@ -6,6 +6,7 @@ PT:7/7 K:Trample T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a red or green creature you control to its owner's hand. SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Creature.Red+YouCtrl,Creature.Green+YouCtrl +SVar:RemAIDeck:True SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/shivan_wurm.jpg SetInfo:PLS|Rare|http://magiccards.info/scans/en/ps/124.jpg diff --git a/res/cardsfolder/skullclamp.txt b/res/cardsfolder/skullclamp.txt index 55c01640ac1..68550c3fffb 100644 --- a/res/cardsfolder/skullclamp.txt +++ b/res/cardsfolder/skullclamp.txt @@ -3,7 +3,7 @@ ManaCost:1 Types:Artifact Equipment Text:Equipped creature gets +1/-1. K:eqPump 1:+1/-1 -T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigDraw | TriggerDescription$ When equipped creature is put into a graveyard, draw two cards. +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.AttachedBy | Execute$ TrigDraw | TriggerDescription$ Whenever equipped creature is put into a graveyard, draw two cards. SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 2 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/skullclamp.jpg diff --git a/res/cardsfolder/sphinx_summoner.txt b/res/cardsfolder/sphinx_summoner.txt new file mode 100644 index 00000000000..6a2a53d3780 --- /dev/null +++ b/res/cardsfolder/sphinx_summoner.txt @@ -0,0 +1,11 @@ +Name:Sphinx Summoner +ManaCost:3 U B +Types:Artifact Creature Sphinx +Text:no text +PT:3/3 +K:Flying +T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | Optional$ True | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for an artifact creature card, reveal it, and put it into your hand. If you do, shuffle your library. +SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Artifact.Creature| ChangeNum$ 1 +SVar:Rarity:Rare +SVar:Picture:http://www.wizards.com/global/images/magic/general/sphinx_summoner.jpg +End \ No newline at end of file diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java index 83b48782678..83120f6c284 100644 --- a/src/forge/CardFactory_Creatures.java +++ b/src/forge/CardFactory_Creatures.java @@ -6997,11 +6997,11 @@ public class CardFactory_Creatures { card.addSpellAbility(ability2); StringBuilder sb = new StringBuilder(); - sb.append(abCost+"Remove all +1/+1 counters from "+cardName+". "+cardName); - sb.append(" deals damage to target creature or player equal to the number of counters removed this way."); + sb.append(abCost+"Remove all +1/+1 counters from "+cardName+": "+cardName); + sb.append(" deals damage to target creature or player equal to the number of +1/+1 counters removed this way."); ability2.setDescription(sb.toString()); - ability2.setStackDescription("Molten Hydra deals damage to number of counters on it to target creature or player."); + ability2.setStackDescription("Molten Hydra deals damage to number of +1/+1 counters on it to target creature or player."); }//*************** END ************ END **************************