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
15517 commits 2 branches 0 tags 782 MiB
Commit graph

9452 commits

Author SHA1 Message Date
Samuel Sandeen
c12959e025 Standardize Another target logic in some cases. 
This removes custom targets and instead uses the AnotherTargetPredicate
to filter.
 2016-07-25 21:58:11 -04:00
Samuel Sandeen
67194253e4 Fix simple issues in target specification 2016-07-25 21:53:12 -04:00
drmDev
bc14f8176a Merge remote-tracking branch 'upstream/master' 2016-07-25 18:23:35 -04:00
drmDev
aa2605d6cf Tribal Unity cardNumber to string fix 2016-07-25 18:16:40 -04:00
Derek M
5c4059fac6 Merge pull request #2118 from fwannmacher/master 
Corrected some more bugs
 2016-07-25 18:14:00 -04:00
fwannmacher
cbd0e36f97 - Fixed Issue #2100 2016-07-25 17:55:38 -03:00
fwannmacher
1fc81b8bc7 - Fixed Issue #2094 2016-07-25 17:25:53 -03:00
Derek M
86e7ace06e Merge pull request #2112 from fwannmacher/master 
Converted cardNumber from int to String. Now card number with "a" or "b" can be used.
 2016-07-25 16:24:01 -04:00
fwannmacher
cd22b3013b - Fixed Issue #2102 2016-07-25 16:41:28 -03:00
fwannmacher
9390ec20b0 - Fixed Issue #2098 2016-07-25 12:52:01 -03:00
drmDev
f2cb945744 Spectral Shepherd double check to only target spirits you control 2016-07-25 11:11:59 -04:00
drmDev
6584079d7a bug fix for Tunnel Vision when it does not find card in library 2016-07-25 06:43:51 -04:00
Derek M
0f48520697 Merge pull request #2115 from Dilnu/master 
Implement new cards and fix a bug with two existing ones.
 2016-07-25 04:48:27 -04:00
Samuel Sandeen
3aa480cef8 Merge remote-tracking branch 'magefree/master' 2016-07-24 22:07:15 -04:00
Samuel Sandeen
68e84d9c23 Modify the way some second targets are chosen 
If implemented the wrong way when you try to choose second targets the
game can get into an impossible state this fixes three such cards.
 2016-07-24 22:07:04 -04:00
drmDev
099e490e4d patching up possible NPEs on quiet speculation 2016-07-24 21:49:36 -04:00
drmDev
f1343dd03f Quiet Speculation bugfix for #1970 - controller searches target player library 2016-07-24 21:47:41 -04:00
Samuel Sandeen
d97d9ea130 Merge remote-tracking branch 'magefree/master' 2016-07-24 18:02:53 -04:00
Samuel Sandeen
5e26638ab5 Fix a bug in Tribal Unity 
BoostAllOfChosenSubtypeEffect was too specific and didn’t apply to this
situation. It has been replaced with it’s superclass BoostAllEffect
 2016-07-24 18:02:22 -04:00
drmDev
e77033f30c Spreading Flames damage fix 2016-07-24 16:59:13 -04:00
drmDev
642de722f6 Mind Shatter bug fix for #2110. Before a discard effect can happen, checks the amount of cards to be discarded > 0 2016-07-24 15:00:07 -04:00
fwannmacher
10778cdd6b - Converted CardImpl.cardNumber from int to String 
- Fixed Issue #1953
- Fixed Issue #1914
- Fixed Issue #739
 2016-07-24 15:18:54 -03:00
Samuel Sandeen
05d88b46dd Merge remote-tracking branch 'magefree/master' 2016-07-24 11:53:11 -04:00
LevelX2
bd70f923b7 * Permeating Mass - Fixed that the copy effect did only work, if Permeating Mass did not die from combat damge. 2016-07-24 17:13:53 +02:00
LevelX2
c264da1cca * Tree of Perdition - Fixed that changed thougness value did not chnage back after it left battlefield. 2016-07-24 14:27:50 +02:00
Samuel Sandeen
a535d9d0e8 Merge remote-tracking branch 'magefree/master' 2016-07-23 17:44:44 -04:00
Samuel Sandeen
32a814fa6e Implement Simic Guildmage 2016-07-23 17:40:12 -04:00
Samuel Sandeen
690c0f41a9 Implement Tribal Unity 2016-07-23 17:40:01 -04:00
Derek M
060084f971 Merge pull request #2097 from fwannmacher/master 
Added option for download image number of threads and some minor fixes
 2016-07-23 09:55:13 -04:00
