Commit Graph

2461 Commits

Author SHA1 Message Date
Hans Mackowiak
e753d45b42 Update getDefinedCards for how it get Valid* cards so the syntax is consistent with other Valid script. Also remove the hacky way to set Effect as mutable for Raging River and Plague of Vermin 2021-07-18 09:06:47 +00:00
leriomaggio
615651bbac Re-enabled all the tests and added missing conditions for spellAbilityWithNoStack 2021-07-15 15:42:09 +01:00
leriomaggio
4dbfda4d43 Adding target to spellAbility only if necessary 2021-07-15 15:40:09 +01:00
leriomaggio
3a56020195 Added mock for GameLogFormatter 2021-07-15 15:39:49 +01:00
leriomaggio
537dee5b1c Added extra constant for Lang dir (currently not yet used as I originally thought) 2021-07-15 08:23:25 +01:00
leriomaggio
860747f8d7 Re-enabled all tests that now work and pass. 2021-07-15 08:22:47 +01:00
leriomaggio
712f907b59 Restored BaseGameSimulationTest with proper Mocks set up 2021-07-15 08:22:27 +01:00
leriomaggio
573901ce51 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-13 08:22:58 +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
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
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
a1964eb75e Fix assignGenericAmount dialog when no targets (Lathiel) 2021-07-08 17:49:42 +02:00
leriomaggio
0feee4c67b Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-08 07:57:52 +01:00
leriomaggio
b42a59a1db Switch Back to "Preferred Art" option name 2021-07-08 07:57:34 +01:00
leriomaggio
4be1891a3f FIX: Better handle the case for deck cover image for empty decks 2021-07-08 07:55:12 +01:00
leriomaggio
d184856d16 Renamed Card Art Preference 2021-07-08 07:47:15 +01:00
leriomaggio
9e67d5fb48 Renamed Set Preference 2021-07-08 07:45:45 +01:00
Grimm
a9a34d90c2 Revert "test commit"
This reverts commit 773762733f
2021-07-08 01:50:23 +00:00
Grimm
773762733f test commit 2021-07-08 00:04:37 +02: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
leriomaggio
b0c1f1cb0b Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-06 08:36:40 +01:00
leriomaggio
dab893c24f Changed options not showing node counts on disabled nodes. 2021-07-05 09:35:02 +01:00
leriomaggio
6e2d5c13b4 NDeckManager now includes the new DeckBlockFilter if preferences in menu
say to load HIstoric formats
2021-07-05 01:18:24 +01:00
leriomaggio
1252b25b0a NEW DeckBlockFilter for Deck Catalog.
This new filter mirrors (and extends) the one on Sets, which also relies on the renewed buildPredicate implementatio which looks at the edition of
a DeckProxy.
2021-07-05 01:15:00 +01:00
leriomaggio
4372311297 buildPredicate specialised for DeckSet filters
Now this new implementation brings the deck set filter to finally work as expected.
In particular, instead of checking that all cards in Deck Pools belong to a unique edition, the predicate now leverages on the getEdition() method of DeckProxy instances, which returns the latest of the earliest
sets of cards. This function will be subject to change into a future Merge Request state.
2021-07-05 01:11:59 +01:00
leriomaggio
5b67c08ae7 buildPredicate not final anymore to allow for override in subclasses
This is the first step to finally make the DeckSetFilter working properly!
So far, the filter applies if **all** the cards in a deck matches selected specific set(s).
We will allow for customisation to simplify and correct this filter - more in the next commit.
2021-07-05 01:06:25 +01:00
leriomaggio
146f44f062 Made sets attr protected to allow subclassing 2021-07-04 21:12:11 +01:00
leriomaggio
8977303c00 Improved getCount summing up the number of allowed sets in all selected blocks. 2021-07-04 21:09:38 +01:00
leriomaggio
96fa129285 FIX typo cardBlock attribute was never set in constructor. 2021-07-04 21:04:43 +01:00
leriomaggio
1aa7825c52 New Block CardManager filter (if Load Historic format is enabled)
The new CardBlockFilter extends the generic CardSetFilter by specialising the selection to set codes allowed in the corresponding Block GameFormat.

