From 7fd7d5e492b1bcf8421db096ab81f540299218e5 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Thu, 18 Apr 2024 12:34:57 -0400
Subject: [PATCH] Noita: Add the new bosses to the check pool (#3170)

---
 worlds/noita/locations.py | 9 ++++++++-
 worlds/noita/options.py   | 2 +-
 worlds/noita/regions.py   | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/worlds/noita/locations.py b/worlds/noita/locations.py
index cf91ba44..01801b15 100644
--- a/worlds/noita/locations.py
+++ b/worlds/noita/locations.py
@@ -26,7 +26,7 @@ class LocationFlag(IntEnum):
 # Mapping of items in each region.
 # Only the first Hidden Chest and Pedestal are mapped here, the others are created in Regions.
 # ltype key: "chest" = Hidden Chests, "pedestal" = Pedestals, "boss" = Boss, "orb" = Orb.
-# 110000-110649
+# 110000-110671
 location_region_mapping: Dict[str, Dict[str, LocationData]] = {
     "Coal Pits Holy Mountain": {
         "Coal Pits Holy Mountain Shop Item 1":   LocationData(110000),
@@ -90,6 +90,9 @@ location_region_mapping: Dict[str, Dict[str, LocationData]] = {
         "Secret Shop Item 3": LocationData(110044),
         "Secret Shop Item 4": LocationData(110045),
     },
+    "The Sky": {
+        "Kivi": LocationData(110670, LocationFlag.main_world, "boss"),
+    },
     "Floating Island": {
         "Floating Island Orb": LocationData(110658, LocationFlag.main_path, "orb"),
     },
@@ -104,6 +107,7 @@ location_region_mapping: Dict[str, Dict[str, LocationData]] = {
     },
     "Lake": {
         "Syväolento": LocationData(110651, LocationFlag.main_world, "boss"),
+        "Tapion vasalli": LocationData(110669, LocationFlag.main_world, "boss"),
     },
     "Frozen Vault": {
         "Frozen Vault Orb":      LocationData(110660, LocationFlag.main_world, "orb"),
@@ -189,6 +193,9 @@ location_region_mapping: Dict[str, Dict[str, LocationData]] = {
     "Deep Underground": {
         "Limatoukka": LocationData(110647, LocationFlag.main_world, "boss"),
     },
+    "West Meat Realm": {
+        "Kolmisilmän sydän": LocationData(110671, LocationFlag.main_world, "boss"),
+    },
     "The Laboratory": {
         "Kolmisilmä": LocationData(110646, LocationFlag.main_path, "boss"),
     },
diff --git a/worlds/noita/options.py b/worlds/noita/options.py
index 2c99e9dd..3600c0ca 100644
--- a/worlds/noita/options.py
+++ b/worlds/noita/options.py
@@ -53,7 +53,7 @@ class BossesAsChecks(Choice):
     """Makes bosses count as location checks. The boss only needs to die, you do not need the kill credit.
     The Main Path option includes Gate Guardian, Suomuhauki, and Kolmisilmä.
     The Side Path option includes the Main Path bosses, Sauvojen Tuntija, and Ylialkemisti.
-    The All Bosses option includes all 12 bosses."""
+    The All Bosses option includes all 15 bosses."""
     display_name = "Bosses as Location Checks"
     option_no_bosses = 0
     option_main_path = 1
diff --git a/worlds/noita/regions.py b/worlds/noita/regions.py
index 3b7fd396..8ea8a41e 100644
--- a/worlds/noita/regions.py
+++ b/worlds/noita/regions.py
@@ -72,7 +72,7 @@ def create_all_regions_and_connections(world: "NoitaWorld") -> None:
 # - Snow Chasm is disconnected from the Snowy Wasteland
 # - Pyramid is connected to the Hiisi Base instead of the Desert due to similar difficulty
 # - Frozen Vault is connected to the Vault instead of the Snowy Wasteland due to similar difficulty
-# - Lake is connected to The Laboratory, since the boss is hard without specific set-ups (which means late game)
+# - Lake is connected to The Laboratory, since the bosses are hard without specific set-ups (which means late game)
 # - Snowy Depths connects to Lava Lake orb since you need digging for it, so fairly early is acceptable
 # - Ancient Laboratory is connected to the Coal Pits, so that Ylialkemisti isn't sphere 1
 noita_connections: Dict[str, List[str]] = {
@@ -99,7 +99,7 @@ noita_connections: Dict[str, List[str]] = {
 
     ###
     "Underground Jungle Holy Mountain": ["Underground Jungle"],
-    "Underground Jungle": ["Dragoncave", "Overgrown Cavern", "Vault Holy Mountain", "Lukki Lair", "Snow Chasm"],
+    "Underground Jungle": ["Dragoncave", "Overgrown Cavern", "Vault Holy Mountain", "Lukki Lair", "Snow Chasm", "West Meat Realm"],
 
     ###
     "Vault Holy Mountain": ["The Vault"],
@@ -113,7 +113,7 @@ noita_connections: Dict[str, List[str]] = {
 
     ###
     "Laboratory Holy Mountain": ["The Laboratory"],
-    "The Laboratory": ["The Work", "Friend Cave", "The Work (Hell)", "Lake"],
+    "The Laboratory": ["The Work", "Friend Cave", "The Work (Hell)", "Lake", "The Sky"],
     ###
 }