Commit Graph

52826 Commits

Author SHA1 Message Date
tool4EvEr
024db5c198 Clean up 2021-07-29 20:59:17 +02:00
tool4EvEr
9148ca3806 AI fixes 2021-07-29 20:59:16 +02:00
tool4EvEr
7d4e9667c0 Turn into cost 2021-07-29 19:06:25 +02:00
tool4EvEr
9bd67d1a17 Support UnlessCost for random Discard 2021-07-29 18:41:37 +02:00
Michael Kamensky
788b34194a Merge branch 'card_text_rendering_preferences' into 'master'
Add preferences for card text rendering

See merge request core-developers/forge!5134
2021-07-29 16:30:51 +00:00
Lyu Zong-Hong
3b690d8c2a Move label position 2021-07-29 22:19:38 +09:00
Lyu Zong-Hong
72e734faba Add preferences for card text rendering 2021-07-29 21:47:09 +09:00
leriomaggio
857cf20466 Aligned implementations to add card to pool from cardrequest
Implementation aligned with method getting in cardName, setcode and artIndex.
2021-07-29 13:30:17 +01:00
Michael Kamensky
69a65da77c Merge branch 'fix_phyrexian_mana' into 'master'
Fix crash when rendering Phyrexian mana symbols in card text and fix issues for Level up cards

See merge request core-developers/forge!5133
2021-07-29 11:45:34 +00:00
leriomaggio
5cc9ddb041 Accounting for any null in CardEdition - for those cards not having one. 2021-07-29 12:18:44 +01:00
leriomaggio
a9f64a52e0 Updating DeckProxy wit the new method on CardEdition.Collection used to determine the edition of a Deck
The edition (set) of a Deck corresponds to the LATEST edition found among the cards in the DECK, considering their ORIGINAL editions.
2021-07-29 12:17:56 +01:00
leriomaggio
e09826a1f0 Improved verification on CardEdition not null for a card (also on date)
When this happens, no card update will be issued!
2021-07-29 12:16:19 +01:00
leriomaggio
556894296f Adding controls on ProgressBar that might avoid sudden NPE with downloading net decks.
I am still not sure how to reproduce the issue, but I do sometimes get a NPE on progress bar (directly raised by Java Swing, tbh) when downloading certain net decks.
I have the feeling there might be some sort of concurrency issue//race condition so just in case, any update to the progress bar is now surrounded by a check that's not null.
2021-07-29 12:14:55 +01:00
leriomaggio
e382fd31ef FIXED collector numbers for lands in Master25 2021-07-29 12:12:30 +01:00
Lyu Zong-Hong
c936b9fed9 Fix some issues when rendering Level up cards 2021-07-29 17:36:16 +09:00
leriomaggio
247fbc57f1 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-29 08:00:28 +01:00
Lyu Zong-Hong
35749300ce Fix crash when rendering Phyrexian mana symbols in card text 2021-07-29 15:59:37 +09:00
Michael Kamensky
43cf318007 Merge branch 'perpetual' into 'master'
Jumpstart Historic Horizons – some cards with "perpetual" mechanic

See merge request core-developers/forge!5129
2021-07-29 05:15:15 +00:00
Michael Kamensky
c213dc0ecd Merge branch 'tome' into 'master'
Jumpstart Historic Horizons – Tome of the Infinite

See merge request core-developers/forge!5130
2021-07-29 05:14:38 +00:00
Michael Kamensky
72c053c4b9 Merge branch 'tidy' into 'master'
Attempt to tidy up prismari_command.txt

See merge request core-developers/forge!5131
2021-07-29 05:13:55 +00:00
Michael Kamensky
22fc15c3c8 Merge branch 'NetDeck-fix' into 'master'
Fixed Net Decks Archive not working on Mobile when in the Deck Manager

