Commit Graph

2588 Commits

Author SHA1 Message Date
Michael Kamensky
13b1a4150c [maven-release-plugin] prepare release forge-1.6.46 2021-11-15 07:33:45 +03:00
Anthony Calosa
bc02725dcf update name
- -old.exe to -java8.exe
2021-11-10 07:19:07 +08:00
Anthony Calosa
6454fd579d Add "Deck: " string for deck export
- fixes exporting a deck and re importing
2021-11-09 22:04:58 +08:00
Anthony Calosa
40d7b89823 Update minimum Java version for Forge Desktop executable
- forge.exe and forge-adventure.exe needs at least Java 11.0.1
- for Java 8, user should use forge-old.exe for Forge Desktop, and forge-adventure-old.exe for Forge Adventure
2021-11-09 21:46:42 +08:00
Anthony Calosa
d5462db931 unused import 2021-11-09 13:42:14 +08:00
Michael Kamensky
dafee0535f Merge branch 'daynight' into 'master'
Move daynight prompt where it should be

See merge request core-developers/forge!5765
2021-11-09 03:53:28 +00:00
friarsol
bbbf7ec53c Move daynight prompt where it should be 2021-11-08 22:08:34 -05:00
leriomaggio
e86745fb34 Merge remote-tracking branch 'upstream/master' into smart-card-art-deck-import-desktop-and-mobile 2021-11-08 07:20:07 +00:00
Michael Kamensky
d942f89162 - Add support for multiple music sets. 2021-11-04 08:09:36 +03:00
leriomaggio
9f563616e4 Card Art optimisation algorithm for DeckImport
The card art optimisation algorithm integrated into DeckImportController leverages (in terms of general logic) on the card art optimisation in Deck.
However, several are differences in terms of context and interactions so a specialised implementation is needed.

First, the smart card art optimisation has been added as an option in DeckImport. Therefore, smart card art is not a static game option to be used when loading decks with cards with no edition, but also as an option to tweak the deck list.

The second specialisation required is that this implementation takes into account any game format constraint (in terms of allowed sets for optimisation).

Last but not least, the current deck in editor (if any) will be also considered during optimisation.
In particular, when _importing cards_ in current deck (therefore, when not creating a new deck with the deck list) will also take into account the pools of current deck so that harmonisation will already consider where cards will be imported to.
2021-11-03 16:46:30 +00:00
leriomaggio
3184f90e62 Created new method in DeckController to return current deck in editor.
This method will be invoked by DeckImport (desktop) to pass on current deck in editor (if any) to the DeckImportController.

This deck will be eventually used as part of the smart card optimisation.
2021-11-03 16:39:51 +00:00
Michael Kamensky
bd0191e63e Merge branch 'sound-profiles' into 'master'
Selectable sound sets

See merge request core-developers/forge!5724
2021-11-03 10:08:09 +00:00
Michael Kamensky
778d714ccd - Don't require restart when changing sound sets. 2021-11-03 12:27:44 +03:00
Anthony Calosa
de74c9e62d Minor Performance
- Clear image cache if necessary (prevent clearing if the downloaded data is not image)
- Cache missing cards (prevent finding missing cards unless the user has fetched/downloads an image)
- Clear preselected options for New Gauntlet Match (easier to filter decks for Gauntlet)
2021-11-03 15:50:07 +08:00
Michael Kamensky
a4c21c623f - Fix imports.
- Add the sound set announcement and a couple other announcements as well.
2021-11-03 09:39:46 +03:00
Michael Kamensky
61ce25f2dd - Change the name "sound profile" to "sound set", which makes more sense.
- Reset to Default profile in absence of custom sound sets.
2021-11-03 09:33:01 +03:00
Michael Kamensky
238a3ea17a - Initial implementation of sound profiles, part 1. 2021-11-03 08:49:52 +03:00
tool4EvEr
4ab76d94db Ward only works on Permanents 2021-11-02 19:10:06 +01:00
leriomaggio
28ccf346b3 Import Basic lands alternative art wrt. current card art pref. settings.
Note: not sure whether last card art was overimposed earlier. can't remember, really!?!
2021-11-02 17:57:09 +00:00
leriomaggio
6e1979fc0c Updated Token creation with new flag 2021-11-02 17:48:03 +00:00
leriomaggio
915aa75a99 DeckRecognizer.Token to include whether request in card list had any set code
This commit adds in a new piece of information to Token in DeckRecognizer to mark whether original card request included or not a set code.
This flag will be only used by actual CardToken and will be leveraged later on by "smart card optimisation option" to be added to DeckImport on desktop too.

Majority of tests in DeckRecognizerTest have been updated to cross-check that no bug has been unintentionally introduced.
2021-11-02 17:47:30 +00:00
Michael Kamensky
34346b38a3 - Fix imports. 2021-10-31 19:25:58 +03:00
leriomaggio
1109cc15bf FIXING same bug for all editor, generalising **same** implementation on Constructed Editors (View and Controller) 2021-10-31 11:14:12 +00:00
leriomaggio
c0e7e2f63a FIXING same bug for Commander editor too 2021-10-31 08:54:05 +00:00
leriomaggio
e20b46dde2 Constructed Deck Editor controller updates the decklist cursor to select current deck in editor (if any).
The DeckView = when initialised = after editing the current deck in editor, tries to select it in the decklist view. However, at startup this won't be actually successful due to an un-initialised table model.

