Commit Graph

18628 Commits

Author SHA1 Message Date
Michael Kamensky
dd3d26191a Merge branch 'Fix_Sacrifice_Cards' into 'master'
Fixed Sacrificed cards that needed LKI

See merge request core-developers/forge!5113
2021-07-26 03:54:45 +00:00
Sol
77d9575e53 Update ANNOUNCEMENTS.txt 2021-07-26 03:31:06 +00:00
Wendell Wilkerson
e75bdd2d5f card updates to handle sacrificed LKI properly 2021-07-25 17:12:47 -05:00
Northmoc
cd4d0a3be1 leinore_autumn_sovereign.txt 2021-07-25 15:53:04 -04:00
tool4EvEr
8f4d58d762 Fix Mordenkainen's Polymorph 2021-07-25 21:01:22 +02:00
Michael Kamensky
da86b24155 Merge branch 'sealed' into 'master'
SealedProduct: fix crash

See merge request core-developers/forge!5109
2021-07-25 18:01:24 +00:00
tool4EvEr
c3d276f3a9 SealedProduct: fix crash 2021-07-25 18:27:30 +02:00
Hans Mackowiak
a2a2c11e4b more TargetsValid fixes 2021-07-25 17:52:13 +02:00
Hans Mackowiak
8caf3fdcbf fix Orvar the all Form: should only trigger on battlefield targets 2021-07-25 17:46:28 +02:00
Hans Mackowiak
c92d1812fd fix The Prismatic Bridge: rest in random order 2021-07-25 17:37:03 +02:00
Northmoc
ad9371b4af wurmcoil_engine.txt consolidate token lines 2021-07-25 07:58:39 -04:00
Michael Kamensky
6dcad6fad0 Merge branch 'AFC_Fiendlash' into 'master'
Added Fiendlash for review

See merge request core-developers/forge!5061
2021-07-25 09:31:05 +00:00
leriomaggio
c8e3eef7cf Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-25 08:09:22 +01:00
leriomaggio
2d189cda9a Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-25 08:09:09 +01:00
tool4EvEr
2480296113 Fix dealDamage ignoring amount changes 2021-07-24 14:15:52 +02: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
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
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
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
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
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
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
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
Lyu Zong-Hong
a3372980e5 Update oracles with AFR release 2021-07-23 15:31:40 +09:00
Lyu Zong-Hong
a42d64353e Update oracles with AFR release 2021-07-23 15:02:11 +09:00
Michael Kamensky
445826e50e Merge branch 'NPE' into 'master'
Fix some NPE from token table

See merge request core-developers/forge!5089
2021-07-23 04:25:47 +00:00
Michael Kamensky
998873f311 Merge branch 'mathas' into 'master'
Fix Mathas

See merge request core-developers/forge!5090
2021-07-23 04:25:07 +00:00
Michael Kamensky
85b2d97a4c Merge branch 'lorcan' into 'master'
Added Lorcan, Warlock Collector

See merge request core-developers/forge!5091
2021-07-23 04:24:49 +00:00
Michael Kamensky
eaa6d6acd6 Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!5092
2021-07-23 04:24:23 +00:00
Michael Kamensky
d1c0d7f49b Merge branch 'fix_fevered_suspicion' into 'master'
Fixed Fevered Suspicion  (issue #1934)

See merge request core-developers/forge!5093
2021-07-23 04:24:14 +00:00
Michael Kamensky
20712cc652 Merge branch 'share_the_spoils' into 'master'
Add Share the Spoils

See merge request core-developers/forge!5084
2021-07-23 04:24:00 +00:00
Lyu Zong-Hong
ebcfa5b084 Add ValidSA check to LandPlayed trigger 2021-07-23 11:38:55 +09:00
Wendell Wilkerson
cb2d44a35c missing Amount$ All added 2021-07-22 21:11:41 -05:00
CCTV-1
62ef92364f update simplified chinese translation 2021-07-23 10:06:00 +08:00
Wendell Wilkerson
9c38466c33 fixed formating 2021-07-22 20:51:53 -05:00
Wendell Wilkerson
b28526cfe3 Merge branch 'master' into AFC_Fiendlash 2021-07-22 20:48:33 -05:00