Commit Graph

64941 Commits

Author SHA1 Message Date
Anthony Calosa
31c705e1bb Merge pull request #3430 from schnautzr/golem
Remove steam animation from golem and golem_2.
2023-07-08 07:58:28 +08:00
Anthony Calosa
abf080fae4 Merge pull request #3412 from schnautzr/amonkhet
Amonkhet
2023-07-08 07:57:20 +08:00
Anthony Calosa
e28becb576 Merge pull request #3343 from EldritchBimbo/Gwyn_DungeonDev
Unhallowed Abbey Dungeon
2023-07-08 07:56:58 +08:00
Anthony Calosa
527f0097c6 update items.png 2023-07-08 07:42:18 +08:00
Rob Schnautz
98494d8630 Remove steam animation from golem and golem_2. 2023-07-07 15:45:38 -05:00
tool4ever
054a885b33 Fix effect getting cleaned up directly if source was exiling (#3426)
Co-authored-by: TRT <>
2023-07-07 12:41:10 +03:00
Agetian
a2dd864047 AI shouldn't miss Grothama's triggers even when it doesn't want to activate them (#3424)
* - AI: Shouldn't miss Grothama's triggers even when it doesn't want to activate them.

* - Consolidate the logic in FightAi

* - Clean up

* - Fix imports

* - Clean up
2023-07-07 11:05:18 +03:00
tool4ever
449e456843 Clean up (#3422)
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2023-07-07 07:09:11 +03:00
Anthony Calosa
e0b030fc95 Update bill_the_pony.txt
- closes #3423
2023-07-07 09:34:34 +08:00
Agetian
dbc2a5b5eb AI: Various logic fixes and improvements (#3416)
* - Fix logic for Elderscale Wurm damage prediction

* - AI logic hint for Tempting Wurm
- Several related AI hint fixes (cards in hand don't have a controller set)

* - Implement AI logic for Grothama, All-Devouring.

* - AI shouldn't fight its own Grothama for card draw (leads to silly results).

* - Attempt two at fixing Elderscale Wurm damage preditions.

* - Improve banding AI so that the AI knows how to tank damage from Trample when the other possibility is multiple chump blockers.

* - Clean up

* - Attempt to defer checking for "...as if it were unblocked" static until after the Banding blocker(s) are assigned.
- Clean up

* - Clean up
2023-07-06 18:01:59 +03:00
Anthony Calosa
bfd93368be Merge pull request #3394 from Agetian/ai-banding
Basic AI logic for Banding / Bands with Other
2023-07-06 05:33:17 +08:00
Agetian
bac3b7751d - Restore the NPE guard for bestAttacker 2023-07-05 20:30:54 +03:00
Alwayssnarky
c0a6d86bde Merge branch 'Gwyn_DungeonDev' of https://github.com/EldritchBimbo/forge into Gwyn_DungeonDev 2023-07-05 11:59:58 -04:00
Alwayssnarky
bcbe6c0068 Re-added new item sprites 2023-07-05 11:59:55 -04:00
Rob Schnautz
7c80fda19a Set gym as subroom of Naktamun, fix a shared tile issue with desertbuildingtiles.png, add collision for desertbuildingtiles.tsx. 2023-07-05 09:15:52 -05:00
Rob Schnautz
e63ff372ea fix bad paths to structure files, link naktamun with gym 2023-07-05 09:15:52 -05:00
TRT
0f61fb97c6 Clean up 2023-07-05 10:55:21 +02:00
Anthony Calosa
1ad21f0e1a Merge pull request #3386 from tool4ever/exileobject2
Exiled card becomes new object when it's exiled
2023-07-05 16:16:19 +08:00
tool4ever
da6fa189be Update lidless_gaze.txt 2023-07-05 08:48:20 +02:00
Agetian
5001a9d2d6 - Mishra's War Machine needs a good card draw engine until its AI is improved, so reserving it for non-random planned decks for now. 2023-07-05 08:07:14 +03:00
Agetian
8cd9d9d79b - Remove unused parameter 2023-07-05 07:51:20 +03:00
tool4ever
3d64308d31 Fix cheating when paying hybrid shards with combo abilities (#3402)
* Clean up

* Fix cheating when paying hybrid shards with combo abilities

* Fix script

---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
2023-07-05 07:09:10 +03:00
Agetian
05b33448a4 - Unnecessary null check 2023-07-05 07:06:32 +03:00
Anthony Calosa
29bd8cc3f3 Merge pull request #3403 from schnautzr/enemies
fix elephant and dragonfly tags
2023-07-05 07:20:47 +08:00
tool4EvEr
ddecc4226d Only return subset of potential attackers based on current declaration 2023-07-04 23:29:49 +02:00
tool4ever
798bcd4bee Update grothama_all_devouring.txt 2023-07-04 20:02:13 +00:00
Agetian
ee65cb64e6 - Implemented suggested optimizations. 2023-07-04 22:35:05 +03:00
Agetian
25323941e0 - Do not try to add Banding to something that will attack by itself, the AI is poor at predicting that (will miss the Banding opportunity).
- Curse prop not needed on AF Debuff.
2023-07-04 22:28:09 +03:00
schnautzr
8d20c6c466 Merge branch 'Card-Forge:master' into enemies 2023-07-04 13:02:47 -05:00
Rob Schnautz
59e1a45c9a fix elephant and dragonfly tags 2023-07-04 12:52:08 -05:00
Agetian
6aa3938144 - Enable more Banding cards for the AI. 2023-07-04 20:22:04 +03:00
Agetian
f699304dc0 - Enable more Banding cards for the AI. 2023-07-04 20:17:04 +03:00
Agetian
6fbe6235c3 - Enable more Banding cards for the AI. 2023-07-04 20:11:31 +03:00
Agetian
54acfaff2c - Add AI support for Banding-granting cards 2023-07-04 20:07:54 +03:00
Anthony Calosa
fb9416f072 fix MusicPlaylist.java 2023-07-04 19:59:34 +08:00
Anthony Calosa
b96fe3dc1e Update MusicPlaylist.java
update check
2023-07-04 19:29:10 +08:00
Anthony Calosa
5538edee71 Merge pull request #3401 from kevlahnota/newmaster2
update paths
2023-07-04 19:25:11 +08:00
Anthony Calosa
11cdb2502a update 2023-07-04 19:24:43 +08:00
Anthony Calosa
cff3df6f0c update paths
- fix music not loading correctly
2023-07-04 19:14:44 +08:00
Agetian
75c43fd0f7 - Slightly more sensible banding for 0-power creatures when attacking. 2023-07-04 13:00:30 +03:00
Agetian
435dfd1486 - Some tweaks. Banding with Protection is actually a good thing (the AI correctly dumps damage into protected creatures). 2023-07-04 12:29:13 +03:00
Anthony Calosa
4024a9037a Merge pull request #3373 from schnautzr/biomes-update
Fix collision issues in Shandalar
2023-07-04 15:07:09 +08:00
Anthony Calosa
948aa3999b Merge pull request #3396 from schnautzr/resize-ibis
upscale ibis from 60% to 130%
2023-07-04 12:07:01 +08:00
Anthony Calosa
d6cc132c56 Update hallowed_sigil.txt 2023-07-04 11:34:42 +08:00
Anthony Calosa
4da74b8282 Update valyx_boss_effect.txt 2023-07-04 11:33:55 +08:00
Anthony Calosa
4118f25f7f Update sigil_of_torment.txt 2023-07-04 11:33:10 +08:00
Anthony Calosa
905006e362 Merge pull request #3331 from schnautzr/common-music
Common music
2023-07-04 11:19:52 +08:00
Anthony Calosa
dda81105a0 Merge pull request #3398 from kevlahnota/newmaster2
prevent NPE
2023-07-04 06:43:57 +08:00
Anthony Calosa
60d79b4374 prevent NPE 2023-07-04 06:43:04 +08:00
Agetian
1ba3e7422d - Fix imports. 2023-07-03 17:52:31 +03:00