Commit Graph

18483 Commits

Author SHA1 Message Date
Anthony Calosa
c1a56f95d2 Update funny cards
collector number that starts with "F" denotes funny, to filter funny cards from legal sets and exclude them in the card audit
2021-10-23 17:12:02 +08:00
Anthony Calosa
d989d22420 update set lookup
- add missing set alias
2021-10-23 14:43:14 +08:00
Michael Kamensky
b28ce0f1bb Some logic improvement for Inferno of the Star Mounts. 2021-10-23 05:30:43 +00:00
Michael Kamensky
4aabd478f7 - Added puzzle PS_MID2. 2021-10-23 07:57:43 +03:00
Bug Hunter
847e703509 Update forge-gui/res/cardsfolder/b/bloodthirsty_adversary.txt 2021-10-22 21:36:50 +00:00
Michael Kamensky
502b6be1a5 Merge branch 'awol' into 'master'
AWOL

See merge request core-developers/forge!5621
2021-10-22 15:22:11 +00:00
Bug Hunter
7716496b89 Merge branch 'typo' into 'master'
vexing_arcanix.txt fix typos in desc

See merge request core-developers/forge!5628
2021-10-22 14:42:14 +00:00
Northmoc
a92db22518 vexing_arcanix.txt fix typos in desc 2021-10-22 10:29:00 -04:00
Michael Kamensky
3d96dc9d93 Merge branch 'astral' into 'master'
MicroProse Astral cards!?!

See merge request core-developers/forge!5465
2021-10-22 12:45:15 +00:00
Tim Mocny
f535c8bc8e MicroProse Astral cards!?! 2021-10-22 12:45:14 +00:00
paul_snoops
c409e907c2 Exclude "funny" cards from audit 2021-10-22 12:59:41 +01:00
Churrufli
0693f6ee3c Gauntlets Updates 2021-10-22 11:39:25 +02:00
Michael Kamensky
b6354907bc - Add AI logic for Delina, Wild Mage. 2021-10-22 09:52:12 +03:00
Michael Kamensky
5a4828d886 Merge branch 'aicombat' into 'master'
Fix miscalculation of damage shields

See merge request core-developers/forge!5622
2021-10-22 03:42:14 +00:00
tool4EvEr
f1467d5a3e Fix miscalculation of damage shields 2021-10-21 22:55:50 +02:00
Michael Kamensky
4233ee160e Merge branch 'shoe_tree' into 'master'
Shoe Tree!

See merge request core-developers/forge!5619
2021-10-21 19:21:29 +00:00
Northmoc
a319d7882d add AI hint 2021-10-21 14:24:16 -04:00
Michael Kamensky
1deb890f93 Merge branch 'cleanup/added-DB$-space' into 'master'
Cleanup/added db$ space

See merge request core-developers/forge!5341
2021-10-21 17:59:27 +00:00
Stu Bob
efcb45546c Cleanup/added db$ space 2021-10-21 17:59:24 +00:00
Northmoc
947deb4b8d awol.txt 2021-10-21 12:55:08 -04:00
Northmoc
d913d0519a haktos_the_unscarred.txt NICKNAME flag 2021-10-21 12:48:08 -04:00
Northmoc
37036332f7 shoe_tree.txt 2021-10-21 12:46:25 -04:00
Michael Kamensky
158de07d60 Merge branch 'sld_hawkins' into 'master'
SLD Edition for missing Stranger Things Card

See merge request core-developers/forge!5612
2021-10-21 12:37:24 +00:00
Michael Kamensky
c3b860998b Merge branch 'master' into 'master'
update simplified chinese translation

See merge request core-developers/forge!5615
2021-10-21 12:37:05 +00:00
Bug Hunter
21b037e2e7 Update forge-gui/res/cardsfolder/t/tevesh_szat_doom_of_fools.txt 2021-10-21 12:35:26 +00:00
CCTV-1
9f0680b20a update new Importer strings. 2021-10-21 19:54:25 +08:00
paul_snoops
83441c6e75 SLD Edition for missing Stranger Things Card 2021-10-21 08:37:30 +01:00
Michael Kamensky
7306f69c4a Merge branch 'twosat-master-patch-36825' into 'master'
Update de-DE.properties

