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

5809 commits

Author SHA1 Message Date
Achilles
c2bcb59c82 - Added Barrin's Spite. Fixed a targeting issue. 2017-03-25 22:41:03 -05:00
Clint Herron
402beb3b49 Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire 2017-03-25 22:07:23 -04:00
Achilles
26dbee6f2d - Added BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect(). Converted all the Genju cards to use it. This class is subject to rule 611.2c. 2017-03-25 17:30:14 -05:00
Achilles
0639b3b75b - Reverted BecomesCreatureAttachedEffect(). It broke cards that are not subject to Rule 611.2c like Ensoul Artifact. A new class called BecomesCreatureAttachedWithActivatedAbilityOrSpellEffect() will be made to fix the Genju of the Spires bug. Yes, that is a long name. If someone has a better suggestion, please let it be known. 2017-03-25 17:02:47 -05:00
Achilles
ff489446fe - Fixed BecomesCreatureAttachedEffect(). Rule 611.2c. Fixes https://github.com/magefree/mage/issues/3011 2017-03-25 13:11:08 -05:00
Clint Herron
40d318ce09 Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire 2017-03-25 10:46:20 -04:00
Derek M
1a9c5fa469 Merge pull request #3014 from drmDev/bug/sphereCosts 
fixes #3012 manaCosts not null check and way to retrieve it
 2017-03-24 08:06:30 -04:00
Clint Herron
bce7e690a8 Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire 2017-03-23 19:26:34 -04:00
Clint Herron
3c81275ab1 Implementing Guilty Conscience and Backfire, as well as expanding capabilities of trigers that occur when an enchanted creature deals damage to a player, and adding an effect to deal damage to an enchanted creature. 2017-03-23 19:23:28 -04:00
drmDev
57efb10003 fixing tokens exiled at end of combat - not at end step 2017-03-23 11:21:38 -04:00
drmDev
097d60f5fc fixes #3012 manaCosts not null check and way to retrieve it 2017-03-23 10:25:21 -04:00
ingmargoudt
5ae4ddce07 Merge branch 'master' into phantoms 2017-03-23 13:43:34 +01:00
vraskulin
d3214c65e4 Merge remote-tracking branch 'fork/master' 2017-03-22 14:51:31 +03:00
vraskulin
d93061c0bc Equals should be compared with == but not equals() 2017-03-22 14:50:50 +03:00
ingmargoudt
b154bf58f9 phantom effect code duplication 2017-03-22 10:25:57 +01:00
LevelX2
7693f3fd59 Added Ogre Leadfoot. 2017-03-21 11:37:22 +01:00
vraskulin
f37c823aa8 String + string concatenation can be replaced by string + char concetenation 2017-03-20 14:00:18 +03:00
drmDev
311e41abd2 refactored exiletokensAtEndStep 2017-03-19 17:54:07 -04:00
drmDev
c109fc8a0e Implemented card Lightning Coils and test for it 2017-03-19 12:23:58 -04:00
LevelX2
441b6bc2e9 Fixed AI handling of cost reduction of reductions defined with "up to" causing game locks. 2017-03-19 11:20:37 +01:00
Jeff
6cb77bfb8f - Fix for bug #2977. Perhaps Levelx knows of a better solution. It works fine in my testing. 
Bound // Determined + Child of Alara = No Death Trigger
 2017-03-17 14:54:14 -05:00
LevelX2
68d398c6fb Merge pull request #2968 from ingmargoudt/singleton-as-enum 
rewrote singleton to enum where applicable
 2017-03-16 17:02:31 +01:00
Clint Herron
3eb9be1b18 Adding check to Flagbearer requirement that only checks for spells that are cast and abilities that are activated -- choosing targets from triggered abilities is exempt. 2017-03-16 03:30:07 -04:00
ingmargoudt
234cfe9519 rewrote singleton to enum where applicable 2017-03-14 16:32:47 +01:00
LevelX2
962f05bbcb * Offering - Fixed that offering could not be activated as instant, cancel during offering mana payment now restores also the sacrificed permanent. 2017-03-12 11:29:53 +01:00
LevelX2
1b2636d0cd * Arachnuns Web - Fixed condition handling. Some renaming. 2017-03-12 10:36:51 +01:00
ingmargoudt
1f215cdbe3 removed autoboxing : 
Boolean -> boolean
Integer -> int
Float -> float
 2017-03-11 15:17:14 +01:00
ingmargoudt
4b5378c423 pool.count() == 0 ---> pool.isEmpty() 2017-03-11 13:52:46 +01:00
LevelX2
c042d50ec7 Fixed a bug that fizzling spell copies let also wrongly fizzle the original spell on the stack the copy was made from. 2017-03-11 12:00:05 +01:00
Nathaniel Brandes
900d68f77d Fix CMC for flashbacked cards. 
This should fix Conflagate/Chalice of the Void interaction.
 2017-03-09 23:32:42 -08:00
