Commit Graph

53916 Commits

Author SHA1 Message Date
Stu Bob
776b83e353 Something is wrong with bat whisperer it crashes the game.
Something is wrong with crawl_from_the_cellar - after targeting it doesn't work
Something is wrong with fateful_absence - it doesn't investigate correctly.
2021-09-23 15:03:12 +00:00
Northmoc
2bf6d1d0c3 DrawEffect auto stackdesc improvements 2021-09-23 10:43:11 -04:00
Northmoc
fc25e911ff DiscardEffect auto stackdesc improvements 2021-09-23 10:42:57 -04:00
Northmoc
5ec4f4253b CounterEffect auto stackdesc improvements 2021-09-23 10:42:35 -04:00
Michael Kamensky
877e78f844 Merge branch 'fix-unique-card-filter-catalog' into 'master'
Fix Issue #1975: Unique cards card catalog

Closes #1975

See merge request core-developers/forge!5416
2021-09-23 13:03:58 +00:00
Michael Kamensky
a98b1cceb9 Merge branch 'fix-issue-npe-cardeditiontype' into 'master'
FIX Issue #1974: NPE on Card Edition Statistics in Card Pool

Closes #1974

See merge request core-developers/forge!5415
2021-09-23 13:02:47 +00:00
leriomaggio
9a0c26b2a2 Fix Issue #1975
Fixed Issue in CardManager for Unique Card Filters.
Now, only one entry of card will be returned per-edition, also accounting for Card images.
In other words, Card entry will be selected considering the default Card Art Preference. Therefore, candidate editions will be iterated in order, looking for an entry having a card with an image.
If none could be found, the original first entry (even with no image) will be returned instead.
2021-09-23 13:21:19 +01:00
leriomaggio
6c782448dd Adding translation support in Tooltip for Unique Card Filter 2021-09-23 13:18:42 +01:00
leriomaggio
5f138b1123 FIX Issue #1974
Fixing NPE occurring when gathering statistics on Card Edition in CardPool and the Edition does not exist.
This patch simply discards any stats about not-found card editions
2021-09-23 12:24:09 +01:00
Michael Kamensky
12052b973e Merge branch 'cg_sb' into 'master'
ControlGainEffect improve StringBuilder

See merge request core-developers/forge!5414
2021-09-23 03:36:31 +00:00
Northmoc
e90428a18d ControlGainEffect improve StringBuilder 2021-09-22 19:11:10 -04:00
Michael Kamensky
04d5958bb9 Merge branch 'cleanup' into 'master'
Cleanup predictDamageTo

See merge request core-developers/forge!5413
2021-09-22 17:46:55 +00:00
Michael Kamensky
1da1f119c4 Merge branch 'mid_22' into 'master'
MID - 22 Sep

See merge request core-developers/forge!5412
2021-09-22 17:46:34 +00:00
Michael Kamensky
1bc327330b Merge branch 'master' into 'master'
[Mobile] Transform Animation

See merge request core-developers/forge!5409
2021-09-22 17:46:10 +00:00
tool4EvEr
e578448daf Cleanup predictDamageTo 2021-09-22 18:41:49 +02:00
Anthony Calosa
e223db61ee Fix 10X Speed up 2021-09-22 23:15:26 +08:00
Anthony Calosa
de452e2da5 Fix 10X Speed up 2021-09-22 23:05:00 +08:00
Anthony Calosa
e2738b361c NPE Guard 2021-09-22 21:15:52 +08:00
Northmoc
b4d4bb8da6 support ConditionPlayerTrue$ False 2021-09-22 08:46:42 -04:00
Northmoc
887e10be45 stolen_vitality.txt 2021-09-22 08:46:08 -04:00
Northmoc
7f8ab75b4f packs_betrayal.txt 2021-09-22 08:45:18 -04:00
Anthony Calosa
5a5b0095ec refactor Tap Untap Animation 2021-09-22 20:08:14 +08:00
Anthony Calosa
e9d9ce4832 Merge remote-tracking branch 'remotes/core/master' 2021-09-22 15:52:58 +08:00
Anthony Calosa
2f75e37368 cleanup 2021-09-22 15:50:54 +08:00
Michael Kamensky
612e1fcb11 Merge branch 'replaceLifeLossDamage' into 'master'
Player: lifeloss now uses Replacement for Worship

