Commit graph

5662 commits

Author SHA1 Message Date
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