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

11127 commits

Author SHA1 Message Date
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
ingmargoudt
58b1c4c0c8 small fix on color 2017-04-19 12:15:36 +02:00
fireshoes
e5e614c341 [AKH] Added common tapland cycle shown in the Gatherer 2017-04-18 19:07:03 -05:00
LevelX2
01153965c4 * Mimic Vat - Fixed possible null pointer exception. 2017-04-19 00:07:34 +02:00
LevelX2
d7671bf0b1 * Time to Reflect - Fixed possible null pointer exception. 2017-04-18 23:59:06 +02:00
LevelX2
e475ad9df7 * Abeyance - Fixed possible null pointer exception. 2017-04-18 23:36:06 +02:00
Jeff
cf90bb4d36 - Text change for Approach of the Second Sun. 2017-04-18 15:44:41 -05:00
Jeff
625efd8150 - Fixed Approach of the Second Sun. Bug #3122 2017-04-18 15:34:05 -05:00
Jeff
6a55c87eef - Fixed Cruel Reality. Bug #3162 2017-04-18 15:12:08 -05:00
Clint Herron
4a13ba3645 Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire 2017-04-18 15:18:30 -04:00
Jeff
9e1acd5daa - Fixed Hapatra, Vizier of Poisons. Bug #3157 2017-04-18 12:08:15 -05:00
fireshoes
2c9c4888cc Added Commander 2017 to known sets. 2017-04-18 11:39:47 -05:00
Clint Herron
d1c8796a49 Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire 2017-04-18 11:00:24 -04:00
Jeff
aa4cf21b13 - Fixed Scarab Feast. 2017-04-18 07:58:25 -05:00
LevelX2
1e06c9d2e3 * Rhonas's Monument - Fixed wrong target definition (fixes #3150). 2017-04-18 07:35:19 +02:00
fireshoes
cc57c2fad9 [AKH] Fixed Oracle's Vault missing 'play without paying its mana cost' ability 2017-04-17 21:12:30 -05:00
Jeff
1869d97dbc - Fixed Plague Belcher. 2017-04-17 15:59:03 -05:00
LevelX2
d52043e9db Merge origin/master 2017-04-17 22:54:27 +02:00
LevelX2
0d5f056fd5 * Nissa, Steward of Elements - Fixed ultimate cost from +6 to -6. 2017-04-17 22:53:39 +02:00
Jeff
6cc02a8653 - Removed flying ability from Grim Strider. 2017-04-17 14:21:15 -05:00
Jeff
4f1ad7b0ec - Text fix for Splendid Agony. 2017-04-17 14:11:03 -05:00
LevelX2
36a0dc7d4e Merge origin/master 2017-04-17 20:11:25 +02:00
LevelX2
fb6bd25d85 * Soulstinger - Fixed a bug that a -1/-1 counter was put on target even if Soulstinger had no counters on it. 2017-04-17 20:11:01 +02:00
Derek Monturo
ca6885d782 fix rhonas text 2017-04-17 13:00:24 -04:00
LevelX2
cc6feacb2b Merge origin/master 2017-04-17 18:34:37 +02:00
LevelX2
804fb12b1d * Vizier of Deferment - Fixed null pointer exception. 2017-04-17 18:27:05 +02:00
Jeff
f8d035d1d4 - Fixed Magus of the Moon. 2017-04-17 10:17:41 -05:00
Derek Monturo
15fba941ef fixes #3124 and unit test for #3125 duplicating issue 2017-04-17 11:11:48 -04:00
Derek Monturo
217b4919f3 Merge remote-tracking branch 'upstream/master' 2017-04-17 10:35:13 -04:00
Jeff
6156ebf5b6 - Fixed Trespasser's Curse. 2017-04-17 09:16:18 -05:00
LevelX2
2c6be695ba * Bounty of the Luxa - Fixed handling of triggered ability if Bounty of the Luxa left the battlefield before resolving. 2017-04-17 14:36:53 +02:00
spjspj
f8d222d59b Fix for Harsh Mentor 2017-04-17 21:30:21 +10:00
LevelX2
ef4cf90a0f Release 1.4.23V0 2017-04-17 10:53:59 +02:00
LevelX2
8739d7a101 [AKH] Fixed Heart-Piercer Manticore. 2017-04-17 09:53:13 +02:00
LevelX2
384e17da70 Merge pull request #3106 from Ketsuban/ogw-fullart-wastes 
Add fullart/regular Wastes
 2017-04-17 08:14:14 +02:00
