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
Michael Kamensky
800a43eba4
Merge branch 'surveilFixChangesAll' into 'master'
...
SurveilEffect: fix triggerChangesZoneAll
See merge request core-developers/forge!4981
2021-07-11 04:00:54 +00:00
Michael Kamensky
a2ed1c386f
Merge branch 'AFR_charm_cards' into 'master'
...
AFR charm cards
See merge request core-developers/forge!4975
2021-07-11 04:00:36 +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
leriomaggio
a132e9a3d4
Merge remote-tracking branch 'upstream/master' into quick-update-sets-filter-per-deck-manager
2021-07-10 21:24:48 +01:00
leriomaggio
d751236154
CardSet and DeckSet filters now include the extra option to instantiate DialogChooseSets with list of allowed sets.
...
This also fixes a BUG for DeckSetFilter that did not update properly the list of filters in ItemManager.
This had the effect of not updating the labels for set filters for deck, after edit.
2021-07-10 21:24:21 +01:00
leriomaggio
32e3d00cec
ItemManager now includes a new special method to get filtered set codes from CardPool
...
The method is implemented in the abstract super class (ItemManager) and so inherited by `CardManager` (where there is no format nor game type that could be used), and specialised by `DeckManager`.
In particular, the only current format with limitations on sets is Brawl, and so the only one accounted for.
In any case, the list of (unique) allowed sets is automatically inferred by default from the cardpool (as in the case of `CardManager`).
It is important to note that this filter is stored into an attribute, and so the list is calculated only once.
The results of this list will be passed on the `DialogChooseSets` to update the content of the dialog panel, accordingly.
2021-07-10 21:22:40 +01:00
leriomaggio
b800e478f1
New constructor with limitedSets list for dual of unselectable
...
There are cases in which the set filter should be initialised with the white list of allowed set codes, rather than the blacklist (i.e. unselectableSets).
This is the case of CardCatalog or DeckCatalog with constraints or limitations on card pool (i.e. restricted cards, and or restricted sets).
This new set of constructors with extra parameters allow to handle this cases, so that the UI can easily adapt.
2021-07-10 21:19:05 +01:00
leriomaggio
f655151a6e
FIXED a bug that did not consider initialised checked leaf nodes
2021-07-10 21:15:35 +01:00
Wendell Wilkerson
5d6939b2f2
Merge branch 'master' into AFR_charm_cards
2021-07-10 10:37:25 -05:00
Wendell Wilkerson
30d276aa29
fixes to address thread comments
2021-07-10 10:35:17 -05: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
Wendell Wilkerson
75ccabff9c
added creatures with charm triggers
2021-07-09 23:30:37 -05: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
Wendell Wilkerson
ac094f4af4
added AFR charm instants
2021-07-09 22:11:07 -05:00
leriomaggio
7664937c93
Updated CardArtPreference Constants value
...
Also, the CardArtPreference Enum now includes a new methods that allows seamless recognition (and instantiation) of corresponding enum value from Forge Preference - also with backward compatibility.
2021-07-09 20:20:52 +01:00
leriomaggio
2d3d67176a
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-07-09 20:08:34 +01:00
tool4EvEr
cdb2330792
Fix Ram Through
2021-07-09 20:22:23 +02:00
Michael Kamensky
7744552450
Merge branch 'stackdesc' into 'master'
...
Various fixes
See merge request core-developers/forge!4972
2021-07-09 16:15:59 +00:00
Michael Kamensky
6de4789428
Merge branch 'afr_9' into 'master'
...
AFR - 9 Jul
See merge request core-developers/forge!4973
2021-07-09 16:15:48 +00:00
Northmoc
3af8a7dfa4
add "RememberRoll" to RollDiceEffect
2021-07-09 11:10:50 -04:00
Northmoc
9e92e46cad
goblin_morningstar.txt
2021-07-09 11:10:28 -04:00
Northmoc
962d5c2105
aberrant_mind_sorceror.txt
2021-07-09 10:17:46 -04:00
Northmoc
ef4536d033
dragon_turtle.txt
2021-07-09 08:55:19 -04:00
Northmoc
01376d82db
said_done.txt fix Duration
2021-07-09 08:49:27 -04:00
Northmoc
570abfcd21
spoils_of_the_hunt.txt - add AILogic
2021-07-09 08:08:13 -04:00
Northmoc
5bf0ad547e
hunters_edge.txt - add AILogic
2021-07-09 08:07:32 -04:00
Northmoc
f8a256ea27
hunters_edge.txt tidy up
2021-07-09 08:00:23 -04:00
Northmoc
e46001cc91
price_of_loyalty.txt fix Pump param
2021-07-09 07:56:34 -04:00
Northmoc
07261e8525
spoils_of_the_hunt.txt
2021-07-09 07:55:00 -04:00
Northmoc
64f022f809
kalain_reclusive_painter.txt
2021-07-09 07:22:55 -04:00
Northmoc
c07a63cd7e
price_of_loyalty.txt
2021-07-09 07:22:54 -04:00
Northmoc
60b27803ce
jaded_sell_sword.txt
2021-07-09 07:22:54 -04:00
Northmoc
c5c58885e6
devour_intellect.txt
2021-07-09 07:22:53 -04:00
Michael Kamensky
0c748c091e
Merge branch 'dividedfix' into 'master'
...
Fix assignGenericAmount dialog when no targets (Lathiel)
See merge request core-developers/forge!4967
2021-07-09 09:42:37 +00:00
Michael Kamensky
8c8c8ba0c7
Merge branch 'twosat-master-patch-51857' into 'master'
...
Update de-DE.properties
See merge request core-developers/forge!4971
2021-07-09 09:31:44 +00:00
Andreas Bendel
2e03b172b2
Update de-DE.properties
...
'translated' Ante and Sideboard label
not much to do
2021-07-09 06:21:10 +00:00
Michael Kamensky
6474f2a7eb
Merge branch 'small_fixes' into 'master'
...
AFR card scripts 08 Jul
See merge request core-developers/forge!4968
2021-07-09 04:14:33 +00:00
Michael Kamensky
51df73d918
Merge branch 'afr_8' into 'master'
...
AFR - 8 Jul
See merge request core-developers/forge!4966
2021-07-09 04:13:36 +00:00
Michael Kamensky
98cf75e92e
Merge branch 'card_targeting_fixes' into 'master'
...
Card script fixes for Issue #1893
See merge request core-developers/forge!4963
2021-07-09 04:12:42 +00:00
Michael Kamensky
43ac1fabcf
Merge branch 'akoum' into 'master'
...
PumpAll: better trigger decision
See merge request core-developers/forge!4969
2021-07-09 04:11:16 +00:00
Wendell Wilkerson
f06fa47e75
Merge branch 'master' into card_targeting_fixes
2021-07-08 21:56:35 -05:00