Nathaniel Brandes
d7d700f66a Some clarification around loyalty. Added unit test. 2017-03-09 02:30:52 -08:00
Justin Herlehy
1a2724c9b2 Revert: Fix planeswalker loyalty counters. 
This change was incorrect.

Gatherer Ruling:
10/1/2005: Planeswalkers will enter the battlefield with double the normal amount of loyalty counters. However, if you activate an ability whose cost has you put loyalty counters on a planeswalker, the number you put on isn’t doubled. This is because those counters are put on as a cost, not as an effect.
 2017-03-09 01:14:10 -08:00
Nathaniel Brandes
52fa369024 Fix planeswalker loyalty counters. 
They should be added like normal counters, firing events that can be
intercepted by cards like doubling season.
 2017-03-08 23:57:11 -08:00
Nathaniel Brandes
4a9eddb724 Properly fix targeting. 
The notTarget should only invalidate the canBeTargetedBy return.
The Filter should still be relevant.
 2017-03-08 20:59:01 -08:00
Nathaniel Brandes
495e20ae1a Fix target defender cases that don't target. 2017-03-08 20:44:02 -08:00
Nathaniel Brandes
ce1f4a3bf8 Phyrexian mana now correctly a payment choice. 
Per rule 601.2b, it is not determined at the pay costs step,
but at the "choice" step, long before costs are determined.

This fixes trinisphere interactions and should be consistent with the
rules.
 2017-03-08 20:03:28 -08:00
Nathaniel Brandes
3bebdd65bc Fixed crewing staying if the object changed zones. 2017-03-08 01:01:10 -08:00
Achilles
31ba751c66 - Fix for Spellskite dealing with a targeted source spell/ability that has multiple targets. 2017-03-07 22:14:18 -06:00
ingmargoudt
7e26a7a141 commandzone is public 2017-03-07 23:19:05 +01:00
ingmargoudt
c5002983e3 changed static zone function to enum method 2017-03-07 22:02:15 +01:00
ingmargoudt
1bc8e2248b changed enum equals to ==, removed contains check for set 2017-03-07 21:47:11 +01:00
ingmargoudt
1caf3a6be4 change getLibrary().size() > 0 to hasCards() 2017-03-07 17:28:26 +01:00
Nathaniel Brandes
d6e4ef793e Fix delve. 
Delve should not target the cards it exiles.
 2017-03-07 00:03:37 -08:00
ingmargoudt
90c6a69335 fixed a count in Battlefield, changed loops to streams 2017-03-06 12:25:14 +01:00
ingmargoudt
3d029d6ad5 put comparing logic in counttype, remove all switches 2017-03-06 11:46:22 +01:00
ingmargoudt
6d4c388c5e small change in gender enum 2017-03-06 10:18:16 +01:00
ingmargoudt
5387f06898 cards now use the new CountType 2017-03-05 23:29:51 +01:00
ingmargoudt
80580d69e9 Replace checktype enum for Cardtype enum 2017-03-05 20:04:09 +01:00
ingmargoudt
b5e8c88153 remove all contains(cardtype.XX) references, instead use the default interface method 2017-03-05 09:14:33 +01:00
Nathaniel Brandes
58d0a8eb2a Remove empty function incorrectly checked in. 2017-03-04 23:08:54 -08:00
Nathaniel Brandes
1d3ebb749d Fix omniscience effect for colorless mana. 
Also unified the tests for omniscience into a single file, and
put the effect into a single class so that Tamiyo and Omniscience
can share implementations.
 2017-03-04 23:04:11 -08:00
Justin Herlehy
8cfe66e29c Fix Ichorid to set notTarget flag. 
Fixes issued #2906
 2017-03-04 16:20:17 -08:00
ingmargoudt
5a57731968 added new helper methods to test for CardType, to get rid of the contains(CardType.XXX) everywhere, put the logic of that in one place and use the interface call 2017-03-04 00:16:36 +01:00
ingmargoudt
372584f7ad changed cardtype from list to enumset 2017-03-03 17:04:32 +01:00
ingmargoudt
d01aed42ed change enum equals to == 2017-03-01 15:05:44 +01:00
vraskulin
0bc9cf91a8 Minor improvements - StringBuilder now have initial value 2017-02-28 15:26:07 +03:00
vraskulin
11dc1e10f1 Few lambda's and removed explicit type from creating lists and hashmaps 2017-02-28 13:46:57 +03:00
vraskulin
0a3c95dde5 Inner classes should be static. It reduces memory usage and gives perfomance boost + DeckImporter rollback 2017-02-28 12:40:12 +03:00
vraskulin
ad7d3c8078 equals "" should be replaced with isEmpty 2017-02-28 11:45:15 +03:00
vraskulin
3600d03e2c StringBuilder in a class field may cause memory leaks, it's not GCed, so it's a better way to store all errors just in string field 2017-02-28 11:37:31 +03:00
ingmargoudt
afbf5ce2b6 Merge pull request #2891 from kubikrubikvkube/master 
Nulls to optional. Also there was bug with AetherChaser
 2017-02-27 17:51:35 +01:00
