diff --git a/res/cards.txt b/res/cards.txt index 6dfd707da83..6c3addc26ac 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -535,6 +535,7 @@ Fire-Belly Changeling Creature Shapeshifter Play this ability no more than twice each turn. 1/1 +Changeling abPump R:+1/+0 Kitsune Loreweaver diff --git a/res/main.properties b/res/main.properties index 35b30c21583..8a46abbaada 100644 --- a/res/main.properties +++ b/res/main.properties @@ -1,6 +1,6 @@ program/mail=mtgerror@yahoo.com program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26 -program/version=Forge -- official beta: 09/12/14, SVN revision: 253 +program/version=Forge -- official beta: 10/01/01, SVN revision: 254 tokens--file=AllTokens.txt diff --git a/res/quest/common.txt b/res/quest/common.txt index ec73da6423f..15b2ef21950 100644 --- a/res/quest/common.txt +++ b/res/quest/common.txt @@ -6,6 +6,7 @@ Accelerate Accumulated Knowledge Acolyte of Xathrid Acorn Harvest +Acridian Advance Scout Advanced Hoverguard Aesthir Glider @@ -44,6 +45,7 @@ Argothian Swine Armadillo Cloak Armored Pegasus Armorer Guildmage +Arnjlot's Ascent Ascending Aven Asha's Favor Ashcoat Bear @@ -115,6 +117,7 @@ Bonesplitter Sliver Boomerang Border Guard Border Patrol +Boreal Centaur Boreal Druid Boreal Griffin Boros Recruit @@ -130,6 +133,7 @@ Briarberry Cohort Brilliant Halo Brute Force Buoyancy +Burning Fields Burning Shield Askari Burst of Speed Cackling Flames @@ -147,6 +151,7 @@ Capsize Caravan Hurda Careful Study Carnivorous Plant +Carnophage Cartographer Castle Raptors Cat Warriors @@ -268,6 +273,7 @@ Dream Cache Dream Stalker Dreg Reaver Drift of Phantasms +Drifter il-Dal Drifting Meadow Dripping-Tongue Zubera Dromad Purebred @@ -342,6 +348,8 @@ Fists of the Anvil Fit of Rage Flame Burst Flame Jet +Flame Rift +Flamecore Elemental Flamekin Brawler Fledgling Djinn Flight @@ -405,6 +413,7 @@ Goblin Hero Goblin Matron Goblin Mountaineer Goblin Outlander +Goblin Patrol Goblin Piker Goblin Raider Goblin Rimerunner @@ -412,6 +421,7 @@ Goblin Sky Raider Goblin Skycutter Goblin Spelunkers Goblin Striker +Goblin War Buggy Goblin War Paint Goblin War Strike Gold Myr @@ -438,6 +448,7 @@ Gruul Signet Guardians of Akrasa Guided Strike Guilty Conscience +Gush Halberdier Hand of Death Harvest Gwyllion @@ -447,6 +458,7 @@ Heart Sliver Heartwood Dryad Helionaut Hematite Golem +Henchfiend of Ukor Hero's Resolve Highland Berserker Highland Giant @@ -469,6 +481,7 @@ Hulking Goblin Hulking Ogre Humble Budoka Hundroog +Hungry Mist Hurloon Minotaur Hush Hyalopterous Lemure @@ -476,6 +489,8 @@ Hymn to Tourach Icatian Scout Ichor Slick Igneous Pouncer +Illusionary Forces +Illusionary Wall Immaculate Magistrate Imperial Edict Imperious Perfect @@ -514,13 +529,16 @@ Keen-Eyed Archers Keeneye Aven Keeper of Kookus Keepers of the Faith +Keldon Vandals Kelinore Bat Kindle Kindled Fury Kird Ape +Kitsune Loreweaver Kjeldoran Outrider Kjeldoran War Cry Knight Errant +Knight of the Skyward Eye Kobolds of Kher Keep Kodama's Reach Kor Cartographer @@ -605,6 +623,7 @@ Misshapen Fiend Mist Leopard Moaning Spirit Mob Justice +Mogg War Marshal Molten Frame Molten Rain Molten Ravager @@ -629,6 +648,7 @@ Muck Rats Mudbrawler Cohort Mudbutton Torchrunner Mulldrifter +Multani's Acolyte Muscle Sliver Nacatl Outlander Nacatl Savage @@ -715,6 +735,7 @@ Pillarfield Ox Pillory of the Sleepless Pincher Beetles Pit Imp +Pit Scorpion Plague Beetle Plated Rootwalla Plated Sliver @@ -722,6 +743,7 @@ Plated Spider Plated Wurm Plover Knights Polluted Mire +Pouncing Jaguar Predator's Strike Preemptive Strike Prickly Boggart @@ -814,6 +836,7 @@ Sakura-Tribe Elder Sanctum Plowbeast Sandbar Merfolk Sandstone Warrior +Sangrophage Scaled Wurm Scare Tactics Scarwood Goblins @@ -886,6 +909,7 @@ Silkenfist Fighter Silver Myr Silverback Ape Silvercoat Lion +Simian Grunts Simic Ragworm Simic Signet Sinew Sliver @@ -967,6 +991,7 @@ Sunbeam Spellbomb Sunlance Suntail Hawk Suq'Ata Lancer +Swamp Mosquito Symbiotic Elf Synchronous Sliver Talas Air Ship @@ -1038,6 +1063,8 @@ Tuktuk Grunts Tundra Wolves Twisted Abomination Tyrranax +Uktabi Drake +Uktabi Efreet Umara Raptor Uncontrollable Anger Unholy Strength @@ -1071,6 +1098,7 @@ Veteran Cavalier Veteran Swordsmith Viashino Fangtail Viashino Grappler +Viashino Outrider Viashino Slasher Viashino Spearhunter Viashino Warrior @@ -1104,6 +1132,7 @@ Wall of Heat Wall of Ice Wall of Spears Wall of Wood +Wandering Goblins Wandering Ones Wandering Stream War Mammoth @@ -1145,6 +1174,7 @@ Willow Dryad Willow Elf Willow Faerie Wind Drake +Winding Wurm Windseeker Centaur Windwright Mage Winged Coatl @@ -1160,6 +1190,7 @@ Woodland Changeling Woodland Druid Woodlurker Mimic Words of Wisdom +Wormwood Dryad Wrap in Vigor Wrecking Ball Wu Elite Cavalry diff --git a/res/quest/questData b/res/quest/questData index 58ca47fad05..d102644935b 100644 Binary files a/res/quest/questData and b/res/quest/questData differ diff --git a/res/quest/rare.txt b/res/quest/rare.txt index ce78e17cba1..3bfa2e10424 100644 --- a/res/quest/rare.txt +++ b/res/quest/rare.txt @@ -24,6 +24,7 @@ Archangel Archivist Archon of Justice Argothian Enchantress +Arid Mesa Armageddon Armored Guardian Ashes to Ashes @@ -57,11 +58,13 @@ Blinkmoth Nexus Blistering Firecat Blizzard Elemental Blood Crypt +Bloodstained Mire Blurred Mongoose Boris Devilboon Bounteous Kirin Breeding Pool Bribery +Bridge from Below Brimstone Dragon Bringer of the Blue Dawn Bringer of the Green Dawn @@ -87,7 +90,10 @@ Chameleon Colossus Chandra Nalaar Char Child of Alara +Child of Gaea Cho-Manno, Revolutionary +Chronatog +Citanul Centaurs Cleanse Cloud Dragon Cloudhoof Kirin @@ -101,6 +107,7 @@ Conspiracy Convalescence Convalescent Care Corrupt Official +Cosmic Horror Cover of Darkness Covetous Dragon Cranial Extraction @@ -125,6 +132,7 @@ Day of Judgment Debtors' Knell Defense of the Heart Demigod of Revenge +Deranged Hermit Devastation Devout Lightcaster Dimir Cutpurse @@ -132,12 +140,14 @@ Dingus Egg Divinity of Pride Djinn of the Lamp Do or Die +Donate Door to Nothingness Doran, the Siege Tower Dovescape Dragon Broodmother Dragon Engine Dragon Roost +Drifting Djinn Dwarven Pony Earthcraft El-Hajjaj @@ -159,6 +169,7 @@ Energizer Entomb Epic Proportions Essence Sliver +Eternal Flame Ethersworn Adjudicator Evacuation Eviscerator @@ -176,14 +187,17 @@ Field Marshal Figure of Destiny Filigree Angel Fire-Lit Thicket +Firestorm Hellkite Flagstones of Trokair Flamebreak Fleeting Image Flooded Grove +Flooded Strand Flowstone Mauler Flowstone Overseer Flowstone Wyvern Font of Mythos +Force of Nature Force of Savagery Forced Fruition Gaddock Teeg @@ -204,6 +218,8 @@ Glorious Anthem Goblin Charbelcher Goblin Chieftain Goblin King +Goblin Marshal +Goblin Piledriver Goblin Sharpshooter Goblin Trenches Godless Shrine @@ -229,6 +245,7 @@ Heartmender Hell-Bent Raider Helldozer Hellkite Overlord +Herald of Serra Hero's Demise Hex Hidetsugu's Second Rite @@ -244,6 +261,7 @@ Hunted Troll Hystrodon Identity Crisis Ifh-Biff Efreet +Illusions of Grandeur Imperial Hellkite Imperial Seal Incendiary Command @@ -265,11 +283,13 @@ Jeska, Warrior Adept Jhovall Queen Joiner Adept Jokulhaups +Jovial Evil Jugan, the Rising Star Juzam Djinn Kaervek's Spite Kalonian Behemoth Kamahl, Pit Fighter +Karmic Guide Kaysa Kazuul Warlord Keiga, the Tide Star @@ -284,6 +304,7 @@ Kobold Overlord Kodama of the North Tree Kokusho, the Evening Star Korlash, Heir to Blackblade +Krosan Cloudscraper Krosan Colossus Lady Zhurong, Warrior Queen Laquatus's Champion @@ -294,6 +315,7 @@ Lhurgoyf Lich Lord of Unx Lichenthrope Lightning Angel +Lightning Dragon Liliana Vess Liu Bei, Lord of Shu Livonya Silone @@ -301,6 +323,7 @@ Lord of Atlantis Lord of Extinction Lotus Cobra Lotus Guardian +Loxodon Gatekeeper Loxodon Hierarch Loxodon Punisher Lu Bu, Master-at-Arms @@ -314,11 +337,13 @@ Magus of the Coffers Magus of the Disk Magus of the Library Magus of the Moat +Magus of the Tabernacle Mahamoti Djinn Marble Titan March of Souls Maro Marrow-Gnawer +Marsh Flats Mass Calcify Mass Hysteria Master Transmuter @@ -337,6 +362,7 @@ Might of Oaks Mikokoro, Center of the Sea Mirri the Cursed Mirri, Cat Warrior +Misty Rainforest Moat Mobilization Molimo, Maro-Sorcerer @@ -365,6 +391,7 @@ Nemata, Grove Guardian Nemesis of Reason Nether Spirit Nevinyrral's Disk +Nicol Bolas Nicol Bolas, Planeswalker Night of Souls' Betrayal Nightmare @@ -388,6 +415,7 @@ Oversoul of Dusk Overwhelming Forces Paladin en-Vec Pale Bears +Palladia-Mors Pardic Dragon Pearl Dragon Penumbra Wurm @@ -395,6 +423,7 @@ Phantom Nishoba Phantom Warrior Phyrexian Arena Phytohydra +Pianna, Nomad Captain Pirate Ship Pixie Queen Plague Wind @@ -402,6 +431,7 @@ Planar Cleansing Plateau Plated Slagwurm Political Trickery +Polluted Delta Predator Dragon Preeminent Captain Primal Clay @@ -424,6 +454,7 @@ Rakka Mar Ramosian Sky Marshal Rampaging Baloths Ranger of Eos +Rappelling Scouts Ratcatcher Rathi Assassin Ravages of War @@ -453,6 +484,7 @@ Sarkhan Vol Sarpadian Empires, Vol. VII Savannah Savannah Lions +Scalding Tarn Scalpelexis Scarblade Elite Scepter of Insight @@ -467,6 +499,7 @@ Sengir Vampire Sensation Gorger Serendib Efreet Serendib Sorcerer +Serpent Generator Serra Angel Serra Avatar Serra Avenger @@ -499,6 +532,7 @@ Sorceress Queen Soulscour Sower of Temptation Spawnwrithe +Spectral Force Spectral Lynx Sphinx of Jwar Isle Sphinx of the Steel Wind @@ -507,6 +541,7 @@ Spiritual Guardian Squee, Goblin Nabob Staff of Domination Stangg +Stasis Steam Vents Steely Resolve Stillmoon Cavalier @@ -539,6 +574,7 @@ Tetsuo Umezawa Tezzeret the Seeker That Which Was Taken The Hive +The Tabernacle at Pendrell Vale The Unspeakable Thelonite Hermit Thornling @@ -573,12 +609,15 @@ Undermine Undying Beast Uril, the Miststalker Ursapine +Urza's Blueprints Utopia Tree +Vaevictis Asmadi Vampiric Tutor Vedalken Archmage Veldrane of Sengir Vendilion Clique Vengeful Firebrand +Verdant Catacombs Verduran Enchantress Vexing Beetle Viashivan Dragon @@ -599,9 +638,12 @@ Weathered Wayfarer Weatherseed Treefolk Wheel of Fortune Will-o'-the-Wisp +Windswept Heath Wit's End Witch-Maw Nephilim Wooded Bastion +Wooded Foothills +Wormwood Treefolk Wort, Boggart Auntie Wrath of God Wren's Run Packmaster diff --git a/res/quest/uncommon.txt b/res/quest/uncommon.txt index e9ffe8a0e7d..5dd3731bd7b 100644 --- a/res/quest/uncommon.txt +++ b/res/quest/uncommon.txt @@ -8,6 +8,7 @@ Act of Treason Adarkar Sentinel Air Elemental Akoum Refuge +Albino Troll Alert Shu Infantry Allied Strategies Ambition's Cost @@ -25,6 +26,7 @@ Arcane Sanctum Arcbound Lancer Arcbound Slith Arctic Flats +Arctic Wolves Armored Galleon Armored Griffin Arrogant Vampire @@ -32,6 +34,8 @@ Ashen Monstrosity Ashenmoor Gouger Aspect of Mongoose Assembly-Worker +Auriok Bladewarden +Avalanche Riders Aven Smokeweaver Aysen Abbey Azure Drake @@ -39,6 +43,7 @@ Balshan Collaborator Bant Battlemage Barbarian General Barktooth Warbeard +Basalt Gargoyle Basalt Monolith Battle Mastery Battlefield Percher @@ -115,6 +120,7 @@ Corrupt Eunuchs Council of Advisors Counterbalance Counterspell +Cradle Guard Crazed Skirge Creeping Mold Crenellated Wall @@ -122,6 +128,7 @@ Crib Swap Crowd of Cinders Crude Rampart Crumbling Necropolis +Crypt Cobra Crystalline Sliver Cudgel Troll Cursed Land @@ -169,6 +176,7 @@ Elvish Harbinger Engineered Plague Enlightened Tutor Enormous Baloth +Ensnare Eron the Relentless Eternal Witness Ethereal Usher @@ -182,12 +190,14 @@ Fanatical Fever Fecundity Feedback Bolt Femeref Archers +Feral Animist Feral Lightning Fighting Drake Fire Bowman Fire Diamond Fire Drake Fire Imp +Fire-Belly Changeling Firefly Firescreamer Fireshrieker @@ -205,8 +215,10 @@ Flowstone Hellion Flowstone Thopter Flying Carpet Forbidding Watchtower +Force of Will Forked-Branch Garami Frost Marsh +Frozen AEther Furnace Whelp Fury Sliver Fusion Elemental @@ -298,15 +310,18 @@ Jedit Ojanen Jerrard of the Closed Fist Jhessian Infiltrator Jhovall Rider +Jodah's Avenger Juggernaut Jund Battlemage Jungle Barrier Jungle Shrine Jungle Troll +Junun Efreet Jwar Isle Refuge Kami of Lunacy Kami of Old Stone Kami of the Palace Fields +Kami of the Tended Garden Karakas Karoo Meerkat Karplusan Strider @@ -318,6 +333,7 @@ Kemuri-Onna Killer Bees Killer Whale King Cheetah +Kismet Kiss of Death Kitchen Finks Kithkin Harbinger @@ -413,6 +429,7 @@ Perish Pestilence Phantom Centaur Phantom Monster +Phobian Phantasm Phyrexian Gargantua Phyrexian Hulk Phyrexian Ironfoot @@ -421,10 +438,12 @@ Pillage Plasma Elemental Plumeveil Pongify +Power Armor Primal Boost Primeval Shambler Primoc Escapee Princess Lucrezia +Prowess of the Fair Psionic Blast Psychotrope Thallid Puppeteer @@ -434,6 +453,7 @@ Pyre Charger Pyrohemia Quagmire Lamprey Rabid Wombat +Radiant's Dragoons Rain of Tears Ramirez DePietro Ramosian Captain @@ -477,9 +497,11 @@ School of the Unseen Scragnoth Screeching Harpy Sea Spirit +Searing Flesh Seascape Aerialist Seashell Cameo Seaside Citadel +Seedcradle Witch Segovian Leviathan Sejiri Refuge Sengir Autocrat @@ -491,6 +513,7 @@ Shatterstorm Shepherd of the Lost Shimmering Barrier Shivan Oasis +Shivan Raptor Shriekmaw Shu Elite Companions Shu General @@ -517,6 +540,7 @@ Slith Strider Sliversmith Smother Sol Ring +Soldevi Simulacrum Soltari Crusader Soltari Monk Soltari Priest @@ -526,6 +550,7 @@ Soulcatcher Spark Elemental Sparkspitter Spawning Pool +Spectral Bears Spectral Procession Spectral Searchlight Spell Snare @@ -546,6 +571,7 @@ Stern Judge Stolen Grain Stonecloaker Storm Shaman +Stormcloud Djinn Stratozeppelid Stream of Acid Street Wraith @@ -555,6 +581,7 @@ Sturdy Hatchling Sunastian Falconer Sunder from Within Sunhome, Fortress of the Legion +Suq'Ata Assassin Svogthos, the Restless Tomb Sword of the Meek Swords to Plowshares @@ -564,6 +591,7 @@ Talonrend Tangle Spider Taoist Hermit Tattermunge Maniac +Tectonic Fiend Tempest Drake Tempest of Light The Lady of the Mountain @@ -574,11 +602,13 @@ Thopter Foundry Thoughtcutter Agent Thousand-legged Kami Thran Dynamo +Thran War Machine Threaten Thunder Spirit Thunder Wall Thunder-Thrash Elder Thundering Giant +Thwart Tidings Tigereye Cameo Tinker @@ -618,6 +648,7 @@ Vedalken Plotter Verdigris Viashino Slaughtermaster Vicious Kavu +Viridian Lorebearers Viridian Shaman Virtue's Ruin Vithian Renegades @@ -631,6 +662,7 @@ Voice of Truth Volcanic Fallout Voltaic Key Voracious Hatchling +Vug Lizard Vulshok Battlegear Wall of Air Wall of Blossoms @@ -679,6 +711,7 @@ Woolly Thoctar Worldly Tutor Worn Powerstone Wreak Havoc +Yavimaya Ants Yavimaya Enchantress Yavimaya Gnats Zebra Unicorn diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java index d3637474ac8..aeaa640402b 100644 --- a/src/forge/CardFactory.java +++ b/src/forge/CardFactory.java @@ -17904,7 +17904,7 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase(); public void selectButtonCancel() {stop();} public void selectCard(Card c, PlayerZone zone) { - if(CardUtil.getColors(c).contains(Constant.Color.Blue) && zone.is(Constant.Zone.Play)) + if(CardUtil.getColors(c).contains(Constant.Color.Blue) && zone.is(Constant.Zone.Hand)) { AllZone.GameAction.removeFromGame(c); String player = card.getController();