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

9757 commits

Author SHA1 Message Date
LevelX2
ea38924b5a Merge pull request #2325 from Dilnu/master 
Fix the combat code to support Slayer's Cleaver
 2016-09-18 22:51:27 +02:00
Dilnu
87a6d3a1ee Fix the combat code to support Slayer's Cleaver 
Update the checks for unfulfilled conditions to confirm the blocking
creatures actually are fulfilled.
Update the check for whether a blocker is already being used correctly
to confirm that there isn’t a stricter condition that is unfulfilled.

This change also updates the Slayer’s Cleaver test to make it more
robust.
 2016-09-18 16:28:01 -04:00
LevelX2
0702571be8 * Eddytrail Hawk - Fixed that the triggered ability was not optional. 2016-09-18 22:26:41 +02:00
LevelX2
2788bb9a17 * Start Your Engines - Fixed that the second effect did not work for vehicles animated by the first effect. 2016-09-18 20:12:01 +02:00
LevelX2
2c60990e46 * Revolutionary Rebuff - Fixed that the ommit of artifact spells did not work. 2016-09-18 18:21:16 +02:00
LevelX2
053fec43d7 * Janjeet Sentry - Fixed the missing target of the activated ability. 2016-09-18 18:17:07 +02:00
LevelX2
143f347d4e * Nature's Way - Fixed that the damage was not dealt. 2016-09-18 18:13:30 +02:00
LevelX2
03f14a0e2f * Take Down - Fixed that the first mode could also target creatures without flying. 2016-09-18 18:04:50 +02:00
LevelX2
332586e5b8 * Eddytrail Hawk - Fixed that instead of flying wrongly indestructible was given. 2016-09-18 18:00:47 +02:00
spjspj
e9d2d48459 Wrong collector ID 2016-09-19 00:49:21 +10:00
spjspj
a5e6bf6896 Some minor fixes. 2016-09-19 00:45:18 +10:00
cg5
33e1e03288 Fix Aetherborn Marauder's ability 2016-09-18 16:07:21 +02:00
spjspj
877c4ffa61 Merge pull request #2316 from cg5-/bug-fixes 
Fix bugs in Ninth Bridge Patrol and Renegade Freighter
 2016-09-18 23:23:24 +10:00
