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

1444 commits

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