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

10829 commits

Author SHA1 Message Date
drmDev
f22c91f82b Merge remote-tracking branch 'upstream/master' 2017-04-11 07:47:58 -04:00
Styxo
058b9e970c [AKH] Name fix 2017-04-11 11:57:29 +02:00
Styxo
0d40fccc62 [AKH] Added rest of 4/10 spoilers 2017-04-11 11:07:39 +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
Achilles
a08155341e - Added Vizier of the Menagerie. <Amonkhet> 2017-04-11 00:34:18 -05:00
drmDev
6e66e7703f Merge remote-tracking branch 'upstream/master' 2017-04-10 21:27:50 -04: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
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
Jeff
f119965f46 - Fixed cost of Greel, Mind Raker. 2017-04-10 14:53:43 -05:00
Derek Monturo
9bc6be736b merge 2017-04-10 10:15:37 -04:00
ThomasLerner
7a48387635 Fixed not giving counter option to non-opponent players that are not the spell's controller 
This update brings to code to compliance with LevelX2's reccomendation by using getPlayersInRange(source.getControllerId(), game) and checking manually that the player is not the spell's controller.
 2017-04-10 04:39:10 -04:00
ThomasLerner
57b50857cc Update IceCave.java 
I used getOpponents, but that required changing input from source.getControllerId() to spell.getControllerId() so that it would get the opponents of the player who played the spell, rather than the opponents of the player who controls Ice Cave. I also implemented a null check for the spellController as I made it.
 2017-04-09 18:23:34 -04:00
ThomasLerner
d510651bac Update IceCave.java 2017-04-09 06:34:37 -04:00
ThomasLerner
7a0a7d9a2f Update Apocalypse.java 
Added Ice Cave entry
 2017-04-09 06:32:43 -04:00
ThomasLerner
77618b7ef5 Create IceCave.java 2017-04-09 06:30:54 -04:00
Justin Herlehy
7ff949d686 [AKH] Liliana, Death's Majesty 
Corrected reanimation filter to correctly generate mouseover text.
 2017-04-08 23:42:03 -07: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
Mark Langen
f96a1532bf Add Approach of the Second Sun [AKH] + test 2017-04-08 20:03:23 -06:00
fireshoes
c44043532f [ANK] Added 4/7 spoilers to mtg-cards-data.txt and implemented a few simple cards. 2017-04-07 10:48:45 -05: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
Jeff
f43a15ab22 - Fixed Karn Liberated. 2017-04-06 11:41:51 -05:00
fireshoes
af0bcbc0a8 [AKH] Added some implemented cards to the Amonkhet set file. 2017-04-06 10:53:46 -05:00
ingmargoudt
ea6ba3c0a9 enum conditions 2017-04-06 16:30:22 +02:00
Justin Herlehy
932dda6d3b Implement Gideon of the Trials 
Unit Test not included as it was failing at last test.  Card tested on local server and confirmed that emblem applies as expected.
 2017-04-06 00:01:40 -07: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
LevelX2
2487cf0645 Merge pull request #3062 from ingmargoudt/cleanups 
Cleanups
 2017-04-05 22:35:05 +02:00
Jeff
efbdf9ee36 - Added Kefnet the Mindful. 2017-04-05 12:17:33 -05: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
3420d0d76c use getOrDefault 2017-04-05 19:10:45 +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
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