Commit graph

5983 commits

Author SHA1 Message Date
LevelX2
b8cc0120cb Merge origin/master 2017-02-06 21:21:16 +01:00
vraskulin
1e64ecfe07 Merge remote-tracking branch 'fork/master' 2017-02-06 14:36:24 +03:00
vraskulin
076045d862 Fixed merge conflict 2017-02-06 14:36:09 +03:00
vraskulin
0557b5e89c list.size > 0 changed to !list.isEmpty
We care about if it's empty or not, not about it's size
2017-02-06 14:32:51 +03:00
vraskulin
f60ebfbb1f All 1-character strings converted to primitives
"b" + "r" now changed to 'b' + 'w'.  It's more straight-forward, and may cause perfomance improvements - character primitives allocation is faster and less expensive than string creation.
2017-02-06 14:32:51 +03:00
vraskulin
31589778ca Try/finally refactored to try with resources 2017-02-06 14:32:11 +03:00
kubikrubikvkube
6a114ac902 Merge branch 'master' into master 2017-02-06 14:29:59 +03:00
LevelX2
b3597d64a0 Merge origin/master 2017-02-05 13:54:24 +01:00
LevelX2
b86acbe0da Some minor fixes. 2017-02-05 13:53:36 +01:00
spjspj
72f4778506 Merge pull request #2837 from spjspj/master
Add Canadian Highlander Deck/Game implementation.
2017-02-05 23:25:53 +11:00
spjspj
c98bf163be Add Canadian Highlander Deck/Game implementation. Also implements the double-mulligan-on-6,5,4,3,2,1 rule. 2017-02-05 23:23:51 +11:00
LevelX2
d71ebdcea9 Merge origin/master 2017-02-05 11:41:20 +01:00
LevelX2
3525e46514 XMage 1.4.21V2 2017-02-05 11:39:43 +01:00
spjspj
9fe53e52c2 Merge pull request #2836 from spjspj/master
Add field for server console
2017-02-05 14:54:28 +11:00
spjspj
fa97e4647e Add field for server console 2017-02-05 14:11:05 +11:00
LevelX2
ff6d79829e * Fixed a bug that damage was wrongly still assigned to players during combat that already left the game. 2017-02-04 23:56:03 +01:00
LevelX2
1d404ee57f Fixed a problem that the TAPPED_FOR_MANA event was not always send (fixed #2826). 2017-02-04 17:56:04 +01:00
LevelX2
0dacf2a6fa * Fixed that the cascade converted mana costs comparison did not work correctly with split spells. 2017-02-04 14:26:17 +01:00
LevelX2
227143aacf * Entwine - Fixed that for spells cast without mana costs entwine could wrongly be used for free. 2017-02-04 14:24:30 +01:00
LevelX2
067b72dcce * Added test. 2017-02-03 21:36:33 +01:00
LevelX2
a5299e3a30 * Fixed a bug that card art of cards with multiple arts (e.g. FEM) were not displayed during game play. 2017-02-03 20:45:47 +01:00
emerald000
f4c9ac53db Added Battlefield Scrounger, Death Spark and Rasputin Dreamweaver. 2017-01-31 11:06:49 -05:00
LevelX2
9ec65dc480 * Green Sun's Zenith - Fixed a bug of the used Search effect (also affecting the other colors). 2017-01-31 16:20:21 +01:00
LevelX2
034ef22468 * Fixed PreventDamageByTargetEffect to handle delayed spell damge (fixes #2822). 2017-01-30 21:19:17 +01:00
LevelX2
0a1356d40e * Fixes to test and fix for issue #2816 2017-01-29 11:16:04 +01:00
LevelX2
2cf15830d7 * Some fixes to Hivestone and BecomesSubtyoeAllEffect. 2017-01-29 11:15:09 +01:00
LevelX2
e9d46db772 * Scrapheap Scrounger - Fixed that the exile cost was not mandatory. 2017-01-28 12:10:38 +01:00
vraskulin
fc54c0156c list.size > 0 changed to !list.isEmpty
We care about if it's empty or not, not about it's size
2017-01-27 16:05:11 +03:00
vraskulin
0de8bd2f70 All 1-character strings converted to primitives
"b" + "r" now changed to 'b' + 'w'.  It's more straight-forward, and may cause perfomance improvements - character primitives allocation is faster and less expensive than string creation.
2017-01-27 15:57:26 +03:00
goblin
7b40803b4f fix the issue
Alter the constructor to create the object with setTargetPointer, like
the other constructors.

I hope nothing relies on it being false. Tests don't show anything breaking.
2017-01-27 13:26:31 +01:00
vraskulin
7b35e25347 Try/finally refactored to try with resources 2017-01-26 20:58:40 +03:00
LevelX2
082210a4bd Xmage 1.4.21V1 2017-01-25 00:14:05 +01:00
LevelX2
ca0485075c Merge pull request #2810 from Galatolol/master
Added 5 cards
2017-01-24 23:12:22 +01:00
LevelX2
cec9d00a59 * Fixed that non creature spells with morph could not be countered with Remove if cast with morph. 2017-01-24 23:08:47 +01:00
LevelX2
8d06c23602 * Selvala, Explorer Returned - Fixed that library top cards were revealead without using the mana ability. Possible mana from this source is no longer calculated for possible mana pool. Tapping for man can no longer be undone.(#2191). 2017-01-24 16:25:26 +01:00
LevelX2
0014c7dcc5 * Fixed some possible null pointer exceptions. 2017-01-22 22:46:14 +01:00
LevelX2
719f88b3c8 * Fixed possible IndexOutOfBoundsException during combat. 2017-01-22 22:27:39 +01:00
LevelX2
fdd28cde4b * Possibility Storm - Fixed a problem with split card moving. 2017-01-22 22:04:50 +01:00
Galatolol
9cbe82299c Fixed AddCardSubtypeAllEffect 2017-01-22 11:40:52 +01:00
Galatolol
8969157ce8 Added 5 cards 2017-01-21 14:26:04 +01:00
LevelX2
fe4abd26c9 Fixed a bug of the Revolt ability word that prevented that ot triggered always correctly. 2017-01-21 01:33:46 +01:00
LevelX2
b1a51ce7cf * Lightning Runner - Fixed a bug of the optional untap and add combat phase effect. 2017-01-21 01:10:37 +01:00
LevelX2
5fe25b0af7 * Fixed some problems with set icon download and displaying. 2017-01-21 00:51:31 +01:00
LevelX2
d68ff964fb * Gonti’s Machinations - Fixed that it triggered more than once per turn. 2017-01-20 00:34:45 +01:00
LevelX2
16648e53d1 * Maelstrom Nexus - Fixed that cascade wrongly triggered not only for the first spell cast. 2017-01-20 00:15:27 +01:00
Ludwig.Hirth
a175ac3a1d Merge origin/master
Conflicts:
	Mage.Sets/src/mage/cards/c/CogworkAssembler.java
2017-01-19 17:01:34 +01:00
Ludwig.Hirth
a3659826a8 * Toxin Sliver - Fixed not corretly working triggerd ability. 2017-01-19 16:59:58 +01:00
Styxo
d690926cef [AER] Refactored some similar abilities and effects 2017-01-18 14:25:58 +01:00
LevelX2
6625bf86be Xmage 1.4.21V0 2017-01-15 17:44:02 +01:00
LevelX2
b7c0c1e8b4 * Mindbreak Trap - Fixed a problem with exiling copied (e.g. by Storm)spells. 2017-01-15 16:04:45 +01:00
LevelX2
75cbfdf3b9 * Some changes to EnterTheBattlefield events, some other fixes (fixes #2765). 2017-01-15 15:22:33 +01:00
LevelX2
78cff4d24f * Fixed Flailing Drake and test. 2017-01-14 15:47:33 +01:00
LevelX2
c996454486 * Duel Commander - Removed commander damage logic. 2017-01-14 15:35:22 +01:00
LevelX2
2d13deff3a * Vorinclex, Voice of Hunger - FIxed a bug that id did not work correctly with some conditional land mana sources (e.g. Gemstone Caverns). 2017-01-14 12:25:07 +01:00
LevelX2
6a70f53f1a Merge pull request #2777 from Galatolol/master
Added 4 cards
2017-01-14 00:15:32 +01:00
LevelX2
94684baf3c * Ghostly Flicker - Reworked effect code again. 2017-01-14 00:00:42 +01:00
LevelX2
8f059ee71a * Fixed a logical bug to DiscardTargetEffect. 2017-01-13 23:43:48 +01:00
LevelX2
eb802431fa * Duel Commander - Removed commander damage logic. 2017-01-13 23:36:22 +01:00
LevelX2
d1af9b0b85 * Fixed a problem of the improvise ability that prevented to pay costs during the resolution of the spell cast using improvise (e.g. Metallic Rebike). 2017-01-13 23:02:21 +01:00
LevelX2
17fbee2400 * Fixed a bug that adding counters with Skyship Plunder or Maulfist Revolution did not trigger counter added events. 2017-01-13 22:40:37 +01:00
LevelX2
350436dee2 * Fixed a bug with rule text generation (e.g. for Lapse of Certainty). 2017-01-13 22:38:04 +01:00
Galatolol
59cf0cf1f3 Fixed target and changed name of the effect 2017-01-13 20:57:44 +01:00
LevelX2
9b14795032 * Champion of Lambholt, Goldnight Commander, Griffin Protector and Healer of the Pride - Fixed that the triggered ability also triggered for not controlled permanents. 2017-01-13 20:47:43 +01:00
LevelX2
450eba06e8 Merge pull request #2772 from ingmargoudt/master
replaced enum comparison from equals to ==
2017-01-13 17:26:50 +01:00
fireshoes
1e7509a765 Fixed Goblin Chieftain missing haste ability for controlled goblins. Fixed missing basic lands from AER booster packs. 2017-01-12 14:10:25 -06:00
test
e18a429e92 * fixed the planeswalker search cards to work correctly with aven mindcensor like effects 2017-01-12 13:51:22 +01:00
Galatolol
0b6e7fdb7d Added 4 cards 2017-01-11 20:35:50 +01:00
igoudt
ac8962cb29 replaced enum comparison from equals to == 2017-01-11 09:53:16 +01:00
LevelX2
1c4bf298eb Merge pull request #2762 from sotovdev/bigRefactoring
Big refactoring
2017-01-11 07:42:52 +01:00
LevelX2
17dbd996d2 Merge pull request #2760 from ingmargoudt/master
some rewrites to reference putIfAbsent
2017-01-11 07:36:12 +01:00
LevelX2
0e9b46bdc1 Merge pull request #2759 from sotovdev/master
We can't invoke equals method on object that can be null
2017-01-11 07:33:54 +01:00
LevelX2
a2b8891188 Fixed a NPE of Meld effect. 2017-01-10 23:54:42 +01:00
vraskulin
076840df53 Big refactoring
I used Intellij IDEA to automatically refactor code to achive 3 goals.
1) get rid of anonymouse classes, and replace the with lamba to get more readeable and clean code (like in TableWaitingDialog).
2) make effectively final  variables actually final to avoid inadvertent changes on it in further releases and keep objects as immutable, as possible.
3)  Get rid of unused imports (most of the changes) in whole project classes.
2017-01-09 19:16:53 +03:00
vraskulin
a9f2c8c407 Refactoring
We don't need to override basic methods to just call the basic method again.
2017-01-09 18:13:43 +03:00
vraskulin
b626bf6866 Properties can be final in these objects 2017-01-09 17:52:17 +03:00
vraskulin
33b9ec52b0 SQLException fixed
ERROR 2017-01-09 15:35:35,693 java.sql.SQLException: Cannot update class mage.cards.repository.ExpansionInfo because it doesn't have an id field =>[main] ExpansionRepository.update
2017-01-09 15:40:20 +03:00
igoudt
316137b5e2 replaced various !contains -> put with putIfAbsent 2017-01-09 13:07:32 +01:00
igoudt
ab624c22ef library replaced !contains -> put with putIfAbsent 2017-01-09 12:09:03 +01:00
LevelX2
0ec712fcd9 Added some additional logic to prevent the ExpansionRepository update errors. 2017-01-08 20:41:29 +01:00
LevelX2
4dd023716e * Added another general static filter class. 2017-01-08 10:35:46 +01:00
LevelX2
fa4cf8161d * Added missing creature type "Servo" to the creature type list. 2017-01-08 10:16:08 +01:00
LevelX2
ee203cf981 Xmage Release 1.4.20V0 2017-01-08 01:36:05 +01:00
LevelX2
a75e4f4fcb Fixed that adding counters to players did not work correctly (e.g. Winding Constrictor). 2017-01-07 23:53:47 +01:00
LevelX2
491ab5fbb0 [AER] Fixed Daredevil Dragster. 2017-01-07 23:29:27 +01:00
LevelX2
9353c5aa9c [AER] Some more minor fixes. 2017-01-07 22:22:17 +01:00
LevelX2
b358597bf4 [AER] Added the last missing cards. Some fixes. 2017-01-07 21:42:29 +01:00
LevelX2
c7e149904b [AER] Fixed some problems with revolt. 2017-01-07 20:03:03 +01:00
spjspj
7a8055172d spjspj - Allow appending from the clipboard in deck editor 2017-01-08 01:02:01 +11:00
LevelX2
b1e65b1bb4 Merge pull request #2744 from Galatolol/master
Added 3 cards, little refactoring (Unattach cost)
2017-01-07 00:40:04 +01:00
Styxo
90b3bacf6e [AER] Added rest of green cards 2017-01-07 00:26:30 +01:00
LevelX2
7ec9394a83 Merge origin/master
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
2017-01-06 21:57:18 +01:00
LevelX2
69db775d05 [AEN] Added Hidden Stockpile. 2017-01-06 21:52:51 +01:00
Styxo
7aa57cc01f [AER] Added white cards 2017-01-06 21:22:24 +01:00
fireshoes
4888a4a15b [AER] Added most of the 1/5 spoiled cards. Fixed a name. 2017-01-05 23:50:20 -06:00
Styxo
e057bde150 [Refactor] Merged some similar abilities together 2017-01-05 14:12:18 +01:00
fireshoes
e4727a1063 [AER] Implemented several cards. 2017-01-04 14:25:39 -06:00
Styxo
fad4f53365 [Refactor] Removed some duplicate classes 2017-01-04 15:10:25 +01:00
Styxo
19316b4e20 Forgot one new class 2017-01-04 12:07:54 +01:00
Styxo
8fd28f70e6 [AER] Added Release Gremlins, Aetherwind Basker and Inspiration Monuments 2017-01-04 12:06:16 +01:00
Styxo
3c67e51db0 [REFACTOR] Removed duplicate code and an unused effect 2017-01-04 09:58:10 +01:00
Justin Herlehy
1c6914398b Code Deduplication
Move the cast from hand effect from the expertise cards to its own effect that can have different values assigned to it.
2017-01-03 23:49:16 -05:00
Galatolol
b0dc7fe276 Added 3 cards, little refactoring (Unattach cost) 2017-01-03 20:51:39 +01:00
ludwig.hirth
3040072be9 Merge origin/master 2017-01-03 14:38:51 +01:00
ludwig.hirth
94717fd041 * Tel-Jilad Wolf - Fixed that the ability triggered for all creatures not only artifact creatures (fixed #2738). 2017-01-03 14:38:18 +01:00
Styxo
7c2af646ec [Refactor] Edited some filter text 2017-01-03 13:58:03 +01:00
Styxo
a4a9e41464 [Refactor] Edited RevealLibraryPutIntoHandEffect, deleted the same effect class (EnvoyEffect) and changed some cards 2017-01-03 10:05:58 +01:00
Styxo
656e658fb4 [Refactor] Added DamageWithPowerEffect and change some cards 2017-01-03 09:23:35 +01:00
emerald000
c6c7c82508 [AER] Implemented Revolt mechanic + 2 cards using it.
Decommission and Fatal Push
2017-01-03 01:11:24 -05:00
LevelX2
54b40646d9 Some minor changes. 2017-01-02 18:09:33 +01:00
LevelX2
4ea6a0befb Merge pull request #2730 from Galatolol/master
Added 7 cards
2017-01-02 17:25:21 +01:00
LevelX2
2162fab114 * Fixed a problem of AI target handling (e.g. for Precursor Golem) 2017-01-01 14:56:34 +01:00
Galatolol
2db6ff1825 Fixed 3 cards 2017-01-01 12:11:11 +01:00
Justin Herlehy
f3c0d3fce0 [MMQ] Ramosian Rally
Also fixed order of check in GameImpl for attached player to prevent possible NPE.
2016-12-31 14:41:38 -05:00
LevelX2
df0cd60fbc * Marionette Master and Mortis Dogs, fixed that power below 0 caused life gain. 2016-12-31 17:41:12 +01:00
LevelX2
c2852ca233 [AER] Added Battke at the Bridge. 2016-12-31 17:00:00 +01:00
LevelX2
eb5b1771e6 Merge pull request #2728 from sotovdev/fix_29122016_2
Refactoring
2016-12-31 00:12:03 +01:00
Galatolol
f577a4b614 Added 7 cards 2016-12-30 12:15:56 +01:00
Justin Herlehy
14507e7dc5 Fix GameImpl SBA for auras attached to players.
attachedToPlayer was always getting set to something so the null check in the SBA loop was not allowing auras to be put into the graveyard for being attached to an illegal player.  Currently checks for hasLost() as the player leaving also sets loses to true.
2016-12-30 01:56:04 -05:00
ludwig.hirth
6c72794859 * Added test. 2016-12-29 17:05:32 +01:00
ludwig.hirth
b26a5730fa * Mage Slayer - Fixed that the correct damage source was assigned for the additional damage. 2016-12-29 16:18:52 +01:00
vraskulin
f04ba151f7 Refactoring
See github line by line comments in 'File changed'
2016-12-29 16:49:12 +03:00
vraskulin
c0cf22bbf7 Refactoring
See github line by line comments in 'File changed'
2016-12-29 16:16:08 +03:00
vraskulin
01bb9572e9 Refactoring
See github line by line comments in 'File changed'
2016-12-29 15:38:22 +03:00
vraskulin
c526306c5b Refactoring
See github line by line comments in 'File changed'
2016-12-29 15:26:19 +03:00
LevelX2
d3c2c33b44 * Added static Goblins filter. 2016-12-28 11:32:29 +01:00
LevelX2
ecc18072cf Cyclopean Tomb - Update. 2016-12-28 02:02:57 +01:00
LevelX2
cebfadbf34 Merge pull request #2709 from MTGfan/master
Cyclopean Tomb TODO: inside watcher get ID for card
2016-12-27 16:38:27 +01:00
LevelX2
8075ea2e50 * Fixed a problem that Emblems created by permanents where its owner left the game caused errors in clients. Some handling cganges of emblems. 2016-12-27 16:00:22 +01:00
LevelX2
ad5699f119 * Fixed a bug that the color choice was fixed if used in activated abilities (e.g. Obi-Wan Kenobi) beyond the first usgae. 2016-12-27 11:48:18 +01:00
Justin Herlehy
5cfec72d81 [TOKEN] Goblin with Haste
The 1/1 red goblin with haste token was failing to specify that it was a token with haste is the fallback autotext.
2016-12-27 00:08:13 -05:00
LevelX2
862ac38f51 * Fixed that special actions (e.g. delve mana payment) were handled correctly if a player plays a turn for another player. 2016-12-24 16:52:06 +01:00
LevelX2
a632f9c0e8 Fixed a problem that Dwarven Recruiter, Goblin Recruiter or Scouting Trek searched for the wrong subtype. 2016-12-24 11:55:30 +01:00
LevelX2
c6d54c929f Fixed a problem that selecting cards in hand or libraray could unintended trigger "becomes the target of a spell or ability" abilities. 2016-12-24 11:42:11 +01:00
MTGfan
8a807c888c Merge remote-tracking branch 'upstream/master' 2016-12-24 00:13:54 -05:00
LevelX2
8ba22ad7e2 * Fixed that selecting no target players let fizzle the spell (e.g. Wheel and Deal). 2016-12-22 23:50:02 +01:00
Styxo
c2ef2b1f47 [CN2] Added Deadly Designs and Fang of the Pack 2016-12-22 08:05:22 +01:00
MTGfan
7e867f4fcf Cyclopean Tomb TODO: remove counters part of effect 2016-12-21 19:46:46 -05:00
LevelX2
f0ba7d38a6 Merge pull request #2697 from sotovdev/master
Refactoring SQl query + unwanted ArrayList creation
2016-12-21 15:48:01 +01:00
Styxo
2eb0a487a4 Added WishEffect, ExchangeLifeTargetEffect and did refactors 2016-12-20 13:31:39 +01:00
Styxo
009676f75f Added HippoToken 2016-12-19 12:40:58 +01:00
Styxo
cff83aefb1 Created LoseHalfLifeTargetEffect, DiscardedByOpponentTrigger and made some refactors 2016-12-19 12:39:26 +01:00
vraskulin
2e83930ace Creating new ArrayList is unneccesarry
We shouldn't create new arraylist with default size and no element in it to show that no elements found in database. It's one more object in heap, which will be never used. There is special method Collections.emptyList() - it's more readeable and returns empty immutable list
2016-12-19 12:23:23 +03:00
vraskulin
e22951c68e Repository objects refactoring
SQL query is limited by 1, so there will be two cases - whether collection is empty or not. We should user convenient shortcut for checking emptiness of collection
2016-12-19 11:30:32 +03:00
LevelX2
1de210ab74 * Fixed a bug of DealsDamageToOneOrMoreCreaturesTriggeredAbility, added some tests. 2016-12-18 17:50:33 +01:00
LevelX2
d85b9943f1 * Added logic to remove control effects that refer to permanents of a player that leaves the game. 2016-12-18 16:57:34 +01:00
LevelX2
40d8a32695 XMage 1.4.19V1 2016-12-17 10:35:45 +01:00
LevelX2
61dd62b148 * Undiscovered Paradise - Fixed that it was not returned to hand on untap step (fixes #2693). 2016-12-17 09:27:24 +01:00
LevelX2
8e51e3a2bf Merge pull request #2686 from MTGfan/master
Guardian Angel and added Dynamic Value constructor to PreventDamageToTargetEffect
2016-12-16 22:57:21 +01:00
LevelX2
6955ad803f Merge pull request #2691 from sotovdev/sqlPerf
SQL query perfomance improvements
2016-12-16 22:34:38 +01:00
LevelX2
8d6d8d25e5 * Reflecting Pool - Fixed that mana from dynamic mana abilities were not taken into account (e.g. Gaea's Cradle or Serra's Sanctum). 2016-12-16 18:38:40 +01:00
vraskulin
3be7598ee1 SQL query perfomance improvements
There will be always 0 or 1 distinct result. If we don't limit this query it will find an item, and still will go through the whole table trying another one, which is unneccesary and have performance impact.
2016-12-16 17:27:19 +03:00
Styxo
8e6cf84ce4 Added TargetHasCounterCondition and option for BecomesMonstrous 2016-12-15 15:33:35 +01:00
MTGfan
26c176abaa Guardian Angel and added Dynamic Value constructor to PreventDamageToTargetEffect 2016-12-14 17:20:00 -05:00
LevelX2
3ca573b7c0 Merge pull request #2672 from MTGfan/master
Nettling Imp, TargetController and ControllerPredicate updated to include active choice
2016-12-13 15:23:36 +01:00
Justin Herlehy
557019e8a6 Merge pull request #2679 from JRHerlehy/master
[CN2] Refactor Council's Dilemma voting.
2016-12-13 02:02:43 -08:00
Styxo
f88d3f0bbf Refactored RevealCardsFromLibraryUntil and some cards to use it 2016-12-13 09:21:11 +01:00
JRHerlehy
b9d5fbcbe5 [CN2] Create new vote effect to reduce boilerplate code duplication on Council's Dilemma cards. 2016-12-12 20:58:31 -08:00
MTGfan
2fcb26887c Nettling Imp and predicate revisions 2016-12-12 15:16:36 -05:00
LevelX2
fe97f289f8 Ravnica: City of Guilds - Added the 5 missing cards with Radiance ability word. 2016-12-12 20:54:45 +01:00
MTGfan
a199d6eaea Nettling Imp, TargetController and ControllerPredicate updated to include active choice 2016-12-12 03:03:39 -05:00
LevelX2
79c80fe24b Added a test and some minor changes. 2016-12-11 23:10:20 +01:00
LevelX2
7c7cebc048 * Saskia the Unyielding - Fixed that the damage source of the triggered ability was not the combat damage causing creature. 2016-12-11 22:58:35 +01:00
LevelX2
4b4aef8ed5 * Orzhov Advokist - Fixed that the attack preventing effect did not work correctly. 2016-12-11 16:25:08 +01:00
LevelX2
fb2d3f911e * Power Surge - Fixed some problems. 2016-12-11 15:14:09 +01:00
LevelX2
561f120ce0 * Consecrete Land - Some changes. 2016-12-11 12:38:25 +01:00
LevelX2
fde05d8efb Merge pull request #2649 from MTGfan/master
I need help finishing these cards, thanks
2016-12-11 10:27:59 +01:00
Justin Herlehy
ba57ccfc9e [USG] Lotus Blossom (#2671) 2016-12-09 16:11:16 -08:00
MTGfan
90aec7c517 Changes to Consecrate Land and Power Surge both not working yet. 2016-12-08 22:38:17 -05:00
MTGfan
4a2e1c5063 Merge remote-tracking branch 'upstream/master' 2016-12-08 21:37:02 -05:00
LevelX2
3d95849c10 Some fixes to the Monarch designation. 2016-12-07 17:14:08 +01:00
JRHerlehy
deb59d409d Implement AER card Ajani Unyielding
Moved Swords to Plowshares effect to common class to dedupe code.
2016-12-07 00:45:06 -08:00
Styxo
ba30a514d2 [AER] Added Ajani and Tezzeret from PW decks 2016-12-06 15:38:24 +01:00
MTGfan
70fa433480 Power Surge ToDo: count untapped land at beginning of turn 2016-12-03 21:48:44 -05:00
spjspj
94224ab367 Merge pull request #2651 from spjspj/master
spjspj - Fix for must attack effects not forcing attacks in multiplayer
2016-12-03 18:54:04 +11:00
spjspj
9f66125cf9 spjspj - Fix for must attack effects not forcing attacks in multiplayer 2016-12-03 18:26:40 +11:00
MTGfan
0f90531b33 Animate Artifact please test this 2016-12-01 23:33:10 -05:00
MTGfan
cc1f4b563d Consecrate Land currently not working 2016-12-01 14:20:40 -05:00
MTGfan
4f744b4e53 Added Personal Incarnation
Personal Incarnation implemented. 
TargetController and ActivatedAbilityImpl added OWNER as required by Personal Incarnation
2016-11-29 20:15:02 -05:00
LevelX2
b62ca1ed1f Xmage 1.4.19 2016-11-27 19:59:42 +01:00
LevelX2
7481b7f5b2 Fixed possible endless loop if player left game during combat. 2016-11-27 07:54:02 +01:00
LevelX2
68d0e6b9fa Added the monarch concept to xmage and all related cards. 2016-11-27 01:14:32 +01:00
LevelX2
8bf299e342 * Fixed and extended extra turn test. 2016-11-26 13:46:10 +01:00
LevelX2
db831202da Merge pull request #2630 from MTGfan/master
New AttachedPermanentToughnessValue and related updates plus misc
2016-11-26 10:40:39 +01:00
LevelX2
946b723361 * Fixed possible null pointer exceptions. 2016-11-26 10:22:23 +01:00
MTGfan
36d6c006ca New AttachedPermanentToughnessValue, updated DamageAttachedControllerEffect to take DynamicValue (ex. to work with AttachedPermanentToughnessValue), and updated Creature Bond to use AttachedPermanentToughnessValue and DamageAttachedControllerEffect. Corrected Gaea's Liege, Kor Scythemaster, Soltari Lancer, and Spirit of the Night to use SourceAttackingCondition. Rmoved the AttackingCondition we creature for Gaea's Liege since it duplicated the already existing SourceAttackingCondition. For the other three using SourceAttackingCondition and the minor changes to the code for them should make their code more efficient. 2016-11-26 03:57:46 -05:00
Dilnu
3198558dd6 Fix March of the Machines
Add a DependencyType for ArtifactAddingRemoving and use it to make March of the Machines come after artifact type adding effects.
2016-11-22 08:40:54 -05:00
Dilnu
9ff3e2c670 Fix the counter removal code so it doesn't throw events when it's removing nonexistent counters. 2016-11-21 07:39:47 -05:00
spjspj
5fe4dcdd29 Merge pull request #2610 from spjspj/master
Add 'EDH power level' rating to Commander tables
2016-11-21 19:45:28 +11:00
LevelX2
7daa476542 * Fixed that the color of cards cast face dwon and later turned face up was not set. 2016-11-20 22:34:12 +01:00
spjspj
7fd2eeedcf Add 'EDH power level' rating to Commander tables 2016-11-20 23:13:16 +11:00
LevelX2
da7982ff2e * Obscuring Aether - Fixed a problem that face down creatures had P/T = 0/0. 2016-11-20 10:13:04 +01:00
LevelX2
7d60d884c3 * Refelecting Pool - Fixed that mana that Exotic Orchard could produce was not taken into account. 2016-11-20 01:15:45 +01:00
LevelX2
5ea1724112 * Ghirapur Guide - Fixed that the effect of the activated ability lasted while Ghirapur Guide was on the battlefield instead only until end of turn. 2016-11-20 00:33:01 +01:00
LevelX2
3eb2531cee * Karona, False God - Reworked gain control handling. 2016-11-20 00:15:06 +01:00
LevelX2
03c766a485 * Myriad - Fixed a bug that the token was also created to attack the definding player. 2016-11-19 23:12:02 +01:00
LevelX2
b7b7a97945 * Fixed that died creature were wrongly returned to battlefield also if it was moved to exile by replacement effect before. 2016-11-19 18:44:11 +01:00
LevelX2
360db9104f * Fixed that the order of opening hand actions could not be chosen by the player. 2016-11-19 17:49:51 +01:00
LevelX2
ca25cc4679 * Fixed a problem that optional effects could produce IndexOutOfBoundsExceptions. 2016-11-19 12:47:20 +01:00
LevelX2
8e42660e33 Fixed a problem that tokens that came into play with modified attributes (P/T e.g. from Master of Etherium) were seen for triggered abilities (e.g. Sword of the Meek ) with unmodified attributes. 2016-11-19 12:08:44 +01:00
LevelX2
0ccaca4a3b Fixed a problem that tokens that came into play with modified attributes (P/T e.g. from Master of Etherium) were seen for triggered abilities (e.g. Sword of the Meek ) with unmodified attributes. 2016-11-19 12:08:38 +01:00
LevelX2
f9fcd7e4bf Merge pull request #2602 from Dilnu/master
Fix AlternativeCostSourceAbility
2016-11-19 11:26:00 +01:00
MTGfan
9c80ca143b updated Gaea's Liege, removed unused import on Protean Hydra, corrected Rock Hydra line to have {this} instead of Rock Hydra. 2016-11-16 22:39:49 -05:00
Dilnu
0caaaa4205 Fix AlternativeCostSourceAbility at the moment it doesn't apply it's filter early enough and so it has strange effects in certain edge cases. Specifically it allows Hypergenesis to be cast with Aluren and Kentaro. 2016-11-16 21:20:37 -05:00
Dilnu
c37b782b75 Fix the Commander Predicate which was written incorrectly. This fixes Bastion Protector. 2016-11-13 20:05:52 -05:00
LevelX2
67d4ecafbe Fixed CommanderPredicate (fixed e.g. problem with Bastion Protector). 2016-11-12 09:05:22 +01:00
Styxo
d291c289b8 Added Aboroth, Avizo, Benediction of Moons and Infernal Tribute 2016-11-10 09:00:37 +01:00
fireshoes
20d09443d5 Changed Declaration in Stone to exile to the generic exile window instead of its own. Added card name identifier to the revealed hand in ExileCardYouChooseTargetOpponentEffect so you can see previously revealed cards when their hand is revealed multiple times. 2016-11-09 11:00:24 -06:00
LevelX2
6962f02ab8 * Kydele, Chosen of Kruphix - Fixed a bug caused by the watcher object. 2016-11-06 23:37:34 +01:00
LevelX2
618ee3698b * Saskia, the Unyielding - Fixed a NPE bug caused the triggered ability. 2016-11-06 23:01:00 +01:00
LevelX2
bfb2924966 * Cabal Conditioning - Fixed that only the first target player had to discard cards. 2016-11-06 22:06:35 +01:00
LevelX2
c9e1b415e2 Xmage 1.4.18V0 2016-11-06 18:11:19 +01:00
LevelX2
efa1ce2429 * Ephara, God of the Polis - Fixed its watcher not able to handle copies of it correctly. 2016-11-06 15:56:31 +01:00
LevelX2
da67a67eaa * Ephara, God of the Polis - Fixed its watcher not able to handle copies of it correctly. 2016-11-06 14:04:43 +01:00
LevelX2
e4fe34dbdb [C16] Added 2 cards. 2016-11-06 11:40:17 +01:00
LevelX2
159180d79b Fixed a minor game log issue. 2016-11-06 10:51:58 +01:00
LevelX2
05feab8e96 [C16] Added 5 cards. 2016-11-06 10:51:38 +01:00
LevelX2
7d8a02bf63 [C16] Added Orzhov Advokist. 2016-11-06 08:28:49 +01:00
Neil Gentleman
ce6087bda6 add ProtectionAbility helpers
for the most common 1 and 2 color cases
2016-11-05 11:27:37 -07:00
Neil Gentleman
6d59ae2771 Zendikons: fix rules text 2016-11-05 11:27:37 -07:00
Neil Gentleman
531577890d ReturnToHandChosenControlledPermanentCost: fix text for n > 1 2016-11-05 11:27:37 -07:00
Neil Gentleman
e6dc8a56e6 PhaseOutTargetEffect: fix "Null phases out" 2016-11-05 11:27:36 -07:00
Neil Gentleman
813c8cdd8a CreateTokenEffect already adds the article
don't want to end up with "a a 3/3 colorless Golem"

and also fixed fix tapped token rules text, which has changed
2016-11-05 11:27:36 -07:00
Neil Gentleman
296e0a9a49 more card text cleanup 2016-11-05 11:26:31 -07:00
Neil Gentleman
7f2b3b71c2 more card text cleanup
Angel of Salvation, Blinding Flare, Allied Strategies, Footbottom Feast,
Delve, Reinforce, Clockwork *, Choking Sands, Cloud Key, Covetous Dragon
2016-11-05 11:26:31 -07:00
Neil Gentleman
ec971140ec format BoostEnchanted and BoostAll like BoostSource
improves Aspect of Wolf, corrects Death's Approach
2016-11-05 11:26:30 -07:00
Neil Gentleman
95f14536eb fix text on some random cards 2016-11-05 11:26:30 -07:00
Neil Gentleman
b215e9c32c specify proto2 syntax
to prevent compiler warning
2016-11-05 11:26:30 -07:00
spjspj
2d3f9fb4f2 Merge pull request #2561 from spjspj/master
spjspj - Grip of Phyresis (C16)
2016-11-05 22:45:51 +11:00
spjspj
a423e87c98 spjspj - Grip of Phyresis (Made germ token public) (C16) 2016-11-05 22:44:25 +11:00
spjspj
e362dea7e6 spjspj - Grip of Phyresis (C16) 2016-11-05 22:43:21 +11:00
LevelX2
43043eba8e [C16] Added 7 cards. 2016-11-05 11:50:15 +01:00
LevelX2
2c7d6e788d * Workaround test for cards db bug. 2016-11-05 10:17:17 +01:00
LevelX2
917d6500fa * Mistbind Clique - Fixed that the tap ability was wrongly triggered as Mistbind Clique left the battlefield. 2016-11-03 23:16:45 +01:00
LevelX2
a4e1c7aefd Merge origin/master 2016-11-03 22:38:14 +01:00
LevelX2
d2561c1752 * Fixed a problem with triggered mana abilities. Fixed a problem that AI did not always select the needed mana color. Fixed a problem with Reflecting Pool not taking triggered mana abilities into account. 2016-11-03 22:37:54 +01:00
LevelX2
f07408f995 * Flagbearer - Fixed a bug that game could be locked if a spell could only target your own creatures. 2016-11-03 19:04:55 +01:00
spjspj
e931db2261 spjspj - Charging Cinderhorn (C16) 2016-11-03 17:19:07 +11:00
Neil Gentleman
8109532adf ThreadLocalStringBuilder is slower here
by about 30%, as measured by JMH

avoiding garbage is more important when the string is more than 5
characters long
2016-11-01 21:28:43 -07:00
Neil Gentleman
f438b76b31 remove deprecated, unused, unimplemented method 2016-11-01 21:28:43 -07:00
emerald000
c38f96ae55 [C16] Implemented Partner ability. 2016-11-01 22:59:39 -04:00
LevelX2
3f882b73c4 Fixed a problem with activated spells that could not be used but were used by AI and available mana calculation. 2016-11-01 14:31:02 +01:00
LevelX2
56900a9b1f [SWS] Yoda, Jedi Master - Fixed a problem with the +1 ability. 2016-11-01 11:47:40 +01:00
fireshoes
ac3203b63c Set some token version types. [C16] Added token info. Implemented Migratory Route. 2016-10-31 23:09:42 -05:00
LevelX2
777025bea4 Unstable Shapeshifter fixed some bugs and clean up. 2016-11-01 01:19:52 +01:00
Neil Gentleman
3966b4a217 Merge pull request #2537 from nigelzor/simplify-some-cards
Simplify some cards
2016-10-31 01:36:54 -07:00
Neil Gentleman
0ad74e8a9b Merge pull request #2536 from nigelzor/shortcut-filters
use TargetArtifactPermanent, etc.
2016-10-31 01:36:40 -07:00
Neil Gentleman
6f96ec5be5 Merge pull request #2538 from nigelzor/mana-cleanup
Mana ability cleanup
2016-10-31 01:36:18 -07:00
Neil Gentleman
3ae8b257d5 Budoka Pupil, etc: flipping is optional
flag was being ignored in OnEventTriggerAbility constructor, and not set
at all for the other cards.
2016-10-31 01:10:28 -07:00
Neil Gentleman
7532d1228b improve PutLandFromHandOntoBattlefieldEffect
so that Elvish Pioneer and Terrain Generator can use it
2016-10-31 00:19:20 -07:00
Neil Gentleman
592cd55518 remove unused method Card.build() 2016-10-30 23:47:01 -07:00
Neil Gentleman
e40329e6e2 use FilterControlledLandPermanent 2016-10-30 23:47:01 -07:00
Neil Gentleman
9a2d209cd8 add non-basic helpers to FilterLandPermanent 2016-10-30 23:47:01 -07:00
Neil Gentleman
da07a58a85 use FilterArtifactOrEnchantmentPermanent 2016-10-30 23:47:01 -07:00
Neil Gentleman
43b0d4ef97 remove redundant this.targetName = filter.getMessage();
not necessary when same code exists in superclass constructor
2016-10-30 23:47:01 -07:00
LevelX2
de28ea797e Merge pull request #2533 from magefree/issue-2492-emrakul-extra-turn
* Emrakul, the Promised End - Fix that extra turn is not giving when …
2016-10-31 07:36:11 +01:00
Neil Gentleman
0125f88611 add mana-generation helpers to ChoiceColor 2016-10-30 23:02:04 -07:00
Neil Gentleman
564e2cd58b use Mana.ColorlessMana; SimpleManaAbility
removing explicit `new BasicManaEffect()` calls, where SimpleManaAbility will do it implicitly
2016-10-30 23:02:04 -07:00
Quercitron
0dcc2a85b8 * Emrakul, the Promised End - Fix that extra turn is not giving when Emrakul is cast during an opponent's turn (fixes #2492). 2016-10-31 03:01:02 +03:00
Quercitron
75432f5b61 Revert rollback changes, fix rollback when extra turn was taken during an opponent's turn. 2016-10-31 02:51:40 +03:00
LevelX2
59f09dbf0c [C16] Added Vial Smasher the Fierce and a partners ability without function. 2016-10-30 19:53:54 +01:00
LevelX2
db4644cbc1 Reworked PreventAllDamageToControllerEffect to be more generic. 2016-10-30 18:59:16 +01:00
spjspj
21d6e9161d spjspj - Curse of Vengeance + Conqueror's Flail C16 2016-10-31 00:25:28 +11:00
LevelX2
0230f8ed9b [C16] Added the cards with the undaunted keyword. 2016-10-30 14:11:52 +01:00
LevelX2
bec827f96c The Gitrog Monster - Fixed that it could only be sacrificed if it's still on the battlefield. 2016-10-29 23:58:41 +02:00
LevelX2
70126988c5 Changed rule text from "put token onto the battlefield" to "create token". 2016-10-29 23:42:19 +02:00
LevelX2
2ba6bf79f1 Added Flip Coin effect. 2016-10-29 11:09:25 +02:00
JOAC69
8191a9cba0 Basic lands with multiple art not showing up #2430 2016-10-28 21:01:35 -05:00
LevelX2
6598e6cc7f * Some minor changes. 2016-10-28 07:53:18 +02:00
fireshoes
f0206537c1 [C16] Added Primeval Protector, Crystalline Crawler, and Breya, Etherium Sculptor. 2016-10-25 15:55:46 -05:00
Styxo
a0e3571d7b Added Riddlekeeper and refactored similar cards 2016-10-25 12:54:46 +02:00
LevelX2
bd0e288087 * Fixed effect text for numbers > 1 (e.g. Daretti, Ingenious Iconlast). 2016-10-23 22:36:45 +02:00
LevelX2
8b62eece68 XMage 1.4.17V0 2016-10-23 10:03:01 +02:00
LevelX2
c7744d8631 * Fixed a bug with tokens using the optional EntersBattlefieldEffect (e.g. Clone with Mimic Vat). 2016-10-23 00:36:36 +02:00
LevelX2
f48e20a48c Fixed a rule text problem of PhaseOutTargetEffect. 2016-10-23 00:08:41 +02:00
LevelX2
07a7afa285 Added test and fixed some possible null pointer exception. 2016-10-22 13:06:41 +02:00
LevelX2
bf43ea9936 Added test and fixed some possible null pointer exception. 2016-10-22 12:45:50 +02:00
LevelX2
13c8f3263f * Glint-Next Crane - Fixed that it was not optional to reveal an artifact (fixes #2491). 2016-10-22 11:14:47 +02:00
LevelX2
97b872d926 * Fixed that a spell that becomes a permanent didn't had the colors of the spell (e.g. ERsatz Gnomes). 2016-10-22 10:38:10 +02:00
LevelX2
ee96531de5 * Fixed that a spell that becomes a permanent didn't had the colors of the spell (e.g. ERsatz Gnomes). 2016-10-21 00:15:41 +02:00
LevelX2
468eb46471 * Midnight Oil - Fixed that also one remaning counter was removed it from it's own effect. 2016-10-20 19:45:04 +02:00
spjspj
b428117252 Merge pull request #2486 from spjspj/master
spjspj - Update all TargetOpponentsChoicePermanent cards with whether…
2016-10-21 00:29:49 +11:00
spjspj
712f19f4e6 spjspj - Update all TargetOpponentsChoicePermanent cards with whether they have to target an opponent. (There was a NPE when an opponent had hexproof) 2016-10-21 00:28:41 +11:00
LevelX2
77729e892c * Prized Amalgam - Fixed that it also returned if it entered and left the battlefield after the trigger was created (fixes #2485). 2016-10-20 15:04:27 +02:00
spjspj
b6661ae79d spjspj - Add Evangelize (TSP) - Also possibly a fix for Preacher which could target Narset, Enlightened Master when it shouldn't be able to 2016-10-20 16:58:18 +11:00
LevelX2
a47aa158f0 [SWS] Fixed a bug of the watcher used for the hate ability. 2016-10-19 23:31:53 +02:00
LevelX2
54d5599e06 [SWS] Fixed Exogorth's block ability. 2016-10-19 23:24:02 +02:00
fireshoes
89f4ad4582 Merge origin/master 2016-10-17 23:49:00 -05:00
fireshoes
89dd981075 Merge 2016-10-17 23:45:47 -05:00
Neil Gentleman
431fe30ab7 remove unused field ExpansionSet.packageName 2016-10-16 13:11:08 -07:00
LevelX2
a402d9fa1f Added Standard Bearer, Coalition Flag and Coalition Honor Guard. 2016-10-15 09:33:42 +02:00
LevelX2
a74e0c2ed3 Allow to set custom text for provoke ability. 2016-10-15 07:34:22 +02:00
spjspj
cac088abee spjspj - SWS Capture - wrong mana cost - If card in .dck file is borked due to wrong set/number, try loading based on name 2016-10-15 16:04:37 +11:00
LevelX2
fa0fe09192 Some fine tuning to enlarged and popup view. Deck editor card size is saved now. Some minor changes. 2016-10-14 17:00:56 +02:00
LevelX2
1674e00e70 Added Standard Bearer, Coalition Flag and Coalition Honor Guard. 2016-10-14 10:55:15 +02:00
LevelX2
0974e6b42d * Fixed some problems with State.values using mutable objects. 2016-10-13 15:48:56 +02:00
LevelX2
43c799e889 * Fixed a problem with not from hand castable cards that were cast before from an opponent e.g. from exile (fixes #2460). 2016-10-13 13:44:55 +02:00
LevelX2
24470a4abf Some minor changes. 2016-10-13 11:40:17 +02:00
LevelX2
c5bb536b46 * Added method to set release date with natural month. 2016-10-13 02:06:51 +02:00
LevelX2
316b1848c4 Added some tests for rollback (#2072). Could not reproduce any problems yet. 2016-10-12 18:54:15 +02:00
LevelX2
baeaaa3eb7 Fixed some bugs where return to battlefield effects on end of turn could bring back cards, that should return first on next turn (e.g. Flickerwisp targets Flickerwisp). 2016-10-12 17:44:58 +02:00
spjspj
383a750f6e spjspj - Typos + SWS Rarity fix 2016-10-12 09:06:35 +11:00
LevelX2
2d70e86e01 Some minor cleanup. 2016-10-11 17:18:08 +02:00
LevelX2
c2ae4c6527 * Fixed a problem with emerge, that the spell could not be cast with emerge, if the player had less mana available as the full emerge mana costs. 2016-10-11 16:37:36 +02:00
LevelX2
203056df0a * Aquitect's Will - Fixed a bug that the target land lost other abilities (fixes #2448). 2016-10-10 20:52:47 +02:00
LevelX2
35e8afb67c * Fixed a problem with Ooze Token that was wrongly created with P/T 0/0 (related to Inexorable Blob, Mitotic Slime and Corrupted Zendikon). 2016-10-10 17:01:24 +02:00
LevelX2
2e1f8c07cb Xmage 1.4.16v3 2016-10-09 15:54:12 +02:00
LevelX2
67cf1604c9 Fixed a problem with images of transformed cards. Workaround for images of basic lands. Does not work correctly yet, because card art od basic lands is switched between various versions continuously. 2016-10-09 03:07:23 +02:00
LevelX2
4ec7d626fa * Fix to get land images shown again. 2016-10-08 19:03:32 +02:00
LevelX2
5d8ae4d411 * Workaround to fix problem with deck layout. 2016-10-08 19:03:09 +02:00
LevelX2
157827addc XMage 1.4.16v0 2016-10-08 11:14:13 +02:00
LevelX2
4d7e744187 [SWS] Fixed some problems. 2016-10-07 17:56:16 +02:00
spjspj
72b0192bae spjspj - Fix cube from deck from being broken with layouts 2016-10-07 10:38:56 +11:00
JOAC69
e8230946af Remove use of card classes for duplicate cards. Remove set related information from being tied to card classes. 2016-10-04 19:58:48 -05:00
LevelX2
7c4b40073c Fixed some exception problems (deck layout, mana symbols). 2016-10-04 23:57:11 +02:00
LevelX2
a1123b3c0b * Myriad some cleanup (#2420). 2016-10-04 15:29:52 +02:00
Mark Langen
f6d50ce04f Various new Drag & Drop deck editor improvements
* Shift-Click / Shift-Drag now work as expected as far as multi-selection
* Deck editor saves split pane split positions
* Card layout and sort settings are now saved along side the a deck when saving to the .dck format, so that you have back the exact same deck layout when you re-load the deck.
* Fixed the symbol image downloader to work around some of the large-size symbol images being missing on gatherer. Falls back to the medium sized images currently for those symbols.
2016-10-04 00:09:51 -06:00
LevelX2
e8ab8558d1 Fixed some possible null pointer exceptions. 2016-10-03 22:07:10 +02:00
LevelX2
9a00dd20ca Fixed some problems with constructed formats definition and custom sets. 2016-10-03 20:25:08 +02:00
LevelX2
1a8f38759b Fixed a problem with filetring of CantBeTargetedAllEffect. 2016-10-03 19:43:26 +02:00
LevelX2
24fc597fe5 Fixed mode handling for modes that can be selected multiple times. 2016-10-03 19:41:46 +02:00
LevelX2
bdaa78e144 Some minor changes. 2016-10-03 10:00:48 +02:00
fireshoes
905fd65ebd Merge origin/master 2016-10-03 00:51:01 -05:00
fireshoes
886b8fa676 Implemented September requested cards Spellbane Centaur, Denying Wind, Diamond Kaleidoscope, and Ersatz Gnomes. 2016-10-03 00:43:12 -05:00
LevelX2
fcba98f985 Some minor changes. 2016-10-03 01:42:35 +02:00
LevelX2
869039a4cf Added AnotherEnchantedPredicate object. 2016-10-03 01:42:13 +02:00
LevelX2
e19172fb91 [SWS] Fixed some problems. 2016-10-03 00:38:39 +02:00
LevelX2
6554102367 [SWS] Fixed some problems. 2016-10-02 22:50:34 +02:00
LevelX2
f8accc4122 Merge pull request #2411 from Eirkei/AshlingsPrerogativeImplemented
Ashling's Prerogative implemented
2016-10-02 17:39:47 +02:00
LevelX2
1e2f0dba0a Merge pull request #2415 from Styxo/master
[CN2] Added two cards
2016-10-02 17:30:37 +02:00
LevelX2
5d94ed8dd0 Some clean up changes. 2016-10-02 17:27:05 +02:00
Styxo
8e9cbff67c [CN2] Added two cards 2016-10-02 15:42:35 +02:00
spjspj
f562a4c0cf spjspj - Update multiseat option to be multi-attack 2016-10-02 21:00:41 +11:00
Eirkei
8fe3964936 Effect for "... enter the battlefield tapped" 2016-10-01 17:23:46 +02:00
emerald000
98cc5bacdd [CN2] Minor text fix. 2016-10-01 06:36:26 -04:00
emerald000
2da4edafb8 [CN2] Implemented Melee ability. Added 3 cards using it.
Deputized Protester, Menagerie Liberator and Wings of the Guard.
2016-10-01 06:33:46 -04:00
JOAC69
58252f5b5f Refactor - Move Born of the Gods tokens to shared area 2016-09-29 19:58:11 -05:00
JOAC69
171e9f183d Refactor - moved OpponentsPoisonCountersCount to shared area 2016-09-29 19:58:11 -05:00
JOAC69
f2d358b5b4 Refactor - moved WallOfResurgenceToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
a12e830a1b Refactor - moved HumanSoldierToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
9eb078842b Refactor - moved KorAllyToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
a5c6cdd9cf Refactor - moved OozeToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
d3160fb861 Refactor - moved BatToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
ffd333c034 Refactor - moved VampireKnightToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
c00692ffad Refactor - moved HumanWizardToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
0ee3d6c662 Refactor - moved ChromaOutrageShamanCount to shared area 2016-09-29 19:58:11 -05:00
JOAC69
b17b5c9e1a Refactor - moved ZuberasDiedDynamicValue to shared area 2016-09-29 19:58:11 -05:00
JOAC69
8e6389040d Refactor - moved ZuberasDiedWatcher to shared area 2016-09-29 19:58:11 -05:00
JOAC69
08ac7ab342 Refactor - moved MistmeadowWeitchEffect to shared area 2016-09-29 19:58:11 -05:00
JOAC69
37f01e88f3 Refactor - moved FeralDeceiverAbility to shared area 2016-09-29 19:58:11 -05:00
JOAC69
8206e29493 Refactor - SkywardEyeProphetsEffect is shared so moved to new RevealTopLandToBattlefieldElseHandEffect 2016-09-29 19:58:11 -05:00
JOAC69
1005fd65f9 Refactor - move MoreCardsInHandThanOpponentsCondition to shared file 2016-09-29 19:58:11 -05:00
JOAC69
71c8adbe5f Refactor - replaced redundant crews abilities with shared CrewsVehicleSourceTriggeredAbility 2016-09-29 19:58:11 -05:00
JOAC69
ecde8dd0b3 Refactor - remove duplicate SkeletonToken classes 2016-09-29 19:58:11 -05:00
JOAC69
a9e479f7dd Refactor - made card specific effects to attack random opponent shared effects 2016-09-29 19:58:11 -05:00
JOAC69
568044261c Refactor - remove duplicate TargetPlayerCardsInHand classes and made CardsInTargetHandCount shared 2016-09-29 19:58:11 -05:00
JOAC69
3e2c3a6ab2 Refactor - Rename Override card class to OverrideCard to not conflict with java.lang.Override. 2016-09-29 19:58:11 -05:00
JOAC69
d4f8224ee9 Refactor - remove duplicate DamageCantBePreventedEffect classes 2016-09-29 19:58:11 -05:00
JOAC69
541c9727ff Refactor - remove duplicate AdditionalAttackPhaseEffect classes 2016-09-29 19:58:11 -05:00
LevelX2
ca414417e3 [SWS] Fixed some bugs of starwars cards. 2016-09-30 01:22:56 +02:00
LevelX2
daf34c6bf0 Some fixes to Emblems of Starwars set and Elspeth, Sun Champion. 2016-09-29 17:31:20 +02:00
LevelX2
3516dc75e4 Updated POM to use Java 8. Updated some tool versions in the POMs. 2016-09-29 16:21:32 +02:00
LevelX2
1066472491 * Fixed a bug that modal spells did not work correctly (fixes #2397). 2016-09-28 23:31:52 +02:00
LevelX2
b6816e1374 Fixed one missing change of transform rework. 2016-09-28 19:04:55 +02:00
LevelX2
8564ebbbc5 * Reworked some parts of transform handling. 2016-09-28 18:08:10 +02:00
LevelX2
210bbeeda7 [SWS] Fixed March of the Droids. 2016-09-28 18:07:55 +02:00
LevelX2
86648c7190 * Reworked some parts of transform handling. Fixes #2396. 2016-09-28 17:02:37 +02:00
Lymia Aluysia
e57da7598e
Merge branch 'master' of https://github.com/magefree/mage 2016-09-28 09:27:06 -05:00
LevelX2
c703ebaa9d Reworked Hate condition. 2016-09-28 08:30:31 +02:00
LevelX2
9cf9d69c55 Fixed minor problem of Volrath's Laboratory. Added combat flag to LIFE_LOST event. 2016-09-28 08:00:32 +02:00
Lymia Aluysia
bd1f7dd32a
Merge branch 'master' of https://github.com/magefree/mage 2016-09-27 11:25:48 -05:00
LevelX2
05f6224f8b Merge origin/master 2016-09-27 17:32:07 +02:00
LevelX2
4619f45771 [SWS] Fixed No Contest. 2016-09-27 17:31:26 +02:00
Eirkei
840e55b949 effect for "Target opponent puts the cards from his or her hand on top of his or her library. Search that player's library for that many cards. The player puts those cards into his or her hand, then shuffles his or her library" 2016-09-27 15:49:41 +02:00
LevelX2
86f2007945 Merge pull request #2384 from Styxo/master
Star Wars Set implemented
2016-09-27 11:30:08 +02:00
Styxo
9084595135 Star Wars Set implemented 2016-09-26 18:43:04 +02:00
LevelX2
e1dc3d4ea1 [CN2] Adding Daretti, Ingenious Iconoclast. 2016-09-26 18:01:17 +02:00
Lymia Aluysia
37d93fa537
Made the dck importer work with arbitary set codes and card ids. 2016-09-26 10:11:39 -05:00
LevelX2
652672ee45 Merge pull request #2379 from Lymia/master
Add basic support for custom sets.
2016-09-26 14:26:35 +02:00
Eirkei
080b61ec62 Effect for "each opponent sacrifices ... unles he or she pays ..." 2016-09-26 13:16:58 +02:00
Lymia Aluysia
f61c18ea63
Fix code formatting issue. 2016-09-26 05:19:40 -05:00
Lymia Aluysia
48e14a1765
Rename stuff. Names are hard. 2016-09-25 14:45:06 -05:00
Lymia Aluysia
207cb04dbc
Merge branch 'master' of https://github.com/magefree/mage 2016-09-25 14:09:42 -05:00
Styxo
f18e4b66f1 Little refactor of PermanentHasCounterCondition 2016-09-25 19:38:40 +02:00
Lymia Aluysia
e606deded8
Make ClassScanner not load inner classes. 2016-09-25 10:40:40 -05:00
Lymia Aluysia
e5af2b843b
Move the custom set flag to setType. 2016-09-24 17:03:04 -05:00
Lymia Aluysia
74a017586a
Exclude custom sets from constructed formats. 2016-09-24 14:15:47 -05:00
Lymia Aluysia
238c88a8b6
Added mechanic for CardImpl to search other classloaders for cards. 2016-09-24 12:33:47 -05:00
Lymia Aluysia
ad5b23aa06
Made CardScanner classloader aware. 2016-09-24 12:14:20 -05:00
Lymia Aluysia
3c2dd8d335
Made ClassScanner classloader aware. 2016-09-24 11:31:26 -05:00
Lymia Aluysia
14f97ba24a
Added plugin events. 2016-09-24 10:27:36 -05:00
spjspj
16bb17e5bb spjspj - Add option of 'Number of Seats'. This is for Tournaments so that you can draft say a 4 way draft and then have a 4 way game at the end of it. 2016-09-25 00:46:16 +10:00
LevelX2
73a2ccda9b Xmage 1.4.15v5 2016-09-24 04:01:00 +02:00
LevelX2
e81f26d539 Some fixes to prevent null pointer exceptions. 2016-09-24 03:48:48 +02:00
Samuel Sandeen
ad2f5a4d46 Merge pull request #2368 from Dilnu/master
Fix Flashback so it can't cause Stack Overflows
2016-09-23 21:25:43 -04:00
Dilnu
396f3b73b1 Propagate Applied Effects with the Flashback Replacement Effect
This fixes a bug that allows replacement loops when other replacement
effects conflict with Flashback’s attempts to exile Flashbacked spells.
2016-09-23 21:19:51 -04:00
LevelX2
423c2bbf6c Fixed a problem of Flashback and Buyback producing a loop. 2016-09-24 03:13:59 +02:00
Dilnu
b7f9626697 Small fixes to TriggeredAbilityImpl
This fixes a type and removes a duplicate null check.
2016-09-23 21:13:34 -04:00
LevelX2
d5d00451a8 Fixed a problem with static abilities for battlefield zone where the source was entering the battlefield but the ability did not work. 2016-09-24 01:13:13 +02:00
LevelX2
c9bb0be016 Reworked selected modes handling. That fixed the Subtle Strike targeting problem. 2016-09-24 01:12:01 +02:00
LevelX2
0b118d074e * Demonic Pact - Fixed that the already chosen options were not correctly rollbacked. 2016-09-23 19:10:25 +02:00
LevelX2
5d50179c84 Added Test. 2016-09-23 15:12:21 +02:00
LevelX2
3c6402f8a6 * Altar of the Brood - Fixed wrong rule tool tip text. 2016-09-23 00:32:48 +02:00
LevelX2
4ad3ef4e68 * Fixed a problem with card movement that prevented Tiny Leaders go to command zone at game start. 2016-09-22 23:08:40 +02:00
LevelX2
8fb04ddbef Fixed a bug that let cards disappear after moving cards from hand to library (e.g. Teferi's puzzle). 2016-09-22 21:36:21 +02:00
LevelX2
3eae5e9a00 Fixed a bug of the copy effect that could lead to null pointer exceptions e.g. for Permeating Mass trying to copy meanwhile removed target(fixes #2342). 2016-09-22 20:49:12 +02:00
Styxo
11bb392c71 Merge pull request #2359 from Styxo/master
Fixed Crew Ability
2016-09-21 21:10:39 +02:00
Styxo
935a51c4da Fixed Crew Ability 2016-09-21 21:05:37 +02:00
LevelX2
6b431be2ba * Shaman of the Great Hunt - Fixed that it triggerd also for other players. 2016-09-21 20:16:27 +02:00
LevelX2
c82d6b5566 * Fixed some possible null pointer exceptions. 2016-09-20 23:40:25 +02:00
emerald000
ab352100f1 Fixed Panharmonicon triggering for non-permanents. 2016-09-20 09:34:36 -04:00
Styxo
8485df8cb7 Added Blessed Wind and few refactors 2016-09-20 00:17:56 +02:00
emerald000
120d7612f6 Fixed Panharmonicon triggering for opponents abilities. Added tests. 2016-09-19 09:22:21 -04:00
Dilnu
4427121a64 Fix the Snapcaster Mage Repeal Test
The flashback ability was attempting to choose targets. That doesn’t
really make sense since the Targets should be chosen by the actual
spell being cast.
2016-09-18 20:20:29 -04:00
Dilnu
41c1540f45 Fix a couple typos 2016-09-18 20:16:56 -04:00
Dilnu
87a6d3a1ee Fix the combat code to support Slayer's Cleaver
Update the checks for unfulfilled conditions to confirm the blocking
creatures actually are fulfilled.
Update the check for whether a blocker is already being used correctly
to confirm that there isn’t a stricter condition that is unfulfilled.

This change also updates the Slayer’s Cleaver test to make it more
robust.
2016-09-18 16:28:01 -04:00
LevelX2
a1e70e21f4 [KLD] Some more fixes. 2016-09-17 20:18:54 +02:00
LevelX2
bf73eb4042 Merge pull request #2310 from fenhl/ae
Change AE to Ae
2016-09-17 19:04:42 +02:00
Fenhl
ab7e86cb27 Change AE to Ae 2016-09-17 16:59:24 +00:00
LevelX2
346b6654f8 [KLD] Some minor fixes. 2016-09-17 18:17:01 +02:00
LevelX2
1d4d612501 [KLD] Some card names fixed. 2016-09-17 17:01:06 +02:00
LevelX2
04ca15a3a9 Some minor fixes. 2016-09-17 16:45:53 +02:00
LevelX2
e7c5effa7f [KLD] Added 13 red cards. 2016-09-17 15:18:34 +02:00
LevelX2
c515a6d690 [KLD] Added 15 black cards. 2016-09-17 13:44:30 +02:00
LevelX2
5244363081 [KLD] Added 7 blue cards. 2016-09-17 10:17:40 +02:00
LevelX2
f9d1c3d2cc [KLD] Added new Planeswalker types. 2016-09-17 02:15:08 +02:00
LevelX2
b9953a5ca9 Merge origin/master 2016-09-17 02:08:47 +02:00
LevelX2
d3d1402fbb [KLD] Added 9 white cards. 2016-09-17 00:45:33 +02:00
Mark Langen
274bdfa33f Fix Issue #2277
* Changes the white color used to a brighter white so that it shows up on the gray background.
2016-09-16 16:40:59 -06:00
LevelX2
d7dd635bca Revert "introduced StringUtil class with .isEmpty(String input) and .isNotEmp…" 2016-09-16 23:55:54 +02:00
LevelX2
18e771ccd5 Fixed PayEnergyCost.pay to check counters amount available. 2016-09-16 22:29:59 +02:00
ingmargoudt
f1cf9e7adb introduced StringUtil class with .isEmpty(String input) and .isNotEmpty(String input), to replace str != null && str.length()>0 statements 2016-09-16 21:23:31 +02:00
LevelX2
a0e797cc5c [KLD] Added 5 red cards. 2016-09-16 15:08:03 +02:00
LevelX2
779dd35559 Merge pull request #2282 from Dilnu/master
Add token support to ZonesHandler
2016-09-16 11:10:07 +02:00
Samuel Sandeen
17d4d6c190 Handle tokens correctly in the new zone change code. 2016-09-15 19:44:32 -04:00
LevelX2
0a5a073637 * Flashback - Fixed handling of combined flashback costs (e.g. Deep Analysis). 2016-09-15 17:34:25 +02:00
LevelX2
0042dc1ad9 Some minor fixes to game log / card rules text /messages. 2016-09-15 16:10:17 +02:00
Mark Langen
577bdaea84 Fixes and additions to card rendering
* Vehicles are rendered with a vehicle background and changed P/T box color
* Kaladesh Inventions are rendered with the invention frame
* Kaladesh Inventions use the full-frame art if they detect that you have that full art downloaded instead of normal card images.
* Changed land text-box colors to be a bit more saturated to make it clearer what colors they produce
* Added mana symbol in the textbox of basic lands instead of rules text as long as they have no additional abilities.
* Fixed problem with triggered abilities on the stack showing up with a type of "??? Ability". Not sure what the real cause is but those abilities have abilityType = null, just worked around it.
2016-09-14 19:37:12 -06:00
Samuel Sandeen
91b4e024fb Remove a bit of duplicate code. 2016-09-14 19:33:17 -04:00
Samuel Sandeen
edd97587fc Add code for a few edge cases in zone change handling
Specifically this should fix the bugs that happen when tokens copy
PermanentCards.
2016-09-14 19:30:14 -04:00
LevelX2
9f199dfa39 * ZonesHandler - fixed possible null pointer exception (#2271). Cause still unclear. 2016-09-14 23:25:36 +02:00
LevelX2
14cd2dfa6d * Jeleva, Nephalia's Scourge and Knowledge Pool - Fixed a bug that created null pointer exception if card was cast from exile. 2016-09-14 22:31:04 +02:00
LevelX2
547d53a2ec [KLD] Added 5 white cards. 2016-09-14 21:51:52 +02:00
LevelX2
14b2760e99 * Fixed a bug that prevented moving tokens to other zones in some cases. 2016-09-14 20:51:03 +02:00
LevelX2
445a8a242e * Reverted the library quick fix for random because RandomUtil works now. 2016-09-14 19:02:27 +02:00
LevelX2
eae53c0cfc Merge pull request #2268 from ingmargoudt/master
replace [list].size() == 0 and [string].length() == 0 to use .isEmpty…
2016-09-14 17:15:10 +02:00
LevelX2
ce94e573e4 * Ral Zarek - Fixed target handling of ability one. 2016-09-14 17:11:18 +02:00
ingmargoudt
3128bd2b4b replace [list].size() == 0 and [string].length() == 0 to use .isEmpty() instead 2016-09-14 15:27:31 +02:00
LevelX2
3612332607 [KLD] Added Speedway Fanatic. Added tests for crew keyword. 2016-09-14 15:16:40 +02:00
LevelX2
975e530d55 * Added artifact subtype "Vehicle". 2016-09-14 13:13:57 +02:00
LevelX2
9de78b5c5f * Added artifact subtype "Vehicle". 2016-09-14 12:38:26 +02:00
ingmargoudt
e62241c3eb fix for the RandomUtil, always use .current() to get the correct thread. 2016-09-14 09:11:26 +02:00
emerald000
959eaf6dab [KLD] Added Panharmonicon. 2016-09-13 08:21:16 -04:00
LevelX2
5e7a4d265e Merge pull request #2254 from royk/add-deck-support
Add support for .dek files
2016-09-13 11:56:46 +02:00
emerald000
2da90bab93 [KLD] Added 12 cards.
Aether Hub; Cloudblazer; Cultivator's Caravan; Depala, Pilot Exemplar; Dynavolt Tower; Kambal, Consul of Allocation; Key to the City; Rashmi, Eternities Crafter; Saheeli Rai; Smuggler's Copter; Unlicensed Disintegration and Voltaic Brawler.
2016-09-12 08:58:16 -04:00
Roy Klein
fbaf24228b Fix typo 2016-09-12 09:19:32 +02:00
Roy Klein
1e39c99914 Add support for .dek files 2016-09-11 23:34:17 +02:00
spjspj
793fc13226 Merge pull request #2251 from spjspj/master
spjspj - Implement Paradoxical Outcome (KLD)
2016-09-12 00:15:19 +10:00
Samuel Sandeen
3ac80b45f3 Merge branch 'magefree/master' 2016-09-10 17:47:40 -04:00
Samuel Sandeen
cdff9bae78 Add Event to the signature of updateZoneChangeCounter.
This is required to Implement Skullbriar, the Walking Grave
2016-09-10 17:45:26 -04:00
LevelX2
d0a570aeee Quick fix to get random shuffling. 2016-09-10 19:39:59 +02:00
LevelX2
bb8326d46b XMage 1.4.15v0 2016-09-10 12:31:18 +02:00
LevelX2
79f8617cd3 Some minor changes. 2016-09-10 11:44:52 +02:00
Samuel Sandeen
ac6a289275 Merge branch 'magefree/master' 2016-09-08 19:12:19 -04:00
LevelX2
21baa14404 * Fixed a problem with token P/T reset (fixes the problem with Tree of Perdition and Soul Separator). 2016-09-08 17:15:40 +02:00
spjspj
5bba477147 spjspj - undo changes to SweepEffect 2016-09-09 00:45:47 +10:00
spjspj
1c49100d75 spjspj - Implement Paradoxical Outcome (KLD) - shroud wasn't being followed 2016-09-08 17:31:42 +10:00
spjspj
8cd3ec1135 spjspj - Implement Paradoxical Outcome (KLD) (done with addition to SweepEffect) 2016-09-08 17:09:47 +10:00
emerald000
67f29124f8 [KLD] Added 15 artifacts.
Aetherflux Reservoir, Aetherworks Marvel, Animation Module, Cogworker's Puzzleknot, Decoction Module, Demolition Stomper, Fabrication Module, Fireforger's Puzzleknot, Fleetwheel Cruiser, Ghirapur Orrery, Glassblower's Puzzleknot, Inventor's Goggles, Metalspinner's Puzzleknot, Ovalchase Dragster and Skysovereign, Consul Flagship.
2016-09-08 02:10:26 -04:00
Mark Langen
8d90f4558d Merge pull request #2234 from stravant/master
Characteristic-Based rendering initial release completed unless further bugs come up before then.
2016-09-07 23:16:10 -06:00
Samuel Sandeen
80da09471d Merge remote-tracking branch 'magefree/master' 2016-09-07 23:31:38 -04:00
Samuel Sandeen
c33a731a4a Refactor the core zone change code to use a common code path. 2016-09-07 23:31:26 -04:00
Samuel Sandeen
b87f91fd97 Fix a Typo 2016-09-07 21:19:36 -04:00
spjspj
8342d03ac9 spjspj - Set Token Descriptor 2016-09-07 21:52:52 +10:00
Mark Langen
f0a1938b3e Full art Land rendering
* Added "frameStyle" tagging to relevant full art lands (ZEN, BFZ, UNG, UHG)

* Added support for rendering based off of frameStyle

* Outstanding bug that frameStyle doesn't seem to be replicated exactly properly
2016-09-07 02:20:51 -06:00
emerald000
df2782fdb6 [KLD] Basic implementation of energy counters. Added Woodweaver's Puzzleknot.
Better display of energy counters would be preferred.
2016-09-07 01:07:21 -04:00
Mark Langen
b549dfe0dc Added frameStyle Characteristic for cards
* Added FrameStyle Enum containing a list of styles that cards can be rendered in.

* Added getFrameStyle() getter to Card interface.

* Implemented getFrameStyle() for various concrete implementations of Card.
2016-09-06 21:50:04 -06:00
emerald000
5c5d6365d8 [KLD] Implemented Crew. Added 2 cards using it. 2016-09-06 03:18:47 -04:00
emerald000
90a55eddb7 [KLD] Implemented Fabricate. Added 3 cards using it. 2016-09-06 02:26:55 -04:00
emerald000
bc0f53973d Added an easier way to put custom text on buttons in a chooseUse prompt. 2016-09-06 02:07:59 -04:00
fireshoes
d70f424d1b [KLD] Added 9/5 spoilers to mtg-cards-data.txt and implemented a few cards. 2016-09-06 00:27:44 -05:00
Samuel Sandeen
34846170c4 Remove an unused argument to Player.putInGraveyard 2016-09-05 11:47:52 -04:00
Samuel Sandeen
db3c2e9d8c Clean up an inconsistency in ZoneChangeEvent handling
Some places set a bit on the ZoneChangeEvent if a permanent was meant
to enter the battlefield tapped but only MeldCard ever read that bit to
determine whether things should come into play tapped.
2016-09-05 09:51:32 -04:00
ingmargoudt
e2a479255a refactor : removed all instances of new Random() and replaced with RandomUtil for a ThreadLocal randomizer 2016-09-05 15:03:47 +02:00
Samuel Sandeen
434be545f7 Merge remote-tracking branch 'magefree/master'
# Conflicts:
#
Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondi
tion.java
#	Mage/src/main/java/mage/game/permanent/PermanentToken.java
2016-09-03 20:06:33 -04:00
Samuel Sandeen
ef5ed5256a Clean up the deprecated moveCards methods in Player 2016-09-03 20:04:12 -04:00
Samuel Sandeen
bec11804f5 Make the handling of counters more consistent.
This dramatically reduces the code duplication around counters handling.
2016-09-03 16:52:41 -04:00
Styxo
adf95f1db5 Merge origin/master 2016-09-03 22:40:18 +02:00
Styxo
66f785dd71 Fixed AddCountersTargetEffect 2016-09-03 22:34:45 +02:00
Samuel Sandeen
148f633672 Make the Counters API for card and permanent consistent. 2016-09-03 10:33:54 -04:00
LevelX2
c1d632be18 Merge origin/master 2016-09-03 15:26:46 +02:00
LevelX2
ab2399cbe7 * Fixed that equipments with restrictions (e.g. Gate Smasher) were not unequipped if the equipped permanent did no longer fulfill the restrictions(fixes #2212). 2016-09-03 15:26:17 +02:00
Styxo
f5c2a51be1 Merge pull request #2219 from Styxo/master
Refactored some things
2016-09-03 12:58:47 +02:00
Styxo
23ac076a44 Added CountersCount 2016-09-03 12:47:46 +02:00
Styxo
2aec9f2ca7 Refactored counters on permanents counting
Added BecomeMonstrousTriggeredAbility 
Added Target and Filter class for creature an opponent controls
2016-09-03 12:38:58 +02:00
LevelX2
cb91c5b9aa Merge pull request #2216 from stravant/master
Full characteristic-based card rendering for cards
2016-09-03 09:13:49 +02:00
Samuel Sandeen
85dc15c5dc Merge remote-tracking branch 'magefree/master' 2016-09-02 19:44:51 -04:00
Mark Langen
463576dbd0 Merged up to current 2016-09-01 15:44:14 -06:00
Mark Langen
818efb8535 * Textual set symbols no longer displayed if set symbol image doesn't exist.
* Fixed a small graphical mispositioning in rendering of keyword abilities.
* Added an option to hide set symbols entirely when rendering.
* Fixed flip walkers like Arlin Kord showing a "0" loyalty on their back face (when they should have no loyalty there).
* Removed some log files I accidentally committed.
* Fixed a bug in tokens, where they are missing their expansion symbol of they are created by another token
* Fixed the the new Rendering based CardPanel not returning the correct Image through getImage (resulting in a poor quality image in the card preview window)
2016-09-01 15:00:46 -06:00
spjspj
0f043d480d spjspj - Implement new method for image generation of tokens. 2016-09-01 17:11:12 +10:00
Mark Langen
d33f8a636e Most obvious bugs ironed out. Ready for PR. 2016-08-31 23:37:31 -06:00