github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-29 11:09:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
19797 commits 2 branches 0 tags 782 MiB
Commit graph

11900 commits

Author SHA1 Message Date
Zzooouhh
fe8cbec043 Update IceAge.java 2017-07-23 23:53:20 +02:00
LevelX2
2efc666f8d * Some minor reworks to prevent exceptions. 2017-07-23 23:16:22 +02:00
LevelX2
b948a8255a * Some cleanup for: Fixed a bug that created a endless loop if mana producer were involved, that create mana of any type lands of players could produce. 2017-07-23 22:49:56 +02:00
LevelX2
f67cd391dd * Jandor's Ring - FIxed possible null pointer exception (discard has to be a cost still lacking). 2017-07-23 20:55:57 +02:00
LevelX2
a9e2303f7e * Fixed a bug that created a endless loop if mana producer were involved, that create mana of any type lands of players could produce (fixes ##3374). 2017-07-23 19:34:24 +02:00
LevelX2
c87e992e1d * Wild Evocation - Fixed handling to prevent errors in some cases. 2017-07-23 19:31:59 +02:00
LevelX2
cd6c7623ed * Added missing imports, imports reorg. 2017-07-23 16:29:29 +02:00
LevelX2
464949476c Merge origin/master 2017-07-23 15:00:06 +02:00
LevelX2
4806738cfb * Some more use of StaticFilter objects. 2017-07-23 14:59:13 +02:00
LevelX2
d5f4df7f54 * Some minor changes to return code handling. 2017-07-23 14:57:06 +02:00
spjspj
19d60b60d5 Merge pull request #3728 from spjspj/master 
Implement Mudslide (ICE)
 2017-07-23 22:44:52 +10:00
spjspj
d0d7f7720a Implement Mudslide (ICE) 2017-07-23 22:43:33 +10:00
spjspj
598f8cbf4d Merge pull request #3727 from spjspj/master 
Implement Planar Guide (LGN)
 2017-07-23 22:32:35 +10:00
spjspj
fc2366a668 Implement Planar Guide (LGN) 2017-07-23 22:31:53 +10:00
LevelX2
4c33359fe2 * Some minor changes to logging and return code handling. 2017-07-23 11:06:23 +02:00
LevelX2
94be7cb4da * Grave Betrayal - Reworked card movement and color and subtype applying. 2017-07-23 11:05:32 +02:00
spjspj
79a72c3b93 Merge pull request #3721 from spjspj/master 
Implement War Elemental (MRD)
 2017-07-22 23:04:45 +10:00
spjspj
1668505ee3 Implement War Elemental (MRD) 2017-07-22 23:01:55 +10:00
LevelX2
c6cd713f0d * Mind's Desire - Fixed a problem with playing lands. 2017-07-22 12:09:28 +02:00
Jeff
fb19f257a7 - Added requested card Nix. 2017-07-21 17:11:10 -05:00
Jeff
c7a3801676 - Added requested card Dimensional Breach. 2017-07-21 12:16:54 -05:00
Zzooouhh
1aed985fd5 Implement Daru Spiritualist (#3712) 
* Add files via upload

* Added Daru Spiritualist
 2017-07-21 07:50:43 -05:00
Derek Monturo
521b573ad2 fixes #3707 minds desire npe 2017-07-21 07:29:14 -04:00
igoudt
183e7ba33c Merge https://github.com/magefree/mage 2017-07-21 09:14:42 +02:00
igoudt
777c66efc6 subtypes move for 'B' 2017-07-21 09:14:26 +02:00
Jeff
5ce1052ebc - Added requested card Seedtime. 2017-07-20 14:54:50 -05:00
Jeff
7ffcf39260 - Added requested card Volcano Hellion. 2017-07-20 11:15:58 -05:00
Jeff
44e85ca351 - Refactor Past In Flames 2017-07-20 11:09:59 -05:00
Jeff
ce1ff40ca0 - Null check added 2017-07-20 11:03:02 -05:00
spjspj
c76b6ece7b Merge pull request #3702 from spjspj/master 
Fix  Magnetic Mountain (ARN)
 2017-07-20 18:37:11 +10:00
spjspj
007b9cd849 Fix Magnetic Mountain (ARN) 2017-07-20 18:35:30 +10:00
igoudt
1be691b7f2 Merge https://github.com/magefree/mage 2017-07-20 09:26:45 +02:00
igoudt
422ce699d1 metallic mimic fix 2017-07-20 09:26:29 +02:00
Jeff
1aadbf5b52 - Commit changes to Sets files. 2017-07-19 16:17:52 -05:00
Jeff
c390862a88 - Added requested card Jeweled Amulet. 2017-07-19 11:25:19 -05:00
ciaccona007
6af45f9cff Merge remote-tracking branch 'remotes/upstream/master' 2017-07-19 01:43:01 -04:00
ciaccona007
51e6da563d Implement Pack Hunt 2017-07-19 01:41:53 -04:00
ciaccona007
e18bd6f363 Implement Bifurcate 2017-07-19 01:27:33 -04:00
Jeff
22c18ef2ff - Added requested card War's Toll. 2017-07-18 09:16:05 -05:00
igoudt
105f346ebc subtypes for cards 'A' 2017-07-18 08:55:40 +02:00
igoudt
be062e8b28 remove arcane subtype from Curse of the Cabal 2017-07-18 08:54:44 +02:00
ciaccona007
c49311112e Format Rites of Refusal 2017-07-18 00:57:03 -04:00
ciaccona007
01929de1dc Implement Rites of Refusal 2017-07-18 00:55:12 -04:00
ciaccona007
a99da3d78f Implement Noble Benefactor 2017-07-18 00:27:23 -04:00
ciaccona007
db0d394798 Implement Seedtime 2017-07-17 23:22:29 -04:00
ciaccona007
b9f4d9523c Merge remote-tracking branch 'remotes/upstream/master' 2017-07-17 21:20:08 -04:00
Justin Herlehy
1daad30559 Subtype Update for "Z" Cards. 
Updated the subtypes for all implemented cards in the "Z" package.
Corrected typo in the SubType enum for type BOAR.
Added a varargs function to allow all creature types to be added in a single function call rather than 1-4.
 2017-07-17 17:17:07 -07:00
Justin Herlehy
e2ccc5c87f Subtype Update for "Z" Cards. 
Updated the subtypes for all implemented cards in the "Z" package.
Corrected typo in the SubType enum for type BOAR.
Added a varargs function to allow all creature types to be added in a single function call rather than 1-4.
 2017-07-17 17:15:48 -07:00
ciaccona007
a76d1f2097 Begin implementation of Seedtime 2017-07-17 00:14:11 -04:00
ciaccona007
3d24f0a0de Merge remote-tracking branch 'remotes/upstream/master' 2017-07-16 21:47:25 -04:00
ingmargoudt
09f0c9ad97 huge rework on subtypes (#3668) 
* huge rework on subtypes

* update for coat of arms

* fix test
 2017-07-16 16:57:39 -05:00
ciaccona007
3e4809b224 Merge remote-tracking branch 'remotes/upstream/master' 2017-07-16 16:38:29 -04:00
someAnonymousUser
81fb4b5d92 Curse of the Cabal (#3684) 
* Create CurseOfTheCabal.java

* Update TimeSpiral.java
 2017-07-16 15:30:59 -05:00
ciaccona007
659c027044 Remove imports from Kindle the Carnage 2017-07-16 16:13:04 -04:00
ciaccona007
8958394779 Implement Kindle the Carnage 2017-07-16 16:04:51 -04:00
LevelX2
ccc4c00ace * Flameshadow Conjuring - Fixed that the {R} could not be paid during resolution (fixes #3559). 2017-07-16 19:25:33 +02:00
ciaccona007
95d0fe8802 Merge remote-tracking branch 'remotes/upstream/master' 2017-07-16 13:10:43 -04:00
LevelX2
87c70043f7 * Terastodon - Fixed that destroying Parallel Lives still doubled the tokens (fixes #3651). 2017-07-16 19:09:19 +02:00
Achilles
5cebe20768 - Fixed bug #3656 2017-07-16 10:31:22 -05:00
LevelX2
20c8c1a9c9 * Fixed that Persist did not working with Hapatra, Vizier of Poisons and Obelisk Spider (fixes #3679). 2017-07-16 15:58:50 +02:00
LevelX2
8c2388644c * Added a test. 2017-07-16 14:58:39 +02:00
LevelX2
ad91cd91ad * Sand Strangler - Fixed that the triggered ability was not optional. 2017-07-16 14:20:34 +02:00
igoudt
905829561e talk to interfaces rather than implementations 2017-07-16 11:08:09 +02:00
ciaccona007
dfa4bad8c5 Merge remote-tracking branch 'remotes/upstream/master' 2017-07-15 23:24:03 -04:00
ingmargoudt
0c80172c2d Merge pull request #3683 from skeate/patch-1 
Update WrensRunPackmaster.java
 2017-07-15 23:32:38 +02:00
Achilles
d10f547879 - Fixed bug #3678 2017-07-15 15:38:06 -05:00
Jonathan Skeate
9e797a7593 Update WrensRunPackmaster.java 
Wolves get deathtouch, not walls
 2017-07-15 15:46:04 -04:00
Achilles
2d4b044bde - Fixed bug #3680 2017-07-15 09:24:53 -05:00
Achilles
11e3c9f729 - Fixed bug #3677 2017-07-15 09:20:00 -05:00
tamaroth
e0a61b9918 Create token for a commander that instead of being exiled by (#3675) 
Curse of the Swine was put into the command zone. #3669
 2017-07-14 15:44:07 -05:00
Jeff
383841cdfb - Fixed bug #3665 2017-07-14 11:27:44 -05:00
Jeff
b7e44f0cce - Added requested card Temporal Aperture. 2017-07-14 09:34:46 -05:00
spjspj
2bc077677c Fix for Soul Barrier 2017-07-14 17:03:54 +10:00
ciaccona007
58fa1305d4 Remove debug code from Daru Spiritualist 2017-07-13 22:23:07 -04:00
ciaccona007
3cab9814bd Implement Daru Spiritualist 2017-07-13 20:31:06 -04:00
Jeff
391e0bac89 - Fixed cost of Breathstealer's Crypt 2017-07-12 17:13:19 -05:00
Jeff
d46919563f - Little fix to Twinning Glass. 2017-07-12 15:54:42 -05:00
Jeff
3efb5c3e2a - Commit changes to Sets files. 2017-07-12 15:48:00 -05:00
Jeff
7bb5721880 - Added requested card Breathstealer's Crypt. 2017-07-12 15:41:39 -05:00
spjspj
db4dc81d5f Merge pull request #3664 from spjspj/master 
Minor fix
 2017-07-12 13:51:43 +10:00
spjspj
02b0fa3d54 Minor fix 2017-07-12 13:51:06 +10:00
spjspj
b38494a549 Merge pull request #3661 from spjspj/master 
Implement Memory Crystal (EXO)
 2017-07-12 12:17:03 +10:00
spjspj
4a6b2e8db3 Implement Memory Crystal (EXO) 2017-07-12 12:16:15 +10:00
Jeff
e26633983f - Added Twinning Glass, Hunt Down, and Captivating Glance. [Lorwyn] 
Lorwyn set is 100%.
 2017-07-11 16:53:01 -05:00
Jeff
7e36618954 - LKI zone for Nettlevine Blight. 2017-07-11 13:02:43 -05:00
Jeff
95246e4da6 - Added Nettlevine Blight [Lorwyn] 2017-07-11 12:12:55 -05:00
spjspj
8255fb6434 Merge pull request #3654 from spjspj/master 
Implement Memory Crystal (EXO)
 2017-07-11 22:31:30 +10:00
spjspj
e9a43758a8 Implement Memory Crystal (EXO) 2017-07-11 22:30:35 +10:00
spjspj
eda0afb3d0 Merge pull request #3653 from spjspj/master 
Fix for Kynaios And Tiro of Meletis
 2017-07-11 17:07:57 +10:00
spjspj
e4d92cde48 Fix for Kynaios And Tiro of Meletis 2017-07-11 17:06:27 +10:00
fireshoes
aa35462a6f Merge origin/master 2017-07-10 20:21:20 -05:00
fireshoes
11bbb6209f Added SDCC 2017 planeswalkers. 2017-07-10 20:15:45 -05:00
igoudt
f2aa948c74 refactor filters to staticfilters 2017-07-11 00:18:41 +02:00
igoudt
b7159d7d2c update spellfilters to staticfilters 2017-07-11 00:18:41 +02:00
ciaccona007
e2f6624cc1 Merge remote-tracking branch 'remotes/upstream/master' 2017-07-10 14:22:19 -04:00
Jeff
ba5c216146 - Fixed issue #3646 2017-07-10 11:48:11 -05:00
Jeff
dd94d33301 - Fixed controller/owner issue with Abandoned Sarcophagus. 2017-07-10 11:33:52 -05:00
ciaccona007
a1e7c00e21 Merge remote-tracking branch 'remotes/upstream/master' 2017-07-10 11:44:54 -04:00
ciaccona007
c7c58ead8e Add author for Festering Wound 2017-07-10 11:17:37 -04:00
LevelX2
b50d557c75 * Ral Zarek - Reverted workaround fix and fixed the cause of the problem the untap did not work. 2017-07-10 17:17:01 +02:00
ciaccona007
81ac455fab Implement Festering Wound 2017-07-10 10:42:51 -04:00
Jeff
8ebc0ab72f - Fixed issue #3634 2017-07-10 09:17:35 -05:00
ciaccona007
d803ebc21a Remove imports from Song of Serenity 2017-07-10 09:58:32 -04:00
ciaccona007
f10e4fe51d Merge remote-tracking branch 'remotes/upstream/master' 2017-07-10 09:46:17 -04:00
ciaccona007
726c98666f Implement Song of Serenity 2017-07-10 09:37:18 -04:00
LevelX2
5d79823c93 Merge pull request #3644 from ingmargoudt/master 
use more staticfilters, fix jsoncard class
 2017-07-10 13:16:53 +02:00
spjspj
2b7a0eee68 Merge pull request #3645 from spjspj/master 
Refactor
 2017-07-10 20:43:51 +10:00
spjspj
568f561c21 Refactor 2017-07-10 20:30:19 +10:00
igoudt
11f040b884 use more staticfilters, fix jsoncard class 2017-07-10 12:25:33 +02:00
spjspj
a57118ffa2 Merge pull request #3643 from spjspj/master 
Further fix for Solemnity (tested with Dark Depths, Ichor Rats, Sunse…
 2017-07-10 19:53:52 +10:00
spjspj
48320bce9a Further fix for Solemnity (tested with Dark Depths, Ichor Rats, Sunset Pyramid, Crystalline Crawler, Infect combat damage, Undying creatures, Persist creatures, flip planeswalkers, normal planeswalkers, Black Sun's Zenith, Vivid land, Scavenging Ooze) 2017-07-10 19:53:02 +10:00
ciaccona007
df98616e54 Implement Reverent Mantra 2017-07-10 00:38:38 -04:00
ciaccona007
7e0a7de77d Fix Gate to the Afterlife's activated ability looting 2017-07-09 23:27:46 -04:00
LevelX2
4f33b6b7c1 * Fraying Sanity - Fixed wrong rarity (was set to uncommon and is chnaged to rare now). 2017-07-09 23:33:28 +02:00
LevelX2
747c997946 * Rhonas's Stalwart - Fixed that it is incorrectly able to be blocked after exerting it. 2017-07-09 20:50:27 +02:00
LevelX2
e8f4b8947e * Stinkdrinker Bandit - Fixed that it applies boost more than once in multiplayer games (fixes #3542). 2017-07-09 20:43:06 +02:00
LevelX2
a28dc88479 * Port Town - Fixed that it did no longer work with basic Plains (fixes #3633). 2017-07-09 19:22:24 +02:00
LevelX2
88a8612b06 Merge origin/master 2017-07-09 19:05:19 +02:00
LevelX2
8b82e240c8 Fixed some problems that searching for split cards did not always work (e.g. Surgical Extraction). 2017-07-09 19:05:03 +02:00
igoudt
d6c8356ded Merge https://github.com/magefree/mage 2017-07-09 16:22:01 +02:00
igoudt
6b9e8274ce fix subtypes 2017-07-09 16:21:48 +02:00
LevelX2
ad645b0af5 Minor fix. 2017-07-09 15:42:47 +02:00
LevelX2
37ffeac23d * Instill Energy - Fixed that the enchanted creature could not attack (but should be able) the turn it came into play. 2017-07-09 15:32:52 +02:00
LevelX2
c61819000a Fixed wrong card number of Flux in the Weatherlight set (fixes #3628). 2017-07-09 14:56:33 +02:00
LevelX2
c35366b1f9 * Tragic Arrogance - Fixed a problem with permanents selecting (fixes #3617). 2017-07-09 14:49:09 +02:00
LevelX2
068147d286 * Pride Sovereign - Fixed wrong boost calculation. 2017-07-09 11:22:13 +02:00
LevelX2
f54c2562a8 * Unesh, Criosphinx Sovereign - Fixed that it did not trigger if a token of it came into play without the subtype Sphinx. 2017-07-09 11:16:03 +02:00
LevelX2
c56e4aefeb * Suq'Ata Firewalker - Fixed that it was incorrectly put into set VIS instead of MIR. 2017-07-09 10:55:17 +02:00
LevelX2
98b2fe1063 * Ninth Edition Box - Fixed error in card spelling of Coral Eel (was Corel Eel). 2017-07-09 10:50:29 +02:00
LevelX2
1c37cb6c95 * Planecahse Antology - Fixed wrong card name of card #151 Mountain instead of Forest. 2017-07-09 10:48:12 +02:00
LevelX2
857e1f82e5 * Raving Dead - Fixed that the damage from the triggered ability was rounded up instead of rounded down. 2017-07-09 10:35:30 +02:00
ciaccona007
2d4c9c8bbe Fix text in HOU gods 2017-07-09 01:06:05 -04:00
fireshoes
612a15d6c8 Fixed Sinuous Striker's missing discard cost for eternalize ability 2017-07-08 21:04:45 -05:00
fireshoes
198b0891ab Merge origin/master 2017-07-08 20:53:47 -05:00
fireshoes
9c3910a2ff Fixed the Scarab God's return to hand trigger timing. 2017-07-08 20:44:26 -05:00
Achilles
64ac4a695b - Fixed cost of Steward of Solidarity 2017-07-08 20:41:12 -05:00
LevelX2
8e666c9403 Xmage 1.4.24.V1 2017-07-09 01:29:26 +02:00
LevelX2
da6a4bd614 * Fraying Sanity - Fixed possible null pointer exception. 2017-07-09 00:25:17 +02:00
LevelX2
2c5dfef315 * Imaginary Threats - Fixed that the creatures of the target player were not forced to attack. 2017-07-09 00:13:14 +02:00
LevelX2
4af878fad2 * Abandoned Sarcophagus - Fixed infinite loop when a creature with cycling dies during combat with Abandoned Sarcophagus on the battlefield (fixes #3619). 2017-07-09 00:00:55 +02:00
LevelX2
99925da80e * Pride Sovereign - Fixed that it also boosted for the Pride Sovereign itself. Fixed tooltip text. 2017-07-08 23:38:47 +02:00
LevelX2
1911b91a82 * Torment of Scarabs - Some fixes to try to solve a problem in games beyond the first in a match. 2017-07-08 23:33:26 +02:00
LevelX2
c42841196f Some minor fixes. 2017-07-08 23:17:41 +02:00
LevelX2
77d9aa0315 Merge pull request #3621 from ciaccona007/master 
Implement 3 new cards and fix text in Hazoret's Undying Fury (HOU)
 2017-07-08 23:05:11 +02:00
LevelX2
a75dd8f158 Vizier of the True - Fixed that the triggered ability wrongly also triggered for all players exerting a creature. 2017-07-08 23:03:05 +02:00
LevelX2
f22bf275ab [HOU] Grind // Dust - Fixed wrong tooltip text of Dust. 2017-07-08 22:57:30 +02:00
LevelX2
57e2576907 [HOU] Tenacious Hunter - Fixed that -1/-1 counters on creatures of other players did not activate the ability. 2017-07-08 22:52:20 +02:00
ciaccona007
40cafac1c2 Fix Outcome in Sky Swallower's effect 2017-07-08 16:19:11 -04:00
ciaccona007
8ed18101eb Merge remote-tracking branch 'remotes/upstream/master' 2017-07-08 16:15:08 -04:00
LevelX2
50e5f0b332 Merge pull request #3620 from marthinwurer/master 
Fixed Historical Type 2 Issues #3417.
 2017-07-08 22:11:35 +02:00
ciaccona007
b7ed8f133f Merge upstream master 2017-07-08 16:09:47 -04:00
ciaccona007
96e8802006 Fix Outcome in Mana Vapors' effect 2017-07-08 16:05:43 -04:00
ciaccona007
e6b22b4bcd Fix filter in Mana Vapors 2017-07-08 15:22:09 -04:00
ciaccona007
4748d723ae Fix text on Hazoret's Undying Fury 2017-07-08 15:20:59 -04:00
Benjamin Maitland
1869777634 Fixed bug Historical Type 2 Issues #3417. 
Shards of Alara had an incorrect release date.
Nemisis had the wrong set code in the hardcoded standards.
 2017-07-08 14:54:44 -04:00
Lazar
1e40cbf7f1 fixed FeralProwler cost 2017-07-08 19:11:00 +02:00
Imagery-Wizard
43b47690c5 Add 3 cards 2017-07-08 12:39:01 -04:00
Imagery-Wizard
ee2705a899 Merge upstream master 2017-07-08 12:35:49 -04:00
Imagery-Wizard
c62f73f8a8 Merge remote-tracking branch 'remotes/origin/master' 2017-07-08 12:31:08 -04:00
Imagery-Wizard
41a600a17e Add 2017-07-08 12:29:40 -04:00
spjspj
e408cb84ab Merge pull request #3616 from spjspj/master 
Fix for Solemnity (tested with Dark Depths, Ichor Rats, Sunset Pyrami…
 2017-07-09 02:21:20 +10:00
spjspj
fad8a31395 Fix for Solemnity (tested with Dark Depths, Ichor Rats, Sunset Pyramid, Crystalline Crawler, Infect combat damage) 2017-07-09 02:20:14 +10:00
LevelX2
16e7e3a346 [HOU] Sunset Pyramid - Fixed second activated ability not using correctly the Scry effect. 2017-07-08 18:09:42 +02:00
LevelX2
850e052bc7 Merge origin/master 2017-07-08 16:34:35 +02:00
LevelX2
7d911ae803 XMage 1.4.24V0 2017-07-08 16:33:09 +02:00
spjspj
a4a8201ec2 Merge pull request #3613 from spjspj/master 
Minor refactor
 2017-07-08 23:54:37 +10:00
LevelX2
c1c224c7ff [HOU] Some fixes. 2017-07-08 15:53:50 +02:00
spjspj
0afaa5c59c Minor refactor 2017-07-08 23:53:17 +10:00
Achilles
1fddddcafa - Little refactor 2017-07-07 21:02:30 -05:00
spjspj
16e732d950 Merge branch 'master' into master 2017-07-08 11:20:09 +10:00
Matthew Zulch
51595dbedf Act of Heroism fixes (#3608) 
* Adding test case for Act of Heroism

* Fixing Act of Heroism mana cost

* Adding can block additional creature effect that applies to spell/ability target rather than source

* Updating Act of Heroism to use new effect

* Removing redundant assertion, adding some comments
 2017-07-07 19:53:06 -05:00
Lazar
af79f02ac0 Apocalypsedemon (#3597) 
* ammit eternal impl + tested

* apocalpyse demon impl + test

* branch mess up

* cleanup

* added effect text

* removed existing cards
 2017-07-07 19:52:30 -05:00
Lazar
0792848f98 added couple lands (#3599) 
* added couple lands

* moved effect to own class
 2017-07-07 18:29:31 -05:00
Achilles
667dcb68af - Made the storage key unique 2017-07-07 17:57:28 -05:00
Jeff
128e25248f - Refactored Abandoned Sarcophagus. 2017-07-07 16:40:26 -05:00
Jeff
525652d41e - Fixed Imminent Doom. 2017-07-07 15:49:16 -05:00
fireshoes
45d03370ec Updated Masterpiece Series Amonkhet. 2017-07-07 14:48:26 -05:00
fireshoes
a1c574bfda Added Planechase Anthology, updated Media Inserts and Judge Promos 2017-07-07 14:27:29 -05:00
Jeff
ed761f824d - Added Imminent Doom. [HOU] 2017-07-07 13:50:14 -05:00
Jeff
4d87821497 - Added Abandoned Sarcophagus. [HOU] 2017-07-07 09:23:43 -05:00
fireshoes
9284bbe6f3 Merge 2017-07-07 01:33:20 -05:00
fireshoes
160647c7cb [HOU] Added several cards 2017-07-07 01:11:27 -05:00
emerald000
e8c1def9b0 [HOU] Added Nimble Obstructionist. 2017-07-06 23:00:37 -04:00
fireshoes
8a4aa57f06 Unstash? 2017-07-06 21:54:13 -05:00
fireshoes
42810944f3 Commit merge 2017-07-06 21:29:21 -05:00
Justin Herlehy
53cb5ae478 Fix for Giedon of the Trials emblem. 
Resolves #3179
 2017-07-06 13:01:47 -07:00
Jeff
90be56dde9 - Fixed the trigger phase in God-Pharaoh's Gift. 2017-07-05 16:53:44 -05:00
Jeff
d861714177 - Added God-Pharaoh's Gift. [HOU] 2017-07-05 16:15:29 -05:00
Jeff
f1cc879edd - Added Ifnir Deadlands. [HOU] 2017-07-05 14:46:13 -05:00
Jeff
05c4c558d0 - Added Graven Abomination. [HOU] 2017-07-05 12:06:04 -05:00
spjspj
74dc8994f3 Merge pull request #3605 from spjspj/master 
Implement Nissa's Encouragement (HOU)
 2017-07-06 01:59:54 +10:00
spjspj
3a9b2b2243 Implement Nissa's Encouragement (HOU) 2017-07-06 01:59:07 +10:00
ciaccona007
e211111097 Implement 13 HOU cards 2017-07-05 10:20:57 -04:00
Lazar
5b50165338 banewhip punisher implementation (#3598) 2017-07-05 09:09:30 -05:00
Lazar
ec9564984d ammit eternal impl + tested (#3595) 
* ammit eternal impl + tested

* fixed combat damage to player
 2017-07-05 09:05:15 -05:00
spjspj
b0d3d15c80 Merge pull request #3602 from spjspj/master 
Implement 1 card (HOU)
 2017-07-05 23:25:14 +10:00
spjspj
22a192fb3c Implement 1 card (HOU) 2017-07-05 23:24:37 +10:00
spjspj
387e66883d Merge pull request #3601 from spjspj/master 
Implement 1 card (HOU)
 2017-07-05 22:46:29 +10:00
spjspj
f3fb7a522e Implement 1 card (HOU) 2017-07-05 22:45:52 +10:00
fireshoes
6286b12278 update HOU 2017-07-05 01:08:10 -05:00
LevelX2
f5c925d26c [HOU] Added Imaginary Threats. 2017-07-05 07:58:46 +02:00
LevelX2
80fde88cae [HOU] Added Hour of Promise.. 2017-07-05 07:15:57 +02:00
ciaccona007
23e6be8ca9 Implement 14 HOU cards 2017-07-05 00:35:45 -04:00
spjspj
29eb1f478f Implement 2 cards (HOU) 2017-07-05 07:53:59 +10:00
ingmargoudt
3c874b47f4 Merge pull request #3593 from ciaccona007/master 
Implement 2 HOU cards
 2017-07-04 21:57:57 +02:00
igoudt
8f0e043361 added Magmaroth (HOU) 2017-07-04 21:55:24 +02:00
igoudt
1afcebc51a change subtype viashivan dragon 2017-07-04 21:54:43 +02:00
igoudt
9fb04dc33c manticore elemental 2017-07-04 21:54:24 +02:00
igoudt
5bb1311a6e added Magmaroth (HOU) 2017-07-04 21:53:43 +02:00
igoudt
1792d98b1a fix ability text 2017-07-04 21:42:05 +02:00
igoudt
a6081e1481 added Manticore Elemental (HOU) 2017-07-04 21:41:44 +02:00
igoudt
f79b534950 granitic titan (HOU) 2017-07-04 20:52:20 +02:00
igoudt
dbd06d7e78 gift of strength (HOU) 2017-07-04 20:47:21 +02:00
ciaccona007
34319b6f60 Implement 2 HOU cards 2017-07-04 14:20:17 -04:00
emerald000
38c2878962 Fix Hour of Devastation set file errors. 2017-07-04 13:24:57 -04:00
emerald000
a219df9ebe Merge commit. 2017-07-04 13:01:50 -04:00
emerald000
fe95fc3b43 [HOU] Added 5 blue cards. 
Aven Reedstalker, Countervailing Winds, Cunning Survivor, Eternal of Harsh Truths and Hour of Eternity.
 2017-07-04 12:57:06 -04:00
ingmargoudt
ae374063c1 Merge branch 'master' into master 2017-07-04 17:57:38 +02:00
ciaccona007
6baa978a48 Implement 2 cards 2017-07-04 11:49:11 -04:00
ciaccona007
4b28f5c994 Remove duplicates 2017-07-04 11:46:58 -04:00
ciaccona007
95c5264cb2 Implement Harrier Naga 2017-07-04 09:38:18 -04:00
ciaccona007
a80bf19dc4 Use {this} in text 2017-07-04 08:19:45 -04:00
spjspj
60ef4ce0da Implement 1 cards (HOU) 2017-07-04 22:08:05 +10:00
spjspj
1dbecd3d3e Implement 1 cards (HOU) 2017-07-04 19:29:00 +10:00
spjspj
c35a182bf1 Implement 2 cards (HOU) Fix for Bontu's Last Reckoning 2017-07-04 19:00:17 +10:00
spjspj
f5024dcf39 Implement 1 card (HOU) 2017-07-04 18:36:35 +10:00
LevelX2
db10a53dd2 [HOU] Added 4 cards, some fixes. 2017-07-04 06:50:59 +02:00
ciaccona007
d653b997cc Update HOU.java with new cards 2017-07-03 23:54:02 -04:00
ciaccona007
7a44a35f23 Implement Dunes of the Dead 2017-07-03 23:52:49 -04:00
ciaccona007
a598e08301 Implement Crash Through 2017-07-03 23:35:12 -04:00
ciaccona007
71e4f9034a Implement Countervailing Winds 2017-07-03 23:24:23 -04:00
ciaccona007
f1010bd0b7 Implement Blur of Blades 2017-07-03 23:09:16 -04:00
ciaccona007
f19dc1e0e8 Implement Bitterbow Sharpshooters 2017-07-03 22:57:04 -04:00
ciaccona007
b4ad0c5f4a Implement Aven Reedstalker 2017-07-03 22:54:56 -04:00
ciaccona007
86bc162c83 Implement Devotee of Strength 2017-07-03 22:50:07 -04:00
ciaccona007
3b3f2b10ac Add Devotee of Strength to HOU.java 2017-07-03 22:49:28 -04:00
ciaccona007
281841e487 Implement Aerial Guide 2017-07-03 22:35:05 -04:00
Imagery-Wizard
f8ec345414 Add Aerial Guide to HourOfDevastation.java 2017-07-03 18:32:50 -04:00
Imagery-Wizard
e9a04f53b5 Implement Aerial Guide 2017-07-03 18:32:11 -04:00
spjspj
8b58fb6b37 Merge pull request #3580 from spjspj/master 
Implement 1 HOU card
 2017-07-04 07:46:40 +10:00
spjspj
70c9163d6a Fix 1 card (HOU) 2017-07-04 07:44:02 +10:00
spjspj
09ed2370ba Implement 1 card (HOU) 2017-07-04 07:25:41 +10:00
igoudt
3e393a83bc Merge https://github.com/magefree/mage into hou 2017-07-03 23:17:40 +02:00
igoudt
2c17bbf006 hou cards 2017-07-03 23:17:17 +02:00
emerald000
4f281eeb1d [HOU] Added 3 white cards. 
Crested Sunmare, God-Pharaoh's Faithful and Mummy Paramount.
Fix Wayward Servant not counting Tribals.
Remove Consign // Oblivion as it was incomplete.
 2017-07-03 16:50:38 -04:00
spjspj
b34d2318fe Merge branch 'master' into master 2017-07-03 23:50:54 +10:00
spjspj
610be4ed2c Merge pull request #3565 from nickymikail/master 
Oketra's Avenger
 2017-07-03 23:44:42 +10:00
spjspj
1e1321be14 Implement 1 card (HOU) 2017-07-03 23:43:23 +10:00
spjspj
422afec3fe Implement 1 card (HOU) 2017-07-03 20:58:42 +10:00
spjspj
01ae2c0e6b Implement 1 card (HOU) 2017-07-03 20:38:42 +10:00
spjspj
6ba9edb799 Merge branch 'master' into master 2017-07-03 20:26:46 +10:00
spjspj
c1f7a10867 Implement 1 card (HOU) 2017-07-03 20:25:04 +10:00
spjspj
519c92a34b Merge pull request #3574 from spjspj/master 
Implement 5 cards (HOU)
 2017-07-03 19:44:00 +10:00
spjspj
7418c01bed Implement 5 cards (HOU) 2017-07-03 19:42:53 +10:00
LevelX2
a86f930117 Merge origin/master 2017-07-03 08:59:25 +02:00
LevelX2
a3ea1a8f49 [HOU] Added 2 cards. 2017-07-03 08:58:48 +02:00
nickymikail
3debc25a56 suggested fixes 2017-07-02 10:04:34 -07:00
spjspj
d8dfda2c25 Merge pull request #3572 from spjspj/master 
Implement 2 cards (HOU)
 2017-07-03 00:23:54 +10:00
spjspj
c3c09eab2c Implement 2 cards (HOU) 2017-07-03 00:23:05 +10:00
Archer262
a8235e414a Dutiful Servants 2017-07-02 10:04:21 -04:00
Archer262
e64a7ad5f7 Djeru's Renunciation 2017-07-02 10:02:17 -04:00
Archer262
fe921f4d00 Disposal Mummy 2017-07-02 09:57:02 -04:00
Archer262
aa1f401a25 Dauntless Aven 2017-07-02 09:45:50 -04:00
igoudt
7d8ff852f6 Merge https://github.com/magefree/mage 2017-07-02 15:39:36 +02:00
igoudt
7028f8ee3d implement Chaos Maw 2017-07-02 15:36:18 +02:00
Archer262
126a95bd1c Aven of Enduring Hope 2017-07-02 08:58:37 -04:00
spjspj
75cb28374b Merge pull request #3571 from spjspj/master 
Implement 2 cards (HOU)
 2017-07-02 22:48:58 +10:00
spjspj
e0464635c4 Implement 2 cards (HOU) 2017-07-02 22:48:00 +10:00
Archer262
310ac060e2 Format Fix 2017-07-02 08:32:17 -04:00
igoudt
e302e5f302 added dutiful servants, rampagin hippo, scrounger of souls 2017-07-02 13:54:10 +02:00
igoudt
b573d72883 added UT, fix small bug on Hour of Revelation 2017-07-02 13:08:03 +02:00
spjspj
dac9f4f4a8 Implement Tragic Lesson (HOU) 2017-07-02 17:11:48 +10:00
Archer262
891cf38a3b Act Of Heroism 2017-07-02 00:19:17 -04:00
spjspj
a1dcaa6a89 Implement 2 HOU cards 2017-07-02 13:49:33 +10:00
Archer262
3cd5309317 Merge pull request #1 from magefree/master 
Merge Update
 2017-07-01 22:47:14 -04:00
spjspj
4a29f7a0f0 Implement Vizier of the Anointed (HOU) 2017-07-02 12:46:06 +10:00
spjspj
2b4bf16cec Implement 2 HOU cards 2017-07-02 12:15:05 +10:00
Archer262
c6291316cd Added Beneath the Sands [HOU] 2017-07-01 22:14:50 -04:00
spjspj
d66663191c HOU - 3 split cards already implemented 2017-07-02 11:18:55 +10:00
nickymikail
186fdb0cac Ruin Rat 2017-07-01 16:15:58 -07:00
nickymikail
f80bcfdfa2 Lurching Rotbeast 2017-07-01 15:02:15 -07:00
nickymikail
81de1f5e65 Oketra's Avenger 2017-07-01 14:43:47 -07:00
spjspj
0bfcd24a8f Implement 1 cards (HOU) 2017-07-02 00:19:38 +10:00
spjspj
7d9886dd98 Implement 3 cards (HOU) 2017-07-02 00:08:39 +10:00
spjspj
3ebb508b94 Implement Sidewinder Naga (HOU) (and add some reprints) 2017-07-01 23:02:34 +10:00
Jeff
87b0b95036 - Text fix. 2017-06-30 17:15:37 -05:00
Jeff
67415c0faf - Added Fraying Sanity. [HOU] 2017-06-30 17:10:02 -05:00
Jeff
ade4e01a77 - Added Gilded Cerodon. [HOU] 2017-06-30 11:25:51 -05:00
spjspj
68d27cd773 Merge branch 'master' into master 2017-06-30 23:52:21 +10:00
spjspj
57caa02091 Implement Sunset Pyramid (HOU) 2017-06-30 23:40:19 +10:00
Jeff
0eb054599a - Added Fervent Paincaster. [HOU] 2017-06-30 08:24:29 -05:00
LevelX2
f1e3bcfd01 Merge origin/master 2017-06-30 15:05:32 +02:00
LevelX2
77af24485b [HOU] Added 3 split cards. 2017-06-30 15:04:56 +02:00
Jeff
5453172953 - Fixed a card name. 2017-06-30 08:04:05 -05:00
Jeff
775f50fe6c - Little refactor. 2017-06-29 16:57:32 -05:00
Jeff
130f5093de - Added Earthshaker Khenra. [HOU] 2017-06-29 16:45:26 -05:00
Jeff
3f53e5fee5 - Added Crook of Comdemnation. [HOU] 2017-06-29 15:26:52 -05:00
LevelX2
970c556557 Merge origin/master 2017-06-29 17:56:15 +02:00
LevelX2
c8e1a9d854 [HOU] Added 4 cards. 2017-06-29 17:55:48 +02:00
LevelX2
74d7bb17c3 Merge pull request #3546 from lilhomie96/master 
eighth / ninth edition box set
 2017-06-29 15:24:15 +02:00
spjspj
3b1fd8a955 Merge pull request #3556 from spjspj/master 
Implement Uncage The Menagerie (HOU)
 2017-06-29 22:57:31 +10:00
spjspj
d43197c0cc Implement Uncage The Menagerie (HOU) 2017-06-29 22:56:06 +10:00
igoudt
b7badc49cf Merge https://github.com/magefree/mage 2017-06-29 12:21:55 +02:00
igoudt
a72fe69018 fixes #3537 2017-06-29 12:21:40 +02:00
spjspj
d4a76bb381 HOU ChampionOfWits 2017-06-29 15:44:54 +10:00
lilhomie96
a450cf8ed9 Ninth Edition Box fixed Ninth Edition 2017-06-28 22:44:11 -05:00
spjspj
2b24d95ac5 HOU ChampionOfWits 2017-06-29 09:44:54 +10:00
Jeff
d296934c03 - Fixed Bug #3539 2017-06-28 17:02:32 -05:00
Jeff
d58a438ba9 - Fixed Bug #3541. Nomad Mythmaker. 2017-06-28 16:33:26 -05:00
Jeff
b39c61eff3 - Added Chaosphere, Goblin Shrine, and Kudzu. All requested. 2017-06-28 14:44:28 -05:00
LevelX2
c11d77e28e Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/HourOfDevastation.java
 2017-06-28 17:07:04 +02:00
LevelX2
886022fd19 [HOU] Added 4 cards and some fixes. 2017-06-28 17:03:26 +02:00
spjspj
afa0acd3f4 Implement 2 cards (HOU) 2017-06-28 22:50:31 +10:00
spjspj
8d91cff617 Implement Avid Reclaimer (HOU) 2017-06-28 18:41:09 +10:00
emerald000
130a123052 Remove useless parameter of ExertSourceCost. 2017-06-27 23:07:24 -04:00
lilhomie96
892fb8c70d Merge pull request #1 from magefree/master 
a
 2017-06-27 13:50:15 -05:00
LevelX2
feec4269eb Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/HourOfDevastation.java
 2017-06-27 17:37:37 +02:00
LevelX2
e6ce3e168a [HOU] Added 4 white cards and some fixes. 2017-06-27 17:29:51 +02:00
spjspj
6d35de829f Implement The Locust God (HOU) 2017-06-27 21:32:14 +10:00
spjspj
d95bd421fc Implement The Locust God (HOU) 2017-06-27 21:16:27 +10:00
spjspj
34bde8a61a Implement full art basics (HOU) 2017-06-27 20:21:33 +10:00
lilhomie96
de530f3025 eighth edition box set 2017-06-27 01:33:59 -05:00
lilhomie96
ff5ce7fea0 Delete EighthEditionBox.java 2017-06-26 22:42:26 -05:00
lilhomie96
f8465d3671 eighth edition box set 
7 cards
 2017-06-26 22:10:29 -05:00
spjspj
dae7530155 Merge branch 'master' into master 2017-06-26 23:16:50 +10:00
spjspj
64524a8c18 Implement The Scarab God (HOU) 2017-06-26 23:13:48 +10:00
emerald000
3388fce4c1 [HOU] Added Desert's Hold. 
Implemented OrCondition.
 2017-06-26 08:26:02 -04:00
emerald000
6ee570d5e7 [HOU] Added Angel of Condemnation. 
Implemented ExertSourceCost.
 2017-06-26 07:31:06 -04:00
spjspj
2681091bf2 Implement The Scorpion God (HOU) 2017-06-25 22:57:39 +10:00
spjspj
9aa7829010 Implement The Scorpion God (HOU) 2017-06-25 22:38:08 +10:00
spjspj
754b2bdfaf Implement The Scorpion God (HOU) + Fix for Unesh 2017-06-25 22:30:55 +10:00
spjspj
fc0b8ec9cb Merge branch 'master' into master 2017-06-25 21:35:37 +10:00
spjspj
67ce816381 Implement Unesh (HOU) 2017-06-25 21:33:06 +10:00
spjspj
cc368c3e1d Implement 2 cards from (HOU) 2017-06-25 21:31:12 +10:00
spjspj
8285f387db Implement Vizier of the True (HOU) 2017-06-25 20:09:50 +10:00
spjspj
e5611d1571 Merge pull request #3531 from spjspj/master 
Implement Vizier of the True (HOU)
 2017-06-25 20:07:46 +10:00
spjspj
b80aab0cfd Implement Vizier of the True (HOU) 2017-06-25 20:06:51 +10:00
LevelX2
f0dbc1da1c [HOU] Added 4 black cards. Some fixes. 2017-06-25 10:21:52 +02:00
spjspj
2db812400e Merge pull request #3525 from spjspj/master 
HOU - Two cards
 2017-06-24 23:46:13 +10:00
spjspj
0b443b08d9 Implement Wildfire Eternal (HOU) 2017-06-24 23:45:20 +10:00
LevelX2
128b972765 [HOU] Added 5 black cards. 2017-06-24 14:00:21 +02:00
spjspj
ed22eb158c Implement Zealot of the God Trump (HOU) 2017-06-24 20:03:43 +10:00
spjspj
724653728b HOU Reprints 2017-06-24 19:51:12 +10:00
spjspj
8371257889 Merge pull request #3523 from spjspj/master 
Implement Chandra's Defeat (HOU)
 2017-06-24 19:42:51 +10:00
spjspj
9dc866852d Implement Chandra's Defeat (HOU) 2017-06-24 19:42:09 +10:00
LevelX2
1210f9795a [HOU] Added Doomfall. 2017-06-24 11:33:53 +02:00
spjspj
7c90bbdd59 Implement Bontu's Last Reckoning (HOU) 2017-06-24 18:32:32 +10:00
spjspj
f04a95c63b Implement Solemnity (HOU) 2017-06-24 17:54:41 +10:00
igoudt
5bcaafd738 implemented Afflict + simple HOU cards 2017-06-24 01:13:42 +02:00
igoudt
ae640ee0b7 refactor duplicate code for playing lands from grave 2017-06-24 00:28:34 +02:00
igoudt
940b44ef81 fix wardSliver 2017-06-19 01:57:28 +02:00
igoudt
d63b241d54 implemented Eternalize Ability + Steadfast Sentinel 2017-06-19 01:03:12 +02:00
igoudt
441e96ebcc fix Gonti's Machinations #3499 2017-06-19 00:26:17 +02:00
Derek M
9904321bf6 Merge pull request #3511 from drmDev/master 
Shattering Spree fix closes #3509
 2017-06-18 13:12:55 -04:00
Derek Monturo
d8871deb6b Shattering Spree fix closes #3509 2017-06-18 13:12:32 -04:00
fireshoes
10a7babc71 Added HOU spoilers to mtg-cards-data.txt and implemented some simple cards and reprints. 2017-06-18 11:36:50 -05:00
Ludwig.Hirth
1fed506c2e * Cankerous Thirst - Fixed not fully working target handling (fixes #3500). 2017-06-18 10:50:31 +02:00
fireshoes
8cd12d6700 Added upcoming sets (Ixalan, Explorers of Ixalan, Rivals of Ixalan, Dominaria, Core 2019, DD: Merfolk vs Goblins, FTV: Transform, Masters 25, Unstable). 2017-06-14 11:08:23 -05:00
LevelX2
dd1eff68fe * Bruna, Light of Alabester - Fixed that the auras could not be moved to Bruno if it had shroud. (fixes #3484). 2017-06-11 15:53:16 +02:00
Derek Monturo
1ecf197732 Fixes #3492 Kamahal grants creatures, not all permanents trample 2017-06-11 08:59:52 -04:00
LevelX2
5cfb496899 * Storm Cauldron - Fixed that it wrongly also returned cards to hand that already left the battlefield (fixes #3487). 2017-06-11 10:44:41 +02:00
LevelX2
a22e89d26a * Added test for spells targeting players continue resolving even when those players leave the game (closes #1600). Problem no longer reproducable. 2017-06-11 10:30:56 +02:00
LevelX2
e7337f66b7 * Desertion - Fixed that the countered spell was wrongly moved to battlefield under owner control instad of Desertion caster control (fixed #3467). 2017-06-11 09:39:57 +02:00
Will Hall
9247d34d8a Fix #3481 - Swans of Bryn Argoll didn't realize an emblem can deal damage to it, so it couldn't find the source of the damage when Chandra, Torch of Defiance's emblem deals damage. 2017-06-09 20:34:14 -07:00
Will Hall
9adab5c8a6 Fix #3478 - Chandra, Pyromancer ultimate does not cast all 3 copies correctly 2017-06-09 18:43:10 -07:00
spjspj
dd4b160fee Merge pull request #3485 from spjspj/master 
Implement Taigam, Ojutai Master (C17)
 2017-06-10 00:53:07 +10:00
spjspj
a2f1c9b578 Implement Taigam, Ojutai Master (C17) 2017-06-10 00:52:10 +10:00
Styxo
e898db149a Added Parallectric Feedback, Invigorating Boon and Well of Knowledge 2017-06-09 14:00:05 +02:00
fireshoes
71460496e0 Updated collector numbers for Archenemy: Nicol Bolas (AKH cards in the set are not on Gatherer, so I appended their numbers after the other cards). Added remaining cards to Archenemy: Nicol Bolas set. 2017-06-07 11:03:35 -05:00
spjspj
aabb479a40 Merge pull request #3473 from spjspj/master 
Implement Wasitora, Nekoru Queen (C17)
 2017-06-07 00:42:38 +10:00
spjspj
1df0e62e00 Implement Wasitora, Nekoru Queen (C17) 2017-06-07 00:40:11 +10:00
spjspj
a48d584cdd Implement Wasitora, Nekoru Queen (C17) 2017-06-07 00:37:45 +10:00
fireshoes
52b4633340 Added Commander Anthology. Added Archenemy: Nicol Bolas to mtg-cards-data.txt (missing most collector numbers until it goes up on Gatherer). Updated tokens for CMA and E01. 2017-06-05 16:00:13 -05:00
LevelX2
92b1cd27be Merge branch 'master' into samut-the-tested 2017-06-05 11:17:06 +02:00
LevelX2
003408046e Merge branch 'master' into nicol-bolas-god-pharoh 2017-06-05 11:16:03 +02:00
fireshoes
e762812a0b Added upcoming FNM promos. Added HOU spoilers to mtg-cards-data.txt. Added Masterpiece info to HOU set. 2017-06-04 22:31:01 -05:00
Will Hall
d989a0e013 Add Nicol Bolas, God-Pharoh 2017-06-04 19:26:26 -07:00
Will Hall
1850e650de Add loyalty cost to note for Samut's ultimate 2017-06-04 15:29:33 -07:00
Will Hall
ce521e2a1f Implement Samut, the Tested 2017-06-04 10:26:52 -07:00
spjspj
a371802cc0 Implement O-Kagachi, Vengeful Kami (C17) 2017-06-04 20:27:48 +10:00
spjspj
1ea8d3a4c6 Implement Ramos, Dragon Engine (C17) 2017-06-04 00:12:00 +10:00
spjspj
cf36661770 Implement Ramos, Dragon Engine (C17) 2017-06-04 00:09:06 +10:00
LevelX2
b62a15f68e Merge pull request #3454 from drmDev/add/welcomedeck2017 
adding welcome deck 2017 (see #3453)
 2017-06-03 10:31:49 +02:00
igoudt
b0a6c76228 fixes 3443 2017-05-31 00:29:06 +02:00
igoudt
9ac70b868d minor text fixes 2017-05-30 23:46:06 +02:00
Derek Monturo
1d662a0a58 adding welcome deck 2017 - closes #3453 2017-05-30 07:31:14 -04:00
Derek Monturo
61f1c2e0c8 eternal thirst non-optional. fixes #3449 2017-05-29 16:21:39 -04:00
LevelX2
09e4435a89 * Fixed a problem that watcher added from cards are not reset between games of a match (fixes #3228). 2017-05-28 18:24:37 +02:00
LevelX2
c0f02259ec * Planar Chaos - Fixed that the flip of the second ability was always done from the Planar Chaos controller instead of the spell caster. 2017-05-28 17:26:57 +02:00
igoudt
2fc742d77d minor typo 2017-05-28 12:23:49 +02:00
LevelX2
9c773ba3cb * Vesuvan Shapeshifter - Fixed that copying creatures with morph and a turn face up trigger did not work correctly (fixes #2864). 2017-05-28 11:01:04 +02:00
LevelX2
40c434f5df * Angelic Arbiter - Fixed that the dont't cast spell if you already attacked ability did not working properly (fixes #3339). 2017-05-28 09:58:48 +02:00
LevelX2
d98f73518a * Swords to Plowshares - Fixed a problem that static effects of the exiled target were still applied as the gain life effect resolved (fixes #3290). 2017-05-28 09:46:41 +02:00
LevelX2
bd9b11fc49 Fixed some problems with popup window not been hidden if another frame is shown. 2017-05-27 14:35:50 +02:00
igoudt
dca676617d fix crypt rats + added new test method 2017-05-27 09:17:08 +02:00
igoudt
530794fd29 removed public identifiers from card specific filters 2017-05-26 16:58:45 +02:00
igoudt
d900df0dad added Heat of Battle and Suq'Ata Firewalker 2017-05-26 16:58:45 +02:00
LevelX2
b4553641eb * Added UT for #2864 Vesuvan Shapeshifter turn face up bug. 2017-05-26 14:56:41 +02:00
LevelX2
a90f65ef58 * Decimator Beetle - Fixed a problem of target handling (probably fixes #3423). 2017-05-26 10:53:38 +02:00
ingmargoudt
64f8c234f1 Merge pull request #3433 from ingmargoudt/newcards 2017-05-25 16:35:34 +02:00
Derek M
9a28e49ec1 Merge pull request #3434 from drmDev/fix/lambholt 
fixes #3427 Lambholt Pacifist vehicles interaction
 2017-05-25 07:58:03 -04:00
Derek Monturo
8960c46fc8 fixes #3427 Lambholt Pacifist vehicles interaction 2017-05-25 07:57:27 -04:00
igoudt
30fb593724 added ruletext comments 2017-05-25 12:12:56 +02:00
igoudt
542a0122fc added new cards from visions 2017-05-25 10:49:09 +02:00
igoudt
070ef359b3 fix several cards that seemed to have same issue as Narset 2017-05-25 09:06:15 +02:00
igoudt
04afceebeb fix issue 3415 2017-05-24 12:48:46 +02:00
Derek Monturo
2ae32e1b3a fixed Ulvenwald Hydra should be a may ability 2017-05-23 09:41:30 -04:00
LevelX2
c8bbc0f035 * Oblivion Sower - Fixed that it can grab face-down cards if they're lands (fixes #3410). 2017-05-22 11:07:31 +02:00
Derek Monturo
5f07cdd0fa updated set to include card Natural Balance implemented 2017-05-21 11:30:02 -04:00
LevelX2
53b77acd89 Spirit Mirror fixed Subtype problem. 2017-05-21 10:58:59 +02:00
LevelX2
9e78410fff Merge branch 'master' into subtypes 2017-05-21 10:50:47 +02:00
LevelX2
ff22e28676 * Spirit Mirror - Fixed that the first ability only checked for Reflection tokens (related to #3391). 2017-05-21 01:01:02 +02:00
LevelX2
c26968a096 * Bruna, Light of Alabaster - Fixed that the check what aura could be selected was not correct (e.g. Daybreak Coronet condition) fixes #3335. 2017-05-21 00:49:59 +02:00
LevelX2
ca9f596e4a * Compelling Deterrance - Fixed that static effects of the card that goes to hand did not end before the discard happens (fixes #3368); 2017-05-21 00:14:06 +02:00
LevelX2
40f192eafc * Squelch - Fixed that it was causing a ClassCastException (fixes #3396). 2017-05-20 23:22:31 +02:00
igoudt
f244f9d6bc fix last compile issues 2017-05-20 23:09:56 +02:00
igoudt
6d83a4a65f finish rewriting subtypepredicate 2017-05-20 22:41:25 +02:00
igoudt
8ab4f5b454 finised all creaturetypes 2017-05-20 22:41:25 +02:00
igoudt
19db21c672 subtypes part 2 2017-05-20 22:41:25 +02:00
igoudt
c44c301f5b subtypes #1 2017-05-20 22:41:25 +02:00
Derek Monturo
5f18161ede Primeval Titan ability is optional 2017-05-20 13:10:14 -04:00
Derek Monturo
9e78f216d1 only fixes 2 of 3 issues with Scarabs. infect damage not triggering it still for #3402 2017-05-20 09:47:30 -04:00
LevelX2
7ee2c23add * Crescendo of War - Fixed that all blocking creatures instead of only controlled creatures got the power boost (fixes #3399). 2017-05-20 09:55:54 +02:00
LevelX2
3cd63003c0 * Curse of Spite - Fixed that the effects of the curse were not correctly applied after the target player dies. (fixes #3401). 2017-05-20 09:30:23 +02:00
spjspj
c85b4830a5 spjspj - Implement Infernal Darkness (ME2 & ICE) 2017-05-20 15:44:30 +10:00
emerald000
a1e12bed0a Merge pull request #3394 from Simown/master 
Fixed Spirit Mirror and added tests. Fixes #3391
 2017-05-18 22:19:57 -04:00
Simown
c53d3b392a Fixed Spirit Mirror and added tests. Fixes #3391 2017-05-18 23:19:18 +01:00
LevelX2
e090b26240 * Urborg Justice - Fixed that tokens going to graveyard were not counted. 2017-05-18 23:42:32 +02:00
LevelX2
376d82be99 * Steam Augury - removed wrong target opponent object (fixes #3393). 2017-05-18 17:04:12 +02:00
LevelX2
d686af8890 * Fixed a problem of endless iteration with Reflecting Pool. 2017-05-18 16:57:32 +02:00
LevelX2
83cdd5570d * Added Gangrenous Zombies and Lethal Vapor. 2017-05-18 16:57:06 +02:00
Derek Monturo
ea5a3d06af fixes #3389 colf urn changed effect to put into own grave 2017-05-17 19:40:54 -04:00
LevelX2
44e15fb705 * Witchbane Orb - Fixed problem of concurrent modification. 2017-05-18 00:10:44 +02:00
LevelX2
1d438060fc * Fixed bug of any mana abilities not working correctly for mana abilities that could produce mana of any type other mana sources could produce. 2017-05-17 23:20:27 +02:00
LevelX2
6bf7a89d45 * Pithing Needle - Fixed a bug that it did not respect the players range (added UT for #3156 - not reproducable). 2017-05-17 17:52:31 +02:00
LevelX2
a068de8d18 * Rooftop Storm - Fixed wrong alternate cost handling (fixes #3387). 2017-05-17 15:06:52 +02:00
LevelX2
020c66c6a1 * Added UT for #3244. Not able to reproduce the problem. 2017-05-17 12:53:00 +02:00
LevelX2
85c394c29b * Brain in a Jar - Fixed that first ability fizzled when it was sacrificed before the ability resolved (fixes #3247). 2017-05-17 11:39:26 +02:00
LevelX2
d6ddff8d68 * Higure the Still Wind - Fixed that the searched card was not revealed (fixes #3268). 2017-05-17 11:24:54 +02:00
LevelX2
d284cc08b1 * Reworked some not correct working dies replacement handling. 2017-05-16 22:36:56 +02:00
magenoxx
83ee1252cd #3373: added exiling multiple targets in Mindbreak Trap 2017-05-16 20:17:40 +03:00
LevelX2
0185bcb37e * Mogg Infestation - Fixed a problem with counting also commanders noz gong to graveyard. 2017-05-16 17:40:43 +02:00
LevelX2
351095a904 * Magma Spray - Fixed a bug of dies replacement handling (#3359). Other cards with same rule text not fixed yet. 2017-05-16 17:40:04 +02:00
LevelX2
7b61ad7455 * Simic Guildmage - Fixed that the aura moving ability eas not working (fixes #3319). 2017-05-16 12:16:52 +02:00
LevelX2
917111b664 * Vizier of the Menagerie - Fixed that the cards from library could be cast at instant speed. 2017-05-16 10:05:17 +02:00
LevelX2
390834a0d7 * Vizier of the Menagerie - Fixed that the cards from library could be cast at instant speed (fixes #3300). 2017-05-15 16:41:47 +02:00
spjspj
71fad444c1 Emblem Refactor 2017-05-15 08:47:59 +10:00
Derek M
6d52ec5a59 Merge pull request #3377 from spjspj/master 
Emblems refactor to show emblems in Card/Token Viewer
 2017-05-14 12:00:58 -04:00
LevelX2
d1e4a7f6b0 Merge pull request #3372 from ingmargoudt/changelings 
change getSubtype(game).contains(..) to hasSubtype(..) to include che…
 2017-05-14 06:32:48 +02:00
spjspj
f85c7e07ba Emblems refactor to show emblems in Card/Token Viewer 2017-05-14 13:43:18 +10:00
emerald000
d5c75cd1b3 Fixed New Perspectives to use a CostModificationEffect. 
Remove CyclingCost and WrapperCost that are now unused.
 2017-05-13 18:53:35 -04:00
igoudt
265cf408f9 change getSubtype(game).contains(..) to hasSubtype(..) to include check on Changelings 2017-05-13 23:35:23 +02:00
Derek M
a5c7d55ed6 Merge pull request #3355 from topher235/master 
Implemented Burnt Offering
 2017-05-13 07:54:59 -04:00
Topher
ea90e7c1e3 Implementation of Burnt Offering 2017-05-12 20:46:48 -07:00
igoudt
af533fb0bc API call for changeling on Kaseto 2017-05-13 00:30:25 +02:00
igoudt
074dccf12d fixed Kaseto to trigger on Changeling too. 2017-05-13 00:23:58 +02:00
Topher
1038a4d4a5 My first attempt at implementing a card. 2017-05-11 12:46:35 -07:00
spjspj
c11a89a90a Merge pull request #3347 from spjspj/master 
Fix for Martyr's Bond
 2017-05-11 16:14:50 +10:00
spjspj
43d0b5f3b2 Fix for Martyr's Bond 2017-05-11 16:09:40 +10:00
LevelX2
645a4ec062 * Ravnica: City of Guilds - Added 3 cards. 2017-05-07 16:24:01 +02:00
LevelX2
96d9362c55 * Ravnica: City of Guilds - Added 3 cards. 2017-05-07 14:58:14 +02:00
LevelX2
dc4283685a * Added another StaticFilter. 2017-05-07 14:07:21 +02:00
LevelX2
757c01343f * Ravnica: City of Guilds - Added 3 cards. 2017-05-07 10:46:01 +02:00
LevelX2
f5b4c41188 * Ravnica: City of Guilds - Added 3 cards. 2017-05-06 16:05:14 +02:00
LevelX2
62947573d6 Merge origin/master 2017-05-06 15:43:34 +02:00
LevelX2
833237e09b * Ravnica: City of Guilds - Added 5 cards. 2017-05-06 15:43:01 +02:00
spjspj
e9408a7203 Merge pull request #3311 from spjspj/master 
Token refactor
 2017-05-06 23:38:32 +10:00
spjspj
e73e7d8600 Token refactor 2017-05-06 23:35:14 +10:00
LevelX2
795218b030 * Roi Elemental - Fixed triggered ability that did not work correctly for copied Roi Elementals (fixes #3214). 2017-05-06 10:19:04 +02:00
Scott Crawford
83f6b142ff Removing minuses 2017-05-04 08:48:03 -07:00
Scott Crawford
a0738ae59d Restoring Starter1999 
Fixing accidental deletion from previous commit
 2017-05-04 08:09:27 -07:00
LevelX2
2832cb9335 * Some minor changes to Misfortune's Gain and Path of Peace. 2017-05-04 10:26:34 +02:00
Scott Crawford
d5c5b0cdb9 fixed spacing 2017-05-03 19:43:23 -07:00
Scott Crawford
f88876d137 Misfortune's Gain 
implemented misfortune's gain
 2017-05-03 19:41:10 -07:00
Scott Crawford
61e3166492 Path of Peace 
implemented Path of Peace
 2017-05-03 19:37:41 -07:00
Scott Crawford
b2db8057b5 New cards 
Generated Misfortune's Gain and Path of Peace
 2017-05-03 19:37:18 -07:00
LevelX2
01171abad2 Merge pull request #3284 from spjspj/master 
Large Refactor - Move all tokens into Mage/src/main/java/mage/game/pe…
 2017-05-03 15:40:32 +02:00
LevelX2
e862e7c5b5 Merge origin/master 2017-05-03 14:59:47 +02:00
LevelX2
e73a2f5c58 * Nest of Scarabs - Fixed that did not produce tokens when -1/-1 counters are placed on creatures. (fixes #3174). 2017-05-03 14:59:21 +02:00
Derek M
03237aa2fe Merge pull request #3295 from ingmargoudt/triumph_hordes_unittest 
Triumph hordes unittest
 2017-05-03 07:53:47 -04:00
igoudt
566966bf6b fix and test for triumph of the hordes 2017-05-03 11:02:23 +02:00
LevelX2
69ac72e242 Merge origin/master 2017-05-03 09:30:05 +02:00
LevelX2
c46a292d14 * Added missing card entry of Celestial Gatekeeper to Prophecy set. 2017-05-03 09:29:44 +02:00
bugfi5h
d43aefa5e3 removed unused imports 2017-05-01 18:27:45 +02:00
bugfi5h
a1dba938a4 Added Card: Entangler 2017-05-01 18:24:10 +02:00
bugfi5h
72ec960c95 Merge branch 'develop' into feature/CopperAngel 2017-05-01 15:10:56 +02:00
spjspj
1754a69f9b Large Refactor - Move all tokens into Mage/src/main/java/mage/game/permanent/token 2017-05-01 20:20:33 +10:00
Dustin Ryan - Roepsch
4c7ab8babe removed extra line 2017-04-30 17:56:08 -05:00
Dustin Ryan - Roepsch
640f1bea5b Fixed card text 2017-04-30 17:53:12 -05:00
Dustin Ryan - Roepsch
c6f4332f2e fixed static text 2017-04-30 17:29:39 -05:00
Dustin Ryan - Roepsch
db608dc35d optimized imports 2017-04-30 16:15:24 -05:00
Dustin Ryan - Roepsch
8aee5d795c Implemented Heat Stroke 2017-04-30 16:14:39 -05:00
Dustin Ryan - Roepsch
3b82e3c2bf Generated card template using pearl script 2017-04-30 15:31:06 -05:00
ingmargoudt
f0a83c4689 Merge pull request #3281 from ingmargoudt/gatherer_of_graces 
Implemented Gatherer of Graces from Guildpact
 2017-04-30 19:00:34 +02:00
igoudt
a1f2c742be Implemented Gatherer of Graces from Guildpact 2017-04-30 18:59:08 +02:00
Derek M
5bfd84f6ac Merge pull request #3280 from ingmargoudt/quicksilver_fountain 
fix for quicksilver fountain, as it let you target all lands in play …
 2017-04-30 12:47:22 -04:00
igoudt
01813cce0c fix for quicksilver fountain, as it let you target all lands in play instead of your own 2017-04-30 17:45:23 +02:00
ingmargoudt
bffc04a49e Merge pull request #3277 from ingmargoudt/kyren_negotiations 
implemented Kyran Negatiations from Mercadian Masques
 2017-04-30 15:08:01 +02:00
igoudt
8512e3043d implemented Kyran Negatiations from Mercadian Masques 2017-04-30 15:05:21 +02:00
igoudt
801aa98430 remove imports 2017-04-30 10:27:43 +02:00
igoudt
f9a5bc59c3 fix for gate to the afterlife 2017-04-30 10:26:47 +02:00
igoudt
b6fe6f772a finish rewriting watchers 2017-04-29 12:07:46 +02:00
igoudt
efae1251f9 first batch of watcher naming 2017-04-29 12:07:46 +02:00
igoudt
20a881a374 make the condition in cards an enum 2017-04-29 12:01:49 +02:00
igoudt
3e5ff8ccb2 rewrites to getOrDefault 2017-04-29 12:01:49 +02:00
igoudt
f69ff3aca9 rewrote InfernoTrap 2017-04-29 12:01:49 +02:00
ingmargoudt
12eb4c2fb7 Merge branch 'master' into move_magepermanent_method 2017-04-28 19:29:20 +02:00
LevelX2
26e81ab26d * Added UT for #3251. 2017-04-28 15:41:38 +02:00
LevelX2
47de4cac6b * Squandered Resources - Fixed that the ability was no mana ability (fixes #3259). 2017-04-28 14:25:04 +02:00
LevelX2
236608cd0f * Approach Of The Second Sun - Fixed that it did not always correctly determined if a player has won (fixes #3250). 2017-04-28 14:18:58 +02:00
LevelX2
33f6c629c2 * Shadow of the Grave - Some minor adjustments. 2017-04-28 11:18:26 +02:00
LevelX2
7f1da83783 Merge pull request #3261 from ingmargoudt/fix_cyclediscardwatcher 
fix for shadow of the grave
 2017-04-28 11:04:24 +02:00
LevelX2
108f3faaa8 * Natural Balance - Some minor changes. 2017-04-28 10:56:44 +02:00
LevelX2
468440cb71 Merge pull request #3248 from bugfi5h/master 
Added Card: Natural Balance
 2017-04-28 10:35:12 +02:00
LevelX2
3cc3d430ea * Bontu the Glorified - Fixed that it was possible to sacrifice non creature permanents. 2017-04-28 10:26:51 +02:00
igoudt
10ecbd5adb fix for shadow of the grave 2017-04-28 09:24:27 +02:00
bugfi5h
217e294470 Added Card: Copper-Leaf Angel 2017-04-27 21:25:30 +02:00
igoudt
2c34870bf0 remove util function on converted manacost, make getColorIdentity default interface method 2017-04-27 10:57:48 +02:00
igoudt
8a80976171 have Flash and Tariff use the moved removeVariableManaCost method 2017-04-27 10:57:48 +02:00
bugfi5h
33f2f3e9fc Merge branch 'master' of https://github.com/magefree/mage 2017-04-27 06:51:17 +02:00
bugfi5h
59a790e320 Using getPlayersInRange instead of getPlayersList 2017-04-27 06:33:35 +02:00
drmDev
43a001dcdd removing the italics from reminder text for meld cards. might fix the issue in #3129 2017-04-26 21:22:22 -04:00
bugfi5h
f20496e40f Auto indent class 2017-04-26 23:11:46 +02:00
bugfi5h
4a8af2b4d2 Merge origin/master 2017-04-26 19:44:24 +02:00
bugfi5h
e2f960c8fd Added Card: Natural Balance 2017-04-26 19:41:18 +02:00
LevelX2
86bc78e4b8 * Nest of Scarabs - Fixed that it does not produce tokens when -1/-1 counters are placed on creatures. 2017-04-26 14:36:52 +02:00
LevelX2
bb4714eb32 Merge origin/master 2017-04-25 19:08:25 +02:00
LevelX2
3f12e1690b * Added 3 cards from Ravinca City of Guilds set. 2017-04-25 19:08:06 +02:00
LevelX2
60cc3a7622 * Some minor fixed and log changes. 2017-04-25 17:37:38 +02:00
LevelX2
3708ea2a89 * Added 3 cards from Ravinca City of Gold set. 2017-04-25 15:47:21 +02:00
LevelX2
d99fe5a70e * Fixed Mimeoplasm allows choosing same creature twice (fixes #3230). 2017-04-25 09:49:43 +02:00
Jeff
7479cd5668 - Fixed Orator of Ojutai. Intervening If clause. 2017-04-24 09:25:27 -05:00
drmDev
ec6f19f41f fixes #3226 wirefly tokens have flying 2017-04-23 19:48:04 -04:00
Achilles
747c76519e - Fixed filter Commit/Memory 2017-04-23 14:03:12 -05:00
fireshoes
4e1572bc62 Added missing Amonkhet Invocations. 2017-04-23 11:20:17 -05:00
LevelX2
ceb7dbcdf2 * Vizier of Remedies - Fixed a possible null pointer exception. 2017-04-23 14:10:27 +02:00
Achilles
74dd2878ed - Fixed Decimator Beetle. Bug #3212 2017-04-22 14:35:38 -05:00
LevelX2
a93dc4e3da * Added a check that continuous PT setting effects are only applied, if the object has still the ability (fixes #3167). 
I added the effect now only to the layer the bug is caused by. Probably it's correct to check this for every layer. But I don't know how much resources the check addional needs. So if we got other tests that fail for this reason caused by other layers, we could add the check and test if all other tests still work correctly.
 2017-04-22 00:23:37 +02:00
LevelX2
5d2c210d36 * Added Celestial Convergence and some changes to game draw handling. 2017-04-21 15:27:22 +02:00
LevelX2
e284922017 * Added Celestial Convergence and some changes to game draw handling. 2017-04-21 15:18:04 +02:00
Derek M
274e0f9052 Merge pull request #3184 from HanClinto/CMH-GuiltyConscienceAndBackfire 
Implementing Guilty Conscience and Backfire
 2017-04-20 20:40:03 -04:00
Clint Herron
523743aaf6 Fixing nits from LevelX2 -- adding authorship tag and marking both enchantments as unboost effects, because both are things that you would tend to want to play on your opponents' creatures -- not your own. This should help the AI make more sensible plays when using these. 2017-04-20 19:03:05 -04:00
Jeff
5f05868865 - Fixed Glyph Keeper. Bug #3180 2017-04-20 14:19:54 -05:00
fireshoes
a86a1ebf5f Added Iconic Masters to known-sets/mtg-sets-data.txt 2017-04-20 10:37:16 -05:00
Jeff
cb3f0b2a51 - Fixed Cruel Reality and Sigarda, Host of Herons interaction. 2017-04-20 08:44:49 -05:00
Clint Herron
f461899eec Changing description to match 'enchanted creature' properly now so that Backfire now has the correct reminder text. 2017-04-19 22:18:49 -04:00
Clint Herron
98eea3c97b Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire 2017-04-19 21:49:10 -04:00
Jeff
c5b3975700 - Changed == to equals(). 2017-04-19 15:05:23 -05:00
Jeff
10a043f19b - Fixed Soul-Scar Mage. Bug #3163 2017-04-19 11:02:27 -05:00
LevelX2
04c80c27a3 * Fixed Binding Mummy's ability doesn't trigger from Liliana, Death Majesty -3 ability (fixes #3165). 2017-04-19 16:40:00 +02:00