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

10460 commits

Author SHA1 Message Date
LevelX2
4dd023716e * Added another general static filter class. 2017-01-08 10:35:46 +01:00
LevelX2
ee203cf981 Xmage Release 1.4.20V0 2017-01-08 01:36:05 +01:00
LevelX2
13659e064c Merge origin/master 2017-01-07 23:54:00 +01:00
LevelX2
a75e4f4fcb Fixed that adding counters to players did not work correctly (e.g. Winding Constrictor). 2017-01-07 23:53:47 +01:00
LevelX2
e04e69f947 [AER] Fixed Baral Chief of Compliance triggered ability. 2017-01-07 23:52:55 +01:00
fireshoes
5b3c273da7 [AER] Fix some more card text. 2017-01-07 16:39:16 -06:00
LevelX2
491ab5fbb0 [AER] Fixed Daredevil Dragster. 2017-01-07 23:29:27 +01:00
LevelX2
9353c5aa9c [AER] Some more minor fixes. 2017-01-07 22:22:17 +01:00
LevelX2
d519aa55c1 [AER] Fixed wrong revolt tool tips. 2017-01-07 21:58:34 +01:00
LevelX2
b358597bf4 [AER] Added the last missing cards. Some fixes. 2017-01-07 21:42:29 +01:00
LevelX2
32e55a7342 Merge origin/master 2017-01-07 20:03:29 +01:00
LevelX2
c7e149904b [AER] Fixed some problems with revolt. 2017-01-07 20:03:03 +01:00
fireshoes
e42a1cd4c1 Merge origin/master 2017-01-07 12:27:08 -06:00
fireshoes
24d0353672 [AER] Edited some cards for text or other minor fixes. 2017-01-07 12:14:50 -06:00
LevelX2
2033095e3d [AER] Added 4 cards. 2017-01-07 19:12:58 +01:00
Styxo
9227c4615f [AER] Added some of the missing cards 2017-01-07 13:51:02 +01:00
spjspj
d6d431d4b1 spjspj - Add 1 card [AER] 2017-01-07 22:28:26 +11:00
spjspj
f5f48f4833 spjspj - Add 3 cards [AER] 2017-01-07 18:37:22 +11:00
spjspj
e7e3b0c0da spjspj - Add 3 cards [AER] 2017-01-07 18:34:08 +11:00
fireshoes
216b9cb2d0 [AER] Added more cards. 2017-01-07 01:05:20 -06:00
spjspj
bf4ec26861 spjspj - Add Cogwork Assembler [AER] 2017-01-07 15:52:41 +11:00
spjspj
fee6fcec78 spjspj - Add Chandra's Revolution and Bastion Inventor [AER] 2017-01-07 15:38:00 +11:00
spjspj
2c08545c88 spjspj - Fix some collector numbers 2017-01-07 12:21:35 +11:00
Styxo
57d7140f59 [AER] Added some artifact cards 2017-01-07 01:45:57 +01:00
LevelX2
b1e65b1bb4 Merge pull request #2744 from Galatolol/master 
Added 3 cards, little refactoring (Unattach cost)
 2017-01-07 00:40:04 +01:00
LevelX2
db981e4b87 Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
 2017-01-07 00:36:35 +01:00
LevelX2
82d5e81a40 [AEN] Added missing black cards. 2017-01-07 00:29:21 +01:00
Styxo
90b3bacf6e [AER] Added rest of green cards 2017-01-07 00:26:30 +01:00
Styxo
47b9832db6 [AER] Fixed some names and cards 2017-01-06 23:17:13 +01:00
LevelX2
0094e700c9 [AEN] Removed Hidden Stocks. 2017-01-06 22:15:56 +01:00
LevelX2
7ec9394a83 Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
 2017-01-06 21:57:18 +01:00
LevelX2
69db775d05 [AEN] Added Hidden Stockpile. 2017-01-06 21:52:51 +01:00
Styxo
5e98860694 Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/sets/AetherRevolt.java
 2017-01-06 21:39:37 +01:00