See merge request core-developers/forge!5606
2021-10-21 04:34:54 +00:00
Michael Kamensky
b19f01ef8b Merge branch 'gildedrake' into 'master'
Fix AI refusing Gilded Drake trigger when no targets

See merge request core-developers/forge!5607
2021-10-21 04:30:40 +00:00
Michael Kamensky
ba3e0c01ea Merge branch 'run-quest-tourney-on-edt' into 'master'
Fix Quest Tournament not running on EDT

See merge request core-developers/forge!5609
2021-10-21 04:29:50 +00:00
Northmoc
627461546a hawkins_national_laboratory_the_upside_down.txt 2021-10-20 21:07:15 -04:00
friarsol
92d5a00750 Fix Quest Tournament not running on EDT 2021-10-20 20:40:32 -04:00
tool4EvEr
e7c9cdb111 Fix AI refusing Gilded Drake trigger when no targets 2021-10-20 22:14:55 +02:00
Andreas Bendel
f75c457e66 Update de-DE.properties
translated a lot of deck importer related lines
2021-10-20 18:39:44 +00:00
Michael Kamensky
253cf35841 Merge branch 'SLD' into 'master'
SLD Extra Life 2021

See merge request core-developers/forge!5605
2021-10-20 16:33:43 +00:00
paul_snoops
96a604d6e9 SLD Extra Life 2021 2021-10-20 16:25:20 +01:00
Bug Hunter
bda03f44cf Update forge-gui/res/cardsfolder/b/brain_in_a_jar.txt 2021-10-20 14:56:36 +00:00
Michael Kamensky
898f3e91e0 Merge branch 'evoke' into 'master'
tidy up non-mana Evoke costs

See merge request core-developers/forge!5602
2021-10-20 14:07:55 +00:00
Michael Kamensky
a49ab3828e Merge branch 'imp' into 'master'
maddening_imp.txt streamline with IsTriggerRemembered

See merge request core-developers/forge!5601
2021-10-20 14:06:54 +00:00
Northmoc
d51de2a1a1 tidy up non-mana Evoke costs 2021-10-20 10:01:50 -04:00
Northmoc
53670a4dd7 maddening_imp.txt streamline with IsTriggerRemembered 2021-10-20 09:09:20 -04:00
Michael Kamensky
e8d229e3a2 Merge branch 'fix' into 'master'
surtland_elementalist.txt restrict play ability

See merge request core-developers/forge!5600
2021-10-20 12:38:52 +00:00
Northmoc
8c25623ffc surtland_elementalist.txt restrict play ability 2021-10-20 08:25:17 -04:00
leriomaggio
87439388db Improved support for Unknown cards in DeckImport
DeckImport now avoids including non-deck and metadata info in decklist as UnknownText, whilst any line that looks like a card request (i.e. includes a card quantity in the beginning) is interpreted as Unknown card.

This seems a good compromise with showing typo and any mispelling in card list whilst avoiding flooding decklist with unnecessary info.
2021-10-20 10:47:44 +02:00
Michael Kamensky
0d67e7950e Merge branch 'adventure' into 'master'
Adventure mode

See merge request core-developers/forge!5584
2021-10-20 04:54:04 +00:00
Grimm
49f7128240 Restore the adventure merge
This reverts commit e69cf66ec8.
2021-10-20 04:54:01 +00:00
leriomaggio
a67da59564 Unknown/Unrecognised text is not muted anymore and displayed as unknown card.
Added new entry in language files (ITA already translated too)
2021-10-20 00:48:02 +02:00
Michael Kamensky
dc3c117ba8 Merge branch 'custody' into 'master'
Custody Battle refactor

See merge request core-developers/forge!5591
2021-10-19 16:01:38 +00:00
Michael Kamensky
7424f765b0 Merge branch 'twosat-master-patch-42991' into 'master'
Update de-DE.properties

See merge request core-developers/forge!5589
2021-10-19 15:54:17 +00:00
Michael Kamensky
dae1c33a6d Merge branch 'fix' into 'master'
fix larder_zombie.txt

See merge request core-developers/forge!5590
2021-10-19 15:54:13 +00:00