fireshoes
99dbdef5ce Added Vintage Cube June 2016 to the cube menu. Fixed that Permeating Mass did not use LKI for creating the copy. 2016-07-22 11:52:04 -05:00
drmDev
2e12164999 Stromkirk Condemned bug fix - only affects vampires you control 2016-07-22 08:12:19 -04:00
drmDev
5ac81a4fdc Clear Shot fix - damage source is the creature 2016-07-21 09:07:09 -04:00
Derek M
b8091cc3a8 Merge pull request #2085 from cg5-/master 
Add Infernal Caretaker
 2016-07-21 06:09:06 -04:00
jeff
c241b45a91 - Added a null check for The Great Aurora 2016-07-20 16:08:42 -05:00
fwannmacher
4732686d8f - Fixed Issue #1992: Added missing cards 2016-07-20 14:42:26 -03:00
fwannmacher
06d14c4388 - Fixed Issue #1994: Added missing cards 2016-07-20 14:32:01 -03:00
fwannmacher
2dacf042d8 - Fixed Issue #1993: Added missing cards 2016-07-20 14:23:41 -03:00
drmDev
8368a8379c variable naming for clarity - Spellbinder 2016-07-20 11:36:58 -04:00
drmDev
a98e05e338 Great Aurora patch - no longer uses deprecated moveCards methods 2016-07-20 09:13:04 -04:00
drmDev
910d6eb048 Spreading Flames targetting fix 2016-07-19 16:33:44 -04:00
fireshoes
9630320ba9 Changed set codes in image sources and Mage Sets to match recent changes. Changed Portal Second Age set code back to PO2. Updated tokens with recent sets to product correct images. Fixed that there was no basic land slot in EMN packs. 2016-07-18 15:49:43 -05:00
Plopman
5350c134da fixed target of Cemetery Recruitment 2016-07-18 19:09:47 +02:00
Neil Gentleman
882136fbc7 Dwarven Blastminer should only be able to target non-basics 
likewise Encroaching Wastes
 2016-07-17 18:19:16 -07:00
Neil Gentleman
5e1bc1e583 implement Beasts of Bogardan 
also fixed Ivory Guardians to correctly boost other Ivory Guardians, and
changed many similar cards to use OpponentControlsPermanentCondition
instead of custom Conditions.
 2016-07-17 18:19:16 -07:00
Neil Gentleman
cfb612b68a Mad Auntie's regeneration ability is targeted 
Baron Sengir, too
 2016-07-17 18:19:16 -07:00
Neil Gentleman
dafd392649 Borborygmos only triggers when damaging a player 2016-07-17 18:19:16 -07:00
Neil Gentleman
46a8ee438a fix "you control you control" in rules text 
GainAbilityControlledEffect + FilterControlledCreaturePermanent is redundant
 2016-07-17 18:19:16 -07:00
Neil Gentleman
0c37163052 use DestroyAllEffect 2016-07-17 18:19:16 -07:00
Neil Gentleman
eb4e758880 FloodtideSerpentReplacementEffect is unused 2016-07-17 18:19:16 -07:00
drmDev
5c5d729447 Merge remote-tracking branch 'upstream/master' 2016-07-17 14:32:42 -04:00
drmDev
3522223b20 Spellbinder implemented 2016-07-17 14:32:23 -04:00
Neil Gentleman
1b78e06c7f Crosis's Charm doesn't prevent artifacts from regenerating 2016-07-17 10:33:29 -07:00
Neil Gentleman
2a8b117f34 Contingency Plan is just a Sorcery 2016-07-17 10:21:05 -07:00
drmDev
4a162dd609 Inner Struggle fixes so creature is source of damage done to itself 2016-07-17 12:37:31 -04:00
drmDev
f807fed12c Foul Tongue Shriek bug fix - filters attacking creatures you control 2016-07-17 06:41:26 -04:00
Neil Gentleman
5529d7c75d Lunge deals two damage to each target 2016-07-16 14:01:08 -07:00
Neil Gentleman
9b44e7860a Lost in the Woods' effect is not optional 2016-07-16 14:00:59 -07:00
Neil Gentleman
a0121dd47e Lovisa Coldeyes affects all player's creatures 2016-07-16 14:00:51 -07:00
Neil Gentleman
7b9ca84ae1 Agonizing Demise prevents regeneration 2016-07-16 14:00:31 -07:00
Neil Gentleman
6c0c499557 Abu Ja'far is not optional, and prevents regeneration 2016-07-16 14:00:23 -07:00
Neil Gentleman
62cec1c520 Hunter of Eyeblights 
not `Of`
 2016-07-16 14:00:17 -07:00
