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

9903 commits

Author SHA1 Message Date
LevelX2
5d94ed8dd0 Some clean up changes. 2016-10-02 17:27:05 +02:00
LevelX2
5469facdd6 Added a test. 2016-10-02 16:15:04 +02:00
Styxo
8e9cbff67c [CN2] Added two cards 2016-10-02 15:42:35 +02:00
Eirkei
31b42c1a8d Tempting Wurm Implemented 2016-10-02 13:12:49 +02:00
LevelX2
da0080e2e1 * Ethersworn Canonist - Code cleanup. 2016-10-02 07:26:59 +02:00
fireshoes
cfcefb3877 Fixed some incorrect collector numbers. 2016-10-01 20:15:23 -05:00
Eirkei
6e2e3e4194 Ashling's Prerogative implemented 2016-10-01 17:24:16 +02:00
Simown
8b66eff239 Fixed typo on Aerial Volley 2016-10-01 12:25:38 +01:00
emerald000
2da4edafb8 [CN2] Implemented Melee ability. Added 3 cards using it. 
Deputized Protester, Menagerie Liberator and Wings of the Guard.
 2016-10-01 06:33:46 -04:00
LevelX2
03d7ea9ecd * Selvala, Explorer Returned - Fixed a bug that mana and life for the controller was not provided. 2016-09-30 11:34:27 +02:00
JOAC69
58252f5b5f Refactor - Move Born of the Gods tokens to shared area 2016-09-29 19:58:11 -05:00
JOAC69
da94a40658 Refactor - Use shared EldraziHorrorToken 2016-09-29 19:58:11 -05:00
JOAC69
bb185c6844 Refactor - make ElementToken classes inner classes to avoid collision 2016-09-29 19:58:11 -05:00
JOAC69
01592c7e50 Refactor - make VampireToken classes inner classes to avoid collision 2016-09-29 19:58:11 -05:00
JOAC69
171e9f183d Refactor - moved OpponentsPoisonCountersCount to shared area 2016-09-29 19:58:11 -05:00
JOAC69
f2d358b5b4 Refactor - moved WallOfResurgenceToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
a12e830a1b Refactor - moved HumanSoldierToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
9eb078842b Refactor - moved KorAllyToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
a5c6cdd9cf Refactor - moved OozeToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
d3160fb861 Refactor - moved BatToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
ffd333c034 Refactor - moved VampireKnightToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
c00692ffad Refactor - moved HumanWizardToken to shared area 2016-09-29 19:58:11 -05:00
JOAC69
97bf274fc8 Fix - GreatestPowerGreatestPowerCountCreatureYouControl was using GreatestPowerCount on copy operation instead of new GreatestPowerCountCreatureYouControl. Fixed naming issue on those two classes as well 2016-09-29 19:58:11 -05:00
JOAC69
0ee3d6c662 Refactor - moved ChromaOutrageShamanCount to shared area 2016-09-29 19:58:11 -05:00
JOAC69
b17b5c9e1a Refactor - moved ZuberasDiedDynamicValue to shared area 2016-09-29 19:58:11 -05:00
JOAC69
8e6389040d Refactor - moved ZuberasDiedWatcher to shared area 2016-09-29 19:58:11 -05:00
JOAC69
08ac7ab342 Refactor - moved MistmeadowWeitchEffect to shared area 2016-09-29 19:58:11 -05:00
JOAC69
37f01e88f3 Refactor - moved FeralDeceiverAbility to shared area 2016-09-29 19:58:11 -05:00
JOAC69
8206e29493 Refactor - SkywardEyeProphetsEffect is shared so moved to new RevealTopLandToBattlefieldElseHandEffect 2016-09-29 19:58:11 -05:00
JOAC69
1005fd65f9 Refactor - move MoreCardsInHandThanOpponentsCondition to shared file 2016-09-29 19:58:11 -05:00
JOAC69
71c8adbe5f Refactor - replaced redundant crews abilities with shared CrewsVehicleSourceTriggeredAbility 2016-09-29 19:58:11 -05:00
JOAC69
adf9c1bfe0 Refactor - changed SnappingDrake and EagleOfTheWatch to only derive from one version for card reorg 2016-09-29 19:58:11 -05:00
JOAC69
671fca15d6 Refactor - changed visibility of effects that would class on card reorg 2016-09-29 19:58:11 -05:00
JOAC69
15478460f9 Refactor - changed visibility of DragonToken classes used in separate Card classes in prep for card reorg 2016-09-29 19:58:11 -05:00
JOAC69
0d3b18c70d Refactor - Changed visibility of HellionToken classes used in separate Card classes in prep for card reorg 2016-09-29 19:58:11 -05:00
JOAC69
ecde8dd0b3 Refactor - remove duplicate SkeletonToken classes 2016-09-29 19:58:11 -05:00
JOAC69
a9e479f7dd Refactor - made card specific effects to attack random opponent shared effects 2016-09-29 19:58:11 -05:00
JOAC69
568044261c Refactor - remove duplicate TargetPlayerCardsInHand classes and made CardsInTargetHandCount shared 2016-09-29 19:58:11 -05:00
JOAC69
4cd4dbfcd2 Refactor - rename different empblems that were named the same 2016-09-29 19:58:11 -05:00
JOAC69
3e2c3a6ab2 Refactor - Rename Override card class to OverrideCard to not conflict with java.lang.Override. 2016-09-29 19:58:11 -05:00
JOAC69
d1f18ced96 Refactor - remove duplicate CantBeBlockedByWallsEffect and replace with CantBeBlockedByCreatureAttachedEffect 2016-09-29 19:58:11 -05:00
JOAC69
d4f8224ee9 Refactor - remove duplicate DamageCantBePreventedEffect classes 2016-09-29 19:58:11 -05:00
JOAC69
541c9727ff Refactor - remove duplicate AdditionalAttackPhaseEffect classes 2016-09-29 19:58:11 -05:00
LevelX2
ca414417e3 [SWS] Fixed some bugs of starwars cards. 2016-09-30 01:22:56 +02:00
LevelX2
81b74c1519 [SWS] Fixed a bug of Hungry Dragonsnake. 2016-09-29 18:00:00 +02:00
LevelX2
daf34c6bf0 Some fixes to Emblems of Starwars set and Elspeth, Sun Champion. 2016-09-29 17:31:20 +02:00
LevelX2
289606d25e Some minor fixes to Riptide Replicator and Elvish Guidance. 2016-09-29 12:58:56 +02:00
LevelX2
cd1832ecc4 Merge pull request #2393 from HanClinto/master 
Implementing Riptide Replicator
 2016-09-29 12:52:33 +02:00
