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

5698 commits

Author SHA1 Message Date
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
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
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
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
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
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
Mark Langen
d5415d2d04 Working Card Rendering 2016-08-31 04:43:28 -06:00
Styxo
cde96864d5 Merge pull request #2209 from Styxo/master 
Refactored multiple CreatureCondition classes into one class
 2016-08-29 20:41:56 +02:00
Styxo
6518b56d9d Refactored multiple CreatureCondition classes into one CreatureCountCondition class 2016-08-29 13:04:40 +02:00
Samuel Sandeen
282443c231 Add Subtype to the CardAttribute Framework 
This is a massive change. I’ve refrained from unrelated refactoring
when possible but there are still a lot of changes here.
 2016-08-28 17:30:10 -04:00
Styxo
42669b9c01 Merge pull request #2200 from Styxo/master 
Refactored cards that use similar abilities
 2016-08-28 16:56:08 +02:00
Styxo
b29c70a3c7 Refactored cards that use similar abilities 2016-08-28 16:39:33 +02:00
Eric McVicker
ebeb20681e No spells cast last turn transform fix to not transform turn 1 #2188 2016-08-23 20:25:28 -05:00
drmDev
292105f60e [CN2] Stunt Double and Subterranean Tremors implemented. 2016-08-21 15:00:41 -04:00
LevelX2
4bfac31370 * Archangel Avacyn - Fixed check for source object of triggered ability. 2016-08-13 09:38:28 +02:00
LevelX2
46566361e7 * Fixed a bug that if a copy token creature of a transformed creature was created (e.g. Mirror Mockery), the front side instead of the transformed side was copied. 2016-08-12 15:42:50 +02:00
LevelX2
aa58c76ba9 * Meld - Fixed a bug that produced an exception if while the meld ability was on the stack, one of the permanents to meld left the battlefield meanwhile. 2016-08-12 12:12:10 +02:00
LevelX2
6f89a67f68 * Some more changes to return boolean for addCounters. 2016-08-11 19:14:18 +02:00
LevelX2
318a0745f0 Merge origin/master 2016-08-11 17:41:57 +02:00
LevelX2
058d25fa56 * Added return code to addCounter method. 2016-08-11 17:40:51 +02:00
spjspj
f46c06066a spjspj - Implement Guardian Beast (ARN) 2016-08-11 23:03:22 +10:00
LevelX2
c31bf97440 * Fixed some problems if a creature has multiple madness abilities. 2016-08-09 13:14:29 +02:00
LevelX2
c563d6f701 * Fixed zone handling of meld cards that left the battlefield (fixes that coninuous effects of meld cards didn't stop to be applied after the meld card left the battlefield) fixes #2140. 2016-08-09 10:20:59 +02:00
LevelX2
7a4b358f8a * Fixed CMC for spells (Escalate is not calculated correctly when more than 1 mode is chosen) fixes #2143. 2016-08-06 13:16:49 +02:00
LevelX2
286dc55396 * Fixed Sightless Brawler cannot attack with other creatures attacking (fixes #2133). 2016-08-06 12:30:52 +02:00
LevelX2
9df373e8f3 * Fixed Leech Bonder -1/-1 Tokens don't kill off enemy creatures (fixes #1975). 2016-08-06 11:33:24 +02:00
LevelX2
d0db2d51ed * Fixed Identity Thief copying creature with +1/+1 counter gets P/T boost from it, but not counter (fixes #2131). 2016-08-05 21:15:07 +02:00
LevelX2
9b683ef481 * Fixed that cost modification with target check (Icefall Regent) did not work for flashbacked spells (fixes #1405). 2016-08-05 17:33:52 +02:00
Quercitron
9129bda9b7 * Hearthcage Giant - Fix that only one Elemental Shaman token is created (fixes #2141). 2016-08-05 00:59:42 +03:00
LevelX2
270ffcb88a * Liliana, Defiant Necromancer - Fixed target bug of -X ability. 2016-08-02 16:52:25 +02:00
LevelX2
f5b2770c3e * Silent Skimmer - Fixed that the lose life effect did not work if a planeswalker was attacked (fixes #2139). 2016-08-02 13:17:09 +02:00
Quercitron
c04bd6d64a Replace Yes/No text with Mulligan/Keep text on mulligan answer buttons to make options more clear. 2016-07-31 15:57:45 +03:00
LevelX2
e9c994d8e5 * Fixed traget definition of Blood Feud and Dissension in the Ranks. 2016-07-31 10:24:28 +02:00
drmDev
0d8b892272 Festival, False Peace, Empty City Ruse, Moment of Silence impl. Extracted SkipNextCombatPhase class. 2016-07-27 09:42:45 -04:00
fwannmacher
ec0e8181d5 - Fixed Issue #1660 2016-07-26 19:34:06 -03:00
fwannmacher
3caf66e4b6 - Fixed Issue #2108 2016-07-26 19:34:06 -03:00
Derek M
86e7ace06e Merge pull request #2112 from fwannmacher/master 
Converted cardNumber from int to String. Now card number with "a" or "b" can be used.
 2016-07-25 16:24:01 -04:00
fwannmacher
9f08ce8b56 - Fixed Issue #2071 2016-07-25 15:59:49 -03:00
spjspj
883b63a01d spjspj - Update to push deck List across from Client to Server for Custom Cube 2016-07-25 22:44:21 +10:00
drmDev
9d9265e02b Delve bug comments, Delve should not target. See issue #1646 2016-07-25 06:08:31 -04:00
drmDev
642de722f6 Mind Shatter bug fix for #2110. Before a discard effect can happen, checks the amount of cards to be discarded > 0 2016-07-24 15:00:07 -04:00
fwannmacher
10778cdd6b - Converted CardImpl.cardNumber from int to String 
- Fixed Issue #1953
- Fixed Issue #1914
- Fixed Issue #739
 2016-07-24 15:18:54 -03:00
LevelX2
171a8b336d * Urza's Incubator - Fixed the not working cost reduction. 2016-07-24 14:18:45 +02:00
LevelX2
e277337c98 Xmage 1.4.13v3 2016-07-24 10:54:17 +02:00
fireshoes
9630320ba9 Changed set codes in image sources and Mage Sets to match recent changes. Changed Portal Second Age set code back to PO2. Updated tokens with recent sets to product correct images. Fixed that there was no basic land slot in EMN packs. 2016-07-18 15:49:43 -05:00
bonefish
f4db49ea2d - Used newer moveCards method in AuraSwapAbility. Take number 2 due to an unstable mind. :) 2016-07-17 20:17:51 -05:00
jeff
f93f0cefb5 - Used newer moveCards method in AuraSwapAbility 2016-07-17 19:58:59 -05:00
drmDev
f807fed12c Foul Tongue Shriek bug fix - filters attacking creatures you control 2016-07-17 06:41:26 -04:00
Neil Gentleman
6fadbd3058 not all BecomesBlockedByCreatureTriggeredAbility share the same filter 2016-07-16 14:00:37 -07:00
Neil Gentleman
a3836f6ec7 Act of Aggression can only target opponent's creatures 2016-07-16 13:59:49 -07:00
bonefish
47ed193dff - Fixed text issue with GainControlAllEffect 2016-07-15 21:05:19 -05:00
jeff
bc1f4e409c - Fixed Aura Swap bug #2025. 2016-07-15 15:30:47 -05:00
spjspj
09cc97dd85 spjspj - Fix copy's owner for Mirrorwing Dragon (EMN) 2016-07-16 03:11:06 +10:00
LevelX2
e5117a967d * Mirrorwing Dragon - Fixed wrong target handling. 2016-07-15 18:14:38 +02:00
LevelX2
88d66784df * Crop Sigil - Fixed that it can't be activated without both a creature and land in the graveyard (fixes #2079 ). 2016-07-15 14:25:25 +02:00
LevelX2
4bdc4936f0 * Fixed Mid's Dilation bugs (fixes #2077). 2016-07-14 17:14:06 +02:00
LevelX2
fc1a1523c5 * Gideon, Champion of Justice - Fixed that the P/T did not change if loyality counters were added after using the 0 ability. 2016-07-13 17:04:52 +02:00
LevelX2
20fa414838 * Gideon, Champion of Justice - Fixed a bug that Gideon dies if its ability to make it a creature was used. 2016-07-13 12:25:54 +02:00
fireshoes
96e88d7350 [EMN] Fixed tooltip text on some green, gold, artifact, and land cards. Added Emrakul's Evangel's missing TapSourceCost. 2016-07-12 23:10:37 -05:00
drmDev
0185b45e2d SacrificeAllTriggeredAbility zone detection fix. Battlefield, not all 2016-07-12 18:03:37 -04:00
fireshoes
80f4ab770b [EMN] Fixed tooltip text on some blue cards. 2016-07-11 23:40:24 -05:00
emerald000
c322b9adad [EMN] Fixed melding not working after the meld pieces return to the battlefield. 
Such as returning from under an Oblivion Ring.
 2016-07-11 22:28:24 -04:00
drmDev
7261452413 SacrificeAllTriggeredAbility bug fix. fixes #1736 2016-07-11 22:04:34 -04:00
Quercitron
c334d98564 [EMN] Fix filter by name in the MeldCondition. 2016-07-12 02:18:36 +03:00
LevelX2
2a55110627 [EMN] Some minor fixes. 2016-07-11 19:25:25 +02:00
fireshoes
e9f66ae65a Merge commit 2016-07-11 11:37:58 -05:00
fireshoes
1dfed9b1c8 [EMN] Added MeldEffect to Gisela and Hanweir Battlements. Changed Brisela and Hanweir, the Writhing Township to MeldCard. Added missing TapSourceCost to Hanweir Battlements. Added missing ability.addEffect to Chittering Host. 2016-07-11 11:32:28 -05:00
LevelX2
1b2f1efb00 Merge pull request #2061 from Dilnu/master 
Implement 6 Cards and tests for two of them.
 2016-07-11 18:23:00 +02:00
LevelX2
54ad8a6ec0 MeldCard prevented possible NPE during test project build. 2016-07-11 17:10:14 +02:00
emerald000
e1b3428a39 [EMN] Implemented basic Meld functionality. 2016-07-11 04:49:40 -04:00
Samuel Sandeen
6cf04e9bd2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
#	Mage.Sets/src/mage/sets/timeshifted/Darkness.java
 2016-07-10 19:01:20 -04:00
samuelsandeen
f9b0befac3 Implement several cards and tests for some of the more complex cards. 
This also makes a small change to AbilityImpl's handling of variable 
costs which may not be needed.
 2016-07-10 18:39:42 -04:00
Quercitron
712316d8ff [EMN] Added Thirsting Axe. 2016-07-10 18:41:36 +03:00
LevelX2
b2bd87b9f4 [EMN] Some fixes to red cards. 2016-07-10 10:09:22 +02:00
LevelX2
771f2c4fb9 [EMN] Added the missing red cards (some untested). 2016-07-09 21:24:58 +02:00
LevelX2
7c0b11c641 [EMN] Added the missing white cards (without meld). 2016-07-09 18:16:56 +02:00
LevelX2
4c363bee23 [EMN] Added the missing green cards. 2016-07-09 15:39:59 +02:00
LevelX2
4818830e5c [EMN] Added the missing blue cards. 2016-07-08 23:10:12 +02:00
LevelX2
753e7dfb2c [EMN] Added some blue cards. 2016-07-08 21:37:24 +02:00
LevelX2
4522eda79c Fixed a bug of PutTokenOntoBattlefieldCopyTargetEffect causing Myriad tests to fail. 2016-07-08 12:14:38 +02:00
fireshoes
b32b2aa4da [EMN] Added several cards. 2016-07-04 22:51:51 -05:00
drmDev
dfece2d268 small fix on default values 2016-07-04 10:11:34 -04:00
drmDev
0c747a1d41 adjusted default values for power and toughness 2016-07-04 10:08:30 -04:00
drmDev
8a4a1933b1 Soul Separator fixes 2016-07-04 06:26:26 -04:00
drmDev
eb8519cd78 Merge remote-tracking branch 'upstream/master' 2016-07-04 04:16:33 -04:00
drmDev
a4dc6a12b8 Soul Separator (EMN) 2016-07-03 21:27:33 -04:00
LevelX2
7f4fc245cd * Fixed some cards that choose a subtype as entering the battlefield that did not work for copied permanents (e.g. Brass Herald for Mormir format). 2016-07-03 21:43:12 +02:00
LevelX2
fd60e43a03 * Fixed a problem with UNDO/rollback setting the wrong active player (fixes #2046). 2016-07-03 18:14:18 +02:00
spjspj
26d38f0773 spjspj - Add the option of having a .dck file as a cube 2016-07-04 00:20:31 +10:00
drmDev
e1bd9a5331 EmrakulsEvangel fix 2016-07-03 06:22:32 -04:00
LevelX2
b85af92942 * Fixed bug concerning Escalate's mana cost. 2016-07-03 10:30:18 +02:00
drmDev
41326affb5 Emrakuls Evangel (EMN) 2016-07-03 04:09:46 -04:00
emerald000
2e3f963363 [EMN] Implemented Escalate. Added Blessed Alliance. 2016-07-02 03:08:39 -04:00
emerald000
c8790f34ad [EMN] Fixed Emerge not caring about timing restrictions. 2016-07-02 02:12:39 -04:00
LevelX2
2874996994 Merge pull request #2032 from draxdyn/hold_priority 
Hold priority on Ctrl+click
 2016-07-01 16:00:20 +02:00
emerald000
3ca28d2eb6 [EMN] Implemented Emerge. Added Elder Deep-Fiend. 2016-07-01 01:15:56 -04:00
draxdyn
a7409f3d08 Hold priority on Ctrl+click 
In most cases, it is not useful to hold priority after doing something,
since the spell or ability added to the stack can just be performed
beforehand.

Hence, automatically passing priority is the only comfortable setting.

However, in some cases it is useful (chiefly for Infernal Tutor +
Lion's Eye Diamond and similar interaction), and currently players
have to open Preferences, change the option and then change it back
whenever they need to hold priority, which is very annoying.

This change allows to temporarily hold priority by simply holding
Control while performing an action, which solves the issue in a
manner similar to other clients.

A "Hold" indicator next to the spells cast indicator is displayed so
that the user knows his Control key holding was registered.

The code works by adding a new HOLD_PRIORITY player action that causes
the automatic priority pass options to be ignored until the player is
given priority again.

The client sends the message whenever it's not already holding priority
and Ctrl+click/space/enter happens anywhere.

This is somewhat "loose" as it means that Ctrl+click on the background
also holds priority, but this might actually be desirable and it greatly
simplifies the code, since only a global AWT event listener is required,
and there is no need to change every place in the code that could add
something to the stack.

It is also possible to hold priority and stop holding priority using
the context menu.
 2016-06-29 19:57:45 +02:00
fireshoes
d844c6056a [EMN] Added 6/29 spoilers to mtg-cards-data.txt. Implemented several cards (will be testing with the clearImage fix in). 2016-06-29 10:01:00 -05:00
drmDev
9deb1bd0da Ignition Team implementation (requested card) 2016-06-29 03:21:40 -04:00
LevelX2
f7cecdf050 Merge pull request #2033 from draxdyn/f6 
Add support for F6
 2016-06-28 09:16:09 +02:00
fireshoes
fd29307ad4 [EMN] Added additional 6/27 spoilers to mtg-cards-data.txt Fixed Identity Thief's translated name. Implemented several new EMN cards. Fixed rules text on several tap and don't untap cards. 2016-06-27 19:33:05 -05:00
spjspj
2eb68403cf spjspj - Add Rich Man Cube draft. This is a variation on the Rich Man set draft. It still (like cube) shouldn't let there be more than one copy of a card in the draft but will give each player a new pack from the cards that haven't been picked already each time. Allows 2 player cube drafts to be playable. 2016-06-26 12:54:59 +10:00
draxdyn
62d5d45a45 Add support for F6 
Skips everything until next turn, except for declare attackers and blockers.

F11 and F9 are a better design, but F6 is provided for compatibility with
established conventions.

There is currently no GUI button for it.
 2016-06-24 21:34:30 +02:00
LevelX2
185f56a7da * Fireblast - Fixed that a wrong text was shown for the land sacrifice. Also that the spell was wrongly marked as castable also if only one mountain was on the battlefield. 2016-06-20 16:23:03 +02:00
LevelX2
c15719b36b Fixed the transform message shown in the game log. 2016-06-20 16:21:52 +02:00
LevelX2
e74f5995cb Fixed some more possible null pointer exceptions. 2016-06-18 14:46:35 +02:00
LevelX2
7e9d285a49 Fixed some possible null pointer exceptions. 2016-06-18 12:56:25 +02:00
LevelX2
34668ba5d9 Fresh Meat, Caller of the Claw - Fixed problem with watchers using the same internal name. 2016-06-18 11:34:39 +02:00
LevelX2
6a973f1f7b Some minor changes. 2016-06-17 18:50:57 +02:00
LevelX2
e334d85078 * Willbender - Fixed that target of abilities could not be changed. 2016-06-17 15:11:05 +02:00
shootbot
1bae2b0b1e Fixed Leeching Sliver bug 
Following bugs fixed:
No life loss from a trigger when Leeching Sliver attacks a planeswalker
No life loss from a trigger when Leeching Sliver doesn't attack a player
and another sliver does
 2016-06-16 19:51:20 +06:00
spjspj
51a1c8d345 spjspj - Fixes for KormusBell not creating 1/1s from swamps. Copies of ContinuousEffect weren't having dependendToType set (was defaulting to null). Add addDependencyType to UrborgTombOfYawgmoth and setDependedToType to KormusBell. 2016-06-14 22:30:06 +10:00
spjspj
b751e69eec spjspj - Fix possible npe for Clockspinning and change return code from apply. Also fix possible npe for adding counters 2016-06-09 01:23:19 +10:00
LevelX2
187866c979 Awaken - Fixed a problem with the rule text of cards with Awaken. 2016-06-05 12:35:00 +02:00
LevelX2
85bc7549fa * Added Custodi Squire (2 votes), Nightshade Assassin (2 votes), Seize the Day (2 votes) from the Card Requests - JUNE list. 2016-06-04 12:21:47 +02:00
Alex Marcotte
95e4e3ea29 Text import will automatically start sideboard after a single blank line. Added a JUnit test for TxtDeckImporter. 2016-05-30 23:03:43 -04:00
LevelX2
fc4133e098 Merge pull request #1952 from aastrand/master 
Make it possible to play lands using hideaway
 2016-05-29 10:18:45 +02:00
LevelX2
9953107171 Some changes to Lost Auramancers. 2016-05-29 09:22:03 +02:00
Kranken
5f7d710b5e Make sure lands via hideaway respects 305.2 2016-05-28 14:07:40 +02:00
LevelX2
24fe679c34 * Commander mulligan - changed to Vancouver mulligan rule. 2016-05-26 15:33:41 +02:00
Kranken
f06e6a7bbb Make it possible to play lands using hideaway 
Previously lands were not playable due to the
ignoreTimings flag being set to false.
Added checks for the hideaway rulings regarding lands.
 2016-05-25 20:43:17 +02:00
LevelX2
b2d136a940 Merge pull request #1940 from wetterlicht/master 
Implemented various Darksteel cards
 2016-05-23 13:19:05 +02:00
LevelX2
f44987aa37 * Fixed that Suspend was handled as activated ability for increase/decrease of mana activation costs. 2016-05-22 16:02:10 +02:00
Quercitron
f815148424 * Runeflare Trap - Fix alternative cost condition (fixes #1943). 2016-05-20 03:26:42 +03:00
LevelX2
d4d486458f Merge pull request #1942 from magefree/rating-system 
Rating system
 2016-05-18 16:29:25 +02:00
Nathaniel Brandes
95b2d76ab1 Fix countering of spell copies. 2016-05-18 02:33:16 -07:00
Quercitron
c781728b97 Add rating to the client (#1498) 2016-05-17 17:27:43 +03:00
Quercitron
972d59aa37 Add user rating using Glicko rating system (#1498) 2016-05-17 17:22:14 +03:00
Nathaniel Brandes
11158d5fa4 Fix casting spell with no cost. 
Ancestral visions should now correctly not be castable with Jace,
Telepath Unbound and be castable for free with Sins of the Past and its
ilk.
 2016-05-17 00:59:53 -07:00