Mark Langen
d1816428ea Various small card fixes for Amonkhet. 2017-04-16 23:24:09 -06:00
Mark Langen
e2f39b289b Fix cards in set using UntapAllControllerEffect with AnotherPredicate 2017-04-16 23:24:09 -06:00
Mark Langen
db18af0161 Fix Approach of the Second Sun 2017-04-16 23:24:08 -06:00
Achilles
237db497b6 - A real fix for Watchers of the Dead. 2017-04-16 21:51:27 -05:00
LevelX2
b8e952cfb9 [AKH] Approach of the Second Sun fix of cast watcher. 2017-04-17 00:44:08 +02:00
fireshoes
430dbdb5f0 [AKH] Fix Approach of the Second Sun tooltip - part 2 2017-04-16 17:27:03 -05:00
fireshoes
ac35254d7e [AKH] Fix Approach of the Second Sun tooltip. 2017-04-16 17:19:19 -05:00
Derek M
0c7d774f1e Merge pull request #3117 from pivotal-ryan-mcleod/watchers_fix 
Fix bug with Watchers of the Dead that stops game from proceeding (AKH)
 2017-04-16 18:10:59 -04:00
Derek M
984eb560b0 Merge pull request #3118 from pivotal-ryan-mcleod/trespassers_curse_trigger_fix 
Fix Trespasser's Curse triggering on all permanents instead of just creatures (AKH)
 2017-04-16 18:09:34 -04:00
Ryan McLeod
50c25ea38e Fix Trespasser's Curse triggering on all permanents 2017-04-16 18:05:57 -04:00
LevelX2
ed341528d9 [AKH] Fixed that Aftermath card images were shown wrongly rotated. 2017-04-16 22:57:08 +02:00
Ryan McLeod
8057b20cbf Fix Watchers of the Dead bug when opponent has 1 card in graveyard 2017-04-16 14:16:56 -04:00
Styxo
bf556c1a77 [AKH] Fixed red and green cards tooltips 2017-04-16 17:42:57 +02:00
Styxo
d4e2b6f306 [AKH] Fixed black cards tooltips 2017-04-16 17:14:48 +02:00
Styxo
ddf7dc1f0b [AKH] Another fixes 2017-04-16 16:03:02 +02:00
Styxo
c8e7c7fb15 [AKH] Another fixes 2017-04-16 15:28:31 +02:00
Styxo
fc794f74aa [AKH] Fix for Supernatural Stamina 2017-04-16 14:44:03 +02:00
LevelX2
3d2e621186 [AKH] Added Stone Quarry and fixed a wrong card number. 2017-04-16 14:06:41 +02:00
spjspj
9c487b7310 Merge pull request #3116 from spjspj/master 
Fix Pyramid of the Pantheon, Fix SourceHasCounterCondition 'toString'
 2017-04-16 22:04:44 +10:00
