Commit graph

11653 commits

Author SHA1 Message Date
Christian
214a585f8d Fixed merge conflicts 2017-08-14 16:13:35 -04:00
Christian
75712661de Updated Kindred Dominance with better code reuse 2017-08-14 16:08:35 -04:00
Christian
98ee5931a7 Implemented Kindred Dominance and added to Commander2017 Set 2017-08-14 15:57:43 -04:00
Evan Kranzler
c9be694f05 Fixed Credit Voucher 2017-08-14 15:54:24 -04:00
Christian
4838ad7e7a Added Kindred Dominance to Commander 2017 Set 2017-08-14 15:22:01 -04:00
Evan Kranzler
cb34678c70 Fixed Crooked Scales, Consuming Ferocity, Crash Landing and Crookclaw Elder 2017-08-14 13:12:32 -04:00
Saga\Robert
1f759f9291 - changed getPermanent to getPermanentOrLKIBattlefield
- changed == operator to equals()
2017-08-14 17:17:10 +02:00
spjspj
f2c89d4717 Merge pull request #3812 from spjspj/master
Implement Fractured Identity (C17)
2017-08-15 01:05:46 +10:00
spjspj
41eff642ba Implement Fractured Identity (C17) 2017-08-15 01:04:25 +10:00
LevelX2
6244046330 * Some minor changes. 2017-08-14 16:48:48 +02:00
Saga\Robert
8b427de2d3 - changed nonland filter to static filter 2017-08-14 15:15:36 +02:00
Evan Kranzler
60d3fb62ba Fixed bug #3797 2017-08-13 22:35:41 -04:00
Evan Kranzler
d6896984c1 Implemented Daru Healer, Daughter of Autumn, Daunting Defender, Delraich, Dermoplasm, Disempower and Divine Congregation 2017-08-13 22:25:15 -04:00
theelk801
83dbc70ff0 Merge pull request #24 from magefree/master
merge
2017-08-13 17:55:08 -04:00
theelk801
ab280682cc Merge pull request #23 from theelk801/morecrads
merge
2017-08-13 17:53:02 -04:00
Saga\Robert
e0bbe2da7e - fixed it so controller doesn't get benefit twice if attacking 2017-08-13 20:19:33 +02:00
Saga\Robert
478a0b8ea8 - updated available set info of Zombie and Gold tokens
- added Curse of Vitality
- added Curse of Verbosity
- added Curse of Disturbance
- added Curse of Opulence
- added Curse of Bounty
- added Curse cycle to C17
2017-08-13 17:52:48 +02:00
LevelX2
1694daa4ab Merge pull request #3801 from theelk801/master
Implemented Charmed Griffin, Chieftain en-Dal, Chill Haunting, Chime of Night, Cleansing, and Coiling Woodwurm
2017-08-13 16:28:10 +02:00
LevelX2
30ec306489 Merge branch 'master' into master 2017-08-13 16:26:17 +02:00
igoudt
195bf90889 Merge https://github.com/magefree/mage 2017-08-13 15:54:12 +02:00
igoudt
f658765722 fixes #3806 2017-08-13 15:53:39 +02:00
spjspj
ae95bd6e16 Fix 2017-08-13 23:06:17 +10:00
spjspj
cf95e5fa08 Merge branch 'master' of https://github.com/spjspj/mage
Conflicts:
	Mage.Sets/src/mage/sets/Commander2017.java
