Michael Kamensky
fa86c351d4
Merge branch 'roll_die_as_cost' into 'master'
...
Add Clay Golem and implement roll dice as cost
See merge request core-developers/forge!5014
2021-07-14 10:21:13 +00:00
Lyu Zong-Hong
5df34731b5
Add Clay Golem and implement roll dice as cost
2021-07-14 18:55:36 +09:00
Lyu Zong-Hong
8ec4a69cb0
Better fix for stack description of WrappedAbility
2021-07-14 15:43:50 +09:00
Michael Kamensky
716ac11bef
Merge branch 'stackdesc_redundant_targets' into 'master'
...
solve redundant (Targeting: clauses in stackdescs for Wrapped triggers
See merge request core-developers/forge!5010
2021-07-14 03:12:37 +00:00
Hans Mackowiak
1fb50f416c
CardUtil: fix getValidCardsToTarget for orcus
2021-07-14 03:11:06 +00:00
Northmoc
35f2c7dacf
solve redundant (Targeting: clauses in stackdescs for Wrapped triggers
2021-07-13 19:38:08 -04:00
Michael Kamensky
24768d42b3
Merge branch 'fix_dungeon_of_the_mad_mage' into 'master'
...
Fix dungeon of the mad mage and update text rendering for Dungeon cards
See merge request core-developers/forge!5002
2021-07-13 16:38:56 +00:00
Lyu Zong-Hong
de20cec586
Update Chicken à la King so only trigger when rolling d6
2021-07-13 22:07:33 +09:00
Lyu Zong-Hong
cd05a8ffe1
Trigger RollDie and RollDieOnce for planar die too
2021-07-13 21:58:52 +09:00
Lyu Zong-Hong
3b8b28c355
Also disable ability texts for Dungeon cards that are not current room
2021-07-13 20:49:45 +09:00
Michael Kamensky
31beff4f4f
Merge branch 'AFR_Artifacts' into 'master'
...
add last AFR artifacts and updated counter enum list to support HARMONY counters
See merge request core-developers/forge!4991
2021-07-12 07:37:32 +00:00
Wendell Wilkerson
eec8b7a42a
add AFR artifact and updated counter enum list to support HARMONY counters
2021-07-11 22:31:58 -05:00
Lyu Zong-Hong
a83c06baf0
Add Dragon's Fire
2021-07-12 11:27:22 +09:00
Hans Mackowiak
73562528f6
Card: fix getType when using changedCardTypesCharacterDefining
2021-07-11 15:15:54 +00:00
Michael Kamensky
cbd8f0297c
Merge branch 'afc_roll_dice' into 'master'
...
Update RollDice effect to support AFC cards
See merge request core-developers/forge!4983
2021-07-11 14:42:10 +00:00
Michael Kamensky
f48fa6baef
Merge branch 'gain_class_level' into 'master'
...
Implement Class mechanism
See merge request core-developers/forge!4955
2021-07-11 13:17:53 +00:00
Alumi
83eb0f8ee4
Implement Class mechanism
2021-07-11 13:17:51 +00:00
Lyu Zong-Hong
4c8acb251e
Update RollDice effect to support AFC cards
2021-07-11 19:13:47 +09:00
tool4EvEr
4b785fd75b
Fix Scavenge for CDA
2021-07-11 09:45:14 +02:00
Michael Kamensky
d4b0c648e9
Merge branch 'afr_jul_10' into 'master'
...
Added AFR RollDice cards and Temple of the Dragon Queen
See merge request core-developers/forge!4978
2021-07-11 04:01:53 +00:00
Alumi
4fe67ccb8c
Added AFR RollDice cards and Temple of the Dragon Queen
2021-07-11 04:01:53 +00:00
Michael Kamensky
6ff7ccd3ac
Merge branch 'equipExtras' into 'master'
...
CardFactoryUtil: add way to add Extra Parameters and Extra Description
See merge request core-developers/forge!4980
2021-07-11 04:01:28 +00:00
Hans Mackowiak
a8cba0eef4
SurveilEffect: fix triggerChangesZoneAll
2021-07-11 03:28:05 +02:00
Hans Mackowiak
e0f01a3168
CardFactoryUtil: add way to add Extra Parameters and Extra Description
2021-07-11 03:01:21 +02:00
Michael Kamensky
3dd44ba71a
Merge branch 'update_wrapped_description' into 'master'
...
Update the implementation of trigger replacing ABILITY text
Closes #1914
See merge request core-developers/forge!4976
2021-07-10 12:33:59 +00:00
Lyu Zong-Hong
33f5080ca6
Fix WrappedAbility again so simultaneous trigger text is shown
2021-07-10 18:43:27 +09:00
Michael Kamensky
affbd917b3
Merge branch 'path' into 'master'
...
Fix Descendants' Path shuffling
See merge request core-developers/forge!4977
2021-07-10 09:05:51 +00:00
Hans Mackowiak
3126d7ac5d
Merge branch 'treasureSpent' into 'master'
...
CastTotalManaSpent Treasure
See merge request core-developers/forge!4948
2021-07-10 07:49:13 +00:00
Hans Mackowiak
1f0e49d1d4
CastTotalManaSpent Treasure
2021-07-10 07:49:12 +00:00
tool4EvEr
60d4991a84
Fix Descendants' Path shuffling
2021-07-10 09:41:35 +02:00
Lyu Zong-Hong
d5149293da
Update the implementation of trigger replacing ABILITY text.
2021-07-10 15:22:55 +09:00
Michael Kamensky
dd6dc739fb
Merge branch 'propertyfix' into 'master'
...
ThisTargetedController
Closes #1909
See merge request core-developers/forge!4974
2021-07-10 03:42:11 +00:00
tool4EvEr
cdb2330792
Fix Ram Through
2021-07-09 20:22:23 +02:00
Northmoc
3af8a7dfa4
add "RememberRoll" to RollDiceEffect
2021-07-09 11:10:50 -04:00
tool4EvEr
a1964eb75e
Fix assignGenericAmount dialog when no targets (Lathiel)
2021-07-08 17:49:42 +02:00
Michael Kamensky
8de27ddb0c
Merge branch 'afr_7' into 'master'
...
AFR - 7 Jul
See merge request core-developers/forge!4964
2021-07-07 20:26:40 +00:00
Northmoc
74b439adaf
AbilityUtils.java support "DungeonCompletedNamed"
2021-07-07 16:10:59 -04:00
Northmoc
b383262e70
GameActionUtil.java - add Equip 0 code block similar to Cycling 0
2021-07-07 10:04:45 -04:00
Northmoc
866602a683
MagicStack.java log number of Equips this turn
2021-07-07 09:43:11 -04:00
Northmoc
0638670b7c
remove Equip Trigger stuff from Player.java
2021-07-07 09:43:10 -04:00
Northmoc
9df082f448
AbilityUtils.java YouEquippedThisTurn XMath
2021-07-07 09:43:10 -04:00
Northmoc
66e8cc5bff
Player.java support equippedThisTurn
2021-07-07 09:43:10 -04:00
Michael Kamensky
76e361287a
Merge branch 'vecna' into 'master'
...
AFR: Vecna
See merge request core-developers/forge!4959
2021-07-07 02:55:03 +00:00
Northmoc
9543534dda
AnimateEffectBase - support "GainsTriggeredAbilitiesOf"
2021-07-06 19:58:34 -04:00
tool4EvEr
c70b3ba4ae
Fix import
2021-07-06 18:15:49 +02:00
Alumi
fcdb9b25bd
Add Ante and Sideboard label to PlayerDetailsPanel to allow view cards in them
2021-07-06 16:07:31 +00:00
Michael Kamensky
251ffbf574
Merge branch 'editions-type-review' into 'master'
...
ReNEWED Edition Types and Dates for Card Edition, ReNewed `Set` filter dialog panel in Desktop, NEW `Blocks` Card|Deck Catalog Filter, Updates to Formats
See merge request core-developers/forge!4878
2021-07-06 04:23:24 +00:00
tool4EvEr
80bc6785ba
Small PlayEffect fix
2021-07-05 23:54:27 +02:00
Hans Mackowiak
7a1a657ae9
Card: changedCardTypesCharacterDefining + changedCardColorsCharacterDefining for better apply in Order
2021-07-05 20:03:07 +02:00
Michael Kamensky
41c3d6ebed
Merge branch 'kethis' into 'master'
...
Small fixes
See merge request core-developers/forge!4945
2021-07-05 14:50:59 +00:00
