Skip to content

Commit 9fb596f

Browse files
ScipioWrightqwint
authored andcommitted
Noita: Add the new bosses to the check pool (ArchipelagoMW#3170)
1 parent 25a1ca6 commit 9fb596f

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

worlds/noita/locations.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class LocationFlag(IntEnum):
2626
# Mapping of items in each region.
2727
# Only the first Hidden Chest and Pedestal are mapped here, the others are created in Regions.
2828
# ltype key: "chest" = Hidden Chests, "pedestal" = Pedestals, "boss" = Boss, "orb" = Orb.
29-
# 110000-110649
29+
# 110000-110671
3030
location_region_mapping: Dict[str, Dict[str, LocationData]] = {
3131
"Coal Pits Holy Mountain": {
3232
"Coal Pits Holy Mountain Shop Item 1": LocationData(110000),
@@ -90,6 +90,9 @@ class LocationFlag(IntEnum):
9090
"Secret Shop Item 3": LocationData(110044),
9191
"Secret Shop Item 4": LocationData(110045),
9292
},
93+
"The Sky": {
94+
"Kivi": LocationData(110670, LocationFlag.main_world, "boss"),
95+
},
9396
"Floating Island": {
9497
"Floating Island Orb": LocationData(110658, LocationFlag.main_path, "orb"),
9598
},
@@ -104,6 +107,7 @@ class LocationFlag(IntEnum):
104107
},
105108
"Lake": {
106109
"Syväolento": LocationData(110651, LocationFlag.main_world, "boss"),
110+
"Tapion vasalli": LocationData(110669, LocationFlag.main_world, "boss"),
107111
},
108112
"Frozen Vault": {
109113
"Frozen Vault Orb": LocationData(110660, LocationFlag.main_world, "orb"),
@@ -189,6 +193,9 @@ class LocationFlag(IntEnum):
189193
"Deep Underground": {
190194
"Limatoukka": LocationData(110647, LocationFlag.main_world, "boss"),
191195
},
196+
"West Meat Realm": {
197+
"Kolmisilmän sydän": LocationData(110671, LocationFlag.main_world, "boss"),
198+
},
192199
"The Laboratory": {
193200
"Kolmisilmä": LocationData(110646, LocationFlag.main_path, "boss"),
194201
},

worlds/noita/options.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class BossesAsChecks(Choice):
5353
"""Makes bosses count as location checks. The boss only needs to die, you do not need the kill credit.
5454
The Main Path option includes Gate Guardian, Suomuhauki, and Kolmisilmä.
5555
The Side Path option includes the Main Path bosses, Sauvojen Tuntija, and Ylialkemisti.
56-
The All Bosses option includes all 12 bosses."""
56+
The All Bosses option includes all 15 bosses."""
5757
display_name = "Bosses as Location Checks"
5858
option_no_bosses = 0
5959
option_main_path = 1

worlds/noita/regions.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def create_all_regions_and_connections(world: "NoitaWorld") -> None:
7272
# - Snow Chasm is disconnected from the Snowy Wasteland
7373
# - Pyramid is connected to the Hiisi Base instead of the Desert due to similar difficulty
7474
# - Frozen Vault is connected to the Vault instead of the Snowy Wasteland due to similar difficulty
75-
# - Lake is connected to The Laboratory, since the boss is hard without specific set-ups (which means late game)
75+
# - Lake is connected to The Laboratory, since the bosses are hard without specific set-ups (which means late game)
7676
# - Snowy Depths connects to Lava Lake orb since you need digging for it, so fairly early is acceptable
7777
# - Ancient Laboratory is connected to the Coal Pits, so that Ylialkemisti isn't sphere 1
7878
noita_connections: Dict[str, List[str]] = {
@@ -99,7 +99,7 @@ def create_all_regions_and_connections(world: "NoitaWorld") -> None:
9999

100100
###
101101
"Underground Jungle Holy Mountain": ["Underground Jungle"],
102-
"Underground Jungle": ["Dragoncave", "Overgrown Cavern", "Vault Holy Mountain", "Lukki Lair", "Snow Chasm"],
102+
"Underground Jungle": ["Dragoncave", "Overgrown Cavern", "Vault Holy Mountain", "Lukki Lair", "Snow Chasm", "West Meat Realm"],
103103

104104
###
105105
"Vault Holy Mountain": ["The Vault"],
@@ -113,7 +113,7 @@ def create_all_regions_and_connections(world: "NoitaWorld") -> None:
113113

114114
###
115115
"Laboratory Holy Mountain": ["The Laboratory"],
116-
"The Laboratory": ["The Work", "Friend Cave", "The Work (Hell)", "Lake"],
116+
"The Laboratory": ["The Work", "Friend Cave", "The Work (Hell)", "Lake", "The Sky"],
117117
###
118118
}
119119

0 commit comments

Comments
 (0)