leriomaggio
72e40504d7
Deck conformance check now includes custom cards to be (eventually) used in games.
2021-07-11 19:07:23 +01:00
leriomaggio
811d6479f5
CardPool now includes the option to load custom cards and check preferences.
...
If Custom Card setting is disabled, an error message in logs will be printed accordingly.
Custom Cards will be loaded as such in Card Pool only if the option in settings is enabled.
2021-07-11 19:06:39 +01:00
leriomaggio
e6958305b5
StaticData now includes an extra option to control the use of Custom Cards
...
This option is read from ForgePreferences and passed to StaticData by FModel
2021-07-11 19:04:56 +01:00
leriomaggio
2808b4945e
New Option in Forge Preference to enable the use of custom cards
...
A new Option has been added in Forge Preferences to enable the use of custom cards.
This option (default is False for backward compatibility) will control whether custom cards can be read in custom editions, and so decks containing them can be used in game matches.
Also, en-US translation file received an update to clarify what is intended with Unknonw cards (to be distinguished from custom cards now)
2021-07-11 19:03:50 +01:00
Wendell Wilkerson
99dcd03e64
optimized scripts for Burning Hands and Divine Smite
2021-07-11 12:17:47 -05:00
Wendell Wilkerson
5cf3458a5e
removed backup file
2021-07-11 11:50:54 -05:00
Wendell Wilkerson
55e2cdddb7
Merge branch 'master' into AFR_Cards_20210710
2021-07-11 11:46:14 -05:00
Wendell Wilkerson
b130e7f658
third batch
2021-07-11 11:43:43 -05:00
Bug Hunter
b6dfbd5e2c
Merge branch 'arsenal' into 'master'
...
Fix Arsenal Thresher
See merge request core-developers/forge!4985
2021-07-11 15:37:16 +00:00
tool4EvEr
79bb2639a8
Fix Arsenal Thresher
2021-07-11 17:36:49 +02:00
Wendell Wilkerson
ba2a48600c
second batch
2021-07-11 10:35:31 -05:00
Hans Mackowiak
cc8c58c961
Merge branch 'gristFixes' into 'master'
...
Card: fix getType when using changedCardTypesCharacterDefining
See merge request core-developers/forge!4984
2021-07-11 15:15:55 +00: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
Michael Kamensky
39a0b9b543
Merge branch 'fixing' into 'master'
...
Small fixes
Closes #1917
See merge request core-developers/forge!4982
2021-07-11 08:51:24 +00:00
tool4EvEr
4b785fd75b
Fix Scavenge for CDA
2021-07-11 09:45:14 +02:00
tool4EvEr
c491f6dfb6
Fix FailedToTarget
2021-07-11 09:44:57 +02:00
tool4EvEr
2e55b6c884
Fix zone
2021-07-11 09:44:39 +02:00
Wendell Wilkerson
25d30254a1
first batch of AFR cards
2021-07-11 01:25:11 -05:00
Michael Kamensky
028307953b
Merge branch 'quick-update-sets-filter-per-deck-manager' into 'master'
...
Update and FIX to Set Filters for Card and Deck Catalogs
See merge request core-developers/forge!4979
2021-07-11 04:02:52 +00: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
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
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
