Commit Graph

52826 Commits

Author SHA1 Message Date
Michael Kamensky
13747b8fd6 - Set X cost for AnimateAi 2021-08-15 14:43:43 +03:00
Michael Kamensky
b5ade0c7bc - More AlwaysOnDiscard AI logic hints. 2021-08-15 14:40:47 +03:00
Michael Kamensky
4f8055cfdc Merge branch 'master' into 'master'
Improve the CostDiscard logic a little for cases where CARDNAME itself is discarded.

See merge request core-developers/forge!5226
2021-08-15 06:41:36 +00:00
Michael Kamensky
de4072f0c8 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-08-15 09:35:33 +03:00
Michael Kamensky
207d8fc97c Merge branch 'fix_ai_x_cannot_be_zero' into 'master'
Adds check for AI when X cost is not allowed to be zero

See merge request core-developers/forge!5224
2021-08-15 06:33:42 +00:00
Michael Kamensky
43c68ddfcb - Improve the CostDiscard logic a little for cases where CARDNAME itself is discarded. 2021-08-15 09:29:55 +03:00
Michael Kamensky
16f7ac2949 Merge branch 'NPE' into 'master'
Fix NPE with Thunderous Might

See merge request core-developers/forge!5223
2021-08-15 04:34:33 +00:00
Wendell Wilkerson
9da3686ecb Adds check for X cannot be zero for AI player 2021-08-14 23:34:18 -05:00
tool4EvEr
e0e5d212f6 Clean up 2021-08-14 23:28:36 +02:00
tool4EvEr
d304655ecd Fix NPE with Thunderous Might 2021-08-14 21:19:51 +02:00
Michael Kamensky
afae2ef25a Merge branch 'manabondCounter' into 'master'
moved ManaBond counter into Engine

Closes #1950

See merge request core-developers/forge!5222
2021-08-14 14:14:09 +00:00
Hans Mackowiak
0a46d9ebc8 moved ManaBond counter into Engine 2021-08-14 15:38:56 +02:00
Michael Kamensky
5d51cf468e Merge branch 'collector-number-in-card-list-and-card-db-refactoring' into 'master'
Card Art Preference, New Feature for "Smart Selection" of Card Art in Decks, Refactoring CardDb w/ Tests & Various FIXES

See merge request core-developers/forge!5220
2021-08-14 10:36:39 +00:00
Michael Kamensky
c2ee17050e Merge branch 'tappay' into 'master'
Fix TapXType & CostSacrifice payment fails

See merge request core-developers/forge!5213
2021-08-14 10:35:26 +00:00
Bug Hunter
b7eaca6483 Fix TapXType & CostSacrifice payment fails 2021-08-14 10:35:25 +00:00
Michael Kamensky
e0435aa309 Merge branch 'gamestate' into 'master'
Fix GameState for partner commanders

See merge request core-developers/forge!5221
2021-08-14 10:34:26 +00:00
tool4EvEr
65de007894 Fix GameState for partner commanders 2021-08-14 10:04:44 +02:00
leriomaggio
838f817be7 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-08-14 08:27:09 +01:00
Michael Kamensky
f6b8a41775 Merge branch 'small_fixes' into 'master'
Small edition fixes

See merge request core-developers/forge!5219
2021-08-14 04:27:39 +00:00
Michael Kamensky
01da67676d Merge branch 'lost' into 'master'
Fix life lost triggers

See merge request core-developers/forge!5218
2021-08-14 04:27:08 +00:00
Michael Kamensky
f919f90974 Merge branch 'TRT-master-patch-72745' into 'master'
Fixes for Grist

See merge request core-developers/forge!5217
2021-08-14 04:26:31 +00:00
Bug Hunter
c9d88ae384 Fixes for Grist 2021-08-14 04:26:30 +00:00
leriomaggio
d72d48a11f FIXED bug for unique filter with missing break statement and reverse for correct iteration 2021-08-14 01:10:02 +01:00
leriomaggio
017a4c579e Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-08-14 00:12:27 +01:00
paul_snoops
d9411ae2a2 Small edition fixes 2021-08-13 23:27:07 +01:00
tool4EvEr
be81ba5e15 Fix life lost triggers 2021-08-13 21:25:24 +02:00
Michael Kamensky
33959fc087 Merge branch 'conspiracy' into 'master'
Fix Conspiracy Theorist

See merge request core-developers/forge!5216
2021-08-13 11:46:55 +00:00
Bug Hunter
1084a972c1 Fix Conspiracy Theorist 2021-08-13 11:46:55 +00:00
leriomaggio
9e3d97b452 Finally added option in settings for smart card art selection in Mobile Settings pane too. 2021-08-13 11:37:17 +01:00
leriomaggio
258f57e080 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-08-13 11:25:38 +01:00
leriomaggio
6d8e935203 FIX a but that avoided Brawl card catalog to properly distribute art indices of cards
This FIX relies on the new method in CardDb to query cards by also using collector numbers.
This has solved the issue of repeated card index/images in card catalog for Brawl (or any other limited game format in the future)
2021-08-13 11:16:02 +01:00
leriomaggio
afaed6fea5 RENEWED and Refined implementation of getUnique for cards, also taking into account current Card Art Preference
getUnique previously returned random results, based on the internal order in which entries were found.