Closes #1971

See merge request core-developers/forge!5411
2021-09-22 06:44:29 +00:00
Anthony Calosa
d2fd534964 update transform animation 2021-09-22 14:02:20 +08:00
Anthony Calosa
834d74d5f2 Merge remote-tracking branch 'remotes/core/master' 2021-09-22 13:58:42 +08:00
Hans Mackowiak
18eedb1dc4 Player: lifeloss now uses Replacement for Worship 2021-09-22 07:45:13 +02:00
Michael Kamensky
d3e91ddedf Merge branch 'vamp' into 'master'
Krovikan Vampire: Add missing trigger

See merge request core-developers/forge!5410
2021-09-22 03:15:47 +00:00
Michael Kamensky
e38a35d9bc Merge branch 'twosat-master-patch-03590' into 'master'
Update de-DE.properties

See merge request core-developers/forge!5408
2021-09-22 03:15:25 +00:00
Michael Kamensky
b526842c39 Merge branch 'MID_cards' into 'master'
MID/MIC cards 21 Sep

See merge request core-developers/forge!5405
2021-09-22 03:15:21 +00:00
Michael Kamensky
b4ab53b1e8 Merge branch 'unblink' into 'master'
MID: Unblinking Observer and support

See merge request core-developers/forge!5407
2021-09-22 03:14:54 +00:00
Northmoc
7abb206b4c support RestrictValid$ Disturb 2021-09-21 20:20:14 -04:00
Northmoc
10b3df681b unblinking_observer.txt 2021-09-21 20:18:32 -04:00
leriomaggio
3f961a14ab Moving getBlockFormats from FModel to GameFormat.Collection
getBlockFormat becomes also getBlockList, inline with other methods in GameFormat.Collection. DeckManager and CardManager have been updated accordingly.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-21 23:16:56 +01:00
tool4EvEr
22a328b64c Improve cleanup 2021-09-21 22:58:49 +02:00
Anthony Calosa
9fc4a09ce3 update 2021-09-22 03:49:33 +08:00
tool4EvEr
7f3bd2dfa4 Add missing trigger 2021-09-21 21:33:49 +02:00
Anthony Calosa
e9c21aa08a Merge remote-tracking branch 'remotes/core/master' 2021-09-22 03:29:50 +08:00
Anthony Calosa
5925d63ccb [Mobile] Transform Animation 2021-09-22 03:25:45 +08:00
Andreas Bendel
d9acacf786 Update de-DE.properties
translated lblHowManyTimesToPay
2021-09-21 19:08:44 +00:00
paul_snoops
82123be7a4 update heronblade_elite 2021-09-21 17:24:10 +01:00
Michael Kamensky
f0de6a79dd Merge branch 'tokens' into 'master'
MID/MIC tokens

See merge request core-developers/forge!5406
2021-09-21 16:19:45 +00:00
paul_snoops
9b98e2f912 fixes 2021-09-21 17:18:09 +01:00
paul_snoops
d6f2b2bda1 remove day & night 2021-09-21 16:38:05 +01:00
paul_snoops
47f4c4e3f6 update kyler_sigardian_emissary 2021-09-21 15:32:30 +01:00
paul_snoops
de1a150373 MID/MIC tokens 2021-09-21 15:28:17 +01:00
paul_snoops
6c3898155f MID/MIC cards 21 Sep 2021-09-21 14:56:58 +01:00
Michael Kamensky
53f6abf726 Merge branch 'master' into 'master'
Generalize AI support for Announce$ NumTimes

See merge request core-developers/forge!5404
2021-09-21 08:58:03 +00:00
Michael Kamensky
eb04fb9cae Merge branch 'master' into 'master'
[Mobile] update bg animation and overlays

See merge request core-developers/forge!5403
2021-09-21 08:56:43 +00:00