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

6277 commits

Author SHA1 Message Date
Evan Kranzler
0681edfa48 updated defending player predicate again 2017-09-23 18:53:12 -04:00
LevelX2
eb842e3219 Merge origin/master 2017-09-24 00:28:21 +02:00
LevelX2
d866234e89 Xmage 1.4.25V6 2017-09-23 23:49:00 +02:00
LevelX2
3ac7fc2726 * Some fixes to possible exceptions. 2017-09-23 23:48:25 +02:00
Evan Kranzler
631acef6b9 updated defending player predicate 2017-09-23 17:40:42 -04:00
theelk801
dafd75e1ab Merge pull request #80 from magefree/master 
merge
 2017-09-23 17:30:43 -04:00
LevelX2
e6225e3ad3 Merge branch 'master' into adjustTargets 2017-09-23 19:27:45 +02:00
LevelX2
0714ae39dc * Hope of Ghirapur - Fixed a problem with check if current object has daone the damage. 2017-09-23 19:16:21 +02:00
Evan Kranzler
843a09b074 fixed activated abilities not being controlled by the player who activated it (#4047) 2017-09-23 09:59:21 -04:00
theelk801
da176e2b7a Merge pull request #79 from magefree/master 
merge
 2017-09-22 22:57:56 -04:00
Evan Kranzler
59b38b76ec (#4015) fixed enrage triggers triggering multiple times in combat, 
didn't fix triggers which use amount of damage dealt (Boros Reckoner)
 2017-09-22 18:18:30 -04:00
Evan Kranzler
2a9def5f50 Implemented Elephant Resurgence 2017-09-22 16:02:34 -04:00
igoudt
cd31a94ed2 text fixes, gatecreeper vine etb is optional 2017-09-22 14:28:52 +02:00
Evan Kranzler
9384bf8df4 Implemented Apocalypse Sanctuaries 2017-09-21 21:20:42 -04:00
Evan Kranzler
0d49e385d5 small fix 2017-09-19 22:12:50 -04:00
Evan Kranzler
b0c3d6aee6 small fix 2017-09-19 21:56:55 -04:00
Evan Kranzler
bd415215f5 Legacy's Allure modified so its ability can be copied 2017-09-19 20:52:18 -04:00
Evan Kranzler
602eee1928 Vile Requiem modified so its ability can be copied, 
implemented Recantation, Rumbling Crescendo, Serra's Liturgy and War Dance
 2017-09-19 20:29:33 -04:00
Evan Kranzler
ce68a1d9ed Pentarch Paladin is now supported properly 2017-09-19 18:01:37 -04:00
Evan Kranzler
79d3bd24d5 cleaned up some cards, tested that the abilities can be copied 2017-09-19 15:40:45 -04:00
Evan Kranzler
e2a1fa50ea moved some target choices to CardImpl, they should be properly copiable now 2017-09-19 12:50:19 -04:00
Evan Kranzler
96a3f40891 changed Ancient Hellkite, made predicate for cards/permanents defending player controls/owns 2017-09-19 11:58:55 -04:00
theelk801
2d577287d1 Merge pull request #77 from magefree/master 
merge
 2017-09-19 10:32:28 -04:00
Evan Kranzler
7bb7754bb3 Updated how spell triggers get information about the spell that triggered them. 
This prevents countering the spell from removing the effect of the trigger.
 2017-09-18 17:02:55 -04:00
Evan Kranzler
6f4d77fc0f Implemented Gemini Engine 2017-09-18 10:40:15 -04:00
Evan Kranzler
356737075a Revert "Skulk is now singleton" 
This reverts commit 6ca03a339a.
 2017-09-17 19:57:54 -04:00
Evan Kranzler
6ab143c123 Implemented Mine Layer 2017-09-17 18:55:06 -04:00
LevelX2
1d5105c0bd Xmage 1.4.26V5 2017-09-17 23:11:38 +02:00
theelk801
c32c5d41a2 Merge pull request #75 from theelk801/master 
merge
 2017-09-17 15:31:03 -04:00
Evan Kranzler
9a57480f4b Fixed Dual Nature 2017-09-17 12:42:59 -04:00
theelk801
a6b95db4fc Merge pull request #73 from magefree/master 
merge
 2017-09-16 21:57:19 -04:00
Evan Kranzler
e646c75487 Fixed Dowsing Dagger token 2017-09-16 21:46:12 -04:00
Evan Kranzler
dcddc91144 Updated cards which target cards with attribute x 2017-09-16 21:08:52 -04:00
Evan Kranzler
b3712b88c7 updated Hakim, Loreweaver 2017-09-16 21:06:56 -04:00
Evan Kranzler
856dcb54d5 updated abilities with x targets 2017-09-16 17:07:48 -04:00
Evan Kranzler
d68efc21c5 Changed some X cost abilities (untested) 2017-09-16 12:58:25 -04:00
LevelX2
2d6bcd83f4 xmage 1.4.26V4 2017-09-16 16:55:58 +02:00
LevelX2
563856434d Some more minor fixes. 2017-09-16 16:03:12 +02:00
LevelX2
afd6bc080d Removed exception for missing subType to prevent empty card list in older deck editors. 2017-09-16 15:14:52 +02:00
LevelX2
d66a9d1693 Some fixes to red cards. 2017-09-16 15:14:21 +02:00
LevelX2
21c3e2cf02 Some fixes to black cards. 2017-09-16 11:39:33 +02:00
LevelX2
53324c0f4d Reverted making Menace a MageSingleton. 2017-09-16 10:38:10 +02:00
Evan Kranzler
217a17b864 Removed planeswalker uniqueness rule 2017-09-15 23:34:49 -04:00
theelk801
ecbc4950cd Merge branch 'master' into master 2017-09-15 18:18:10 -04:00
LevelX2
7d748721da [XLN] Added 10 cards. 2017-09-16 00:11:38 +02:00
theelk801
a62410d3e5 Merge pull request #67 from magefree/master 
merge
 2017-09-15 17:33:51 -04:00
Evan Kranzler
6fe2eaf6a3 Implemented Shore Keeper 2017-09-15 16:51:11 -04:00
LevelX2
82d2953d7b Merge origin/master 2017-09-15 21:57:54 +02:00
Evan Kranzler
58bba450e0 Added all XLN reprints 2017-09-15 13:24:25 -04:00
LevelX2
5996aa12e6 Trove of Temptation working for Human. 2017-09-15 17:51:54 +02:00
LevelX2
24c2c69a81 Merge master into TroveOfTemptation 2017-09-15 17:12:45 +02:00
Evan Kranzler
c611d71f30 Implemented Spiritual Asylum 2017-09-14 22:23:01 -04:00
Evan Kranzler
10a57b1594 Implemented Energy Storm 2017-09-14 21:12:25 -04:00
theelk801
ba85640c84 Merge pull request #3987 from theelk801/master 
Added XLN cards
 2017-09-14 18:17:01 -04:00
Evan Kranzler
7663827a30 Implemented Vance's Blasting Cannons/Spitfire Bastion 2017-09-14 18:14:32 -04:00
LevelX2
d0dfd46c5f Fixed problem that prevented project generation. 2017-09-14 23:45:48 +02:00
Evan Kranzler
73a8d64d5c fixed Thraben Sentry 2017-09-14 13:38:25 -04:00
LevelX2
d9c601dd26 Trove of Temptation - Basic some changes to Combat and Human 2017-09-14 17:50:00 +02:00
Evan Kranzler
68a42726a8 Implemented Shadowed Caravel, generalized explore triggers 2017-09-14 11:19:29 -04:00
Evan Kranzler
1ae29e900a Implemented Guided Passage 2017-09-14 10:02:32 -04:00
theelk801
6802b60d21 Merge pull request #3971 from theelk801/mairsil2 
Fixed issues with Mairsil (I think) re:#3963
 2017-09-14 08:00:56 -04:00
Evan Kranzler
98c2332b3c a few small changes 2017-09-14 07:04:44 -04:00
Evan Kranzler
6ca03a339a Skulk is now singleton 2017-09-13 20:38:29 -04:00
Evan Kranzler
b83e12f51c Menace is now a singleton like other keywords 2017-09-13 15:38:02 -04:00
theelk801
c7cfca6677 Merge pull request #3977 from theelk801/master 
Implemented cards, updated spoiler
 2017-09-13 11:08:21 -04:00
LevelX2
c70b548464 Some minor changes. 2017-09-13 17:05:37 +02:00
LevelX2
55917ccc63 * Anthroplasm - Fixed possible null pointer exception. 2017-09-13 17:05:09 +02:00
Evan Kranzler
cd58164b89 Implemented Celestial Gatekeeper 2017-09-13 10:30:35 -04:00
LevelX2
c3157bbcde * Path of Ancestry - Fixed possible null pointer exception. 2017-09-13 14:52:47 +02:00
Evan Kranzler
69c7668bd0 Implemented Dowsing Dagger/Lost Vale 2017-09-12 16:27:10 -04:00
Evan Kranzler
a26c5a509f updated various activated abilities 2017-09-12 12:31:00 -04:00
Evan Kranzler
9b25dd0e39 revamped how conditional and limited-use activated abilities are implemented 2017-09-12 09:33:12 -04:00
Evan Kranzler
3a6e2b080b updated spoiler 2017-09-11 16:40:49 -04:00
Evan Kranzler
650f184ee6 Begin Mairsil fix 2017-09-11 16:26:30 -04:00
theelk801
31acee7624 Merge branch 'master' into subTypeSwitch 2017-09-09 11:16:47 -04:00
Evan Kranzler
f43950c4b8 Fixed various rule texts 2017-09-09 10:16:26 -04:00
Evan Kranzler
3cc178196e Refactored more subtypes usages to enum 2017-09-08 11:05:58 -04:00
Evan Kranzler
252c941b4f Refactored more subtypes usages to enum 2017-09-08 09:57:51 -04:00
igoudt
d79c57b907 Merge https://github.com/magefree/mage 2017-09-08 13:12:03 +02:00
igoudt
2355d35e04 small fixes 2017-09-08 13:11:58 +02:00
LevelX2
66c4aec499 * Conspiracy - Fixed that it doesn't revert creature types of non-permanent cards when it leaves the battlefield (fixes #3911). 2017-09-08 12:14:18 +02:00
Evan Kranzler
245bf2f2df Refactored subtypes to enum 2017-09-07 21:18:19 -04:00
Evan Kranzler
0656f97d7c Merge branch 'master' of https://github.com/magefree/mage into magefree-master 
# Conflicts:
#	Utils/mtg-cards-data.txt
 2017-09-07 11:36:07 -04:00
Justin Herlehy
b6dceb28c8 Code Cleanup 
Deprecated SubTypeList methods that expect strings and List<String>.
Readability cleanup for SubType Enum.
 2017-09-06 20:38:11 -07:00
Evan Kranzler
e954de0012 Implemented Fathom Fleet Captain 2017-09-06 18:04:41 -04:00
Evan Kranzler
0f72c4fb22 Additional token effect text changes 2017-09-06 17:39:58 -04:00
Evan Kranzler
6fc78d1d78 Implemented Pirate's Cutlass, changed text templating for creating token effects 2017-09-06 16:21:06 -04:00
Evan Kranzler
fce99fa182 Implemented Conqueror's Galleon/Foothold 2017-09-05 19:39:04 -04:00
theelk801
1f92fbcf3e Merge pull request #56 from magefree/master 
merge
 2017-09-05 13:31:28 -04:00
Evan Kranzler
97e34dab49 Added Explore event 2017-09-05 13:27:45 -04:00
LevelX2
466e524d6e Fixed possible exception during draft player repplacement. 2017-09-05 16:39:43 +02:00
LevelX2
0ce13bf676 * Grenzo, Havoc Raiser - Fixed that blocked the game. 2017-09-05 16:20:58 +02:00
Evan Kranzler
9e44a1f152 Implemented Huatli, Warrior Poet 2017-09-04 21:02:33 -04:00
Evan Kranzler
d0a4e5a420 Implemented Mavren Fein and Call to the Feast 2017-09-04 17:29:45 -04:00
TacomenX
518bae18df [XLN] Deeproot Waters + Merfolk Hexproof Token 2017-09-04 01:29:20 -05:00
LevelX2
20a3f6a2c6 xmage 1.4.26V3 2017-09-03 08:21:48 +02:00
LevelX2
66c69e51a3 Started to implement a solution for effects that change words in rule text. 2017-09-03 07:31:36 +02:00
Evan Kranzler
54761f400d fixed bug #3923 2017-09-02 13:06:13 -04:00
Evan Kranzler
a8abdba0ad Implemented Huatli, Dinosaur Mage 2017-09-02 10:19:20 -04:00
igoudt
e2ad4a6654 Merge https://github.com/magefree/mage 2017-09-02 13:03:46 +02:00
theelk801
bda6658d79 Merge pull request #50 from magefree/master 
merge
 2017-09-01 21:25:20 -04:00
Evan Kranzler
1f382a7ce7 Implemented Jace, Cunning Castaway (ultimate won't work correctly until planeswalker rule is removed) 
various other small changes as well
 2017-09-01 21:20:05 -04:00
LevelX2
720351c065 Some minor user handling changes. 2017-09-02 00:46:24 +02:00
LevelX2
5bf12d227c Some minor changes. 2017-09-01 23:50:07 +02:00
igoudt
43bb541876 Merge https://github.com/magefree/mage 2017-09-01 22:49:50 +02:00
igoudt
f0623d37c9 some cleanups 2017-09-01 22:48:42 +02:00
Evan Kranzler
d28de9e357 Implemented Shifty Doppelganger 2017-09-01 16:38:40 -04:00
LevelX2
84fe04b92d Replaced exception handling of invalid deck submitting by a user message. 2017-09-01 20:05:26 +02:00
Evan Kranzler
029420a9a8 fixed enrage text 2017-09-01 09:57:11 -04:00
LevelX2
77f6f7b2b6 * Tawnos's Coffin - Fixed that it did not work correctly if abilities were copied by Mairsil, The Pretenderand and general rework. 2017-09-01 12:36:40 +02:00
spjspj
669ae56d6f Allow Dinosaur to be selected in creature type dialog 2017-08-31 23:27:11 +10:00
Evan Kranzler
13c7c2f231 Implemented Treasure Map/Treasure Cove 2017-08-30 21:56:45 -04:00
Evan Kranzler
3fd7a34944 Implemented Captain Lannery Storm 2017-08-30 20:03:29 -04:00
theelk801
1f607e7429 Merge pull request #47 from magefree/master 
merge
 2017-08-30 18:08:28 -04:00
Evan Kranzler
e4cf16f338 Implemented Revel in Riches, added Treasure tokens 2017-08-30 18:06:06 -04:00
theelk801
2ea174724c Merge pull request #3901 from theelk801/master 
Implemented 4 XLN cards
 2017-08-30 11:49:24 -04:00
Evan Kranzler
b2e7b02fd7 Implemented Tishana's Wayfinder 2017-08-30 11:46:16 -04:00
LevelX2
4d832326a3 * Added log message. 2017-08-30 17:31:06 +02:00
LevelX2
40689fe1b9 Fixed possible null pointer exception. 2017-08-30 17:07:57 +02:00
theelk801
6df548dc5d Merge pull request #3900 from theelk801/master 
Implemented Infernal Denizen, Ripjaw Raptor and Sun-Crowned Hunters
 2017-08-29 18:44:16 -04:00
LevelX2
cba7a510ea * Fixed a bug if casting split cards from other players e.g with Mindclaw Shaman (fixes #3867). 2017-08-30 00:30:46 +02:00
Evan Kranzler
be2f27bfb3 added Enrage as an ability word 2017-08-29 18:22:10 -04:00
LevelX2
e909f5c801 C17 Added Portal Mage. 2017-08-28 16:50:00 +02:00
LevelX2
5660348f98 C17 Added Alms Collector. 2017-08-28 12:44:08 +02:00
LevelX2
ea4af25c77 * Goaded creatures able to attack the goading player (in multiplayer) (fixes #3891). 
* Grenzo, Havoc Raiser - Fixed trigger handling and null pointer exception.
 2017-08-27 22:28:13 +02:00
Evan Kranzler
b888e8e634 Implemented Temporal Distortion 2017-08-27 11:08:47 -04:00
theelk801
ad893aee31 Merge pull request #44 from magefree/master 
merge
 2017-08-27 11:08:13 -04:00
Evan Kranzler
4bf436b0f4 Fixed Duplicant getting boost from Commander in command zone (#3299) 2017-08-27 09:16:47 -04:00
LevelX2
cb15d4728d * Dragon Tempest - Fixed a problem if damage was redirected (e.g. with Spellskite) - (fixes #3887). 2017-08-27 14:27:03 +02:00
Evan Kranzler
962ec40d4c Fixed Nazahn not properly searching for his Hammer. 2017-08-27 08:07:57 -04:00
LevelX2
7e8dcef120 C17 added Seth's Tiger. 2017-08-27 10:57:14 +02:00
LevelX2
f35eee935c * XMage 1.4.26V2 2017-08-27 08:04:18 +02:00
LevelX2
52897094b3 * Some chnages to chat, user and player handling. 2017-08-26 18:26:55 +02:00
LevelX2
e7a3fee8d7 * Teferi's Protection - Fixed that the damage prevention and protection from did not work correctly (fixes #3879). 2017-08-26 13:24:41 +02:00
LevelX2
cf7d718226 * Some minor changes. 2017-08-26 09:52:51 +02:00
theelk801
ed9320362d Merge pull request #42 from magefree/master 
merge
 2017-08-25 10:14:03 -04:00
LevelX2
04afe73f28 * Fixed that curses selected with Bitterheart Witch or Curse of Misfortunes could be retargeted (fixes #3858). 2017-08-24 16:08:58 +02:00
Evan Kranzler
255b81f143 fixed bug #3834 2017-08-23 21:26:39 -04:00
Evan Kranzler
c6029176d3 Implemented Varchild's War Raiders 2017-08-23 10:52:58 -04:00
Evan Kranzler
d0744486ad small change 2017-08-23 09:40:11 -04:00
Evan Kranzler
c61651da69 Fixed bug #3777 2017-08-22 21:44:14 -04:00
Evan Kranzler
12cedf945d Fixed bug #3835, stolen creatures that exploit themselves now trigger for the appropriate player 2017-08-22 21:34:14 -04:00
Evan Kranzler
e3faef4a52 Fixed several cards with ETB abilities that didn't use last known information properly 2017-08-22 13:35:44 -04:00
LevelX2
4c2d8cd8f8 * Improved payment handling of conditional monohybrid colored mana. 2017-08-22 17:51:48 +02:00
LevelX2
5b7fb59b52 * Sepulchral Primordial - Fixed that its ETB ability doesn't trigger if at least one opponent in range had no creature in the graveyard (fixes #3257). 2017-08-22 16:10:40 +02:00
theelk801
4d5e8d4a91 Merge branch 'master' into master 2017-08-22 09:31:16 -04:00
Evan Kranzler
8d85189262 Implemented Mairsil properly 2017-08-22 09:27:07 -04:00
LevelX2
1a4d6ea547 * Vindictive Lich - Fixed cross mode target handling. 2017-08-22 00:37:44 +02:00
LevelX2
2880b32444 * Vindictive Lich - Fixed cross mode target handling. 2017-08-22 00:27:18 +02:00
LevelX2
9ac7fe27f0 * Vindictive Lich (mode target handling not fixed yet). 2017-08-21 18:49:37 +02:00