github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-28 19:19:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
16231 commits 2 branches 0 tags 782 MiB
Commit graph

9866 commits

Author SHA1 Message Date
LevelX2
46566361e7 * Fixed a bug that if a copy token creature of a transformed creature was created (e.g. Mirror Mockery), the front side instead of the transformed side was copied. 2016-08-12 15:42:50 +02:00
LevelX2
0c617d1d35 * Ink-Eyes, Servant of Oni - Fixed a bug of how the card was moved to the battlefield by the triggered effect. 2016-08-12 13:25:12 +02:00
spjspj
d5ab9df255 spjspj - Implement Guardian Beast (ARN) 2016-08-11 23:12:06 +10:00
spjspj
f46c06066a spjspj - Implement Guardian Beast (ARN) 2016-08-11 23:03:22 +10:00
fireshoes
5ee29a14e6 [CN2] Implemented Kaya, Ghost Assassin 2016-08-10 14:20:18 -05:00
drmDev
b7743e69a0 Pariah's Shield bug fix - replacement effect only occurs when equipped to a creature 2016-08-09 21:25:13 -04:00
LevelX2
aa5623fd70 * Blinkmoth Urn - Fixed that the created mana was not removed at the steps end. 2016-08-09 22:52:22 +02:00
LevelX2
7504c58d5a Merge pull request #2160 from Choiseul11/choiseul11/2159-indulgent-aristocrat-tooltip-error 
Changed Indulgent Aristocrat filter to prevent 'each' appearing twice…
 2016-08-09 22:37:05 +02:00
Timothy Rogers
64f4a1584f Changed Indulgent Aristocrat filter to prevent 'each' appearing twice in tooltip 2016-08-09 14:10:02 -05:00
LevelX2
c31bf97440 * Fixed some problems if a creature has multiple madness abilities. 2016-08-09 13:14:29 +02:00
LevelX2
7f8f4bc034 * Goblin Gaveleer - Added missing Trample ability. 2016-08-08 17:10:28 +02:00
LevelX2
c84180b0f7 * Eye of the Storm - Fixed that the exiled spells could only always be cast by the controller of the Eye of the Storm. 2016-08-08 16:49:45 +02:00
LevelX2
47fb2c1ac5 Merge origin/master 2016-08-08 16:29:58 +02:00
LevelX2
005a805973 * Unbreathing Horde - Fixed that the creature came onto battlefield with one counter less than intended. 2016-08-08 16:29:16 +02:00
LevelX2
9e29a01c0c * Grafted Wargear - Fixed that the sacrifice effect did not work. 2016-08-07 10:16:25 +02:00
LevelX2
07bbd53d82 * Stitcher's Graft - Fixed that the sacrifice effect did not work. 2016-08-07 10:12:38 +02:00
LevelX2
8ccb5d18ec * removing double negative checks. 2016-08-07 09:28:39 +02:00
LevelX2
f84040f4c0 Merge pull request #2155 from Choiseul11/timr/implement-assorted-cards 
Timr/implement assorted cards
 2016-08-07 08:50:22 +02:00
