6802 commits

Author	SHA1	Message	Date
theelk801	ba85640c84	Merge pull request #3987 from theelk801/master ... Added XLN cards	2017-09-14 18:17:01 -04:00
Evan Kranzler	7663827a30	Implemented Vance's Blasting Cannons/Spitfire Bastion	2017-09-14 18:14:32 -04:00
LevelX2	d0dfd46c5f	Fixed problem that prevented project generation.	2017-09-14 23:45:48 +02:00
Evan Kranzler	73a8d64d5c	fixed Thraben Sentry	2017-09-14 13:38:25 -04:00
LevelX2	d9c601dd26	Trove of Temptation - Basic some changes to Combat and Human	2017-09-14 17:50:00 +02:00
Evan Kranzler	68a42726a8	Implemented Shadowed Caravel, generalized explore triggers	2017-09-14 11:19:29 -04:00
Evan Kranzler	1ae29e900a	Implemented Guided Passage	2017-09-14 10:02:32 -04:00
theelk801	6802b60d21	Merge pull request #3971 from theelk801/mairsil2 ... Fixed issues with Mairsil (I think) re:#3963	2017-09-14 08:00:56 -04:00
Evan Kranzler	98c2332b3c	a few small changes	2017-09-14 07:04:44 -04:00
Evan Kranzler	6ca03a339a	Skulk is now singleton	2017-09-13 20:38:29 -04:00
Evan Kranzler	b83e12f51c	Menace is now a singleton like other keywords	2017-09-13 15:38:02 -04:00
theelk801	c7cfca6677	Merge pull request #3977 from theelk801/master ... Implemented cards, updated spoiler	2017-09-13 11:08:21 -04:00
LevelX2	c70b548464	Some minor changes.	2017-09-13 17:05:37 +02:00
LevelX2	55917ccc63	* Anthroplasm - Fixed possible null pointer exception.	2017-09-13 17:05:09 +02:00
Evan Kranzler	cd58164b89	Implemented Celestial Gatekeeper	2017-09-13 10:30:35 -04:00
LevelX2	c3157bbcde	* Path of Ancestry - Fixed possible null pointer exception.	2017-09-13 14:52:47 +02:00
Evan Kranzler	69c7668bd0	Implemented Dowsing Dagger/Lost Vale	2017-09-12 16:27:10 -04:00
Evan Kranzler	a26c5a509f	updated various activated abilities	2017-09-12 12:31:00 -04:00
Evan Kranzler	9b25dd0e39	revamped how conditional and limited-use activated abilities are implemented	2017-09-12 09:33:12 -04:00
Evan Kranzler	3a6e2b080b	updated spoiler	2017-09-11 16:40:49 -04:00
Evan Kranzler	650f184ee6	Begin Mairsil fix	2017-09-11 16:26:30 -04:00
theelk801	31acee7624	Merge branch 'master' into subTypeSwitch	2017-09-09 11:16:47 -04:00
Evan Kranzler	f43950c4b8	Fixed various rule texts	2017-09-09 10:16:26 -04:00
Evan Kranzler	3cc178196e	Refactored more subtypes usages to enum	2017-09-08 11:05:58 -04:00
Evan Kranzler	252c941b4f	Refactored more subtypes usages to enum	2017-09-08 09:57:51 -04:00
igoudt	d79c57b907	Merge https://github.com/magefree/mage	2017-09-08 13:12:03 +02:00
igoudt	2355d35e04	small fixes	2017-09-08 13:11:58 +02:00
LevelX2	66c4aec499	* Conspiracy - Fixed that it doesn't revert creature types of non-permanent cards when it leaves the battlefield (fixes #3911).	2017-09-08 12:14:18 +02:00
Evan Kranzler	245bf2f2df	Refactored subtypes to enum	2017-09-07 21:18:19 -04:00
Evan Kranzler	0656f97d7c	Merge branch 'master' of https://github.com/magefree/mage into magefree-master ... # Conflicts: # Utils/mtg-cards-data.txt	2017-09-07 11:36:07 -04:00
Justin Herlehy	b6dceb28c8	Code Cleanup ... Deprecated SubTypeList methods that expect strings and List<String>. Readability cleanup for SubType Enum.	2017-09-06 20:38:11 -07:00
Evan Kranzler	e954de0012	Implemented Fathom Fleet Captain	2017-09-06 18:04:41 -04:00
Evan Kranzler	0f72c4fb22	Additional token effect text changes	2017-09-06 17:39:58 -04:00
Evan Kranzler	6fc78d1d78	Implemented Pirate's Cutlass, changed text templating for creating token effects	2017-09-06 16:21:06 -04:00
Evan Kranzler	fce99fa182	Implemented Conqueror's Galleon/Foothold	2017-09-05 19:39:04 -04:00
theelk801	1f92fbcf3e	Merge pull request #56 from magefree/master ... merge	2017-09-05 13:31:28 -04:00
Evan Kranzler	97e34dab49	Added Explore event	2017-09-05 13:27:45 -04:00
LevelX2	466e524d6e	Fixed possible exception during draft player repplacement.	2017-09-05 16:39:43 +02:00
LevelX2	0ce13bf676	* Grenzo, Havoc Raiser - Fixed that blocked the game.	2017-09-05 16:20:58 +02:00
Evan Kranzler	9e44a1f152	Implemented Huatli, Warrior Poet	2017-09-04 21:02:33 -04:00
Evan Kranzler	d0a4e5a420	Implemented Mavren Fein and Call to the Feast	2017-09-04 17:29:45 -04:00
TacomenX	518bae18df	[XLN] Deeproot Waters + Merfolk Hexproof Token	2017-09-04 01:29:20 -05:00
LevelX2	20a3f6a2c6	xmage 1.4.26V3	2017-09-03 08:21:48 +02:00
LevelX2	66c69e51a3	Started to implement a solution for effects that change words in rule text.	2017-09-03 07:31:36 +02:00
Evan Kranzler	54761f400d	fixed bug #3923	2017-09-02 13:06:13 -04:00
Evan Kranzler	a8abdba0ad	Implemented Huatli, Dinosaur Mage	2017-09-02 10:19:20 -04:00
igoudt	e2ad4a6654	Merge https://github.com/magefree/mage	2017-09-02 13:03:46 +02:00
theelk801	bda6658d79	Merge pull request #50 from magefree/master ... merge	2017-09-01 21:25:20 -04:00
Evan Kranzler	1f382a7ce7	Implemented Jace, Cunning Castaway (ultimate won't work correctly until planeswalker rule is removed) ... various other small changes as well	2017-09-01 21:20:05 -04:00
LevelX2	720351c065	Some minor user handling changes.	2017-09-02 00:46:24 +02:00
LevelX2	5bf12d227c	Some minor changes.	2017-09-01 23:50:07 +02:00
igoudt	43bb541876	Merge https://github.com/magefree/mage	2017-09-01 22:49:50 +02:00
igoudt	f0623d37c9	some cleanups	2017-09-01 22:48:42 +02:00
Evan Kranzler	d28de9e357	Implemented Shifty Doppelganger	2017-09-01 16:38:40 -04:00
LevelX2	84fe04b92d	Replaced exception handling of invalid deck submitting by a user message.	2017-09-01 20:05:26 +02:00
Evan Kranzler	029420a9a8	fixed enrage text	2017-09-01 09:57:11 -04:00
LevelX2	77f6f7b2b6	* Tawnos's Coffin - Fixed that it did not work correctly if abilities were copied by Mairsil, The Pretenderand and general rework.	2017-09-01 12:36:40 +02:00
spjspj	669ae56d6f	Allow Dinosaur to be selected in creature type dialog	2017-08-31 23:27:11 +10:00
Evan Kranzler	13c7c2f231	Implemented Treasure Map/Treasure Cove	2017-08-30 21:56:45 -04:00
Evan Kranzler	3fd7a34944	Implemented Captain Lannery Storm	2017-08-30 20:03:29 -04:00
theelk801	1f607e7429	Merge pull request #47 from magefree/master ... merge	2017-08-30 18:08:28 -04:00
Evan Kranzler	e4cf16f338	Implemented Revel in Riches, added Treasure tokens	2017-08-30 18:06:06 -04:00
theelk801	2ea174724c	Merge pull request #3901 from theelk801/master ... Implemented 4 XLN cards	2017-08-30 11:49:24 -04:00
Evan Kranzler	b2e7b02fd7	Implemented Tishana's Wayfinder	2017-08-30 11:46:16 -04:00
LevelX2	4d832326a3	* Added log message.	2017-08-30 17:31:06 +02:00
LevelX2	40689fe1b9	Fixed possible null pointer exception.	2017-08-30 17:07:57 +02:00
theelk801	6df548dc5d	Merge pull request #3900 from theelk801/master ... Implemented Infernal Denizen, Ripjaw Raptor and Sun-Crowned Hunters	2017-08-29 18:44:16 -04:00
LevelX2	cba7a510ea	* Fixed a bug if casting split cards from other players e.g with Mindclaw Shaman (fixes #3867).	2017-08-30 00:30:46 +02:00
Evan Kranzler	be2f27bfb3	added Enrage as an ability word	2017-08-29 18:22:10 -04:00
LevelX2	e909f5c801	C17 Added Portal Mage.	2017-08-28 16:50:00 +02:00
LevelX2	5660348f98	C17 Added Alms Collector.	2017-08-28 12:44:08 +02:00
LevelX2	ea4af25c77	* Goaded creatures able to attack the goading player (in multiplayer) (fixes #3891). ... * Grenzo, Havoc Raiser - Fixed trigger handling and null pointer exception.	2017-08-27 22:28:13 +02:00
Evan Kranzler	b888e8e634	Implemented Temporal Distortion	2017-08-27 11:08:47 -04:00
theelk801	ad893aee31	Merge pull request #44 from magefree/master ... merge	2017-08-27 11:08:13 -04:00
Evan Kranzler	4bf436b0f4	Fixed Duplicant getting boost from Commander in command zone (#3299)	2017-08-27 09:16:47 -04:00
LevelX2	cb15d4728d	* Dragon Tempest - Fixed a problem if damage was redirected (e.g. with Spellskite) - (fixes #3887).	2017-08-27 14:27:03 +02:00
Evan Kranzler	962ec40d4c	Fixed Nazahn not properly searching for his Hammer.	2017-08-27 08:07:57 -04:00
LevelX2	7e8dcef120	C17 added Seth's Tiger.	2017-08-27 10:57:14 +02:00
LevelX2	f35eee935c	* XMage 1.4.26V2	2017-08-27 08:04:18 +02:00
LevelX2	52897094b3	* Some chnages to chat, user and player handling.	2017-08-26 18:26:55 +02:00
LevelX2	e7a3fee8d7	* Teferi's Protection - Fixed that the damage prevention and protection from did not work correctly (fixes #3879).	2017-08-26 13:24:41 +02:00
LevelX2	cf7d718226	* Some minor changes.	2017-08-26 09:52:51 +02:00
theelk801	ed9320362d	Merge pull request #42 from magefree/master ... merge	2017-08-25 10:14:03 -04:00
LevelX2	04afe73f28	* Fixed that curses selected with Bitterheart Witch or Curse of Misfortunes could be retargeted (fixes #3858).	2017-08-24 16:08:58 +02:00
Evan Kranzler	255b81f143	fixed bug #3834	2017-08-23 21:26:39 -04:00
Evan Kranzler	c6029176d3	Implemented Varchild's War Raiders	2017-08-23 10:52:58 -04:00
Evan Kranzler	d0744486ad	small change	2017-08-23 09:40:11 -04:00
Evan Kranzler	c61651da69	Fixed bug #3777	2017-08-22 21:44:14 -04:00
Evan Kranzler	12cedf945d	Fixed bug #3835, stolen creatures that exploit themselves now trigger for the appropriate player	2017-08-22 21:34:14 -04:00
Evan Kranzler	e3faef4a52	Fixed several cards with ETB abilities that didn't use last known information properly	2017-08-22 13:35:44 -04:00
LevelX2	4c2d8cd8f8	* Improved payment handling of conditional monohybrid colored mana.	2017-08-22 17:51:48 +02:00
LevelX2	5b7fb59b52	* Sepulchral Primordial - Fixed that its ETB ability doesn't trigger if at least one opponent in range had no creature in the graveyard (fixes #3257).	2017-08-22 16:10:40 +02:00
theelk801	4d5e8d4a91	Merge branch 'master' into master	2017-08-22 09:31:16 -04:00
Evan Kranzler	8d85189262	Implemented Mairsil properly	2017-08-22 09:27:07 -04:00
LevelX2	1a4d6ea547	* Vindictive Lich - Fixed cross mode target handling.	2017-08-22 00:37:44 +02:00
LevelX2	2880b32444	* Vindictive Lich - Fixed cross mode target handling.	2017-08-22 00:27:18 +02:00
LevelX2	9ac7fe27f0	* Vindictive Lich (mode target handling not fixed yet).	2017-08-21 18:49:37 +02:00
Evan Kranzler	f33d9006c6	Implemented Mairsil but this is possibly game-breaking	2017-08-21 11:29:34 -04:00
Evan Kranzler	e0c48bfa4e	Implemented Mairsil almost	2017-08-21 10:07:40 -04:00
Evan Kranzler	ebc9b728dd	Implemented Grenzo, Havoc Raiser	2017-08-20 13:50:15 -04:00
Evan Kranzler	f4cdb77513	fixed bug #3857, recoded the C17 curses	2017-08-20 09:54:43 -04:00
LevelX2	09511cc151	* Assembled Alphas - Fixed that the triggered ability did not work.	2017-08-19 08:41:05 +02:00
LevelX2	a439f30c21	Fixed a bug that falsely ended players tournaments.	2017-08-19 07:46:47 +02:00
LevelX2	f4f23f615a	Merge origin/master	2017-08-18 00:26:07 +02:00
Evan Kranzler	53a666a580	Implemented Mathas, Fiend Seeker	2017-08-17 18:18:44 -04:00
LevelX2	c2d70fa1cc	Xmage 1.4.25V1	2017-08-18 00:12:57 +02:00
theelk801	b2270a7f10	Merge pull request #33 from magefree/master ... merge	2017-08-17 15:55:26 -04:00
LevelX2	db93e3f672	* C17 Enchantment Curses - Fixed a bug that could create game errors (index out of bounds).	2017-08-17 21:36:55 +02:00
Evan Kranzler	87635cf1b9	Implemented Disrupt Decorum, implemented goading	2017-08-17 14:56:47 -04:00
LevelX2	0affb45264	* Curse of Opulence - Fixed a bug that could create game error (index out of bounds).	2017-08-17 20:35:36 +02:00
theelk801	df02c32b0d	Merge branch 'master' into c17KindredCycle	2017-08-17 11:13:44 -04:00
LevelX2	2b8737b026	* Fixed text of planeswalker to keep to only include type not name.	2017-08-17 01:11:03 +02:00
Saga\Robert	f69374be8c	- added a Triggered Ability for ETBs or Attacks	2017-08-17 00:18:58 +02:00
Evan Kranzler	341094dc00	Implemented Edgar Markov	2017-08-15 18:08:33 -04:00
Evan Kranzler	57d6a1d995	Implemented The Ur-Dragon, added Eminence as an ability word	2017-08-15 16:03:34 -04:00
LevelX2	118665dfd4	Minor change.	2017-08-15 01:56:48 +02:00
LevelX2	4b8e9c1525	Merge pull request #3810 from Eleros/C17 ... Implemented C17 Curse cycle	2017-08-14 23:10:52 +02:00
LevelX2	6244046330	* Some minor changes.	2017-08-14 16:48:48 +02:00
Saga\Robert	478a0b8ea8	- updated available set info of Zombie and Gold tokens ... - added Curse of Vitality - added Curse of Verbosity - added Curse of Disturbance - added Curse of Opulence - added Curse of Bounty - added Curse cycle to C17	2017-08-13 17:52:48 +02:00
LevelX2	1694daa4ab	Merge pull request #3801 from theelk801/master ... Implemented Charmed Griffin, Chieftain en-Dal, Chill Haunting, Chime of Night, Cleansing, and Coiling Woodwurm	2017-08-13 16:28:10 +02:00
Saga\Robert	9a2ea73ec0	- added Rat token with Deathtouch	2017-08-12 19:19:35 +02:00
spjspj	10e4d20e47	Merge branch 'master' into master	2017-08-12 17:58:24 +10:00
spjspj	f41effe979	Implement Nazahn, Revered Bladesmith (C17)	2017-08-12 17:56:55 +10:00
Justin Herlehy	4e15194d08	Merge pull request #3784 from Eleros/feature/HASCON2017Promos ... Implemented Grimlock, Dinobot Leader // Grimlock, Ferocious King & Balan, Wandering Knight	2017-08-11 15:26:23 -07:00
theelk801	ff47290039	Merge pull request #20 from magefree/master ... merge	2017-08-11 18:20:53 -04:00
Evan Kranzler	fcd6edfe6f	Implemented Charmed Griffin, added filter, fixed Hunted Wumpus wording	2017-08-10 08:18:27 -04:00
LevelX2	a3e7aa6230	* Karn Liberated - fixed that after using its -14 ability the game does not properly set the starting player of the new game (fixes #3786).	2017-08-10 07:04:32 +02:00
theelk801	3a52ce609d	Implemented Carrion, Cephalid Pathmage, Cephalid Inkshrouder and Ceremonial Guard (#3793) ... * Implement Epicenter * Implement Infested Roothold * Implement Brown Ouphe * Implement Rust * Implement Ouphe Vandals * Implement Fatal Attraction * Implement Fighting Chance * Implement Arcbound Fiend * Implement Carry Away * Implement Caverns of Despair * Implement Amulet of Unmaking * Implement Aphetto Exterminator * Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor * Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman * Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter * Implement Brown Ouphe * Implemented Break Open * Implemented Carrion * Implemented Cephalid Pathmage * Implemented Cephalid Inkshrouder * Implemented Ceremonial Guard	2017-08-09 23:13:36 -05:00
Eleros	b770e8ba51	Merge branch 'master' into feature/HASCON2017Promos	2017-08-09 22:11:19 +02:00
Evan Kranzler	7838049c14	Implemented Carrion	2017-08-09 12:41:32 -04:00
theelk801	385e462f15	Implemented Epicenter, Infested Roothold, Brown Ouphe, Rust, Ouphe Vandals, Fatal Attraction, Fighting Chance, Arcbound Fiend, Carry Away, Caverns of Despair, Amulet of Unmaking, Aphetto Exterminator, Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound, Boa Constrictor, Bola Warrior, Brass Talon Chimera, Briar Patch, Brine Shaman, Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin (#3779) ... * Implement Epicenter * Implement Infested Roothold * Implement Brown Ouphe * Implement Rust * Implement Ouphe Vandals * Implement Fatal Attraction * Implement Fighting Chance * Implement Arcbound Fiend * Implement Carry Away * Implement Caverns of Despair * Implement Amulet of Unmaking * Implement Aphetto Exterminator * Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor * Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman * Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter	2017-08-08 21:49:14 -05:00
theelk801	8b36b16b09	Merge pull request #17 from magefree/master ... merge	2017-08-08 17:44:15 -04:00
Evan Kranzler	e47798d6c9	Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter	2017-08-08 14:28:32 -04:00
igoudt	2ca7927580	AddCardSubtypeAllEffect uses SubType enum	2017-08-08 17:11:21 +02:00
Saga\Robert	05f5b99a99	- changed Autobot and Dinosaur to fantasy types	2017-08-07 22:35:08 +02:00
igoudt	19a8f3c4c1	fix fired event for eternalize	2017-08-07 22:30:34 +02:00
igoudt	4dc3419efa	fix some subtypes for becomesBasiclandTargetEffect	2017-08-07 22:26:17 +02:00
igoudt	8d52e995e8	change BEcomesBasicLandTargetEffect to use SubType	2017-08-07 21:58:59 +02:00
Evan Kranzler	515fb58bc0	Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor	2017-08-07 14:22:09 -04:00
Saga\Robert	21b892a9b4	-added EquippedMultipleSourceCondition (to check if permanent has 2 or more Equipments attached)	2017-08-07 17:03:21 +02:00
theelk801	c989fde625	Merge pull request #16 from magefree/master ... merge	2017-08-06 21:37:50 -04:00
Saga\Robert	2a9d8edee8	- added Autobot and Dinosaur Subtypes ... - added TransformedPredicate(checks isTransformed())	2017-08-07 01:28:17 +02:00
igoudt	ead0141b5b	fix spreading seas	2017-08-06 22:58:20 +02:00
igoudt	5d99bacf73	fix subtype in game state	2017-08-06 22:11:26 +02:00
igoudt	6336f82845	remove redundant cardgraphicinfo instances	2017-08-06 17:23:03 +02:00
igoudt	f793504ba0	remove hasSubType(String s)	2017-08-06 17:22:11 +02:00
Evan Kranzler	6a49135479	Implement Carry Away	2017-08-06 09:35:02 -04:00
LevelX2	9a1ce3f449	Merge pull request #3769 from Eleros/feature/HASCON2017Promos ... Feature/hascon2017 promos	2017-08-04 22:39:20 +02:00
Evan Kranzler	d9649fd54c	Implement Common Cause	2017-08-04 15:39:10 -04:00
Evan Kranzler	65004d1a5f	Fix Mindless Null and Can't Block effect	2017-08-02 14:21:08 -04:00
ingmargoudt	2192a517ce	Merge pull request #3774 from ingmargoudt/master ... fixing choosing creature types	2017-08-02 08:06:07 +02:00
igoudt	449e82a796	fixing choosing creature types	2017-08-02 08:04:26 +02:00
Saga\Robert	2e1a820040	- added gold color ... - added gold Dragon Token - edited new set data (H17) for Sword of Dungeons and Dragons	2017-08-01 14:55:17 +02:00
LevelX2	1e3f9bffc6	* Fixed that morphed permanents (face down) had wrongly the cumulative mana costs of their face-up side instead of 0(fixes #3726).	2017-08-01 12:20:05 +02:00
LevelX2	ad12c75c20	* Cinder cloud - Fixed the check for "dies this way".	2017-07-31 20:55:29 +02:00
LevelX2	7a1245e2fe	Fixed a problem of DiesTriggeredAbility that produced null pointer exception.	2017-07-31 20:42:32 +02:00
LevelX2	7b168a9d5e	* Minds Aglow - Fixed that payed mana can be undone if X was set to a too high value.	2017-07-30 18:50:36 +02:00
LevelX2	69e239d2ed	Xmage 1.4.25V0 (update because of Log problem)	2017-07-30 08:54:37 +02:00
ciaccona007	bd4d00f031	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-29 20:08:04 -04:00
ciaccona007	d484991818	Fix problem in Permanent.destroy()	2017-07-29 19:07:25 -04:00
igoudt	89ac77e28a	clean ups, talk to interface rather than implementation	2017-07-29 23:55:11 +02:00
LevelX2	fe2ee5dfec	Xmage 1.4.25V0	2017-07-29 20:35:16 +02:00
LevelX2	6530b404c8	* Some Aftermath fixes.	2017-07-29 20:13:48 +02:00
LevelX2	0ef94a588c	* Fixed some null pointer or other exception bugs.	2017-07-29 19:13:42 +02:00
LevelX2	18cab46b05	* Improved editor search function, fixed some problems with search for split card rules.	2017-07-29 11:43:05 +02:00
LevelX2	1ddd063928	* Some Aftermath rule text fixes.	2017-07-29 11:40:51 +02:00
LevelX2	b9dff66fcb	* Kormus Bell - Fixed a bug with order land type changing effects are applied (fixes #3470).	2017-07-28 16:56:31 +02:00
LevelX2	ffd0c24c9c	Some minor changes.	2017-07-28 12:21:52 +02:00
ciaccona007	6e2679ed48	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-27 15:59:51 -04:00
ciaccona007	b93fe24fde	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-27 15:55:31 -04:00
LevelX2	d0e610e83b	* Afflict - Fixed that life loss of triggered afflict ability was not applied if creature with afflict was removed from battlefield before life loss effect resolved (fixes #3694).	2017-07-27 11:33:45 +02:00
LevelX2	847c6981ca	* Some rework for TargetPointer handling.	2017-07-26 17:21:03 +02:00
igoudt	96064ca5d2	clue subtype	2017-07-25 21:07:51 +02:00
igoudt	f12dc1e2b4	filter_basic_land_card added	2017-07-24 23:39:44 +02:00
igoudt	83928463a4	remove default override parameters	2017-07-24 14:42:13 +02:00
igoudt	216e269a31	use static filter for enchantment permanents	2017-07-24 14:42:13 +02:00
igoudt	c2b157d790	rewrite filter_artifact_or_enchantment_card	2017-07-24 14:42:13 +02:00
LevelX2	3f351d0def	* Clean up.	2017-07-24 00:43:20 +02:00
LevelX2	acf28d8aff	* Breath of Fury - Fixed that the enchnatment was no longer properly moved (fixes #3722).	2017-07-24 00:41:03 +02:00
LevelX2	2efc666f8d	* Some minor reworks to prevent exceptions.	2017-07-23 23:16:22 +02:00
LevelX2	b948a8255a	* Some cleanup for: Fixed a bug that created a endless loop if mana producer were involved, that create mana of any type lands of players could produce.	2017-07-23 22:49:56 +02:00
LevelX2	f67cd391dd	* Jandor's Ring - FIxed possible null pointer exception (discard has to be a cost still lacking).	2017-07-23 20:55:57 +02:00
LevelX2	ee59ec80e2	* Fixed a problem that the table health check removed tables that were just created by adding 30 seconds check stop after table start to prevent checking while server still is initializing the table start.	2017-07-23 20:28:18 +02:00
LevelX2	878ba90625	* Fixed a bug that prevented players from paying costs during spell resolution (e.g. Mana Leak) - (fixes #3715).	2017-07-23 19:48:04 +02:00
LevelX2	a9e2303f7e	* Fixed a bug that created a endless loop if mana producer were involved, that create mana of any type lands of players could produce (fixes ##3374).	2017-07-23 19:34:24 +02:00
LevelX2	cd6c7623ed	* Added missing imports, imports reorg.	2017-07-23 16:29:29 +02:00
LevelX2	4806738cfb	* Some more use of StaticFilter objects.	2017-07-23 14:59:13 +02:00
LevelX2	d5f4df7f54	* Some minor changes to return code handling.	2017-07-23 14:57:06 +02:00
LevelX2	4c33359fe2	* Some minor changes to logging and return code handling.	2017-07-23 11:06:23 +02:00
LevelX2	94be7cb4da	* Grave Betrayal - Reworked card movement and color and subtype applying.	2017-07-23 11:05:32 +02:00
Jeff	469ddcea6b	- Refactor AnnihilatorAbility().	2017-07-20 13:37:23 -05:00
Jeff	7ffcf39260	- Added requested card Volcano Hellion.	2017-07-20 11:15:58 -05:00
ciaccona007	6af45f9cff	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-19 01:43:01 -04:00
igoudt	105f346ebc	subtypes for cards 'A'	2017-07-18 08:55:40 +02:00
ciaccona007	b9f4d9523c	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-17 21:20:08 -04:00
Justin Herlehy	1daad30559	Subtype Update for "Z" Cards. ... Updated the subtypes for all implemented cards in the "Z" package. Corrected typo in the SubType enum for type BOAR. Added a varargs function to allow all creature types to be added in a single function call rather than 1-4.	2017-07-17 17:17:07 -07:00
ciaccona007	3d24f0a0de	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-16 21:47:25 -04:00
ingmargoudt	09f0c9ad97	huge rework on subtypes (#3668) ... * huge rework on subtypes * update for coat of arms * fix test	2017-07-16 16:57:39 -05:00
ciaccona007	3e4809b224	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-16 16:38:29 -04:00
LevelX2	5774deb90c	XMAGE 1.4.24V3	2017-07-16 19:46:41 +02:00
Achilles	79be2c4ce8	- Little refactor CardsCycledOrDiscardedThisTurnWatcher	2017-07-16 12:21:28 -05:00
ciaccona007	95d0fe8802	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-16 13:10:43 -04:00
Achilles	5cebe20768	- Fixed bug #3656	2017-07-16 10:31:22 -05:00
LevelX2	20c8c1a9c9	* Fixed that Persist did not working with Hapatra, Vizier of Poisons and Obelisk Spider (fixes #3679).	2017-07-16 15:58:50 +02:00
igoudt	905829561e	talk to interfaces rather than implementations	2017-07-16 11:08:09 +02:00
ciaccona007	dfa4bad8c5	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-15 23:24:03 -04:00
Achilles	525a98e78a	- Fixed bug #3682	2017-07-15 15:03:13 -05:00
Achilles	11e3c9f729	- Fixed bug #3677	2017-07-15 09:20:00 -05:00
Jeff	f0d9988e9b	- Fixed bug #3656	2017-07-14 11:39:11 -05:00
Lazar	37c6d3e3f6	removed trample (#3671) ... It doesn't have trample	2017-07-12 14:18:36 -05:00
LevelX2	eb9a18c07a	* Fixed a problem that you can see the second card from top of libraray while able to cancel the cast of the top card (fixes #3196).	2017-07-12 17:05:44 +02:00
spjspj	b9f4adaf44	Merge pull request #3662 from spjspj/master ... Implement Memory Crystal (EXO)	2017-07-12 12:41:31 +10:00
spjspj	ed512d3a1d	Implement Memory Crystal (EXO)	2017-07-12 12:40:14 +10:00
spjspj	b38494a549	Merge pull request #3661 from spjspj/master ... Implement Memory Crystal (EXO)	2017-07-12 12:17:03 +10:00
spjspj	4a6b2e8db3	Implement Memory Crystal (EXO)	2017-07-12 12:16:15 +10:00
Jeff	95246e4da6	- Added Nettlevine Blight [Lorwyn]	2017-07-11 12:12:55 -05:00
Jeff	ee07a6ebc5	- Fixed issue #3519	2017-07-11 08:26:33 -05:00
spjspj	8255fb6434	Merge pull request #3654 from spjspj/master ... Implement Memory Crystal (EXO)	2017-07-11 22:31:30 +10:00
spjspj	e9a43758a8	Implement Memory Crystal (EXO)	2017-07-11 22:30:35 +10:00
igoudt	fb7b3aa7b6	added kaya subtype	2017-07-11 08:13:37 +02:00
igoudt	f2aa948c74	refactor filters to staticfilters	2017-07-11 00:18:41 +02:00
igoudt	b7159d7d2c	update spellfilters to staticfilters	2017-07-11 00:18:41 +02:00
ciaccona007	a1e7c00e21	Merge remote-tracking branch 'remotes/upstream/master'	2017-07-10 11:44:54 -04:00
LevelX2	b50d557c75	* Ral Zarek - Reverted workaround fix and fixed the cause of the problem the untap did not work.	2017-07-10 17:17:01 +02:00
LevelX2	99a553e814	Merge origin/master	2017-07-10 17:15:16 +02:00
LevelX2	5a3243890d	Fixed that the information what mana was payed to pay the mana cost of a spell or ability were not correct if "spend mana as though" abilities were involved in the payment (fixes #3604).	2017-07-10 16:53:02 +02:00
ciaccona007	81ac455fab	Implement Festering Wound	2017-07-10 10:42:51 -04:00
igoudt	11f040b884	use more staticfilters, fix jsoncard class	2017-07-10 12:25:33 +02:00
LevelX2	75aff217da	Xmage 1.4.24V2	2017-07-09 21:09:42 +02:00
LevelX2	747c997946	* Rhonas's Stalwart - Fixed that it is incorrectly able to be blocked after exerting it.	2017-07-09 20:50:27 +02:00
LevelX2	37ffeac23d	* Instill Energy - Fixed that the enchanted creature could not attack (but should be able) the turn it came into play.	2017-07-09 15:32:52 +02:00
LevelX2	8e666c9403	Xmage 1.4.24.V1	2017-07-09 01:29:26 +02:00
LevelX2	c42841196f	Some minor fixes.	2017-07-08 23:17:41 +02:00
LevelX2	28cfbad76a	[HOU] Nimble Obstructionist - Fixed that the Cycle ability blocked the game if no valid target to counter is on the stack (fixes +3615).	2017-07-08 18:42:50 +02:00
spjspj	a4a8201ec2	Merge pull request #3613 from spjspj/master ... Minor refactor	2017-07-08 23:54:37 +10:00
LevelX2	d1f61f48f1	XMage 1.4.24V0	2017-07-08 15:54:06 +02:00
spjspj	0afaa5c59c	Minor refactor	2017-07-08 23:53:17 +10:00
igoudt	a167122459	loop to streams	2017-07-08 10:58:47 +02:00
Matthew Zulch	51595dbedf	Act of Heroism fixes (#3608) ... * Adding test case for Act of Heroism * Fixing Act of Heroism mana cost * Adding can block additional creature effect that applies to spell/ability target rather than source * Updating Act of Heroism to use new effect * Removing redundant assertion, adding some comments	2017-07-07 19:53:06 -05:00
Lazar	0792848f98	added couple lands (#3599) ... * added couple lands * moved effect to own class	2017-07-07 18:29:31 -05:00
Jeff	4d87821497	- Added Abandoned Sarcophagus. [HOU]	2017-07-07 09:23:43 -05:00
fireshoes	9284bbe6f3	Merge	2017-07-07 01:33:20 -05:00
fireshoes	160647c7cb	[HOU] Added several cards	2017-07-07 01:11:27 -05:00
emerald000	e8c1def9b0	[HOU] Added Nimble Obstructionist.	2017-07-06 23:00:37 -04:00
fireshoes	42810944f3	Commit merge	2017-07-06 21:29:21 -05:00
Justin Herlehy	53cb5ae478	Fix for Giedon of the Trials emblem. ... Resolves #3179	2017-07-06 13:01:47 -07:00
fireshoes	6286b12278	update HOU	2017-07-05 01:08:10 -05:00
LevelX2	f5c925d26c	[HOU] Added Imaginary Threats.	2017-07-05 07:58:46 +02:00
emerald000	fe95fc3b43	[HOU] Added 5 blue cards. ... Aven Reedstalker, Countervailing Winds, Cunning Survivor, Eternal of Harsh Truths and Hour of Eternity.	2017-07-04 12:57:06 -04:00
spjspj	495a84f1f1	Implement 2 cards (HOU) Fix for Bontu's Last Reckoning	2017-07-04 19:07:17 +10:00
spjspj	8e4f478946	Implement 2 cards (HOU)	2017-07-03 09:08:24 +10:00
emerald000	564e0ff70d	Fix compilation error.	2017-06-30 11:10:33 -04:00
LevelX2	c8e1a9d854	[HOU] Added 4 cards.	2017-06-29 17:55:48 +02:00
Jeff	831985a7bd	- Fixed Bug #3501	2017-06-28 16:55:24 -05:00
LevelX2	886022fd19	[HOU] Added 4 cards and some fixes.	2017-06-28 17:03:26 +02:00
emerald000	130a123052	Remove useless parameter of ExertSourceCost.	2017-06-27 23:07:24 -04:00
spjspj	5a7a9049d9	Merge pull request #3549 from spjspj/master ... Implement The Locust God (HOU)	2017-06-27 21:33:21 +10:00
spjspj	d95bd421fc	Implement The Locust God (HOU)	2017-06-27 21:16:27 +10:00
LevelX2	9b31a5a7e3	Merge pull request #3516 from ruler501/summerproject ... Shortcut/Macro System	2017-06-26 17:53:49 +02:00
spjspj	dae7530155	Merge branch 'master' into master	2017-06-26 23:16:50 +10:00
spjspj	64524a8c18	Implement The Scarab God (HOU)	2017-06-26 23:13:48 +10:00
emerald000	3388fce4c1	[HOU] Added Desert's Hold. ... Implemented OrCondition.	2017-06-26 08:26:02 -04:00
emerald000	6ee570d5e7	[HOU] Added Angel of Condemnation. ... Implemented ExertSourceCost.	2017-06-26 07:31:06 -04:00
spjspj	fc0b8ec9cb	Merge branch 'master' into master	2017-06-25 21:35:37 +10:00
spjspj	67ce816381	Implement Unesh (HOU)	2017-06-25 21:33:06 +10:00
LevelX2	f0dbc1da1c	[HOU] Added 4 black cards. Some fixes.	2017-06-25 10:21:52 +02:00
LevelX2	128b972765	[HOU] Added 5 black cards.	2017-06-24 14:00:21 +02:00
LevelX2	1210f9795a	[HOU] Added Doomfall.	2017-06-24 11:33:53 +02:00
igoudt	5bcaafd738	implemented Afflict + simple HOU cards	2017-06-24 01:13:42 +02:00
igoudt	ae640ee0b7	refactor duplicate code for playing lands from grave	2017-06-24 00:28:34 +02:00
Devon Richards	028d7ed1f8	Initial working product. Doesn't handle skipping stack.	2017-06-20 19:54:16 -05:00
igoudt	d63b241d54	implemented Eternalize Ability + Steadfast Sentinel	2017-06-19 01:03:12 +02:00
LevelX2	5cfb496899	* Storm Cauldron - Fixed that it wrongly also returned cards to hand that already left the battlefield (fixes #3487).	2017-06-11 10:44:41 +02:00
Will Hall	cdcc7449d4	Create a subtype for Samut.	2017-06-06 20:16:10 -07:00
spjspj	aabb479a40	Merge pull request #3473 from spjspj/master ... Implement Wasitora, Nekoru Queen (C17)	2017-06-07 00:42:38 +10:00
spjspj	a48d584cdd	Implement Wasitora, Nekoru Queen (C17)	2017-06-07 00:37:45 +10:00
igoudt	352637d411	Merge https://github.com/magefree/mage into text	2017-06-06 09:32:52 +02:00
igoudt	0cb7d8aab6	loop to streams	2017-06-06 09:31:41 +02:00
fireshoes	52b4633340	Added Commander Anthology. Added Archenemy: Nicol Bolas to mtg-cards-data.txt (missing most collector numbers until it goes up on Gatherer). Updated tokens for CMA and E01.	2017-06-05 16:00:13 -05:00
LevelX2	0fd72c3010	* Added check if the deck was modified during sideboarding.	2017-06-05 20:23:09 +02:00
LevelX2	3c6ede7407	* Improved game is infinite loop check to ask players only if some kind of iteration is recognized.	2017-06-05 12:27:59 +02:00
igoudt	d42b2a6d37	change text for cycling to this card, rather than referring the name	2017-06-04 17:12:08 +02:00
spjspj	a371802cc0	Implement O-Kagachi, Vengeful Kami (C17)	2017-06-04 20:27:48 +10:00
LevelX2	b62a15f68e	Merge pull request #3454 from drmDev/add/welcomedeck2017 ... adding welcome deck 2017 (see #3453)	2017-06-03 10:31:49 +02:00
LevelX2	13ea2c33c6	Merge pull request #3447 from aastrand/master ... Ban ignored users from watching	2017-06-03 10:31:24 +02:00
igoudt	9ac70b868d	minor text fixes	2017-05-30 23:46:06 +02:00
Derek Monturo	1d662a0a58	adding welcome deck 2017 - closes #3453	2017-05-30 07:31:14 -04:00
Anders Åstrand	ad0507e739	Ban ignored users from watching ... This commit bans ignored users from watching games where the creator has them on their ignore list.	2017-05-29 21:36:42 +02:00
Simown	62c14a9c24	Added missed private member	2017-05-29 13:40:48 +01:00
Simown	12a520c85a	Fixed mock split card generation. Fixes #3444. ... Implementation was missing - copied it from actual split cards.	2017-05-29 13:33:50 +01:00
LevelX2	485ea2729a	Merge origin/master	2017-05-28 23:47:28 +02:00
LevelX2	884a3af503	* Norn's Annex - Fixed a bug with the payment of phyrexian mana (fixes #3178).	2017-05-28 23:45:41 +02:00
igoudt	63b69cb5db	missed some mtg subtypes	2017-05-28 22:56:27 +02:00
igoudt	d99a444389	exert can't --> won't	2017-05-28 22:56:27 +02:00
LevelX2	09e4435a89	* Fixed a problem that watcher added from cards are not reset between games of a match (fixes #3228).	2017-05-28 18:24:37 +02:00
igoudt	83c3dc05b2	forloop to stream	2017-05-28 12:24:06 +02:00
igoudt	2fc742d77d	minor typo	2017-05-28 12:23:49 +02:00
LevelX2	9c773ba3cb	* Vesuvan Shapeshifter - Fixed that copying creatures with morph and a turn face up trigger did not work correctly (fixes #2864).	2017-05-28 11:01:04 +02:00
LevelX2	d98f73518a	* Swords to Plowshares - Fixed a problem that static effects of the exiled target were still applied as the gain life effect resolved (fixes #3290).	2017-05-28 09:46:41 +02:00
LevelX2	db9e8e586b	* Cho Manno's Blessing - FIxed that it did remove itself sometimes (fixes #3382).	2017-05-28 09:11:36 +02:00
igoudt	dca676617d	fix crypt rats + added new test method	2017-05-27 09:17:08 +02:00
LevelX2	2feb764179	* Some clean up to skip handling (related to #2924).	2017-05-26 11:51:50 +02:00
LevelX2	1eb1a2abed	* Transform - Fixed that a transform effect did only resolve, if the related permanent to transform was the same as the ability was put to stack (fixes #2912).	2017-05-23 17:26:16 +02:00
LevelX2	9e78410fff	Merge branch 'master' into subtypes	2017-05-21 10:50:47 +02:00
spjspj	b467ff2080	Add emblems into the int.txt file 'emblem:Human:ElspethSunsChampionEmblem:1' for example	2017-05-21 12:42:50 +10:00
LevelX2	0b7a50e48f	* Xmage 1.4.23V6	2017-05-21 01:01:50 +02:00
LevelX2	ca9f596e4a	* Compelling Deterrance - Fixed that static effects of the card that goes to hand did not end before the discard happens (fixes #3368);	2017-05-21 00:14:06 +02:00
LevelX2	40f192eafc	* Squelch - Fixed that it was causing a ClassCastException (fixes #3396).	2017-05-20 23:22:31 +02:00
igoudt	de8737697d	complete planeswalker subtypes	2017-05-20 22:54:52 +02:00
igoudt	6d83a4a65f	finish rewriting subtypepredicate	2017-05-20 22:41:25 +02:00
igoudt	8ab4f5b454	finised all creaturetypes	2017-05-20 22:41:25 +02:00
igoudt	19db21c672	subtypes part 2	2017-05-20 22:41:25 +02:00
igoudt	c44c301f5b	subtypes #1	2017-05-20 22:41:25 +02:00
LevelX2	67a66d90da	* Hapatra, Vizier of Poisons - Fixed that it was not triggering off of Infect (fixes #3288).	2017-05-19 17:51:04 +02:00
LevelX2	e090b26240	* Urborg Justice - Fixed that tokens going to graveyard were not counted.	2017-05-18 23:42:32 +02:00
LevelX2	11ba007fd3	Xmage 1.4.23V5	2017-05-18 21:55:44 +02:00
LevelX2	d686af8890	* Fixed a problem of endless iteration with Reflecting Pool.	2017-05-18 16:57:32 +02:00
LevelX2	83cdd5570d	* Added Gangrenous Zombies and Lethal Vapor.	2017-05-18 16:57:06 +02:00
LevelX2	1d438060fc	* Fixed bug of any mana abilities not working correctly for mana abilities that could produce mana of any type other mana sources could produce.	2017-05-17 23:20:27 +02:00
LevelX2	1362637561	* Fixed bug in condition.	2017-05-16 22:48:14 +02:00
LevelX2	d284cc08b1	* Reworked some not correct working dies replacement handling.	2017-05-16 22:36:56 +02:00
LevelX2	51b075bfdb	* Reworked infinite loop handling a bit.	2017-05-16 21:13:20 +02:00
magenoxx	b3eb89c6ea	#3373: fixed exiling copied spells from stack	2017-05-16 20:18:32 +03:00
magenoxx	83ee1252cd	#3373: added exiling multiple targets in Mindbreak Trap	2017-05-16 20:17:40 +03:00
LevelX2	351095a904	* Magma Spray - Fixed a bug of dies replacement handling (#3359). Other cards with same rule text not fixed yet.	2017-05-16 17:40:04 +02:00
LevelX2	5ce813ad87	* Added a simple check for infinite loops so that if players confirm the game ends in a draw (#3329).	2017-05-16 14:45:30 +02:00
LevelX2	7dcfbd5be5	* Hexproof Planeswalkers can't be attacked (fixes #3328).	2017-05-16 10:34:58 +02:00
LevelX2	390834a0d7	* Vizier of the Menagerie - Fixed that the cards from library could be cast at instant speed (fixes #3300).	2017-05-15 16:41:47 +02:00
Ex Mage	be69510340	Fix source of PutCountersSourceCost not being set	2017-05-15 00:11:46 -04:00
Derek M	6d52ec5a59	Merge pull request #3377 from spjspj/master ... Emblems refactor to show emblems in Card/Token Viewer	2017-05-14 12:00:58 -04:00
LevelX2	d1e4a7f6b0	Merge pull request #3372 from ingmargoudt/changelings ... change getSubtype(game).contains(..) to hasSubtype(..) to include che…	2017-05-14 06:32:48 +02:00
spjspj	f85c7e07ba	Emblems refactor to show emblems in Card/Token Viewer	2017-05-14 13:43:18 +10:00
emerald000	d5c75cd1b3	Fixed New Perspectives to use a CostModificationEffect. ... Remove CyclingCost and WrapperCost that are now unused.	2017-05-13 18:53:35 -04:00
igoudt	265cf408f9	change getSubtype(game).contains(..) to hasSubtype(..) to include check on Changelings	2017-05-13 23:35:23 +02:00
igoudt	fc7cdcdc4e	small rewrite in the creaturesDiedWatcher	2017-05-12 22:47:35 +02:00
Derek Monturo	ae38095c58	merge	2017-05-11 12:12:20 -04:00
LevelX2	d1fd69f685	Fixed shuffle algorithm.	2017-05-09 17:01:46 +02:00
spjspj	d581fddecf	Merge pull request #3331 from spjspj/master ... Token refactor	2017-05-08 21:57:50 +10:00
spjspj	bec0964726	Token refactor	2017-05-08 21:53:01 +10:00
LevelX2	645a4ec062	* Ravnica: City of Guilds - Added 3 cards.	2017-05-07 16:24:01 +02:00
LevelX2	96d9362c55	* Ravnica: City of Guilds - Added 3 cards.	2017-05-07 14:58:14 +02:00
LevelX2	dc4283685a	* Added another StaticFilter.	2017-05-07 14:07:21 +02:00
spjspj	a897b374a0	Token refactor	2017-05-07 20:57:57 +10:00
LevelX2	757c01343f	* Ravnica: City of Guilds - Added 3 cards.	2017-05-07 10:46:01 +02:00
spjspj	a587119644	Merge pull request #3320 from spjspj/master ... Token refactor	2017-05-07 12:05:07 +10:00
spjspj	ba6e8409d1	Token refactor	2017-05-07 11:46:52 +10:00
LevelX2	f5b4c41188	* Ravnica: City of Guilds - Added 3 cards.	2017-05-06 16:05:14 +02:00
LevelX2	62947573d6	Merge origin/master	2017-05-06 15:43:34 +02:00
LevelX2	833237e09b	* Ravnica: City of Guilds - Added 5 cards.	2017-05-06 15:43:01 +02:00
spjspj	bc5e0570ed	Merge pull request #3312 from spjspj/master ... Token refactor	2017-05-06 23:42:49 +10:00
spjspj	6a610dc9d4	Token refactor	2017-05-06 23:41:18 +10:00
spjspj	e9408a7203	Merge pull request #3311 from spjspj/master ... Token refactor	2017-05-06 23:38:32 +10:00
spjspj	e73e7d8600	Token refactor	2017-05-06 23:35:14 +10:00
LevelX2	ee129e2251	* Lotus Vale - Fixed a bug that it did not working properly (fixes #3308).	2017-05-06 13:17:52 +02:00
LevelX2	afb7de2fbb	* Gitrog Monster - Fixed that triggered ability was not handled correctly after a control change (fixes #3251).	2017-05-06 11:49:49 +02:00
LevelX2	795218b030	* Roi Elemental - Fixed triggered ability that did not work correctly for copied Roi Elementals (fixes #3214).	2017-05-06 10:19:04 +02:00
igoudt	a277aafbc5	fix player damaged by source watcher	2017-05-03 16:59:45 +02:00
LevelX2	01171abad2	Merge pull request #3284 from spjspj/master ... Large Refactor - Move all tokens into Mage/src/main/java/mage/game/pe…	2017-05-03 15:40:32 +02:00
Derek M	8278b1bb2f	Merge pull request #3294 from ingmargoudt/splitcard_cmc ... fix cascade for splitcards	2017-05-03 07:51:08 -04:00
igoudt	9da97f9368	fix cascade for splitcards	2017-05-03 09:51:22 +02:00
igoudt	576ccdb34a	fix broke shadowOfTheGrave + watcher	2017-05-01 17:31:51 +02:00
spjspj	1754a69f9b	Large Refactor - Move all tokens into Mage/src/main/java/mage/game/permanent/token	2017-05-01 20:20:33 +10:00
LevelX2	97a4e9ed05	Xmage 1.4.23V4	2017-04-30 00:23:33 +02:00
igoudt	e5b9e41c1f	fix copy constructor of a watcher	2017-04-29 12:07:46 +02:00
igoudt	b6fe6f772a	finish rewriting watchers	2017-04-29 12:07:46 +02:00
igoudt	efae1251f9	first batch of watcher naming	2017-04-29 12:07:46 +02:00
spjspj	241691b153	spjspj - Add in Tokens to the Card Viewer (first version)	2017-04-29 17:25:54 +10:00
ingmargoudt	12eb4c2fb7	Merge branch 'master' into move_magepermanent_method	2017-04-28 19:29:20 +02:00
LevelX2	33f6c629c2	* Shadow of the Grave - Some minor adjustments.	2017-04-28 11:18:26 +02:00
LevelX2	7f1da83783	Merge pull request #3261 from ingmargoudt/fix_cyclediscardwatcher ... fix for shadow of the grave	2017-04-28 11:04:24 +02:00
igoudt	6b66f8c05b	add cartouche as enchantment subtype	2017-04-28 10:23:13 +02:00
igoudt	10ecbd5adb	fix for shadow of the grave	2017-04-28 09:24:27 +02:00
igoudt	2c34870bf0	remove util function on converted manacost, make getColorIdentity default interface method	2017-04-27 10:57:48 +02:00
igoudt	7a4a0b9faa	move removeVariableManaCost from CardUtil to ManaCosts interface	2017-04-27 10:57:48 +02:00
Achilles	ba2456188f	Reverted this commit that broke a watcher. Fixes #3246	2017-04-26 07:59:16 -05:00
LevelX2	7e9d4ab515	* DreadshipReef - Fixed that the 3rd ability did not create mana (fixes #3223).	2017-04-25 23:27:24 +02:00
LevelX2	85e44017ea	Xmage 1.4.23V3	2017-04-25 22:17:22 +02:00
LevelX2	80beebccf5	* Fixed a problem of EndTurnEffect not beeing able to remove stackAbilities and endless looping as a result (fixes #3221).	2017-04-25 21:30:45 +02:00
LevelX2	24b99216f8	* Aftermath - Fixed a bug that caused problems with zone check.	2017-04-25 21:29:21 +02:00
LevelX2	60cc3a7622	* Some minor fixed and log changes.	2017-04-25 17:37:38 +02:00
LevelX2	3708ea2a89	* Added 3 cards from Ravinca City of Gold set.	2017-04-25 15:47:21 +02:00
Achilles	1607849c19	- Fixed Bug #3225	2017-04-23 20:07:40 -05:00
LevelX2	c085ea148a	* Changed some logging messages.	2017-04-23 14:11:02 +02:00
spjspj	6ab4a94bd7	spjspj - Add in 'View Current Deck' option.	2017-04-23 13:06:09 +10:00
LevelX2	900e7b29ba	XMage 1.4.23V2	2017-04-23 01:57:26 +02:00
spjspj	8845d77628	spjspj - Remove View Limited Deck option	2017-04-22 19:35:08 +10:00
spjspj	0cd4e06e22	spjspj - Add a View Limited Deck option to allow you to see your deck during matches.	2017-04-22 19:16:12 +10:00
LevelX2	a93dc4e3da	* Added a check that continuous PT setting effects are only applied, if the object has still the ability (fixes #3167). ... I added the effect now only to the layer the bug is caused by. Probably it's correct to check this for every layer. But I don't know how much resources the check addional needs. So if we got other tests that fail for this reason caused by other layers, we could add the check and test if all other tests still work correctly.	2017-04-22 00:23:37 +02:00
magenoxx	ee7026f71d	Revert "Added hashCode and equal to main server objects" ... This reverts commit 27a454f042.	2017-04-21 20:43:32 +03:00
LevelX2	e284922017	* Added Celestial Convergence and some changes to game draw handling.	2017-04-21 15:18:04 +02:00
Derek M	274e0f9052	Merge pull request #3184 from HanClinto/CMH-GuiltyConscienceAndBackfire ... Implementing Guilty Conscience and Backfire	2017-04-20 20:40:03 -04:00
magenoxx	f02999910a	Merge branch 'master' of github.com:magefree/mage	2017-04-20 22:46:51 +03:00
Jeff	5f05868865	- Fixed Glyph Keeper. Bug #3180	2017-04-20 14:19:54 -05:00
magenoxx	27a454f042	Added hashCode and equal to main server objects	2017-04-20 20:06:52 +03:00
Derek M	e9d31aa93c	Merge pull request #3185 from HanClinto/CMH-FixPredicate ... Fix for "Inference variable T#1 has incompatible bounds"	2017-04-20 04:37:23 -04:00
Clint Herron	d82687bdc4	Fixing check for objects that should not untap during a specific player's next untap step ('your next untap step' vs. 'its controllers next untap step' lanugage)	2017-04-19 23:56:20 -04:00
Clint Herron	48cde05cff	Fixing additional instances where unspecified types could lead to errors	2017-04-19 22:55:48 -04:00
Clint Herron	8174f53a8c	Removing error when running server where Creeping Mold would have a predicate error because 'inference variable T#1 has incompatible bounds' -- I don't fully understand the error, but at least this fix seems to work.	2017-04-19 22:31:15 -04:00
Clint Herron	30e0ef863d	Removing error when running server where Creeping Mold would have a predicate error because 'inference variable T#1 has incompatible bounds' -- I don't fully understand the error, but at least this fix seems to work.	2017-04-19 22:31:02 -04:00
Clint Herron	98eea3c97b	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-04-19 21:49:10 -04:00
LevelX2	04c80c27a3	* Fixed Binding Mummy's ability doesn't trigger from Liliana, Death Majesty -3 ability (fixes #3165).	2017-04-19 16:40:00 +02:00
LevelX2	0b827b239c	* Fixed the handling of comparing characteristics concerning split cards (related to the recent rule changes).	2017-04-19 12:36:46 +02:00
magenoxx	f5fe2bd133	Issue#3148: added reproducing test	2017-04-18 23:28:42 +03:00
Clint Herron	4a13ba3645	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-04-18 15:18:30 -04:00
magenoxx	6ee2e69f2c	Fixed #3144: added searching for exile zone with change zone counter (that's true for tokens from graveyard)	2017-04-18 22:03:33 +03:00
Clint Herron	d1c8796a49	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-04-18 11:00:24 -04:00
Jeff	9b5a04697c	- Applied fix suggested by Stravant for the Flashback Ability issue. Bug #3132	2017-04-18 09:26:38 -05:00
spjspj	8c46f23e02	Increased performance function for finding a card in DB with a specific set. Cube from deck (custom cube) now respects chosen set for a given card.	2017-04-18 20:58:03 +10:00
LevelX2	d55c82adf4	XMage 1.4.23V1	2017-04-18 07:50:49 +02:00
LevelX2	90c583f755	* Fixed a bug that prevented the display of supertypes (fixes #3142).	2017-04-17 23:14:06 +02:00
LevelX2	804fb12b1d	* Vizier of Deferment - Fixed null pointer exception.	2017-04-17 18:27:05 +02:00
LevelX2	8739d7a101	[AKH] Fixed Heart-Piercer Manticore.	2017-04-17 09:53:13 +02:00
Mark Langen	2b4e8c3e4c	Add a parameter to untap only other objects than the source to UntapAllContollerEffect since OtherPredicate does not work on the filter for it.	2017-04-16 23:24:08 -06:00
Mark Langen	3c91b8d15f	Start to add builder pattern to some card definition classes	2017-04-16 23:24:08 -06:00
Mark Langen	79648eb7ea	Couple small changes	2017-04-16 23:24:08 -06:00
LevelX2	b8e952cfb9	[AKH] Approach of the Second Sun fix of cast watcher.	2017-04-17 00:44:08 +02:00
LevelX2	ed341528d9	[AKH] Fixed that Aftermath card images were shown wrongly rotated.	2017-04-16 22:57:08 +02:00
fireshoes	a8631c6ff3	Remove comma change from BecomesCreatureSourceEffect staticText.	2017-04-16 15:43:49 -05:00
Styxo	d4e2b6f306	[AKH] Fixed black cards tooltips	2017-04-16 17:14:48 +02:00
spjspj	9c487b7310	Merge pull request #3116 from spjspj/master ... Fix Pyramid of the Pantheon, Fix SourceHasCounterCondition 'toString'	2017-04-16 22:04:44 +10:00
spjspj	c895253d5b	Fix Pyramid of the Pantheon, Fix SourceHasCounterCondition 'toString'	2017-04-16 22:04:07 +10:00
LevelX2	664405caab	[AKH] Added Vizier of Many Faces.	2017-04-16 13:28:36 +02:00
LevelX2	c033868795	[AKH] Added Vizier of Many Faces.	2017-04-16 13:04:38 +02:00
fireshoes	06fdd17e7d	[AKH] Updated tooltip text on several white and blue cards. Some minor fixes.	2017-04-15 23:37:50 -05:00
LevelX2	88d25b7a3a	[AKH] Added New Perspectives.	2017-04-16 01:38:59 +02:00
LevelX2	4044b9aa3b	[AKH] Embalm - Fixed that the token wrongly had the mana costs of the original card.	2017-04-16 01:38:36 +02:00
Styxo	5a2678f916	[AKH] Code deduplication and fixes	2017-04-15 18:53:57 +02:00
Styxo	e2a1d4436f	[AKH] Added some cards + fixes	2017-04-15 16:46:53 +02:00
Mark Langen	77586eec7e	Add 30 AKH card implementations ... * Some of the cards still need testing. Will fix and problems and update tomorrow, but pushing them for now to make it clear what's been implemented so far.	2017-04-15 04:24:14 -06:00
Achilles	d51eb07692	- Added Time to Reflect and Wayward Servant. <Amonkhet>	2017-04-14 18:44:25 -05:00
fireshoes	7dea71df59	[AKH] Implemented some of the 4/13 spoiled cards.	2017-04-13 23:28:21 -05:00
Jeff	1c958ccc72	- A watcher for Shadows of the Grave.	2017-04-13 17:03:23 -05:00
ingmargoudt	58b7148de9	fix for endreksahr	2017-04-13 07:50:44 +02:00
Derek M	3e6a925271	Merge pull request #3088 from ingmargoudt/fixes ... Fixes	2017-04-12 10:08:27 -04:00
Mark Langen	db74576397	Added 4 cards from AHK ... * Added Cartouche of Strength * Added Nest of Scarabs (More correct implementation than existing one) * Added Soul-Scar Mage * Added Battlefield Scavenger	2017-04-11 17:40:15 -06:00
ingmargoudt	03643d53a3	rename counttype to comparisontype	2017-04-11 17:01:59 +02:00
ingmargoudt	60a325c43f	fix reversed intcompare	2017-04-11 16:50:46 +02:00
Styxo	46d44f84e3	[AKH] Added Hapatra, Nest of Scarabs and Throne of the God Pharao and removed redundant code	2017-04-11 15:20:55 +02:00
ingmargoudt	cb693b5826	there were 3 enums to compare ints, refactored to 1	2017-04-11 09:15:12 +02:00
ingmargoudt	813d84274a	removed string constructor in SuperTypePredicate	2017-04-11 09:15:09 +02:00
fireshoes	7da69e5064	Merge origin/master	2017-04-10 18:46:43 -05:00
fireshoes	5fbcf759d6	[ANK] Added 4/10 spoilers to mtg-cards-data.txt and implemented a many cards.	2017-04-10 18:45:48 -05:00
Mark Langen	2b08d5a101	As Foretold Implemented ... * Final change to card casting code to support as foretold. Removed all of the "Can't cast cards with no mana cost" code from the earlier parts of the casting process and simplified it to just the PlayerImpl::canPlay check and one final check in the main AbilityImpl::activate code after alternative costs have been chosen.	2017-04-10 17:00:27 -06:00
Mark Langen	b33e03862a	Work in progress changes to support As Foretold ... * Modifies how cards with no mana cost are handled. You can now begin to cast them if there is an AlternativeCost that would allow you to play them.	2017-04-10 16:13:42 -06:00
Justin Herlehy	8b1220af66	[AKH] Liliana, Death's Majesty ... Refactored the "Becomes a black Zombie in addition to its other colors and types" code to own class file to dedupe code from several cards.	2017-04-08 23:25:43 -07:00
LevelX2	22e376699e	Merge pull request #3066 from ingmargoudt/cleanups ... Cleanups	2017-04-06 23:26:52 +02:00
LevelX2	b71c618294	[AKH] Added exert ability, Ahn-Crop Crasher and Combat Celebrant.	2017-04-06 23:10:24 +02:00
ingmargoudt	f22ebd3677	removed contains cardtype calls	2017-04-06 16:38:34 +02:00
ingmargoudt	ea6ba3c0a9	enum conditions	2017-04-06 16:30:22 +02:00
Mark Langen	40870f22c2	Added a bunch of spoiled cards for 4/5 ... * Added Colossapede * Added Cut // Ribbons * Added Insult // Injury (+test) * Added Mouth // Feed * Added Pouncing Cheetah * Added Scarab Feast * Added Rags // Riches (+test)	2017-04-05 22:41:56 -06:00
ingmargoudt	4361b7412a	can not be singleton	2017-04-05 19:10:47 +02:00
ingmargoudt	fb9d713287	singleton conditions to enum	2017-04-05 19:10:47 +02:00
ingmargoudt	809c8c97c9	introduced YouGainedLifeCondition	2017-04-05 19:10:46 +02:00
ingmargoudt	22c842dfec	refactored IntCompareCondition	2017-04-05 19:10:45 +02:00
ingmargoudt	1f89b4eedf	introduced XorLessLifeCondition	2017-04-05 19:10:44 +02:00
ingmargoudt	e44b2fd673	extracted duplicate AttachmentAttachedToCardTypePredicate	2017-04-05 19:10:43 +02:00
ingmargoudt	8b90f87af6	added addCardType to MageObject	2017-04-05 19:10:43 +02:00
ingmargoudt	cf6fe27f7d	duplicate continuouseffect for vehicles	2017-04-05 19:10:42 +02:00
Jeff	b3bd801c47	- Removed unneeded import.	2017-04-05 09:01:14 -05:00
Mark Langen	047449f14e	* Correct type line rendering for split cards with different types on each half. ... * Correct art rendering for Aftermath, Split, and Fuse cards on the stack. Fused cards show as a single card with all the abilities / characteristics of both halves while on the stack.	2017-04-04 21:58:52 -06:00
Mark Langen	a2e8cedd02	Merge branch 'master' into akh-card-frame	2017-04-04 18:36:37 -06:00
Mark Langen	7a6b8a1540	Final Aftermath implementation stuff ... * Fixed PlayerImpl::getPlayable() to support aftermath (Needs PLAY_FROM_NOT_OWN_HAND_ZONE at the granularity of each card half rather than the whole card) * Added tests for Dusk // Dawn to make sure there are no regressions on Aftermath.	2017-04-04 18:28:30 -06:00
Mark Langen	fd73fd39af	Addressed Feedback and added cards ... * Addressed feedback on Pull Request #3053 * Fixed a copy-paste bug in Destined // Lead * Added two new Aftermath Split cards that were revealed today	2017-04-04 17:07:59 -06:00
fireshoes	195ff7f554	[AKH] Added 4/4 spoilers and implemented non-exert/embalm/aftermath cards.	2017-04-04 17:57:08 -05:00
fireshoes	fe33f82acc	[AKH] Added 4/4 spoilers and implemented non-exert/embalm/aftermath cards.	2017-04-04 14:28:45 -05:00
LevelX2	5952c5e33a	* Fixed a bug that mana pool was carried over to next game (e.g. using Savage Ventmaw).	2017-04-04 16:23:10 +02:00
LevelX2	269189f87e	Merge origin/master	2017-04-04 15:33:01 +02:00
LevelX2	45818f3a51	* Celestial Dawn - Fixed that it was not possible to pay colorless costs with non white mana.	2017-04-04 15:32:39 +02:00
Jeff	772fff4f66	- Fixed spelling for Event.	2017-04-04 08:24:30 -05:00
LevelX2	989250c7f6	Added missing player type.	2017-04-04 09:21:14 +02:00
Mark Langen	18663f0a7a	Amonket Aftermath ability and card frame changes Completed ... * Aftermath Ability implementation complete (At least until we see comprehensive rules that contradict the way I assumed it will work) * Aftermath Card Frame rendering complete * Normal Split and Fuse Split card frame rendering complete * Amonket Split card CMC changes NOT made, but left for a separate commit	2017-04-04 00:29:54 -06:00
Mark Langen	a96a7f89f5	Work in progress changes for Amonket Aftermath ability. ... * Card Rendering has support for Aftermath Split card frames * Card Rendering has support for Split cards * Aftermath ability work in progress	2017-04-03 04:15:25 -06:00
ingmargoudt	211d433ea9	playertype, enum singleton	2017-04-02 22:09:20 +02:00
Derek M	b19170f34f	Merge pull request #3045 from SickBoyWi/master ... Implemented Soul Burn card for the two sets it's a part of: Ice Age a…	2017-04-02 12:17:32 -04:00
LevelX2	097a8ce0dd	Some rework to end turn logic and removing of stack objects (related to #2977).	2017-04-02 15:18:50 +02:00
LevelX2	15c1c7f8c0	* Fixed a problem with flashback ability and variable non mana costs (related to #2436).	2017-04-02 10:11:25 +02:00
ingmargoudt	594ffa2754	rewrote some streams and optionals	2017-04-01 22:45:40 +02:00
LevelX2	d0bf77cedf	* Fixed a problem with replacement effects that add counters were applied more than once to the same EnteresTheBattlefield event (fixes #2872).	2017-04-01 17:43:17 +02:00
Johnny.Hastings@gmail.com	2be3f20320	Implemented Soul Burn card for the two sets it's a part of: Ice Age and Invasion.	2017-03-31 18:33:17 -05:00
ingmargoudt	884ae83791	Merge pull request #3042 from ingmargoudt/card_functions ... move static function to CardImpl, and other api fixes	2017-03-31 18:52:37 +02:00
LevelX2	db25867067	* Fixed a problem of VariableCostImpl with stack abilities.	2017-03-31 17:30:41 +02:00
Achilles	c968a03ff8	- Fixes all but the Conflagrate issue in regards to FlashbackAbility. The CMC issue works with the Flashback cards as well. Conflagrate will require more testing to see what is going on.	2017-03-30 21:11:15 -05:00
ingmargoudt	6f8f10fcc3	move static function to CardImpl, and other api fixes	2017-03-30 20:09:47 +02:00
fireshoes	1bf2d1782c	[MPS-AKH] Added Amonkhet Masterpiece reprints. [MM3] Token updates	2017-03-29 10:42:43 -05:00
fireshoes	55b433ae36	[AKH] Added 3/27 spoilers to mtg-cards-data.txt. Implemented several of the new cards.	2017-03-28 22:25:29 -05:00
Derek M	1dcd3d0a81	Merge branch 'master' into type_api	2017-03-27 19:13:45 -04:00
Jeff	aa81a6d663	- LoseAbilityAllEffect() now works with rule 611.2c.	2017-03-27 17:17:56 -05:00
Jeff	c4dc0222d8	- Fixed Indomitable Creativity. Bug #3029	2017-03-27 16:42:32 -05:00
ingmargoudt	5cd1b5880f	fix supertype on the client	2017-03-27 22:20:19 +02:00
ingmargoudt	0879298e92	refactor cards to use supertype enum	2017-03-27 21:56:33 +02:00
ingmargoudt	84559457d3	refactor supertype to enum	2017-03-27 21:51:04 +02:00
Clint Herron	70e4752cfd	Merge remote-tracking branch 'upstream/master' into CMH-GuiltyConscienceAndBackfire	2017-03-27 08:37:27 -04:00
Achilles	3a2c828fb8	- Fixed Rivals' Duel.	2017-03-26 18:25:45 -05:00
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
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