Commit graph

30628 commits

Author SHA1 Message Date
johnm
72d9c736c9 Fix so Nacatl's attack trigger works correctly when a creature has
copied Nacatl
2020-05-16 20:49:14 +01:00
Evan Kranzler
c24851b4a9 fixed a bunch of discard issues (#6532) 2020-05-15 21:19:04 -04:00
Evan Kranzler
713a7ab35d fixed a null pointer exception when multiple players discard 2020-05-15 20:51:42 -04:00
Evan Kranzler
42fd5a6410 fixed Crosis, the Purger's discard effect 2020-05-15 20:47:07 -04:00
Evan Kranzler
6a582ed669 added IKO promos 2020-05-15 20:43:55 -04:00
etpalmer63
25db5f11eb Changed old constructor to call the new one to prevent code duplication 2020-05-15 11:29:51 -07:00
Oleg Agafonov
19af91cf18
Merge pull request #6541 from gp66/tokens-with-x-power-toughness
Tokens with x power toughness
2020-05-15 20:05:54 +02:00
gp66
877abe087a removed copy/paste code 2020-05-15 12:57:28 -05:00
gp66
162907b9da missing token images in thb and war 2020-05-13 15:44:40 -05:00
gp66
3865c52974 missing token images in thb and war 2020-05-13 15:44:26 -05:00
etpalmer63
235c5aa86f Added method to SupportAbility class to allow for removal of 'other' text in rule generation 2020-05-11 10:52:34 -07:00
Thomas ARBLAY
d0a2e26e02 Fix the issue where Stormwild Capridor don't output a prevention text in chat 2020-05-11 15:30:18 +02:00
Thomas ARBLAY
4e79a64aa9 Fix text for Breya, Etherium Shaper and Hadana's Climb 2020-05-11 12:03:57 +02:00
Oleg Agafonov
651f0875bb
Merge pull request #6531 from SpeedProg/java11
make jboss remoting2 work with openjdk11 in xmage
2020-05-10 09:44:42 +02:00
Oleg Agafonov
9424009721
Merge pull request #6394 from Craigacp/look-and-feel-fix
Change the nimbus look and feel name (OpenJDK support)
2020-05-10 09:44:28 +02:00
Evan Kranzler
96449ad5b9 fixed Ana Battlemage only targeting opponents 2020-05-08 18:11:39 -04:00
Evan Kranzler
8f7e91183f fixed Abandon Hope targeting any player 2020-05-08 18:10:32 -04:00
Evan Kranzler
8f04b9fb14 fixed Cavalier of Flame discard triggers 2020-05-08 18:07:36 -04:00
SpeedProg
f36792be93 make jboss remoting2 work with openjdk11 2020-05-08 21:29:42 +02:00
Evan Kranzler
f64549213f fixed a filter 2020-05-07 22:23:37 -04:00
Evan Kranzler
87b40007a8 fixed Rielle, the Everwise not triggering properly (fixes #6530) 2020-05-07 18:19:46 -04:00
Oleg Agafonov
6db2b8baa1
Merge pull request #6528 from gp66/missing-thb-war-token-images
missing token images in thb and war
2020-05-07 19:48:47 +02:00
gp66
da1c9cc38e missing token images in thb and war 2020-05-07 12:34:47 -05:00
Oleg Agafonov
48049dbfc9 Tests: improved verify test for token's constructor; 2020-05-07 20:50:15 +04:00
Oleg Agafonov
e3b75a445f
Merge pull request #6520 from emerald000/londonMulligan
Streamline London Mulligan UX.
2020-05-07 15:52:16 +02:00
Oleg Agafonov
e424ad4522
Merge pull request #6521 from emerald000/quartzwoodCrasher
Fix Quartzwood Crasher combat damage tracking.
2020-05-07 15:49:31 +02:00
Oleg Agafonov
771d54aa39 * Triggered abilities with modes - fixed that player can skip mode selection (example: skip lose game with Demonic Pact, see #6524); 2020-05-07 15:21:15 +04:00
emerald000
a904b7c890 Fix StubPlayer handling of London mulligans and fix related tests. 2020-05-05 23:15:45 -04:00
Evan Kranzler
b4fd4aab58 fixed bookmark usage in DoWhenCostPaid 2020-05-05 10:04:07 -04:00
Thomas ARBLAY
6a294a58d9 Fix text for Marrow Gnawer 2020-05-05 14:36:25 +02:00
emerald000
9097ae5afe Fix Quartzwood Crasher combat damage tracking.
Fixes #6512.
2020-05-04 23:22:37 -04:00
emerald000
1e8f006448 Streamline London Mulligan UX.
- Choose cards to put on bottom directly from hand.
- Put cards on bottom in order chosen instead of asking afterwards.
2020-05-04 22:57:50 -04:00
Evan Kranzler
55a8e34f7a fixed a merge conflict 2020-05-04 20:53:52 -04:00
Evan Kranzler
bde65d6279
Created class for reflexive triggered abilities (Ready for review) (#6500)
* added class for reflexive triggered abilities

* added DoWhenCostPaid

* a few more refactors

* some more refactoring

* almost all refactors done

* finished refactoring

* updated text generation

* Delete SendOptionUsedEventEffect.java

* fixed Wildborn Preserver text
2020-05-04 20:51:38 -04:00
Oleg Agafonov
8a3ba6729f
Merge pull request #6507 from emerald000/abilityResolved
Refactor and add hint for "Ability resolved X times"
2020-05-04 08:54:40 +02:00
emerald000
3465493ccf Rename, move and comment resolving ability event creation.
Should be clearer now.
2020-05-03 18:56:35 -04:00
Evan Kranzler
75577cdbe9
Added new method for discarding cards to handle batch triggers (ready for review) (#6489)
* added new discard method

* started refactoring to use new discard method

* refactored A through I

* fixed some issues

* separated balance effect into its own class

* refactored J through R

* refactored S through Z

* applied requested changes
2020-05-03 14:35:26 -04:00
Oleg Agafonov
2739391b1d
Merge pull request #6510 from gp66/completed-suggestions-iko-tokens
Completed suggestions iko tokens
2020-05-03 20:10:11 +02:00
Oleg Agafonov
f3990caf22
Merge pull request #6502 from SpeedProg/angel_of_serenity_mp_fix
Multiplayer test and fix for Angel of Serenity leaves battlefied trig…
2020-05-03 19:56:21 +02:00
gp66
f3bde1dbab completed suggestions for IKO tokens 2020-05-03 12:52:51 -05:00
emerald000
111114e338 Refactor and add hint for "Ability resolved X times"
Affects Ashling the Pilgrim, Inner-Flame Igniter and Soulbright Flamekin.
2020-05-03 09:42:16 -04:00
SpeedProg
724287360c Multiplayer test and fix for Angel of Serenity leaves battlefied trigger when controlled by other then owner and owner leaves game 2020-05-03 11:20:48 +02:00
Oleg Agafonov
a7de11345d
Merge pull request #6503 from SpeedProg/fix_rednering_tooltipmarktags
UI: fix for </font> in card renders at end of ToolTipMarkTags
2020-05-03 09:07:17 +02:00
gp66
8bea930a69 added IKO tokens 2020-05-02 21:59:22 -05:00
gp66
eba1980a9a added IKO tokens 2020-05-02 21:52:33 -05:00
Evan Kranzler
a90276b55b added hints to Expansion // Explosion 2020-05-01 21:29:13 -04:00
Evan Kranzler
11d71d061d fixed Conjurer's Ban text 2020-05-01 18:31:29 -04:00
Evan Kranzler
4ceaeeebad added a new static filter 2020-05-01 18:28:43 -04:00
SpeedProg
325d96f6db display ToolTipMarkTags in card renders in blue instead of leaving the closing </font> tag in the text 2020-05-01 17:47:00 +02:00
Evan Kranzler
43c9bec7be fixed Hungering Yeti text missing 2020-05-01 07:59:14 -04:00