Neil Gentleman
16fc86ef1a Awakening Zone's trigger is optional 2016-07-16 14:00:04 -07:00
Neil Gentleman
09a9e06a0f Arashin War Beast's ability is not optional 2016-07-16 13:59:58 -07:00
Neil Gentleman
a3836f6ec7 Act of Aggression can only target opponent's creatures 2016-07-16 13:59:49 -07:00
michaelstephendavies
ba4053c725 Infernal Caretaker - use ReturnToHandFromGraveyardAllEffect 2016-07-16 22:13:19 +02:00
michaelstephendavies
ddbd5f6514 Add Infernal Caretaker 2016-07-16 17:28:00 +02:00
Neil Gentleman
1a95e2021a Fix some incorrect card data 2016-07-15 21:23:39 -07:00
drmDev
2ecadbc30b Tamiyo fixes #2078 2016-07-15 21:15:04 -04:00
drmDev
966de10386 Stensia Banquet fix 2016-07-15 19:51:09 -04:00
jeff
bc1f4e409c - Fixed Aura Swap bug #2025. 2016-07-15 15:30:47 -05:00
spjspj
09cc97dd85 spjspj - Fix copy's owner for Mirrorwing Dragon (EMN) 2016-07-16 03:11:06 +10:00
LevelX2
e5117a967d * Mirrorwing Dragon - Fixed wrong target handling. 2016-07-15 18:14:38 +02:00
LevelX2
4302186032 * Devils' Playground - Fixed name spelling bug. 2016-07-15 14:47:20 +02:00
LevelX2
88d66784df * Crop Sigil - Fixed that it can't be activated without both a creature and land in the graveyard (fixes #2079 ). 2016-07-15 14:25:25 +02:00
LevelX2
4bdc4936f0 * Fixed Mid's Dilation bugs (fixes #2077). 2016-07-14 17:14:06 +02:00
LevelX2
fc1a1523c5 * Gideon, Champion of Justice - Fixed that the P/T did not change if loyality counters were added after using the 0 ability. 2016-07-13 17:04:52 +02:00
LevelX2
20fa414838 * Gideon, Champion of Justice - Fixed a bug that Gideon dies if its ability to make it a creature was used. 2016-07-13 12:25:54 +02:00
LevelX2
87296b56c3 * Tamiyo, Field Researcher - Fixed that only one card was drawn from +1 ability if both target creatures did combat damage. 2016-07-13 11:45:31 +02:00
drmDev
0670b24f22 Reverting gideon change (no more CDA). added junit test demonstrating issue #2069 2016-07-13 05:27:32 -04:00
drmDev
8ded1981fb Gideon Champion of Justice bugfix fixes #2069 2016-07-13 04:50:57 -04:00
fireshoes
96e88d7350 [EMN] Fixed tooltip text on some green, gold, artifact, and land cards. Added Emrakul's Evangel's missing TapSourceCost. 2016-07-12 23:10:37 -05:00
jeff
0e4a3a2142 - Fixed Grave Scrabbler. 2016-07-12 16:39:00 -05:00
fireshoes
cf6ac805b7 [EMN] Fixed tooltip text on some red cards. Fixed Spreading Flames targeting creatures or players. Fixed Stensia Banquet subtype filter. 2016-07-12 16:05:42 -05:00
fireshoes
e8880437df [EMN] Fixed tooltip text on some black cards. Fixed Dark Salvation -x/-x ability. Fixed Stromkirk Condemned collector number. 2016-07-12 12:00:31 -05:00
LevelX2
e7014f385b Added tests. 2016-07-12 18:07:18 +02:00
drmDev
bb3828ce0c Distember of the Blood [EMN] bug fix 2016-07-12 08:57:09 -04:00
Eric McVicker
9a069edc44 Fix meld trigger text for Gisela, the Broken Blade 2016-07-12 02:38:20 -05:00
fireshoes
80f4ab770b [EMN] Fixed tooltip text on some blue cards. 2016-07-11 23:40:24 -05:00
fireshoes
c698ce5630 [EMN] Various fixes. 2016-07-11 21:13:32 -05:00
Quercitron
99a2f4b323 * Borrowed Hostility - Fixed that all controlled creatures were buffed with the first mode. 2016-07-12 02:02:52 +03:00
fireshoes
bf0d920e8c [EMN] Cleaned up some tooltip text on white cards, fixed a couple of card names. 2016-07-11 16:37:12 -05:00
LevelX2
fa32925b28 Merge origin/master 2016-07-11 22:55:34 +02:00
LevelX2
d0ecb473da Xmage 1.4.13v0 2016-07-11 22:54:43 +02:00
fireshoes
69dbff9cb3 Added upcoming promo cards. Worked on mtg-cards-data.txt organization (alphabetizing by set name and removing duplicate sets). 2016-07-11 13:56:14 -05:00
LevelX2
2a55110627 [EMN] Some minor fixes. 2016-07-11 19:25:25 +02:00
LevelX2
8a7a1e3dab Merge origin/master 2016-07-11 18:56:16 +02:00
LevelX2
2bdb3635a2 Serum Tank - Fixed some bugs. 2016-07-11 18:55:49 +02:00
fireshoes
e9f66ae65a Merge commit 2016-07-11 11:37:58 -05:00
fireshoes
1dfed9b1c8 [EMN] Added MeldEffect to Gisela and Hanweir Battlements. Changed Brisela and Hanweir, the Writhing Township to MeldCard. Added missing TapSourceCost to Hanweir Battlements. Added missing ability.addEffect to Chittering Host. 2016-07-11 11:32:28 -05:00
LevelX2
1b2f1efb00 Merge pull request #2061 from Dilnu/master 
Implement 6 Cards and tests for two of them.
 2016-07-11 18:23:00 +02:00
