Michael Kamensky
ba7f08d5ec
Merge branch 'tokenset' into 'master'
...
Some improvements to token image fetching (especially emblems)
See merge request core-developers/forge!5105
2021-07-25 04:27:44 +00:00
Northmoc
222448d29c
Add extra try for "setless" token image (Desktop)
2021-07-24 13:06:47 -04:00
Northmoc
377cbca39b
Add extra try for "setless" token image (Android)
2021-07-24 13:06:13 -04:00
Northmoc
97225782c1
Emblems - common rarity
2021-07-24 13:05:06 -04:00
Northmoc
8b96079f6e
EffectEffect add set to Emblem imagekey
2021-07-24 13:04:27 -04:00
Michael Kamensky
921369628b
Merge branch 'dealdamage' into 'master'
...
Fix dealDamage ignoring amount changes
See merge request core-developers/forge!5104
2021-07-24 16:42:44 +00:00
tool4EvEr
2480296113
Fix dealDamage ignoring amount changes
2021-07-24 14:15:52 +02:00
leriomaggio
d9620a5556
TEMP implementation of Smart Card Art Selection method
2021-07-24 11:33:37 +01:00
leriomaggio
56080cdf3f
Added support to the new Smart Card Art Preference Option
...
The new "Smart Card Art Selection" option for card images in deck has been added.
The Ui and forge preferences have been updated (default is False), as well as corresponding support in StaticData.
On this note, the old `getAlternativeCardPrint` has been re-implemented to enforce a "Latest_Art" based preference selection so that editions could be selected accordingly (as the smart method was originally designed)
Actual implementation of the method will be part of future commits as still under dev - and requires better encapsulation
2021-07-24 11:07:20 +01:00
leriomaggio
6277bc0c0f
Added note on behaviour for candidate w/ no edition
...
Left note only for (internal) documentation purposes!
2021-07-24 11:02:05 +01:00
leriomaggio
ec89ff755b
more robust and reliable method to check for card images
...
The getImagefile will be invoked since this method will also account for any difference in `full` and `fullborder` naming for card images.
In particular, it will try everything possible before giving up and assume the card has no image.
This is **crucial** for cardDB card retrieval, as well as determines the boolean value returned by PaperCard.hasImage method/property
2021-07-24 10:51:26 +01:00
leriomaggio
4c001b9462
Nothing serious - explicit null initialisation
2021-07-24 10:48:08 +01:00
Bug Hunter
3b357207a4
Merge branch 'import' into 'master'
...
Fix imports
See merge request core-developers/forge!5103
2021-07-24 09:27:39 +00:00
tool4EvEr
ac6219f4bd
Clean up
2021-07-24 11:27:37 +02:00
leriomaggio
513eed297d
removed annoying blank line in code formatting :D
2021-07-24 10:09:41 +01:00
Wendell Wilkerson
c70ab7b722
fix for LKI on DamageDoneOnce trigger
2021-07-24 00:22:48 -05:00
Michael Kamensky
004ea04a0e
Merge branch 'move-fatpacks-to-editions' into 'master'
...
Move fatpacks to editions
See merge request core-developers/forge!5102
2021-07-24 05:18:05 +00:00
Michael Kamensky
2b342d7118
Merge branch 'dungeon' into 'master'
...
Add Dungeon to EditionSectionWithCollectorNumbers
See merge request core-developers/forge!5099
2021-07-24 05:17:57 +00:00
Michael Kamensky
5645f2212e
Merge branch 'predict' into 'master'
...
Fix predictDamageTo
See merge request core-developers/forge!5100
2021-07-24 05:17:23 +00:00
Michael Kamensky
e5cb062644
Merge branch 'anger' into 'master'
...
Fix ReplaceDyingDefined on cards that use DamageAll effect
Closes #1938
See merge request core-developers/forge!5097
2021-07-24 05:17:14 +00:00
Michael Kamensky
4bce4a9a84
Merge branch 'thirst' into 'master'
...
Bloodchief's Thirst: improve StackDescription to show target when kicked (band-aid)
See merge request core-developers/forge!5101
2021-07-24 05:16:21 +00:00
Wendell Wilkerson
8a6a0c5d85
Merge branch 'master' into AFC_Fiendlash
2021-07-23 23:51:23 -05:00
friarsol
da0f7ed15e
Include D&D set
2021-07-23 22:49:32 -04:00
friarsol
6210fdd9fc
Move FatPacks to editions file
2021-07-23 22:47:48 -04:00
Northmoc
610fe7fada
- typo
2021-07-23 20:45:29 -04:00
Northmoc
4108b56135
serpentine_spike.txt tidy up StackDesc
2021-07-23 20:40:37 -04:00
tool4EvEr
1534636a64
Fix Serpentine Spike
2021-07-23 20:24:17 -04:00
Northmoc
94da5f3c3a
add Remember objects from Damage effects to GameAction before the maps are cleared
2021-07-23 20:24:16 -04:00
Northmoc
a8205192ca
remove Remember functions from DamageAllEffect
2021-07-23 20:24:09 -04:00
Northmoc
22337e4a7b
remove Remember functions from DamageDealEffect
2021-07-23 20:21:18 -04:00
tool4EvEr
ffb40f1195
Fix Price of Loyalty
2021-07-24 00:09:52 +02:00
leriomaggio
01d117b07e
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-07-23 22:38:23 +01:00
leriomaggio
b3ce4bf9ff
New Options for Smart Card Art Selection
2021-07-23 22:38:19 +01:00
tool4EvEr
df160a751e
Fix predictDamageTo
2021-07-23 21:56:37 +02:00
tool4EvEr
911511d039
Add Dungeon to EditionSectionWithCollectorNumbers
2021-07-23 21:33:25 +02:00
leriomaggio
f52dbdb996
Requires Restart for Preferred Art was set to the wrong label
2021-07-23 20:01:23 +01:00
leriomaggio
7d2a62714c
Removed repeated/duplicate entries
2021-07-23 19:43:52 +01:00
Michael Kamensky
ef917a91b9
Merge branch 'update_translation_dice_class' into 'master'
...
Fix translation issues for Class and dice rolling cards
See merge request core-developers/forge!5098
2021-07-23 15:59:52 +00:00
Northmoc
589f714d70
improve StackDescription to show target when kicked (band-aid)
2021-07-23 11:13:12 -04:00
Lyu Zong-Hong
b28e32460d
Fix translation issues for Class and dice rolling cards
2021-07-23 23:40:04 +09:00
Northmoc
2fffb11d72
anger_of_the_gods.txt tidy up
2021-07-23 10:00:05 -04:00
leriomaggio
f0c584f9d0
FIX bug of DeckViewer on window auto-resize
...
On my laptop, the dimensions of the deck viewer rescaled were ridiculously small, and smaller even than "small deck viewer".
I've removed the scaling factor, which caused the issue.
2021-07-23 10:53:17 +01:00
Michael Kamensky
7dcf2c6131
Merge branch 'afr_update_translation' into 'master'
...
Update translations for AFR release
See merge request core-developers/forge!5096
2021-07-23 09:46:13 +00:00
Michael Kamensky
49fe438790
Merge branch 'afr_oracle_update' into 'master'
...
Update oracles with AFR release
See merge request core-developers/forge!5095
2021-07-23 09:45:57 +00:00
leriomaggio
32d0e14a35
New Preferred Card Art Preference with two separate controllers
...
Now menu settings (on Desktop App) includes the preferred art option selection as separated in two settings.
The former is to decide whether Latest or Original Art should be used; the latter specifies whether only core, exp. and reprint sets should be considered.
All translation files have been updated, aligned, and extended accordingly.
The MAJOR update here is that now options for Art are fully localised too!! (so far only for Desktop App)
2021-07-23 10:45:54 +01:00
Lyu Zong-Hong
f559bd98ef
Update translations for AFR release
2021-07-23 16:19:40 +09:00
leriomaggio
5c27c57f74
New and Refined methods to get and set cart art preferences for all instances of CardDb
2021-07-23 07:57:30 +01:00
leriomaggio
89bdb79d03
New methods (w. tests) to setup card art preferences
...
CardDb now includes a more refined mechanism to set up values for CardArt Preference.
These methods do now support the proper setup for legacy values and string values (as supported previously in mobile version).
Moreover, new methods are now defined to support the new (separated) pair of settings as integrated into the Desktop App.
2021-07-23 07:45:59 +01:00
leriomaggio
6be921c1a2
FIX for CustomCardReader to support instantiation when no custom edition has been found
2021-07-23 07:37:32 +01:00
Lyu Zong-Hong
a3372980e5
Update oracles with AFR release
2021-07-23 15:31:40 +09:00