Styxo
7aa57cc01f [AER] Added white cards 2017-01-06 21:22:24 +01:00
fireshoes
5e8cdf546a [AER] Added some green cards. 2017-01-06 14:14:54 -06:00
LevelX2
a1a93d3691 [AEN] Winding Constrictor & Weldfast Engineer 2017-01-06 19:05:40 +01:00
Styxo
f2e9daece7 [AER] Added reprints 2017-01-06 18:26:38 +01:00
Styxo
928a63432c [AER] Added Skyship Plunderer and Midnight Entourage 2017-01-06 18:06:20 +01:00
fireshoes
4888a4a15b [AER] Added most of the 1/5 spoiled cards. Fixed a name. 2017-01-05 23:50:20 -06:00
Styxo
ba27c01e19 [AER] Added rest of 1/4 spoilers and 4 cards 2017-01-05 15:11:27 +01:00
Styxo
e057bde150 [Refactor] Merged some similar abilities together 2017-01-05 14:12:18 +01:00
fireshoes
e4727a1063 [AER] Implemented several cards. 2017-01-04 14:25:39 -06:00
Styxo
fad4f53365 [Refactor] Removed some duplicate classes 2017-01-04 15:10:25 +01:00
Styxo
8fd28f70e6 [AER] Added Release Gremlins, Aetherwind Basker and Inspiration Monuments 2017-01-04 12:06:16 +01:00
Styxo
3c67e51db0 [REFACTOR] Removed duplicate code and an unused effect 2017-01-04 09:58:10 +01:00
Styxo
ffca57e41c [AER] Added Industrial Tower, Greenbelt Druid and Shock 2017-01-04 09:51:43 +01:00
Justin Herlehy
1c6914398b Code Deduplication 
Move the cast from hand effect from the expertise cards to its own effect that can have different values assigned to it.
 2017-01-03 23:49:16 -05:00
fireshoes
27c0432895 [AER] Added Aegis Automaton, Aid from the Cowl, Renegade Rallier, and Rishkar's Expertise. 2017-01-03 20:38:36 -06:00
fireshoes
348715cd1c [AER] Added Rogue Refiner, Tezzeret's Touch, and Renegade Map. 2017-01-03 17:22:00 -06:00
fireshoes
a56873f18c [AER] Added Reverse Engineer's missing draw effect. 2017-01-03 16:14:37 -06:00
Justin Herlehy
5e76a8fcf9 [AER] Implement Four Revolt Creatures 
Implemented
- Copuntless Gears Renegade
- Greenwheel Liberator
- Night Market Aeronaut
- Silkweaver Elite
 2017-01-03 16:32:43 -05:00
Justin Herlehy
6e401028b7 [AER] Implement Four Revolt Creatures 
Implemented
- Copuntless Gears Renegade
- Greenwheel Liberator
- Night Market Aeronaut
- Silkweaver Elite
 2017-01-03 16:32:07 -05:00