LevelX2
0f122ff154 Merge pull request #2062 from CountAndromalius/SerumTank 
Implementing Serum Tank (Mirrodin and Planechase)
 2016-07-11 18:22:47 +02:00
fireshoes
436942ccff [EMN] Minor spelling fix. 2016-07-11 09:04:46 -05:00
emerald000
e1b3428a39 [EMN] Implemented basic Meld functionality. 2016-07-11 04:49:40 -04:00
CountAndromalius
3c52670d61 Implementing Serum Tank (Mirrodin and Planechase) 2016-07-11 02:27:38 -03:00
Samuel Sandeen
bf613572e9 Fix another merge artifact. 2016-07-10 19:07:53 -04:00
Samuel Sandeen
c7cdd792d0 Remove Merge conflict artifacts. 2016-07-10 19:05:41 -04:00
Samuel Sandeen
6cf04e9bd2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
#	Mage.Sets/src/mage/sets/timeshifted/Darkness.java
 2016-07-10 19:01:20 -04:00
Samuel Sandeen
8fe5bf4fbb Update the uses of PreventAllDamageByAllPermanentsEffect to use the new name. 2016-07-10 18:55:58 -04:00
samuelsandeen
f9b0befac3 Implement several cards and tests for some of the more complex cards. 
This also makes a small change to AbilityImpl's handling of variable 
costs which may not be needed.
 2016-07-10 18:39:42 -04:00