spjspj
c895253d5b Fix Pyramid of the Pantheon, Fix SourceHasCounterCondition 'toString' 2017-04-16 22:04:07 +10:00
LevelX2
d1d9683d84 Merge origin/master 2017-04-16 13:29:31 +02:00
LevelX2
664405caab [AKH] Added Vizier of Many Faces. 2017-04-16 13:28:36 +02:00
spjspj
f43eb06953 Fix Pyramid of the Pantheon, added class for 'new cards' found in find_new_cards.pl 2017-04-16 21:19:40 +10:00
LevelX2
20a1c02f4d Merge origin/master 2017-04-16 13:04:54 +02:00
LevelX2
c033868795 [AKH] Added Vizier of Many Faces. 2017-04-16 13:04:38 +02:00
spjspj
fc1d1a996d spjspj - Implement Pyramid of the Pantheon (AKH) 2017-04-16 18:07:40 +10:00
fireshoes
06fdd17e7d [AKH] Updated tooltip text on several white and blue cards. Some minor fixes. 2017-04-15 23:37:50 -05:00
LevelX2
88d25b7a3a [AKH] Added New Perspectives. 2017-04-16 01:38:59 +02:00
LevelX2
f58ab300b2 [AKH] Added Gate to the Afterlife. 2017-04-16 00:16:52 +02:00
drmDev
7de31a8e68 Merge remote-tracking branch 'upstream/master' 2017-04-15 13:14:31 -04:00
spjspj
09a2db88b1 spjspj - Implement Decimator Beetle (AKH) 2017-04-16 02:58:37 +10:00
Styxo
5a2678f916 [AKH] Code deduplication and fixes 2017-04-15 18:53:57 +02:00
Achilles
75d0a8a238 - Added Luxa River Shrine. <Amonkhet> 2017-04-15 11:46:15 -05:00
LevelX2
d08de1812e [AKH] Added Open into Wonder. 2017-04-15 18:13:36 +02:00
Achilles
b666b7ab5d - added target to Grasping Dunes ability. 2017-04-15 10:15:00 -05:00
Achilles
94912e1cfd - Added Edifice of Authority and Grasping Dunes. <Amonkhet> 2017-04-15 10:12:55 -05:00
Styxo
e2a1d4436f [AKH] Added some cards + fixes 2017-04-15 16:46:53 +02:00
Mark Langen
77586eec7e Add 30 AKH card implementations 
* Some of the cards still need testing. Will fix and problems and update tomorrow, but pushing them for now to make it clear what's been implemented so far.
 2017-04-15 04:24:14 -06:00
Achilles
804cdf6b21 - Added Vizier of Deferment. <Amonkhet> 2017-04-14 21:34:06 -05:00
Achilles
d51eb07692 - Added Time to Reflect and Wayward Servant. <Amonkhet> 2017-04-14 18:44:25 -05:00
fireshoes
ff27279c86 [AKH] Implemented several cards. 2017-04-14 15:06:12 -05:00
fireshoes
e4b7a65362 [AKH] Added complete spoiler to mtg-cards-data.txt. Added a few reprints. 2017-04-14 10:50:54 -05:00
spjspj
7638c73b2f spjspj - Implement Gideon's Intervention (AKH) 2017-04-14 23:41:47 +10:00
spjspj
2fbae9b596 spjspj - Implement Gideon's Intervention (AKH) 2017-04-14 23:40:39 +10:00
fireshoes
7dea71df59 [AKH] Implemented some of the 4/13 spoiled cards. 2017-04-13 23:28:21 -05:00
fireshoes
15ea3626ae [AKH] Added more 4/13 spoilers to mtg-cards-data.txt. 2017-04-13 20:22:19 -05:00
spjspj
97a74df8ea spjspj - Implement Cradle of the Accursed (AKH) 2017-04-14 09:46:21 +10:00
spjspj
82a1583dfa spjspj - Implement 2x cards (AKH) 2017-04-14 08:59:33 +10:00
Jeff
f62ad6db96 - Added Shadow of the Grave. <Amonkhet> 2017-04-13 17:01:07 -05:00
Thomas Winwood
473403d464 Add fullart/regular Wastes 
As with BFZ, "a" denotes the regular-art land while "b" denotes the full-art.
 2017-04-13 21:48:32 +01:00
fireshoes
0c9ad1e8b2 [AKH] Added 4/13 spoilers to mtg.cards.data.txt. Added tokens to card-pictures-tok.txt. Minor text fix on Rhonas. 2017-04-13 10:10:59 -05:00
Jeff
53d41783a3 - Added Samut, Voice of Dissent. <Amonkhet> 2017-04-13 09:59:38 -05:00
Jeff
6b65572de0 - Fixed Bontu the Glorified. 2017-04-13 08:42:59 -05:00
Styxo
97a00695cf [AKH] Added rest of 4/12 spoilers and implemented some cards 2017-04-13 15:02:50 +02:00
spjspj
0920c6dcad Merge pull request #3103 from spjspj/master 
spjspj - Implement Failure // Comply (AKH)
 2017-04-13 12:53:06 +10:00
