From 7f9565a23e2b62cabaf9de5784b259dba3dae55f Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 15:47:26 +0000 Subject: [PATCH] - Fixed Marshaling Cry and Angel of Fury. - Updated some themes. --- res/cardsfolder/angel_of_fury.txt | 4 +-- res/cardsfolder/magnetic_flux.txt | 1 + res/cardsfolder/marshaling_cry.txt | 4 +-- res/quest/themes/Clerics WB.thm | 1 + res/quest/themes/Equipment W.thm | 3 +- res/quest/themes/Goblins R.thm | 3 ++ res/quest/themes/Merfolk U.thm | 1 + res/quest/themes/Treefolk WBG.thm | 51 ++++++++++++++++++++---------- 8 files changed, 46 insertions(+), 22 deletions(-) diff --git a/res/cardsfolder/angel_of_fury.txt b/res/cardsfolder/angel_of_fury.txt index f8c38759e92..4e4d525d66a 100644 --- a/res/cardsfolder/angel_of_fury.txt +++ b/res/cardsfolder/angel_of_fury.txt @@ -3,8 +3,8 @@ ManaCost:4 W W Types:Creature Angel PT:3/5 K:Flying -T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | Optional$ True | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ If CARDNAME is put into your graveyard from play, you may choose to shuffle CARDNAME into your library. -SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Library | Defined$ Self +T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | Optional$ True | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ If CARDNAME is put into your graveyard from the battlefield, you may shuffle it into your library. +SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Library | Shuffle$ True | Defined$ Self SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/angel_of_fury.jpg End diff --git a/res/cardsfolder/magnetic_flux.txt b/res/cardsfolder/magnetic_flux.txt index fce9a4d6b40..9e30d2029a6 100644 --- a/res/cardsfolder/magnetic_flux.txt +++ b/res/cardsfolder/magnetic_flux.txt @@ -3,6 +3,7 @@ ManaCost:2 U Types:Instant Text:no text A:SP$PumpAll | Cost$ 2 U | ValidCards$ Creature.Artifact+YouCtrl | KW$ Flying | SpellDescription$ Artifact creatures you control gain flying until end of turn. +SVar:RemAIDeck:True SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/magnetic_flux.jpg SetInfo:DST|Common|http://magiccards.info/scans/en/ds/25.jpg diff --git a/res/cardsfolder/marshaling_cry.txt b/res/cardsfolder/marshaling_cry.txt index 90775eea45f..f7697678eed 100644 --- a/res/cardsfolder/marshaling_cry.txt +++ b/res/cardsfolder/marshaling_cry.txt @@ -2,8 +2,8 @@ Name:Marshaling Cry ManaCost:1 W W Types:Sorcery Text:no text -A:SP$PumpAll | Cost$ 1 W W | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Vigilance | SpellDescription$ Creatures you control get +1/+1 and gain vigilance until end of turn. -A:SP$PumpAll | Cost$ 1 W W | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Vigilance | Flashback$ True | CostDesc$ Flashback 3 W | SpellDescription$ (You may cast this card from your graveyard for its flashback cost. Then exile it.) +A:SP$PumpAll | Cost$ 1 W W | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Vigilance | SpellDescription$ Creatures you control get +1/+1 and gain vigilance until end of turn. +A:SP$PumpAll | Cost$ 3 W | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Vigilance | Flashback$ True | CostDesc$ Flashback 3 W | SpellDescription$ (You may cast this card from your graveyard for its flashback cost. Then exile it.) K:Cycling:2 # K:Flashback:3 W SVar:Rarity:Common diff --git a/res/quest/themes/Clerics WB.thm b/res/quest/themes/Clerics WB.thm index a9279648225..4165e9f916f 100644 --- a/res/quest/themes/Clerics WB.thm +++ b/res/quest/themes/Clerics WB.thm @@ -51,6 +51,7 @@ War Priest of Thune [Group MaxCnt=4 Percentage=11] Glowrider Keepers of the Faith +Reliquary Monk Transcendent Master Undead Slayer Venerable Monk diff --git a/res/quest/themes/Equipment W.thm b/res/quest/themes/Equipment W.thm index bfccd543dc8..a6120141f8f 100644 --- a/res/quest/themes/Equipment W.thm +++ b/res/quest/themes/Equipment W.thm @@ -55,9 +55,10 @@ Vulshok Battlegear [/Group] [Group MaxCnt=1 Percentage=2] +Argentum Armor +Ogre's Cleaver Shield of Kaldra Warlord's Axe -Ogre's Cleaver [/Group] End \ No newline at end of file diff --git a/res/quest/themes/Goblins R.thm b/res/quest/themes/Goblins R.thm index f48fabb35f5..864ad431521 100644 --- a/res/quest/themes/Goblins R.thm +++ b/res/quest/themes/Goblins R.thm @@ -33,6 +33,7 @@ Goblin Digging Team Goblin Firestarter Goblin Gaveleer Goblin Guide +Goblin Masons Goblin Mountaineer Goblin Patrol Mogg Fanatic @@ -99,6 +100,7 @@ Tuktuk the Explorer [Group MaxCnt=4 Percentage=4] Boartusk Liege Goblin Berserker +Goblin Gardener Goblin Settler Murderous Redcap Tar Pitcher @@ -106,6 +108,7 @@ Tar Pitcher [Group MaxCnt=1 Percentage=2] Battle Squadron +Goblin Commando Kiki-Jiki, Mirror Breaker Scuzzback Marauders [/Group] diff --git a/res/quest/themes/Merfolk U.thm b/res/quest/themes/Merfolk U.thm index 4e47d810739..cffc286ba0f 100644 --- a/res/quest/themes/Merfolk U.thm +++ b/res/quest/themes/Merfolk U.thm @@ -22,6 +22,7 @@ Halimar Wavewatch Inkfathom Infiltrator Maritime Guard Merfolk Assassin +Merrow Commerce Riptide Pilferer River Merfolk Saprazzan Heir diff --git a/res/quest/themes/Treefolk WBG.thm b/res/quest/themes/Treefolk WBG.thm index 35fc0ef9c31..be9f3c5caa2 100644 --- a/res/quest/themes/Treefolk WBG.thm +++ b/res/quest/themes/Treefolk WBG.thm @@ -20,40 +20,57 @@ Orchard Warden Timber Protector [/Group] -[Group MaxCnt=3 Percentage=20] +[Group MaxCnt=3 Percentage=19] Battlewand Oak -Cradle Guard Dauntless Dourbark -Ebony Treefolk Lignify Reach of Branches Sapling of Colfenor Treefolk Harbinger [/Group] -[Group MaxCnt=4 Percentage=19] +[Group MaxCnt=4 Percentage=6] +Black Poplar Shaman +Cradle Guard +Cradle Guard +Ebony Treefolk +Ebony Treefolk +Gaea's Avenger +Tilling Treefolk +Treefolk Seedlings +[/Group] + +[Group MaxCnt=4 Percentage=6] Ambassador Oak -Blanchwood Treefolk Bog-Strider Ash Cloudcrown Oak -Crabapple Cohort -Foxfire Oak -Gaea's Avenger -Guardian of Cloverdell Heartwood Treefolk Indomitable Ancients -Ironroot Treefolk -Nemata, Grove Guardian -Oakgnarl Warrior -Old Ghastbark -Redwood Treefolk +Indomitable Ancients Rowan Treefolk Scarwood Treefolk -Weatherseed Treefolk -Woodfall Primus -Wormwood Treefolk +Wickerbough Elder +[/Group] + +[Group MaxCnt=2 Percentage=5] +Argothian Treefolk +Blanchwood Treefolk +Crabapple Cohort +Ironroot Treefolk +Magnigoth Treefolk +Old Ghastbark +Redwood Treefolk +Weed-Pruner Poplar Yavimaya Ancients Yavimaya Scion [/Group] +[Group MaxCnt=1 Percentage=3] +Foxfire Oak +Guardian of Cloverdell +Oakgnarl Warrior +Woodfall Primus +Nemata, Grove Guardian +[/Group] + End \ No newline at end of file