external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,169 Commits 31 Branches 187 Tags
ce7c7b9fc573bc01ea31e470fa183e3eff337fb9
Commit Graph

65169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Calosa
998ebbcc57 Merge pull request #3443 from jjayers99/master 
Adventure - Updated draft set filtering
 2023-07-10 11:09:21 +08:00
TabletopGeneral
9bee1838d6 Merge branch 'Card-Forge:master' into master 2023-07-09 22:51:31 -04:00
jjayers99
75ef4be4be Adventure - Updated draft set filtering 2023-07-09 22:50:31 -04:00
tool4ever
491ccd1719 Fix missing reorder (#3435) 
* Fix missing reorder

* Fix Ward check for all subs
 2023-07-09 11:09:37 +00:00
Agetian
62e3472d6a Implement AI for Arena (#3434) 
* - 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

* - Implement AI for Arena.

* - Hook up the AI for Magus of the Arena
- Simplify implementation for the relevant cards
 2023-07-09 13:04:44 +03:00
Anthony Calosa
49e5ce974d Merge pull request #3436 from kevlahnota/newmaster2 
format win/loss ratio
 2023-07-09 11:20:40 +08:00
Anthony Calosa
0c8b51ccf2 Update TextUtil.java 2023-07-09 11:14:53 +08:00
Anthony Calosa
3ec52cae4b move decimal format to TextUtil 2023-07-09 10:48:34 +08:00
Anthony Calosa
f757192df5 format win/loss ratio 2023-07-09 10:34:31 +08:00
Simisays
a62b5a911f Update gandalf_westward_voyager.txt 2023-07-08 23:31:42 +02:00
Simisays
d805c47422 Update gandalf_westward_voyager.txt 2023-07-08 23:19:33 +02:00
Simisays
f0926c204c Update gandalf_westward_voyager.txt 2023-07-08 22:55:27 +02:00
Simisays
567111174c update 2023-07-08 22:36:27 +02:00
Simisays
717472cb30 Merge branch 'LOTR28' of https://github.com/Simisays/forge into LOTR28 2023-07-08 22:22:28 +02:00
Simisays
add0f986af Update gandalf_westward_voyager.txt 2023-07-08 22:22:26 +02:00
Simisays
0a5b3f35c5 update 2023-07-08 17:31:51 +02:00
tool4ever
e242003d4c Update amethyst_dragon_explosive_crystal.txt 2023-07-08 14:15:47 +00:00
Anthony Calosa
a808bc948b Merge pull request #3431 from jjayers99/master 
Adventure fixes
 2023-07-08 19:44:54 +08:00
Anthony Calosa
0fa5a6cfa6 Update NewGameScene.java 
add imports
 2023-07-08 19:41:25 +08:00
TabletopGeneral
c8ae4246b2 Merge branch 'Card-Forge:master' into master 2023-07-08 07:08:27 -04:00
jjayers99
95fd4b3112 Adventure - Ensure spawn map is loaded on new game 2023-07-08 07:07:54 -04:00
squee1968
72d72b1b03 6 LTC + Tokens (#3421) 
* 6 LTC + Tokens

* Update shelob_dread_weaver.txt

* Update and rename gríma_sarumans_footman.txt to grima_sarumans_footman.txt

* Update gwaihir_greatest_of_the_eagles.txt

* Update haldir_lorien_lieutenant.txt

* Update lobelia_defender_of_bag_end.txt

* Update lord_of_the_nazgul.txt

* Update shelob_dread_weaver.txt

* Delete w_3_3_bird_flying_jump.txt

* Delete b_3_3_wraith_menace.txt

* Update grima_sarumans_footman.txt

* tokens

* Update lord_of_the_nazgul.txt

* Update lobelia_defender_of_bag_end.txt

* Update gwaihir_greatest_of_the_eagles.txt

* Update grima_sarumans_footman.txt

* Update lobelia_defender_of_bag_end.txt
 2023-07-08 09:11:19 +01:00
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
Simisays
565c94b909 update 2023-07-07 21:47:13 +02:00
Simisays
bd861a1632 Merge remote-tracking branch 'upstream/master' into LOTR28 2023-07-07 21:26:40 +02: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
TabletopGeneral
6401414aa2 Merge branch 'Card-Forge:master' into master 2023-07-06 21:16:34 -04: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