LevelX2
cb91282f9e [EMN] Some fixes to Dark Salvation, Eldrich Moon, Make Mischief. 2016-07-10 22:02:56 +02:00
LevelX2
09273f284d [EMN] Set Hanwar the Writhing Township to nightSide 2016-07-10 21:07:59 +02:00
LevelX2
772abd9311 Merge origin/master 2016-07-10 20:58:51 +02:00
LevelX2
1e120bdeaa [EMN] Added Dark Salvation and a workaroung version of Slayer's Cleaver. The meld cards without meld. 2016-07-10 20:58:26 +02:00
Quercitron
712316d8ff [EMN] Added Thirsting Axe. 2016-07-10 18:41:36 +03:00
LevelX2
de0b66240f [EMN] Added 3 black cards. 2016-07-10 11:11:56 +02:00
LevelX2
0017f7a458 [EMN] Added 8 black cards. 2016-07-10 10:43:26 +02:00
LevelX2
b2bd87b9f4 [EMN] Some fixes to red cards. 2016-07-10 10:09:22 +02:00
LevelX2
fd55feee17 [EMN] Added the missing multicolor cards. 2016-07-10 10:09:06 +02:00
drmDev
55aae9910e fixes #2054 2016-07-10 03:27:33 -04:00
drmDev
e317719e16 [EMN] some black cards implemented 2016-07-09 19:15:04 -04:00
drmDev
4423f1e7fc the real [EMN] commit... 2016-07-09 16:48:33 -04:00
drmDev
2e4384ef68 [EMN] implemented many more colorless cards 2016-07-09 16:46:56 -04:00
drmDev
566e667780 Merge remote-tracking branch 'upstream/master' 2016-07-09 16:32:06 -04:00
drmDev
f694c2106b additional card fix for #2057 2016-07-09 16:31:17 -04:00
drmDev
6fe2c226b8 fixes #2057 2016-07-09 16:29:43 -04:00
LevelX2
771f2c4fb9 [EMN] Added the missing red cards (some untested). 2016-07-09 21:24:58 +02:00
LevelX2
7c0b11c641 [EMN] Added the missing white cards (without meld). 2016-07-09 18:16:56 +02:00
drmDev
29b3a2398d Merge remote-tracking branch 'upstream/master' 2016-07-09 09:45:36 -04:00
drmDev
d234fb7961 Added some colorless cards (EMN) 2016-07-09 09:45:03 -04:00
LevelX2
4c363bee23 [EMN] Added the missing green cards. 2016-07-09 15:39:59 +02:00
LevelX2
4818830e5c [EMN] Added the missing blue cards. 2016-07-08 23:10:12 +02:00
LevelX2
753e7dfb2c [EMN] Added some blue cards. 2016-07-08 21:37:24 +02:00
fireshoes
4cf3f29c4c [EMN] Added complete spoiler to mtg-cards-data.txt. Added existing reprints. 2016-07-08 11:18:14 -05:00
drmDev
18e8a6dc49 Merge branch 'master' of https://github.com/drmDev/mage 2016-07-08 08:51:21 -04:00
fireshoes
d30736de38 [EMN] Added Mind's Dilation, Splendid Reclamation, and Bedlam Reveler. Fixed some card translations. 2016-07-07 22:26:25 -05:00
drmDev
16ce177143 Reflector Mage restriction effect fix 2016-07-07 20:27:49 -04:00
fireshoes
742acf5406 [EMN] Added 7/7 spoilers to mtg-cards-data.txt. Implemented several cards. 2016-07-07 18:42:43 -05:00
fireshoes
7172606506 [EMN] Added additional 7/6 spoilers to mtg-cards-data.txt. Implemented Wolfkin Bond and Noose Constrictor. 2016-07-06 23:39:12 -05:00
jeff
6441a3dac3 - Little fix for Bruna, Light of Alabaster. 2016-07-06 15:44:24 -05:00
fireshoes
b8d7ee2c02 [EMN] Added 7/6 spoilers to mtg-cards-data.txt. Implemented Permeating Mass and Falkenrath Reaver. Add Meld reminder text to Bruna, Midnight Scavengers, and Hanweir Garrison. Fixed translated name of Collective Defiance. 2016-07-06 10:56:38 -05:00
LevelX2
21e1b98637 * Fixed wrong card number of Wild Pair PLC. 2016-07-06 17:18:52 +02:00
LevelX2
d95c13c563 * Fixed a problem of Identity Thief (fixes ##2052). 2016-07-06 16:14:51 +02:00
LevelX2
c236f1f8e1 Merge pull request #2048 from shootbot/master 
Implemented 'The Rack' from 'Duels of the Planeswalkers'
 2016-07-06 11:32:38 +02:00
fireshoes
edc6ef36ac [EMN] Added additional 7/5 spoilers to mtg-cards-data.txt. Fixed some translated text. 2016-07-05 18:07:41 -05:00
fireshoes
f0d169367a [EMN] Added 7/5 spoilers to mtg-cards-data.txt. Implemented some new cards. Fixed Liliana and Ishkanah to only filter controlled creatures. 2016-07-05 10:48:25 -05:00
spjspj
fabbcbddc1 spjspj - Implement Identity Thief [EMN] 2016-07-05 22:52:23 +10:00
fireshoes
b32b2aa4da [EMN] Added several cards. 2016-07-04 22:51:51 -05:00
drmDev
908f97ad68 Darigaaz Charm tooltip fix 2016-07-04 19:10:02 -04:00
drmDev
8a4a1933b1 Soul Separator fixes 2016-07-04 06:26:26 -04:00
drmDev
eb8519cd78 Merge remote-tracking branch 'upstream/master' 2016-07-04 04:16:33 -04:00