2017-08-13 23:04:01 +10:00
spjspj
a39ceae9a1 Implement Crimson Honor Guard (C17) 2017-08-13 22:59:45 +10:00
Saga
3ad7c71b42 Update HungryLynx.java 2017-08-13 14:37:48 +02:00
Christian
df07c7fa0c Created Kindred Dominance 2017-08-12 20:54:53 -04:00
Saga\Robert
ce0dded9ca - removed unused imports 2017-08-13 00:24:27 +02:00
Saga\Robert
497f6a9342 - added Herald's Horn
- added Horn to C17
2017-08-13 00:20:48 +02:00
Saga\Robert
b49f46dcf6 - added Bloodsworn Steward
- added Hungry Lynx
- added both cards to C17
2017-08-12 19:22:51 +02:00
spjspj
10e4d20e47 Merge branch 'master' into master 2017-08-12 17:58:24 +10:00
spjspj
f41effe979 Implement Nazahn, Revered Bladesmith (C17) 2017-08-12 17:56:55 +10:00
spjspj
e152fda404 Merge pull request #3802 from spjspj/master
Implement Patron of the Vein / Qasali Slingers (C17)
2017-08-12 17:06:15 +10:00
spjspj
c83ad3a4ed Implement Patron of the Vein / Qasali Slingers (C17) 2017-08-12 17:05:33 +10:00
Evan Kranzler
53f194552c Implemented Consuming Ferocity, Crash Landing, Credit Voucher, Crooked Scales and Deathmark Prelate 2017-08-11 18:40:53 -04:00
Justin Herlehy
4e15194d08 Merge pull request #3784 from Eleros/feature/HASCON2017Promos
Implemented Grimlock, Dinobot Leader // Grimlock, Ferocious King & Balan, Wandering Knight
2017-08-11 15:26:23 -07:00
theelk801
ff47290039 Merge pull request #20 from magefree/master
merge
2017-08-11 18:20:53 -04:00
theelk801
cfdf83929e Implemented Chain of Acid, Chain of Silence, Chain of Smog and Chain Stasis (#3796)
* Implement Epicenter

* Implement Infested Roothold

* Implement Brown Ouphe

* Implement Rust

* Implement Ouphe Vandals

* Implement Fatal Attraction

* Implement Fighting Chance

* Implement Arcbound Fiend

* Implement Carry Away

* Implement Caverns of Despair

* Implement Amulet of Unmaking

* Implement Aphetto Exterminator

* Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor

* Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman

* Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter

* Implement Brown Ouphe

* Implemented Break Open

* Implemented Carrion

* Implemented Cephalid Pathmage

* Implemented Cephalid Inkshrouder

* Implemented Ceremonial Guard

* Implemented Chain of Acid, Chain of Silence, and Chain of Smog

* Implemented Chain of Acid, Chain of Silence, and Chain of Smog

* Implemented Chain Stasis
2017-08-11 17:01:57 -05:00
spjspj
04037a6d70 Implement Scalelord Reckoner (C17) 2017-08-12 01:12:30 +10:00
spjspj
10159cd157 Implement Taigam, Sidisi's Hand (C17) 2017-08-11 19:56:25 +10:00
spjspj
7d2c4b9ab3 Implement Teferi's Protection (C17) 2017-08-11 17:28:03 +10:00
spjspj
625620efcc Implement Traverse the Outlands (C17) 2017-08-11 16:50:57 +10:00
Evan Kranzler
82fbb18c0d Implemented Dark Triumph 2017-08-10 13:55:30 -04:00
Evan Kranzler
fbc5d9a0ff Implemented Crookclaw Elder 2017-08-10 10:04:23 -04:00
Evan Kranzler
91a52a8b8f Implemented Complex Automaton 2017-08-10 09:50:22 -04:00
Evan Kranzler
1e1bb6c3ba Implemented Chime of Night 2017-08-10 09:34:03 -04:00
Evan Kranzler
da77fbf90b Implemented Cleansing 2017-08-10 09:28:20 -04:00
Evan Kranzler
4038aa3408 Implemented Chill Haunting 2017-08-10 09:03:19 -04:00
Evan Kranzler
976f2ff1ac Implemented Coiling Woodworm 2017-08-10 08:52:16 -04:00
Evan Kranzler
946cab1355 Implemented Chieftain en-Dal 2017-08-10 08:37:16 -04:00
Evan Kranzler
fcd6edfe6f Implemented Charmed Griffin, added filter, fixed Hunted Wumpus wording 2017-08-10 08:18:27 -04:00
Evan Kranzler
abb3a680fc Implemented Chain Stasis 2017-08-10 08:01:32 -04:00
LevelX2
a3e7aa6230 * Karn Liberated - fixed that after using its -14 ability the game does not properly set the starting player of the new game (fixes #3786). 2017-08-10 07:04:32 +02:00
theelk801
3a52ce609d Implemented Carrion, Cephalid Pathmage, Cephalid Inkshrouder and Ceremonial Guard (#3793)
* Implement Epicenter

* Implement Infested Roothold

* Implement Brown Ouphe

* Implement Rust

* Implement Ouphe Vandals

* Implement Fatal Attraction

* Implement Fighting Chance

* Implement Arcbound Fiend

* Implement Carry Away

* Implement Caverns of Despair

* Implement Amulet of Unmaking

* Implement Aphetto Exterminator

* Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor

* Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman

* Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter

* Implement Brown Ouphe

* Implemented Break Open

* Implemented Carrion

* Implemented Cephalid Pathmage

* Implemented Cephalid Inkshrouder

* Implemented Ceremonial Guard
2017-08-09 23:13:36 -05:00
Evan Kranzler
6af0994368 Implemented Chain of Acid, Chain of Silence, and Chain of Smog 2017-08-09 20:27:38 -04:00
Eleros
b770e8ba51 Merge branch 'master' into feature/HASCON2017Promos 2017-08-09 22:11:19 +02:00
Evan Kranzler
050b2d0c1c Implemented Ceremonial Guard 2017-08-09 12:41:37 -04:00
Evan Kranzler
75853463e9 Implemented Cephalid Inkshrouder 2017-08-09 12:41:35 -04:00
Evan Kranzler
c77971e588 Implemented Cephalid Pathmage 2017-08-09 12:41:34 -04:00
Evan Kranzler
7838049c14 Implemented Carrion 2017-08-09 12:41:32 -04:00
Evan Kranzler
10e1e9d3ab Implemented Break Open 2017-08-09 12:41:31 -04:00
Evan Kranzler
8c664e942d Implement Brown Ouphe 2017-08-09 12:41:29 -04:00
spjspj
5717dc5e69 Merge pull request #3791 from spjspj/master
Update card numbers
2017-08-09 23:57:04 +10:00
spjspj
7efb8bdee4 Update card numbers 2017-08-09 23:56:02 +10:00
theelk801
385e462f15 Implemented Epicenter, Infested Roothold, Brown Ouphe, Rust, Ouphe Vandals, Fatal Attraction, Fighting Chance, Arcbound Fiend, Carry Away, Caverns of Despair, Amulet of Unmaking, Aphetto Exterminator, Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound, Boa Constrictor, Bola Warrior, Brass Talon Chimera, Briar Patch, Brine Shaman, Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin (#3779)
* Implement Epicenter

* Implement Infested Roothold

* Implement Brown Ouphe

* Implement Rust

* Implement Ouphe Vandals

* Implement Fatal Attraction

* Implement Fighting Chance

* Implement Arcbound Fiend

* Implement Carry Away

* Implement Caverns of Despair

* Implement Amulet of Unmaking

* Implement Aphetto Exterminator

* Implement Balduvian Conjurer, Barrin's Unmaking, Each Mana Battery, Blood Hound and Boa Constrictor

* Implement Bola Warrior, Brass Talon Chimera, Briar Patch and Brine Shaman

* Implemented Call to Arms, Goham Djinn, Halam Djinn, Ruham Djinn, Sulam Djinn, Zanam Djinn, Heroic Defiance and Tsabo's Assassin, updated Barrin's Unmaking and Epicenter
2017-08-08 21:49:14 -05:00
igoudt
63c3689d47 update cabal therapy complying CR 708.4a 2017-08-08 17:37:12 +02:00
igoudt
2ca7927580 AddCardSubtypeAllEffect uses SubType enum 2017-08-08 17:11:21 +02:00
Saga\Robert
53c31d4a81 - changed to new SubType.add method 2017-08-07 22:38:42 +02:00
Saga\Robert
dbda9eb4b2 - changed to new SubType.add method 2017-08-07 22:37:23 +02:00
Saga\Robert
8819d8abae - changed to new SubType.add method 2017-08-07 22:37:01 +02:00
Saga\Robert
05f5b99a99 - changed Autobot and Dinosaur to fantasy types 2017-08-07 22:35:08 +02:00
igoudt
4dc3419efa fix some subtypes for becomesBasiclandTargetEffect 2017-08-07 22:26:17 +02:00
igoudt
8d52e995e8 change BEcomesBasicLandTargetEffect to use SubType 2017-08-07 21:58:59 +02:00
Saga\Robert
c99c3f1765 - added Balan, Wandering Knight
- added Balan to C17
2017-08-07 17:02:29 +02:00
Saga\Robert
e1dd26f799 - added Grimlock, Dinobot Leader (including Grimlock, Ferocious King)
- added Grimlock to H17 set
2017-08-07 01:28:37 +02:00
igoudt
ead0141b5b fix spreading seas 2017-08-06 22:58:20 +02:00
igoudt
5d99bacf73 fix subtype in game state 2017-08-06 22:11:26 +02:00
igoudt
b7e2459129 fix mystic barrier 2017-08-06 17:27:28 +02:00
igoudt
6336f82845 remove redundant cardgraphicinfo instances 2017-08-06 17:23:03 +02:00
igoudt
f793504ba0 remove hasSubType(String s) 2017-08-06 17:22:11 +02:00
Eleros
c094251061 - added Shauku, Endbringer (#3780)
- added Shauku to Mirage set
2017-08-05 18:09:44 -05:00
LevelX2
9a1ce3f449 Merge pull request #3769 from Eleros/feature/HASCON2017Promos
Feature/hascon2017 promos
2017-08-04 22:39:20 +02:00
Evan Kranzler
e9c47a4644 Implement Coffin Puppets 2017-08-04 16:36:00 -04:00
Evan Kranzler
d9649fd54c Implement Common Cause 2017-08-04 15:39:10 -04:00
Evan Kranzler
e8c96ad83f Implement Spectral Guardian 2017-08-03 18:17:21 -04:00
Evan Kranzler
19b3d03b97 Implement Second Sight 2017-08-03 17:49:08 -04:00
Evan Kranzler
d6586cd103 Fixed Powder Keg sac ability cost 2017-08-03 14:45:44 -04:00
Evan Kranzler
e6eb415236 Fix bug #3286 2017-08-03 13:57:03 -04:00
Evan Kranzler
145415cadf Fix bug #3775 and other cards with the same issue 2017-08-03 10:39:18 -04:00
theelk801
f22c8672fb Merge pull request #13 from magefree/master
* Borderland Explorer - Fixed that it was possible to search a land a…
2017-08-03 10:38:22 -04:00
LevelX2
15fd74063c * Borderland Explorer - Fixed that it was possible to search a land also if the player did not discard a card. 2017-08-03 10:23:21 +02:00
Evan Kranzler
65004d1a5f Fix Mindless Null and Can't Block effect 2017-08-02 14:21:08 -04:00
theelk801
7370baad73 Merge pull request #12 from magefree/master
merge
2017-08-02 13:59:11 -04:00
Evan Kranzler
f2ea073547 Implement Riptide Entrancer, fix Blind Zealot 2017-08-02 13:57:02 -04:00
ingmargoudt
2192a517ce Merge pull request #3774 from ingmargoudt/master
fixing choosing creature types
2017-08-02 08:06:07 +02:00
igoudt
449e82a796 fixing choosing creature types 2017-08-02 08:04:26 +02:00
Jeff
57c4f89cbd - Added requested card Hakim Loreweaver. 2017-08-01 16:46:21 -05:00
Evan Kranzler
433049e910 Implement Custody Battle 2017-08-01 16:45:19 -04:00
theelk801
cdd4a8f123 Implemented Endless Wurm, Flame-Kin War Scout, Squealing Devil and Ghastly Remains (#3770)
* Implement Crazed Firecat

* Implement Endless Wurm

* Implement Flame-Kin War Scout and Squealing Devil

* Implement Ghastly Remains
2017-08-01 15:04:16 -05:00
Evan Kranzler
cedf4a451b Implement Ghastly Remains 2017-08-01 14:25:10 -04:00
Evan Kranzler
d1b712b154 Implement Flame-Kin War Scout and Squealing Devil 2017-08-01 12:39:42 -04:00