spjspj
8cf1c2aad8 spjspj - Implement Failure // Comply (AKH) 2017-04-13 12:52:13 +10:00
spjspj
a429bc044b Merge pull request #3102 from spjspj/master 
spjspj - Implement Harsh Mentor (AKH)
 2017-04-13 10:34:02 +10:00
spjspj
4f21af64c5 spjspj - Implement Harsh Mentor (AKH) 2017-04-13 10:32:44 +10:00
spjspj
954cd88f95 spjspj - Implement Harsh Mentor (AKH) 2017-04-13 10:30:17 +10:00
Jeff
b1b4ef1086 - Added Bontu the Glorified. <Amonkhet> 2017-04-12 16:45:41 -05:00
ingmargoudt
8871be844f fix compile errors 2017-04-12 22:35:32 +02:00
Darkside
cd47ef1869 Add Enigma Drake to AKH 2017-04-12 13:39:15 -05:00
Darkside
f53d4c4f75 Merge remote-tracking branch 'upstream/master' 2017-04-12 13:32:18 -05:00
Darkside
c2ba110375 Add Sweltering Suns to AHK 2017-04-12 13:27:02 -05:00
Derek Monturo
e32e279432 Merge remote-tracking branch 'upstream/master' 2017-04-12 14:16:49 -04:00
fireshoes
30bbbf528e Merge origin/master 2017-04-12 12:52:47 -05:00
fireshoes
581beb4bfe [AKH] Implemented several cards. Added 4/12 spoilers to mtg-cards-data.txt. 2017-04-12 12:42:22 -05:00
Darkside
bccb09366e Add Lord of the Accursed for AKH 2017-04-12 10:58:34 -05:00
Jeff
6cec543809 - Added Bounty of the Luxa. <Amonkhet> 2017-04-12 10:06:24 -05:00
Derek M
3e6a925271 Merge pull request #3088 from ingmargoudt/fixes 
Fixes
 2017-04-12 10:08:27 -04:00
LevelX2
b5886cca99 Merge pull request #3081 from ThomasLerner/master 
Ice Cave Implementation
 2017-04-12 09:50:40 +02:00
spjspj
ea98f96a92 spjspj - Implement Harsh Mentor (AKH) 2017-04-12 14:16:04 +10:00
spjspj
239d931774 Amonkhet - minor housekeeping 2017-04-12 12:24:21 +10:00
spjspj
d82eeacf4f Amonkhet - minor housekeeping 2017-04-12 12:17:30 +10:00
Mark Langen
db74576397 Added 4 cards from AHK 
* Added Cartouche of Strength
* Added Nest of Scarabs (More correct implementation than existing one)
* Added Soul-Scar Mage
* Added Battlefield Scavenger
 2017-04-11 17:40:15 -06:00
Jeff
04f1b6306a - Added Cruel Reality. <Amonkhet> 2017-04-11 17:53:34 -05:00
Jeff
fb923865a8 - Added Watchers of the Dead. <Amonkhet> 2017-04-11 16:14:03 -05:00
Timothy Rice
b101492af9 added grim strider to AKH 2017-04-11 15:35:39 -05:00
Timothy Rice
49a37ad804 added deem worthy to AKH 2017-04-11 15:23:04 -05:00
Timothy Rice
89ee5eeeae fixed Mistform creature types and verify test for phyrexian mana 2017-04-11 13:58:01 -05:00
ingmargoudt
03643d53a3 rename counttype to comparisontype 2017-04-11 17:01:59 +02:00
Styxo
46d44f84e3 [AKH] Added Hapatra, Nest of Scarabs and Throne of the God Pharao and removed redundant code 2017-04-11 15:20:55 +02:00
drmDev
f22c91f82b Merge remote-tracking branch 'upstream/master' 2017-04-11 07:47:58 -04:00
Styxo
058b9e970c [AKH] Name fix 2017-04-11 11:57:29 +02:00
Styxo
0d40fccc62 [AKH] Added rest of 4/10 spoilers 2017-04-11 11:07:39 +02:00
ingmargoudt
cb693b5826 there were 3 enums to compare ints, refactored to 1 2017-04-11 09:15:12 +02:00
ingmargoudt
813d84274a removed string constructor in SuperTypePredicate 2017-04-11 09:15:09 +02:00
Achilles
a08155341e - Added Vizier of the Menagerie. <Amonkhet> 2017-04-11 00:34:18 -05:00
drmDev
6e66e7703f Merge remote-tracking branch 'upstream/master' 2017-04-10 21:27:50 -04:00
fireshoes
7da69e5064 Merge origin/master 2017-04-10 18:46:43 -05:00
fireshoes
5fbcf759d6 [ANK] Added 4/10 spoilers to mtg-cards-data.txt and implemented a many cards. 2017-04-10 18:45:48 -05:00
Mark Langen
b33e03862a Work in progress changes to support As Foretold 
* Modifies how cards with no mana cost are handled. You can now begin to cast them if there is an AlternativeCost that would allow you to play them.
 2017-04-10 16:13:42 -06:00