Galatolol
2be2638f27 Added 3 cards, little refactoring (Unattach cost) 2017-01-03 21:01:30 +01:00
Galatolol
b0dc7fe276 Added 3 cards, little refactoring (Unattach cost) 2017-01-03 20:51:39 +01:00
fireshoes
38abee93a6 [AER] Added Yahenni,Reverse Engineer, Glint-Sleeve Siphoner, and Aethergeode Miner. 2017-01-03 12:47:17 -06:00
ludwig.hirth
aa375c687c * Uba Mask - Fixed some problems. 2017-01-03 17:18:34 +01:00
ludwig.hirth
3040072be9 Merge origin/master 2017-01-03 14:38:51 +01:00
ludwig.hirth
94717fd041 * Tel-Jilad Wolf - Fixed that the ability triggered for all creatures not only artifact creatures (fixed #2738). 2017-01-03 14:38:18 +01:00
LevelX2
1eac0bf23f Merge pull request #2741 from vereena42/StompAndHowl 
Stomp and Howl card added.
 2017-01-03 14:32:15 +01:00
Styxo
7c2af646ec [Refactor] Edited some filter text 2017-01-03 13:58:03 +01:00
Styxo
a4a9e41464 [Refactor] Edited RevealLibraryPutIntoHandEffect, deleted the same effect class (EnvoyEffect) and changed some cards 2017-01-03 10:05:58 +01:00
vereena42
34d8147ccc Fixing tabulation issue 2017-01-03 09:29:21 +01:00
Styxo
656e658fb4 [Refactor] Added DamageWithPowerEffect and change some cards 2017-01-03 09:23:35 +01:00
vereena42
476e4e87a1 Correcting Stomp and Howl 2017-01-03 09:09:50 +01:00
emerald000
60bad2407b Fighting Git, part 2. 2017-01-03 01:23:56 -05:00
emerald000
2baf795fab Fighting Git. 2017-01-03 01:20:47 -05:00
emerald000
c6c7c82508 [AER] Implemented Revolt mechanic + 2 cards using it. 
Decommission and Fatal Push
 2017-01-03 01:11:24 -05:00
Justin Herlehy
24d58193fa Undo unintended rearranement of set file methods. 2017-01-02 19:23:15 -05:00
Justin Herlehy
a44ff0e4eb [AER] Implement Spoiled Cards 
Implemented
-Freejam Regent
-Siege Modification
-Untethered Express

Added
-Additional Spoiled cards to data file

Fixed
-Keywords file to enable autogeneration of Improvise ability
 2017-01-02 19:08:43 -05:00
fireshoes
365317ff6e Merge origin/master 2017-01-02 16:44:09 -06:00
fireshoes
2133348b60 [AER] Added more 1/2 spoilers. Implemented Gonti's Aether Heart, Sweatworks Brawler, Sram Senior Edificer, Sram's Expertise, Foundry Assembler, and Whir of Invention. 2017-01-02 16:34:24 -06:00
fireshoes
23eff3bb7d [AER] Added more 1/2 spoilers. Implemented Gonti's Aether Heart, Sweatworks Brawler, Sram Senior Edificer, Sram's Expertise, Foundry Assembler, and Whir of Invention. 2017-01-02 16:33:29 -06:00
Justin Herlehy
86ed3e20cb [AER] Implement Spoiled Cards from 1/2 
Added additional spoilers to data file.
 2017-01-02 16:46:56 -05:00
vereena42
add95c8a63 Stomp and Howl card added. 2017-01-02 20:33:30 +01:00
LevelX2
dee07fe89a * Dominator Drone - Fixed that its ability did damage instead of life loss(fixes #2739). 2017-01-02 18:15:13 +01:00
LevelX2
211f2285c1 [AEN] Fixed card name. 2017-01-02 18:11:14 +01:00
LevelX2
54b40646d9 Some minor changes. 2017-01-02 18:09:33 +01:00
LevelX2
f777668a4d Merge pull request #2736 from shootbot/master 
Fixed Asylum Visitor and Spined Sliver bugs
 2017-01-02 17:30:07 +01:00
LevelX2
b30dd49a37 Merge pull request #2734 from brikr/awe-strike 
[MRD] Awe Strike
 2017-01-02 17:28:41 +01:00
LevelX2
4ea6a0befb Merge pull request #2730 from Galatolol/master 
Added 7 cards
 2017-01-02 17:25:21 +01:00
Timur Nurmagambetov
93428aa54e mend 2017-01-01 20:39:44 +06:00
Timur Nurmagambetov
0b5a388dbb Fixed Asylum Visitor and Spined Sliver bugs 2017-01-01 18:41:02 +06:00
Galatolol
2db6ff1825 Fixed 3 cards 2017-01-01 12:11:11 +01:00
Brik Royster
0f34338173 [MRD] Awe Strike 2016-12-31 23:07:04 -07:00
Justin Herlehy
f3c0d3fce0 [MMQ] Ramosian Rally 
Also fixed order of check in GameImpl for attached player to prevent possible NPE.
 2016-12-31 14:41:38 -05:00
LevelX2
df0cd60fbc * Marionette Master and Mortis Dogs, fixed that power below 0 caused life gain. 2016-12-31 17:41:12 +01:00
LevelX2
68a6920b63 [AER] Added existing cards to set list. 2016-12-31 17:28:20 +01:00
LevelX2
c2852ca233 [AER] Added Battke at the Bridge. 2016-12-31 17:00:00 +01:00
LevelX2
24f72004e3 [AER] Added Scrap Trawler. 2016-12-31 12:10:40 +01:00
Galatolol
f577a4b614 Added 7 cards 2016-12-30 12:15:56 +01:00
Justin Herlehy
b5eaf8d3d0 [C16] Curse of Vengeance 
Fix that the cure was triggering for all player loss events, not just for enchanted player.
 2016-12-30 00:58:14 -05:00
fireshoes
245977bfaf Added Masterpieces Paradox Engine and Planar Bridge. 2016-12-29 21:10:54 -06:00
ludwig.hirth
b26a5730fa * Mage Slayer - Fixed that the correct damage source was assigned for the additional damage. 2016-12-29 16:18:52 +01:00
LevelX2
aff057e1a7 * Uncle Istvan - Fixed a bug that all damage instead of only damage from creatures was prevented. 2016-12-28 20:02:20 +01:00
LevelX2
d3c2c33b44 * Added static Goblins filter. 2016-12-28 11:32:29 +01:00
Brik Royster
4cb4d1ea4e using hasSubtype instead of getSubtype().contains 2016-12-28 00:31:49 -07:00
Brik Royster
d0b405f41b Updated author for Harsh Judgment 2016-12-28 00:27:03 -07:00
Justin Herlehy
7484e46b04 Duskwatch Recruiter Fix 
Ability was incorrectly requiring a pick from the hidden zone if an applicable card was in the zone.  Fixed to properly recognize the "may" ability.
 2016-12-28 00:27:03 -07:00
Brik Royster
642b14db17 [PLS] Dralnu's Crusade 2016-12-27 20:41:20 -07:00
MTGfan
cf93656f0d Merge remote-tracking branch 'upstream/master' 2016-12-27 20:29:31 -05:00
MTGfan
6a6c03205d Revert Gilder Bairn added filter 2016-12-27 20:11:20 -05:00
LevelX2
ecc18072cf Cyclopean Tomb - Update. 2016-12-28 02:02:57 +01:00
LevelX2
cebfadbf34 Merge pull request #2709 from MTGfan/master 
Cyclopean Tomb TODO: inside watcher get ID for card
 2016-12-27 16:38:27 +01:00
LevelX2
a239b93823 Merge pull request #2719 from brikr/master 
[INV] Harsh Judgment
 2016-12-27 16:38:14 +01:00
LevelX2
8075ea2e50 * Fixed a problem that Emblems created by permanents where its owner left the game caused errors in clients. Some handling cganges of emblems. 2016-12-27 16:00:22 +01:00
LevelX2
81caed134f * Loaming Shaman - Fixed card movement. 2016-12-27 15:48:18 +01:00
LevelX2
03468817e9 Added Hall of Gemstone. 2016-12-27 15:46:09 +01:00
Brik Royster
a3b913b678 [INV] Harsh Judgment 2016-12-27 04:50:28 -07:00
LevelX2
07c6aa729d * Fixed emblem names of Starwars cards. 2016-12-27 11:51:20 +01:00
MTGfan
949784af0d Gilder Bairn: added filter so player can't accidentally pick a card without counter(s) on it. 2016-12-27 02:33:55 -05:00
Justin Herlehy
b0f85a8d6a [C16] Trasios, Triton Hero 
Fixed that ability was not correctly putting reveled lands into play tapped.
 2016-12-27 01:18:01 -05:00
MTGfan
5cc2a4f204 Cyclopean Tomb: Watcher is almost done 2016-12-26 01:51:20 -05:00
MTGfan
d9a1e724b6 Cyclopean Tomb: Partial changes related to it's watcher. 2016-12-25 16:29:44 -05:00
MTGfan
5859633955 Gaea's Liege: corrected sent to graveyard upon entering the battlefield issue that effect some players 2016-12-25 15:07:03 -05:00
fireshoes
7943d1021e Added AER Masterpieces. Fixed Yahenni's Expertise spelling. 2016-12-24 22:18:13 -06:00
LevelX2
862ac38f51 * Fixed that special actions (e.g. delve mana payment) were handled correctly if a player plays a turn for another player. 2016-12-24 16:52:06 +01:00
LevelX2
7bdc5b2f44 * Show of Dominance - Fixed a bug that toughness instead of power was used to select creature. 2016-12-24 13:01:38 +01:00
LevelX2
08887113fd Added Hall of Gemstone. 2016-12-24 12:34:34 +01:00
LevelX2
030430fe51 * Debt to the Deathless - Fixed that it wrongly did damage to opponents instead of life loss. 2016-12-24 11:48:12 +01:00
LevelX2
3cd26fa834 * Wild Pair - FIxed that it also triggered for creatures cast from opponents. 2016-12-24 11:02:05 +01:00
LevelX2
4bbdaad101 * Gilded Drake - Fixed possible null pointer exception. 2016-12-24 10:52:57 +01:00
LevelX2
4988e0bb74 Merge origin/master 2016-12-24 10:16:23 +01:00
LevelX2
c05941cf0d * Added cascade test. 2016-12-24 10:16:03 +01:00
LevelX2
b3e884fae9 Merge pull request #2714 from DimitarKum/master 
Card fix: Recuperate
 2016-12-24 09:56:35 +01:00
LevelX2
b788356460 * Fulfill Contract - Fixed that the spell created an error. 2016-12-24 09:52:58 +01:00
DimitarK
2f38e35344 Recuperate fixed; use to gain life for target player, now gains life for 
self as it should
 2016-12-23 23:10:10 -08:00
MTGfan
8a807c888c Merge remote-tracking branch 'upstream/master' 2016-12-24 00:13:54 -05:00
MTGfan
a40a67c2b8 Cyclopean Tomb: watcher stuff replacing the array stuff, card not working completely yet 2016-12-23 23:59:29 -05:00
ludwig.hirth
e5a5911c6e * Sacred Ground - Fixed that the Sacred Ground effect did also move the land if it was removed from graveyard since the ability triggered. 2016-12-23 12:29:33 +01:00
MTGfan
7c6d19267b Cyclopean Tomb: Progress, player is now prompted to pick a land, landId predicate not working yet 2016-12-23 00:27:13 -05:00
Justin Herlehy
decc5c190c Merge pull request #2708 from JRHerlehy/NewCardsImpl 
[AER] Heart of Kiran
 2016-12-22 21:43:06 -05:00
MTGfan
cf17d02657 CyclopeanTomb: updated to track what lands it is putting counters on 2016-12-22 15:58:03 -05:00
MTGfan
dc2e4569db Jihad: Fixed - was missing condition 2nd ability and corrected trigger that results in sacrificing Jihad 2016-12-22 03:27:45 -05:00
Styxo
c2ef2b1f47 [CN2] Added Deadly Designs and Fang of the Pack 2016-12-22 08:05:22 +01:00
MTGfan
4183e31984 Celestial Sword: removed unused imports 2016-12-22 00:17:38 -05:00
Justin Herlehy
4ef339d521 [AER] Heart of Kiran 
Fixed the Alternate Crew Cost to push the correct game events for crewing a vehicle and the vehicle being crewed.
 2016-12-21 23:07:55 -05:00
MTGfan
7e867f4fcf Cyclopean Tomb TODO: remove counters part of effect 2016-12-21 19:46:46 -05:00
LevelX2
913e7f8719 * Hardened Scales - Fixed that the counter was only added if at least one counter was added originally. 2016-12-21 16:17:18 +01:00
Justin Herlehy
91a3d9a6a2 [AER] Heart of Kiran 
As the alternate crew cost payment ability is just a simple activated ability with a different wording, it is implemented here as an anonymous inner class to override the getRule() method rather than generate large amounts of boilerplate code to get the same effect with a full class.
 2016-12-21 02:33:58 -05:00
Justin Herlehy
7395c4aa12 [AER] Tezzeret the Schemer 
Remove unused code from test version.
 2016-12-20 21:40:23 -05:00
Justin Herlehy
ef3efc9c86 [AER] Tezzeret the Schemer 2016-12-20 21:21:42 -05:00
Justin Herlehy
f44c934334 [AER] Oath of Ajani 2016-12-20 11:34:15 -05:00
Justin Herlehy
ffd1b37eeb Merge pull request #2694 from JRHerlehy/master 
[AER] Oath of Ajani
 2016-12-20 11:33:24 -05:00
Styxo
465fa48026 [AER] Added Quicksmith Rebel & Spy 2016-12-20 15:01:07 +01:00
Styxo
2eb0a487a4 Added WishEffect, ExchangeLifeTargetEffect and did refactors 2016-12-20 13:31:39 +01:00
Styxo
cff83aefb1 Created LoseHalfLifeTargetEffect, DiscardedByOpponentTrigger and made some refactors 2016-12-19 12:39:26 +01:00
LevelX2
a5b2c9f8c0 Merge pull request #2695 from PedroTav/develop 
[PLS] Dark Suspicions
 2016-12-18 23:41:10 +01:00
LevelX2
3c0ee90663 Pia's Revolution - Fixed that it wrongly triggered for artifacts from other players. 2016-12-18 23:14:11 +01:00
LevelX2
1de210ab74 * Fixed a bug of DealsDamageToOneOrMoreCreaturesTriggeredAbility, added some tests. 2016-12-18 17:50:33 +01:00
Filipe Cordeiro
6b36899fc9 [PLS] Dark Suspicions 2016-12-18 16:35:24 +00:00