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

9588 commits

Author SHA1 Message Date
LevelX2
8abac8803e Merge pull request #2222 from Derpthemeus/pull2 
Implement 10 cards
 2016-09-04 09:36:20 +02:00
LevelX2
9e20efa444 Merge pull request #2224 from Dilnu/master 
Improve Counter and Zone code
 2016-09-04 09:35:18 +02:00
Matt Oslan
0f66d41744 Implement Rushwood Elemental 2016-09-03 23:36:48 -04:00
Matt Oslan
dcf5a0593a Implement Soothing Balm 2016-09-03 23:35:55 -04:00
Matt Oslan
f78d79e914 Implement Tonic Peddler 2016-09-03 23:35:32 -04:00
Samuel Sandeen
ac4658576b Remove Skullbriar 
There are still too many changes required before it can be implemented.
 2016-09-03 20:24:05 -04:00
Samuel Sandeen
434be545f7 Merge remote-tracking branch 'magefree/master' 
# Conflicts:
#
Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondi
tion.java
#	Mage/src/main/java/mage/game/permanent/PermanentToken.java
 2016-09-03 20:06:33 -04:00
Samuel Sandeen
ef5ed5256a Clean up the deprecated moveCards methods in Player 2016-09-03 20:04:12 -04:00
Matt Oslan
a58432ac3f Change Minions' Murmurs from damage to life loss 2016-09-03 17:04:27 -04:00
Samuel Sandeen
bec11804f5 Make the handling of counters more consistent. 
This dramatically reduces the code duplication around counters handling.
 2016-09-03 16:52:41 -04:00
Max Lebedev
1bae15ab11 Merge https://github.com/magefree/mage 2016-09-03 16:05:33 -04:00
Max Lebedev
ecd1985dab implemented Vernal Equinox 2016-09-03 16:04:22 -04:00
Matt Oslan
eaa16a179b Implement Cyclopean Mummy 2016-09-03 14:13:55 -04:00
Matt Oslan
00e3ca1939 Implement Walking Dead 2016-09-03 14:12:21 -04:00
Matt Oslan
cfa5b13f0b Implement Living Armor 2016-09-03 14:11:54 -04:00
Matt Oslan
53edfaeaa0 Implement Vulshok Battlemaster 2016-09-03 13:02:23 -04:00
LevelX2
2c904321e3 Merge pull request #2220 from maxlebedev/master 
Added a couple of old Legends cards
 2016-09-03 18:53:26 +02:00
