Commit Graph

51337 Commits

Author SHA1 Message Date
tool4EvEr
80bc6785ba Small PlayEffect fix 2021-07-05 23:54:27 +02:00
paul_snoops
622fbe3192 AFR card scripts 05 Jul 2021-07-05 22:18:16 +01:00
Michael Kamensky
7516882c0d Merge branch '1911-painter-s-servant-devoid' into 'master'
Resolve "Painter's Servant + Devoid"

Closes #1911

See merge request core-developers/forge!4951
2021-07-05 18:57:21 +00:00
Hans Mackowiak
7a1a657ae9 Card: changedCardTypesCharacterDefining + changedCardColorsCharacterDefining for better apply in Order 2021-07-05 20:03:07 +02:00
paul_snoops
0f4af36c17 AFR card scripts 05 Jul 2021-07-05 16:15:50 +01:00
paul_snoops
70677a963a AFR card scripts 05 Jul 2021-07-05 16:10:32 +01: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
Michael Kamensky
bdff72745a Merge branch 'volo_guide_to_monsters' into 'master'
Add Volo, Guide to Monsters and support invert condition for card properties

See merge request core-developers/forge!4949
2021-07-05 14:48:27 +00:00
paul_snoops
b57e3e89bf AFR card scripts 05 Jul 2021-07-05 14:12:47 +01:00
paul_snoops
974b027cf6 AFR card scripts 05 Jul 2021-07-05 13:30:11 +01:00
paul_snoops
7d884eb61e AFR card scripts 05 Jul 2021-07-05 13:00:39 +01:00
paul_snoops
883d7ce476 AFR card scripts 05 Jul 2021-07-05 12:58:50 +01:00
leriomaggio
921fc43f75 Updates to Legacy and Vintage with left out sets 2021-07-05 11:18:47 +01:00
leriomaggio
42223f109e Merge remote-tracking branch 'upstream/master' into editions-type-review 2021-07-05 09:40:34 +01:00
leriomaggio
4c264b7e3d Changed labels for format restrctions to Sanctioned formats (en only)
Other languages would be OK the same with previous wordings.
2021-07-05 09:38:47 +01:00
leriomaggio
dab893c24f Changed options not showing node counts on disabled nodes. 2021-07-05 09:35:02 +01:00
leriomaggio
a276118409 Set restrictions to Legacy and Vintage to allow for proper edition selection in sets filters 2021-07-05 09:22:25 +01:00
leriomaggio
57c81ec49f Updated to new DRAFT edition type 2021-07-05 08:14:46 +01:00
leriomaggio
411e77c8c6 Modern format now also includes: TSR, MMA, MM3, W16 sets
Modern format now inclides TimeSpiral Remastered, Modern Masters (all) and
Welcome Deck 2016 (all new frame cards, since also W17 was included)
2021-07-05 08:06:46 +01:00
leriomaggio
af12354366 G18 Set added to Pioneer format 2021-07-05 08:05:02 +01:00
leriomaggio
81ec996ab3 DRAFT_INNOVATION card edition type renamed as DRAFT
The new name IMHO is easier and more appropriate as a category name.
This would be a mismatch with Scryfall Nomenclature, but Forge contains already mismatch (e.g. REPRINT) so not a big deal.
2021-07-05 08:04:19 +01:00
Alumi
756132c8af Merge branch 'GristFixes' into 'master'
Grist: Better check for StaticAbility using ExcludeZone, fix timestamp on...

See merge request core-developers/forge!4947
2021-07-05 05:53:15 +00:00
Lyu Zong-Hong
f7694970c8 Add Volo, Guide to Monsters and support negate condition for card properties 2021-07-05 13:26:09 +09:00
Michael Kamensky
8ca4432482 Merge branch 'AFR_cards' into 'master'
AFR card scripts 04 Jul

See merge request core-developers/forge!4946
2021-07-05 02:41:40 +00:00
Michael Kamensky
b51436d4f1 Merge branch 'roll_a_d20' into 'master'
Update RollDiceEffect to better support d20 mechanism in AFR

See merge request core-developers/forge!4944
2021-07-05 02:38:58 +00:00
Alumi
dc793aa266 Update RollDiceEffect to better support d20 mechanism in AFR 2021-07-05 02:38:57 +00:00
leriomaggio
cabfe0a33a Merge remote-tracking branch 'upstream/master' into editions-type-review 2021-07-05 01:21:39 +01:00
paul_snoops
d22d3f21da AFR card scripts 04 Jul 2021-07-05 01:20:36 +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
paul_snoops
f0c1062c21 AFR card scripts 04 Jul 2021-07-04 21:56:30 +01:00
paul_snoops
28db6218b4 AFR card scripts 04 Jul 2021-07-04 21:38:08 +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
9256fdfd1a FIXED dates comparison for Historic formats, and used index in addition (if no date) 2021-07-04 20:45:26 +01:00
leriomaggio
0ef7986e3a Corrected Set Codes for Masques and Time Spiral Block formats 2021-07-04 20:44:44 +01:00
leriomaggio
8a7848f411 Changed sets to protected to allow SubClassing 2021-07-04 20:44:04 +01:00
tool4EvEr
db3accfa50 Clean up 2021-07-04 20:07:44 +02:00
leriomaggio
a2e97700df Simplified sorting of QuestWorld 2021-07-04 18:31:29 +01:00
leriomaggio
9d80ae2d5c Fixing format types and subtypes read after uppercase change 2021-07-04 18:22:11 +01:00
tool4EvEr
af04a994bb Restore ability 2021-07-04 18:48:47 +02:00
leriomaggio
33526bb31b Updating all enum FormatSubType to UPPERCASE as constants 2021-07-04 17:46:07 +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
Hans Mackowiak
5cb384afa2 Grist: Better check for StaticAbility using ExcludeZone, fix timestamp on Stack, and extra rule for canBeCommander 2021-07-04 18:27:31 +02:00