github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-27 11:07:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
17968 commits 2 branches 0 tags 782 MiB
Commit graph

10791 commits

Author SHA1 Message Date
fireshoes
4e3d75d937 Merge origin/master 2017-04-04 21:00:03 -05:00
fireshoes
8ff947c6f0 [AKH] Added embalm to the keyword file and card gen script. Implemented the rest of the embalm cards. 2017-04-04 20:57:25 -05:00
Mark Langen
a2e8cedd02 Merge branch 'master' into akh-card-frame 2017-04-04 18:36:37 -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
2296647df9 Merge origin/master 2017-04-04 18:02:31 -05:00
fireshoes
195ff7f554 [AKH] Added 4/4 spoilers and implemented non-exert/embalm/aftermath cards. 2017-04-04 17:57:08 -05:00
Jeff
796fca7c1b - Added Charisma. 2017-04-04 17:18:19 -05:00
Jeff
da34d6c3ca - Modified set for Bronze Bombshell. 2017-04-04 15:44:42 -05:00
Jeff
b76933d5b3 - Added Bronze Bombshell. 2017-04-04 15:41:48 -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
e42d195f8d [AKH] Added Anoiter Priest and embalm ability. 2017-04-04 17:55:37 +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
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
fireshoes
a04bbce5db [AKH] Added 4/3 spoilers and implemented several. 2017-04-03 23:52:39 -05: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
LevelX2
e88613da5c * Kira, Great Glass-Spinner - Fixed that targeting objects that later changed to creatures was ignored (related to #3041). 2017-04-03 10:30:28 +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
Johnny.Hastings@gmail.com
675c3346ac Removed duplicate line in SoulBurn, used correct reference to Soul Burn as [this] in SoulBurnEffect. 2017-04-02 10:17:39 -05:00
Achilles
9b6151e835 - Fixed Thran Turbine. Bug #3051. 2017-04-02 09:47:27 -05:00
LevelX2
a49f79cfc3 * Fixed a problem with replacement effects that add counters were applied more than once to the same EnteresTheBattlefield event (fixes #2872). 2017-04-02 09:46:17 +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
fireshoes
e70e7daa0f [AKH] Added cycling duals and basics. 2017-03-31 11:25:36 -05:00
Jeff
38a04fda37 - Added Myr Incubator. 2017-03-31 11:19:30 -05:00
Styxo
9b95064c1f Added Dismantle 2017-03-31 13:05:58 +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
212f963b43 Merge origin/master 2017-03-29 08:16:44 -05:00
Achilles
94dc4ac52c - Fixed Pathbreaker Ibex. Bug #2984 2017-03-28 22:34:19 -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
fireshoes
adc3b2ccac Fixed Chandra, Pyromaster only casting cards, not playing. Add Oracle's Vault to MLP 2017-03-28 22:16:14 -05:00
Derek M
b68bfdf4c2 Merge pull request #3032 from ingmargoudt/type_api 
Type api
 2017-03-28 22:48:02 -04:00
drmDev
c25361202a minor fixes - remove inconsistent test, make isperia ability non-optional 2017-03-27 23:36:06 -04:00
Achilles
f6279d1250 - Fix Isperia the Inscrutable. Bug #3018 2017-03-27 22:23:44 -05:00
drmDev
4bdf0f1c08 fix build - bonds of mortality using loseabilityalleffect 2017-03-27 23:14:29 -04: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
0879298e92 refactor cards to use supertype enum 2017-03-27 21:56:33 +02:00
Achilles
3a2c828fb8 - Fixed Rivals' Duel. 2017-03-26 18:25:45 -05:00
drmDev
dcc8dc68f9 Fixes #3022 : Game of Chaos refactor and fix 2017-03-26 11:55:18 -04:00
drmDev
523703b373 merge 2017-03-26 10:33:41 -04:00
Achilles
c2bcb59c82 - Added Barrin's Spite. Fixed a targeting issue. 2017-03-25 22:41:03 -05:00
Achilles
f7eab224dd - Missed Genju of the Cedars in that last commit. 2017-03-25 18:41:25 -05: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
908861e56a - Fixed Maralen of the Mornsong. 2017-03-25 14:07:14 -05:00
Achilles
302f1f8262 - Fixed Goblin Grenade 2017-03-24 21:18:06 -05:00
Achilles
9702074bf5 - Fixed the Dissention set. Accidently add War's Toll. 2017-03-24 18:54:28 -05:00
Achilles
e30821b6cf - Added Azorius AEthermage. Fixed Spellshift: The library must be shuffled. 2017-03-24 18:30:57 -05:00
Achilles
8bcb2d1d2d - Added Quicksilver Fountain 2017-03-23 15:13:13 -05:00
drmDev
57efb10003 fixing tokens exiled at end of combat - not at end step 2017-03-23 11:21:38 -04:00
ingmargoudt
5ae4ddce07 Merge branch 'master' into phantoms 2017-03-23 13:43:34 +01:00
Derek M
cf831eea28 Merge pull request #3007 from kubikrubikvkube/master 
Enums should be compared with == but not equals()
 2017-03-22 16:17:07 -04:00
Derek M
9c3aab3284 Merge pull request #3009 from Alexsandr0x/Citadel-of-Pain 
Citadel of Pain
 2017-03-22 16:16:21 -04:00
Alexsandro
bfb2b07ba6 Create unit tests 2017-03-22 13:09:49 -03:00
spjspj
ddd226e60c Merge pull request #3008 from spjspj/master 
spjspj - Add Chronomantic Escape (FUT)
 2017-03-23 00:45:35 +11:00
spjspj
d947a8d75b spjspj - Add Chronomantic Escape (FUT) 2017-03-23 00:44:03 +11: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
Achilles
1f9b51d833 - Added Noetic Scales 2017-03-21 21:37:11 -05:00
Achilles
1fc245eb10 - Set edit needed for Keldon Firebombers 2017-03-21 20:44:04 -05:00
Achilles
cdef5fb13b - Added Keldon Firebombers 2017-03-21 20:40:10 -05:00
drmDev
107b83c231 fixes tapped and attacking cards. reverted firecat blitz. created issue for that one 2017-03-21 19:57:49 -04:00
LevelX2
4b8c2d19ad Added Ogre Leadfoot. 2017-03-21 19:57:49 -04:00
Max Lebedev
338d032a8b updated author 2017-03-21 19:57:49 -04:00
Max Lebedev
2f031f883c added Divining Witch 2017-03-21 19:57:49 -04:00
ingmargoudt
59eb2ed568 change map for list 2017-03-21 19:57:49 -04:00
drmDev
5c34022175 second set using refactored createtokeneffect for exiling at end step 2017-03-20 21:57:26 -04:00
drmDev
a8f42de901 First set of cards updated to simplifed token creation and exile at end step 2017-03-20 21:30:48 -04:00
LevelX2
696272b328 * Misthollow Griffin - Fixed a bug that sometimes a not owning player could play the card from exile. 2017-03-20 23:09:14 +01:00
Alexsandro
a6e1c1a37d Add ability to cast 2017-03-20 19:03:12 -03:00
Alexsandro
096efc8951 Implement Citadel of Pain 2017-03-20 18:55:49 -03:00
Achilles
dc7e9318af - getPlayersInRange() added to All Hallow's Eve 2017-03-20 08:24:28 -05:00
Achilles
49974c5d66 - Added All Hallow's Eve. 2017-03-19 18:47:20 -05:00
drmDev
311e41abd2 refactored exiletokensAtEndStep 2017-03-19 17:54:07 -04:00
drmDev
dcd5c76bad minor typo fix 2017-03-19 12:33:12 -04:00
drmDev
c109fc8a0e Implemented card Lightning Coils and test for it 2017-03-19 12:23:58 -04:00
drmDev
164b6e00c2 merge 2017-03-18 09:44:16 -04:00
Jeff
b739c3bd7d - Fixed Hellcarver Demon. 2017-03-16 15:24:43 -05:00
fireshoes
86022e17cf [FUT] Added Reality Strobe and Festering March. 2017-03-16 11:42:43 -05:00
fireshoes
8516c6f365 Merge origin/master 2017-03-16 11:25:53 -05:00
fireshoes
bc9aba3cb7 [FUT] Added Reality Strobe and Festering March. 2017-03-16 11:24:37 -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
LevelX2
63e9ca9266 Merge pull request #2969 from Alexsandr0x/Machinate 
Implement Machinate + unitTests
 2017-03-16 17:00:18 +01:00
spjspj
894c575d34 Fix for UndeadAlchemist 2017-03-16 09:48:02 +01:00
fireshoes
2c814f8321 [JR] Added Homeward Path and Avacyn, Angel of Hope. [DDS] Added Lovisa Coldeyes and Jhoira of the Ghitu. 2017-03-16 09:48:02 +01:00
Clint Herron
1f20d0f2e9 Making card match generated template. 2017-03-15 23:18:28 -04:00
Clint Herron
7c5a18e5b1 Adding missing card Lavamancer's Skill from Onslaught. Tricky conditional continuous effect, but fun to implement. 2017-03-15 23:18:19 -04:00
spjspj
4824b96640 Merge pull request #2973 from spjspj/master 
Fix for UndeadAlchemist
 2017-03-16 00:50:08 +11:00
spjspj
b0fd3b0446 Fix for UndeadAlchemist 2017-03-16 00:49:29 +11:00
fireshoes
fdfdeb1ee1 [JR] Added Homeward Path and Avacyn, Angel of Hope. [DDS] Added Lovisa Coldeyes and Jhoira of the Ghitu. 2017-03-14 23:03:44 -05:00
Alexsandro
17bccde39d Implement Machinate + unitTests 2017-03-14 17:22:16 -03:00
ingmargoudt
234cfe9519 rewrote singleton to enum where applicable 2017-03-14 16:32:47 +01:00
Jeff
3b62489ef5 - Converted Deceiver of Form to use CopyEffect(). 2017-03-14 09:13:08 -05:00
Jeff
15a2b3444e - Fixed Zur's Weirdling. 2017-03-13 17:14:47 -05:00
Jeff
66362aa797 - Removed a debugging line. 2017-03-13 15:35:41 -05:00
Jeff
f52bc17ca5 - Fixed Declaration In Stone. 2017-03-13 15:31:27 -05:00
Jeff
0b2f7ffcdb - Fixed Vision Charm second ability. Rule 611.2c. 2017-03-13 12:18:44 -05:00
Jeff
4b3389b8cc - Fixed Elsewhere Flask and Terraformer. Rule 611.2c. 2017-03-13 11:57:39 -05:00
Justin Herlehy
a5628dcf5b Corrected ability cost on Phyrexian Broodlings 
Was coded as "T, Sac", corrected to "{1}, Sca".
 2017-03-12 23:34:47 -07:00
LevelX2
bfa9d17182 Merge origin/master 2017-03-12 21:00:26 +01:00
LevelX2
115512ad9b * Spellskite - Fixed a bug that target could not always be chnaged to Spellskite if other modes already targeted Spellskite. 2017-03-12 20:59:35 +01:00
Achilles
730fc3c95e - Fixed Eye of the Storm. It should resolve even if the triggered spell is not on the stack. 2017-03-12 13:40:56 -05:00
LevelX2
1b2636d0cd * Arachnuns Web - Fixed condition handling. Some renaming. 2017-03-12 10:36:51 +01:00
LevelX2
105ef6e571 Merge origin/master 2017-03-11 18:19:28 +01:00
LevelX2
037f471f5f * Stitcher's Graft - Fixed that the triggered ability was wrongly given to the equipped creature instead of being a ability of the equipment. Fixed a bug that prevented that the equipped creature did not untap after attacking. 2017-03-11 18:18:54 +01:00
ingmargoudt
1f215cdbe3 removed autoboxing : 
Boolean -> boolean
Integer -> int
Float -> float
 2017-03-11 15:17:14 +01:00
LevelX2
9d8a8a33f1 Xmage 1.4.22V0 2017-03-11 13:38:55 +01:00
LevelX2
d89dfd4ac3 Added some missing MM3 cards and fixed wrong collector numbers. Allow image download for MM3. 2017-03-11 12:33:59 +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
LevelX2
2d20045b61 Bloodbond March - minor change. 2017-03-11 09:49:51 +01:00
LevelX2
7843187bc7 Merge pull request #2958 from JRHerlehy/master 
Implement Bloodbond March
 2017-03-11 09:41:41 +01:00
Justin Herlehy
3e60eb7780 Implement Bloodbond March 2017-03-11 00:01:51 -08:00
Jeff
80f524d94d - Fixed type on Solemn Recruit 2017-03-10 16:18:39 -06:00
Jeff
8c62038d7e - Fixed Nacatl War-Pride 2017-03-10 15:59:06 -06:00
Jeff
609fbc7f7b - Fixed Uba Mask. 2017-03-10 15:20:25 -06:00
Nathaniel Brandes
74b9f0eb24 Remove some unnecessary checks. 2017-03-09 23:39:50 -08:00
Jeff
368dd9a5be - Fixed Possibility Storm. 
Issue: https://github.com/magefree/mage/issues/2685
 2017-03-09 12:26:50 -06:00
Jeff
cb5fc3037e - Changed the SimpleActivatedAbility to a SimpleManaAbility on Selvala, Heart of the Wilds. 2017-03-09 10:41:01 -06:00
Jeff
691c590e68 - Fixed Selvala, Heart of the Wilds. 2017-03-09 10:15:57 -06:00
Nathaniel Brandes
dd0c89db1d Fix Dack Fayden Emblem. 
The emblem's effect was referencing the permanent directly.
This meant that if the permanent left and came back, the control effect
would start working again.
 2017-03-09 02:24:34 -08:00
Justin Herlehy
964f2fb9d0 Corrected card listing in Scourge set file. 2017-03-09 01:57:21 -08:00
Justin Herlehy
9dd1e60f2d Implement Clutch of Undeath 
Implement Clutch of Undeath and add test to ensure functionality.
 2017-03-09 01:48:34 -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
Jeff
209e2d13c1 - Fix for Spellskite in situations where it was also a target. Fixed the test for Spellskite. 2017-03-08 12:05:36 -06: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
603984c8b0 Merge pull request #2946 from ingmargoudt/master 
various rewrites
 2017-03-07 22:29:13 +01:00
Derek M
2ff68c2fb3 Merge pull request #2944 from Alexsandr0x/sakashima-bug 
SpellStutter Sprite - Sakashima Impostor Bug
 2017-03-07 16:10:06 -05:00
ingmargoudt
c5002983e3 changed static zone function to enum method 2017-03-07 22:02:15 +01:00
Zach H
ca73258654 fix flashback cost 2017-03-07 15:29:06 -05:00
ingmargoudt
1caf3a6be4 change getLibrary().size() > 0 to hasCards() 2017-03-07 17:28:26 +01:00
Alexsandro
b83bc9d68a Assert if Sakashima copied SpellStutter by S/T 2017-03-06 21:11:09 -03:00
Alexsandro
3c5bd9acce Check if exists a target to counter in Stack before counter 2017-03-06 19:06:37 -03:00
spjspj
c34826611b spjspj - Implement Land Equilibrium (LEG, ME3) 2017-03-07 01:20:35 +11:00
spjspj
2e4d5e2bba spjspj - Implement Land Equilibrium (LEG, ME3) 2017-03-07 00:57:04 +11:00
spjspj
fd57cf537c spjspj - Implement Planar Void (USG) 2017-03-06 23:56:02 +11: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
drmDev
bf5e55aef9 modifications 2017-03-05 11:34:10 -05:00
drmDev
c8e41bc002 Phyrexian Purge impl and tests 2017-03-05 10:37:05 -05:00
ingmargoudt
d31e3a3f8f Merge pull request #2916 from ingmargoudt/master 
remove all contains(cardtype.XX) references, instead use the default …
 2017-03-05 09:16:28 +01:00
ingmargoudt
b5e8c88153 remove all contains(cardtype.XX) references, instead use the default interface method 2017-03-05 09:14:33 +01:00
ingmargoudt
ef797384e6 Merge pull request #2914 from kubikrubikvkube/master 
Should it be mandatory?
 2017-03-05 09:04:37 +01:00