LevelX2
152a4439ca Merge pull request #2404 from Eirkei/ElvishGuidanceImplemented 
Elvish Guidance Implemented
 2016-09-29 12:52:02 +02:00
Eirkei
762e034244 Elvish Guidance Implemented 2016-09-29 12:16:00 +02:00
LevelX2
814f4b4989 * Karn Liberated - Fixed that also already dead players were alive if Karn restarted the game. 2016-09-29 00:38:16 +02:00
LevelX2
d7408a4531 Merge origin/master 2016-09-28 18:08:47 +02:00
LevelX2
210bbeeda7 [SWS] Fixed March of the Droids. 2016-09-28 18:07:55 +02:00
spjspj
90b9c620ff Merge pull request #2400 from spjspj/master 
spjspj - Implement Grand Moff Tarkin (SWS)
 2016-09-29 02:04:28 +10:00
spjspj
3ad68f0697 spjspj - Implement Grand Moff Tarkin (SWS) 2016-09-29 02:03:34 +10:00
LevelX2
86648c7190 * Reworked some parts of transform handling. Fixes #2396. 2016-09-28 17:02:37 +02:00
LevelX2
c703ebaa9d Reworked Hate condition. 2016-09-28 08:30:31 +02:00
LevelX2
9cf9d69c55 Fixed minor problem of Volrath's Laboratory. Added combat flag to LIFE_LOST event. 2016-09-28 08:00:32 +02:00
fireshoes
9676f24752 Added some promo cards. 2016-09-27 21:05:38 -05:00
spjspj
bc5a53632f Merge pull request #2395 from Fr33dan/master 
Fix Fairgrounds Trumpeter triggering only on controller's end step.
 2016-09-28 09:42:05 +10:00
LevelX2
68464198dc Fixed minor problem of Volrath's Laboratory. 2016-09-28 00:08:04 +02:00
LevelX2
923f4a1bb5 [SWS] Fixed Sith Ravager, added missing import to Maintenance Hangar. 2016-09-28 00:05:13 +02:00
Fr33dan
6898313f0f Fix Fairgrounds Trumpeter triggering only on controller's end step. 2016-09-27 18:01:27 -04:00
Clint Herron
a363749b2f Tabs and spaces once again. 2016-09-27 15:53:25 -04:00
Clint Herron
73235fad37 Attempting to implement Riptide Replicator. 2016-09-27 15:52:56 -04:00
LevelX2
05f6224f8b Merge origin/master 2016-09-27 17:32:07 +02:00
LevelX2
4619f45771 [SWS] Fixed No Contest. 2016-09-27 17:31:26 +02:00
spjspj
d2f560ba24 Merge pull request #2390 from spjspj/master 
spjspj - Fix Maintenance Droid
 2016-09-28 01:10:59 +10:00
