Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AHIT: Fix act shuffle test fail #3522

Merged
merged 193 commits into from
Jul 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
193 commits
Select commit Hold shift + click to select a range
45ccb99
duh
CookieCat45 Aug 27, 2023
173896b
Fuck it
CookieCat45 Aug 28, 2023
cbdf4d9
Major fixes
CookieCat45 Aug 28, 2023
5c49cca
a
CookieCat45 Aug 28, 2023
6442c40
b
CookieCat45 Aug 28, 2023
906c412
Even more fixes
CookieCat45 Aug 29, 2023
1fd2a21
New option - NoFreeRoamFinale
CookieCat45 Aug 29, 2023
b5475ac
a
CookieCat45 Aug 29, 2023
6d9bfbc
Hat Logic Fix
CookieCat45 Aug 29, 2023
149a42b
Just to be safe
CookieCat45 Aug 29, 2023
2b44619
multiworld.random to world.random
CookieCat45 Aug 29, 2023
0dc211f
KeyError fix
CookieCat45 Aug 30, 2023
c0adc90
Update .gitignore
CookieCat45 Aug 30, 2023
e338826
Update __init__.py
CookieCat45 Aug 30, 2023
a7190b6
Zoinks Scoob
CookieCat45 Aug 30, 2023
a3fd865
ffs
CookieCat45 Aug 30, 2023
949f152
Ruh Roh Raggy, more r-r-r-random bugs!
CookieCat45 Aug 30, 2023
d673b87
0.9b - cleanup + expanded logic difficulty
CookieCat45 Sep 1, 2023
77ac8a7
Update Rules.py
CookieCat45 Sep 1, 2023
2ef4422
Update Regions.py
CookieCat45 Sep 1, 2023
127ce1d
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Sep 2, 2023
1f916e8
AttributeError fix
CookieCat45 Sep 2, 2023
215594d
0.10b - New Options
CookieCat45 Sep 2, 2023
1daafff
1.0 Preparations
CookieCat45 Sep 8, 2023
02087ed
Docs
CookieCat45 Sep 8, 2023
32561dd
Docs 2
CookieCat45 Sep 8, 2023
6c56f79
Fixes
CookieCat45 Sep 9, 2023
da20a77
Update __init__.py
CookieCat45 Sep 9, 2023
c5b8113
Fixes
CookieCat45 Sep 9, 2023
6cedbe8
variable capture my beloathed
CookieCat45 Sep 9, 2023
0d07ae0
Fixes
CookieCat45 Sep 11, 2023
e3e1c0d
a
CookieCat45 Sep 11, 2023
a1395ee
10 Seconds logic fix
CookieCat45 Sep 12, 2023
714241b
1.1
CookieCat45 Sep 15, 2023
1afb569
1.2
CookieCat45 Oct 4, 2023
13acb67
a
CookieCat45 Oct 13, 2023
0e273dd
New client
CookieCat45 Oct 17, 2023
8b98cd7
More client changes
CookieCat45 Oct 17, 2023
d043c0d
1.3
CookieCat45 Oct 19, 2023
8d3aa7e
Final touch-ups for 1.3
CookieCat45 Oct 19, 2023
6eaf941
1.3.1
CookieCat45 Oct 21, 2023
afdcde8
1.3.3
CookieCat45 Oct 23, 2023
1cf5218
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Oct 24, 2023
a3e928d
Zero Jumps gen error fix
CookieCat45 Oct 24, 2023
100a5f9
Merge branch 'main' of https://github.com/CookieCat45/Archipelago-ahit
CookieCat45 Oct 24, 2023
a20a9e8
more fixes
CookieCat45 Oct 24, 2023
b4fb763
Formatting improvements
CookieCat45 Oct 25, 2023
6ae347c
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Oct 27, 2023
8eb351e
typo
CookieCat45 Oct 27, 2023
e178a7c
Update __init__.py
CookieCat45 Oct 27, 2023
f37a718
Revert "Update __init__.py"
CookieCat45 Oct 27, 2023
25a39a4
init
CookieCat45 Oct 27, 2023
2ce7b52
Update to new options API
CookieCat45 Oct 27, 2023
eb6f373
Missed some
CookieCat45 Oct 27, 2023
a028b9a
Snatcher Coins fix
CookieCat45 Oct 27, 2023
eb2bd1c
Missed some more
CookieCat45 Oct 27, 2023
3eaa808
Merge branch 'ArchipelagoMW:main' into new-options-api
CookieCat45 Oct 27, 2023
8c02a96
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Oct 27, 2023
311966c
some slight touch ups
CookieCat45 Oct 28, 2023
0ede996
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Oct 30, 2023
b5167bf
Merge branch 'ArchipelagoMW:main' into new-options-api
CookieCat45 Oct 30, 2023
674cf7a
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Nov 4, 2023
aa71433
Merge branch 'ArchipelagoMW:main' into new-options-api
CookieCat45 Nov 4, 2023
a262b13
rewind
CookieCat45 Nov 4, 2023
60df274
Merge branch 'main' of https://github.com/CookieCat45/Archipelago-ahit
CookieCat45 Nov 4, 2023
bd8698e
a
CookieCat45 Nov 4, 2023
b8948bc
fix things
CookieCat45 Nov 5, 2023
a2360fe
Merge branch 'main' of https://github.com/CookieCat45/Archipelago-ahit
CookieCat45 Nov 5, 2023
58fcd50
Revert "Merge branch 'main' of https://github.com/CookieCat45/Archipe…
CookieCat45 Nov 5, 2023
f4f405f
Update .gitignore
CookieCat45 Nov 5, 2023
db54bed
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Nov 5, 2023
eea1dd6
Merge branch 'ArchipelagoMW:main' into new-options-api
CookieCat45 Nov 5, 2023
74715c3
1.3.6
CookieCat45 Nov 5, 2023
10e1ed0
Merge branch 'main' of https://github.com/CookieCat45/Archipelago-ahit
CookieCat45 Nov 5, 2023
f451f2c
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Dec 7, 2023
24b8be7
Merge branch 'ArchipelagoMW:main' into new-options-api
CookieCat45 Dec 8, 2023
0d703b8
Merge branch 'main' into new-options-api
CookieCat45 Dec 8, 2023
98c29b7
Final touch-ups
CookieCat45 Dec 8, 2023
e64fe75
Merge pull request #1 from CookieCat45/new-options-api
CookieCat45 Dec 8, 2023
4f80e15
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Dec 17, 2023
b9fce5a
Fix client and leftover old options api
CookieCat45 Dec 19, 2023
0ef6c33
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Dec 19, 2023
6d629a0
Delete setup-ahitclient.py
CookieCat45 Dec 19, 2023
4e12f4c
Merge branch 'main' of https://github.com/CookieCat45/Archipelago-ahit
CookieCat45 Dec 19, 2023
083f5b7
Update .gitignore
CookieCat45 Dec 19, 2023
ae58cd9
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Dec 28, 2023
185f5b5
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Jan 3, 2024
f967588
old python version fix
CookieCat45 Jan 4, 2024
4c6974f
proper warnings for invalid act plandos
CookieCat45 Jan 5, 2024
1548da9
Update worlds/ahit/docs/en_A Hat in Time.md
CookieCat45 Jan 16, 2024
2dd3a45
Update worlds/ahit/docs/setup_en.md
CookieCat45 Jan 16, 2024
a431e19
120 char per line
CookieCat45 Jan 16, 2024
0e590b0
"settings" to "options"
CookieCat45 Jan 16, 2024
237fd74
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Jan 16, 2024
59f45a2
Update DeathWishRules.py
CookieCat45 Jan 17, 2024
806ca07
Merge branch 'main' of https://github.com/CookieCat45/Archipelago-ahit
CookieCat45 Jan 17, 2024
5b8c139
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Jan 17, 2024
b38d1cd
Update worlds/ahit/docs/en_A Hat in Time.md
CookieCat45 Feb 13, 2024
e713d71
Merge branch 'main' into main
CookieCat45 Feb 13, 2024
9bec739
No more loading the data package
CookieCat45 Feb 19, 2024
5ef32e3
Merge branch 'main' of https://github.com/CookieCat45/Archipelago-ahit
CookieCat45 Feb 19, 2024
64dfb29
cleanup + act plando fixes
CookieCat45 Mar 20, 2024
4f6bf80
almost forgot
CookieCat45 Mar 21, 2024
de02f92
Update Rules.py
CookieCat45 Mar 21, 2024
877d317
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Mar 21, 2024
0db3dcb
a
CookieCat45 Mar 23, 2024
9f4e34c
Update worlds/ahit/Options.py
CookieCat45 Mar 25, 2024
d47d6c2
Options stuff
CookieCat45 Mar 25, 2024
bcb4195
Merge remote-tracking branch 'origin/main'
CookieCat45 Mar 25, 2024
bf87029
oop
CookieCat45 Mar 25, 2024
dbd2d8f
no unnecessary type hints
CookieCat45 Mar 25, 2024
8480d51
warn about depot download length in setup guide
CookieCat45 Mar 25, 2024
54557e7
Update worlds/ahit/Options.py
CookieCat45 Mar 25, 2024
5700b74
typo
CookieCat45 Mar 25, 2024
b00eb53
Update worlds/ahit/Rules.py
CookieCat45 Mar 25, 2024
2e14859
review stuff
CookieCat45 Mar 25, 2024
67e8f62
Merge remote-tracking branch 'origin/main'
CookieCat45 Mar 25, 2024
e53e75d
More stuff from review
CookieCat45 Mar 26, 2024
0b41527
comment
CookieCat45 Mar 26, 2024
44cf751
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 May 4, 2024
6318a1a
1.5 Update
CookieCat45 May 8, 2024
d572f22
link fix?
CookieCat45 May 8, 2024
634ee6a
link fix 2
CookieCat45 May 8, 2024
edead9a
Update setup_en.md
CookieCat45 May 8, 2024
6416a37
Update setup_en.md
CookieCat45 May 8, 2024
5580f70
Update setup_en.md
CookieCat45 May 8, 2024
ff9f33e
Evil
CookieCat45 May 10, 2024
455b60f
Good fucking lord
CookieCat45 May 10, 2024
3675e01
Review stuff again + Logic fixes
CookieCat45 May 12, 2024
380f576
More review stuff
CookieCat45 May 12, 2024
2a7564d
Even more review stuff - we're almost done
CookieCat45 May 12, 2024
b429021
DW review stuff
CookieCat45 May 12, 2024
f47b026
Finish up review stuff
CookieCat45 May 12, 2024
bc7e108
remove leftover stuff
CookieCat45 May 12, 2024
989dcab
a
CookieCat45 May 12, 2024
3799f49
assert item
CookieCat45 May 12, 2024
092cb11
add A Hat in Time to readme/codeowners files
CookieCat45 May 13, 2024
88a54a2
Merge branch 'main' into main
CookieCat45 May 13, 2024
8e8206e
Fix range options not being corrected properly
CookieCat45 May 13, 2024
f66c37d
120 chars per line in docs
CookieCat45 May 13, 2024
4257552
Update worlds/ahit/Regions.py
CookieCat45 May 13, 2024
2e56a04
Update worlds/ahit/DeathWishLocations.py
CookieCat45 May 13, 2024
1e6bec6
Remove some unnecessary option.class.value
CookieCat45 May 13, 2024
8e80b9c
Remove data_version and more option.class.value
CookieCat45 May 13, 2024
ecf6917
Update worlds/ahit/Items.py
CookieCat45 May 13, 2024
c20076f
Remove the rest of option.class.value
CookieCat45 May 13, 2024
61257b1
Update worlds/ahit/DeathWishLocations.py
CookieCat45 May 13, 2024
9a0964f
review stuff
CookieCat45 May 13, 2024
1450d33
Replace connect_regions with Region.connect
CookieCat45 May 13, 2024
e33c5cc
review stuff
CookieCat45 May 13, 2024
e7c2bea
Remove unnecessary Optional from LocData
CookieCat45 May 13, 2024
ba0c184
Remove HatType.NONE
CookieCat45 May 13, 2024
1244477
Update worlds/ahit/test/TestActs.py
CookieCat45 May 13, 2024
1f148cb
fix so default tests actually don't run
CookieCat45 May 13, 2024
f61ab04
Improve performance for death wish rules
CookieCat45 May 13, 2024
0e54140
rename test file
CookieCat45 May 13, 2024
850dfba
change test imports
CookieCat45 May 13, 2024
e061adf
1000 is probably unnecessary
CookieCat45 May 13, 2024
b45ab0f
Merge branch 'main' into main
CookieCat45 May 13, 2024
6331ab2
a
CookieCat45 May 13, 2024
64f742f
change state.count to state.has
CookieCat45 May 14, 2024
39b102e
stuff
CookieCat45 May 15, 2024
4027d2f
starting inventory hats fix
CookieCat45 May 15, 2024
1768246
shouldn't have done this lol
CookieCat45 May 15, 2024
530b65c
make ship shape task goal equal to number of tasksanity checks if set…
CookieCat45 May 16, 2024
6951766
a
CookieCat45 May 16, 2024
dead6eb
change act shuffle starting acts + logic updates
CookieCat45 May 17, 2024
0fcb1a6
dumb
CookieCat45 May 17, 2024
b299d96
Merge branch 'main' into main
CookieCat45 May 18, 2024
3b75bb0
option groups + lambda capture cringe + typo
CookieCat45 May 18, 2024
f4c7531
a
CookieCat45 May 18, 2024
a543a3a
b
CookieCat45 May 18, 2024
6f6bf41
missing option in groups
CookieCat45 May 18, 2024
85b9794
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 May 19, 2024
2c7ff4b
c
CookieCat45 May 19, 2024
acdc41e
Merge branch 'main' into main
Berserker66 May 20, 2024
445afb9
Fix Your Contract Has Expired being placed on first level when it sho…
CookieCat45 May 22, 2024
b3b2432
Merge remote-tracking branch 'origin/main'
CookieCat45 May 22, 2024
322f482
Merge remote-tracking branch 'origin/main'
CookieCat45 May 22, 2024
3263638
yche fix
CookieCat45 May 22, 2024
63411f6
formatting
CookieCat45 May 22, 2024
814eee2
major logic bug fix for death wish
CookieCat45 Jun 3, 2024
238022e
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Jun 3, 2024
af5d6ae
Update Regions.py
CookieCat45 Jun 12, 2024
ca44d92
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Jun 12, 2024
7689d56
Add missing indirect connections
CookieCat45 Jun 16, 2024
8e3845d
Merge branch 'ArchipelagoMW:main' into main
CookieCat45 Jul 7, 2024
39b6def
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
CookieCat45 Jul 8, 2024
0f4d441
Fix generation error from chapter 2 start with act shuffle off
CookieCat45 Jul 8, 2024
3a46b17
Merge branch 'main' of https://github.com/CookieCat45/Archipelago-ahit
CookieCat45 Jul 8, 2024
df58bbc
a
CookieCat45 Jul 8, 2024
a5665bc
Revert "a"
CookieCat45 Jul 8, 2024
7b1d9eb
Revert "Fix generation error from chapter 2 start with act shuffle off"
CookieCat45 Jul 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions worlds/ahit/Regions.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,9 @@
# See above comment
"Time Rift - Deep Sea": ["Alpine Free Roam", "Nyakuza Free Roam", "Contractual Obligations",
"Murder on the Owl Express"],

