Commit graph

17129 commits

Author SHA1 Message Date
emerald000
60bad2407b Fighting Git, part 2. 2017-01-03 01:23:56 -05:00
emerald000
2baf795fab Fighting Git. 2017-01-03 01:20:47 -05:00
Justin Herlehy
99bb976d99 [AER] Implement Greenbelt Rampager and Hungry Flames
Added test for Greebel Rampager to verify that it returns to the correct player.

Added Spoilers to Data File
- Merchant's Porter
- Ornithopter
- Hungry Flames
- Rishkar, Peema Renegade
2017-01-03 01:20:44 -05:00
emerald000
c6c7c82508 [AER] Implemented Revolt mechanic + 2 cards using it.
Decommission and Fatal Push
2017-01-03 01:11:24 -05:00
Justin Herlehy
be9599d6a1 [AER] Implement Pacification Array
Added card to data file and implemented.
2017-01-02 22:07:11 -05:00
Justin Herlehy
24d58193fa Undo unintended rearranement of set file methods. 2017-01-02 19:23:15 -05:00
Justin Herlehy
a44ff0e4eb [AER] Implement Spoiled Cards
Implemented
-Freejam Regent
-Siege Modification
-Untethered Express

Added
-Additional Spoiled cards to data file

Fixed
-Keywords file to enable autogeneration of Improvise ability
2017-01-02 19:08:43 -05:00
fireshoes
365317ff6e Merge origin/master 2017-01-02 16:44:09 -06:00
fireshoes
2133348b60 [AER] Added more 1/2 spoilers. Implemented Gonti's Aether Heart, Sweatworks Brawler, Sram Senior Edificer, Sram's Expertise, Foundry Assembler, and Whir of Invention. 2017-01-02 16:34:24 -06:00
fireshoes
23eff3bb7d [AER] Added more 1/2 spoilers. Implemented Gonti's Aether Heart, Sweatworks Brawler, Sram Senior Edificer, Sram's Expertise, Foundry Assembler, and Whir of Invention. 2017-01-02 16:33:29 -06:00
Justin Herlehy
86ed3e20cb [AER] Implement Spoiled Cards from 1/2
Added additional spoilers to data file.
2017-01-02 16:46:56 -05:00
fireshoes
c5e220233b [AER] Added 1/2 spoilers. 2017-01-02 13:53:01 -06:00
vereena42
add95c8a63 Stomp and Howl card added. 2017-01-02 20:33:30 +01:00
LevelX2
dee07fe89a * Dominator Drone - Fixed that its ability did damage instead of life loss(fixes #2739). 2017-01-02 18:15:13 +01:00
LevelX2
211f2285c1 [AEN] Fixed card name. 2017-01-02 18:11:14 +01:00
LevelX2
54b40646d9 Some minor changes. 2017-01-02 18:09:33 +01:00
LevelX2
f777668a4d Merge pull request #2736 from shootbot/master
Fixed Asylum Visitor and Spined Sliver bugs
2017-01-02 17:30:07 +01:00
LevelX2
b30dd49a37 Merge pull request #2734 from brikr/awe-strike
[MRD] Awe Strike
2017-01-02 17:28:41 +01:00
LevelX2
4ea6a0befb Merge pull request #2730 from Galatolol/master
Added 7 cards
2017-01-02 17:25:21 +01:00
Timur Nurmagambetov
0684748c71 Merge remote-tracking branch 'mage/master' 2017-01-01 21:40:53 +06:00
Timur Nurmagambetov
93428aa54e mend 2017-01-01 20:39:44 +06:00
LevelX2
2162fab114 * Fixed a problem of AI target handling (e.g. for Precursor Golem) 2017-01-01 14:56:34 +01:00
Timur Nurmagambetov
0b5a388dbb Fixed Asylum Visitor and Spined Sliver bugs 2017-01-01 18:41:02 +06:00
Galatolol
2db6ff1825 Fixed 3 cards 2017-01-01 12:11:11 +01:00
Brik Royster
0f34338173 [MRD] Awe Strike 2016-12-31 23:07:04 -07:00
Justin Herlehy
f3c0d3fce0 [MMQ] Ramosian Rally
Also fixed order of check in GameImpl for attached player to prevent possible NPE.
2016-12-31 14:41:38 -05:00
LevelX2
df0cd60fbc * Marionette Master and Mortis Dogs, fixed that power below 0 caused life gain. 2016-12-31 17:41:12 +01:00
LevelX2
68a6920b63 [AER] Added existing cards to set list. 2016-12-31 17:28:20 +01:00
LevelX2
c2852ca233 [AER] Added Battke at the Bridge. 2016-12-31 17:00:00 +01:00
LevelX2
24f72004e3 [AER] Added Scrap Trawler. 2016-12-31 12:10:40 +01:00
LevelX2
eb5b1771e6 Merge pull request #2728 from sotovdev/fix_29122016_2
Refactoring
2016-12-31 00:12:03 +01:00
Galatolol
f577a4b614 Added 7 cards 2016-12-30 12:15:56 +01:00
Justin Herlehy
14507e7dc5 Fix GameImpl SBA for auras attached to players.
attachedToPlayer was always getting set to something so the null check in the SBA loop was not allowing auras to be put into the graveyard for being attached to an illegal player.  Currently checks for hasLost() as the player leaving also sets loses to true.
2016-12-30 01:56:04 -05:00
Justin Herlehy
a7ead46439 Merge pull request #2729 from JRHerlehy/master
[C16] Curse of Vengeance
2016-12-30 00:58:48 -05:00
Justin Herlehy
b5eaf8d3d0 [C16] Curse of Vengeance
Fix that the cure was triggering for all player loss events, not just for enchanted player.
2016-12-30 00:58:14 -05:00
fireshoes
245977bfaf Added Masterpieces Paradox Engine and Planar Bridge. 2016-12-29 21:10:54 -06:00
ludwig.hirth
6c72794859 * Added test. 2016-12-29 17:05:32 +01:00
ludwig.hirth
b26a5730fa * Mage Slayer - Fixed that the correct damage source was assigned for the additional damage. 2016-12-29 16:18:52 +01:00
vraskulin
f04ba151f7 Refactoring
See github line by line comments in 'File changed'
2016-12-29 16:49:12 +03:00
vraskulin
c0cf22bbf7 Refactoring
See github line by line comments in 'File changed'
2016-12-29 16:16:08 +03:00
LevelX2
7979d4ed41 Merge pull request #2727 from sotovdev/fix_29122016
Renamed method
2016-12-29 13:59:00 +01:00
vraskulin
01bb9572e9 Refactoring
See github line by line comments in 'File changed'
2016-12-29 15:38:22 +03:00
vraskulin
c526306c5b Refactoring
See github line by line comments in 'File changed'
2016-12-29 15:26:19 +03:00
vraskulin
6577e641e6 Deprected methods changed with more up-to-date ones 2016-12-29 14:46:34 +03:00
vraskulin
b4546a2ecb Renamed method
According java naming convention methods should start from lowercase letter.
2016-12-29 14:13:23 +03:00
LevelX2
aff057e1a7 * Uncle Istvan - Fixed a bug that all damage instead of only damage from creatures was prevented. 2016-12-28 20:02:20 +01:00
LevelX2
3a33fa4748 * Added Test for #2721. 2016-12-28 12:01:03 +01:00
LevelX2
d3c2c33b44 * Added static Goblins filter. 2016-12-28 11:32:29 +01:00
LevelX2
09ad644a72 Merge pull request #2725 from brikr/master
[PLS] Dralnu's Crusade
2016-12-28 11:06:50 +01:00
Brik Royster
4cb4d1ea4e using hasSubtype instead of getSubtype().contains 2016-12-28 00:31:49 -07:00