Matt Oslan
e163227492 Merge origin/master into pull2 2016-09-03 10:39:06 -04:00
Samuel Sandeen
148f633672 Make the Counters API for card and permanent consistent. 2016-09-03 10:33:54 -04:00
LevelX2
c1d632be18 Merge origin/master 2016-09-03 15:26:46 +02:00
LevelX2
ab2399cbe7 * Fixed that equipments with restrictions (e.g. Gate Smasher) were not unequipped if the equipped permanent did no longer fulfill the restrictions(fixes #2212). 2016-09-03 15:26:17 +02:00
Max Lebedev
d65bb6bec5 added the Heaven's Gate, Dwarven Song, SeaKing's Blessing, Sylvan Paradise, and Touch of Darkness cards based mostly on Sway of Illusion 2016-09-03 07:45:50 -04:00
Styxo
f5c2a51be1 Merge pull request #2219 from Styxo/master 
Refactored some things
 2016-09-03 12:58:47 +02:00
Styxo
2aec9f2ca7 Refactored counters on permanents counting 
Added BecomeMonstrousTriggeredAbility 
Added Target and Filter class for creature an opponent controls
 2016-09-03 12:38:58 +02:00
LevelX2
cb91c5b9aa Merge pull request #2216 from stravant/master 
Full characteristic-based card rendering for cards
 2016-09-03 09:13:49 +02:00
Samuel Sandeen
85dc15c5dc Merge remote-tracking branch 'magefree/master' 2016-09-02 19:44:51 -04:00
Matt Oslan
0960a54998 Implement Wirecat 2016-09-02 19:17:09 -04:00
Matt Oslan
3c6f2430a9 Implement Minions' Murmurs 2016-09-02 18:59:49 -04:00
Mark Langen
463576dbd0 Merged up to current 2016-09-01 15:44:14 -06:00
Derek M
ac5f2ca6cc Merge pull request #2213 from Derpthemeus/master 
Implement 10 cards, fix a minor typo
 2016-08-31 22:00:43 -04:00
Matt Oslan
4669b4224a Implement Rooting Kavu 2016-08-31 19:05:45 -04:00
Matt Oslan
93bdb89d44 Implement Defiling Tears 2016-08-31 18:42:30 -04:00
Matt Oslan
67105ce3a0 Implement Disarm 2016-08-31 13:31:48 -04:00
Matt Oslan
a7b9809396 Implement Scarred Puma 2016-08-31 13:30:40 -04:00
Mark Langen
d5415d2d04 Working Card Rendering 2016-08-31 04:43:28 -06:00
Fenhl
8a427a2351 Fix capitalization of ownerId variable 
to fix my scripts that look up unimplemented cards.
 2016-08-31 06:53:10 +00:00
Matt Oslan
0fd013fb1b Implement Root Greevil 2016-08-30 20:23:53 -04:00
Matt Oslan
588a2d33a3 Implement Lightning Dart 2016-08-30 20:11:31 -04:00
Matt Oslan
1f0b4c1f6b Implement Dromad Purebred 2016-08-30 19:52:33 -04:00
Matt Oslan
e0015a5ac1 Implement Skyhunter Cub 2016-08-30 18:54:50 -04:00
Matt Oslan
aea744f95a Implement Moonlit Wake 2016-08-30 12:52:54 -04:00
Matt Oslan
deca4258d6 Fix Akki Blizzard-Herder's text 
Previously said "When Akki Blizzard-Herder dies, Each player sacrifices a land you control." now says "When Akki Blizzard-Herder dies, Each player sacrifices a land."
 2016-08-30 12:52:27 -04:00
Matt Oslan
9856cffa49 Implement Hurloon Shaman 2016-08-30 12:49:49 -04:00
Matt Oslan
33bdc359eb Implement Nova Cleric 2016-08-30 12:37:35 -04:00
Matt Oslan
56fb6e51e5 Implement Straw Golem 2016-08-30 12:36:15 -04:00
Matt Oslan
51bc1edae5 Implement Blossoming Wreath 2016-08-30 11:49:33 -04:00
Matt Oslan
acd3580527 Implement Elixir of Vitality 2016-08-30 11:32:04 -04:00
Styxo
cde96864d5 Merge pull request #2209 from Styxo/master 
Refactored multiple CreatureCondition classes into one class
 2016-08-29 20:41:56 +02:00
cg5
8cbffb3e69 Fix Gratuitous Violence bug 2016-08-29 20:10:01 +02:00
Styxo
6518b56d9d Refactored multiple CreatureCondition classes into one CreatureCountCondition class 2016-08-29 13:04:40 +02:00
Samuel Sandeen
71a5e4e15a Fix Changing the type of spells on the stack 2016-08-28 18:21:58 -04:00
Samuel Sandeen
282443c231 Add Subtype to the CardAttribute Framework 
This is a massive change. I’ve refrained from unrelated refactoring
when possible but there are still a lot of changes here.
 2016-08-28 17:30:10 -04:00
Styxo
42669b9c01 Merge pull request #2200 from Styxo/master 
Refactored cards that use similar abilities
 2016-08-28 16:56:08 +02:00
Styxo
b29c70a3c7 Refactored cards that use similar abilities 2016-08-28 16:39:33 +02:00
Samuel Sandeen
a1a3c0c6a7 Implement Conspiracy 
Implemented conspiracy, based on Teferi, Story Circle, and Cast Through
Time
 2016-08-27 20:01:54 -04:00
Derek M
61f6166f9d Merge pull request #2198 from cg5-/culling-scales 
Add Culling Scales
 2016-08-27 12:51:00 -04:00
michaelstephendavies
4dcb113761 Add Culling Scales 2016-08-27 18:45:33 +02:00
LevelX2
b5f7ab8c48 Merge pull request #2180 from Derpthemeus/master 
Implement Fathom Trawl, Launch, and Dispersing Orb
 2016-08-27 08:59:41 +02:00
fireshoes
10866056e1 [CN2] Added complete spoiler to mtg-cards-data.txt and all existing reprints. 2016-08-22 09:57:43 -05:00
drmDev
292105f60e [CN2] Stunt Double and Subterranean Tremors implemented. 2016-08-21 15:00:41 -04:00
fireshoes
4a708e4dc0 [CN2] Added 8/20 new card and white reprint spoilers to mtg-cards-data.txt. Added white reprints. 2016-08-21 09:24:55 -05:00
drmDev
b6c0433fa2 [Conspiracy:TTC] Recruiter of the Guard impl 2016-08-20 09:20:16 -04:00
Matt Oslan
38a6d3fcbd Implement Fathom Trawl, Launch, and Dispersing Orb 2016-08-19 16:41:09 -04:00
fireshoes
7de7df39b1 [CN2] Added 8/19 spoilers to mtg-cards-data.txt. Added Birds of Paradise reprint. 2016-08-19 10:14:47 -05:00
fireshoes
4f5876e3d5 [CN2] Added 8/18 spoilers to mtg-cards-data.txt. Added Wild Pair, Berserk, Duskmantle Seer, and Dragonlair Spider reprints. 2016-08-18 12:43:09 -05:00
fireshoes
5e96e7b444 [CN2] Added 8/17 spoilers to mtg-cards-data.txt. Added Exotic Orchard, Burgeoning, and Serum Visions reprints. 2016-08-17 10:56:31 -05:00
fireshoes
298d624f9c [CN2] Added 8/16 spoilers to mtg-cards-data.txt. Added Burning Wish, Phyrexian Arena, Desertion, and Hallowed Burial reprints. 2016-08-16 20:43:46 -05:00
fireshoes
eeaea4c566 [CN2] Added 8/15 spoilers to mtg-cards-data.txt. Added Inquisition of Kozilek reprint. 2016-08-15 11:17:51 -05:00
LevelX2
6b2d326f7b * Tree of Redemption - Fixed that the set toughness from exchange was still applied after zone changes. 2016-08-15 11:43:45 +02:00
drmDev
8051b8dedf Tree of Perdition bug fix - was incorrectly gaining toughness AND power equal to opponent life total 2016-08-13 23:17:25 -04:00
LevelX2
539b03bd1d Xmage 1.4.14v0 2016-08-13 10:14:38 +02:00
LevelX2
4bfac31370 * Archangel Avacyn - Fixed check for source object of triggered ability. 2016-08-13 09:38:28 +02:00
LevelX2
46566361e7 * Fixed a bug that if a copy token creature of a transformed creature was created (e.g. Mirror Mockery), the front side instead of the transformed side was copied. 2016-08-12 15:42:50 +02:00
LevelX2
0c617d1d35 * Ink-Eyes, Servant of Oni - Fixed a bug of how the card was moved to the battlefield by the triggered effect. 2016-08-12 13:25:12 +02:00
spjspj
d5ab9df255 spjspj - Implement Guardian Beast (ARN) 2016-08-11 23:12:06 +10:00
spjspj
f46c06066a spjspj - Implement Guardian Beast (ARN) 2016-08-11 23:03:22 +10:00
fireshoes
5ee29a14e6 [CN2] Implemented Kaya, Ghost Assassin 2016-08-10 14:20:18 -05:00
drmDev
b7743e69a0 Pariah's Shield bug fix - replacement effect only occurs when equipped to a creature 2016-08-09 21:25:13 -04:00
LevelX2
aa5623fd70 * Blinkmoth Urn - Fixed that the created mana was not removed at the steps end. 2016-08-09 22:52:22 +02:00
LevelX2
7504c58d5a Merge pull request #2160 from Choiseul11/choiseul11/2159-indulgent-aristocrat-tooltip-error 
Changed Indulgent Aristocrat filter to prevent 'each' appearing twice…
 2016-08-09 22:37:05 +02:00
Timothy Rogers
64f4a1584f Changed Indulgent Aristocrat filter to prevent 'each' appearing twice in tooltip 2016-08-09 14:10:02 -05:00
LevelX2
c31bf97440 * Fixed some problems if a creature has multiple madness abilities. 2016-08-09 13:14:29 +02:00
LevelX2
7f8f4bc034 * Goblin Gaveleer - Added missing Trample ability. 2016-08-08 17:10:28 +02:00
LevelX2
c84180b0f7 * Eye of the Storm - Fixed that the exiled spells could only always be cast by the controller of the Eye of the Storm. 2016-08-08 16:49:45 +02:00
LevelX2
47fb2c1ac5 Merge origin/master 2016-08-08 16:29:58 +02:00
LevelX2
005a805973 * Unbreathing Horde - Fixed that the creature came onto battlefield with one counter less than intended. 2016-08-08 16:29:16 +02:00
LevelX2
9e29a01c0c * Grafted Wargear - Fixed that the sacrifice effect did not work. 2016-08-07 10:16:25 +02:00
LevelX2
07bbd53d82 * Stitcher's Graft - Fixed that the sacrifice effect did not work. 2016-08-07 10:12:38 +02:00
LevelX2
8ccb5d18ec * removing double negative checks. 2016-08-07 09:28:39 +02:00
LevelX2
f84040f4c0 Merge pull request #2155 from Choiseul11/timr/implement-assorted-cards 
Timr/implement assorted cards
 2016-08-07 08:50:22 +02:00
Timothy Rogers
32d70cb069 Changed Celestial Sword sacrifice trigger to use CreateDelayedTriggeredAbilityEffect and AtTheBeginOfNextEndStepDelayedTriggeredAbility 2016-08-06 17:00:50 -05:00
LevelX2
5b5c13c137 * Kusari-Gama - Fixed trigger occurs but no damage is dealt (fixes #2154). 2016-08-06 12:43:16 +02:00
LevelX2
286dc55396 * Fixed Sightless Brawler cannot attack with other creatures attacking (fixes #2133). 2016-08-06 12:30:52 +02:00
LevelX2
14c02bc756 Merge origin/master 2016-08-06 11:33:55 +02:00
LevelX2
9df373e8f3 * Fixed Leech Bonder -1/-1 Tokens don't kill off enemy creatures (fixes #1975). 2016-08-06 11:33:24 +02:00
Timothy Rogers
adf6575eb2 Fixed author comment on Murderous Betrayal 2016-08-05 22:02:56 -05:00
Timothy Rogers
33e0f2cdde Implemented Murderous Betrayal 2016-08-05 20:52:11 -05:00
Quercitron
b91ef8b385 * Thirsting Axe - Fix check if equipped creature dealt combat damage to creature (fixes #2145). 2016-08-06 03:15:54 +03:00
Timothy Rogers
cb591e10ef Fixed author comment 2016-08-05 17:11:27 -05:00
Timothy Rogers
48dfdafe1e Implemented Celestial Sword from Iceage and ME4 2016-08-05 17:10:25 -05:00
LevelX2
64432e9132 Merge pull request #2152 from Choiseul11/choiseul11/implement-homelands-shrink 
Implemented Shrink (Homelands)
 2016-08-05 22:21:04 +02:00
LevelX2
d0db2d51ed * Fixed Identity Thief copying creature with +1/+1 counter gets P/T boost from it, but not counter (fixes #2131). 2016-08-05 21:15:07 +02:00
LevelX2
d1c25b0662 * Fixed flashback check of Altar of the Lost conditional mana. 2016-08-05 20:03:04 +02:00
Timothy Rogers
fe2434fa9f Implemented Shrink (Homelands) 2016-08-05 10:26:47 -05:00
Plopman
956724b5fa [TMP] Added 5 cards 2016-08-05 13:43:23 +02:00
Quercitron
9129bda9b7 * Hearthcage Giant - Fix that only one Elemental Shaman token is created (fixes #2141). 2016-08-05 00:59:42 +03:00
fwannmacher
9b5a02c09c - Fixed issue #2075 2016-08-04 09:52:56 -03:00
LevelX2
335c24c7c0 * Crown of Doom - Fix of target handling (untested). 2016-08-03 17:42:23 +02:00
drmDev
5442a92a2b Crown of Doom bug fix 2016-08-03 05:17:00 -04:00
LevelX2
270ffcb88a * Liliana, Defiant Necromancer - Fixed target bug of -X ability. 2016-08-02 16:52:25 +02:00
LevelX2
acf5df7f94 Merge origin/master 2016-08-02 15:43:57 +02:00
LevelX2
62a85fafc6 * Postmortem Lunge - Fixed that the exile effect were not applied correctly. 2016-08-02 15:42:45 +02:00
drmDev
693c45294a bug fix for Ghost-Lit Nourisher 2016-08-02 07:55:03 -04:00
fireshoes
88e8894b29 Added Duel Decks: Nissa vs Ob Nixilis and From the Vault: Lore. 2016-08-01 15:05:25 -05:00
LevelX2
94e59e5ee7 * Icefall Regent, Monastery Siege, Elderwood Scion, Accursed Witch, Infectious Curse - Fixed target check not working for multi modal spells (fixed #2114). 2016-07-31 10:41:23 +02:00
LevelX2
e9c994d8e5 * Fixed traget definition of Blood Feud and Dissension in the Ranks. 2016-07-31 10:24:28 +02:00
drmDev
2a51663ebc Fixed various bugs - loseLife instead of damage was supposed to be used 2016-07-30 21:15:05 -04:00
fwannmacher
b4bda0da5e - Fix issue #2088 2016-07-29 18:43:12 -03:00
drmDev
38a7927edb Spell Queller bug fix for #2126 2016-07-29 16:14:44 -04:00
drmDev
b7e0702b62 Fixed Genesis bug - activation cost is 2G not 3 colorless 2016-07-29 11:25:24 -04:00
LevelX2
8073d2e3f7 * Polymorphous Rush - Fixed wrong target description. 2016-07-29 14:19:52 +02:00
drmDev
c00dadcd4c build fix - maven doesn't like bloodclockeffect as public unless in its own file named bloodclockeffect 2016-07-29 03:46:43 -04:00
drmDev
3f3229c43c Martyred Rusalka and Netter En Dal impl 2016-07-28 17:50:26 -04:00
Fenhl
f2e6ee510b Add card Umbilicus 2016-07-28 13:40:23 +00:00
drmDev
0d8b892272 Festival, False Peace, Empty City Ruse, Moment of Silence impl. Extracted SkipNextCombatPhase class. 2016-07-27 09:42:45 -04:00
drmDev
0b48749e0b fix soul warden test. 2016-07-26 22:58:56 -04:00
drmDev
f593623508 finished implementation of cards. CardView bug fix for card number change. 2016-07-26 22:58:20 -04:00
drmDev
b7c4eec90f Merge branch 'master' of https://github.com/drmDev/mage 2016-07-26 20:00:37 -04:00
fwannmacher
3caf66e4b6 - Fixed Issue #2108 2016-07-26 19:34:06 -03:00
fireshoes
ad3f3649da Added FNM promo Rise from the Tides. 2016-07-26 13:52:36 -05:00
drmDev
54fcc1c408 WIP Syphon Flesh, Gravestorm, Gravespawn Sovereign implementations 2016-07-26 14:46:32 -04:00
Derek M
218583ebf8 Merge pull request #2120 from Dilnu/master 
Fix all known cases of Issue #2106
 2016-07-26 11:19:44 -04:00
Samuel Sandeen
2173069c09 Update Legerdemain to use filters in targeting. 
Fix the way targeting is handled on Legerdemain.

Previously it was possible to get into an impossible state if there was
no valid second target.
 2016-07-26 08:33:33 -04:00
drmDev
18a6e5392b Bloodscale Prowler, Burning Tree Bloodscale,Gristleback implemented 2016-07-26 06:35:47 -04:00
drmDev
f56b81b243 Trigon of Mending bug fix - allows targetting player 2016-07-25 23:46:01 -04:00
Samuel Sandeen
4c9a49df5b Merge remote-tracking branch 'magefree/master' 2016-07-25 21:58:43 -04:00
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