Jeff
79983fbe26 - Extra check to verify a player is in game. 2017-02-27 08:41:07 -06:00
vraskulin
498c8cf60c Made utility classes final to explicitly forbid it's inheritance 2017-02-27 17:03:38 +03:00
vraskulin
f309717616 Merge remote-tracking branch 'fork/master' 2017-02-27 16:33:47 +03:00
vraskulin
af3986df46 All final strings became static - it will give a little perfomance boost, due to not instantiating same string every time 2017-02-27 16:33:32 +03:00
doncarton
5eaaa67d1e Nulls to optional. Also there was bug with AetherChaser "you may pay" was not set to optional 2017-02-26 15:15:54 +03:00
LevelX2
d4415e2eff Merge pull request #2887 from aastrand/ignorelist 
Add client-side user ignore list
 2017-02-26 09:49:43 +01:00
LevelX2
f06ee144f7 * Fixed AddCardTypeSourceEffect with limited duration and object reference was applied on wrong objects (fixes failing crew test). 2017-02-25 12:05:43 +01:00
Anders Åstrand
f68460603a Add client-side user ignore list 
This commit adds a client-side per-server ignore list.
* Whispers and talk from an ignored user is hidden
* Ignored users cannot join your tables
* Ignored users tables are hidden
 2017-02-22 22:16:09 +01:00
ingmargoudt
48a1fe8602 Merge pull request #2880 from ingmargoudt/master 
put the writing of equipped and enchanted in the attachmenttype
 2017-02-19 23:59:25 +01:00
ingmargoudt
d0fa00f3af put the writing of equipped and enchanted in the attachmenttype 2017-02-19 23:58:32 +01:00
Achilles
0372eb12e2 - Little fix for a watcher used for Ephara, God of the Polis. 2017-02-19 16:42:32 -06:00
ingmargoudt
972ed6a3f2 changed enum comparison to ==. 
isDependentTo returns empty set rather than null
 2017-02-19 23:38:47 +01:00
JOAC69
845e406d63 Fix failing tests that were doing Object.Equels where == was needed 2017-02-19 02:31:04 -06:00
LevelX2
899046cf16 * Gratuitous Violence - FIxed that if the damage of a creature with lifelink was doubeled only the non doubled amount was added to life. 2017-02-18 01:26:02 +01:00
LevelX2
e6be0577bb Fixed a bug of FirstSpellCastThisTurnWatcher (fixes #2871). 2017-02-17 23:23:33 +01:00
ingmargoudt
cf23d0905b mentioned the wrong hashmap (confusing names!!!) 2017-02-16 15:14:44 +01:00
ingmargoudt
14c459b924 solving review issues 2017-02-16 14:03:25 +01:00
ingmargoudt
4aa51210f9 refactor of watchers to use map functions 2017-02-15 23:19:40 +01:00
spjspj
fbbfc6c611 Merge pull request #2869 from spjspj/master 
Limit deck to 1000 cards
 2017-02-16 08:07:17 +11:00
spjspj
b65c1180e4 Limit deck to 1000 cards 2017-02-16 08:06:23 +11:00
ingmargoudt
a1bc43d33e Merge pull request #2868 from kubikrubikvkube/master 
Functional interfaces annotation and bugfixes
 2017-02-15 20:27:21 +01:00
vraskulin
a15220d51e Bugfixes with != instead of equals and default toString calls 2017-02-15 19:52:20 +03:00
vraskulin
752392fc46 Functional interfaces should be annotated as functional interfaces 2017-02-15 19:23:12 +03:00
Plopman
cafd002634 Fix {Q} and Thousand year elixir. Fix #2349 2017-02-14 23:04:57 +01:00
ingmargoudt
26e16be772 fix counters 2017-02-13 21:45:37 +01:00
ingmargoudt
3a152ab3d6 rewrote enum comparisons, iterator to removeIf, added some stream and filters 2017-02-11 22:37:00 +01:00
Jeff
fc3ecdf8d0 - Added Auratouched Mage and test suite. 2017-02-10 10:15:56 -06:00
Jeff
1e82f0750a Fixed FlashbackTest and made modifications to CascadeAbility allowing it to pass its test suite. 2017-02-09 10:20:21 -06:00
spjspj
0ff7ff686d Merge pull request #2848 from spjspj/master 
Allow lands with AnyColorManaAbility to be have automatic payments done
 2017-02-09 18:26:14 +11:00
spjspj
a08816123c Allow lands with AnyColorManaAbility to be have automatic payments done 2017-02-09 18:20:51 +11:00
LevelX2
166c6a3590 * Sunforger - Fixed activated unattach ability. 2017-02-06 22:55:52 +01:00
LevelX2
b6a66f1aba Fixed syntax error of cascadeAbility. 2017-02-06 22:02:44 +01:00
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
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