A new Label `lblBlock` has been added to language file (so far, English only)
2021-07-04 21:01:39 +01:00
leriomaggio
8a7848f411 Changed sets to protected to allow SubClassing 2021-07-04 20:44:04 +01:00
leriomaggio
9c72cf2eb4 Updating all enum FormatType to UPPERCASE as constants 2021-07-04 17:44:53 +01:00
leriomaggio
81b214f6ed CardManager updated to instantiate quest filters without reprints
CardManager now instantiate Quest World filters forcing a NO-REPRINT policy. The `allowReprints` option was set to true by default for card and deck catalog, resulting in just a weird and unexpected side-effect IMHO. Whenever a block is selected, no other reprints should be taken into account. That's the point of choosing a block.
2021-07-04 17:40:33 +01:00
leriomaggio
eed49554b5 The CardQuestWorldFilter constructors overload to include option to disable reprints.
The CardQuestWorldFilter has been updated with two extra constructors overload that also control the option to include or not the `allowReprints` attribute.
By default, the allowReprints attribute is true for backward compatibility.

The new constructor will be used (next commit) by CardManager when creating filters in Card Catalog.
2021-07-04 17:27:56 +01:00
leriomaggio
ef18dac22c CardSetFilter and DeckSetFilter now includes the allowReprints option when instantiating (for edit) the DialogChooseSets so UI updates accordingly. 2021-07-04 17:23:46 +01:00
leriomaggio
8f01f56a1e Updates to DialogChooseSets for UI sizes and status restore
First off, the status of the "allowReprints" checkbox is updated accordingly, when a filter is edited.
This fixes a previous bug that did not take this into account
(more on this, in the next commit msg).

Other improvements to the DialogChooseSets includes a better management of spaces, as well as dimension (width) of main windows that is now dynamically adapted to current resolution.

Also, this update fixes a bug having some panels dynamically adjusting height to fit components.
Now all the components should be correctly aligned, and spread across the panel.
2021-07-04 17:21:26 +01:00
leriomaggio
d8cb67a5f6 A few minor adjustments to allow the UI to restore status after an edit op. 2021-07-04 17:17:41 +01:00
leriomaggio
3906c1f3a5 Merge remote-tracking branch 'upstream/master' into editions-type-review 2021-07-04 00:22:10 +01:00
leriomaggio
a5b256f2fb Completely redesigned DialogChooseSets to use FCheckboxTree component.
This new version of the panel is completely interactive, and dynamically populated with card editions, types, and formats.

The selection of formats leads to selections of subsets of editions (and so type), updating other components accordingly.
2021-07-03 21:32:32 +01:00
leriomaggio
0393c8d4d9 Updated JDocs to workaround IDE errors 2021-07-03 21:30:25 +01:00
leriomaggio
37d7ef3ee9 Brand new desktop UI Component representing a JTree of FCheckboxes
Differently from standard JTree, this component leverages on a custom TreeCellRenderer that renders each node with a checkbox, therefore rewriting completely the selection mechanism of the JTree.

This component is currently used in the DialogChooseSets to represent card editions grouped per edition type.
In general, this component can be used elsewhere, whenever nested objects for selection should be used.

The class exposes a public API for easy interaction, as well as customised classes for nodes and nodes data, and specialised events and listeners.
2021-07-03 21:29:46 +01:00
leriomaggio
c3db51b5f8 Updated Javadoc param 2021-07-03 20:14:37 +01:00
Lyu Zong-Hong
ed0c5aac5e Add localization strings, draw markers, and updated Oubliette room 2021-06-27 15:22:33 +09:00
leriomaggio
79f4595292 Merge remote-tracking branch 'upstream/master' into editions-type-review 2021-06-21 11:45:15 +01:00
leriomaggio
fe0441c667 TEMPORARY new Dialog for Sets filtering (still very WIP) 2021-06-21 11:44:20 +01:00
Lyu Zong-Hong
afa6c9986a Use VAssignGenericAmount dialog to assign mana combo 2021-06-18 17:58:52 +09:00