Commit Graph

53079 Commits

Author SHA1 Message Date
Northmoc
50a713365c CostExile support X as amount to exile 2021-09-24 17:57:27 -04:00
Northmoc
a8db6f9370 Card ability stringbuilder updates + support AdditionalDesc 2021-09-24 17:56:47 -04:00
Northmoc
1fb3cc0ca0 falcon_abomination.txt add Flying 2021-09-24 17:16:10 -04:00
tool4EvEr
58e4bc9519 Clean up 2021-09-24 22:15:18 +02:00
Northmoc
1dfc6608dc liesa_forgotten_archangel.txt 2021-09-24 16:06:15 -04:00
Northmoc
731e610ced gavony_silversmith.txt fix PT 2021-09-24 16:02:37 -04:00
tool4EvEr
c88d5b373a Fix AI for Ludevic 2021-09-24 21:55:01 +02:00
Northmoc
0e488ebbac ChangeZoneEffect support SkipCancelPrompt 2021-09-24 15:51:57 -04:00
Northmoc
eb2a864fea distant_memories.txt without ChooseCard 2021-09-24 15:22:30 -04:00
Michael Kamensky
d2b3880cb3 Merge branch 'TRT-master-patch-37742' into 'master'
Update forge-gui/res/cardsfolder/upcoming/harvesttide_sentry.txt

See merge request core-developers/forge!5423
2021-09-24 18:53:39 +00:00
Bug Hunter
59000df8ec Update forge-gui/res/cardsfolder/upcoming/harvesttide_sentry.txt 2021-09-24 17:31:31 +00:00
Northmoc
fba174419e distant_memories.txt improve functionality and AI 2021-09-24 09:15:24 -04:00
Northmoc
c306789e14 increasing_confusion.txt fix SVar:Y 2021-09-24 09:14:41 -04:00
Michael Kamensky
d0abc02bc5 Merge branch 'edition_changes' into 'master'
Edition changes

See merge request core-developers/forge!5421
2021-09-24 12:34:40 +00:00
paul_snoops
c2723e1c9f primal_adversary fix 2021-09-24 12:18:51 +01:00
paul_snoops
f1527b1451 artist fix 2021-09-24 10:43:36 +01:00
paul_snoops
63330b53a5 Edition changes 2021-09-24 10:39:35 +01:00
Michael Kamensky
b3e878b015 Merge branch 'removeIntrinsic' into 'master'
Card: remove removeIntrinsic from Trait and Keyword Changes, check ChangedType instead

See merge request core-developers/forge!5420
2021-09-24 05:41:51 +00:00
Hans Mackowiak
bacf387657 Card: remove removeIntrinsic from Trait and Keyword Changes, check ChangedType instead 2021-09-24 07:23:59 +02:00
Michael Kamensky
2a4f5ef3a3 Merge branch 'mic_23' into 'master'
MIC - 23 Sep

See merge request core-developers/forge!5419
2021-09-24 04:56:14 +00:00
Michael Kamensky
dbbb8ec95d Merge branch 'when_dies_this_turn' into 'master'
Refactor "when X dies this turn" cards from Effect to DelayedTrigger

See merge request core-developers/forge!5351
2021-09-24 03:56:59 +00:00
Tim Mocny
725eee27e8 Refactor "when X dies this turn" cards from Effect to DelayedTrigger 2021-09-24 03:56:58 +00:00
Northmoc
73e9d4b1c6 new messages 2021-09-23 19:07:47 -04:00
Northmoc
f42ef251a7 celestial_judgment.txt 2021-09-23 19:07:46 -04:00
Northmoc
3fb5e5ea87 sigardian_zealot.txt 2021-09-23 19:07:45 -04:00
Northmoc
4e6abaff0f sigardas_vanguard.txt 2021-09-23 19:07:45 -04:00
Northmoc
59549ef7b0 ChooseCardEffect "EachDifferentPower" 2021-09-23 19:07:45 -04:00
Northmoc
a5ee24e23d ChooseCardEffect "WithDifferentPowers" 2021-09-23 19:07:44 -04:00
Northmoc
3df72b446b crowded_crypt.txt (Marvel) 2021-09-23 19:05:07 -04:00
Northmoc
af0b0df71a curse_of_conformity.txt (Marvel) 2021-09-23 19:05:07 -04:00
Northmoc
1907cf4d41 moorland_rescuer.txt (Marvel) 2021-09-23 19:05:07 -04:00
Northmoc
5655b3b3c2 curse_of_unbinding.txt (Marvel) 2021-09-23 19:05:07 -04:00
Michael Kamensky
6c62df0a48 Merge branch 'stackdesc' into 'master'
auto Stackdesc updates

See merge request core-developers/forge!5417
2021-09-23 15:03:29 +00:00
Michael Kamensky
f190bd991e Merge branch 'MID/cards-3' into 'master'
MID Cards

See merge request core-developers/forge!5338
2021-09-23 15:03:17 +00:00
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