Timothy Rogers
32d70cb069 Changed Celestial Sword sacrifice trigger to use CreateDelayedTriggeredAbilityEffect and AtTheBeginOfNextEndStepDelayedTriggeredAbility 2016-08-06 17:00:50 -05:00
LevelX2
5b5c13c137 * Kusari-Gama - Fixed trigger occurs but no damage is dealt (fixes #2154). 2016-08-06 12:43:16 +02:00
LevelX2
286dc55396 * Fixed Sightless Brawler cannot attack with other creatures attacking (fixes #2133). 2016-08-06 12:30:52 +02:00
LevelX2
14c02bc756 Merge origin/master 2016-08-06 11:33:55 +02:00
LevelX2
9df373e8f3 * Fixed Leech Bonder -1/-1 Tokens don't kill off enemy creatures (fixes #1975). 2016-08-06 11:33:24 +02:00
Timothy Rogers
adf6575eb2 Fixed author comment on Murderous Betrayal 2016-08-05 22:02:56 -05:00
Timothy Rogers
33e0f2cdde Implemented Murderous Betrayal 2016-08-05 20:52:11 -05:00
Quercitron
b91ef8b385 * Thirsting Axe - Fix check if equipped creature dealt combat damage to creature (fixes #2145). 2016-08-06 03:15:54 +03:00
Timothy Rogers
cb591e10ef Fixed author comment 2016-08-05 17:11:27 -05:00
Timothy Rogers
48dfdafe1e Implemented Celestial Sword from Iceage and ME4 2016-08-05 17:10:25 -05:00
LevelX2
64432e9132 Merge pull request #2152 from Choiseul11/choiseul11/implement-homelands-shrink 
Implemented Shrink (Homelands)
 2016-08-05 22:21:04 +02:00
LevelX2
d0db2d51ed * Fixed Identity Thief copying creature with +1/+1 counter gets P/T boost from it, but not counter (fixes #2131). 2016-08-05 21:15:07 +02:00
LevelX2
d1c25b0662 * Fixed flashback check of Altar of the Lost conditional mana. 2016-08-05 20:03:04 +02:00
Timothy Rogers
fe2434fa9f Implemented Shrink (Homelands) 2016-08-05 10:26:47 -05:00
Plopman
956724b5fa [TMP] Added 5 cards 2016-08-05 13:43:23 +02:00
Quercitron
9129bda9b7 * Hearthcage Giant - Fix that only one Elemental Shaman token is created (fixes #2141). 2016-08-05 00:59:42 +03:00
fwannmacher
9b5a02c09c - Fixed issue #2075 2016-08-04 09:52:56 -03:00
LevelX2
335c24c7c0 * Crown of Doom - Fix of target handling (untested). 2016-08-03 17:42:23 +02:00
drmDev
5442a92a2b Crown of Doom bug fix 2016-08-03 05:17:00 -04:00
LevelX2
270ffcb88a * Liliana, Defiant Necromancer - Fixed target bug of -X ability. 2016-08-02 16:52:25 +02:00
LevelX2
acf5df7f94 Merge origin/master 2016-08-02 15:43:57 +02:00
LevelX2
62a85fafc6 * Postmortem Lunge - Fixed that the exile effect were not applied correctly. 2016-08-02 15:42:45 +02:00
drmDev
693c45294a bug fix for Ghost-Lit Nourisher 2016-08-02 07:55:03 -04:00
fireshoes
88e8894b29 Added Duel Decks: Nissa vs Ob Nixilis and From the Vault: Lore. 2016-08-01 15:05:25 -05:00
LevelX2
94e59e5ee7 * Icefall Regent, Monastery Siege, Elderwood Scion, Accursed Witch, Infectious Curse - Fixed target check not working for multi modal spells (fixed #2114). 2016-07-31 10:41:23 +02:00
LevelX2
e9c994d8e5 * Fixed traget definition of Blood Feud and Dissension in the Ranks. 2016-07-31 10:24:28 +02:00
drmDev
2a51663ebc Fixed various bugs - loseLife instead of damage was supposed to be used 2016-07-30 21:15:05 -04:00
fwannmacher
b4bda0da5e - Fix issue #2088 2016-07-29 18:43:12 -03:00
drmDev
38a7927edb Spell Queller bug fix for #2126 2016-07-29 16:14:44 -04:00
drmDev
b7e0702b62 Fixed Genesis bug - activation cost is 2G not 3 colorless 2016-07-29 11:25:24 -04:00
LevelX2
8073d2e3f7 * Polymorphous Rush - Fixed wrong target description. 2016-07-29 14:19:52 +02:00
drmDev
c00dadcd4c build fix - maven doesn't like bloodclockeffect as public unless in its own file named bloodclockeffect 2016-07-29 03:46:43 -04:00
drmDev
3f3229c43c Martyred Rusalka and Netter En Dal impl 2016-07-28 17:50:26 -04:00
Fenhl
f2e6ee510b Add card Umbilicus 2016-07-28 13:40:23 +00:00
drmDev
0d8b892272 Festival, False Peace, Empty City Ruse, Moment of Silence impl. Extracted SkipNextCombatPhase class. 2016-07-27 09:42:45 -04:00
drmDev
0b48749e0b fix soul warden test. 2016-07-26 22:58:56 -04:00
drmDev
f593623508 finished implementation of cards. CardView bug fix for card number change. 2016-07-26 22:58:20 -04:00
drmDev
b7c4eec90f Merge branch 'master' of https://github.com/drmDev/mage 2016-07-26 20:00:37 -04:00
fwannmacher
3caf66e4b6 - Fixed Issue #2108 2016-07-26 19:34:06 -03:00
fireshoes
ad3f3649da Added FNM promo Rise from the Tides. 2016-07-26 13:52:36 -05:00
drmDev
54fcc1c408 WIP Syphon Flesh, Gravestorm, Gravespawn Sovereign implementations 2016-07-26 14:46:32 -04:00
Derek M
218583ebf8 Merge pull request #2120 from Dilnu/master 
Fix all known cases of Issue #2106
 2016-07-26 11:19:44 -04:00
Samuel Sandeen
2173069c09 Update Legerdemain to use filters in targeting. 
Fix the way targeting is handled on Legerdemain.

Previously it was possible to get into an impossible state if there was
no valid second target.
 2016-07-26 08:33:33 -04:00
drmDev
18a6e5392b Bloodscale Prowler, Burning Tree Bloodscale,Gristleback implemented 2016-07-26 06:35:47 -04:00
drmDev
f56b81b243 Trigon of Mending bug fix - allows targetting player 2016-07-25 23:46:01 -04:00
Samuel Sandeen
4c9a49df5b Merge remote-tracking branch 'magefree/master' 2016-07-25 21:58:43 -04:00
Samuel Sandeen
c12959e025 Standardize Another target logic in some cases. 
This removes custom targets and instead uses the AnotherTargetPredicate
to filter.
 2016-07-25 21:58:11 -04:00
Samuel Sandeen
67194253e4 Fix simple issues in target specification 2016-07-25 21:53:12 -04:00
drmDev
bc14f8176a Merge remote-tracking branch 'upstream/master' 2016-07-25 18:23:35 -04:00
drmDev
aa2605d6cf Tribal Unity cardNumber to string fix 2016-07-25 18:16:40 -04:00
Derek M
5c4059fac6 Merge pull request #2118 from fwannmacher/master 
Corrected some more bugs
 2016-07-25 18:14:00 -04:00
fwannmacher
cbd0e36f97 - Fixed Issue #2100 2016-07-25 17:55:38 -03:00
fwannmacher
1fc81b8bc7 - Fixed Issue #2094 2016-07-25 17:25:53 -03:00
Derek M
86e7ace06e Merge pull request #2112 from fwannmacher/master 
Converted cardNumber from int to String. Now card number with "a" or "b" can be used.
 2016-07-25 16:24:01 -04:00
fwannmacher
cd22b3013b - Fixed Issue #2102 2016-07-25 16:41:28 -03:00
fwannmacher
9390ec20b0 - Fixed Issue #2098 2016-07-25 12:52:01 -03:00
drmDev
f2cb945744 Spectral Shepherd double check to only target spirits you control 2016-07-25 11:11:59 -04:00
drmDev
6584079d7a bug fix for Tunnel Vision when it does not find card in library 2016-07-25 06:43:51 -04:00
Derek M
0f48520697 Merge pull request #2115 from Dilnu/master 
Implement new cards and fix a bug with two existing ones.
 2016-07-25 04:48:27 -04:00
Samuel Sandeen
3aa480cef8 Merge remote-tracking branch 'magefree/master' 2016-07-24 22:07:15 -04:00
Samuel Sandeen
68e84d9c23 Modify the way some second targets are chosen 
If implemented the wrong way when you try to choose second targets the
game can get into an impossible state this fixes three such cards.
 2016-07-24 22:07:04 -04:00
drmDev
099e490e4d patching up possible NPEs on quiet speculation 2016-07-24 21:49:36 -04:00
drmDev
f1343dd03f Quiet Speculation bugfix for #1970 - controller searches target player library 2016-07-24 21:47:41 -04:00
Samuel Sandeen
d97d9ea130 Merge remote-tracking branch 'magefree/master' 2016-07-24 18:02:53 -04:00
Samuel Sandeen
5e26638ab5 Fix a bug in Tribal Unity 
BoostAllOfChosenSubtypeEffect was too specific and didn’t apply to this
situation. It has been replaced with it’s superclass BoostAllEffect
 2016-07-24 18:02:22 -04:00
drmDev
e77033f30c Spreading Flames damage fix 2016-07-24 16:59:13 -04:00
drmDev
642de722f6 Mind Shatter bug fix for #2110. Before a discard effect can happen, checks the amount of cards to be discarded > 0 2016-07-24 15:00:07 -04:00
fwannmacher
10778cdd6b - Converted CardImpl.cardNumber from int to String 
- Fixed Issue #1953
- Fixed Issue #1914
- Fixed Issue #739
 2016-07-24 15:18:54 -03:00
Samuel Sandeen
05d88b46dd Merge remote-tracking branch 'magefree/master' 2016-07-24 11:53:11 -04:00
LevelX2
bd70f923b7 * Permeating Mass - Fixed that the copy effect did only work, if Permeating Mass did not die from combat damge. 2016-07-24 17:13:53 +02:00
LevelX2
c264da1cca * Tree of Perdition - Fixed that changed thougness value did not chnage back after it left battlefield. 2016-07-24 14:27:50 +02:00
Samuel Sandeen
a535d9d0e8 Merge remote-tracking branch 'magefree/master' 2016-07-23 17:44:44 -04:00
Samuel Sandeen
32a814fa6e Implement Simic Guildmage 2016-07-23 17:40:12 -04:00
Samuel Sandeen
690c0f41a9 Implement Tribal Unity 2016-07-23 17:40:01 -04:00
Derek M
060084f971 Merge pull request #2097 from fwannmacher/master 
Added option for download image number of threads and some minor fixes
 2016-07-23 09:55:13 -04:00
fireshoes
99dbdef5ce Added Vintage Cube June 2016 to the cube menu. Fixed that Permeating Mass did not use LKI for creating the copy. 2016-07-22 11:52:04 -05:00
drmDev
2e12164999 Stromkirk Condemned bug fix - only affects vampires you control 2016-07-22 08:12:19 -04:00
drmDev
5ac81a4fdc Clear Shot fix - damage source is the creature 2016-07-21 09:07:09 -04:00
Derek M
b8091cc3a8 Merge pull request #2085 from cg5-/master 
Add Infernal Caretaker
 2016-07-21 06:09:06 -04:00
jeff
c241b45a91 - Added a null check for The Great Aurora 2016-07-20 16:08:42 -05:00
fwannmacher
4732686d8f - Fixed Issue #1992: Added missing cards 2016-07-20 14:42:26 -03:00
fwannmacher
06d14c4388 - Fixed Issue #1994: Added missing cards 2016-07-20 14:32:01 -03:00
fwannmacher
2dacf042d8 - Fixed Issue #1993: Added missing cards 2016-07-20 14:23:41 -03:00
drmDev
8368a8379c variable naming for clarity - Spellbinder 2016-07-20 11:36:58 -04:00
drmDev
a98e05e338 Great Aurora patch - no longer uses deprecated moveCards methods 2016-07-20 09:13:04 -04:00
drmDev
910d6eb048 Spreading Flames targetting fix 2016-07-19 16:33:44 -04:00
fireshoes
9630320ba9 Changed set codes in image sources and Mage Sets to match recent changes. Changed Portal Second Age set code back to PO2. Updated tokens with recent sets to product correct images. Fixed that there was no basic land slot in EMN packs. 2016-07-18 15:49:43 -05:00
Plopman
5350c134da fixed target of Cemetery Recruitment 2016-07-18 19:09:47 +02:00
Neil Gentleman
882136fbc7 Dwarven Blastminer should only be able to target non-basics 
likewise Encroaching Wastes
 2016-07-17 18:19:16 -07:00
Neil Gentleman
5e1bc1e583 implement Beasts of Bogardan 
also fixed Ivory Guardians to correctly boost other Ivory Guardians, and
changed many similar cards to use OpponentControlsPermanentCondition
instead of custom Conditions.
 2016-07-17 18:19:16 -07:00
Neil Gentleman
cfb612b68a Mad Auntie's regeneration ability is targeted 
Baron Sengir, too
 2016-07-17 18:19:16 -07:00
Neil Gentleman
dafd392649 Borborygmos only triggers when damaging a player 2016-07-17 18:19:16 -07:00
Neil Gentleman
46a8ee438a fix "you control you control" in rules text 
GainAbilityControlledEffect + FilterControlledCreaturePermanent is redundant
 2016-07-17 18:19:16 -07:00
Neil Gentleman
0c37163052 use DestroyAllEffect 2016-07-17 18:19:16 -07:00
Neil Gentleman
eb4e758880 FloodtideSerpentReplacementEffect is unused 2016-07-17 18:19:16 -07:00
drmDev
5c5d729447 Merge remote-tracking branch 'upstream/master' 2016-07-17 14:32:42 -04:00
drmDev
3522223b20 Spellbinder implemented 2016-07-17 14:32:23 -04:00
Neil Gentleman
1b78e06c7f Crosis's Charm doesn't prevent artifacts from regenerating 2016-07-17 10:33:29 -07:00
Neil Gentleman
2a8b117f34 Contingency Plan is just a Sorcery 2016-07-17 10:21:05 -07:00
drmDev
4a162dd609 Inner Struggle fixes so creature is source of damage done to itself 2016-07-17 12:37:31 -04:00
drmDev
f807fed12c Foul Tongue Shriek bug fix - filters attacking creatures you control 2016-07-17 06:41:26 -04:00
Neil Gentleman
5529d7c75d Lunge deals two damage to each target 2016-07-16 14:01:08 -07:00
Neil Gentleman
9b44e7860a Lost in the Woods' effect is not optional 2016-07-16 14:00:59 -07:00
Neil Gentleman
a0121dd47e Lovisa Coldeyes affects all player's creatures 2016-07-16 14:00:51 -07:00
Neil Gentleman
7b9ca84ae1 Agonizing Demise prevents regeneration 2016-07-16 14:00:31 -07:00
Neil Gentleman
6c0c499557 Abu Ja'far is not optional, and prevents regeneration 2016-07-16 14:00:23 -07:00
Neil Gentleman
62cec1c520 Hunter of Eyeblights 
not `Of`
 2016-07-16 14:00:17 -07:00
Neil Gentleman
16fc86ef1a Awakening Zone's trigger is optional 2016-07-16 14:00:04 -07:00
Neil Gentleman
09a9e06a0f Arashin War Beast's ability is not optional 2016-07-16 13:59:58 -07:00
Neil Gentleman
a3836f6ec7 Act of Aggression can only target opponent's creatures 2016-07-16 13:59:49 -07:00
michaelstephendavies
ba4053c725 Infernal Caretaker - use ReturnToHandFromGraveyardAllEffect 2016-07-16 22:13:19 +02:00
michaelstephendavies
ddbd5f6514 Add Infernal Caretaker 2016-07-16 17:28:00 +02:00
Neil Gentleman
1a95e2021a Fix some incorrect card data 2016-07-15 21:23:39 -07:00
drmDev
2ecadbc30b Tamiyo fixes #2078 2016-07-15 21:15:04 -04:00
drmDev
966de10386 Stensia Banquet fix 2016-07-15 19:51:09 -04:00
jeff
bc1f4e409c - Fixed Aura Swap bug #2025. 2016-07-15 15:30:47 -05:00
spjspj
09cc97dd85 spjspj - Fix copy's owner for Mirrorwing Dragon (EMN) 2016-07-16 03:11:06 +10:00
LevelX2
e5117a967d * Mirrorwing Dragon - Fixed wrong target handling. 2016-07-15 18:14:38 +02:00
LevelX2
4302186032 * Devils' Playground - Fixed name spelling bug. 2016-07-15 14:47:20 +02:00
LevelX2
88d66784df * Crop Sigil - Fixed that it can't be activated without both a creature and land in the graveyard (fixes #2079 ). 2016-07-15 14:25:25 +02:00
LevelX2
4bdc4936f0 * Fixed Mid's Dilation bugs (fixes #2077). 2016-07-14 17:14:06 +02:00
LevelX2
fc1a1523c5 * Gideon, Champion of Justice - Fixed that the P/T did not change if loyality counters were added after using the 0 ability. 2016-07-13 17:04:52 +02:00
LevelX2
20fa414838 * Gideon, Champion of Justice - Fixed a bug that Gideon dies if its ability to make it a creature was used. 2016-07-13 12:25:54 +02:00
LevelX2
87296b56c3 * Tamiyo, Field Researcher - Fixed that only one card was drawn from +1 ability if both target creatures did combat damage. 2016-07-13 11:45:31 +02:00
drmDev
0670b24f22 Reverting gideon change (no more CDA). added junit test demonstrating issue #2069 2016-07-13 05:27:32 -04:00
drmDev
8ded1981fb Gideon Champion of Justice bugfix fixes #2069 2016-07-13 04:50:57 -04:00
fireshoes
96e88d7350 [EMN] Fixed tooltip text on some green, gold, artifact, and land cards. Added Emrakul's Evangel's missing TapSourceCost. 2016-07-12 23:10:37 -05:00
jeff
0e4a3a2142 - Fixed Grave Scrabbler. 2016-07-12 16:39:00 -05:00
fireshoes
cf6ac805b7 [EMN] Fixed tooltip text on some red cards. Fixed Spreading Flames targeting creatures or players. Fixed Stensia Banquet subtype filter. 2016-07-12 16:05:42 -05:00
fireshoes
e8880437df [EMN] Fixed tooltip text on some black cards. Fixed Dark Salvation -x/-x ability. Fixed Stromkirk Condemned collector number. 2016-07-12 12:00:31 -05:00
LevelX2
e7014f385b Added tests. 2016-07-12 18:07:18 +02:00
drmDev
bb3828ce0c Distember of the Blood [EMN] bug fix 2016-07-12 08:57:09 -04:00
Eric McVicker
9a069edc44 Fix meld trigger text for Gisela, the Broken Blade 2016-07-12 02:38:20 -05:00
fireshoes
80f4ab770b [EMN] Fixed tooltip text on some blue cards. 2016-07-11 23:40:24 -05:00
fireshoes
c698ce5630 [EMN] Various fixes. 2016-07-11 21:13:32 -05:00
Quercitron
99a2f4b323 * Borrowed Hostility - Fixed that all controlled creatures were buffed with the first mode. 2016-07-12 02:02:52 +03:00
fireshoes
bf0d920e8c [EMN] Cleaned up some tooltip text on white cards, fixed a couple of card names. 2016-07-11 16:37:12 -05:00
LevelX2
fa32925b28 Merge origin/master 2016-07-11 22:55:34 +02:00
LevelX2
d0ecb473da Xmage 1.4.13v0 2016-07-11 22:54:43 +02:00
fireshoes
69dbff9cb3 Added upcoming promo cards. Worked on mtg-cards-data.txt organization (alphabetizing by set name and removing duplicate sets). 2016-07-11 13:56:14 -05:00
LevelX2
2a55110627 [EMN] Some minor fixes. 2016-07-11 19:25:25 +02:00
LevelX2
8a7a1e3dab Merge origin/master 2016-07-11 18:56:16 +02:00
LevelX2
2bdb3635a2 Serum Tank - Fixed some bugs. 2016-07-11 18:55:49 +02:00
fireshoes
e9f66ae65a Merge commit 2016-07-11 11:37:58 -05:00
fireshoes
1dfed9b1c8 [EMN] Added MeldEffect to Gisela and Hanweir Battlements. Changed Brisela and Hanweir, the Writhing Township to MeldCard. Added missing TapSourceCost to Hanweir Battlements. Added missing ability.addEffect to Chittering Host. 2016-07-11 11:32:28 -05:00
LevelX2
1b2f1efb00 Merge pull request #2061 from Dilnu/master 
Implement 6 Cards and tests for two of them.
 2016-07-11 18:23:00 +02:00
LevelX2
0f122ff154 Merge pull request #2062 from CountAndromalius/SerumTank 
Implementing Serum Tank (Mirrodin and Planechase)
 2016-07-11 18:22:47 +02:00
fireshoes
436942ccff [EMN] Minor spelling fix. 2016-07-11 09:04:46 -05:00
emerald000
e1b3428a39 [EMN] Implemented basic Meld functionality. 2016-07-11 04:49:40 -04:00
CountAndromalius
3c52670d61 Implementing Serum Tank (Mirrodin and Planechase) 2016-07-11 02:27:38 -03:00
Samuel Sandeen
bf613572e9 Fix another merge artifact. 2016-07-10 19:07:53 -04:00
Samuel Sandeen
c7cdd792d0 Remove Merge conflict artifacts. 2016-07-10 19:05:41 -04:00
Samuel Sandeen
6cf04e9bd2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
#	Mage.Sets/src/mage/sets/timeshifted/Darkness.java
 2016-07-10 19:01:20 -04:00
Samuel Sandeen
8fe5bf4fbb Update the uses of PreventAllDamageByAllPermanentsEffect to use the new name. 2016-07-10 18:55:58 -04:00
samuelsandeen
f9b0befac3 Implement several cards and tests for some of the more complex cards. 
This also makes a small change to AbilityImpl's handling of variable 
costs which may not be needed.
 2016-07-10 18:39:42 -04:00
LevelX2
cb91282f9e [EMN] Some fixes to Dark Salvation, Eldrich Moon, Make Mischief. 2016-07-10 22:02:56 +02:00
LevelX2
09273f284d [EMN] Set Hanwar the Writhing Township to nightSide 2016-07-10 21:07:59 +02:00
LevelX2
772abd9311 Merge origin/master 2016-07-10 20:58:51 +02:00
LevelX2
1e120bdeaa [EMN] Added Dark Salvation and a workaroung version of Slayer's Cleaver. The meld cards without meld. 2016-07-10 20:58:26 +02:00
Quercitron
712316d8ff [EMN] Added Thirsting Axe. 2016-07-10 18:41:36 +03:00
LevelX2
de0b66240f [EMN] Added 3 black cards. 2016-07-10 11:11:56 +02:00
LevelX2
0017f7a458 [EMN] Added 8 black cards. 2016-07-10 10:43:26 +02:00
LevelX2
b2bd87b9f4 [EMN] Some fixes to red cards. 2016-07-10 10:09:22 +02:00
LevelX2
fd55feee17 [EMN] Added the missing multicolor cards. 2016-07-10 10:09:06 +02:00
drmDev
55aae9910e fixes #2054 2016-07-10 03:27:33 -04:00
drmDev
e317719e16 [EMN] some black cards implemented 2016-07-09 19:15:04 -04:00
drmDev
4423f1e7fc the real [EMN] commit... 2016-07-09 16:48:33 -04:00
drmDev
2e4384ef68 [EMN] implemented many more colorless cards 2016-07-09 16:46:56 -04:00
drmDev
566e667780 Merge remote-tracking branch 'upstream/master' 2016-07-09 16:32:06 -04:00
drmDev
f694c2106b additional card fix for #2057 2016-07-09 16:31:17 -04:00
drmDev
6fe2c226b8 fixes #2057 2016-07-09 16:29:43 -04:00
LevelX2
771f2c4fb9 [EMN] Added the missing red cards (some untested). 2016-07-09 21:24:58 +02:00
LevelX2
7c0b11c641 [EMN] Added the missing white cards (without meld). 2016-07-09 18:16:56 +02:00
drmDev
29b3a2398d Merge remote-tracking branch 'upstream/master' 2016-07-09 09:45:36 -04:00
drmDev
d234fb7961 Added some colorless cards (EMN) 2016-07-09 09:45:03 -04:00
LevelX2
4c363bee23 [EMN] Added the missing green cards. 2016-07-09 15:39:59 +02:00
LevelX2
4818830e5c [EMN] Added the missing blue cards. 2016-07-08 23:10:12 +02:00
LevelX2
753e7dfb2c [EMN] Added some blue cards. 2016-07-08 21:37:24 +02:00
fireshoes
4cf3f29c4c [EMN] Added complete spoiler to mtg-cards-data.txt. Added existing reprints. 2016-07-08 11:18:14 -05:00
drmDev
18e8a6dc49 Merge branch 'master' of https://github.com/drmDev/mage 2016-07-08 08:51:21 -04:00
fireshoes
d30736de38 [EMN] Added Mind's Dilation, Splendid Reclamation, and Bedlam Reveler. Fixed some card translations. 2016-07-07 22:26:25 -05:00
drmDev
16ce177143 Reflector Mage restriction effect fix 2016-07-07 20:27:49 -04:00
fireshoes
742acf5406 [EMN] Added 7/7 spoilers to mtg-cards-data.txt. Implemented several cards. 2016-07-07 18:42:43 -05:00
fireshoes
7172606506 [EMN] Added additional 7/6 spoilers to mtg-cards-data.txt. Implemented Wolfkin Bond and Noose Constrictor. 2016-07-06 23:39:12 -05:00
jeff
6441a3dac3 - Little fix for Bruna, Light of Alabaster. 2016-07-06 15:44:24 -05:00
fireshoes
b8d7ee2c02 [EMN] Added 7/6 spoilers to mtg-cards-data.txt. Implemented Permeating Mass and Falkenrath Reaver. Add Meld reminder text to Bruna, Midnight Scavengers, and Hanweir Garrison. Fixed translated name of Collective Defiance. 2016-07-06 10:56:38 -05:00
LevelX2
21e1b98637 * Fixed wrong card number of Wild Pair PLC. 2016-07-06 17:18:52 +02:00
LevelX2
d95c13c563 * Fixed a problem of Identity Thief (fixes ##2052). 2016-07-06 16:14:51 +02:00
LevelX2
c236f1f8e1 Merge pull request #2048 from shootbot/master 
Implemented 'The Rack' from 'Duels of the Planeswalkers'
 2016-07-06 11:32:38 +02:00
fireshoes
edc6ef36ac [EMN] Added additional 7/5 spoilers to mtg-cards-data.txt. Fixed some translated text. 2016-07-05 18:07:41 -05:00
fireshoes
f0d169367a [EMN] Added 7/5 spoilers to mtg-cards-data.txt. Implemented some new cards. Fixed Liliana and Ishkanah to only filter controlled creatures. 2016-07-05 10:48:25 -05:00
spjspj
fabbcbddc1 spjspj - Implement Identity Thief [EMN] 2016-07-05 22:52:23 +10:00
fireshoes
b32b2aa4da [EMN] Added several cards. 2016-07-04 22:51:51 -05:00
drmDev
908f97ad68 Darigaaz Charm tooltip fix 2016-07-04 19:10:02 -04:00
drmDev
8a4a1933b1 Soul Separator fixes 2016-07-04 06:26:26 -04:00
drmDev
eb8519cd78 Merge remote-tracking branch 'upstream/master' 2016-07-04 04:16:33 -04:00
drmDev
a4dc6a12b8 Soul Separator (EMN) 2016-07-03 21:27:33 -04:00
LevelX2
7f4fc245cd * Fixed some cards that choose a subtype as entering the battlefield that did not work for copied permanents (e.g. Brass Herald for Mormir format). 2016-07-03 21:43:12 +02:00
drmDev
3d00bd33d5 Lamplighter of Selhoff bug fix 2016-07-03 13:45:08 -04:00
shootbot
24f568b131 Implemented 'The Rack' from 'Duels of the Planeswalkers' 
First card implemented
I will add whole set later if everything is fine with this commit
Tested it locally, works fine, modern border and new art in place
 2016-07-03 21:49:21 +06:00
fireshoes
1c0a4a7532 [EMN] Added Collective Brutality, Borrowed Malevolence, and Turn Aside. 2016-07-03 10:19:40 -05:00
drmDev
548b05ba74 Whoops... removing unnecessary line 2016-07-03 06:23:50 -04:00
drmDev
e1bd9a5331 EmrakulsEvangel fix 2016-07-03 06:22:32 -04:00
drmDev
41326affb5 Emrakuls Evangel (EMN) 2016-07-03 04:09:46 -04:00
emerald000
2e3f963363 [EMN] Implemented Escalate. Added Blessed Alliance. 2016-07-02 03:08:39 -04:00
fireshoes
9c0e73dfdb Fixed Warriors' Lesson to only trigger on combat damage instead of all damage.[EMN] Added a few more cards. 2016-07-01 15:00:18 -05:00
LevelX2
a6094afa40 * Worldheart Phoenix - Fixed that if cast from graveyard the counters were not added. 2016-07-01 17:04:42 +02:00
spjspj
9a1c67a9a4 Merge pull request #2040 from spjspj/master 
spjspj - Implement Stitcher's Graft [EMN]
 2016-07-02 00:06:50 +10:00
spjspj
dad0b3809f spjspj - Implement Stitcher's Graft [EMN] 2016-07-02 00:03:50 +10:00
spjspj
b91b6402dc spjspj - Implement Stitcher's Graft [EMN] and slight change to mtg-cards-data.txt 2016-07-01 23:59:47 +10:00
Styxo
541e6a7f9b Added Earth Surge 2016-07-01 14:50:18 +02:00
emerald000
3ca28d2eb6 [EMN] Implemented Emerge. Added Elder Deep-Fiend. 2016-07-01 01:15:56 -04:00
fireshoes
8d7ebdc088 [EMN] Added even more 6/30 spoilers to mtg-cards-data.txt. Added a couple of those cards. 2016-07-01 00:06:48 -05:00
fireshoes
33ac32f5c4 [EMN] Added additional 6/30 spoilers to mtg-cards-data.txt. Added some more cards. 2016-06-30 14:47:59 -05:00
fireshoes
e86946b23e [EMN] Added 6/30 spoilers to mtg-cards-data.txt. Fixed bugs with Lone Rider and Docent of Perfection. Added several cards. 2016-06-30 10:26:42 -05:00
fireshoes
4ed2e40841 [EMN] Added more 6/29 spoilers to mtg-cards-data.txt. 2016-06-29 11:59:05 -05:00
fireshoes
d844c6056a [EMN] Added 6/29 spoilers to mtg-cards-data.txt. Implemented several cards (will be testing with the clearImage fix in). 2016-06-29 10:01:00 -05:00
drmDev
9deb1bd0da Ignition Team implementation (requested card) 2016-06-29 03:21:40 -04:00
LevelX2
60b74289c9 * Fixed some tooltip texts caused by Oracle update #2039. 2016-06-28 23:33:34 +02:00
fireshoes
7cb6ae826d [EMN] Added 6/28 spoilers to mtg-cards-data.txt. Fixed Thalia's Lancers collector number. 2016-06-28 11:21:16 -05:00
fireshoes
fd29307ad4 [EMN] Added additional 6/27 spoilers to mtg-cards-data.txt Fixed Identity Thief's translated name. Implemented several new EMN cards. Fixed rules text on several tap and don't untap cards. 2016-06-27 19:33:05 -05:00
fireshoes
744e303265 [EMN] Added 6/27 spoilers to mtg-cards-data.txt Fixed Thalia's translated name. 2016-06-27 11:40:00 -05:00
spjspj
a3dc06c51f Slight fix for Molten Sentry (RAV) 2016-06-26 22:52:48 +10:00
spjspj
efa8bade8f spjspj - Add Insidious Dreams (TOR) 2016-06-26 22:30:57 +10:00
drmDev
c1c63c7c91 Thopter Squadron 2nd ability fix 2016-06-25 10:58:21 -04:00
fireshoes
48ae863459 [EMN] Implemented Thalia, Heretical Cathar 2016-06-23 15:56:13 -05:00
emerald000
32f6ed94af Minor rule text fix. 2016-06-23 13:26:48 -04:00
emerald000
748fcd9a16 [EMN] Added Emrakul, the Promised End. 2016-06-23 00:05:29 -04:00
LevelX2
8beaeab485 * Prismatic Strands - Added game log message with the color chosen. 2016-06-21 10:15:16 +02:00
LevelX2
d26cc4ac1b * Curse of the Pierced Heart - Fixed that the ability triggered wrongly in the draw instead of the upkeep step. 2016-06-21 09:42:03 +02:00
LevelX2
0b05bdeeec * Everglades - Fixed a bug that it produced colorless instead of black mana. 2016-06-21 09:30:04 +02:00
fireshoes
9ae4c2c2de [EMN] Added Coax from the Blind Eternities to mtg-cards-data.txt. Implemented Ulrich. 2016-06-20 18:13:23 -05:00
LevelX2
185f56a7da * Fireblast - Fixed that a wrong text was shown for the land sacrifice. Also that the spell was wrongly marked as castable also if only one mountain was on the battlefield. 2016-06-20 16:23:03 +02:00
LevelX2
ea53692b57 Merge pull request #2020 from Styxo/master 
Added Heal the Scars and Hunter Of Eyeblights
 2016-06-20 09:10:31 +02:00
Styxo
9bf92ae9d8 Added Heal the Scars and Hunter Of Eyeblights 2016-06-19 20:11:05 +02:00
LevelX2
b44e2f3cdd * Winter Orb - Implemented errata 2016-06-08 2016-06-19 17:29:19 +02:00
LevelX2
ef9ab0769d * Glimmervoid - Fixed that the condition was not implemented as an “Intervening If” clause. 2016-06-19 16:39:22 +02:00
LevelX2
4022a47a0d * Din of the Fireherd - Fixed that the created token was not counted for the sacrifice effect. 2016-06-19 16:22:40 +02:00
LevelX2
f691017cda * Gryff's Boon - Fixed that the target was wrongly selected during resolution. 2016-06-19 16:13:50 +02:00
LevelX2
7563b0c30f Some rework for "Name a nonland card" effects. 2016-06-19 16:05:17 +02:00
LevelX2
3edca4234a Merge pull request #2017 from Styxo/master 
Added Brain Pry, Slithering Shade and Gruul Scrapper
 2016-06-19 15:55:22 +02:00
spjspj
35c05c0d65 spjspj - Minor change for VesuvanShapeshifter (TSP) 2016-06-19 22:55:44 +10:00
spjspj
6f6d9bc314 spjspj - Minor change for Masterwork of Ingenuity (C14) 2016-06-19 21:12:44 +10:00
LevelX2
a669c5daaa * Icatian Javelineers - Fixed rule text generation. 2016-06-19 11:12:35 +02:00
Styxo
a8a5321702 Added Brain Pry, Slithering Shade and Gruul Scrapper 2016-06-18 20:36:40 +02:00
spjspj
802414764d spjspj - Some fixes for Synod Sanctum (ARC) 2016-06-19 01:45:18 +10:00
LevelX2
e74f5995cb Fixed some more possible null pointer exceptions. 2016-06-18 14:46:35 +02:00
LevelX2
7e9d285a49 Fixed some possible null pointer exceptions. 2016-06-18 12:56:25 +02:00
LevelX2
1bee035aaa * Phyrexian Ingester - Fixed possible null pointer exception. 2016-06-18 11:58:08 +02:00
LevelX2
34668ba5d9 Fresh Meat, Caller of the Claw - Fixed problem with watchers using the same internal name. 2016-06-18 11:34:39 +02:00
LevelX2
bdebcbaf63 * Angelic Skirmisher - Fixed that the ability choice caused error. 2016-06-18 10:47:40 +02:00
LevelX2
2b3fb81cdd Some minor changes. 2016-06-17 15:16:24 +02:00
LevelX2
f6c1538bda * Cleansing Beam - Fixed that the target creature was damaged twice. 2016-06-17 14:50:30 +02:00
LevelX2
089996edce Braids, Cabal Minion - Fixed tooltip rule text. 2016-06-17 14:32:29 +02:00
LevelX2
ac989ddf36 Merge pull request #2010 from shootbot/master 
Fixed Leeching Sliver bug
 2016-06-17 14:10:40 +02:00
spjspj
aca2e16581 spjspj - Some fixes for Synod Sanctum (ARC) 2016-06-17 21:35:49 +10:00
spjspj
dfcca1307b spjspj - Some fixes for Synod Sanctum (ARC) 2016-06-17 21:34:23 +10:00
fireshoes
d90ef8e9ae Changed @Override to @java.lang.Override on MRD Synod Sanctum 2016-06-16 11:32:25 -05:00
shootbot
1bae2b0b1e Fixed Leeching Sliver bug 
Following bugs fixed:
No life loss from a trigger when Leeching Sliver attacks a planeswalker
No life loss from a trigger when Leeching Sliver doesn't attack a player
and another sliver does
 2016-06-16 19:51:20 +06:00
spjspj
9f88ebdef9 spjspj - Implement Synod Sanctum (ARC & MRD) 2016-06-16 23:24:00 +10:00
spjspj
1a7edd66c7 spjspj - Slight fixes for Wave of Vitriol (C14) 2016-06-16 12:12:01 +10:00
spjspj
0f806988f0 spjspj - Slight fixes for Wave of Vitriol (C14) 2016-06-16 12:10:27 +10:00
spjspj
51a1c8d345 spjspj - Fixes for KormusBell not creating 1/1s from swamps. Copies of ContinuousEffect weren't having dependendToType set (was defaulting to null). Add addDependencyType to UrborgTombOfYawgmoth and setDependedToType to KormusBell. 2016-06-14 22:30:06 +10:00
spjspj
4944d8ed69 spjspj - Clean up code for Eye of the Storm (RAV) 2016-06-11 18:07:16 +10:00
spjspj
ac910ca881 spjspj - Clean up code for Eye of the Storm (RAV) - aka EotS shouldn't trigger after every spell is cast, only instants/sorceries and now check if imprinted spells are from players who have been eliminated before copying. 2016-06-11 12:40:41 +10:00
spjspj
80901d713f spjspj - Clean up code for Psychic Possession (DIS) 2016-06-10 01:06:28 +10:00
spjspj
83d6936f42 spjspj - Clean up code for Psychic Possession (DIS) 2016-06-10 01:02:39 +10:00
spjspj
d7c2f5b9c5 spjspj - Implement Psychic Possession (DIS) 2016-06-09 20:35:26 +10:00
spjspj
0008234ab9 spjspj - Implement Psychic Possession (DIS) 2016-06-09 20:32:35 +10:00
spjspj
b751e69eec spjspj - Fix possible npe for Clockspinning and change return code from apply. Also fix possible npe for adding counters 2016-06-09 01:23:19 +10:00
LevelX2
89d9762ea1 * Qasali Ambusher - Fixed possible null pointer exception. 2016-06-05 12:30:47 +02:00
LevelX2
85bc7549fa * Added Custodi Squire (2 votes), Nightshade Assassin (2 votes), Seize the Day (2 votes) from the Card Requests - JUNE list. 2016-06-04 12:21:47 +02:00
LevelX2
ffca19c408 Merge pull request #1860 from fenhl/set-codes 
Fix set codes
 2016-06-03 08:57:57 +02:00
LevelX2
086d69c200 Merge pull request #1972 from gnumast/master 
Text Import should detect sideboard after a single blank line
 2016-06-03 08:57:40 +02:00
LevelX2
4581cfc803 * Fixed continuous effect handling of Marsh Casualities, Savage Offensive and Explosive Growth. 2016-06-02 12:47:53 +02:00
Fenhl
1a5afc98a6 Add Commander printing of Hour of Reckoning 2016-06-02 03:18:05 +00:00
drmDev
5a813262d6 Faerie Tauntings typo fix 2016-06-01 09:19:23 -04:00
Alex Marcotte
2d4ba24dd9 Added missing rarity for EMA Winter Orb 2016-05-30 23:03:43 -04:00
fireshoes
a9744b2d04 Added Crumbling Vestige FNM promo. 2016-05-30 20:44:49 -05:00
LevelX2
1045f35705 * Sylvan Might - Fixed that Trample was not given to target creature. 2016-05-29 17:38:08 +02:00
LevelX2
266a0870ca Xmage 1.4.12v0 2016-05-29 10:59:39 +02:00
LevelX2
c0274304c8 [EMA] Fixed wrong rarity of Desperate Ravings. 2016-05-29 09:54:36 +02:00
LevelX2
0085b6b1ef Removed some custom classes by use of framework classes. 2016-05-29 09:52:43 +02:00
LevelX2
2c11d9cfef Merge pull request #1960 from Styxo/master 
Added Faerie Tautings, Heat Shimmer and Spring Cleaning
 2016-05-29 09:23:11 +02:00
LevelX2
9953107171 Some changes to Lost Auramancers. 2016-05-29 09:22:03 +02:00
ZEPLAR
165b0630f7 Fixes Issue #1958: Creatures copying Lost Auramancers fail to trigger its death effect. My solution was to copy the Undying template, but I'm not sure why the original implementation didn't work. 2016-05-28 20:02:26 -07:00
spjspj
a6316ed26f spjspj - Add Spike Cannibal [EXO] 2016-05-28 23:41:47 +10:00
spjspj
3ce07ae6bb spjspj - Add in Carbonize [EMA] 2016-05-28 23:11:15 +10:00
Styxo
3bd10a2b2b Added Faerie Tautings, Heat Shimmer and Spring Cleaning 2016-05-28 12:26:49 +02:00
LevelX2
8c6f44386d [EMA] Added Prowling Pangolin and fixed some wrong rarities. 2016-05-28 12:14:14 +02:00
LevelX2
5c8c6a3aeb [EMA] Added Crater Hellion and edited some minor formatting. 2016-05-28 11:44:10 +02:00
LevelX2
eb1ae59d11 Merge origin/master 2016-05-28 11:20:03 +02:00
LevelX2
5738a705a4 [EMA] Added missing rarity for Winter Orb. 2016-05-28 11:19:32 +02:00
spjspj
e4d10ec87a spjspj - Rest of EMA spoilers 2016-05-28 18:54:32 +10:00
fireshoes
6330a3a344 [EMA] Added additional 5/26 spoilers. 2016-05-26 16:58:57 -05:00
fireshoes
9b5353c648 [EMA] Added 5/26 spoilers. 2016-05-26 11:02:59 -05:00
fireshoes
85c3fe425b [EMA] Added 5/25 spoilers. 2016-05-25 10:57:05 -05:00
fireshoes
a34cf7115c [EMA] Added additional 5/24 spoilers. 2016-05-25 00:41:04 -05:00
fireshoes
6f7c15a849 [EMA] Added 5/24 spoilers. 2016-05-24 10:42:10 -05:00
Fenhl
a4c7625c65 Fix some set codes 2016-05-24 12:24:40 +00:00
spjspj
6e4ff8d34e spjspj - Implement Thought Prison (MRD) 2016-05-24 20:40:29 +10:00
fireshoes
3d0409e1bb Merge origin/master 2016-05-23 18:39:13 -05:00
fireshoes
c15b541eac [EMA] Added 5/23 spoilers. 2016-05-23 18:29:37 -05:00
LevelX2
b2d136a940 Merge pull request #1940 from wetterlicht/master 
Implemented various Darksteel cards
 2016-05-23 13:19:05 +02:00
wetterlicht
dc4168efae 2016-05-22 19:41:59 +02:00
LevelX2
949662de16 * Coat of Arms - FIxed that the boost effect also worked with non creature types (e.g. Basic land types if some lands were animated). 2016-05-22 16:24:45 +02:00
spjspj
6912949825 spjspj - Implement Portcullis (STH) 2016-05-22 23:16:44 +10:00
spjspj
4aadc359c4 spjspj - Implement Portcullis (STH) 2016-05-22 23:11:04 +10:00
Nathaniel Brandes
4a416c7fbb Fix ETB kicker on Dralnu's Pet. 2016-05-21 03:59:36 -07:00
drmDev
6d622a8f00 LastStand fixes - loss of life and 2x 2016-05-21 05:34:57 -04:00
emerald000
2a2e8c3657 Added 8 new cards. Completed Morningtide and Venser vs. Koth! 
Arc Blade, Battletide Alchemist, Boldwyr Heavyweights, Coordinated Barrage, Hostile Realm, Stenchskipper, Torchling and Weight of Conscience.
 2016-05-20 09:00:27 -04:00
Quercitron
f815148424 * Runeflare Trap - Fix alternative cost condition (fixes #1943). 2016-05-20 03:26:42 +03:00
LevelX2
eea532b2a5 * Invoke Prejudice - Some changes. 2016-05-19 12:52:57 +02:00
fireshoes
9c821f59da Fixed that Strength of Arms made a Soldier token instead of a Human Soldier token. 2016-05-18 10:20:18 -05:00
fireshoes
a2c56d821c Added a bunch of promo cards and the new sets that were announced today. 2016-05-16 23:05:31 -05:00
wetterlicht
28902e5616 Implemented Murderous Spoils 2016-05-16 22:58:27 +02:00
wetterlicht
1f44b8cde1 Implemented cards: 
Burden of Greed, Drill Skimmer, Drooling Ogre, Emissary of Despair,
Psychic Overload, Pulse of the Tangle, Rebuking Ceremony,
Tel-Jilad Wolf, Unforge, Vex
 2016-05-16 22:55:29 +02:00
Fenhl
77b32014f6 Fix formatting in several card files 2016-05-16 02:01:09 +00:00
Fenhl
eb50790b97 Fix imports in LeaveNoTrace.java 2016-05-16 00:14:25 +00:00
Fenhl
e3fba3d187 Add card Cleansing Beam 2016-05-15 20:20:37 +00:00
Fenhl
79d303e180 Fix Leave No Trace to target only enchantments 2016-05-15 20:15:15 +00:00
LevelX2
88e744c04c * Some fixes to tests and sacrifice cost. 2016-05-15 20:33:06 +02:00
fireshoes
e77817b67a Fixed collector numbers of basic lands in DD: Blessed vs Cursed. 2016-05-15 12:58:07 -05:00
Fenhl
cdbbdb03b4 Merge pull request #1932 from fenhl/glint-eye-nephilim 
Implement Glint-Eye Nephilim
 2016-05-15 05:46:19 +00:00
Fenhl
85b210f394 Add card Grand Melee 2016-05-14 17:05:56 +00:00
Fenhl
c80e155dd5 Add card Glint-Eye Nephilim 2016-05-14 06:52:41 +00:00
Fenhl
4b113afe64 Merge pull request #1933 from fenhl/parallel-evolution 
Implement Parallel Evolution
 2016-05-14 06:51:38 +00:00
Nathaniel Brandes
06ec3f16ac Deprecated cards function caller move, part 2. 
Now with less accidental riders.
 2016-05-13 23:30:19 -07:00
Nathaniel Brandes
90e38ad031 Rollback WIP file checked in by mistake. 2016-05-13 23:23:42 -07:00
Nathaniel Brandes
4b6bbacd8c Migrated some card moving callers to non-deprecated method. 
Since the function the were calling just calls into the non-deprecated
method, this is a low risk change.
 2016-05-13 23:20:03 -07:00
Fenhl
bffabaafd1 Add card Parallel Evolution 2016-05-14 05:53:23 +00:00
spjspj
f94a337e87 Cleanup InvokePrejudice.java 2016-05-13 08:34:56 +10:00
spjspj
344ad96fa0 spjspj - Implement Invoke Prejudice (LEG) 2016-05-13 08:27:32 +10:00
emerald000
d301bc1ad7 Added Jhoira's Timebug and Timecrafting. 2016-05-12 03:37:46 -04:00
drmDev
9b58fb8062 Ghost Council fix 2016-05-11 05:51:52 -04:00
Nathaniel Brandes
bceda744fd Fix JTMS 0 Loyalty ability to use Brain Implementation. 
As it is the exact same ability, implementing it twice slightly
differently made no sense. Now there is a single implementation for both
of them.
 2016-05-11 02:29:06 -07:00
Nathaniel Brandes
43205b6f46 Fix Angel of Jubilation. 
The Angel now properly only restricts the sacrifice of creatures.
 2016-05-09 00:26:02 -07:00
drmDev
e7a2277252 Morphling fix 2016-05-08 06:54:53 -04:00
LevelX2
4d1641538e * Shaman of the Pack - Fixed that the lose life calculation did only count creatures. 2016-05-08 08:41:29 +02:00
drmDev
661c9c985f fix twisted exp 2016-05-07 17:18:23 -04:00
drmDev
7a0361fe58 Twisted Experiment impl 2016-05-07 16:24:27 -04:00
drmDev
9a8c05ab6d Merge remote-tracking branch 'upstream/master' 2016-05-06 12:40:00 -04:00
drmDev
a6fc8d7d8a Strength in Numbers impl 2016-05-06 12:39:36 -04:00
LevelX2
73d54fb156 * Spitemare - Fixed that no damage was dealt to creatures. 2016-05-05 13:46:54 +02:00
Fenhl
091bd62627 Fix inverted Yawgmoth Demon trigger, fixes #1918 2016-05-03 17:54:17 +00:00
emerald000
0495c5a17a Added Pulsemage Advocate and Gate to the AEther. 2016-05-02 02:17:15 -04:00
drmDev
ebcc1f9ad2 Clockwork Beast and Magus of the Abyss impl 2016-05-01 12:48:27 -04:00
LevelX2
e3d16f2580 * Yawgmoth Demon - Fixed that no damage and th Demon was not tapped if no artifact was sacrificed (#1918). 2016-05-01 13:11:47 +02:00
LevelX2
993e1aaebf * Fixed generation of double faced cards of SOI boosters (fixes #1810). 2016-05-01 12:50:47 +02:00
Fenhl
d25ed112bb Remove deprecated method calls from card Murmurs from Beyond 2016-05-01 09:53:55 +00:00
Fenhl
2ded3f9cac Add card Animal Magnetism 2016-05-01 09:52:55 +00:00
drmDev
667681a47a Orcish Bloodpainter fix 2016-04-29 15:36:18 -04:00
emerald000
92421238ef Added Nefarious Lich, Thelon of Havenwood and Transcendence. 2016-04-28 15:24:11 -04:00
emerald000
9b1bc491a8 Added Lich. 2016-04-28 02:49:36 -04:00
emerald000
9d380331d7 Removed choices that should not be made while casting of a spell. 
For example: color choices for protection abilities.
 2016-04-28 01:32:48 -04:00
LevelX2
4b4417d88d Merge origin/master 2016-04-27 23:44:01 +02:00
LevelX2
c1e70c307a * Vanishing - Fixed wrong card number. 2016-04-27 23:43:35 +02:00
drmDev
01e12bfe8f Fleshwrither impl 2016-04-27 17:41:55 -04:00
LevelX2
3d740a69dd * Bound by Moonsilver - Fixed tooltip text. 2016-04-27 23:40:18 +02:00
fireshoes
27bce84e5c Added several cards. Changed LoseAbilityTargetEffect to use targetPointer. 2016-04-27 12:38:52 -05:00
LevelX2
6a03522ee8 * Unearth - Fixed a problem with exiling the unearthed creature (fixes #1912). 2016-04-27 16:52:15 +02:00
drmDev
0d11a39fc4 Merge remote-tracking branch 'upstream/master' 2016-04-27 09:56:41 -04:00
drmDev
1f1eddc65e Test for Unearth bug added 2016-04-27 09:56:01 -04:00
LevelX2
08454eb12a Added some Blood Cultist tests. 2016-04-27 15:22:38 +02:00
drmDev
47674121fe Leeching Sliver fix - maybe 2016-04-26 14:03:09 -04:00
LevelX2
9fcefc8cd7 Some minor changes. 2016-04-26 12:00:20 +02:00
LevelX2
dff8c1ea40 Merge pull request #1906 from Marco-Marin/master 
Couple more cards + Fixes
 2016-04-26 11:47:17 +02:00
LevelX2
55ed1c3121 Merge pull request #1903 from KWottrich/fix-serendib-djinn-island-damage 
Fix serendib djinn island damage
 2016-04-26 11:44:09 +02:00
LevelX2
e2a8ddef0f Merge pull request #1905 from KWottrich/clean-up-java-imports 
Clean up java imports
 2016-04-26 11:37:35 +02:00
LevelX2
44effa8103 Starter 2000 set. Set the card numbers to unique values. Has anyone the correct numbers? 2016-04-26 11:09:32 +02:00
LevelX2
1fcd26fc60 xmage 1.4.11v0 2016-04-26 00:59:03 +02:00
LevelX2
e81f5cbb32 * Fixed some wrong rule text of Oubliette and Tawnos's Coffin. 2016-04-25 23:30:56 +02:00
drmDev
213107f835 Squandered Resources impl 2016-04-25 17:20:17 -04:00
MarcoMarin
457bc29b34 Merge remote-tracking branch 'upstream/master' 2016-04-25 14:26:23 -03:00
MarcoMarin
38adc7518d A few fixes after suggestions thanks to LevelX2 for spotting them 2016-04-25 14:23:36 -03:00
Kenny Wottrich
6c84692a9b Add last few unused imports, which also had character encoding issues with Eclipse 2016-04-24 20:19:50 -05:00
Kenny Wottrich
f3c83d54f5 Remove Unused Imports 
Delete unused java imports that cause compiler warnings
 2016-04-24 19:50:29 -05:00
Kenny Wottrich
9b2ad2a88a put Island check before land is sacrificed 2016-04-24 19:08:38 -05:00
Kenny Wottrich
19a4d7dc7a fixed land sacrifice effect to damage player if sacrificed land is an island 2016-04-24 17:45:30 -05:00
LevelX2
d626b072cd * Myr Superion - Fixed that its mana costs could not be decreased by convoke. 2016-04-24 12:34:35 +02:00
LevelX2
ea0b13c64f Merge origin/master 2016-04-24 09:39:23 +02:00
LevelX2
44100968b7 Fixed internal wrong spelling. 2016-04-24 09:38:39 +02:00
LevelX2
48035a053e * Myr Superion - Fixed that its mana costs could not be decreased by convoke (fixes #1897). 2016-04-24 09:38:02 +02:00
Kenny Wottrich
412c395494 Fix Effect Logic 
Both players must not be null in order for the hand size check to
succeed
 2016-04-23 19:31:36 -05:00
LevelX2
a6c5e83c51 Merge pull request #1894 from Styxo/master 
Added some LRW cards
 2016-04-22 08:51:16 +02:00
drmDev
d6d8042a12 WildDogs impl 2016-04-21 23:40:30 -04:00
spjspj
e9ad2fb6af spjspj - Missed DRK printing of Preacher 2016-04-22 08:34:39 +10:00
drmDev
109506ad63 Calming Verse impl 2016-04-21 17:35:11 -04:00
Styxo
01ee8e5a4f Added Ego Erasure, Shields of Velis Vel, Springjack Knight, Turtleshell Changeling and Wellgabber Apothecary 2016-04-21 22:18:51 +02:00
drmDev
f1fc4e4463 Merge remote-tracking branch 'upstream/master' 2016-04-21 14:45:52 -04:00
drmDev
410c8d9e6e VolrathTheFallen impl 2016-04-21 14:45:07 -04:00
LevelX2
0c0dd82480 * Some changes to activation count and sacrifice source triggers. 2016-04-21 17:13:57 +02:00
LevelX2
06d3b929a2 Merge pull request #1891 from Marco-Marin/master 
Fem + Fixes
 2016-04-21 12:01:57 +02:00
LevelX2
eb960a34ad * Dragon Whelp - Made the activation handling more reusable friendly and object sensitive (zone change counter). 2016-04-21 11:46:02 +02:00
drmDev
181381b262 Prismatic Strands impl 2016-04-20 23:18:21 -04:00
LevelX2
6ff458d86c * Reworked Dragon Whelp activation check. 2016-04-21 00:19:32 +02:00
LevelX2
9cc1c3edd5 * Kindly Stranger - Fixed that it did not allow destroying creature on transform (fixes #1888). 2016-04-20 15:40:15 +02:00
LevelX2
eaae3cc9b0 * Time Spiral storage duals lands - Fixed that the activated ability to remove the counters was not defnied as mana ability. 2016-04-20 13:34:32 +02:00
MarcoMarin
a9c9a98120 resolve conflict for Oubliette and Tawnos Coffin 2016-04-19 14:27:17 -03:00
MarcoMarin
4c25816be1 midway through FEM + fixed Oubliette, Tawnos Coffin 2016-04-19 12:50:48 -03:00
drmDev
7a3c15d8b8 Game of Chaos impl. Kindly Stranger test for bug 2016-04-19 09:24:42 -04:00
spjspj
1c7e3b7022 Merge pull request #1889 from spjspj/master 
spjspj - Add new condition 'SourceHasRemainedInSameZoneCondition'. Adjust
 2016-04-19 20:19:19 +10:00
emerald000
6162d4c80d Added Timesifter. 2016-04-18 23:47:17 -04:00
emerald000
68ee22f8d1 Added Shared Fate. 2016-04-18 17:07:13 -04:00
spjspj
c885f212d3 spjspj - Add new condition 'SourceHasRemainedOnBattlefield' and adjust DL SIlumgar to use it as well (as DL Silumgar was buggy with Ghostly Flicker for example) 
Also implement Preacher (DRK)
 2016-04-19 01:53:04 +10:00
fireshoes
194c817c11 Merge origin/master 2016-04-18 01:25:52 -05:00
fireshoes
3c3a9cc965 Added Water Wurm. 2016-04-18 01:22:03 -05:00
emerald000
3e4a3f79fa Added Grip of Chaos. 2016-04-17 23:55:31 -04:00
emerald000
8823839a42 Added framework method for copying a StackAbility without casting it. 
Modified the effects doing so with the new method.
 2016-04-17 23:55:11 -04:00
emerald000
a4af95d775 Added Thieves' Auction. 
Changed Detain reminder to blue text.
 2016-04-17 19:22:33 -04:00
LevelX2
31e82d1dc4 * Added Brothers Yamazaki and Struggle for Sanity from Champions of Kamigawa. 2016-04-16 12:33:29 +02:00
drmDev
e84c8d47a2 vanish into memory fix 2016-04-15 23:15:07 -04:00
drmDev
5566490b26 Vanish Into Memory implemented 2016-04-15 23:10:16 -04:00
LevelX2
1dbba3f7a9 * Soulbond - Reworked to two triggerd abilities (fixes #1882). 2016-04-16 02:43:52 +02:00
emerald000
a4b3e31bd8 Remove unnecessary stuff in Confusion in the Ranks. 2016-04-15 15:00:17 -04:00
emerald000
8d28883f7c Added Confusion in the Ranks. 2016-04-15 14:53:19 -04:00
Derek M
a1550363d5 Merge pull request #1880 from drmDev/master 
W16 fix. Eldrazi Obligator fix and test
 2016-04-15 12:24:33 -04:00
drmDev
5ab54142de W16 fix. Eldrazi Obligator fix and test 2016-04-15 12:24:04 -04:00
LevelX2
22dbb1ef38 Fixed that no event was send for removing counters from players. 2016-04-15 18:01:38 +02:00
drmDev
e136e409fd [W16] cards added. Still does not show as Standard legal. HELP 2016-04-15 09:15:26 -04:00
LevelX2
2b8f73dbcc * Fixed CMC calculation for transformed cards (fixes #1826). 2016-04-15 14:59:36 +02:00
LevelX2
55dc0f8b6a Merge pull request #1874 from fenhl/brand 
Implement Brand
 2016-04-14 22:33:44 +02:00
drmDev
cce5404a92 Stinkdrinker bandit bug fix and test 2016-04-14 16:03:32 -04:00
Fenhl
2c5083b85d Implement Brand 2016-04-14 19:31:46 +00:00
Fenhl
430ae503c7 Change all line endings to LF 2016-04-14 16:18:01 +00:00
LevelX2
13d9a56b7a * Jace, Unraveler of Secrets - Fixed that the emblem still doesn't counter spells (fixes #1855). 2016-04-14 17:49:08 +02:00
LevelX2
d00f1adf38 * Leeching Sliver - Fixed that the triggered ability did not work if a planswalker was attacked (fixes #1858). 2016-04-14 16:54:04 +02:00
LevelX2
b415d5e116 * Olivia Voldaren - Fixed some wrong tooltip wording (fixes #1868). 2016-04-14 16:29:52 +02:00
LevelX2
ce3c26ab4b * Some minor changes / fixes. 2016-04-14 16:00:56 +02:00
Derek M
b564bf1760 Merge pull request #1867 from fenhl/heliod-god-of-the-sun 
Fix Heliod's token-generating ability not saying “token”
 2016-04-14 08:17:57 -04:00
Derek M
a6dc3d330a Merge pull request #1862 from fenhl/magus-of-the-future 
Fix wording of Magus of the Future ability tooltip
 2016-04-14 08:17:30 -04:00
Fenhl
4906790e32 Fix Heliod's token-generating ability not saying “token” 2016-04-14 10:52:39 +00:00
drmDev
270b9bb5a9 Merge and InduceParanoia impl 2016-04-13 17:59:06 -04:00
Fenhl
72f32e782c Fix Stone-Seeder Hierophant triggering on other players' lands 2016-04-13 17:51:17 +00:00
Fenhl
f42ea89930 Fix wording of Magus of the Future ability tooltip 2016-04-13 16:09:12 +00:00
Marco-Marin
a356cd1649 Merge pull request #1835 from Marco-Marin/master 
First ever card after incorporating the Testing Process: Dwarven Catapult.
Tested from scratch (tho it worked the 1st time, so maybe most previous ones were not too shabby either :))
Also using this to test my learning of new Git CLI commands: "add ." and "add -u" seemed to do the trick.

PS: Nevermind the Oubliette changes, I'm doing a 'poor man's' versioning system to make sure my builds are working. ^_^
 2016-04-12 16:38:05 -03:00
MarcoMarin
a02f6a3c3a Testing Git commands with card: Dwarven Catapult 2016-04-12 16:27:47 -03:00
Derek M
66263e155b Merge pull request #1852 from fenhl/packs-disdain 
Implement Pack's Disdain
 2016-04-12 13:16:53 -04:00
Fenhl
74b5e85a3e Fix continuous effect creation in Pack's Disdain 2016-04-12 16:57:28 +00:00
Fenhl
5d341af554 Fix activated ability of Canopy Crawler 2016-04-12 13:50:32 +00:00
Fenhl
899122a170 Implement Pack's Disdain 2016-04-12 13:45:45 +00:00
drmDev
d707e03807 Tunnel Vision implemented 2016-04-12 09:09:49 -04:00
Jared Hall
3f2611de76 Fixes #1836 2016-04-12 08:16:15 -04:00
spjspj
bc44851b62 spjspj - Implement Kill Switch (NMS) - 
Implemented using a new type of condition 'SourceTappedBeforeUntapStepCondition'
 2016-04-12 11:29:55 +10:00
Derek M
262de17d17 Merge pull request #1847 from drmDev/master 
Earthbind implementation
 2016-04-11 19:55:49 -04:00
drmDev
d735c4e41b Earthbind implementation 2016-04-11 19:55:18 -04:00
Derek M
6775c9bc97 Merge pull request #1846 from drmDev/master 
Champion bug fixes
 2016-04-11 17:07:15 -04:00
drmDev
f2d5462c97 Champion bug fixes 2016-04-11 17:06:14 -04:00
MarcoMarin
7149ecd2dd oubliette difference is blocking me from pulls from origin2 2016-04-11 17:26:32 -03:00
MarcoMarin
318c18fb34 oubliette difference is blocking me from pulls from origin 2016-04-11 17:24:31 -03:00
MarcoMarin
d045d16a20 Oubliette: 
Fixed tooltip(s), and I believe the Auras now come back (modified from working card, so should work).

1st stab at trying to get those Counters back. Not very confident tho, further testing required.
 2016-04-11 16:20:50 -03:00
MarcoMarin
013c506fac Oubliette: 
Fixed tooltip(s), and I believe the Auras now come back (modified from working card, so should work).

1st stab at trying to get those Counters back. Not very confident tho, further testing required.
 2016-04-11 15:01:01 -03:00
Derek M
90507f4c55 Merge pull request #1844 from drmDev/master 
SilentSkimmer and PyreHound bug fixes
 2016-04-11 11:42:18 -04:00
drmDev
57a992649e SilentSkimmer and PyreHound bug fixes 2016-04-11 11:41:55 -04:00
MarcoMarin
7505365425 Merge remote-tracking branch 'upstream/master' 2016-04-11 12:10:34 -03:00
LevelX2
2f4232476e * Changing some Target inheritance to fix AI Target handling (e.g. Loaming Shaman). 2016-04-11 17:00:28 +02:00
drmDev
b0c0ca351c WeirdingWood fix. Gloom and VolcanicEruption impl 2016-04-10 11:19:06 -04:00
LevelX2
386c7168d0 * Dromoka's Command - Fixed that P/T changes resulting of a sacrifice of an enchantment were not applied before the fighting effect was applied. 2016-04-10 10:56:13 +02:00
LevelX2
0cf3ab9d78 * Oath of Nissa - Fixed target selection mot working for AI players. 2016-04-10 10:30:23 +02:00
spjspj
065a202c1d Fix possible NPE for Martyr's Bond 2016-04-10 13:00:44 +10:00
MarcoMarin
a295964b04 Antiquities is complete. (except for antes, banding and reverse polarity) 
27 unique cards, 68 total;
bringing ATQ from 63,53% to 94.12% and ARN to 92.31%

+ Fixed a detail on Oubliette (tho bugs may remain)
+ Added 1 last card to ARN, now that I know about Watchers ;)
 2016-04-09 13:37:11 -03:00
Derek M
1be18a0188 Merge pull request #1834 from drmDev/master 
LightningSurge implemented
 2016-04-09 12:04:35 -04:00
drmDev
fc0197186b LightningSurge implemented 2016-04-09 12:04:15 -04:00
spjspj
9009375bf4 spjspj - Implement Martyr's Bond (CMD) 2016-04-10 01:37:49 +10:00
drmDev
1eae61a752 Millikin and EmptytheCatacombs implemented 2016-04-09 07:35:33 -04:00
Derek M
86528ede16 Merge pull request #1831 from drmDev/master 
Card implementations Epic Struggle, Primitive Etchings
 2016-04-09 05:53:34 -04:00
drmDev
80a0134120 Card implementations Epic Struggle, Primitive Etchings 2016-04-09 05:53:00 -04:00
LevelX2
f51302a780 Merge origin/master 2016-04-09 11:45:05 +02:00
LevelX2
278558c925 * Ghazban Ogre - Fixed various bugs (fixes #1828). 2016-04-09 11:44:35 +02:00
drmDev
f5843a5498 Life Burst card implemented 2016-04-09 05:26:06 -04:00
drmDev
266ba0643e Pariahs Shield implemented 2016-04-09 04:43:10 -04:00
drmDev
e6d36d9523 Vanishing card implemented 2016-04-08 17:13:04 -04:00
drmDev
7c8ac25abc Gelid Shackles implementation. PlayerStub fix 2016-04-08 15:55:25 -04:00
Derek M
aa2b61ad83 Merge pull request #1823 from Marco-Marin/master 
MM reporting for duty! :)
 2016-04-08 11:44:02 -04:00
MarcoMarin
73caa5c869 Revert "Revert "-- Maybe I forgot to commit the file? (yes, it fixed the counters) -- Fixed Uncle Istvan; -- Another batch of cards: 10 unique, 22 total"" 
This reverts commit 342141dfe0f40b6ae1bbef4fd609bd3afc8ebb86.
 2016-04-08 12:09:03 -03:00
MarcoMarin
0403c7f178 Revert "-- Maybe I forgot to commit the file? (yes, it fixed the counters) -- Fixed Uncle Istvan; -- Another batch of cards: 10 unique, 22 total" 
This reverts commit 663e52bf7bf2e5d1e80fc5eb3700fe328d18b5f1.
 2016-04-08 12:04:56 -03:00
MarcoMarin
beb1856542 Maybe I forgot to commit the file? (yes, it fixed the counters) 
fixed Uncle Istvan
Another batch of cards:
 2016-04-08 12:02:11 -03:00
LevelX2
bc4999a698 * Jace, Unraveler of Secrets - Fixed that the emblem did never counter a spell (fixes #1739). 2016-04-08 16:59:30 +02:00
MarcoMarin
31c13f6166 Another batch of 6(14) cards ready. 2016-04-08 11:57:57 -03:00
MarcoMarin
b1ed8378c0 First few cards from new author. 
Compilation is broken tho, because CounterType enum isn't accepting my
new counter for Cyclone.
 2016-04-08 11:54:50 -03:00
Derek M
7190788d65 Merge pull request #1817 from Wehk/master 
Added old cards, and fixed Fallowmage's abiltiy to "may"
 2016-04-08 09:32:15 -04:00
Wehk
ae6383c850 Added old cards, and fixed Fallowsage's ability to "may". 2016-04-08 15:25:45 +02:00