Scipio Wright
69c6f48245
Merge branch 'ArchipelagoMW:main' into tunc-combat-logic
2024-07-15 09:42:21 -04:00
Sunny Bat
925e02dca7
Raft: Move to new Options API ( #3587 )
2024-07-15 15:09:02 +02:00
CookieCat
e76d32e908
AHIT: Fix act shuffle test fail ( #3522 )
2024-07-14 14:17:05 +02:00
dennisw100
08a36ec223
Undertale: Fixed output location of the patched game in UndertaleClient.py ( #3418 )
...
* Update UndertaleClient.py Fixed output location of the patched game
Fixed the error that when the client is opened outside of the archipelago folder, the patched folder would be created in there which on windows ends up trying to create it in the system32 folder
Bug Report: https://discord.com/channels/731205301247803413/1148330675452264499/1237412436382973962
* Undertale: removed unnecessary wrapping in UndertaleClient.py
I did not know os.path.join was unnecessary in this case the more you know.
2024-07-14 14:11:52 +02:00
Bryce Wilson
48dc14421e
Pokemon Emerald: Fix logic for coin case location ( #3631 )
2024-07-14 14:05:50 +02:00
black-sliver
948f50f35d
customserver: fix minor memory leak ( #3636 )
...
Old code keeps ref to last started room's task and thus never fully cleans it up.
2024-07-14 13:56:56 +02:00
black-sliver
187f9dac94
customserver: preemtively run GC before starting room ( #3637 )
...
GC seems to be lazy.
2024-07-14 13:56:27 +02:00
Scipio Wright
8208a4d356
Dagger or combat for swamp big skeleton chest
2024-07-13 22:20:15 -04:00
Scipio Wright
6f0440548d
Put in money logic
2024-07-13 13:41:39 -04:00
Scipio Wright
7e25b00f3c
Modify beneath the vault bridge rule to need a lantern if combat logic is on
2024-07-13 11:13:44 -04:00
Scipio Wright
351e427b99
Add laurels rules to combat logic chests
2024-07-13 10:48:58 -04:00
Scipio Wright
38d0bb6634
Revamp combat logic function to work properly without melee
2024-07-13 10:39:58 -04:00
Scipio Wright
9f90401b91
Update the rule for the chest near the 6 crabs surrounding a slorm to also possibly require laurels
2024-07-13 10:23:56 -04:00
Scipio Wright
68dd2737d2
Add rule for atoll near the 6 crabs surrounding a poor defenseless baby slorm
2024-07-13 10:15:31 -04:00
Scipio Wright
d86e198260
Add rule for entering town portal of having equipment to deal with enemies
2024-07-13 09:56:47 -04:00
Scipio Wright
11bf9ed800
Run through checks you can do with magic dagger
2024-07-12 19:41:41 -04:00
Scipio Wright
c42866db98
Run through checks you can do with magic dagger
2024-07-12 19:40:17 -04:00
Scipio Wright
f2b7dbbb7d
Fix bugs, refactor quarry regions so you can access chests in lower quarry with ice grapples
2024-07-12 19:12:11 -04:00
Scipio Wright
efdaeb29f1
Slight wording changes
2024-07-12 18:13:26 -04:00
Scipio Wright
90ade96d7c
Update test_access.py
2024-07-12 15:27:22 -04:00
Scipio Wright
fe5b2f2a7e
Update test to explicitly disable combat logic
2024-07-12 15:26:48 -04:00
Scipio Wright
0092584fb6
Temporarily default combat logic on
2024-07-12 15:20:52 -04:00
Scipio Wright
e166e3c40b
Make it so zig skip is only made with fewer shops and er
2024-07-12 15:19:34 -04:00
Scipio Wright
b29d64c51b
Don't make zig skip if er or fixed shop is off
2024-07-12 15:18:22 -04:00
Scipio Wright
66f65a1b06
Add todo
2024-07-12 15:06:38 -04:00
Scipio Wright
7d1793c973
Add todo
2024-07-12 15:01:37 -04:00
Scipio Wright
4a67361e5a
Update combat logic description
2024-07-12 14:21:23 -04:00
Scipio Wright
bb29ab0707
Fix missing world.
2024-07-12 13:28:03 -04:00
Scipio Wright
fd26fa51f8
Fix typos
2024-07-12 12:19:40 -04:00
Scipio Wright
4c7a067da2
Fix typo
2024-07-12 12:15:25 -04:00
Scipio Wright
297d519e04
Upper zig combat logic
2024-07-12 10:20:30 -04:00
Scipio Wright
fc955cff61
Lower Zig combat logic
2024-07-12 10:15:14 -04:00
Scipio Wright
4b13fc0547
Move around lower zig regions for combat logic
2024-07-12 10:10:57 -04:00
Scipio Wright
16b682e99e
Add more regions for lower zig
2024-07-12 09:57:02 -04:00
Scipio Wright
f25b6e4e85
Fix typo
2024-07-12 09:50:36 -04:00
Scipio Wright
1523301d2c
Update region name for frog's domain
2024-07-12 09:46:50 -04:00
Scipio Wright
d76d0c2262
Add new frog's domain regions for combat logic
2024-07-12 09:46:06 -04:00
Scipio Wright
0f1fd3e728
Move frog's domain locations to regions for combat logic
2024-07-12 09:43:30 -04:00
Scipio Wright
906ce159e3
Add combat logic to frog's domain
2024-07-12 09:42:53 -04:00
Scipio Wright
0104329821
Add laurels zip logic to the chest in the spike room in cathedral
2024-07-12 09:22:51 -04:00
Scipio Wright
ba24481fb1
Adjust locations' regions for ER
2024-07-12 09:20:08 -04:00
Scipio Wright
a0416b95c0
Setup cathedral combat logic
2024-07-12 09:18:28 -04:00
Scipio Wright
810fbebbca
Add cathedral main region, rename cathedral -> cathedral entry
2024-07-12 09:14:18 -04:00
Scipio Wright
228c6254ec
Combat logic for cathedral to elevator
2024-07-12 09:10:54 -04:00
Scipio Wright
5b88cb0964
Fix missing cathedral -> elevator connection
2024-07-12 09:02:41 -04:00
Scipio Wright
d67f4a3fc1
Add combat rules to beneath the vault
2024-07-11 22:34:02 -04:00
Scipio Wright
df055ee789
Add combat logic to the other two sets of fortress fuses
2024-07-11 21:27:06 -04:00
Scipio Wright
2cf5ad25a3
Refactor to use a new function cause wow there was a lot of repeated code
2024-07-11 21:23:11 -04:00
Scipio Wright
bb73c80a61
Fortress east shortcut logic, and rewriting the try except blocks to use finally
2024-07-11 20:52:47 -04:00
Scipio Wright
4fb06cb0ff
Fortress Grave Path logic, and a couple fixes to the west garden logic
2024-07-11 19:46:44 -04:00
