Commit Graph

52520 Commits

Author SHA1 Message Date
Michael Kamensky
ad55566a98 Merge branch 'aifix' into 'master'
Fix DamageDealAi math for untargeted players

See merge request core-developers/forge!5125
2021-07-28 07:18:10 +00:00
tool4EvEr
9a621f2179 Improve Crackling Doom logic 2021-07-28 07:15:10 +02:00
tool4EvEr
a00e408c84 Fix assigning damage to lost players 2021-07-28 06:30:06 +02:00
Michael Kamensky
40ef4de16e Merge branch 'J21' into 'master'
Added Jumpstart: Historic Horizons edition file

See merge request core-developers/forge!5123
2021-07-28 03:49:21 +00:00
Nigol
f5bf7a4581 Fixed Net Decks Archive not working on Mobile when in the Deck Manager
(cherry picked from commit 8585d49e246d4c936f1ddbad2b39f5c1381f64dc)
2021-07-27 21:04:47 -04:00
leriomaggio
1697c1205f Refined implementation (+ test) for getEarliestEditionWithAllCards
This method should still be optimised, and definetly renamed.
2021-07-28 01:19:41 +01:00
leriomaggio
2cc1ee724d Merged Conflict with CardDB method call 2021-07-28 01:16:20 +01:00
leriomaggio
b893283abc Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-28 01:14:00 +01:00
tool4EvEr
ef7ff4dd66 Fix DamageDealAi math for untargeted players 2021-07-27 22:57:21 +02:00
leriomaggio
c8052e00a8 New method processCardList that generates the List of Pair per request.
This method will be also re-used in Decks when inspecting the list of cards to add in a Deck Section.

This refactoring avoids code duplications, and improves modularization.
2021-07-27 17:58:49 +01:00
leriomaggio
f3eb862737 FIXED typo 2021-07-27 16:19:00 +01:00
leriomaggio
f7e85b1f64 Updated with new method call from StaticData to account for conformance of custom cards 2021-07-27 16:16:26 +01:00
leriomaggio
79a4e71968 New test cases (and extended implementation) accounting for cards from UNKNONW sets to be correctly retrieved. 2021-07-27 16:15:25 +01:00
leriomaggio
e5350c83d6 Extended test cases to verify that any CardRequest passed in works with no side effect.
New tests (and fixed updated CardRequest implementation) verify that any method used for Card Retrieval when receiving directly CardRequest formatted strings as cardName won't have any side effect. In particular, the code is reliable to be robust enough to support passing in both card name (only) or a full cardRequest string.

If the latter, any parameter in the request will be updated - accordingly - only when explicit params in function calls are provided.
Also, new tests demonstrate that the current implementation has NO side effect when testing for multiple combinations. Therefore, whatever is requested in requestString won't be overruled, unless really requested too.
2021-07-27 14:31:37 +01:00
paul_snoops
e645dd3eaf Formats fixed 2021-07-27 14:24:44 +01:00
Alumi
3f30f45972 Merge branch 'fix_unknown_cards' into 'master'
Get PaperCard for unknown edition

See merge request core-developers/forge!5124
2021-07-27 13:19:52 +00:00
Lyu Zong-Hong
26adc5ca7b Get Paper Card for unknown edition 2021-07-27 22:17:10 +09:00
paul_snoops
4e99063750 Added Jumpstart: Historic Horizons 2021-07-27 12:01:25 +01:00
leriomaggio
b1a2af4868 Updated Translations for "Custom Cards in Deck Conformance" Option for remaining languages. 2021-07-27 11:11:38 +01:00
leriomaggio
5a7d0c7b6b Updated Mobile Settings Panel with the upd vars and labels for "Custom Cards in Deck conformance" option. 2021-07-27 10:53:01 +01:00
leriomaggio
9978632c10 Improved ITALIAN translations on Custom Card Check in Deck Conformance and other minors.
Clarified (imho) a ton my own previous wording about this option - also for Italian. Moreover, this update aligns all the "RESTART REQUIRED" labels with the same translation and case.
2021-07-27 10:52:04 +01:00
leriomaggio
59b9ed1c4d Improved wording for Custom Card Check in Deck Conformance
Clarified (imho) a ton my own previous wording about this option.
2021-07-27 10:49:47 +01:00
leriomaggio
b6bfa2fd16 Renamed Preference for Custom Card in Deck Conformance Check
Previous naming (pref and vars) was very confusing. Updated.
2021-07-27 10:48:03 +01:00
Hans Mackowiak
3a1bd57fcb Merge branch 'maven_build_fix' into 'master'
Fix for broken Maven build

