Commit graph

9570 commits

Author SHA1 Message Date
Samuel Sandeen
ac6a289275 Merge branch 'magefree/master' 2016-09-08 19:12:19 -04:00
LevelX2
21baa14404 * Fixed a problem with token P/T reset (fixes the problem with Tree of Perdition and Soul Separator). 2016-09-08 17:15:40 +02:00
spjspj
d01307e5ea spjspj - Fix for Paradoxical Outcome (KLD) 2016-09-09 00:31:23 +10:00
spjspj
1c49100d75 spjspj - Implement Paradoxical Outcome (KLD) - shroud wasn't being followed 2016-09-08 17:31:42 +10:00
spjspj
8cd3ec1135 spjspj - Implement Paradoxical Outcome (KLD) (done with addition to SweepEffect) 2016-09-08 17:09:47 +10:00
emerald000
67f29124f8 [KLD] Added 15 artifacts.
Aetherflux Reservoir, Aetherworks Marvel, Animation Module, Cogworker's Puzzleknot, Decoction Module, Demolition Stomper, Fabrication Module, Fireforger's Puzzleknot, Fleetwheel Cruiser, Ghirapur Orrery, Glassblower's Puzzleknot, Inventor's Goggles, Metalspinner's Puzzleknot, Ovalchase Dragster and Skysovereign, Consul Flagship.
2016-09-08 02:10:26 -04:00
Mark Langen
8d90f4558d Merge pull request #2234 from stravant/master
Characteristic-Based rendering initial release completed unless further bugs come up before then.
2016-09-07 23:16:10 -06:00
Samuel Sandeen
80da09471d Merge remote-tracking branch 'magefree/master' 2016-09-07 23:31:38 -04:00
spjspj
8375af12f2 spjspj - Implement Fountain Watch 2016-09-08 12:38:19 +10:00
fireshoes
72b13214e6 [KLD] Updated mtg-cards-data.txt with 9/7 spoilers. 2016-09-07 10:59:51 -05:00
Mark Langen
f0a1938b3e Full art Land rendering
* Added "frameStyle" tagging to relevant full art lands (ZEN, BFZ, UNG, UHG)

* Added support for rendering based off of frameStyle

* Outstanding bug that frameStyle doesn't seem to be replicated exactly properly
2016-09-07 02:20:51 -06:00
emerald000
df2782fdb6 [KLD] Basic implementation of energy counters. Added Woodweaver's Puzzleknot.
Better display of energy counters would be preferred.
2016-09-07 01:07:21 -04:00
fireshoes
f67cb21f2a [KLD] Implemented Chandra, Torch of Defiance; Chandra, Pyrogenius; Nissa, Nature's Artisan; and Nissa, Vital Force. 2016-09-06 22:15:33 -05:00
emerald000
5c5d6365d8 [KLD] Implemented Crew. Added 2 cards using it. 2016-09-06 03:18:47 -04:00
emerald000
90a55eddb7 [KLD] Implemented Fabricate. Added 3 cards using it. 2016-09-06 02:26:55 -04:00
emerald000
bc0f53973d Added an easier way to put custom text on buttons in a chooseUse prompt. 2016-09-06 02:07:59 -04:00
fireshoes
d70f424d1b [KLD] Added 9/5 spoilers to mtg-cards-data.txt and implemented a few cards. 2016-09-06 00:27:44 -05:00
Samuel Sandeen
eb89781154 Don't check for event validity in Karn's Ultimate
Karn Liberated should not check whether it’s valid before putting the
Commanders where they belong. Technically any operations after Karn’s
ultimate goes off are invalid if strict checks are made.
2016-09-05 22:17:04 -04:00
spjspj
41ff4cf595 Merge pull request #2228 from spjspj/master
spjspj - Slight fix for colours of tokens
2016-09-06 01:43:35 +10:00
spjspj
f6d06c895e spjspj - Slight fix for colours of tokens 2016-09-06 01:41:04 +10:00
LevelX2
0322f882a9 Merge pull request #2227 from ingmargoudt/master
refactor : removed all instances of new Random() and replaced with Ra…
2016-09-05 17:32:07 +02:00
ingmargoudt
e2a479255a refactor : removed all instances of new Random() and replaced with RandomUtil for a ThreadLocal randomizer 2016-09-05 15:03:47 +02:00
LevelX2
23433e82f0 Merge pull request #2226 from Derpthemeus/pull1
Implement 6 cards, fix Living Armor
2016-09-05 10:03:53 +02:00
fireshoes
b9d29d3ebf Added upcoming sets. [KLD] Updated mtg-cards-data.txt. Added some simple cards. 2016-09-04 22:54:05 -05:00
Matt Oslan
f8c1a46645 Implement The Brute 2016-09-04 11:56:35 -04:00
Matt Oslan
7803847f4b Implement Iron Lance 2016-09-04 11:55:30 -04:00
Matt Oslan
ce7c3d99a1 Implement Run Wild 2016-09-04 11:55:11 -04:00
LevelX2
133f043411 * Orcish Spy - Fixed that the activated ability did not work. 2016-09-04 17:17:34 +02:00
LevelX2
507ddd8711 * Necromancer's Magemark - Fixed replacement effect that was coded as triggered ability. 2016-09-04 17:14:27 +02:00
Matt Oslan
87fa888852 Fix return value of LivingArmorEffect 2016-09-04 10:39:12 -04:00
Matt Oslan
9b1dd2ceeb Merge origin/master into pull1 2016-09-04 10:36:11 -04:00
LevelX2
e43333aece * Mayael's Aria - Fixed that the +1/+1 counter was added to every controlled permanent instead of only creature permanents. 2016-09-04 11:01:42 +02:00
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