The issue only happens at startup time, and it is related to the fact that despite any selected item can be set (with the current Deck in editor) - see `populate` - the `update` method that initialise the (table)models is only called afterwards.
Therefore, the update method of Controller has been modified to re-try a selection with current deck in editor.

The whole procedure is skipped if the selected index is different from zero = assuming zero is the default fallback option.
If that's not the case, say the zero first deck should be indeed selected, the selected item shouldn't be activated twice anyway if that's exactly what's already been selected.
2021-10-29 11:25:51 +01:00
leriomaggio
b7b11ffba7 Deck Editor init which is null-aware. 2021-10-29 10:37:43 +01:00
leriomaggio
acb60979b9 Fixed outdated docstrings to avoid annoying IDE warnings 2021-10-29 10:37:12 +01:00
leriomaggio
237a423180 Added caching strategy when (deep) comparing decks
Deck model comparison may be triggered a certain number of times, and the new deep-comparison on each part may slow down performance in deck editor. Therefore, a caching strategy has been integrated to avoid comparing the same objects multiple times.
2021-10-29 10:36:34 +01:00
leriomaggio
663ebd4120 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-28 23:20:48 +01:00
leriomaggio
35eca6f038 Better control on Deck save and editor state set + FIX set deck name
the loadDeck method now has a better handling of the deck (model) status, also wrt. the state of the UI editor.
If the deck is Stored, the editor will be in "modified - not saved" state.
2021-10-28 23:20:31 +01:00
tool4EvEr
2de6fc476c Fix dropping foil from card when copying 2021-10-28 21:20:45 +02:00
TRT
5e050765a3 Clean up 2021-10-26 13:41:31 +02:00
tool4EvEr
fb88fcfe9c Fix deck loading not restoring foiled status 2021-10-25 23:54:08 +02:00
Michael Kamensky
6ae88ea82b Merge branch 'java-11plus' into 'master'
Update Forge scripts for Java 11+ and Java 17+

See merge request core-developers/forge!5566
2021-10-25 09:41:50 +00:00
tool4EvEr
47a1a93625 Fix SA not fizzling when targeting cards that left game 2021-10-24 22:10:22 +02:00
leriomaggio
669a10820e Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-10-24 16:20:21 +02:00
leriomaggio
d303c0e8ff Saving a Deck is now performed ONLY if there is any actual change to save onto disk. Otherwise, the whole op is skipped. 2021-10-24 16:18:18 +02:00
leriomaggio
1a7288815c Updated resetTable to reuse the code in setEditorMode and to update the DeckSection Dropdown
This FIXES a bug causing the Deck Editor to not properly restore its state after saving a Deck and not originally in Main Decksection.
This commit also avoids repeating code and reset tables only if necessary.
2021-10-24 16:17:05 +02:00
leriomaggio
2d40d0135c Added support for new Dungeon DeckSection in Constructed Editor (w/ i18n) 2021-10-23 22:14:15 +02:00
leriomaggio
0343da977c Removed FIXME and added note 2021-10-23 21:48:35 +02:00
leriomaggio
9f97b34a3a Recognise new Dungeon DeckSection Placeholder, and improved support to .dec files
.Dec files have collector nr//art-index as separated by a Pipe.
RegExps with collector numbers have been extended to further support decks in this format (with simply copy & paste the listing).
Tests updated/added to verify the new regexp & behaviour.
2021-10-23 21:45:04 +02:00
Anthony Calosa
c1a56f95d2 Update funny cards
collector number that starts with "F" denotes funny, to filter funny cards from legal sets and exclude them in the card audit
2021-10-23 17:12:02 +08:00
Anthony Calosa
0d194ba645 [Desktop] Update card audit
- only display the missing cards and not implemented cards.
2021-10-23 13:36:00 +08:00
paul_snoops
c409e907c2 Exclude "funny" cards from audit 2021-10-22 12:59:41 +01:00
Anthony Calosa
165a564caf unused imports 2021-10-21 15:45:30 +08:00
tool4EvEr
43019b3881 Add some more modern resolution choices 2021-10-20 22:27:36 +02:00
leriomaggio
87439388db Improved support for Unknown cards in DeckImport
DeckImport now avoids including non-deck and metadata info in decklist as UnknownText, whilst any line that looks like a card request (i.e. includes a card quantity in the beginning) is interpreted as Unknown card.

This seems a good compromise with showing typo and any mispelling in card list whilst avoiding flooding decklist with unnecessary info.
2021-10-20 10:47:44 +02:00
Michael Kamensky
0d67e7950e Merge branch 'adventure' into 'master'
Adventure mode

See merge request core-developers/forge!5584
2021-10-20 04:54:04 +00:00
Grimm
49f7128240 Restore the adventure merge
This reverts commit e69cf66ec8.
2021-10-20 04:54:01 +00:00
Michael Kamensky
48f894b1ae - Fix shared params lines. 2021-10-20 07:09:00 +03:00