Commit graph

9366 commits

Author SHA1 Message Date
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