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

6854 commits

Author SHA1 Message Date
L_J
77762cbf59
Some multi-blocker damage changes 
Fixes situations like "two-man band with Viscera Seer gets blocked, Viscera Seer sacs itself afterwards" - before, the blocker would deal its damage twice to the remaining attacker.
 2018-02-16 23:59:17 +00:00
Jeff
74a47bc63a - Fixed Myr Battlesphere #4522 2018-02-16 16:28:13 -06:00
L_J
f2a70193e3
Reverted canBlock changes 
due to some incorrect banding interactions
 2018-02-16 13:59:04 +00:00
LevelX2
e679b1003d * Fixed that all spells could be cast by canceling the mana payment process. 2018-02-15 16:51:47 +01:00
L_J
9e797e4ed4
Implemented Errand of Duty 2018-02-15 10:40:33 +00:00
L_J
7b4eb5193e
Permitted AI to band attackers 2018-02-15 00:08:40 +00:00
L_J
58fde7db50
Reverted accidental change 2018-02-15 00:05:44 +00:00
L_J
3dbd5a72c4
Merge branch 'master' into Zzooouhh-banding-final 2018-02-15 00:49:08 +01:00
LevelX2
1d09168857 Xmage 1.4.27V4 2018-02-14 23:05:43 +01:00
LevelX2
d10d6361ac * Some minor chnages. 2018-02-14 22:57:57 +01:00
LevelX2
e77b457414 * Madness ability - reworked madness ability design. 2018-02-14 17:33:59 +01:00
LevelX2
3b19304f64 * Fixed that soulbond arrow to paired card was not shown and improved soulbond text on permanent. 2018-02-14 12:41:44 +01:00
L_J
0982d6b10e
Name typo 2018-02-13 20:56:05 +00:00
L_J
c37ecff939
Small rewrite 2018-02-13 19:56:46 +00:00
L_J
e7301e2c08
Implemented banding (#41) 2018-02-13 20:36:25 +01:00
LevelX2
a85fa82de0 * Bestow - Fixed a problem that if the target of a bestow enchantment aura got illegal, the bestow permanent did not chnage back to be a creature. 2018-02-12 15:49:16 +01:00
LevelX2
f0f407457e * Subtypes of tokens were not set back correctly after a subtype changing effect did end (e.g. Arcane Adaptation). 2018-02-12 14:45:05 +01:00
LevelX2
6d848e2059 * Fixed a bug that turn rollback did not work correctly, if player was in a buy cost process that included possible rollback (fixes #4510). 2018-02-12 11:41:01 +01:00
LevelX2
c9603d1994 * Some fixes to token image downloading. 2018-02-11 23:30:15 +01:00
LevelX2
d66d8d47fb Some rework of Keeper of the Light. 2018-02-10 00:05:54 +01:00
LevelX2
82e104f9df * Fixed a problem that instead putting cards to library bottom the cards cease to exist (e.g. Ancient Stirrings). 2018-02-08 22:42:34 +01:00
spjspj
90e830cc84
Merge pull request #4498 from spjspj/master 
Implementing Snow Mercy (HHO) - Christmas Special Occasion card
 2018-02-08 01:28:08 +11:00
spjspj
7dcbc0f441 Implementing Snow Mercy (HHO) - Christmas Special Occasion card 2018-02-08 01:14:25 +11:00
LevelX2
eeb938af94 * Fixed a bug that could lock the game if you should pick more cards from shown cards from your library than cards left in your library (e.g. Dig Through Time). 2018-02-07 14:24:17 +01:00
LevelX2
c13b16fa84 Xmage 1.4.27V3 2018-02-06 23:49:41 +01:00
LevelX2
0a28ab2d5a * Fixed a bug when token permanents were put on top or buttom of library (e.g. using activated ability of a copied Timestream Navigator). 2018-02-06 23:33:44 +01:00
Oleg Agafonov
c556ea5b12 Fixed #4490 - Layout Mismatch 2018-02-06 17:25:15 +04:00
L_J
d1c5fe3f0f
Ponder fix (#4484 #4481) 2018-02-06 10:46:10 +00:00
L_J
28a3f75f4d
Merge pull request #4478 from Zzooouhh/Zzooouhh-cards 
Implemented Nebuchadnezzar, Spy Network, Carrionette, Stangg
 2018-02-05 09:27:09 +01:00
LevelX2
88d4e2b965 * Bushido - Fixed that it triggerd wrongly for each blocker instead of only once if blocked. 2018-02-04 21:13:07 +01:00
Oleg Agafonov
5722b51d6e * Fixed "layout mismatch" error on open some decks (#4311); 2018-02-04 22:15:27 +04:00
LevelX2
b752eacfaa * Optimized handling and call of player.choose choice to prevent problems if a player disconnects or left a game (#4263). 2018-02-04 17:51:12 +01:00
LevelX2
4dd196f373 * Fixed some problems with getting cards at random from collection that could cause loops. 2018-02-04 12:27:08 +01:00
L_J
8fd5d92152
Switched order of getRange and getDraws 2018-02-04 01:43:46 +00:00
L_J
1e0090e4a7
Included logging for range at game startup (fixes #3878) 2018-02-04 01:33:17 +00:00
L_J
a533352f0d
Implemented Stangg 2018-02-03 22:30:53 +00:00
LevelX2
ced9cef1e1 * Lightning Storm - Fixed that abilities from stack abilities could be activated without cost paying (#4371). 2018-02-03 17:55:22 +01:00
spjspj
b924f4bb6b Scenario I was testing for this fix. 
Local Server, EDH game with Player1, Player2, Player3.
Player1 has 2 mana reflections out, cast Torment of Hailfire for 15 and is tapping mana for it.
The 'choose replacement effect' popup comes up.
Whilst this is happening, Player2 concedes.
This will currently lock up the game and sits forever in waitResponseOpen.
 (With the time out now there, it will time out after 30 seconds or so.
 2018-02-03 13:21:47 +11:00
LevelX2
db0fc1b439 * Some changes to skip handling. 2018-02-02 00:27:12 +01:00
LevelX2
f9ca04dfbb * Wildfire Eternal - Fixed that the ability triggered multiple times if more than one player blocked during the turn (fixes #4466). 2018-01-31 00:10:02 +01:00
Oleg Agafonov
66eb1de7f1 Fixed v1 server incompatible with v0 clients (freezes on game startup) 2018-01-28 17:57:55 +04:00
LevelX2
62a40ab459 Xmage 1.7.27V1 2018-01-28 01:15:19 +01:00
LevelX2
afaa1149e7
Merge pull request #4450 from BenDawes/bugfix/becomesCreateAllEffectSetCalculation 
Fix becomesCreatureAllEffect set calculation
 2018-01-27 19:03:54 +01:00
LevelX2
8c2185019c * Ascend - Fixed that not all types of permanets were counted (e.g. Planeswalker). 2018-01-27 18:54:10 +01:00
LevelX2
c401a7f5ea Fixed some exception problems. 2018-01-27 18:29:47 +01:00
LevelX2
84a815eb73 Merge origin/master 2018-01-27 17:57:27 +01:00
LevelX2
f5499531c7 Fixed that combat damage triggered abilities go to stack during the related combat step. 2018-01-27 17:56:46 +01:00
Quercitron
ad74ddd981 * Infernal Genesis - Fix that incorrect Minion creature token was used (closes #4445) 2018-01-27 18:35:43 +03:00
LevelX2
2f016c8ea6 Fixed some more exception and/or logging problems. 2018-01-27 13:19:20 +01:00
Ben Dawes
2f4b6ca713 BecomeCreatureAllEffect used to always calculate the permanent set to apply to every time it is applied 
Now we calculate it either at init-time (for abilities with affected object sets) OR at apply-time (Static abilities etc.)
 2018-01-27 11:51:16 +00:00
Oleg Agafonov
9268281c4b Tests: fixed random gen deck 2018-01-27 15:49:24 +04:00
LevelX2
020beb1bf6 Merge origin/master 2018-01-27 11:43:01 +01:00
LevelX2
6b90c1fd7f Fixed some exception problems. 2018-01-27 11:42:43 +01:00
Oleg Agafonov
1b191a5f93 Fixed temporary effects copy between game states, fixed concurrent access errors while execute some cheat commands; 2018-01-27 13:26:04 +04:00
Oleg Agafonov
c69b3f4609 Fixed wrong players compare (not by UUID -- see #4407) 2018-01-27 13:23:03 +04:00
Oleg Agafonov
9d131f6bde Random generated decks improvements and fixes for AI: 
* added generation of only basic lands decks;
 * fixed wrong color cards selection;
 2018-01-27 13:19:03 +04:00
spjspj
8db20dbe8d
Merge pull request #4430 from spjspj/master 
Fix M15 colors for GW (was WG), GU (was UG), RW (was WR)
 2018-01-19 22:20:03 +11:00
spjspj
d095f83d8a Fix M15 colors for GW (was WG), GU (was UG), RW (was WR) 2018-01-19 21:28:47 +11:00
spjspj
af48b17451 Fix M15 colors for GW (was WG), GU (was UG), RW (was WR) 2018-01-19 20:30:12 +11:00
Oleg Agafonov
89f5967441 * [RIX] Added missing tokens (tokens.mtg.onl is updated with 150+ images too); 2018-01-18 07:02:02 +04:00
L_J
1dceae4e95
Implemented Lurker 2018-01-17 20:34:35 +00:00
Achilles
6da1112a89 - Code by Noxx to address the Blood Moon/Urborgtoy layering issue. Layer test updated. 2018-01-15 18:47:42 -06:00
Oleg Agafonov
98cc704592 Fixed visible empty sets in new tournament dialog (#4415) 2018-01-14 20:54:42 +04:00
igoudt
7f319c2751 fix null-check in raging river and a watcher 2018-01-13 23:26:35 +01:00
LevelX2
ed3742b1e4 Merge origin/master 2018-01-13 22:55:44 +01:00
LevelX2
40afa04b24 xmage 1.4.27V0 2018-01-13 22:54:53 +01:00
Zzooouhh
d4e2b70cf3
Added hunger counter 2018-01-13 19:14:39 +00:00
LevelX2
9a760670dd * Fixed that Explore did not trigger if it was initiated from a instant or sorcery. 2018-01-13 19:37:36 +01:00
LevelX2
2e3ba7e104 Added designation names to player tooltip. 2018-01-13 18:55:07 +01:00
LevelX2
6693929557 * Some refactoring. 2018-01-13 14:45:50 +01:00
Oleg Agafonov
9a0b48e9b7 Little fix on filter 2018-01-13 14:58:43 +04:00
LevelX2
393f8dc9f4 * World at War - Fixed that its extra Main Phase was not executed (fixes #4382). 2018-01-13 11:14:13 +01:00
LevelX2
524541040f * Daretti, Ingenious Iconoclast - Fixed wrong third text (fixes #4405). 2018-01-13 10:20:35 +01:00
LevelX2
83528369ee * Daretti, Ingenious Iconoclast - Fixed wrong third text (fixes #4405). 2018-01-13 09:25:31 +01:00
Achilles
7ade17595d - Aftermath keyword works again. Added test for Aftermath keyword. 2018-01-12 23:58:38 -06:00
Oleg Agafonov
4771ad2c63 Fixed UGL test, rename new token 2018-01-13 02:27:16 +04:00
Oleg Agafonov
9b740b8cbb
Merge pull request #4363 from SpikesCafe-google/master 
Implement "Pure Reflection" card from Invasion.
 2018-01-13 02:23:30 +04:00
Oleg Agafonov
bbdf762775
Merge pull request #4404 from Zzooouhh/Zzooouhh-sporogenesis 
Implemented Sporogenesis & some The Dark cards
 2018-01-13 01:10:30 +04:00
Oleg Agafonov
36dcae63b3 For last fix 2018-01-12 21:28:10 +04:00
Oleg Agafonov
7c2511355e Tests: added checks for errors on card loading (see #4402) 2018-01-12 21:10:10 +04:00
Zzooouhh
c6f623ea41
Added fungus counter 2018-01-12 16:40:53 +00:00
LevelX2
a63f87da2c Little fix. 2018-01-12 17:04:51 +01:00
LevelX2
f798a25b3b Added some mechanism that helps to prevent unintended changes to StaticFilters. 2018-01-12 15:27:52 +01:00
igoudt
267100d3d6 fix for #4402 2018-01-12 15:03:54 +01:00
Radoslaw Sypen
29a889b236 Merge branch 'master' of github.com:rsypen/mage into fix_tests_not_passing 2018-01-12 10:42:50 +01:00
Radoslaw Sypen
88527987cc Fixed ItThatBetrays and Barrin, Master Wizard broken effects, added new test for Emrakul's annihilator trigger 2018-01-12 10:33:11 +01:00
Zzooouhh
ca46a8872a
Moved PermanentInListPredicate to common predicates 2018-01-11 17:53:32 +00:00
spjspj
ab4490e476
Merge pull request #4398 from spjspj/master 
Add 5 cards  (UGL)
 2018-01-12 00:06:39 +11:00
spjspj
d9bcfa3f31 Add 5 cards (UGL) 2018-01-11 23:55:37 +11:00
spjspj
8a1619f9b4
Merge pull request #4396 from spjspj/master 
Add 3 cards  (UGL)
 2018-01-11 17:56:55 +11:00
spjspj
96e6a917b4 Add 3 cards (UGL) 2018-01-11 17:43:33 +11:00
LevelX2
4c9ed95662 Xmage 1.4.26V11d 2018-01-11 07:14:49 +01:00
LevelX2
2685d9f8b4 Fixed some possible null pointer exceptions (found in server log). Market Festival, Kindred Summons, Profane Processions, New Blood, Kindred Charge , Bishop of Binding, Metzal Tower of Triumph, Chrome Mox 2018-01-11 06:12:27 +01:00
Zzooouhh
a38ec84581
Removed slipped beta Blaze of Glory code 
in case it could break something, as it's still buggy
 2018-01-10 19:49:15 +00:00
Zzooouhh
8f9356533d
Fixed undoing individual blocker declarations for multi-blockers 
One more #4172 fix
 2018-01-10 19:44:48 +00:00
ciaccona007
470bb69a7e Implement Timmy, Power Gamer 2018-01-09 14:14:34 -08:00
ciaccona007
3e87a50b4d Implement Krazy Kow 2018-01-09 13:25:46 -08:00
ciaccona007
79c18d28e2 Implement Chicken Egg 2018-01-09 12:40:39 -08:00
LevelX2
fef0ef83ec xmage 1.4.26V11c 2018-01-08 22:59:35 +01:00
Zzooouhh
1109d2b246
Made Changeling take effect in all zones 
Still doesn't fix Path of Ancestry interaction of Dr. Julius Jumblemorph though
 2018-01-08 17:23:12 +00:00
SpikesCafe-google
645b4ac47b
Rename PermanentReflectionToken.java to PureReflectionToken.java 2018-01-07 20:59:00 -05:00
SpikesCafe-google
99b4b427f0
Create PermanentReflectionToken.java 2018-01-07 20:45:30 -05:00
igoudt
ec5b34be04 Merge branch 'master' of https://github.com/magefree/mage 2018-01-07 22:39:40 +01:00
igoudt
27ec3431ee rewrite with staticfilter 2018-01-07 22:39:31 +01:00
igoudt
6d16e41ec3 use some staticfilters, rewrite some lines to java8 streams 2018-01-07 22:38:54 +01:00
LevelX2
995c58e381 * Reckless Rage - Fixed damge dealing to the creatures. 2018-01-07 22:11:12 +01:00
LevelX2
86857e2e0f Merge origin/master 2018-01-07 18:05:23 +01:00
LevelX2
46bcad2ada Mage 1.4.26V11 2018-01-07 18:04:59 +01:00
Zzooouhh
9c77a5db7a
Added currency counter 2018-01-07 16:13:34 +00:00
LevelX2
0e119ffa01 [RIX] Fixed set card [RIX] Added 5 cards. 2018-01-07 13:29:40 +01:00
LevelX2
3480d47d11 [RIX] Added 7 cards. 2018-01-07 10:54:15 +01:00
LevelX2
15081f7d0e Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
 2018-01-07 02:41:49 +01:00
LevelX2
0f0b1d8330 [RIX] Added 8 cards. 2018-01-07 02:33:32 +01:00
Oleg Agafonov
70e99e185b Updated menace and explore abilities to show or hide description 2018-01-07 03:46:07 +04:00
LevelX2
5935221878 [RIX] Added 6 cards. 2018-01-06 23:47:54 +01:00
LevelX2
b4f9cbd15c [RIX] Added 5 cards. 2018-01-06 22:35:39 +01:00
LevelX2
4571ab8dce [RIX] Added 5 cards. 2018-01-06 21:34:15 +01:00
LevelX2
803df371f9 [RIX] Added 4 cards. 2018-01-06 18:42:03 +01:00
LevelX2
488622662a [RIX] Added Profane Procession, Tomb of the Dusk Rose, Twilight Prophet. 2018-01-06 17:24:00 +01:00
LevelX2
509648448e [RIX] Added 2 cards. 2018-01-06 13:31:50 +01:00
LevelX2
7189cb868f [RIX] Added 9 cards. 2018-01-06 12:40:25 +01:00
LevelX2
f95b0e6c0a Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
 2018-01-05 23:41:30 +01:00
LevelX2
f0494383fd [RIX] Added 4 cards. 2018-01-05 15:26:10 +01:00
Oleg Agafonov
bc75f82524 Fixed wrong ability texts with duplicated card name (see #4335) 2018-01-05 02:21:16 +04:00
LevelX2
145fe8ca15 [Rix] Added 5 cards. 2018-01-04 18:00:08 +01:00
Oleg Agafonov
56949414d1 Fixed wrong ability texts with duplicated card name (see #4335) 2018-01-04 20:48:41 +04:00
Oleg Agafonov
6b9db5eb17 [RIX] Added Deeproot Elite 2018-01-04 05:44:12 +04:00
Oleg Agafonov
3dda5712db AI: fixed not working choice with key-value dialogs, random refactor 2018-01-04 00:23:20 +04:00
LevelX2
547c7078bf [Rix] Added 6 cards. 2018-01-03 18:02:27 +01:00
LevelX2
32fb2507c3 Some rework to Framework. 2018-01-03 11:40:07 +01:00
Oleg Agafonov
1a252e61a2 Fixed #4311: deck editor can't load decks with cards cards from Masterpiece Series Amonkhet (MPS-AKH) 2018-01-03 09:10:39 +04:00
Oleg Agafonov
204a602b36 Added old decklist files compatibility loading (free to change card numbers, names and codes, see #4332) 2018-01-03 07:43:15 +04:00
LevelX2
02f6ce7639 Merge origin/master 2018-01-02 23:48:27 +01:00
LevelX2
bc490ef91a Added Spellweaver Volute. 2018-01-02 23:48:07 +01:00
LevelX2
7d026c699f [RIX] Added 3 cards. 2018-01-02 17:47:38 +01:00
LevelX2
70c08a2d81 * Victimize - Fixed that continuous effects of sacrificed permanent did not end before returning targets from graveyard (fixes #4315). 2018-01-02 15:01:58 +01:00
Zzooouhh
f201ec6fc0
Merge pull request #4326 from Zzooouhh/Zzooouhh-hml 
Implemented some Homelands cards
 2018-01-02 09:11:46 +01:00
Zzooouhh
497ebebc05
Implemented Broken Visage 2018-01-02 05:52:47 +01:00
Zzooouhh
bde116e201
Implemented Autumn Willow 2018-01-02 05:48:06 +01:00
Zzooouhh
aa10e2d336
Implemented Autumn Willow 2018-01-02 05:46:33 +01:00
Zzooouhh
49aa22079f
Added net counter 2018-01-01 19:09:08 +01:00
igoudt
54c585afd8 fixes #4317 2017-12-31 22:24:03 +01:00
LevelX2
d87ce66347 Added Even the Odds and reworked Feast of Blood's cast restriction. 2017-12-31 12:55:21 +01:00
LevelX2
519eae42fc * Fixed some problems with abilities that let permanents become artifact creatures but only added creature card type instead of artifact and creature card type (fixes #4290). 2017-12-31 11:31:58 +01:00
LevelX2
330c6f1393 XMage 1.4.26V10 2017-12-30 20:17:04 +01:00
LevelX2
e81f6c5e90 * Unearth - Fixed that a pahsed out creature were wrongly exiled by unearth. 2017-12-30 19:15:33 +01:00
LevelX2
529a38a96f Fixed some card download problems. 2017-12-30 18:36:03 +01:00
Zzooouhh
0f61bdeabd
Lot of progress on Panglacial Wurm quirks 2017-12-30 06:14:45 +01:00
Zzooouhh
1f5ab92e9d
Fix attempt 2017-12-30 03:15:17 +01:00
Zzooouhh
4c5dc3f839
Fix attempt 2017-12-30 03:09:56 +01:00
Zzooouhh
310764814f
Minor fix 2017-12-30 02:42:32 +01:00
Zzooouhh
c675f3b4d1
Cleanup, improvements etc. 2017-12-30 02:26:14 +01:00
Zzooouhh
818a005b59
Fixed double copypaste 2017-12-30 02:06:39 +01:00
Zzooouhh
d671c2a06c
Plenty of Panglacial Wurm fixes 2017-12-30 02:03:36 +01:00
Zzooouhh
549fb0fb22
Merge pull request #28 from Zzooouhh/Zzooouhh-csp-panglacialwurm 
Zzooouhh csp panglacialwurm
 2017-12-30 01:24:44 +01:00
Zzooouhh
5a1a6f7031
Implemented Panglacial Wurm (buggy!) 2017-12-30 01:23:52 +01:00
Zzooouhh
fc754372bd
Implemented Panglacial Wurm 2017-12-30 01:09:35 +01:00
Oleg Agafonov
e87db19b7d Tests: fixed NykthosShrineToNyx that broke dozens of other tests with mana choice 2017-12-29 17:10:07 +04:00
Zzooouhh
31648dbc0e
Changed PermanentImpl to Permanent 2017-12-29 05:31:55 +01:00
Oleg Agafonov
78b8d64649 Merge remote-tracking branch 'production/master' into production_master 2017-12-29 06:16:51 +04:00
Oleg Agafonov
af0c77a409 UI: added custom sorting in choice dialog 2017-12-29 06:11:10 +04:00
Zzooouhh
f93c55025e
Auras targetting tokens fix (fixes #4297) 2017-12-29 01:10:06 +01:00
Oleg Agafonov
35a950dc80 Merge remote-tracking branch 'production/master' into production_master 2017-12-29 04:03:45 +04:00
Oleg Agafonov
e4dfa5925b UI: added start selection value on choice dialog popup; 2017-12-28 22:38:18 +04:00
LevelX2
80f71027d6 Merge origin/master 2017-12-28 16:56:13 +01:00
LevelX2
f88a42dd74 Merge origin/master 2017-12-28 16:53:56 +01:00
Zzooouhh
c25eaa9446
Fixed one overlooked instance of lethalDamage 2017-12-28 16:53:52 +01:00
LevelX2
d808b15569 * Hollow One - Fixed counting of discarded/cycled cards if returned to hand during a turn. 2017-12-28 16:52:51 +01:00
Zzooouhh
f166bebe8c
Fixed lethal damage potentially dipping into negative values 
Example: in multiple multi-blocker creatures blocking the same creatures (if one of them assigns more than lethal to the first creature in its attackerOrder)
 2017-12-28 16:49:51 +01:00
LevelX2
6d17199129 * Toxin Sliver - Fixed that the damaged creature was not destroyed. 2017-12-28 15:57:31 +01:00
LevelX2
91efa42d0d Merge origin/master 2017-12-28 12:57:53 +01:00
LevelX2
d85637336e * Cabal Ritual, Gemstone Caverns, River of Tears - Fixed a problem that the tap for mana event was sent twice for theses lands (fixes #4288). 2017-12-28 12:57:16 +01:00
Oleg Agafonov
8a699bae81 Merge remote-tracking branch 'production/master' into production_master 2017-12-28 15:40:21 +04:00
Zzooouhh
cedfc5591b
Merge pull request #4293 from Zzooouhh/master 
Implemented Corrosion and Desolation
 2017-12-28 12:39:54 +01:00
Oleg Agafonov
101cb304fb Fixed typos 2017-12-28 15:39:00 +04:00
Oleg Agafonov
6afbcb638b Updated cards for new choice dialog 2017-12-28 04:25:17 +04:00
Oleg Agafonov
3bdd2ae8bb Fixed choice typos 2017-12-28 04:14:37 +04:00
Oleg Agafonov
7954031f41
Merge pull request #4283 from JayDi85/ui-choose-new 
Added new choose dialog
 2017-12-28 02:59:09 +04:00
Oleg Agafonov
68c6551188 Fixed cards with any color lands produce ability: 
* Fixed ManaOptions result (no more duplicated records with same options);
  * Fixed mana types searching (now mana search return {Any} type too);
  * Fixed cards: Fellwar Stone, Harvester Druid, Reflecting Pool (#4125), Sylvok Explorer, Exotic Orchard (#3374), Naga Vitalist;
 2017-12-28 02:15:49 +04:00
Oleg Agafonov
80b5026ec7 Search enabled by default 2017-12-27 06:42:27 +04:00
Oleg Agafonov
534e00e41f Updated choose color dialog: added mana value and ability source 2017-12-27 06:32:24 +04:00
Oleg Agafonov
75cec526dc Fixed magic "error switch" for unit tests 2017-12-27 06:26:05 +04:00
Zzooouhh
3de6f417dc
Combat.removeBlocker incorrectly ignored blockingGroups (Partial fix for #4172) 2017-12-26 22:29:54 +01:00
Zzooouhh
3a7b1454f8
Implemented Corrosion 2017-12-26 16:50:46 +01:00
LevelX2
8228cee30c * Some minor changes. 2017-12-26 10:59:28 +01:00
Oleg Agafonov
531b5bc569 Added auto enabled search for all pickup dialogs with many items; 2017-12-25 12:47:30 +04:00
Oleg Agafonov
749ca59ad6 Added new choose dialog (creature types and etc): 
* added incremental search;
 * added keyboard hotkeys (up/down for select, enter for choose);
 * added choose by mouse double click;
 * added source card name;
 * fixed cancel button on required choice (#4230);
 * fixed text sizes form messages (now it's auto size);
 2017-12-25 08:12:02 +04:00
LevelX2
cfadfe9942 * Fixed a problem that subtypes were still present (e.g. for spell cost reduction) for cards cast face down (fixes #4277). 2017-12-24 01:07:35 +01:00
LevelX2
6f8aec173d [RIX] Added 2 cards. 2017-12-24 00:36:56 +01:00
Zzooouhh
e6fa563919
Merge pull request #4225 from Zzooouhh/master 
Implemented cards, overflow check & other stuff
 2017-12-24 00:17:08 +01:00
Zzooouhh
688e0658b7
Moved overflow check method to CardUtil 2017-12-23 23:58:40 +01:00
Zzooouhh
c4334ef043
Moved overflow check method to CardUtil 2017-12-23 23:58:31 +01:00
Zzooouhh
88e421918e
CardUtil overflow 2017-12-23 23:19:33 +01:00
Zzooouhh
2bb4f07df2
CardUtil overflow 2017-12-23 23:17:53 +01:00
Zzooouhh
ab3128975a
Overflow check methods in CardUtil 2017-12-23 23:01:35 +01:00
LevelX2
3df4af2104 [RIX] Added Tetzimoc, Primal Death. 2017-12-23 19:27:47 +01:00
LevelX2
66acc1c1e8 [RIX] Added 6 cards. 2017-12-23 18:54:43 +01:00
spjspj
5af1355083
Merge pull request #4274 from spjspj/master 
Add The Big Idea
 2017-12-23 21:03:19 +10:00
LevelX2
ef34b3ca21 [RIX] Added Angrath's Ambusher and Angrath, Minotaur Pirate. 2017-12-23 11:30:12 +01:00
spjspj
f9896be537 Add The Big Idea (UST) 2017-12-23 18:32:20 +11:00
spjspj
118e05516a
Merge pull request #4273 from spjspj/master 
Slight fix
 2017-12-23 15:44:01 +10:00
spjspj
5272b88947 Slight fix 2017-12-23 16:43:10 +11:00
Zzooouhh
6fae8ef606
Merge branch 'master' into master 2017-12-22 23:17:20 +01:00
Oleg Agafonov
8624671a52 typos 2017-12-22 09:23:33 +04:00
Oleg Agafonov
39ca5a13f4 Added new set: Explorers of Ixalan (47 cards, 1 token) 2017-12-22 09:18:41 +04:00
LevelX2
43c732c751 [RIX] Added Vona's Hunger. 2017-12-21 17:08:24 +01:00
spjspj
856cb2b71d
Merge pull request #4267 from spjspj/master 
Add Arboria (LEG)
 2017-12-21 16:25:48 +10:00
spjspj
3055bac004 Add Arboria (LEG) 2017-12-21 17:07:08 +11:00
LevelX2
eecc322618 [RIX] Added Brass's Bounty. 2017-12-20 16:26:08 +01:00
spjspj
38272a6dde Add Arboria (LEG) 2017-12-21 01:08:55 +11:00
Zzooouhh
bf6939f45b
Included overflow check methods 2017-12-20 00:31:31 +01:00
Zzooouhh
40561e900a
Included overflow check methods 2017-12-20 00:29:36 +01:00
Zzooouhh
35bbe20b95
Included overflow check methods 2017-12-20 00:21:44 +01:00
Zzooouhh
29c9ce696d
Included overflow check methods 2017-12-20 00:20:27 +01:00
Zzooouhh
4a6ff5593e
More edits 2017-12-19 01:40:44 +01:00
Zzooouhh
a4ce4e4b17
Merge pull request #23 from magefree/master 
Merge https://github.com/magefree/mage
 2017-12-18 03:08:01 +01:00
Zzooouhh
860909408d
Minor improvement 2017-12-17 23:03:54 +01:00
Zzooouhh
aa7231bec0
Expanded DoUnlessTargetPlayerOrTargetsControllerPaysEffect 2017-12-17 19:41:22 +01:00
Zzooouhh
982c178921
Added DoUnlessTargetPlayerOrTargetsControllerPaysEffect 2017-12-17 14:46:24 +01:00
spjspj
578ea668bb Add Summon The Pack (modification - needs the creatures to be zombies (done) but not black) 2017-12-18 00:28:37 +11:00
spjspj
b17d35dff3 Add 1.25 UST cards 2017-12-16 18:04:26 +11:00
spjspj
667b2affdf Add 2 unstable cards. 2017-12-16 00:34:21 +11:00
spjspj
635c446148 Add 2 unstable cards. 2017-12-14 23:44:18 +11:00
spjspj
f39a0d4a77 Add 2 unstable cards. 2017-12-14 19:21:53 +11:00
spjspj
7645f10202 Add 2 unstable cards. 2017-12-14 10:14:48 +11:00
spjspj
7c855990c9 Add 1 unstable card. Fix dice roll (was only returning '0-(n-1)') 2017-12-12 00:08:37 +11:00
spjspj
46cbaed493 Merge branch 'master' of https://github.com/spjspj/mage 2017-12-10 23:02:33 +11:00
spjspj
eb9f50e370 Crow Storm! 2017-12-10 23:01:55 +11:00
spjspj
f5d16a930f
Merge branch 'master' into master 2017-12-10 21:54:02 +10:00
spjspj
eca218881c Start adding in Dice Roll effects 2017-12-10 22:51:08 +11:00
spjspj
8e3daf54a9 Start adding in Dice Roll effects 2017-12-10 22:49:55 +11:00
Oleg Agafonov
dce69c18dc + improved deck import from deckstats 2017-12-09 18:52:24 +04:00
Oleg Agafonov
763594e579 type 2017-12-08 00:53:46 +04:00
Oleg Agafonov
5fc0393bc7 Deck editor: 
+ added warning messages dialog after load/import decks with errors (instead throw exception);
 + added loading cursors on import-load decks;
 - fixed null exception error on empty/error deck loading;
 2017-12-08 00:20:18 +04:00
Oleg Agafonov
1efc062f66 Decks importer: 
+ added support for new decklist text format from deckstats.net (see #4228);
  + added new checks to text format (too many empty lines, too big card number: more then 100);
  + fixed double window popup on cancel/close import from clipboard window;
 2017-12-07 23:14:22 +04:00
Zzooouhh
230233659b
Some naming changes, Butcher Orgg first strike fix 2017-12-07 11:13:27 +01:00
Oleg Agafonov
5b7ab0de7a typo 2017-12-07 08:41:59 +04:00
Oleg Agafonov
66a70dd116 - Fixed #4220 - card viewer raise error with alternative card numbers; 
- Fixed potential error on getCardsByRarity;
- Added inner checks for wrong booster max card numbers settings;
 2017-12-07 08:01:54 +04:00
Zzooouhh
d8daec11d4
Fixed Butcher Orgg handling attackers/blockers leaving combat 2017-12-07 01:04:31 +01:00
Zzooouhh
d6a08fbdd7
NullPointerException fix 2017-12-07 01:01:52 +01:00
Zzooouhh
e1fdc3093a
Some other edits + small fix for Defensive Formation 2017-12-06 21:30:33 +01:00
Zzooouhh
5fec04935d
Optimization edit for assignDamageToBlockers 2017-12-06 20:31:54 +01:00
Zzooouhh
c6e69868fa
Test message cleanup 2017-12-06 19:50:06 +01:00
Zzooouhh
edd07d4f80
Implemented Butcher Orgg (the missing bits) 2017-12-06 19:46:13 +01:00
Zzooouhh
16513408fc
Cleanup #2 2017-12-06 17:05:30 +01:00
Zzooouhh
b48c37ea8f
Defensive Formation slight cleanup 2017-12-06 17:02:49 +01:00
Zzooouhh
47ef2a4ce4
Implemented Butcher Orgg (partially) 
Option to divide damage while being a blocker doesn't work for some reason
 2017-12-06 16:31:36 +01:00
Zzooouhh
dcce07cfdc
Implemented Butcher Orgg 2017-12-06 15:00:09 +01:00
LevelX2
8fac7a3dc1 XMage 1.4.26V9 2017-12-03 18:15:16 +01:00
Zzooouhh
7d72172c60
Included Echo counter type 2017-12-02 16:36:54 +01:00
LevelX2
b2e3201ea4 [RIX] Added some cards. Added some spoiler texts to mtg-cards-data.txt 2017-12-02 13:39:30 +01:00
Zzooouhh
659e3d7015
Merge branch 'master' into master 2017-11-26 21:17:27 +01:00
Zzooouhh
32ef8a5047
Small damage fix 2017-11-25 09:10:01 +01:00
Zzooouhh
200e5e07bf
Hollowhenge Spirit fix (partial fix for #4172) 2017-11-25 08:48:21 +01:00
Zzooouhh
b035c436d5
Another small fix 2017-11-25 08:35:18 +01:00
Zzooouhh
a7514fc671
Added mustBlockAllAttackers 2017-11-25 07:49:30 +01:00
Zzooouhh
7cf73917e6
Added mustBlockAllAttackers 2017-11-25 07:47:39 +01:00
Zzooouhh
92e5d8de0a
multiAttackerDamage fix 2017-11-25 07:20:25 +01:00
LevelX2
53448e6dc4 Ficed a problem with Bestow, adding multiple times "AURA" subtype. 2017-11-24 12:30:15 +01:00
Zzooouhh
19ef8f47f2
Final fix 2017-11-23 10:07:54 +01:00
Zzooouhh
0e2096395a
Another watcher fix 2017-11-23 09:56:07 +01:00
Zzooouhh
ce3176adf2
Fix for Giant Turtle/Halls of Mist watcher 2017-11-23 09:32:14 +01:00
Zzooouhh
a40e80e9e5
Created new watcher for Giant Turtle 2017-11-22 20:21:30 +01:00
Zzooouhh
813219df2d
Some changes to how Defensive Formation handles lethal damage 2017-11-22 11:28:36 +01:00
Zzooouhh
bb56568ea1
Implemented Defensive Formation 2017-11-22 02:13:22 +01:00
Zzooouhh
877a98d3d5
Implemented Defensive Formation 2017-11-22 02:08:00 +01:00
Evan Kranzler
afcf3a43d2 fixed Simic Manipulator implementation 2017-11-21 16:42:27 -05:00
Zzooouhh
bbc5f4594b
Implemented Imprison 2017-11-21 17:03:15 +01:00
Zzooouhh
6164a631ba
Fix for Umbra Mystic 2017-11-20 19:17:14 +01:00
theelk801
ad249d7c6b
Merge pull request #4158 from Zzooouhh/master 
Implemented more cards & fix for Grinning Totem
 2017-11-18 09:52:01 -05:00
Zzooouhh
8ffa590a08
Alleged text fix 
Will this mess up anything?
 2017-11-18 06:59:31 +01:00
Zzooouhh
5cc042779a
Implemented False Orders and Balduvian Warlord 2017-11-17 23:45:40 +01:00
Zzooouhh
ad9b95553f
Implemented Tombstone Stairwell 2017-11-15 00:05:29 +01:00
Zzooouhh
5d1ef487bf
Text fix 2017-11-13 22:03:37 +01:00
Evan Kranzler
036bc12508 fixed delayed end step triggers not triggering if created during an end step 2017-11-11 10:21:17 -05:00
Zzooouhh
de21a86913
Implemented Telekinesis 2017-11-11 12:59:46 +01:00
Zzooouhh
c63da1bb67
Made choosing at least one color mandatory 
10/1/2005: You can choose any single color or any combination of more than one color. You can't choose colorless.
 2017-11-11 12:17:42 +01:00
Zzooouhh
a52c98aa25
Typo fix 2017-11-05 20:49:39 +01:00
LevelX2
f5f6f924f9 XMage 1.4.26V8 2017-11-04 18:50:00 +01:00
LevelX2
a5e80d66f1 Merge origin/master 2017-11-04 18:20:35 +01:00
LevelX2
0d46c68924 * Fixed some problems for handling concede during game init. 2017-11-04 18:19:41 +01:00
Evan Kranzler
cddae049d6 fixed life loss triggers triggering off of 0 life 2017-11-04 12:15:33 -04:00
LevelX2
9a28f8d678 * Fixed that conditional mana colors were not tracked correctly for abilities like Converge. 2017-11-04 16:48:13 +01:00
LevelX2
9704d21c82 * Fixed a problem with player leaving the game during multiplayer game. 2017-11-03 15:50:01 +01:00
LevelX2
9e4beb6b51 * Nettling Impl - Fixed that the conditional delayed destroy ability did not work corretly (fixes #4142). 2017-11-03 14:59:26 +01:00
LevelX2
583033ff3b
Merge pull request #4139 from Zzooouhh/master 
Implemented a whole bunch of cards + fixes for #4131, #4137, #4138 and #4090
 2017-11-02 14:08:26 +01:00
LevelX2
02b97aa9b3 Some fixes to: Merge pull request #4129 from jerekwilson/master - Implementing 5 cards 2017-11-02 13:43:49 +01:00
LevelX2
7202e27891 Merge origin/master 2017-11-02 11:17:40 +01:00
LevelX2
b4ee3ff1da
Merge pull request #4101 from magefree/phasingFix 
Fixed how phasing is implemented
 2017-11-02 11:00:33 +01:00
LevelX2
f1bbb37c81 Merge origin/master 2017-11-02 10:29:04 +01:00
Zzooouhh
f653ddb921
Another fix for #4090 2017-11-02 07:05:33 +01:00
Zzooouhh
9423c30245
Fix for #4131 2017-11-01 20:40:49 +01:00
Zzooouhh
6e1a3b1b11 Removed garbage imports 2017-10-26 16:06:16 +02:00
Zzooouhh
1296537765 Included new watcher for "you choose blockers..." effects 2017-10-26 15:54:52 +02:00
Zzooouhh
7afb7eb2c5 Merge branch 'master' into master 2017-10-25 16:15:07 +02:00
Evan Kranzler
3746fddf54 fixed Angelic Accord displaying the wrong amount of life gain required (fixes #4132 and #4133) 2017-10-25 07:24:49 -04:00
Zzooouhh
fe9ce16ed2 Reverted MeleeAbility.calculate 2017-10-25 01:10:02 +02:00
Zzooouhh
6a8ce4c6ea Delete JohanVigilanceAbility.java 2017-10-24 17:04:35 +02:00
Zzooouhh
549f89ac20 Update Combat.java 2017-10-24 17:04:12 +02:00
Zzooouhh
58ff5e017a Moved JohanVigilanceAbility 2017-10-24 17:01:46 +02:00
Zzooouhh
e82d640060 Implemented Johan 2017-10-24 06:12:10 +02:00
Zzooouhh
7c5562881b Implemented Johan 2017-10-24 06:10:06 +02:00
Zzooouhh
b153a7c2a2 Implemented Custodi Soulcaller 2017-10-22 23:39:31 +02:00
Zzooouhh
db8e38b587 Implemented Johan 2017-10-22 16:48:47 +02:00
Evan Kranzler
f29141605b fixed Nissa, Genesis Mage -10 forcing players to put 10 cards into play in order to continue 2017-10-22 09:16:51 -04:00
LevelX2
919ec2fade Merge origin/master 2017-10-21 16:14:14 +02:00
LevelX2
58d3fc2328 Fixed player leaving/conceding handling. 2017-10-21 16:13:45 +02:00
Evan Kranzler
b30335e344 Implemented Momentum 2017-10-20 10:58:44 -04:00
Evan Kranzler
1452e10128 Implemented Waylay 2017-10-19 07:34:46 -04:00
Evan Kranzler
8cbffc89d8 updated some text and implementations 2017-10-18 14:53:30 -04:00
Evan Kranzler
08bdfcc961 updated some text and implementations 2017-10-18 14:45:30 -04:00
Evan Kranzler
474048bcbc fixed implementation of Confusion in the Ranks 2017-10-17 14:02:47 -04:00
Evan Kranzler
ba31763a7a Implemented Rally the Troops 2017-10-16 20:29:53 -04:00
Evan Kranzler
457269cb12 fixed some range of influence issues 2017-10-16 18:12:57 -04:00
Evan Kranzler
587e8a75ef fixed phased-out permanents not being invalid targets upon resolution 2017-10-16 17:04:04 -04:00
Evan Kranzler
79d4c07d20 updated how Withering Wisps and limited use activated abilities are implemented 2017-10-14 09:04:45 -04:00
Zzooouhh
5735515a31 Implemented Ovinomancer 2017-10-14 10:22:53 +02:00
igoudt
81875d19dc revert cardtextpredicate to fix issue #4091 2017-10-14 10:07:17 +02:00
Zzooouhh
eba43f1905 Create SacrificeAttachedCost.java 2017-10-12 23:14:09 +02:00
Zzooouhh
36fed5d72e Create TapAttachedCost.java 2017-10-12 21:28:52 +02:00
Zzooouhh
c82f38e3df (Credit where it's due) 2017-10-12 18:29:04 +02:00
Zzooouhh
c3c8148baf Create SkipUntapStepEffect.java 2017-10-12 18:24:32 +02:00
Evan Kranzler
0fc3afb235 fixed Evangelize not being castable when caster controls no creatures. 
(fixes #4094)
 2017-10-12 07:56:45 -04:00
Evan Kranzler
9b51694908 fixed embalm and eternalize sometimes giving the token to the wrong player 2017-10-11 13:09:39 -04:00
Evan Kranzler
ab632ef1d0 small fix 2017-10-11 08:35:33 -04:00
Evan Kranzler
81a1e81525 fixed being able to cast spells from an opponents hand when revealed. (fixes #4102) 2017-10-10 19:27:03 -04:00
Evan Kranzler
4116b58414 fixed Venser, Shaper Savant and other similar cards not properly removing copied spells from the stack (fixes #4072) 2017-10-10 16:58:40 -04:00
Evan Kranzler
80f21132eb fixed Nivmagus Elemental being able to infinitely exile copied spells (fixes #4092) 2017-10-10 16:25:15 -04:00
Evan Kranzler
fdf3f831ca updated cards which phase things out to properly handle indirect phasing 
(#4071)
 2017-10-10 14:32:08 -04:00
Evan Kranzler
3d20e4dbef changed how phasing is handled 2017-10-10 13:37:05 -04:00
theelk801
51f0e92103 Merge pull request #4100 from magefree/master 
merge
 2017-10-10 11:25:00 -04:00
Evan Kranzler
118978e39d text fixes 2017-10-09 12:23:14 -04:00
Evan Kranzler
f16b5881e8 fext tixes 2017-10-08 09:33:01 -04:00
Evan Kranzler
54b8f10c3c text fixes and test fixes to fix how tests test text, then more text next 2017-10-07 16:08:06 -04:00
Evan Kranzler
14107b3d55 2 text 2 fixrious 2017-10-07 11:02:36 -04:00
Evan Kranzler
0075535650 so many text fixes 2017-10-06 22:00:06 -04:00
Evan Kranzler
bc2bfba02a more text fixes 2017-10-06 18:28:22 -04:00
Evan Kranzler
3baabe2534 some text fixes 2017-10-06 16:55:46 -04:00
Evan Kranzler
a63e024ea4 initial setup for phasing fix 2017-10-06 12:29:14 -04:00
Evan Kranzler
0ea78d21ef Implemented Spheres from Odyssey 2017-10-05 20:13:48 -04:00
Evan Kranzler
b320d1d0f0 Implemented Forgotten Harvest 2017-10-05 18:02:10 -04:00
Evan Kranzler
2733d736d5 fixed Curtain of Light targeting, updated how being unblocked is checked 2017-10-05 13:41:12 -04:00
Evan Kranzler
3b0b923b7c Implemented Weathered Bodyguards 2017-10-05 13:31:05 -04:00
Evan Kranzler
8c20861e92 Implemented Kjeldoran Home Guard 2017-10-04 18:32:46 -04:00
Evan Kranzler
6725c50b4a Implemented Elder Land Wurm 2017-10-04 14:19:10 -04:00
Evan Kranzler
1453fa46a7 Fixed Urborg's functionality, also fixed Scarwood Hag not removing forestwalk properly (#4088) 2017-10-03 15:54:42 -04:00
LevelX2
71336a916d XMage 1.4.26V7 2017-10-03 18:41:06 +02:00
LevelX2
4a71f8af67 Some minot fixes /changes. 2017-10-03 17:24:35 +02:00
Evan Kranzler
de8ae96aaa Fixed Hour of Eternity's targeting and another small fix that was causing an error 2017-10-02 20:55:02 -04:00
Evan Kranzler
67bc2fb6bb Updated some power-setting and toughness-setting effects to the correct layers 2017-10-02 16:58:48 -04:00