cg5
bf16b25f51 Fix bugs in Ninth Bridge Patrol and Renegade Freighter 2016-09-18 12:25:03 +02:00
LevelX2
e5466470ef * Select for Inspection - Fixed wrong casting costs (fixes #2315). 2016-09-18 09:07:20 +02:00
LevelX2
c971aea67d * Gonti, Lord of Luxury - Fixed a endless loop error. 2016-09-18 01:15:56 +02:00
LevelX2
844b36c7dc * Glimmer of Genius - Fixed the missing Instant card type. 2016-09-18 00:16:20 +02:00
LevelX2
a1e70e21f4 [KLD] Some more fixes. 2016-09-17 20:18:54 +02:00
LevelX2
bf73eb4042 Merge pull request #2310 from fenhl/ae 
Change AE to Ae
 2016-09-17 19:04:42 +02:00
LevelX2
a6d72d4101 [KLD] Some more fixes. 2016-09-17 19:01:00 +02:00
Fenhl
ab7e86cb27 Change AE to Ae 2016-09-17 16:59:24 +00:00
LevelX2
346b6654f8 [KLD] Some minor fixes. 2016-09-17 18:17:01 +02:00
LevelX2
d9c804602e Merge origin/master 2016-09-17 17:01:29 +02:00
LevelX2
1d4d612501 [KLD] Some card names fixed. 2016-09-17 17:01:06 +02:00
spjspj
086ef80172 Merge pull request #2309 from spjspj/master 
spjspj - Fairgrounds Trumpeter (KLD)
 2016-09-18 00:46:22 +10:00
spjspj
7ccd05afd5 spjspj - Fairgrounds Trumpeter (KLD) 2016-09-18 00:45:35 +10:00
LevelX2
5d98324c82 Merge origin/master 2016-09-17 16:32:42 +02:00
LevelX2
9accd877a5 [KLD] Added 7 green and 1 multicolor card. 2016-09-17 16:32:17 +02:00
spjspj
9151199d7c Merge pull request #2308 from spjspj/master 
spjspj - Durable Handicraft(KLD)
 2016-09-18 00:07:12 +10:00
spjspj
73a6749dbc spjspj - Durable Handicraft(KLD) 2016-09-18 00:06:07 +10:00
LevelX2
4b768812f6 [KLD] Added 6 artifacts and 1 multicolor card. 2016-09-17 15:56:18 +02:00
spjspj
68be138d6b Merge pull request #2307 from spjspj/master 
spjspj - Deadlock Trap (KLD)
 2016-09-17 23:30:22 +10:00
spjspj
f891d66e92 spjspj - Deadlock Trap (KLD) 2016-09-17 23:29:24 +10:00
LevelX2
e7c5effa7f [KLD] Added 13 red cards. 2016-09-17 15:18:34 +02:00
LevelX2
c087296c05 Merge origin/master 2016-09-17 14:57:24 +02:00
spjspj
a6723dade7 spjspj - 1 kld card 2016-09-17 22:39:31 +10:00
spjspj
b697e6bcfa spjspj - 3 KLD cards 2016-09-17 22:31:25 +10:00
LevelX2
c515a6d690 [KLD] Added 15 black cards. 2016-09-17 13:44:30 +02:00
spjspj
c8937f8ab4 Merge pull request #2302 from spjspj/master 
spjspj - 4 Green / Golgari card/s
 2016-09-17 18:59:29 +10:00
spjspj
c412544280 spjspj - 2 KLD {G} cards 2016-09-17 18:57:44 +10:00
spjspj
cc01ae7634 spjspj - Kujar Seedsculptor 2016-09-17 18:49:15 +10:00
spjspj
9417f6f186 spjspj - Hazardous Conditions 2016-09-17 18:29:41 +10:00
LevelX2
5244363081 [KLD] Added 7 blue cards. 2016-09-17 10:17:40 +02:00
LevelX2
18cce84694 [KLD] Added 4 cards implemented from ingmargoudt. 2016-09-17 08:41:39 +02:00
LevelX2
12001a6a03 Merge pull request #2297 from maxlebedev/master 
Changes similar cards to have mana instead of activated abilities.
 2016-09-17 08:30:56 +02:00
Max Lebedev
a5fb372d3c Selvala Explorer Returned now has a mana ability (I hope) 2016-09-17 01:40:01 -04:00
spjspj
a82584461a spjspj - Empyreal Voyager 2016-09-17 13:30:38 +10:00
Max Lebedev
7805d22de6 Merge branch 'master' of https://github.com/magefree/mage 2016-09-16 21:32:49 -04:00
Max Lebedev
43fa5ed06d Changes similar cards to have mana instead of activated abilities. This addresses the bug reported on post 201914 in the forum 2016-09-16 21:31:59 -04:00
LevelX2
ac4c6755a2 [KLD] Removed wrongly generated simple card. 2016-09-17 02:20:56 +02:00
LevelX2
1673a0dcf6 [KLD] Added 6 blue cards. 2016-09-17 02:09:36 +02:00
LevelX2
b9953a5ca9 Merge origin/master 2016-09-17 02:08:47 +02:00
LevelX2
d3d1402fbb [KLD] Added 9 white cards. 2016-09-17 00:45:33 +02:00
LevelX2
e669395000 Merge pull request #2296 from cg5-/some-red-cards 
Add 3 red cards
 2016-09-17 00:37:19 +02:00
cg5
286f84c861 Add 3 red cards 2016-09-17 00:27:46 +02:00
LevelX2
d7dd635bca Revert "introduced StringUtil class with .isEmpty(String input) and .isNotEmp…" 2016-09-16 23:55:54 +02:00
LevelX2
aa661e6ac3 [KLD] Added simple automatically generated cards. 2016-09-16 22:26:04 +02:00
LevelX2
46f05a9eaa [KLD] Spark of Creativity. 2016-09-16 22:20:47 +02:00
LevelX2
9c75b81354 Merge pull request #2292 from ingmargoudt/master 
introduced StringUtil class with .isEmpty(String input) and .isNotEmp…
 2016-09-16 21:57:36 +02:00
ingmargoudt
1327279fc1 implemented Glimmer of Genius - KLD 2016-09-16 21:56:33 +02:00
LevelX2
8ca9e078e1 Merge pull request #2290 from maxlebedev/master 
added Selvala
 2016-09-16 21:54:42 +02:00
ingmargoudt
534621560b Implemented Revolutionary Rebuff - KLD 
fixed setcode for 2 KLD cards
 2016-09-16 21:47:58 +02:00
ingmargoudt
3085f4e6a4 implemented Vedalken Blademaster - KLD 2016-09-16 21:35:46 +02:00
ingmargoudt
b441616a48 implemented Rush of Vitality - KLD 2016-09-16 21:24:36 +02:00
ingmargoudt
fb15c79964 Merge pull request #2293 from royk/welding-sparks 
looks good to me!
 2016-09-16 21:13:45 +02:00
Roy Klein
b0ad1182f5 Added Kaladesh: MakeObsolete 2016-09-16 21:03:48 +02:00
Max Lebedev
e6566e1e80 removed unnecessary SelvalaHeartOfTheWildsTriggeredAbility 2016-09-16 14:36:25 -04:00
Max Lebedev
d44d0c0378 fixed a bug with Cabal Therapy where it would 'look at' rather than 'reveal' a hand 2016-09-16 14:22:58 -04:00
Max Lebedev
e959ccb972 added Selvala 2016-09-16 14:10:05 -04:00
fireshoes
24cd3dcc0e [KLD] Updated mtg-cards-data with complete spoiler. Added some reprints. Added Midnight Oil (needs MaximumHandSizeControllerEffect rework). 2016-09-16 12:21:51 -05:00
LevelX2
b6c844d2b3 [KLD] Added 2 artifacts. 2016-09-16 17:51:05 +02:00
LevelX2
39b01378cc Merge origin/master 2016-09-16 17:28:37 +02:00
LevelX2
d6366be9ea [KLD] Added 3 green adn 3 red cards. 2016-09-16 17:27:21 +02:00
spjspj
06c2a7b8a5 spjspj - Combustible Gearhulk 2016-09-17 01:15:13 +10:00
spjspj
7214d31f78 spjspj - Combustible Gearhulk 2016-09-16 23:54:17 +10:00
spjspj
5e6df1d1df Merge pull request #2288 from spjspj/master 
spjspj - Combustible Gearhulk
 2016-09-16 23:48:25 +10:00
spjspj
24ae338f87 spjspj - Combustible Gearhulk 2016-09-16 23:47:44 +10:00
spjspj
a82c8d9903 Merge pull request #2287 from spjspj/master 
spjspj - Combustible Gearhulk
 2016-09-16 23:46:47 +10:00
spjspj
25674c00da spjspj - Combustible Gearhulk 2016-09-16 23:43:27 +10:00
LevelX2
a0e797cc5c [KLD] Added 5 red cards. 2016-09-16 15:08:03 +02:00
spjspj
0a43d2abd4 spjspj - ChandrasPyrohelix 2016-09-16 21:57:17 +10:00
spjspj
a8c3ebe7ed spjspj - Fix for BallistaCharger 2016-09-16 21:54:07 +10:00
spjspj
1a29534f6a spjspj - Add two vehicles 2016-09-16 21:46:10 +10:00
fireshoes
f35da6030c [KLD] Updated mtg-cards-data with more 9/15 spoilers. Implemented several blue cards. 2016-09-16 01:27:11 -05:00
fireshoes
31afdefe7b [KLD] Updated mtg-cards-data with another 9/15 spoiler. Implemented several cards. Minor text fixes. 2016-09-15 19:36:19 -05:00
LevelX2
3fb5a60202 [KLD] Added 12 green cards. 2016-09-16 00:41:03 +02:00
LevelX2
47e38e32bb [KLD] Added 2 white cards. Name fix for Master Trinketeer. 2016-09-15 22:31:26 +02:00
fireshoes
360823ec2e [KLD] Updated mtg-cards-data with 9/15 spoilers. Implemented several cards. 2016-09-15 12:02:13 -05:00
LevelX2
0042dc1ad9 Some minor fixes to game log / card rules text /messages. 2016-09-15 16:10:17 +02:00
ingmargoudt
4e3ec26dbd Merge pull request #2264 from maxlebedev/master 
Added Dream Leash
Code checked, thanks
 2016-09-15 13:27:59 +02:00
fireshoes
4c0c7b512b [KLD] Updated mtg-cards-data with more 9/14 spoilers. Add 6 white cards. 2016-09-15 01:43:53 -05:00
emerald000
b3acb61be5 [KLD] Added 4 cards. 
Metalwork Colossus, Perpetual Timepiece, Restoration Gearsmith and Torch Gauntlet.
 2016-09-15 01:35:27 -04:00
Mark Langen
577bdaea84 Fixes and additions to card rendering 
* Vehicles are rendered with a vehicle background and changed P/T box color
* Kaladesh Inventions are rendered with the invention frame
* Kaladesh Inventions use the full-frame art if they detect that you have that full art downloaded instead of normal card images.
* Changed land text-box colors to be a bit more saturated to make it clearer what colors they produce
* Added mana symbol in the textbox of basic lands instead of rules text as long as they have no additional abilities.
* Fixed problem with triggered abilities on the stack showing up with a type of "??? Ability". Not sure what the real cause is but those abilities have abilityType = null, just worked around it.
 2016-09-14 19:37:12 -06:00
Samuel Sandeen
0214576146 Merge branch 'magefree/master' 2016-09-14 18:56:20 -04:00
LevelX2
e73be58113 * Crown of Doom - Fixed a bug of target handling of the activated ability. 2016-09-14 22:49:13 +02:00
LevelX2
14cd2dfa6d * Jeleva, Nephalia's Scourge and Knowledge Pool - Fixed a bug that created null pointer exception if card was cast from exile. 2016-09-14 22:31:04 +02:00
LevelX2
547d53a2ec [KLD] Added 5 white cards. 2016-09-14 21:51:52 +02:00
fireshoes
9bd9fa2e53 [KLD] Updated mtg-cards-data with 9/14 spoilers. Implemented some black cards and reprints. 2016-09-14 14:29:16 -05:00
LevelX2
14b2760e99 * Fixed a bug that prevented moving tokens to other zones in some cases. 2016-09-14 20:51:03 +02:00
LevelX2
eae53c0cfc Merge pull request #2268 from ingmargoudt/master 
replace [list].size() == 0 and [string].length() == 0 to use .isEmpty…
 2016-09-14 17:15:10 +02:00
LevelX2
ce94e573e4 * Ral Zarek - Fixed target handling of ability one. 2016-09-14 17:11:18 +02:00
LevelX2
317ba7fd87 * Terastodon - Fixed a problem that tokens were already created before all target permanents were destroyed. 2016-09-14 16:08:31 +02:00
ingmargoudt
3128bd2b4b replace [list].size() == 0 and [string].length() == 0 to use .isEmpty() instead 2016-09-14 15:27:31 +02:00
LevelX2
3612332607 [KLD] Added Speedway Fanatic. Added tests for crew keyword. 2016-09-14 15:16:40 +02:00
LevelX2
8598cf2a33 Merge pull request #2262 from ingmargoudt/master 
removed some contains on sets
 2016-09-14 12:19:28 +02:00
emerald000
542a1ef1d9 [KLD] Added 5 cards. 
Bomat Courier, Dovin Baan, Electrostatic Pummeler, Scrapheap Scrounger and Whirler Virtuoso.
 2016-09-14 03:27:48 -04:00
ingmargoudt
5289dd3df8 no need to do contains followed by an add on a set #2 2016-09-14 09:10:08 +02:00
ingmargoudt
aad6a0d1f3 no need to do contains followed by an add on a set 2016-09-14 09:10:08 +02:00
Samuel Sandeen
c6e2dc100c Don't not an equals outside the equals. 2016-09-13 21:15:29 -04:00
Samuel Sandeen
e64e068b88 Remove unneeded code in SkyblinderStaff 2016-09-13 21:09:26 -04:00
Samuel Sandeen
612e53300b Fix Mindless Null 2016-09-13 21:08:08 -04:00
Samuel Sandeen
9f111984da Merge branch 'magefree/master' 2016-09-13 20:51:35 -04:00
Samuel Sandeen
7c3c8403b2 Fix Skybinder Staff 2016-09-13 20:51:09 -04:00
Max Lebedev
14629dbd71 Added Dream Leash 2016-09-13 14:33:20 -04:00
emerald000
959eaf6dab [KLD] Added Panharmonicon. 2016-09-13 08:21:16 -04:00
fireshoes
628b1a6573 [KLD] Updated mtg-cards-data.txt with more 9/12 spoilers and added Masterpiece Series reprints. Added Masterpiece Series pack distribution code to KLD and AER. 2016-09-12 23:48:08 -05:00
fireshoes
99cab69dc0 [KLD] Updated mtg-cards-data.txt with more 9/12 spoilers and added basic lands. 2016-09-12 14:23:33 -05:00
fireshoes
6ea98ba19b [KLD] Updated mtg-cards-data.txt with spoilers through 9/12. Add Masterpiece Series set and 4 known reprints so far. 2016-09-12 14:02:48 -05:00
emerald000
2da90bab93 [KLD] Added 12 cards. 
Aether Hub; Cloudblazer; Cultivator's Caravan; Depala, Pilot Exemplar; Dynavolt Tower; Kambal, Consul of Allocation; Key to the City; Rashmi, Eternities Crafter; Saheeli Rai; Smuggler's Copter; Unlicensed Disintegration and Voltaic Brawler.
 2016-09-12 08:58:16 -04:00
spjspj
793fc13226 Merge pull request #2251 from spjspj/master 
spjspj - Implement Paradoxical Outcome (KLD)
 2016-09-12 00:15:19 +10:00
LevelX2
d03d65190e * Fixed a bug of Fate Reforged booster generation adding wrong rarities. 2016-09-11 10:18:10 +02:00
LevelX2
c95646db8e Merge pull request #2248 from Dilnu/master 
Implement Skullbriar, the Walking Grave
 2016-09-11 09:38:22 +02:00
LevelX2
1aade7f26a Merge pull request #2250 from maxlebedev/master 
Added SanctumPrelate
 2016-09-11 09:38:14 +02:00
Max Lebedev
bc09772e4a Added SanctumPrelate 2016-09-11 02:20:23 -04:00
LevelX2
5d62444f36 [CN2] Added Splitting Slime. 2016-09-11 00:27:58 +02:00
LevelX2
ea9c00ed86 * Chandra, Torch of Defiance - Fixed cost of fourth ability. 2016-09-11 00:22:14 +02:00
LevelX2
2429e1ad0f [CN2] Added 3 creatures with monstrosity. 2016-09-11 00:02:37 +02:00
Samuel Sandeen
3ac80b45f3 Merge branch 'magefree/master' 2016-09-10 17:47:40 -04:00
Samuel Sandeen
4fc3418de4 Implement Skullbriar, the Walking Grave 
Skullbriar is implemented by a combination of a replacement effect that
serves as a marker and an override of the update zone change counter
function that copies counters from one zone to the next.
 2016-09-10 17:47:29 -04:00
LevelX2
7fd6d286f6 Merge pull request #2243 from maxlebedev/master 
Added Leovold, Emissary of Trest. VernalEquinox is now symmetrical
 2016-09-10 22:38:06 +02:00
LevelX2
0e033bd43c * Hissing Quagmire - Fixed wrong token colores (fixes #2247). 2016-09-10 22:26:07 +02:00
Max Lebedev
c3e8903105 watcher now saves info for all players. Rule modifying effect does the check 2016-09-10 15:23:09 -04:00
LevelX2
bb8326d46b XMage 1.4.15v0 2016-09-10 12:31:18 +02:00
LevelX2
79f8617cd3 Some minor changes. 2016-09-10 11:44:52 +02:00
Max Lebedev
7ce878a315 Added Leovold, Emissary of Trest. VernalEquinox is now a symmetrical effect 2016-09-09 17:19:18 -04:00
Nathaniel Brandes
678a46dba8 Fix shapesharer's duration. 2016-09-09 11:58:04 -07:00
Nathaniel Brandes
bb6faa39c1 Fix night side color of Ulrich, Uncontested Alpha. 2016-09-09 11:20:12 -07:00
Samuel Sandeen
ac6a289275 Merge branch 'magefree/master' 2016-09-08 19:12:19 -04:00
LevelX2
21baa14404 * Fixed a problem with token P/T reset (fixes the problem with Tree of Perdition and Soul Separator). 2016-09-08 17:15:40 +02:00
spjspj
d01307e5ea spjspj - Fix for Paradoxical Outcome (KLD) 2016-09-09 00:31:23 +10:00
spjspj
1c49100d75 spjspj - Implement Paradoxical Outcome (KLD) - shroud wasn't being followed 2016-09-08 17:31:42 +10:00
spjspj
8cd3ec1135 spjspj - Implement Paradoxical Outcome (KLD) (done with addition to SweepEffect) 2016-09-08 17:09:47 +10:00
emerald000
67f29124f8 [KLD] Added 15 artifacts. 
Aetherflux Reservoir, Aetherworks Marvel, Animation Module, Cogworker's Puzzleknot, Decoction Module, Demolition Stomper, Fabrication Module, Fireforger's Puzzleknot, Fleetwheel Cruiser, Ghirapur Orrery, Glassblower's Puzzleknot, Inventor's Goggles, Metalspinner's Puzzleknot, Ovalchase Dragster and Skysovereign, Consul Flagship.
 2016-09-08 02:10:26 -04:00
Mark Langen
8d90f4558d Merge pull request #2234 from stravant/master 
Characteristic-Based rendering initial release completed unless further bugs come up before then.
 2016-09-07 23:16:10 -06:00
Samuel Sandeen
80da09471d Merge remote-tracking branch 'magefree/master' 2016-09-07 23:31:38 -04:00
spjspj
8375af12f2 spjspj - Implement Fountain Watch 2016-09-08 12:38:19 +10:00
fireshoes
72b13214e6 [KLD] Updated mtg-cards-data.txt with 9/7 spoilers. 2016-09-07 10:59:51 -05:00
Mark Langen
f0a1938b3e Full art Land rendering 
* Added "frameStyle" tagging to relevant full art lands (ZEN, BFZ, UNG, UHG)

* Added support for rendering based off of frameStyle

* Outstanding bug that frameStyle doesn't seem to be replicated exactly properly
 2016-09-07 02:20:51 -06:00
emerald000
df2782fdb6 [KLD] Basic implementation of energy counters. Added Woodweaver's Puzzleknot. 
Better display of energy counters would be preferred.
 2016-09-07 01:07:21 -04:00
fireshoes
f67cb21f2a [KLD] Implemented Chandra, Torch of Defiance; Chandra, Pyrogenius; Nissa, Nature's Artisan; and Nissa, Vital Force. 2016-09-06 22:15:33 -05:00