From 85bab0d7b84a04f4ac78573b99e81dce9e3a2a2d Mon Sep 17 00:00:00 2001 From: moomarc Date: Tue, 25 Sep 2012 13:50:55 +0000 Subject: [PATCH] - Added the remaining Mirage instantments (Grave Servitude, Lightning Reflexes, Soar, and Ward of Lights --- .gitattributes | 4 ++++ res/cardsfolder/g/grave_servitude.txt | 18 ++++++++++++++++++ res/cardsfolder/l/lightning_reflexes.txt | 18 ++++++++++++++++++ res/cardsfolder/s/soar.txt | 18 ++++++++++++++++++ res/cardsfolder/w/ward_of_lights.txt | 20 ++++++++++++++++++++ src/main/java/forge/Card.java | 3 ++- 6 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 res/cardsfolder/g/grave_servitude.txt create mode 100644 res/cardsfolder/l/lightning_reflexes.txt create mode 100644 res/cardsfolder/s/soar.txt create mode 100644 res/cardsfolder/w/ward_of_lights.txt diff --git a/.gitattributes b/.gitattributes index b67fb1e5020..d80673cd389 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4021,6 +4021,7 @@ res/cardsfolder/g/grave_exchange.txt -text res/cardsfolder/g/grave_pact.txt svneol=native#text/plain res/cardsfolder/g/grave_peril.txt svneol=native#text/plain res/cardsfolder/g/grave_robbers.txt svneol=native#text/plain +res/cardsfolder/g/grave_servitude.txt -text res/cardsfolder/g/grave_shell_scarab.txt svneol=native#text/plain res/cardsfolder/g/grave_titan.txt svneol=native#text/plain res/cardsfolder/g/gravebane_zombie.txt -text @@ -5448,6 +5449,7 @@ res/cardsfolder/l/lightning_hounds.txt svneol=native#text/plain res/cardsfolder/l/lightning_mauler.txt -text res/cardsfolder/l/lightning_prowess.txt -text res/cardsfolder/l/lightning_reaver.txt svneol=native#text/plain +res/cardsfolder/l/lightning_reflexes.txt -text res/cardsfolder/l/lightning_rift.txt svneol=native#text/plain res/cardsfolder/l/lightning_serpent.txt svneol=native#text/plain res/cardsfolder/l/lightning_surge.txt svneol=native#text/plain @@ -8806,6 +8808,7 @@ res/cardsfolder/s/snow_devil.txt svneol=native#text/plain res/cardsfolder/s/snow_fortress.txt svneol=native#text/plain res/cardsfolder/s/snow_hound.txt svneol=native#text/plain res/cardsfolder/s/snuff_out.txt svneol=native#text/plain +res/cardsfolder/s/soar.txt -text res/cardsfolder/s/soaring_hope.txt svneol=native#text/plain res/cardsfolder/s/soaring_seacliff.txt svneol=native#text/plain res/cardsfolder/s/soilshaper.txt svneol=native#text/plain @@ -10746,6 +10749,7 @@ res/cardsfolder/w/war_torch_goblin.txt svneol=native#text/plain res/cardsfolder/w/warbreak_trumpeter.txt svneol=native#text/plain res/cardsfolder/w/warclamp_mastiff.txt -text res/cardsfolder/w/ward_of_bones.txt -text +res/cardsfolder/w/ward_of_lights.txt -text res/cardsfolder/w/ward_of_piety.txt -text res/cardsfolder/w/ward_sliver.txt -text svneol=unset#text/plain res/cardsfolder/w/warden_of_the_wall.txt -text diff --git a/res/cardsfolder/g/grave_servitude.txt b/res/cardsfolder/g/grave_servitude.txt new file mode 100644 index 00000000000..14b9728a0b0 --- /dev/null +++ b/res/cardsfolder/g/grave_servitude.txt @@ -0,0 +1,18 @@ +Name:Grave Servitude +ManaCost:1 B +Types:Enchantment Aura +Text:no text +K:You may cast CARDNAME as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step. +K:Enchant creature +T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDelayedSac | Static$ True | Secondary$ True | SpellSpeed$ NotSorcerySpeed | TriggerDescription$ If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step. +SVar:TrigDelayedSac:AB$ Animate | Cost$ 0 | Defined$ Self | Triggers$ CleanupTrig | sVars$ Sac | Permanent$ True +SVar:CleanupTrig:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ Sac | TriggerDescription$ At the beginning of the next cleanup step, sacrifice CARDNAME. +SVar:Sac:AB$ Sacrifice | Cost$ 0 | Defined$ Self +A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ -1 | SetColor$ Black | Description$ Enchanted creature gets +3/-1 and is black. +SVar:RemAIDeck:True +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/grave_servitude.jpg +SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/24.jpg +Oracle:You may cast Grave Servitude as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.\nEnchant creature\nEnchanted creature gets +3/-1 and is black. +End \ No newline at end of file diff --git a/res/cardsfolder/l/lightning_reflexes.txt b/res/cardsfolder/l/lightning_reflexes.txt new file mode 100644 index 00000000000..782c95eecab --- /dev/null +++ b/res/cardsfolder/l/lightning_reflexes.txt @@ -0,0 +1,18 @@ +Name:Lightning Reflexes +ManaCost:1 R +Types:Enchantment Aura +Text:no text +K:You may cast CARDNAME as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step. +K:Enchant creature +T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDelayedSac | Static$ True | Secondary$ True | SpellSpeed$ NotSorcerySpeed | TriggerDescription$ If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step. +SVar:TrigDelayedSac:AB$ Animate | Cost$ 0 | Defined$ Self | Triggers$ CleanupTrig | sVars$ Sac | Permanent$ True +SVar:CleanupTrig:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ Sac | TriggerDescription$ At the beginning of the next cleanup step, sacrifice CARDNAME. +SVar:Sac:AB$ Sacrifice | Cost$ 0 | Defined$ Self +A:SP$ Attach | Cost$ 1 R | ValidTgts$ Creature | AILogic$ Pump +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddKeyword$ First Strike | Description$ Enchanted creature gets +1/+0 and has first strike. +SVar:RemAIDeck:True +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/lightning_reflexes.jpg +SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/186.jpg +Oracle:You may cast Lightning Reflexes as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.\nEnchant creature\nEnchanted creature gets +1/+0 and has first strike. +End \ No newline at end of file diff --git a/res/cardsfolder/s/soar.txt b/res/cardsfolder/s/soar.txt new file mode 100644 index 00000000000..1b5477600ed --- /dev/null +++ b/res/cardsfolder/s/soar.txt @@ -0,0 +1,18 @@ +Name:Soar +ManaCost:1 U +Types:Enchantment Aura +Text:no text +K:You may cast CARDNAME as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step. +K:Enchant creature +T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDelayedSac | Static$ True | Secondary$ True | SpellSpeed$ NotSorcerySpeed | TriggerDescription$ If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step. +SVar:TrigDelayedSac:AB$ Animate | Cost$ 0 | Defined$ Self | Triggers$ CleanupTrig | sVars$ Sac | Permanent$ True +SVar:CleanupTrig:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ Sac | TriggerDescription$ At the beginning of the next cleanup step, sacrifice CARDNAME. +SVar:Sac:AB$ Sacrifice | Cost$ 0 | Defined$ Self +A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Pump +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddToughness$ 1 | AddKeyword$ Flying | Description$ Enchanted creature gets +0/+1 and has flying. +SVar:RemAIDeck:True +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/soar.jpg +SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/93.jpg +Oracle:You may cast Soar as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.\nEnchant creature\nEnchanted creature gets +0/+1 and has flying. +End \ No newline at end of file diff --git a/res/cardsfolder/w/ward_of_lights.txt b/res/cardsfolder/w/ward_of_lights.txt new file mode 100644 index 00000000000..d30ee51ea80 --- /dev/null +++ b/res/cardsfolder/w/ward_of_lights.txt @@ -0,0 +1,20 @@ +Name:Ward of Lights +ManaCost:W W +Types:Enchantment Aura +Text:no text +K:You may cast CARDNAME as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step. +K:Enchant creature +T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigDelayedSac | Static$ True | Secondary$ True | SpellSpeed$ NotSorcerySpeed | TriggerDescription$ If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step. +SVar:TrigDelayedSac:AB$ Animate | Cost$ 0 | Defined$ Self | Triggers$ CleanupTrig | sVars$ Sac | Permanent$ True +SVar:CleanupTrig:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ Sac | TriggerDescription$ At the beginning of the next cleanup step, sacrifice CARDNAME. +SVar:Sac:AB$ Sacrifice | Cost$ 0 | Defined$ Self +T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose a color. +SVar:ChooseColor:AB$ ChooseColor | Cost$ 0 | Defined$ You | AILogic$ MostProminentInHumanDeck +A:SP$ Attach | Cost$ W W | ValidTgts$ Creature | AILogic$ Pump +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Protection:Card.ChosenColor:Protection from ChosenColor | Description$ Enchanted creature has protection from the chosen color. This effect doesn't remove CARDNAME. +SVar:RemAIDeck:True +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/ward_of_lights.jpg +SetInfo:MIR|Common|http://magiccards.info/scans/en/mr/251.jpg +Oracle:You may cast Ward of Lights as though it had flash. If you cast it any time a sorcery couldn't have been cast, the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.\nEnchant creature\nAs Ward of Lights enters the battlefield, choose a color.\nEnchanted creature has protection from the chosen color. This effect doesn't remove Ward of Lights. +End \ No newline at end of file diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index a7065efe484..0024f120589 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -8818,7 +8818,8 @@ public class Card extends GameEntity implements Comparable { final String[] characteristics = characteristic.split(","); if (source.isValid(characteristics, this.getController(), this) && !source.getName().contains("Flickering Ward") && !source.getName().contains("Pentarch Ward") - && !source.getName().contains("Cho-Manno's Blessing") && !source.getName().contains("Floating Shield")) { + && !source.getName().contains("Cho-Manno's Blessing") && !source.getName().contains("Floating Shield") + && !source.getName().contains("Ward of Light")) { return true; } }