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

9075 commits

Author SHA1 Message Date
MarcoMarin
457bc29b34 Merge remote-tracking branch 'upstream/master' 2016-04-25 14:26:23 -03:00
MarcoMarin
38adc7518d A few fixes after suggestions thanks to LevelX2 for spotting them 2016-04-25 14:23:36 -03:00
Kenny Wottrich
6c84692a9b Add last few unused imports, which also had character encoding issues with Eclipse 2016-04-24 20:19:50 -05:00
Kenny Wottrich
f3c83d54f5 Remove Unused Imports 
Delete unused java imports that cause compiler warnings
 2016-04-24 19:50:29 -05:00
Kenny Wottrich
9b2ad2a88a put Island check before land is sacrificed 2016-04-24 19:08:38 -05:00
Kenny Wottrich
19a4d7dc7a fixed land sacrifice effect to damage player if sacrificed land is an island 2016-04-24 17:45:30 -05:00
LevelX2
d626b072cd * Myr Superion - Fixed that its mana costs could not be decreased by convoke. 2016-04-24 12:34:35 +02:00
LevelX2
ea0b13c64f Merge origin/master 2016-04-24 09:39:23 +02:00
LevelX2
44100968b7 Fixed internal wrong spelling. 2016-04-24 09:38:39 +02:00
LevelX2
48035a053e * Myr Superion - Fixed that its mana costs could not be decreased by convoke (fixes #1897). 2016-04-24 09:38:02 +02:00
Kenny Wottrich
412c395494 Fix Effect Logic 
Both players must not be null in order for the hand size check to
succeed
 2016-04-23 19:31:36 -05:00
LevelX2
a6c5e83c51 Merge pull request #1894 from Styxo/master 
Added some LRW cards
 2016-04-22 08:51:16 +02:00
drmDev
d6d8042a12 WildDogs impl 2016-04-21 23:40:30 -04:00
spjspj
e9ad2fb6af spjspj - Missed DRK printing of Preacher 2016-04-22 08:34:39 +10:00
drmDev
109506ad63 Calming Verse impl 2016-04-21 17:35:11 -04:00
Styxo
01ee8e5a4f Added Ego Erasure, Shields of Velis Vel, Springjack Knight, Turtleshell Changeling and Wellgabber Apothecary 2016-04-21 22:18:51 +02:00
drmDev
f1fc4e4463 Merge remote-tracking branch 'upstream/master' 2016-04-21 14:45:52 -04:00
drmDev
410c8d9e6e VolrathTheFallen impl 2016-04-21 14:45:07 -04:00
LevelX2
0c0dd82480 * Some changes to activation count and sacrifice source triggers. 2016-04-21 17:13:57 +02:00
LevelX2
06d3b929a2 Merge pull request #1891 from Marco-Marin/master 
Fem + Fixes
 2016-04-21 12:01:57 +02:00
LevelX2
eb960a34ad * Dragon Whelp - Made the activation handling more reusable friendly and object sensitive (zone change counter). 2016-04-21 11:46:02 +02:00
drmDev
181381b262 Prismatic Strands impl 2016-04-20 23:18:21 -04:00
LevelX2
6ff458d86c * Reworked Dragon Whelp activation check. 2016-04-21 00:19:32 +02:00
LevelX2
9cc1c3edd5 * Kindly Stranger - Fixed that it did not allow destroying creature on transform (fixes #1888). 2016-04-20 15:40:15 +02:00
LevelX2
eaae3cc9b0 * Time Spiral storage duals lands - Fixed that the activated ability to remove the counters was not defnied as mana ability. 2016-04-20 13:34:32 +02:00
MarcoMarin
a9c9a98120 resolve conflict for Oubliette and Tawnos Coffin 2016-04-19 14:27:17 -03:00
MarcoMarin
4c25816be1 midway through FEM + fixed Oubliette, Tawnos Coffin 2016-04-19 12:50:48 -03:00
drmDev
7a3c15d8b8 Game of Chaos impl. Kindly Stranger test for bug 2016-04-19 09:24:42 -04:00
spjspj
1c7e3b7022 Merge pull request #1889 from spjspj/master 
spjspj - Add new condition 'SourceHasRemainedInSameZoneCondition'. Adjust
 2016-04-19 20:19:19 +10:00
emerald000
6162d4c80d Added Timesifter. 2016-04-18 23:47:17 -04:00
emerald000
68ee22f8d1 Added Shared Fate. 2016-04-18 17:07:13 -04:00
spjspj
c885f212d3 spjspj - Add new condition 'SourceHasRemainedOnBattlefield' and adjust DL SIlumgar to use it as well (as DL Silumgar was buggy with Ghostly Flicker for example) 
Also implement Preacher (DRK)
 2016-04-19 01:53:04 +10:00
fireshoes
194c817c11 Merge origin/master 2016-04-18 01:25:52 -05:00
fireshoes
3c3a9cc965 Added Water Wurm. 2016-04-18 01:22:03 -05:00
emerald000
3e4a3f79fa Added Grip of Chaos. 2016-04-17 23:55:31 -04:00
emerald000
8823839a42 Added framework method for copying a StackAbility without casting it. 
Modified the effects doing so with the new method.
 2016-04-17 23:55:11 -04:00
emerald000
a4af95d775 Added Thieves' Auction. 
Changed Detain reminder to blue text.
 2016-04-17 19:22:33 -04:00
LevelX2
31e82d1dc4 * Added Brothers Yamazaki and Struggle for Sanity from Champions of Kamigawa. 2016-04-16 12:33:29 +02:00
drmDev
e84c8d47a2 vanish into memory fix 2016-04-15 23:15:07 -04:00
drmDev
5566490b26 Vanish Into Memory implemented 2016-04-15 23:10:16 -04:00
LevelX2
1dbba3f7a9 * Soulbond - Reworked to two triggerd abilities (fixes #1882). 2016-04-16 02:43:52 +02:00
emerald000
a4b3e31bd8 Remove unnecessary stuff in Confusion in the Ranks. 2016-04-15 15:00:17 -04:00
emerald000
8d28883f7c Added Confusion in the Ranks. 2016-04-15 14:53:19 -04:00
Derek M
a1550363d5 Merge pull request #1880 from drmDev/master 
W16 fix. Eldrazi Obligator fix and test
 2016-04-15 12:24:33 -04:00
drmDev
5ab54142de W16 fix. Eldrazi Obligator fix and test 2016-04-15 12:24:04 -04:00
LevelX2
22dbb1ef38 Fixed that no event was send for removing counters from players. 2016-04-15 18:01:38 +02:00
drmDev
e136e409fd [W16] cards added. Still does not show as Standard legal. HELP 2016-04-15 09:15:26 -04:00
LevelX2
2b8f73dbcc * Fixed CMC calculation for transformed cards (fixes #1826). 2016-04-15 14:59:36 +02:00
LevelX2
55dc0f8b6a Merge pull request #1874 from fenhl/brand 
Implement Brand
 2016-04-14 22:33:44 +02:00
drmDev
cce5404a92 Stinkdrinker bandit bug fix and test 2016-04-14 16:03:32 -04:00
Fenhl
2c5083b85d Implement Brand 2016-04-14 19:31:46 +00:00
Fenhl
430ae503c7 Change all line endings to LF 2016-04-14 16:18:01 +00:00
LevelX2
13d9a56b7a * Jace, Unraveler of Secrets - Fixed that the emblem still doesn't counter spells (fixes #1855). 2016-04-14 17:49:08 +02:00
LevelX2
d00f1adf38 * Leeching Sliver - Fixed that the triggered ability did not work if a planswalker was attacked (fixes #1858). 2016-04-14 16:54:04 +02:00
LevelX2
b415d5e116 * Olivia Voldaren - Fixed some wrong tooltip wording (fixes #1868). 2016-04-14 16:29:52 +02:00
LevelX2
ce3c26ab4b * Some minor changes / fixes. 2016-04-14 16:00:56 +02:00
Derek M
b564bf1760 Merge pull request #1867 from fenhl/heliod-god-of-the-sun 
Fix Heliod's token-generating ability not saying “token”
 2016-04-14 08:17:57 -04:00
Derek M
a6dc3d330a Merge pull request #1862 from fenhl/magus-of-the-future 
Fix wording of Magus of the Future ability tooltip
 2016-04-14 08:17:30 -04:00
Fenhl
4906790e32 Fix Heliod's token-generating ability not saying “token” 2016-04-14 10:52:39 +00:00
drmDev
270b9bb5a9 Merge and InduceParanoia impl 2016-04-13 17:59:06 -04:00
Fenhl
72f32e782c Fix Stone-Seeder Hierophant triggering on other players' lands 2016-04-13 17:51:17 +00:00
Fenhl
f42ea89930 Fix wording of Magus of the Future ability tooltip 2016-04-13 16:09:12 +00:00
Marco-Marin
a356cd1649 Merge pull request #1835 from Marco-Marin/master 
First ever card after incorporating the Testing Process: Dwarven Catapult.
Tested from scratch (tho it worked the 1st time, so maybe most previous ones were not too shabby either :))
Also using this to test my learning of new Git CLI commands: "add ." and "add -u" seemed to do the trick.

PS: Nevermind the Oubliette changes, I'm doing a 'poor man's' versioning system to make sure my builds are working. ^_^
 2016-04-12 16:38:05 -03:00
MarcoMarin
a02f6a3c3a Testing Git commands with card: Dwarven Catapult 2016-04-12 16:27:47 -03:00
Derek M
66263e155b Merge pull request #1852 from fenhl/packs-disdain 
Implement Pack's Disdain
 2016-04-12 13:16:53 -04:00
Fenhl
74b5e85a3e Fix continuous effect creation in Pack's Disdain 2016-04-12 16:57:28 +00:00
Fenhl
5d341af554 Fix activated ability of Canopy Crawler 2016-04-12 13:50:32 +00:00
Fenhl
899122a170 Implement Pack's Disdain 2016-04-12 13:45:45 +00:00
drmDev
d707e03807 Tunnel Vision implemented 2016-04-12 09:09:49 -04:00
Jared Hall
3f2611de76 Fixes #1836 2016-04-12 08:16:15 -04:00
spjspj
bc44851b62 spjspj - Implement Kill Switch (NMS) - 
Implemented using a new type of condition 'SourceTappedBeforeUntapStepCondition'
 2016-04-12 11:29:55 +10:00
Derek M
262de17d17 Merge pull request #1847 from drmDev/master 
Earthbind implementation
 2016-04-11 19:55:49 -04:00
drmDev
d735c4e41b Earthbind implementation 2016-04-11 19:55:18 -04:00
Derek M
6775c9bc97 Merge pull request #1846 from drmDev/master 
Champion bug fixes
 2016-04-11 17:07:15 -04:00
drmDev
f2d5462c97 Champion bug fixes 2016-04-11 17:06:14 -04:00
MarcoMarin
7149ecd2dd oubliette difference is blocking me from pulls from origin2 2016-04-11 17:26:32 -03:00
MarcoMarin
318c18fb34 oubliette difference is blocking me from pulls from origin 2016-04-11 17:24:31 -03:00
MarcoMarin
d045d16a20 Oubliette: 
Fixed tooltip(s), and I believe the Auras now come back (modified from working card, so should work).

1st stab at trying to get those Counters back. Not very confident tho, further testing required.
 2016-04-11 16:20:50 -03:00
MarcoMarin
013c506fac Oubliette: 
Fixed tooltip(s), and I believe the Auras now come back (modified from working card, so should work).

1st stab at trying to get those Counters back. Not very confident tho, further testing required.
 2016-04-11 15:01:01 -03:00
Derek M
90507f4c55 Merge pull request #1844 from drmDev/master 
SilentSkimmer and PyreHound bug fixes
 2016-04-11 11:42:18 -04:00
drmDev
57a992649e SilentSkimmer and PyreHound bug fixes 2016-04-11 11:41:55 -04:00
MarcoMarin
7505365425 Merge remote-tracking branch 'upstream/master' 2016-04-11 12:10:34 -03:00
LevelX2
2f4232476e * Changing some Target inheritance to fix AI Target handling (e.g. Loaming Shaman). 2016-04-11 17:00:28 +02:00
drmDev
b0c0ca351c WeirdingWood fix. Gloom and VolcanicEruption impl 2016-04-10 11:19:06 -04:00
LevelX2
386c7168d0 * Dromoka's Command - Fixed that P/T changes resulting of a sacrifice of an enchantment were not applied before the fighting effect was applied. 2016-04-10 10:56:13 +02:00
LevelX2
0cf3ab9d78 * Oath of Nissa - Fixed target selection mot working for AI players. 2016-04-10 10:30:23 +02:00
spjspj
065a202c1d Fix possible NPE for Martyr's Bond 2016-04-10 13:00:44 +10:00
MarcoMarin
a295964b04 Antiquities is complete. (except for antes, banding and reverse polarity) 
27 unique cards, 68 total;
bringing ATQ from 63,53% to 94.12% and ARN to 92.31%

+ Fixed a detail on Oubliette (tho bugs may remain)
+ Added 1 last card to ARN, now that I know about Watchers ;)
 2016-04-09 13:37:11 -03:00
Derek M
1be18a0188 Merge pull request #1834 from drmDev/master 
LightningSurge implemented
 2016-04-09 12:04:35 -04:00
drmDev
fc0197186b LightningSurge implemented 2016-04-09 12:04:15 -04:00
spjspj
9009375bf4 spjspj - Implement Martyr's Bond (CMD) 2016-04-10 01:37:49 +10:00
drmDev
1eae61a752 Millikin and EmptytheCatacombs implemented 2016-04-09 07:35:33 -04:00
Derek M
86528ede16 Merge pull request #1831 from drmDev/master 
Card implementations Epic Struggle, Primitive Etchings
 2016-04-09 05:53:34 -04:00
drmDev
80a0134120 Card implementations Epic Struggle, Primitive Etchings 2016-04-09 05:53:00 -04:00
LevelX2
f51302a780 Merge origin/master 2016-04-09 11:45:05 +02:00
LevelX2
278558c925 * Ghazban Ogre - Fixed various bugs (fixes #1828). 2016-04-09 11:44:35 +02:00
drmDev
f5843a5498 Life Burst card implemented 2016-04-09 05:26:06 -04:00
drmDev
266ba0643e Pariahs Shield implemented 2016-04-09 04:43:10 -04:00
drmDev
e6d36d9523 Vanishing card implemented 2016-04-08 17:13:04 -04:00
drmDev
7c8ac25abc Gelid Shackles implementation. PlayerStub fix 2016-04-08 15:55:25 -04:00