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

7123 commits

Author SHA1 Message Date
Michael Simons
63df286680 Token image changes for DOM 2018-05-10 00:30:50 -04:00
Michael Simons
8477a56c54 Token image changes for DOM 2018-05-10 00:30:27 -04:00
Michael Simons
801d2c39a4 Token image changes for DOM 2018-05-10 00:29:51 -04:00
Michael Simons
af31f86b10 Token image changes for DOM 2018-05-10 00:29:12 -04:00
Michael Simons
43d99b5caa Token image changes for DOM 2018-05-10 00:28:17 -04:00
Michael Simons
bc70a5e4ad Token image changes for DOM 2018-05-10 00:27:53 -04:00
Michael Simons
b773599614 Token image changes for DOM 2018-05-10 00:27:26 -04:00
Michael Simons
969bf282cd Merge dom_tokens 2018-05-09 23:33:10 -04:00
Michael Simons
c8d2c2f25f Token changes for C17 2018-05-09 22:12:56 -04:00
Michael Simons
5274436938 Token changes for C17 2018-05-09 22:12:46 -04:00
Michael Simons
d73b1c2987 Token changes for C17 2018-05-09 22:12:40 -04:00
Michael Simons
31419dbc76 Token changes for C17 2018-05-09 22:12:23 -04:00
Michael Simons
4a6cdbe560 Token changes for C17 2018-05-09 22:12:13 -04:00
Michael Simons
ba57aeb820 Token changes for C17 2018-05-09 22:12:06 -04:00
Michael Simons
b93bbb6e3c Token changes for C17 2018-05-09 22:11:56 -04:00
Michael Simons
849fb5a14a Token changes for C17 2018-05-09 22:11:50 -04:00
Michael Simons
fde9b1cda5 Token changes for C17 2018-05-09 22:11:40 -04:00
LevelX2
dcd3e7c039 * Some more fixed/reworked card movement handling. 2018-05-08 23:46:34 +02:00
LevelX2
df987049c0 * Fixed some card movement (fixes #4910). 2018-05-08 18:01:15 +02:00
LevelX2
48d0c6ec5e
Merge pull request #4882 from tcontis/master 
Cephalid Snitch Torment
 2018-05-07 00:53:17 +02:00
LevelX2
1ab3d24e7c
Merge pull request #4890 from Zzooouhh/master 
Implemented old cards
 2018-05-07 00:52:56 +02:00
LevelX2
8f06fd130a * Some formatting. 2018-05-07 00:48:41 +02:00
LevelX2
8afd51fa04 Merge origin/master 2018-05-07 00:45:05 +02:00
LevelX2
bb15176a84 * Fixed token ability (id handling) and token cardType (reset was not correctly done) handling (this fixed problems with copying Planeswalker with Helm of the Host). 2018-05-07 00:44:32 +02:00
Oleg Agafonov
721f37c5ae * Summon the Pack - fixed that it gives black color to cards (#4905); 2018-05-06 19:48:09 +04:00
Oleg Agafonov
72314a9512 * Fixed 8 cards with "becomes creature attached" effect that it adds colors instead replace it; 
* Affected cards: Awaken the Ancient, Corrupted Zendikon, Crusher Zendikon, Deep Freeze, Guardian Zendikon, Living Terrain, Vastwood Zendikon, Wind Zendikon;
 2018-05-06 19:07:45 +04:00
LevelX2
2b69f1a311 * Soul Ransom - Fixed handling of some rare cases (e.g. Vedalken Orrery in play using Boomerang and playing Soul Ransom again). 2018-05-06 09:43:47 +02:00
Oleg Agafonov
459ef9af94 Refactoring: added mana color check and fix 2018-05-06 00:48:16 +04:00
Evan Kranzler
7edcec0dc1 fixed ability word text formatting 2018-05-05 14:05:04 -04:00
Oleg Agafonov
69ba8cada4 Refactoring: replace custom creature tokens with basic class 2018-05-05 19:18:12 +04:00
Oleg Agafonov
7d8c9f5b13 Small fixes 2018-05-05 17:32:01 +04:00
Oleg Agafonov
578427a601 Refactoring: replace custom creature tokens with basic class 2018-05-05 17:25:33 +04:00
Oleg Agafonov
483853658b Refactoring: replace custom creature tokens with basic class 2018-05-05 14:37:24 +04:00
L_J
2fdfaa9138
Implemented Gauntlets of Chaos 2018-05-04 23:20:08 +02:00
LevelX2
a063889205 Merge origin/master 2018-05-03 01:33:39 +02:00
LevelX2
cddd81123b Some changes related to #4893. 2018-05-03 01:33:21 +02:00
Evan Kranzler
75bef57832 fixed Lich's Mastery preventing auto-win effects 2018-05-02 18:34:22 -04:00
Evan Kranzler
9b5b3afcb8 fixed Teferi, Hero of Dominaria's untap trigger 2018-05-02 17:42:41 -04:00
Oleg Agafonov
b6bad9ca96 * Fixed viewer's error on tokens show up (Mirage and other); Fixed some tokens. 2018-05-02 15:16:39 +04:00
spjspj
4b4d7989cd
Merge pull request #4879 from spjspj/master 
Add planechase to new tournament window as well.
 2018-05-02 18:31:59 +10:00
Oleg Agafonov
3549f958d4 Fixed NPE in Riptide Replicator and Volraths Laboratory tokens 2018-05-02 00:17:55 +04:00
L_J
58a829de0e
Implemented old cards 2018-05-01 02:07:45 +02:00
LevelX2
e767c79429 XMage 1.4.29V4 2018-05-01 01:20:52 +02:00
LevelX2
0ceb5fc88f * Drain Power - Improved conditonal mana handling. 2018-05-01 00:55:46 +02:00
LevelX2
940fe603c6 * Herald's Horn - Fixed that cast cost reduction was also applied to other players. 2018-04-30 23:15:48 +02:00
LevelX2
f27f32ec5e
Merge pull request #4880 from Zzooouhh/Zzooouhh-drain 
Implemented Drain Power (with bugs)
 2018-04-30 22:43:00 +02:00
LevelX2
dc91d6ff81 * Some updated to Psychic Battle handling. 2018-04-30 08:06:23 +02:00
spjspj
1dbffe70b5 Add planechase to tournaments 2018-04-29 23:47:08 +10:00
Thomas Contis
e2a5561a87 Began implementing Cephalid Snitch methods 2018-04-28 22:29:16 -04:00
Thomas Contis
24f6dc6031 Beginning of proper implementation of Cephalid Snitch Methods 2018-04-28 22:25:50 -04:00
Oleg Agafonov
c24ba742f6 Fixed equal or == errors -- 23 cards and more (see #4407) 2018-04-28 21:24:48 +04:00
L_J
4446adfadf
Made Mana#includesMana capable of comparing colorless to generic 2018-04-28 13:17:25 +00:00
LevelX2
15fa8fa124
Merge pull request #4803 from Zzooouhh/Zzooouhh-psy 
Implemented Psychic Battle
 2018-04-28 13:24:58 +02:00
LevelX2
29605bc5ae * Redirection effect - Added possibility to last for one applyEffect cycle instead of only one absolute use. 2018-04-28 13:21:58 +02:00
spjspj
1a9f12f576 Increase (by 1/3) the chance of getting either a chaos or planar roll for planechase. 2018-04-28 20:37:19 +10:00
LevelX2
7e73cf5d34 * Mana Vault - Fixed that it doesn't return mana if payment is cancelled (fixes #4473) 2018-04-28 00:52:04 +02:00
LevelX2
59b9449fb9 * Some rework of filter hanmdling. 2018-04-28 00:30:28 +02:00
Evan Kranzler
f2835685e9 updated how Saga abilities are added 
still need to fix sacrificing works (#4875)
 2018-04-27 18:22:49 -04:00
Evan Kranzler
4ac6e7d86c Fixing saga implementation 
Related to #4875, still need to rework how the SBA removes the saga with respect to the final trigger
 2018-04-27 15:12:11 -04:00
spjspj
26bc78dc8c
Merge pull request #4873 from spjspj/master 
Remove plane from old player and add in new one
 2018-04-27 13:26:20 +10:00
spjspj
ef281065a8 Remove plane from old player and add in new one 2018-04-27 09:10:02 +10:00
LevelX2
329116669a * Fixed a problem with stack abilities created by Designations eg. Monarch triggered ability (fixes #4457). 2018-04-26 23:35:26 +02:00
Evan Kranzler
1d69c2611d fixed more instances of Kwende, Pride of Femeref not granting double strike 2018-04-26 12:56:27 -04:00
LevelX2
90e9a21aa5 * Replaced some wrong card movement handling. 2018-04-26 17:30:44 +02:00
LevelX2
db077d68ca * Fixed Rat Colony deck valid check for all formats. 2018-04-25 16:34:55 +02:00
LevelX2
1048472736 * Torgaar, Famine Incarnate - Fixed that if used as commander one cannot pay additional costs (fixes #4815). 2018-04-25 11:57:31 +02:00
LevelX2
758634f5bb XMage 1.4.29V3 2018-04-24 23:43:24 +02:00
LevelX2
b496adcb11 * Corrosive Ooze - Fixed that the equipments were not destroyed. 2018-04-24 23:34:45 +02:00
LevelX2
242e55dcd4 * Fixed that Fall of the Thran allowed AI to get back dragons (fixes #4848). 2018-04-24 23:22:29 +02:00
LevelX2
26f4bf6867 Merge origin/master 2018-04-24 17:51:34 +02:00
LevelX2
7b2ff38225 * Grasp of Fate - Fixed rule text. Fixed that exiled permanents did not return to battlefeild if the Grasp left the battlefield because its owner lost or left the game. 2018-04-24 17:50:35 +02:00
spjspj
0082b3581b
Merge pull request #4858 from spjspj/master 
Fix Tazeem Plane
 2018-04-25 00:01:33 +10:00
spjspj
a08aeb6141 Fix Tazeem Plane 2018-04-24 23:59:42 +10:00
LevelX2
6ebd715e17 * Some minor clean ups. 2018-04-24 11:38:25 +02:00
LevelX2
6bd8f52b66 * Fixed a problem of becomes ColorTargetEffect that causes objects to not always reset to original color. 2018-04-24 11:35:33 +02:00
spjspj
229cad7330
Merge pull request #4853 from spjspj/master 
One more plane
 2018-04-24 14:12:48 +10:00
Evan Kranzler
95efa51197 fixed Phyrexian Scriptures exiling all graveyards rather than the opponents' 2018-04-23 23:28:03 -04:00
spjspj
5e70e73acd One more plane 2018-04-24 09:21:32 +10:00
Plopman
a5fc4d0741 Fix some DOM card text 2018-04-23 22:42:41 +02:00
Evan Kranzler
ea5155bb34 small text fix 2018-04-23 11:55:09 -04:00
Evan Kranzler
05070cff35 fixed adding saga counter not using the stack (this should be a state-based action though) 2018-04-22 21:16:09 -04:00
Evan Kranzler
35b78f8d11 Fixed Goblin Barrage not targeting correctly 2018-04-22 17:26:06 -04:00
Plopman
01295bb94b Fix some DOM card text 2018-04-22 22:47:37 +02:00
Oleg Agafonov
76b15e86af Fixed broken "any target" spells (can't target to planeswalkers) 2018-04-22 17:52:38 +04:00
Oleg Agafonov
885130b108 Texts update: target creature or player => any target 2018-04-22 08:34:27 +04:00
Oleg Agafonov
23becf1775 Texts update: to target creature or player => to any target 2018-04-22 08:15:40 +04:00
Evan Kranzler
63e7358eb5 fixed Deep Freeze overwriting color (fixes #4843) 2018-04-21 23:19:04 -04:00
Evan Kranzler
b54cebf6ab fixed filterplayerorplaneswalker and filteropponentorplaneswalker 2018-04-21 22:08:30 -04:00
Oleg Agafonov
4e12b06bc7 Fixed not working opponent or planeswalker filter (count all permanents instead planeswalkers); 2018-04-22 04:58:24 +04:00
Evan Kranzler
cf9ac754f0 small text fix 2018-04-21 18:49:10 -04:00
Evan Kranzler
7deb521a65 more mana pool errata 2018-04-21 18:36:22 -04:00
Evan Kranzler
2dcc50d592 more "this spell" errata 2018-04-21 18:24:07 -04:00
Evan Kranzler
b82475dcff updated additional cost text 2018-04-21 17:56:44 -04:00
LevelX2
52ae0a9be6 XMage 1.4.29V2 2018-04-21 23:04:50 +02:00
LevelX2
88b3efe759 * Phyrexian Scriptures - Fixed that wrongly also the card sfrom the controlling player were exiled. 2018-04-21 22:47:29 +02:00
LevelX2
92793327f3 * returned UUID of used THOUGHT AS effect instead of boolean. 2018-04-21 22:32:45 +02:00
LevelX2
968b10bd79
Merge pull request #4835 from spjspj/master 
Two more planes
 2018-04-21 22:24:32 +02:00
Evan Kranzler
61bb7d075b another small fix 2018-04-21 09:41:08 -04:00
Evan Kranzler
ef947493db small fix 2018-04-21 09:23:27 -04:00
Evan Kranzler
590e412550 fixed color identity function not working for transguild courier 2018-04-21 08:25:03 -04:00
LevelX2
290be87073 * Jaya Ballard - Fixed that the created emblem's ability did cause game breaking errors. 2018-04-21 11:16:19 +02:00
spjspj
82b9a26142 Two more planes 2018-04-21 18:32:28 +10:00
spjspj
618c89ee91
Merge pull request #4833 from spjspj/master 
Fix for Agyrem Plane
 2018-04-21 18:09:41 +10:00
spjspj
f3f9603b61 Fix for Cost reducing Planes 2018-04-21 17:58:39 +10:00
spjspj
b4d953525d Fix for Agyrem Plane 2018-04-21 12:10:30 +10:00
Evan Kranzler
16c081dbf5 fix all the tests 2018-04-20 20:10:26 -04:00
Evan Kranzler
e51b63aea8 a few changes to help with tests 2018-04-20 18:02:33 -04:00
Evan Kranzler
dc2d8145fd added copy methods that I accidentally removed 2018-04-20 17:17:51 -04:00
theelk801
95d2721421
Merge branch 'planeswalkerErrata' into master 2018-04-20 16:21:44 -04:00
LevelX2
e4f09a5358 * Fixed that casting Fervent Strike didn't give double strike to targeted creature with Kwende, Pride of Femeref onto battlefield (fixes #4813). 2018-04-20 20:09:25 +02:00
Evan Kranzler
d290c7f26b updated TargetPlayerOrPlaneswalker to be a subclass of TargetPlayerOrPermanent (as well as the respective filters) 2018-04-20 13:34:35 -04:00
Evan Kranzler
5f843eefcf removed Planeswalker Redirection Effect (leaving it commented for now) 2018-04-20 11:32:52 -04:00
Evan Kranzler
e6bb4f4b83 added damagePlayerOrPlaneswalker method to Game to make some things easier, fixed some more cards 2018-04-20 09:59:03 -04:00
LevelX2
c648ddd6e5 Fixed a problem with exiling copied spells from the stack (Time Stop and Hive Mind problem). 2018-04-20 15:40:02 +02:00
spjspj
43b7222ab6
Merge pull request #4824 from spjspj/master 
Fix for Agyrem Plane
 2018-04-20 20:18:47 +10:00
spjspj
7116182aa2 Fix for Agyrem Plane 2018-04-20 19:50:27 +10:00
LevelX2
e3750ad335 * Fixed Knight of Malice, Knight of Grace that boost only worked if all players had a permanent with the needed color (fixes #4811). 2018-04-20 08:04:49 +02:00
Evan Kranzler
4c2d2cf537 added TargetOpponentOrPlaneswalker and FilterOpponentOrPlaneswalker 2018-04-19 16:59:38 -04:00
LevelX2
19ad6da608 * Knight of Malice - Fixed that all controlled creatures were boost instead of only the Knight. 2018-04-19 22:33:51 +02:00
Evan Kranzler
6bc735c297 updated more "that player or that planeswalker's controller" cards 2018-04-19 16:22:51 -04:00
Evan Kranzler
1e27d7222a updated Bonfire of the Damned, added a new method for getting a player or planeswalker's controller 2018-04-19 16:01:44 -04:00
LevelX2
fe2220e19e Xmage 1.4.29V0 2018-04-19 21:07:14 +02:00
LevelX2
47ad1ea0ee Fixed a AI target selecting problem. 2018-04-19 21:02:34 +02:00
L_J
f64ec46742
Implemented Psychic Battle 2018-04-19 18:46:33 +00:00
L_J
9f5249cc73
Implemented Psychic Battle 2018-04-19 18:43:09 +00:00
Evan Kranzler
f072ba8d37 updated all cards that use any target (with a few possible exceptions, it's hard to tell) 2018-04-19 14:41:38 -04:00
LevelX2
e821d22fb6 [DOM] Some fixes and tooltip rule text changes. 2018-04-19 17:53:30 +02:00
Evan Kranzler
5fe607e852 updated targeting for cards that damage 2018-04-19 11:45:20 -04:00
Evan Kranzler
7212b02e53 initial changes, creation of branch, detailed in #4799 2018-04-19 11:20:18 -04:00
LevelX2
97b2b2feac Merge origin/master 2018-04-19 15:48:55 +02:00
theelk801
b001105b7b
Merge pull request #4794 from jpgunter/master 
Fixup Firesong and Sunspeaker
 2018-04-19 09:48:39 -04:00
LevelX2
4cc77c49c4 [DOM] Some fixes and tooltip rule text changes. 2018-04-19 15:48:25 +02:00
LevelX2
753e01598a Merge origin/master 2018-04-19 12:33:32 +02:00
LevelX2
265bcf5004 [DOM] Update Aryel, Knight of Windgrace. 2018-04-19 12:31:42 +02:00
spjspj
bc77b825cb Fix for Darkbarony plane (1 life) 2018-04-19 20:08:43 +10:00
spjspj
96472332a4 Fix for AkoumPlane (Any player). 2018-04-19 18:57:32 +10:00
spjspj
0c4f487db5 Fix for TrugaJunglePlane (Adding in new condition). 2018-04-19 18:36:09 +10:00
spjspj
8db079f430 Fix for Planes (Incorrectly appending continuous effects) 2018-04-19 18:01:46 +10:00
spjspj
fb4e23e9be Fix for BantPlane (Adding in new condition). 2018-04-19 17:28:14 +10:00
Jimmy Gunter
943a6f1740 Move GainAbilitySpellsEffect to common place 2018-04-18 20:40:23 -07:00
Evan Kranzler
3c2a8ee17d refactored Player.setLife() to include source, some more changes 2018-04-18 21:14:05 -04:00
Evan Kranzler
3798f34c38 refactored Player.gainLife() to include source 2018-04-18 20:30:59 -04:00
Evan Kranzler
254935da39 Implemented Darigaaz Reincarnated 2018-04-18 19:50:12 -04:00
LevelX2
da96ee7b05 [DOM] Added Haphazard Bombardment and Jaya Ballard. 2018-04-19 00:30:13 +02:00
Oleg Agafonov
f2c76b6b88 Removed static instance from dynamic KickerAbility 2018-04-18 23:23:13 +04:00
Evan Kranzler
356ee9ac4e updated Deep Freeze 2018-04-18 14:35:37 -04:00
theelk801
a5e6b04fbe
Merge pull request #4791 from jpgunter/master 
Add Elfhame Druid
 2018-04-18 13:56:56 -04:00
Oleg Agafonov
c11a16d115 Improved logs on card create exceptions, fixed broken tests 2018-04-18 20:37:05 +04:00
Jimmy Gunter
2a22e67754 Add Elfhame Druid 2018-04-18 09:28:30 -07:00
Oleg Agafonov
4d770d3aac [DOM] Refactor Corrosive Ooze to use standard effect 2018-04-18 19:56:39 +04:00
LevelX2
1eaa12aca4 [DOM] Added Rona, Disciple of Gix. 2018-04-18 17:12:27 +02:00
LevelX2
26ce05b42d [DOM] Added Shield of the Realm. 2018-04-18 15:18:23 +02:00
LevelX2
3daa66f396 [DOM] Added Seismic Shift. 2018-04-18 14:33:41 +02:00
LevelX2
f1e140761b [DOM] Added Muldrotha, the Gravetide. 2018-04-18 13:18:45 +02:00
LevelX2
5ecb34453d
Merge branch 'master' into Zzooouhh-rat 2018-04-18 11:12:09 +02:00
LevelX2
d2a51dc4c0 [DOM] Updated Corrosive Ooze. 2018-04-18 10:58:12 +02:00
LevelX2
de53977941 [DOM] Added Warcry Phoenix. 2018-04-18 10:47:29 +02:00
Evan Kranzler
99038825a0 Implemented Fight with Fire 2018-04-17 19:28:32 -04:00
Evan Kranzler
093c6c380b Implemented Chandra, Bold Pyromancer 2018-04-17 17:26:18 -04:00
Evan Kranzler
0c2132f7b9 Implemented Chainer's Torment 2018-04-17 16:58:49 -04:00
LevelX2
d51e8c70b4 [DOM] Aryel update. 2018-04-17 22:22:38 +02:00
LevelX2
731ee2db5a
Merge branch 'master' into master 2018-04-17 21:43:12 +02:00
LevelX2
89ac8cf62f Merge origin/master 2018-04-17 21:30:50 +02:00
LevelX2
bff7c56b49 [DOM] Added Goblin Barrage. 2018-04-17 21:27:46 +02:00
Evan Kranzler
6a0aadbea3 Dominaria packs will now be guaranteed to have at least one legendary creature 2018-04-17 15:16:30 -04:00
spjspj
889f1ce1c8 1 DOM card. 2018-04-18 01:40:23 +10:00
jack-the-BOSS
4e313e8792
Update CardImpl.java 
Added adjustTargets case for Aryel, Knight of Windgrace
 2018-04-17 08:59:08 -05:00
Evan Kranzler
a30c9cc682 Implemented Rite of Belzenlok 2018-04-16 21:50:41 -04:00
L_J
58c3cd59e2
Implemented Rat Colony 2018-04-17 01:37:05 +00:00
Plopman
36d69a96be Fix some card text 2018-04-16 21:03:16 +02:00
Evan Kranzler
240ac2c813 Implemented In Bolas's Clutches 2018-04-16 13:21:52 -04:00
spjspj
91cf3556d4
Merge pull request #4772 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-17 02:43:45 +10:00
spjspj
776928c76c Continuing implementation of Planechase. 2018-04-17 02:13:48 +10:00
LevelX2
5b6e3cd72e Merge origin/master 2018-04-15 21:54:46 +02:00
LevelX2
9d7b2c808e [DOM] Added five cards. 2018-04-15 21:54:03 +02:00
Evan Kranzler
50b5377a8e fixed mana pool errata 2018-04-15 14:30:01 -04:00
Evan Kranzler
ef33472ee5 fixed some tests and text 2018-04-15 13:50:48 -04:00
spjspj
0ffd895be9 Minor revert. 2018-04-15 20:58:04 +10:00
spjspj
b7b70c2aec
Merge pull request #4761 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-15 19:41:40 +10:00
spjspj
b45a409939 Continuing implementation of Planechase. 2018-04-15 19:40:15 +10:00
LevelX2
8facef4140 Merge origin/master 2018-04-15 11:34:25 +02:00
LevelX2
041ad9e036 [DOM] Added three cards. Some fixes to rule texts and some more minor fixes. 2018-04-15 11:33:57 +02:00
spjspj
2f966b7a2c
Merge pull request #4754 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-15 17:26:03 +10:00
Evan Kranzler
455e859e97 Implemented Ancient Animus 2018-04-14 21:21:34 -04:00
Evan Kranzler
62869362e2 fixed parley count including players out of range (fixes #4757) 2018-04-14 21:04:25 -04:00
theelk801
c9a6903253
Merge pull request #4753 from jpgunter/master 
Implement Multani, Yavimaya's Avatar
 2018-04-14 20:52:29 -04:00
Evan Kranzler
2252353592 fixed an accidental error 2018-04-14 18:48:47 -04:00
Evan Kranzler
d753cffb01 Implemented Mishra's Self Replicator 2018-04-14 17:23:35 -04:00
spjspj
a828050ae1 Continuing implementation of Planechase. 2018-04-14 23:09:37 +10:00
LevelX2
245a3c5202 [DOM] Added Saga ability and Fall of the Thran. 2018-04-14 14:30:20 +02:00
Michael Simons
d9d9da1152 Merge origin/master 2018-04-14 00:21:07 -04:00
Michael Simons
c5c2d13bd6 Added EquipLegendaryAbility (used by Blackblade Reforged) 2018-04-14 00:13:33 -04:00
Jimmy Gunter
37ebdaa6b7 Implement Multani, Yavimaya's Avatar 2018-04-13 19:02:15 -07:00
spjspj
4f8d58d198
Merge pull request #4749 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-14 11:09:40 +10:00
spjspj
611b48fd47 Continuing implementation of Planechase. 2018-04-14 10:47:49 +10:00
LevelX2
d83de60467 [DOM] Added 4 cards. 2018-04-13 23:53:35 +02:00
18ths
8cb26b1de6 Implemented Bestial Fury 2018-04-13 21:14:58 +02:00
spjspj
d97a3ebf04 Continuing implementation of Planechase. 2018-04-13 01:20:10 +10:00
spjspj
b5a7052697
Merge pull request #4747 from spjspj/master 
Continuing implementation of Planechase.
 2018-04-12 23:37:31 +10:00
spjspj
3e092c2211 Continuing implementation of Planechase. 2018-04-12 21:03:53 +10:00
Justin Herlehy
45a22e85ab
[DOM] Implement 3 Cards 
Add: Academy Journeymage
Add: Adeliz, the Cinder Wind
Add: Befuddle
Update: Set file
Update: Knight Token
Update: Static Filter for Opponents Creatures
 2018-04-11 23:20:16 -07:00
spjspj
87d19c7d51 Continuing implementation of Planechase. 2018-04-12 11:51:28 +10:00
spjspj
c8b741f0bf Continuing implementation of Planechase. 2018-04-12 00:07:24 +10:00
spjspj
dbbc5f255c
Merge pull request #4741 from spjspj/master 
Beginning of implementation of Planechase.
 2018-04-11 09:31:39 +10:00
LevelX2
03f5b8c2da * Vindictive Lich - Fixed that it did only execute the first effect (fixes #4742). 2018-04-10 23:17:19 +02:00
spjspj
dabef80af2 Beginning of implementation of Planechase. 2018-04-10 23:41:37 +10:00
LevelX2
8bee825d5c
Merge pull request #4734 from spjspj/master 
Beginning of implementation of Planechase.
 2018-04-10 10:45:26 +02:00
spjspj
334cfbc9d0 Beginning of implementation of Planechase. 2018-04-09 23:28:39 +10:00
spjspj
57354d83bb Beginning of implementation of Planechase. 
10 or so initial planes that (mostly) have been tested, no phenomenons as yet and no modifying yet of chaos rolls.  Also no support for a user to be able to set if it is planechase (able to do so via the cheat button).
 2018-04-09 19:38:37 +10:00
Michael Simons
c38dacb879
Update LookLibraryAndPickControllerEffect to support random order return 
New Dominaria cards support looking in library and returning to bottom of library in random order.
 2018-04-08 22:09:43 -04:00
Justin Herlehy
702756b4e7 [DOM] Implement Legendary Sorceries 
Add: Target Any Target for damage spells
Add: Drudge Sentinel
Fix: Genesis Wave Filter
 2018-04-08 18:37:11 -07:00
spjspj
e932c139d9 Beginning of implementation of Planechase. 
10 or so initial planes that (mostly) have been tested, no phenomenons as yet and no modifying yet of chaos rolls.  Also no support for a user to be able to set if it is planechase (able to do so via the cheat button).
 2018-04-09 08:44:48 +10:00
igoudt
49ee8f9856 add 3 DOM cards, added a token, updated card text 2018-04-08 02:16:52 +02:00
JRHerlehy
db8af2d4f7 [DOM] Implement 3 Cards 
Add Grunn, the Lonely King
Add Naru Meha, Master Wizard
Add Verix Bladewing & Token
Fix Seal Away text
 2018-04-06 00:01:46 -07:00
JRHerlehy
01c273ad20 Code DeDupe 
Reorder Dominaria Set file to alphabetical to allow card gen script to execute as expected.
 2018-04-04 22:11:22 -07:00
igoudt
d828427b8f remove T type from OptionalAdditionalCostImpl. The class was of a type that extended itself. No idea how to interpret that. 2018-04-04 23:29:25 +02:00
Oleg Agafonov
f6b8d0fea6
Merge pull request #4707 from delftswa2018/feature/SOLID-fix-in-Token-classes 
SOLID violation fix in token classes
 2018-04-04 18:31:52 +04:00
Oleg Agafonov
da919d5301 Fixed Elves type 2018-04-04 06:12:39 +04:00
Christiaan
7885fe42a0 Fixed subtype of Elvish Impersonator 2018-04-03 16:31:42 +02:00
Marc Zwart
1053db617b fixed missing linebreaks 2018-04-03 14:31:59 +02:00
Marc Zwart
3e32287f00 fixed Token/TokenImpl imports and references 2018-04-03 14:05:41 +02:00
Marc Zwart
d4d8a04694 Extracted Token interface and renamed Token implementation to TokenImpl + renamed tests 2018-04-03 14:04:08 +02:00
Marc Zwart
12becca27d removed unused / bad code + fixed implementations of new tokens 2018-04-03 12:55:45 +02:00
Marc Zwart
03eb170a04 made permanent tokens from framework compliant with new abstract superclass 2018-04-02 17:47:04 +02:00
Marc Zwart
2d922cb6af marked Token class as abstract and removed abstracted copy method 2018-04-02 17:45:56 +02:00
LevelX2
1e2e53073c * Deep Analysis - Fixed that its flashback costs did not work with mana casting cost modification effects (fixes #4677). 2018-04-02 15:30:57 +02:00
L_J
6c98f4802e
Fix for Cabal Slaver 
Cabal Slaver's ability caused the damaging goblin's controller to discard
 2018-03-31 00:06:44 +00:00
Plopman
1466cc2a81 Fix Axelrod Gunnarson 2018-03-27 00:07:13 +02:00
Plopman
a33916f3f4 Add StaticFilters.FILTER_CONTROLLED_LAND_SHORT_TEXT 2018-03-27 00:04:13 +02:00
spjspj
1340f75c1e
Merge pull request #4658 from spjspj/master 
Karn, Scion of Urza (DOM)
 2018-03-25 09:04:49 +11:00
spjspj
4527f791aa Karn, Scion of Urza (DOM) 2018-03-25 01:44:23 +11:00
igoudt
c535b81bff changed some == to .equals() 2018-03-22 23:37:07 +01:00
igoudt
00f91391e9 Homarid Drake, reprints, and rewriting his or her to their 2018-03-22 16:52:26 +01:00
igoudt
03355aee37 Merge branch 'master' of https://github.com/magefree/mage 2018-03-22 14:45:28 +01:00
ArcadeMode
5ac975c52e Blocker and Critical level bugfixes throughout the project (#4648) 
* fixed https://sonarcloud.io/project/issues?id=org.xmage%3Amage-root&issues=AWIlv32RgrzAwlaaQ7rP&open=AWIlv32RgrzAwlaaQ7rP

* ensure closing of scanner if it was opened

* Refactored method in EmpyrialArchAngel to not always return same value.

* Refactored method in FalkenrathAristocrat to not always return same value.

* Refactored method in GilderBairn to not always return the same value.

* fixed left open resources, ensured quiet closing of the streams

* Refactored method in IceCave to not always return same value.

* Refactored method in KjeldoranRoyalGuard to not always return same value.

* Refactored method in LegionsInitiative to not always return same value.

* Refactored method in NaturesWill to not always return same value.

* added quiet closing method in new streamutils class, used to clean up the connectdialog

* Fix small typo

* added quiet closing to saveobjectutil

* closed resources in savegame method of gamecontroller

* properly close resources in loadGame method of GameReplay class

* further proper resource closing in ServerMessagesUtil

* fixed unclosed resources in copy method in mage framework Copier

* closed unclosed resources in copyCompressed method in Copier

* ensure closing of filewriter in manasymbols

* ensure proper closing of Stream in arcane UI

* ensure closing of datagram socket in arcane Util

* ensure resource closing in deckimport from clipboard

* ensure closing of plugin classloader

* ensured closing of zipinputstream resource

* ensure closing of fileoutputstream in ScryfallSymbolsSource

* ensure closing resources after finishing/canceling download of pictures

* remove commented code

* move locks to try block to ensure unlocking along all execution paths

* remove dangerous instance of double-checked locking

* removed dangerous instance of double checked locking in settingsmanager

* Removed dangerous instance of double-checked locking in ThemePluginImpl

* close resource which did not happen certainly

* close another stream

* ensure closing of inputstream
 2018-03-22 08:13:13 -05:00
igoudt
af83a34c64 added Academy Drake, Knight of Malice, Hexproof from White 2018-03-22 12:06:45 +01:00
igoudt
ad8b046b05 a list that is null is just strange, just use an empty List 2018-03-22 12:06:45 +01:00
igoudt
e205fef785 added a removeIf and streams 2018-03-22 12:06:45 +01:00
LevelX2
f56b2fb86c [ODY] Added Charmed Pendant. 2018-03-20 21:42:10 +01:00
LevelX2
48cfe249f7 * Fixed a problem that a gained "is all creature types" from continous effects were not propertly reset on permanents. 2018-03-20 13:39:48 +01:00
Chase
491a05b2df Fix Mana#containsAny to account for Any mana 2018-03-20 01:39:26 -07:00
spjspj
8ff4f81cea
Merge pull request #4640 from spjspj/master 
New M15 Rendering for Unstable lands
 2018-03-20 16:49:00 +11:00
spjspj
a368c93845 New M15 Rendering for Unstable lands 2018-03-20 16:12:43 +11:00
LevelX2
d29707bdea * Morph - Fixed that turning creatures face up didn't restore their subtypes (fixes #4566). 2018-03-18 19:37:25 +01:00
LevelX2
b073ce1c42 * Added to all toUpperCase/toLowerCase calls the Locale.ENGLISH to prevent problems with some languages (e.g. Turkish). Removed some unused import statements. (#4634). 2018-03-18 18:18:54 +01:00
LevelX2
03ebdc17d8
Merge pull request #4632 from CountAndromalius/master 
Corrected "Any TYPE among permanent types" handling
 2018-03-18 16:25:47 +01:00
igoudt
7344a15a9b remove comparator, use Comparator.comparing 2018-03-18 00:56:52 +01:00
igoudt
5736272dd6 add historic spell filter 2018-03-18 00:38:30 +01:00
igoudt
6a24de6e5a added Saga enchantment subtype and default method for isHistoric 2018-03-18 00:32:50 +01:00
igoudt
ddf568679f added 3 Dominari cards, benalish marshal, charge, knight of grace, added a new condition and a new ability 2018-03-18 00:22:03 +01:00
LevelX2
b046428f8c XMage 1.4.28V1 2018-03-17 23:59:34 +01:00
LevelX2
442130beb6 Some minor changes. 2018-03-17 23:40:36 +01:00
LevelX2
85b13b88c8 * Kindred Summons - Fixed that no creatures were put onto the battlefield. 2018-03-17 22:35:03 +01:00
Count Andromalius
240416146e Merge remote-tracking branch 'upstream/master' 2018-03-17 15:24:40 -03:00
LevelX2
7d1af66162 * Fixed Sacrific a creature text and filter handling. 2018-03-17 18:58:18 +01:00
Count Andromalius
86443d7cd4 Corrected error when handling colorless permanents on "Any type among [...] permanents" 
Also changed comment on AnyColorLandsProduce for clarity
 2018-03-17 11:35:50 -03:00
LevelX2
66bd5294e8 * Removed effect's ApplyEffectsAfter functionality. It's now always applied. 2018-03-17 13:43:31 +01:00
LevelX2
d9ede35857 * MIracle - Fixed a problem with miracle casting costs. 2018-03-17 12:35:40 +01:00
LevelX2
170ad083c7 * Fixed a problem of the AI that it could cast cards with flashback without paying the costs. 2018-03-17 01:51:25 +01:00
LevelX2
946503864a Merge origin/master 2018-03-16 20:12:08 +01:00
LevelX2
62db7ae72f * Skyshrout War Beast - Fixed wrong P/T calculation because of wrong land filter. 2018-03-16 20:11:10 +01:00
CountAndromalius
d7458c5e35 Implemented [DOM] Mox Amber (#4622) 2018-03-16 14:09:35 -05:00
LevelX2
b035d85f98 * Fixed a problem that triggered abilities that face down permanents got from other sourced did not trigger (fixes #4571). 2018-03-16 15:06:15 +01:00
LevelX2
fdd8cd0e09 * It That Betrays - Fixed that target handling of second triggered ability did not work correct (fixes #4568). 2018-03-16 15:04:31 +01:00
LevelX2
dbfb708e44 * It That Betrays - Fixed that target handling of second triggered ability did not work correct (fixes #4568). 2018-03-16 13:13:16 +01:00
Jeff
6e4d655ac1 - Fixed #4521 2018-03-15 07:59:20 -05:00
Oleg Agafonov
83a3de9a93 * UI: improved choose number dialog (fixed enter key, added more info colorized info for mana distribute dialog); 2018-03-15 00:14:04 +04:00
LevelX2
1e1e361c60 * Some minor changes to Casting of Bones and the used effect. 2018-03-13 22:57:27 +01:00
LevelX2
c8b1c6058b
Merge pull request #4613 from AMWJ/master 
Implemented card: Casting of Bones
 2018-03-13 22:19:38 +01:00
LevelX2
d101dc5a0e
Merge pull request #4617 from delftswa2018/hotfix/play-land-event 
Fire PLAY_LAND event only after replace check
 2018-03-13 22:14:05 +01:00
Christiaan
da54f97a9d Fire PLAY_LAND event after replace check 
Fix issue with cards preventing players from playing lands still firing PLAY_LAND, while the actual event is replaced.
 2018-03-13 17:08:44 +01:00
spjspj
4258520158
Merge pull request #4615 from spjspj/master 
Allow automatic targeting of lands to occur when untapping them under certain conditions.
 2018-03-14 01:34:51 +11:00
spjspj
3953ad8b0b Untapping lands in response to a trigger is somewhat painful. Allow lands to be targeted automatically. 2018-03-14 01:21:03 +11:00
spjspj
fa53e1ef6f Untapping lands in response to a trigger is somewhat painful. Allow lands to be targeted automatically. 2018-03-14 00:49:05 +11:00
AMWJ
5793e9a9dd Merge branch 'master' of https://github.com/magefree/mage 2018-03-12 21:37:44 -04:00
AMWJ
a0f2311300 * Implemented Casting Of Bones (https://scryfall.com/card/cst/44b), and added it to Alliances set. 
* Refactored DrawDiscardOneOfThemEffect to be used in CastingOfBones, KrovikanSorcerer, and SoldeviSage.
 2018-03-12 19:50:52 -04:00
Plopman
9aba870aa5 Change place counters to put counters 2018-03-12 22:52:02 +01:00
LevelX2
b7fa942b10 * Fixed a problem that the AI did not care for maximum allowed mana payment for X mana costs. 2018-03-12 16:33:42 +01:00
LevelX2
c2a4890603 * Fixed that commander replacement effect was wrongly only applied once (903.9). Simplified some replacement effects that move objects to other zones. (fixes #4585). 2018-03-11 21:48:37 +01:00
LevelX2
fed2d1a259 XMage 1.4.28V0 2018-03-10 20:42:29 +01:00
L_J
a2b0e5a39c
Implemented "can block landwalk as though it didn't have landwalk" and related cards 2018-03-10 11:52:25 +01:00
LevelX2
17afa3b3c1 * Added a test. 2018-03-09 15:51:31 +01:00
spjspj
0c0e1804f1 Mox Lotus (UNH) 2018-03-09 23:58:05 +11:00
LevelX2
15602cdfb3 Small change to Uphill Battle. 2018-03-08 23:27:19 +01:00
LevelX2
ef809e837c
Merge pull request #4573 from delftswa2018/feature/UphillBattle 
[WIP] Implemented Uphill Battle
 2018-03-08 17:25:10 +01:00
Christiaan
0b8e8c0007 Fire PLAY_LAND event when a player plays a land, fixed UphillBattle PlayCreatureLandWatcher 
Fire a PLAY_LAND event when a player plays a land. This is necessary for the PlayCreatureLandWatcher to know if a land was played, or put into thte battlefield (make distinction between playing Dryad Arbor and using Sneak Attack to put it on the battlefield)
 2018-03-08 16:17:36 +01:00
spjspj
3dee3586c2
Merge pull request #4583 from spjspj/master 
Add a 'spectators allowed' option for regular tables (aka non tournam…
 2018-03-08 22:46:44 +10:00
spjspj
4c7b0d50d2 Add a 'spectators allowed' option for regular tables (aka non tournaments). 2018-03-08 23:31:51 +11:00
L_J
5bd58ca56e
Included duration for BecomesChosenCreatureTypeSourceEffect 2018-03-04 10:38:38 +00:00
L_J
d2c39a1339
Included duration for BecomesChosenCreatureTypeTargetEffect 2018-03-04 10:37:22 +00:00
spjspj
be70ecd7f3 Add a singleton search option for deck editor search 2018-03-04 17:57:51 +11:00
Oleg Agafonov
08f15416ba * Add new full set Masters 25 (only Karona's Zealot must be implemented); 2018-03-02 22:06:24 +04:00
Oleg Agafonov
ae99a1b444 Fixed tests 2018-03-02 21:42:16 +04:00
L_J
b32c8f6bb0
Merge pull request #4547 from Zzooouhh/Zzooouhh-bog 
Implemented Blaze of Glory and Portal cards (& finished a todo in MustBlockAny checking)
 2018-03-01 07:05:11 +01:00
LevelX2
8c8b4ce019 * Added a check if life of players is going down during infinite loop check. Is so no Draw check message is shown (fixes #4557). 2018-02-28 17:24:42 +01:00
LevelX2
5f98cb685e * Hushwing Gryff - Fixed that log message was sent out too often (fixes #4548). 2018-02-26 16:17:16 +01:00
LevelX2
2fceafda93 * Fixed a bug that mana in the mana pool could not be used to pay mana costs that could only be payed with "you may spend mana as thought" effects (fixes #2581). 2018-02-25 21:53:47 +01:00
L_J
2c28f64294
CantBeBlockedByCreaturesAllEffect duration bugfix 2018-02-25 14:26:02 +00:00
LevelX2
4c88b8e6e3 * Fixed a bug of AttackedThisStepWatcher (fixes #4549). 2018-02-25 10:39:33 +01:00
L_J
4b89342c34
Added support for Blaze of Glory 2018-02-24 21:52:05 +00:00