spjspj
6eead24f0a spjspj - Fix Maintenance Droid 2016-09-28 01:09:54 +10:00
spjspj
62ba94e721 Merge pull request #2389 from spjspj/master 
spjspj - Implement Jango Fett (SWS - Custom set)
 2016-09-28 01:01:23 +10:00
spjspj
a6028f2e76 spjspj - Implement Jango Fett (SWS - Custom set) 2016-09-28 01:00:24 +10:00
LevelX2
2c0234d842 Merge pull request #2388 from Eirkei/HeadGamesJestersMaskImplemented 
Head Games and Jester's Mask implemented
 2016-09-27 16:24:00 +02:00
Eirkei
871e9741c0 Jester's Mask Implemented 2016-09-27 15:50:17 +02:00
Eirkei
92dbc55379 Head Games Implemented 2016-09-27 15:49:58 +02:00
LevelX2
a5b1db4ec1 [SWS] Fixed Ravenous Wampa and casting cost of Gamorream Enforcer. 2016-09-27 15:44:00 +02:00
LevelX2
91aa36e707 [SWS] Fixed Ravenous Wampa and casting cost of Gamorream Enforcer. 2016-09-27 15:43:55 +02:00
LevelX2
33bc95082c [SWS] Implemented Sabacc Game, Fixed A-Wing. 2016-09-27 12:35:22 +02:00
LevelX2
86f2007945 Merge pull request #2384 from Styxo/master 
Star Wars Set implemented
 2016-09-27 11:30:08 +02:00
LevelX2
311f797565 * Some fixes for exile handling. 2016-09-26 23:27:12 +02:00
LevelX2
31bc96d16a * Astral Slide - Some clean up. 2016-09-26 23:04:07 +02:00
Styxo
9084595135 Star Wars Set implemented 2016-09-26 18:43:04 +02:00
LevelX2
e1dc3d4ea1 [CN2] Adding Daretti, Ingenious Iconoclast. 2016-09-26 18:01:17 +02:00
LevelX2
c08ada15e4 Merge pull request #2380 from Eirkei/TanglerootImplementation 
Tangleroot implemented
 2016-09-26 14:00:08 +02:00
Eirkei
edf9f5cc49 Rishadan Footpad implemented 2016-09-26 13:19:26 +02:00
Eirkei
97cd2b7c0a Rishadan Cutpurse implemented 2016-09-26 13:19:05 +02:00
Eirkei
af08ee5b6f Rishadan Brigand implemented 2016-09-26 13:18:40 +02:00
Eirkei
0c2e02ec62 Tangleroot implemented 2016-09-26 13:03:19 +02:00
LevelX2
3c93c00d60 * Nature's Way - Fixed wrong damage source (fixes #2378). 2016-09-26 12:09:06 +02:00
LevelX2
e552d64764 Merge pull request #2372 from Eirkei/master 
Shaleskin Bruiser implemented
 2016-09-26 11:38:49 +02:00
Styxo
f18e4b66f1 Little refactor of PermanentHasCounterCondition 2016-09-25 19:38:40 +02:00
Eirkei
c4ebb2f7e5 Marton Stromgald implementation - fix setting lockedInPT 2016-09-25 10:42:59 +02:00
Eirkei
1ae166bcfc Marton Stromgald implementation - fix name in comment 2016-09-24 23:36:29 +02:00
Eirkei
bb0fae82b7 Marton Stromgald implemented 2016-09-24 21:57:34 +02:00
eirkei
92b8057e6c Shaleskin Bruiser implemented 2016-09-24 20:15:25 +02:00
LevelX2
b85dc8c0cd Some minor changes. 2016-09-24 14:55:09 +02:00
LevelX2
1ccd2a1b04 Some fixes to prevent null pointer exceptions. 2016-09-24 03:36:18 +02:00
LevelX2
5215a02181 Minor change. 2016-09-24 02:22:21 +02:00
LevelX2
c9bb0be016 Reworked selected modes handling. That fixed the Subtle Strike targeting problem. 2016-09-24 01:12:01 +02:00
eirkei
1509b2ea08 Krosan Drover implemented 2016-09-23 14:43:07 +02:00
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