Jeff
f119965f46 - Fixed cost of Greel, Mind Raker. 2017-04-10 14:53:43 -05:00
Derek Monturo
9bc6be736b merge 2017-04-10 10:15:37 -04:00
ThomasLerner
7a48387635 Fixed not giving counter option to non-opponent players that are not the spell's controller 
This update brings to code to compliance with LevelX2's reccomendation by using getPlayersInRange(source.getControllerId(), game) and checking manually that the player is not the spell's controller.
 2017-04-10 04:39:10 -04:00
ThomasLerner
57b50857cc Update IceCave.java 
I used getOpponents, but that required changing input from source.getControllerId() to spell.getControllerId() so that it would get the opponents of the player who played the spell, rather than the opponents of the player who controls Ice Cave. I also implemented a null check for the spellController as I made it.
 2017-04-09 18:23:34 -04:00
ThomasLerner
d510651bac Update IceCave.java 2017-04-09 06:34:37 -04:00
ThomasLerner
7a0a7d9a2f Update Apocalypse.java 
Added Ice Cave entry
 2017-04-09 06:32:43 -04:00
ThomasLerner
77618b7ef5 Create IceCave.java 2017-04-09 06:30:54 -04:00
Justin Herlehy
7ff949d686 [AKH] Liliana, Death's Majesty 
Corrected reanimation filter to correctly generate mouseover text.
 2017-04-08 23:42:03 -07:00
Justin Herlehy
8b1220af66 [AKH] Liliana, Death's Majesty 
Refactored the "Becomes a black Zombie in addition to its other colors and types" code to own class file to dedupe code from several cards.
 2017-04-08 23:25:43 -07:00
Mark Langen
f96a1532bf Add Approach of the Second Sun [AKH] + test 2017-04-08 20:03:23 -06:00
fireshoes
c44043532f [ANK] Added 4/7 spoilers to mtg-cards-data.txt and implemented a few simple cards. 2017-04-07 10:48:45 -05:00
LevelX2
22e376699e Merge pull request #3066 from ingmargoudt/cleanups 
Cleanups
 2017-04-06 23:26:52 +02:00
LevelX2
b71c618294 [AKH] Added exert ability, Ahn-Crop Crasher and Combat Celebrant. 2017-04-06 23:10:24 +02:00
Jeff
f43a15ab22 - Fixed Karn Liberated. 2017-04-06 11:41:51 -05:00
fireshoes
af0bcbc0a8 [AKH] Added some implemented cards to the Amonkhet set file. 2017-04-06 10:53:46 -05:00
ingmargoudt
ea6ba3c0a9 enum conditions 2017-04-06 16:30:22 +02:00
Justin Herlehy
932dda6d3b Implement Gideon of the Trials 
Unit Test not included as it was failing at last test.  Card tested on local server and confirmed that emblem applies as expected.
 2017-04-06 00:01:40 -07:00
Mark Langen
40870f22c2 Added a bunch of spoiled cards for 4/5 
* Added Colossapede
* Added Cut // Ribbons
* Added Insult // Injury (+test)
* Added Mouth // Feed
* Added Pouncing Cheetah
* Added Scarab Feast
* Added Rags // Riches (+test)
 2017-04-05 22:41:56 -06:00
LevelX2
2487cf0645 Merge pull request #3062 from ingmargoudt/cleanups 
Cleanups
 2017-04-05 22:35:05 +02:00