Now, filtering by Unique Cards in Catalog is aware of the current Cart Art Preference
Also, the algorithm takes into account the case in which card image is missing.
In that case, the method tries to fill in the gaps with those alternatives having images. If not possible, the original entries are returned.
2021-08-13 11:14:31 +01:00
leriomaggio
b870d519c9 Updating Deck to use the new method in StaticData to get Card Art Preference Name
(Forgot to include this in prev. commit)
2021-08-13 10:19:37 +01:00
leriomaggio
b09b5972ab FORCING all Deck Editors to not have a Unique Cards Only filter 2021-08-13 10:17:51 +01:00
leriomaggio
d171170c45 FIX bug allowing WantUnique filter possible even if alwaysNonUnique is set to true 2021-08-13 10:17:14 +01:00
leriomaggio
50be83ee9d Disabling Unique Cards Only filter for Deck Editors (completely useless and misleading) 2021-08-13 10:16:32 +01:00
leriomaggio
beaf98793b Renamed method to retrieve card art preference name and new method to return actual card art preference instance. 2021-08-13 10:15:08 +01:00
Michael Kamensky
678bd9a9e1 Merge branch 'osgir' into 'master'
Fix Osgir looping too much

See merge request core-developers/forge!5214
2021-08-12 19:48:19 +00:00
leriomaggio
bd2971d6e9 Smart Card Art Selection Options and Preferred Art Updated for all Languages 2021-08-12 17:41:25 +01:00
leriomaggio
4b1e9b6c0c Improved Implementation for Card Art Optimisation
The new implementation now contains a completely refactored version of the algorithm, also including the invocation of the latest method for getAlternativeCardPrint in StaticData (with extra statistics paramenters gathered from current pool). This include optimisation for card frame, and cards from Expansion sets.

Moreover, the new implementation now automatically distribute card arts for **all** the cards in the pool - regardless they need to be "replaced" with alternative print or not.

THE ONLY case when this is not happening is when there is NO card to update in the current pool. This makes sense as this means editions has been specified, so the Deck won't receive any UNDESIRED alteration.
2021-08-12 16:35:08 +01:00
leriomaggio
e54916e837 Extended API with new methods to gather Pool Statistics and the Pivot CardEdition
CardPool API has been extended by including utility methods to gather specific statistics about a cardPool. These statistics include:
- Distribution (card count frequency) of the Card Edition included in the Pool
- Distribution of the Card Edition Type included in the Pool
- Retrieving the most common Card Edition Type among those included in the Pool
- Determine whether or not the Pool "isModern" (i.e. the majority of cards is gathered from Modern Sets)
- get the PivotCardEdition: this is the cornerstone of card art optimisation for decks

The PivotCardEdition is the edition that will be considered the threshold boundary for cards in the pool. Any decision of card arts for other cards will be considered based on the PivotEdition, that is "alternativeCardPrint" released BEFORE or AFTER (depending on the current Card Art Preference) the PIVOT EDITION RELEASE DATE.

Also, this commit includes an optimisation in add method implementation, getting rid of lots of duplicated code!
2021-08-12 16:30:33 +01:00
leriomaggio
13429991ee Updated method call reflecting the API change in StaticData 2021-08-12 16:18:01 +01:00
leriomaggio
788c2d8c14 Better renaming to existing methods for Card Art Preference and NEW getAlternativeCardPrint implementations
Methods related to Card Art Preference Settings, and for Card Art Smart Selection have been renamed with better wording.

Most importantly, StaticData now includes a new method to retrieve the number of art count for a given PaperCard, as well as a completely refactored and improved method for getAlternativeCardPrint.
In particular, the class now provides three different implementation of getAlternativeCardPrint, with the more sophisticated one also including normalisation wrt. the card frame, and whether or not the chosen alternative print should be gathered from an Expansion edition.

All these specialisation are part of the "Card Art Optimisation" algorithm included in Deck, and instructed by statistics gathered from Card Pool (next commit)
2021-08-12 16:17:31 +01:00
leriomaggio
000622cfae Added MEMO comment to get rid of retrieveCollectorNumber method 2021-08-12 15:52:58 +01:00
leriomaggio
21da278eec Aligned to latest constructor including Artist Name for foiled version. 2021-08-12 15:52:11 +01:00
Michael Kamensky
39722f9e26 Merge branch 'TRT-master-patch-54796' into 'master'
Update forge-gui/res/cardsfolder/h/hellrider.txt

See merge request core-developers/forge!5215
2021-08-12 11:57:02 +00:00
Hans Mackowiak
f935b30632 Mercurial Transformation: remove Card and Sub Types 2021-08-12 11:03:25 +00:00
Bug Hunter
3522220938 Update forge-gui/res/cardsfolder/h/hellrider.txt 2021-08-12 06:19:17 +00:00
tool4EvEr
aaa195ca38 Fix Osgir looping too much 2021-08-11 23:54:40 +02:00
Michael Kamensky
dc03ff599c Merge branch 'editions_update' into 'master'
Update J21 and SLD

See merge request core-developers/forge!5211
2021-08-11 18:21:55 +00:00