# was causing test failures
"Time Rift - Balcony": ["Alpine Free Roam"],
}


Expand Down
3 changes: 3 additions & 0 deletions worlds/ahit/Rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,8 @@ def set_rift_rules(world: "HatInTimeWorld", regions: Dict[str, Region]):
if world.is_dlc1():
for entrance in regions["Time Rift - Balcony"].entrances:
add_rule(entrance, lambda state: can_clear_required_act(state, world, "The Arctic Cruise - Finale"))
reg_act_connection(world, world.multiworld.get_entrance("The Arctic Cruise - Finale",
world.player).connected_region, entrance)

for entrance in regions["Time Rift - Deep Sea"].entrances:
add_rule(entrance, lambda state: has_relic_combo(state, world, "Cake"))
Expand Down Expand Up @@ -939,6 +941,7 @@ def set_default_rift_rules(world: "HatInTimeWorld"):
if world.is_dlc1():
for entrance in world.multiworld.get_region("Time Rift - Balcony", world.player).entrances:
add_rule(entrance, lambda state: can_clear_required_act(state, world, "The Arctic Cruise - Finale"))
reg_act_connection(world, "Rock the Boat", entrance.name)

for entrance in world.multiworld.get_region("Time Rift - Deep Sea", world.player).entrances:
add_rule(entrance, lambda state: has_relic_combo(state, world, "Cake"))
Expand Down
Loading