Jeff
efbdf9ee36 - Added Kefnet the Mindful. 2017-04-05 12:17:33 -05:00
ingmargoudt
fb9d713287 singleton conditions to enum 2017-04-05 19:10:47 +02:00
ingmargoudt
809c8c97c9 introduced YouGainedLifeCondition 2017-04-05 19:10:46 +02:00
ingmargoudt
3420d0d76c use getOrDefault 2017-04-05 19:10:45 +02:00
ingmargoudt
22c842dfec refactored IntCompareCondition 2017-04-05 19:10:45 +02:00
ingmargoudt
1f89b4eedf introduced XorLessLifeCondition 2017-04-05 19:10:44 +02:00
ingmargoudt
e44b2fd673 extracted duplicate AttachmentAttachedToCardTypePredicate 2017-04-05 19:10:43 +02:00
ingmargoudt
8b90f87af6 added addCardType to MageObject 2017-04-05 19:10:43 +02:00
ingmargoudt
cf6fe27f7d duplicate continuouseffect for vehicles 2017-04-05 19:10:42 +02:00
fireshoes
4e3d75d937 Merge origin/master 2017-04-04 21:00:03 -05:00
fireshoes
8ff947c6f0 [AKH] Added embalm to the keyword file and card gen script. Implemented the rest of the embalm cards. 2017-04-04 20:57:25 -05:00
Mark Langen
a2e8cedd02 Merge branch 'master' into akh-card-frame 2017-04-04 18:36:37 -06:00
Mark Langen
fd73fd39af Addressed Feedback and added cards 
* Addressed feedback on Pull Request #3053
* Fixed a copy-paste bug in Destined // Lead
* Added two new Aftermath Split cards that were revealed today
 2017-04-04 17:07:59 -06:00
fireshoes
2296647df9 Merge origin/master 2017-04-04 18:02:31 -05:00
fireshoes
195ff7f554 [AKH] Added 4/4 spoilers and implemented non-exert/embalm/aftermath cards. 2017-04-04 17:57:08 -05:00
Jeff
796fca7c1b - Added Charisma. 2017-04-04 17:18:19 -05:00
Jeff
da34d6c3ca - Modified set for Bronze Bombshell. 2017-04-04 15:44:42 -05:00
Jeff
b76933d5b3 - Added Bronze Bombshell. 2017-04-04 15:41:48 -05:00
fireshoes
fe33f82acc [AKH] Added 4/4 spoilers and implemented non-exert/embalm/aftermath cards. 2017-04-04 14:28:45 -05:00
LevelX2
e42d195f8d [AKH] Added Anoiter Priest and embalm ability. 2017-04-04 17:55:37 +02:00
LevelX2
269189f87e Merge origin/master 2017-04-04 15:33:01 +02:00
LevelX2
45818f3a51 * Celestial Dawn - Fixed that it was not possible to pay colorless costs with non white mana. 2017-04-04 15:32:39 +02:00
Jeff
772fff4f66 - Fixed spelling for Event. 2017-04-04 08:24:30 -05:00
Mark Langen
18663f0a7a Amonket Aftermath ability and card frame changes Completed 
* Aftermath Ability implementation complete (At least until we see comprehensive rules that contradict the way I assumed it will work)
* Aftermath Card Frame rendering complete
* Normal Split and Fuse Split card frame rendering complete
* Amonket Split card CMC changes NOT made, but left for a separate commit
 2017-04-04 00:29:54 -06:00
fireshoes
a04bbce5db [AKH] Added 4/3 spoilers and implemented several. 2017-04-03 23:52:39 -05:00
Mark Langen
a96a7f89f5 Work in progress changes for Amonket Aftermath ability. 
* Card Rendering has support for Aftermath Split card frames
* Card Rendering has support for Split cards
* Aftermath ability work in progress
 2017-04-03 04:15:25 -06:00
LevelX2
e88613da5c * Kira, Great Glass-Spinner - Fixed that targeting objects that later changed to creatures was ignored (related to #3041). 2017-04-03 10:30:28 +02:00
Derek M
b19170f34f Merge pull request #3045 from SickBoyWi/master 
Implemented Soul Burn card for the two sets it's a part of: Ice Age a…
 2017-04-02 12:17:32 -04:00