See merge request core-developers/forge!5126
2021-07-29 05:13:31 +00:00
Northmoc
da7225dc33 can't use ThisTargetedCard for "any target" 2021-07-28 16:32:19 -04:00
Northmoc
955e1552ca Attempt to tidy up prismari_command.txt 2021-07-28 16:28:05 -04:00
Northmoc
0822a4de0d add "RememberMade" to MakeCardEffect 2021-07-28 16:06:59 -04:00
Northmoc
c9dae7c666 support using ChosenName for MakeCardEffect 2021-07-28 16:06:25 -04:00
Northmoc
09795207ff add "ClearNamedCard" to CleanUpEffect 2021-07-28 16:05:17 -04:00
Northmoc
af5d8cd988 ChooseCardNameEffect - support choosing from list, with support for random too 2021-07-28 16:03:55 -04:00
Northmoc
f705634b5c tome_of_the_infinite.txt 2021-07-28 16:00:39 -04:00
Northmoc
0bbe2828ef sarkhan_wanderer_to_shiv.txt 2021-07-28 15:21:03 -04:00
leriomaggio
beec4915c4 Just cleanup and formattings for getMaxArtIndex and getArtCount 2021-07-28 16:51:32 +01:00
leriomaggio
6ae1a7a5d7 Refined implementation (refactored and optimised) for add method in a CardPool from cardName, Set code and artIndex. 2021-07-28 16:51:10 +01:00
leriomaggio
6726d1f776 New method to retrieve all available databases in a MAP (w/ names)
This method is used in CardPool to add a card, and keep track of the original DB.
2021-07-28 16:50:18 +01:00
leriomaggio
cf006d1c16 Updated and Aligned implementation for DeckController whenever a pick for limited catalog is required.
Most of this commit is for code formatting and cleaning. Major changes include the use fo getAlternativeCardPrint from Static Data (using the same policy that was used before) and the use of the `getTheLatestOfAllEditionsForCardsIn` method :D
2021-07-28 16:07:38 +01:00
leriomaggio
3e63a0c54d Renamed attr. and methods related to "allowCustomCardsInDecksConformance" options and improved API for alternativeCardArt
The new `getAlternativeCardArt` method builds on the previous `getCardFromEdition` which generates alternative card art given a PaperCard and a reference date.
Extension to this method is also incorporated to force the options to adopt for card art preference policy.
If None provided, default options set up in Game preferences will be used!
2021-07-28 16:02:34 +01:00
leriomaggio
dc10c6217e Improved code formatting and extensive refactoring of code for smart card art optimisation
Note: deferred section are still kept alive for live testing. Will be restored and fixed next commit.
2021-07-28 15:59:55 +01:00
leriomaggio
93fa6b28b2 All the logic used in Deck for OptimisedCardArt relating to Pivot Edition and Editions Frequency Map has been now moved in CardPool
CardPool now includes the logic to (a) retrieve the edition frequency map of itself, as well as retrieving its corresponding PivotEdition (depending on cards in the pool).

This refactoring optimises the code in Deck class for "smartCardArt" selection
2021-07-28 15:58:39 +01:00
leriomaggio
1eaf644e5b Renamed and optimised implementation for getTheLatestOfAllTheOriginalEditionsOfCardsIn + tests
`getTheLatestOfAllTheOriginalEditionsOfCardsIn` is the new name for `getEarliestEditionWithAllCards` which better clarifies the intent of the method.
The implementation has been optimised, according to the new CardDb behaviour and APIs.

The tests have been extended to verify that the output of the method is always consistent regardless of the edition of cards in the input CardPool.
2021-07-28 15:56:17 +01:00
Northmoc
953430255e - I'm dumb 2021-07-28 10:42:51 -04:00
Michael Kamensky
47ad20523e Merge branch 'refine_card_image_renderer' into 'master'
Refine card image renderer

See merge request core-developers/forge!5128
2021-07-28 14:42:26 +00:00
Northmoc
a14b13164f - clean up line that sets "prompt" 2021-07-28 09:54:07 -04:00
Northmoc
d903cb1a84 add Command to "perpetual" AffectedZone list 2021-07-28 09:52:13 -04:00
Northmoc
baa7855ff5 natures_wrath.txt fix Description 2021-07-28 09:48:59 -04:00
Northmoc
4e02f01bf8 knight_of_the_ebon_legion.txt - Players not Opponents 2021-07-28 09:48:26 -04:00
Northmoc
87faa670e1 davriel_soul_broker.txt - make each Effect name unique 2021-07-28 09:47:30 -04:00
Northmoc
bd7ab26f3e Support "ChoicePrompt" for GenericChoice 2021-07-28 09:36:16 -04:00
Northmoc
d58191283e davriel_soul_broker.txt 2021-07-28 09:35:25 -04:00
Northmoc
8dcf4b7a19 plaguecrafters_familiar.txt 2021-07-28 09:33:16 -04:00
Lyu Zong-Hong
e029149893 Use a darker color for bottom column of Level up cards 2021-07-28 20:42:12 +09:00
Lyu Zong-Hong
57acff9bff Handle Level up cards 2021-07-28 20:34:15 +09:00
Lyu Zong-Hong
f5ee502601 Handle Adventure cards 2021-07-28 20:34:15 +09:00