See merge request core-developers/forge!5122
2021-07-27 07:05:35 +00:00
leriomaggio
38a63bb4ce FIXED duplicated entries 2021-07-27 08:04:49 +01:00
leriomaggio
6320857864 Code formatting cleanup.
Also, it is important to emphasise that previous implementation of the "Strict" Card Art Preference policy were too stringent, and did not account for corner cases when the card could not be retrieved. This has been FIXED in the new API implementation.
2021-07-27 07:40:13 +01:00
leriomaggio
286533cf90 Aligned CardDb calls after API revision for getCardFromEditionsReleasedBefore(date). 2021-07-27 07:40:13 +01:00
leriomaggio
e2aa8874b6 Refactoring and Extension to CardDb Test cases
Huge refactoring in variable names and test case optimisations. Also, new tests for the new API are also included. In particular, additional corner cases tested, as well as verification with Legacy (previous) CardDb implementation.
2021-07-27 07:40:13 +01:00
leriomaggio
8de07821e0 Refactoring and Second Update to the new ICardDatabase APIs
This new revision of the APi brings a more consistent distribution of the different parameters and settings in DB API calls.
In particular, the changes affect the getCardFromEditions which are now separated into three sets of methods:

- methods to retrieve a card based on CardArtPreference
- methods to also include a Release Date restriction,
that can be now considered in both directions
(as in "releasedBefore" and "releasedAfter" a specified date).

These changes will be functional for new additions in future changes to Deck Importer, as well as will be used
to refine the implementation of the new Smart Card Art Selection in Decks.

From an implementation perspective, it is important to emphasise that all those methods are just syntactic sugar
for parameter passing to the **same** core (private) retrieval method (centralised single point of failure)
which incorporates all the required parameters, that would also be cumbersome to use in a public API.
2021-07-27 07:40:12 +01:00
Lyu Zong-Hong
106515d217 Fix for broken Maven build 2021-07-27 14:38:22 +09:00
Hans Mackowiak
70531a8f31 Merge branch 'classLevelStatic' into 'master'
Class: use Static Ability to follow CR

See merge request core-developers/forge!5115
2021-07-27 04:59:51 +00:00
Hans Mackowiak
6562a04667 Class: use Static Ability to follow CR 2021-07-27 04:59:50 +00:00
Michael Kamensky
4decf8bf64 Merge branch 'jumphh' into 'master'
Some other new Jumpstart cards

See merge request core-developers/forge!5120
2021-07-27 04:55:27 +00:00
Michael Kamensky
bb65d4d2ec Merge branch 'manor' into 'master'
JHH: Some "seek" cards

See merge request core-developers/forge!5119
2021-07-27 04:55:21 +00:00
Michael Kamensky
119a53b0fd Merge branch 'acolyte' into 'master'
JHH: Subversive Acolyte

See merge request core-developers/forge!5118
2021-07-27 04:54:36 +00:00
Michael Kamensky
c9036f90ef Merge branch 'mdfc' into 'master'
Correctly evaluate modal faces

See merge request core-developers/forge!5112
2021-07-27 04:53:19 +00:00
Michael Kamensky
0cb35f7c84 Merge branch 'target' into 'master'
Fix hasAllTargets

See merge request core-developers/forge!5117
2021-07-27 04:52:51 +00:00
Michael Kamensky
3e3f0729a9 Merge branch 'render_token_emblem' into 'master'
Also render tokens and emblems when not using images

See merge request core-developers/forge!5121
2021-07-27 04:52:36 +00:00
Lyu Zong-Hong
8f70a6ab96 Pass CardView from scaleImage() too 2021-07-27 13:48:46 +09:00
Lyu Zong-Hong
5f39b98cc5 Also render tokens and emblems when not using images 2021-07-27 12:10:26 +09:00
Sol
d8dfbcf1a3 Update birgi_god_of_storytelling_harnfel_horn_of_bounty.txt 2021-07-27 02:49:04 +00:00
Northmoc
13217aaa3e wingsteed_trainer.txt 2021-07-26 22:46:57 -04:00
Northmoc
da6162180e sarkhans_scorn.txt 2021-07-26 22:22:48 -04:00
Northmoc
175db96e4f CardFactoryUtil - add getMostProminentCreatureType 2021-07-26 19:44:19 -04:00
Northmoc
64e95df6a2 CardProperty - add "MostProminentCreatureTypeInLibrary" 2021-07-26 19:42:43 -04:00
Northmoc
d10a1e1a78 faceless_agent.txt 2021-07-26 19:41:04 -04:00
Northmoc
de4ae7bb3c CharmEffect.java support GameActivationLimit in formatted desc 2021-07-26 19:09:25 -04:00
Northmoc
f0ead44849 subversive_acolyte.txt 2021-07-26 19:08:34 -04:00
Northmoc
f3ecd98f8a manor_guardian.txt 2021-07-26 19:06:34 -04:00
tool4EvEr
7eec98db61 Fix CostSacrifice OriginalHost 2021-07-26 21:55:50 +02:00