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

9804 commits

Author SHA1 Message Date
LevelX2
3c6402f8a6 * Altar of the Brood - Fixed wrong rule tool tip text. 2016-09-23 00:32:48 +02:00
LevelX2
ae8e6122a5 * Smokestack - Fixed that the sacrifice was wrongly handled targeted. 2016-09-22 23:58:45 +02:00
LevelX2
500926f093 * Terastodon - Fixed that the tokens were not put to battlefield. 2016-09-22 23:42:43 +02:00
LevelX2
8fb04ddbef Fixed a bug that let cards disappear after moving cards from hand to library (e.g. Teferi's puzzle). 2016-09-22 21:36:21 +02:00
LevelX2
9805f4f9ef Merge pull request #2361 from HanClinto/master 
Implementing Quilled Sliver
 2016-09-22 20:53:42 +02:00
Clint Herron
44f8293c42 Fixing tabs to spaces 2016-09-22 14:39:12 -04:00
Clint Herron
2ca0639f15 Adding Quilled Sliver by merging Gemhide Sliver with Crossbow Infantry 2016-09-22 14:37:23 -04:00
LevelX2
3870a1e522 * Leovold, Emissary of Trest - Some code cleanup. 2016-09-22 20:36:10 +02:00
LevelX2
f90e440e79 Merge pull request #2343 from keflavich/patch-1 
SubtleStrike: add text to modes
 2016-09-22 19:54:03 +02:00
LevelX2
32e4f705c4 Merge pull request #2346 from maxlebedev/PsychoticEpisode 
Psychotic episode
 2016-09-22 19:53:33 +02:00
LevelX2
9feaed8b8b Merge pull request #2347 from maxlebedev/Curfew 
Added Curfew
 2016-09-22 19:52:29 +02:00
LevelX2
d6e19e4114 * Era of Innovation - Fixed wrong tool tip text. 2016-09-21 23:11:36 +02:00
LevelX2
130554954b * Selvala, Heart of the Wilds - Added the missing {G} cost for the mana ability. 2016-09-21 23:00:52 +02:00
LevelX2
716377cc32 * Multiform Wonder - Fixed the nor working boost effect. 2016-09-21 22:56:31 +02:00
LevelX2
a46bbfcd60 * Sequestered Stash - Fixed that the return to library effect was wrongly targeted. 2016-09-21 22:50:41 +02:00
LevelX2
f428d5533f * Selvala, Heart of the Wilds - FIxed tool tip text. 2016-09-21 22:42:09 +02:00
LevelX2
6b431be2ba * Shaman of the Great Hunt - Fixed that it triggerd also for other players. 2016-09-21 20:16:27 +02:00
LevelX2
23e24f32ba * Myojin of Life's Web - Fixed the put from hand to battlefield effect. 2016-09-21 19:36:01 +02:00
LevelX2
babeb5418c * Lightmine Field - Fixed that the damge done was not preventable. 2016-09-21 19:34:29 +02:00
Adam Ginsburg
e72393c16d Add text to Subtle Strike's modes to clarify which creature is getting + 
and which is getting -
(followed by a few minor squashed commits)

Maybe java fixes?

semicolons

change case
 2016-09-21 10:18:55 -06:00
Styxo
b6f71f3621 Merge pull request #2357 from Styxo/master 
Added Silvergill Douser
 2016-09-21 17:08:13 +02:00
spjspj
fc728b110c Merge pull request #2356 from spjspj/master 
spjspj - Tooltip text for Reconnaissance (EXO)
 2016-09-22 01:07:53 +10:00
spjspj
3e7479317c spjspj - Tooltip text for Reconnaissance (EXO) 2016-09-22 01:03:12 +10:00
Derek M
c05975f7eb Merge pull request #2344 from Fr33dan/master 
Update EraOfInnovation.java
 2016-09-21 08:52:44 -04:00
Derek M
b6d8f3ca10 Merge pull request #2345 from maxlebedev/master 
Prelate now shows the chosen number
 2016-09-21 08:52:31 -04:00
LevelX2
c82d6b5566 * Fixed some possible null pointer exceptions. 2016-09-20 23:40:25 +02:00
Max Lebedev
493cf1e3e6 removed an extra word from rules text 2016-09-20 14:57:37 -04:00
Styxo
ab6112f0a0 Added Silvergill Douser 2016-09-20 17:12:19 +02:00
emerald000
ab352100f1 Fixed Panharmonicon triggering for non-permanents. 2016-09-20 09:34:36 -04:00
Max Lebedev
5b35c5e9d5 Added Curfew 2016-09-20 05:42:29 -04:00
Max Lebedev
781fff2169 Added Psychotic Episode 2016-09-20 04:54:35 -04:00
Max Lebedev
85fd7bbea2 Prelate now shows the chosen number 2016-09-20 02:57:59 -04:00
Fr33dan
9cec1aa54b Update EraOfInnovation.java 
Card triggered for all creatures when it should only trigger for Artificers
 2016-09-20 01:05:06 -04:00
Styxo
8485df8cb7 Added Blessed Wind and few refactors 2016-09-20 00:17:56 +02:00
spjspj
a4195b2bb0 spjspj - Fix for if Combustible Gearhulk dies prior to trigger resolving KLD 2016-09-19 23:42:43 +10:00
emerald000
120d7612f6 Fixed Panharmonicon triggering for opponents abilities. Added tests. 2016-09-19 09:22:21 -04:00
LevelX2
b89822a655 * Inventer's Google - Fixed wrong parameters. 2016-09-19 11:22:50 +02:00
LevelX2
50c2b52d73 * Spark of Creativity - Fixed the missing target definition. 2016-09-19 11:18:49 +02:00
LevelX2
43f1cd929a Merge pull request #2332 from brodee/master 
Fixed: Inventor's Goggle was triggering for opponent's creatures. it shouldn't
 2016-09-19 09:30:17 +02:00
brodee
dba0f14591 Fixed: Inventor's Goggle was triggering for opponent's creatures. it shouldn't 2016-09-18 23:24:51 -07:00
LevelX2
95a641d08b Merge pull request #2327 from brodee/master 
Capture by the consolate incorrectly prevented creatures from blocking.
 2016-09-19 07:15:36 +02:00
LevelX2
8f836f8cda Merge pull request #2318 from cg5-/aetherborn-marauder-fix 
Fix Aetherborn Marauder's ETB ability
 2016-09-19 07:13:50 +02:00
brodee
7b336e3a0b Captured by the Consulate incorrectly prevented creature from blocking 2016-09-18 15:44:46 -07:00
brodee
94fa24813b Merge branch 'master' of https://github.com/brodee/mage 2016-09-18 15:41:18 -07:00
brodee
d01e8303e8 Captured by the Consulate incorrectly prevented creature from blocking 2016-09-18 15:37:43 -07:00
brodee
b5d965d9ba Captured by the Consulate incorrectly prevented creature from blocking 2016-09-18 15:35:56 -07:00
brodee
16e82ac582 Capture by the consolate incorrectly prevented creatures from blocking. 2016-09-18 15:28:28 -07:00
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