From 1bebd14d8694ccf7219133011a81b4ac3a0c4309 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Sat, 2 Aug 2025 19:14:40 +0200
Subject: [PATCH 01/23] Add cccharles world to AP

> The logic has been tested, the game can be completed
> The logic is simple and it does not take into account options
! The documentations are a work in progress
---
 .run/Archipelago Unittests.run.xml            |   8 +-
 docs/CODEOWNERS                               |   3 +
 worlds/cccharles/BaseID.py                    |   2 +
 worlds/cccharles/Items.py                     | 167 ++++
 worlds/cccharles/Locations.py                 | 898 ++++++++++++++++++
 worlds/cccharles/Options.py                   | 172 ++++
 worlds/cccharles/Regions.py                   | 263 +++++
 worlds/cccharles/Rules.py                     | 324 +++++++
 worlds/cccharles/__init__.py                  | 158 +++
 worlds/cccharles/docs/en_Choo-Choo Charles.md |  26 +
 worlds/cccharles/docs/en_setup_guide.md       |  27 +
 worlds/cccharles/docs/fr_Choo-Choo Charles.md |  26 +
 worlds/cccharles/docs/fr_setup_guide.md       |  27 +
 worlds/cccharles/test/__init__.py             |   5 +
 worlds/cccharles/test/bases.py                | 345 +++++++
 worlds/cccharles/test/test_access.py          |  10 +
 16 files changed, 2458 insertions(+), 3 deletions(-)
 create mode 100644 worlds/cccharles/BaseID.py
 create mode 100644 worlds/cccharles/Items.py
 create mode 100644 worlds/cccharles/Locations.py
 create mode 100644 worlds/cccharles/Options.py
 create mode 100644 worlds/cccharles/Regions.py
 create mode 100644 worlds/cccharles/Rules.py
 create mode 100644 worlds/cccharles/__init__.py
 create mode 100644 worlds/cccharles/docs/en_Choo-Choo Charles.md
 create mode 100644 worlds/cccharles/docs/en_setup_guide.md
 create mode 100644 worlds/cccharles/docs/fr_Choo-Choo Charles.md
 create mode 100644 worlds/cccharles/docs/fr_setup_guide.md
 create mode 100644 worlds/cccharles/test/__init__.py
 create mode 100644 worlds/cccharles/test/bases.py
 create mode 100644 worlds/cccharles/test/test_access.py

diff --git a/.run/Archipelago Unittests.run.xml b/.run/Archipelago Unittests.run.xml
index 24fea0f73fec..c45075715c5a 100644
--- a/.run/Archipelago Unittests.run.xml	
+++ b/.run/Archipelago Unittests.run.xml	
@@ -1,11 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Archipelago Unittests" type="tests" factoryName="Unittests">
-    <module name="Archipelago" />
+    <module name="Archipelago-CCCharles" />
+    <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
-    <option name="SDK_HOME" value="" />
+    <option name="SDK_HOME" value="$PROJECT_DIR$/venv/Scripts/python.exe" />
+    <option name="SDK_NAME" value="Python 3.11 (Archipelago-CCCharles)" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
+    <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index 85b31683aa3a..4ccb164e6e89 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -45,6 +45,9 @@
 # ChecksFinder
 /worlds/checksfinder/ @SunCatMC
 
+# Choo-Choo Charles
+/worlds/cccharles/ @Yaranorgoth
+
 # Civilization VI
 /worlds/civ6/ @hesto2
 
diff --git a/worlds/cccharles/BaseID.py b/worlds/cccharles/BaseID.py
new file mode 100644
index 000000000000..d8b609e5308f
--- /dev/null
+++ b/worlds/cccharles/BaseID.py
@@ -0,0 +1,2 @@
+# CCCharles base ID
+base_id = 6660000000
diff --git a/worlds/cccharles/Items.py b/worlds/cccharles/Items.py
new file mode 100644
index 000000000000..2e1edbdc23d4
--- /dev/null
+++ b/worlds/cccharles/Items.py
@@ -0,0 +1,167 @@
+from BaseClasses import Item
+from .BaseID import base_id
+
+
+class CCCharlesItem(Item):
+    game = "Choo-Choo Charles"
+
+
+optional_items = {
+    "Scraps" : base_id + 1,
+    "30 Scraps Reward" : base_id + 2,
+    "25 Scraps Reward" : base_id + 3,
+    "35 Scraps Reward" : base_id + 4,
+    "40 Scraps Reward" : base_id + 5,
+    "South Mine Key" : base_id + 6,
+    "North Mine Key" : base_id + 7,
+    "Mountain Ruin Key" : base_id + 8,
+    "Barn Key" : base_id + 9,
+    "Candice's Key" : base_id + 10,
+    "Dead Fish" : base_id + 11,
+    "Lockpicks" : base_id + 12,
+    "Ancient Tablet" : base_id + 13,
+    "Blue Box" : base_id + 14,
+    "Page Drawing" : base_id + 15,
+    "Journal" : base_id + 16,
+    "Timed Dynamite" : base_id + 17,
+    "Box of Rocket" : base_id + 18,
+    "Breaker" : base_id + 19,
+    "Broken Bob" : base_id + 20,
+    "Employment Contracts" : base_id + 21,
+    "Mob Camp Key" : base_id + 22,
+    "Jar of Pickles" : base_id + 23
+}
+
+useless_items = {
+    "Orange Paint Can" : base_id + 24,
+    "Green Paint Can" : base_id + 25,
+    "White Paint Can" : base_id + 26,
+    "Pink Paint Can" : base_id + 27,
+    "Gray Paint Can" : base_id + 28,
+    "Blue Paint Can" : base_id + 29,
+    "Black Paint Can" : base_id + 30,
+    "Lime Paint Can" : base_id + 31,
+    "Teal Paint Can" : base_id + 32,
+    "Red Paint Can" : base_id + 33,
+    "Purple Paint Can" : base_id + 34,
+    "The Boomer" : base_id + 35,
+    "Bob" : base_id + 36
+}
+
+progression_items = {
+    "Green Egg" : base_id + 37,
+    "Blue Egg" : base_id + 38,
+    "Red Egg" : base_id + 39,
+    "Remote Explosive" : base_id + 40,
+    "Remote Explosive x8" : base_id + 41, # Originally, Paul gives 8 explosives at once
+    "Temple Key" : base_id + 42,
+    "Bug Spray" : base_id + 43 # Should only be considered progressive in Nightmare Mode
+}
+
+item_groups = {
+        "Weapons": {
+            "Bug Spray",
+            "The Boomer",
+            "Bob"
+        },
+        "Paint Can": {
+            "Orange Paint Can",
+            "Green Paint Can",
+            "White Paint Can",
+            "Pink Paint Can",
+            "Gray Paint Can",
+            "Blue Paint Can",
+            "Black Paint Can",
+            "Lime Paint Can",
+            "Teal Paint Can",
+            "Red Paint Can",
+            "Purple Paint Can"
+        },
+        "Train Upgrade": {
+            "Scraps",
+            "30 Scraps Reward",
+            "25 Scraps Reward",
+            "40 Scraps Reward"
+        },
+        "Dungeon Keys": {
+            "South Mine Key",
+            "North Mine Key",
+            "Mountain Ruin Key"
+        },
+        "Building Keys": {
+            "Barn Key",
+            "Candice's Key",
+            "Mob Camp Key",
+            "Temple Key"
+        },
+        "Mission Items": {
+            "Dead Fish",
+            "Lockpicks",
+            "Ancient Tablet",
+            "Blue Box",
+            "Page Drawing",
+            "Journal",
+            "Timed Dynamite",
+            "Box of Rocket",
+            "Breaker",
+            "Broken Bob",
+            "Employment Contracts",
+            "Jar of Pickles",
+            "Remote Explosive",
+            "Remote Explosive x8"
+        },
+        "Eggs": {
+            "Green Egg",
+            "Blue Egg",
+            "Red Egg"
+        }
+    }
+
+
+# All items excepted the duplications (no item amount)
+unique_item_dict = {**optional_items, **useless_items, **progression_items}
+
+# All 691 items to add to the item pool
+full_item_list = []
+full_item_list += ["Scraps"] * 637 # 636 + 1 as Scrap Reward (from Ronny)
+full_item_list += ["30 Scraps Reward"] * 3
+full_item_list += ["25 Scraps Reward"] * 1
+full_item_list += ["35 Scraps Reward"] * 2
+full_item_list += ["40 Scraps Reward"] * 1
+full_item_list += ["South Mine Key"] * 1
+full_item_list += ["North Mine Key"] * 1
+full_item_list += ["Mountain Ruin Key"] * 1
+full_item_list += ["Barn Key"] * 1
+full_item_list += ["Candice's Key"] * 1
+full_item_list += ["Dead Fish"] * 1
+full_item_list += ["Lockpicks"] * 1
+full_item_list += ["Ancient Tablet"] * 1
+full_item_list += ["Blue Box"] * 1
+full_item_list += ["Page Drawing"] * 8
+full_item_list += ["Journal"] * 1
+full_item_list += ["Timed Dynamite"] * 1
+full_item_list += ["Box of Rocket"] * 1
+full_item_list += ["Breaker"] * 4
+full_item_list += ["Broken Bob"] * 1
+full_item_list += ["Employment Contracts"] * 1
+full_item_list += ["Mob Camp Key"] * 1
+full_item_list += ["Jar of Pickles"] * 1
+full_item_list += ["Orange Paint Can"] * 1
+full_item_list += ["Green Paint Can"] * 1
+full_item_list += ["White Paint Can"] * 1
+full_item_list += ["Pink Paint Can"] * 1
+full_item_list += ["Gray Paint Can"] * 1
+full_item_list += ["Blue Paint Can"] * 1
+full_item_list += ["Black Paint Can"] * 1
+full_item_list += ["Lime Paint Can"] * 1
+full_item_list += ["Teal Paint Can"] * 1
+full_item_list += ["Red Paint Can"] * 1
+full_item_list += ["Purple Paint Can"] * 1
+full_item_list += ["The Boomer"] * 1
+full_item_list += ["Bob"] * 1
+full_item_list += ["Green Egg"] * 1
+full_item_list += ["Blue Egg"] * 1
+full_item_list += ["Red Egg"] * 1
+full_item_list += ["Remote Explosive x8"] * 1
+full_item_list += ["Temple Key"] * 1
+full_item_list += ["Bug Spray"] * 1
diff --git a/worlds/cccharles/Locations.py b/worlds/cccharles/Locations.py
new file mode 100644
index 000000000000..1f2007f45ef5
--- /dev/null
+++ b/worlds/cccharles/Locations.py
@@ -0,0 +1,898 @@
+from BaseClasses import Location
+from .BaseID import base_id
+
+
+class CCCharlesLocation(Location):
+    game: str = "Choo-Choo Charles"
+
+# "First Station" :
+# /!\ NOT CONSIDERED YET : train_keypickup Train_KeyPickup Photorealistic_Island (X=-8816.341 Y=23392.416 Z=10219.855)
+
+loc_start_camp = {
+    "start_camp_scraps_1" : base_id + 1000, # ItemPickup139_5 Camp (X=24006.348 Y=53777.297 Z=10860.107)
+    "start_camp_scraps_2" : base_id + 1001 # ItemPickup140_8 Camp (X=23951.754 Y=54897.230 Z=10895.235)
+}
+
+loc_tony_tiddle_mission = {
+    "barn_tony_tiddle_mission_start" : base_id + 1002, # (dialog 5) -> barn_key (1)
+    "barn_scraps_1" : base_id + 1003, # ItemPickup12 Photorealistic_Island (X=70582.805 Y=52591.066 Z=11976.719)
+    "barn_scraps_2" : base_id + 1004, # ItemPickup4_2 Photorealistic_Island (X=70536.641 Y=51890.633 Z=11986.488)
+    "barn_scraps_3" : base_id + 1005, # ItemPickup6 Photorealistic_Island (X=70750.336 Y=52275.828 Z=11994.434)
+    "barn_scraps_4" : base_id + 1006, # ItemPickup11 Photorealistic_Island (X=70937.719 Y=52989.066 Z=12003.523)
+    "barn_scraps_5" : base_id + 1007, # ItemPickup5 Photorealistic_Island (X=71303.508 Y=52232.188 Z=12003.997)
+    "barn_scraps_6" : base_id + 1008, # ItemPickup7 Photorealistic_Island (X=71678.672 Y=52825.531 Z=11977.212)
+    "barn_scraps_7" : base_id + 1009, # ItemPickup8 Photorealistic_Island (X=71506.961 Y=52357.293 Z=12362.159)
+    "barn_scraps_8" : base_id + 1010, # ItemPickup9 Photorealistic_Island (X=71029.875 Y=52384.613 Z=12362.159)
+    "barn_scraps_9" : base_id + 1011 # ItemPickup10 Photorealistic_Island (X=71129.594 Y=52600.262 Z=12364.142)
+}
+
+loc_tutorial_candice_mission = {
+    "tutorial_candice_mission_start" : base_id + 1012, # (dialog 3) -> candice_key (2)
+    "tutorial_scraps_1" : base_id + 1013, # ItemPickup17_2 Photorealistic_Island (X=74745.852 Y=73865.555 Z=11426.619)
+    "tutorial_scraps_2" : base_id + 1014, # ItemPickup18_2 Photorealistic_Island (X=74864.102 Y=73900.094 Z=11426.619)
+    "tutorial_scraps_3" : base_id + 1015, # ItemPickup14_2 Photorealistic_Island (X=74877.625 Y=73738.594 Z=11422.057) \!/ Existing match 4
+    "tutorial_scraps_4" : base_id + 1016, # ItemPickup15_8 Photorealistic_Island (X=75068.992 Y=73971.133 Z=11426.619)
+    "tutorial_scraps_5" : base_id + 1017, # ItemPickup21_1 Photorealistic_Island (X=74923.500 Y=73571.648 Z=11426.619)
+    "tutorial_scraps_6" : base_id + 1018, # ItemPickup19 Photorealistic_Island (X=75194.906 Y=73495.719 Z=11426.619)
+    "tutorial_scraps_7" : base_id + 1019, # ItemPickup13_3 Photorealistic_Island (X=75320.102 Y=73446.352 Z=11487.376)
+    "tutorial_scraps_8" : base_id + 1020, # ItemPickup20 Photorealistic_Island (X=75298.680 Y=73580.531 Z=11426.619)
+    "tutorial_scraps_9" : base_id + 1021 # ItemPickup16_3 Photorealistic_Island (X=75310.008 Y=73770.742 Z=11489.709)
+}
+
+loc_swamp = {
+    "swamp_scraps_1" : base_id + 1022, # ItemPickup465_67 Swamp_EnvironmentDetails (X=81964.398 Y=72167.305 Z=10116.385)
+    "swamp_scraps_2" : base_id + 1023, # ItemPickup460_52 Swamp_EnvironmentDetails (X=89674.047 Y=71610.008 Z=9482.095)
+    "swamp_scraps_3" : base_id + 1024, # ItemPickup459_49 Swamp_EnvironmentDetails (X=91637.156 Y=73345.672 Z=9492.019)
+    "swamp_scraps_4" : base_id + 1025, # ItemPickup458_46 Swamp_EnvironmentDetails (X=94601.117 Y=75064.117 Z=9567.464)
+    "swamp_scraps_5" : base_id + 1026, # ItemPickup457_43 Swamp_EnvironmentDetails (X=95536.641 Y=72622.969 Z=9512.531)
+    "swamp_scraps_6" : base_id + 1027, # ItemPickup456_40 Swamp_EnvironmentDetails (X=96419.922 Y=65508.676 Z=9838.949)
+    "swamp_scraps_7" : base_id + 1028, # ItemPickup455_37 Swamp_EnvironmentDetails (X=98158.680 Y=63191.629 Z=10477.084)
+    "swamp_scraps_8" : base_id + 1029, # ItemPickup55_29 Swamp_EnvironmentDetails (X=93421.820 Y=59200.461 Z=9545.312)
+    "swamp_scraps_9" : base_id + 1030, # ItemPickup453_31 Swamp_EnvironmentDetails(X=92951.648 Y=56453.527 Z=9560.638)
+    "swamp_scraps_10" : base_id + 1031, # ItemPickup454_34 Swamp_EnvironmentDetails (X=96943.297 Y=58754.043 Z=10728.124)
+    "swamp_scraps_11" : base_id + 1032, # ItemPickup452_28 Swamp_EnvironmentDetails (X=95000.617 Y=53070.859 Z=10258.078)
+    "swamp_scraps_12" : base_id + 1033, # ItemPickup451_25 Swamp_EnvironmentDetails (X=91390.703 Y=53628.707 Z=9498.378)
+    "swamp_scraps_13" : base_id + 1034, # ItemPickup53_23 Swamp_EnvironmentDetails (X=87628.742 Y=51614.957 Z=9487.013)
+    "swamp_scraps_14" : base_id + 1035, # ItemPickup448_16 Swamp_EnvironmentDetails (X=89785.992 Y=48603.844 Z=9573.859)
+    "swamp_scraps_15" : base_id + 1036, # ItemPickup447_11 Swamp_EnvironmentDetails (X=89925.383 Y=46288.707 Z=9499.904)
+    "swamp_scraps_16" : base_id + 1037, # ItemPickup446_8 Swamp_EnvironmentDetails (X=90848.938 Y=43133.535 Z=9729.535)
+    "swamp_scraps_17" : base_id + 1038, # ItemPickup445_5 Swamp_EnvironmentDetails (X=87382.383 Y=42475.191 Z=9509.929)
+    "swamp_scraps_18" : base_id + 1039, # ItemPickup444_2 Swamp_EnvironmentDetails (X=87481.820 Y=39316.820 Z=9757.511)
+    "swamp_scraps_19" : base_id + 1040, # ItemPickup54_26 Swamp_EnvironmentDetails (X=86039.180 Y=37135.004 Z=9826.263)
+    "swamp_scraps_20" : base_id + 1041, # ItemPickup475_97 Swamp_EnvironmentDetails (X=81798.609 Y=36766.922 Z=9479.318)
+    "swamp_scraps_21" : base_id + 1042, # ItemPickup474_94 Swamp_EnvironmentDetails (X=79254.055 Y=40120.293 Z=9879.539)
+    "swamp_scraps_22" : base_id + 1043, # ItemPickup473_91 Swamp_EnvironmentDetails (X=82251.773 Y=42454.027 Z=9482.057)
+    "swamp_scraps_23" : base_id + 1044, # ItemPickup472_88 Swamp_EnvironmentDetails (X=84903.977 Y=48323.543 Z=9503.382)
+    "swamp_scraps_24" : base_id + 1045, # ItemPickup471_85 Swamp_EnvironmentDetails (X=84238.609 Y=51239.547 Z=9529.745)
+    "swamp_scraps_25" : base_id + 1046, # ItemPickup470_82 Swamp_EnvironmentDetails (X=84439.063 Y=53501.563 Z=9491.291)
+    "swamp_scraps_26" : base_id + 1047, # ItemPickup52_20 Swamp_EnvironmentDetails (X=83025.086 Y=53275.348 Z=9694.177)
+    "swamp_scraps_27" : base_id + 1048, # ItemPickup469_79 Swamp_EnvironmentDetails (X=79827.055 Y=54791.504 Z=10121.452)
+    "swamp_scraps_28" : base_id + 1049, # ItemPickup468_76 Swamp_EnvironmentDetails (X=82266.461 Y=58126.316 Z=9660.493)
+    "swamp_scraps_29" : base_id + 1050, # ItemPickup467_73 Swamp_EnvironmentDetails (X=75911.297 Y=65155.836 Z=10660.832)
+    "swamp_scraps_30" : base_id + 1051, # ItemPickup466_70 Swamp_EnvironmentDetails (X=81171.641 Y=66836.125 Z=9673.756)
+    "swamp_scraps_31" : base_id + 1052, # ItemPickup449_19 Swamp_EnvironmentDetails (X=95254.992 Y=40910.563 Z=10503.727)
+    "swamp_scraps_32" : base_id + 1053 # ItemPickup450_22 Swamp_EnvironmentDetails (X=93992.992 Y=50773.484 Z=10238.064)
+}
+
+loc_lizbeth_murkwater_mission = {
+    "swamp_shack_scraps_1" : base_id + 1054, # ItemPickup51_17 Swamp_EnvironmentDetails (X=87685.797 Y=69754.008 Z=9629.617)
+    "swamp_shack_scraps_2" : base_id + 1055, # ItemPickup461_55 Swamp_EnvironmentDetails (X=87308.883 Y=69096.789 Z=9624.543)
+    "swamp_isle_scraps_1" : base_id + 1056, # ItemPickup462_58 Swamp_EnvironmentDetails (X=88101.219 Y=64553.148 Z=9557.692)
+    "swamp_isle_scraps_2" : base_id + 1057, # ItemPickup463_61 Swamp_EnvironmentDetails (X=87100.922 Y=63590.965 Z=9582.900)
+    "swamp_isle_scraps_3" : base_id + 1058, # ItemPickup464_64 Swamp_EnvironmentDetails (X=86399.656 Y=64290.805 Z=9493.576)
+    "swamp_isle_dead_fish" : base_id + 1059, # Swamp_FishPickup Swamp_EnvironmentDetails (X=87288.945 Y=64278.273 Z=9550.320)
+    "swamp_lizbeth_murkwater_mission_end" : base_id + 1060 # (dialog 2) -> 30_scraps_reward
+}
+
+loc_daryl_mission = {
+    "junkyard_daryl_scraps_1" : base_id + 1061, # ItemPickup185_29 Junkyard_Details1 (X=94184.391 Y=89760.258 Z=9331.188)
+    "junkyard_daryl_scraps_2" : base_id + 1062, # ItemPickup177_5 Junkyard_Details1 (X=91919.469 Y=89681.602 Z=9407.639)
+    "junkyard_daryl_scraps_3" : base_id + 1063, # ItemPickup46_5 Junkyard_Details (X=91696.078 Y=90453.563 Z=9480.997)
+    "junkyard_daryl_scraps_4" : base_id + 1064, # ItemPickup178_8 Junkyard_Details1 (X=92453.719 Y=91142.531 Z=9398.951)
+    "junkyard_daryl_scraps_5" : base_id + 1065, # ItemPickup182_20 Junkyard_Details1 (X=88645.453 Y=90374.930 Z=9507.291)
+    "junkyard_daryl_scraps_6" : base_id + 1066, # ItemPickup48_11 Junkyard_Details (X=88461.953 Y=92077.531 Z=9712.173)
+    "junkyard_daryl_scraps_7" : base_id + 1067, # ItemPickup49_14 Junkyard_Details (X=91521.555 Y=93773.641 Z=9421.457)
+    "junkyard_daryl_scraps_8" : base_id + 1068, # ItemPickup50_17 Junkyard_Details (X=94741.484 Y=92565.938 Z=9221.093)
+    "junkyard_daryl_scraps_9" : base_id + 1069, # ItemPickup186_32 Junkyard_Details1 (X=95256.008 Y=91356.789 Z=9251.082)
+    "junkyard_daryl_scraps_10" : base_id + 1070, # ItemPickup45_2 Junkyard_Details (X=94289.664 Y=89951.477 Z=9367.076)
+    "junkyard_daryl_mission_start" : base_id + 1071, # (dialog 4) -> Lockpicks (4)
+    "junkyard_daryl_ancient_tablet" : base_id + 1072, # Junkyard_TabletPickup Junkyard_Details (X=90715.367 Y=92168.563 Z=9402.729)
+    "junkyard_daryl_mission_end" : base_id + 1073 # (dialog 3) -> 25_scraps_reward
+}
+
+loc_south_house = {
+    "south_house_scraps_1" : base_id + 1074, # ItemPickup361_26 Secret12_ExteriorDetails (X=85865.969 Y=103869.656 Z=9453.063)
+    "south_house_scraps_2" : base_id + 1075, # ItemPickup360_23 Secret12_ExteriorDetails (X=84403.742 Y=107229.039 Z=9067.245)
+    "south_house_scraps_3" : base_id + 1076, # ItemPickup359_20 Secret12_ExteriorDetails (X=83389.789 Y=108817.992 Z=8752.255)
+    "south_house_scraps_4" : base_id + 1077, # ItemPickup353_2 Secret12_ExteriorDetails (X=82413.547 Y=109697.477 Z=8637.677)
+    "south_house_scraps_5" : base_id + 1078, # ItemPickup354_5 Secret12_ExteriorDetails (X=83000.359 Y=110323.664 Z=8560.229)
+    "south_house_scraps_6" : base_id + 1079, # ItemPickup358_17 Secret12_ExteriorDetails (X=82072.625 Y=110482.664 Z=8682.441)
+    "south_house_scraps_7" : base_id + 1080, # ItemPickup24_30 Secret12_Details (X=81970.766 Y=111082.117 Z=8647.703)
+    "south_house_scraps_8" : base_id + 1081, # ItemPickup356_11 Secret12_ExteriorDetails (X=80915.375 Y=108689.758 Z=8377.754)
+    "south_house_scraps_9" : base_id + 1082, # ItemPickup355_8 Secret12_ExteriorDetails (X=81762.180 Y=111371.023 Z=7876.312)
+    "south_house_scraps_10" : base_id + 1083, # ItemPickup357_14 Secret12_ExteriorDetails (X=80663.336 Y=113306.695 Z=7226.475)
+    "south_house_scraps_11" : base_id + 1084, # ItemPickup23_21 Secret12_Details (X=80520.367 Y=113747.039 Z=7252.808)
+    "south_house_scraps_12" : base_id + 1085, # ItemPickup22_18 Secret12_Details (X=80830.273 Y=113871.383 Z=7201.687)
+    "south_house_chest_scraps_1" : base_id + 1086, # ItemPickup21 Secret12_Details (X=82079.922 Y=110808.602 Z=8739.324)
+    "south_house_chest_scraps_2" : base_id + 1087, # ItemPickup18 Secret12_Details (X=82102.664 Y=110813.664 Z=8726.308)
+    "south_house_chest_scraps_3" : base_id + 1088, # ItemPickup17 Secret12_Details (X=82091.547 Y=110810.906 Z=8721.354) \!/ Existing match 1
+    "south_house_chest_scraps_4" : base_id + 1089, # ItemPickup16 Secret12_Details (X=82102.664 Y=110813.664 Z=8708.337) KO
+    "south_house_chest_scraps_5" : base_id + 1090, # ItemPickup14 Secret12_Details (X=82091.516 Y=110810.898 Z=8701.793) \!/ Existing match 3
+    "south_house_chest_scraps_6" : base_id + 1091 # ItemPickup13_7 Secret12_Details (X=82102.664 Y=110813.625 Z=8688.776)
+}
+
+loc_helen_mission = {
+    "junkyard_helen_mission_start" : base_id + 1092, # (dialog 8) -> south_mine_key (6)
+    "junkyard_helen_scraps_1" : base_id + 1093, # ItemPickup424_23 Settlement_A_House_1 (X=98303.992 Y=84476.016 Z=9376.540)
+    "junkyard_helen_scraps_2" : base_id + 1094, # ItemPickup419_8 Settlement_A_House_1 (X=98174.680 Y=84067.383 Z=9249.197)
+    "junkyard_helen_scraps_3" : base_id + 1095, # ItemPickup418_5 Settlement_A_House_1 (X=97948.977 Y=83354.656 Z=9339.430)
+    "junkyard_helen_scraps_4" : base_id + 1096, # ItemPickup417_2 Settlement_A_House_1 (X=98208.391 Y=83088.047 Z=9273.632)
+    "junkyard_helen_scraps_5" : base_id + 1097, # ItemPickup420_11 Settlement_A_House_1 (X=97757.773 Y=82995.656 Z=9298.597)
+    "junkyard_helen_scraps_6" : base_id + 1098, # ItemPickup422_17 Settlement_A_House_1 (X=98776.102 Y=80881.133 Z=9286.782)
+    "junkyard_helen_scraps_7" : base_id + 1099, # ItemPickup421_14 Settlement_A_House_1 (X=99198.508 Y=82057.820 Z=9248.227)
+    "junkyard_helen_scraps_8" : base_id + 1100 # ItemPickup423_20 Settlement_A_House_1 (X=99208.617 Y=84383.125 Z=9257.880)
+}
+
+loc_sgt_flint_mission = {
+    "base_sgt_flint_mission_end" : base_id + 1101, # (dialog 2) -> bug_spray
+    "base_sgt_flint_scraps_1" : base_id + 1102, # ItemPickup134_17 Bugspray_Main (X=105743.531 Y=83017.492 Z=9423.290)
+    "base_sgt_flint_scraps_2" : base_id + 1103, # ItemPickup129_2 Bugspray_Main (X=108495.805 Y=81616.992 Z=9139.340)
+    "base_sgt_flint_scraps_3" : base_id + 1104, # ItemPickup135_20 Bugspray_Main (X=108709.219 Y=85981.016 Z=9650.472)
+    "base_sgt_flint_scraps_4" : base_id + 1105, # ItemPickup130_5 Bugspray_Main (X=112004.195 Y=83811.313 Z=8887.996)
+    "base_sgt_flint_scraps_5" : base_id + 1106, # ItemPickup131_8 Bugspray_Main (X=110904.867 Y=82024.781 Z=9581.007)
+    "base_sgt_flint_scraps_6" : base_id + 1107, # ItemPickup132_11 Bugspray_Main (X=112458.563 Y=81967.945 Z=9850.968)
+    "base_sgt_flint_scraps_7" : base_id + 1108, # ItemPickup22_9 Bugspray_Details (X=112541.695 Y=81345.875 Z=9896.940)
+    "base_sgt_flint_scraps_8" : base_id + 1109, # ItemPickup133_14 Bugspray_Main (X=111943.391 Y=79970.016 Z=10025.820)
+    "base_sgt_flint_scraps_9" : base_id + 1110, # ItemPickup24_8 Bugspray_Details (X=112074.063 Y=83533.398 Z=9008.831)
+    "base_sgt_flint_scraps_10" : base_id + 1111, # ItemPickup23_2 Bugspray_Details (X=110738.523 Y=85389.852 Z=9082.626)
+    "base_sgt_flint_scraps_11" : base_id + 1112, # ItemPickup136_23 Bugspray_Main (X=112962.594 Y=85872.922 Z=8638.805)
+    "base_sgt_flint_scraps_12" : base_id + 1113, # ItemPickup137_26 Bugspray_Main (X=116230.563 Y=84357.602 Z=8580.226)
+    "base_sgt_flint_paint_can_orange" : base_id + 1114 # PaintCan_5 Bugspray_Details (X=111916.102 Y=83066.195 Z=9094.554)
+}
+
+loc_south_mine_outside = {
+    "south_mine_outside_scraps_1" : base_id + 1115, # ItemPickup20_1 Mine_1_OutsideMain (X=114794.375 Y=57211.855 Z=8523.348)
+    "south_mine_outside_scraps_2" : base_id + 1116, # ItemPickup15_2 Mine_1_OutsideDetails (X=112523.438 Y=57693.836 Z=8639.382)
+    "south_mine_outside_scraps_3" : base_id + 1117, # ItemPickup22_5 Mine_1_OutsideMain (X=112348.586 Y=59174.289 Z=8945.143)
+    "south_mine_outside_scraps_4" : base_id + 1118, # ItemPickup13_2 Mine_1_OutsideDetails (X=110989.156 Y=57840.090 Z=8700.936)
+    "south_mine_outside_scraps_5" : base_id + 1119, # ItemPickup16_1 Mine_1_OutsideDetails (X=110487.281 Y=54528.535 Z=8589.910)
+    "south_mine_outside_scraps_6" : base_id + 1120, # ItemPickup18_1 Mine_1_OutsideMain (X=113727.297 Y=54791.703 Z=8424.460)
+    "south_mine_outside_scraps_7" : base_id + 1121 # ItemPickup17_3 Mine_1_OutsideMain (X=113965.211 Y=53289.539 Z=8402.346)
+}
+
+loc_south_mine_inside = {
+    "south_mine_inside_scraps_1" : base_id + 1122, # ItemPickup23_4 Mine_1_Interior_1 (X=108659.945 Y=58712.691 Z=8763.015)
+    "south_mine_inside_scraps_2" : base_id + 1123, # ItemPickup24_0 Mine_1_Interior_1 (X=104954.602 Y=61540.488 Z=7876.374)
+    "south_mine_inside_scraps_3" : base_id + 1124, # ItemPickup26_0 Mine_1_Interior_1 (X=104436.758 Y=64091.211 Z=7872.767)
+    "south_mine_inside_scraps_4" : base_id + 1125, # ItemPickup290_20 Mine_1_Interior_2 (X=101356.625 Y=66110.906 Z=8034.738)
+    "south_mine_inside_scraps_5" : base_id + 1126, # ItemPickup287_8 Mine_1_Interior_2 (X=96888.820 Y=64458.559 Z=7917.468)
+    "south_mine_inside_scraps_6" : base_id + 1127, # ItemPickup289_14 Mine_1_Interior_2 (X=95863.180 Y=63252.902 Z=7847.054)
+    "south_mine_inside_scraps_7" : base_id + 1128, # ItemPickup288_11 Mine_1_Interior_2 (X=97337.219 Y=62921.438 Z=7884.393)
+    "south_mine_inside_scraps_8" : base_id + 1129, # ItemPickup285_2 Mine_1_Interior_2 (X=96689.203 Y=61880.895 Z=7806.810)
+    "south_mine_inside_scraps_9" : base_id + 1130, # ItemPickup286_5 Mine_1_Interior_2 (X=98403.227 Y=62812.531 Z=7880.947)
+    "south_mine_inside_egg_green" : base_id + 1131, # ItemPickup14_2 Mine_1_Interior_2 (X=96753.219 Y=62909.504 Z=8030.018) \!/ Existing match 4
+    "south_mine_inside_paint_can_green" : base_id + 1132 # PaintCan_2 Mine_1_Interior_1 (X=108293.281 Y=64192.094 Z=7872.770) \!/ Existing match 5
+}
+
+loc_theodore_mission = {
+    "station_paint_can_white" : base_id + 1133, # PaintCan_2 Station_Details1 (X=34554.141 Y=-7395.408 Z=11897.556) \!/ Existing match 5
+    "station_theodore_scraps_1" : base_id + 1134, # ItemPickup431_20 Station_BuildingDetails (X=37710.504 Y=-6462.562 Z=11356.691)
+    "station_theodore_scraps_2" : base_id + 1135, # ItemPickup425_2 Station_BuildingDetails (X=37034.340 Y=-4923.256 Z=11348.328)
+    "station_theodore_scraps_3" : base_id + 1136, # ItemPickup427_8 Station_BuildingDetails (X=36689.164 Y=-3727.466 Z=11353.597)
+    "station_theodore_scraps_4" : base_id + 1137, # ItemPickup426_5 Station_BuildingDetails (X=37207.629 Y=-3393.977 Z=11379.110)
+    "station_theodore_scraps_5" : base_id + 1138, # ItemPickup429_14 Station_BuildingDetails (X=37988.219 Y=-3365.906 Z=11350.225)
+    "station_theodore_scraps_6" : base_id + 1139, # ItemPickup428_11 Station_BuildingDetails (X=36956.242 Y=-2746.948 Z=11353.506)
+    "station_theodore_scraps_7" : base_id + 1140, # ItemPickup430_17 Station_BuildingDetails (X=36638.492 Y=-6410.017 Z=11353.546)
+    "station_theodore_scraps_8" : base_id + 1141, # ItemPickup433_26 Station_BuildingDetails (X=35931.168 Y=-7558.021 Z=11899.232)
+    "station_theodore_scraps_9" : base_id + 1142, # ItemPickup434 Station_BuildingDetails (X=35636.855 Y=-7628.500 Z=11903.627)
+    "station_theodore_scraps_10" : base_id + 1143, # ItemPickup435 Station_BuildingDetails (X=34894.152 Y=-7537.087 Z=11903.627)
+    "station_theodore_scraps_11" : base_id + 1144, # ItemPickup13_4 Station_BuildingDetails (X=33505.609 Y=-7742.843 Z=11898.971)
+    "station_theodore_scraps_12" : base_id + 1145, # ItemPickup440_5 Station_Details1 (X=37394.004 Y=-8395.084 Z=11389.296)
+    "station_theodore_scraps_13" : base_id + 1146, # ItemPickup432_23 Station_BuildingDetails (X=36040.695 Y=-8068.016 Z=11456.609)
+    "station_theodore_scraps_14" : base_id + 1147, # ItemPickup16_4 Station_BuildingDetails (X=35360.320 Y=-8441.443 Z=11457.823)
+    "station_theodore_scraps_15" : base_id + 1148, # ItemPickup439_2 Station_Details1 (X=36311.324 Y=-9563.938 Z=11468.039)
+    "station_theodore_scraps_16" : base_id + 1149, # ItemPickup442_11 Station_Details1 (X=33335.656 Y=-13872.785 Z=11189.906)
+    "station_theodore_scraps_17" : base_id + 1150, # ItemPickup441_8 Station_Details1 (X=33129.984 Y=-14073.978 Z=11189.906)
+    "station_theodore_scraps_18" : base_id + 1151, # ItemPickup436_31 Station_BuildingDetails (X=33587.488 Y=-7828.651 Z=11529.446)
+    "station_theodore_scraps_19" : base_id + 1152, # ItemPickup14_3 Station_BuildingDetails (X=34007.254 Y=-7749.381 Z=11533.760)
+    "station_theodore_scraps_20" : base_id + 1153, # ItemPickup443_14 Station_Details1 (X=31457.752 Y=-7120.744 Z=11421.197)
+    "station_theodore_mission_end" : base_id + 1154 # (dialog 2) -> 35_scraps_reward
+    # "station_theodore_scraps_glitch_1" ItemPickup437_34 (X=34217.613 Y=-9481.271 Z=11505.686) /!\ Glitched scrap
+    # "station_theodore_scraps_glitch_2" ItemPickup438_37 (X=36101.633 Y=-10459.024 Z=11385.937) /!\ Glitched scrap
+}
+
+loc_canyon_theodore = {
+    "canyon_scraps_1" : base_id + 1155, # ItemPickup156_47 Canyon_Main (X=29432.162 Y=-3164.300 Z=11540.294)
+    "canyon_scraps_2" : base_id + 1156, # ItemPickup155_44 Canyon_Main (X=26331.086 Y=3036.740 Z=11701.688)
+    "canyon_scraps_3" : base_id + 1157, # ItemPickup154_41 Canyon_Main (X=22688.129 Y=3906.730 Z=12249.182)
+    "canyon_scraps_4" : base_id + 1158, # ItemPickup147_20 Canyon_Main (X=20546.193 Y=4371.471 Z=12128.874)
+    "canyon_scraps_5" : base_id + 1159, # ItemPickup148_23 Canyon_Main (X=20006.584 Y=4928.478 Z=12174.837)
+    "canyon_scraps_6" : base_id + 1160, # ItemPickup146_17 Canyon_Main (X=19251.633 Y=3798.014 Z=12170.390)
+    "canyon_scraps_7" : base_id + 1161, # ItemPickup149_26 Canyon_Main (X=18302.678 Y=7323.849 Z=12595.085)
+    "canyon_scraps_8" : base_id + 1162, # ItemPickup150_29 Canyon_Main (X=19019.563 Y=8172.146 Z=12640.462)
+    "canyon_scraps_9" : base_id + 1163, # ItemPickup142_5 Canyon_Main (X=18001.689 Y=11138.320 Z=13035.360)
+    "canyon_scraps_10" : base_id + 1164, # ItemPickup143_8 Canyon_Main (X=16381.525 Y=7191.394 Z=13682.453)
+    "canyon_scraps_11" : base_id + 1165, # ItemPickup144_11 Canyon_Main (X=18294.928 Y=7870.372 Z=14350.015)
+    "canyon_scraps_12" : base_id + 1166, # ItemPickup31_2 CanyonCamp_Details (X=20730.520 Y=8032.158 Z=14439.826)
+    "canyon_scraps_13" : base_id + 1167, # ItemPickup145_14 Canyon_Main (X=24752.658 Y=7959.624 Z=14363.087)
+    "canyon_scraps_14" : base_id + 1168, # ItemPickup141_2 Canyon_Main (X=20181.992 Y=13816.017 Z=14897.407)
+    "canyon_scraps_15" : base_id + 1169, # ItemPickup151_32 Canyon_Main (X=23172.160 Y=2842.120 Z=12954.566)
+    "canyon_scraps_16" : base_id + 1170, # ItemPickup152_35 Canyon_Main (X=22307.621 Y=-1180.840 Z=12451.548)
+    "canyon_scraps_17" : base_id + 1171, # ItemPickup153_38 Canyon_Main (X=28473.596 Y=6741.842 Z=13314.166)
+    "canyon_theodore_blue_box" : base_id + 1172 # Canyon_BlueBoxPickup CanyonCamp_Details (X=20338.525 Y=4989.111 Z=12323.649)
+}
+
+loc_watchtower = {
+    "watchtower_scraps_1" : base_id + 1173, # ItemPickup373_13 Secret2_WatchTowerDetails (X=32760.389 Y=-28814.084 Z=10997.447)
+    "watchtower_scraps_2" : base_id + 1174, # ItemPickup22_6 Secret2_WatchTowerDetails (X=32801.668 Y=-31660.041 Z=10643.390)
+    "watchtower_scraps_3" : base_id + 1175, # ItemPickup372_10 Secret2_WatchTowerDetails (X=31018.063 Y=-33375.313 Z=11100.126)
+    "watchtower_scraps_4" : base_id + 1176, # ItemPickup22_16 Secret2_WatchTowerDetails (X=33308.215 Y=-35928.578 Z=10614.347)
+    "watchtower_scraps_5" : base_id + 1177, # ItemPickup22_2 Secret2_WatchTowerDetails (X=34304.262 Y=-33446.063 Z=10674.936)
+    "watchtower_scraps_6" : base_id + 1178, # ItemPickup370_2 Secret2_WatchTowerDetails (X=32869.453 Y=-33184.094 Z=10612.040)
+    "watchtower_scraps_7" : base_id + 1179, # ItemPickup374_16 Secret2_WatchTowerDetails (X=33210.707 Y=-32097.611 Z=11211.031)
+    "watchtower_scraps_8" : base_id + 1180, # ItemPickup22_10 Secret2_WatchTowerDetails (X=33246.262 Y=-32046.697 Z=11851.025)
+    "watchtower_scraps_9" : base_id + 1181, # ItemPickup22_8 Secret2_WatchTowerDetails (X=33553.156 Y=-31810.645 Z=11849.521)
+    "watchtower_scraps_10" : base_id + 1182, # ItemPickup371_7 Secret2_WatchTowerDetails (X=36151.621 Y=-31791.633 Z=11093.785)
+    "watchtower_paint_can_pink" : base_id + 1183 # PaintCan_2 Secret2_WatchTowerDetails (X=33069.133 Y=-32168.045 Z=11859.582) \!/ Existing match 5
+}
+
+loc_boulder_field = {
+    "boulder_field_page_drawing_1" : base_id + 1184, # Pages_Drawing1 Pages_Environment_Details (X=46232.703 Y=-37052.875 Z=9531.116)
+    "boulder_field_page_drawing_2" : base_id + 1185, # Pages_Drawing2 Pages_Environment_Details (X=51854.980 Y=-31332.070 Z=9804.927)
+    "boulder_field_page_drawing_3" : base_id + 1186, # Pages_Drawing3 Pages_Environment_Details (X=47595.750 Y=-29931.740 Z=9308.014)
+    "boulder_field_page_drawing_4" : base_id + 1187, # Pages_Drawing4 Pages_Environment_Details (X=43819.680 Y=-30378.770 Z=9706.599)
+    "boulder_field_page_drawing_5" : base_id + 1188, # Pages_Drawing5 Pages_Environment_Details (X=47494.746 Y=-20884.781 Z=9812.398)
+    "boulder_field_page_drawing_6" : base_id + 1189, # Pages_Drawing6 Pages_Environment_Details (X=43725.148 Y=-21952.570 Z=9744.351)
+    "boulder_field_page_drawing_7" : base_id + 1190, # Pages_Drawing7 Pages_Environment_Details (X=44752.465 Y=-16362.510 Z=10147.004)
+    "boulder_field_page_drawing_8" : base_id + 1191, # Pages_Drawing8 Pages_Environment_Details (X=50496.270 Y=-26090.533 Z=9835.365)
+    "boulder_field_scraps_1" : base_id + 1192, # ItemPickup293_8 Pages_Environment_Main (X=41385.406 Y=-32281.871 Z=10240.781)
+    "boulder_field_scraps_2" : base_id + 1193, # ItemPickup987321 Pages_House_Main (X=46654.969 Y=-38859.254 Z=9920.861)
+    "boulder_field_scraps_3" : base_id + 1194, # ItemPickup516121 Pages_House_Main (X=44765.836 Y=-41675.559 Z=9938.179)
+    "boulder_field_scraps_4" : base_id + 1195, # ItemPickup291_2 Pages_Environment_Main (X=50088.270 Y=-30669.107 Z=9267.371)
+    "boulder_field_scraps_5" : base_id + 1196, # ItemPickup303_38 Pages_Environment_Main (X=48014.609 Y=-28971.115 Z=9199.659)
+    "boulder_field_scraps_6" : base_id + 1197, # ItemPickup302_35 Pages_Environment_Main (X=50190.266 Y=-26243.977 Z=9648.289)
+    "boulder_field_scraps_7" : base_id + 1198, # ItemPickup305_44 Pages_Environment_Main (X=47802.246 Y=-22594.684 Z=9631.879)
+    "boulder_field_scraps_8" : base_id + 1199, # ItemPickup294_11 Pages_Environment_Main (X=44345.996 Y=-23408.535 Z=9659.643)
+    "boulder_field_scraps_9" : base_id + 1200, # ItemPickup295_14 Pages_Environment_Main (X=41620.590 Y=-22982.641 Z=9720.177)
+    "boulder_field_scraps_10" : base_id + 1201, # ItemPickup300_29 Pages_Environment_Main (X=52003.172 Y=-19163.049 Z=9925.105)
+    "boulder_field_scraps_11" : base_id + 1202, # ItemPickup301_32 Pages_Environment_Main (X=51422.176 Y=-22319.322 Z=10663.813)
+    "boulder_field_scraps_12" : base_id + 1203, # ItemPickup296_17 Pages_Environment_Main (X=43527.176 Y=-17952.570 Z=10812.458)
+    "boulder_field_scraps_13" : base_id + 1204, # ItemPickup297_20 Pages_Environment_Main (X=45241.871 Y=-15847.636 Z=9952.198)
+    "boulder_field_scraps_14" : base_id + 1205, # ItemPickup298_23 Pages_Environment_Main (X=46238.027 Y=-18407.420 Z=10199.825)
+    "boulder_field_scraps_15" : base_id + 1206, # ItemPickup299_26 Pages_Environment_Main (X=49835.617 Y=-17379.959 Z=9810.836)
+    "boulder_field_scraps_16" : base_id + 1207, # ItemPickup306_47 Pages_Environment_Main (X=45144.594 Y=-33817.090 Z=10136.658)
+    "boulder_field_scraps_17" : base_id + 1208, # ItemPickup292_5 Pages_Environment_Main (X=44336.184 Y=-37162.367 Z=9789.548)
+    "boulder_field_scraps_18" : base_id + 1209 # ItemPickup304_41 Pages_Environment_Main (X=44490.160 Y=-26442.754 Z=9974.022)
+}
+
+loc_house_sasha_mission = {
+    "house_sasha_mission_end" : base_id + 1210, # (dialog 2) -> 40_scraps_reward
+    "house_sasha_scraps_1" : base_id + 1211, # ItemPickup1309876 Pages_House_Main (X=42900.188 Y=-43760.617 Z=9900.531)
+    "house_sasha_scraps_2" : base_id + 1212, # ItemPickup22213 Pages_House_Main (X=43608.078 Y=-44642.434 Z=9922.888)
+    "house_sasha_scraps_3" : base_id + 1213, # ItemPickup5423189 Pages_House_Main (X=43992.387 Y=-44259.336 Z=9877.623)
+    "house_sasha_scraps_4" : base_id + 1214, # ItemPickup1312312 Pages_House_Main (X=43340.012 Y=-45362.617 Z=9882.796)
+    "house_sasha_scraps_5" : base_id + 1215, # ItemPickup1596 Pages_House_Main (X=45105.383 Y=-45980.879 Z=9854.796)
+    "house_sasha_scraps_6" : base_id + 1216 # ItemPickup8624 Pages_House_Main (X=45888.406 Y=-46050.246 Z=9555.326)
+}
+
+loc_house_santiago = {
+    "house_santiago_scraps_1" : base_id + 1217, # ItemPickup342_19 PortNPCHouse_Details (X=37271.445 Y=-46075.598 Z=10648.827)
+    "house_santiago_scraps_2" : base_id + 1218, # ItemPickup37_5 PortNPCHouse_Details (X=38330.512 Y=-47184.668 Z=10387.618)
+    "house_santiago_scraps_3" : base_id + 1219, # ItemPickup337_2 PortNPCHouse_Details (X=35720.422 Y=-49536.328 Z=10098.503)
+    "house_santiago_scraps_4" : base_id + 1220, # ItemPickup344_25 PortNPCHouse_Details (X=35466.285 Y=-50363.078 Z=10098.504)
+    "house_santiago_scraps_5" : base_id + 1221, # ItemPickup338_7 PortNPCHouse_Details (X=34274.289 Y=-49947.578 Z=10098.501)
+    "house_santiago_scraps_6" : base_id + 1222, # ItemPickup341_16 PortNPCHouse_Details (X=35584.359 Y=-48195.172 Z=10323.833)
+    "house_santiago_scraps_7" : base_id + 1223, # ItemPickup340_13 PortNPCHouse_Details (X=35019.766 Y=-49904.113 Z=10124.169)
+    "house_santiago_scraps_8" : base_id + 1224, # ItemPickup339_10 PortNPCHouse_Details (X=35527.711 Y=-49614.801 Z=10124.016)
+    "house_santiago_scraps_9" : base_id + 1225, # ItemPickup36_2 PortNPCHouse_Details (X=34471.707 Y=-49497.000 Z=10199.790)
+    "house_santiago_scraps_10" : base_id + 1226, # ItemPickup343_22 PortNPCHouse_Details (X=37920.277 Y=-51867.754 Z=9847.511)
+    "house_santiago_journal" : base_id + 1227 # Port_Journal_Pickup PortNPCHouse_Details (X=34690.777 Y=-49788.359 Z=10214.353)
+}
+
+loc_port_santiago_mission = {
+    "port_paint_can_gray" : base_id + 1228, # PaintCan_13 Port_Details (X=74641.648 Y=-11320.948 Z=7551.767)
+    "port_scraps_1" : base_id + 1229, # ItemPickup334_32 Port_Main (X=67315.281 Y=-13828.055 Z=10101.339)
+    "port_scraps_2" : base_id + 1230, # ItemPickup335_35 Port_Main (X=67679.508 Y=-14127.952 Z=10061.037)
+    "port_scraps_3" : base_id + 1231, # ItemPickup336_38 Port_Main (X=67062.219 Y=-15626.003 Z=10065.956)
+    "port_scraps_4" : base_id + 1232, # ItemPickup21_15 Port_Main (X=66140.914 Y=-16079.730 Z=10092.268)
+    "port_scraps_5" : base_id + 1233, # ItemPickup18_12 Port_Main (X=66824.719 Y=-14729.157 Z=10125.234)
+    "port_scraps_6" : base_id + 1234, # ItemPickup333_29 Port_Main (X=69777.258 Y=-8371.526 Z=9391.735)
+    "port_scraps_7" : base_id + 1235, # ItemPickup332_26 Port_Main (X=70339.695 Y=-11066.703 Z=8912.465)
+    "port_scraps_8" : base_id + 1236, # ItemPickup331_23 Port_Main (X=72729.508 Y=-7048.998 Z=8245.522)
+    "port_scraps_9" : base_id + 1237, # ItemPickup329_17 Port_Main (X=75896.070 Y=-8705.214 Z=7514.992)
+    "port_scraps_10" : base_id + 1238, # ItemPickup330_20 Port_Main (X=74264.211 Y=-10553.446 Z=7520.141)
+    "port_scraps_11" : base_id + 1239, # ItemPickup17_9 Port_Main (X=74328.117 Y=-11423.852 Z=7511.827)
+    "port_scraps_12" : base_id + 1240, # ItemPickup328_14 Port_Main (X=76753.164 Y=-10744.933 Z=7437.174)
+    "port_scraps_13" : base_id + 1241, # ItemPickup326_8 Port_Main (X=77330.414 Y=-11640.151 Z=7189.003)
+    "port_scraps_14" : base_id + 1242, # ItemPickup327_11 Port_Main (X=76403.516 Y=-12484.995 Z=7440.368)
+    "port_scraps_15" : base_id + 1243, # ItemPickup324_2 Port_Main (X=78651.977 Y=-12233.159 Z=7439.514)
+    "port_scraps_16" : base_id + 1244, # ItemPickup14_5 Port_Main (X=80336.297 Y=-12276.590 Z=7436.639)
+    "port_scraps_17" : base_id + 1245, # ItemPickup325_5 Port_Main (X=79845.086 Y=-13410.705 Z=7440.597)
+    "port_scraps_18" : base_id + 1246, # ItemPickup13_2 Port_Main (X=76156.719 Y=-12816.718 Z=7439.269) KO
+    "port_scraps_19" : base_id + 1247, # ItemPickup16 Port_Main (X=80754.914 Y=-14055.545 Z=7445.339) KO
+    "port_santiago_mission_end" : base_id + 1248 # (dialog 3) -> 35_scraps_reward
+}
+
+loc_trench_house = {
+    "trench_house_scraps_1" : base_id + 1249, # ItemPickup157_2 DeadWoodsEnvironment (X=76340.328 Y=-42886.191 Z=9567.521)
+    "trench_house_scraps_2" : base_id + 1250, # ItemPickup158_5 DeadWoodsEnvironment (X=76013.594 Y=-44140.141 Z=9413.147)
+    "trench_house_scraps_3" : base_id + 1251, # ItemPickup159_11 DeadWoodsEnvironment (X=74408.320 Y=-45424.000 Z=9446.966)
+    "trench_house_scraps_4" : base_id + 1252, # ItemPickup69_14 Secret8_BasementHouseDetails (X=75196.344 Y=-48321.504 Z=9453.302)
+    "trench_house_scraps_5" : base_id + 1253, # ItemPickup160_14 DeadWoodsEnvironment (X=73467.273 Y=-48995.738 Z=9355.070)
+    "trench_house_scraps_6" : base_id + 1254, # ItemPickup163_23 DeadWoodsEnvironment (X=76418.469 Y=-53239.539 Z=9276.892)
+    "trench_house_scraps_7" : base_id + 1255, # ItemPickup173_56 DeadWoodsEnvironment (X=70719.875 Y=-54290.117 Z=9357.084)
+    "trench_house_scraps_8" : base_id + 1256, # ItemPickup165_29 DeadWoodsEnvironment (X=70075.938 Y=-53041.973 Z=9675.481)
+    "trench_house_scraps_9" : base_id + 1257, # ItemPickup162_20 DeadWoodsEnvironment (X=74745.711 Y=-52304.027 Z=9073.130)
+    "trench_house_scraps_10" : base_id + 1258, # ItemPickup68_11 Secret8_BasementHouseDetails (X=74519.750 Y=-53603.063 Z=9078.054)
+    "trench_house_scraps_11" : base_id + 1259, # ItemPickup161_17 DeadWoodsEnvironment (X=73747.492 Y=-52589.906 Z=9104.748)
+    "trench_house_scraps_12" : base_id + 1260, # ItemPickup67_8 Secret8_BasementHouseDetails (X=74333.125 Y=-52847.961 Z=9124.773)
+    "trench_house_scraps_13" : base_id + 1261, # ItemPickup66_5 Secret8_BasementHouseDetails (X=74062.195 Y=-52663.043 Z=9122.827)
+    "trench_house_scraps_14" : base_id + 1262, # ItemPickup65_2 Secret8_BasementHouseDetails (X=74820.492 Y=-51350.051 Z=7956.387)
+    "trench_house_scraps_15" : base_id + 1263, # ItemPickup164_26 DeadWoodsEnvironment (X=75286.289 Y=-51164.098 Z=7957.081)
+    "trench_house_scraps_16" : base_id + 1264, # ItemPickup174_59 DeadWoodsEnvironment (X=68413.258 Y=-56872.816 Z=9349.443)
+    "trench_house_scraps_17" : base_id + 1265, # ItemPickup175_62 DeadWoodsEnvironment (X=67281.281 Y=-59201.371 Z=9254.457)
+    "trench_house_scraps_18" : base_id + 1266, # ItemPickup172_50 DeadWoodsEnvironment (X=69064.219 Y=-48796.352 Z=9770.164)
+    "trench_house_chest_scraps_1" : base_id + 1267, # ItemPickup75123123 Secret8_BasementHouseDetails (X=75042.141 Y=-50830.891 Z=8005.156)
+    "trench_house_chest_scraps_2" : base_id + 1268, # ItemPickup741123 Secret8_BasementHouseDetails (X=75066.516 Y=-50824.398 Z=7995.000)
+    "trench_house_chest_scraps_3" : base_id + 1269, # ItemPickup729842 Secret8_BasementHouseDetails (X=75072.789 Y=-50818.441 Z=7986.979)
+    "trench_house_chest_scraps_4" : base_id + 1270, # ItemPickup711123 Secret8_BasementHouseDetails (X=75038.656 Y=-50827.566 Z=7973.354)
+    "trench_house_chest_scraps_5" : base_id + 1271, # ItemPickup73 Secret8_BasementHouseDetails (X=75060.406 Y=-50828.102 Z=7965.915)
+    "trench_house_chest_scraps_6" : base_id + 1272 # ItemPickup7075674 Secret8_BasementHouseDetails (X=75056.648 Y=-50818.125 Z=7959.868)
+}
+
+loc_doll_woods = {
+    "doll_woods_scraps_1" : base_id + 1273, # ItemPickup78_2 DeadWoodsDolls (X=60126.234 Y=-49668.906 Z=9970.880)
+    "doll_woods_scraps_2" : base_id + 1274, # ItemPickup166_32 DeadWoodsEnvironment (X=59854.066 Y=-47313.121 Z=10376.684)
+    "doll_woods_scraps_3" : base_id + 1275, # ItemPickup80_8 DeadWoodsDolls (X=59130.613 Y=-49597.789 Z=9930.675)
+    "doll_woods_scraps_4" : base_id + 1276, # ItemPickup168_38 DeadWoodsEnvironment (X=59785.973 Y=-51269.684 Z=10180.019)
+    "doll_woods_scraps_5" : base_id + 1277, # ItemPickup81_11 DeadWoodsDolls (X=58226.449 Y=-52660.801 Z=10576.626)
+    "doll_woods_scraps_6" : base_id + 1278, # ItemPickup167_35 DeadWoodsEnvironment (X=56243.176 Y=-49097.793 Z=10869.889)
+    "doll_woods_scraps_7" : base_id + 1279, # ItemPickup79_5 DeadWoodsDolls (X=59481.672 Y=-45288.137 Z=10897.672)
+    "doll_woods_scraps_8" : base_id + 1280, # ItemPickup170_44 DeadWoodsEnvironment (X=63807.668 Y=-44674.734 Z=10337.434)
+    "doll_woods_scraps_9" : base_id + 1281, # ItemPickup171_47 DeadWoodsEnvironment (X=68406.664 Y=-45721.813 Z=10021.356)
+    "doll_woods_scraps_10" : base_id + 1282 # ItemPickup169_41 DeadWoodsEnvironment (X=62898.469 Y=-47565.703 Z=10744.431)
+}
+
+loc_lost_stairs = {
+    "lost_stairs_scraps_1" : base_id + 1283, # ItemPickup29_2 Secret1_Stairs2 (X=47087.617 Y=-53476.547 Z=9103.093)
+    "lost_stairs_scraps_2" : base_id + 1284 # ItemPickup30_5 Secret1_Stairs2 (X=47162.238 Y=-55318.094 Z=9127.096)
+}
+
+loc_east_house = {
+    "east_house_scraps_1" : base_id + 1285, # ItemPickup409_5 Secret7_CliffHouseEnvironment (X=97507.664 Y=-53201.270 Z=9174.678)
+    "east_house_scraps_2" : base_id + 1286, # ItemPickup408_2 Secret7_CliffHouseEnvironment (X=98511.242 Y=-53899.414 Z=9016.314)
+    "east_house_scraps_3" : base_id + 1287, # ItemPickup410_8 Secret7_CliffHouseEnvironment (X=100688.102 Y=-54197.578 Z=8919.432)
+    "east_house_scraps_4" : base_id + 1288, # ItemPickup411_11 Secret7_CliffHouseEnvironment (X=103149.773 Y=-54659.980 Z=9002.535)
+    "east_house_scraps_5" : base_id + 1289, # ItemPickup416_26 Secret7_CliffHouseEnvironment (X=107458.172 Y=-55683.793 Z=9429.004)
+    "east_house_scraps_6" : base_id + 1290, # ItemPickup25_2 Secret7_CliffHouseEnvironment (X=109034.164 Y=-54360.703 Z=9495.910)
+    "east_house_scraps_7" : base_id + 1291, # ItemPickup413_17 Secret7_CliffHouseEnvironment (X=109245.148 Y=-55045.242 Z=9553.601)
+    "east_house_scraps_8" : base_id + 1292, # ItemPickup414_20 Secret7_CliffHouseEnvironment (X=112556.445 Y=-55851.754 Z=10049.954)
+    "east_house_scraps_9" : base_id + 1293, # ItemPickup415_23 Secret7_CliffHouseEnvironment (X=113131.469 Y=-56822.508 Z=10038.047)
+    "east_house_scraps_10" : base_id + 1294, # ItemPickup2599786 Secret7_CliffHouseDetails (X=112279.828 Y=-56743.781 Z=10029.549)
+    "east_house_scraps_11" : base_id + 1295, # ItemPickup253321 Secret7_CliffHouseDetails (X=112445.508 Y=-56280.320 Z=10059.164)
+    "east_house_scraps_12" : base_id + 1296, # ItemPickup2532323 Secret7_CliffHouseDetails (X=112562.211 Y=-56736.332 Z=10454.907)
+    "east_house_scraps_13" : base_id + 1297, # ItemPickup257655 Secret7_CliffHouseDetails (X=109313.320 Y=-58221.316 Z=9501.283)
+    "east_house_scraps_14" : base_id + 1298, # ItemPickup412_14 Secret7_CliffHouseEnvironment (X=104077.805 Y=-55987.301 Z=9066.847)
+    "east_house_chest_scraps_1" : base_id + 1299, # ItemPickup76246 Secret7_CliffHouseDetails (X=112317.242 Y=-55820.805 Z=10497.336)
+    "east_house_chest_scraps_2" : base_id + 1300, # ItemPickup76245 Secret7_CliffHouseDetails (X=112326.086 Y=-55808.477 Z=10485.685)
+    "east_house_chest_scraps_3" : base_id + 1301, # ItemPickup85131 Secret7_CliffHouseDetails (X=112329.031 Y=-55828.438 Z=10478.107)
+    "east_house_chest_scraps_4" : base_id + 1302, # ItemPickup56124 Secret7_CliffHouseDetails (X=112315.922 Y=-55820.102 Z=10466.683)
+    "east_house_chest_scraps_5" : base_id + 1303 # ItemPickup25123123123 Secret7_CliffHouseDetails (X=112337.922 Y=-55821.848 Z=10456.924)
+}
+
+loc_explosive_training = {
+    "explosive_training_timed_dynamite" : base_id + 1304, # Boomer_DynamitePickup Boomer_RangeDetails (X=76476.609 Y=-65286.738 Z=8303.742)
+    "explosive_training_scraps_1" : base_id + 1305, # ItemPickup105_14 Boomer_HouseDetails (X=88925.570 Y=-63375.051 Z=8563.354)
+    "explosive_training_scraps_2" : base_id + 1306, # ItemPickup106_17 Boomer_HouseDetails (X=84234.016 Y=-64475.551 Z=8382.108)
+    "explosive_training_scraps_3" : base_id + 1307, # ItemPickup114_23 Boomer_RangeDetails (X=79349.438 Y=-64225.480 Z=8384.219)
+    "explosive_training_scraps_4" : base_id + 1308, # ItemPickup22_0 Boomer_RangeDetails (X=79831.070 Y=-65847.766 Z=8301.337)
+    "explosive_training_scraps_5" : base_id + 1309, # ItemPickup109_5 Boomer_RangeDetails (X=76526.500 Y=-65394.875 Z=8223.883)
+    "explosive_training_scraps_6" : base_id + 1310, # ItemPickup108_2 Boomer_RangeDetails (X=76237.977 Y=-67087.414 Z=8361.979)
+    "explosive_training_scraps_7" : base_id + 1311, # ItemPickup115_26 Boomer_RangeDetails (X=78857.672 Y=-67802.227 Z=8257.150)
+    "explosive_training_scraps_8" : base_id + 1312, # ItemPickup110_8 Boomer_RangeDetails (X=74878.570 Y=-62927.297 Z=8749.549)
+    "explosive_training_scraps_9" : base_id + 1313, # ItemPickup111_11 Boomer_RangeDetails (X=74542.641 Y=-61301.082 Z=9493.931)
+    "explosive_training_scraps_10" : base_id + 1314, # ItemPickup23_0 Boomer_RangeDetails (X=77020.859 Y=-62031.320 Z=8873.663)
+    "explosive_training_scraps_11" : base_id + 1315, # ItemPickup113_20 Boomer_RangeDetails (X=77552.094 Y=-61144.559 Z=8523.195)
+    "explosive_training_scraps_12" : base_id + 1316, # ItemPickup112_14 Boomer_RangeDetails (X=77670.227 Y=-62029.941 Z=8570.785)
+    # "explosive_training_scraps_glitch_1" ItemPickup107_20 (X=81308.406 Y=-63482.320 Z=8533.338) /!\ Glitched scrap
+    "explosive_training_box_of_rocket" : base_id + 1317 # Boomer_RocketsPickup Boomer_RangeDetails (X=77330.086 Y=-61504.324 Z=8523.195)
+}
+
+loc_john_smith_mission = {
+    "workshop_scraps_1" : base_id + 1318, # ItemPickup103_8 Boomer_HouseDetails (X=93550.773 Y=-61901.797 Z=8828.551)
+    "workshop_scraps_2" : base_id + 1319, # ItemPickup102_5 Boomer_HouseDetails (X=93508.047 Y=-64009.910 Z=8783.468)
+    "workshop_scraps_3" : base_id + 1320, # ItemPickup101_2 Boomer_HouseDetails (X=92011.648 Y=-65572.281 Z=8736.709)
+    "workshop_scraps_4" : base_id + 1321, # ItemPickup24_2 Boomer_HouseDetails (X=92311.594 Y=-63045.211 Z=8749.977)
+    "workshop_scraps_5" : base_id + 1322, # ItemPickup104_11 Boomer_HouseDetails (X=91392.734 Y=-63527.629 Z=8709.268)
+    "workshop_scraps_6" : base_id + 1323, # ItemPickup25_1 Boomer_HouseDetails (X=92986.789 Y=-63012.047 Z=9235.383)
+    "workshop_john_smith_mission_end" : base_id + 1324 # (dialog 2) -> the_boomer
+}
+
+loc_greg_mission = {
+    "tower_greg_mission_start" : base_id + 1325, # (dialog 6) -> north_mine_key
+    "tower_greg_scraps_1" : base_id + 1326, # ItemPickup231_17 Mine2_NPCHouseDetails (X=95448.250 Y=-67249.156 Z=8607.896)
+    "tower_greg_scraps_2" : base_id + 1327, # ItemPickup228_8 Mine2_NPCHouseDetails (X=96339.242 Y=-66374.828 Z=8650.519)
+    "tower_greg_scraps_3" : base_id + 1328, # ItemPickup229_11 Mine2_NPCHouseDetails (X=98540.711 Y=-67173.656 Z=8418.825)
+    "tower_greg_scraps_4" : base_id + 1329, # ItemPickup230_14 Mine2_NPCHouseDetails (X=97276.414 Y=-68495.008 Z=8337.229)
+    "tower_greg_scraps_5" : base_id + 1330, # ItemPickup227_5 Mine2_NPCHouseDetails (X=96470.820 Y=-66540.859 Z=8953.763)
+    "tower_greg_scraps_6" : base_id + 1331 # ItemPickup226_2 Mine2_NPCHouseDetails (X=96141.555 Y=-67013.445 Z=9399.308)
+}
+
+loc_claire_mission = {
+    "lighthouse_scraps_1": base_id + 1332, # ItemPickup200_41 LighthouseTerrainMain (X=100072.813 Y=-68645.688 Z=8150.313)
+    "lighthouse_scraps_2" : base_id + 1333, # ItemPickup198_35 LighthouseTerrainMain (X=105340.594 Y=-70828.602 Z=8436.780)
+    "lighthouse_scraps_3" : base_id + 1334, # ItemPickup199_38 LighthouseTerrainMain (X=103851.688 Y=-73396.625 Z=7973.290)
+    "lighthouse_scraps_4" : base_id + 1335, # ItemPickup196_29 LighthouseTerrainMain (X=107040.711 Y=-74021.555 Z=8303.216)
+    "lighthouse_scraps_5" : base_id + 1336, # ItemPickup197_32 LighthouseTerrainMain (X=110566.859 Y=-77435.961 Z=7642.565)
+    "lighthouse_scraps_6" : base_id + 1337, # ItemPickup32_2 LighthouseShed_Main (X=111451.352 Y=-77351.117 Z=7633.413)
+    "lighthouse_scraps_7" : base_id + 1338, # ItemPickup35_11 Lighthouse_Main (X=113078.500 Y=-78618.281 Z=7180.793)
+    "lighthouse_scraps_8" : base_id + 1339, # ItemPickup192_17 LighthouseTerrainMain (X=113396.305 Y=-80315.383 Z=7184.260)
+    "lighthouse_scraps_9" : base_id + 1340, # ItemPickup193_20 LighthouseTerrainMain (X=114057.484 Y=-81517.836 Z=7245.034)
+    "lighthouse_scraps_10" : base_id + 1341, # ItemPickup194_23 LighthouseTerrainMain (X=110915.156 Y=-78376.609 Z=7676.131)
+    "lighthouse_scraps_11" : base_id + 1342, # ItemPickup195_26 LighthouseTerrainMain (X=109341.703 Y=-79014.469 Z=8075.679)
+    "lighthouse_scraps_12" : base_id + 1343, # ItemPickup33_5 Lighthouse_Details (X=107006.578 Y=-81377.711 Z=8821.629)
+    "lighthouse_scraps_13" : base_id + 1344, # ItemPickup191_14 LighthouseTerrainMain (X=109240.195 Y=-82951.375 Z=8194.619)
+    "lighthouse_scraps_14" : base_id + 1345, # ItemPickup190_11 LighthouseTerrainMain (X=106295.719 Y=-84190.578 Z=8581.896)
+    "lighthouse_scraps_15" : base_id + 1346, # ItemPickup189_8 LighthouseTerrainMain (X=104233.883 Y=-84663.328 Z=7806.311)
+    "lighthouse_scraps_16" : base_id + 1347, # ItemPickup188_5 LighthouseTerrainMain (X=103209.227 Y=-81564.047 Z=8140.578)
+    "lighthouse_scraps_17" : base_id + 1348, # ItemPickup187_2 LighthouseTerrainMain (X=104795.555 Y=-81344.758 Z=8775.158)
+    "lighthouse_scraps_18" : base_id + 1349, # ItemPickup34_8 Lighthouse_Main (X=100843.914 Y=-78038.539 Z=7197.542)
+    "lighthouse_breaker_1" : base_id + 1350, # ItemPickup13_2 LighthouseShed_Main (X=110781.164 Y=-77296.813 Z=7757.248) \!/ Existing match 6
+    "lighthouse_breaker_2" : base_id + 1351, # ItemPickup14 LighthouseShed_Main (X=110899.227 Y=-77239.031 Z=7757.134) \!/ Existing match 3
+    "lighthouse_breaker_3" : base_id + 1352, # ItemPickup16 LighthouseShed_Main (X=110948.547 Y=-77253.336 Z=7757.134) \!/ Existing match 2
+    "lighthouse_breaker_4" : base_id + 1353, # ItemPickup17 LighthouseShed_Main (X=111001.078 Y=-77205.047 Z=7757.134) \!/ Existing match 1
+    "lighthouse_claire_mission_end" : base_id + 1354 # (dialog 2) -> 30_scraps_reward
+}
+
+loc_north_mine_outside = {
+    "north_mine_outside_scraps_1" : base_id + 1355, # ItemPickup241_31 Mine2_OutsideDetails (X=-52376.746 Y=-101857.492 Z=10542.841)
+    "north_mine_outside_scraps_2" : base_id + 1356, # ItemPickup242_34 Mine2_OutsideDetails (X=-53786.742 Y=-102067.789 Z=10858.948)
+    "north_mine_outside_scraps_3" : base_id + 1357, # ItemPickup239_25 Mine2_OutsideDetails (X=-57502.777 Y=-105475.336 Z=10609.405)
+    "north_mine_outside_scraps_4" : base_id + 1358, # ItemPickup16_2 Mine2_OutsideDetails (X=-58102.102 Y=-104007.906 Z=11146.535)
+    "north_mine_outside_scraps_5" : base_id + 1359, # ItemPickup238_20 Mine2_OutsideDetails (X=-59474.840 Y=-105053.734 Z=11213.524)
+    "north_mine_outside_scraps_6" : base_id + 1360, # ItemPickup240_28 Mine2_OutsideDetails (X=-55011.750 Y=-104936.359 Z=9935.366)
+    "north_mine_outside_scraps_7" : base_id + 1361, # ItemPickup236_14 Mine2_OutsideDetails (X=-55594.863 Y=-107667.594 Z=9596.611)
+    "north_mine_outside_scraps_8" : base_id + 1362, # ItemPickup15_1 Mine2_Interior2 (X=-56632.578 Y=-109503.406 Z=9280.788)
+    "north_mine_outside_scraps_9" : base_id + 1363, # ItemPickup234_8 Mine2_OutsideDetails (X=-54645.418 Y=-110747.602 Z=9553.452)
+    "north_mine_outside_scraps_10" : base_id + 1364, # ItemPickup232_2 Mine2_OutsideDetails (X=-51561.340 Y=-113574.813 Z=9414.959)
+    "north_mine_outside_scraps_11" : base_id + 1365, # ItemPickup233_5 Mine2_OutsideDetails (X=-54072.105 Y=-112672.031 Z=10077.665)
+    "north_mine_outside_scraps_12" : base_id + 1366, # ItemPickup237_17 Mine2_OutsideDetails (X=-58042.758 Y=-108748.656 Z=9693.470)
+    "north_mine_outside_scraps_13" : base_id + 1367, # ItemPickup235_11 Mine2_OutsideDetails (X=-55717.227 Y=-110610.414 Z=9487.879)
+    "north_mine_outside_scraps_14" : base_id + 1368 # ItemPickup13_2 Mine2_Interior2 (X=-52235.836 Y=-114501.117 Z=9462.438) KO
+}
+
+loc_north_mine_inside = {
+    "north_mine_inside_scraps_1" : base_id + 1369, # ItemPickup17_2 Mine2_Interior1 (X=-58433.055 Y=-104081.570 Z=9378.083) KO
+    "north_mine_inside_scraps_2" : base_id + 1370, # ItemPickup246_2 Mine2_Interior1 (X=-58987.199 Y=-103262.906 Z=9186.494)
+    "north_mine_inside_scraps_3" : base_id + 1371, # ItemPickup247_5 Mine2_Interior1 (X=-58812.801 Y=-99259.570 Z=8847.714)
+    "north_mine_inside_scraps_4" : base_id + 1372, # ItemPickup248_8 Mine2_Interior1 (X=-56634.379 Y=-99529.563 Z=8851.877)
+    "north_mine_inside_scraps_5" : base_id + 1373, # ItemPickup22_4 Mine2_Interior1 (X=-55604.477 Y=-98342.906 Z=8842.766)
+    "north_mine_inside_scraps_6" : base_id + 1374, # ItemPickup250_14 Mine2_Interior1 (X=-54824.535 Y=-98526.492 Z=8852.156)
+    "north_mine_inside_scraps_7" : base_id + 1375, # ItemPickup21_14 Mine2_Interior1 (X=-54887.254 Y=-99047.141 Z=8849.855)
+    "north_mine_inside_scraps_8" : base_id + 1376, # ItemPickup20_2 Mine2_Interior1 (X=-55610.020 Y=-101877.961 Z=9081.042)
+    "north_mine_inside_scraps_9" : base_id + 1377, # ItemPickup19_2 Mine2_Interior1 (X=-56519.340 Y=-101375.008 Z=9001.270)
+    "north_mine_inside_scraps_10" : base_id + 1378, # ItemPickup249_11 Mine2_Interior1 (X=-53329.922 Y=-99469.773 Z=8848.643)
+    "north_mine_inside_scraps_11" : base_id + 1379, # ItemPickup251_17 Mine2_Interior1 (X=-52814.828 Y=-96286.969 Z=8851.372)
+    "north_mine_inside_scraps_12" : base_id + 1380, # ItemPickup24_1 Mine2_Interior1 (X=-52605.957 Y=-96535.156 Z=8940.480)
+    "north_mine_inside_scraps_13" : base_id + 1381, # ItemPickup23_20 Mine2_Interior1 (X=-53237.699 Y=-96609.461 Z=8846.201)
+    "north_mine_inside_scraps_14" : base_id + 1382, # ItemPickup18_5 Mine2_Interior1 (X=-58543.488 Y=-95879.695 Z=8981.646)
+    "north_mine_inside_blue_egg" : base_id + 1383, # Mine2_Egg Mine2_Interior2 (X=-53592.195 Y=-99177.500 Z=8975.387)
+    "north_mine_inside_paint_can_blue" : base_id + 1384 # PaintCan_2 Mine2_Interior2 (X=-56133.391 Y=-101870.047 Z=9004.720) \!/ Existing match 5
+    # "secret_gear" ItemPickup26_2 (X=-55546.859 Y=-98209.852 Z=8429.085) /!\ Inaccessible gear
+}
+
+loc_wood_bridge = {
+    "wood_bridge_scraps_1" : base_id + 1385, # ItemPickup127_35 Bridge_Details (X=-66790.141 Y=-110340.367 Z=10454.417)
+    "wood_bridge_scraps_2" : base_id + 1386, # ItemPickup18613654 Bridge_Details (X=-68364.586 Y=-111691.625 Z=10444.172)
+    "wood_bridge_scraps_3" : base_id + 1387, # ItemPickup1311221 Bridge_StructureDetails (X=-69013.555 Y=-112353.977 Z=10399.942)
+    "wood_bridge_scraps_4" : base_id + 1388, # ItemPickup93564 Bridge_StructureDetails (X=-70398.797 Y=-112916.945 Z=10372.192)
+    "wood_bridge_scraps_5" : base_id + 1389, # ItemPickup161323 Bridge_Details (X=-71336.172 Y=-106966.672 Z=8430.104)
+    "wood_bridge_scraps_6" : base_id + 1390, # ItemPickup128_38 Bridge_Details (X=-72776.086 Y=-107813.102 Z=8305.589)
+    "wood_bridge_scraps_7" : base_id + 1391, # ItemPickup17975 Bridge_Details (X=-75224.648 Y=-108280.867 Z=7929.499)
+    "wood_bridge_scraps_8" : base_id + 1392, # ItemPickup126_32 Bridge_Details (X=-68112.172 Y=-105119.656 Z=9458.937)
+    "wood_bridge_scraps_9" : base_id + 1393, # ItemPickup118_8 Bridge_Details (X=-71847.625 Y=-103623.203 Z=10707.521)
+    "wood_bridge_scraps_10" : base_id + 1394, # ItemPickup116_2 Bridge_Details (X=-71812.219 Y=-107256.094 Z=10780.134)
+    "wood_bridge_scraps_11" : base_id + 1395, # ItemPickup134321 Bridge_Details (X=-72011.570 Y=-109054.547 Z=10866.852)
+    "wood_bridge_scraps_12" : base_id + 1396, # ItemPickup117_5 Bridge_Details (X=-72862.430 Y=-106144.852 Z=10329.061)
+    "wood_bridge_scraps_13" : base_id + 1397 # ItemPickup1494567 Bridge_Details (X=-71843.117 Y=-107174.133 Z=10367.116)
+}
+
+loc_paul_mission = {
+    "museum_scraps_1" : base_id + 1398, # ItemPickup119_11 Bridge_Details (X=-69687.773 Y=-100002.406 Z=10806.339)
+    "museum_scraps_2" : base_id + 1399, # ItemPickup120_14 Bridge_Details (X=-68035.195 Y=-99480.672 Z=11049.731)
+    "museum_scraps_3" : base_id + 1400, # ItemPickup125_29 Bridge_Details (X=-66912.641 Y=-99976.750 Z=11064.357)
+    "museum_scraps_4" : base_id + 1401, # ItemPickup13532 Bridge_HouseDetails (X=-64901.117 Y=-99624.953 Z=11176.359)
+    "museum_scraps_5" : base_id + 1402, # ItemPickup121_17 Bridge_Details (X=-66082.328 Y=-98105.555 Z=11089.308)
+    "museum_scraps_6" : base_id + 1403, # ItemPickup21765 Bridge_HouseDetails (X=-67402.742 Y=-97735.133 Z=11153.927)
+    "museum_scraps_7" : base_id + 1404, # ItemPickup124_26 Bridge_Details (X=-66716.031 Y=-98282.508 Z=11195.624)
+    "museum_scraps_8" : base_id + 1405, # ItemPickup122_20 Bridge_Details (X=-66582.703 Y=-99092.461 Z=11630.082)
+    "museum_scraps_9" : base_id + 1406, # ItemPickup123_23 Bridge_Details (X=-66798.164 Y=-99550.266 Z=11547.321)
+    "museum_scraps_10" : base_id + 1407, # ItemPickup183423 Bridge_HouseDetails (X=-66850.336 Y=-99682.844 Z=11543.618)
+    "museum_scraps_11" : base_id + 1408, # ItemPickup244_40 Mine2_OutsideDetails (X=-60156.828 Y=-98516.953 Z=11811.422)
+    "museum_scraps_12" : base_id + 1409, # ItemPickup245_43 Mine2_OutsideDetails (X=-61195.203 Y=-98262.422 Z=11779.118)
+    "museum_paul_mission_start" : base_id + 1410, # (dialog 6) -> remote_explosive (x8)
+    "museum_paul_mission_end" : base_id + 1411 # (dialog 3) -> temple_key
+}
+
+loc_gertrude_mission = {
+    "refuge_gertrude_mission_start" : base_id + 1412, # (dialog 4) -> broken_bob
+    "refuge_gertrude_scraps_1" : base_id + 1413, # ItemPickup100_8 Bob_NPCHouseMain (X=-72525.500 Y=-89333.734 Z=9820.663)
+    "refuge_gertrude_scraps_2" : base_id + 1414, # ItemPickup98_2 Bob_NPCHouseMain (X=-74870.758 Y=-88576.641 Z=9836.814)
+    "refuge_gertrude_scraps_3" : base_id + 1415, # ItemPickup22_1 Bob_NPCHouseDetails (X=-76193.914 Y=-88038.836 Z=9818.776)
+    "refuge_gertrude_scraps_4" : base_id + 1416, # ItemPickup99_5 Bob_NPCHouseMain (X=-74494.859 Y=-87609.969 Z=9837.866)
+    "refuge_gertrude_scraps_5" : base_id + 1417 # ItemPickup23_3 Bob_NPCHouseDetails (X=-74826.930 Y=-88402.039 Z=9929.854)
+}
+
+loc_west_beach = {
+    "west_beach_chest_scraps_1" : base_id + 1418, # ItemPickup9122346 Secret11_Details (X=-85934.047 Y=-89532.547 Z=7383.054)
+    "west_beach_chest_scraps_2" : base_id + 1419, # ItemPickup84 Secret11_Details (X=-85933.977 Y=-89532.977 Z=7369.364)
+    "west_beach_chest_scraps_3" : base_id + 1420, # ItemPickup9099877 Secret11_Details (X=-85951.000 Y=-89527.023 Z=7367.054)
+    "west_beach_chest_scraps_4" : base_id + 1421, # ItemPickup89086423 Secret11_Details (X=-85932.461 Y=-89533.148 Z=7354.001)
+    "west_beach_chest_scraps_5" : base_id + 1422, # ItemPickup83 Secret11_Details (X=-85950.930 Y=-89527.453 Z=7353.365)
+    "west_beach_chest_scraps_6" : base_id + 1423, # ItemPickup82_2 Secret11_Details (X=-85932.391 Y=-89533.578 Z=7340.312)
+    "west_beach_scraps_1" : base_id + 1424, # ItemPickup87_13 Secret11_Details (X=-84489.945 Y=-91235.977 Z=8360.803)
+    "west_beach_scraps_2" : base_id + 1425, # ItemPickup349_2 Secret11_Details1 (X=-84386.320 Y=-90391.789 Z=8376.434)
+    "west_beach_scraps_3" : base_id + 1426, # ItemPickup86_10 Secret11_Details (X=-84714.773 Y=-89876.992 Z=7707.064)
+    "west_beach_scraps_4" : base_id + 1427, # ItemPickup350_5 Secret11_Details1 (X=-85478.672 Y=-90648.414 Z=7708.377)
+    "west_beach_scraps_5" : base_id + 1428, # ItemPickup85_7 Secret11_Details (X=-86276.633 Y=-90674.289 Z=7532.364)
+    "west_beach_scraps_6" : base_id + 1429, # ItemPickup88_16 Secret11_Details (X=-84363.055 Y=-87497.938 Z=7582.647)
+    "west_beach_scraps_7" : base_id + 1430, # ItemPickup351_8 Secret11_Details1 (X=-86556.266 Y=-89748.484 Z=7297.274)
+    "west_beach_scraps_8" : base_id + 1431 # ItemPickup352_11 Secret11_Details1 (X=-83210.836 Y=-92551.953 Z=8460.213)
+}
+
+loc_church = {
+    "church_paint_can_black" : base_id + 1432, # PaintCan_4 Secret5_ChurchDetails (X=-67628.172 Y=-83801.375 Z=9865.983)
+    "church_scraps_1" : base_id + 1433, # ItemPickup391_11 Secret5_ChurchDetails (X=-64009.039 Y=-84252.156 Z=10258.335)
+    "church_scraps_2" : base_id + 1434, # ItemPickup389_5 Secret5_ChurchDetails (X=-66870.719 Y=-85202.180 Z=9843.936)
+    "church_scraps_3" : base_id + 1435, # ItemPickup388_2 Secret5_ChurchDetails (X=-68588.352 Y=-84041.867 Z=9790.541)
+    "church_scraps_4" : base_id + 1436, # ItemPickup396_26 Secret5_ChurchDetails (X=-67595.797 Y=-82120.094 Z=9818.303)
+    "church_scraps_5" : base_id + 1437, # ItemPickup390_8 Secret5_ChurchDetails (X=-67291.000 Y=-83324.836 Z=9774.942)
+    "church_scraps_6" : base_id + 1438, # ItemPickup392_14 Secret5_ChurchDetails (X=-65849.070 Y=-80676.477 Z=9895.943)
+    "church_scraps_7" : base_id + 1439, # ItemPickup395_23 Secret5_ChurchDetails (X=-65170.266 Y=-79155.227 Z=9904.275)
+    "church_scraps_8" : base_id + 1440, # ItemPickup24_4 Secret5_GraveyardMain (X=-64837.563 Y=-80885.305 Z=9906.755)
+    "church_scraps_9" : base_id + 1441, # ItemPickup22_3 Secret5_ChurchDetails (X=-68248.359 Y=-83578.008 Z=9807.300)
+    "church_scraps_10" : base_id + 1442, # ItemPickup23_5 Secret5_ChurchDetails (X=-67086.102 Y=-84605.086 Z=9805.521)
+    "church_scraps_11" : base_id + 1443, # ItemPickup393_17 Secret5_ChurchDetails (X=-67901.930 Y=-83477.625 Z=9812.613)
+    "church_scraps_12" : base_id + 1444 # ItemPickup394_20 Secret5_ChurchDetails (X=-65834.344 Y=-84192.102 Z=9987.823)
+}
+
+loc_refuge_gale_mission = {
+    "refuge_gale_mission_start" : base_id + 1445, # (dialog 10) -> mountain_ruin_key
+    "refuge_gale_scraps_1" : base_id + 1446, # ItemPickup15_3 Mine3_NPCHouse (X=-74407.695 Y=-81781.250 Z=10120.775)
+    "refuge_gale_scraps_2" : base_id + 1447, # ItemPickup283_5 Mine3_NPCHouseDetails (X=-73784.695 Y=-79414.359 Z=10128.285)
+    "refuge_gale_scraps_3" : base_id + 1448, # ItemPickup13_1 Mine3_NPCHouse (X=-73992.391 Y=-78600.094 Z=10162.495)
+    "refuge_gale_scraps_4" : base_id + 1449, # ItemPickup284_8 Mine3_NPCHouseDetails (X=-71623.000 Y=-75998.023 Z=10275.477)
+    "refuge_gale_scraps_5" : base_id + 1450 # ItemPickup282_2 Mine3_NPCHouseDetails (X=-72626.453 Y=-79391.070 Z=10211.037)
+}
+
+loc_caravan = {
+    "caravan_scraps_1" : base_id + 1451, # ItemPickup348_11 Secret10_PAth (X=-52638.109 Y=-43924.395 Z=10579.809)
+    "caravan_scraps_2" : base_id + 1452, # ItemPickup347_8 Secret10_PAth (X=-50203.695 Y=-42865.672 Z=10778.871)
+    "caravan_scraps_3" : base_id + 1453, # ItemPickup346_5 Secret10_PAth (X=-48467.738 Y=-42018.488 Z=10818.758)
+    "caravan_scraps_4" : base_id + 1454, # ItemPickup77_14 Secret10_Details (X=-46325.219 Y=-41707.512 Z=11003.229)
+    "caravan_scraps_5" : base_id + 1455, # ItemPickup345_2 Secret10_PAth (X=-44557.043 Y=-40652.930 Z=11076.221)
+    "caravan_scraps_6" : base_id + 1456, # ItemPickup76_11 Secret10_Details (X=-43380.664 Y=-38207.152 Z=11165.370)
+    "caravan_scraps_7" : base_id + 1457, # ItemPickup73_2 Secret10_Details (X=-42919.410 Y=-38797.738 Z=11265.633)
+    "caravan_scraps_8" : base_id + 1458, # ItemPickup74_5 Secret10_Details (X=-42787.523 Y=-38601.820 Z=11254.003)
+    "caravan_scraps_9" : base_id + 1459, # ItemPickup75_8 Secret10_Details (X=-42711.363 Y=-39141.523 Z=11173.905)
+    "caravan_chest_scraps_1" : base_id + 1460, # ItemPickup71561 Secret10_Details (X=-42910.668 Y=-38297.309 Z=11233.402)
+    "caravan_chest_scraps_2" : base_id + 1461, # ItemPickup078654 Secret10_Details (X=-42904.344 Y=-38307.332 Z=11219.678)
+    "caravan_chest_scraps_3" : base_id + 1462, # ItemPickup02345 Secret10_Details (X=-42904.965 Y=-38280.383 Z=11208.191)
+    "caravan_chest_scraps_4" : base_id + 1463, # ItemPickup-6546483648 Secret10_Details (X=-42911.680 Y=-38315.254 Z=11204.225)
+    "caravan_chest_scraps_5" : base_id + 1464 #  ItemPickup176752623547 Secret10_Details (X=-42905.090 Y=-38279.828 Z=11192.738)
+}
+
+loc_trailer_house = {
+    "trailer_house_scraps_1" : base_id + 1465, # ItemPickup493_17 TrailerCabin_Details (X=-50702.449 Y=-38850.020 Z=10810.316)
+    "trailer_house_scraps_2" : base_id + 1466, # ItemPickup489_5 TrailerCabin_Details (X=-51365.684 Y=-38502.379 Z=10875.761)
+    "trailer_house_scraps_3" : base_id + 1467, # ItemPickup491_11 TrailerCabin_Details (X=-52397.570 Y=-37530.145 Z=10873.624)
+    "trailer_house_scraps_4" : base_id + 1468, # ItemPickup490_8 TrailerCabin_Details (X=-50625.746 Y=-37916.758 Z=10886.909)
+    "trailer_house_scraps_5" : base_id + 1469, # ItemPickup488_2 TrailerCabin_Details (X=-51201.051 Y=-37467.137 Z=10910.795)
+    "trailer_house_scraps_6" : base_id + 1470 # ItemPickup492_14 TrailerCabin_Details (X=-51891.320 Y=-40549.492 Z=10675.211)
+}
+
+loc_ronny_mission = {
+    "towers_ronny_scraps_1" : base_id + 1471, # ItemPickup486_32 Towers_Environment_Details (X=-24434.766 Y=-25708.373 Z=11200.865)
+    "towers_ronny_scraps_2" : base_id + 1472, # ItemPickup483_23 Towers_Environment_Details (X=-20970.262 Y=-25678.754 Z=11731.241)
+    "towers_ronny_scraps_3" : base_id + 1473, # ItemPickup481_17 Towers_Environment_Details (X=-19812.230 Y=-27768.301 Z=12051.623)
+    "towers_ronny_scraps_4" : base_id + 1474, # ItemPickup484_26 Towers_Environment_Details (X=-19940.912 Y=-25411.576 Z=12035.366)
+    "towers_ronny_scraps_5" : base_id + 1475, # ItemPickup41_17 Towers_Environment (X=-18596.791 Y=-25100.035 Z=12290.350)
+    "towers_ronny_scraps_6" : base_id + 1476, # ItemPickup482_20 Towers_Environment_Details (X=-23302.396 Y=-23270.324 Z=12036.164)
+    "towers_ronny_scraps_7" : base_id + 1477, # ItemPickup487_35 Towers_Environment_Details (X=-22955.039 Y=-27576.859 Z=11211.258)
+    "towers_ronny_scraps_8" : base_id + 1478, # ItemPickup478_8 Towers_Environment_Details (X=-21485.520 Y=-29634.893 Z=11787.103)
+    "towers_ronny_scraps_9" : base_id + 1479, # ItemPickup477_5 Towers_Environment_Details (X=-23667.957 Y=-29825.240 Z=12035.269)
+    "towers_ronny_scraps_10" : base_id + 1480, # ItemPickup39_11 Towers_Environment (X=-25361.008 Y=-29794.301 Z=12026.073)
+    "towers_ronny_scraps_11" : base_id + 1481, # ItemPickup476_2 Towers_Environment_Details (X=-26549.584 Y=-32768.133 Z=12289.732)
+    "towers_ronny_scraps_12" : base_id + 1482, # ItemPickup38_8 Towers_Environment (X=-27240.127 Y=-27404.748 Z=12027.208)
+    "towers_ronny_scraps_13" : base_id + 1483, # ItemPickup40_14 Towers_Environment (X=-23231.639 Y=-27799.158 Z=11829.792)
+    "towers_ronny_scraps_14" : base_id + 1484, # ItemPickup485_29 Towers_Environment_Details (X=-22949.568 Y=-26146.012 Z=11702.730)
+    "towers_ronny_scraps_15" : base_id + 1485, # ItemPickup479_11 Towers_Environment_Details (X=-19726.715 Y=-32464.682 Z=12118.678)
+    "towers_ronny_scraps_16" : base_id + 1486, # ItemPickup1366543 Tower_BuildingsExteriorDetails (X=-23495.104 Y=-27644.689 Z=11872.844)
+    "towers_ronny_scraps_17" : base_id + 1487, # ItemPickup139978 Tower_BuildingsExteriorDetails (X=-23512.971 Y=-27493.051 Z=12218.543)
+    "towers_ronny_scraps_18" : base_id + 1488, # ItemPickup42_20 Towers_Environment (X=-22731.439 Y=-26331.393 Z=12102.758)
+    "towers_ronny_scraps_19" : base_id + 1489, # ItemPickup131123 Tower_BuildingsExteriorDetails (X=-22599.641 Y=-26454.590 Z=11752.040)
+    "towers_ronny_scraps_20" : base_id + 1490, # ItemPickup196987 Tower_BuildingsExteriorDetails (X=-22589.721 Y=-26397.414 Z=12571.282)
+    "towers_ronny_scraps_21" : base_id + 1491, # ItemPickup138787 Tower_BuildingsExteriorDetails (X=-22163.268 Y=-26775.938 Z=13107.048)
+    "towers_ronny_scraps_22" : base_id + 1492, # ItemPickup43_23 Towers_Environment (X=-21996.184 Y=-26754.393 Z=13105.997)
+    "towers_ronny_scraps_23" : base_id + 1493, # ItemPickup837454 Tower_BuildingsExteriorDetails (X=-24068.221 Y=-27874.443 Z=12819.666)
+    "towers_ronny_scraps_24" : base_id + 1494, # ItemPickup44_29 Towers_Environment (X=-23525.330 Y=-27770.035 Z=12612.871)
+    "towers_ronny_scraps_25" : base_id + 1495, # ItemPickup18932 Tower_BuildingsExteriorDetails (X=-23472.215 Y=-27617.404 Z=13213.256)
+    "towers_ronny_scraps_26" : base_id + 1496, # ItemPickup188348 Tower_BuildingsExteriorDetails (X=-23981.588 Y=-27984.385 Z=13219.854)
+    "towers_ronny_scraps_27" : base_id + 1497, # ItemPickup480_14 Towers_Environment_Details (X=-18696.230 Y=-34511.277 Z=12704.238)
+    "towers_ronny_paint_can_lime" : base_id + 1498, # PaintCan_2 Towers_BuildingsDetails (X=-22288.555 Y=-26022.281 Z=11835.892) \!/ Existing match 5
+    "towers_ronny_employment_contracts" : base_id + 1499, # Towers_Files_Pickup Tower_BuildingsExteriorDetails (X=-24081.414 Y=-27637.459 Z=13679.163)
+    "towers_ronny_mission_end" : base_id + 1500 # (dialog 3) -> 1_scraps_reward
+}
+
+loc_north_beach = {
+    "north_beach_chest_scraps_1" : base_id + 1501, # ItemPickup9254 Secret3_CampDetails (X=-74444.648 Y=-130627.672 Z=8793.757)
+    "north_beach_chest_scraps_2" : base_id + 1502, # ItemPickup14523 Secret3_CampDetails (X=-74426.539 Y=-130626.547 Z=8781.948)
+    "north_beach_chest_scraps_3" : base_id + 1503, # ItemPickup084537 Secret3_CampDetails (X=-74448.852 Y=-130632.367 Z=8772.555)
+    "north_beach_chest_scraps_4" : base_id + 1504, # ItemPickup17754234 Secret3_CampDetails (X=-74425.523 Y=-130622.875 Z=8755.526)
+    "north_beach_scraps_1" : base_id + 1505, # ItemPickup376_5 Secret3_CampDetails (X=-75003.078 Y=-131084.016 Z=8729.731)
+    "north_beach_scraps_2" : base_id + 1506, # ItemPickup378_11 Secret3_CampDetails (X=-75477.758 Y=-129413.750 Z=9082.617)
+    "north_beach_scraps_3" : base_id + 1507, # ItemPickup377_8 Secret3_CampDetails (X=-75608.453 Y=-130483.430 Z=8909.659)
+    "north_beach_scraps_4" : base_id + 1508, # ItemPickup375_2 Secret3_CampDetails (X=-74143.469 Y=-131117.953 Z=8752.130)
+    "north_beach_scraps_5" : base_id + 1509, # ItemPickup387_6 Secret4_BeachHouseMain (X=-80847.078 Y=-135628.719 Z=7915.444)
+    "north_beach_scraps_6" : base_id + 1510, # ItemPickup386_3 Secret4_BeachHouseMain (X=-84044.789 Y=-137591.000 Z=7359.172)
+    "north_beach_scraps_7" : base_id + 1511, # ItemPickup379_2 Secret4_BeachHouseDetails (X=-83992.836 Y=-132933.531 Z=7941.225)
+    "north_beach_scraps_8" : base_id + 1512, # ItemPickup380_5 Secret4_BeachHouseDetails (X=-87355.734 Y=-134216.438 Z=7237.310)
+    "north_beach_scraps_9" : base_id + 1513, # ItemPickup384_17 Secret4_BeachHouseDetails (X=-89213.844 Y=-134625.922 Z=7185.133)
+    "north_beach_scraps_10" : base_id + 1514, # ItemPickup25_0 Secret4_BeachHouseDetails (X=-88423.430 Y=-135922.969 Z=7290.801)
+    "north_beach_scraps_11" : base_id + 1515, # ItemPickup381_8 Secret4_BeachHouseDetails (X=-87668.977 Y=-136850.359 Z=7275.346)
+    "north_beach_scraps_12" : base_id + 1516, # ItemPickup383_14 Secret4_BeachHouseDetails (X=-90241.328 Y=-136381.000 Z=7199.622)
+    "north_beach_scraps_13" : base_id + 1517, # ItemPickup27_8 Secret4_BeachHouseDetails (X=-91728.680 Y=-135288.203 Z=7319.699)
+    "north_beach_scraps_14" : base_id + 1518, # ItemPickup26_2 Secret4_BeachHouseDetails (X=-88789.039 Y=-135461.719 Z=7305.800)
+    "north_beach_scraps_15" : base_id + 1519, # ItemPickup382_11 Secret4_BeachHouseDetails (X=-88572.078 Y=-135970.734 Z=7302.674)
+    "north_beach_paint_can_teal" : base_id + 1520 # PaintCan_2 Secret4_BeachHouseDetails (X=-91706.805 Y=-134988.453 Z=7347.827) \!/ Existing match 5
+    # "north_beach_scraps_glitch_1" ItemPickup385_20 (X=-77651.938 Y=-139721.453 Z=7261.729) /!\ Glitched scrap
+}
+
+loc_mine_shaft = {
+    "mine_shaft_chest_scraps_1" : base_id + 1521, # ItemPickup0934569 Secret13_Details (X=-17360.789 Y=-74064.367 Z=8038.313)
+    "mine_shaft_chest_scraps_2" : base_id + 1522, # ItemPickup17234455622 Secret13_Details (X=-17360.814 Y=-74064.367 Z=8024.187)
+    "mine_shaft_chest_scraps_3" : base_id + 1523, # ItemPickup856743 Secret13_Details (X=-17361.059 Y=-74049.234 Z=8015.940)
+    "mine_shaft_chest_scraps_4" : base_id + 1524, # ItemPickup16456456 Secret13_Details (X=-17336.465 Y=-74087.063 Z=8009.707)
+    "mine_shaft_chest_scraps_5" : base_id + 1525, # ItemPickup234743 Secret13_Details (X=-17349.941 Y=-74075.484 Z=8004.179)
+    "mine_shaft_chest_scraps_6" : base_id + 1526, # ItemPickup1434563456 Secret13_Details (X=-17361.084 Y=-74049.234 Z=8001.814)
+    "mine_shaft_chest_scraps_7" : base_id + 1527, # ItemPickup13634563456 Secret13_Details (X=-17349.967 Y=-74075.484 Z=7990.054)
+    "mine_shaft_scraps_1" : base_id + 1528, # ItemPickup369_23 Secret13_Details (X=-16985.645 Y=-70377.273 Z=10837.127)
+    "mine_shaft_scraps_2" : base_id + 1529, # ItemPickup368_20 Secret13_Details (X=-18292.045 Y=-71003.563 Z=10975.308)
+    "mine_shaft_scraps_3" : base_id + 1530, # ItemPickup367_17 Secret13_Details (X=-16150.797 Y=-72075.289 Z=10609.141)
+    "mine_shaft_scraps_4" : base_id + 1531, # ItemPickup24456463 Secret13_EntranceDetails1 (X=-18404.480 Y=-71894.367 Z=10968.230)
+    "mine_shaft_scraps_5" : base_id + 1532, # ItemPickup2565644 Secret13_Details (X=-17777.268 Y=-71467.172 Z=10441.745)
+    "mine_shaft_scraps_6" : base_id + 1533, # ItemPickup366_14 Secret13_Details (X=-17630.971 Y=-72800.641 Z=8842.322)
+    "mine_shaft_scraps_7" : base_id + 1534, # ItemPickup18_8 Secret13_Details (X=-17979.719 Y=-73413.563 Z=8118.260)
+    "mine_shaft_scraps_8" : base_id + 1535, # ItemPickup21_11 Secret13_Details (X=-16554.467 Y=-74139.781 Z=7892.738)
+    "mine_shaft_scraps_9" : base_id + 1536, # ItemPickup365_11 Secret13_Details (X=-16343.033 Y=-74617.555 Z=7298.177)
+    "mine_shaft_scraps_10" : base_id + 1537, # ItemPickup22123 Secret13_Details (X=-12390.332 Y=-77620.320 Z=7324.504)
+    "mine_shaft_scraps_11" : base_id + 1538, # ItemPickup364_8 Secret13_Details (X=-10969.702 Y=-77961.477 Z=7297.171)
+    "mine_shaft_scraps_12" : base_id + 1539, # ItemPickup363_5 Secret13_Details (X=-9888.596 Y=-78208.930 Z=7269.473)
+    "mine_shaft_scraps_13" : base_id + 1540, # ItemPickup362_2 Secret13_Details (X=-8865.696 Y=-79063.977 Z=7247.677)
+    "mine_shaft_scraps_14" : base_id + 1541 # ItemPickup238976 Secret13_ExitDetails (X=-8143.984 Y=-79764.617 Z=7222.096)
+}
+
+loc_mob_camp = {
+    "mob_camp_key" : base_id + 1542, # ItemPickup29_0 Bob_CampDetails2 (X=-29114.480 Y=-53608.520 Z=12839.528)
+    "mob_camp_scraps_1" : base_id + 1543, # ItemPickup25_5 Bob_CampDetails2 (X=-27373.525 Y=-53008.668 Z=12706.465)
+    "mob_camp_scraps_2" : base_id + 1544, # ItemPickup26_1 Bob_CampDetails2 (X=-28786.941 Y=-53009.762 Z=12760.727)
+    "mob_camp_scraps_3" : base_id + 1545, # ItemPickup13_14 Mine3_Mountain (X=-29650.207 Y=-53328.070 Z=12724.598)
+    "mob_camp_scraps_4" : base_id + 1546, # ItemPickup90_5 Bob_CampDetails2 (X=-31515.057 Y=-55533.324 Z=12344.274)
+    "mob_camp_scraps_5" : base_id + 1547, # ItemPickup49513294 Mine3_Mountain (X=-31847.229 Y=-55152.352 Z=11574.255)
+    "mob_camp_scraps_6" : base_id + 1548, # ItemPickup92_14 Bob_CampDetails2 (X=-31323.533 Y=-55432.871 Z=11245.139)
+    "mob_camp_scraps_7" : base_id + 1549, # ItemPickup91_8 Bob_CampDetails2 (X=-31583.443 Y=-55475.805 Z=11234.112)
+    "mob_camp_scraps_8" : base_id + 1550, # ItemPickup95_23 Bob_CampDetails2 (X=-32925.406 Y=-57157.605 Z=11086.322)
+    "mob_camp_scraps_9" : base_id + 1551, # ItemPickup96_26 Bob_CampDetails2 (X=-33052.488 Y=-58560.098 Z=11101.021)
+    "mob_camp_scraps_10" : base_id + 1552, # ItemPickup13121212 Mine3_Mountain (X=-32422.406 Y=-60145.063 Z=11203.182)
+    "mob_camp_scraps_11" : base_id + 1553, # ItemPickup93_17 Bob_CampDetails2 (X=-30891.457 Y=-60046.465 Z=11237.567)
+    "mob_camp_scraps_12" : base_id + 1554, # ItemPickup97_29 Bob_CampDetails2 (X=-31888.428 Y=-59222.645 Z=11179.302)
+    "mob_camp_scraps_13" : base_id + 1555, # ItemPickup62156 Mine3_Mountain (X=-31161.750 Y=-57410.789 Z=11279.820)
+    "mob_camp_scraps_14" : base_id + 1556, # ItemPickup24_3 Bob_CampDetails2 (X=-31256.545 Y=-59865.809 Z=11904.155)
+    "mob_camp_scraps_15" : base_id + 1557, # ItemPickup27_0 Bob_CampDetails2 (X=-31757.953 Y=-57179.258 Z=11295.150)
+    "mob_camp_scraps_16" : base_id + 1558, # ItemPickup89_2 Bob_CampDetails2 (X=-29137.043 Y=-54824.797 Z=12418.673)
+    "mob_camp_scraps_17" : base_id + 1559, # ItemPickup94_20 Bob_CampDetails2 (X=-31736.459 Y=-59761.465 Z=11211.379)
+    "mob_camp_scraps_18" : base_id + 1560, # ItemPickup28_14 Bob_CampDetails2 (X=-32150.889 Y=-59879.594 Z=11297.058)
+    "mob_camp_stolen_bob" : base_id + 1561 # Bob_Clickbox (X=-31771.172 Y=-59892.449 Z=11323.562)
+}
+
+loc_mine_elevator_exit = {
+    "mine_elevator_exit_scraps_1" : base_id + 1562, # ItemPickup266_19 Mine3_ExitCampDetails (X=-29587.271 Y=-42650.797 Z=12515.042)
+    "mine_elevator_exit_scraps_2" : base_id + 1563, # ItemPickup265_16 Mine3_ExitCampDetails (X=-30727.555 Y=-42715.438 Z=12485.763)
+    "mine_elevator_exit_scraps_3" : base_id + 1564, # ItemPickup267_22 Mine3_ExitCampDetails (X=-29814.680 Y=-43722.777 Z=12518.878)
+    "mine_elevator_exit_scraps_4" : base_id + 1565, # ItemPickup261_2 Mine3_ExitCampDetails (X=-30983.000 Y=-42943.754 Z=12474.396)
+    "mine_elevator_exit_scraps_5" : base_id + 1566, # ItemPickup262_5 Mine3_ExitCampDetails (X=-31824.576 Y=-43997.270 Z=12345.908)
+    "mine_elevator_exit_scraps_6" : base_id + 1567, # ItemPickup268_25 Mine3_ExitCampDetails (X=-32553.924 Y=-44761.855 Z=12341.698)
+    "mine_elevator_exit_scraps_7" : base_id + 1568, # ItemPickup263_10 Mine3_ExitCampDetails (X=-33598.023 Y=-44369.297 Z=12438.430)
+    "mine_elevator_exit_scraps_8" : base_id + 1569, # ItemPickup264_13 Mine3_ExitCampDetails (X=-31947.459 Y=-42017.137 Z=12384.311)
+    "mine_elevator_exit_scraps_9" : base_id + 1570 # ItemPickup269_28 Mine3_ExitCampDetails (X=-30127.123 Y=-46004.891 Z=12229.104)
+}
+
+loc_mountain_ruin_outside = {
+    "mountain_ruin_outside_scraps_1" : base_id + 1571, # ItemPickup112345556 Mine3_Outside (X=-2218.456 Y=-43914.789 Z=11238.952)
+    "mountain_ruin_outside_scraps_2" : base_id + 1572, # ItemPickup35621 Mine3_Outside (X=-2402.206 Y=-45494.766 Z=11244.650)
+    "mountain_ruin_outside_scraps_3" : base_id + 1573, # ItemPickup13000 Mine3_Outside (X=-2781.385 Y=-47365.313 Z=11235.389)
+    "mountain_ruin_outside_scraps_4" : base_id + 1574, # ItemPickup995959 Mine3_Outside (X=-2961.431 Y=-45445.973 Z=11255.289)
+    "mountain_ruin_outside_scraps_5" : base_id + 1575, # ItemPickup136999 Mine3_Outside (X=-5873.435 Y=-46300.633 Z=11228.667)
+    "mountain_ruin_outside_scraps_6" : base_id + 1576, # ItemPickup1589994 Mine3_Outside (X=-1823.357 Y=-47071.813 Z=11161.523)
+    "mountain_ruin_outside_scraps_7" : base_id + 1577, # ItemPickup09871230948 Mine3_Outside (X=-3478.155 Y=-49094.965 Z=11083.230)
+    "mountain_ruin_outside_scraps_8" : base_id + 1578, # ItemPickup258_20 Mine3_Camp (X=-4606.678 Y=-50246.180 Z=11613.938)
+    "mountain_ruin_outside_scraps_9" : base_id + 1579, # ItemPickup257_17 Mine3_Camp (X=-5454.638 Y=-53508.004 Z=12062.944)
+    "mountain_ruin_outside_scraps_10" : base_id + 1580, # ItemPickup18_3 Mine3_Camp (X=-8192.042 Y=-53726.535 Z=11947.394)
+    "mountain_ruin_outside_scraps_11" : base_id + 1581, # ItemPickup252_2 Mine3_Camp (X=-9409.834 Y=-53970.621 Z=11923.256)
+    "mountain_ruin_outside_scraps_12" : base_id + 1582, # ItemPickup254_8 Mine3_Camp (X=-8977.424 Y=-57134.637 Z=12232.596)
+    "mountain_ruin_outside_scraps_13" : base_id + 1583, # ItemPickup19_1 Mine3_Camp (X=-10449.292 Y=-56481.938 Z=12274.706)
+    "mountain_ruin_outside_scraps_14" : base_id + 1584, # ItemPickup255_11 Mine3_Camp (X=-10490.690 Y=-56584.301 Z=12281.096)
+    "mountain_ruin_outside_scraps_15" : base_id + 1585, # ItemPickup256_14 Mine3_Camp (X=-11600.937 Y=-55831.191 Z=12388.329)
+    "mountain_ruin_outside_scraps_16" : base_id + 1586, # ItemPickup259_23 Mine3_Camp (X=-3307.077 Y=-49973.461 Z=11282.041)
+    "mountain_ruin_outside_scraps_17" : base_id + 1587 # ItemPickup260_26 Mine3_Camp (X=-8878.345 Y=-49816.922 Z=13700.768)
+}
+
+loc_mountain_ruin_inside = {
+    "mountain_ruin_inside_scraps_1" : base_id + 1588, # ItemPickup253_5 Mine3_Camp (X=-10647.446 Y=-52039.848 Z=11925.344)
+    "mountain_ruin_inside_scraps_2" : base_id + 1589, # ItemPickup270_2 Mine3_Interior1 (X=-12834.990 Y=-48683.176 Z=10200.083)
+    "mountain_ruin_inside_scraps_3" : base_id + 1590, # ItemPickup271_5 Mine3_Interior1 (X=-15748.594 Y=-44925.523 Z=10199.975)
+    "mountain_ruin_inside_scraps_4" : base_id + 1591, # ItemPickup20_3 Mine3_Interior1 (X=-15312.152 Y=-43957.055 Z=10350.783)
+    "mountain_ruin_inside_scraps_5" : base_id + 1592, # ItemPickup273_11 Mine3_Interior1 (X=-16709.586 Y=-44997.316 Z=10198.888)
+    "mountain_ruin_inside_scraps_6" : base_id + 1593, # ItemPickup272_8 Mine3_Interior1 (X=-17412.561 Y=-46041.977 Z=10349.650)
+    "mountain_ruin_inside_scraps_7" : base_id + 1594, # ItemPickup274_14 Mine3_Interior1 (X=-17452.596 Y=-43804.941 Z=10201.436)
+    "mountain_ruin_inside_scraps_8" : base_id + 1595, # ItemPickup21_2 Mine3_Interior1 (X=-18119.473 Y=-42001.453 Z=10198.855)
+    "mountain_ruin_inside_scraps_9" : base_id + 1596, # ItemPickup276_20 Mine3_Interior1 (X=-18975.068 Y=-42906.488 Z=10279.690)
+    "mountain_ruin_inside_scraps_10" : base_id + 1597, # ItemPickup277_26 Mine3_Interior1 (X=-19727.902 Y=-41581.039 Z=10199.614)
+    "mountain_ruin_inside_scraps_11" : base_id + 1598, # ItemPickup275_17 Mine3_Interior1 (X=-19187.891 Y=-40516.941 Z=10201.049)
+    "mountain_ruin_inside_scraps_12" : base_id + 1599, # ItemPickup278_29 Mine3_Interior1 (X=-22470.986 Y=-41602.875 Z=10073.847)
+    "mountain_ruin_inside_scraps_13" : base_id + 1600, # ItemPickup279_2 Mine3_Interior2 (X=-23717.383 Y=-42597.141 Z=7455.452)
+    "mountain_ruin_inside_scraps_14" : base_id + 1601, # ItemPickup22_7 Mine3_Interior2 (X=-24494.582 Y=-44598.086 Z=7433.633)
+    "mountain_ruin_inside_scraps_15" : base_id + 1602, # ItemPickup280_5 Mine3_Interior2 (X=-26783.293 Y=-42331.145 Z=7446.357)
+    "mountain_ruin_inside_scraps_16" : base_id + 1603, # ItemPickup281_8 Mine3_Interior2 (X=-28636.996 Y=-46745.340 Z=7430.463)
+    "mountain_ruin_inside_scraps_17" : base_id + 1604, # ItemPickup23_1 Mine3_Interior2 (X=-27752.643 Y=-47453.973 Z=7445.047)
+    "mountain_ruin_inside_red_egg" : base_id + 1605, # Mine3_EggPickup Mine3_Interior2 (X=-28254.400 Y=-45702.844 Z=7551.568)
+    "mountain_ruin_inside_paint_can_red" : base_id + 1606 # PaintCan_2 Mine3_Interior2 (X=-31391.293 Y=-44953.223 Z=7448.648) \!/ Existing match 5
+}
+
+loc_field_pickle_lady_mission = {
+    "field_pickle_lady_scraps_1" : base_id + 1607, # ItemPickup56_2 Pickles_HouseDetails (X=60402.582 Y=25252.434 Z=11151.982)
+    "field_pickle_lady_scraps_2" : base_id + 1608, # ItemPickup57_5 Pickles_HouseDetails (X=58717.516 Y=24457.180 Z=11343.938)
+    "field_pickle_lady_scraps_3" : base_id + 1609, # ItemPickup311_14 Pickles_EnvironmentDetails (X=56455.688 Y=22324.875 Z=11655.192)
+    "field_pickle_lady_scraps_4" : base_id + 1610, # ItemPickup310_11 Pickles_EnvironmentDetails (X=52888.387 Y=22541.955 Z=12428.012)
+    "field_pickle_lady_scraps_5" : base_id + 1611, # ItemPickup58_2 Pickles_EnvironmentDetails (X=50374.863 Y=22073.027 Z=12591.468)
+    "field_pickle_lady_scraps_6" : base_id + 1612, # ItemPickup309_8 Pickles_EnvironmentDetails (X=45985.988 Y=23063.826 Z=13043.497)
+    "field_pickle_lady_scraps_7" : base_id + 1613, # ItemPickup316_27 Pickles_EnvironmentDetails (X=45533.469 Y=24876.168 Z=13015.539)
+    "field_pickle_lady_scraps_8" : base_id + 1614, # ItemPickup317_30 Pickles_EnvironmentDetails (X=44928.848 Y=30913.396 Z=14273.230)
+    "field_pickle_lady_scraps_9" : base_id + 1615, # ItemPickup321_42 Pickles_EnvironmentDetails (X=41572.684 Y=37403.539 Z=13527.379)
+    "field_pickle_lady_scraps_10" : base_id + 1616, # ItemPickup61_11 Pickles_EnvironmentDetails (X=42266.566 Y=30556.238 Z=13584.196)
+    "field_pickle_lady_scraps_11" : base_id + 1617, # ItemPickup314_21 Pickles_EnvironmentDetails (X=43356.219 Y=29465.746 Z=13449.486)
+    "field_pickle_lady_scraps_12" : base_id + 1618, # ItemPickup323_48 Pickles_EnvironmentDetails (X=40893.461 Y=30669.398 Z=13465.039)
+    "field_pickle_lady_scraps_13" : base_id + 1619, # ItemPickup318_33 Pickles_EnvironmentDetails (X=41276.863 Y=32313.068 Z=13480.846)
+    "field_pickle_lady_scraps_14" : base_id + 1620, # ItemPickup319_36 Pickles_EnvironmentDetails (X=38630.031 Y=30471.996 Z=13571.207)
+    "field_pickle_lady_scraps_15" : base_id + 1621, # ItemPickup320_39 Pickles_EnvironmentDetails (X=38596.938 Y=30050.293 Z=13559.574)
+    "field_pickle_lady_scraps_16" : base_id + 1622, # ItemPickup60_8 Pickles_EnvironmentDetails (X=42042.520 Y=25136.820 Z=13077.339)
+    "field_pickle_lady_scraps_17" : base_id + 1623, # ItemPickup308_5 Pickles_EnvironmentDetails (X=43770.914 Y=23307.234 Z=12374.002)
+    "field_pickle_lady_scraps_18" : base_id + 1624, # ItemPickup59_5 Pickles_EnvironmentDetails (X=44672.641 Y=20936.520 Z=12198.017)
+    "field_pickle_lady_scraps_19" : base_id + 1625, # ItemPickup307_2 Pickles_EnvironmentDetails (X=42844.730 Y=22869.387 Z=12832.900)
+    "field_pickle_lady_scraps_20" : base_id + 1626, # ItemPickup315_24 Pickles_EnvironmentDetails (X=43397.758 Y=26367.248 Z=13005.097)
+    "field_pickle_lady_scraps_21" : base_id + 1627, # ItemPickup322_45 Pickles_EnvironmentDetails (X=39352.430 Y=32668.316 Z=14494.778)
+    "field_pickle_lady_scraps_22" : base_id + 1628, # ItemPickup313 Pickles_EnvironmentDetails (X=59688.781 Y=25266.756 Z=11425.324)
+    "field_pickle_lady_scraps_23" : base_id + 1629, # ItemPickup312_17 Pickles_EnvironmentDetails (X=59197.871 Y=24760.773 Z=11425.324)
+    "field_pickle_lady_paint_can_purple" : base_id + 1630, # PaintCan_7 Pickles_EnvironmentDetails (X=40394.855 Y=31546.465 Z=13472.573)
+    "field_pickle_lady_jar_of_pickles" : base_id + 1631, # Pickles_Pickup Pickles_Cave (X=38227.535 Y=30234.848 Z=13593.506)
+    "field_pickle_lady_mission_end" : base_id + 1632 # (dialog 4) -> 30_scraps_reward
+}
+
+loc_shrine_near_temple = {
+    "shrine_near_temple_scraps_1" : base_id + 1633, # ItemPickup3 Photorealistic_Island (X=-4675.183 Y=-21143.846 Z=11984.782)
+    "shrine_near_temple_scraps_2" : base_id + 1634, # ItemPickup_2 Photorealistic_Island (X=-4994.117 Y=-20496.621 Z=11874.112)
+    "shrine_near_temple_scraps_3" : base_id + 1635 # ItemPickup2 Photorealistic_Island (X=-4196.896 Y=-20477.025 Z=11882.833)
+}
+
+loc_morse_bunker = {
+    "morse_bunker_chest_scraps_1" : base_id + 1636, # ItemPickup6512 Secret6_BunkerDetails (X=-47961.078 Y=-85433.031 Z=10615.777)
+    "morse_bunker_chest_scraps_2" : base_id + 1637, # ItemPickup9363 Secret6_BunkerDetails (X=-47958.617 Y=-85444.805 Z=10604.365)
+    "morse_bunker_chest_scraps_3" : base_id + 1638, # ItemPickup921436 Secret6_BunkerDetails (X=-47953.637 Y=-85426.172 Z=10592.347)
+    "morse_bunker_chest_scraps_4" : base_id + 1639, # ItemPickup0128704 Secret6_BunkerDetails (X=-47958.691 Y=-85444.805 Z=10587.060)
+    "morse_bunker_chest_scraps_5" : base_id + 1640, # ItemPickup64_8 Secret6_BunkerDetails (X=-47953.617 Y=-85426.172 Z=10574.149)
+    "morse_bunker_scraps_1" : base_id + 1641, # ItemPickup397_2 Secret6_BunkerDetails (X=-48336.863 Y=-85458.453 Z=10574.537)
+    "morse_bunker_scraps_2" : base_id + 1642, # ItemPickup62_2 Secret6_BunkerDetails (X=-48253.844 Y=-84944.609 Z=10573.793)
+    "morse_bunker_scraps_3" : base_id + 1643, # ItemPickup63_5 Secret6_BunkerDetails (X=-47272.422 Y=-84549.945 Z=10543.671)
+    "morse_bunker_scraps_4" : base_id + 1644, # ItemPickup398_5 Secret6_BunkerDetails (X=-47080.836 Y=-85268.281 Z=10564.355)
+    "morse_bunker_scraps_5" : base_id + 1645, # ItemPickup406_31 Secret6_BunkerDetails (X=-47913.855 Y=-85234.258 Z=10819.314)
+    "morse_bunker_scraps_6" : base_id + 1646, # ItemPickup405_28 Secret6_BunkerDetails (X=-46410.227 Y=-83293.742 Z=10361.746)
+    "morse_bunker_scraps_7" : base_id + 1647, # ItemPickup399_8 Secret6_BunkerDetails (X=-45204.199 Y=-84841.211 Z=10329.200)
+    "morse_bunker_scraps_8" : base_id + 1648, # ItemPickup401_14 Secret6_BunkerDetails (X=-43895.801 Y=-83794.750 Z=10265.661)
+    "morse_bunker_scraps_9" : base_id + 1649, # ItemPickup402_17 Secret6_BunkerDetails (X=-45163.078 Y=-80832.828 Z=10090.777)
+    "morse_bunker_scraps_10" : base_id + 1650, # ItemPickup403_20 Secret6_BunkerDetails (X=-46782.027 Y=-82284.805 Z=10289.180)
+    "morse_bunker_scraps_11" : base_id + 1651, # ItemPickup404_23 Secret6_BunkerDetails (X=-49240.047 Y=-83654.961 Z=10898.540)
+    "morse_bunker_scraps_12" : base_id + 1652, # ItemPickup407_34 Secret6_BunkerDetails (X=-46571.930 Y=-85962.773 Z=10697.339)
+    "morse_bunker_scraps_13" : base_id + 1653, # ItemPickup400_11 Secret6_BunkerDetails (X=-43472.793 Y=-85983.805 Z=10310.322)
+}
+
+loc_prism_temple = {
+    "prism_temple_chest_scraps_1" : base_id + 1654, # ItemPickup16632 MainShrine_DetailsREPAIRED (X=12659.641 Y=-27827.016 Z=10930.621)
+    "prism_temple_chest_scraps_2" : base_id + 1655, # ItemPickup148864 MainShrine_DetailsREPAIRED (X=12648.021 Y=-27825.189 Z=10916.296)
+    "prism_temple_chest_scraps_3" : base_id + 1656, # ItemPickup13123 MainShrine_DetailsREPAIRED (X=12665.557 Y=-27836.633 Z=10905.999)
+    "prism_temple_scraps_1" : base_id + 1657, # ItemPickup225_77 MainShrine_ExteriorDetails (X=5281.087 Y=-16620.387 Z=10520.609)
+    "prism_temple_scraps_2" : base_id + 1658, # ItemPickup223_71 MainShrine_ExteriorDetails (X=15032.147 Y=-16788.352 Z=10992.200)
+    "prism_temple_scraps_3" : base_id + 1659, # ItemPickup222_68 MainShrine_ExteriorDetails (X=16591.920 Y=-18725.771 Z=11004.751)
+    "prism_temple_scraps_4" : base_id + 1660, # ItemPickup135123 MainShrine_DetailsREPAIRED (X=17940.854 Y=-20726.746 Z=10999.944)
+    "prism_temple_scraps_5" : base_id + 1661, # ItemPickup220_62 MainShrine_ExteriorDetails (X=18187.346 Y=-21390.066 Z=11025.650)
+    "prism_temple_scraps_6" : base_id + 1662, # ItemPickup218_56 MainShrine_ExteriorDetails (X=19218.670 Y=-24017.619 Z=10906.966)
+    "prism_temple_scraps_7" : base_id + 1663, # ItemPickup209_29 MainShrine_ExteriorDetails (X=7710.977 Y=-23469.254 Z=11012.888)
+    "prism_temple_scraps_8" : base_id + 1664, # ItemPickup138765 MainShrine_DetailsREPAIRED (X=8160.002 Y=-22335.266 Z=11016.638)
+    "prism_temple_scraps_9" : base_id + 1665, # ItemPickup210_32 MainShrine_ExteriorDetails (X=8637.903 Y=-24295.850 Z=10929.299)
+    "prism_temple_scraps_10" : base_id + 1666, # ItemPickup1112 MainShrine_DetailsREPAIRED (X=7923.367 Y=-25204.055 Z=10832.877)
+    "prism_temple_scraps_11" : base_id + 1667, # ItemPickup214_44 MainShrine_ExteriorDetails (X=10694.420 Y=-27246.365 Z=10569.074)
+    "prism_temple_scraps_12" : base_id + 1668, # ItemPickup215_47 MainShrine_ExteriorDetails (X=12892.631 Y=-26743.068 Z=10868.578)
+    "prism_temple_scraps_13" : base_id + 1669, # ItemPickup213_41 MainShrine_ExteriorDetails (X=12483.535 Y=-27253.867 Z=10876.461)
+    "prism_temple_scraps_14" : base_id + 1670, # ItemPickup212_38 MainShrine_ExteriorDetails (X=13259.813 Y=-27092.033 Z=10887.968)
+    "prism_temple_scraps_15" : base_id + 1671, # ItemPickup211_35 MainShrine_ExteriorDetails (X=9303.245 Y=-25057.908 Z=10943.273)
+    "prism_temple_scraps_16" : base_id + 1672, # ItemPickup201_2 MainShrine_ExteriorDetails (X=11750.875 Y=-22999.371 Z=12426.734)
+    "prism_temple_scraps_17" : base_id + 1673, # ItemPickup203_8 MainShrine_ExteriorDetails (X=12966.615 Y=-23568.324 Z=12519.387)
+    "prism_temple_scraps_18" : base_id + 1674, # ItemPickup204_11 MainShrine_ExteriorDetails (X=14093.343 Y=-22393.182 Z=12426.847)
+    "prism_temple_scraps_19" : base_id + 1675, # ItemPickup206_17 MainShrine_ExteriorDetails (X=13767.980 Y=-21269.568 Z=12425.791)
+    "prism_temple_scraps_20" : base_id + 1676, # ItemPickup207_23 MainShrine_ExteriorDetails (X=12882.754 Y=-20027.527 Z=12516.095)
+    "prism_temple_scraps_21" : base_id + 1677, # ItemPickup114535 MainShrine_DetailsREPAIRED (X=11883.399 Y=-20801.344 Z=12428.452)
+    "prism_temple_scraps_22" : base_id + 1678, # ItemPickup208_26 MainShrine_ExteriorDetails (X=13281.792 Y=-21302.344 Z=12902.728)
+    "prism_temple_scraps_23" : base_id + 1679, # ItemPickup205_14 MainShrine_ExteriorDetails (X=14190.678 Y=-23671.621 Z=11781.533)
+    "prism_temple_scraps_24" : base_id + 1680, # ItemPickup8903 MainShrine_DetailsREPAIRED (X=14311.736 Y=-22347.758 Z=11765.781)
+    "prism_temple_scraps_25" : base_id + 1681, # ItemPickup654 MainShrine_DetailsREPAIRED (X=13826.154 Y=-19923.131 Z=11755.189)
+    "prism_temple_scraps_26" : base_id + 1682, # ItemPickup224_74 MainShrine_ExteriorDetails (X=12443.228 Y=-18577.926 Z=11240.455)
+    "prism_temple_scraps_27" : base_id + 1683, # ItemPickup202_5 MainShrine_ExteriorDetails (X=10993.180 Y=-23783.047 Z=11754.121)
+    "prism_temple_scraps_28" : base_id + 1684, # ItemPickup13098 MainShrine_DetailsREPAIRED (X=16762.963 Y=-23634.342 Z=11031.588)
+    "prism_temple_scraps_29" : base_id + 1685, # ItemPickup221_65 MainShrine_ExteriorDetails (X=17804.979 Y=-23512.395 Z=11066.884)
+    "prism_temple_scraps_30" : base_id + 1686, # ItemPickup17123123565 MainShrine_DetailsREPAIRED (X=16998.229 Y=-23241.652 Z=11055.539)
+    "prism_temple_scraps_31" : base_id + 1687, # ItemPickup10812783 MainShrine_DetailsREPAIRED (X=17613.518 Y=-23799.813 Z=11057.277)
+    "prism_temple_scraps_32" : base_id + 1688, # ItemPickup216_50 MainShrine_ExteriorDetails (X=15342.375 Y=-24807.357 Z=11024.192)
+    "prism_temple_scraps_33" : base_id + 1689, # ItemPickup217_53 MainShrine_ExteriorDetails (X=15963.284 Y=-24834.156 Z=11021.444)
+    "prism_temple_scraps_34" : base_id + 1690 # ItemPickup219_59 MainShrine_ExteriorDetails (X=21563.559 Y=-23705.184 Z=10895.696)
+}
+
+
+## All locations
+location_table: dict[str, int] = {
+    **loc_start_camp,
+    **loc_tony_tiddle_mission,
+    **loc_tutorial_candice_mission,
+    **loc_swamp,
+    **loc_lizbeth_murkwater_mission,
+    **loc_daryl_mission,
+    **loc_south_house,
+    **loc_helen_mission,
+    **loc_sgt_flint_mission,
+    **loc_south_mine_outside,
+    **loc_south_mine_inside,
+    **loc_theodore_mission,
+    **loc_canyon_theodore,
+    **loc_watchtower,
+    **loc_boulder_field,
+    **loc_house_sasha_mission,
+    **loc_house_santiago,
+    **loc_port_santiago_mission,
+    **loc_trench_house,
+    **loc_doll_woods,
+    **loc_lost_stairs,
+    **loc_east_house,
+    **loc_explosive_training,
+    **loc_john_smith_mission,
+    **loc_greg_mission,
+    **loc_claire_mission,
+    **loc_north_mine_outside,
+    **loc_north_mine_inside,
+    **loc_wood_bridge,
+    **loc_paul_mission,
+    **loc_gertrude_mission,
+    **loc_west_beach,
+    **loc_church,
+    **loc_refuge_gale_mission,
+    **loc_caravan,
+    **loc_trailer_house,
+    **loc_ronny_mission,
+    **loc_north_beach,
+    **loc_mine_shaft,
+    **loc_mob_camp,
+    **loc_mine_elevator_exit,
+    **loc_mountain_ruin_outside,
+    **loc_mountain_ruin_inside,
+    **loc_prism_temple,
+    **loc_field_pickle_lady_mission,
+    **loc_shrine_near_temple,
+    **loc_morse_bunker
+}
diff --git a/worlds/cccharles/Options.py b/worlds/cccharles/Options.py
new file mode 100644
index 000000000000..4fb1fa741bde
--- /dev/null
+++ b/worlds/cccharles/Options.py
@@ -0,0 +1,172 @@
+from dataclasses import dataclass
+from Options import DefaultOnToggle, Range, Toggle, DeathLink, Choice, PerGameCommonOptions, Visibility
+from .Items import useless_items
+
+
+class ScrapsAmountAsCheck(Range):
+    """
+    What number of scraps are necessary to get an item as a check.
+    The collected scraps are not added to the inventory.
+    You must collect this number of scraps to get 1 randomized item.
+    '0' means the option is disabled and no scraps will be randomized (except mission rewards).
+    """
+    display_name = "Scraps amount"
+    range_start = 0
+    range_end = 5
+    default = 1
+    visibility = Visibility.none
+
+
+class KeyFragments(Range):
+    """
+    Change keys into fragments of keys, instead of directly get a key.
+    Collecting this amount of fragments will craft the associated key.
+    '1' means the option is disabled, because 1 fragment = 1 key.
+    Remember there are 7 keys in the game, 8 in total if the key to access the train is included.
+    If the 'Train access' option is enabled, the key to access the train is affected (40 fragments).
+    If 'Train access' is disabled, there are at most 7x5 = 35 fragments, 8x5 = 40 fragments otherwise.
+    """
+    display_name = "Key fragments amount"
+    range_start = 1
+    range_end = 5
+    default = 1
+    visibility = Visibility.none
+
+
+class AddCompass(Choice):
+    """
+    Add a compass in the game, that allows a UI showing the closest check to do.
+    This item does not exist in the original game.
+    The following options are provided :
+    - **No compass** : Disabled, the game stays vanilla.
+    - **Compass at start** : The compass is given at the start of the game.
+    - **Compass as check** : The compass is added to the item pool, meaning it must first be found.
+    """
+    display_name = "Add compass"
+    option_no_compass = 0
+    option_compass_at_start = 1
+    option_compass_as_check = 2
+    default = 1
+    visibility = Visibility.none
+
+
+class ScrapsTracker(DefaultOnToggle):
+    """
+    If allowed, the amount of collected scraps will be shown on the map.
+    """
+    display_name = "Allow scraps tracker"
+    visibility = Visibility.none
+
+
+class TrainUpgradeFragments(Toggle):
+    """
+    If allowed, none of the 3 upgrades of the train can be done without collecting a blueprint fragment.
+    These fragments will be added to the item pool : Speed Upgrade ; Damage Upgrade ; Armor Upgrade.
+    The 'Repair' option on the blueprint will remain unchanged.
+    """
+    display_name = "Allow train upgrade fragments"
+    visibility = Visibility.none
+
+
+class RandomStartingWeapon(DefaultOnToggle):
+    """
+    If allowed, the starting weapon will be randomized among the 4 possible guns.
+    """
+    display_name = "Random starting weapon"
+    visibility = Visibility.none
+
+
+class TrainAccess(Toggle):
+    """
+    If allowed, the key allowing the access to the train will be added to the item pool.
+    Meaning the player cannot use the train while the key is not found.
+    Note this option is affected by the "Key fragments amount" option only if enabled.
+    """
+    display_name = "Train access"
+    visibility = Visibility.none
+
+
+class PaintCanRule(Choice):
+    """
+    Add a rule when a paint can is collected.
+    The following options are provided :
+    - **No rule** : Disabled, the game stays vanilla.
+    - **Randomized** : The paint cans are added to the item pool.
+    - **Vanilla with hints** : The paint cans are not randomized and give hints when collected.
+    - **Random with hints** : The paint cans are randomized and give hints when collected.
+    """
+    display_name = "Paint can rule"
+    option_no_rule = 0
+    option_randomized = 1
+    option_vanilla_with_hints = 2
+    option_random_with_hints = 3
+    default = 1
+    visibility = Visibility.none
+
+
+class SplitRemoteExplosive(Choice):
+    """
+    Split the 8 explosives to make up to 8 more checks.
+    The following options are provided :
+    - **Stack of 1** : Split the explosives to 8 stacks of 1.
+    - **Stack of 2** : Split the explosives to 4 stacks of 2.
+    - **Stack of 4** : Split the explosives to 2 stacks of 4.
+    - **Stack of 8** : Split the explosives to 1 stacks of 8 (vanilla).
+    """
+    display_name = "Paint can rule"
+    option_stack_of_1 = 1
+    option_stack_of_2 = 2
+    option_stack_of_4 = 4
+    option_stack_of_8 = 8
+    default = 1
+    visibility = Visibility.none
+
+
+class UnscrapTrap(Range):
+    """
+    What percent of traps removing 5 scraps from the inventory will be added to the item pool.
+    """
+    display_name = "Unscrap-trap %"
+    range_start = 0
+    range_end = 20
+    default = 0
+    visibility = Visibility.all
+
+
+class DerailedTrap(Range):
+    """
+    What percent of traps reducing the train HP by 40 will be added to the item pool.
+    """
+    display_name = "Derailed-trap %"
+    range_start = 0
+    range_end = 20
+    default = 0
+    visibility = Visibility.none
+
+
+class GuruTrap(Range):
+    """
+    What percent of traps spawning a cultist near the player for a short while will be added to the item pool.
+    """
+    display_name = "Guru-trap %"
+    range_start = 0
+    range_end = 20
+    default = 0
+    visibility = Visibility.none
+
+
+@dataclass
+class CCCharlesOptions(PerGameCommonOptions):
+    scraps_amount_as_check: ScrapsAmountAsCheck
+    key_fragments: KeyFragments
+    add_compass: AddCompass
+    scraps_tracker: ScrapsTracker
+    train_upgrade_fragments: TrainUpgradeFragments
+    random_starting_weapon: RandomStartingWeapon
+    train_access: TrainAccess
+    paint_can_rule: PaintCanRule
+    split_remote_explosive: SplitRemoteExplosive
+    unscrap_trap: UnscrapTrap
+    derailed_trap: DerailedTrap
+    guru_trap: GuruTrap
+    death_link: DeathLink
diff --git a/worlds/cccharles/Regions.py b/worlds/cccharles/Regions.py
new file mode 100644
index 000000000000..0232006d0edb
--- /dev/null
+++ b/worlds/cccharles/Regions.py
@@ -0,0 +1,263 @@
+from BaseClasses import MultiWorld, Region, ItemClassification
+from . import CCCharlesItem
+from .Options import CCCharlesOptions
+from .Locations import CCCharlesLocation, loc_start_camp, loc_tony_tiddle_mission, loc_tutorial_candice_mission, \
+    loc_swamp, loc_lizbeth_murkwater_mission, loc_daryl_mission, loc_south_house, loc_helen_mission, \
+    loc_sgt_flint_mission, loc_south_mine_outside, loc_south_mine_inside, loc_theodore_mission, loc_canyon_theodore, \
+    loc_watchtower, loc_boulder_field, loc_house_sasha_mission, loc_house_santiago, loc_port_santiago_mission, \
+    loc_trench_house, loc_doll_woods, loc_lost_stairs, loc_east_house, loc_explosive_training, \
+    loc_john_smith_mission, loc_greg_mission, loc_claire_mission, loc_north_mine_outside, loc_north_mine_inside, \
+    loc_wood_bridge, loc_paul_mission, loc_gertrude_mission, loc_west_beach, loc_church, loc_refuge_gale_mission, \
+    loc_caravan, loc_trailer_house, loc_ronny_mission, loc_north_beach, loc_mine_shaft, loc_mob_camp, \
+    loc_mine_elevator_exit, loc_mountain_ruin_outside, loc_mountain_ruin_inside, loc_prism_temple, \
+    loc_field_pickle_lady_mission, loc_shrine_near_temple, loc_morse_bunker
+
+
+class CCCharlesRegion(Region):
+    regions = []
+
+def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int):
+    menu_region = Region("Menu", player, world, "Eugene's Boat")
+    world.regions.append(menu_region)
+
+    start_camp_region = Region("Start Camp", player, world)
+    start_camp_region.add_locations(loc_start_camp, CCCharlesLocation)
+    world.regions.append(start_camp_region)
+
+    tony_tiddle_barn_region = Region("Tony Tiddle Barn", player, world)
+    tony_tiddle_barn_region.add_locations(loc_tony_tiddle_mission, CCCharlesLocation)
+    world.regions.append(tony_tiddle_barn_region)
+
+    candice_house_region = Region("Candice House", player, world)
+    candice_house_region.add_locations(loc_tutorial_candice_mission, CCCharlesLocation)
+    world.regions.append(candice_house_region)
+
+    swamp_region = Region("Swamp", player, world)
+    swamp_region.add_locations(loc_swamp, CCCharlesLocation)
+    world.regions.append(swamp_region)
+
+    shack_region = Region("Shack", player, world)
+    shack_region.add_locations(loc_lizbeth_murkwater_mission, CCCharlesLocation)
+    world.regions.append(shack_region)
+
+    junkyard_region = Region("Junkyard", player, world)
+    junkyard_region.add_locations(loc_daryl_mission, CCCharlesLocation)
+    world.regions.append(junkyard_region)
+
+    dianne_house_region = Region("Dianne House", player, world)
+    dianne_house_region.add_locations(loc_south_house, CCCharlesLocation)
+    world.regions.append(dianne_house_region)
+
+    helen_house_region = Region("Helen House", player, world)
+    helen_house_region.add_locations(loc_helen_mission, CCCharlesLocation)
+    world.regions.append(helen_house_region)
+
+    military_base_region = Region("Military Base", player, world)
+    military_base_region.add_locations(loc_sgt_flint_mission, CCCharlesLocation)
+    world.regions.append(military_base_region)
+
+    outside_south_mine_region = Region("Outside South Mine", player, world)
+    outside_south_mine_region.add_locations(loc_south_mine_outside, CCCharlesLocation)
+    world.regions.append(outside_south_mine_region)
+
+    inside_south_mine_region = Region("Inside South Mine", player, world)
+    inside_south_mine_region.add_locations(loc_south_mine_inside, CCCharlesLocation)
+    world.regions.append(inside_south_mine_region)
+
+    theodore_station_region = Region("Theodore Station", player, world)
+    theodore_station_region.add_locations(loc_theodore_mission, CCCharlesLocation)
+    world.regions.append(theodore_station_region)
+
+    theodore_canyon_region = Region("Theodore Canyon", player, world)
+    theodore_canyon_region.add_locations(loc_canyon_theodore, CCCharlesLocation)
+    world.regions.append(theodore_canyon_region)
+
+    watchtower_region = Region("Watchtower", player, world)
+    watchtower_region.add_locations(loc_watchtower, CCCharlesLocation)
+    world.regions.append(watchtower_region)
+
+    ghost_boulder_field_region = Region("Ghost Boulder Field", player, world)
+    ghost_boulder_field_region.add_locations(loc_boulder_field, CCCharlesLocation)
+    world.regions.append(ghost_boulder_field_region)
+
+    sasha_house_region = Region("Sasha House", player, world)
+    sasha_house_region.add_locations(loc_house_sasha_mission, CCCharlesLocation)
+    world.regions.append(sasha_house_region)
+
+    santiago_house_region = Region("Santiago House", player, world)
+    santiago_house_region.add_locations(loc_house_santiago, CCCharlesLocation)
+    world.regions.append(santiago_house_region)
+
+    santiago_port_region = Region("Santiago Port", player, world)
+    santiago_port_region.add_locations(loc_port_santiago_mission, CCCharlesLocation)
+    world.regions.append(santiago_port_region)
+
+    trench_house_region = Region("Trench House", player, world)
+    trench_house_region.add_locations(loc_trench_house, CCCharlesLocation)
+    world.regions.append(trench_house_region)
+
+    doll_woods_region = Region("Doll Woods", player, world)
+    doll_woods_region.add_locations(loc_doll_woods, CCCharlesLocation)
+    world.regions.append(doll_woods_region)
+
+    forest_lost_stairs_region = Region("Forest Lost Stairs", player, world)
+    forest_lost_stairs_region.add_locations(loc_lost_stairs, CCCharlesLocation)
+    world.regions.append(forest_lost_stairs_region)
+
+    far_east_house_region = Region("Far East House", player, world)
+    far_east_house_region.add_locations(loc_east_house, CCCharlesLocation)
+    world.regions.append(far_east_house_region)
+
+    explosive_training_region = Region("Explosive Training", player, world)
+    explosive_training_region.add_locations(loc_explosive_training, CCCharlesLocation)
+    world.regions.append(explosive_training_region)
+
+    john_smith_workshop_region = Region("John Smith Workshop", player, world)
+    john_smith_workshop_region.add_locations(loc_john_smith_mission, CCCharlesLocation)
+    world.regions.append(john_smith_workshop_region)
+
+    greg_tower_region = Region("Greg Tower", player, world)
+    greg_tower_region.add_locations(loc_greg_mission, CCCharlesLocation)
+    world.regions.append(greg_tower_region)
+
+    lighthouse_region = Region("Lighthouse", player, world)
+    lighthouse_region.add_locations(loc_claire_mission, CCCharlesLocation)
+    world.regions.append(lighthouse_region)
+
+    outside_north_mine_region = Region("Outside North Mine", player, world)
+    outside_north_mine_region.add_locations(loc_north_mine_outside, CCCharlesLocation)
+    world.regions.append(outside_north_mine_region)
+
+    inside_north_mine_region = Region("Inside North Mine", player, world)
+    inside_north_mine_region.add_locations(loc_north_mine_inside, CCCharlesLocation)
+    world.regions.append(inside_north_mine_region)
+
+    wood_bridge_region = Region("Wood Bridge", player, world)
+    wood_bridge_region.add_locations(loc_wood_bridge, CCCharlesLocation)
+    world.regions.append(wood_bridge_region)
+
+    paul_museum_region = Region("Paul Museum", player, world)
+    paul_museum_region.add_locations(loc_paul_mission, CCCharlesLocation)
+    world.regions.append(paul_museum_region)
+
+    gertrude_base_region = Region("Gertrude Base", player, world)
+    gertrude_base_region.add_locations(loc_gertrude_mission, CCCharlesLocation)
+    world.regions.append(gertrude_base_region)
+
+    beach_region = Region("Beach", player, world)
+    beach_region.add_locations(loc_west_beach, CCCharlesLocation)
+    world.regions.append(beach_region)
+
+    church_region = Region("Church", player, world)
+    church_region.add_locations(loc_church, CCCharlesLocation)
+    world.regions.append(church_region)
+
+    gale_house_region = Region("Gale House", player, world)
+    gale_house_region.add_locations(loc_refuge_gale_mission, CCCharlesLocation)
+    world.regions.append(gale_house_region)
+
+    caravan_region = Region("Caravan", player, world)
+    caravan_region.add_locations(loc_caravan, CCCharlesLocation)
+    world.regions.append(caravan_region)
+
+    abandoned_house_region = Region("Abandoned House", player, world)
+    abandoned_house_region.add_locations(loc_trailer_house, CCCharlesLocation)
+    world.regions.append(abandoned_house_region)
+
+    ronny_towers_region = Region("Ronny Towers", player, world)
+    ronny_towers_region.add_locations(loc_ronny_mission, CCCharlesLocation)
+    world.regions.append(ronny_towers_region)
+
+    north_frank_fisher_region = Region("North Frank Fisher", player, world)
+    north_frank_fisher_region.add_locations(loc_north_beach, CCCharlesLocation)
+    world.regions.append(north_frank_fisher_region)
+
+    hidden_hole_region = Region("Hidden Hole", player, world)
+    hidden_hole_region.add_locations(loc_mine_shaft, CCCharlesLocation)
+    world.regions.append(hidden_hole_region)
+
+    mob_camp_region = Region("Mob Camp", player, world)
+    mob_camp_region.add_locations(loc_mob_camp, CCCharlesLocation)
+    world.regions.append(mob_camp_region)
+
+    mine_elevator_exit_region = Region("Mine Elevator Exit", player, world)
+    mine_elevator_exit_region.add_locations(loc_mine_elevator_exit, CCCharlesLocation)
+    world.regions.append(mine_elevator_exit_region)
+
+    outside_mountain_ruin_region = Region("Outside Mountain Ruin", player, world)
+    outside_mountain_ruin_region.add_locations(loc_mountain_ruin_outside, CCCharlesLocation)
+    world.regions.append(outside_mountain_ruin_region)
+
+    inside_mountain_ruin_region = Region("Inside Mountain Ruin", player, world)
+    inside_mountain_ruin_region.add_locations(loc_mountain_ruin_inside, CCCharlesLocation)
+    world.regions.append(inside_mountain_ruin_region)
+
+    prism_temple_region = Region("Prism Temple", player, world)
+    prism_temple_region.add_locations(loc_prism_temple, CCCharlesLocation)
+    world.regions.append(prism_temple_region)
+
+    pickle_lady_house_region = Region("Pickle Lady House", player, world)
+    pickle_lady_house_region.add_locations(loc_field_pickle_lady_mission, CCCharlesLocation)
+    world.regions.append(pickle_lady_house_region)
+
+    shrine_near_temple_region = Region("Temple Shrine", player, world)
+    shrine_near_temple_region.add_locations(loc_shrine_near_temple, CCCharlesLocation)
+    world.regions.append(shrine_near_temple_region)
+
+    morse_refuge_region = Region("Morse Refuge", player, world)
+    morse_refuge_region.add_locations(loc_morse_bunker, CCCharlesLocation)
+    world.regions.append(morse_refuge_region)
+
+    # Include Victory event
+    loc_final_boss = CCCharlesLocation(player, "Final Boss", None, menu_region)
+    loc_final_boss.place_locked_item(CCCharlesItem("Victory", ItemClassification.progression, None, player))
+
+    menu_region.locations.append(loc_final_boss)
+
+    menu_region.connect(start_camp_region)
+    menu_region.connect(tony_tiddle_barn_region)
+    menu_region.connect(candice_house_region)
+    menu_region.connect(swamp_region)
+    menu_region.connect(shack_region)
+    menu_region.connect(junkyard_region)
+    menu_region.connect(dianne_house_region)
+    menu_region.connect(helen_house_region)
+    menu_region.connect(military_base_region)
+    menu_region.connect(outside_south_mine_region)
+    menu_region.connect(inside_south_mine_region)
+    menu_region.connect(theodore_station_region)
+    menu_region.connect(theodore_canyon_region)
+    menu_region.connect(watchtower_region)
+    menu_region.connect(ghost_boulder_field_region)
+    menu_region.connect(sasha_house_region)
+    menu_region.connect(santiago_house_region)
+    menu_region.connect(santiago_port_region)
+    menu_region.connect(trench_house_region)
+    menu_region.connect(doll_woods_region)
+    menu_region.connect(forest_lost_stairs_region)
+    menu_region.connect(far_east_house_region)
+    menu_region.connect(explosive_training_region)
+    menu_region.connect(john_smith_workshop_region)
+    menu_region.connect(greg_tower_region)
+    menu_region.connect(lighthouse_region)
+    menu_region.connect(outside_north_mine_region)
+    menu_region.connect(inside_north_mine_region)
+    menu_region.connect(wood_bridge_region)
+    menu_region.connect(paul_museum_region)
+    menu_region.connect(gertrude_base_region)
+    menu_region.connect(beach_region)
+    menu_region.connect(church_region)
+    menu_region.connect(gale_house_region)
+    menu_region.connect(caravan_region)
+    menu_region.connect(abandoned_house_region)
+    menu_region.connect(ronny_towers_region)
+    menu_region.connect(north_frank_fisher_region)
+    menu_region.connect(hidden_hole_region)
+    menu_region.connect(mob_camp_region)
+    menu_region.connect(mine_elevator_exit_region)
+    menu_region.connect(outside_mountain_ruin_region)
+    menu_region.connect(inside_mountain_ruin_region)
+    menu_region.connect(prism_temple_region)
+    menu_region.connect(pickle_lady_house_region)
+    menu_region.connect(shrine_near_temple_region)
+    menu_region.connect(morse_refuge_region)
diff --git a/worlds/cccharles/Rules.py b/worlds/cccharles/Rules.py
new file mode 100644
index 000000000000..acfbe89e24a5
--- /dev/null
+++ b/worlds/cccharles/Rules.py
@@ -0,0 +1,324 @@
+from BaseClasses import MultiWorld
+from ..generic.Rules import set_rule
+from .Options import CCCharlesOptions
+
+# Go mode : egg_green + egg_blue + egg_red + temple_key + bug_spray (+ remote_explosive x8 but the base game ignores it)
+
+def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None:
+    # Tony
+    set_rule(world.get_location("barn_scraps_1", player),
+        lambda state: state.has("Barn Key", player))
+    set_rule(world.get_location("barn_scraps_2", player),
+        lambda state: state.has("Barn Key", player))
+    set_rule(world.get_location("barn_scraps_3", player),
+        lambda state: state.has("Barn Key", player))
+    set_rule(world.get_location("barn_scraps_4", player),
+        lambda state: state.has("Barn Key", player))
+    set_rule(world.get_location("barn_scraps_5", player),
+        lambda state: state.has("Barn Key", player))
+    set_rule(world.get_location("barn_scraps_6", player),
+        lambda state: state.has("Barn Key", player))
+    set_rule(world.get_location("barn_scraps_7", player),
+        lambda state: state.has("Barn Key", player))
+    set_rule(world.get_location("barn_scraps_8", player),
+        lambda state: state.has("Barn Key", player))
+    set_rule(world.get_location("barn_scraps_9", player),
+        lambda state: state.has("Barn Key", player))
+
+    # Candice
+    set_rule(world.get_location("tutorial_scraps_1", player),
+        lambda state: state.has("Candice's Key", player))
+    set_rule(world.get_location("tutorial_scraps_2", player),
+        lambda state: state.has("Candice's Key", player))
+    set_rule(world.get_location("tutorial_scraps_3", player),
+        lambda state: state.has("Candice's Key", player))
+    set_rule(world.get_location("tutorial_scraps_4", player),
+        lambda state: state.has("Candice's Key", player))
+    set_rule(world.get_location("tutorial_scraps_5", player),
+        lambda state: state.has("Candice's Key", player))
+    set_rule(world.get_location("tutorial_scraps_6", player),
+        lambda state: state.has("Candice's Key", player))
+    set_rule(world.get_location("tutorial_scraps_7", player),
+        lambda state: state.has("Candice's Key", player))
+    set_rule(world.get_location("tutorial_scraps_8", player),
+        lambda state: state.has("Candice's Key", player))
+    set_rule(world.get_location("tutorial_scraps_9", player),
+        lambda state: state.has("Candice's Key", player))
+
+    # Lizbeth
+    set_rule(world.get_location("swamp_lizbeth_murkwater_mission_end", player),
+        lambda state: state.has("Dead Fish", player))
+
+    # Daryl
+    set_rule(world.get_location("junkyard_daryl_ancient_tablet", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("junkyard_daryl_mission_end", player),
+        lambda state: state.has("Ancient Tablet", player))
+
+    # South House
+    set_rule(world.get_location("south_house_chest_scraps_1", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("south_house_chest_scraps_2", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("south_house_chest_scraps_3", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("south_house_chest_scraps_4", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("south_house_chest_scraps_5", player),
+         lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("south_house_chest_scraps_6", player),
+         lambda state: state.has("Lockpicks", player))
+
+    # South Mine
+    set_rule(world.get_location("south_mine_inside_scraps_1", player),
+        lambda state: state.has("South Mine Key", player))
+    set_rule(world.get_location("south_mine_inside_scraps_2", player),
+        lambda state: state.has("South Mine Key", player))
+    set_rule(world.get_location("south_mine_inside_scraps_3", player),
+        lambda state: state.has("South Mine Key", player))
+    set_rule(world.get_location("south_mine_inside_scraps_4", player),
+        lambda state: state.has("South Mine Key", player))
+    set_rule(world.get_location("south_mine_inside_scraps_5", player),
+        lambda state: state.has("South Mine Key", player))
+    set_rule(world.get_location("south_mine_inside_scraps_6", player),
+        lambda state: state.has("South Mine Key", player))
+    set_rule(world.get_location("south_mine_inside_scraps_7", player),
+        lambda state: state.has("South Mine Key", player))
+    set_rule(world.get_location("south_mine_inside_scraps_8", player),
+        lambda state: state.has("South Mine Key", player))
+    set_rule(world.get_location("south_mine_inside_scraps_9", player),
+        lambda state: state.has("South Mine Key", player))
+    set_rule(world.get_location("south_mine_inside_paint_can_green", player),
+        lambda state: state.has("South Mine Key", player) and
+            state.has("Lockpicks", player))
+
+    # Theodore
+    set_rule(world.get_location("station_theodore_mission_end", player),
+        lambda state: state.has("Blue Box", player))
+
+    # Watchtower
+    set_rule(world.get_location("watchtower_paint_can_pink", player),
+        lambda state: state.has("Lockpicks", player))
+
+    # Sasha
+    set_rule(world.get_location("house_sasha_mission_end", player),
+            lambda state: state.has("Page Drawing", player, 8))
+
+    # Santiago
+    set_rule(world.get_location("port_santiago_mission_end", player),
+        lambda state: state.has("Journal", player))
+
+    # Trench House
+    set_rule(world.get_location("trench_house_chest_scraps_1", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("trench_house_chest_scraps_2", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("trench_house_chest_scraps_3", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("trench_house_chest_scraps_4", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("trench_house_chest_scraps_5", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("trench_house_chest_scraps_6", player),
+        lambda state: state.has("Lockpicks", player))
+
+    # East House
+    set_rule(world.get_location("east_house_chest_scraps_1", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("east_house_chest_scraps_2", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("east_house_chest_scraps_3", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("east_house_chest_scraps_4", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("east_house_chest_scraps_5", player),
+        lambda state: state.has("Lockpicks", player))
+
+    # Explosive Training
+    set_rule(world.get_location("explosive_training_scraps_11", player),
+        lambda state: state.has("Timed Dynamite", player))
+    set_rule(world.get_location("explosive_training_scraps_12", player),
+        lambda state: state.has("Timed Dynamite", player))
+    set_rule(world.get_location("explosive_training_box_of_rocket", player),
+        lambda state: state.has("Timed Dynamite", player))
+
+    # John
+    set_rule(world.get_location("workshop_john_smith_mission_end", player),
+         lambda state: state.has("Box of Rocket", player))
+
+    # Claire
+    set_rule(world.get_location("lighthouse_claire_mission_end", player),
+        lambda state: state.has("Breaker", player, 4))
+
+    # North Mine
+    set_rule(world.get_location("north_mine_inside_scraps_1", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_2", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_3", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_4", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_5", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_6", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_7", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_8", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_9", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_10", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_11", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_12", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_scraps_13", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_blue_egg", player),
+        lambda state: state.has("North Mine Key", player))
+    set_rule(world.get_location("north_mine_inside_paint_can_blue", player),
+        lambda state: state.has("North Mine Key", player) and
+            state.has("Lockpicks", player))
+
+    # Paul
+    set_rule(world.get_location("museum_paul_mission_end", player),
+        lambda state: state.has("Remote Explosive x8", player))
+        # lambda state: state.has("Remote Explosive", player, 8)) # TODO : Add an option to split remote explosives
+
+    # West Beach
+    set_rule(world.get_location("west_beach_chest_scraps_1", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("west_beach_chest_scraps_2", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("west_beach_chest_scraps_3", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("west_beach_chest_scraps_4", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("west_beach_chest_scraps_5", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("west_beach_chest_scraps_6", player),
+        lambda state: state.has("Lockpicks", player))
+
+    # Caravan
+    set_rule(world.get_location("caravan_chest_scraps_1", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("caravan_chest_scraps_2", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("caravan_chest_scraps_3", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("caravan_chest_scraps_4", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("caravan_chest_scraps_5", player),
+        lambda state: state.has("Lockpicks", player))
+
+    # Ronny
+    set_rule(world.get_location("towers_ronny_mission_end", player),
+        lambda state: state.has("Employment Contracts", player))
+
+    # North Beach
+    set_rule(world.get_location("north_beach_chest_scraps_1", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("north_beach_chest_scraps_2", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("north_beach_chest_scraps_3", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("north_beach_chest_scraps_4", player),
+        lambda state: state.has("Lockpicks", player))
+
+    # Mine Shaft
+    set_rule(world.get_location("mine_shaft_chest_scraps_1", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("mine_shaft_chest_scraps_2", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("mine_shaft_chest_scraps_3", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("mine_shaft_chest_scraps_4", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("mine_shaft_chest_scraps_5", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("mine_shaft_chest_scraps_6", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("mine_shaft_chest_scraps_7", player),
+        lambda state: state.has("Lockpicks", player))
+
+    # Mob Camp
+    set_rule(world.get_location("mob_camp_scraps_17", player),
+        lambda state: state.has("Mob Camp Key", player))
+    set_rule(world.get_location("mob_camp_scraps_18", player),
+        lambda state: state.has("Mob Camp Key", player))
+    set_rule(world.get_location("mob_camp_stolen_bob", player),
+        lambda state: state.has("Mob Camp Key", player) and
+            state.has("Broken Bob", player))
+
+    # Mountain Ruin
+    set_rule(world.get_location("mountain_ruin_inside_scraps_1", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_2", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_3", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_4", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_5", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_6", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_7", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_8", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_9", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_10", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_11", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_12", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_13", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_14", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_15", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_16", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_scraps_17", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_red_egg", player),
+        lambda state: state.has("Mountain Ruin Key", player))
+    set_rule(world.get_location("mountain_ruin_inside_paint_can_red", player),
+        lambda state: state.has("Mountain Ruin Key", player) and
+            state.has("Lockpicks", player))
+
+    # Prism Temple
+    set_rule(world.get_location("prism_temple_chest_scraps_1", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("prism_temple_chest_scraps_2", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("prism_temple_chest_scraps_3", player),
+        lambda state: state.has("Lockpicks", player))
+
+    # Pickle
+    set_rule(world.get_location("field_pickle_lady_jar_of_pickles", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("field_pickle_lady_mission_end", player),
+         lambda state: state.has("Jar of Pickles", player))
+
+    # Morse Bunker
+    set_rule(world.get_location("morse_bunker_chest_scraps_1", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("morse_bunker_chest_scraps_2", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("morse_bunker_chest_scraps_3", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("morse_bunker_chest_scraps_4", player),
+        lambda state: state.has("Lockpicks", player))
+    set_rule(world.get_location("morse_bunker_chest_scraps_5", player),
+        lambda state: state.has("Lockpicks", player))
+
+    # Place "Victory" at "Final Boss" and set collection as win condition
+    world.completion_condition[player] = lambda state: state.has("Victory", player)
diff --git a/worlds/cccharles/__init__.py b/worlds/cccharles/__init__.py
new file mode 100644
index 000000000000..9d839ef98c1a
--- /dev/null
+++ b/worlds/cccharles/__init__.py
@@ -0,0 +1,158 @@
+from .Items import CCCharlesItem, unique_item_dict, full_item_list, item_groups
+from .Locations import CCCharlesLocation, location_table
+from .Options import CCCharlesOptions
+from .Rules import set_rules
+from .Regions import CCCharlesRegion, create_regions
+from BaseClasses import Tutorial, ItemClassification
+from worlds.AutoWorld import World, WebWorld
+
+
+class CCCharlesWeb(WebWorld):
+    """
+    Choo-Choo Charles is a horror game.
+    A devil spider train from hell called Charles chases any person it finds on an island.
+    The goal is to gather scraps to upgrade a train to fight Charles and travel by train to find 3 eggs
+    to lead Charles to a brutal death and save the island.
+    """
+
+    theme = "stone"
+
+    tutorials = [Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to setup Choo-Choo Charles for MultiWorld.",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["Yaranorgoth"]
+    )]
+
+    game_info_languages = ["en", "fr"]
+    rich_text_options_doc = True
+
+
+class CCCharlesWorld(World):
+    """ 
+    An independent 3D horror game, taking place on an island.
+    The main gameplay is composed of 2 phases :
+    > Traveling and fighting a monster on board a train
+    > Walking disarmed to gather resources
+    """
+
+    game = "Choo-Choo Charles"
+
+    web = CCCharlesWeb()
+
+    item_name_to_id = unique_item_dict
+    location_name_to_id = location_table
+    item_name_groups = item_groups
+
+    # Options the player can set
+    options_dataclass = CCCharlesOptions
+    # Typing hints for all the options we defined
+    options: CCCharlesOptions
+
+    topology_present = True  # show path to required location checks in spoiler
+
+    def create_regions(self) -> None :
+        create_regions(self.multiworld, self.options, self.player)
+
+    def create_item(self, name: str) -> CCCharlesItem:
+        item_id = unique_item_dict[name]
+
+        match name:
+            case "Scraps" :
+                classification = ItemClassification.useful
+            case "30 Scraps Reward" :
+                classification = ItemClassification.useful
+            case "25 Scraps Reward" :
+                classification = ItemClassification.useful
+            case "35 Scraps Reward" :
+                classification = ItemClassification.useful
+            case "40 Scraps Reward" :
+                classification = ItemClassification.useful
+            case "South Mine Key" :
+                classification = ItemClassification.progression
+            case "North Mine Key" :
+                classification = ItemClassification.progression
+            case "Mountain Ruin Key" :
+                classification = ItemClassification.progression
+            case "Barn Key" :
+                classification = ItemClassification.progression
+            case "Candice's Key" :
+                classification = ItemClassification.progression
+            case "Dead Fish" :
+                classification = ItemClassification.progression
+            case "Lockpicks" :
+                classification = ItemClassification.progression
+            case "Ancient Tablet" :
+                classification = ItemClassification.progression
+            case "Blue Box" :
+                classification = ItemClassification.progression
+            case "Page Drawing" :
+                classification = ItemClassification.progression
+            case "Journal" :
+                classification = ItemClassification.progression
+            case "Timed Dynamite" :
+                classification = ItemClassification.progression
+            case "Box of Rocket" :
+                classification = ItemClassification.progression
+            case "Breaker" :
+                classification = ItemClassification.progression
+            case "Broken Bob" :
+                classification = ItemClassification.progression
+            case "Employment Contracts" :
+                classification = ItemClassification.progression
+            case "Mob Camp Key" :
+                classification = ItemClassification.progression
+            case "Jar of Pickles" :
+                classification = ItemClassification.progression
+            case "Orange Paint Can" :
+                classification = ItemClassification.filler
+            case "Green Paint Can" :
+                classification = ItemClassification.filler
+            case "White Paint Can" :
+                classification = ItemClassification.filler
+            case "Pink Paint Can" :
+                classification = ItemClassification.filler
+            case "Gray Paint Can" :
+                classification = ItemClassification.filler
+            case "Blue Paint Can" :
+                classification = ItemClassification.filler
+            case "Black Paint Can" :
+                classification = ItemClassification.filler
+            case "Lime Paint Can" :
+                classification = ItemClassification.filler
+            case "Teal Paint Can" :
+                classification = ItemClassification.filler
+            case "Red Paint Can" :
+                classification = ItemClassification.filler
+            case "Purple Paint Can" :
+                classification = ItemClassification.filler
+            case "The Boomer" :
+                classification = ItemClassification.filler
+            case "Bob" :
+                classification = ItemClassification.filler
+            case "Green Egg" :
+                classification = ItemClassification.progression
+            case "Blue Egg" :
+                classification = ItemClassification.progression
+            case "Red Egg" :
+                classification = ItemClassification.progression
+            case "Remote Explosive" :
+                classification = ItemClassification.progression
+            case "Remote Explosive x8" :
+                classification = ItemClassification.progression
+            case "Temple Key" :
+                classification = ItemClassification.progression
+            case "Bug spray":
+                classification = ItemClassification.progression
+            case _: # Should not occur
+                classification = ItemClassification.filler
+
+        return CCCharlesItem(name, classification, item_id, self.player)
+    
+    def create_items(self) -> None:
+        self.multiworld.itempool += [self.create_item(item) for item in full_item_list]
+
+    def set_rules(self) -> None:
+        set_rules(self.multiworld, self.options, self.player)
diff --git a/worlds/cccharles/docs/en_Choo-Choo Charles.md b/worlds/cccharles/docs/en_Choo-Choo Charles.md
new file mode 100644
index 000000000000..8fa1fac55a71
--- /dev/null
+++ b/worlds/cccharles/docs/en_Choo-Choo Charles.md	
@@ -0,0 +1,26 @@
+# Choo-Choo Charles
+
+## Where is the options page?
+The player options page for this game contains all the options to configure and export a yaml config file. The page can be accessed [here](TODO).
+
+## What does randomization do to this game?
+All scraps or any pickup item on the ground (exept from Lootboxes) and items received from NPCs missions are considered as locations to check.
+
+## What is the goal of Choo-Choo Charles when randomized?
+Beating the evil train from Hell named "Charles".
+
+## How is the game managed in Nightmare mode?
+At death, the player has to restart a brand new game, giving him the choice to stay under the Nightmare mode or continuing with the Normal mode if considered too hard. In this case, all collected items won't appear on the map and will be redistributed in the inventory. In addition, if the option is enabled, all collected scraps are lost. However, those scraps can be found where the randomized items have already been collected (breaking the randomization only for the already collected items).
+
+## What does another world's item look like in Choo-Choo Charles?
+Any item or hint that cannot be normaly represented in the game is replaced by the miniaturized "DeathDuck" easter egg that can be seen out from the physical wall limits of the original game.
+
+## How is the player informed by an item transmission and hints?
+A message appears in game to inform what item is sent or received, including which world and what player the item comes from. The same method is used for hints.
+
+## Is it possible to use hints in the game?
+At any moment, the player can press one of the following keys to display a console in the game :
+* "~" (querty)
+* "²" (azerty)
+* "F10"
+Then, a hint can be revealed by typing "/hint [player] <item>".
diff --git a/worlds/cccharles/docs/en_setup_guide.md b/worlds/cccharles/docs/en_setup_guide.md
new file mode 100644
index 000000000000..f156cad243b2
--- /dev/null
+++ b/worlds/cccharles/docs/en_setup_guide.md
@@ -0,0 +1,27 @@
+# Choo-Choo Charles MultiWorld Setup Guide
+
+## Requirements
+* A computer running Windows (the Mod is not handled by Linux)
+* Cloning the [Choo-Choo Charles Multiworld Randomizer Mod](https://github.com/lgbarrere/CCCharles-Random)
+
+## Installation and Game Start Procedures
+Copy all the content from **result/** in \<GameFolder\>/Obscure/Binaries/Win64/
+
+Copy the packed file from :
+```
+<ProjectFolder>\Obscure\PackagedMod\WindowsNoEditor\Obscure\Content\Paks\pakchunk1-WindowsNoEditor.pak
+```
+To :
+```
+<GameFolder>\Obscure\Content\Paks\LogicMods\
+```
+Then rename that file "TesterMod.pak".
+
+## Joining a MultiWorld Game
+TODO
+
+## Playing offline
+TODO
+
+## Game Troubleshooting
+TODO
diff --git a/worlds/cccharles/docs/fr_Choo-Choo Charles.md b/worlds/cccharles/docs/fr_Choo-Choo Charles.md
new file mode 100644
index 000000000000..08845d881904
--- /dev/null
+++ b/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
@@ -0,0 +1,26 @@
+# Choo-Choo Charles
+
+## Où est la page d'options ?
+La page d'options du joueur pour ce jeu contient toutes les options pour configurer et exporter un fichier de configuration yaml. L'accès à cette page se trouve [ici](TODO).
+
+## Qu'est ce que la randomisation fait au jeu ?
+Tous les ferrailles ou n'importe quel objet collectable au sol (excepté les boîtes à butin) et objets reçus par les missions de PNJs sont considérés comme emplacements à vérifier.
+
+## Quel est le but de Choo-Choo Charles lorsqu'il est randomisé ?
+Vaincre le train démoniaque de l'Enfer nommé "Charles".
+
+## Comment le jeu est-il géré en mode Nightmare ?
+À sa mort, le joueur doit relancer une toute nouvelle partie, lui donnant la possisilité de rester en mode Nightmare ou poursuivre la partie en mode Normal s'il considère la partie trop difficile. Dans ce cas, tout objet collecté n'apparaît plus sur la carte et sera redistribué dans l'inventaire. De plus, Si l'option est activée, tous les ferrailles collectés sont perdus. Cependant, ces ferrailles peuvent être trouvés où les objets randomisés ont déjà été collectés (brisant la randomisation uniquement pour les objets déjà collectés).
+
+## À quoi ressemble un objet d'un autre monde dans Choo-Choo Charles ?
+Tout objet ou indice qui ne peut pas être représenté normalement dans le jeu est remplacé par l'easter egg "DeadDuck" miniaturisé qui peut être vu en dehors des limites murales physiques du jeu original.
+
+## Comment le joueur est-il informé par une transmission d'objet et des indices ?
+Un message apparaît en jeu pour informer quel objet est envoyé ou reçu, incluant de quel monde et de quel joueur l'objet vient. La même méthode est utilisée pour les indices.
+
+## Est-il possible d'utiliser les indices dans le jeu ?
+À n'importe quel moment, le joueur peu appuyer sur l'une des touches suivantes pour afficher la console dans le jeu :
+* "~" (querty)
+* "²" (azerty)
+* "F10"
+Puis, un indice peut être révélé en tapant "/hint [player] <item>"
diff --git a/worlds/cccharles/docs/fr_setup_guide.md b/worlds/cccharles/docs/fr_setup_guide.md
new file mode 100644
index 000000000000..dc2f7ec55974
--- /dev/null
+++ b/worlds/cccharles/docs/fr_setup_guide.md
@@ -0,0 +1,27 @@
+# Choo-Choo Charles MultiWorld Guide d'Installation
+
+## Exigences
+* Un ordinateur lançant Windows (le Mod n'est pas utilisable sous Linux)
+* Cloner le [Choo-Choo Charles Multiworld Randomizer Mod](https://github.com/lgbarrere/CCCharles-Random)
+
+## Installation et Procédures de Lancement du Jeu
+Copier tout le contenu de **result/** dans \<GameFolder\>/Obscure/Binaries/Win64/
+
+Copier le fichier empaqueté depuis :
+```
+<ProjectFolder>\Obscure\PackagedMod\WindowsNoEditor\Obscure\Content\Paks\pakchunk1-WindowsNoEditor.pak
+```
+Vers :
+```
+<GameFolder>\Obscure\Content\Paks\LogicMods\
+```
+Puis renommer ce fichier "TesterMod.pak".
+
+## Joining a MultiWorld Game
+TODO
+
+## Playing offline
+TODO
+
+## Game Troubleshooting
+TODO
diff --git a/worlds/cccharles/test/__init__.py b/worlds/cccharles/test/__init__.py
new file mode 100644
index 000000000000..c84d7e221a68
--- /dev/null
+++ b/worlds/cccharles/test/__init__.py
@@ -0,0 +1,5 @@
+from test.bases import WorldTestBase
+
+
+class MyGameTestBase(WorldTestBase):
+    game = "Choo-Choo Charles"
diff --git a/worlds/cccharles/test/bases.py b/worlds/cccharles/test/bases.py
new file mode 100644
index 000000000000..ddcb5797ea21
--- /dev/null
+++ b/worlds/cccharles/test/bases.py
@@ -0,0 +1,345 @@
+import random
+import sys
+import typing
+import unittest
+from argparse import Namespace
+
+from Generate import get_seed_name
+from test.general import gen_steps
+from worlds import AutoWorld
+from worlds.AutoWorld import World, call_all
+
+from BaseClasses import Location, MultiWorld, CollectionState, ItemClassification, Item
+from worlds.alttp.Items import item_factory
+
+
+class TestBase(unittest.TestCase):
+    multiworld: MultiWorld
+    _state_cache = {}
+
+    def get_state(self, items):
+        if (self.multiworld, tuple(items)) in self._state_cache:
+            return self._state_cache[self.multiworld, tuple(items)]
+        state = CollectionState(self.multiworld)
+        for item in items:
+            item.classification = ItemClassification.progression
+            state.collect(item, prevent_sweep=True)
+        state.sweep_for_advancements()
+        state.update_reachable_regions(1)
+        self._state_cache[self.multiworld, tuple(items)] = state
+        return state
+
+    def get_path(self, state, region):
+        def flist_to_iter(node):
+            while node:
+                value, node = node
+                yield value
+
+        from itertools import zip_longest
+        reversed_path_as_flist = state.path.get(region, (region, None))
+        string_path_flat = reversed(list(map(str, flist_to_iter(reversed_path_as_flist))))
+        # Now we combine the flat string list into (region, exit) pairs
+        pathsiter = iter(string_path_flat)
+        pathpairs = zip_longest(pathsiter, pathsiter)
+        return list(pathpairs)
+
+    def run_location_tests(self, access_pool):
+        for i, (location, access, *item_pool) in enumerate(access_pool):
+            items = item_pool[0]
+            all_except = item_pool[1] if len(item_pool) > 1 else None
+            state = self._get_items(item_pool, all_except)
+            path = self.get_path(state, self.multiworld.get_location(location, 1).parent_region)
+            with self.subTest(msg="Reach Location", location=location, access=access, items=items,
+                              all_except=all_except, path=path, entry=i):
+
+                self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), access,
+                                 f"failed {self.multiworld.get_location(location, 1)} with: {item_pool}")
+
+            # check for partial solution
+            if not all_except and access:  # we are not supposed to be able to reach location with partial inventory
+                for missing_item in item_pool[0]:
+                    with self.subTest(msg="Location reachable without required item", location=location,
+                                      items=item_pool[0], missing_item=missing_item, entry=i):
+                        state = self._get_items_partial(item_pool, missing_item)
+
+                        self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), False,
+                                         f"failed {self.multiworld.get_location(location, 1)}: succeeded with "
+                                         f"{missing_item} removed from: {item_pool}")
+
+    def run_entrance_tests(self, access_pool):
+        for i, (entrance, access, *item_pool) in enumerate(access_pool):
+            items = item_pool[0]
+            all_except = item_pool[1] if len(item_pool) > 1 else None
+            state = self._get_items(item_pool, all_except)
+            path = self.get_path(state, self.multiworld.get_entrance(entrance, 1).parent_region)
+            with self.subTest(msg="Reach Entrance", entrance=entrance, access=access, items=items,
+                              all_except=all_except, path=path, entry=i):
+
+                self.assertEqual(self.multiworld.get_entrance(entrance, 1).can_reach(state), access)
+
+            # check for partial solution
+            if not all_except and access:  # we are not supposed to be able to reach location with partial inventory
+                for missing_item in item_pool[0]:
+                    with self.subTest(msg="Entrance reachable without required item", entrance=entrance,
+                                      items=item_pool[0], missing_item=missing_item, entry=i):
+                        state = self._get_items_partial(item_pool, missing_item)
+                        self.assertEqual(self.multiworld.get_entrance(entrance, 1).can_reach(state), False,
+                                         f"failed {self.multiworld.get_entrance(entrance, 1)} with: {item_pool}")
+
+    def _get_items(self, item_pool, all_except):
+        if all_except and len(all_except) > 0:
+            items = self.multiworld.itempool[:]
+            items = [item for item in items if
+                     item.name not in all_except and not ("Bottle" in item.name and "AnyBottle" in all_except)]
+            items.extend(item_factory(item_pool[0], self.multiworld.worlds[1]))
+        else:
+            items = item_factory(item_pool[0], self.multiworld.worlds[1])
+        return self.get_state(items)
+
+    def _get_items_partial(self, item_pool, missing_item):
+        new_items = item_pool[0].copy()
+        new_items.remove(missing_item)
+        items = item_factory(new_items, self.multiworld.worlds[1])
+        return self.get_state(items)
+
+
+class WorldTestBase(unittest.TestCase):
+    options: typing.Dict[str, typing.Any] = {}
+    """Define options that should be used when setting up this TestBase."""
+    multiworld: MultiWorld
+    """The constructed MultiWorld instance after setup."""
+    world: World
+    """The constructed World instance after setup."""
+    player: typing.ClassVar[int] = 1
+
+    game: typing.ClassVar[str]
+    """Define game name in subclass, example "Secret of Evermore"."""
+    auto_construct: typing.ClassVar[bool] = True
+    """ automatically set up a world for each test in this class """
+    memory_leak_tested: typing.ClassVar[bool] = False
+    """ remember if memory leak test was already done for this class """
+
+    def setUp(self) -> None:
+        if self.auto_construct:
+            self.world_setup()
+
+    def tearDown(self) -> None:
+        if self.__class__.memory_leak_tested or not self.options or not self.constructed or \
+                sys.version_info < (3, 11, 0):  # the leak check in tearDown fails in py<3.11 for an unknown reason
+            # only run memory leak test once per class, only for constructed with non-default options
+            # default options will be tested in test/general
+            super().tearDown()
+            return
+
+        import gc
+        import weakref
+        weak = weakref.ref(self.multiworld)
+        for attr_name in dir(self):  # delete all direct references to MultiWorld and World
+            attr: object = typing.cast(object, getattr(self, attr_name))
+            if type(attr) is MultiWorld or isinstance(attr, AutoWorld.World):
+                delattr(self, attr_name)
+        state_cache: typing.Optional[typing.Dict[typing.Any, typing.Any]] = getattr(self, "_state_cache", None)
+        if state_cache is not None:  # in case of multiple inheritance with TestBase, we need to clear its cache
+            state_cache.clear()
+        gc.collect()
+        self.__class__.memory_leak_tested = True
+        self.assertFalse(weak(), f"World {getattr(self, 'game', '')} leaked MultiWorld object")
+        super().tearDown()
+
+    def world_setup(self, seed: typing.Optional[int] = None) -> None:
+        if type(self) is WorldTestBase or \
+                (hasattr(WorldTestBase, self._testMethodName)
+                 and not self.run_default_tests and
+                 getattr(self, self._testMethodName).__code__ is
+                 getattr(WorldTestBase, self._testMethodName, None).__code__):
+            return  # setUp gets called for tests defined in the base class. We skip world_setup here.
+        if not hasattr(self, "game"):
+            raise NotImplementedError("didn't define game name")
+        self.multiworld = MultiWorld(1)
+        self.multiworld.game[self.player] = self.game
+        self.multiworld.player_name = {self.player: "Tester"}
+        self.multiworld.set_seed(seed)
+        self.multiworld.state = CollectionState(self.multiworld)
+        random.seed(self.multiworld.seed)
+        self.multiworld.seed_name = get_seed_name(random)  # only called to get same RNG progression as Generate.py
+        args = Namespace()
+        for name, option in AutoWorld.AutoWorldRegister.world_types[self.game].options_dataclass.type_hints.items():
+            setattr(args, name, {
+                1: option.from_any(self.options.get(name, option.default))
+            })
+        self.multiworld.set_options(args)
+        self.world = self.multiworld.worlds[self.player]
+        for step in gen_steps:
+            call_all(self.multiworld, step)
+
+    # methods that can be called within tests
+    def collect_all_but(self, item_names: typing.Union[str, typing.Iterable[str]],
+                        state: typing.Optional[CollectionState] = None) -> None:
+        """Collects all pre-placed items and items in the multiworld itempool except those provided"""
+        if isinstance(item_names, str):
+            item_names = (item_names,)
+        if not state:
+            state = self.multiworld.state
+        for item in self.multiworld.get_items():
+            if item.name not in item_names:
+                state.collect(item)
+
+    def get_item_by_name(self, item_name: str) -> Item:
+        """Returns the first item found in placed items, or in the itempool with the matching name"""
+        for item in self.multiworld.get_items():
+            if item.name == item_name:
+                return item
+        raise ValueError("No such item")
+
+    def get_items_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]:
+        """Returns actual items from the itempool that match the provided name(s)"""
+        if isinstance(item_names, str):
+            item_names = (item_names,)
+        return [item for item in self.multiworld.itempool if item.name in item_names]
+
+    def collect_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]:
+        """ collect all of the items in the item pool that have the given names """
+        items = self.get_items_by_name(item_names)
+        self.collect(items)
+        return items
+
+    def collect(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None:
+        """Collects the provided item(s) into state"""
+        if isinstance(items, Item):
+            items = (items,)
+        for item in items:
+            self.multiworld.state.collect(item)
+    
+    def remove_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]:
+        """Remove all of the items in the item pool with the given names from state"""
+        items = self.get_items_by_name(item_names)
+        self.remove(items)
+        return items
+
+    def remove(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None:
+        """Removes the provided item(s) from state"""
+        if isinstance(items, Item):
+            items = (items,)
+        for item in items:
+            if item.location and item.advancement and item.location in self.multiworld.state.advancements:
+                self.multiworld.state.advancements.remove(item.location)
+            self.multiworld.state.remove(item)
+
+    def can_reach_location(self, location: str) -> bool:
+        """Determines if the current state can reach the provided location name"""
+        return self.multiworld.state.can_reach(location, "Location", self.player)
+
+    def can_reach_entrance(self, entrance: str) -> bool:
+        """Determines if the current state can reach the provided entrance name"""
+        return self.multiworld.state.can_reach(entrance, "Entrance", self.player)
+    
+    def can_reach_region(self, region: str) -> bool:
+        """Determines if the current state can reach the provided region name"""
+        return self.multiworld.state.can_reach(region, "Region", self.player)
+
+    def count(self, item_name: str) -> int:
+        """Returns the amount of an item currently in state"""
+        return self.multiworld.state.count(item_name, self.player)
+
+    def assertAccessDependency(self,
+                               locations: typing.List[str],
+                               possible_items: typing.Iterable[typing.Iterable[str]],
+                               only_check_listed: bool = False) -> None:
+        """Asserts that the provided locations can't be reached without the listed items but can be reached with any
+         one of the provided combinations"""
+        all_items = [item_name for item_names in possible_items for item_name in item_names]
+
+        state = CollectionState(self.multiworld)
+        self.collect_all_but(all_items, state)
+        if only_check_listed:
+            for location in locations:
+                self.assertFalse(state.can_reach(location, "Location", self.player),
+                                 f"{location} is reachable without {all_items}")
+        else:
+            for location in self.multiworld.get_locations():
+                loc_reachable = state.can_reach(location, "Location", self.player)
+                self.assertEqual(loc_reachable, location.name not in locations,
+                                 f"{location.name} is reachable without {all_items}" if loc_reachable
+                                 else f"{location.name} is not reachable without {all_items}")
+        for item_names in possible_items:
+            items = self.get_items_by_name(item_names)
+            for item in items:
+                state.collect(item)
+            for location in locations:
+                self.assertTrue(state.can_reach(location, "Location", self.player),
+                                f"{location} not reachable with {item_names}")
+            for item in items:
+                state.remove(item)
+
+    def assertBeatable(self, beatable: bool):
+        """Asserts that the game can be beaten with the current state"""
+        self.assertEqual(self.multiworld.can_beat_game(self.multiworld.state), beatable)
+
+    # following tests are automatically run
+    @property
+    def run_default_tests(self) -> bool:
+        """Not possible or identical to the base test that's always being run already"""
+        return (self.options
+                or self.setUp.__code__ is not WorldTestBase.setUp.__code__
+                or self.world_setup.__code__ is not WorldTestBase.world_setup.__code__)
+
+    @property
+    def constructed(self) -> bool:
+        """A multiworld has been constructed by this point"""
+        return hasattr(self, "game") and hasattr(self, "multiworld")
+
+    def test_all_state_can_reach_everything(self):
+        """Ensure all state can reach everything and complete the game with the defined options"""
+        if not (self.run_default_tests and self.constructed):
+            return
+        with self.subTest("Game", game=self.game, seed=self.multiworld.seed):
+            state = self.multiworld.get_all_state(False)
+            for location in self.multiworld.get_locations():
+                with self.subTest("Location should be reached", location=location.name):
+                    reachable = location.can_reach(state)
+                    self.assertTrue(reachable, f"{location.name} unreachable")
+            with self.subTest("Beatable"):
+                self.multiworld.state = state
+                self.assertBeatable(True)
+
+    def test_empty_state_can_reach_something(self):
+        """Ensure empty state can reach at least one location with the defined options"""
+        if not (self.run_default_tests and self.constructed):
+            return
+        with self.subTest("Game", game=self.game, seed=self.multiworld.seed):
+            state = CollectionState(self.multiworld)
+            locations = self.multiworld.get_reachable_locations(state, self.player)
+            self.assertGreater(len(locations), 0,
+                               "Need to be able to reach at least one location to get started.")
+
+    def test_fill(self):
+        """Generates a multiworld and validates placements with the defined options"""
+        if not (self.run_default_tests and self.constructed):
+            return
+        from Fill import distribute_items_restrictive
+
+        # basically a shortened reimplementation of this method from core, in order to force the check is done
+        def fulfills_accessibility() -> bool:
+            locations = list(self.multiworld.get_locations(1))
+            state = CollectionState(self.multiworld)
+            while locations:
+                sphere: typing.List[Location] = []
+                for n in range(len(locations) - 1, -1, -1):
+                    if locations[n].can_reach(state):
+                        sphere.append(locations.pop(n))
+                self.assertTrue(sphere or self.multiworld.worlds[1].options.accessibility == "minimal",
+                                f"Unreachable locations: {locations}")
+                if not sphere:
+                    break
+                for location in sphere:
+                    if location.item:
+                        state.collect(location.item, True, location)
+            return self.multiworld.has_beaten_game(state, self.player)
+
+        with self.subTest("Game", game=self.game, seed=self.multiworld.seed):
+            distribute_items_restrictive(self.multiworld)
+            call_all(self.multiworld, "post_fill")
+            self.assertTrue(fulfills_accessibility(), "Collected all locations, but can't beat the game.")
+            placed_items = [loc.item for loc in self.multiworld.get_locations() if loc.item and loc.item.code]
+            self.assertLessEqual(len(self.multiworld.itempool), len(placed_items),
+                                 "Unplaced Items remaining in itempool")
\ No newline at end of file
diff --git a/worlds/cccharles/test/test_access.py b/worlds/cccharles/test/test_access.py
new file mode 100644
index 000000000000..de73fa4140f5
--- /dev/null
+++ b/worlds/cccharles/test/test_access.py
@@ -0,0 +1,10 @@
+from worlds.cccharles.test import MyGameTestBase
+
+
+class TestChestAccess(MyGameTestBase):
+    def test_claire_breakers(self) -> None:
+        """Test locations that require 4 Breakers"""
+        locations = ["lighthouse_claire_mission_end"]
+        items = [["Breaker"], ["Breaker"], ["Breaker"], ["Breaker"]]
+        # This will test that each location can't be accessed without 4 "Breaker", but can be accessed once obtained
+        self.assertAccessDependency(locations, items)

From ce82800a851b4eea07ae240f3750c8ce8799955c Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Sun, 3 Aug 2025 16:24:16 +0200
Subject: [PATCH 02/23] Update documentations

> Redacted French and English Setup Guides
> Redacted French and English Game Pages
---
 worlds/cccharles/__init__.py                  | 17 ++++-
 worlds/cccharles/docs/en_Choo-Choo Charles.md | 23 +++++--
 worlds/cccharles/docs/en_setup_guide.md       | 27 --------
 worlds/cccharles/docs/fr_Choo-Choo Charles.md | 21 +++++--
 worlds/cccharles/docs/fr_setup_guide.md       | 27 --------
 worlds/cccharles/docs/setup_en.md             | 62 +++++++++++++++++++
 worlds/cccharles/docs/setup_fr.md             | 62 +++++++++++++++++++
 7 files changed, 171 insertions(+), 68 deletions(-)
 delete mode 100644 worlds/cccharles/docs/en_setup_guide.md
 delete mode 100644 worlds/cccharles/docs/fr_setup_guide.md
 create mode 100644 worlds/cccharles/docs/setup_en.md
 create mode 100644 worlds/cccharles/docs/setup_fr.md

diff --git a/worlds/cccharles/__init__.py b/worlds/cccharles/__init__.py
index 9d839ef98c1a..c0d91005c391 100644
--- a/worlds/cccharles/__init__.py
+++ b/worlds/cccharles/__init__.py
@@ -17,14 +17,25 @@ class CCCharlesWeb(WebWorld):
 
     theme = "stone"
 
-    tutorials = [Tutorial(
+    setup_en = Tutorial(
         "Multiworld Setup Guide",
-        "A guide to setup Choo-Choo Charles for MultiWorld.",
+        "A guide to setup Choo-Choo Charles for the Archipelago MultiWorld Randomizer.",
         "English",
         "setup_en.md",
         "setup/en",
         ["Yaranorgoth"]
-    )]
+    )
+
+    setup_fr = Tutorial(
+        "Guide d'Installation Multiworld",
+        "Un guide pour mettre en place Choo-Choo Charles pour le Randomiseur Multiworld Archipelago",
+        "Français",
+        "setup_fr.md",
+        "setup/fr",
+        ["Yaranorgoth"]
+    )
+
+    tutorials = [setup_en, setup_fr]
 
     game_info_languages = ["en", "fr"]
     rich_text_options_doc = True
diff --git a/worlds/cccharles/docs/en_Choo-Choo Charles.md b/worlds/cccharles/docs/en_Choo-Choo Charles.md
index 8fa1fac55a71..744f3a77694e 100644
--- a/worlds/cccharles/docs/en_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/en_Choo-Choo Charles.md	
@@ -1,26 +1,37 @@
 # Choo-Choo Charles
 
 ## Where is the options page?
-The player options page for this game contains all the options to configure and export a yaml config file. The page can be accessed [here](TODO).
+The player options page for this game contains all the options to configure and export a yaml config file.
+The page cannot be accessed yet, the default YAML should be used instead from [the Choo-Choo Charles Multiworld Randomizer YAML page](https://github.com/lgbarrere/CCCharles-Random/blob/main/Release/CCCharles.yaml).
 
 ## What does randomization do to this game?
-All scraps or any pickup item on the ground (exept from Lootboxes) and items received from NPCs missions are considered as locations to check.
+All scraps or any pickup item on the ground (except from Loot Crates) and items received from NPCs missions are considered as locations to check.
 
 ## What is the goal of Choo-Choo Charles when randomized?
 Beating the evil train from Hell named "Charles".
 
 ## How is the game managed in Nightmare mode?
-At death, the player has to restart a brand new game, giving him the choice to stay under the Nightmare mode or continuing with the Normal mode if considered too hard. In this case, all collected items won't appear on the map and will be redistributed in the inventory. In addition, if the option is enabled, all collected scraps are lost. However, those scraps can be found where the randomized items have already been collected (breaking the randomization only for the already collected items).
+At death, the player has to restart a brand-new game, giving him the choice to stay under the Nightmare mode or continuing with the Normal mode if considered too hard.
+In this case, all collected items will be redistributed in the inventory and the missions states will be kept.
+The Deathlink is not implemented yet. When this option will be available, a choice will be provided to :
+* Disable the Deathlink
+* Enable the soft Deathlink with respawn at Player Train when a Deathlink event is received
+* Enable the hard Deathlink with removal of the game save when a Deathlink event is received
 
 ## What does another world's item look like in Choo-Choo Charles?
-Any item or hint that cannot be normaly represented in the game is replaced by the miniaturized "DeathDuck" easter egg that can be seen out from the physical wall limits of the original game.
+Items appearance are kept unchanged.
+Any hint that cannot be normally represented in the game is replaced by the miniaturized "DeathDuck" Easter Egg that can be seen out from the physical wall limits of the original game.
 
 ## How is the player informed by an item transmission and hints?
-A message appears in game to inform what item is sent or received, including which world and what player the item comes from. The same method is used for hints.
+A message appears in game to inform what item is sent or received, including which world and what player the item comes from.
+The same method is used for hints.
 
 ## Is it possible to use hints in the game?
+No, this is a work in progress.
+The following options will be possible once the implementations are available :
+
 At any moment, the player can press one of the following keys to display a console in the game :
-* "~" (querty)
+* "~" or "`" (querty)
 * "²" (azerty)
 * "F10"
 Then, a hint can be revealed by typing "/hint [player] <item>".
diff --git a/worlds/cccharles/docs/en_setup_guide.md b/worlds/cccharles/docs/en_setup_guide.md
deleted file mode 100644
index f156cad243b2..000000000000
--- a/worlds/cccharles/docs/en_setup_guide.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Choo-Choo Charles MultiWorld Setup Guide
-
-## Requirements
-* A computer running Windows (the Mod is not handled by Linux)
-* Cloning the [Choo-Choo Charles Multiworld Randomizer Mod](https://github.com/lgbarrere/CCCharles-Random)
-
-## Installation and Game Start Procedures
-Copy all the content from **result/** in \<GameFolder\>/Obscure/Binaries/Win64/
-
-Copy the packed file from :
-```
-<ProjectFolder>\Obscure\PackagedMod\WindowsNoEditor\Obscure\Content\Paks\pakchunk1-WindowsNoEditor.pak
-```
-To :
-```
-<GameFolder>\Obscure\Content\Paks\LogicMods\
-```
-Then rename that file "TesterMod.pak".
-
-## Joining a MultiWorld Game
-TODO
-
-## Playing offline
-TODO
-
-## Game Troubleshooting
-TODO
diff --git a/worlds/cccharles/docs/fr_Choo-Choo Charles.md b/worlds/cccharles/docs/fr_Choo-Choo Charles.md
index 08845d881904..addaf395d449 100644
--- a/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
@@ -1,24 +1,35 @@
 # Choo-Choo Charles
 
 ## Où est la page d'options ?
-La page d'options du joueur pour ce jeu contient toutes les options pour configurer et exporter un fichier de configuration yaml. L'accès à cette page se trouve [ici](TODO).
+La page d'options du joueur pour ce jeu contient toutes les options pour configurer et exporter un fichier de configuration yaml.
+La page n'est pas encore possible pour le moment, le YAML par défaut doit être utilisé à la place depuis [la page YAML du Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random/blob/main/Release/CCCharles.yaml).
 
 ## Qu'est ce que la randomisation fait au jeu ?
-Tous les ferrailles ou n'importe quel objet collectable au sol (excepté les boîtes à butin) et objets reçus par les missions de PNJs sont considérés comme emplacements à vérifier.
+Tous les débrits ou n'importe quel objet collectionnable au sol (excepté les Caisses à Butin) et objets reçus par les missions de PNJs sont considérés comme emplacements à vérifier.
 
 ## Quel est le but de Choo-Choo Charles lorsqu'il est randomisé ?
 Vaincre le train démoniaque de l'Enfer nommé "Charles".
 
 ## Comment le jeu est-il géré en mode Nightmare ?
-À sa mort, le joueur doit relancer une toute nouvelle partie, lui donnant la possisilité de rester en mode Nightmare ou poursuivre la partie en mode Normal s'il considère la partie trop difficile. Dans ce cas, tout objet collecté n'apparaît plus sur la carte et sera redistribué dans l'inventaire. De plus, Si l'option est activée, tous les ferrailles collectés sont perdus. Cependant, ces ferrailles peuvent être trouvés où les objets randomisés ont déjà été collectés (brisant la randomisation uniquement pour les objets déjà collectés).
+À sa mort, le joueur doit relancer une toute nouvelle partie, lui donnant la possisilité de rester en mode Nightmare ou de poursuivre la partie en mode Normal s'il considère la partie trop difficile.
+Dans ce cas, tous les objets collectés seront redistribués dans l'inventaire et les états des missions seront conservés.
+Le Deathlink n'est pas implémenté pour l'instant. Lorsque cette option sera disponible, un choix sera fourni pour :
+* Désactiver le Deathlink
+* Activer le Deathlink modéré avec réapparition au Train du Joueur lorsqu'un évènement Deathlink est reçu
+* Activer le Deathlink strict avec suppression de la sauvegarde lorsqu'un évènement Deathlink est reçu
 
 ## À quoi ressemble un objet d'un autre monde dans Choo-Choo Charles ?
-Tout objet ou indice qui ne peut pas être représenté normalement dans le jeu est remplacé par l'easter egg "DeadDuck" miniaturisé qui peut être vu en dehors des limites murales physiques du jeu original.
+Les apparances des objets sont conservés.
+Tout indice qui ne peut pas être représenté normalement dans le jeu est remplacé par l'Easter Egg "DeadDuck" miniaturisé qui peut être vu en dehors des limites murales physiques du jeu original.
 
 ## Comment le joueur est-il informé par une transmission d'objet et des indices ?
-Un message apparaît en jeu pour informer quel objet est envoyé ou reçu, incluant de quel monde et de quel joueur l'objet vient. La même méthode est utilisée pour les indices.
+Un message apparaît en jeu pour informer quel objet est envoyé ou reçu, incluant de quel monde et de quel joueur vient l'objet.
+La même méthode est utilisée pour les indices.
 
 ## Est-il possible d'utiliser les indices dans le jeu ?
+Non, ceci est un travail en cours.
+Les options suivantes seront possibles une fois les implémentations disponibles :
+
 À n'importe quel moment, le joueur peu appuyer sur l'une des touches suivantes pour afficher la console dans le jeu :
 * "~" (querty)
 * "²" (azerty)
diff --git a/worlds/cccharles/docs/fr_setup_guide.md b/worlds/cccharles/docs/fr_setup_guide.md
deleted file mode 100644
index dc2f7ec55974..000000000000
--- a/worlds/cccharles/docs/fr_setup_guide.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Choo-Choo Charles MultiWorld Guide d'Installation
-
-## Exigences
-* Un ordinateur lançant Windows (le Mod n'est pas utilisable sous Linux)
-* Cloner le [Choo-Choo Charles Multiworld Randomizer Mod](https://github.com/lgbarrere/CCCharles-Random)
-
-## Installation et Procédures de Lancement du Jeu
-Copier tout le contenu de **result/** dans \<GameFolder\>/Obscure/Binaries/Win64/
-
-Copier le fichier empaqueté depuis :
-```
-<ProjectFolder>\Obscure\PackagedMod\WindowsNoEditor\Obscure\Content\Paks\pakchunk1-WindowsNoEditor.pak
-```
-Vers :
-```
-<GameFolder>\Obscure\Content\Paks\LogicMods\
-```
-Puis renommer ce fichier "TesterMod.pak".
-
-## Joining a MultiWorld Game
-TODO
-
-## Playing offline
-TODO
-
-## Game Troubleshooting
-TODO
diff --git a/worlds/cccharles/docs/setup_en.md b/worlds/cccharles/docs/setup_en.md
new file mode 100644
index 000000000000..6d2f68f52089
--- /dev/null
+++ b/worlds/cccharles/docs/setup_en.md
@@ -0,0 +1,62 @@
+# Choo-Choo Charles MultiWorld Setup Guide
+This page is a simplified guide of [the Choo-Choo Charles Multiworld Randomizer Mod Documentation](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#cccharles-random).
+
+## Requirements and Required Softwares
+* A computer running Windows (the Mod is not handled by Linux or Mac)
+* [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
+* A legal copy of the Choo-Choo Charles original game (can be found on [Steam](https://store.steampowered.com/))
+
+## Mod Installation for playing
+To install the Mod, open [the Choo-Choo Charles Multiworld Randomizer Mod page](https://github.com/lgbarrere/CCCharles-Random) and follow the steps below.
+
+### Game Setup
+The releases of this game are currently unofficial. However, the Mod can be installed and played by following these instructions :
+1. Click the green "<> Code" button
+2. Click "Download ZIP" and unzip the downloaded archive or clone this project
+3. From this folder, in **Release/**, copy the **Obscure/** folder to **\<GameFolder\>** (where the **Obscure/** folder and **Obscure.exe** are placed)
+4. Launch the game, if "OFFLINE" is written in the upper-right corner of the screen, the Mod is working
+> [!NOTE]
+> The content from the **Release/** folder can be manually placed while the paths to files are respected.
+
+### Create a Config (.yaml) File
+> [!NOTE]
+> The purpose of a YAML file is described at [the Basic Multiworld Setup Guide](https://archipelago.gg/tutorial/Archipelago/setup/en#generating-a-game).
+
+No option is currently taken into account by the Mod, this is a work in progress.
+
+A default YAML should be used while the options are not implemented, it can be found :
+* In the Release/ folder, downloaded in the **[Game Setup](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#game-setup)** section
+* In [the Choo-Choo Charles Multiworld Randomizer YAML page](https://github.com/lgbarrere/CCCharles-Random/blob/main/Release/CCCharles.yaml), by clicking the "Download raw file" icon
+
+The player name configured by this default YAML is "CCCharles", it can be changed by renaming both the YAML and the "name" section inside of this YAML, **both must be identical**.
+
+## Joining a MultiWorld Game
+> [!NOTE]
+> Before playing, it is highly recommended to check out the **[Known Issues](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#known-issues)** section
+* The game console must be opened to type Archipelago commands, press "F10" key or "`" (or "~") key in querty ("²" key in azerty)
+* Type ``/connect <IP> <PlayerName>`` with \<IP\> and \<PlayerName\> found on the hosting Archipelago web page in the form ``archipelago.gg:XXXXX`` and ``CCCharles``
+* Disconnection is automatic at game closure but can be manually done with ``/disconnect``
+
+## Hosting a MultiWorld or Single-Player Game
+See **[Game Setup](https://github.com/lgbarrere/CCCharles-Random#setup-the-game)** section to have the **Release/** folder downloaded.
+
+In this section, **Archipelago/** refers to the path where [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases) is installed locally.
+
+Follow these steps to host a remote multiplayer or a local single-player session :
+1. Double-click the **cccharles.apworld** in **Release/** to automatically install the world randomization logic
+2. Put the **CCCharles.yaml** from **Release/** to **Archipelago/Players/** with the YAML of each player to host
+3. Launch the Archipelago launcher and click "Generate" to configure a game with the YAML in **Archipelago/output/**
+4. For a multiplayer session, go to [the Archipelago HOST GAME page](https://archipelago.gg/uploads)
+5. Click "Upload File" and select the generated **AP_\<seed\>.zip** in **Archipelago/output/**
+6. Send the generated room page to each player
+> [!TIP]
+> For a local single-player session, click "Host" in the Archipelago launcher by using the generated **AP_\<seed\>.zip** in **Archipelago/output/**
+
+## Known Issues
+### Major issues
+* If the player receives the **Box of Rockets**, the bunker at the **Training Explosive** region will be opened once loaded. It may be possible to break the mission state if the player interacts with elements in unexpected order.
+
+### Minor issues
+* The current version of the command parser does not accept console commands with a player names containing whitespaces. It is recommended to use underscores "_" instead, for instance : CCCharles_Player_1.
+* Sometimes, an item reception or sending a location can fail (rare cases). Reloading the game is supposed to respawn all items on the ground and restarting a new game retrieves all unlocked items from Archipelago, that can be used as workarounds.
+* When an egg is received, if the player goes to one of the three mine exits before talking to the NPC who gives its entry key, the player will no longer be able to interact with this NPC. Make sure to talk to them before approaching their respective mines. Restart a new game otherwise.
diff --git a/worlds/cccharles/docs/setup_fr.md b/worlds/cccharles/docs/setup_fr.md
new file mode 100644
index 000000000000..1bccabfd6a8f
--- /dev/null
+++ b/worlds/cccharles/docs/setup_fr.md
@@ -0,0 +1,62 @@
+# Guide d'Installation du MultiWorld Choo-Choo Charles
+Cette page est un guide simplifié de [la Documentation du Mod Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#cccharles-random).
+
+## Exigences et Logiciels Nécessaires
+* Un ordinateur utilisant Windows (le Mod n'est pas utilisable sous Linux ou Mac)
+* [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
+* Une copie légale du jeu original Choo-Choo Charles (peut être trouvé sur [Steam](https://store.steampowered.com/))
+
+## Installation du Mod pour jouer
+Pour installer le Mod, ouvrir [la page du Mod Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random) et suivre les étapes ci-dessous.
+
+### Préparation du jeu
+Les sorties de ce jeu ne sont actuellement pas officielles. Cependant, le Mod peut être installé et joué en suivant ces instructions :
+1. Cliquer sur le bouton vert "<> Code"
+2. Cliquer "Download ZIP" et désarchiver l'archive téléchargée ou cloner ce projet
+3. Depuis ce dossier, dans **Release/**, copier le dossier **Obscure/** dans **\<DossierDuJeu\>** (où se situent le dossier **Obscure/** et **Obscure.exe**)
+4. Lancer le jeu, si "OFFLINE" est marqué dans le coin en haut à droite de l'écran, le Mod est actif
+> [!NOTE]
+> Le contenu du dossier **Release/** peut être placé manuellement tant que les chemins d'accès des fichiers sont respectés.
+
+### Créer un Fichier de Configuration (.yaml)
+> [!NOTE]
+> L'objectif d'un fichier YAML est décrit dans [le Guide d'Installation Basique du Multiworld](https://archipelago.gg/tutorial/Archipelago/setup/en#generating-a-game) (en anglais).
+
+Aucune option n'est actuellement prise en compte par le Mod, ceci est un travail en cours.
+
+Un YAML par défaut doit utilisé tant que les options ne sont pas implémentées, celui-ci peut être trouvé :
+* Dans le dossier Release/, téléchargé à la section **[Préparation du jeu](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#game-setup)**
+* Dans [la page YAML du Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random/blob/main/Release/CCCharles.yaml), en cliquant sur l'icône "Download raw file"
+
+Le nom du joueur configuré par ce YAML par défaut est "CCCharles", ceci peut être changé en renommant le YAML et la section "name" dans ce YAML, **les deux doivent être identiques**.
+
+## Rejoindre une Partie MultiWorld
+> [!NOTE]
+> Avant de jouer, il est fortement recommandé d'aller voir à la section **[Problèmes Connus](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#known-issues)**
+* La console du jeu doit être ouverte pour taper des commandes Archipelago, appuyer sur la touche "F10" ou "`" (ou "~") en querty (touche "²" en azerty)
+* Taper ``/connect <IP> <NomDuJoueur>`` avec \<IP\> et \<NomDuJoueur\> trouvés sur la page web d'hébergement Archipelago sous la forme ``archipelago.gg:XXXXX`` et ``CCCharles``
+* La déconnexion est automatique à la fermeture du jeu mais peut être faite manuellement avec ``/disconnect``
+
+## Héberger une partie MultiWorld ou un Seul Joueur
+Voir la section **[Préparation du jeu](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#game-setup)** pour télécharger le dossier **Release/**.
+
+Dans cette section, **Archipelago/** fait référence au chemin d'accès où [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases) est installé localement.
+
+Suivre ces étapes pour héberger une session multijoueur à distance ou locale pour un seul joueur :
+1. Double-cliquer sur **cccharles.apworld** dans **Release/** pour installer automatiquement la logique de randomisation du monde
+2. Copier **CCCharles.yaml** depuis **Release/** vers **Archipelago/Players/** avec le YAML de chaque joueur à héberger
+3. Exécuter le lanceur Archipelago et cliquer sur "Generate" pour configurer une partie avec le YAML dans **Archipelago/output/**
+4. Pour une session multijoueur, aller à [la page Archipelago HOST GAME](https://archipelago.gg/uploads)
+5. Cliquer sur "Upload File" et selectionner le **AP_\<seed\>.zip** généré dans **Archipelago/output/**
+6. Envoyer la page de la partie générée à chaque joueur
+> [!TIP]
+> Pour une session locale à un seul joueur, cliquer sur "Host" dans le lanceur Archipelago en utilisant **AP_\<seed\>.zip** généré dans **Archipelago/output/**
+
+## Problème Connus
+### Problèmes majeurs
+* Si le joueur reçoit la **Box of Rockets**, le bunker de la région **Training Explosive** sera ouvert une fois la zone chargée. Il peut être possible de casser l'état de la mission si le joueur interagit avec des éléments dans un ordre inattendu.
+
+### Problèmes mineurs
+* La version actuelle de l'analyseur de commandes n'accepte pas des commandes de la console dont le nom du joueur contient des espaces. Il est recommandé d'utiliser des soulignés "_" à la place, par exemple : CCCharles_Player_1.
+* Parfois, la réception d'un objet ou l'envoie d'un emplacement peut échouer (cas rares). Recharger le jeu est supposé faire réapparaître tous les objets au sol et relancer une nouvelle partie récupère tous les objets débloqués sur Archipelago, ceci peut être utilisé comme solution de contournement.
+* Quand un oeuf est reçu, si le joueur va vers l'une des trois sorties de mines avant de parler au PNJ qui en donne la clef d'entrée, le joueur ne sera plus capable d'interagir avec le PNJ. Il faut s'assurer de leur parler avant de s'approcher de leur mine respective. Recommencer une nouvelle partie si cela se produit.

From bbfb4d1b6f7b3c62f6492a20d9cb803f728984d2 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Sun, 3 Aug 2025 20:06:30 +0200
Subject: [PATCH 03/23] Handling PR#5287 remarks

> Revert unexpected changes on .run\Archipelago Unittests.run.xml (base Archipelago file)
> Fixed typo "querty" -> "qwerty" in fr and eng Game Pages
> Adding "Game page in other languages" section to eng Game Page documentation
> Improved Steam path in fr and eng Setup Guides
---
 .run/Archipelago Unittests.run.xml            | 8 +++-----
 worlds/cccharles/docs/en_Choo-Choo Charles.md | 5 ++++-
 worlds/cccharles/docs/fr_Choo-Choo Charles.md | 2 +-
 worlds/cccharles/docs/setup_en.md             | 2 +-
 worlds/cccharles/docs/setup_fr.md             | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.run/Archipelago Unittests.run.xml b/.run/Archipelago Unittests.run.xml
index c45075715c5a..24fea0f73fec 100644
--- a/.run/Archipelago Unittests.run.xml	
+++ b/.run/Archipelago Unittests.run.xml	
@@ -1,13 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Archipelago Unittests" type="tests" factoryName="Unittests">
-    <module name="Archipelago-CCCharles" />
-    <option name="ENV_FILES" value="" />
+    <module name="Archipelago" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
-    <option name="SDK_HOME" value="$PROJECT_DIR$/venv/Scripts/python.exe" />
-    <option name="SDK_NAME" value="Python 3.11 (Archipelago-CCCharles)" />
+    <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
+    <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
diff --git a/worlds/cccharles/docs/en_Choo-Choo Charles.md b/worlds/cccharles/docs/en_Choo-Choo Charles.md
index 744f3a77694e..56e418eb4ee5 100644
--- a/worlds/cccharles/docs/en_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/en_Choo-Choo Charles.md	
@@ -1,5 +1,8 @@
 # Choo-Choo Charles
 
+## Game page in other languages
+* [Français]()
+
 ## Where is the options page?
 The player options page for this game contains all the options to configure and export a yaml config file.
 The page cannot be accessed yet, the default YAML should be used instead from [the Choo-Choo Charles Multiworld Randomizer YAML page](https://github.com/lgbarrere/CCCharles-Random/blob/main/Release/CCCharles.yaml).
@@ -31,7 +34,7 @@ No, this is a work in progress.
 The following options will be possible once the implementations are available :
 
 At any moment, the player can press one of the following keys to display a console in the game :
-* "~" or "`" (querty)
+* "~" or "`" (qwerty)
 * "²" (azerty)
 * "F10"
 Then, a hint can be revealed by typing "/hint [player] <item>".
diff --git a/worlds/cccharles/docs/fr_Choo-Choo Charles.md b/worlds/cccharles/docs/fr_Choo-Choo Charles.md
index addaf395d449..ed946fe1d999 100644
--- a/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
@@ -31,7 +31,7 @@ Non, ceci est un travail en cours.
 Les options suivantes seront possibles une fois les implémentations disponibles :
 
 À n'importe quel moment, le joueur peu appuyer sur l'une des touches suivantes pour afficher la console dans le jeu :
-* "~" (querty)
+* "~" (qwerty)
 * "²" (azerty)
 * "F10"
 Puis, un indice peut être révélé en tapant "/hint [player] <item>"
diff --git a/worlds/cccharles/docs/setup_en.md b/worlds/cccharles/docs/setup_en.md
index 6d2f68f52089..fe725c7717d1 100644
--- a/worlds/cccharles/docs/setup_en.md
+++ b/worlds/cccharles/docs/setup_en.md
@@ -4,7 +4,7 @@ This page is a simplified guide of [the Choo-Choo Charles Multiworld Randomizer
 ## Requirements and Required Softwares
 * A computer running Windows (the Mod is not handled by Linux or Mac)
 * [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
-* A legal copy of the Choo-Choo Charles original game (can be found on [Steam](https://store.steampowered.com/))
+* A legal copy of the Choo-Choo Charles original game (can be found on [Steam](https://store.steampowered.com/app/1766740/ChooChoo_Charles/))
 
 ## Mod Installation for playing
 To install the Mod, open [the Choo-Choo Charles Multiworld Randomizer Mod page](https://github.com/lgbarrere/CCCharles-Random) and follow the steps below.
diff --git a/worlds/cccharles/docs/setup_fr.md b/worlds/cccharles/docs/setup_fr.md
index 1bccabfd6a8f..8284a03def66 100644
--- a/worlds/cccharles/docs/setup_fr.md
+++ b/worlds/cccharles/docs/setup_fr.md
@@ -4,7 +4,7 @@ Cette page est un guide simplifié de [la Documentation du Mod Randomiseur Multi
 ## Exigences et Logiciels Nécessaires
 * Un ordinateur utilisant Windows (le Mod n'est pas utilisable sous Linux ou Mac)
 * [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
-* Une copie légale du jeu original Choo-Choo Charles (peut être trouvé sur [Steam](https://store.steampowered.com/))
+* Une copie légale du jeu original Choo-Choo Charles (peut être trouvé sur [Steam](https://store.steampowered.com/app/1766740/ChooChoo_Charles/)
 
 ## Installation du Mod pour jouer
 Pour installer le Mod, ouvrir [la page du Mod Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random) et suivre les étapes ci-dessous.

From 48e8182b6a784cf8210de19779efa953036e7ce1 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Wed, 6 Aug 2025 22:27:33 +0200
Subject: [PATCH 04/23] Handled PR remarks + fixes

> Added get_filler_item_name() to remove warnings
> Fixed irrelevant links for documentations
> Used the Player Options page instead of the default YAML on GitHub
> Reworded all locations to make them simple and clear
> Split some locations that can be linked with an entrance rule
> Reworked all options
> Updated regions according to locations
> Replaced unnecessary rules by rules on entrances
---
 worlds/cccharles/Items.py                     |   12 +-
 worlds/cccharles/Locations.py                 | 1576 +++++++++--------
 worlds/cccharles/Options.py                   |  206 ++-
 worlds/cccharles/Regions.py                   |  323 ++--
 worlds/cccharles/Rules.py                     |  288 +--
 worlds/cccharles/__init__.py                  |   12 +-
 worlds/cccharles/docs/en_Choo-Choo Charles.md |    7 +-
 worlds/cccharles/docs/fr_Choo-Choo Charles.md |    5 +-
 worlds/cccharles/docs/setup_en.md             |   32 +-
 worlds/cccharles/docs/setup_fr.md             |   34 +-
 worlds/cccharles/test/test_access.py          |    6 +-
 11 files changed, 1216 insertions(+), 1285 deletions(-)

diff --git a/worlds/cccharles/Items.py b/worlds/cccharles/Items.py
index 2e1edbdc23d4..1c31db51682d 100644
--- a/worlds/cccharles/Items.py
+++ b/worlds/cccharles/Items.py
@@ -24,7 +24,7 @@ class CCCharlesItem(Item):
     "Page Drawing" : base_id + 15,
     "Journal" : base_id + 16,
     "Timed Dynamite" : base_id + 17,
-    "Box of Rocket" : base_id + 18,
+    "Box of Rockets" : base_id + 18,
     "Breaker" : base_id + 19,
     "Broken Bob" : base_id + 20,
     "Employment Contracts" : base_id + 21,
@@ -37,7 +37,7 @@ class CCCharlesItem(Item):
     "Green Paint Can" : base_id + 25,
     "White Paint Can" : base_id + 26,
     "Pink Paint Can" : base_id + 27,
-    "Gray Paint Can" : base_id + 28,
+    "Grey Paint Can" : base_id + 28,
     "Blue Paint Can" : base_id + 29,
     "Black Paint Can" : base_id + 30,
     "Lime Paint Can" : base_id + 31,
@@ -69,7 +69,7 @@ class CCCharlesItem(Item):
             "Green Paint Can",
             "White Paint Can",
             "Pink Paint Can",
-            "Gray Paint Can",
+            "Grey Paint Can",
             "Blue Paint Can",
             "Black Paint Can",
             "Lime Paint Can",
@@ -102,7 +102,7 @@ class CCCharlesItem(Item):
             "Page Drawing",
             "Journal",
             "Timed Dynamite",
-            "Box of Rocket",
+            "Box of Rockets",
             "Breaker",
             "Broken Bob",
             "Employment Contracts",
@@ -140,7 +140,7 @@ class CCCharlesItem(Item):
 full_item_list += ["Page Drawing"] * 8
 full_item_list += ["Journal"] * 1
 full_item_list += ["Timed Dynamite"] * 1
-full_item_list += ["Box of Rocket"] * 1
+full_item_list += ["Box of Rockets"] * 1
 full_item_list += ["Breaker"] * 4
 full_item_list += ["Broken Bob"] * 1
 full_item_list += ["Employment Contracts"] * 1
@@ -150,7 +150,7 @@ class CCCharlesItem(Item):
 full_item_list += ["Green Paint Can"] * 1
 full_item_list += ["White Paint Can"] * 1
 full_item_list += ["Pink Paint Can"] * 1
-full_item_list += ["Gray Paint Can"] * 1
+full_item_list += ["Grey Paint Can"] * 1
 full_item_list += ["Blue Paint Can"] * 1
 full_item_list += ["Black Paint Can"] * 1
 full_item_list += ["Lime Paint Can"] * 1
diff --git a/worlds/cccharles/Locations.py b/worlds/cccharles/Locations.py
index 1f2007f45ef5..252f29ef70d2 100644
--- a/worlds/cccharles/Locations.py
+++ b/worlds/cccharles/Locations.py
@@ -9,840 +9,852 @@ class CCCharlesLocation(Location):
 # /!\ NOT CONSIDERED YET : train_keypickup Train_KeyPickup Photorealistic_Island (X=-8816.341 Y=23392.416 Z=10219.855)
 
 loc_start_camp = {
-    "start_camp_scraps_1" : base_id + 1000, # ItemPickup139_5 Camp (X=24006.348 Y=53777.297 Z=10860.107)
-    "start_camp_scraps_2" : base_id + 1001 # ItemPickup140_8 Camp (X=23951.754 Y=54897.230 Z=10895.235)
+    "Start Camp Scraps 1" : base_id + 1000, # ItemPickup139_5 Camp (X=24006.348 Y=53777.297 Z=10860.107)
+    "Start Camp Scraps 2" : base_id + 1001 # ItemPickup140_8 Camp (X=23951.754 Y=54897.230 Z=10895.235)
 }
 
 loc_tony_tiddle_mission = {
-    "barn_tony_tiddle_mission_start" : base_id + 1002, # (dialog 5) -> barn_key (1)
-    "barn_scraps_1" : base_id + 1003, # ItemPickup12 Photorealistic_Island (X=70582.805 Y=52591.066 Z=11976.719)
-    "barn_scraps_2" : base_id + 1004, # ItemPickup4_2 Photorealistic_Island (X=70536.641 Y=51890.633 Z=11986.488)
-    "barn_scraps_3" : base_id + 1005, # ItemPickup6 Photorealistic_Island (X=70750.336 Y=52275.828 Z=11994.434)
-    "barn_scraps_4" : base_id + 1006, # ItemPickup11 Photorealistic_Island (X=70937.719 Y=52989.066 Z=12003.523)
-    "barn_scraps_5" : base_id + 1007, # ItemPickup5 Photorealistic_Island (X=71303.508 Y=52232.188 Z=12003.997)
-    "barn_scraps_6" : base_id + 1008, # ItemPickup7 Photorealistic_Island (X=71678.672 Y=52825.531 Z=11977.212)
-    "barn_scraps_7" : base_id + 1009, # ItemPickup8 Photorealistic_Island (X=71506.961 Y=52357.293 Z=12362.159)
-    "barn_scraps_8" : base_id + 1010, # ItemPickup9 Photorealistic_Island (X=71029.875 Y=52384.613 Z=12362.159)
-    "barn_scraps_9" : base_id + 1011 # ItemPickup10 Photorealistic_Island (X=71129.594 Y=52600.262 Z=12364.142)
-}
-
-loc_tutorial_candice_mission = {
-    "tutorial_candice_mission_start" : base_id + 1012, # (dialog 3) -> candice_key (2)
-    "tutorial_scraps_1" : base_id + 1013, # ItemPickup17_2 Photorealistic_Island (X=74745.852 Y=73865.555 Z=11426.619)
-    "tutorial_scraps_2" : base_id + 1014, # ItemPickup18_2 Photorealistic_Island (X=74864.102 Y=73900.094 Z=11426.619)
-    "tutorial_scraps_3" : base_id + 1015, # ItemPickup14_2 Photorealistic_Island (X=74877.625 Y=73738.594 Z=11422.057) \!/ Existing match 4
-    "tutorial_scraps_4" : base_id + 1016, # ItemPickup15_8 Photorealistic_Island (X=75068.992 Y=73971.133 Z=11426.619)
-    "tutorial_scraps_5" : base_id + 1017, # ItemPickup21_1 Photorealistic_Island (X=74923.500 Y=73571.648 Z=11426.619)
-    "tutorial_scraps_6" : base_id + 1018, # ItemPickup19 Photorealistic_Island (X=75194.906 Y=73495.719 Z=11426.619)
-    "tutorial_scraps_7" : base_id + 1019, # ItemPickup13_3 Photorealistic_Island (X=75320.102 Y=73446.352 Z=11487.376)
-    "tutorial_scraps_8" : base_id + 1020, # ItemPickup20 Photorealistic_Island (X=75298.680 Y=73580.531 Z=11426.619)
-    "tutorial_scraps_9" : base_id + 1021 # ItemPickup16_3 Photorealistic_Island (X=75310.008 Y=73770.742 Z=11489.709)
-}
-
-loc_swamp = {
-    "swamp_scraps_1" : base_id + 1022, # ItemPickup465_67 Swamp_EnvironmentDetails (X=81964.398 Y=72167.305 Z=10116.385)
-    "swamp_scraps_2" : base_id + 1023, # ItemPickup460_52 Swamp_EnvironmentDetails (X=89674.047 Y=71610.008 Z=9482.095)
-    "swamp_scraps_3" : base_id + 1024, # ItemPickup459_49 Swamp_EnvironmentDetails (X=91637.156 Y=73345.672 Z=9492.019)
-    "swamp_scraps_4" : base_id + 1025, # ItemPickup458_46 Swamp_EnvironmentDetails (X=94601.117 Y=75064.117 Z=9567.464)
-    "swamp_scraps_5" : base_id + 1026, # ItemPickup457_43 Swamp_EnvironmentDetails (X=95536.641 Y=72622.969 Z=9512.531)
-    "swamp_scraps_6" : base_id + 1027, # ItemPickup456_40 Swamp_EnvironmentDetails (X=96419.922 Y=65508.676 Z=9838.949)
-    "swamp_scraps_7" : base_id + 1028, # ItemPickup455_37 Swamp_EnvironmentDetails (X=98158.680 Y=63191.629 Z=10477.084)
-    "swamp_scraps_8" : base_id + 1029, # ItemPickup55_29 Swamp_EnvironmentDetails (X=93421.820 Y=59200.461 Z=9545.312)
-    "swamp_scraps_9" : base_id + 1030, # ItemPickup453_31 Swamp_EnvironmentDetails(X=92951.648 Y=56453.527 Z=9560.638)
-    "swamp_scraps_10" : base_id + 1031, # ItemPickup454_34 Swamp_EnvironmentDetails (X=96943.297 Y=58754.043 Z=10728.124)
-    "swamp_scraps_11" : base_id + 1032, # ItemPickup452_28 Swamp_EnvironmentDetails (X=95000.617 Y=53070.859 Z=10258.078)
-    "swamp_scraps_12" : base_id + 1033, # ItemPickup451_25 Swamp_EnvironmentDetails (X=91390.703 Y=53628.707 Z=9498.378)
-    "swamp_scraps_13" : base_id + 1034, # ItemPickup53_23 Swamp_EnvironmentDetails (X=87628.742 Y=51614.957 Z=9487.013)
-    "swamp_scraps_14" : base_id + 1035, # ItemPickup448_16 Swamp_EnvironmentDetails (X=89785.992 Y=48603.844 Z=9573.859)
-    "swamp_scraps_15" : base_id + 1036, # ItemPickup447_11 Swamp_EnvironmentDetails (X=89925.383 Y=46288.707 Z=9499.904)
-    "swamp_scraps_16" : base_id + 1037, # ItemPickup446_8 Swamp_EnvironmentDetails (X=90848.938 Y=43133.535 Z=9729.535)
-    "swamp_scraps_17" : base_id + 1038, # ItemPickup445_5 Swamp_EnvironmentDetails (X=87382.383 Y=42475.191 Z=9509.929)
-    "swamp_scraps_18" : base_id + 1039, # ItemPickup444_2 Swamp_EnvironmentDetails (X=87481.820 Y=39316.820 Z=9757.511)
-    "swamp_scraps_19" : base_id + 1040, # ItemPickup54_26 Swamp_EnvironmentDetails (X=86039.180 Y=37135.004 Z=9826.263)
-    "swamp_scraps_20" : base_id + 1041, # ItemPickup475_97 Swamp_EnvironmentDetails (X=81798.609 Y=36766.922 Z=9479.318)
-    "swamp_scraps_21" : base_id + 1042, # ItemPickup474_94 Swamp_EnvironmentDetails (X=79254.055 Y=40120.293 Z=9879.539)
-    "swamp_scraps_22" : base_id + 1043, # ItemPickup473_91 Swamp_EnvironmentDetails (X=82251.773 Y=42454.027 Z=9482.057)
-    "swamp_scraps_23" : base_id + 1044, # ItemPickup472_88 Swamp_EnvironmentDetails (X=84903.977 Y=48323.543 Z=9503.382)
-    "swamp_scraps_24" : base_id + 1045, # ItemPickup471_85 Swamp_EnvironmentDetails (X=84238.609 Y=51239.547 Z=9529.745)
-    "swamp_scraps_25" : base_id + 1046, # ItemPickup470_82 Swamp_EnvironmentDetails (X=84439.063 Y=53501.563 Z=9491.291)
-    "swamp_scraps_26" : base_id + 1047, # ItemPickup52_20 Swamp_EnvironmentDetails (X=83025.086 Y=53275.348 Z=9694.177)
-    "swamp_scraps_27" : base_id + 1048, # ItemPickup469_79 Swamp_EnvironmentDetails (X=79827.055 Y=54791.504 Z=10121.452)
-    "swamp_scraps_28" : base_id + 1049, # ItemPickup468_76 Swamp_EnvironmentDetails (X=82266.461 Y=58126.316 Z=9660.493)
-    "swamp_scraps_29" : base_id + 1050, # ItemPickup467_73 Swamp_EnvironmentDetails (X=75911.297 Y=65155.836 Z=10660.832)
-    "swamp_scraps_30" : base_id + 1051, # ItemPickup466_70 Swamp_EnvironmentDetails (X=81171.641 Y=66836.125 Z=9673.756)
-    "swamp_scraps_31" : base_id + 1052, # ItemPickup449_19 Swamp_EnvironmentDetails (X=95254.992 Y=40910.563 Z=10503.727)
-    "swamp_scraps_32" : base_id + 1053 # ItemPickup450_22 Swamp_EnvironmentDetails (X=93992.992 Y=50773.484 Z=10238.064)
-}
-
-loc_lizbeth_murkwater_mission = {
-    "swamp_shack_scraps_1" : base_id + 1054, # ItemPickup51_17 Swamp_EnvironmentDetails (X=87685.797 Y=69754.008 Z=9629.617)
-    "swamp_shack_scraps_2" : base_id + 1055, # ItemPickup461_55 Swamp_EnvironmentDetails (X=87308.883 Y=69096.789 Z=9624.543)
-    "swamp_isle_scraps_1" : base_id + 1056, # ItemPickup462_58 Swamp_EnvironmentDetails (X=88101.219 Y=64553.148 Z=9557.692)
-    "swamp_isle_scraps_2" : base_id + 1057, # ItemPickup463_61 Swamp_EnvironmentDetails (X=87100.922 Y=63590.965 Z=9582.900)
-    "swamp_isle_scraps_3" : base_id + 1058, # ItemPickup464_64 Swamp_EnvironmentDetails (X=86399.656 Y=64290.805 Z=9493.576)
-    "swamp_isle_dead_fish" : base_id + 1059, # Swamp_FishPickup Swamp_EnvironmentDetails (X=87288.945 Y=64278.273 Z=9550.320)
-    "swamp_lizbeth_murkwater_mission_end" : base_id + 1060 # (dialog 2) -> 30_scraps_reward
-}
-
-loc_daryl_mission = {
-    "junkyard_daryl_scraps_1" : base_id + 1061, # ItemPickup185_29 Junkyard_Details1 (X=94184.391 Y=89760.258 Z=9331.188)
-    "junkyard_daryl_scraps_2" : base_id + 1062, # ItemPickup177_5 Junkyard_Details1 (X=91919.469 Y=89681.602 Z=9407.639)
-    "junkyard_daryl_scraps_3" : base_id + 1063, # ItemPickup46_5 Junkyard_Details (X=91696.078 Y=90453.563 Z=9480.997)
-    "junkyard_daryl_scraps_4" : base_id + 1064, # ItemPickup178_8 Junkyard_Details1 (X=92453.719 Y=91142.531 Z=9398.951)
-    "junkyard_daryl_scraps_5" : base_id + 1065, # ItemPickup182_20 Junkyard_Details1 (X=88645.453 Y=90374.930 Z=9507.291)
-    "junkyard_daryl_scraps_6" : base_id + 1066, # ItemPickup48_11 Junkyard_Details (X=88461.953 Y=92077.531 Z=9712.173)
-    "junkyard_daryl_scraps_7" : base_id + 1067, # ItemPickup49_14 Junkyard_Details (X=91521.555 Y=93773.641 Z=9421.457)
-    "junkyard_daryl_scraps_8" : base_id + 1068, # ItemPickup50_17 Junkyard_Details (X=94741.484 Y=92565.938 Z=9221.093)
-    "junkyard_daryl_scraps_9" : base_id + 1069, # ItemPickup186_32 Junkyard_Details1 (X=95256.008 Y=91356.789 Z=9251.082)
-    "junkyard_daryl_scraps_10" : base_id + 1070, # ItemPickup45_2 Junkyard_Details (X=94289.664 Y=89951.477 Z=9367.076)
-    "junkyard_daryl_mission_start" : base_id + 1071, # (dialog 4) -> Lockpicks (4)
-    "junkyard_daryl_ancient_tablet" : base_id + 1072, # Junkyard_TabletPickup Junkyard_Details (X=90715.367 Y=92168.563 Z=9402.729)
-    "junkyard_daryl_mission_end" : base_id + 1073 # (dialog 3) -> 25_scraps_reward
+    "Barn Tony Tiddle Mission Start": base_id + 1002  # (dialog 5) -> barn_key (1)
+}
+
+loc_barn = {
+    "Barn Scraps 1" : base_id + 1003, # ItemPickup12 Photorealistic_Island (X=70582.805 Y=52591.066 Z=11976.719)
+    "Barn Scraps 2" : base_id + 1004, # ItemPickup4_2 Photorealistic_Island (X=70536.641 Y=51890.633 Z=11986.488)
+    "Barn Scraps 3" : base_id + 1005, # ItemPickup6 Photorealistic_Island (X=70750.336 Y=52275.828 Z=11994.434)
+    "Barn Scraps 4" : base_id + 1006, # ItemPickup11 Photorealistic_Island (X=70937.719 Y=52989.066 Z=12003.523)
+    "Barn Scraps 5" : base_id + 1007, # ItemPickup5 Photorealistic_Island (X=71303.508 Y=52232.188 Z=12003.997)
+    "Barn Scraps 6" : base_id + 1008, # ItemPickup7 Photorealistic_Island (X=71678.672 Y=52825.531 Z=11977.212)
+    "Barn Scraps 7" : base_id + 1009, # ItemPickup8 Photorealistic_Island (X=71506.961 Y=52357.293 Z=12362.159)
+    "Barn Scraps 8" : base_id + 1010, # ItemPickup9 Photorealistic_Island (X=71029.875 Y=52384.613 Z=12362.159)
+    "Barn Scraps 9" : base_id + 1011 # ItemPickup10 Photorealistic_Island (X=71129.594 Y=52600.262 Z=12364.142)
+}
+
+loc_candice_mission = {
+    "Tutorial House Candice Mission Start" : base_id + 1012 # (dialog 3) -> candice_key (2)
+}
+
+loc_tutorial_house = {
+    "Tutorial House Scraps 1": base_id + 1013, # ItemPickup17_2 Photorealistic_Island (X=74745.852 Y=73865.555 Z=11426.619)
+    "Tutorial House Scraps 2": base_id + 1014, # ItemPickup18_2 Photorealistic_Island (X=74864.102 Y=73900.094 Z=11426.619)
+    "Tutorial House Scraps 3": base_id + 1015, # ItemPickup14_2 Photorealistic_Island (X=74877.625 Y=73738.594 Z=11422.057) \!/ Existing match 4
+    "Tutorial House Scraps 4": base_id + 1016, # ItemPickup15_8 Photorealistic_Island (X=75068.992 Y=73971.133 Z=11426.619)
+    "Tutorial House Scraps 5": base_id + 1017, # ItemPickup21_1 Photorealistic_Island (X=74923.500 Y=73571.648 Z=11426.619)
+    "Tutorial House Scraps 6": base_id + 1018, # ItemPickup19 Photorealistic_Island (X=75194.906 Y=73495.719 Z=11426.619)
+    "Tutorial House Scraps 7": base_id + 1019, # ItemPickup13_3 Photorealistic_Island (X=75320.102 Y=73446.352 Z=11487.376)
+    "Tutorial House Scraps 8": base_id + 1020, # ItemPickup20 Photorealistic_Island (X=75298.680 Y=73580.531 Z=11426.619)
+    "Tutorial House Scraps 9": base_id + 1021 # ItemPickup16_3 Photorealistic_Island (X=75310.008 Y=73770.742 Z=11489.709)
+}
+
+loc_swamp_edges = {
+    "Swamp Edges Scraps 1" : base_id + 1022, # ItemPickup465_67 Swamp_EnvironmentDetails (X=81964.398 Y=72167.305 Z=10116.385)
+    "Swamp Edges Scraps 2" : base_id + 1023, # ItemPickup460_52 Swamp_EnvironmentDetails (X=89674.047 Y=71610.008 Z=9482.095)
+    "Swamp Edges Scraps 3" : base_id + 1024, # ItemPickup459_49 Swamp_EnvironmentDetails (X=91637.156 Y=73345.672 Z=9492.019)
+    "Swamp Edges Scraps 4" : base_id + 1025, # ItemPickup458_46 Swamp_EnvironmentDetails (X=94601.117 Y=75064.117 Z=9567.464)
+    "Swamp Edges Scraps 5" : base_id + 1026, # ItemPickup457_43 Swamp_EnvironmentDetails (X=95536.641 Y=72622.969 Z=9512.531)
+    "Swamp Edges Scraps 6" : base_id + 1027, # ItemPickup456_40 Swamp_EnvironmentDetails (X=96419.922 Y=65508.676 Z=9838.949)
+    "Swamp Edges Scraps 7" : base_id + 1028, # ItemPickup455_37 Swamp_EnvironmentDetails (X=98158.680 Y=63191.629 Z=10477.084)
+    "Swamp Edges Scraps 8" : base_id + 1029, # ItemPickup55_29 Swamp_EnvironmentDetails (X=93421.820 Y=59200.461 Z=9545.312)
+    "Swamp Edges Scraps 9" : base_id + 1030, # ItemPickup453_31 Swamp_EnvironmentDetails(X=92951.648 Y=56453.527 Z=9560.638)
+    "Swamp Edges Scraps 10" : base_id + 1031, # ItemPickup454_34 Swamp_EnvironmentDetails (X=96943.297 Y=58754.043 Z=10728.124)
+    "Swamp Edges Scraps 11" : base_id + 1032, # ItemPickup452_28 Swamp_EnvironmentDetails (X=95000.617 Y=53070.859 Z=10258.078)
+    "Swamp Edges Scraps 12" : base_id + 1033, # ItemPickup451_25 Swamp_EnvironmentDetails (X=91390.703 Y=53628.707 Z=9498.378)
+    "Swamp Edges Scraps 13" : base_id + 1034, # ItemPickup53_23 Swamp_EnvironmentDetails (X=87628.742 Y=51614.957 Z=9487.013)
+    "Swamp Edges Scraps 14" : base_id + 1035, # ItemPickup448_16 Swamp_EnvironmentDetails (X=89785.992 Y=48603.844 Z=9573.859)
+    "Swamp Edges Scraps 15" : base_id + 1036, # ItemPickup447_11 Swamp_EnvironmentDetails (X=89925.383 Y=46288.707 Z=9499.904)
+    "Swamp Edges Scraps 16" : base_id + 1037, # ItemPickup446_8 Swamp_EnvironmentDetails (X=90848.938 Y=43133.535 Z=9729.535)
+    "Swamp Edges Scraps 17" : base_id + 1038, # ItemPickup445_5 Swamp_EnvironmentDetails (X=87382.383 Y=42475.191 Z=9509.929)
+    "Swamp Edges Scraps 18" : base_id + 1039, # ItemPickup444_2 Swamp_EnvironmentDetails (X=87481.820 Y=39316.820 Z=9757.511)
+    "Swamp Edges Scraps 19" : base_id + 1040, # ItemPickup54_26 Swamp_EnvironmentDetails (X=86039.180 Y=37135.004 Z=9826.263)
+    "Swamp Edges Scraps 20" : base_id + 1041, # ItemPickup475_97 Swamp_EnvironmentDetails (X=81798.609 Y=36766.922 Z=9479.318)
+    "Swamp Edges Scraps 21" : base_id + 1042, # ItemPickup474_94 Swamp_EnvironmentDetails (X=79254.055 Y=40120.293 Z=9879.539)
+    "Swamp Edges Scraps 22" : base_id + 1043, # ItemPickup473_91 Swamp_EnvironmentDetails (X=82251.773 Y=42454.027 Z=9482.057)
+    "Swamp Edges Scraps 23" : base_id + 1044, # ItemPickup472_88 Swamp_EnvironmentDetails (X=84903.977 Y=48323.543 Z=9503.382)
+    "Swamp Edges Scraps 24" : base_id + 1045, # ItemPickup471_85 Swamp_EnvironmentDetails (X=84238.609 Y=51239.547 Z=9529.745)
+    "Swamp Edges Scraps 25" : base_id + 1046, # ItemPickup470_82 Swamp_EnvironmentDetails (X=84439.063 Y=53501.563 Z=9491.291)
+    "Swamp Edges Scraps 26" : base_id + 1047, # ItemPickup52_20 Swamp_EnvironmentDetails (X=83025.086 Y=53275.348 Z=9694.177)
+    "Swamp Edges Scraps 27" : base_id + 1048, # ItemPickup469_79 Swamp_EnvironmentDetails (X=79827.055 Y=54791.504 Z=10121.452)
+    "Swamp Edges Scraps 28" : base_id + 1049, # ItemPickup468_76 Swamp_EnvironmentDetails (X=82266.461 Y=58126.316 Z=9660.493)
+    "Swamp Edges Scraps 29" : base_id + 1050, # ItemPickup467_73 Swamp_EnvironmentDetails (X=75911.297 Y=65155.836 Z=10660.832)
+    "Swamp Edges Scraps 30" : base_id + 1051, # ItemPickup466_70 Swamp_EnvironmentDetails (X=81171.641 Y=66836.125 Z=9673.756)
+    "Swamp Edges Scraps 31" : base_id + 1052, # ItemPickup449_19 Swamp_EnvironmentDetails (X=95254.992 Y=40910.563 Z=10503.727)
+    "Swamp Edges Scraps 32" : base_id + 1053 # ItemPickup450_22 Swamp_EnvironmentDetails (X=93992.992 Y=50773.484 Z=10238.064)
+}
+
+loc_swamp_mission = {
+    "Swamp Shack Scraps 1" : base_id + 1054, # ItemPickup51_17 Swamp_EnvironmentDetails (X=87685.797 Y=69754.008 Z=9629.617)
+    "Swamp Shack Scraps 2" : base_id + 1055, # ItemPickup461_55 Swamp_EnvironmentDetails (X=87308.883 Y=69096.789 Z=9624.543)
+    "Swamp Islet Scraps 1" : base_id + 1056, # ItemPickup462_58 Swamp_EnvironmentDetails (X=88101.219 Y=64553.148 Z=9557.692)
+    "Swamp Islet Scraps 2" : base_id + 1057, # ItemPickup463_61 Swamp_EnvironmentDetails (X=87100.922 Y=63590.965 Z=9582.900)
+    "Swamp Islet Scraps 3" : base_id + 1058, # ItemPickup464_64 Swamp_EnvironmentDetails (X=86399.656 Y=64290.805 Z=9493.576)
+    "Swamp Islet Dead Fish" : base_id + 1059, # Swamp_FishPickup Swamp_EnvironmentDetails (X=87288.945 Y=64278.273 Z=9550.320)
+    "Swamp Lizbeth Murkwater Mission End" : base_id + 1060 # (dialog 2) -> 30_scraps_reward
+}
+
+loc_junkyard_area = {
+    "Junkyard Area Scraps 1" : base_id + 1061, # ItemPickup185_29 Junkyard_Details1 (X=94184.391 Y=89760.258 Z=9331.188)
+    "Junkyard Area Scraps 2" : base_id + 1062, # ItemPickup177_5 Junkyard_Details1 (X=91919.469 Y=89681.602 Z=9407.639)
+    "Junkyard Area Scraps 3" : base_id + 1063, # ItemPickup46_5 Junkyard_Details (X=91696.078 Y=90453.563 Z=9480.997)
+    "Junkyard Area Scraps 4" : base_id + 1064, # ItemPickup178_8 Junkyard_Details1 (X=92453.719 Y=91142.531 Z=9398.951)
+    "Junkyard Area Scraps 5" : base_id + 1065, # ItemPickup182_20 Junkyard_Details1 (X=88645.453 Y=90374.930 Z=9507.291)
+    "Junkyard Area Scraps 6" : base_id + 1066, # ItemPickup48_11 Junkyard_Details (X=88461.953 Y=92077.531 Z=9712.173)
+    "Junkyard Area Scraps 7" : base_id + 1067, # ItemPickup49_14 Junkyard_Details (X=91521.555 Y=93773.641 Z=9421.457)
+    "Junkyard Area Scraps 8" : base_id + 1068, # ItemPickup50_17 Junkyard_Details (X=94741.484 Y=92565.938 Z=9221.093)
+    "Junkyard Area Scraps 9" : base_id + 1069, # ItemPickup186_32 Junkyard_Details1 (X=95256.008 Y=91356.789 Z=9251.082)
+    "Junkyard Area Scraps 10" : base_id + 1070, # ItemPickup45_2 Junkyard_Details (X=94289.664 Y=89951.477 Z=9367.076)
+    "Junkyard Area Daryl Mission Start" : base_id + 1071, # (dialog 4) -> Lockpicks (4)
+    "Junkyard Area Chest Ancient Tablet" : base_id + 1072, # Junkyard_TabletPickup Junkyard_Details (X=90715.367 Y=92168.563 Z=9402.729)
+    "Junkyard Area Daryl Mission End" : base_id + 1073 # (dialog 3) -> 25_scraps_reward
 }
 
 loc_south_house = {
-    "south_house_scraps_1" : base_id + 1074, # ItemPickup361_26 Secret12_ExteriorDetails (X=85865.969 Y=103869.656 Z=9453.063)
-    "south_house_scraps_2" : base_id + 1075, # ItemPickup360_23 Secret12_ExteriorDetails (X=84403.742 Y=107229.039 Z=9067.245)
-    "south_house_scraps_3" : base_id + 1076, # ItemPickup359_20 Secret12_ExteriorDetails (X=83389.789 Y=108817.992 Z=8752.255)
-    "south_house_scraps_4" : base_id + 1077, # ItemPickup353_2 Secret12_ExteriorDetails (X=82413.547 Y=109697.477 Z=8637.677)
-    "south_house_scraps_5" : base_id + 1078, # ItemPickup354_5 Secret12_ExteriorDetails (X=83000.359 Y=110323.664 Z=8560.229)
-    "south_house_scraps_6" : base_id + 1079, # ItemPickup358_17 Secret12_ExteriorDetails (X=82072.625 Y=110482.664 Z=8682.441)
-    "south_house_scraps_7" : base_id + 1080, # ItemPickup24_30 Secret12_Details (X=81970.766 Y=111082.117 Z=8647.703)
-    "south_house_scraps_8" : base_id + 1081, # ItemPickup356_11 Secret12_ExteriorDetails (X=80915.375 Y=108689.758 Z=8377.754)
-    "south_house_scraps_9" : base_id + 1082, # ItemPickup355_8 Secret12_ExteriorDetails (X=81762.180 Y=111371.023 Z=7876.312)
-    "south_house_scraps_10" : base_id + 1083, # ItemPickup357_14 Secret12_ExteriorDetails (X=80663.336 Y=113306.695 Z=7226.475)
-    "south_house_scraps_11" : base_id + 1084, # ItemPickup23_21 Secret12_Details (X=80520.367 Y=113747.039 Z=7252.808)
-    "south_house_scraps_12" : base_id + 1085, # ItemPickup22_18 Secret12_Details (X=80830.273 Y=113871.383 Z=7201.687)
-    "south_house_chest_scraps_1" : base_id + 1086, # ItemPickup21 Secret12_Details (X=82079.922 Y=110808.602 Z=8739.324)
-    "south_house_chest_scraps_2" : base_id + 1087, # ItemPickup18 Secret12_Details (X=82102.664 Y=110813.664 Z=8726.308)
-    "south_house_chest_scraps_3" : base_id + 1088, # ItemPickup17 Secret12_Details (X=82091.547 Y=110810.906 Z=8721.354) \!/ Existing match 1
-    "south_house_chest_scraps_4" : base_id + 1089, # ItemPickup16 Secret12_Details (X=82102.664 Y=110813.664 Z=8708.337) KO
-    "south_house_chest_scraps_5" : base_id + 1090, # ItemPickup14 Secret12_Details (X=82091.516 Y=110810.898 Z=8701.793) \!/ Existing match 3
-    "south_house_chest_scraps_6" : base_id + 1091 # ItemPickup13_7 Secret12_Details (X=82102.664 Y=110813.625 Z=8688.776)
-}
-
-loc_helen_mission = {
-    "junkyard_helen_mission_start" : base_id + 1092, # (dialog 8) -> south_mine_key (6)
-    "junkyard_helen_scraps_1" : base_id + 1093, # ItemPickup424_23 Settlement_A_House_1 (X=98303.992 Y=84476.016 Z=9376.540)
-    "junkyard_helen_scraps_2" : base_id + 1094, # ItemPickup419_8 Settlement_A_House_1 (X=98174.680 Y=84067.383 Z=9249.197)
-    "junkyard_helen_scraps_3" : base_id + 1095, # ItemPickup418_5 Settlement_A_House_1 (X=97948.977 Y=83354.656 Z=9339.430)
-    "junkyard_helen_scraps_4" : base_id + 1096, # ItemPickup417_2 Settlement_A_House_1 (X=98208.391 Y=83088.047 Z=9273.632)
-    "junkyard_helen_scraps_5" : base_id + 1097, # ItemPickup420_11 Settlement_A_House_1 (X=97757.773 Y=82995.656 Z=9298.597)
-    "junkyard_helen_scraps_6" : base_id + 1098, # ItemPickup422_17 Settlement_A_House_1 (X=98776.102 Y=80881.133 Z=9286.782)
-    "junkyard_helen_scraps_7" : base_id + 1099, # ItemPickup421_14 Settlement_A_House_1 (X=99198.508 Y=82057.820 Z=9248.227)
-    "junkyard_helen_scraps_8" : base_id + 1100 # ItemPickup423_20 Settlement_A_House_1 (X=99208.617 Y=84383.125 Z=9257.880)
-}
-
-loc_sgt_flint_mission = {
-    "base_sgt_flint_mission_end" : base_id + 1101, # (dialog 2) -> bug_spray
-    "base_sgt_flint_scraps_1" : base_id + 1102, # ItemPickup134_17 Bugspray_Main (X=105743.531 Y=83017.492 Z=9423.290)
-    "base_sgt_flint_scraps_2" : base_id + 1103, # ItemPickup129_2 Bugspray_Main (X=108495.805 Y=81616.992 Z=9139.340)
-    "base_sgt_flint_scraps_3" : base_id + 1104, # ItemPickup135_20 Bugspray_Main (X=108709.219 Y=85981.016 Z=9650.472)
-    "base_sgt_flint_scraps_4" : base_id + 1105, # ItemPickup130_5 Bugspray_Main (X=112004.195 Y=83811.313 Z=8887.996)
-    "base_sgt_flint_scraps_5" : base_id + 1106, # ItemPickup131_8 Bugspray_Main (X=110904.867 Y=82024.781 Z=9581.007)
-    "base_sgt_flint_scraps_6" : base_id + 1107, # ItemPickup132_11 Bugspray_Main (X=112458.563 Y=81967.945 Z=9850.968)
-    "base_sgt_flint_scraps_7" : base_id + 1108, # ItemPickup22_9 Bugspray_Details (X=112541.695 Y=81345.875 Z=9896.940)
-    "base_sgt_flint_scraps_8" : base_id + 1109, # ItemPickup133_14 Bugspray_Main (X=111943.391 Y=79970.016 Z=10025.820)
-    "base_sgt_flint_scraps_9" : base_id + 1110, # ItemPickup24_8 Bugspray_Details (X=112074.063 Y=83533.398 Z=9008.831)
-    "base_sgt_flint_scraps_10" : base_id + 1111, # ItemPickup23_2 Bugspray_Details (X=110738.523 Y=85389.852 Z=9082.626)
-    "base_sgt_flint_scraps_11" : base_id + 1112, # ItemPickup136_23 Bugspray_Main (X=112962.594 Y=85872.922 Z=8638.805)
-    "base_sgt_flint_scraps_12" : base_id + 1113, # ItemPickup137_26 Bugspray_Main (X=116230.563 Y=84357.602 Z=8580.226)
-    "base_sgt_flint_paint_can_orange" : base_id + 1114 # PaintCan_5 Bugspray_Details (X=111916.102 Y=83066.195 Z=9094.554)
+    "South House Scraps 1" : base_id + 1074, # ItemPickup361_26 Secret12_ExteriorDetails (X=85865.969 Y=103869.656 Z=9453.063)
+    "South House Scraps 2" : base_id + 1075, # ItemPickup360_23 Secret12_ExteriorDetails (X=84403.742 Y=107229.039 Z=9067.245)
+    "South House Scraps 3" : base_id + 1076, # ItemPickup359_20 Secret12_ExteriorDetails (X=83389.789 Y=108817.992 Z=8752.255)
+    "South House Scraps 4" : base_id + 1077, # ItemPickup353_2 Secret12_ExteriorDetails (X=82413.547 Y=109697.477 Z=8637.677)
+    "South House Scraps 5" : base_id + 1078, # ItemPickup354_5 Secret12_ExteriorDetails (X=83000.359 Y=110323.664 Z=8560.229)
+    "South House Scraps 6" : base_id + 1079, # ItemPickup358_17 Secret12_ExteriorDetails (X=82072.625 Y=110482.664 Z=8682.441)
+    "South House Scraps 7" : base_id + 1080, # ItemPickup24_30 Secret12_Details (X=81970.766 Y=111082.117 Z=8647.703)
+    "South House Scraps 8" : base_id + 1081, # ItemPickup356_11 Secret12_ExteriorDetails (X=80915.375 Y=108689.758 Z=8377.754)
+    "South House Scraps 9" : base_id + 1082, # ItemPickup355_8 Secret12_ExteriorDetails (X=81762.180 Y=111371.023 Z=7876.312)
+    "South House Scraps 10" : base_id + 1083, # ItemPickup357_14 Secret12_ExteriorDetails (X=80663.336 Y=113306.695 Z=7226.475)
+    "South House Scraps 11" : base_id + 1084, # ItemPickup23_21 Secret12_Details (X=80520.367 Y=113747.039 Z=7252.808)
+    "South House Scraps 12" : base_id + 1085, # ItemPickup22_18 Secret12_Details (X=80830.273 Y=113871.383 Z=7201.687)
+    "South House Chest Scraps 1" : base_id + 1086, # ItemPickup21 Secret12_Details (X=82079.922 Y=110808.602 Z=8739.324)
+    "South House Chest Scraps 2" : base_id + 1087, # ItemPickup18 Secret12_Details (X=82102.664 Y=110813.664 Z=8726.308)
+    "South House Chest Scraps 3" : base_id + 1088, # ItemPickup17 Secret12_Details (X=82091.547 Y=110810.906 Z=8721.354) \!/ Existing match 1
+    "South House Chest Scraps 4" : base_id + 1089, # ItemPickup16 Secret12_Details (X=82102.664 Y=110813.664 Z=8708.337) KO
+    "South House Chest Scraps 5" : base_id + 1090, # ItemPickup14 Secret12_Details (X=82091.516 Y=110810.898 Z=8701.793) \!/ Existing match 3
+    "South House Chest Scraps 6" : base_id + 1091 # ItemPickup13_7 Secret12_Details (X=82102.664 Y=110813.625 Z=8688.776)
+}
+
+loc_junkyard_shed = {
+    "Junkyard Shed Helen Mission Start" : base_id + 1092, # (dialog 8) -> south_mine_key (6)
+    "Junkyard Shed Scraps 1" : base_id + 1093, # ItemPickup424_23 Settlement_A_House_1 (X=98303.992 Y=84476.016 Z=9376.540)
+    "Junkyard Shed Scraps 2" : base_id + 1094, # ItemPickup419_8 Settlement_A_House_1 (X=98174.680 Y=84067.383 Z=9249.197)
+    "Junkyard Shed Scraps 3" : base_id + 1095, # ItemPickup418_5 Settlement_A_House_1 (X=97948.977 Y=83354.656 Z=9339.430)
+    "Junkyard Shed Scraps 4" : base_id + 1096, # ItemPickup417_2 Settlement_A_House_1 (X=98208.391 Y=83088.047 Z=9273.632)
+    "Junkyard Shed Scraps 5" : base_id + 1097, # ItemPickup420_11 Settlement_A_House_1 (X=97757.773 Y=82995.656 Z=9298.597)
+    "Junkyard Shed Scraps 6" : base_id + 1098, # ItemPickup422_17 Settlement_A_House_1 (X=98776.102 Y=80881.133 Z=9286.782)
+    "Junkyard Shed Scraps 7" : base_id + 1099, # ItemPickup421_14 Settlement_A_House_1 (X=99198.508 Y=82057.820 Z=9248.227)
+    "Junkyard Shed Scraps 8" : base_id + 1100 # ItemPickup423_20 Settlement_A_House_1 (X=99208.617 Y=84383.125 Z=9257.880)
+}
+
+loc_military_base = {
+    "Military Base Sgt Flint Mission End" : base_id + 1101, # (dialog 2) -> bug_spray
+    "Military Base Scraps 1" : base_id + 1102, # ItemPickup134_17 Bugspray_Main (X=105743.531 Y=83017.492 Z=9423.290)
+    "Military Base Scraps 2" : base_id + 1103, # ItemPickup129_2 Bugspray_Main (X=108495.805 Y=81616.992 Z=9139.340)
+    "Military Base Scraps 3" : base_id + 1104, # ItemPickup135_20 Bugspray_Main (X=108709.219 Y=85981.016 Z=9650.472)
+    "Military Base Scraps 4" : base_id + 1105, # ItemPickup130_5 Bugspray_Main (X=112004.195 Y=83811.313 Z=8887.996)
+    "Military Base Scraps 5" : base_id + 1106, # ItemPickup131_8 Bugspray_Main (X=110904.867 Y=82024.781 Z=9581.007)
+    "Military Base Scraps 6" : base_id + 1107, # ItemPickup132_11 Bugspray_Main (X=112458.563 Y=81967.945 Z=9850.968)
+    "Military Base Scraps 7" : base_id + 1108, # ItemPickup22_9 Bugspray_Details (X=112541.695 Y=81345.875 Z=9896.940)
+    "Military Base Scraps 8" : base_id + 1109, # ItemPickup133_14 Bugspray_Main (X=111943.391 Y=79970.016 Z=10025.820)
+    "Military Base Scraps 9" : base_id + 1110, # ItemPickup24_8 Bugspray_Details (X=112074.063 Y=83533.398 Z=9008.831)
+    "Military Base Scraps 10" : base_id + 1111, # ItemPickup23_2 Bugspray_Details (X=110738.523 Y=85389.852 Z=9082.626)
+    "Military Base Scraps 11" : base_id + 1112, # ItemPickup136_23 Bugspray_Main (X=112962.594 Y=85872.922 Z=8638.805)
+    "Military Base Scraps 12" : base_id + 1113, # ItemPickup137_26 Bugspray_Main (X=116230.563 Y=84357.602 Z=8580.226)
+    "Military Base Orange Paint Can" : base_id + 1114 # PaintCan_5 Bugspray_Details (X=111916.102 Y=83066.195 Z=9094.554)
 }
 
 loc_south_mine_outside = {
-    "south_mine_outside_scraps_1" : base_id + 1115, # ItemPickup20_1 Mine_1_OutsideMain (X=114794.375 Y=57211.855 Z=8523.348)
-    "south_mine_outside_scraps_2" : base_id + 1116, # ItemPickup15_2 Mine_1_OutsideDetails (X=112523.438 Y=57693.836 Z=8639.382)
-    "south_mine_outside_scraps_3" : base_id + 1117, # ItemPickup22_5 Mine_1_OutsideMain (X=112348.586 Y=59174.289 Z=8945.143)
-    "south_mine_outside_scraps_4" : base_id + 1118, # ItemPickup13_2 Mine_1_OutsideDetails (X=110989.156 Y=57840.090 Z=8700.936)
-    "south_mine_outside_scraps_5" : base_id + 1119, # ItemPickup16_1 Mine_1_OutsideDetails (X=110487.281 Y=54528.535 Z=8589.910)
-    "south_mine_outside_scraps_6" : base_id + 1120, # ItemPickup18_1 Mine_1_OutsideMain (X=113727.297 Y=54791.703 Z=8424.460)
-    "south_mine_outside_scraps_7" : base_id + 1121 # ItemPickup17_3 Mine_1_OutsideMain (X=113965.211 Y=53289.539 Z=8402.346)
+    "South Mine Outside Scraps 1" : base_id + 1115, # ItemPickup20_1 Mine_1_OutsideMain (X=114794.375 Y=57211.855 Z=8523.348)
+    "South Mine Outside Scraps 2" : base_id + 1116, # ItemPickup15_2 Mine_1_OutsideDetails (X=112523.438 Y=57693.836 Z=8639.382)
+    "South Mine Outside Scraps 3" : base_id + 1117, # ItemPickup22_5 Mine_1_OutsideMain (X=112348.586 Y=59174.289 Z=8945.143)
+    "South Mine Outside Scraps 4" : base_id + 1118, # ItemPickup13_2 Mine_1_OutsideDetails (X=110989.156 Y=57840.090 Z=8700.936)
+    "South Mine Outside Scraps 5" : base_id + 1119, # ItemPickup16_1 Mine_1_OutsideDetails (X=110487.281 Y=54528.535 Z=8589.910)
+    "South Mine Outside Scraps 6" : base_id + 1120, # ItemPickup18_1 Mine_1_OutsideMain (X=113727.297 Y=54791.703 Z=8424.460)
+    "South Mine Outside Scraps 7" : base_id + 1121 # ItemPickup17_3 Mine_1_OutsideMain (X=113965.211 Y=53289.539 Z=8402.346)
 }
 
 loc_south_mine_inside = {
-    "south_mine_inside_scraps_1" : base_id + 1122, # ItemPickup23_4 Mine_1_Interior_1 (X=108659.945 Y=58712.691 Z=8763.015)
-    "south_mine_inside_scraps_2" : base_id + 1123, # ItemPickup24_0 Mine_1_Interior_1 (X=104954.602 Y=61540.488 Z=7876.374)
-    "south_mine_inside_scraps_3" : base_id + 1124, # ItemPickup26_0 Mine_1_Interior_1 (X=104436.758 Y=64091.211 Z=7872.767)
-    "south_mine_inside_scraps_4" : base_id + 1125, # ItemPickup290_20 Mine_1_Interior_2 (X=101356.625 Y=66110.906 Z=8034.738)
-    "south_mine_inside_scraps_5" : base_id + 1126, # ItemPickup287_8 Mine_1_Interior_2 (X=96888.820 Y=64458.559 Z=7917.468)
-    "south_mine_inside_scraps_6" : base_id + 1127, # ItemPickup289_14 Mine_1_Interior_2 (X=95863.180 Y=63252.902 Z=7847.054)
-    "south_mine_inside_scraps_7" : base_id + 1128, # ItemPickup288_11 Mine_1_Interior_2 (X=97337.219 Y=62921.438 Z=7884.393)
-    "south_mine_inside_scraps_8" : base_id + 1129, # ItemPickup285_2 Mine_1_Interior_2 (X=96689.203 Y=61880.895 Z=7806.810)
-    "south_mine_inside_scraps_9" : base_id + 1130, # ItemPickup286_5 Mine_1_Interior_2 (X=98403.227 Y=62812.531 Z=7880.947)
-    "south_mine_inside_egg_green" : base_id + 1131, # ItemPickup14_2 Mine_1_Interior_2 (X=96753.219 Y=62909.504 Z=8030.018) \!/ Existing match 4
-    "south_mine_inside_paint_can_green" : base_id + 1132 # PaintCan_2 Mine_1_Interior_1 (X=108293.281 Y=64192.094 Z=7872.770) \!/ Existing match 5
-}
-
-loc_theodore_mission = {
-    "station_paint_can_white" : base_id + 1133, # PaintCan_2 Station_Details1 (X=34554.141 Y=-7395.408 Z=11897.556) \!/ Existing match 5
-    "station_theodore_scraps_1" : base_id + 1134, # ItemPickup431_20 Station_BuildingDetails (X=37710.504 Y=-6462.562 Z=11356.691)
-    "station_theodore_scraps_2" : base_id + 1135, # ItemPickup425_2 Station_BuildingDetails (X=37034.340 Y=-4923.256 Z=11348.328)
-    "station_theodore_scraps_3" : base_id + 1136, # ItemPickup427_8 Station_BuildingDetails (X=36689.164 Y=-3727.466 Z=11353.597)
-    "station_theodore_scraps_4" : base_id + 1137, # ItemPickup426_5 Station_BuildingDetails (X=37207.629 Y=-3393.977 Z=11379.110)
-    "station_theodore_scraps_5" : base_id + 1138, # ItemPickup429_14 Station_BuildingDetails (X=37988.219 Y=-3365.906 Z=11350.225)
-    "station_theodore_scraps_6" : base_id + 1139, # ItemPickup428_11 Station_BuildingDetails (X=36956.242 Y=-2746.948 Z=11353.506)
-    "station_theodore_scraps_7" : base_id + 1140, # ItemPickup430_17 Station_BuildingDetails (X=36638.492 Y=-6410.017 Z=11353.546)
-    "station_theodore_scraps_8" : base_id + 1141, # ItemPickup433_26 Station_BuildingDetails (X=35931.168 Y=-7558.021 Z=11899.232)
-    "station_theodore_scraps_9" : base_id + 1142, # ItemPickup434 Station_BuildingDetails (X=35636.855 Y=-7628.500 Z=11903.627)
-    "station_theodore_scraps_10" : base_id + 1143, # ItemPickup435 Station_BuildingDetails (X=34894.152 Y=-7537.087 Z=11903.627)
-    "station_theodore_scraps_11" : base_id + 1144, # ItemPickup13_4 Station_BuildingDetails (X=33505.609 Y=-7742.843 Z=11898.971)
-    "station_theodore_scraps_12" : base_id + 1145, # ItemPickup440_5 Station_Details1 (X=37394.004 Y=-8395.084 Z=11389.296)
-    "station_theodore_scraps_13" : base_id + 1146, # ItemPickup432_23 Station_BuildingDetails (X=36040.695 Y=-8068.016 Z=11456.609)
-    "station_theodore_scraps_14" : base_id + 1147, # ItemPickup16_4 Station_BuildingDetails (X=35360.320 Y=-8441.443 Z=11457.823)
-    "station_theodore_scraps_15" : base_id + 1148, # ItemPickup439_2 Station_Details1 (X=36311.324 Y=-9563.938 Z=11468.039)
-    "station_theodore_scraps_16" : base_id + 1149, # ItemPickup442_11 Station_Details1 (X=33335.656 Y=-13872.785 Z=11189.906)
-    "station_theodore_scraps_17" : base_id + 1150, # ItemPickup441_8 Station_Details1 (X=33129.984 Y=-14073.978 Z=11189.906)
-    "station_theodore_scraps_18" : base_id + 1151, # ItemPickup436_31 Station_BuildingDetails (X=33587.488 Y=-7828.651 Z=11529.446)
-    "station_theodore_scraps_19" : base_id + 1152, # ItemPickup14_3 Station_BuildingDetails (X=34007.254 Y=-7749.381 Z=11533.760)
-    "station_theodore_scraps_20" : base_id + 1153, # ItemPickup443_14 Station_Details1 (X=31457.752 Y=-7120.744 Z=11421.197)
-    "station_theodore_mission_end" : base_id + 1154 # (dialog 2) -> 35_scraps_reward
-    # "station_theodore_scraps_glitch_1" ItemPickup437_34 (X=34217.613 Y=-9481.271 Z=11505.686) /!\ Glitched scrap
-    # "station_theodore_scraps_glitch_2" ItemPickup438_37 (X=36101.633 Y=-10459.024 Z=11385.937) /!\ Glitched scrap
-}
-
-loc_canyon_theodore = {
-    "canyon_scraps_1" : base_id + 1155, # ItemPickup156_47 Canyon_Main (X=29432.162 Y=-3164.300 Z=11540.294)
-    "canyon_scraps_2" : base_id + 1156, # ItemPickup155_44 Canyon_Main (X=26331.086 Y=3036.740 Z=11701.688)
-    "canyon_scraps_3" : base_id + 1157, # ItemPickup154_41 Canyon_Main (X=22688.129 Y=3906.730 Z=12249.182)
-    "canyon_scraps_4" : base_id + 1158, # ItemPickup147_20 Canyon_Main (X=20546.193 Y=4371.471 Z=12128.874)
-    "canyon_scraps_5" : base_id + 1159, # ItemPickup148_23 Canyon_Main (X=20006.584 Y=4928.478 Z=12174.837)
-    "canyon_scraps_6" : base_id + 1160, # ItemPickup146_17 Canyon_Main (X=19251.633 Y=3798.014 Z=12170.390)
-    "canyon_scraps_7" : base_id + 1161, # ItemPickup149_26 Canyon_Main (X=18302.678 Y=7323.849 Z=12595.085)
-    "canyon_scraps_8" : base_id + 1162, # ItemPickup150_29 Canyon_Main (X=19019.563 Y=8172.146 Z=12640.462)
-    "canyon_scraps_9" : base_id + 1163, # ItemPickup142_5 Canyon_Main (X=18001.689 Y=11138.320 Z=13035.360)
-    "canyon_scraps_10" : base_id + 1164, # ItemPickup143_8 Canyon_Main (X=16381.525 Y=7191.394 Z=13682.453)
-    "canyon_scraps_11" : base_id + 1165, # ItemPickup144_11 Canyon_Main (X=18294.928 Y=7870.372 Z=14350.015)
-    "canyon_scraps_12" : base_id + 1166, # ItemPickup31_2 CanyonCamp_Details (X=20730.520 Y=8032.158 Z=14439.826)
-    "canyon_scraps_13" : base_id + 1167, # ItemPickup145_14 Canyon_Main (X=24752.658 Y=7959.624 Z=14363.087)
-    "canyon_scraps_14" : base_id + 1168, # ItemPickup141_2 Canyon_Main (X=20181.992 Y=13816.017 Z=14897.407)
-    "canyon_scraps_15" : base_id + 1169, # ItemPickup151_32 Canyon_Main (X=23172.160 Y=2842.120 Z=12954.566)
-    "canyon_scraps_16" : base_id + 1170, # ItemPickup152_35 Canyon_Main (X=22307.621 Y=-1180.840 Z=12451.548)
-    "canyon_scraps_17" : base_id + 1171, # ItemPickup153_38 Canyon_Main (X=28473.596 Y=6741.842 Z=13314.166)
-    "canyon_theodore_blue_box" : base_id + 1172 # Canyon_BlueBoxPickup CanyonCamp_Details (X=20338.525 Y=4989.111 Z=12323.649)
+    "South Mine Inside Scraps 1" : base_id + 1122, # ItemPickup23_4 Mine_1_Interior_1 (X=108659.945 Y=58712.691 Z=8763.015)
+    "South Mine Inside Scraps 2" : base_id + 1123, # ItemPickup24_0 Mine_1_Interior_1 (X=104954.602 Y=61540.488 Z=7876.374)
+    "South Mine Inside Scraps 3" : base_id + 1124, # ItemPickup26_0 Mine_1_Interior_1 (X=104436.758 Y=64091.211 Z=7872.767)
+    "South Mine Inside Scraps 4" : base_id + 1125, # ItemPickup290_20 Mine_1_Interior_2 (X=101356.625 Y=66110.906 Z=8034.738)
+    "South Mine Inside Scraps 5" : base_id + 1126, # ItemPickup287_8 Mine_1_Interior_2 (X=96888.820 Y=64458.559 Z=7917.468)
+    "South Mine Inside Scraps 6" : base_id + 1127, # ItemPickup289_14 Mine_1_Interior_2 (X=95863.180 Y=63252.902 Z=7847.054)
+    "South Mine Inside Scraps 7" : base_id + 1128, # ItemPickup288_11 Mine_1_Interior_2 (X=97337.219 Y=62921.438 Z=7884.393)
+    "South Mine Inside Scraps 8" : base_id + 1129, # ItemPickup285_2 Mine_1_Interior_2 (X=96689.203 Y=61880.895 Z=7806.810)
+    "South Mine Inside Scraps 9" : base_id + 1130, # ItemPickup286_5 Mine_1_Interior_2 (X=98403.227 Y=62812.531 Z=7880.947)
+    "South Mine Inside Green Egg" : base_id + 1131, # ItemPickup14_2 Mine_1_Interior_2 (X=96753.219 Y=62909.504 Z=8030.018) \!/ Existing match 4
+    "South Mine Inside Green Paint Can" : base_id + 1132 # PaintCan_2 Mine_1_Interior_1 (X=108293.281 Y=64192.094 Z=7872.770) \!/ Existing match 5
+}
+
+loc_middle_station = {
+    "Middle Station White Paint Can" : base_id + 1133, # PaintCan_2 Station_Details1 (X=34554.141 Y=-7395.408 Z=11897.556) \!/ Existing match 5
+    "Middle Station Scraps 1" : base_id + 1134, # ItemPickup431_20 Station_BuildingDetails (X=37710.504 Y=-6462.562 Z=11356.691)
+    "Middle Station Scraps 2" : base_id + 1135, # ItemPickup425_2 Station_BuildingDetails (X=37034.340 Y=-4923.256 Z=11348.328)
+    "Middle Station Scraps 3" : base_id + 1136, # ItemPickup427_8 Station_BuildingDetails (X=36689.164 Y=-3727.466 Z=11353.597)
+    "Middle Station Scraps 4" : base_id + 1137, # ItemPickup426_5 Station_BuildingDetails (X=37207.629 Y=-3393.977 Z=11379.110)
+    "Middle Station Scraps 5" : base_id + 1138, # ItemPickup429_14 Station_BuildingDetails (X=37988.219 Y=-3365.906 Z=11350.225)
+    "Middle Station Scraps 6" : base_id + 1139, # ItemPickup428_11 Station_BuildingDetails (X=36956.242 Y=-2746.948 Z=11353.506)
+    "Middle Station Scraps 7" : base_id + 1140, # ItemPickup430_17 Station_BuildingDetails (X=36638.492 Y=-6410.017 Z=11353.546)
+    "Middle Station Scraps 8" : base_id + 1141, # ItemPickup433_26 Station_BuildingDetails (X=35931.168 Y=-7558.021 Z=11899.232)
+    "Middle Station Scraps 9" : base_id + 1142, # ItemPickup434 Station_BuildingDetails (X=35636.855 Y=-7628.500 Z=11903.627)
+    "Middle Station Scraps 10" : base_id + 1143, # ItemPickup435 Station_BuildingDetails (X=34894.152 Y=-7537.087 Z=11903.627)
+    "Middle Station Scraps 11" : base_id + 1144, # ItemPickup13_4 Station_BuildingDetails (X=33505.609 Y=-7742.843 Z=11898.971)
+    "Middle Station Scraps 12" : base_id + 1145, # ItemPickup440_5 Station_Details1 (X=37394.004 Y=-8395.084 Z=11389.296)
+    "Middle Station Scraps 13" : base_id + 1146, # ItemPickup432_23 Station_BuildingDetails (X=36040.695 Y=-8068.016 Z=11456.609)
+    "Middle Station Scraps 14" : base_id + 1147, # ItemPickup16_4 Station_BuildingDetails (X=35360.320 Y=-8441.443 Z=11457.823)
+    "Middle Station Scraps 15" : base_id + 1148, # ItemPickup439_2 Station_Details1 (X=36311.324 Y=-9563.938 Z=11468.039)
+    "Middle Station Scraps 16" : base_id + 1149, # ItemPickup442_11 Station_Details1 (X=33335.656 Y=-13872.785 Z=11189.906)
+    "Middle Station Scraps 17" : base_id + 1150, # ItemPickup441_8 Station_Details1 (X=33129.984 Y=-14073.978 Z=11189.906)
+    "Middle Station Scraps 18" : base_id + 1151, # ItemPickup436_31 Station_BuildingDetails (X=33587.488 Y=-7828.651 Z=11529.446)
+    "Middle Station Scraps 19" : base_id + 1152, # ItemPickup14_3 Station_BuildingDetails (X=34007.254 Y=-7749.381 Z=11533.760)
+    "Middle Station Scraps 20" : base_id + 1153, # ItemPickup443_14 Station_Details1 (X=31457.752 Y=-7120.744 Z=11421.197)
+    "Middle Station Theodore Mission End" : base_id + 1154 # (dialog 2) -> 35_scraps_reward
+    # "Middle Station Scraps Glitch 1" ItemPickup437_34 (X=34217.613 Y=-9481.271 Z=11505.686) /!\ Glitched scrap
+    # "Middle Station Scraps Glitch 2" ItemPickup438_37 (X=36101.633 Y=-10459.024 Z=11385.937) /!\ Glitched scrap
+}
+
+loc_canyon = {
+    "Canyon Scraps 1" : base_id + 1155, # ItemPickup156_47 Canyon_Main (X=29432.162 Y=-3164.300 Z=11540.294)
+    "Canyon Scraps 2" : base_id + 1156, # ItemPickup155_44 Canyon_Main (X=26331.086 Y=3036.740 Z=11701.688)
+    "Canyon Scraps 3" : base_id + 1157, # ItemPickup154_41 Canyon_Main (X=22688.129 Y=3906.730 Z=12249.182)
+    "Canyon Scraps 4" : base_id + 1158, # ItemPickup147_20 Canyon_Main (X=20546.193 Y=4371.471 Z=12128.874)
+    "Canyon Scraps 5" : base_id + 1159, # ItemPickup148_23 Canyon_Main (X=20006.584 Y=4928.478 Z=12174.837)
+    "Canyon Scraps 6" : base_id + 1160, # ItemPickup146_17 Canyon_Main (X=19251.633 Y=3798.014 Z=12170.390)
+    "Canyon Scraps 7" : base_id + 1161, # ItemPickup149_26 Canyon_Main (X=18302.678 Y=7323.849 Z=12595.085)
+    "Canyon Scraps 8" : base_id + 1162, # ItemPickup150_29 Canyon_Main (X=19019.563 Y=8172.146 Z=12640.462)
+    "Canyon Scraps 9" : base_id + 1163, # ItemPickup142_5 Canyon_Main (X=18001.689 Y=11138.320 Z=13035.360)
+    "Canyon Scraps 10" : base_id + 1164, # ItemPickup143_8 Canyon_Main (X=16381.525 Y=7191.394 Z=13682.453)
+    "Canyon Scraps 11" : base_id + 1165, # ItemPickup144_11 Canyon_Main (X=18294.928 Y=7870.372 Z=14350.015)
+    "Canyon Scraps 12" : base_id + 1166, # ItemPickup31_2 CanyonCamp_Details (X=20730.520 Y=8032.158 Z=14439.826)
+    "Canyon Scraps 13" : base_id + 1167, # ItemPickup145_14 Canyon_Main (X=24752.658 Y=7959.624 Z=14363.087)
+    "Canyon Scraps 14" : base_id + 1168, # ItemPickup141_2 Canyon_Main (X=20181.992 Y=13816.017 Z=14897.407)
+    "Canyon Scraps 15" : base_id + 1169, # ItemPickup151_32 Canyon_Main (X=23172.160 Y=2842.120 Z=12954.566)
+    "Canyon Scraps 16" : base_id + 1170, # ItemPickup152_35 Canyon_Main (X=22307.621 Y=-1180.840 Z=12451.548)
+    "Canyon Scraps 17" : base_id + 1171, # ItemPickup153_38 Canyon_Main (X=28473.596 Y=6741.842 Z=13314.166)
+    "Canyon Blue Box" : base_id + 1172 # Canyon_BlueBoxPickup CanyonCamp_Details (X=20338.525 Y=4989.111 Z=12323.649)
 }
 
 loc_watchtower = {
-    "watchtower_scraps_1" : base_id + 1173, # ItemPickup373_13 Secret2_WatchTowerDetails (X=32760.389 Y=-28814.084 Z=10997.447)
-    "watchtower_scraps_2" : base_id + 1174, # ItemPickup22_6 Secret2_WatchTowerDetails (X=32801.668 Y=-31660.041 Z=10643.390)
-    "watchtower_scraps_3" : base_id + 1175, # ItemPickup372_10 Secret2_WatchTowerDetails (X=31018.063 Y=-33375.313 Z=11100.126)
-    "watchtower_scraps_4" : base_id + 1176, # ItemPickup22_16 Secret2_WatchTowerDetails (X=33308.215 Y=-35928.578 Z=10614.347)
-    "watchtower_scraps_5" : base_id + 1177, # ItemPickup22_2 Secret2_WatchTowerDetails (X=34304.262 Y=-33446.063 Z=10674.936)
-    "watchtower_scraps_6" : base_id + 1178, # ItemPickup370_2 Secret2_WatchTowerDetails (X=32869.453 Y=-33184.094 Z=10612.040)
-    "watchtower_scraps_7" : base_id + 1179, # ItemPickup374_16 Secret2_WatchTowerDetails (X=33210.707 Y=-32097.611 Z=11211.031)
-    "watchtower_scraps_8" : base_id + 1180, # ItemPickup22_10 Secret2_WatchTowerDetails (X=33246.262 Y=-32046.697 Z=11851.025)
-    "watchtower_scraps_9" : base_id + 1181, # ItemPickup22_8 Secret2_WatchTowerDetails (X=33553.156 Y=-31810.645 Z=11849.521)
-    "watchtower_scraps_10" : base_id + 1182, # ItemPickup371_7 Secret2_WatchTowerDetails (X=36151.621 Y=-31791.633 Z=11093.785)
-    "watchtower_paint_can_pink" : base_id + 1183 # PaintCan_2 Secret2_WatchTowerDetails (X=33069.133 Y=-32168.045 Z=11859.582) \!/ Existing match 5
+    "Watchtower Scraps 1" : base_id + 1173, # ItemPickup373_13 Secret2_WatchTowerDetails (X=32760.389 Y=-28814.084 Z=10997.447)
+    "Watchtower Scraps 2" : base_id + 1174, # ItemPickup22_6 Secret2_WatchTowerDetails (X=32801.668 Y=-31660.041 Z=10643.390)
+    "Watchtower Scraps 3" : base_id + 1175, # ItemPickup372_10 Secret2_WatchTowerDetails (X=31018.063 Y=-33375.313 Z=11100.126)
+    "Watchtower Scraps 4" : base_id + 1176, # ItemPickup22_16 Secret2_WatchTowerDetails (X=33308.215 Y=-35928.578 Z=10614.347)
+    "Watchtower Scraps 5" : base_id + 1177, # ItemPickup22_2 Secret2_WatchTowerDetails (X=34304.262 Y=-33446.063 Z=10674.936)
+    "Watchtower Scraps 6" : base_id + 1178, # ItemPickup370_2 Secret2_WatchTowerDetails (X=32869.453 Y=-33184.094 Z=10612.040)
+    "Watchtower Scraps 7" : base_id + 1179, # ItemPickup374_16 Secret2_WatchTowerDetails (X=33210.707 Y=-32097.611 Z=11211.031)
+    "Watchtower Scraps 8" : base_id + 1180, # ItemPickup22_10 Secret2_WatchTowerDetails (X=33246.262 Y=-32046.697 Z=11851.025)
+    "Watchtower Scraps 9" : base_id + 1181, # ItemPickup22_8 Secret2_WatchTowerDetails (X=33553.156 Y=-31810.645 Z=11849.521)
+    "Watchtower Scraps 10" : base_id + 1182, # ItemPickup371_7 Secret2_WatchTowerDetails (X=36151.621 Y=-31791.633 Z=11093.785)
+    "Watchtower Pink Paint Can" : base_id + 1183 # PaintCan_2 Secret2_WatchTowerDetails (X=33069.133 Y=-32168.045 Z=11859.582) \!/ Existing match 5
 }
 
 loc_boulder_field = {
-    "boulder_field_page_drawing_1" : base_id + 1184, # Pages_Drawing1 Pages_Environment_Details (X=46232.703 Y=-37052.875 Z=9531.116)
-    "boulder_field_page_drawing_2" : base_id + 1185, # Pages_Drawing2 Pages_Environment_Details (X=51854.980 Y=-31332.070 Z=9804.927)
-    "boulder_field_page_drawing_3" : base_id + 1186, # Pages_Drawing3 Pages_Environment_Details (X=47595.750 Y=-29931.740 Z=9308.014)
-    "boulder_field_page_drawing_4" : base_id + 1187, # Pages_Drawing4 Pages_Environment_Details (X=43819.680 Y=-30378.770 Z=9706.599)
-    "boulder_field_page_drawing_5" : base_id + 1188, # Pages_Drawing5 Pages_Environment_Details (X=47494.746 Y=-20884.781 Z=9812.398)
-    "boulder_field_page_drawing_6" : base_id + 1189, # Pages_Drawing6 Pages_Environment_Details (X=43725.148 Y=-21952.570 Z=9744.351)
-    "boulder_field_page_drawing_7" : base_id + 1190, # Pages_Drawing7 Pages_Environment_Details (X=44752.465 Y=-16362.510 Z=10147.004)
-    "boulder_field_page_drawing_8" : base_id + 1191, # Pages_Drawing8 Pages_Environment_Details (X=50496.270 Y=-26090.533 Z=9835.365)
-    "boulder_field_scraps_1" : base_id + 1192, # ItemPickup293_8 Pages_Environment_Main (X=41385.406 Y=-32281.871 Z=10240.781)
-    "boulder_field_scraps_2" : base_id + 1193, # ItemPickup987321 Pages_House_Main (X=46654.969 Y=-38859.254 Z=9920.861)
-    "boulder_field_scraps_3" : base_id + 1194, # ItemPickup516121 Pages_House_Main (X=44765.836 Y=-41675.559 Z=9938.179)
-    "boulder_field_scraps_4" : base_id + 1195, # ItemPickup291_2 Pages_Environment_Main (X=50088.270 Y=-30669.107 Z=9267.371)
-    "boulder_field_scraps_5" : base_id + 1196, # ItemPickup303_38 Pages_Environment_Main (X=48014.609 Y=-28971.115 Z=9199.659)
-    "boulder_field_scraps_6" : base_id + 1197, # ItemPickup302_35 Pages_Environment_Main (X=50190.266 Y=-26243.977 Z=9648.289)
-    "boulder_field_scraps_7" : base_id + 1198, # ItemPickup305_44 Pages_Environment_Main (X=47802.246 Y=-22594.684 Z=9631.879)
-    "boulder_field_scraps_8" : base_id + 1199, # ItemPickup294_11 Pages_Environment_Main (X=44345.996 Y=-23408.535 Z=9659.643)
-    "boulder_field_scraps_9" : base_id + 1200, # ItemPickup295_14 Pages_Environment_Main (X=41620.590 Y=-22982.641 Z=9720.177)
-    "boulder_field_scraps_10" : base_id + 1201, # ItemPickup300_29 Pages_Environment_Main (X=52003.172 Y=-19163.049 Z=9925.105)
-    "boulder_field_scraps_11" : base_id + 1202, # ItemPickup301_32 Pages_Environment_Main (X=51422.176 Y=-22319.322 Z=10663.813)
-    "boulder_field_scraps_12" : base_id + 1203, # ItemPickup296_17 Pages_Environment_Main (X=43527.176 Y=-17952.570 Z=10812.458)
-    "boulder_field_scraps_13" : base_id + 1204, # ItemPickup297_20 Pages_Environment_Main (X=45241.871 Y=-15847.636 Z=9952.198)
-    "boulder_field_scraps_14" : base_id + 1205, # ItemPickup298_23 Pages_Environment_Main (X=46238.027 Y=-18407.420 Z=10199.825)
-    "boulder_field_scraps_15" : base_id + 1206, # ItemPickup299_26 Pages_Environment_Main (X=49835.617 Y=-17379.959 Z=9810.836)
-    "boulder_field_scraps_16" : base_id + 1207, # ItemPickup306_47 Pages_Environment_Main (X=45144.594 Y=-33817.090 Z=10136.658)
-    "boulder_field_scraps_17" : base_id + 1208, # ItemPickup292_5 Pages_Environment_Main (X=44336.184 Y=-37162.367 Z=9789.548)
-    "boulder_field_scraps_18" : base_id + 1209 # ItemPickup304_41 Pages_Environment_Main (X=44490.160 Y=-26442.754 Z=9974.022)
-}
-
-loc_house_sasha_mission = {
-    "house_sasha_mission_end" : base_id + 1210, # (dialog 2) -> 40_scraps_reward
-    "house_sasha_scraps_1" : base_id + 1211, # ItemPickup1309876 Pages_House_Main (X=42900.188 Y=-43760.617 Z=9900.531)
-    "house_sasha_scraps_2" : base_id + 1212, # ItemPickup22213 Pages_House_Main (X=43608.078 Y=-44642.434 Z=9922.888)
-    "house_sasha_scraps_3" : base_id + 1213, # ItemPickup5423189 Pages_House_Main (X=43992.387 Y=-44259.336 Z=9877.623)
-    "house_sasha_scraps_4" : base_id + 1214, # ItemPickup1312312 Pages_House_Main (X=43340.012 Y=-45362.617 Z=9882.796)
-    "house_sasha_scraps_5" : base_id + 1215, # ItemPickup1596 Pages_House_Main (X=45105.383 Y=-45980.879 Z=9854.796)
-    "house_sasha_scraps_6" : base_id + 1216 # ItemPickup8624 Pages_House_Main (X=45888.406 Y=-46050.246 Z=9555.326)
-}
-
-loc_house_santiago = {
-    "house_santiago_scraps_1" : base_id + 1217, # ItemPickup342_19 PortNPCHouse_Details (X=37271.445 Y=-46075.598 Z=10648.827)
-    "house_santiago_scraps_2" : base_id + 1218, # ItemPickup37_5 PortNPCHouse_Details (X=38330.512 Y=-47184.668 Z=10387.618)
-    "house_santiago_scraps_3" : base_id + 1219, # ItemPickup337_2 PortNPCHouse_Details (X=35720.422 Y=-49536.328 Z=10098.503)
-    "house_santiago_scraps_4" : base_id + 1220, # ItemPickup344_25 PortNPCHouse_Details (X=35466.285 Y=-50363.078 Z=10098.504)
-    "house_santiago_scraps_5" : base_id + 1221, # ItemPickup338_7 PortNPCHouse_Details (X=34274.289 Y=-49947.578 Z=10098.501)
-    "house_santiago_scraps_6" : base_id + 1222, # ItemPickup341_16 PortNPCHouse_Details (X=35584.359 Y=-48195.172 Z=10323.833)
-    "house_santiago_scraps_7" : base_id + 1223, # ItemPickup340_13 PortNPCHouse_Details (X=35019.766 Y=-49904.113 Z=10124.169)
-    "house_santiago_scraps_8" : base_id + 1224, # ItemPickup339_10 PortNPCHouse_Details (X=35527.711 Y=-49614.801 Z=10124.016)
-    "house_santiago_scraps_9" : base_id + 1225, # ItemPickup36_2 PortNPCHouse_Details (X=34471.707 Y=-49497.000 Z=10199.790)
-    "house_santiago_scraps_10" : base_id + 1226, # ItemPickup343_22 PortNPCHouse_Details (X=37920.277 Y=-51867.754 Z=9847.511)
-    "house_santiago_journal" : base_id + 1227 # Port_Journal_Pickup PortNPCHouse_Details (X=34690.777 Y=-49788.359 Z=10214.353)
-}
-
-loc_port_santiago_mission = {
-    "port_paint_can_gray" : base_id + 1228, # PaintCan_13 Port_Details (X=74641.648 Y=-11320.948 Z=7551.767)
-    "port_scraps_1" : base_id + 1229, # ItemPickup334_32 Port_Main (X=67315.281 Y=-13828.055 Z=10101.339)
-    "port_scraps_2" : base_id + 1230, # ItemPickup335_35 Port_Main (X=67679.508 Y=-14127.952 Z=10061.037)
-    "port_scraps_3" : base_id + 1231, # ItemPickup336_38 Port_Main (X=67062.219 Y=-15626.003 Z=10065.956)
-    "port_scraps_4" : base_id + 1232, # ItemPickup21_15 Port_Main (X=66140.914 Y=-16079.730 Z=10092.268)
-    "port_scraps_5" : base_id + 1233, # ItemPickup18_12 Port_Main (X=66824.719 Y=-14729.157 Z=10125.234)
-    "port_scraps_6" : base_id + 1234, # ItemPickup333_29 Port_Main (X=69777.258 Y=-8371.526 Z=9391.735)
-    "port_scraps_7" : base_id + 1235, # ItemPickup332_26 Port_Main (X=70339.695 Y=-11066.703 Z=8912.465)
-    "port_scraps_8" : base_id + 1236, # ItemPickup331_23 Port_Main (X=72729.508 Y=-7048.998 Z=8245.522)
-    "port_scraps_9" : base_id + 1237, # ItemPickup329_17 Port_Main (X=75896.070 Y=-8705.214 Z=7514.992)
-    "port_scraps_10" : base_id + 1238, # ItemPickup330_20 Port_Main (X=74264.211 Y=-10553.446 Z=7520.141)
-    "port_scraps_11" : base_id + 1239, # ItemPickup17_9 Port_Main (X=74328.117 Y=-11423.852 Z=7511.827)
-    "port_scraps_12" : base_id + 1240, # ItemPickup328_14 Port_Main (X=76753.164 Y=-10744.933 Z=7437.174)
-    "port_scraps_13" : base_id + 1241, # ItemPickup326_8 Port_Main (X=77330.414 Y=-11640.151 Z=7189.003)
-    "port_scraps_14" : base_id + 1242, # ItemPickup327_11 Port_Main (X=76403.516 Y=-12484.995 Z=7440.368)
-    "port_scraps_15" : base_id + 1243, # ItemPickup324_2 Port_Main (X=78651.977 Y=-12233.159 Z=7439.514)
-    "port_scraps_16" : base_id + 1244, # ItemPickup14_5 Port_Main (X=80336.297 Y=-12276.590 Z=7436.639)
-    "port_scraps_17" : base_id + 1245, # ItemPickup325_5 Port_Main (X=79845.086 Y=-13410.705 Z=7440.597)
-    "port_scraps_18" : base_id + 1246, # ItemPickup13_2 Port_Main (X=76156.719 Y=-12816.718 Z=7439.269) KO
-    "port_scraps_19" : base_id + 1247, # ItemPickup16 Port_Main (X=80754.914 Y=-14055.545 Z=7445.339) KO
-    "port_santiago_mission_end" : base_id + 1248 # (dialog 3) -> 35_scraps_reward
+    "Boulder Field Page Drawing 1" : base_id + 1184, # Pages_Drawing1 Pages_Environment_Details (X=46232.703 Y=-37052.875 Z=9531.116)
+    "Boulder Field Page Drawing 2" : base_id + 1185, # Pages_Drawing2 Pages_Environment_Details (X=51854.980 Y=-31332.070 Z=9804.927)
+    "Boulder Field Page Drawing 3" : base_id + 1186, # Pages_Drawing3 Pages_Environment_Details (X=47595.750 Y=-29931.740 Z=9308.014)
+    "Boulder Field Page Drawing 4" : base_id + 1187, # Pages_Drawing4 Pages_Environment_Details (X=43819.680 Y=-30378.770 Z=9706.599)
+    "Boulder Field Page Drawing 5" : base_id + 1188, # Pages_Drawing5 Pages_Environment_Details (X=47494.746 Y=-20884.781 Z=9812.398)
+    "Boulder Field Page Drawing 6" : base_id + 1189, # Pages_Drawing6 Pages_Environment_Details (X=43725.148 Y=-21952.570 Z=9744.351)
+    "Boulder Field Page Drawing 7" : base_id + 1190, # Pages_Drawing7 Pages_Environment_Details (X=44752.465 Y=-16362.510 Z=10147.004)
+    "Boulder Field Page Drawing 8" : base_id + 1191, # Pages_Drawing8 Pages_Environment_Details (X=50496.270 Y=-26090.533 Z=9835.365)
+    "Boulder Field Scraps 1" : base_id + 1192, # ItemPickup293_8 Pages_Environment_Main (X=41385.406 Y=-32281.871 Z=10240.781)
+    "Boulder Field Scraps 2" : base_id + 1193, # ItemPickup987321 Pages_House_Main (X=46654.969 Y=-38859.254 Z=9920.861)
+    "Boulder Field Scraps 3" : base_id + 1194, # ItemPickup516121 Pages_House_Main (X=44765.836 Y=-41675.559 Z=9938.179)
+    "Boulder Field Scraps 4" : base_id + 1195, # ItemPickup291_2 Pages_Environment_Main (X=50088.270 Y=-30669.107 Z=9267.371)
+    "Boulder Field Scraps 5" : base_id + 1196, # ItemPickup303_38 Pages_Environment_Main (X=48014.609 Y=-28971.115 Z=9199.659)
+    "Boulder Field Scraps 6" : base_id + 1197, # ItemPickup302_35 Pages_Environment_Main (X=50190.266 Y=-26243.977 Z=9648.289)
+    "Boulder Field Scraps 7" : base_id + 1198, # ItemPickup305_44 Pages_Environment_Main (X=47802.246 Y=-22594.684 Z=9631.879)
+    "Boulder Field Scraps 8" : base_id + 1199, # ItemPickup294_11 Pages_Environment_Main (X=44345.996 Y=-23408.535 Z=9659.643)
+    "Boulder Field Scraps 9" : base_id + 1200, # ItemPickup295_14 Pages_Environment_Main (X=41620.590 Y=-22982.641 Z=9720.177)
+    "Boulder Field Scraps 10" : base_id + 1201, # ItemPickup300_29 Pages_Environment_Main (X=52003.172 Y=-19163.049 Z=9925.105)
+    "Boulder Field Scraps 11" : base_id + 1202, # ItemPickup301_32 Pages_Environment_Main (X=51422.176 Y=-22319.322 Z=10663.813)
+    "Boulder Field Scraps 12" : base_id + 1203, # ItemPickup296_17 Pages_Environment_Main (X=43527.176 Y=-17952.570 Z=10812.458)
+    "Boulder Field Scraps 13" : base_id + 1204, # ItemPickup297_20 Pages_Environment_Main (X=45241.871 Y=-15847.636 Z=9952.198)
+    "Boulder Field Scraps 14" : base_id + 1205, # ItemPickup298_23 Pages_Environment_Main (X=46238.027 Y=-18407.420 Z=10199.825)
+    "Boulder Field Scraps 15" : base_id + 1206, # ItemPickup299_26 Pages_Environment_Main (X=49835.617 Y=-17379.959 Z=9810.836)
+    "Boulder Field Scraps 16" : base_id + 1207, # ItemPickup306_47 Pages_Environment_Main (X=45144.594 Y=-33817.090 Z=10136.658)
+    "Boulder Field Scraps 17" : base_id + 1208, # ItemPickup292_5 Pages_Environment_Main (X=44336.184 Y=-37162.367 Z=9789.548)
+    "Boulder Field Scraps 18" : base_id + 1209 # ItemPickup304_41 Pages_Environment_Main (X=44490.160 Y=-26442.754 Z=9974.022)
+}
+
+loc_haunted_house = {
+    "Haunted House Sasha Mission End" : base_id + 1210, # (dialog 2) -> 40_scraps_reward
+    "Haunted House Scraps 1" : base_id + 1211, # ItemPickup1309876 Pages_House_Main (X=42900.188 Y=-43760.617 Z=9900.531)
+    "Haunted House Scraps 2" : base_id + 1212, # ItemPickup22213 Pages_House_Main (X=43608.078 Y=-44642.434 Z=9922.888)
+    "Haunted House Scraps 3" : base_id + 1213, # ItemPickup5423189 Pages_House_Main (X=43992.387 Y=-44259.336 Z=9877.623)
+    "Haunted House Scraps 4" : base_id + 1214, # ItemPickup1312312 Pages_House_Main (X=43340.012 Y=-45362.617 Z=9882.796)
+    "Haunted House Scraps 5" : base_id + 1215, # ItemPickup1596 Pages_House_Main (X=45105.383 Y=-45980.879 Z=9854.796)
+    "Haunted House Scraps 6" : base_id + 1216 # ItemPickup8624 Pages_House_Main (X=45888.406 Y=-46050.246 Z=9555.326)
+}
+
+loc_santiago_house = {
+    "Santiago House Scraps 1" : base_id + 1217, # ItemPickup342_19 PortNPCHouse_Details (X=37271.445 Y=-46075.598 Z=10648.827)
+    "Santiago House Scraps 2" : base_id + 1218, # ItemPickup37_5 PortNPCHouse_Details (X=38330.512 Y=-47184.668 Z=10387.618)
+    "Santiago House Scraps 3" : base_id + 1219, # ItemPickup337_2 PortNPCHouse_Details (X=35720.422 Y=-49536.328 Z=10098.503)
+    "Santiago House Scraps 4" : base_id + 1220, # ItemPickup344_25 PortNPCHouse_Details (X=35466.285 Y=-50363.078 Z=10098.504)
+    "Santiago House Scraps 5" : base_id + 1221, # ItemPickup338_7 PortNPCHouse_Details (X=34274.289 Y=-49947.578 Z=10098.501)
+    "Santiago House Scraps 6" : base_id + 1222, # ItemPickup341_16 PortNPCHouse_Details (X=35584.359 Y=-48195.172 Z=10323.833)
+    "Santiago House Scraps 7" : base_id + 1223, # ItemPickup340_13 PortNPCHouse_Details (X=35019.766 Y=-49904.113 Z=10124.169)
+    "Santiago House Scraps 8" : base_id + 1224, # ItemPickup339_10 PortNPCHouse_Details (X=35527.711 Y=-49614.801 Z=10124.016)
+    "Santiago House Scraps 9" : base_id + 1225, # ItemPickup36_2 PortNPCHouse_Details (X=34471.707 Y=-49497.000 Z=10199.790)
+    "Santiago House Scraps 10" : base_id + 1226, # ItemPickup343_22 PortNPCHouse_Details (X=37920.277 Y=-51867.754 Z=9847.511)
+    "Santiago House Journal" : base_id + 1227 # Port_Journal_Pickup PortNPCHouse_Details (X=34690.777 Y=-49788.359 Z=10214.353)
+}
+
+loc_port = {
+    "Port Grey Paint Can" : base_id + 1228, # PaintCan_13 Port_Details (X=74641.648 Y=-11320.948 Z=7551.767)
+    "Port Scraps 1" : base_id + 1229, # ItemPickup334_32 Port_Main (X=67315.281 Y=-13828.055 Z=10101.339)
+    "Port Scraps 2" : base_id + 1230, # ItemPickup335_35 Port_Main (X=67679.508 Y=-14127.952 Z=10061.037)
+    "Port Scraps 3" : base_id + 1231, # ItemPickup336_38 Port_Main (X=67062.219 Y=-15626.003 Z=10065.956)
+    "Port Scraps 4" : base_id + 1232, # ItemPickup21_15 Port_Main (X=66140.914 Y=-16079.730 Z=10092.268)
+    "Port Scraps 5" : base_id + 1233, # ItemPickup18_12 Port_Main (X=66824.719 Y=-14729.157 Z=10125.234)
+    "Port Scraps 6" : base_id + 1234, # ItemPickup333_29 Port_Main (X=69777.258 Y=-8371.526 Z=9391.735)
+    "Port Scraps 7" : base_id + 1235, # ItemPickup332_26 Port_Main (X=70339.695 Y=-11066.703 Z=8912.465)
+    "Port Scraps 8" : base_id + 1236, # ItemPickup331_23 Port_Main (X=72729.508 Y=-7048.998 Z=8245.522)
+    "Port Scraps 9" : base_id + 1237, # ItemPickup329_17 Port_Main (X=75896.070 Y=-8705.214 Z=7514.992)
+    "Port Scraps 10" : base_id + 1238, # ItemPickup330_20 Port_Main (X=74264.211 Y=-10553.446 Z=7520.141)
+    "Port Scraps 11" : base_id + 1239, # ItemPickup17_9 Port_Main (X=74328.117 Y=-11423.852 Z=7511.827)
+    "Port Scraps 12" : base_id + 1240, # ItemPickup328_14 Port_Main (X=76753.164 Y=-10744.933 Z=7437.174)
+    "Port Scraps 13" : base_id + 1241, # ItemPickup326_8 Port_Main (X=77330.414 Y=-11640.151 Z=7189.003)
+    "Port Scraps 14" : base_id + 1242, # ItemPickup327_11 Port_Main (X=76403.516 Y=-12484.995 Z=7440.368)
+    "Port Scraps 15" : base_id + 1243, # ItemPickup324_2 Port_Main (X=78651.977 Y=-12233.159 Z=7439.514)
+    "Port Scraps 16" : base_id + 1244, # ItemPickup14_5 Port_Main (X=80336.297 Y=-12276.590 Z=7436.639)
+    "Port Scraps 17" : base_id + 1245, # ItemPickup325_5 Port_Main (X=79845.086 Y=-13410.705 Z=7440.597)
+    "Port Scraps 18" : base_id + 1246, # ItemPickup13_2 Port_Main (X=76156.719 Y=-12816.718 Z=7439.269) KO
+    "Port Scraps 19" : base_id + 1247, # ItemPickup16 Port_Main (X=80754.914 Y=-14055.545 Z=7445.339) KO
+    "Port Santiago Mission End" : base_id + 1248 # (dialog 3) -> 35_scraps_reward
 }
 
 loc_trench_house = {
-    "trench_house_scraps_1" : base_id + 1249, # ItemPickup157_2 DeadWoodsEnvironment (X=76340.328 Y=-42886.191 Z=9567.521)
-    "trench_house_scraps_2" : base_id + 1250, # ItemPickup158_5 DeadWoodsEnvironment (X=76013.594 Y=-44140.141 Z=9413.147)
-    "trench_house_scraps_3" : base_id + 1251, # ItemPickup159_11 DeadWoodsEnvironment (X=74408.320 Y=-45424.000 Z=9446.966)
-    "trench_house_scraps_4" : base_id + 1252, # ItemPickup69_14 Secret8_BasementHouseDetails (X=75196.344 Y=-48321.504 Z=9453.302)
-    "trench_house_scraps_5" : base_id + 1253, # ItemPickup160_14 DeadWoodsEnvironment (X=73467.273 Y=-48995.738 Z=9355.070)
-    "trench_house_scraps_6" : base_id + 1254, # ItemPickup163_23 DeadWoodsEnvironment (X=76418.469 Y=-53239.539 Z=9276.892)
-    "trench_house_scraps_7" : base_id + 1255, # ItemPickup173_56 DeadWoodsEnvironment (X=70719.875 Y=-54290.117 Z=9357.084)
-    "trench_house_scraps_8" : base_id + 1256, # ItemPickup165_29 DeadWoodsEnvironment (X=70075.938 Y=-53041.973 Z=9675.481)
-    "trench_house_scraps_9" : base_id + 1257, # ItemPickup162_20 DeadWoodsEnvironment (X=74745.711 Y=-52304.027 Z=9073.130)
-    "trench_house_scraps_10" : base_id + 1258, # ItemPickup68_11 Secret8_BasementHouseDetails (X=74519.750 Y=-53603.063 Z=9078.054)
-    "trench_house_scraps_11" : base_id + 1259, # ItemPickup161_17 DeadWoodsEnvironment (X=73747.492 Y=-52589.906 Z=9104.748)
-    "trench_house_scraps_12" : base_id + 1260, # ItemPickup67_8 Secret8_BasementHouseDetails (X=74333.125 Y=-52847.961 Z=9124.773)
-    "trench_house_scraps_13" : base_id + 1261, # ItemPickup66_5 Secret8_BasementHouseDetails (X=74062.195 Y=-52663.043 Z=9122.827)
-    "trench_house_scraps_14" : base_id + 1262, # ItemPickup65_2 Secret8_BasementHouseDetails (X=74820.492 Y=-51350.051 Z=7956.387)
-    "trench_house_scraps_15" : base_id + 1263, # ItemPickup164_26 DeadWoodsEnvironment (X=75286.289 Y=-51164.098 Z=7957.081)
-    "trench_house_scraps_16" : base_id + 1264, # ItemPickup174_59 DeadWoodsEnvironment (X=68413.258 Y=-56872.816 Z=9349.443)
-    "trench_house_scraps_17" : base_id + 1265, # ItemPickup175_62 DeadWoodsEnvironment (X=67281.281 Y=-59201.371 Z=9254.457)
-    "trench_house_scraps_18" : base_id + 1266, # ItemPickup172_50 DeadWoodsEnvironment (X=69064.219 Y=-48796.352 Z=9770.164)
-    "trench_house_chest_scraps_1" : base_id + 1267, # ItemPickup75123123 Secret8_BasementHouseDetails (X=75042.141 Y=-50830.891 Z=8005.156)
-    "trench_house_chest_scraps_2" : base_id + 1268, # ItemPickup741123 Secret8_BasementHouseDetails (X=75066.516 Y=-50824.398 Z=7995.000)
-    "trench_house_chest_scraps_3" : base_id + 1269, # ItemPickup729842 Secret8_BasementHouseDetails (X=75072.789 Y=-50818.441 Z=7986.979)
-    "trench_house_chest_scraps_4" : base_id + 1270, # ItemPickup711123 Secret8_BasementHouseDetails (X=75038.656 Y=-50827.566 Z=7973.354)
-    "trench_house_chest_scraps_5" : base_id + 1271, # ItemPickup73 Secret8_BasementHouseDetails (X=75060.406 Y=-50828.102 Z=7965.915)
-    "trench_house_chest_scraps_6" : base_id + 1272 # ItemPickup7075674 Secret8_BasementHouseDetails (X=75056.648 Y=-50818.125 Z=7959.868)
+    "Trench House Scraps 1" : base_id + 1249, # ItemPickup157_2 DeadWoodsEnvironment (X=76340.328 Y=-42886.191 Z=9567.521)
+    "Trench House Scraps 2" : base_id + 1250, # ItemPickup158_5 DeadWoodsEnvironment (X=76013.594 Y=-44140.141 Z=9413.147)
+    "Trench House Scraps 3" : base_id + 1251, # ItemPickup159_11 DeadWoodsEnvironment (X=74408.320 Y=-45424.000 Z=9446.966)
+    "Trench House Scraps 4" : base_id + 1252, # ItemPickup69_14 Secret8_BasementHouseDetails (X=75196.344 Y=-48321.504 Z=9453.302)
+    "Trench House Scraps 5" : base_id + 1253, # ItemPickup160_14 DeadWoodsEnvironment (X=73467.273 Y=-48995.738 Z=9355.070)
+    "Trench House Scraps 6" : base_id + 1254, # ItemPickup163_23 DeadWoodsEnvironment (X=76418.469 Y=-53239.539 Z=9276.892)
+    "Trench House Scraps 7" : base_id + 1255, # ItemPickup173_56 DeadWoodsEnvironment (X=70719.875 Y=-54290.117 Z=9357.084)
+    "Trench House Scraps 8" : base_id + 1256, # ItemPickup165_29 DeadWoodsEnvironment (X=70075.938 Y=-53041.973 Z=9675.481)
+    "Trench House Scraps 9" : base_id + 1257, # ItemPickup162_20 DeadWoodsEnvironment (X=74745.711 Y=-52304.027 Z=9073.130)
+    "Trench House Scraps 10" : base_id + 1258, # ItemPickup68_11 Secret8_BasementHouseDetails (X=74519.750 Y=-53603.063 Z=9078.054)
+    "Trench House Scraps 11" : base_id + 1259, # ItemPickup161_17 DeadWoodsEnvironment (X=73747.492 Y=-52589.906 Z=9104.748)
+    "Trench House Scraps 12" : base_id + 1260, # ItemPickup67_8 Secret8_BasementHouseDetails (X=74333.125 Y=-52847.961 Z=9124.773)
+    "Trench House Scraps 13" : base_id + 1261, # ItemPickup66_5 Secret8_BasementHouseDetails (X=74062.195 Y=-52663.043 Z=9122.827)
+    "Trench House Scraps 14" : base_id + 1262, # ItemPickup65_2 Secret8_BasementHouseDetails (X=74820.492 Y=-51350.051 Z=7956.387)
+    "Trench House Scraps 15" : base_id + 1263, # ItemPickup164_26 DeadWoodsEnvironment (X=75286.289 Y=-51164.098 Z=7957.081)
+    "Trench House Scraps 16" : base_id + 1264, # ItemPickup174_59 DeadWoodsEnvironment (X=68413.258 Y=-56872.816 Z=9349.443)
+    "Trench House Scraps 17" : base_id + 1265, # ItemPickup175_62 DeadWoodsEnvironment (X=67281.281 Y=-59201.371 Z=9254.457)
+    "Trench House Scraps 18" : base_id + 1266, # ItemPickup172_50 DeadWoodsEnvironment (X=69064.219 Y=-48796.352 Z=9770.164)
+    "Trench House Chest Scraps 1" : base_id + 1267, # ItemPickup75123123 Secret8_BasementHouseDetails (X=75042.141 Y=-50830.891 Z=8005.156)
+    "Trench House Chest Scraps 2" : base_id + 1268, # ItemPickup741123 Secret8_BasementHouseDetails (X=75066.516 Y=-50824.398 Z=7995.000)
+    "Trench House Chest Scraps 3" : base_id + 1269, # ItemPickup729842 Secret8_BasementHouseDetails (X=75072.789 Y=-50818.441 Z=7986.979)
+    "Trench House Chest Scraps 4" : base_id + 1270, # ItemPickup711123 Secret8_BasementHouseDetails (X=75038.656 Y=-50827.566 Z=7973.354)
+    "Trench House Chest Scraps 5" : base_id + 1271, # ItemPickup73 Secret8_BasementHouseDetails (X=75060.406 Y=-50828.102 Z=7965.915)
+    "Trench House Chest Scraps 6" : base_id + 1272 # ItemPickup7075674 Secret8_BasementHouseDetails (X=75056.648 Y=-50818.125 Z=7959.868)
 }
 
 loc_doll_woods = {
-    "doll_woods_scraps_1" : base_id + 1273, # ItemPickup78_2 DeadWoodsDolls (X=60126.234 Y=-49668.906 Z=9970.880)
-    "doll_woods_scraps_2" : base_id + 1274, # ItemPickup166_32 DeadWoodsEnvironment (X=59854.066 Y=-47313.121 Z=10376.684)
-    "doll_woods_scraps_3" : base_id + 1275, # ItemPickup80_8 DeadWoodsDolls (X=59130.613 Y=-49597.789 Z=9930.675)
-    "doll_woods_scraps_4" : base_id + 1276, # ItemPickup168_38 DeadWoodsEnvironment (X=59785.973 Y=-51269.684 Z=10180.019)
-    "doll_woods_scraps_5" : base_id + 1277, # ItemPickup81_11 DeadWoodsDolls (X=58226.449 Y=-52660.801 Z=10576.626)
-    "doll_woods_scraps_6" : base_id + 1278, # ItemPickup167_35 DeadWoodsEnvironment (X=56243.176 Y=-49097.793 Z=10869.889)
-    "doll_woods_scraps_7" : base_id + 1279, # ItemPickup79_5 DeadWoodsDolls (X=59481.672 Y=-45288.137 Z=10897.672)
-    "doll_woods_scraps_8" : base_id + 1280, # ItemPickup170_44 DeadWoodsEnvironment (X=63807.668 Y=-44674.734 Z=10337.434)
-    "doll_woods_scraps_9" : base_id + 1281, # ItemPickup171_47 DeadWoodsEnvironment (X=68406.664 Y=-45721.813 Z=10021.356)
-    "doll_woods_scraps_10" : base_id + 1282 # ItemPickup169_41 DeadWoodsEnvironment (X=62898.469 Y=-47565.703 Z=10744.431)
+    "Doll Woods Scraps 1" : base_id + 1273, # ItemPickup78_2 DeadWoodsDolls (X=60126.234 Y=-49668.906 Z=9970.880)
+    "Doll Woods Scraps 2" : base_id + 1274, # ItemPickup166_32 DeadWoodsEnvironment (X=59854.066 Y=-47313.121 Z=10376.684)
+    "Doll Woods Scraps 3" : base_id + 1275, # ItemPickup80_8 DeadWoodsDolls (X=59130.613 Y=-49597.789 Z=9930.675)
+    "Doll Woods Scraps 4" : base_id + 1276, # ItemPickup168_38 DeadWoodsEnvironment (X=59785.973 Y=-51269.684 Z=10180.019)
+    "Doll Woods Scraps 5" : base_id + 1277, # ItemPickup81_11 DeadWoodsDolls (X=58226.449 Y=-52660.801 Z=10576.626)
+    "Doll Woods Scraps 6" : base_id + 1278, # ItemPickup167_35 DeadWoodsEnvironment (X=56243.176 Y=-49097.793 Z=10869.889)
+    "Doll Woods Scraps 7" : base_id + 1279, # ItemPickup79_5 DeadWoodsDolls (X=59481.672 Y=-45288.137 Z=10897.672)
+    "Doll Woods Scraps 8" : base_id + 1280, # ItemPickup170_44 DeadWoodsEnvironment (X=63807.668 Y=-44674.734 Z=10337.434)
+    "Doll Woods Scraps 9" : base_id + 1281, # ItemPickup171_47 DeadWoodsEnvironment (X=68406.664 Y=-45721.813 Z=10021.356)
+    "Doll Woods Scraps 10" : base_id + 1282 # ItemPickup169_41 DeadWoodsEnvironment (X=62898.469 Y=-47565.703 Z=10744.431)
 }
 
 loc_lost_stairs = {
-    "lost_stairs_scraps_1" : base_id + 1283, # ItemPickup29_2 Secret1_Stairs2 (X=47087.617 Y=-53476.547 Z=9103.093)
-    "lost_stairs_scraps_2" : base_id + 1284 # ItemPickup30_5 Secret1_Stairs2 (X=47162.238 Y=-55318.094 Z=9127.096)
+    "Lost Stairs Scraps 1" : base_id + 1283, # ItemPickup29_2 Secret1_Stairs2 (X=47087.617 Y=-53476.547 Z=9103.093)
+    "Lost Stairs Scraps 2" : base_id + 1284 # ItemPickup30_5 Secret1_Stairs2 (X=47162.238 Y=-55318.094 Z=9127.096)
 }
 
 loc_east_house = {
-    "east_house_scraps_1" : base_id + 1285, # ItemPickup409_5 Secret7_CliffHouseEnvironment (X=97507.664 Y=-53201.270 Z=9174.678)
-    "east_house_scraps_2" : base_id + 1286, # ItemPickup408_2 Secret7_CliffHouseEnvironment (X=98511.242 Y=-53899.414 Z=9016.314)
-    "east_house_scraps_3" : base_id + 1287, # ItemPickup410_8 Secret7_CliffHouseEnvironment (X=100688.102 Y=-54197.578 Z=8919.432)
-    "east_house_scraps_4" : base_id + 1288, # ItemPickup411_11 Secret7_CliffHouseEnvironment (X=103149.773 Y=-54659.980 Z=9002.535)
-    "east_house_scraps_5" : base_id + 1289, # ItemPickup416_26 Secret7_CliffHouseEnvironment (X=107458.172 Y=-55683.793 Z=9429.004)
-    "east_house_scraps_6" : base_id + 1290, # ItemPickup25_2 Secret7_CliffHouseEnvironment (X=109034.164 Y=-54360.703 Z=9495.910)
-    "east_house_scraps_7" : base_id + 1291, # ItemPickup413_17 Secret7_CliffHouseEnvironment (X=109245.148 Y=-55045.242 Z=9553.601)
-    "east_house_scraps_8" : base_id + 1292, # ItemPickup414_20 Secret7_CliffHouseEnvironment (X=112556.445 Y=-55851.754 Z=10049.954)
-    "east_house_scraps_9" : base_id + 1293, # ItemPickup415_23 Secret7_CliffHouseEnvironment (X=113131.469 Y=-56822.508 Z=10038.047)
-    "east_house_scraps_10" : base_id + 1294, # ItemPickup2599786 Secret7_CliffHouseDetails (X=112279.828 Y=-56743.781 Z=10029.549)
-    "east_house_scraps_11" : base_id + 1295, # ItemPickup253321 Secret7_CliffHouseDetails (X=112445.508 Y=-56280.320 Z=10059.164)
-    "east_house_scraps_12" : base_id + 1296, # ItemPickup2532323 Secret7_CliffHouseDetails (X=112562.211 Y=-56736.332 Z=10454.907)
-    "east_house_scraps_13" : base_id + 1297, # ItemPickup257655 Secret7_CliffHouseDetails (X=109313.320 Y=-58221.316 Z=9501.283)
-    "east_house_scraps_14" : base_id + 1298, # ItemPickup412_14 Secret7_CliffHouseEnvironment (X=104077.805 Y=-55987.301 Z=9066.847)
-    "east_house_chest_scraps_1" : base_id + 1299, # ItemPickup76246 Secret7_CliffHouseDetails (X=112317.242 Y=-55820.805 Z=10497.336)
-    "east_house_chest_scraps_2" : base_id + 1300, # ItemPickup76245 Secret7_CliffHouseDetails (X=112326.086 Y=-55808.477 Z=10485.685)
-    "east_house_chest_scraps_3" : base_id + 1301, # ItemPickup85131 Secret7_CliffHouseDetails (X=112329.031 Y=-55828.438 Z=10478.107)
-    "east_house_chest_scraps_4" : base_id + 1302, # ItemPickup56124 Secret7_CliffHouseDetails (X=112315.922 Y=-55820.102 Z=10466.683)
-    "east_house_chest_scraps_5" : base_id + 1303 # ItemPickup25123123123 Secret7_CliffHouseDetails (X=112337.922 Y=-55821.848 Z=10456.924)
-}
-
-loc_explosive_training = {
-    "explosive_training_timed_dynamite" : base_id + 1304, # Boomer_DynamitePickup Boomer_RangeDetails (X=76476.609 Y=-65286.738 Z=8303.742)
-    "explosive_training_scraps_1" : base_id + 1305, # ItemPickup105_14 Boomer_HouseDetails (X=88925.570 Y=-63375.051 Z=8563.354)
-    "explosive_training_scraps_2" : base_id + 1306, # ItemPickup106_17 Boomer_HouseDetails (X=84234.016 Y=-64475.551 Z=8382.108)
-    "explosive_training_scraps_3" : base_id + 1307, # ItemPickup114_23 Boomer_RangeDetails (X=79349.438 Y=-64225.480 Z=8384.219)
-    "explosive_training_scraps_4" : base_id + 1308, # ItemPickup22_0 Boomer_RangeDetails (X=79831.070 Y=-65847.766 Z=8301.337)
-    "explosive_training_scraps_5" : base_id + 1309, # ItemPickup109_5 Boomer_RangeDetails (X=76526.500 Y=-65394.875 Z=8223.883)
-    "explosive_training_scraps_6" : base_id + 1310, # ItemPickup108_2 Boomer_RangeDetails (X=76237.977 Y=-67087.414 Z=8361.979)
-    "explosive_training_scraps_7" : base_id + 1311, # ItemPickup115_26 Boomer_RangeDetails (X=78857.672 Y=-67802.227 Z=8257.150)
-    "explosive_training_scraps_8" : base_id + 1312, # ItemPickup110_8 Boomer_RangeDetails (X=74878.570 Y=-62927.297 Z=8749.549)
-    "explosive_training_scraps_9" : base_id + 1313, # ItemPickup111_11 Boomer_RangeDetails (X=74542.641 Y=-61301.082 Z=9493.931)
-    "explosive_training_scraps_10" : base_id + 1314, # ItemPickup23_0 Boomer_RangeDetails (X=77020.859 Y=-62031.320 Z=8873.663)
-    "explosive_training_scraps_11" : base_id + 1315, # ItemPickup113_20 Boomer_RangeDetails (X=77552.094 Y=-61144.559 Z=8523.195)
-    "explosive_training_scraps_12" : base_id + 1316, # ItemPickup112_14 Boomer_RangeDetails (X=77670.227 Y=-62029.941 Z=8570.785)
-    # "explosive_training_scraps_glitch_1" ItemPickup107_20 (X=81308.406 Y=-63482.320 Z=8533.338) /!\ Glitched scrap
-    "explosive_training_box_of_rocket" : base_id + 1317 # Boomer_RocketsPickup Boomer_RangeDetails (X=77330.086 Y=-61504.324 Z=8523.195)
-}
-
-loc_john_smith_mission = {
-    "workshop_scraps_1" : base_id + 1318, # ItemPickup103_8 Boomer_HouseDetails (X=93550.773 Y=-61901.797 Z=8828.551)
-    "workshop_scraps_2" : base_id + 1319, # ItemPickup102_5 Boomer_HouseDetails (X=93508.047 Y=-64009.910 Z=8783.468)
-    "workshop_scraps_3" : base_id + 1320, # ItemPickup101_2 Boomer_HouseDetails (X=92011.648 Y=-65572.281 Z=8736.709)
-    "workshop_scraps_4" : base_id + 1321, # ItemPickup24_2 Boomer_HouseDetails (X=92311.594 Y=-63045.211 Z=8749.977)
-    "workshop_scraps_5" : base_id + 1322, # ItemPickup104_11 Boomer_HouseDetails (X=91392.734 Y=-63527.629 Z=8709.268)
-    "workshop_scraps_6" : base_id + 1323, # ItemPickup25_1 Boomer_HouseDetails (X=92986.789 Y=-63012.047 Z=9235.383)
-    "workshop_john_smith_mission_end" : base_id + 1324 # (dialog 2) -> the_boomer
-}
-
-loc_greg_mission = {
-    "tower_greg_mission_start" : base_id + 1325, # (dialog 6) -> north_mine_key
-    "tower_greg_scraps_1" : base_id + 1326, # ItemPickup231_17 Mine2_NPCHouseDetails (X=95448.250 Y=-67249.156 Z=8607.896)
-    "tower_greg_scraps_2" : base_id + 1327, # ItemPickup228_8 Mine2_NPCHouseDetails (X=96339.242 Y=-66374.828 Z=8650.519)
-    "tower_greg_scraps_3" : base_id + 1328, # ItemPickup229_11 Mine2_NPCHouseDetails (X=98540.711 Y=-67173.656 Z=8418.825)
-    "tower_greg_scraps_4" : base_id + 1329, # ItemPickup230_14 Mine2_NPCHouseDetails (X=97276.414 Y=-68495.008 Z=8337.229)
-    "tower_greg_scraps_5" : base_id + 1330, # ItemPickup227_5 Mine2_NPCHouseDetails (X=96470.820 Y=-66540.859 Z=8953.763)
-    "tower_greg_scraps_6" : base_id + 1331 # ItemPickup226_2 Mine2_NPCHouseDetails (X=96141.555 Y=-67013.445 Z=9399.308)
-}
-
-loc_claire_mission = {
-    "lighthouse_scraps_1": base_id + 1332, # ItemPickup200_41 LighthouseTerrainMain (X=100072.813 Y=-68645.688 Z=8150.313)
-    "lighthouse_scraps_2" : base_id + 1333, # ItemPickup198_35 LighthouseTerrainMain (X=105340.594 Y=-70828.602 Z=8436.780)
-    "lighthouse_scraps_3" : base_id + 1334, # ItemPickup199_38 LighthouseTerrainMain (X=103851.688 Y=-73396.625 Z=7973.290)
-    "lighthouse_scraps_4" : base_id + 1335, # ItemPickup196_29 LighthouseTerrainMain (X=107040.711 Y=-74021.555 Z=8303.216)
-    "lighthouse_scraps_5" : base_id + 1336, # ItemPickup197_32 LighthouseTerrainMain (X=110566.859 Y=-77435.961 Z=7642.565)
-    "lighthouse_scraps_6" : base_id + 1337, # ItemPickup32_2 LighthouseShed_Main (X=111451.352 Y=-77351.117 Z=7633.413)
-    "lighthouse_scraps_7" : base_id + 1338, # ItemPickup35_11 Lighthouse_Main (X=113078.500 Y=-78618.281 Z=7180.793)
-    "lighthouse_scraps_8" : base_id + 1339, # ItemPickup192_17 LighthouseTerrainMain (X=113396.305 Y=-80315.383 Z=7184.260)
-    "lighthouse_scraps_9" : base_id + 1340, # ItemPickup193_20 LighthouseTerrainMain (X=114057.484 Y=-81517.836 Z=7245.034)
-    "lighthouse_scraps_10" : base_id + 1341, # ItemPickup194_23 LighthouseTerrainMain (X=110915.156 Y=-78376.609 Z=7676.131)
-    "lighthouse_scraps_11" : base_id + 1342, # ItemPickup195_26 LighthouseTerrainMain (X=109341.703 Y=-79014.469 Z=8075.679)
-    "lighthouse_scraps_12" : base_id + 1343, # ItemPickup33_5 Lighthouse_Details (X=107006.578 Y=-81377.711 Z=8821.629)
-    "lighthouse_scraps_13" : base_id + 1344, # ItemPickup191_14 LighthouseTerrainMain (X=109240.195 Y=-82951.375 Z=8194.619)
-    "lighthouse_scraps_14" : base_id + 1345, # ItemPickup190_11 LighthouseTerrainMain (X=106295.719 Y=-84190.578 Z=8581.896)
-    "lighthouse_scraps_15" : base_id + 1346, # ItemPickup189_8 LighthouseTerrainMain (X=104233.883 Y=-84663.328 Z=7806.311)
-    "lighthouse_scraps_16" : base_id + 1347, # ItemPickup188_5 LighthouseTerrainMain (X=103209.227 Y=-81564.047 Z=8140.578)
-    "lighthouse_scraps_17" : base_id + 1348, # ItemPickup187_2 LighthouseTerrainMain (X=104795.555 Y=-81344.758 Z=8775.158)
-    "lighthouse_scraps_18" : base_id + 1349, # ItemPickup34_8 Lighthouse_Main (X=100843.914 Y=-78038.539 Z=7197.542)
-    "lighthouse_breaker_1" : base_id + 1350, # ItemPickup13_2 LighthouseShed_Main (X=110781.164 Y=-77296.813 Z=7757.248) \!/ Existing match 6
-    "lighthouse_breaker_2" : base_id + 1351, # ItemPickup14 LighthouseShed_Main (X=110899.227 Y=-77239.031 Z=7757.134) \!/ Existing match 3
-    "lighthouse_breaker_3" : base_id + 1352, # ItemPickup16 LighthouseShed_Main (X=110948.547 Y=-77253.336 Z=7757.134) \!/ Existing match 2
-    "lighthouse_breaker_4" : base_id + 1353, # ItemPickup17 LighthouseShed_Main (X=111001.078 Y=-77205.047 Z=7757.134) \!/ Existing match 1
-    "lighthouse_claire_mission_end" : base_id + 1354 # (dialog 2) -> 30_scraps_reward
+    "East House Scraps 1" : base_id + 1285, # ItemPickup409_5 Secret7_CliffHouseEnvironment (X=97507.664 Y=-53201.270 Z=9174.678)
+    "East House Scraps 2" : base_id + 1286, # ItemPickup408_2 Secret7_CliffHouseEnvironment (X=98511.242 Y=-53899.414 Z=9016.314)
+    "East House Scraps 3" : base_id + 1287, # ItemPickup410_8 Secret7_CliffHouseEnvironment (X=100688.102 Y=-54197.578 Z=8919.432)
+    "East House Scraps 4" : base_id + 1288, # ItemPickup411_11 Secret7_CliffHouseEnvironment (X=103149.773 Y=-54659.980 Z=9002.535)
+    "East House Scraps 5" : base_id + 1289, # ItemPickup416_26 Secret7_CliffHouseEnvironment (X=107458.172 Y=-55683.793 Z=9429.004)
+    "East House Scraps 6" : base_id + 1290, # ItemPickup25_2 Secret7_CliffHouseEnvironment (X=109034.164 Y=-54360.703 Z=9495.910)
+    "East House Scraps 7" : base_id + 1291, # ItemPickup413_17 Secret7_CliffHouseEnvironment (X=109245.148 Y=-55045.242 Z=9553.601)
+    "East House Scraps 8" : base_id + 1292, # ItemPickup414_20 Secret7_CliffHouseEnvironment (X=112556.445 Y=-55851.754 Z=10049.954)
+    "East House Scraps 9" : base_id + 1293, # ItemPickup415_23 Secret7_CliffHouseEnvironment (X=113131.469 Y=-56822.508 Z=10038.047)
+    "East House Scraps 10" : base_id + 1294, # ItemPickup2599786 Secret7_CliffHouseDetails (X=112279.828 Y=-56743.781 Z=10029.549)
+    "East House Scraps 11" : base_id + 1295, # ItemPickup253321 Secret7_CliffHouseDetails (X=112445.508 Y=-56280.320 Z=10059.164)
+    "East House Scraps 12" : base_id + 1296, # ItemPickup2532323 Secret7_CliffHouseDetails (X=112562.211 Y=-56736.332 Z=10454.907)
+    "East House Scraps 13" : base_id + 1297, # ItemPickup257655 Secret7_CliffHouseDetails (X=109313.320 Y=-58221.316 Z=9501.283)
+    "East House Scraps 14" : base_id + 1298, # ItemPickup412_14 Secret7_CliffHouseEnvironment (X=104077.805 Y=-55987.301 Z=9066.847)
+    "East House Chest Scraps 1" : base_id + 1299, # ItemPickup76246 Secret7_CliffHouseDetails (X=112317.242 Y=-55820.805 Z=10497.336)
+    "East House Chest Scraps 2" : base_id + 1300, # ItemPickup76245 Secret7_CliffHouseDetails (X=112326.086 Y=-55808.477 Z=10485.685)
+    "East House Chest Scraps 3" : base_id + 1301, # ItemPickup85131 Secret7_CliffHouseDetails (X=112329.031 Y=-55828.438 Z=10478.107)
+    "East House Chest Scraps 4" : base_id + 1302, # ItemPickup56124 Secret7_CliffHouseDetails (X=112315.922 Y=-55820.102 Z=10466.683)
+    "East House Chest Scraps 5" : base_id + 1303 # ItemPickup25123123123 Secret7_CliffHouseDetails (X=112337.922 Y=-55821.848 Z=10456.924)
+}
+
+loc_rockets_testing_ground = {
+    "Rockets Testing Ground Timed Dynamite" : base_id + 1304, # Boomer_DynamitePickup Boomer_RangeDetails (X=76476.609 Y=-65286.738 Z=8303.742)
+    "Rockets Testing Ground Scraps 1" : base_id + 1305, # ItemPickup105_14 Boomer_HouseDetails (X=88925.570 Y=-63375.051 Z=8563.354)
+    "Rockets Testing Ground Scraps 2" : base_id + 1306, # ItemPickup106_17 Boomer_HouseDetails (X=84234.016 Y=-64475.551 Z=8382.108)
+    "Rockets Testing Ground Scraps 3" : base_id + 1307, # ItemPickup114_23 Boomer_RangeDetails (X=79349.438 Y=-64225.480 Z=8384.219)
+    "Rockets Testing Ground Scraps 4" : base_id + 1308, # ItemPickup22_0 Boomer_RangeDetails (X=79831.070 Y=-65847.766 Z=8301.337)
+    "Rockets Testing Ground Scraps 5" : base_id + 1309, # ItemPickup109_5 Boomer_RangeDetails (X=76526.500 Y=-65394.875 Z=8223.883)
+    "Rockets Testing Ground Scraps 6" : base_id + 1310, # ItemPickup108_2 Boomer_RangeDetails (X=76237.977 Y=-67087.414 Z=8361.979)
+    "Rockets Testing Ground Scraps 7" : base_id + 1311, # ItemPickup115_26 Boomer_RangeDetails (X=78857.672 Y=-67802.227 Z=8257.150)
+    "Rockets Testing Ground Scraps 8" : base_id + 1312, # ItemPickup110_8 Boomer_RangeDetails (X=74878.570 Y=-62927.297 Z=8749.549)
+    "Rockets Testing Ground Scraps 9" : base_id + 1313, # ItemPickup111_11 Boomer_RangeDetails (X=74542.641 Y=-61301.082 Z=9493.931)
+    "Rockets Testing Ground Scraps 10" : base_id + 1314 # ItemPickup23_0 Boomer_RangeDetails (X=77020.859 Y=-62031.320 Z=8873.663)
+    # "Rockets Testing Ground Scraps Glitch 1" ItemPickup107_20 (X=81308.406 Y=-63482.320 Z=8533.338) /!\ Glitched scrap
+}
+
+loc_rockets_testing_bunker = {
+    "Rockets Testing Bunker Scraps 1" : base_id + 1315, # ItemPickup113_20 Boomer_RangeDetails (X=77552.094 Y=-61144.559 Z=8523.195)
+    "Rockets Testing Bunker Scraps 2" : base_id + 1316, # ItemPickup112_14 Boomer_RangeDetails (X=77670.227 Y=-62029.941 Z=8570.785)
+    "Rockets Testing Bunker Box of Rockets" : base_id + 1317 # Boomer_RocketsPickup Boomer_RangeDetails (X=77330.086 Y=-61504.324 Z=8523.195)
+}
+
+loc_workshop = {
+    "Workshop Scraps 1" : base_id + 1318, # ItemPickup103_8 Boomer_HouseDetails (X=93550.773 Y=-61901.797 Z=8828.551)
+    "Workshop Scraps 2" : base_id + 1319, # ItemPickup102_5 Boomer_HouseDetails (X=93508.047 Y=-64009.910 Z=8783.468)
+    "Workshop Scraps 3" : base_id + 1320, # ItemPickup101_2 Boomer_HouseDetails (X=92011.648 Y=-65572.281 Z=8736.709)
+    "Workshop Scraps 4" : base_id + 1321, # ItemPickup24_2 Boomer_HouseDetails (X=92311.594 Y=-63045.211 Z=8749.977)
+    "Workshop Scraps 5" : base_id + 1322, # ItemPickup104_11 Boomer_HouseDetails (X=91392.734 Y=-63527.629 Z=8709.268)
+    "Workshop Scraps 6" : base_id + 1323, # ItemPickup25_1 Boomer_HouseDetails (X=92986.789 Y=-63012.047 Z=9235.383)
+    "Workshop John Smith Mission End" : base_id + 1324 # (dialog 2) -> the_boomer
+}
+
+loc_east_tower = {
+    "Greg Mission Start" : base_id + 1325, # (dialog 6) -> north_mine_key
+    "East Tower Scraps 1" : base_id + 1326, # ItemPickup231_17 Mine2_NPCHouseDetails (X=95448.250 Y=-67249.156 Z=8607.896)
+    "East Tower Scraps 2" : base_id + 1327, # ItemPickup228_8 Mine2_NPCHouseDetails (X=96339.242 Y=-66374.828 Z=8650.519)
+    "East Tower Scraps 3" : base_id + 1328, # ItemPickup229_11 Mine2_NPCHouseDetails (X=98540.711 Y=-67173.656 Z=8418.825)
+    "East Tower Scraps 4" : base_id + 1329, # ItemPickup230_14 Mine2_NPCHouseDetails (X=97276.414 Y=-68495.008 Z=8337.229)
+    "East Tower Scraps 5" : base_id + 1330, # ItemPickup227_5 Mine2_NPCHouseDetails (X=96470.820 Y=-66540.859 Z=8953.763)
+    "East Tower Scraps 6" : base_id + 1331 # ItemPickup226_2 Mine2_NPCHouseDetails (X=96141.555 Y=-67013.445 Z=9399.308)
+}
+
+loc_lighthouse = {
+    "Lighthouse Scraps 1": base_id + 1332, # ItemPickup200_41 LighthouseTerrainMain (X=100072.813 Y=-68645.688 Z=8150.313)
+    "Lighthouse Scraps 2" : base_id + 1333, # ItemPickup198_35 LighthouseTerrainMain (X=105340.594 Y=-70828.602 Z=8436.780)
+    "Lighthouse Scraps 3" : base_id + 1334, # ItemPickup199_38 LighthouseTerrainMain (X=103851.688 Y=-73396.625 Z=7973.290)
+    "Lighthouse Scraps 4" : base_id + 1335, # ItemPickup196_29 LighthouseTerrainMain (X=107040.711 Y=-74021.555 Z=8303.216)
+    "Lighthouse Scraps 5" : base_id + 1336, # ItemPickup197_32 LighthouseTerrainMain (X=110566.859 Y=-77435.961 Z=7642.565)
+    "Lighthouse Scraps 6" : base_id + 1337, # ItemPickup32_2 LighthouseShed_Main (X=111451.352 Y=-77351.117 Z=7633.413)
+    "Lighthouse Scraps 7" : base_id + 1338, # ItemPickup35_11 Lighthouse_Main (X=113078.500 Y=-78618.281 Z=7180.793)
+    "Lighthouse Scraps 8" : base_id + 1339, # ItemPickup192_17 LighthouseTerrainMain (X=113396.305 Y=-80315.383 Z=7184.260)
+    "Lighthouse Scraps 9" : base_id + 1340, # ItemPickup193_20 LighthouseTerrainMain (X=114057.484 Y=-81517.836 Z=7245.034)
+    "Lighthouse Scraps 10" : base_id + 1341, # ItemPickup194_23 LighthouseTerrainMain (X=110915.156 Y=-78376.609 Z=7676.131)
+    "Lighthouse Scraps 11" : base_id + 1342, # ItemPickup195_26 LighthouseTerrainMain (X=109341.703 Y=-79014.469 Z=8075.679)
+    "Lighthouse Scraps 12" : base_id + 1343, # ItemPickup33_5 Lighthouse_Details (X=107006.578 Y=-81377.711 Z=8821.629)
+    "Lighthouse Scraps 13" : base_id + 1344, # ItemPickup191_14 LighthouseTerrainMain (X=109240.195 Y=-82951.375 Z=8194.619)
+    "Lighthouse Scraps 14" : base_id + 1345, # ItemPickup190_11 LighthouseTerrainMain (X=106295.719 Y=-84190.578 Z=8581.896)
+    "Lighthouse Scraps 15" : base_id + 1346, # ItemPickup189_8 LighthouseTerrainMain (X=104233.883 Y=-84663.328 Z=7806.311)
+    "Lighthouse Scraps 16" : base_id + 1347, # ItemPickup188_5 LighthouseTerrainMain (X=103209.227 Y=-81564.047 Z=8140.578)
+    "Lighthouse Scraps 17" : base_id + 1348, # ItemPickup187_2 LighthouseTerrainMain (X=104795.555 Y=-81344.758 Z=8775.158)
+    "Lighthouse Scraps 18" : base_id + 1349, # ItemPickup34_8 Lighthouse_Main (X=100843.914 Y=-78038.539 Z=7197.542)
+    "Lighthouse Breaker 1" : base_id + 1350, # ItemPickup13_2 LighthouseShed_Main (X=110781.164 Y=-77296.813 Z=7757.248) \!/ Existing match 6
+    "Lighthouse Breaker 2" : base_id + 1351, # ItemPickup14 LighthouseShed_Main (X=110899.227 Y=-77239.031 Z=7757.134) \!/ Existing match 3
+    "Lighthouse Breaker 3" : base_id + 1352, # ItemPickup16 LighthouseShed_Main (X=110948.547 Y=-77253.336 Z=7757.134) \!/ Existing match 2
+    "Lighthouse Breaker 4" : base_id + 1353, # ItemPickup17 LighthouseShed_Main (X=111001.078 Y=-77205.047 Z=7757.134) \!/ Existing match 1
+    "Lighthouse Claire Mission End" : base_id + 1354 # (dialog 2) -> 30_scraps_reward
 }
 
 loc_north_mine_outside = {
-    "north_mine_outside_scraps_1" : base_id + 1355, # ItemPickup241_31 Mine2_OutsideDetails (X=-52376.746 Y=-101857.492 Z=10542.841)
-    "north_mine_outside_scraps_2" : base_id + 1356, # ItemPickup242_34 Mine2_OutsideDetails (X=-53786.742 Y=-102067.789 Z=10858.948)
-    "north_mine_outside_scraps_3" : base_id + 1357, # ItemPickup239_25 Mine2_OutsideDetails (X=-57502.777 Y=-105475.336 Z=10609.405)
-    "north_mine_outside_scraps_4" : base_id + 1358, # ItemPickup16_2 Mine2_OutsideDetails (X=-58102.102 Y=-104007.906 Z=11146.535)
-    "north_mine_outside_scraps_5" : base_id + 1359, # ItemPickup238_20 Mine2_OutsideDetails (X=-59474.840 Y=-105053.734 Z=11213.524)
-    "north_mine_outside_scraps_6" : base_id + 1360, # ItemPickup240_28 Mine2_OutsideDetails (X=-55011.750 Y=-104936.359 Z=9935.366)
-    "north_mine_outside_scraps_7" : base_id + 1361, # ItemPickup236_14 Mine2_OutsideDetails (X=-55594.863 Y=-107667.594 Z=9596.611)
-    "north_mine_outside_scraps_8" : base_id + 1362, # ItemPickup15_1 Mine2_Interior2 (X=-56632.578 Y=-109503.406 Z=9280.788)
-    "north_mine_outside_scraps_9" : base_id + 1363, # ItemPickup234_8 Mine2_OutsideDetails (X=-54645.418 Y=-110747.602 Z=9553.452)
-    "north_mine_outside_scraps_10" : base_id + 1364, # ItemPickup232_2 Mine2_OutsideDetails (X=-51561.340 Y=-113574.813 Z=9414.959)
-    "north_mine_outside_scraps_11" : base_id + 1365, # ItemPickup233_5 Mine2_OutsideDetails (X=-54072.105 Y=-112672.031 Z=10077.665)
-    "north_mine_outside_scraps_12" : base_id + 1366, # ItemPickup237_17 Mine2_OutsideDetails (X=-58042.758 Y=-108748.656 Z=9693.470)
-    "north_mine_outside_scraps_13" : base_id + 1367, # ItemPickup235_11 Mine2_OutsideDetails (X=-55717.227 Y=-110610.414 Z=9487.879)
-    "north_mine_outside_scraps_14" : base_id + 1368 # ItemPickup13_2 Mine2_Interior2 (X=-52235.836 Y=-114501.117 Z=9462.438) KO
+    "North Mine Outside Scraps 1" : base_id + 1355, # ItemPickup241_31 Mine2_OutsideDetails (X=-52376.746 Y=-101857.492 Z=10542.841)
+    "North Mine Outside Scraps 2" : base_id + 1356, # ItemPickup242_34 Mine2_OutsideDetails (X=-53786.742 Y=-102067.789 Z=10858.948)
+    "North Mine Outside Scraps 3" : base_id + 1357, # ItemPickup239_25 Mine2_OutsideDetails (X=-57502.777 Y=-105475.336 Z=10609.405)
+    "North Mine Outside Scraps 4" : base_id + 1358, # ItemPickup16_2 Mine2_OutsideDetails (X=-58102.102 Y=-104007.906 Z=11146.535)
+    "North Mine Outside Scraps 5" : base_id + 1359, # ItemPickup238_20 Mine2_OutsideDetails (X=-59474.840 Y=-105053.734 Z=11213.524)
+    "North Mine Outside Scraps 6" : base_id + 1360, # ItemPickup240_28 Mine2_OutsideDetails (X=-55011.750 Y=-104936.359 Z=9935.366)
+    "North Mine Outside Scraps 7" : base_id + 1361, # ItemPickup236_14 Mine2_OutsideDetails (X=-55594.863 Y=-107667.594 Z=9596.611)
+    "North Mine Outside Scraps 8" : base_id + 1362, # ItemPickup15_1 Mine2_Interior2 (X=-56632.578 Y=-109503.406 Z=9280.788)
+    "North Mine Outside Scraps 9" : base_id + 1363, # ItemPickup234_8 Mine2_OutsideDetails (X=-54645.418 Y=-110747.602 Z=9553.452)
+    "North Mine Outside Scraps 10" : base_id + 1364, # ItemPickup232_2 Mine2_OutsideDetails (X=-51561.340 Y=-113574.813 Z=9414.959)
+    "North Mine Outside Scraps 11" : base_id + 1365, # ItemPickup233_5 Mine2_OutsideDetails (X=-54072.105 Y=-112672.031 Z=10077.665)
+    "North Mine Outside Scraps 12" : base_id + 1366, # ItemPickup237_17 Mine2_OutsideDetails (X=-58042.758 Y=-108748.656 Z=9693.470)
+    "North Mine Outside Scraps 13" : base_id + 1367, # ItemPickup235_11 Mine2_OutsideDetails (X=-55717.227 Y=-110610.414 Z=9487.879)
+    "North Mine Outside Scraps 14" : base_id + 1368 # ItemPickup13_2 Mine2_Interior2 (X=-52235.836 Y=-114501.117 Z=9462.438) KO
 }
 
 loc_north_mine_inside = {
-    "north_mine_inside_scraps_1" : base_id + 1369, # ItemPickup17_2 Mine2_Interior1 (X=-58433.055 Y=-104081.570 Z=9378.083) KO
-    "north_mine_inside_scraps_2" : base_id + 1370, # ItemPickup246_2 Mine2_Interior1 (X=-58987.199 Y=-103262.906 Z=9186.494)
-    "north_mine_inside_scraps_3" : base_id + 1371, # ItemPickup247_5 Mine2_Interior1 (X=-58812.801 Y=-99259.570 Z=8847.714)
-    "north_mine_inside_scraps_4" : base_id + 1372, # ItemPickup248_8 Mine2_Interior1 (X=-56634.379 Y=-99529.563 Z=8851.877)
-    "north_mine_inside_scraps_5" : base_id + 1373, # ItemPickup22_4 Mine2_Interior1 (X=-55604.477 Y=-98342.906 Z=8842.766)
-    "north_mine_inside_scraps_6" : base_id + 1374, # ItemPickup250_14 Mine2_Interior1 (X=-54824.535 Y=-98526.492 Z=8852.156)
-    "north_mine_inside_scraps_7" : base_id + 1375, # ItemPickup21_14 Mine2_Interior1 (X=-54887.254 Y=-99047.141 Z=8849.855)
-    "north_mine_inside_scraps_8" : base_id + 1376, # ItemPickup20_2 Mine2_Interior1 (X=-55610.020 Y=-101877.961 Z=9081.042)
-    "north_mine_inside_scraps_9" : base_id + 1377, # ItemPickup19_2 Mine2_Interior1 (X=-56519.340 Y=-101375.008 Z=9001.270)
-    "north_mine_inside_scraps_10" : base_id + 1378, # ItemPickup249_11 Mine2_Interior1 (X=-53329.922 Y=-99469.773 Z=8848.643)
-    "north_mine_inside_scraps_11" : base_id + 1379, # ItemPickup251_17 Mine2_Interior1 (X=-52814.828 Y=-96286.969 Z=8851.372)
-    "north_mine_inside_scraps_12" : base_id + 1380, # ItemPickup24_1 Mine2_Interior1 (X=-52605.957 Y=-96535.156 Z=8940.480)
-    "north_mine_inside_scraps_13" : base_id + 1381, # ItemPickup23_20 Mine2_Interior1 (X=-53237.699 Y=-96609.461 Z=8846.201)
-    "north_mine_inside_scraps_14" : base_id + 1382, # ItemPickup18_5 Mine2_Interior1 (X=-58543.488 Y=-95879.695 Z=8981.646)
-    "north_mine_inside_blue_egg" : base_id + 1383, # Mine2_Egg Mine2_Interior2 (X=-53592.195 Y=-99177.500 Z=8975.387)
-    "north_mine_inside_paint_can_blue" : base_id + 1384 # PaintCan_2 Mine2_Interior2 (X=-56133.391 Y=-101870.047 Z=9004.720) \!/ Existing match 5
-    # "secret_gear" ItemPickup26_2 (X=-55546.859 Y=-98209.852 Z=8429.085) /!\ Inaccessible gear
+    "North Mine Inside Scraps 1" : base_id + 1369, # ItemPickup17_2 Mine2_Interior1 (X=-58433.055 Y=-104081.570 Z=9378.083) KO
+    "North Mine Inside Scraps 2" : base_id + 1370, # ItemPickup246_2 Mine2_Interior1 (X=-58987.199 Y=-103262.906 Z=9186.494)
+    "North Mine Inside Scraps 3" : base_id + 1371, # ItemPickup247_5 Mine2_Interior1 (X=-58812.801 Y=-99259.570 Z=8847.714)
+    "North Mine Inside Scraps 4" : base_id + 1372, # ItemPickup248_8 Mine2_Interior1 (X=-56634.379 Y=-99529.563 Z=8851.877)
+    "North Mine Inside Scraps 5" : base_id + 1373, # ItemPickup22_4 Mine2_Interior1 (X=-55604.477 Y=-98342.906 Z=8842.766)
+    "North Mine Inside Scraps 6" : base_id + 1374, # ItemPickup250_14 Mine2_Interior1 (X=-54824.535 Y=-98526.492 Z=8852.156)
+    "North Mine Inside Scraps 7" : base_id + 1375, # ItemPickup21_14 Mine2_Interior1 (X=-54887.254 Y=-99047.141 Z=8849.855)
+    "North Mine Inside Scraps 8" : base_id + 1376, # ItemPickup20_2 Mine2_Interior1 (X=-55610.020 Y=-101877.961 Z=9081.042)
+    "North Mine Inside Scraps 9" : base_id + 1377, # ItemPickup19_2 Mine2_Interior1 (X=-56519.340 Y=-101375.008 Z=9001.270)
+    "North Mine Inside Scraps 10" : base_id + 1378, # ItemPickup249_11 Mine2_Interior1 (X=-53329.922 Y=-99469.773 Z=8848.643)
+    "North Mine Inside Scraps 11" : base_id + 1379, # ItemPickup251_17 Mine2_Interior1 (X=-52814.828 Y=-96286.969 Z=8851.372)
+    "North Mine Inside Scraps 12" : base_id + 1380, # ItemPickup24_1 Mine2_Interior1 (X=-52605.957 Y=-96535.156 Z=8940.480)
+    "North Mine Inside Scraps 13" : base_id + 1381, # ItemPickup23_20 Mine2_Interior1 (X=-53237.699 Y=-96609.461 Z=8846.201)
+    "North Mine Inside Scraps 14" : base_id + 1382, # ItemPickup18_5 Mine2_Interior1 (X=-58543.488 Y=-95879.695 Z=8981.646)
+    "North Mine Inside Blue Egg" : base_id + 1383, # Mine2_Egg Mine2_Interior2 (X=-53592.195 Y=-99177.500 Z=8975.387)
+    "North Mine Inside Blue Paint Can" : base_id + 1384 # PaintCan_2 Mine2_Interior2 (X=-56133.391 Y=-101870.047 Z=9004.720) \!/ Existing match 5
+    # "North Mine Inside Secret Gear" ItemPickup26_2 (X=-55546.859 Y=-98209.852 Z=8429.085) /!\ Inaccessible gear
 }
 
 loc_wood_bridge = {
-    "wood_bridge_scraps_1" : base_id + 1385, # ItemPickup127_35 Bridge_Details (X=-66790.141 Y=-110340.367 Z=10454.417)
-    "wood_bridge_scraps_2" : base_id + 1386, # ItemPickup18613654 Bridge_Details (X=-68364.586 Y=-111691.625 Z=10444.172)
-    "wood_bridge_scraps_3" : base_id + 1387, # ItemPickup1311221 Bridge_StructureDetails (X=-69013.555 Y=-112353.977 Z=10399.942)
-    "wood_bridge_scraps_4" : base_id + 1388, # ItemPickup93564 Bridge_StructureDetails (X=-70398.797 Y=-112916.945 Z=10372.192)
-    "wood_bridge_scraps_5" : base_id + 1389, # ItemPickup161323 Bridge_Details (X=-71336.172 Y=-106966.672 Z=8430.104)
-    "wood_bridge_scraps_6" : base_id + 1390, # ItemPickup128_38 Bridge_Details (X=-72776.086 Y=-107813.102 Z=8305.589)
-    "wood_bridge_scraps_7" : base_id + 1391, # ItemPickup17975 Bridge_Details (X=-75224.648 Y=-108280.867 Z=7929.499)
-    "wood_bridge_scraps_8" : base_id + 1392, # ItemPickup126_32 Bridge_Details (X=-68112.172 Y=-105119.656 Z=9458.937)
-    "wood_bridge_scraps_9" : base_id + 1393, # ItemPickup118_8 Bridge_Details (X=-71847.625 Y=-103623.203 Z=10707.521)
-    "wood_bridge_scraps_10" : base_id + 1394, # ItemPickup116_2 Bridge_Details (X=-71812.219 Y=-107256.094 Z=10780.134)
-    "wood_bridge_scraps_11" : base_id + 1395, # ItemPickup134321 Bridge_Details (X=-72011.570 Y=-109054.547 Z=10866.852)
-    "wood_bridge_scraps_12" : base_id + 1396, # ItemPickup117_5 Bridge_Details (X=-72862.430 Y=-106144.852 Z=10329.061)
-    "wood_bridge_scraps_13" : base_id + 1397 # ItemPickup1494567 Bridge_Details (X=-71843.117 Y=-107174.133 Z=10367.116)
-}
-
-loc_paul_mission = {
-    "museum_scraps_1" : base_id + 1398, # ItemPickup119_11 Bridge_Details (X=-69687.773 Y=-100002.406 Z=10806.339)
-    "museum_scraps_2" : base_id + 1399, # ItemPickup120_14 Bridge_Details (X=-68035.195 Y=-99480.672 Z=11049.731)
-    "museum_scraps_3" : base_id + 1400, # ItemPickup125_29 Bridge_Details (X=-66912.641 Y=-99976.750 Z=11064.357)
-    "museum_scraps_4" : base_id + 1401, # ItemPickup13532 Bridge_HouseDetails (X=-64901.117 Y=-99624.953 Z=11176.359)
-    "museum_scraps_5" : base_id + 1402, # ItemPickup121_17 Bridge_Details (X=-66082.328 Y=-98105.555 Z=11089.308)
-    "museum_scraps_6" : base_id + 1403, # ItemPickup21765 Bridge_HouseDetails (X=-67402.742 Y=-97735.133 Z=11153.927)
-    "museum_scraps_7" : base_id + 1404, # ItemPickup124_26 Bridge_Details (X=-66716.031 Y=-98282.508 Z=11195.624)
-    "museum_scraps_8" : base_id + 1405, # ItemPickup122_20 Bridge_Details (X=-66582.703 Y=-99092.461 Z=11630.082)
-    "museum_scraps_9" : base_id + 1406, # ItemPickup123_23 Bridge_Details (X=-66798.164 Y=-99550.266 Z=11547.321)
-    "museum_scraps_10" : base_id + 1407, # ItemPickup183423 Bridge_HouseDetails (X=-66850.336 Y=-99682.844 Z=11543.618)
-    "museum_scraps_11" : base_id + 1408, # ItemPickup244_40 Mine2_OutsideDetails (X=-60156.828 Y=-98516.953 Z=11811.422)
-    "museum_scraps_12" : base_id + 1409, # ItemPickup245_43 Mine2_OutsideDetails (X=-61195.203 Y=-98262.422 Z=11779.118)
-    "museum_paul_mission_start" : base_id + 1410, # (dialog 6) -> remote_explosive (x8)
-    "museum_paul_mission_end" : base_id + 1411 # (dialog 3) -> temple_key
-}
-
-loc_gertrude_mission = {
-    "refuge_gertrude_mission_start" : base_id + 1412, # (dialog 4) -> broken_bob
-    "refuge_gertrude_scraps_1" : base_id + 1413, # ItemPickup100_8 Bob_NPCHouseMain (X=-72525.500 Y=-89333.734 Z=9820.663)
-    "refuge_gertrude_scraps_2" : base_id + 1414, # ItemPickup98_2 Bob_NPCHouseMain (X=-74870.758 Y=-88576.641 Z=9836.814)
-    "refuge_gertrude_scraps_3" : base_id + 1415, # ItemPickup22_1 Bob_NPCHouseDetails (X=-76193.914 Y=-88038.836 Z=9818.776)
-    "refuge_gertrude_scraps_4" : base_id + 1416, # ItemPickup99_5 Bob_NPCHouseMain (X=-74494.859 Y=-87609.969 Z=9837.866)
-    "refuge_gertrude_scraps_5" : base_id + 1417 # ItemPickup23_3 Bob_NPCHouseDetails (X=-74826.930 Y=-88402.039 Z=9929.854)
+    "Wood Bridge Scraps 1" : base_id + 1385, # ItemPickup127_35 Bridge_Details (X=-66790.141 Y=-110340.367 Z=10454.417)
+    "Wood Bridge Scraps 2" : base_id + 1386, # ItemPickup18613654 Bridge_Details (X=-68364.586 Y=-111691.625 Z=10444.172)
+    "Wood Bridge Scraps 3" : base_id + 1387, # ItemPickup1311221 Bridge_StructureDetails (X=-69013.555 Y=-112353.977 Z=10399.942)
+    "Wood Bridge Scraps 4" : base_id + 1388, # ItemPickup93564 Bridge_StructureDetails (X=-70398.797 Y=-112916.945 Z=10372.192)
+    "Wood Bridge Scraps 5" : base_id + 1389, # ItemPickup161323 Bridge_Details (X=-71336.172 Y=-106966.672 Z=8430.104)
+    "Wood Bridge Scraps 6" : base_id + 1390, # ItemPickup128_38 Bridge_Details (X=-72776.086 Y=-107813.102 Z=8305.589)
+    "Wood Bridge Scraps 7" : base_id + 1391, # ItemPickup17975 Bridge_Details (X=-75224.648 Y=-108280.867 Z=7929.499)
+    "Wood Bridge Scraps 8" : base_id + 1392, # ItemPickup126_32 Bridge_Details (X=-68112.172 Y=-105119.656 Z=9458.937)
+    "Wood Bridge Scraps 9" : base_id + 1393, # ItemPickup118_8 Bridge_Details (X=-71847.625 Y=-103623.203 Z=10707.521)
+    "Wood Bridge Scraps 10" : base_id + 1394, # ItemPickup116_2 Bridge_Details (X=-71812.219 Y=-107256.094 Z=10780.134)
+    "Wood Bridge Scraps 11" : base_id + 1395, # ItemPickup134321 Bridge_Details (X=-72011.570 Y=-109054.547 Z=10866.852)
+    "Wood Bridge Scraps 12" : base_id + 1396, # ItemPickup117_5 Bridge_Details (X=-72862.430 Y=-106144.852 Z=10329.061)
+    "Wood Bridge Scraps 13" : base_id + 1397 # ItemPickup1494567 Bridge_Details (X=-71843.117 Y=-107174.133 Z=10367.116)
+}
+
+loc_museum = {
+    "Museum Scraps 1" : base_id + 1398, # ItemPickup119_11 Bridge_Details (X=-69687.773 Y=-100002.406 Z=10806.339)
+    "Museum Scraps 2" : base_id + 1399, # ItemPickup120_14 Bridge_Details (X=-68035.195 Y=-99480.672 Z=11049.731)
+    "Museum Scraps 3" : base_id + 1400, # ItemPickup125_29 Bridge_Details (X=-66912.641 Y=-99976.750 Z=11064.357)
+    "Museum Scraps 4" : base_id + 1401, # ItemPickup13532 Bridge_HouseDetails (X=-64901.117 Y=-99624.953 Z=11176.359)
+    "Museum Scraps 5" : base_id + 1402, # ItemPickup121_17 Bridge_Details (X=-66082.328 Y=-98105.555 Z=11089.308)
+    "Museum Scraps 6" : base_id + 1403, # ItemPickup21765 Bridge_HouseDetails (X=-67402.742 Y=-97735.133 Z=11153.927)
+    "Museum Scraps 7" : base_id + 1404, # ItemPickup124_26 Bridge_Details (X=-66716.031 Y=-98282.508 Z=11195.624)
+    "Museum Scraps 8" : base_id + 1405, # ItemPickup122_20 Bridge_Details (X=-66582.703 Y=-99092.461 Z=11630.082)
+    "Museum Scraps 9" : base_id + 1406, # ItemPickup123_23 Bridge_Details (X=-66798.164 Y=-99550.266 Z=11547.321)
+    "Museum Scraps 10" : base_id + 1407, # ItemPickup183423 Bridge_HouseDetails (X=-66850.336 Y=-99682.844 Z=11543.618)
+    "Museum Scraps 11" : base_id + 1408, # ItemPickup244_40 Mine2_OutsideDetails (X=-60156.828 Y=-98516.953 Z=11811.422)
+    "Museum Scraps 12" : base_id + 1409, # ItemPickup245_43 Mine2_OutsideDetails (X=-61195.203 Y=-98262.422 Z=11779.118)
+    "Museum Paul Mission Start" : base_id + 1410, # (dialog 6) -> remote_explosive (x8)
+    "Museum Paul Mission End" : base_id + 1411 # (dialog 3) -> temple_key
+}
+
+loc_barbed_shelter = {
+    "Barbed Shelter Gertrude Mission Start" : base_id + 1412, # (dialog 4) -> broken_bob
+    "Barbed Shelter Scraps 1" : base_id + 1413, # ItemPickup100_8 Bob_NPCHouseMain (X=-72525.500 Y=-89333.734 Z=9820.663)
+    "Barbed Shelter Scraps 2" : base_id + 1414, # ItemPickup98_2 Bob_NPCHouseMain (X=-74870.758 Y=-88576.641 Z=9836.814)
+    "Barbed Shelter Scraps 3" : base_id + 1415, # ItemPickup22_1 Bob_NPCHouseDetails (X=-76193.914 Y=-88038.836 Z=9818.776)
+    "Barbed Shelter Scraps 4" : base_id + 1416, # ItemPickup99_5 Bob_NPCHouseMain (X=-74494.859 Y=-87609.969 Z=9837.866)
+    "Barbed Shelter Scraps 5" : base_id + 1417 # ItemPickup23_3 Bob_NPCHouseDetails (X=-74826.930 Y=-88402.039 Z=9929.854)
 }
 
 loc_west_beach = {
-    "west_beach_chest_scraps_1" : base_id + 1418, # ItemPickup9122346 Secret11_Details (X=-85934.047 Y=-89532.547 Z=7383.054)
-    "west_beach_chest_scraps_2" : base_id + 1419, # ItemPickup84 Secret11_Details (X=-85933.977 Y=-89532.977 Z=7369.364)
-    "west_beach_chest_scraps_3" : base_id + 1420, # ItemPickup9099877 Secret11_Details (X=-85951.000 Y=-89527.023 Z=7367.054)
-    "west_beach_chest_scraps_4" : base_id + 1421, # ItemPickup89086423 Secret11_Details (X=-85932.461 Y=-89533.148 Z=7354.001)
-    "west_beach_chest_scraps_5" : base_id + 1422, # ItemPickup83 Secret11_Details (X=-85950.930 Y=-89527.453 Z=7353.365)
-    "west_beach_chest_scraps_6" : base_id + 1423, # ItemPickup82_2 Secret11_Details (X=-85932.391 Y=-89533.578 Z=7340.312)
-    "west_beach_scraps_1" : base_id + 1424, # ItemPickup87_13 Secret11_Details (X=-84489.945 Y=-91235.977 Z=8360.803)
-    "west_beach_scraps_2" : base_id + 1425, # ItemPickup349_2 Secret11_Details1 (X=-84386.320 Y=-90391.789 Z=8376.434)
-    "west_beach_scraps_3" : base_id + 1426, # ItemPickup86_10 Secret11_Details (X=-84714.773 Y=-89876.992 Z=7707.064)
-    "west_beach_scraps_4" : base_id + 1427, # ItemPickup350_5 Secret11_Details1 (X=-85478.672 Y=-90648.414 Z=7708.377)
-    "west_beach_scraps_5" : base_id + 1428, # ItemPickup85_7 Secret11_Details (X=-86276.633 Y=-90674.289 Z=7532.364)
-    "west_beach_scraps_6" : base_id + 1429, # ItemPickup88_16 Secret11_Details (X=-84363.055 Y=-87497.938 Z=7582.647)
-    "west_beach_scraps_7" : base_id + 1430, # ItemPickup351_8 Secret11_Details1 (X=-86556.266 Y=-89748.484 Z=7297.274)
-    "west_beach_scraps_8" : base_id + 1431 # ItemPickup352_11 Secret11_Details1 (X=-83210.836 Y=-92551.953 Z=8460.213)
+    "West Beach Chest Scraps 1" : base_id + 1418, # ItemPickup9122346 Secret11_Details (X=-85934.047 Y=-89532.547 Z=7383.054)
+    "West Beach Chest Scraps 2" : base_id + 1419, # ItemPickup84 Secret11_Details (X=-85933.977 Y=-89532.977 Z=7369.364)
+    "West Beach Chest Scraps 3" : base_id + 1420, # ItemPickup9099877 Secret11_Details (X=-85951.000 Y=-89527.023 Z=7367.054)
+    "West Beach Chest Scraps 4" : base_id + 1421, # ItemPickup89086423 Secret11_Details (X=-85932.461 Y=-89533.148 Z=7354.001)
+    "West Beach Chest Scraps 5" : base_id + 1422, # ItemPickup83 Secret11_Details (X=-85950.930 Y=-89527.453 Z=7353.365)
+    "West Beach Chest Scraps 6" : base_id + 1423, # ItemPickup82_2 Secret11_Details (X=-85932.391 Y=-89533.578 Z=7340.312)
+    "West Beach Scraps 1" : base_id + 1424, # ItemPickup87_13 Secret11_Details (X=-84489.945 Y=-91235.977 Z=8360.803)
+    "West Beach Scraps 2" : base_id + 1425, # ItemPickup349_2 Secret11_Details1 (X=-84386.320 Y=-90391.789 Z=8376.434)
+    "West Beach Scraps 3" : base_id + 1426, # ItemPickup86_10 Secret11_Details (X=-84714.773 Y=-89876.992 Z=7707.064)
+    "West Beach Scraps 4" : base_id + 1427, # ItemPickup350_5 Secret11_Details1 (X=-85478.672 Y=-90648.414 Z=7708.377)
+    "West Beach Scraps 5" : base_id + 1428, # ItemPickup85_7 Secret11_Details (X=-86276.633 Y=-90674.289 Z=7532.364)
+    "West Beach Scraps 6" : base_id + 1429, # ItemPickup88_16 Secret11_Details (X=-84363.055 Y=-87497.938 Z=7582.647)
+    "West Beach Scraps 7" : base_id + 1430, # ItemPickup351_8 Secret11_Details1 (X=-86556.266 Y=-89748.484 Z=7297.274)
+    "West Beach Scraps 8" : base_id + 1431 # ItemPickup352_11 Secret11_Details1 (X=-83210.836 Y=-92551.953 Z=8460.213)
 }
 
 loc_church = {
-    "church_paint_can_black" : base_id + 1432, # PaintCan_4 Secret5_ChurchDetails (X=-67628.172 Y=-83801.375 Z=9865.983)
-    "church_scraps_1" : base_id + 1433, # ItemPickup391_11 Secret5_ChurchDetails (X=-64009.039 Y=-84252.156 Z=10258.335)
-    "church_scraps_2" : base_id + 1434, # ItemPickup389_5 Secret5_ChurchDetails (X=-66870.719 Y=-85202.180 Z=9843.936)
-    "church_scraps_3" : base_id + 1435, # ItemPickup388_2 Secret5_ChurchDetails (X=-68588.352 Y=-84041.867 Z=9790.541)
-    "church_scraps_4" : base_id + 1436, # ItemPickup396_26 Secret5_ChurchDetails (X=-67595.797 Y=-82120.094 Z=9818.303)
-    "church_scraps_5" : base_id + 1437, # ItemPickup390_8 Secret5_ChurchDetails (X=-67291.000 Y=-83324.836 Z=9774.942)
-    "church_scraps_6" : base_id + 1438, # ItemPickup392_14 Secret5_ChurchDetails (X=-65849.070 Y=-80676.477 Z=9895.943)
-    "church_scraps_7" : base_id + 1439, # ItemPickup395_23 Secret5_ChurchDetails (X=-65170.266 Y=-79155.227 Z=9904.275)
-    "church_scraps_8" : base_id + 1440, # ItemPickup24_4 Secret5_GraveyardMain (X=-64837.563 Y=-80885.305 Z=9906.755)
-    "church_scraps_9" : base_id + 1441, # ItemPickup22_3 Secret5_ChurchDetails (X=-68248.359 Y=-83578.008 Z=9807.300)
-    "church_scraps_10" : base_id + 1442, # ItemPickup23_5 Secret5_ChurchDetails (X=-67086.102 Y=-84605.086 Z=9805.521)
-    "church_scraps_11" : base_id + 1443, # ItemPickup393_17 Secret5_ChurchDetails (X=-67901.930 Y=-83477.625 Z=9812.613)
-    "church_scraps_12" : base_id + 1444 # ItemPickup394_20 Secret5_ChurchDetails (X=-65834.344 Y=-84192.102 Z=9987.823)
-}
-
-loc_refuge_gale_mission = {
-    "refuge_gale_mission_start" : base_id + 1445, # (dialog 10) -> mountain_ruin_key
-    "refuge_gale_scraps_1" : base_id + 1446, # ItemPickup15_3 Mine3_NPCHouse (X=-74407.695 Y=-81781.250 Z=10120.775)
-    "refuge_gale_scraps_2" : base_id + 1447, # ItemPickup283_5 Mine3_NPCHouseDetails (X=-73784.695 Y=-79414.359 Z=10128.285)
-    "refuge_gale_scraps_3" : base_id + 1448, # ItemPickup13_1 Mine3_NPCHouse (X=-73992.391 Y=-78600.094 Z=10162.495)
-    "refuge_gale_scraps_4" : base_id + 1449, # ItemPickup284_8 Mine3_NPCHouseDetails (X=-71623.000 Y=-75998.023 Z=10275.477)
-    "refuge_gale_scraps_5" : base_id + 1450 # ItemPickup282_2 Mine3_NPCHouseDetails (X=-72626.453 Y=-79391.070 Z=10211.037)
+    "Church Black Paint Can" : base_id + 1432, # PaintCan_4 Secret5_ChurchDetails (X=-67628.172 Y=-83801.375 Z=9865.983)
+    "Church Scraps 1" : base_id + 1433, # ItemPickup391_11 Secret5_ChurchDetails (X=-64009.039 Y=-84252.156 Z=10258.335)
+    "Church Scraps 2" : base_id + 1434, # ItemPickup389_5 Secret5_ChurchDetails (X=-66870.719 Y=-85202.180 Z=9843.936)
+    "Church Scraps 3" : base_id + 1435, # ItemPickup388_2 Secret5_ChurchDetails (X=-68588.352 Y=-84041.867 Z=9790.541)
+    "Church Scraps 4" : base_id + 1436, # ItemPickup396_26 Secret5_ChurchDetails (X=-67595.797 Y=-82120.094 Z=9818.303)
+    "Church Scraps 5" : base_id + 1437, # ItemPickup390_8 Secret5_ChurchDetails (X=-67291.000 Y=-83324.836 Z=9774.942)
+    "Church Scraps 6" : base_id + 1438, # ItemPickup392_14 Secret5_ChurchDetails (X=-65849.070 Y=-80676.477 Z=9895.943)
+    "Church Scraps 7" : base_id + 1439, # ItemPickup395_23 Secret5_ChurchDetails (X=-65170.266 Y=-79155.227 Z=9904.275)
+    "Church Scraps 8" : base_id + 1440, # ItemPickup24_4 Secret5_GraveyardMain (X=-64837.563 Y=-80885.305 Z=9906.755)
+    "Church Scraps 9" : base_id + 1441, # ItemPickup22_3 Secret5_ChurchDetails (X=-68248.359 Y=-83578.008 Z=9807.300)
+    "Church Scraps 10" : base_id + 1442, # ItemPickup23_5 Secret5_ChurchDetails (X=-67086.102 Y=-84605.086 Z=9805.521)
+    "Church Scraps 11" : base_id + 1443, # ItemPickup393_17 Secret5_ChurchDetails (X=-67901.930 Y=-83477.625 Z=9812.613)
+    "Church Scraps 12" : base_id + 1444 # ItemPickup394_20 Secret5_ChurchDetails (X=-65834.344 Y=-84192.102 Z=9987.823)
+}
+
+loc_west_cottage = {
+    "West Cottage Gale Mission Start" : base_id + 1445, # (dialog 10) -> mountain_ruin_key
+    "West Cottage Scraps 1" : base_id + 1446, # ItemPickup15_3 Mine3_NPCHouse (X=-74407.695 Y=-81781.250 Z=10120.775)
+    "West Cottage Scraps 2" : base_id + 1447, # ItemPickup283_5 Mine3_NPCHouseDetails (X=-73784.695 Y=-79414.359 Z=10128.285)
+    "West Cottage Scraps 3" : base_id + 1448, # ItemPickup13_1 Mine3_NPCHouse (X=-73992.391 Y=-78600.094 Z=10162.495)
+    "West Cottage Scraps 4" : base_id + 1449, # ItemPickup284_8 Mine3_NPCHouseDetails (X=-71623.000 Y=-75998.023 Z=10275.477)
+    "West Cottage Scraps 5" : base_id + 1450 # ItemPickup282_2 Mine3_NPCHouseDetails (X=-72626.453 Y=-79391.070 Z=10211.037)
 }
 
 loc_caravan = {
-    "caravan_scraps_1" : base_id + 1451, # ItemPickup348_11 Secret10_PAth (X=-52638.109 Y=-43924.395 Z=10579.809)
-    "caravan_scraps_2" : base_id + 1452, # ItemPickup347_8 Secret10_PAth (X=-50203.695 Y=-42865.672 Z=10778.871)
-    "caravan_scraps_3" : base_id + 1453, # ItemPickup346_5 Secret10_PAth (X=-48467.738 Y=-42018.488 Z=10818.758)
-    "caravan_scraps_4" : base_id + 1454, # ItemPickup77_14 Secret10_Details (X=-46325.219 Y=-41707.512 Z=11003.229)
-    "caravan_scraps_5" : base_id + 1455, # ItemPickup345_2 Secret10_PAth (X=-44557.043 Y=-40652.930 Z=11076.221)
-    "caravan_scraps_6" : base_id + 1456, # ItemPickup76_11 Secret10_Details (X=-43380.664 Y=-38207.152 Z=11165.370)
-    "caravan_scraps_7" : base_id + 1457, # ItemPickup73_2 Secret10_Details (X=-42919.410 Y=-38797.738 Z=11265.633)
-    "caravan_scraps_8" : base_id + 1458, # ItemPickup74_5 Secret10_Details (X=-42787.523 Y=-38601.820 Z=11254.003)
-    "caravan_scraps_9" : base_id + 1459, # ItemPickup75_8 Secret10_Details (X=-42711.363 Y=-39141.523 Z=11173.905)
-    "caravan_chest_scraps_1" : base_id + 1460, # ItemPickup71561 Secret10_Details (X=-42910.668 Y=-38297.309 Z=11233.402)
-    "caravan_chest_scraps_2" : base_id + 1461, # ItemPickup078654 Secret10_Details (X=-42904.344 Y=-38307.332 Z=11219.678)
-    "caravan_chest_scraps_3" : base_id + 1462, # ItemPickup02345 Secret10_Details (X=-42904.965 Y=-38280.383 Z=11208.191)
-    "caravan_chest_scraps_4" : base_id + 1463, # ItemPickup-6546483648 Secret10_Details (X=-42911.680 Y=-38315.254 Z=11204.225)
-    "caravan_chest_scraps_5" : base_id + 1464 #  ItemPickup176752623547 Secret10_Details (X=-42905.090 Y=-38279.828 Z=11192.738)
-}
-
-loc_trailer_house = {
-    "trailer_house_scraps_1" : base_id + 1465, # ItemPickup493_17 TrailerCabin_Details (X=-50702.449 Y=-38850.020 Z=10810.316)
-    "trailer_house_scraps_2" : base_id + 1466, # ItemPickup489_5 TrailerCabin_Details (X=-51365.684 Y=-38502.379 Z=10875.761)
-    "trailer_house_scraps_3" : base_id + 1467, # ItemPickup491_11 TrailerCabin_Details (X=-52397.570 Y=-37530.145 Z=10873.624)
-    "trailer_house_scraps_4" : base_id + 1468, # ItemPickup490_8 TrailerCabin_Details (X=-50625.746 Y=-37916.758 Z=10886.909)
-    "trailer_house_scraps_5" : base_id + 1469, # ItemPickup488_2 TrailerCabin_Details (X=-51201.051 Y=-37467.137 Z=10910.795)
-    "trailer_house_scraps_6" : base_id + 1470 # ItemPickup492_14 TrailerCabin_Details (X=-51891.320 Y=-40549.492 Z=10675.211)
-}
-
-loc_ronny_mission = {
-    "towers_ronny_scraps_1" : base_id + 1471, # ItemPickup486_32 Towers_Environment_Details (X=-24434.766 Y=-25708.373 Z=11200.865)
-    "towers_ronny_scraps_2" : base_id + 1472, # ItemPickup483_23 Towers_Environment_Details (X=-20970.262 Y=-25678.754 Z=11731.241)
-    "towers_ronny_scraps_3" : base_id + 1473, # ItemPickup481_17 Towers_Environment_Details (X=-19812.230 Y=-27768.301 Z=12051.623)
-    "towers_ronny_scraps_4" : base_id + 1474, # ItemPickup484_26 Towers_Environment_Details (X=-19940.912 Y=-25411.576 Z=12035.366)
-    "towers_ronny_scraps_5" : base_id + 1475, # ItemPickup41_17 Towers_Environment (X=-18596.791 Y=-25100.035 Z=12290.350)
-    "towers_ronny_scraps_6" : base_id + 1476, # ItemPickup482_20 Towers_Environment_Details (X=-23302.396 Y=-23270.324 Z=12036.164)
-    "towers_ronny_scraps_7" : base_id + 1477, # ItemPickup487_35 Towers_Environment_Details (X=-22955.039 Y=-27576.859 Z=11211.258)
-    "towers_ronny_scraps_8" : base_id + 1478, # ItemPickup478_8 Towers_Environment_Details (X=-21485.520 Y=-29634.893 Z=11787.103)
-    "towers_ronny_scraps_9" : base_id + 1479, # ItemPickup477_5 Towers_Environment_Details (X=-23667.957 Y=-29825.240 Z=12035.269)
-    "towers_ronny_scraps_10" : base_id + 1480, # ItemPickup39_11 Towers_Environment (X=-25361.008 Y=-29794.301 Z=12026.073)
-    "towers_ronny_scraps_11" : base_id + 1481, # ItemPickup476_2 Towers_Environment_Details (X=-26549.584 Y=-32768.133 Z=12289.732)
-    "towers_ronny_scraps_12" : base_id + 1482, # ItemPickup38_8 Towers_Environment (X=-27240.127 Y=-27404.748 Z=12027.208)
-    "towers_ronny_scraps_13" : base_id + 1483, # ItemPickup40_14 Towers_Environment (X=-23231.639 Y=-27799.158 Z=11829.792)
-    "towers_ronny_scraps_14" : base_id + 1484, # ItemPickup485_29 Towers_Environment_Details (X=-22949.568 Y=-26146.012 Z=11702.730)
-    "towers_ronny_scraps_15" : base_id + 1485, # ItemPickup479_11 Towers_Environment_Details (X=-19726.715 Y=-32464.682 Z=12118.678)
-    "towers_ronny_scraps_16" : base_id + 1486, # ItemPickup1366543 Tower_BuildingsExteriorDetails (X=-23495.104 Y=-27644.689 Z=11872.844)
-    "towers_ronny_scraps_17" : base_id + 1487, # ItemPickup139978 Tower_BuildingsExteriorDetails (X=-23512.971 Y=-27493.051 Z=12218.543)
-    "towers_ronny_scraps_18" : base_id + 1488, # ItemPickup42_20 Towers_Environment (X=-22731.439 Y=-26331.393 Z=12102.758)
-    "towers_ronny_scraps_19" : base_id + 1489, # ItemPickup131123 Tower_BuildingsExteriorDetails (X=-22599.641 Y=-26454.590 Z=11752.040)
-    "towers_ronny_scraps_20" : base_id + 1490, # ItemPickup196987 Tower_BuildingsExteriorDetails (X=-22589.721 Y=-26397.414 Z=12571.282)
-    "towers_ronny_scraps_21" : base_id + 1491, # ItemPickup138787 Tower_BuildingsExteriorDetails (X=-22163.268 Y=-26775.938 Z=13107.048)
-    "towers_ronny_scraps_22" : base_id + 1492, # ItemPickup43_23 Towers_Environment (X=-21996.184 Y=-26754.393 Z=13105.997)
-    "towers_ronny_scraps_23" : base_id + 1493, # ItemPickup837454 Tower_BuildingsExteriorDetails (X=-24068.221 Y=-27874.443 Z=12819.666)
-    "towers_ronny_scraps_24" : base_id + 1494, # ItemPickup44_29 Towers_Environment (X=-23525.330 Y=-27770.035 Z=12612.871)
-    "towers_ronny_scraps_25" : base_id + 1495, # ItemPickup18932 Tower_BuildingsExteriorDetails (X=-23472.215 Y=-27617.404 Z=13213.256)
-    "towers_ronny_scraps_26" : base_id + 1496, # ItemPickup188348 Tower_BuildingsExteriorDetails (X=-23981.588 Y=-27984.385 Z=13219.854)
-    "towers_ronny_scraps_27" : base_id + 1497, # ItemPickup480_14 Towers_Environment_Details (X=-18696.230 Y=-34511.277 Z=12704.238)
-    "towers_ronny_paint_can_lime" : base_id + 1498, # PaintCan_2 Towers_BuildingsDetails (X=-22288.555 Y=-26022.281 Z=11835.892) \!/ Existing match 5
-    "towers_ronny_employment_contracts" : base_id + 1499, # Towers_Files_Pickup Tower_BuildingsExteriorDetails (X=-24081.414 Y=-27637.459 Z=13679.163)
-    "towers_ronny_mission_end" : base_id + 1500 # (dialog 3) -> 1_scraps_reward
+    "Caravan Scraps 1" : base_id + 1451, # ItemPickup348_11 Secret10_PAth (X=-52638.109 Y=-43924.395 Z=10579.809)
+    "Caravan Scraps 2" : base_id + 1452, # ItemPickup347_8 Secret10_PAth (X=-50203.695 Y=-42865.672 Z=10778.871)
+    "Caravan Scraps 3" : base_id + 1453, # ItemPickup346_5 Secret10_PAth (X=-48467.738 Y=-42018.488 Z=10818.758)
+    "Caravan Scraps 4" : base_id + 1454, # ItemPickup77_14 Secret10_Details (X=-46325.219 Y=-41707.512 Z=11003.229)
+    "Caravan Scraps 5" : base_id + 1455, # ItemPickup345_2 Secret10_PAth (X=-44557.043 Y=-40652.930 Z=11076.221)
+    "Caravan Scraps 6" : base_id + 1456, # ItemPickup76_11 Secret10_Details (X=-43380.664 Y=-38207.152 Z=11165.370)
+    "Caravan Scraps 7" : base_id + 1457, # ItemPickup73_2 Secret10_Details (X=-42919.410 Y=-38797.738 Z=11265.633)
+    "Caravan Scraps 8" : base_id + 1458, # ItemPickup74_5 Secret10_Details (X=-42787.523 Y=-38601.820 Z=11254.003)
+    "Caravan Scraps 9" : base_id + 1459, # ItemPickup75_8 Secret10_Details (X=-42711.363 Y=-39141.523 Z=11173.905)
+    "Caravan Chest Scraps 1" : base_id + 1460, # ItemPickup71561 Secret10_Details (X=-42910.668 Y=-38297.309 Z=11233.402)
+    "Caravan Chest Scraps 2" : base_id + 1461, # ItemPickup078654 Secret10_Details (X=-42904.344 Y=-38307.332 Z=11219.678)
+    "Caravan Chest Scraps 3" : base_id + 1462, # ItemPickup02345 Secret10_Details (X=-42904.965 Y=-38280.383 Z=11208.191)
+    "Caravan Chest Scraps 4" : base_id + 1463, # ItemPickup-6546483648 Secret10_Details (X=-42911.680 Y=-38315.254 Z=11204.225)
+    "Caravan Chest Scraps 5" : base_id + 1464 #  ItemPickup176752623547 Secret10_Details (X=-42905.090 Y=-38279.828 Z=11192.738)
+}
+
+loc_trailer_cabin = {
+    "Trailer Cabin Scraps 1" : base_id + 1465, # ItemPickup493_17 TrailerCabin_Details (X=-50702.449 Y=-38850.020 Z=10810.316)
+    "Trailer Cabin Scraps 2" : base_id + 1466, # ItemPickup489_5 TrailerCabin_Details (X=-51365.684 Y=-38502.379 Z=10875.761)
+    "Trailer Cabin Scraps 3" : base_id + 1467, # ItemPickup491_11 TrailerCabin_Details (X=-52397.570 Y=-37530.145 Z=10873.624)
+    "Trailer Cabin Scraps 4" : base_id + 1468, # ItemPickup490_8 TrailerCabin_Details (X=-50625.746 Y=-37916.758 Z=10886.909)
+    "Trailer Cabin Scraps 5" : base_id + 1469, # ItemPickup488_2 TrailerCabin_Details (X=-51201.051 Y=-37467.137 Z=10910.795)
+    "Trailer Cabin Scraps 6" : base_id + 1470 # ItemPickup492_14 TrailerCabin_Details (X=-51891.320 Y=-40549.492 Z=10675.211)
+}
+
+loc_towers = {
+    "Towers Scraps 1" : base_id + 1471, # ItemPickup486_32 Towers_Environment_Details (X=-24434.766 Y=-25708.373 Z=11200.865)
+    "Towers Scraps 2" : base_id + 1472, # ItemPickup483_23 Towers_Environment_Details (X=-20970.262 Y=-25678.754 Z=11731.241)
+    "Towers Scraps 3" : base_id + 1473, # ItemPickup481_17 Towers_Environment_Details (X=-19812.230 Y=-27768.301 Z=12051.623)
+    "Towers Scraps 4" : base_id + 1474, # ItemPickup484_26 Towers_Environment_Details (X=-19940.912 Y=-25411.576 Z=12035.366)
+    "Towers Scraps 5" : base_id + 1475, # ItemPickup41_17 Towers_Environment (X=-18596.791 Y=-25100.035 Z=12290.350)
+    "Towers Scraps 6" : base_id + 1476, # ItemPickup482_20 Towers_Environment_Details (X=-23302.396 Y=-23270.324 Z=12036.164)
+    "Towers Scraps 7" : base_id + 1477, # ItemPickup487_35 Towers_Environment_Details (X=-22955.039 Y=-27576.859 Z=11211.258)
+    "Towers Scraps 8" : base_id + 1478, # ItemPickup478_8 Towers_Environment_Details (X=-21485.520 Y=-29634.893 Z=11787.103)
+    "Towers Scraps 9" : base_id + 1479, # ItemPickup477_5 Towers_Environment_Details (X=-23667.957 Y=-29825.240 Z=12035.269)
+    "Towers Scraps 10" : base_id + 1480, # ItemPickup39_11 Towers_Environment (X=-25361.008 Y=-29794.301 Z=12026.073)
+    "Towers Scraps 11" : base_id + 1481, # ItemPickup476_2 Towers_Environment_Details (X=-26549.584 Y=-32768.133 Z=12289.732)
+    "Towers Scraps 12" : base_id + 1482, # ItemPickup38_8 Towers_Environment (X=-27240.127 Y=-27404.748 Z=12027.208)
+    "Towers Scraps 13" : base_id + 1483, # ItemPickup40_14 Towers_Environment (X=-23231.639 Y=-27799.158 Z=11829.792)
+    "Towers Scraps 14" : base_id + 1484, # ItemPickup485_29 Towers_Environment_Details (X=-22949.568 Y=-26146.012 Z=11702.730)
+    "Towers Scraps 15" : base_id + 1485, # ItemPickup479_11 Towers_Environment_Details (X=-19726.715 Y=-32464.682 Z=12118.678)
+    "Towers Scraps 16" : base_id + 1486, # ItemPickup1366543 Tower_BuildingsExteriorDetails (X=-23495.104 Y=-27644.689 Z=11872.844)
+    "Towers Scraps 17" : base_id + 1487, # ItemPickup139978 Tower_BuildingsExteriorDetails (X=-23512.971 Y=-27493.051 Z=12218.543)
+    "Towers Scraps 18" : base_id + 1488, # ItemPickup42_20 Towers_Environment (X=-22731.439 Y=-26331.393 Z=12102.758)
+    "Towers Scraps 19" : base_id + 1489, # ItemPickup131123 Tower_BuildingsExteriorDetails (X=-22599.641 Y=-26454.590 Z=11752.040)
+    "Towers Scraps 20" : base_id + 1490, # ItemPickup196987 Tower_BuildingsExteriorDetails (X=-22589.721 Y=-26397.414 Z=12571.282)
+    "Towers Scraps 21" : base_id + 1491, # ItemPickup138787 Tower_BuildingsExteriorDetails (X=-22163.268 Y=-26775.938 Z=13107.048)
+    "Towers Scraps 22" : base_id + 1492, # ItemPickup43_23 Towers_Environment (X=-21996.184 Y=-26754.393 Z=13105.997)
+    "Towers Scraps 23" : base_id + 1493, # ItemPickup837454 Tower_BuildingsExteriorDetails (X=-24068.221 Y=-27874.443 Z=12819.666)
+    "Towers Scraps 24" : base_id + 1494, # ItemPickup44_29 Towers_Environment (X=-23525.330 Y=-27770.035 Z=12612.871)
+    "Towers Scraps 25" : base_id + 1495, # ItemPickup18932 Tower_BuildingsExteriorDetails (X=-23472.215 Y=-27617.404 Z=13213.256)
+    "Towers Scraps 26" : base_id + 1496, # ItemPickup188348 Tower_BuildingsExteriorDetails (X=-23981.588 Y=-27984.385 Z=13219.854)
+    "Towers Scraps 27" : base_id + 1497, # ItemPickup480_14 Towers_Environment_Details (X=-18696.230 Y=-34511.277 Z=12704.238)
+    "Towers Lime Paint Can" : base_id + 1498, # PaintCan_2 Towers_BuildingsDetails (X=-22288.555 Y=-26022.281 Z=11835.892) \!/ Existing match 5
+    "Towers Employment Contracts" : base_id + 1499, # Towers_Files_Pickup Tower_BuildingsExteriorDetails (X=-24081.414 Y=-27637.459 Z=13679.163)
+    "Towers Ronny Mission End" : base_id + 1500 # (dialog 3) -> 1_scraps_reward
 }
 
 loc_north_beach = {
-    "north_beach_chest_scraps_1" : base_id + 1501, # ItemPickup9254 Secret3_CampDetails (X=-74444.648 Y=-130627.672 Z=8793.757)
-    "north_beach_chest_scraps_2" : base_id + 1502, # ItemPickup14523 Secret3_CampDetails (X=-74426.539 Y=-130626.547 Z=8781.948)
-    "north_beach_chest_scraps_3" : base_id + 1503, # ItemPickup084537 Secret3_CampDetails (X=-74448.852 Y=-130632.367 Z=8772.555)
-    "north_beach_chest_scraps_4" : base_id + 1504, # ItemPickup17754234 Secret3_CampDetails (X=-74425.523 Y=-130622.875 Z=8755.526)
-    "north_beach_scraps_1" : base_id + 1505, # ItemPickup376_5 Secret3_CampDetails (X=-75003.078 Y=-131084.016 Z=8729.731)
-    "north_beach_scraps_2" : base_id + 1506, # ItemPickup378_11 Secret3_CampDetails (X=-75477.758 Y=-129413.750 Z=9082.617)
-    "north_beach_scraps_3" : base_id + 1507, # ItemPickup377_8 Secret3_CampDetails (X=-75608.453 Y=-130483.430 Z=8909.659)
-    "north_beach_scraps_4" : base_id + 1508, # ItemPickup375_2 Secret3_CampDetails (X=-74143.469 Y=-131117.953 Z=8752.130)
-    "north_beach_scraps_5" : base_id + 1509, # ItemPickup387_6 Secret4_BeachHouseMain (X=-80847.078 Y=-135628.719 Z=7915.444)
-    "north_beach_scraps_6" : base_id + 1510, # ItemPickup386_3 Secret4_BeachHouseMain (X=-84044.789 Y=-137591.000 Z=7359.172)
-    "north_beach_scraps_7" : base_id + 1511, # ItemPickup379_2 Secret4_BeachHouseDetails (X=-83992.836 Y=-132933.531 Z=7941.225)
-    "north_beach_scraps_8" : base_id + 1512, # ItemPickup380_5 Secret4_BeachHouseDetails (X=-87355.734 Y=-134216.438 Z=7237.310)
-    "north_beach_scraps_9" : base_id + 1513, # ItemPickup384_17 Secret4_BeachHouseDetails (X=-89213.844 Y=-134625.922 Z=7185.133)
-    "north_beach_scraps_10" : base_id + 1514, # ItemPickup25_0 Secret4_BeachHouseDetails (X=-88423.430 Y=-135922.969 Z=7290.801)
-    "north_beach_scraps_11" : base_id + 1515, # ItemPickup381_8 Secret4_BeachHouseDetails (X=-87668.977 Y=-136850.359 Z=7275.346)
-    "north_beach_scraps_12" : base_id + 1516, # ItemPickup383_14 Secret4_BeachHouseDetails (X=-90241.328 Y=-136381.000 Z=7199.622)
-    "north_beach_scraps_13" : base_id + 1517, # ItemPickup27_8 Secret4_BeachHouseDetails (X=-91728.680 Y=-135288.203 Z=7319.699)
-    "north_beach_scraps_14" : base_id + 1518, # ItemPickup26_2 Secret4_BeachHouseDetails (X=-88789.039 Y=-135461.719 Z=7305.800)
-    "north_beach_scraps_15" : base_id + 1519, # ItemPickup382_11 Secret4_BeachHouseDetails (X=-88572.078 Y=-135970.734 Z=7302.674)
-    "north_beach_paint_can_teal" : base_id + 1520 # PaintCan_2 Secret4_BeachHouseDetails (X=-91706.805 Y=-134988.453 Z=7347.827) \!/ Existing match 5
-    # "north_beach_scraps_glitch_1" ItemPickup385_20 (X=-77651.938 Y=-139721.453 Z=7261.729) /!\ Glitched scrap
+    "North Beach Chest Scraps 1" : base_id + 1501, # ItemPickup9254 Secret3_CampDetails (X=-74444.648 Y=-130627.672 Z=8793.757)
+    "North Beach Chest Scraps 2" : base_id + 1502, # ItemPickup14523 Secret3_CampDetails (X=-74426.539 Y=-130626.547 Z=8781.948)
+    "North Beach Chest Scraps 3" : base_id + 1503, # ItemPickup084537 Secret3_CampDetails (X=-74448.852 Y=-130632.367 Z=8772.555)
+    "North Beach Chest Scraps 4" : base_id + 1504, # ItemPickup17754234 Secret3_CampDetails (X=-74425.523 Y=-130622.875 Z=8755.526)
+    "North Beach Scraps 1" : base_id + 1505, # ItemPickup376_5 Secret3_CampDetails (X=-75003.078 Y=-131084.016 Z=8729.731)
+    "North Beach Scraps 2" : base_id + 1506, # ItemPickup378_11 Secret3_CampDetails (X=-75477.758 Y=-129413.750 Z=9082.617)
+    "North Beach Scraps 3" : base_id + 1507, # ItemPickup377_8 Secret3_CampDetails (X=-75608.453 Y=-130483.430 Z=8909.659)
+    "North Beach Scraps 4" : base_id + 1508, # ItemPickup375_2 Secret3_CampDetails (X=-74143.469 Y=-131117.953 Z=8752.130)
+    "North Beach Scraps 5" : base_id + 1509, # ItemPickup387_6 Secret4_BeachHouseMain (X=-80847.078 Y=-135628.719 Z=7915.444)
+    "North Beach Scraps 6" : base_id + 1510, # ItemPickup386_3 Secret4_BeachHouseMain (X=-84044.789 Y=-137591.000 Z=7359.172)
+    "North Beach Scraps 7" : base_id + 1511, # ItemPickup379_2 Secret4_BeachHouseDetails (X=-83992.836 Y=-132933.531 Z=7941.225)
+    "North Beach Scraps 8" : base_id + 1512, # ItemPickup380_5 Secret4_BeachHouseDetails (X=-87355.734 Y=-134216.438 Z=7237.310)
+    "North Beach Scraps 9" : base_id + 1513, # ItemPickup384_17 Secret4_BeachHouseDetails (X=-89213.844 Y=-134625.922 Z=7185.133)
+    "North Beach Scraps 10" : base_id + 1514, # ItemPickup25_0 Secret4_BeachHouseDetails (X=-88423.430 Y=-135922.969 Z=7290.801)
+    "North Beach Scraps 11" : base_id + 1515, # ItemPickup381_8 Secret4_BeachHouseDetails (X=-87668.977 Y=-136850.359 Z=7275.346)
+    "North Beach Scraps 12" : base_id + 1516, # ItemPickup383_14 Secret4_BeachHouseDetails (X=-90241.328 Y=-136381.000 Z=7199.622)
+    "North Beach Scraps 13" : base_id + 1517, # ItemPickup27_8 Secret4_BeachHouseDetails (X=-91728.680 Y=-135288.203 Z=7319.699)
+    "North Beach Scraps 14" : base_id + 1518, # ItemPickup26_2 Secret4_BeachHouseDetails (X=-88789.039 Y=-135461.719 Z=7305.800)
+    "North Beach Scraps 15" : base_id + 1519, # ItemPickup382_11 Secret4_BeachHouseDetails (X=-88572.078 Y=-135970.734 Z=7302.674)
+    "North Beach Teal Paint Can" : base_id + 1520 # PaintCan_2 Secret4_BeachHouseDetails (X=-91706.805 Y=-134988.453 Z=7347.827) \!/ Existing match 5
+    # "North Beach Scraps Glitch 1" ItemPickup385_20 (X=-77651.938 Y=-139721.453 Z=7261.729) /!\ Glitched scrap
 }
 
 loc_mine_shaft = {
-    "mine_shaft_chest_scraps_1" : base_id + 1521, # ItemPickup0934569 Secret13_Details (X=-17360.789 Y=-74064.367 Z=8038.313)
-    "mine_shaft_chest_scraps_2" : base_id + 1522, # ItemPickup17234455622 Secret13_Details (X=-17360.814 Y=-74064.367 Z=8024.187)
-    "mine_shaft_chest_scraps_3" : base_id + 1523, # ItemPickup856743 Secret13_Details (X=-17361.059 Y=-74049.234 Z=8015.940)
-    "mine_shaft_chest_scraps_4" : base_id + 1524, # ItemPickup16456456 Secret13_Details (X=-17336.465 Y=-74087.063 Z=8009.707)
-    "mine_shaft_chest_scraps_5" : base_id + 1525, # ItemPickup234743 Secret13_Details (X=-17349.941 Y=-74075.484 Z=8004.179)
-    "mine_shaft_chest_scraps_6" : base_id + 1526, # ItemPickup1434563456 Secret13_Details (X=-17361.084 Y=-74049.234 Z=8001.814)
-    "mine_shaft_chest_scraps_7" : base_id + 1527, # ItemPickup13634563456 Secret13_Details (X=-17349.967 Y=-74075.484 Z=7990.054)
-    "mine_shaft_scraps_1" : base_id + 1528, # ItemPickup369_23 Secret13_Details (X=-16985.645 Y=-70377.273 Z=10837.127)
-    "mine_shaft_scraps_2" : base_id + 1529, # ItemPickup368_20 Secret13_Details (X=-18292.045 Y=-71003.563 Z=10975.308)
-    "mine_shaft_scraps_3" : base_id + 1530, # ItemPickup367_17 Secret13_Details (X=-16150.797 Y=-72075.289 Z=10609.141)
-    "mine_shaft_scraps_4" : base_id + 1531, # ItemPickup24456463 Secret13_EntranceDetails1 (X=-18404.480 Y=-71894.367 Z=10968.230)
-    "mine_shaft_scraps_5" : base_id + 1532, # ItemPickup2565644 Secret13_Details (X=-17777.268 Y=-71467.172 Z=10441.745)
-    "mine_shaft_scraps_6" : base_id + 1533, # ItemPickup366_14 Secret13_Details (X=-17630.971 Y=-72800.641 Z=8842.322)
-    "mine_shaft_scraps_7" : base_id + 1534, # ItemPickup18_8 Secret13_Details (X=-17979.719 Y=-73413.563 Z=8118.260)
-    "mine_shaft_scraps_8" : base_id + 1535, # ItemPickup21_11 Secret13_Details (X=-16554.467 Y=-74139.781 Z=7892.738)
-    "mine_shaft_scraps_9" : base_id + 1536, # ItemPickup365_11 Secret13_Details (X=-16343.033 Y=-74617.555 Z=7298.177)
-    "mine_shaft_scraps_10" : base_id + 1537, # ItemPickup22123 Secret13_Details (X=-12390.332 Y=-77620.320 Z=7324.504)
-    "mine_shaft_scraps_11" : base_id + 1538, # ItemPickup364_8 Secret13_Details (X=-10969.702 Y=-77961.477 Z=7297.171)
-    "mine_shaft_scraps_12" : base_id + 1539, # ItemPickup363_5 Secret13_Details (X=-9888.596 Y=-78208.930 Z=7269.473)
-    "mine_shaft_scraps_13" : base_id + 1540, # ItemPickup362_2 Secret13_Details (X=-8865.696 Y=-79063.977 Z=7247.677)
-    "mine_shaft_scraps_14" : base_id + 1541 # ItemPickup238976 Secret13_ExitDetails (X=-8143.984 Y=-79764.617 Z=7222.096)
+    "Mine Shaft Chest Scraps 1" : base_id + 1521, # ItemPickup0934569 Secret13_Details (X=-17360.789 Y=-74064.367 Z=8038.313)
+    "Mine Shaft Chest Scraps 2" : base_id + 1522, # ItemPickup17234455622 Secret13_Details (X=-17360.814 Y=-74064.367 Z=8024.187)
+    "Mine Shaft Chest Scraps 3" : base_id + 1523, # ItemPickup856743 Secret13_Details (X=-17361.059 Y=-74049.234 Z=8015.940)
+    "Mine Shaft Chest Scraps 4" : base_id + 1524, # ItemPickup16456456 Secret13_Details (X=-17336.465 Y=-74087.063 Z=8009.707)
+    "Mine Shaft Chest Scraps 5" : base_id + 1525, # ItemPickup234743 Secret13_Details (X=-17349.941 Y=-74075.484 Z=8004.179)
+    "Mine Shaft Chest Scraps 6" : base_id + 1526, # ItemPickup1434563456 Secret13_Details (X=-17361.084 Y=-74049.234 Z=8001.814)
+    "Mine Shaft Chest Scraps 7" : base_id + 1527, # ItemPickup13634563456 Secret13_Details (X=-17349.967 Y=-74075.484 Z=7990.054)
+    "Mine Shaft Scraps 1" : base_id + 1528, # ItemPickup369_23 Secret13_Details (X=-16985.645 Y=-70377.273 Z=10837.127)
+    "Mine Shaft Scraps 2" : base_id + 1529, # ItemPickup368_20 Secret13_Details (X=-18292.045 Y=-71003.563 Z=10975.308)
+    "Mine Shaft Scraps 3" : base_id + 1530, # ItemPickup367_17 Secret13_Details (X=-16150.797 Y=-72075.289 Z=10609.141)
+    "Mine Shaft Scraps 4" : base_id + 1531, # ItemPickup24456463 Secret13_EntranceDetails1 (X=-18404.480 Y=-71894.367 Z=10968.230)
+    "Mine Shaft Scraps 5" : base_id + 1532, # ItemPickup2565644 Secret13_Details (X=-17777.268 Y=-71467.172 Z=10441.745)
+    "Mine Shaft Scraps 6" : base_id + 1533, # ItemPickup366_14 Secret13_Details (X=-17630.971 Y=-72800.641 Z=8842.322)
+    "Mine Shaft Scraps 7" : base_id + 1534, # ItemPickup18_8 Secret13_Details (X=-17979.719 Y=-73413.563 Z=8118.260)
+    "Mine Shaft Scraps 8" : base_id + 1535, # ItemPickup21_11 Secret13_Details (X=-16554.467 Y=-74139.781 Z=7892.738)
+    "Mine Shaft Scraps 9" : base_id + 1536, # ItemPickup365_11 Secret13_Details (X=-16343.033 Y=-74617.555 Z=7298.177)
+    "Mine Shaft Scraps 10" : base_id + 1537, # ItemPickup22123 Secret13_Details (X=-12390.332 Y=-77620.320 Z=7324.504)
+    "Mine Shaft Scraps 11" : base_id + 1538, # ItemPickup364_8 Secret13_Details (X=-10969.702 Y=-77961.477 Z=7297.171)
+    "Mine Shaft Scraps 12" : base_id + 1539, # ItemPickup363_5 Secret13_Details (X=-9888.596 Y=-78208.930 Z=7269.473)
+    "Mine Shaft Scraps 13" : base_id + 1540, # ItemPickup362_2 Secret13_Details (X=-8865.696 Y=-79063.977 Z=7247.677)
+    "Mine Shaft Scraps 14" : base_id + 1541 # ItemPickup238976 Secret13_ExitDetails (X=-8143.984 Y=-79764.617 Z=7222.096)
 }
 
 loc_mob_camp = {
-    "mob_camp_key" : base_id + 1542, # ItemPickup29_0 Bob_CampDetails2 (X=-29114.480 Y=-53608.520 Z=12839.528)
-    "mob_camp_scraps_1" : base_id + 1543, # ItemPickup25_5 Bob_CampDetails2 (X=-27373.525 Y=-53008.668 Z=12706.465)
-    "mob_camp_scraps_2" : base_id + 1544, # ItemPickup26_1 Bob_CampDetails2 (X=-28786.941 Y=-53009.762 Z=12760.727)
-    "mob_camp_scraps_3" : base_id + 1545, # ItemPickup13_14 Mine3_Mountain (X=-29650.207 Y=-53328.070 Z=12724.598)
-    "mob_camp_scraps_4" : base_id + 1546, # ItemPickup90_5 Bob_CampDetails2 (X=-31515.057 Y=-55533.324 Z=12344.274)
-    "mob_camp_scraps_5" : base_id + 1547, # ItemPickup49513294 Mine3_Mountain (X=-31847.229 Y=-55152.352 Z=11574.255)
-    "mob_camp_scraps_6" : base_id + 1548, # ItemPickup92_14 Bob_CampDetails2 (X=-31323.533 Y=-55432.871 Z=11245.139)
-    "mob_camp_scraps_7" : base_id + 1549, # ItemPickup91_8 Bob_CampDetails2 (X=-31583.443 Y=-55475.805 Z=11234.112)
-    "mob_camp_scraps_8" : base_id + 1550, # ItemPickup95_23 Bob_CampDetails2 (X=-32925.406 Y=-57157.605 Z=11086.322)
-    "mob_camp_scraps_9" : base_id + 1551, # ItemPickup96_26 Bob_CampDetails2 (X=-33052.488 Y=-58560.098 Z=11101.021)
-    "mob_camp_scraps_10" : base_id + 1552, # ItemPickup13121212 Mine3_Mountain (X=-32422.406 Y=-60145.063 Z=11203.182)
-    "mob_camp_scraps_11" : base_id + 1553, # ItemPickup93_17 Bob_CampDetails2 (X=-30891.457 Y=-60046.465 Z=11237.567)
-    "mob_camp_scraps_12" : base_id + 1554, # ItemPickup97_29 Bob_CampDetails2 (X=-31888.428 Y=-59222.645 Z=11179.302)
-    "mob_camp_scraps_13" : base_id + 1555, # ItemPickup62156 Mine3_Mountain (X=-31161.750 Y=-57410.789 Z=11279.820)
-    "mob_camp_scraps_14" : base_id + 1556, # ItemPickup24_3 Bob_CampDetails2 (X=-31256.545 Y=-59865.809 Z=11904.155)
-    "mob_camp_scraps_15" : base_id + 1557, # ItemPickup27_0 Bob_CampDetails2 (X=-31757.953 Y=-57179.258 Z=11295.150)
-    "mob_camp_scraps_16" : base_id + 1558, # ItemPickup89_2 Bob_CampDetails2 (X=-29137.043 Y=-54824.797 Z=12418.673)
-    "mob_camp_scraps_17" : base_id + 1559, # ItemPickup94_20 Bob_CampDetails2 (X=-31736.459 Y=-59761.465 Z=11211.379)
-    "mob_camp_scraps_18" : base_id + 1560, # ItemPickup28_14 Bob_CampDetails2 (X=-32150.889 Y=-59879.594 Z=11297.058)
-    "mob_camp_stolen_bob" : base_id + 1561 # Bob_Clickbox (X=-31771.172 Y=-59892.449 Z=11323.562)
+    "Mob Camp Key" : base_id + 1542, # ItemPickup29_0 Bob_CampDetails2 (X=-29114.480 Y=-53608.520 Z=12839.528)
+    "Mob Camp Scraps 1" : base_id + 1543, # ItemPickup25_5 Bob_CampDetails2 (X=-27373.525 Y=-53008.668 Z=12706.465)
+    "Mob Camp Scraps 2" : base_id + 1544, # ItemPickup26_1 Bob_CampDetails2 (X=-28786.941 Y=-53009.762 Z=12760.727)
+    "Mob Camp Scraps 3" : base_id + 1545, # ItemPickup13_14 Mine3_Mountain (X=-29650.207 Y=-53328.070 Z=12724.598)
+    "Mob Camp Scraps 4" : base_id + 1546, # ItemPickup90_5 Bob_CampDetails2 (X=-31515.057 Y=-55533.324 Z=12344.274)
+    "Mob Camp Scraps 5" : base_id + 1547, # ItemPickup49513294 Mine3_Mountain (X=-31847.229 Y=-55152.352 Z=11574.255)
+    "Mob Camp Scraps 6" : base_id + 1548, # ItemPickup92_14 Bob_CampDetails2 (X=-31323.533 Y=-55432.871 Z=11245.139)
+    "Mob Camp Scraps 7" : base_id + 1549, # ItemPickup91_8 Bob_CampDetails2 (X=-31583.443 Y=-55475.805 Z=11234.112)
+    "Mob Camp Scraps 8" : base_id + 1550, # ItemPickup95_23 Bob_CampDetails2 (X=-32925.406 Y=-57157.605 Z=11086.322)
+    "Mob Camp Scraps 9" : base_id + 1551, # ItemPickup96_26 Bob_CampDetails2 (X=-33052.488 Y=-58560.098 Z=11101.021)
+    "Mob Camp Scraps 10" : base_id + 1552, # ItemPickup13121212 Mine3_Mountain (X=-32422.406 Y=-60145.063 Z=11203.182)
+    "Mob Camp Scraps 11" : base_id + 1553, # ItemPickup93_17 Bob_CampDetails2 (X=-30891.457 Y=-60046.465 Z=11237.567)
+    "Mob Camp Scraps 12" : base_id + 1554, # ItemPickup97_29 Bob_CampDetails2 (X=-31888.428 Y=-59222.645 Z=11179.302)
+    "Mob Camp Scraps 13" : base_id + 1555, # ItemPickup62156 Mine3_Mountain (X=-31161.750 Y=-57410.789 Z=11279.820)
+    "Mob Camp Scraps 14" : base_id + 1556, # ItemPickup24_3 Bob_CampDetails2 (X=-31256.545 Y=-59865.809 Z=11904.155)
+    "Mob Camp Scraps 15" : base_id + 1557, # ItemPickup27_0 Bob_CampDetails2 (X=-31757.953 Y=-57179.258 Z=11295.150)
+    "Mob Camp Scraps 16" : base_id + 1558 # ItemPickup89_2 Bob_CampDetails2 (X=-29137.043 Y=-54824.797 Z=12418.673)
+}
+
+loc_mob_camp_locked_room = {
+    "Mob Camp Locked Room Scraps 1" : base_id + 1559, # ItemPickup94_20 Bob_CampDetails2 (X=-31736.459 Y=-59761.465 Z=11211.379)
+    "Mob Camp Locked Room Scraps 2" : base_id + 1560, # ItemPickup28_14 Bob_CampDetails2 (X=-32150.889 Y=-59879.594 Z=11297.058)
+    "Mob Camp Locked Room Stolen Bob" : base_id + 1561 # Bob_Clickbox (X=-31771.172 Y=-59892.449 Z=11323.562)
 }
 
 loc_mine_elevator_exit = {
-    "mine_elevator_exit_scraps_1" : base_id + 1562, # ItemPickup266_19 Mine3_ExitCampDetails (X=-29587.271 Y=-42650.797 Z=12515.042)
-    "mine_elevator_exit_scraps_2" : base_id + 1563, # ItemPickup265_16 Mine3_ExitCampDetails (X=-30727.555 Y=-42715.438 Z=12485.763)
-    "mine_elevator_exit_scraps_3" : base_id + 1564, # ItemPickup267_22 Mine3_ExitCampDetails (X=-29814.680 Y=-43722.777 Z=12518.878)
-    "mine_elevator_exit_scraps_4" : base_id + 1565, # ItemPickup261_2 Mine3_ExitCampDetails (X=-30983.000 Y=-42943.754 Z=12474.396)
-    "mine_elevator_exit_scraps_5" : base_id + 1566, # ItemPickup262_5 Mine3_ExitCampDetails (X=-31824.576 Y=-43997.270 Z=12345.908)
-    "mine_elevator_exit_scraps_6" : base_id + 1567, # ItemPickup268_25 Mine3_ExitCampDetails (X=-32553.924 Y=-44761.855 Z=12341.698)
-    "mine_elevator_exit_scraps_7" : base_id + 1568, # ItemPickup263_10 Mine3_ExitCampDetails (X=-33598.023 Y=-44369.297 Z=12438.430)
-    "mine_elevator_exit_scraps_8" : base_id + 1569, # ItemPickup264_13 Mine3_ExitCampDetails (X=-31947.459 Y=-42017.137 Z=12384.311)
-    "mine_elevator_exit_scraps_9" : base_id + 1570 # ItemPickup269_28 Mine3_ExitCampDetails (X=-30127.123 Y=-46004.891 Z=12229.104)
+    "Mine Elevator Exit Scraps 1" : base_id + 1562, # ItemPickup266_19 Mine3_ExitCampDetails (X=-29587.271 Y=-42650.797 Z=12515.042)
+    "Mine Elevator Exit Scraps 2" : base_id + 1563, # ItemPickup265_16 Mine3_ExitCampDetails (X=-30727.555 Y=-42715.438 Z=12485.763)
+    "Mine Elevator Exit Scraps 3" : base_id + 1564, # ItemPickup267_22 Mine3_ExitCampDetails (X=-29814.680 Y=-43722.777 Z=12518.878)
+    "Mine Elevator Exit Scraps 4" : base_id + 1565, # ItemPickup261_2 Mine3_ExitCampDetails (X=-30983.000 Y=-42943.754 Z=12474.396)
+    "Mine Elevator Exit Scraps 5" : base_id + 1566, # ItemPickup262_5 Mine3_ExitCampDetails (X=-31824.576 Y=-43997.270 Z=12345.908)
+    "Mine Elevator Exit Scraps 6" : base_id + 1567, # ItemPickup268_25 Mine3_ExitCampDetails (X=-32553.924 Y=-44761.855 Z=12341.698)
+    "Mine Elevator Exit Scraps 7" : base_id + 1568, # ItemPickup263_10 Mine3_ExitCampDetails (X=-33598.023 Y=-44369.297 Z=12438.430)
+    "Mine Elevator Exit Scraps 8" : base_id + 1569, # ItemPickup264_13 Mine3_ExitCampDetails (X=-31947.459 Y=-42017.137 Z=12384.311)
+    "Mine Elevator Exit Scraps 9" : base_id + 1570 # ItemPickup269_28 Mine3_ExitCampDetails (X=-30127.123 Y=-46004.891 Z=12229.104)
 }
 
 loc_mountain_ruin_outside = {
-    "mountain_ruin_outside_scraps_1" : base_id + 1571, # ItemPickup112345556 Mine3_Outside (X=-2218.456 Y=-43914.789 Z=11238.952)
-    "mountain_ruin_outside_scraps_2" : base_id + 1572, # ItemPickup35621 Mine3_Outside (X=-2402.206 Y=-45494.766 Z=11244.650)
-    "mountain_ruin_outside_scraps_3" : base_id + 1573, # ItemPickup13000 Mine3_Outside (X=-2781.385 Y=-47365.313 Z=11235.389)
-    "mountain_ruin_outside_scraps_4" : base_id + 1574, # ItemPickup995959 Mine3_Outside (X=-2961.431 Y=-45445.973 Z=11255.289)
-    "mountain_ruin_outside_scraps_5" : base_id + 1575, # ItemPickup136999 Mine3_Outside (X=-5873.435 Y=-46300.633 Z=11228.667)
-    "mountain_ruin_outside_scraps_6" : base_id + 1576, # ItemPickup1589994 Mine3_Outside (X=-1823.357 Y=-47071.813 Z=11161.523)
-    "mountain_ruin_outside_scraps_7" : base_id + 1577, # ItemPickup09871230948 Mine3_Outside (X=-3478.155 Y=-49094.965 Z=11083.230)
-    "mountain_ruin_outside_scraps_8" : base_id + 1578, # ItemPickup258_20 Mine3_Camp (X=-4606.678 Y=-50246.180 Z=11613.938)
-    "mountain_ruin_outside_scraps_9" : base_id + 1579, # ItemPickup257_17 Mine3_Camp (X=-5454.638 Y=-53508.004 Z=12062.944)
-    "mountain_ruin_outside_scraps_10" : base_id + 1580, # ItemPickup18_3 Mine3_Camp (X=-8192.042 Y=-53726.535 Z=11947.394)
-    "mountain_ruin_outside_scraps_11" : base_id + 1581, # ItemPickup252_2 Mine3_Camp (X=-9409.834 Y=-53970.621 Z=11923.256)
-    "mountain_ruin_outside_scraps_12" : base_id + 1582, # ItemPickup254_8 Mine3_Camp (X=-8977.424 Y=-57134.637 Z=12232.596)
-    "mountain_ruin_outside_scraps_13" : base_id + 1583, # ItemPickup19_1 Mine3_Camp (X=-10449.292 Y=-56481.938 Z=12274.706)
-    "mountain_ruin_outside_scraps_14" : base_id + 1584, # ItemPickup255_11 Mine3_Camp (X=-10490.690 Y=-56584.301 Z=12281.096)
-    "mountain_ruin_outside_scraps_15" : base_id + 1585, # ItemPickup256_14 Mine3_Camp (X=-11600.937 Y=-55831.191 Z=12388.329)
-    "mountain_ruin_outside_scraps_16" : base_id + 1586, # ItemPickup259_23 Mine3_Camp (X=-3307.077 Y=-49973.461 Z=11282.041)
-    "mountain_ruin_outside_scraps_17" : base_id + 1587 # ItemPickup260_26 Mine3_Camp (X=-8878.345 Y=-49816.922 Z=13700.768)
+    "Mountain Ruin Outside Scraps 1" : base_id + 1571, # ItemPickup112345556 Mine3_Outside (X=-2218.456 Y=-43914.789 Z=11238.952)
+    "Mountain Ruin Outside Scraps 2" : base_id + 1572, # ItemPickup35621 Mine3_Outside (X=-2402.206 Y=-45494.766 Z=11244.650)
+    "Mountain Ruin Outside Scraps 3" : base_id + 1573, # ItemPickup13000 Mine3_Outside (X=-2781.385 Y=-47365.313 Z=11235.389)
+    "Mountain Ruin Outside Scraps 4" : base_id + 1574, # ItemPickup995959 Mine3_Outside (X=-2961.431 Y=-45445.973 Z=11255.289)
+    "Mountain Ruin Outside Scraps 5" : base_id + 1575, # ItemPickup136999 Mine3_Outside (X=-5873.435 Y=-46300.633 Z=11228.667)
+    "Mountain Ruin Outside Scraps 6" : base_id + 1576, # ItemPickup1589994 Mine3_Outside (X=-1823.357 Y=-47071.813 Z=11161.523)
+    "Mountain Ruin Outside Scraps 7" : base_id + 1577, # ItemPickup09871230948 Mine3_Outside (X=-3478.155 Y=-49094.965 Z=11083.230)
+    "Mountain Ruin Outside Scraps 8" : base_id + 1578, # ItemPickup258_20 Mine3_Camp (X=-4606.678 Y=-50246.180 Z=11613.938)
+    "Mountain Ruin Outside Scraps 9" : base_id + 1579, # ItemPickup257_17 Mine3_Camp (X=-5454.638 Y=-53508.004 Z=12062.944)
+    "Mountain Ruin Outside Scraps 10" : base_id + 1580, # ItemPickup18_3 Mine3_Camp (X=-8192.042 Y=-53726.535 Z=11947.394)
+    "Mountain Ruin Outside Scraps 11" : base_id + 1581, # ItemPickup252_2 Mine3_Camp (X=-9409.834 Y=-53970.621 Z=11923.256)
+    "Mountain Ruin Outside Scraps 12" : base_id + 1582, # ItemPickup254_8 Mine3_Camp (X=-8977.424 Y=-57134.637 Z=12232.596)
+    "Mountain Ruin Outside Scraps 13" : base_id + 1583, # ItemPickup19_1 Mine3_Camp (X=-10449.292 Y=-56481.938 Z=12274.706)
+    "Mountain Ruin Outside Scraps 14" : base_id + 1584, # ItemPickup255_11 Mine3_Camp (X=-10490.690 Y=-56584.301 Z=12281.096)
+    "Mountain Ruin Outside Scraps 15" : base_id + 1585, # ItemPickup256_14 Mine3_Camp (X=-11600.937 Y=-55831.191 Z=12388.329)
+    "Mountain Ruin Outside Scraps 16" : base_id + 1586, # ItemPickup259_23 Mine3_Camp (X=-3307.077 Y=-49973.461 Z=11282.041)
+    "Mountain Ruin Outside Scraps 17" : base_id + 1587 # ItemPickup260_26 Mine3_Camp (X=-8878.345 Y=-49816.922 Z=13700.768)
 }
 
 loc_mountain_ruin_inside = {
-    "mountain_ruin_inside_scraps_1" : base_id + 1588, # ItemPickup253_5 Mine3_Camp (X=-10647.446 Y=-52039.848 Z=11925.344)
-    "mountain_ruin_inside_scraps_2" : base_id + 1589, # ItemPickup270_2 Mine3_Interior1 (X=-12834.990 Y=-48683.176 Z=10200.083)
-    "mountain_ruin_inside_scraps_3" : base_id + 1590, # ItemPickup271_5 Mine3_Interior1 (X=-15748.594 Y=-44925.523 Z=10199.975)
-    "mountain_ruin_inside_scraps_4" : base_id + 1591, # ItemPickup20_3 Mine3_Interior1 (X=-15312.152 Y=-43957.055 Z=10350.783)
-    "mountain_ruin_inside_scraps_5" : base_id + 1592, # ItemPickup273_11 Mine3_Interior1 (X=-16709.586 Y=-44997.316 Z=10198.888)
-    "mountain_ruin_inside_scraps_6" : base_id + 1593, # ItemPickup272_8 Mine3_Interior1 (X=-17412.561 Y=-46041.977 Z=10349.650)
-    "mountain_ruin_inside_scraps_7" : base_id + 1594, # ItemPickup274_14 Mine3_Interior1 (X=-17452.596 Y=-43804.941 Z=10201.436)
-    "mountain_ruin_inside_scraps_8" : base_id + 1595, # ItemPickup21_2 Mine3_Interior1 (X=-18119.473 Y=-42001.453 Z=10198.855)
-    "mountain_ruin_inside_scraps_9" : base_id + 1596, # ItemPickup276_20 Mine3_Interior1 (X=-18975.068 Y=-42906.488 Z=10279.690)
-    "mountain_ruin_inside_scraps_10" : base_id + 1597, # ItemPickup277_26 Mine3_Interior1 (X=-19727.902 Y=-41581.039 Z=10199.614)
-    "mountain_ruin_inside_scraps_11" : base_id + 1598, # ItemPickup275_17 Mine3_Interior1 (X=-19187.891 Y=-40516.941 Z=10201.049)
-    "mountain_ruin_inside_scraps_12" : base_id + 1599, # ItemPickup278_29 Mine3_Interior1 (X=-22470.986 Y=-41602.875 Z=10073.847)
-    "mountain_ruin_inside_scraps_13" : base_id + 1600, # ItemPickup279_2 Mine3_Interior2 (X=-23717.383 Y=-42597.141 Z=7455.452)
-    "mountain_ruin_inside_scraps_14" : base_id + 1601, # ItemPickup22_7 Mine3_Interior2 (X=-24494.582 Y=-44598.086 Z=7433.633)
-    "mountain_ruin_inside_scraps_15" : base_id + 1602, # ItemPickup280_5 Mine3_Interior2 (X=-26783.293 Y=-42331.145 Z=7446.357)
-    "mountain_ruin_inside_scraps_16" : base_id + 1603, # ItemPickup281_8 Mine3_Interior2 (X=-28636.996 Y=-46745.340 Z=7430.463)
-    "mountain_ruin_inside_scraps_17" : base_id + 1604, # ItemPickup23_1 Mine3_Interior2 (X=-27752.643 Y=-47453.973 Z=7445.047)
-    "mountain_ruin_inside_red_egg" : base_id + 1605, # Mine3_EggPickup Mine3_Interior2 (X=-28254.400 Y=-45702.844 Z=7551.568)
-    "mountain_ruin_inside_paint_can_red" : base_id + 1606 # PaintCan_2 Mine3_Interior2 (X=-31391.293 Y=-44953.223 Z=7448.648) \!/ Existing match 5
-}
-
-loc_field_pickle_lady_mission = {
-    "field_pickle_lady_scraps_1" : base_id + 1607, # ItemPickup56_2 Pickles_HouseDetails (X=60402.582 Y=25252.434 Z=11151.982)
-    "field_pickle_lady_scraps_2" : base_id + 1608, # ItemPickup57_5 Pickles_HouseDetails (X=58717.516 Y=24457.180 Z=11343.938)
-    "field_pickle_lady_scraps_3" : base_id + 1609, # ItemPickup311_14 Pickles_EnvironmentDetails (X=56455.688 Y=22324.875 Z=11655.192)
-    "field_pickle_lady_scraps_4" : base_id + 1610, # ItemPickup310_11 Pickles_EnvironmentDetails (X=52888.387 Y=22541.955 Z=12428.012)
-    "field_pickle_lady_scraps_5" : base_id + 1611, # ItemPickup58_2 Pickles_EnvironmentDetails (X=50374.863 Y=22073.027 Z=12591.468)
-    "field_pickle_lady_scraps_6" : base_id + 1612, # ItemPickup309_8 Pickles_EnvironmentDetails (X=45985.988 Y=23063.826 Z=13043.497)
-    "field_pickle_lady_scraps_7" : base_id + 1613, # ItemPickup316_27 Pickles_EnvironmentDetails (X=45533.469 Y=24876.168 Z=13015.539)
-    "field_pickle_lady_scraps_8" : base_id + 1614, # ItemPickup317_30 Pickles_EnvironmentDetails (X=44928.848 Y=30913.396 Z=14273.230)
-    "field_pickle_lady_scraps_9" : base_id + 1615, # ItemPickup321_42 Pickles_EnvironmentDetails (X=41572.684 Y=37403.539 Z=13527.379)
-    "field_pickle_lady_scraps_10" : base_id + 1616, # ItemPickup61_11 Pickles_EnvironmentDetails (X=42266.566 Y=30556.238 Z=13584.196)
-    "field_pickle_lady_scraps_11" : base_id + 1617, # ItemPickup314_21 Pickles_EnvironmentDetails (X=43356.219 Y=29465.746 Z=13449.486)
-    "field_pickle_lady_scraps_12" : base_id + 1618, # ItemPickup323_48 Pickles_EnvironmentDetails (X=40893.461 Y=30669.398 Z=13465.039)
-    "field_pickle_lady_scraps_13" : base_id + 1619, # ItemPickup318_33 Pickles_EnvironmentDetails (X=41276.863 Y=32313.068 Z=13480.846)
-    "field_pickle_lady_scraps_14" : base_id + 1620, # ItemPickup319_36 Pickles_EnvironmentDetails (X=38630.031 Y=30471.996 Z=13571.207)
-    "field_pickle_lady_scraps_15" : base_id + 1621, # ItemPickup320_39 Pickles_EnvironmentDetails (X=38596.938 Y=30050.293 Z=13559.574)
-    "field_pickle_lady_scraps_16" : base_id + 1622, # ItemPickup60_8 Pickles_EnvironmentDetails (X=42042.520 Y=25136.820 Z=13077.339)
-    "field_pickle_lady_scraps_17" : base_id + 1623, # ItemPickup308_5 Pickles_EnvironmentDetails (X=43770.914 Y=23307.234 Z=12374.002)
-    "field_pickle_lady_scraps_18" : base_id + 1624, # ItemPickup59_5 Pickles_EnvironmentDetails (X=44672.641 Y=20936.520 Z=12198.017)
-    "field_pickle_lady_scraps_19" : base_id + 1625, # ItemPickup307_2 Pickles_EnvironmentDetails (X=42844.730 Y=22869.387 Z=12832.900)
-    "field_pickle_lady_scraps_20" : base_id + 1626, # ItemPickup315_24 Pickles_EnvironmentDetails (X=43397.758 Y=26367.248 Z=13005.097)
-    "field_pickle_lady_scraps_21" : base_id + 1627, # ItemPickup322_45 Pickles_EnvironmentDetails (X=39352.430 Y=32668.316 Z=14494.778)
-    "field_pickle_lady_scraps_22" : base_id + 1628, # ItemPickup313 Pickles_EnvironmentDetails (X=59688.781 Y=25266.756 Z=11425.324)
-    "field_pickle_lady_scraps_23" : base_id + 1629, # ItemPickup312_17 Pickles_EnvironmentDetails (X=59197.871 Y=24760.773 Z=11425.324)
-    "field_pickle_lady_paint_can_purple" : base_id + 1630, # PaintCan_7 Pickles_EnvironmentDetails (X=40394.855 Y=31546.465 Z=13472.573)
-    "field_pickle_lady_jar_of_pickles" : base_id + 1631, # Pickles_Pickup Pickles_Cave (X=38227.535 Y=30234.848 Z=13593.506)
-    "field_pickle_lady_mission_end" : base_id + 1632 # (dialog 4) -> 30_scraps_reward
+    "Mountain Ruin Inside Scraps 1" : base_id + 1588, # ItemPickup253_5 Mine3_Camp (X=-10647.446 Y=-52039.848 Z=11925.344)
+    "Mountain Ruin Inside Scraps 2" : base_id + 1589, # ItemPickup270_2 Mine3_Interior1 (X=-12834.990 Y=-48683.176 Z=10200.083)
+    "Mountain Ruin Inside Scraps 3" : base_id + 1590, # ItemPickup271_5 Mine3_Interior1 (X=-15748.594 Y=-44925.523 Z=10199.975)
+    "Mountain Ruin Inside Scraps 4" : base_id + 1591, # ItemPickup20_3 Mine3_Interior1 (X=-15312.152 Y=-43957.055 Z=10350.783)
+    "Mountain Ruin Inside Scraps 5" : base_id + 1592, # ItemPickup273_11 Mine3_Interior1 (X=-16709.586 Y=-44997.316 Z=10198.888)
+    "Mountain Ruin Inside Scraps 6" : base_id + 1593, # ItemPickup272_8 Mine3_Interior1 (X=-17412.561 Y=-46041.977 Z=10349.650)
+    "Mountain Ruin Inside Scraps 7" : base_id + 1594, # ItemPickup274_14 Mine3_Interior1 (X=-17452.596 Y=-43804.941 Z=10201.436)
+    "Mountain Ruin Inside Scraps 8" : base_id + 1595, # ItemPickup21_2 Mine3_Interior1 (X=-18119.473 Y=-42001.453 Z=10198.855)
+    "Mountain Ruin Inside Scraps 9" : base_id + 1596, # ItemPickup276_20 Mine3_Interior1 (X=-18975.068 Y=-42906.488 Z=10279.690)
+    "Mountain Ruin Inside Scraps 10" : base_id + 1597, # ItemPickup277_26 Mine3_Interior1 (X=-19727.902 Y=-41581.039 Z=10199.614)
+    "Mountain Ruin Inside Scraps 11" : base_id + 1598, # ItemPickup275_17 Mine3_Interior1 (X=-19187.891 Y=-40516.941 Z=10201.049)
+    "Mountain Ruin Inside Scraps 12" : base_id + 1599, # ItemPickup278_29 Mine3_Interior1 (X=-22470.986 Y=-41602.875 Z=10073.847)
+    "Mountain Ruin Inside Scraps 13" : base_id + 1600, # ItemPickup279_2 Mine3_Interior2 (X=-23717.383 Y=-42597.141 Z=7455.452)
+    "Mountain Ruin Inside Scraps 14" : base_id + 1601, # ItemPickup22_7 Mine3_Interior2 (X=-24494.582 Y=-44598.086 Z=7433.633)
+    "Mountain Ruin Inside Scraps 15" : base_id + 1602, # ItemPickup280_5 Mine3_Interior2 (X=-26783.293 Y=-42331.145 Z=7446.357)
+    "Mountain Ruin Inside Scraps 16" : base_id + 1603, # ItemPickup281_8 Mine3_Interior2 (X=-28636.996 Y=-46745.340 Z=7430.463)
+    "Mountain Ruin Inside Scraps 17" : base_id + 1604, # ItemPickup23_1 Mine3_Interior2 (X=-27752.643 Y=-47453.973 Z=7445.047)
+    "Mountain Ruin Inside Red Egg" : base_id + 1605, # Mine3_EggPickup Mine3_Interior2 (X=-28254.400 Y=-45702.844 Z=7551.568)
+    "Mountain Ruin Inside Red Paint Can" : base_id + 1606 # PaintCan_2 Mine3_Interior2 (X=-31391.293 Y=-44953.223 Z=7448.648) \!/ Existing match 5
+}
+
+loc_pickle_val = {
+    "Pickle Val Scraps 1" : base_id + 1607, # ItemPickup56_2 Pickles_HouseDetails (X=60402.582 Y=25252.434 Z=11151.982)
+    "Pickle Val Scraps 2" : base_id + 1608, # ItemPickup57_5 Pickles_HouseDetails (X=58717.516 Y=24457.180 Z=11343.938)
+    "Pickle Val Scraps 3" : base_id + 1609, # ItemPickup311_14 Pickles_EnvironmentDetails (X=56455.688 Y=22324.875 Z=11655.192)
+    "Pickle Val Scraps 4" : base_id + 1610, # ItemPickup310_11 Pickles_EnvironmentDetails (X=52888.387 Y=22541.955 Z=12428.012)
+    "Pickle Val Scraps 5" : base_id + 1611, # ItemPickup58_2 Pickles_EnvironmentDetails (X=50374.863 Y=22073.027 Z=12591.468)
+    "Pickle Val Scraps 6" : base_id + 1612, # ItemPickup309_8 Pickles_EnvironmentDetails (X=45985.988 Y=23063.826 Z=13043.497)
+    "Pickle Val Scraps 7" : base_id + 1613, # ItemPickup316_27 Pickles_EnvironmentDetails (X=45533.469 Y=24876.168 Z=13015.539)
+    "Pickle Val Scraps 8" : base_id + 1614, # ItemPickup317_30 Pickles_EnvironmentDetails (X=44928.848 Y=30913.396 Z=14273.230)
+    "Pickle Val Scraps 9" : base_id + 1615, # ItemPickup321_42 Pickles_EnvironmentDetails (X=41572.684 Y=37403.539 Z=13527.379)
+    "Pickle Val Scraps 10" : base_id + 1616, # ItemPickup61_11 Pickles_EnvironmentDetails (X=42266.566 Y=30556.238 Z=13584.196)
+    "Pickle Val Scraps 11" : base_id + 1617, # ItemPickup314_21 Pickles_EnvironmentDetails (X=43356.219 Y=29465.746 Z=13449.486)
+    "Pickle Val Scraps 12" : base_id + 1618, # ItemPickup323_48 Pickles_EnvironmentDetails (X=40893.461 Y=30669.398 Z=13465.039)
+    "Pickle Val Scraps 13" : base_id + 1619, # ItemPickup318_33 Pickles_EnvironmentDetails (X=41276.863 Y=32313.068 Z=13480.846)
+    "Pickle Val Scraps 14" : base_id + 1620, # ItemPickup319_36 Pickles_EnvironmentDetails (X=38630.031 Y=30471.996 Z=13571.207)
+    "Pickle Val Scraps 15" : base_id + 1621, # ItemPickup320_39 Pickles_EnvironmentDetails (X=38596.938 Y=30050.293 Z=13559.574)
+    "Pickle Val Scraps 16" : base_id + 1622, # ItemPickup60_8 Pickles_EnvironmentDetails (X=42042.520 Y=25136.820 Z=13077.339)
+    "Pickle Val Scraps 17" : base_id + 1623, # ItemPickup308_5 Pickles_EnvironmentDetails (X=43770.914 Y=23307.234 Z=12374.002)
+    "Pickle Val Scraps 18" : base_id + 1624, # ItemPickup59_5 Pickles_EnvironmentDetails (X=44672.641 Y=20936.520 Z=12198.017)
+    "Pickle Val Scraps 19" : base_id + 1625, # ItemPickup307_2 Pickles_EnvironmentDetails (X=42844.730 Y=22869.387 Z=12832.900)
+    "Pickle Val Scraps 20" : base_id + 1626, # ItemPickup315_24 Pickles_EnvironmentDetails (X=43397.758 Y=26367.248 Z=13005.097)
+    "Pickle Val Scraps 21" : base_id + 1627, # ItemPickup322_45 Pickles_EnvironmentDetails (X=39352.430 Y=32668.316 Z=14494.778)
+    "Pickle Val Scraps 22" : base_id + 1628, # ItemPickup313 Pickles_EnvironmentDetails (X=59688.781 Y=25266.756 Z=11425.324)
+    "Pickle Val Scraps 23" : base_id + 1629, # ItemPickup312_17 Pickles_EnvironmentDetails (X=59197.871 Y=24760.773 Z=11425.324)
+    "Pickle Val Purple Paint Can" : base_id + 1630, # PaintCan_7 Pickles_EnvironmentDetails (X=40394.855 Y=31546.465 Z=13472.573)
+    "Pickle Val Jar of Pickles" : base_id + 1631, # Pickles_Pickup Pickles_Cave (X=38227.535 Y=30234.848 Z=13593.506)
+    "Pickle Val Pickle Lady Mission End" : base_id + 1632 # (dialog 4) -> 30_scraps_reward
 }
 
 loc_shrine_near_temple = {
-    "shrine_near_temple_scraps_1" : base_id + 1633, # ItemPickup3 Photorealistic_Island (X=-4675.183 Y=-21143.846 Z=11984.782)
-    "shrine_near_temple_scraps_2" : base_id + 1634, # ItemPickup_2 Photorealistic_Island (X=-4994.117 Y=-20496.621 Z=11874.112)
-    "shrine_near_temple_scraps_3" : base_id + 1635 # ItemPickup2 Photorealistic_Island (X=-4196.896 Y=-20477.025 Z=11882.833)
+    "Shrine Near Temple Scraps 1" : base_id + 1633, # ItemPickup3 Photorealistic_Island (X=-4675.183 Y=-21143.846 Z=11984.782)
+    "Shrine Near Temple Scraps 2" : base_id + 1634, # ItemPickup_2 Photorealistic_Island (X=-4994.117 Y=-20496.621 Z=11874.112)
+    "Shrine Near Temple Scraps 3" : base_id + 1635 # ItemPickup2 Photorealistic_Island (X=-4196.896 Y=-20477.025 Z=11882.833)
 }
 
 loc_morse_bunker = {
-    "morse_bunker_chest_scraps_1" : base_id + 1636, # ItemPickup6512 Secret6_BunkerDetails (X=-47961.078 Y=-85433.031 Z=10615.777)
-    "morse_bunker_chest_scraps_2" : base_id + 1637, # ItemPickup9363 Secret6_BunkerDetails (X=-47958.617 Y=-85444.805 Z=10604.365)
-    "morse_bunker_chest_scraps_3" : base_id + 1638, # ItemPickup921436 Secret6_BunkerDetails (X=-47953.637 Y=-85426.172 Z=10592.347)
-    "morse_bunker_chest_scraps_4" : base_id + 1639, # ItemPickup0128704 Secret6_BunkerDetails (X=-47958.691 Y=-85444.805 Z=10587.060)
-    "morse_bunker_chest_scraps_5" : base_id + 1640, # ItemPickup64_8 Secret6_BunkerDetails (X=-47953.617 Y=-85426.172 Z=10574.149)
-    "morse_bunker_scraps_1" : base_id + 1641, # ItemPickup397_2 Secret6_BunkerDetails (X=-48336.863 Y=-85458.453 Z=10574.537)
-    "morse_bunker_scraps_2" : base_id + 1642, # ItemPickup62_2 Secret6_BunkerDetails (X=-48253.844 Y=-84944.609 Z=10573.793)
-    "morse_bunker_scraps_3" : base_id + 1643, # ItemPickup63_5 Secret6_BunkerDetails (X=-47272.422 Y=-84549.945 Z=10543.671)
-    "morse_bunker_scraps_4" : base_id + 1644, # ItemPickup398_5 Secret6_BunkerDetails (X=-47080.836 Y=-85268.281 Z=10564.355)
-    "morse_bunker_scraps_5" : base_id + 1645, # ItemPickup406_31 Secret6_BunkerDetails (X=-47913.855 Y=-85234.258 Z=10819.314)
-    "morse_bunker_scraps_6" : base_id + 1646, # ItemPickup405_28 Secret6_BunkerDetails (X=-46410.227 Y=-83293.742 Z=10361.746)
-    "morse_bunker_scraps_7" : base_id + 1647, # ItemPickup399_8 Secret6_BunkerDetails (X=-45204.199 Y=-84841.211 Z=10329.200)
-    "morse_bunker_scraps_8" : base_id + 1648, # ItemPickup401_14 Secret6_BunkerDetails (X=-43895.801 Y=-83794.750 Z=10265.661)
-    "morse_bunker_scraps_9" : base_id + 1649, # ItemPickup402_17 Secret6_BunkerDetails (X=-45163.078 Y=-80832.828 Z=10090.777)
-    "morse_bunker_scraps_10" : base_id + 1650, # ItemPickup403_20 Secret6_BunkerDetails (X=-46782.027 Y=-82284.805 Z=10289.180)
-    "morse_bunker_scraps_11" : base_id + 1651, # ItemPickup404_23 Secret6_BunkerDetails (X=-49240.047 Y=-83654.961 Z=10898.540)
-    "morse_bunker_scraps_12" : base_id + 1652, # ItemPickup407_34 Secret6_BunkerDetails (X=-46571.930 Y=-85962.773 Z=10697.339)
-    "morse_bunker_scraps_13" : base_id + 1653, # ItemPickup400_11 Secret6_BunkerDetails (X=-43472.793 Y=-85983.805 Z=10310.322)
+    "Morse Bunker Chest Scraps 1" : base_id + 1636, # ItemPickup6512 Secret6_BunkerDetails (X=-47961.078 Y=-85433.031 Z=10615.777)
+    "Morse Bunker Chest Scraps 2" : base_id + 1637, # ItemPickup9363 Secret6_BunkerDetails (X=-47958.617 Y=-85444.805 Z=10604.365)
+    "Morse Bunker Chest Scraps 3" : base_id + 1638, # ItemPickup921436 Secret6_BunkerDetails (X=-47953.637 Y=-85426.172 Z=10592.347)
+    "Morse Bunker Chest Scraps 4" : base_id + 1639, # ItemPickup0128704 Secret6_BunkerDetails (X=-47958.691 Y=-85444.805 Z=10587.060)
+    "Morse Bunker Chest Scraps 5" : base_id + 1640, # ItemPickup64_8 Secret6_BunkerDetails (X=-47953.617 Y=-85426.172 Z=10574.149)
+    "Morse Bunker Scraps 1" : base_id + 1641, # ItemPickup397_2 Secret6_BunkerDetails (X=-48336.863 Y=-85458.453 Z=10574.537)
+    "Morse Bunker Scraps 2" : base_id + 1642, # ItemPickup62_2 Secret6_BunkerDetails (X=-48253.844 Y=-84944.609 Z=10573.793)
+    "Morse Bunker Scraps 3" : base_id + 1643, # ItemPickup63_5 Secret6_BunkerDetails (X=-47272.422 Y=-84549.945 Z=10543.671)
+    "Morse Bunker Scraps 4" : base_id + 1644, # ItemPickup398_5 Secret6_BunkerDetails (X=-47080.836 Y=-85268.281 Z=10564.355)
+    "Morse Bunker Scraps 5" : base_id + 1645, # ItemPickup406_31 Secret6_BunkerDetails (X=-47913.855 Y=-85234.258 Z=10819.314)
+    "Morse Bunker Scraps 6" : base_id + 1646, # ItemPickup405_28 Secret6_BunkerDetails (X=-46410.227 Y=-83293.742 Z=10361.746)
+    "Morse Bunker Scraps 7" : base_id + 1647, # ItemPickup399_8 Secret6_BunkerDetails (X=-45204.199 Y=-84841.211 Z=10329.200)
+    "Morse Bunker Scraps 8" : base_id + 1648, # ItemPickup401_14 Secret6_BunkerDetails (X=-43895.801 Y=-83794.750 Z=10265.661)
+    "Morse Bunker Scraps 9" : base_id + 1649, # ItemPickup402_17 Secret6_BunkerDetails (X=-45163.078 Y=-80832.828 Z=10090.777)
+    "Morse Bunker Scraps 10" : base_id + 1650, # ItemPickup403_20 Secret6_BunkerDetails (X=-46782.027 Y=-82284.805 Z=10289.180)
+    "Morse Bunker Scraps 11" : base_id + 1651, # ItemPickup404_23 Secret6_BunkerDetails (X=-49240.047 Y=-83654.961 Z=10898.540)
+    "Morse Bunker Scraps 12" : base_id + 1652, # ItemPickup407_34 Secret6_BunkerDetails (X=-46571.930 Y=-85962.773 Z=10697.339)
+    "Morse Bunker Scraps 13" : base_id + 1653 # ItemPickup400_11 Secret6_BunkerDetails (X=-43472.793 Y=-85983.805 Z=10310.322)
 }
 
 loc_prism_temple = {
-    "prism_temple_chest_scraps_1" : base_id + 1654, # ItemPickup16632 MainShrine_DetailsREPAIRED (X=12659.641 Y=-27827.016 Z=10930.621)
-    "prism_temple_chest_scraps_2" : base_id + 1655, # ItemPickup148864 MainShrine_DetailsREPAIRED (X=12648.021 Y=-27825.189 Z=10916.296)
-    "prism_temple_chest_scraps_3" : base_id + 1656, # ItemPickup13123 MainShrine_DetailsREPAIRED (X=12665.557 Y=-27836.633 Z=10905.999)
-    "prism_temple_scraps_1" : base_id + 1657, # ItemPickup225_77 MainShrine_ExteriorDetails (X=5281.087 Y=-16620.387 Z=10520.609)
-    "prism_temple_scraps_2" : base_id + 1658, # ItemPickup223_71 MainShrine_ExteriorDetails (X=15032.147 Y=-16788.352 Z=10992.200)
-    "prism_temple_scraps_3" : base_id + 1659, # ItemPickup222_68 MainShrine_ExteriorDetails (X=16591.920 Y=-18725.771 Z=11004.751)
-    "prism_temple_scraps_4" : base_id + 1660, # ItemPickup135123 MainShrine_DetailsREPAIRED (X=17940.854 Y=-20726.746 Z=10999.944)
-    "prism_temple_scraps_5" : base_id + 1661, # ItemPickup220_62 MainShrine_ExteriorDetails (X=18187.346 Y=-21390.066 Z=11025.650)
-    "prism_temple_scraps_6" : base_id + 1662, # ItemPickup218_56 MainShrine_ExteriorDetails (X=19218.670 Y=-24017.619 Z=10906.966)
-    "prism_temple_scraps_7" : base_id + 1663, # ItemPickup209_29 MainShrine_ExteriorDetails (X=7710.977 Y=-23469.254 Z=11012.888)
-    "prism_temple_scraps_8" : base_id + 1664, # ItemPickup138765 MainShrine_DetailsREPAIRED (X=8160.002 Y=-22335.266 Z=11016.638)
-    "prism_temple_scraps_9" : base_id + 1665, # ItemPickup210_32 MainShrine_ExteriorDetails (X=8637.903 Y=-24295.850 Z=10929.299)
-    "prism_temple_scraps_10" : base_id + 1666, # ItemPickup1112 MainShrine_DetailsREPAIRED (X=7923.367 Y=-25204.055 Z=10832.877)
-    "prism_temple_scraps_11" : base_id + 1667, # ItemPickup214_44 MainShrine_ExteriorDetails (X=10694.420 Y=-27246.365 Z=10569.074)
-    "prism_temple_scraps_12" : base_id + 1668, # ItemPickup215_47 MainShrine_ExteriorDetails (X=12892.631 Y=-26743.068 Z=10868.578)
-    "prism_temple_scraps_13" : base_id + 1669, # ItemPickup213_41 MainShrine_ExteriorDetails (X=12483.535 Y=-27253.867 Z=10876.461)
-    "prism_temple_scraps_14" : base_id + 1670, # ItemPickup212_38 MainShrine_ExteriorDetails (X=13259.813 Y=-27092.033 Z=10887.968)
-    "prism_temple_scraps_15" : base_id + 1671, # ItemPickup211_35 MainShrine_ExteriorDetails (X=9303.245 Y=-25057.908 Z=10943.273)
-    "prism_temple_scraps_16" : base_id + 1672, # ItemPickup201_2 MainShrine_ExteriorDetails (X=11750.875 Y=-22999.371 Z=12426.734)
-    "prism_temple_scraps_17" : base_id + 1673, # ItemPickup203_8 MainShrine_ExteriorDetails (X=12966.615 Y=-23568.324 Z=12519.387)
-    "prism_temple_scraps_18" : base_id + 1674, # ItemPickup204_11 MainShrine_ExteriorDetails (X=14093.343 Y=-22393.182 Z=12426.847)
-    "prism_temple_scraps_19" : base_id + 1675, # ItemPickup206_17 MainShrine_ExteriorDetails (X=13767.980 Y=-21269.568 Z=12425.791)
-    "prism_temple_scraps_20" : base_id + 1676, # ItemPickup207_23 MainShrine_ExteriorDetails (X=12882.754 Y=-20027.527 Z=12516.095)
-    "prism_temple_scraps_21" : base_id + 1677, # ItemPickup114535 MainShrine_DetailsREPAIRED (X=11883.399 Y=-20801.344 Z=12428.452)
-    "prism_temple_scraps_22" : base_id + 1678, # ItemPickup208_26 MainShrine_ExteriorDetails (X=13281.792 Y=-21302.344 Z=12902.728)
-    "prism_temple_scraps_23" : base_id + 1679, # ItemPickup205_14 MainShrine_ExteriorDetails (X=14190.678 Y=-23671.621 Z=11781.533)
-    "prism_temple_scraps_24" : base_id + 1680, # ItemPickup8903 MainShrine_DetailsREPAIRED (X=14311.736 Y=-22347.758 Z=11765.781)
-    "prism_temple_scraps_25" : base_id + 1681, # ItemPickup654 MainShrine_DetailsREPAIRED (X=13826.154 Y=-19923.131 Z=11755.189)
-    "prism_temple_scraps_26" : base_id + 1682, # ItemPickup224_74 MainShrine_ExteriorDetails (X=12443.228 Y=-18577.926 Z=11240.455)
-    "prism_temple_scraps_27" : base_id + 1683, # ItemPickup202_5 MainShrine_ExteriorDetails (X=10993.180 Y=-23783.047 Z=11754.121)
-    "prism_temple_scraps_28" : base_id + 1684, # ItemPickup13098 MainShrine_DetailsREPAIRED (X=16762.963 Y=-23634.342 Z=11031.588)
-    "prism_temple_scraps_29" : base_id + 1685, # ItemPickup221_65 MainShrine_ExteriorDetails (X=17804.979 Y=-23512.395 Z=11066.884)
-    "prism_temple_scraps_30" : base_id + 1686, # ItemPickup17123123565 MainShrine_DetailsREPAIRED (X=16998.229 Y=-23241.652 Z=11055.539)
-    "prism_temple_scraps_31" : base_id + 1687, # ItemPickup10812783 MainShrine_DetailsREPAIRED (X=17613.518 Y=-23799.813 Z=11057.277)
-    "prism_temple_scraps_32" : base_id + 1688, # ItemPickup216_50 MainShrine_ExteriorDetails (X=15342.375 Y=-24807.357 Z=11024.192)
-    "prism_temple_scraps_33" : base_id + 1689, # ItemPickup217_53 MainShrine_ExteriorDetails (X=15963.284 Y=-24834.156 Z=11021.444)
-    "prism_temple_scraps_34" : base_id + 1690 # ItemPickup219_59 MainShrine_ExteriorDetails (X=21563.559 Y=-23705.184 Z=10895.696)
+    "Prism Temple Chest Scraps 1" : base_id + 1654, # ItemPickup16632 MainShrine_DetailsREPAIRED (X=12659.641 Y=-27827.016 Z=10930.621)
+    "Prism Temple Chest Scraps 2" : base_id + 1655, # ItemPickup148864 MainShrine_DetailsREPAIRED (X=12648.021 Y=-27825.189 Z=10916.296)
+    "Prism Temple Chest Scraps 3" : base_id + 1656, # ItemPickup13123 MainShrine_DetailsREPAIRED (X=12665.557 Y=-27836.633 Z=10905.999)
+    "Prism Temple Scraps 1" : base_id + 1657, # ItemPickup225_77 MainShrine_ExteriorDetails (X=5281.087 Y=-16620.387 Z=10520.609)
+    "Prism Temple Scraps 2" : base_id + 1658, # ItemPickup223_71 MainShrine_ExteriorDetails (X=15032.147 Y=-16788.352 Z=10992.200)
+    "Prism Temple Scraps 3" : base_id + 1659, # ItemPickup222_68 MainShrine_ExteriorDetails (X=16591.920 Y=-18725.771 Z=11004.751)
+    "Prism Temple Scraps 4" : base_id + 1660, # ItemPickup135123 MainShrine_DetailsREPAIRED (X=17940.854 Y=-20726.746 Z=10999.944)
+    "Prism Temple Scraps 5" : base_id + 1661, # ItemPickup220_62 MainShrine_ExteriorDetails (X=18187.346 Y=-21390.066 Z=11025.650)
+    "Prism Temple Scraps 6" : base_id + 1662, # ItemPickup218_56 MainShrine_ExteriorDetails (X=19218.670 Y=-24017.619 Z=10906.966)
+    "Prism Temple Scraps 7" : base_id + 1663, # ItemPickup209_29 MainShrine_ExteriorDetails (X=7710.977 Y=-23469.254 Z=11012.888)
+    "Prism Temple Scraps 8" : base_id + 1664, # ItemPickup138765 MainShrine_DetailsREPAIRED (X=8160.002 Y=-22335.266 Z=11016.638)
+    "Prism Temple Scraps 9" : base_id + 1665, # ItemPickup210_32 MainShrine_ExteriorDetails (X=8637.903 Y=-24295.850 Z=10929.299)
+    "Prism Temple Scraps 10" : base_id + 1666, # ItemPickup1112 MainShrine_DetailsREPAIRED (X=7923.367 Y=-25204.055 Z=10832.877)
+    "Prism Temple Scraps 11" : base_id + 1667, # ItemPickup214_44 MainShrine_ExteriorDetails (X=10694.420 Y=-27246.365 Z=10569.074)
+    "Prism Temple Scraps 12" : base_id + 1668, # ItemPickup215_47 MainShrine_ExteriorDetails (X=12892.631 Y=-26743.068 Z=10868.578)
+    "Prism Temple Scraps 13" : base_id + 1669, # ItemPickup213_41 MainShrine_ExteriorDetails (X=12483.535 Y=-27253.867 Z=10876.461)
+    "Prism Temple Scraps 14" : base_id + 1670, # ItemPickup212_38 MainShrine_ExteriorDetails (X=13259.813 Y=-27092.033 Z=10887.968)
+    "Prism Temple Scraps 15" : base_id + 1671, # ItemPickup211_35 MainShrine_ExteriorDetails (X=9303.245 Y=-25057.908 Z=10943.273)
+    "Prism Temple Scraps 16" : base_id + 1672, # ItemPickup201_2 MainShrine_ExteriorDetails (X=11750.875 Y=-22999.371 Z=12426.734)
+    "Prism Temple Scraps 17" : base_id + 1673, # ItemPickup203_8 MainShrine_ExteriorDetails (X=12966.615 Y=-23568.324 Z=12519.387)
+    "Prism Temple Scraps 18" : base_id + 1674, # ItemPickup204_11 MainShrine_ExteriorDetails (X=14093.343 Y=-22393.182 Z=12426.847)
+    "Prism Temple Scraps 19" : base_id + 1675, # ItemPickup206_17 MainShrine_ExteriorDetails (X=13767.980 Y=-21269.568 Z=12425.791)
+    "Prism Temple Scraps 20" : base_id + 1676, # ItemPickup207_23 MainShrine_ExteriorDetails (X=12882.754 Y=-20027.527 Z=12516.095)
+    "Prism Temple Scraps 21" : base_id + 1677, # ItemPickup114535 MainShrine_DetailsREPAIRED (X=11883.399 Y=-20801.344 Z=12428.452)
+    "Prism Temple Scraps 22" : base_id + 1678, # ItemPickup208_26 MainShrine_ExteriorDetails (X=13281.792 Y=-21302.344 Z=12902.728)
+    "Prism Temple Scraps 23" : base_id + 1679, # ItemPickup205_14 MainShrine_ExteriorDetails (X=14190.678 Y=-23671.621 Z=11781.533)
+    "Prism Temple Scraps 24" : base_id + 1680, # ItemPickup8903 MainShrine_DetailsREPAIRED (X=14311.736 Y=-22347.758 Z=11765.781)
+    "Prism Temple Scraps 25" : base_id + 1681, # ItemPickup654 MainShrine_DetailsREPAIRED (X=13826.154 Y=-19923.131 Z=11755.189)
+    "Prism Temple Scraps 26" : base_id + 1682, # ItemPickup224_74 MainShrine_ExteriorDetails (X=12443.228 Y=-18577.926 Z=11240.455)
+    "Prism Temple Scraps 27" : base_id + 1683, # ItemPickup202_5 MainShrine_ExteriorDetails (X=10993.180 Y=-23783.047 Z=11754.121)
+    "Prism Temple Scraps 28" : base_id + 1684, # ItemPickup13098 MainShrine_DetailsREPAIRED (X=16762.963 Y=-23634.342 Z=11031.588)
+    "Prism Temple Scraps 29" : base_id + 1685, # ItemPickup221_65 MainShrine_ExteriorDetails (X=17804.979 Y=-23512.395 Z=11066.884)
+    "Prism Temple Scraps 30" : base_id + 1686, # ItemPickup17123123565 MainShrine_DetailsREPAIRED (X=16998.229 Y=-23241.652 Z=11055.539)
+    "Prism Temple Scraps 31" : base_id + 1687, # ItemPickup10812783 MainShrine_DetailsREPAIRED (X=17613.518 Y=-23799.813 Z=11057.277)
+    "Prism Temple Scraps 32" : base_id + 1688, # ItemPickup216_50 MainShrine_ExteriorDetails (X=15342.375 Y=-24807.357 Z=11024.192)
+    "Prism Temple Scraps 33" : base_id + 1689, # ItemPickup217_53 MainShrine_ExteriorDetails (X=15963.284 Y=-24834.156 Z=11021.444)
+    "Prism Temple Scraps 34" : base_id + 1690 # ItemPickup219_59 MainShrine_ExteriorDetails (X=21563.559 Y=-23705.184 Z=10895.696)
 }
 
 
@@ -850,49 +862,53 @@ class CCCharlesLocation(Location):
 location_table: dict[str, int] = {
     **loc_start_camp,
     **loc_tony_tiddle_mission,
-    **loc_tutorial_candice_mission,
-    **loc_swamp,
-    **loc_lizbeth_murkwater_mission,
-    **loc_daryl_mission,
+    **loc_barn,
+    **loc_candice_mission,
+    **loc_tutorial_house,
+    **loc_swamp_edges,
+    **loc_swamp_mission,
+    **loc_junkyard_area,
     **loc_south_house,
-    **loc_helen_mission,
-    **loc_sgt_flint_mission,
+    **loc_junkyard_shed,
+    **loc_military_base,
     **loc_south_mine_outside,
     **loc_south_mine_inside,
-    **loc_theodore_mission,
-    **loc_canyon_theodore,
+    **loc_middle_station,
+    **loc_canyon,
     **loc_watchtower,
     **loc_boulder_field,
-    **loc_house_sasha_mission,
-    **loc_house_santiago,
-    **loc_port_santiago_mission,
+    **loc_haunted_house,
+    **loc_santiago_house,
+    **loc_port,
     **loc_trench_house,
     **loc_doll_woods,
     **loc_lost_stairs,
     **loc_east_house,
-    **loc_explosive_training,
-    **loc_john_smith_mission,
-    **loc_greg_mission,
-    **loc_claire_mission,
+    **loc_rockets_testing_ground,
+    **loc_rockets_testing_bunker,
+    **loc_workshop,
+    **loc_east_tower,
+    **loc_lighthouse,
     **loc_north_mine_outside,
     **loc_north_mine_inside,
     **loc_wood_bridge,
-    **loc_paul_mission,
-    **loc_gertrude_mission,
+    **loc_museum,
+    **loc_barbed_shelter,
     **loc_west_beach,
     **loc_church,
-    **loc_refuge_gale_mission,
+    **loc_west_cottage,
     **loc_caravan,
-    **loc_trailer_house,
-    **loc_ronny_mission,
+    **loc_trailer_cabin,
+    **loc_towers,
     **loc_north_beach,
     **loc_mine_shaft,
     **loc_mob_camp,
+    **loc_mob_camp_locked_room,
     **loc_mine_elevator_exit,
     **loc_mountain_ruin_outside,
     **loc_mountain_ruin_inside,
     **loc_prism_temple,
-    **loc_field_pickle_lady_mission,
+    **loc_pickle_val,
     **loc_shrine_near_temple,
     **loc_morse_bunker
 }
diff --git a/worlds/cccharles/Options.py b/worlds/cccharles/Options.py
index 4fb1fa741bde..435e54d766c6 100644
--- a/worlds/cccharles/Options.py
+++ b/worlds/cccharles/Options.py
@@ -5,168 +5,182 @@
 
 class ScrapsAmountAsCheck(Range):
     """
-    What number of scraps are necessary to get an item as a check.
+    What number of scraps are required to get an item as a check.
     The collected scraps are not added to the inventory.
-    You must collect this number of scraps to get 1 randomized item.
-    '0' means the option is disabled and no scraps will be randomized (except mission rewards).
+    You must collect this number of scraps to send 1 randomized item.
+
+    '0' means the option is disabled and no scraps is randomized (except mission rewards).
     """
-    display_name = "Scraps amount"
+    display_name = "Scraps amount as check"
     range_start = 0
     range_end = 5
     default = 1
-    visibility = Visibility.none
+    visibility = Visibility.all
 
 
-class KeyFragments(Range):
-    """
-    Change keys into fragments of keys, instead of directly get a key.
-    Collecting this amount of fragments will craft the associated key.
-    '1' means the option is disabled, because 1 fragment = 1 key.
-    Remember there are 7 keys in the game, 8 in total if the key to access the train is included.
-    If the 'Train access' option is enabled, the key to access the train is affected (40 fragments).
-    If 'Train access' is disabled, there are at most 7x5 = 35 fragments, 8x5 = 40 fragments otherwise.
+class ScrapsDetector(Choice):
     """
-    display_name = "Key fragments amount"
-    range_start = 1
-    range_end = 5
-    default = 1
-    visibility = Visibility.none
+    Add a detector in the game, showing the closest scraps in a UI.
 
+    **No:** Disabled.
 
-class AddCompass(Choice):
-    """
-    Add a compass in the game, that allows a UI showing the closest check to do.
-    This item does not exist in the original game.
-    The following options are provided :
-    - **No compass** : Disabled, the game stays vanilla.
-    - **Compass at start** : The compass is given at the start of the game.
-    - **Compass as check** : The compass is added to the item pool, meaning it must first be found.
+    **Start:** The detector is enabled from the start of the game.
+
+    **Randomized:** The detector is randomized.
     """
-    display_name = "Add compass"
-    option_no_compass = 0
-    option_compass_at_start = 1
-    option_compass_as_check = 2
+    display_name = "Scraps detector"
+    option_no = 0
+    option_start = 1
+    option_randomized = 2
     default = 1
-    visibility = Visibility.none
+    visibility = Visibility.all
 
 
 class ScrapsTracker(DefaultOnToggle):
     """
-    If allowed, the amount of collected scraps will be shown on the map.
+    The number of collected scraps in the region is shown on the map and the UI.
     """
-    display_name = "Allow scraps tracker"
-    visibility = Visibility.none
+    display_name = "Scraps tracker"
+    visibility = Visibility.all
 
 
-class TrainUpgradeFragments(Toggle):
+class BlueprintFragments(Toggle):
     """
-    If allowed, none of the 3 upgrades of the train can be done without collecting a blueprint fragment.
-    These fragments will be added to the item pool : Speed Upgrade ; Damage Upgrade ; Armor Upgrade.
-    The 'Repair' option on the blueprint will remain unchanged.
+    Blueprint fragments must be received to access the 3 upgrades of the train.
+    These fragments are randomized:
+
+    Speed Upgrade ; Damage Upgrade ; Armor Upgrade
+
+    The 'Repair' option on the blueprint is not affected.
     """
-    display_name = "Allow train upgrade fragments"
-    visibility = Visibility.none
+    display_name = "Blueprint fragments"
+    visibility = Visibility.all
 
 
-class RandomStartingWeapon(DefaultOnToggle):
+class KeyFragments(Range):
     """
-    If allowed, the starting weapon will be randomized among the 4 possible guns.
+    Break keys into key fragments.
+    Collecting enough fragments crafts the associated key.
+
+    '1' means the option is disabled (1 fragment = 1 key).
+
+    If the 'Train access' option is disabled, there are at most:
+
+    **7x5 = 35 fragments**
+
+    **8x5 = 40 fragments otherwise**
     """
-    display_name = "Random starting weapon"
-    visibility = Visibility.none
+    display_name = "Key fragments"
+    range_start = 1
+    range_end = 5
+    default = 1
+    visibility = Visibility.all
 
 
 class TrainAccess(Toggle):
     """
-    If allowed, the key allowing the access to the train will be added to the item pool.
-    Meaning the player cannot use the train while the key is not found.
-    Note this option is affected by the "Key fragments amount" option only if enabled.
+    The key to access the train is randomized.
+    This option is affected by the "Key fragments" option if enabled.
     """
     display_name = "Train access"
-    visibility = Visibility.none
+    visibility = Visibility.all
+
+
+class TrainRepairCost(Range):
+    """
+    Set the number of required scraps to repair the train.
+    """
+    display_name = "Repair cost"
+    range_start = 0
+    range_end = 5
+    default = 1
+    visibility = Visibility.all
+
+
+class RandomStartingWeapon(DefaultOnToggle):
+    """
+    Randomize the starting weapon among the 4 possible guns.
+    """
+    display_name = "Random starting weapon"
+    visibility = Visibility.all
 
 
-class PaintCanRule(Choice):
+class PaintCansRule(Choice):
     """
-    Add a rule when a paint can is collected.
-    The following options are provided :
-    - **No rule** : Disabled, the game stays vanilla.
-    - **Randomized** : The paint cans are added to the item pool.
-    - **Vanilla with hints** : The paint cans are not randomized and give hints when collected.
-    - **Random with hints** : The paint cans are randomized and give hints when collected.
+    Add a rule for the paint cans.
+
+    **No:** Disabled.
+
+    **Randomized:** The paint cans are randomized.
+
+    **Hints:** The paint cans are randomized and give hints when received.
+
+    **Potions:** The paint cans are randomized and confer passive effects when received.
     """
-    display_name = "Paint can rule"
-    option_no_rule = 0
+    display_name = "Paint Cans rule"
+    option_no = 0
     option_randomized = 1
-    option_vanilla_with_hints = 2
-    option_random_with_hints = 3
+    option_hints = 2
+    option_potions = 3
     default = 1
-    visibility = Visibility.none
+    visibility = Visibility.all
 
 
-class SplitRemoteExplosive(Choice):
+class SplitRemoteExplosives(Choice):
     """
-    Split the 8 explosives to make up to 8 more checks.
-    The following options are provided :
-    - **Stack of 1** : Split the explosives to 8 stacks of 1.
-    - **Stack of 2** : Split the explosives to 4 stacks of 2.
-    - **Stack of 4** : Split the explosives to 2 stacks of 4.
-    - **Stack of 8** : Split the explosives to 1 stacks of 8 (vanilla).
+    Split the explosives to make up to 8 packs to randomize.
+
+    **1 pack:** 1 pack of 8 (vanilla).
+
+    **2 packs:** 2 packs of 4.
+
+    **4 packs:** 4 packs of 2.
+
+    **8 packs:** 8 packs of 1.
     """
-    display_name = "Paint can rule"
-    option_stack_of_1 = 1
-    option_stack_of_2 = 2
-    option_stack_of_4 = 4
-    option_stack_of_8 = 8
+    display_name = "Split Remote Explosives"
+    option_1_pack = 1
+    option_2_packs = 2
+    option_4_packs = 4
+    option_8_packs = 8
     default = 1
-    visibility = Visibility.none
+    visibility = Visibility.all
 
 
 class UnscrapTrap(Range):
     """
-    What percent of traps removing 5 scraps from the inventory will be added to the item pool.
+    What percent of traps removing 5 scraps from the inventory are randomized.
     """
     display_name = "Unscrap-trap %"
     range_start = 0
-    range_end = 20
+    range_end = 10
     default = 0
     visibility = Visibility.all
 
 
 class DerailedTrap(Range):
     """
-    What percent of traps reducing the train HP by 40 will be added to the item pool.
+    What percent of traps reducing the train HP by 30 are randomized.
     """
     display_name = "Derailed-trap %"
     range_start = 0
-    range_end = 20
+    range_end = 10
     default = 0
-    visibility = Visibility.none
-
-
-class GuruTrap(Range):
-    """
-    What percent of traps spawning a cultist near the player for a short while will be added to the item pool.
-    """
-    display_name = "Guru-trap %"
-    range_start = 0
-    range_end = 20
-    default = 0
-    visibility = Visibility.none
+    visibility = Visibility.all
 
 
 @dataclass
 class CCCharlesOptions(PerGameCommonOptions):
     scraps_amount_as_check: ScrapsAmountAsCheck
-    key_fragments: KeyFragments
-    add_compass: AddCompass
+    scraps_detector: ScrapsDetector
     scraps_tracker: ScrapsTracker
-    train_upgrade_fragments: TrainUpgradeFragments
-    random_starting_weapon: RandomStartingWeapon
+    blueprint_fragments: BlueprintFragments
+    key_fragments: KeyFragments
     train_access: TrainAccess
-    paint_can_rule: PaintCanRule
-    split_remote_explosive: SplitRemoteExplosive
+    train_repair_cost: TrainRepairCost
+    random_starting_weapon: RandomStartingWeapon
+    paint_cans_rule: PaintCansRule
+    split_remote_explosives: SplitRemoteExplosives
     unscrap_trap: UnscrapTrap
     derailed_trap: DerailedTrap
-    guru_trap: GuruTrap
     death_link: DeathLink
diff --git a/worlds/cccharles/Regions.py b/worlds/cccharles/Regions.py
index 0232006d0edb..9e5364678bf3 100644
--- a/worlds/cccharles/Regions.py
+++ b/worlds/cccharles/Regions.py
@@ -1,96 +1,107 @@
 from BaseClasses import MultiWorld, Region, ItemClassification
 from . import CCCharlesItem
 from .Options import CCCharlesOptions
-from .Locations import CCCharlesLocation, loc_start_camp, loc_tony_tiddle_mission, loc_tutorial_candice_mission, \
-    loc_swamp, loc_lizbeth_murkwater_mission, loc_daryl_mission, loc_south_house, loc_helen_mission, \
-    loc_sgt_flint_mission, loc_south_mine_outside, loc_south_mine_inside, loc_theodore_mission, loc_canyon_theodore, \
-    loc_watchtower, loc_boulder_field, loc_house_sasha_mission, loc_house_santiago, loc_port_santiago_mission, \
-    loc_trench_house, loc_doll_woods, loc_lost_stairs, loc_east_house, loc_explosive_training, \
-    loc_john_smith_mission, loc_greg_mission, loc_claire_mission, loc_north_mine_outside, loc_north_mine_inside, \
-    loc_wood_bridge, loc_paul_mission, loc_gertrude_mission, loc_west_beach, loc_church, loc_refuge_gale_mission, \
-    loc_caravan, loc_trailer_house, loc_ronny_mission, loc_north_beach, loc_mine_shaft, loc_mob_camp, \
+from .Locations import (
+    CCCharlesLocation, loc_start_camp, loc_tony_tiddle_mission, loc_barn, loc_candice_mission, \
+    loc_tutorial_house, loc_swamp_edges, loc_swamp_mission, loc_junkyard_area, loc_south_house, \
+    loc_junkyard_shed, loc_military_base, loc_south_mine_outside, loc_south_mine_inside, \
+    loc_middle_station, loc_canyon, loc_watchtower, loc_boulder_field, loc_haunted_house, \
+    loc_santiago_house, loc_port, loc_trench_house, loc_doll_woods, loc_lost_stairs, loc_east_house, \
+    loc_rockets_testing_ground, loc_rockets_testing_bunker, loc_workshop, loc_east_tower, \
+    loc_lighthouse, loc_north_mine_outside, loc_north_mine_inside, loc_wood_bridge, loc_museum, \
+    loc_barbed_shelter, loc_west_beach, loc_church, loc_west_cottage, loc_caravan, loc_trailer_cabin, \
+    loc_towers, loc_north_beach, loc_mine_shaft, loc_mob_camp, loc_mob_camp_locked_room, \
     loc_mine_elevator_exit, loc_mountain_ruin_outside, loc_mountain_ruin_inside, loc_prism_temple, \
-    loc_field_pickle_lady_mission, loc_shrine_near_temple, loc_morse_bunker
+    loc_pickle_val, loc_shrine_near_temple, loc_morse_bunker
+)
 
 
 class CCCharlesRegion(Region):
     regions = []
 
 def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int):
-    menu_region = Region("Menu", player, world, "Eugene's Boat")
+    menu_region = Region("Menu", player, world, "Aranearum")
     world.regions.append(menu_region)
 
     start_camp_region = Region("Start Camp", player, world)
     start_camp_region.add_locations(loc_start_camp, CCCharlesLocation)
     world.regions.append(start_camp_region)
 
-    tony_tiddle_barn_region = Region("Tony Tiddle Barn", player, world)
-    tony_tiddle_barn_region.add_locations(loc_tony_tiddle_mission, CCCharlesLocation)
-    world.regions.append(tony_tiddle_barn_region)
+    tony_tiddle_mission_region = Region("Tony Tiddle Mission", player, world)
+    tony_tiddle_mission_region.add_locations(loc_tony_tiddle_mission, CCCharlesLocation)
+    world.regions.append(tony_tiddle_mission_region)
 
-    candice_house_region = Region("Candice House", player, world)
-    candice_house_region.add_locations(loc_tutorial_candice_mission, CCCharlesLocation)
-    world.regions.append(candice_house_region)
+    barn_region = Region("Barn", player, world)
+    barn_region.add_locations(loc_barn, CCCharlesLocation)
+    world.regions.append(barn_region)
 
-    swamp_region = Region("Swamp", player, world)
-    swamp_region.add_locations(loc_swamp, CCCharlesLocation)
-    world.regions.append(swamp_region)
+    candice_mission_region = Region("Candice Mission", player, world)
+    candice_mission_region.add_locations(loc_candice_mission, CCCharlesLocation)
+    world.regions.append(candice_mission_region)
 
-    shack_region = Region("Shack", player, world)
-    shack_region.add_locations(loc_lizbeth_murkwater_mission, CCCharlesLocation)
-    world.regions.append(shack_region)
+    tutorial_house_region = Region("Tutorial House", player, world)
+    tutorial_house_region.add_locations(loc_tutorial_house, CCCharlesLocation)
+    world.regions.append(tutorial_house_region)
 
-    junkyard_region = Region("Junkyard", player, world)
-    junkyard_region.add_locations(loc_daryl_mission, CCCharlesLocation)
-    world.regions.append(junkyard_region)
+    swamp_edges_region = Region("Swamp Edges", player, world)
+    swamp_edges_region.add_locations(loc_swamp_edges, CCCharlesLocation)
+    world.regions.append(swamp_edges_region)
 
-    dianne_house_region = Region("Dianne House", player, world)
-    dianne_house_region.add_locations(loc_south_house, CCCharlesLocation)
-    world.regions.append(dianne_house_region)
+    swamp_mission_region = Region("Swamp Mission", player, world)
+    swamp_mission_region.add_locations(loc_swamp_mission, CCCharlesLocation)
+    world.regions.append(swamp_mission_region)
 
-    helen_house_region = Region("Helen House", player, world)
-    helen_house_region.add_locations(loc_helen_mission, CCCharlesLocation)
-    world.regions.append(helen_house_region)
+    junkyard_area_region = Region("Junkyard Area", player, world)
+    junkyard_area_region.add_locations(loc_junkyard_area, CCCharlesLocation)
+    world.regions.append(junkyard_area_region)
+
+    south_house_region = Region("South House", player, world)
+    south_house_region.add_locations(loc_south_house, CCCharlesLocation)
+    world.regions.append(south_house_region)
+
+    junkyard_shed_region = Region("Junkyard Shed", player, world)
+    junkyard_shed_region.add_locations(loc_junkyard_shed, CCCharlesLocation)
+    world.regions.append(junkyard_shed_region)
 
     military_base_region = Region("Military Base", player, world)
-    military_base_region.add_locations(loc_sgt_flint_mission, CCCharlesLocation)
+    military_base_region.add_locations(loc_military_base, CCCharlesLocation)
     world.regions.append(military_base_region)
 
-    outside_south_mine_region = Region("Outside South Mine", player, world)
-    outside_south_mine_region.add_locations(loc_south_mine_outside, CCCharlesLocation)
-    world.regions.append(outside_south_mine_region)
+    south_mine_outside_region = Region("South Mine Outside", player, world)
+    south_mine_outside_region.add_locations(loc_south_mine_outside, CCCharlesLocation)
+    world.regions.append(south_mine_outside_region)
 
-    inside_south_mine_region = Region("Inside South Mine", player, world)
-    inside_south_mine_region.add_locations(loc_south_mine_inside, CCCharlesLocation)
-    world.regions.append(inside_south_mine_region)
+    south_mine_inside_region = Region("South Mine Inside", player, world)
+    south_mine_inside_region.add_locations(loc_south_mine_inside, CCCharlesLocation)
+    world.regions.append(south_mine_inside_region)
 
-    theodore_station_region = Region("Theodore Station", player, world)
-    theodore_station_region.add_locations(loc_theodore_mission, CCCharlesLocation)
-    world.regions.append(theodore_station_region)
+    middle_station_region = Region("Middle Station", player, world)
+    middle_station_region.add_locations(loc_middle_station, CCCharlesLocation)
+    world.regions.append(middle_station_region)
 
-    theodore_canyon_region = Region("Theodore Canyon", player, world)
-    theodore_canyon_region.add_locations(loc_canyon_theodore, CCCharlesLocation)
-    world.regions.append(theodore_canyon_region)
+    canyon_region = Region("Canyon", player, world)
+    canyon_region.add_locations(loc_canyon, CCCharlesLocation)
+    world.regions.append(canyon_region)
 
     watchtower_region = Region("Watchtower", player, world)
     watchtower_region.add_locations(loc_watchtower, CCCharlesLocation)
     world.regions.append(watchtower_region)
 
-    ghost_boulder_field_region = Region("Ghost Boulder Field", player, world)
-    ghost_boulder_field_region.add_locations(loc_boulder_field, CCCharlesLocation)
-    world.regions.append(ghost_boulder_field_region)
+    boulder_field_region = Region("Boulder Field", player, world)
+    boulder_field_region.add_locations(loc_boulder_field, CCCharlesLocation)
+    world.regions.append(boulder_field_region)
 
-    sasha_house_region = Region("Sasha House", player, world)
-    sasha_house_region.add_locations(loc_house_sasha_mission, CCCharlesLocation)
-    world.regions.append(sasha_house_region)
+    haunted_house_region = Region("Haunted House", player, world)
+    haunted_house_region.add_locations(loc_haunted_house, CCCharlesLocation)
+    world.regions.append(haunted_house_region)
 
     santiago_house_region = Region("Santiago House", player, world)
-    santiago_house_region.add_locations(loc_house_santiago, CCCharlesLocation)
+    santiago_house_region.add_locations(loc_santiago_house, CCCharlesLocation)
     world.regions.append(santiago_house_region)
 
-    santiago_port_region = Region("Santiago Port", player, world)
-    santiago_port_region.add_locations(loc_port_santiago_mission, CCCharlesLocation)
-    world.regions.append(santiago_port_region)
+    port_region = Region("Port", player, world)
+    port_region.add_locations(loc_port, CCCharlesLocation)
+    world.regions.append(port_region)
 
     trench_house_region = Region("Trench House", player, world)
     trench_house_region.add_locations(loc_trench_house, CCCharlesLocation)
@@ -100,113 +111,121 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int):
     doll_woods_region.add_locations(loc_doll_woods, CCCharlesLocation)
     world.regions.append(doll_woods_region)
 
-    forest_lost_stairs_region = Region("Forest Lost Stairs", player, world)
-    forest_lost_stairs_region.add_locations(loc_lost_stairs, CCCharlesLocation)
-    world.regions.append(forest_lost_stairs_region)
+    lost_stairs_region = Region("Lost Stairs", player, world)
+    lost_stairs_region.add_locations(loc_lost_stairs, CCCharlesLocation)
+    world.regions.append(lost_stairs_region)
 
-    far_east_house_region = Region("Far East House", player, world)
-    far_east_house_region.add_locations(loc_east_house, CCCharlesLocation)
-    world.regions.append(far_east_house_region)
+    east_house_region = Region("East House", player, world)
+    east_house_region.add_locations(loc_east_house, CCCharlesLocation)
+    world.regions.append(east_house_region)
 
-    explosive_training_region = Region("Explosive Training", player, world)
-    explosive_training_region.add_locations(loc_explosive_training, CCCharlesLocation)
-    world.regions.append(explosive_training_region)
+    rockets_testing_ground_region = Region("Rockets Testing Ground", player, world)
+    rockets_testing_ground_region.add_locations(loc_rockets_testing_ground, CCCharlesLocation)
+    world.regions.append(rockets_testing_ground_region)
 
-    john_smith_workshop_region = Region("John Smith Workshop", player, world)
-    john_smith_workshop_region.add_locations(loc_john_smith_mission, CCCharlesLocation)
-    world.regions.append(john_smith_workshop_region)
+    rockets_testing_bunker_region = Region("Rockets Testing Bunker", player, world)
+    rockets_testing_bunker_region.add_locations(loc_rockets_testing_bunker, CCCharlesLocation)
+    world.regions.append(rockets_testing_bunker_region)
 
-    greg_tower_region = Region("Greg Tower", player, world)
-    greg_tower_region.add_locations(loc_greg_mission, CCCharlesLocation)
-    world.regions.append(greg_tower_region)
+    workshop_region = Region("Workshop", player, world)
+    workshop_region.add_locations(loc_workshop, CCCharlesLocation)
+    world.regions.append(workshop_region)
+
+    east_tower_region = Region("East Tower", player, world)
+    east_tower_region.add_locations(loc_east_tower, CCCharlesLocation)
+    world.regions.append(east_tower_region)
 
     lighthouse_region = Region("Lighthouse", player, world)
-    lighthouse_region.add_locations(loc_claire_mission, CCCharlesLocation)
+    lighthouse_region.add_locations(loc_lighthouse, CCCharlesLocation)
     world.regions.append(lighthouse_region)
 
-    outside_north_mine_region = Region("Outside North Mine", player, world)
-    outside_north_mine_region.add_locations(loc_north_mine_outside, CCCharlesLocation)
-    world.regions.append(outside_north_mine_region)
+    north_mine_outside_region = Region("North Mine Outside", player, world)
+    north_mine_outside_region.add_locations(loc_north_mine_outside, CCCharlesLocation)
+    world.regions.append(north_mine_outside_region)
 
-    inside_north_mine_region = Region("Inside North Mine", player, world)
-    inside_north_mine_region.add_locations(loc_north_mine_inside, CCCharlesLocation)
-    world.regions.append(inside_north_mine_region)
+    north_mine_inside_region = Region("North Mine Inside", player, world)
+    north_mine_inside_region.add_locations(loc_north_mine_inside, CCCharlesLocation)
+    world.regions.append(north_mine_inside_region)
 
     wood_bridge_region = Region("Wood Bridge", player, world)
     wood_bridge_region.add_locations(loc_wood_bridge, CCCharlesLocation)
     world.regions.append(wood_bridge_region)
 
-    paul_museum_region = Region("Paul Museum", player, world)
-    paul_museum_region.add_locations(loc_paul_mission, CCCharlesLocation)
-    world.regions.append(paul_museum_region)
+    museum_region = Region("Museum", player, world)
+    museum_region.add_locations(loc_museum, CCCharlesLocation)
+    world.regions.append(museum_region)
 
-    gertrude_base_region = Region("Gertrude Base", player, world)
-    gertrude_base_region.add_locations(loc_gertrude_mission, CCCharlesLocation)
-    world.regions.append(gertrude_base_region)
+    barbed_shelter_region = Region("Barbed Shelter", player, world)
+    barbed_shelter_region.add_locations(loc_barbed_shelter, CCCharlesLocation)
+    world.regions.append(barbed_shelter_region)
 
-    beach_region = Region("Beach", player, world)
-    beach_region.add_locations(loc_west_beach, CCCharlesLocation)
-    world.regions.append(beach_region)
+    west_beach_region = Region("West Beach", player, world)
+    west_beach_region.add_locations(loc_west_beach, CCCharlesLocation)
+    world.regions.append(west_beach_region)
 
     church_region = Region("Church", player, world)
     church_region.add_locations(loc_church, CCCharlesLocation)
     world.regions.append(church_region)
 
-    gale_house_region = Region("Gale House", player, world)
-    gale_house_region.add_locations(loc_refuge_gale_mission, CCCharlesLocation)
-    world.regions.append(gale_house_region)
+    west_cottage_region = Region("West Cottage", player, world)
+    west_cottage_region.add_locations(loc_west_cottage, CCCharlesLocation)
+    world.regions.append(west_cottage_region)
 
     caravan_region = Region("Caravan", player, world)
     caravan_region.add_locations(loc_caravan, CCCharlesLocation)
     world.regions.append(caravan_region)
 
-    abandoned_house_region = Region("Abandoned House", player, world)
-    abandoned_house_region.add_locations(loc_trailer_house, CCCharlesLocation)
-    world.regions.append(abandoned_house_region)
+    trailer_cabin_region = Region("Trailer Cabin", player, world)
+    trailer_cabin_region.add_locations(loc_trailer_cabin, CCCharlesLocation)
+    world.regions.append(trailer_cabin_region)
 
-    ronny_towers_region = Region("Ronny Towers", player, world)
-    ronny_towers_region.add_locations(loc_ronny_mission, CCCharlesLocation)
-    world.regions.append(ronny_towers_region)
+    towers_region = Region("Towers", player, world)
+    towers_region.add_locations(loc_towers, CCCharlesLocation)
+    world.regions.append(towers_region)
 
-    north_frank_fisher_region = Region("North Frank Fisher", player, world)
-    north_frank_fisher_region.add_locations(loc_north_beach, CCCharlesLocation)
-    world.regions.append(north_frank_fisher_region)
+    north_beach_region = Region("North beach", player, world)
+    north_beach_region.add_locations(loc_north_beach, CCCharlesLocation)
+    world.regions.append(north_beach_region)
 
-    hidden_hole_region = Region("Hidden Hole", player, world)
-    hidden_hole_region.add_locations(loc_mine_shaft, CCCharlesLocation)
-    world.regions.append(hidden_hole_region)
+    mine_shaft_region = Region("Mine Shaft", player, world)
+    mine_shaft_region.add_locations(loc_mine_shaft, CCCharlesLocation)
+    world.regions.append(mine_shaft_region)
 
     mob_camp_region = Region("Mob Camp", player, world)
     mob_camp_region.add_locations(loc_mob_camp, CCCharlesLocation)
     world.regions.append(mob_camp_region)
 
+    mob_camp_locked_room_region = Region("Mob Camp Locked Room", player, world)
+    mob_camp_locked_room_region.add_locations(loc_mob_camp_locked_room, CCCharlesLocation)
+    world.regions.append(mob_camp_locked_room_region)
+
     mine_elevator_exit_region = Region("Mine Elevator Exit", player, world)
     mine_elevator_exit_region.add_locations(loc_mine_elevator_exit, CCCharlesLocation)
     world.regions.append(mine_elevator_exit_region)
 
-    outside_mountain_ruin_region = Region("Outside Mountain Ruin", player, world)
-    outside_mountain_ruin_region.add_locations(loc_mountain_ruin_outside, CCCharlesLocation)
-    world.regions.append(outside_mountain_ruin_region)
+    mountain_ruin_outside_region = Region("Mountain Ruin Outside", player, world)
+    mountain_ruin_outside_region.add_locations(loc_mountain_ruin_outside, CCCharlesLocation)
+    world.regions.append(mountain_ruin_outside_region)
 
-    inside_mountain_ruin_region = Region("Inside Mountain Ruin", player, world)
-    inside_mountain_ruin_region.add_locations(loc_mountain_ruin_inside, CCCharlesLocation)
-    world.regions.append(inside_mountain_ruin_region)
+    mountain_ruin_inside_region = Region("Mountain Ruin Inside", player, world)
+    mountain_ruin_inside_region.add_locations(loc_mountain_ruin_inside, CCCharlesLocation)
+    world.regions.append(mountain_ruin_inside_region)
 
     prism_temple_region = Region("Prism Temple", player, world)
     prism_temple_region.add_locations(loc_prism_temple, CCCharlesLocation)
     world.regions.append(prism_temple_region)
 
-    pickle_lady_house_region = Region("Pickle Lady House", player, world)
-    pickle_lady_house_region.add_locations(loc_field_pickle_lady_mission, CCCharlesLocation)
-    world.regions.append(pickle_lady_house_region)
+    pickle_val_region = Region("Pickle Val", player, world)
+    pickle_val_region.add_locations(loc_pickle_val, CCCharlesLocation)
+    world.regions.append(pickle_val_region)
 
-    shrine_near_temple_region = Region("Temple Shrine", player, world)
+    shrine_near_temple_region = Region("Shrine Near Temple", player, world)
     shrine_near_temple_region.add_locations(loc_shrine_near_temple, CCCharlesLocation)
     world.regions.append(shrine_near_temple_region)
 
-    morse_refuge_region = Region("Morse Refuge", player, world)
-    morse_refuge_region.add_locations(loc_morse_bunker, CCCharlesLocation)
-    world.regions.append(morse_refuge_region)
+    morse_bunker_region = Region("Morse Bunker", player, world)
+    morse_bunker_region.add_locations(loc_morse_bunker, CCCharlesLocation)
+    world.regions.append(morse_bunker_region)
 
     # Include Victory event
     loc_final_boss = CCCharlesLocation(player, "Final Boss", None, menu_region)
@@ -214,50 +233,62 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int):
 
     menu_region.locations.append(loc_final_boss)
 
+    # Connect the Regions by named Entrances that must have access Rules
     menu_region.connect(start_camp_region)
-    menu_region.connect(tony_tiddle_barn_region)
-    menu_region.connect(candice_house_region)
-    menu_region.connect(swamp_region)
-    menu_region.connect(shack_region)
-    menu_region.connect(junkyard_region)
-    menu_region.connect(dianne_house_region)
-    menu_region.connect(helen_house_region)
+    menu_region.connect(tony_tiddle_mission_region)
+    menu_region.connect(barn_region)
+    tony_tiddle_mission_region.connect(barn_region, "Barn Door")
+    menu_region.connect(candice_mission_region)
+    menu_region.connect(tutorial_house_region)
+    candice_mission_region.connect(tutorial_house_region, "Tutorial House Door")
+    menu_region.connect(swamp_edges_region)
+    menu_region.connect(swamp_mission_region)
+    menu_region.connect(junkyard_area_region)
+    menu_region.connect(south_house_region)
+    menu_region.connect(junkyard_shed_region)
     menu_region.connect(military_base_region)
-    menu_region.connect(outside_south_mine_region)
-    menu_region.connect(inside_south_mine_region)
-    menu_region.connect(theodore_station_region)
-    menu_region.connect(theodore_canyon_region)
+    menu_region.connect(south_mine_outside_region)
+    menu_region.connect(south_mine_inside_region)
+    south_mine_outside_region.connect(south_mine_inside_region, "South Mine Gate")
+    menu_region.connect(middle_station_region)
+    menu_region.connect(canyon_region)
     menu_region.connect(watchtower_region)
-    menu_region.connect(ghost_boulder_field_region)
-    menu_region.connect(sasha_house_region)
+    menu_region.connect(boulder_field_region)
+    menu_region.connect(haunted_house_region)
     menu_region.connect(santiago_house_region)
-    menu_region.connect(santiago_port_region)
+    menu_region.connect(port_region)
     menu_region.connect(trench_house_region)
     menu_region.connect(doll_woods_region)
-    menu_region.connect(forest_lost_stairs_region)
-    menu_region.connect(far_east_house_region)
-    menu_region.connect(explosive_training_region)
-    menu_region.connect(john_smith_workshop_region)
-    menu_region.connect(greg_tower_region)
+    menu_region.connect(lost_stairs_region)
+    menu_region.connect(east_house_region)
+    menu_region.connect(rockets_testing_ground_region)
+    menu_region.connect(rockets_testing_bunker_region)
+    rockets_testing_ground_region.connect(rockets_testing_bunker_region, "Stuck Bunker Door")
+    menu_region.connect(workshop_region)
+    menu_region.connect(east_tower_region)
     menu_region.connect(lighthouse_region)
-    menu_region.connect(outside_north_mine_region)
-    menu_region.connect(inside_north_mine_region)
+    menu_region.connect(north_mine_outside_region)
+    menu_region.connect(north_mine_inside_region)
+    north_mine_outside_region.connect(north_mine_inside_region, "North Mine Gate")
     menu_region.connect(wood_bridge_region)
-    menu_region.connect(paul_museum_region)
-    menu_region.connect(gertrude_base_region)
-    menu_region.connect(beach_region)
+    menu_region.connect(museum_region)
+    menu_region.connect(barbed_shelter_region)
+    menu_region.connect(west_beach_region)
     menu_region.connect(church_region)
-    menu_region.connect(gale_house_region)
+    menu_region.connect(west_cottage_region)
     menu_region.connect(caravan_region)
-    menu_region.connect(abandoned_house_region)
-    menu_region.connect(ronny_towers_region)
-    menu_region.connect(north_frank_fisher_region)
-    menu_region.connect(hidden_hole_region)
+    menu_region.connect(trailer_cabin_region)
+    menu_region.connect(towers_region)
+    menu_region.connect(north_beach_region)
+    menu_region.connect(mine_shaft_region)
     menu_region.connect(mob_camp_region)
+    menu_region.connect(mob_camp_locked_room_region)
+    mob_camp_region.connect(mob_camp_locked_room_region, 'Mob Camp Locked Door')
     menu_region.connect(mine_elevator_exit_region)
-    menu_region.connect(outside_mountain_ruin_region)
-    menu_region.connect(inside_mountain_ruin_region)
+    menu_region.connect(mountain_ruin_outside_region)
+    menu_region.connect(mountain_ruin_inside_region)
+    mountain_ruin_outside_region.connect(mountain_ruin_inside_region, "Mountain Ruin Gate")
     menu_region.connect(prism_temple_region)
-    menu_region.connect(pickle_lady_house_region)
+    menu_region.connect(pickle_val_region)
     menu_region.connect(shrine_near_temple_region)
-    menu_region.connect(morse_refuge_region)
+    menu_region.connect(morse_bunker_region)
diff --git a/worlds/cccharles/Rules.py b/worlds/cccharles/Rules.py
index acfbe89e24a5..5a7bc3a05727 100644
--- a/worlds/cccharles/Rules.py
+++ b/worlds/cccharles/Rules.py
@@ -2,322 +2,208 @@
 from ..generic.Rules import set_rule
 from .Options import CCCharlesOptions
 
-# Go mode : egg_green + egg_blue + egg_red + temple_key + bug_spray (+ remote_explosive x8 but the base game ignores it)
+# Go mode : Green Egg + Blue Egg + Ref Egg + Temple Key + Bug Spray (+ Remote Explosive x8 but the base game ignores it)
 
 def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None:
-    # Tony
-    set_rule(world.get_location("barn_scraps_1", player),
-        lambda state: state.has("Barn Key", player))
-    set_rule(world.get_location("barn_scraps_2", player),
-        lambda state: state.has("Barn Key", player))
-    set_rule(world.get_location("barn_scraps_3", player),
-        lambda state: state.has("Barn Key", player))
-    set_rule(world.get_location("barn_scraps_4", player),
-        lambda state: state.has("Barn Key", player))
-    set_rule(world.get_location("barn_scraps_5", player),
-        lambda state: state.has("Barn Key", player))
-    set_rule(world.get_location("barn_scraps_6", player),
-        lambda state: state.has("Barn Key", player))
-    set_rule(world.get_location("barn_scraps_7", player),
-        lambda state: state.has("Barn Key", player))
-    set_rule(world.get_location("barn_scraps_8", player),
-        lambda state: state.has("Barn Key", player))
-    set_rule(world.get_location("barn_scraps_9", player),
+    # Tony Tiddle
+    set_rule(world.get_entrance("Barn Door", player),
         lambda state: state.has("Barn Key", player))
 
     # Candice
-    set_rule(world.get_location("tutorial_scraps_1", player),
-        lambda state: state.has("Candice's Key", player))
-    set_rule(world.get_location("tutorial_scraps_2", player),
-        lambda state: state.has("Candice's Key", player))
-    set_rule(world.get_location("tutorial_scraps_3", player),
-        lambda state: state.has("Candice's Key", player))
-    set_rule(world.get_location("tutorial_scraps_4", player),
-        lambda state: state.has("Candice's Key", player))
-    set_rule(world.get_location("tutorial_scraps_5", player),
-        lambda state: state.has("Candice's Key", player))
-    set_rule(world.get_location("tutorial_scraps_6", player),
-        lambda state: state.has("Candice's Key", player))
-    set_rule(world.get_location("tutorial_scraps_7", player),
-        lambda state: state.has("Candice's Key", player))
-    set_rule(world.get_location("tutorial_scraps_8", player),
-        lambda state: state.has("Candice's Key", player))
-    set_rule(world.get_location("tutorial_scraps_9", player),
+    set_rule(world.get_entrance("Tutorial House Door", player),
         lambda state: state.has("Candice's Key", player))
 
-    # Lizbeth
-    set_rule(world.get_location("swamp_lizbeth_murkwater_mission_end", player),
+    # Lizbeth Murkwater
+    set_rule(world.get_location("Swamp Lizbeth Murkwater Mission End", player),
         lambda state: state.has("Dead Fish", player))
 
     # Daryl
-    set_rule(world.get_location("junkyard_daryl_ancient_tablet", player),
+    set_rule(world.get_location("Junkyard Area Chest Ancient Tablet", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("junkyard_daryl_mission_end", player),
+    set_rule(world.get_location("Junkyard Area Daryl Mission End", player),
         lambda state: state.has("Ancient Tablet", player))
 
     # South House
-    set_rule(world.get_location("south_house_chest_scraps_1", player),
+    set_rule(world.get_location("South House Chest Scraps 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("south_house_chest_scraps_2", player),
+    set_rule(world.get_location("South House Chest Scraps 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("south_house_chest_scraps_3", player),
+    set_rule(world.get_location("South House Chest Scraps 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("south_house_chest_scraps_4", player),
+    set_rule(world.get_location("South House Chest Scraps 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("south_house_chest_scraps_5", player),
+    set_rule(world.get_location("South House Chest Scraps 5", player),
          lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("south_house_chest_scraps_6", player),
+    set_rule(world.get_location("South House Chest Scraps 6", player),
          lambda state: state.has("Lockpicks", player))
 
     # South Mine
-    set_rule(world.get_location("south_mine_inside_scraps_1", player),
-        lambda state: state.has("South Mine Key", player))
-    set_rule(world.get_location("south_mine_inside_scraps_2", player),
-        lambda state: state.has("South Mine Key", player))
-    set_rule(world.get_location("south_mine_inside_scraps_3", player),
-        lambda state: state.has("South Mine Key", player))
-    set_rule(world.get_location("south_mine_inside_scraps_4", player),
-        lambda state: state.has("South Mine Key", player))
-    set_rule(world.get_location("south_mine_inside_scraps_5", player),
-        lambda state: state.has("South Mine Key", player))
-    set_rule(world.get_location("south_mine_inside_scraps_6", player),
-        lambda state: state.has("South Mine Key", player))
-    set_rule(world.get_location("south_mine_inside_scraps_7", player),
-        lambda state: state.has("South Mine Key", player))
-    set_rule(world.get_location("south_mine_inside_scraps_8", player),
-        lambda state: state.has("South Mine Key", player))
-    set_rule(world.get_location("south_mine_inside_scraps_9", player),
+    set_rule(world.get_entrance("South Mine Gate", player),
         lambda state: state.has("South Mine Key", player))
-    set_rule(world.get_location("south_mine_inside_paint_can_green", player),
-        lambda state: state.has("South Mine Key", player) and
-            state.has("Lockpicks", player))
+
+    set_rule(world.get_location("South Mine Inside Green Paint Can", player),
+        lambda state: state.has("Lockpicks", player))
 
     # Theodore
-    set_rule(world.get_location("station_theodore_mission_end", player),
+    set_rule(world.get_location("Middle Station Theodore Mission End", player),
         lambda state: state.has("Blue Box", player))
 
     # Watchtower
-    set_rule(world.get_location("watchtower_paint_can_pink", player),
+    set_rule(world.get_location("Watchtower Pink Paint Can", player),
         lambda state: state.has("Lockpicks", player))
 
     # Sasha
-    set_rule(world.get_location("house_sasha_mission_end", player),
+    set_rule(world.get_location("Haunted House Sasha Mission End", player),
             lambda state: state.has("Page Drawing", player, 8))
 
     # Santiago
-    set_rule(world.get_location("port_santiago_mission_end", player),
+    set_rule(world.get_location("Port Santiago Mission End", player),
         lambda state: state.has("Journal", player))
 
     # Trench House
-    set_rule(world.get_location("trench_house_chest_scraps_1", player),
+    set_rule(world.get_location("Trench House Chest Scraps 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("trench_house_chest_scraps_2", player),
+    set_rule(world.get_location("Trench House Chest Scraps 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("trench_house_chest_scraps_3", player),
+    set_rule(world.get_location("Trench House Chest Scraps 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("trench_house_chest_scraps_4", player),
+    set_rule(world.get_location("Trench House Chest Scraps 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("trench_house_chest_scraps_5", player),
+    set_rule(world.get_location("Trench House Chest Scraps 5", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("trench_house_chest_scraps_6", player),
+    set_rule(world.get_location("Trench House Chest Scraps 6", player),
         lambda state: state.has("Lockpicks", player))
 
     # East House
-    set_rule(world.get_location("east_house_chest_scraps_1", player),
+    set_rule(world.get_location("East House Chest Scraps 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("east_house_chest_scraps_2", player),
+    set_rule(world.get_location("East House Chest Scraps 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("east_house_chest_scraps_3", player),
+    set_rule(world.get_location("East House Chest Scraps 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("east_house_chest_scraps_4", player),
+    set_rule(world.get_location("East House Chest Scraps 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("east_house_chest_scraps_5", player),
+    set_rule(world.get_location("East House Chest Scraps 5", player),
         lambda state: state.has("Lockpicks", player))
 
-    # Explosive Training
-    set_rule(world.get_location("explosive_training_scraps_11", player),
-        lambda state: state.has("Timed Dynamite", player))
-    set_rule(world.get_location("explosive_training_scraps_12", player),
-        lambda state: state.has("Timed Dynamite", player))
-    set_rule(world.get_location("explosive_training_box_of_rocket", player),
+    # Rocket Testing Bunker
+    set_rule(world.get_entrance("Stuck Bunker Door", player),
         lambda state: state.has("Timed Dynamite", player))
 
-    # John
-    set_rule(world.get_location("workshop_john_smith_mission_end", player),
-         lambda state: state.has("Box of Rocket", player))
+    # John Smith
+    set_rule(world.get_location("Workshop John Smith Mission End", player),
+         lambda state: state.has("Box of Rockets", player))
 
     # Claire
-    set_rule(world.get_location("lighthouse_claire_mission_end", player),
+    set_rule(world.get_location("Lighthouse Claire Mission End", player),
         lambda state: state.has("Breaker", player, 4))
 
     # North Mine
-    set_rule(world.get_location("north_mine_inside_scraps_1", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_2", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_3", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_4", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_5", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_6", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_7", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_8", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_9", player),
+    set_rule(world.get_entrance("North Mine Gate", player),
         lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_10", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_11", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_12", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_scraps_13", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_blue_egg", player),
-        lambda state: state.has("North Mine Key", player))
-    set_rule(world.get_location("north_mine_inside_paint_can_blue", player),
-        lambda state: state.has("North Mine Key", player) and
-            state.has("Lockpicks", player))
+
+    set_rule(world.get_location("North Mine Inside Blue Paint Can", player),
+        lambda state: state.has("Lockpicks", player))
 
     # Paul
-    set_rule(world.get_location("museum_paul_mission_end", player),
+    set_rule(world.get_location("Museum Paul Mission End", player),
         lambda state: state.has("Remote Explosive x8", player))
         # lambda state: state.has("Remote Explosive", player, 8)) # TODO : Add an option to split remote explosives
 
     # West Beach
-    set_rule(world.get_location("west_beach_chest_scraps_1", player),
+    set_rule(world.get_location("West Beach Chest Scraps 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("west_beach_chest_scraps_2", player),
+    set_rule(world.get_location("West Beach Chest Scraps 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("west_beach_chest_scraps_3", player),
+    set_rule(world.get_location("West Beach Chest Scraps 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("west_beach_chest_scraps_4", player),
+    set_rule(world.get_location("West Beach Chest Scraps 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("west_beach_chest_scraps_5", player),
+    set_rule(world.get_location("West Beach Chest Scraps 5", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("west_beach_chest_scraps_6", player),
+    set_rule(world.get_location("West Beach Chest Scraps 6", player),
         lambda state: state.has("Lockpicks", player))
 
     # Caravan
-    set_rule(world.get_location("caravan_chest_scraps_1", player),
+    set_rule(world.get_location("Caravan Chest Scraps 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("caravan_chest_scraps_2", player),
+    set_rule(world.get_location("Caravan Chest Scraps 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("caravan_chest_scraps_3", player),
+    set_rule(world.get_location("Caravan Chest Scraps 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("caravan_chest_scraps_4", player),
+    set_rule(world.get_location("Caravan Chest Scraps 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("caravan_chest_scraps_5", player),
+    set_rule(world.get_location("Caravan Chest Scraps 5", player),
         lambda state: state.has("Lockpicks", player))
 
     # Ronny
-    set_rule(world.get_location("towers_ronny_mission_end", player),
+    set_rule(world.get_location("Towers Ronny Mission End", player),
         lambda state: state.has("Employment Contracts", player))
 
     # North Beach
-    set_rule(world.get_location("north_beach_chest_scraps_1", player),
+    set_rule(world.get_location("North Beach Chest Scraps 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("north_beach_chest_scraps_2", player),
+    set_rule(world.get_location("North Beach Chest Scraps 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("north_beach_chest_scraps_3", player),
+    set_rule(world.get_location("North Beach Chest Scraps 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("north_beach_chest_scraps_4", player),
+    set_rule(world.get_location("North Beach Chest Scraps 4", player),
         lambda state: state.has("Lockpicks", player))
 
     # Mine Shaft
-    set_rule(world.get_location("mine_shaft_chest_scraps_1", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("mine_shaft_chest_scraps_2", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("mine_shaft_chest_scraps_3", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("mine_shaft_chest_scraps_4", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("mine_shaft_chest_scraps_5", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps 5", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("mine_shaft_chest_scraps_6", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps 6", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("mine_shaft_chest_scraps_7", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps 7", player),
         lambda state: state.has("Lockpicks", player))
 
     # Mob Camp
-    set_rule(world.get_location("mob_camp_scraps_17", player),
-        lambda state: state.has("Mob Camp Key", player))
-    set_rule(world.get_location("mob_camp_scraps_18", player),
+    set_rule(world.get_entrance("Mob Camp Locked Door", player),
         lambda state: state.has("Mob Camp Key", player))
-    set_rule(world.get_location("mob_camp_stolen_bob", player),
-        lambda state: state.has("Mob Camp Key", player) and
-            state.has("Broken Bob", player))
+
+    set_rule(world.get_location("Mob Camp Locked Room Stolen Bob", player),
+        lambda state: state.has("Broken Bob", player))
 
     # Mountain Ruin
-    set_rule(world.get_location("mountain_ruin_inside_scraps_1", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_2", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_3", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_4", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_5", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_6", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_7", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_8", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_9", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_10", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_11", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_12", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_13", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_14", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_15", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_16", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_scraps_17", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_red_egg", player),
-        lambda state: state.has("Mountain Ruin Key", player))
-    set_rule(world.get_location("mountain_ruin_inside_paint_can_red", player),
-        lambda state: state.has("Mountain Ruin Key", player) and
-            state.has("Lockpicks", player))
+    set_rule(world.get_entrance("Mountain Ruin Gate", player),
+             lambda state: state.has("Mountain Ruin Key", player))
+
+    set_rule(world.get_location("Mountain Ruin Inside Red Paint Can", player),
+        lambda state: state.has("Lockpicks", player))
 
     # Prism Temple
-    set_rule(world.get_location("prism_temple_chest_scraps_1", player),
+    set_rule(world.get_location("Prism Temple Chest Scraps 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("prism_temple_chest_scraps_2", player),
+    set_rule(world.get_location("Prism Temple Chest Scraps 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("prism_temple_chest_scraps_3", player),
+    set_rule(world.get_location("Prism Temple Chest Scraps 3", player),
         lambda state: state.has("Lockpicks", player))
 
-    # Pickle
-    set_rule(world.get_location("field_pickle_lady_jar_of_pickles", player),
+    # Pickle Lady
+    set_rule(world.get_location("Pickle Val Jar of Pickles", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("field_pickle_lady_mission_end", player),
+    set_rule(world.get_location("Pickle Val Pickle Lady Mission End", player),
          lambda state: state.has("Jar of Pickles", player))
 
     # Morse Bunker
-    set_rule(world.get_location("morse_bunker_chest_scraps_1", player),
+    set_rule(world.get_location("Morse Bunker Chest Scraps 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("morse_bunker_chest_scraps_2", player),
+    set_rule(world.get_location("Morse Bunker Chest Scraps 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("morse_bunker_chest_scraps_3", player),
+    set_rule(world.get_location("Morse Bunker Chest Scraps 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("morse_bunker_chest_scraps_4", player),
+    set_rule(world.get_location("Morse Bunker Chest Scraps 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("morse_bunker_chest_scraps_5", player),
+    set_rule(world.get_location("Morse Bunker Chest Scraps 5", player),
         lambda state: state.has("Lockpicks", player))
 
     # Place "Victory" at "Final Boss" and set collection as win condition
diff --git a/worlds/cccharles/__init__.py b/worlds/cccharles/__init__.py
index c0d91005c391..e2d602a65cfd 100644
--- a/worlds/cccharles/__init__.py
+++ b/worlds/cccharles/__init__.py
@@ -44,9 +44,8 @@ class CCCharlesWeb(WebWorld):
 class CCCharlesWorld(World):
     """ 
     An independent 3D horror game, taking place on an island.
-    The main gameplay is composed of 2 phases :
-    > Traveling and fighting a monster on board a train
-    > Walking disarmed to gather resources
+    The main gameplay consists of traveling and fighting a monster on board a train.
+    Upgrading the train requires leaving the train to gather resources with the threat of encountering the monster.
     """
 
     game = "Choo-Choo Charles"
@@ -105,7 +104,7 @@ def create_item(self, name: str) -> CCCharlesItem:
                 classification = ItemClassification.progression
             case "Timed Dynamite" :
                 classification = ItemClassification.progression
-            case "Box of Rocket" :
+            case "Box of Rockets" :
                 classification = ItemClassification.progression
             case "Breaker" :
                 classification = ItemClassification.progression
@@ -125,7 +124,7 @@ def create_item(self, name: str) -> CCCharlesItem:
                 classification = ItemClassification.filler
             case "Pink Paint Can" :
                 classification = ItemClassification.filler
-            case "Gray Paint Can" :
+            case "Grey Paint Can" :
                 classification = ItemClassification.filler
             case "Blue Paint Can" :
                 classification = ItemClassification.filler
@@ -167,3 +166,6 @@ def create_items(self) -> None:
 
     def set_rules(self) -> None:
         set_rules(self.multiworld, self.options, self.player)
+
+    def get_filler_item_name(self) -> str:
+        return "Scraps"
diff --git a/worlds/cccharles/docs/en_Choo-Choo Charles.md b/worlds/cccharles/docs/en_Choo-Choo Charles.md
index 56e418eb4ee5..5305a362bd4f 100644
--- a/worlds/cccharles/docs/en_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/en_Choo-Choo Charles.md	
@@ -1,14 +1,13 @@
 # Choo-Choo Charles
 
 ## Game page in other languages
-* [Français]()
+* [Français](fr)
 
 ## Where is the options page?
-The player options page for this game contains all the options to configure and export a yaml config file.
-The page cannot be accessed yet, the default YAML should be used instead from [the Choo-Choo Charles Multiworld Randomizer YAML page](https://github.com/lgbarrere/CCCharles-Random/blob/main/Release/CCCharles.yaml).
+The [Player Options page](../player-options) contains all the options to configure and export a yaml config file.
 
 ## What does randomization do to this game?
-All scraps or any pickup item on the ground (except from Loot Crates) and items received from NPCs missions are considered as locations to check.
+All scraps or any collectable item on the ground (except from Loot Crates) and items received from NPCs missions are considered as locations to check.
 
 ## What is the goal of Choo-Choo Charles when randomized?
 Beating the evil train from Hell named "Charles".
diff --git a/worlds/cccharles/docs/fr_Choo-Choo Charles.md b/worlds/cccharles/docs/fr_Choo-Choo Charles.md
index ed946fe1d999..42f0c48396c6 100644
--- a/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
@@ -1,11 +1,10 @@
 # Choo-Choo Charles
 
 ## Où est la page d'options ?
-La page d'options du joueur pour ce jeu contient toutes les options pour configurer et exporter un fichier de configuration yaml.
-La page n'est pas encore possible pour le moment, le YAML par défaut doit être utilisé à la place depuis [la page YAML du Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random/blob/main/Release/CCCharles.yaml).
+La [page d'options du joueur pour ce jeu](../player-options) contient toutes les options pour configurer et exporter un fichier de configuration yaml.
 
 ## Qu'est ce que la randomisation fait au jeu ?
-Tous les débrits ou n'importe quel objet collectionnable au sol (excepté les Caisses à Butin) et objets reçus par les missions de PNJs sont considérés comme emplacements à vérifier.
+Tous les débrits ou n'importe quel objet ramassable au sol (excepté les Caisses à Butin) et objets reçus par les missions de PNJs sont considérés comme emplacements à vérifier.
 
 ## Quel est le but de Choo-Choo Charles lorsqu'il est randomisé ?
 Vaincre le train démoniaque de l'Enfer nommé "Charles".
diff --git a/worlds/cccharles/docs/setup_en.md b/worlds/cccharles/docs/setup_en.md
index fe725c7717d1..13bd31dc5ee6 100644
--- a/worlds/cccharles/docs/setup_en.md
+++ b/worlds/cccharles/docs/setup_en.md
@@ -1,5 +1,5 @@
 # Choo-Choo Charles MultiWorld Setup Guide
-This page is a simplified guide of [the Choo-Choo Charles Multiworld Randomizer Mod Documentation](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#cccharles-random).
+This page is a simplified guide of the [Choo-Choo Charles Multiworld Randomizer Mod page](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#cccharles-random).
 
 ## Requirements and Required Softwares
 * A computer running Windows (the Mod is not handled by Linux or Mac)
@@ -7,7 +7,7 @@ This page is a simplified guide of [the Choo-Choo Charles Multiworld Randomizer
 * A legal copy of the Choo-Choo Charles original game (can be found on [Steam](https://store.steampowered.com/app/1766740/ChooChoo_Charles/))
 
 ## Mod Installation for playing
-To install the Mod, open [the Choo-Choo Charles Multiworld Randomizer Mod page](https://github.com/lgbarrere/CCCharles-Random) and follow the steps below.
+To install the Mod, open the [Choo-Choo Charles Multiworld Randomizer Mod page](https://github.com/lgbarrere/CCCharles-Random) page and follow the steps below.
 
 ### Game Setup
 The releases of this game are currently unofficial. However, the Mod can be installed and played by following these instructions :
@@ -15,30 +15,22 @@ The releases of this game are currently unofficial. However, the Mod can be inst
 2. Click "Download ZIP" and unzip the downloaded archive or clone this project
 3. From this folder, in **Release/**, copy the **Obscure/** folder to **\<GameFolder\>** (where the **Obscure/** folder and **Obscure.exe** are placed)
 4. Launch the game, if "OFFLINE" is written in the upper-right corner of the screen, the Mod is working
-> [!NOTE]
-> The content from the **Release/** folder can be manually placed while the paths to files are respected.
 
-### Create a Config (.yaml) File
-> [!NOTE]
-> The purpose of a YAML file is described at [the Basic Multiworld Setup Guide](https://archipelago.gg/tutorial/Archipelago/setup/en#generating-a-game).
-
-No option is currently taken into account by the Mod, this is a work in progress.
+The content from the **Release/** folder can be manually placed while the paths to files are respected.
 
-A default YAML should be used while the options are not implemented, it can be found :
-* In the Release/ folder, downloaded in the **[Game Setup](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#game-setup)** section
-* In [the Choo-Choo Charles Multiworld Randomizer YAML page](https://github.com/lgbarrere/CCCharles-Random/blob/main/Release/CCCharles.yaml), by clicking the "Download raw file" icon
+### Create a Config (.yaml) File
+The purpose of a YAML file is described in the [Basic Multiworld Setup Guide](https://archipelago.gg/tutorial/Archipelago/setup/en#generating-a-game).
 
-The player name configured by this default YAML is "CCCharles", it can be changed by renaming both the YAML and the "name" section inside of this YAML, **both must be identical**.
+The [Player Options page](/games/Choo-Choo%20Charles/player-options) allows to configure personal options and export a config YAML file.
 
 ## Joining a MultiWorld Game
-> [!NOTE]
-> Before playing, it is highly recommended to check out the **[Known Issues](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#known-issues)** section
+Before playing, it is highly recommended to check out the **[Known Issues](setup_en#known-issues)** section
 * The game console must be opened to type Archipelago commands, press "F10" key or "`" (or "~") key in querty ("²" key in azerty)
 * Type ``/connect <IP> <PlayerName>`` with \<IP\> and \<PlayerName\> found on the hosting Archipelago web page in the form ``archipelago.gg:XXXXX`` and ``CCCharles``
 * Disconnection is automatic at game closure but can be manually done with ``/disconnect``
 
 ## Hosting a MultiWorld or Single-Player Game
-See **[Game Setup](https://github.com/lgbarrere/CCCharles-Random#setup-the-game)** section to have the **Release/** folder downloaded.
+See **[Game Setup](setup_en#game-setup)** section to have the **Release/** folder downloaded.
 
 In this section, **Archipelago/** refers to the path where [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases) is installed locally.
 
@@ -46,11 +38,11 @@ Follow these steps to host a remote multiplayer or a local single-player session
 1. Double-click the **cccharles.apworld** in **Release/** to automatically install the world randomization logic
 2. Put the **CCCharles.yaml** from **Release/** to **Archipelago/Players/** with the YAML of each player to host
 3. Launch the Archipelago launcher and click "Generate" to configure a game with the YAML in **Archipelago/output/**
-4. For a multiplayer session, go to [the Archipelago HOST GAME page](https://archipelago.gg/uploads)
+4. For a multiplayer session, go to the [Archipelago HOST GAME page](https://archipelago.gg/uploads)
 5. Click "Upload File" and select the generated **AP_\<seed\>.zip** in **Archipelago/output/**
 6. Send the generated room page to each player
-> [!TIP]
-> For a local single-player session, click "Host" in the Archipelago launcher by using the generated **AP_\<seed\>.zip** in **Archipelago/output/**
+
+For a local single-player session, click "Host" in the Archipelago launcher by using the generated **AP_\<seed\>.zip** in **Archipelago/output/**
 
 ## Known Issues
 ### Major issues
@@ -59,4 +51,4 @@ Follow these steps to host a remote multiplayer or a local single-player session
 ### Minor issues
 * The current version of the command parser does not accept console commands with a player names containing whitespaces. It is recommended to use underscores "_" instead, for instance : CCCharles_Player_1.
 * Sometimes, an item reception or sending a location can fail (rare cases). Reloading the game is supposed to respawn all items on the ground and restarting a new game retrieves all unlocked items from Archipelago, that can be used as workarounds.
-* When an egg is received, if the player goes to one of the three mine exits before talking to the NPC who gives its entry key, the player will no longer be able to interact with this NPC. Make sure to talk to them before approaching their respective mines. Restart a new game otherwise.
+* When an egg is received, if the player goes to one of the three mine exits before talking to the NPC who gives its entrance key, the player will no longer be able to interact with this NPC. Make sure to talk to them before approaching their respective mines. Restart a new game otherwise.
diff --git a/worlds/cccharles/docs/setup_fr.md b/worlds/cccharles/docs/setup_fr.md
index 8284a03def66..0f46d9258930 100644
--- a/worlds/cccharles/docs/setup_fr.md
+++ b/worlds/cccharles/docs/setup_fr.md
@@ -1,5 +1,5 @@
 # Guide d'Installation du MultiWorld Choo-Choo Charles
-Cette page est un guide simplifié de [la Documentation du Mod Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#cccharles-random).
+Cette page est un guide simplifié de la [page du Mod Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#cccharles-random).
 
 ## Exigences et Logiciels Nécessaires
 * Un ordinateur utilisant Windows (le Mod n'est pas utilisable sous Linux ou Mac)
@@ -7,38 +7,30 @@ Cette page est un guide simplifié de [la Documentation du Mod Randomiseur Multi
 * Une copie légale du jeu original Choo-Choo Charles (peut être trouvé sur [Steam](https://store.steampowered.com/app/1766740/ChooChoo_Charles/)
 
 ## Installation du Mod pour jouer
-Pour installer le Mod, ouvrir [la page du Mod Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random) et suivre les étapes ci-dessous.
+Pour installer le Mod, ouvrir la [page du Mod Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random) et suivre les étapes ci-dessous.
 
-### Préparation du jeu
+### Préparation du Jeu
 Les sorties de ce jeu ne sont actuellement pas officielles. Cependant, le Mod peut être installé et joué en suivant ces instructions :
 1. Cliquer sur le bouton vert "<> Code"
 2. Cliquer "Download ZIP" et désarchiver l'archive téléchargée ou cloner ce projet
 3. Depuis ce dossier, dans **Release/**, copier le dossier **Obscure/** dans **\<DossierDuJeu\>** (où se situent le dossier **Obscure/** et **Obscure.exe**)
 4. Lancer le jeu, si "OFFLINE" est marqué dans le coin en haut à droite de l'écran, le Mod est actif
-> [!NOTE]
-> Le contenu du dossier **Release/** peut être placé manuellement tant que les chemins d'accès des fichiers sont respectés.
 
-### Créer un Fichier de Configuration (.yaml)
-> [!NOTE]
-> L'objectif d'un fichier YAML est décrit dans [le Guide d'Installation Basique du Multiworld](https://archipelago.gg/tutorial/Archipelago/setup/en#generating-a-game) (en anglais).
-
-Aucune option n'est actuellement prise en compte par le Mod, ceci est un travail en cours.
+Le contenu du dossier **Release/** peut être placé manuellement tant que les chemins des fichiers sont respectés.
 
-Un YAML par défaut doit utilisé tant que les options ne sont pas implémentées, celui-ci peut être trouvé :
-* Dans le dossier Release/, téléchargé à la section **[Préparation du jeu](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#game-setup)**
-* Dans [la page YAML du Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random/blob/main/Release/CCCharles.yaml), en cliquant sur l'icône "Download raw file"
+### Créer un Fichier de Configuration (.yaml)
+L'objectif d'un fichier YAML est décrit dans le [Guide d'Installation Basique du Multiworld](https://archipelago.gg/tutorial/Archipelago/setup/en#generating-a-game) (en anglais).
 
-Le nom du joueur configuré par ce YAML par défaut est "CCCharles", ceci peut être changé en renommant le YAML et la section "name" dans ce YAML, **les deux doivent être identiques**.
+La [page d'Options Joueur](/games/Choo-Choo%20Charles/player-options) permet de configurer des options personnelles et exporter un fichier de configuration YAML.
 
 ## Rejoindre une Partie MultiWorld
-> [!NOTE]
-> Avant de jouer, il est fortement recommandé d'aller voir à la section **[Problèmes Connus](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#known-issues)**
+Avant de jouer, il est fortement recommandé de consulter la section **[Problèmes Connus](setup_fr#probl%C3%A8mes-connus)**.
 * La console du jeu doit être ouverte pour taper des commandes Archipelago, appuyer sur la touche "F10" ou "`" (ou "~") en querty (touche "²" en azerty)
 * Taper ``/connect <IP> <NomDuJoueur>`` avec \<IP\> et \<NomDuJoueur\> trouvés sur la page web d'hébergement Archipelago sous la forme ``archipelago.gg:XXXXX`` et ``CCCharles``
 * La déconnexion est automatique à la fermeture du jeu mais peut être faite manuellement avec ``/disconnect``
 
 ## Héberger une partie MultiWorld ou un Seul Joueur
-Voir la section **[Préparation du jeu](https://github.com/lgbarrere/CCCharles-Random?tab=readme-ov-file#game-setup)** pour télécharger le dossier **Release/**.
+Voir la section **[Préparation du Jeu](setup_fr#pr%C3%A9paration-du-jeu)** pour télécharger le dossier **Release/**.
 
 Dans cette section, **Archipelago/** fait référence au chemin d'accès où [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases) est installé localement.
 
@@ -46,13 +38,13 @@ Suivre ces étapes pour héberger une session multijoueur à distance ou locale
 1. Double-cliquer sur **cccharles.apworld** dans **Release/** pour installer automatiquement la logique de randomisation du monde
 2. Copier **CCCharles.yaml** depuis **Release/** vers **Archipelago/Players/** avec le YAML de chaque joueur à héberger
 3. Exécuter le lanceur Archipelago et cliquer sur "Generate" pour configurer une partie avec le YAML dans **Archipelago/output/**
-4. Pour une session multijoueur, aller à [la page Archipelago HOST GAME](https://archipelago.gg/uploads)
+4. Pour une session multijoueur, aller à la [page Archipelago HOST GAME](https://archipelago.gg/uploads)
 5. Cliquer sur "Upload File" et selectionner le **AP_\<seed\>.zip** généré dans **Archipelago/output/**
 6. Envoyer la page de la partie générée à chaque joueur
-> [!TIP]
-> Pour une session locale à un seul joueur, cliquer sur "Host" dans le lanceur Archipelago en utilisant **AP_\<seed\>.zip** généré dans **Archipelago/output/**
 
-## Problème Connus
+Pour une session locale à un seul joueur, cliquer sur "Host" dans le lanceur Archipelago en utilisant **AP_\<seed\>.zip** généré dans **Archipelago/output/**
+
+## Problèmes Connus
 ### Problèmes majeurs
 * Si le joueur reçoit la **Box of Rockets**, le bunker de la région **Training Explosive** sera ouvert une fois la zone chargée. Il peut être possible de casser l'état de la mission si le joueur interagit avec des éléments dans un ordre inattendu.
 
diff --git a/worlds/cccharles/test/test_access.py b/worlds/cccharles/test/test_access.py
index de73fa4140f5..7d68593ff9a8 100644
--- a/worlds/cccharles/test/test_access.py
+++ b/worlds/cccharles/test/test_access.py
@@ -4,7 +4,7 @@
 class TestChestAccess(MyGameTestBase):
     def test_claire_breakers(self) -> None:
         """Test locations that require 4 Breakers"""
-        locations = ["lighthouse_claire_mission_end"]
-        items = [["Breaker"], ["Breaker"], ["Breaker"], ["Breaker"]]
-        # This will test that each location can't be accessed without 4 "Breaker", but can be accessed once obtained
+        locations = ["Lighthouse Claire Mission End"]
+        items = [["Breaker"] * 4]
+        # Test locations cannot be accessed without 4 "Breaker", but can be accessed once obtained
         self.assertAccessDependency(locations, items)

From 06ecf018ed358f7ea08d8729f2738a0d347f3ee7 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Wed, 6 Aug 2025 23:05:36 +0200
Subject: [PATCH 05/23] Empty Options.py

Only the base options are handled yet, "work in progress" features removed.
---
 worlds/cccharles/Options.py | 183 +-----------------------------------
 1 file changed, 2 insertions(+), 181 deletions(-)

diff --git a/worlds/cccharles/Options.py b/worlds/cccharles/Options.py
index 435e54d766c6..8484da7891ea 100644
--- a/worlds/cccharles/Options.py
+++ b/worlds/cccharles/Options.py
@@ -1,186 +1,7 @@
 from dataclasses import dataclass
-from Options import DefaultOnToggle, Range, Toggle, DeathLink, Choice, PerGameCommonOptions, Visibility
-from .Items import useless_items
-
-
-class ScrapsAmountAsCheck(Range):
-    """
-    What number of scraps are required to get an item as a check.
-    The collected scraps are not added to the inventory.
-    You must collect this number of scraps to send 1 randomized item.
-
-    '0' means the option is disabled and no scraps is randomized (except mission rewards).
-    """
-    display_name = "Scraps amount as check"
-    range_start = 0
-    range_end = 5
-    default = 1
-    visibility = Visibility.all
-
-
-class ScrapsDetector(Choice):
-    """
-    Add a detector in the game, showing the closest scraps in a UI.
-
-    **No:** Disabled.
-
-    **Start:** The detector is enabled from the start of the game.
-
-    **Randomized:** The detector is randomized.
-    """
-    display_name = "Scraps detector"
-    option_no = 0
-    option_start = 1
-    option_randomized = 2
-    default = 1
-    visibility = Visibility.all
-
-
-class ScrapsTracker(DefaultOnToggle):
-    """
-    The number of collected scraps in the region is shown on the map and the UI.
-    """
-    display_name = "Scraps tracker"
-    visibility = Visibility.all
-
-
-class BlueprintFragments(Toggle):
-    """
-    Blueprint fragments must be received to access the 3 upgrades of the train.
-    These fragments are randomized:
-
-    Speed Upgrade ; Damage Upgrade ; Armor Upgrade
-
-    The 'Repair' option on the blueprint is not affected.
-    """
-    display_name = "Blueprint fragments"
-    visibility = Visibility.all
-
-
-class KeyFragments(Range):
-    """
-    Break keys into key fragments.
-    Collecting enough fragments crafts the associated key.
-
-    '1' means the option is disabled (1 fragment = 1 key).
-
-    If the 'Train access' option is disabled, there are at most:
-
-    **7x5 = 35 fragments**
-
-    **8x5 = 40 fragments otherwise**
-    """
-    display_name = "Key fragments"
-    range_start = 1
-    range_end = 5
-    default = 1
-    visibility = Visibility.all
-
-
-class TrainAccess(Toggle):
-    """
-    The key to access the train is randomized.
-    This option is affected by the "Key fragments" option if enabled.
-    """
-    display_name = "Train access"
-    visibility = Visibility.all
-
-
-class TrainRepairCost(Range):
-    """
-    Set the number of required scraps to repair the train.
-    """
-    display_name = "Repair cost"
-    range_start = 0
-    range_end = 5
-    default = 1
-    visibility = Visibility.all
-
-
-class RandomStartingWeapon(DefaultOnToggle):
-    """
-    Randomize the starting weapon among the 4 possible guns.
-    """
-    display_name = "Random starting weapon"
-    visibility = Visibility.all
-
-
-class PaintCansRule(Choice):
-    """
-    Add a rule for the paint cans.
-
-    **No:** Disabled.
-
-    **Randomized:** The paint cans are randomized.
-
-    **Hints:** The paint cans are randomized and give hints when received.
-
-    **Potions:** The paint cans are randomized and confer passive effects when received.
-    """
-    display_name = "Paint Cans rule"
-    option_no = 0
-    option_randomized = 1
-    option_hints = 2
-    option_potions = 3
-    default = 1
-    visibility = Visibility.all
-
-
-class SplitRemoteExplosives(Choice):
-    """
-    Split the explosives to make up to 8 packs to randomize.
-
-    **1 pack:** 1 pack of 8 (vanilla).
-
-    **2 packs:** 2 packs of 4.
-
-    **4 packs:** 4 packs of 2.
-
-    **8 packs:** 8 packs of 1.
-    """
-    display_name = "Split Remote Explosives"
-    option_1_pack = 1
-    option_2_packs = 2
-    option_4_packs = 4
-    option_8_packs = 8
-    default = 1
-    visibility = Visibility.all
-
-
-class UnscrapTrap(Range):
-    """
-    What percent of traps removing 5 scraps from the inventory are randomized.
-    """
-    display_name = "Unscrap-trap %"
-    range_start = 0
-    range_end = 10
-    default = 0
-    visibility = Visibility.all
-
-
-class DerailedTrap(Range):
-    """
-    What percent of traps reducing the train HP by 30 are randomized.
-    """
-    display_name = "Derailed-trap %"
-    range_start = 0
-    range_end = 10
-    default = 0
-    visibility = Visibility.all
+from Options import PerGameCommonOptions
 
 
 @dataclass
 class CCCharlesOptions(PerGameCommonOptions):
-    scraps_amount_as_check: ScrapsAmountAsCheck
-    scraps_detector: ScrapsDetector
-    scraps_tracker: ScrapsTracker
-    blueprint_fragments: BlueprintFragments
-    key_fragments: KeyFragments
-    train_access: TrainAccess
-    train_repair_cost: TrainRepairCost
-    random_starting_weapon: RandomStartingWeapon
-    paint_cans_rule: PaintCansRule
-    split_remote_explosives: SplitRemoteExplosives
-    unscrap_trap: UnscrapTrap
-    derailed_trap: DerailedTrap
-    death_link: DeathLink
+    pass

From f9fa6b945415bea714f384a17487f041c5b5e792 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Thu, 7 Aug 2025 13:22:53 +0200
Subject: [PATCH 06/23] Handled PR remark

> Fixed specific UT name
---
 worlds/cccharles/test/__init__.py    | 2 +-
 worlds/cccharles/test/test_access.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/worlds/cccharles/test/__init__.py b/worlds/cccharles/test/__init__.py
index c84d7e221a68..4c08d163ec60 100644
--- a/worlds/cccharles/test/__init__.py
+++ b/worlds/cccharles/test/__init__.py
@@ -1,5 +1,5 @@
 from test.bases import WorldTestBase
 
 
-class MyGameTestBase(WorldTestBase):
+class CCCharlesTestBase(WorldTestBase):
     game = "Choo-Choo Charles"
diff --git a/worlds/cccharles/test/test_access.py b/worlds/cccharles/test/test_access.py
index 7d68593ff9a8..8d74ffa4b29e 100644
--- a/worlds/cccharles/test/test_access.py
+++ b/worlds/cccharles/test/test_access.py
@@ -1,7 +1,7 @@
-from worlds.cccharles.test import MyGameTestBase
+from worlds.cccharles.test import CCCharlesTestBase
 
 
-class TestChestAccess(MyGameTestBase):
+class TestChestAccess(CCCharlesTestBase):
     def test_claire_breakers(self) -> None:
         """Test locations that require 4 Breakers"""
         locations = ["Lighthouse Claire Mission End"]

From a45809e8cd0c164492c20e7de8b97d6dffa0f5f7 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Thu, 7 Aug 2025 21:48:33 +0200
Subject: [PATCH 07/23] Handled PR remarks

> UT updated by replacing depreciated features
---
 .../test/{test_access.py => TestAccess.py}    |   6 +-
 worlds/cccharles/test/__init__.py             |   5 -
 worlds/cccharles/test/bases.py                | 346 +-----------------
 3 files changed, 7 insertions(+), 350 deletions(-)
 rename worlds/cccharles/test/{test_access.py => TestAccess.py} (76%)

diff --git a/worlds/cccharles/test/test_access.py b/worlds/cccharles/test/TestAccess.py
similarity index 76%
rename from worlds/cccharles/test/test_access.py
rename to worlds/cccharles/test/TestAccess.py
index 8d74ffa4b29e..4ef816f81e8e 100644
--- a/worlds/cccharles/test/test_access.py
+++ b/worlds/cccharles/test/TestAccess.py
@@ -1,7 +1,9 @@
-from worlds.cccharles.test import CCCharlesTestBase
+from .bases import CCCharlesTestBase
 
 
-class TestChestAccess(CCCharlesTestBase):
+class TestAccess(CCCharlesTestBase):
+    game = "Choo-Choo Charles"
+
     def test_claire_breakers(self) -> None:
         """Test locations that require 4 Breakers"""
         locations = ["Lighthouse Claire Mission End"]
diff --git a/worlds/cccharles/test/__init__.py b/worlds/cccharles/test/__init__.py
index 4c08d163ec60..e69de29bb2d1 100644
--- a/worlds/cccharles/test/__init__.py
+++ b/worlds/cccharles/test/__init__.py
@@ -1,5 +0,0 @@
-from test.bases import WorldTestBase
-
-
-class CCCharlesTestBase(WorldTestBase):
-    game = "Choo-Choo Charles"
diff --git a/worlds/cccharles/test/bases.py b/worlds/cccharles/test/bases.py
index ddcb5797ea21..4c08d163ec60 100644
--- a/worlds/cccharles/test/bases.py
+++ b/worlds/cccharles/test/bases.py
@@ -1,345 +1,5 @@
-import random
-import sys
-import typing
-import unittest
-from argparse import Namespace
+from test.bases import WorldTestBase
 
-from Generate import get_seed_name
-from test.general import gen_steps
-from worlds import AutoWorld
-from worlds.AutoWorld import World, call_all
 
-from BaseClasses import Location, MultiWorld, CollectionState, ItemClassification, Item
-from worlds.alttp.Items import item_factory
-
-
-class TestBase(unittest.TestCase):
-    multiworld: MultiWorld
-    _state_cache = {}
-
-    def get_state(self, items):
-        if (self.multiworld, tuple(items)) in self._state_cache:
-            return self._state_cache[self.multiworld, tuple(items)]
-        state = CollectionState(self.multiworld)
-        for item in items:
-            item.classification = ItemClassification.progression
-            state.collect(item, prevent_sweep=True)
-        state.sweep_for_advancements()
-        state.update_reachable_regions(1)
-        self._state_cache[self.multiworld, tuple(items)] = state
-        return state
-
-    def get_path(self, state, region):
-        def flist_to_iter(node):
-            while node:
-                value, node = node
-                yield value
-
-        from itertools import zip_longest
-        reversed_path_as_flist = state.path.get(region, (region, None))
-        string_path_flat = reversed(list(map(str, flist_to_iter(reversed_path_as_flist))))
-        # Now we combine the flat string list into (region, exit) pairs
-        pathsiter = iter(string_path_flat)
-        pathpairs = zip_longest(pathsiter, pathsiter)
-        return list(pathpairs)
-
-    def run_location_tests(self, access_pool):
-        for i, (location, access, *item_pool) in enumerate(access_pool):
-            items = item_pool[0]
-            all_except = item_pool[1] if len(item_pool) > 1 else None
-            state = self._get_items(item_pool, all_except)
-            path = self.get_path(state, self.multiworld.get_location(location, 1).parent_region)
-            with self.subTest(msg="Reach Location", location=location, access=access, items=items,
-                              all_except=all_except, path=path, entry=i):
-
-                self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), access,
-                                 f"failed {self.multiworld.get_location(location, 1)} with: {item_pool}")
-
-            # check for partial solution
-            if not all_except and access:  # we are not supposed to be able to reach location with partial inventory
-                for missing_item in item_pool[0]:
-                    with self.subTest(msg="Location reachable without required item", location=location,
-                                      items=item_pool[0], missing_item=missing_item, entry=i):
-                        state = self._get_items_partial(item_pool, missing_item)
-
-                        self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), False,
-                                         f"failed {self.multiworld.get_location(location, 1)}: succeeded with "
-                                         f"{missing_item} removed from: {item_pool}")
-
-    def run_entrance_tests(self, access_pool):
-        for i, (entrance, access, *item_pool) in enumerate(access_pool):
-            items = item_pool[0]
-            all_except = item_pool[1] if len(item_pool) > 1 else None
-            state = self._get_items(item_pool, all_except)
-            path = self.get_path(state, self.multiworld.get_entrance(entrance, 1).parent_region)
-            with self.subTest(msg="Reach Entrance", entrance=entrance, access=access, items=items,
-                              all_except=all_except, path=path, entry=i):
-
-                self.assertEqual(self.multiworld.get_entrance(entrance, 1).can_reach(state), access)
-
-            # check for partial solution
-            if not all_except and access:  # we are not supposed to be able to reach location with partial inventory
-                for missing_item in item_pool[0]:
-                    with self.subTest(msg="Entrance reachable without required item", entrance=entrance,
-                                      items=item_pool[0], missing_item=missing_item, entry=i):
-                        state = self._get_items_partial(item_pool, missing_item)
-                        self.assertEqual(self.multiworld.get_entrance(entrance, 1).can_reach(state), False,
-                                         f"failed {self.multiworld.get_entrance(entrance, 1)} with: {item_pool}")
-
-    def _get_items(self, item_pool, all_except):
-        if all_except and len(all_except) > 0:
-            items = self.multiworld.itempool[:]
-            items = [item for item in items if
-                     item.name not in all_except and not ("Bottle" in item.name and "AnyBottle" in all_except)]
-            items.extend(item_factory(item_pool[0], self.multiworld.worlds[1]))
-        else:
-            items = item_factory(item_pool[0], self.multiworld.worlds[1])
-        return self.get_state(items)
-
-    def _get_items_partial(self, item_pool, missing_item):
-        new_items = item_pool[0].copy()
-        new_items.remove(missing_item)
-        items = item_factory(new_items, self.multiworld.worlds[1])
-        return self.get_state(items)
-
-
-class WorldTestBase(unittest.TestCase):
-    options: typing.Dict[str, typing.Any] = {}
-    """Define options that should be used when setting up this TestBase."""
-    multiworld: MultiWorld
-    """The constructed MultiWorld instance after setup."""
-    world: World
-    """The constructed World instance after setup."""
-    player: typing.ClassVar[int] = 1
-
-    game: typing.ClassVar[str]
-    """Define game name in subclass, example "Secret of Evermore"."""
-    auto_construct: typing.ClassVar[bool] = True
-    """ automatically set up a world for each test in this class """
-    memory_leak_tested: typing.ClassVar[bool] = False
-    """ remember if memory leak test was already done for this class """
-
-    def setUp(self) -> None:
-        if self.auto_construct:
-            self.world_setup()
-
-    def tearDown(self) -> None:
-        if self.__class__.memory_leak_tested or not self.options or not self.constructed or \
-                sys.version_info < (3, 11, 0):  # the leak check in tearDown fails in py<3.11 for an unknown reason
-            # only run memory leak test once per class, only for constructed with non-default options
-            # default options will be tested in test/general
-            super().tearDown()
-            return
-
-        import gc
-        import weakref
-        weak = weakref.ref(self.multiworld)
-        for attr_name in dir(self):  # delete all direct references to MultiWorld and World
-            attr: object = typing.cast(object, getattr(self, attr_name))
-            if type(attr) is MultiWorld or isinstance(attr, AutoWorld.World):
-                delattr(self, attr_name)
-        state_cache: typing.Optional[typing.Dict[typing.Any, typing.Any]] = getattr(self, "_state_cache", None)
-        if state_cache is not None:  # in case of multiple inheritance with TestBase, we need to clear its cache
-            state_cache.clear()
-        gc.collect()
-        self.__class__.memory_leak_tested = True
-        self.assertFalse(weak(), f"World {getattr(self, 'game', '')} leaked MultiWorld object")
-        super().tearDown()
-
-    def world_setup(self, seed: typing.Optional[int] = None) -> None:
-        if type(self) is WorldTestBase or \
-                (hasattr(WorldTestBase, self._testMethodName)
-                 and not self.run_default_tests and
-                 getattr(self, self._testMethodName).__code__ is
-                 getattr(WorldTestBase, self._testMethodName, None).__code__):
-            return  # setUp gets called for tests defined in the base class. We skip world_setup here.
-        if not hasattr(self, "game"):
-            raise NotImplementedError("didn't define game name")
-        self.multiworld = MultiWorld(1)
-        self.multiworld.game[self.player] = self.game
-        self.multiworld.player_name = {self.player: "Tester"}
-        self.multiworld.set_seed(seed)
-        self.multiworld.state = CollectionState(self.multiworld)
-        random.seed(self.multiworld.seed)
-        self.multiworld.seed_name = get_seed_name(random)  # only called to get same RNG progression as Generate.py
-        args = Namespace()
-        for name, option in AutoWorld.AutoWorldRegister.world_types[self.game].options_dataclass.type_hints.items():
-            setattr(args, name, {
-                1: option.from_any(self.options.get(name, option.default))
-            })
-        self.multiworld.set_options(args)
-        self.world = self.multiworld.worlds[self.player]
-        for step in gen_steps:
-            call_all(self.multiworld, step)
-
-    # methods that can be called within tests
-    def collect_all_but(self, item_names: typing.Union[str, typing.Iterable[str]],
-                        state: typing.Optional[CollectionState] = None) -> None:
-        """Collects all pre-placed items and items in the multiworld itempool except those provided"""
-        if isinstance(item_names, str):
-            item_names = (item_names,)
-        if not state:
-            state = self.multiworld.state
-        for item in self.multiworld.get_items():
-            if item.name not in item_names:
-                state.collect(item)
-
-    def get_item_by_name(self, item_name: str) -> Item:
-        """Returns the first item found in placed items, or in the itempool with the matching name"""
-        for item in self.multiworld.get_items():
-            if item.name == item_name:
-                return item
-        raise ValueError("No such item")
-
-    def get_items_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]:
-        """Returns actual items from the itempool that match the provided name(s)"""
-        if isinstance(item_names, str):
-            item_names = (item_names,)
-        return [item for item in self.multiworld.itempool if item.name in item_names]
-
-    def collect_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]:
-        """ collect all of the items in the item pool that have the given names """
-        items = self.get_items_by_name(item_names)
-        self.collect(items)
-        return items
-
-    def collect(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None:
-        """Collects the provided item(s) into state"""
-        if isinstance(items, Item):
-            items = (items,)
-        for item in items:
-            self.multiworld.state.collect(item)
-    
-    def remove_by_name(self, item_names: typing.Union[str, typing.Iterable[str]]) -> typing.List[Item]:
-        """Remove all of the items in the item pool with the given names from state"""
-        items = self.get_items_by_name(item_names)
-        self.remove(items)
-        return items
-
-    def remove(self, items: typing.Union[Item, typing.Iterable[Item]]) -> None:
-        """Removes the provided item(s) from state"""
-        if isinstance(items, Item):
-            items = (items,)
-        for item in items:
-            if item.location and item.advancement and item.location in self.multiworld.state.advancements:
-                self.multiworld.state.advancements.remove(item.location)
-            self.multiworld.state.remove(item)
-
-    def can_reach_location(self, location: str) -> bool:
-        """Determines if the current state can reach the provided location name"""
-        return self.multiworld.state.can_reach(location, "Location", self.player)
-
-    def can_reach_entrance(self, entrance: str) -> bool:
-        """Determines if the current state can reach the provided entrance name"""
-        return self.multiworld.state.can_reach(entrance, "Entrance", self.player)
-    
-    def can_reach_region(self, region: str) -> bool:
-        """Determines if the current state can reach the provided region name"""
-        return self.multiworld.state.can_reach(region, "Region", self.player)
-
-    def count(self, item_name: str) -> int:
-        """Returns the amount of an item currently in state"""
-        return self.multiworld.state.count(item_name, self.player)
-
-    def assertAccessDependency(self,
-                               locations: typing.List[str],
-                               possible_items: typing.Iterable[typing.Iterable[str]],
-                               only_check_listed: bool = False) -> None:
-        """Asserts that the provided locations can't be reached without the listed items but can be reached with any
-         one of the provided combinations"""
-        all_items = [item_name for item_names in possible_items for item_name in item_names]
-
-        state = CollectionState(self.multiworld)
-        self.collect_all_but(all_items, state)
-        if only_check_listed:
-            for location in locations:
-                self.assertFalse(state.can_reach(location, "Location", self.player),
-                                 f"{location} is reachable without {all_items}")
-        else:
-            for location in self.multiworld.get_locations():
-                loc_reachable = state.can_reach(location, "Location", self.player)
-                self.assertEqual(loc_reachable, location.name not in locations,
-                                 f"{location.name} is reachable without {all_items}" if loc_reachable
-                                 else f"{location.name} is not reachable without {all_items}")
-        for item_names in possible_items:
-            items = self.get_items_by_name(item_names)
-            for item in items:
-                state.collect(item)
-            for location in locations:
-                self.assertTrue(state.can_reach(location, "Location", self.player),
-                                f"{location} not reachable with {item_names}")
-            for item in items:
-                state.remove(item)
-
-    def assertBeatable(self, beatable: bool):
-        """Asserts that the game can be beaten with the current state"""
-        self.assertEqual(self.multiworld.can_beat_game(self.multiworld.state), beatable)
-
-    # following tests are automatically run
-    @property
-    def run_default_tests(self) -> bool:
-        """Not possible or identical to the base test that's always being run already"""
-        return (self.options
-                or self.setUp.__code__ is not WorldTestBase.setUp.__code__
-                or self.world_setup.__code__ is not WorldTestBase.world_setup.__code__)
-
-    @property
-    def constructed(self) -> bool:
-        """A multiworld has been constructed by this point"""
-        return hasattr(self, "game") and hasattr(self, "multiworld")
-
-    def test_all_state_can_reach_everything(self):
-        """Ensure all state can reach everything and complete the game with the defined options"""
-        if not (self.run_default_tests and self.constructed):
-            return
-        with self.subTest("Game", game=self.game, seed=self.multiworld.seed):
-            state = self.multiworld.get_all_state(False)
-            for location in self.multiworld.get_locations():
-                with self.subTest("Location should be reached", location=location.name):
-                    reachable = location.can_reach(state)
-                    self.assertTrue(reachable, f"{location.name} unreachable")
-            with self.subTest("Beatable"):
-                self.multiworld.state = state
-                self.assertBeatable(True)
-
-    def test_empty_state_can_reach_something(self):
-        """Ensure empty state can reach at least one location with the defined options"""
-        if not (self.run_default_tests and self.constructed):
-            return
-        with self.subTest("Game", game=self.game, seed=self.multiworld.seed):
-            state = CollectionState(self.multiworld)
-            locations = self.multiworld.get_reachable_locations(state, self.player)
-            self.assertGreater(len(locations), 0,
-                               "Need to be able to reach at least one location to get started.")
-
-    def test_fill(self):
-        """Generates a multiworld and validates placements with the defined options"""
-        if not (self.run_default_tests and self.constructed):
-            return
-        from Fill import distribute_items_restrictive
-
-        # basically a shortened reimplementation of this method from core, in order to force the check is done
-        def fulfills_accessibility() -> bool:
-            locations = list(self.multiworld.get_locations(1))
-            state = CollectionState(self.multiworld)
-            while locations:
-                sphere: typing.List[Location] = []
-                for n in range(len(locations) - 1, -1, -1):
-                    if locations[n].can_reach(state):
-                        sphere.append(locations.pop(n))
-                self.assertTrue(sphere or self.multiworld.worlds[1].options.accessibility == "minimal",
-                                f"Unreachable locations: {locations}")
-                if not sphere:
-                    break
-                for location in sphere:
-                    if location.item:
-                        state.collect(location.item, True, location)
-            return self.multiworld.has_beaten_game(state, self.player)
-
-        with self.subTest("Game", game=self.game, seed=self.multiworld.seed):
-            distribute_items_restrictive(self.multiworld)
-            call_all(self.multiworld, "post_fill")
-            self.assertTrue(fulfills_accessibility(), "Collected all locations, but can't beat the game.")
-            placed_items = [loc.item for loc in self.multiworld.get_locations() if loc.item and loc.item.code]
-            self.assertLessEqual(len(self.multiworld.itempool), len(placed_items),
-                                 "Unplaced Items remaining in itempool")
\ No newline at end of file
+class CCCharlesTestBase(WorldTestBase):
+    game = "Choo-Choo Charles"

From 185cd282bf9fd49a01147ad08887f4ea653dc045 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Wed, 13 Aug 2025 20:20:23 +0200
Subject: [PATCH 08/23] Add start_inventory_from_pool as option

This start_inventory_from_pool option is like regular start inventory but it takes items from the pool and replaces them with fillers

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
---
 worlds/cccharles/Options.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/cccharles/Options.py b/worlds/cccharles/Options.py
index 8484da7891ea..2ce1fc7afe03 100644
--- a/worlds/cccharles/Options.py
+++ b/worlds/cccharles/Options.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
-from Options import PerGameCommonOptions
+from Options import PerGameCommonOptions, StartInventoryPool
 
 
 @dataclass
 class CCCharlesOptions(PerGameCommonOptions):
-    pass
+    start_inventory_from_pool: StartInventoryPool

From 04cdd048b72dac9e651add2318593d5725215026 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Sat, 23 Aug 2025 22:05:26 +0200
Subject: [PATCH 09/23] Handled PR remarks

> Mainly fixed editorial and minor issues without impact on UT results (still passed)
---
 worlds/cccharles/Items.py                     |  198 +--
 worlds/cccharles/Locations.py                 | 1374 ++++++++---------
 worlds/cccharles/Regions.py                   |    7 +-
 worlds/cccharles/Rules.py                     |    4 +-
 worlds/cccharles/__init__.py                  |   94 +-
 worlds/cccharles/docs/en_Choo-Choo Charles.md |    6 +-
 worlds/cccharles/docs/setup_en.md             |    6 +-
 worlds/cccharles/test/TestAccess.py           |    2 -
 8 files changed, 843 insertions(+), 848 deletions(-)

diff --git a/worlds/cccharles/Items.py b/worlds/cccharles/Items.py
index 1c31db51682d..0cf7ced0389b 100644
--- a/worlds/cccharles/Items.py
+++ b/worlds/cccharles/Items.py
@@ -7,115 +7,115 @@ class CCCharlesItem(Item):
 
 
 optional_items = {
-    "Scraps" : base_id + 1,
-    "30 Scraps Reward" : base_id + 2,
-    "25 Scraps Reward" : base_id + 3,
-    "35 Scraps Reward" : base_id + 4,
-    "40 Scraps Reward" : base_id + 5,
-    "South Mine Key" : base_id + 6,
-    "North Mine Key" : base_id + 7,
-    "Mountain Ruin Key" : base_id + 8,
-    "Barn Key" : base_id + 9,
-    "Candice's Key" : base_id + 10,
-    "Dead Fish" : base_id + 11,
-    "Lockpicks" : base_id + 12,
-    "Ancient Tablet" : base_id + 13,
-    "Blue Box" : base_id + 14,
-    "Page Drawing" : base_id + 15,
-    "Journal" : base_id + 16,
-    "Timed Dynamite" : base_id + 17,
-    "Box of Rockets" : base_id + 18,
-    "Breaker" : base_id + 19,
-    "Broken Bob" : base_id + 20,
-    "Employment Contracts" : base_id + 21,
-    "Mob Camp Key" : base_id + 22,
-    "Jar of Pickles" : base_id + 23
+    "Scraps": base_id + 1,
+    "30 Scraps Reward": base_id + 2,
+    "25 Scraps Reward": base_id + 3,
+    "35 Scraps Reward": base_id + 4,
+    "40 Scraps Reward": base_id + 5,
+    "South Mine Key": base_id + 6,
+    "North Mine Key": base_id + 7,
+    "Mountain Ruin Key": base_id + 8,
+    "Barn Key": base_id + 9,
+    "Candice's Key": base_id + 10,
+    "Dead Fish": base_id + 11,
+    "Lockpicks": base_id + 12,
+    "Ancient Tablet": base_id + 13,
+    "Blue Box": base_id + 14,
+    "Page Drawing": base_id + 15,
+    "Journal": base_id + 16,
+    "Timed Dynamite": base_id + 17,
+    "Box of Rockets": base_id + 18,
+    "Breaker": base_id + 19,
+    "Broken Bob": base_id + 20,
+    "Employment Contracts": base_id + 21,
+    "Mob Camp Key": base_id + 22,
+    "Jar of Pickles": base_id + 23
 }
 
 useless_items = {
-    "Orange Paint Can" : base_id + 24,
-    "Green Paint Can" : base_id + 25,
-    "White Paint Can" : base_id + 26,
-    "Pink Paint Can" : base_id + 27,
-    "Grey Paint Can" : base_id + 28,
-    "Blue Paint Can" : base_id + 29,
-    "Black Paint Can" : base_id + 30,
-    "Lime Paint Can" : base_id + 31,
-    "Teal Paint Can" : base_id + 32,
-    "Red Paint Can" : base_id + 33,
-    "Purple Paint Can" : base_id + 34,
-    "The Boomer" : base_id + 35,
-    "Bob" : base_id + 36
+    "Orange Paint Can": base_id + 24,
+    "Green Paint Can": base_id + 25,
+    "White Paint Can": base_id + 26,
+    "Pink Paint Can": base_id + 27,
+    "Grey Paint Can": base_id + 28,
+    "Blue Paint Can": base_id + 29,
+    "Black Paint Can": base_id + 30,
+    "Lime Paint Can": base_id + 31,
+    "Teal Paint Can": base_id + 32,
+    "Red Paint Can": base_id + 33,
+    "Purple Paint Can": base_id + 34,
+    "The Boomer": base_id + 35,
+    "Bob": base_id + 36
 }
 
 progression_items = {
-    "Green Egg" : base_id + 37,
-    "Blue Egg" : base_id + 38,
-    "Red Egg" : base_id + 39,
-    "Remote Explosive" : base_id + 40,
-    "Remote Explosive x8" : base_id + 41, # Originally, Paul gives 8 explosives at once
-    "Temple Key" : base_id + 42,
-    "Bug Spray" : base_id + 43 # Should only be considered progressive in Nightmare Mode
+    "Green Egg": base_id + 37,
+    "Blue Egg": base_id + 38,
+    "Red Egg": base_id + 39,
+    "Remote Explosive": base_id + 40,
+    "Remote Explosive x8": base_id + 41, # Originally, Paul gives 8 explosives at once
+    "Temple Key": base_id + 42,
+    "Bug Spray": base_id + 43 # Should only be considered progressive in Nightmare Mode
 }
 
 item_groups = {
-        "Weapons": {
-            "Bug Spray",
-            "The Boomer",
-            "Bob"
-        },
-        "Paint Can": {
-            "Orange Paint Can",
-            "Green Paint Can",
-            "White Paint Can",
-            "Pink Paint Can",
-            "Grey Paint Can",
-            "Blue Paint Can",
-            "Black Paint Can",
-            "Lime Paint Can",
-            "Teal Paint Can",
-            "Red Paint Can",
-            "Purple Paint Can"
-        },
-        "Train Upgrade": {
-            "Scraps",
-            "30 Scraps Reward",
-            "25 Scraps Reward",
-            "40 Scraps Reward"
-        },
-        "Dungeon Keys": {
-            "South Mine Key",
-            "North Mine Key",
-            "Mountain Ruin Key"
-        },
-        "Building Keys": {
-            "Barn Key",
-            "Candice's Key",
-            "Mob Camp Key",
-            "Temple Key"
-        },
-        "Mission Items": {
-            "Dead Fish",
-            "Lockpicks",
-            "Ancient Tablet",
-            "Blue Box",
-            "Page Drawing",
-            "Journal",
-            "Timed Dynamite",
-            "Box of Rockets",
-            "Breaker",
-            "Broken Bob",
-            "Employment Contracts",
-            "Jar of Pickles",
-            "Remote Explosive",
-            "Remote Explosive x8"
-        },
-        "Eggs": {
-            "Green Egg",
-            "Blue Egg",
-            "Red Egg"
-        }
+    "Weapons": {
+        "Bug Spray",
+        "The Boomer",
+        "Bob"
+    },
+    "Paint Can": {
+        "Orange Paint Can",
+        "Green Paint Can",
+        "White Paint Can",
+        "Pink Paint Can",
+        "Grey Paint Can",
+        "Blue Paint Can",
+        "Black Paint Can",
+        "Lime Paint Can",
+        "Teal Paint Can",
+        "Red Paint Can",
+        "Purple Paint Can"
+    },
+    "Train Upgrade": {
+        "Scraps",
+        "30 Scraps Reward",
+        "25 Scraps Reward",
+        "40 Scraps Reward"
+    },
+    "Dungeon Keys": {
+        "South Mine Key",
+        "North Mine Key",
+        "Mountain Ruin Key"
+    },
+    "Building Keys": {
+        "Barn Key",
+        "Candice's Key",
+        "Mob Camp Key",
+        "Temple Key"
+    },
+    "Mission Items": {
+        "Dead Fish",
+        "Lockpicks",
+        "Ancient Tablet",
+        "Blue Box",
+        "Page Drawing",
+        "Journal",
+        "Timed Dynamite",
+        "Box of Rockets",
+        "Breaker",
+        "Broken Bob",
+        "Employment Contracts",
+        "Jar of Pickles",
+        "Remote Explosive",
+        "Remote Explosive x8"
+    },
+    "Eggs": {
+        "Green Egg",
+        "Blue Egg",
+        "Red Egg"
     }
+}
 
 
 # All items excepted the duplications (no item amount)
diff --git a/worlds/cccharles/Locations.py b/worlds/cccharles/Locations.py
index 252f29ef70d2..63b502bcf460 100644
--- a/worlds/cccharles/Locations.py
+++ b/worlds/cccharles/Locations.py
@@ -3,14 +3,14 @@
 
 
 class CCCharlesLocation(Location):
-    game: str = "Choo-Choo Charles"
+    game = "Choo-Choo Charles"
 
-# "First Station" :
-# /!\ NOT CONSIDERED YET : train_keypickup Train_KeyPickup Photorealistic_Island (X=-8816.341 Y=23392.416 Z=10219.855)
+# "First Station":
+# /!\ NOT CONSIDERED YET: train_keypickup Train_KeyPickup Photorealistic_Island (X=-8816.341 Y=23392.416 Z=10219.855)
 
 loc_start_camp = {
-    "Start Camp Scraps 1" : base_id + 1000, # ItemPickup139_5 Camp (X=24006.348 Y=53777.297 Z=10860.107)
-    "Start Camp Scraps 2" : base_id + 1001 # ItemPickup140_8 Camp (X=23951.754 Y=54897.230 Z=10895.235)
+    "Start Camp Scraps 1": base_id + 1000, # ItemPickup139_5 Camp (X=24006.348 Y=53777.297 Z=10860.107)
+    "Start Camp Scraps 2": base_id + 1001 # ItemPickup140_8 Camp (X=23951.754 Y=54897.230 Z=10895.235)
 }
 
 loc_tony_tiddle_mission = {
@@ -18,19 +18,19 @@ class CCCharlesLocation(Location):
 }
 
 loc_barn = {
-    "Barn Scraps 1" : base_id + 1003, # ItemPickup12 Photorealistic_Island (X=70582.805 Y=52591.066 Z=11976.719)
-    "Barn Scraps 2" : base_id + 1004, # ItemPickup4_2 Photorealistic_Island (X=70536.641 Y=51890.633 Z=11986.488)
-    "Barn Scraps 3" : base_id + 1005, # ItemPickup6 Photorealistic_Island (X=70750.336 Y=52275.828 Z=11994.434)
-    "Barn Scraps 4" : base_id + 1006, # ItemPickup11 Photorealistic_Island (X=70937.719 Y=52989.066 Z=12003.523)
-    "Barn Scraps 5" : base_id + 1007, # ItemPickup5 Photorealistic_Island (X=71303.508 Y=52232.188 Z=12003.997)
-    "Barn Scraps 6" : base_id + 1008, # ItemPickup7 Photorealistic_Island (X=71678.672 Y=52825.531 Z=11977.212)
-    "Barn Scraps 7" : base_id + 1009, # ItemPickup8 Photorealistic_Island (X=71506.961 Y=52357.293 Z=12362.159)
-    "Barn Scraps 8" : base_id + 1010, # ItemPickup9 Photorealistic_Island (X=71029.875 Y=52384.613 Z=12362.159)
-    "Barn Scraps 9" : base_id + 1011 # ItemPickup10 Photorealistic_Island (X=71129.594 Y=52600.262 Z=12364.142)
+    "Barn Scraps 1": base_id + 1003, # ItemPickup12 Photorealistic_Island (X=70582.805 Y=52591.066 Z=11976.719)
+    "Barn Scraps 2": base_id + 1004, # ItemPickup4_2 Photorealistic_Island (X=70536.641 Y=51890.633 Z=11986.488)
+    "Barn Scraps 3": base_id + 1005, # ItemPickup6 Photorealistic_Island (X=70750.336 Y=52275.828 Z=11994.434)
+    "Barn Scraps 4": base_id + 1006, # ItemPickup11 Photorealistic_Island (X=70937.719 Y=52989.066 Z=12003.523)
+    "Barn Scraps 5": base_id + 1007, # ItemPickup5 Photorealistic_Island (X=71303.508 Y=52232.188 Z=12003.997)
+    "Barn Scraps 6": base_id + 1008, # ItemPickup7 Photorealistic_Island (X=71678.672 Y=52825.531 Z=11977.212)
+    "Barn Scraps 7": base_id + 1009, # ItemPickup8 Photorealistic_Island (X=71506.961 Y=52357.293 Z=12362.159)
+    "Barn Scraps 8": base_id + 1010, # ItemPickup9 Photorealistic_Island (X=71029.875 Y=52384.613 Z=12362.159)
+    "Barn Scraps 9": base_id + 1011 # ItemPickup10 Photorealistic_Island (X=71129.594 Y=52600.262 Z=12364.142)
 }
 
 loc_candice_mission = {
-    "Tutorial House Candice Mission Start" : base_id + 1012 # (dialog 3) -> candice_key (2)
+    "Tutorial House Candice Mission Start": base_id + 1012 # (dialog 3) -> candice_key (2)
 }
 
 loc_tutorial_house = {
@@ -46,819 +46,819 @@ class CCCharlesLocation(Location):
 }
 
 loc_swamp_edges = {
-    "Swamp Edges Scraps 1" : base_id + 1022, # ItemPickup465_67 Swamp_EnvironmentDetails (X=81964.398 Y=72167.305 Z=10116.385)
-    "Swamp Edges Scraps 2" : base_id + 1023, # ItemPickup460_52 Swamp_EnvironmentDetails (X=89674.047 Y=71610.008 Z=9482.095)
-    "Swamp Edges Scraps 3" : base_id + 1024, # ItemPickup459_49 Swamp_EnvironmentDetails (X=91637.156 Y=73345.672 Z=9492.019)
-    "Swamp Edges Scraps 4" : base_id + 1025, # ItemPickup458_46 Swamp_EnvironmentDetails (X=94601.117 Y=75064.117 Z=9567.464)
-    "Swamp Edges Scraps 5" : base_id + 1026, # ItemPickup457_43 Swamp_EnvironmentDetails (X=95536.641 Y=72622.969 Z=9512.531)
-    "Swamp Edges Scraps 6" : base_id + 1027, # ItemPickup456_40 Swamp_EnvironmentDetails (X=96419.922 Y=65508.676 Z=9838.949)
-    "Swamp Edges Scraps 7" : base_id + 1028, # ItemPickup455_37 Swamp_EnvironmentDetails (X=98158.680 Y=63191.629 Z=10477.084)
-    "Swamp Edges Scraps 8" : base_id + 1029, # ItemPickup55_29 Swamp_EnvironmentDetails (X=93421.820 Y=59200.461 Z=9545.312)
-    "Swamp Edges Scraps 9" : base_id + 1030, # ItemPickup453_31 Swamp_EnvironmentDetails(X=92951.648 Y=56453.527 Z=9560.638)
-    "Swamp Edges Scraps 10" : base_id + 1031, # ItemPickup454_34 Swamp_EnvironmentDetails (X=96943.297 Y=58754.043 Z=10728.124)
-    "Swamp Edges Scraps 11" : base_id + 1032, # ItemPickup452_28 Swamp_EnvironmentDetails (X=95000.617 Y=53070.859 Z=10258.078)
-    "Swamp Edges Scraps 12" : base_id + 1033, # ItemPickup451_25 Swamp_EnvironmentDetails (X=91390.703 Y=53628.707 Z=9498.378)
-    "Swamp Edges Scraps 13" : base_id + 1034, # ItemPickup53_23 Swamp_EnvironmentDetails (X=87628.742 Y=51614.957 Z=9487.013)
-    "Swamp Edges Scraps 14" : base_id + 1035, # ItemPickup448_16 Swamp_EnvironmentDetails (X=89785.992 Y=48603.844 Z=9573.859)
-    "Swamp Edges Scraps 15" : base_id + 1036, # ItemPickup447_11 Swamp_EnvironmentDetails (X=89925.383 Y=46288.707 Z=9499.904)
-    "Swamp Edges Scraps 16" : base_id + 1037, # ItemPickup446_8 Swamp_EnvironmentDetails (X=90848.938 Y=43133.535 Z=9729.535)
-    "Swamp Edges Scraps 17" : base_id + 1038, # ItemPickup445_5 Swamp_EnvironmentDetails (X=87382.383 Y=42475.191 Z=9509.929)
-    "Swamp Edges Scraps 18" : base_id + 1039, # ItemPickup444_2 Swamp_EnvironmentDetails (X=87481.820 Y=39316.820 Z=9757.511)
-    "Swamp Edges Scraps 19" : base_id + 1040, # ItemPickup54_26 Swamp_EnvironmentDetails (X=86039.180 Y=37135.004 Z=9826.263)
-    "Swamp Edges Scraps 20" : base_id + 1041, # ItemPickup475_97 Swamp_EnvironmentDetails (X=81798.609 Y=36766.922 Z=9479.318)
-    "Swamp Edges Scraps 21" : base_id + 1042, # ItemPickup474_94 Swamp_EnvironmentDetails (X=79254.055 Y=40120.293 Z=9879.539)
-    "Swamp Edges Scraps 22" : base_id + 1043, # ItemPickup473_91 Swamp_EnvironmentDetails (X=82251.773 Y=42454.027 Z=9482.057)
-    "Swamp Edges Scraps 23" : base_id + 1044, # ItemPickup472_88 Swamp_EnvironmentDetails (X=84903.977 Y=48323.543 Z=9503.382)
-    "Swamp Edges Scraps 24" : base_id + 1045, # ItemPickup471_85 Swamp_EnvironmentDetails (X=84238.609 Y=51239.547 Z=9529.745)
-    "Swamp Edges Scraps 25" : base_id + 1046, # ItemPickup470_82 Swamp_EnvironmentDetails (X=84439.063 Y=53501.563 Z=9491.291)
-    "Swamp Edges Scraps 26" : base_id + 1047, # ItemPickup52_20 Swamp_EnvironmentDetails (X=83025.086 Y=53275.348 Z=9694.177)
-    "Swamp Edges Scraps 27" : base_id + 1048, # ItemPickup469_79 Swamp_EnvironmentDetails (X=79827.055 Y=54791.504 Z=10121.452)
-    "Swamp Edges Scraps 28" : base_id + 1049, # ItemPickup468_76 Swamp_EnvironmentDetails (X=82266.461 Y=58126.316 Z=9660.493)
-    "Swamp Edges Scraps 29" : base_id + 1050, # ItemPickup467_73 Swamp_EnvironmentDetails (X=75911.297 Y=65155.836 Z=10660.832)
-    "Swamp Edges Scraps 30" : base_id + 1051, # ItemPickup466_70 Swamp_EnvironmentDetails (X=81171.641 Y=66836.125 Z=9673.756)
-    "Swamp Edges Scraps 31" : base_id + 1052, # ItemPickup449_19 Swamp_EnvironmentDetails (X=95254.992 Y=40910.563 Z=10503.727)
-    "Swamp Edges Scraps 32" : base_id + 1053 # ItemPickup450_22 Swamp_EnvironmentDetails (X=93992.992 Y=50773.484 Z=10238.064)
+    "Swamp Edges Scraps 1": base_id + 1022, # ItemPickup465_67 Swamp_EnvironmentDetails (X=81964.398 Y=72167.305 Z=10116.385)
+    "Swamp Edges Scraps 2": base_id + 1023, # ItemPickup460_52 Swamp_EnvironmentDetails (X=89674.047 Y=71610.008 Z=9482.095)
+    "Swamp Edges Scraps 3": base_id + 1024, # ItemPickup459_49 Swamp_EnvironmentDetails (X=91637.156 Y=73345.672 Z=9492.019)
+    "Swamp Edges Scraps 4": base_id + 1025, # ItemPickup458_46 Swamp_EnvironmentDetails (X=94601.117 Y=75064.117 Z=9567.464)
+    "Swamp Edges Scraps 5": base_id + 1026, # ItemPickup457_43 Swamp_EnvironmentDetails (X=95536.641 Y=72622.969 Z=9512.531)
+    "Swamp Edges Scraps 6": base_id + 1027, # ItemPickup456_40 Swamp_EnvironmentDetails (X=96419.922 Y=65508.676 Z=9838.949)
+    "Swamp Edges Scraps 7": base_id + 1028, # ItemPickup455_37 Swamp_EnvironmentDetails (X=98158.680 Y=63191.629 Z=10477.084)
+    "Swamp Edges Scraps 8": base_id + 1029, # ItemPickup55_29 Swamp_EnvironmentDetails (X=93421.820 Y=59200.461 Z=9545.312)
+    "Swamp Edges Scraps 9": base_id + 1030, # ItemPickup453_31 Swamp_EnvironmentDetails(X=92951.648 Y=56453.527 Z=9560.638)
+    "Swamp Edges Scraps 10": base_id + 1031, # ItemPickup454_34 Swamp_EnvironmentDetails (X=96943.297 Y=58754.043 Z=10728.124)
+    "Swamp Edges Scraps 11": base_id + 1032, # ItemPickup452_28 Swamp_EnvironmentDetails (X=95000.617 Y=53070.859 Z=10258.078)
+    "Swamp Edges Scraps 12": base_id + 1033, # ItemPickup451_25 Swamp_EnvironmentDetails (X=91390.703 Y=53628.707 Z=9498.378)
+    "Swamp Edges Scraps 13": base_id + 1034, # ItemPickup53_23 Swamp_EnvironmentDetails (X=87628.742 Y=51614.957 Z=9487.013)
+    "Swamp Edges Scraps 14": base_id + 1035, # ItemPickup448_16 Swamp_EnvironmentDetails (X=89785.992 Y=48603.844 Z=9573.859)
+    "Swamp Edges Scraps 15": base_id + 1036, # ItemPickup447_11 Swamp_EnvironmentDetails (X=89925.383 Y=46288.707 Z=9499.904)
+    "Swamp Edges Scraps 16": base_id + 1037, # ItemPickup446_8 Swamp_EnvironmentDetails (X=90848.938 Y=43133.535 Z=9729.535)
+    "Swamp Edges Scraps 17": base_id + 1038, # ItemPickup445_5 Swamp_EnvironmentDetails (X=87382.383 Y=42475.191 Z=9509.929)
+    "Swamp Edges Scraps 18": base_id + 1039, # ItemPickup444_2 Swamp_EnvironmentDetails (X=87481.820 Y=39316.820 Z=9757.511)
+    "Swamp Edges Scraps 19": base_id + 1040, # ItemPickup54_26 Swamp_EnvironmentDetails (X=86039.180 Y=37135.004 Z=9826.263)
+    "Swamp Edges Scraps 20": base_id + 1041, # ItemPickup475_97 Swamp_EnvironmentDetails (X=81798.609 Y=36766.922 Z=9479.318)
+    "Swamp Edges Scraps 21": base_id + 1042, # ItemPickup474_94 Swamp_EnvironmentDetails (X=79254.055 Y=40120.293 Z=9879.539)
+    "Swamp Edges Scraps 22": base_id + 1043, # ItemPickup473_91 Swamp_EnvironmentDetails (X=82251.773 Y=42454.027 Z=9482.057)
+    "Swamp Edges Scraps 23": base_id + 1044, # ItemPickup472_88 Swamp_EnvironmentDetails (X=84903.977 Y=48323.543 Z=9503.382)
+    "Swamp Edges Scraps 24": base_id + 1045, # ItemPickup471_85 Swamp_EnvironmentDetails (X=84238.609 Y=51239.547 Z=9529.745)
+    "Swamp Edges Scraps 25": base_id + 1046, # ItemPickup470_82 Swamp_EnvironmentDetails (X=84439.063 Y=53501.563 Z=9491.291)
+    "Swamp Edges Scraps 26": base_id + 1047, # ItemPickup52_20 Swamp_EnvironmentDetails (X=83025.086 Y=53275.348 Z=9694.177)
+    "Swamp Edges Scraps 27": base_id + 1048, # ItemPickup469_79 Swamp_EnvironmentDetails (X=79827.055 Y=54791.504 Z=10121.452)
+    "Swamp Edges Scraps 28": base_id + 1049, # ItemPickup468_76 Swamp_EnvironmentDetails (X=82266.461 Y=58126.316 Z=9660.493)
+    "Swamp Edges Scraps 29": base_id + 1050, # ItemPickup467_73 Swamp_EnvironmentDetails (X=75911.297 Y=65155.836 Z=10660.832)
+    "Swamp Edges Scraps 30": base_id + 1051, # ItemPickup466_70 Swamp_EnvironmentDetails (X=81171.641 Y=66836.125 Z=9673.756)
+    "Swamp Edges Scraps 31": base_id + 1052, # ItemPickup449_19 Swamp_EnvironmentDetails (X=95254.992 Y=40910.563 Z=10503.727)
+    "Swamp Edges Scraps 32": base_id + 1053 # ItemPickup450_22 Swamp_EnvironmentDetails (X=93992.992 Y=50773.484 Z=10238.064)
 }
 
 loc_swamp_mission = {
-    "Swamp Shack Scraps 1" : base_id + 1054, # ItemPickup51_17 Swamp_EnvironmentDetails (X=87685.797 Y=69754.008 Z=9629.617)
-    "Swamp Shack Scraps 2" : base_id + 1055, # ItemPickup461_55 Swamp_EnvironmentDetails (X=87308.883 Y=69096.789 Z=9624.543)
-    "Swamp Islet Scraps 1" : base_id + 1056, # ItemPickup462_58 Swamp_EnvironmentDetails (X=88101.219 Y=64553.148 Z=9557.692)
-    "Swamp Islet Scraps 2" : base_id + 1057, # ItemPickup463_61 Swamp_EnvironmentDetails (X=87100.922 Y=63590.965 Z=9582.900)
-    "Swamp Islet Scraps 3" : base_id + 1058, # ItemPickup464_64 Swamp_EnvironmentDetails (X=86399.656 Y=64290.805 Z=9493.576)
-    "Swamp Islet Dead Fish" : base_id + 1059, # Swamp_FishPickup Swamp_EnvironmentDetails (X=87288.945 Y=64278.273 Z=9550.320)
-    "Swamp Lizbeth Murkwater Mission End" : base_id + 1060 # (dialog 2) -> 30_scraps_reward
+    "Swamp Shack Scraps 1": base_id + 1054, # ItemPickup51_17 Swamp_EnvironmentDetails (X=87685.797 Y=69754.008 Z=9629.617)
+    "Swamp Shack Scraps 2": base_id + 1055, # ItemPickup461_55 Swamp_EnvironmentDetails (X=87308.883 Y=69096.789 Z=9624.543)
+    "Swamp Islet Scraps 1": base_id + 1056, # ItemPickup462_58 Swamp_EnvironmentDetails (X=88101.219 Y=64553.148 Z=9557.692)
+    "Swamp Islet Scraps 2": base_id + 1057, # ItemPickup463_61 Swamp_EnvironmentDetails (X=87100.922 Y=63590.965 Z=9582.900)
+    "Swamp Islet Scraps 3": base_id + 1058, # ItemPickup464_64 Swamp_EnvironmentDetails (X=86399.656 Y=64290.805 Z=9493.576)
+    "Swamp Islet Dead Fish": base_id + 1059, # Swamp_FishPickup Swamp_EnvironmentDetails (X=87288.945 Y=64278.273 Z=9550.320)
+    "Swamp Lizbeth Murkwater Mission End": base_id + 1060 # (dialog 2) -> 30_scraps_reward
 }
 
 loc_junkyard_area = {
-    "Junkyard Area Scraps 1" : base_id + 1061, # ItemPickup185_29 Junkyard_Details1 (X=94184.391 Y=89760.258 Z=9331.188)
-    "Junkyard Area Scraps 2" : base_id + 1062, # ItemPickup177_5 Junkyard_Details1 (X=91919.469 Y=89681.602 Z=9407.639)
-    "Junkyard Area Scraps 3" : base_id + 1063, # ItemPickup46_5 Junkyard_Details (X=91696.078 Y=90453.563 Z=9480.997)
-    "Junkyard Area Scraps 4" : base_id + 1064, # ItemPickup178_8 Junkyard_Details1 (X=92453.719 Y=91142.531 Z=9398.951)
-    "Junkyard Area Scraps 5" : base_id + 1065, # ItemPickup182_20 Junkyard_Details1 (X=88645.453 Y=90374.930 Z=9507.291)
-    "Junkyard Area Scraps 6" : base_id + 1066, # ItemPickup48_11 Junkyard_Details (X=88461.953 Y=92077.531 Z=9712.173)
-    "Junkyard Area Scraps 7" : base_id + 1067, # ItemPickup49_14 Junkyard_Details (X=91521.555 Y=93773.641 Z=9421.457)
-    "Junkyard Area Scraps 8" : base_id + 1068, # ItemPickup50_17 Junkyard_Details (X=94741.484 Y=92565.938 Z=9221.093)
-    "Junkyard Area Scraps 9" : base_id + 1069, # ItemPickup186_32 Junkyard_Details1 (X=95256.008 Y=91356.789 Z=9251.082)
-    "Junkyard Area Scraps 10" : base_id + 1070, # ItemPickup45_2 Junkyard_Details (X=94289.664 Y=89951.477 Z=9367.076)
-    "Junkyard Area Daryl Mission Start" : base_id + 1071, # (dialog 4) -> Lockpicks (4)
-    "Junkyard Area Chest Ancient Tablet" : base_id + 1072, # Junkyard_TabletPickup Junkyard_Details (X=90715.367 Y=92168.563 Z=9402.729)
-    "Junkyard Area Daryl Mission End" : base_id + 1073 # (dialog 3) -> 25_scraps_reward
+    "Junkyard Area Scraps 1": base_id + 1061, # ItemPickup185_29 Junkyard_Details1 (X=94184.391 Y=89760.258 Z=9331.188)
+    "Junkyard Area Scraps 2": base_id + 1062, # ItemPickup177_5 Junkyard_Details1 (X=91919.469 Y=89681.602 Z=9407.639)
+    "Junkyard Area Scraps 3": base_id + 1063, # ItemPickup46_5 Junkyard_Details (X=91696.078 Y=90453.563 Z=9480.997)
+    "Junkyard Area Scraps 4": base_id + 1064, # ItemPickup178_8 Junkyard_Details1 (X=92453.719 Y=91142.531 Z=9398.951)
+    "Junkyard Area Scraps 5": base_id + 1065, # ItemPickup182_20 Junkyard_Details1 (X=88645.453 Y=90374.930 Z=9507.291)
+    "Junkyard Area Scraps 6": base_id + 1066, # ItemPickup48_11 Junkyard_Details (X=88461.953 Y=92077.531 Z=9712.173)
+    "Junkyard Area Scraps 7": base_id + 1067, # ItemPickup49_14 Junkyard_Details (X=91521.555 Y=93773.641 Z=9421.457)
+    "Junkyard Area Scraps 8": base_id + 1068, # ItemPickup50_17 Junkyard_Details (X=94741.484 Y=92565.938 Z=9221.093)
+    "Junkyard Area Scraps 9": base_id + 1069, # ItemPickup186_32 Junkyard_Details1 (X=95256.008 Y=91356.789 Z=9251.082)
+    "Junkyard Area Scraps 10": base_id + 1070, # ItemPickup45_2 Junkyard_Details (X=94289.664 Y=89951.477 Z=9367.076)
+    "Junkyard Area Daryl Mission Start": base_id + 1071, # (dialog 4) -> Lockpicks (4)
+    "Junkyard Area Chest Ancient Tablet": base_id + 1072, # Junkyard_TabletPickup Junkyard_Details (X=90715.367 Y=92168.563 Z=9402.729)
+    "Junkyard Area Daryl Mission End": base_id + 1073 # (dialog 3) -> 25_scraps_reward
 }
 
 loc_south_house = {
-    "South House Scraps 1" : base_id + 1074, # ItemPickup361_26 Secret12_ExteriorDetails (X=85865.969 Y=103869.656 Z=9453.063)
-    "South House Scraps 2" : base_id + 1075, # ItemPickup360_23 Secret12_ExteriorDetails (X=84403.742 Y=107229.039 Z=9067.245)
-    "South House Scraps 3" : base_id + 1076, # ItemPickup359_20 Secret12_ExteriorDetails (X=83389.789 Y=108817.992 Z=8752.255)
-    "South House Scraps 4" : base_id + 1077, # ItemPickup353_2 Secret12_ExteriorDetails (X=82413.547 Y=109697.477 Z=8637.677)
-    "South House Scraps 5" : base_id + 1078, # ItemPickup354_5 Secret12_ExteriorDetails (X=83000.359 Y=110323.664 Z=8560.229)
-    "South House Scraps 6" : base_id + 1079, # ItemPickup358_17 Secret12_ExteriorDetails (X=82072.625 Y=110482.664 Z=8682.441)
-    "South House Scraps 7" : base_id + 1080, # ItemPickup24_30 Secret12_Details (X=81970.766 Y=111082.117 Z=8647.703)
-    "South House Scraps 8" : base_id + 1081, # ItemPickup356_11 Secret12_ExteriorDetails (X=80915.375 Y=108689.758 Z=8377.754)
-    "South House Scraps 9" : base_id + 1082, # ItemPickup355_8 Secret12_ExteriorDetails (X=81762.180 Y=111371.023 Z=7876.312)
-    "South House Scraps 10" : base_id + 1083, # ItemPickup357_14 Secret12_ExteriorDetails (X=80663.336 Y=113306.695 Z=7226.475)
-    "South House Scraps 11" : base_id + 1084, # ItemPickup23_21 Secret12_Details (X=80520.367 Y=113747.039 Z=7252.808)
-    "South House Scraps 12" : base_id + 1085, # ItemPickup22_18 Secret12_Details (X=80830.273 Y=113871.383 Z=7201.687)
-    "South House Chest Scraps 1" : base_id + 1086, # ItemPickup21 Secret12_Details (X=82079.922 Y=110808.602 Z=8739.324)
-    "South House Chest Scraps 2" : base_id + 1087, # ItemPickup18 Secret12_Details (X=82102.664 Y=110813.664 Z=8726.308)
-    "South House Chest Scraps 3" : base_id + 1088, # ItemPickup17 Secret12_Details (X=82091.547 Y=110810.906 Z=8721.354) \!/ Existing match 1
-    "South House Chest Scraps 4" : base_id + 1089, # ItemPickup16 Secret12_Details (X=82102.664 Y=110813.664 Z=8708.337) KO
-    "South House Chest Scraps 5" : base_id + 1090, # ItemPickup14 Secret12_Details (X=82091.516 Y=110810.898 Z=8701.793) \!/ Existing match 3
-    "South House Chest Scraps 6" : base_id + 1091 # ItemPickup13_7 Secret12_Details (X=82102.664 Y=110813.625 Z=8688.776)
+    "South House Scraps 1": base_id + 1074, # ItemPickup361_26 Secret12_ExteriorDetails (X=85865.969 Y=103869.656 Z=9453.063)
+    "South House Scraps 2": base_id + 1075, # ItemPickup360_23 Secret12_ExteriorDetails (X=84403.742 Y=107229.039 Z=9067.245)
+    "South House Scraps 3": base_id + 1076, # ItemPickup359_20 Secret12_ExteriorDetails (X=83389.789 Y=108817.992 Z=8752.255)
+    "South House Scraps 4": base_id + 1077, # ItemPickup353_2 Secret12_ExteriorDetails (X=82413.547 Y=109697.477 Z=8637.677)
+    "South House Scraps 5": base_id + 1078, # ItemPickup354_5 Secret12_ExteriorDetails (X=83000.359 Y=110323.664 Z=8560.229)
+    "South House Scraps 6": base_id + 1079, # ItemPickup358_17 Secret12_ExteriorDetails (X=82072.625 Y=110482.664 Z=8682.441)
+    "South House Scraps 7": base_id + 1080, # ItemPickup24_30 Secret12_Details (X=81970.766 Y=111082.117 Z=8647.703)
+    "South House Scraps 8": base_id + 1081, # ItemPickup356_11 Secret12_ExteriorDetails (X=80915.375 Y=108689.758 Z=8377.754)
+    "South House Scraps 9": base_id + 1082, # ItemPickup355_8 Secret12_ExteriorDetails (X=81762.180 Y=111371.023 Z=7876.312)
+    "South House Scraps 10": base_id + 1083, # ItemPickup357_14 Secret12_ExteriorDetails (X=80663.336 Y=113306.695 Z=7226.475)
+    "South House Scraps 11": base_id + 1084, # ItemPickup23_21 Secret12_Details (X=80520.367 Y=113747.039 Z=7252.808)
+    "South House Scraps 12": base_id + 1085, # ItemPickup22_18 Secret12_Details (X=80830.273 Y=113871.383 Z=7201.687)
+    "South House Chest Scraps 1": base_id + 1086, # ItemPickup21 Secret12_Details (X=82079.922 Y=110808.602 Z=8739.324)
+    "South House Chest Scraps 2": base_id + 1087, # ItemPickup18 Secret12_Details (X=82102.664 Y=110813.664 Z=8726.308)
+    "South House Chest Scraps 3": base_id + 1088, # ItemPickup17 Secret12_Details (X=82091.547 Y=110810.906 Z=8721.354) \!/ Existing match 1
+    "South House Chest Scraps 4": base_id + 1089, # ItemPickup16 Secret12_Details (X=82102.664 Y=110813.664 Z=8708.337) KO
+    "South House Chest Scraps 5": base_id + 1090, # ItemPickup14 Secret12_Details (X=82091.516 Y=110810.898 Z=8701.793) \!/ Existing match 3
+    "South House Chest Scraps 6": base_id + 1091 # ItemPickup13_7 Secret12_Details (X=82102.664 Y=110813.625 Z=8688.776)
 }
 
 loc_junkyard_shed = {
-    "Junkyard Shed Helen Mission Start" : base_id + 1092, # (dialog 8) -> south_mine_key (6)
-    "Junkyard Shed Scraps 1" : base_id + 1093, # ItemPickup424_23 Settlement_A_House_1 (X=98303.992 Y=84476.016 Z=9376.540)
-    "Junkyard Shed Scraps 2" : base_id + 1094, # ItemPickup419_8 Settlement_A_House_1 (X=98174.680 Y=84067.383 Z=9249.197)
-    "Junkyard Shed Scraps 3" : base_id + 1095, # ItemPickup418_5 Settlement_A_House_1 (X=97948.977 Y=83354.656 Z=9339.430)
-    "Junkyard Shed Scraps 4" : base_id + 1096, # ItemPickup417_2 Settlement_A_House_1 (X=98208.391 Y=83088.047 Z=9273.632)
-    "Junkyard Shed Scraps 5" : base_id + 1097, # ItemPickup420_11 Settlement_A_House_1 (X=97757.773 Y=82995.656 Z=9298.597)
-    "Junkyard Shed Scraps 6" : base_id + 1098, # ItemPickup422_17 Settlement_A_House_1 (X=98776.102 Y=80881.133 Z=9286.782)
-    "Junkyard Shed Scraps 7" : base_id + 1099, # ItemPickup421_14 Settlement_A_House_1 (X=99198.508 Y=82057.820 Z=9248.227)
-    "Junkyard Shed Scraps 8" : base_id + 1100 # ItemPickup423_20 Settlement_A_House_1 (X=99208.617 Y=84383.125 Z=9257.880)
+    "Junkyard Shed Helen Mission Start": base_id + 1092, # (dialog 8) -> south_mine_key (6)
+    "Junkyard Shed Scraps 1": base_id + 1093, # ItemPickup424_23 Settlement_A_House_1 (X=98303.992 Y=84476.016 Z=9376.540)
+    "Junkyard Shed Scraps 2": base_id + 1094, # ItemPickup419_8 Settlement_A_House_1 (X=98174.680 Y=84067.383 Z=9249.197)
+    "Junkyard Shed Scraps 3": base_id + 1095, # ItemPickup418_5 Settlement_A_House_1 (X=97948.977 Y=83354.656 Z=9339.430)
+    "Junkyard Shed Scraps 4": base_id + 1096, # ItemPickup417_2 Settlement_A_House_1 (X=98208.391 Y=83088.047 Z=9273.632)
+    "Junkyard Shed Scraps 5": base_id + 1097, # ItemPickup420_11 Settlement_A_House_1 (X=97757.773 Y=82995.656 Z=9298.597)
+    "Junkyard Shed Scraps 6": base_id + 1098, # ItemPickup422_17 Settlement_A_House_1 (X=98776.102 Y=80881.133 Z=9286.782)
+    "Junkyard Shed Scraps 7": base_id + 1099, # ItemPickup421_14 Settlement_A_House_1 (X=99198.508 Y=82057.820 Z=9248.227)
+    "Junkyard Shed Scraps 8": base_id + 1100 # ItemPickup423_20 Settlement_A_House_1 (X=99208.617 Y=84383.125 Z=9257.880)
 }
 
 loc_military_base = {
-    "Military Base Sgt Flint Mission End" : base_id + 1101, # (dialog 2) -> bug_spray
-    "Military Base Scraps 1" : base_id + 1102, # ItemPickup134_17 Bugspray_Main (X=105743.531 Y=83017.492 Z=9423.290)
-    "Military Base Scraps 2" : base_id + 1103, # ItemPickup129_2 Bugspray_Main (X=108495.805 Y=81616.992 Z=9139.340)
-    "Military Base Scraps 3" : base_id + 1104, # ItemPickup135_20 Bugspray_Main (X=108709.219 Y=85981.016 Z=9650.472)
-    "Military Base Scraps 4" : base_id + 1105, # ItemPickup130_5 Bugspray_Main (X=112004.195 Y=83811.313 Z=8887.996)
-    "Military Base Scraps 5" : base_id + 1106, # ItemPickup131_8 Bugspray_Main (X=110904.867 Y=82024.781 Z=9581.007)
-    "Military Base Scraps 6" : base_id + 1107, # ItemPickup132_11 Bugspray_Main (X=112458.563 Y=81967.945 Z=9850.968)
-    "Military Base Scraps 7" : base_id + 1108, # ItemPickup22_9 Bugspray_Details (X=112541.695 Y=81345.875 Z=9896.940)
-    "Military Base Scraps 8" : base_id + 1109, # ItemPickup133_14 Bugspray_Main (X=111943.391 Y=79970.016 Z=10025.820)
-    "Military Base Scraps 9" : base_id + 1110, # ItemPickup24_8 Bugspray_Details (X=112074.063 Y=83533.398 Z=9008.831)
-    "Military Base Scraps 10" : base_id + 1111, # ItemPickup23_2 Bugspray_Details (X=110738.523 Y=85389.852 Z=9082.626)
-    "Military Base Scraps 11" : base_id + 1112, # ItemPickup136_23 Bugspray_Main (X=112962.594 Y=85872.922 Z=8638.805)
-    "Military Base Scraps 12" : base_id + 1113, # ItemPickup137_26 Bugspray_Main (X=116230.563 Y=84357.602 Z=8580.226)
-    "Military Base Orange Paint Can" : base_id + 1114 # PaintCan_5 Bugspray_Details (X=111916.102 Y=83066.195 Z=9094.554)
+    "Military Base Sgt Flint Mission End": base_id + 1101, # (dialog 2) -> bug_spray
+    "Military Base Scraps 1": base_id + 1102, # ItemPickup134_17 Bugspray_Main (X=105743.531 Y=83017.492 Z=9423.290)
+    "Military Base Scraps 2": base_id + 1103, # ItemPickup129_2 Bugspray_Main (X=108495.805 Y=81616.992 Z=9139.340)
+    "Military Base Scraps 3": base_id + 1104, # ItemPickup135_20 Bugspray_Main (X=108709.219 Y=85981.016 Z=9650.472)
+    "Military Base Scraps 4": base_id + 1105, # ItemPickup130_5 Bugspray_Main (X=112004.195 Y=83811.313 Z=8887.996)
+    "Military Base Scraps 5": base_id + 1106, # ItemPickup131_8 Bugspray_Main (X=110904.867 Y=82024.781 Z=9581.007)
+    "Military Base Scraps 6": base_id + 1107, # ItemPickup132_11 Bugspray_Main (X=112458.563 Y=81967.945 Z=9850.968)
+    "Military Base Scraps 7": base_id + 1108, # ItemPickup22_9 Bugspray_Details (X=112541.695 Y=81345.875 Z=9896.940)
+    "Military Base Scraps 8": base_id + 1109, # ItemPickup133_14 Bugspray_Main (X=111943.391 Y=79970.016 Z=10025.820)
+    "Military Base Scraps 9": base_id + 1110, # ItemPickup24_8 Bugspray_Details (X=112074.063 Y=83533.398 Z=9008.831)
+    "Military Base Scraps 10": base_id + 1111, # ItemPickup23_2 Bugspray_Details (X=110738.523 Y=85389.852 Z=9082.626)
+    "Military Base Scraps 11": base_id + 1112, # ItemPickup136_23 Bugspray_Main (X=112962.594 Y=85872.922 Z=8638.805)
+    "Military Base Scraps 12": base_id + 1113, # ItemPickup137_26 Bugspray_Main (X=116230.563 Y=84357.602 Z=8580.226)
+    "Military Base Orange Paint Can": base_id + 1114 # PaintCan_5 Bugspray_Details (X=111916.102 Y=83066.195 Z=9094.554)
 }
 
 loc_south_mine_outside = {
-    "South Mine Outside Scraps 1" : base_id + 1115, # ItemPickup20_1 Mine_1_OutsideMain (X=114794.375 Y=57211.855 Z=8523.348)
-    "South Mine Outside Scraps 2" : base_id + 1116, # ItemPickup15_2 Mine_1_OutsideDetails (X=112523.438 Y=57693.836 Z=8639.382)
-    "South Mine Outside Scraps 3" : base_id + 1117, # ItemPickup22_5 Mine_1_OutsideMain (X=112348.586 Y=59174.289 Z=8945.143)
-    "South Mine Outside Scraps 4" : base_id + 1118, # ItemPickup13_2 Mine_1_OutsideDetails (X=110989.156 Y=57840.090 Z=8700.936)
-    "South Mine Outside Scraps 5" : base_id + 1119, # ItemPickup16_1 Mine_1_OutsideDetails (X=110487.281 Y=54528.535 Z=8589.910)
-    "South Mine Outside Scraps 6" : base_id + 1120, # ItemPickup18_1 Mine_1_OutsideMain (X=113727.297 Y=54791.703 Z=8424.460)
-    "South Mine Outside Scraps 7" : base_id + 1121 # ItemPickup17_3 Mine_1_OutsideMain (X=113965.211 Y=53289.539 Z=8402.346)
+    "South Mine Outside Scraps 1": base_id + 1115, # ItemPickup20_1 Mine_1_OutsideMain (X=114794.375 Y=57211.855 Z=8523.348)
+    "South Mine Outside Scraps 2": base_id + 1116, # ItemPickup15_2 Mine_1_OutsideDetails (X=112523.438 Y=57693.836 Z=8639.382)
+    "South Mine Outside Scraps 3": base_id + 1117, # ItemPickup22_5 Mine_1_OutsideMain (X=112348.586 Y=59174.289 Z=8945.143)
+    "South Mine Outside Scraps 4": base_id + 1118, # ItemPickup13_2 Mine_1_OutsideDetails (X=110989.156 Y=57840.090 Z=8700.936)
+    "South Mine Outside Scraps 5": base_id + 1119, # ItemPickup16_1 Mine_1_OutsideDetails (X=110487.281 Y=54528.535 Z=8589.910)
+    "South Mine Outside Scraps 6": base_id + 1120, # ItemPickup18_1 Mine_1_OutsideMain (X=113727.297 Y=54791.703 Z=8424.460)
+    "South Mine Outside Scraps 7": base_id + 1121 # ItemPickup17_3 Mine_1_OutsideMain (X=113965.211 Y=53289.539 Z=8402.346)
 }
 
 loc_south_mine_inside = {
-    "South Mine Inside Scraps 1" : base_id + 1122, # ItemPickup23_4 Mine_1_Interior_1 (X=108659.945 Y=58712.691 Z=8763.015)
-    "South Mine Inside Scraps 2" : base_id + 1123, # ItemPickup24_0 Mine_1_Interior_1 (X=104954.602 Y=61540.488 Z=7876.374)
-    "South Mine Inside Scraps 3" : base_id + 1124, # ItemPickup26_0 Mine_1_Interior_1 (X=104436.758 Y=64091.211 Z=7872.767)
-    "South Mine Inside Scraps 4" : base_id + 1125, # ItemPickup290_20 Mine_1_Interior_2 (X=101356.625 Y=66110.906 Z=8034.738)
-    "South Mine Inside Scraps 5" : base_id + 1126, # ItemPickup287_8 Mine_1_Interior_2 (X=96888.820 Y=64458.559 Z=7917.468)
-    "South Mine Inside Scraps 6" : base_id + 1127, # ItemPickup289_14 Mine_1_Interior_2 (X=95863.180 Y=63252.902 Z=7847.054)
-    "South Mine Inside Scraps 7" : base_id + 1128, # ItemPickup288_11 Mine_1_Interior_2 (X=97337.219 Y=62921.438 Z=7884.393)
-    "South Mine Inside Scraps 8" : base_id + 1129, # ItemPickup285_2 Mine_1_Interior_2 (X=96689.203 Y=61880.895 Z=7806.810)
-    "South Mine Inside Scraps 9" : base_id + 1130, # ItemPickup286_5 Mine_1_Interior_2 (X=98403.227 Y=62812.531 Z=7880.947)
-    "South Mine Inside Green Egg" : base_id + 1131, # ItemPickup14_2 Mine_1_Interior_2 (X=96753.219 Y=62909.504 Z=8030.018) \!/ Existing match 4
-    "South Mine Inside Green Paint Can" : base_id + 1132 # PaintCan_2 Mine_1_Interior_1 (X=108293.281 Y=64192.094 Z=7872.770) \!/ Existing match 5
+    "South Mine Inside Scraps 1": base_id + 1122, # ItemPickup23_4 Mine_1_Interior_1 (X=108659.945 Y=58712.691 Z=8763.015)
+    "South Mine Inside Scraps 2": base_id + 1123, # ItemPickup24_0 Mine_1_Interior_1 (X=104954.602 Y=61540.488 Z=7876.374)
+    "South Mine Inside Scraps 3": base_id + 1124, # ItemPickup26_0 Mine_1_Interior_1 (X=104436.758 Y=64091.211 Z=7872.767)
+    "South Mine Inside Scraps 4": base_id + 1125, # ItemPickup290_20 Mine_1_Interior_2 (X=101356.625 Y=66110.906 Z=8034.738)
+    "South Mine Inside Scraps 5": base_id + 1126, # ItemPickup287_8 Mine_1_Interior_2 (X=96888.820 Y=64458.559 Z=7917.468)
+    "South Mine Inside Scraps 6": base_id + 1127, # ItemPickup289_14 Mine_1_Interior_2 (X=95863.180 Y=63252.902 Z=7847.054)
+    "South Mine Inside Scraps 7": base_id + 1128, # ItemPickup288_11 Mine_1_Interior_2 (X=97337.219 Y=62921.438 Z=7884.393)
+    "South Mine Inside Scraps 8": base_id + 1129, # ItemPickup285_2 Mine_1_Interior_2 (X=96689.203 Y=61880.895 Z=7806.810)
+    "South Mine Inside Scraps 9": base_id + 1130, # ItemPickup286_5 Mine_1_Interior_2 (X=98403.227 Y=62812.531 Z=7880.947)
+    "South Mine Inside Green Egg": base_id + 1131, # ItemPickup14_2 Mine_1_Interior_2 (X=96753.219 Y=62909.504 Z=8030.018) \!/ Existing match 4
+    "South Mine Inside Green Paint Can": base_id + 1132 # PaintCan_2 Mine_1_Interior_1 (X=108293.281 Y=64192.094 Z=7872.770) \!/ Existing match 5
 }
 
 loc_middle_station = {
-    "Middle Station White Paint Can" : base_id + 1133, # PaintCan_2 Station_Details1 (X=34554.141 Y=-7395.408 Z=11897.556) \!/ Existing match 5
-    "Middle Station Scraps 1" : base_id + 1134, # ItemPickup431_20 Station_BuildingDetails (X=37710.504 Y=-6462.562 Z=11356.691)
-    "Middle Station Scraps 2" : base_id + 1135, # ItemPickup425_2 Station_BuildingDetails (X=37034.340 Y=-4923.256 Z=11348.328)
-    "Middle Station Scraps 3" : base_id + 1136, # ItemPickup427_8 Station_BuildingDetails (X=36689.164 Y=-3727.466 Z=11353.597)
-    "Middle Station Scraps 4" : base_id + 1137, # ItemPickup426_5 Station_BuildingDetails (X=37207.629 Y=-3393.977 Z=11379.110)
-    "Middle Station Scraps 5" : base_id + 1138, # ItemPickup429_14 Station_BuildingDetails (X=37988.219 Y=-3365.906 Z=11350.225)
-    "Middle Station Scraps 6" : base_id + 1139, # ItemPickup428_11 Station_BuildingDetails (X=36956.242 Y=-2746.948 Z=11353.506)
-    "Middle Station Scraps 7" : base_id + 1140, # ItemPickup430_17 Station_BuildingDetails (X=36638.492 Y=-6410.017 Z=11353.546)
-    "Middle Station Scraps 8" : base_id + 1141, # ItemPickup433_26 Station_BuildingDetails (X=35931.168 Y=-7558.021 Z=11899.232)
-    "Middle Station Scraps 9" : base_id + 1142, # ItemPickup434 Station_BuildingDetails (X=35636.855 Y=-7628.500 Z=11903.627)
-    "Middle Station Scraps 10" : base_id + 1143, # ItemPickup435 Station_BuildingDetails (X=34894.152 Y=-7537.087 Z=11903.627)
-    "Middle Station Scraps 11" : base_id + 1144, # ItemPickup13_4 Station_BuildingDetails (X=33505.609 Y=-7742.843 Z=11898.971)
-    "Middle Station Scraps 12" : base_id + 1145, # ItemPickup440_5 Station_Details1 (X=37394.004 Y=-8395.084 Z=11389.296)
-    "Middle Station Scraps 13" : base_id + 1146, # ItemPickup432_23 Station_BuildingDetails (X=36040.695 Y=-8068.016 Z=11456.609)
-    "Middle Station Scraps 14" : base_id + 1147, # ItemPickup16_4 Station_BuildingDetails (X=35360.320 Y=-8441.443 Z=11457.823)
-    "Middle Station Scraps 15" : base_id + 1148, # ItemPickup439_2 Station_Details1 (X=36311.324 Y=-9563.938 Z=11468.039)
-    "Middle Station Scraps 16" : base_id + 1149, # ItemPickup442_11 Station_Details1 (X=33335.656 Y=-13872.785 Z=11189.906)
-    "Middle Station Scraps 17" : base_id + 1150, # ItemPickup441_8 Station_Details1 (X=33129.984 Y=-14073.978 Z=11189.906)
-    "Middle Station Scraps 18" : base_id + 1151, # ItemPickup436_31 Station_BuildingDetails (X=33587.488 Y=-7828.651 Z=11529.446)
-    "Middle Station Scraps 19" : base_id + 1152, # ItemPickup14_3 Station_BuildingDetails (X=34007.254 Y=-7749.381 Z=11533.760)
-    "Middle Station Scraps 20" : base_id + 1153, # ItemPickup443_14 Station_Details1 (X=31457.752 Y=-7120.744 Z=11421.197)
-    "Middle Station Theodore Mission End" : base_id + 1154 # (dialog 2) -> 35_scraps_reward
+    "Middle Station White Paint Can": base_id + 1133, # PaintCan_2 Station_Details1 (X=34554.141 Y=-7395.408 Z=11897.556) \!/ Existing match 5
+    "Middle Station Scraps 1": base_id + 1134, # ItemPickup431_20 Station_BuildingDetails (X=37710.504 Y=-6462.562 Z=11356.691)
+    "Middle Station Scraps 2": base_id + 1135, # ItemPickup425_2 Station_BuildingDetails (X=37034.340 Y=-4923.256 Z=11348.328)
+    "Middle Station Scraps 3": base_id + 1136, # ItemPickup427_8 Station_BuildingDetails (X=36689.164 Y=-3727.466 Z=11353.597)
+    "Middle Station Scraps 4": base_id + 1137, # ItemPickup426_5 Station_BuildingDetails (X=37207.629 Y=-3393.977 Z=11379.110)
+    "Middle Station Scraps 5": base_id + 1138, # ItemPickup429_14 Station_BuildingDetails (X=37988.219 Y=-3365.906 Z=11350.225)
+    "Middle Station Scraps 6": base_id + 1139, # ItemPickup428_11 Station_BuildingDetails (X=36956.242 Y=-2746.948 Z=11353.506)
+    "Middle Station Scraps 7": base_id + 1140, # ItemPickup430_17 Station_BuildingDetails (X=36638.492 Y=-6410.017 Z=11353.546)
+    "Middle Station Scraps 8": base_id + 1141, # ItemPickup433_26 Station_BuildingDetails (X=35931.168 Y=-7558.021 Z=11899.232)
+    "Middle Station Scraps 9": base_id + 1142, # ItemPickup434 Station_BuildingDetails (X=35636.855 Y=-7628.500 Z=11903.627)
+    "Middle Station Scraps 10": base_id + 1143, # ItemPickup435 Station_BuildingDetails (X=34894.152 Y=-7537.087 Z=11903.627)
+    "Middle Station Scraps 11": base_id + 1144, # ItemPickup13_4 Station_BuildingDetails (X=33505.609 Y=-7742.843 Z=11898.971)
+    "Middle Station Scraps 12": base_id + 1145, # ItemPickup440_5 Station_Details1 (X=37394.004 Y=-8395.084 Z=11389.296)
+    "Middle Station Scraps 13": base_id + 1146, # ItemPickup432_23 Station_BuildingDetails (X=36040.695 Y=-8068.016 Z=11456.609)
+    "Middle Station Scraps 14": base_id + 1147, # ItemPickup16_4 Station_BuildingDetails (X=35360.320 Y=-8441.443 Z=11457.823)
+    "Middle Station Scraps 15": base_id + 1148, # ItemPickup439_2 Station_Details1 (X=36311.324 Y=-9563.938 Z=11468.039)
+    "Middle Station Scraps 16": base_id + 1149, # ItemPickup442_11 Station_Details1 (X=33335.656 Y=-13872.785 Z=11189.906)
+    "Middle Station Scraps 17": base_id + 1150, # ItemPickup441_8 Station_Details1 (X=33129.984 Y=-14073.978 Z=11189.906)
+    "Middle Station Scraps 18": base_id + 1151, # ItemPickup436_31 Station_BuildingDetails (X=33587.488 Y=-7828.651 Z=11529.446)
+    "Middle Station Scraps 19": base_id + 1152, # ItemPickup14_3 Station_BuildingDetails (X=34007.254 Y=-7749.381 Z=11533.760)
+    "Middle Station Scraps 20": base_id + 1153, # ItemPickup443_14 Station_Details1 (X=31457.752 Y=-7120.744 Z=11421.197)
+    "Middle Station Theodore Mission End": base_id + 1154 # (dialog 2) -> 35_scraps_reward
     # "Middle Station Scraps Glitch 1" ItemPickup437_34 (X=34217.613 Y=-9481.271 Z=11505.686) /!\ Glitched scrap
     # "Middle Station Scraps Glitch 2" ItemPickup438_37 (X=36101.633 Y=-10459.024 Z=11385.937) /!\ Glitched scrap
 }
 
 loc_canyon = {
-    "Canyon Scraps 1" : base_id + 1155, # ItemPickup156_47 Canyon_Main (X=29432.162 Y=-3164.300 Z=11540.294)
-    "Canyon Scraps 2" : base_id + 1156, # ItemPickup155_44 Canyon_Main (X=26331.086 Y=3036.740 Z=11701.688)
-    "Canyon Scraps 3" : base_id + 1157, # ItemPickup154_41 Canyon_Main (X=22688.129 Y=3906.730 Z=12249.182)
-    "Canyon Scraps 4" : base_id + 1158, # ItemPickup147_20 Canyon_Main (X=20546.193 Y=4371.471 Z=12128.874)
-    "Canyon Scraps 5" : base_id + 1159, # ItemPickup148_23 Canyon_Main (X=20006.584 Y=4928.478 Z=12174.837)
-    "Canyon Scraps 6" : base_id + 1160, # ItemPickup146_17 Canyon_Main (X=19251.633 Y=3798.014 Z=12170.390)
-    "Canyon Scraps 7" : base_id + 1161, # ItemPickup149_26 Canyon_Main (X=18302.678 Y=7323.849 Z=12595.085)
-    "Canyon Scraps 8" : base_id + 1162, # ItemPickup150_29 Canyon_Main (X=19019.563 Y=8172.146 Z=12640.462)
-    "Canyon Scraps 9" : base_id + 1163, # ItemPickup142_5 Canyon_Main (X=18001.689 Y=11138.320 Z=13035.360)
-    "Canyon Scraps 10" : base_id + 1164, # ItemPickup143_8 Canyon_Main (X=16381.525 Y=7191.394 Z=13682.453)
-    "Canyon Scraps 11" : base_id + 1165, # ItemPickup144_11 Canyon_Main (X=18294.928 Y=7870.372 Z=14350.015)
-    "Canyon Scraps 12" : base_id + 1166, # ItemPickup31_2 CanyonCamp_Details (X=20730.520 Y=8032.158 Z=14439.826)
-    "Canyon Scraps 13" : base_id + 1167, # ItemPickup145_14 Canyon_Main (X=24752.658 Y=7959.624 Z=14363.087)
-    "Canyon Scraps 14" : base_id + 1168, # ItemPickup141_2 Canyon_Main (X=20181.992 Y=13816.017 Z=14897.407)
-    "Canyon Scraps 15" : base_id + 1169, # ItemPickup151_32 Canyon_Main (X=23172.160 Y=2842.120 Z=12954.566)
-    "Canyon Scraps 16" : base_id + 1170, # ItemPickup152_35 Canyon_Main (X=22307.621 Y=-1180.840 Z=12451.548)
-    "Canyon Scraps 17" : base_id + 1171, # ItemPickup153_38 Canyon_Main (X=28473.596 Y=6741.842 Z=13314.166)
-    "Canyon Blue Box" : base_id + 1172 # Canyon_BlueBoxPickup CanyonCamp_Details (X=20338.525 Y=4989.111 Z=12323.649)
+    "Canyon Scraps 1": base_id + 1155, # ItemPickup156_47 Canyon_Main (X=29432.162 Y=-3164.300 Z=11540.294)
+    "Canyon Scraps 2": base_id + 1156, # ItemPickup155_44 Canyon_Main (X=26331.086 Y=3036.740 Z=11701.688)
+    "Canyon Scraps 3": base_id + 1157, # ItemPickup154_41 Canyon_Main (X=22688.129 Y=3906.730 Z=12249.182)
+    "Canyon Scraps 4": base_id + 1158, # ItemPickup147_20 Canyon_Main (X=20546.193 Y=4371.471 Z=12128.874)
+    "Canyon Scraps 5": base_id + 1159, # ItemPickup148_23 Canyon_Main (X=20006.584 Y=4928.478 Z=12174.837)
+    "Canyon Scraps 6": base_id + 1160, # ItemPickup146_17 Canyon_Main (X=19251.633 Y=3798.014 Z=12170.390)
+    "Canyon Scraps 7": base_id + 1161, # ItemPickup149_26 Canyon_Main (X=18302.678 Y=7323.849 Z=12595.085)
+    "Canyon Scraps 8": base_id + 1162, # ItemPickup150_29 Canyon_Main (X=19019.563 Y=8172.146 Z=12640.462)
+    "Canyon Scraps 9": base_id + 1163, # ItemPickup142_5 Canyon_Main (X=18001.689 Y=11138.320 Z=13035.360)
+    "Canyon Scraps 10": base_id + 1164, # ItemPickup143_8 Canyon_Main (X=16381.525 Y=7191.394 Z=13682.453)
+    "Canyon Scraps 11": base_id + 1165, # ItemPickup144_11 Canyon_Main (X=18294.928 Y=7870.372 Z=14350.015)
+    "Canyon Scraps 12": base_id + 1166, # ItemPickup31_2 CanyonCamp_Details (X=20730.520 Y=8032.158 Z=14439.826)
+    "Canyon Scraps 13": base_id + 1167, # ItemPickup145_14 Canyon_Main (X=24752.658 Y=7959.624 Z=14363.087)
+    "Canyon Scraps 14": base_id + 1168, # ItemPickup141_2 Canyon_Main (X=20181.992 Y=13816.017 Z=14897.407)
+    "Canyon Scraps 15": base_id + 1169, # ItemPickup151_32 Canyon_Main (X=23172.160 Y=2842.120 Z=12954.566)
+    "Canyon Scraps 16": base_id + 1170, # ItemPickup152_35 Canyon_Main (X=22307.621 Y=-1180.840 Z=12451.548)
+    "Canyon Scraps 17": base_id + 1171, # ItemPickup153_38 Canyon_Main (X=28473.596 Y=6741.842 Z=13314.166)
+    "Canyon Blue Box": base_id + 1172 # Canyon_BlueBoxPickup CanyonCamp_Details (X=20338.525 Y=4989.111 Z=12323.649)
 }
 
 loc_watchtower = {
-    "Watchtower Scraps 1" : base_id + 1173, # ItemPickup373_13 Secret2_WatchTowerDetails (X=32760.389 Y=-28814.084 Z=10997.447)
-    "Watchtower Scraps 2" : base_id + 1174, # ItemPickup22_6 Secret2_WatchTowerDetails (X=32801.668 Y=-31660.041 Z=10643.390)
-    "Watchtower Scraps 3" : base_id + 1175, # ItemPickup372_10 Secret2_WatchTowerDetails (X=31018.063 Y=-33375.313 Z=11100.126)
-    "Watchtower Scraps 4" : base_id + 1176, # ItemPickup22_16 Secret2_WatchTowerDetails (X=33308.215 Y=-35928.578 Z=10614.347)
-    "Watchtower Scraps 5" : base_id + 1177, # ItemPickup22_2 Secret2_WatchTowerDetails (X=34304.262 Y=-33446.063 Z=10674.936)
-    "Watchtower Scraps 6" : base_id + 1178, # ItemPickup370_2 Secret2_WatchTowerDetails (X=32869.453 Y=-33184.094 Z=10612.040)
-    "Watchtower Scraps 7" : base_id + 1179, # ItemPickup374_16 Secret2_WatchTowerDetails (X=33210.707 Y=-32097.611 Z=11211.031)
-    "Watchtower Scraps 8" : base_id + 1180, # ItemPickup22_10 Secret2_WatchTowerDetails (X=33246.262 Y=-32046.697 Z=11851.025)
-    "Watchtower Scraps 9" : base_id + 1181, # ItemPickup22_8 Secret2_WatchTowerDetails (X=33553.156 Y=-31810.645 Z=11849.521)
-    "Watchtower Scraps 10" : base_id + 1182, # ItemPickup371_7 Secret2_WatchTowerDetails (X=36151.621 Y=-31791.633 Z=11093.785)
-    "Watchtower Pink Paint Can" : base_id + 1183 # PaintCan_2 Secret2_WatchTowerDetails (X=33069.133 Y=-32168.045 Z=11859.582) \!/ Existing match 5
+    "Watchtower Scraps 1": base_id + 1173, # ItemPickup373_13 Secret2_WatchTowerDetails (X=32760.389 Y=-28814.084 Z=10997.447)
+    "Watchtower Scraps 2": base_id + 1174, # ItemPickup22_6 Secret2_WatchTowerDetails (X=32801.668 Y=-31660.041 Z=10643.390)
+    "Watchtower Scraps 3": base_id + 1175, # ItemPickup372_10 Secret2_WatchTowerDetails (X=31018.063 Y=-33375.313 Z=11100.126)
+    "Watchtower Scraps 4": base_id + 1176, # ItemPickup22_16 Secret2_WatchTowerDetails (X=33308.215 Y=-35928.578 Z=10614.347)
+    "Watchtower Scraps 5": base_id + 1177, # ItemPickup22_2 Secret2_WatchTowerDetails (X=34304.262 Y=-33446.063 Z=10674.936)
+    "Watchtower Scraps 6": base_id + 1178, # ItemPickup370_2 Secret2_WatchTowerDetails (X=32869.453 Y=-33184.094 Z=10612.040)
+    "Watchtower Scraps 7": base_id + 1179, # ItemPickup374_16 Secret2_WatchTowerDetails (X=33210.707 Y=-32097.611 Z=11211.031)
+    "Watchtower Scraps 8": base_id + 1180, # ItemPickup22_10 Secret2_WatchTowerDetails (X=33246.262 Y=-32046.697 Z=11851.025)
+    "Watchtower Scraps 9": base_id + 1181, # ItemPickup22_8 Secret2_WatchTowerDetails (X=33553.156 Y=-31810.645 Z=11849.521)
+    "Watchtower Scraps 10": base_id + 1182, # ItemPickup371_7 Secret2_WatchTowerDetails (X=36151.621 Y=-31791.633 Z=11093.785)
+    "Watchtower Pink Paint Can": base_id + 1183 # PaintCan_2 Secret2_WatchTowerDetails (X=33069.133 Y=-32168.045 Z=11859.582) \!/ Existing match 5
 }
 
 loc_boulder_field = {
-    "Boulder Field Page Drawing 1" : base_id + 1184, # Pages_Drawing1 Pages_Environment_Details (X=46232.703 Y=-37052.875 Z=9531.116)
-    "Boulder Field Page Drawing 2" : base_id + 1185, # Pages_Drawing2 Pages_Environment_Details (X=51854.980 Y=-31332.070 Z=9804.927)
-    "Boulder Field Page Drawing 3" : base_id + 1186, # Pages_Drawing3 Pages_Environment_Details (X=47595.750 Y=-29931.740 Z=9308.014)
-    "Boulder Field Page Drawing 4" : base_id + 1187, # Pages_Drawing4 Pages_Environment_Details (X=43819.680 Y=-30378.770 Z=9706.599)
-    "Boulder Field Page Drawing 5" : base_id + 1188, # Pages_Drawing5 Pages_Environment_Details (X=47494.746 Y=-20884.781 Z=9812.398)
-    "Boulder Field Page Drawing 6" : base_id + 1189, # Pages_Drawing6 Pages_Environment_Details (X=43725.148 Y=-21952.570 Z=9744.351)
-    "Boulder Field Page Drawing 7" : base_id + 1190, # Pages_Drawing7 Pages_Environment_Details (X=44752.465 Y=-16362.510 Z=10147.004)
-    "Boulder Field Page Drawing 8" : base_id + 1191, # Pages_Drawing8 Pages_Environment_Details (X=50496.270 Y=-26090.533 Z=9835.365)
-    "Boulder Field Scraps 1" : base_id + 1192, # ItemPickup293_8 Pages_Environment_Main (X=41385.406 Y=-32281.871 Z=10240.781)
-    "Boulder Field Scraps 2" : base_id + 1193, # ItemPickup987321 Pages_House_Main (X=46654.969 Y=-38859.254 Z=9920.861)
-    "Boulder Field Scraps 3" : base_id + 1194, # ItemPickup516121 Pages_House_Main (X=44765.836 Y=-41675.559 Z=9938.179)
-    "Boulder Field Scraps 4" : base_id + 1195, # ItemPickup291_2 Pages_Environment_Main (X=50088.270 Y=-30669.107 Z=9267.371)
-    "Boulder Field Scraps 5" : base_id + 1196, # ItemPickup303_38 Pages_Environment_Main (X=48014.609 Y=-28971.115 Z=9199.659)
-    "Boulder Field Scraps 6" : base_id + 1197, # ItemPickup302_35 Pages_Environment_Main (X=50190.266 Y=-26243.977 Z=9648.289)
-    "Boulder Field Scraps 7" : base_id + 1198, # ItemPickup305_44 Pages_Environment_Main (X=47802.246 Y=-22594.684 Z=9631.879)
-    "Boulder Field Scraps 8" : base_id + 1199, # ItemPickup294_11 Pages_Environment_Main (X=44345.996 Y=-23408.535 Z=9659.643)
-    "Boulder Field Scraps 9" : base_id + 1200, # ItemPickup295_14 Pages_Environment_Main (X=41620.590 Y=-22982.641 Z=9720.177)
-    "Boulder Field Scraps 10" : base_id + 1201, # ItemPickup300_29 Pages_Environment_Main (X=52003.172 Y=-19163.049 Z=9925.105)
-    "Boulder Field Scraps 11" : base_id + 1202, # ItemPickup301_32 Pages_Environment_Main (X=51422.176 Y=-22319.322 Z=10663.813)
-    "Boulder Field Scraps 12" : base_id + 1203, # ItemPickup296_17 Pages_Environment_Main (X=43527.176 Y=-17952.570 Z=10812.458)
-    "Boulder Field Scraps 13" : base_id + 1204, # ItemPickup297_20 Pages_Environment_Main (X=45241.871 Y=-15847.636 Z=9952.198)
-    "Boulder Field Scraps 14" : base_id + 1205, # ItemPickup298_23 Pages_Environment_Main (X=46238.027 Y=-18407.420 Z=10199.825)
-    "Boulder Field Scraps 15" : base_id + 1206, # ItemPickup299_26 Pages_Environment_Main (X=49835.617 Y=-17379.959 Z=9810.836)
-    "Boulder Field Scraps 16" : base_id + 1207, # ItemPickup306_47 Pages_Environment_Main (X=45144.594 Y=-33817.090 Z=10136.658)
-    "Boulder Field Scraps 17" : base_id + 1208, # ItemPickup292_5 Pages_Environment_Main (X=44336.184 Y=-37162.367 Z=9789.548)
-    "Boulder Field Scraps 18" : base_id + 1209 # ItemPickup304_41 Pages_Environment_Main (X=44490.160 Y=-26442.754 Z=9974.022)
+    "Boulder Field Page Drawing 1": base_id + 1184, # Pages_Drawing1 Pages_Environment_Details (X=46232.703 Y=-37052.875 Z=9531.116)
+    "Boulder Field Page Drawing 2": base_id + 1185, # Pages_Drawing2 Pages_Environment_Details (X=51854.980 Y=-31332.070 Z=9804.927)
+    "Boulder Field Page Drawing 3": base_id + 1186, # Pages_Drawing3 Pages_Environment_Details (X=47595.750 Y=-29931.740 Z=9308.014)
+    "Boulder Field Page Drawing 4": base_id + 1187, # Pages_Drawing4 Pages_Environment_Details (X=43819.680 Y=-30378.770 Z=9706.599)
+    "Boulder Field Page Drawing 5": base_id + 1188, # Pages_Drawing5 Pages_Environment_Details (X=47494.746 Y=-20884.781 Z=9812.398)
+    "Boulder Field Page Drawing 6": base_id + 1189, # Pages_Drawing6 Pages_Environment_Details (X=43725.148 Y=-21952.570 Z=9744.351)
+    "Boulder Field Page Drawing 7": base_id + 1190, # Pages_Drawing7 Pages_Environment_Details (X=44752.465 Y=-16362.510 Z=10147.004)
+    "Boulder Field Page Drawing 8": base_id + 1191, # Pages_Drawing8 Pages_Environment_Details (X=50496.270 Y=-26090.533 Z=9835.365)
+    "Boulder Field Scraps 1": base_id + 1192, # ItemPickup293_8 Pages_Environment_Main (X=41385.406 Y=-32281.871 Z=10240.781)
+    "Boulder Field Scraps 2": base_id + 1193, # ItemPickup987321 Pages_House_Main (X=46654.969 Y=-38859.254 Z=9920.861)
+    "Boulder Field Scraps 3": base_id + 1194, # ItemPickup516121 Pages_House_Main (X=44765.836 Y=-41675.559 Z=9938.179)
+    "Boulder Field Scraps 4": base_id + 1195, # ItemPickup291_2 Pages_Environment_Main (X=50088.270 Y=-30669.107 Z=9267.371)
+    "Boulder Field Scraps 5": base_id + 1196, # ItemPickup303_38 Pages_Environment_Main (X=48014.609 Y=-28971.115 Z=9199.659)
+    "Boulder Field Scraps 6": base_id + 1197, # ItemPickup302_35 Pages_Environment_Main (X=50190.266 Y=-26243.977 Z=9648.289)
+    "Boulder Field Scraps 7": base_id + 1198, # ItemPickup305_44 Pages_Environment_Main (X=47802.246 Y=-22594.684 Z=9631.879)
+    "Boulder Field Scraps 8": base_id + 1199, # ItemPickup294_11 Pages_Environment_Main (X=44345.996 Y=-23408.535 Z=9659.643)
+    "Boulder Field Scraps 9": base_id + 1200, # ItemPickup295_14 Pages_Environment_Main (X=41620.590 Y=-22982.641 Z=9720.177)
+    "Boulder Field Scraps 10": base_id + 1201, # ItemPickup300_29 Pages_Environment_Main (X=52003.172 Y=-19163.049 Z=9925.105)
+    "Boulder Field Scraps 11": base_id + 1202, # ItemPickup301_32 Pages_Environment_Main (X=51422.176 Y=-22319.322 Z=10663.813)
+    "Boulder Field Scraps 12": base_id + 1203, # ItemPickup296_17 Pages_Environment_Main (X=43527.176 Y=-17952.570 Z=10812.458)
+    "Boulder Field Scraps 13": base_id + 1204, # ItemPickup297_20 Pages_Environment_Main (X=45241.871 Y=-15847.636 Z=9952.198)
+    "Boulder Field Scraps 14": base_id + 1205, # ItemPickup298_23 Pages_Environment_Main (X=46238.027 Y=-18407.420 Z=10199.825)
+    "Boulder Field Scraps 15": base_id + 1206, # ItemPickup299_26 Pages_Environment_Main (X=49835.617 Y=-17379.959 Z=9810.836)
+    "Boulder Field Scraps 16": base_id + 1207, # ItemPickup306_47 Pages_Environment_Main (X=45144.594 Y=-33817.090 Z=10136.658)
+    "Boulder Field Scraps 17": base_id + 1208, # ItemPickup292_5 Pages_Environment_Main (X=44336.184 Y=-37162.367 Z=9789.548)
+    "Boulder Field Scraps 18": base_id + 1209 # ItemPickup304_41 Pages_Environment_Main (X=44490.160 Y=-26442.754 Z=9974.022)
 }
 
 loc_haunted_house = {
-    "Haunted House Sasha Mission End" : base_id + 1210, # (dialog 2) -> 40_scraps_reward
-    "Haunted House Scraps 1" : base_id + 1211, # ItemPickup1309876 Pages_House_Main (X=42900.188 Y=-43760.617 Z=9900.531)
-    "Haunted House Scraps 2" : base_id + 1212, # ItemPickup22213 Pages_House_Main (X=43608.078 Y=-44642.434 Z=9922.888)
-    "Haunted House Scraps 3" : base_id + 1213, # ItemPickup5423189 Pages_House_Main (X=43992.387 Y=-44259.336 Z=9877.623)
-    "Haunted House Scraps 4" : base_id + 1214, # ItemPickup1312312 Pages_House_Main (X=43340.012 Y=-45362.617 Z=9882.796)
-    "Haunted House Scraps 5" : base_id + 1215, # ItemPickup1596 Pages_House_Main (X=45105.383 Y=-45980.879 Z=9854.796)
-    "Haunted House Scraps 6" : base_id + 1216 # ItemPickup8624 Pages_House_Main (X=45888.406 Y=-46050.246 Z=9555.326)
+    "Haunted House Sasha Mission End": base_id + 1210, # (dialog 2) -> 40_scraps_reward
+    "Haunted House Scraps 1": base_id + 1211, # ItemPickup1309876 Pages_House_Main (X=42900.188 Y=-43760.617 Z=9900.531)
+    "Haunted House Scraps 2": base_id + 1212, # ItemPickup22213 Pages_House_Main (X=43608.078 Y=-44642.434 Z=9922.888)
+    "Haunted House Scraps 3": base_id + 1213, # ItemPickup5423189 Pages_House_Main (X=43992.387 Y=-44259.336 Z=9877.623)
+    "Haunted House Scraps 4": base_id + 1214, # ItemPickup1312312 Pages_House_Main (X=43340.012 Y=-45362.617 Z=9882.796)
+    "Haunted House Scraps 5": base_id + 1215, # ItemPickup1596 Pages_House_Main (X=45105.383 Y=-45980.879 Z=9854.796)
+    "Haunted House Scraps 6": base_id + 1216 # ItemPickup8624 Pages_House_Main (X=45888.406 Y=-46050.246 Z=9555.326)
 }
 
 loc_santiago_house = {
-    "Santiago House Scraps 1" : base_id + 1217, # ItemPickup342_19 PortNPCHouse_Details (X=37271.445 Y=-46075.598 Z=10648.827)
-    "Santiago House Scraps 2" : base_id + 1218, # ItemPickup37_5 PortNPCHouse_Details (X=38330.512 Y=-47184.668 Z=10387.618)
-    "Santiago House Scraps 3" : base_id + 1219, # ItemPickup337_2 PortNPCHouse_Details (X=35720.422 Y=-49536.328 Z=10098.503)
-    "Santiago House Scraps 4" : base_id + 1220, # ItemPickup344_25 PortNPCHouse_Details (X=35466.285 Y=-50363.078 Z=10098.504)
-    "Santiago House Scraps 5" : base_id + 1221, # ItemPickup338_7 PortNPCHouse_Details (X=34274.289 Y=-49947.578 Z=10098.501)
-    "Santiago House Scraps 6" : base_id + 1222, # ItemPickup341_16 PortNPCHouse_Details (X=35584.359 Y=-48195.172 Z=10323.833)
-    "Santiago House Scraps 7" : base_id + 1223, # ItemPickup340_13 PortNPCHouse_Details (X=35019.766 Y=-49904.113 Z=10124.169)
-    "Santiago House Scraps 8" : base_id + 1224, # ItemPickup339_10 PortNPCHouse_Details (X=35527.711 Y=-49614.801 Z=10124.016)
-    "Santiago House Scraps 9" : base_id + 1225, # ItemPickup36_2 PortNPCHouse_Details (X=34471.707 Y=-49497.000 Z=10199.790)
-    "Santiago House Scraps 10" : base_id + 1226, # ItemPickup343_22 PortNPCHouse_Details (X=37920.277 Y=-51867.754 Z=9847.511)
-    "Santiago House Journal" : base_id + 1227 # Port_Journal_Pickup PortNPCHouse_Details (X=34690.777 Y=-49788.359 Z=10214.353)
+    "Santiago House Scraps 1": base_id + 1217, # ItemPickup342_19 PortNPCHouse_Details (X=37271.445 Y=-46075.598 Z=10648.827)
+    "Santiago House Scraps 2": base_id + 1218, # ItemPickup37_5 PortNPCHouse_Details (X=38330.512 Y=-47184.668 Z=10387.618)
+    "Santiago House Scraps 3": base_id + 1219, # ItemPickup337_2 PortNPCHouse_Details (X=35720.422 Y=-49536.328 Z=10098.503)
+    "Santiago House Scraps 4": base_id + 1220, # ItemPickup344_25 PortNPCHouse_Details (X=35466.285 Y=-50363.078 Z=10098.504)
+    "Santiago House Scraps 5": base_id + 1221, # ItemPickup338_7 PortNPCHouse_Details (X=34274.289 Y=-49947.578 Z=10098.501)
+    "Santiago House Scraps 6": base_id + 1222, # ItemPickup341_16 PortNPCHouse_Details (X=35584.359 Y=-48195.172 Z=10323.833)
+    "Santiago House Scraps 7": base_id + 1223, # ItemPickup340_13 PortNPCHouse_Details (X=35019.766 Y=-49904.113 Z=10124.169)
+    "Santiago House Scraps 8": base_id + 1224, # ItemPickup339_10 PortNPCHouse_Details (X=35527.711 Y=-49614.801 Z=10124.016)
+    "Santiago House Scraps 9": base_id + 1225, # ItemPickup36_2 PortNPCHouse_Details (X=34471.707 Y=-49497.000 Z=10199.790)
+    "Santiago House Scraps 10": base_id + 1226, # ItemPickup343_22 PortNPCHouse_Details (X=37920.277 Y=-51867.754 Z=9847.511)
+    "Santiago House Journal": base_id + 1227 # Port_Journal_Pickup PortNPCHouse_Details (X=34690.777 Y=-49788.359 Z=10214.353)
 }
 
 loc_port = {
-    "Port Grey Paint Can" : base_id + 1228, # PaintCan_13 Port_Details (X=74641.648 Y=-11320.948 Z=7551.767)
-    "Port Scraps 1" : base_id + 1229, # ItemPickup334_32 Port_Main (X=67315.281 Y=-13828.055 Z=10101.339)
-    "Port Scraps 2" : base_id + 1230, # ItemPickup335_35 Port_Main (X=67679.508 Y=-14127.952 Z=10061.037)
-    "Port Scraps 3" : base_id + 1231, # ItemPickup336_38 Port_Main (X=67062.219 Y=-15626.003 Z=10065.956)
-    "Port Scraps 4" : base_id + 1232, # ItemPickup21_15 Port_Main (X=66140.914 Y=-16079.730 Z=10092.268)
-    "Port Scraps 5" : base_id + 1233, # ItemPickup18_12 Port_Main (X=66824.719 Y=-14729.157 Z=10125.234)
-    "Port Scraps 6" : base_id + 1234, # ItemPickup333_29 Port_Main (X=69777.258 Y=-8371.526 Z=9391.735)
-    "Port Scraps 7" : base_id + 1235, # ItemPickup332_26 Port_Main (X=70339.695 Y=-11066.703 Z=8912.465)
-    "Port Scraps 8" : base_id + 1236, # ItemPickup331_23 Port_Main (X=72729.508 Y=-7048.998 Z=8245.522)
-    "Port Scraps 9" : base_id + 1237, # ItemPickup329_17 Port_Main (X=75896.070 Y=-8705.214 Z=7514.992)
-    "Port Scraps 10" : base_id + 1238, # ItemPickup330_20 Port_Main (X=74264.211 Y=-10553.446 Z=7520.141)
-    "Port Scraps 11" : base_id + 1239, # ItemPickup17_9 Port_Main (X=74328.117 Y=-11423.852 Z=7511.827)
-    "Port Scraps 12" : base_id + 1240, # ItemPickup328_14 Port_Main (X=76753.164 Y=-10744.933 Z=7437.174)
-    "Port Scraps 13" : base_id + 1241, # ItemPickup326_8 Port_Main (X=77330.414 Y=-11640.151 Z=7189.003)
-    "Port Scraps 14" : base_id + 1242, # ItemPickup327_11 Port_Main (X=76403.516 Y=-12484.995 Z=7440.368)
-    "Port Scraps 15" : base_id + 1243, # ItemPickup324_2 Port_Main (X=78651.977 Y=-12233.159 Z=7439.514)
-    "Port Scraps 16" : base_id + 1244, # ItemPickup14_5 Port_Main (X=80336.297 Y=-12276.590 Z=7436.639)
-    "Port Scraps 17" : base_id + 1245, # ItemPickup325_5 Port_Main (X=79845.086 Y=-13410.705 Z=7440.597)
-    "Port Scraps 18" : base_id + 1246, # ItemPickup13_2 Port_Main (X=76156.719 Y=-12816.718 Z=7439.269) KO
-    "Port Scraps 19" : base_id + 1247, # ItemPickup16 Port_Main (X=80754.914 Y=-14055.545 Z=7445.339) KO
-    "Port Santiago Mission End" : base_id + 1248 # (dialog 3) -> 35_scraps_reward
+    "Port Grey Paint Can": base_id + 1228, # PaintCan_13 Port_Details (X=74641.648 Y=-11320.948 Z=7551.767)
+    "Port Scraps 1": base_id + 1229, # ItemPickup334_32 Port_Main (X=67315.281 Y=-13828.055 Z=10101.339)
+    "Port Scraps 2": base_id + 1230, # ItemPickup335_35 Port_Main (X=67679.508 Y=-14127.952 Z=10061.037)
+    "Port Scraps 3": base_id + 1231, # ItemPickup336_38 Port_Main (X=67062.219 Y=-15626.003 Z=10065.956)
+    "Port Scraps 4": base_id + 1232, # ItemPickup21_15 Port_Main (X=66140.914 Y=-16079.730 Z=10092.268)
+    "Port Scraps 5": base_id + 1233, # ItemPickup18_12 Port_Main (X=66824.719 Y=-14729.157 Z=10125.234)
+    "Port Scraps 6": base_id + 1234, # ItemPickup333_29 Port_Main (X=69777.258 Y=-8371.526 Z=9391.735)
+    "Port Scraps 7": base_id + 1235, # ItemPickup332_26 Port_Main (X=70339.695 Y=-11066.703 Z=8912.465)
+    "Port Scraps 8": base_id + 1236, # ItemPickup331_23 Port_Main (X=72729.508 Y=-7048.998 Z=8245.522)
+    "Port Scraps 9": base_id + 1237, # ItemPickup329_17 Port_Main (X=75896.070 Y=-8705.214 Z=7514.992)
+    "Port Scraps 10": base_id + 1238, # ItemPickup330_20 Port_Main (X=74264.211 Y=-10553.446 Z=7520.141)
+    "Port Scraps 11": base_id + 1239, # ItemPickup17_9 Port_Main (X=74328.117 Y=-11423.852 Z=7511.827)
+    "Port Scraps 12": base_id + 1240, # ItemPickup328_14 Port_Main (X=76753.164 Y=-10744.933 Z=7437.174)
+    "Port Scraps 13": base_id + 1241, # ItemPickup326_8 Port_Main (X=77330.414 Y=-11640.151 Z=7189.003)
+    "Port Scraps 14": base_id + 1242, # ItemPickup327_11 Port_Main (X=76403.516 Y=-12484.995 Z=7440.368)
+    "Port Scraps 15": base_id + 1243, # ItemPickup324_2 Port_Main (X=78651.977 Y=-12233.159 Z=7439.514)
+    "Port Scraps 16": base_id + 1244, # ItemPickup14_5 Port_Main (X=80336.297 Y=-12276.590 Z=7436.639)
+    "Port Scraps 17": base_id + 1245, # ItemPickup325_5 Port_Main (X=79845.086 Y=-13410.705 Z=7440.597)
+    "Port Scraps 18": base_id + 1246, # ItemPickup13_2 Port_Main (X=76156.719 Y=-12816.718 Z=7439.269) KO
+    "Port Scraps 19": base_id + 1247, # ItemPickup16 Port_Main (X=80754.914 Y=-14055.545 Z=7445.339) KO
+    "Port Santiago Mission End": base_id + 1248 # (dialog 3) -> 35_scraps_reward
 }
 
 loc_trench_house = {
-    "Trench House Scraps 1" : base_id + 1249, # ItemPickup157_2 DeadWoodsEnvironment (X=76340.328 Y=-42886.191 Z=9567.521)
-    "Trench House Scraps 2" : base_id + 1250, # ItemPickup158_5 DeadWoodsEnvironment (X=76013.594 Y=-44140.141 Z=9413.147)
-    "Trench House Scraps 3" : base_id + 1251, # ItemPickup159_11 DeadWoodsEnvironment (X=74408.320 Y=-45424.000 Z=9446.966)
-    "Trench House Scraps 4" : base_id + 1252, # ItemPickup69_14 Secret8_BasementHouseDetails (X=75196.344 Y=-48321.504 Z=9453.302)
-    "Trench House Scraps 5" : base_id + 1253, # ItemPickup160_14 DeadWoodsEnvironment (X=73467.273 Y=-48995.738 Z=9355.070)
-    "Trench House Scraps 6" : base_id + 1254, # ItemPickup163_23 DeadWoodsEnvironment (X=76418.469 Y=-53239.539 Z=9276.892)
-    "Trench House Scraps 7" : base_id + 1255, # ItemPickup173_56 DeadWoodsEnvironment (X=70719.875 Y=-54290.117 Z=9357.084)
-    "Trench House Scraps 8" : base_id + 1256, # ItemPickup165_29 DeadWoodsEnvironment (X=70075.938 Y=-53041.973 Z=9675.481)
-    "Trench House Scraps 9" : base_id + 1257, # ItemPickup162_20 DeadWoodsEnvironment (X=74745.711 Y=-52304.027 Z=9073.130)
-    "Trench House Scraps 10" : base_id + 1258, # ItemPickup68_11 Secret8_BasementHouseDetails (X=74519.750 Y=-53603.063 Z=9078.054)
-    "Trench House Scraps 11" : base_id + 1259, # ItemPickup161_17 DeadWoodsEnvironment (X=73747.492 Y=-52589.906 Z=9104.748)
-    "Trench House Scraps 12" : base_id + 1260, # ItemPickup67_8 Secret8_BasementHouseDetails (X=74333.125 Y=-52847.961 Z=9124.773)
-    "Trench House Scraps 13" : base_id + 1261, # ItemPickup66_5 Secret8_BasementHouseDetails (X=74062.195 Y=-52663.043 Z=9122.827)
-    "Trench House Scraps 14" : base_id + 1262, # ItemPickup65_2 Secret8_BasementHouseDetails (X=74820.492 Y=-51350.051 Z=7956.387)
-    "Trench House Scraps 15" : base_id + 1263, # ItemPickup164_26 DeadWoodsEnvironment (X=75286.289 Y=-51164.098 Z=7957.081)
-    "Trench House Scraps 16" : base_id + 1264, # ItemPickup174_59 DeadWoodsEnvironment (X=68413.258 Y=-56872.816 Z=9349.443)
-    "Trench House Scraps 17" : base_id + 1265, # ItemPickup175_62 DeadWoodsEnvironment (X=67281.281 Y=-59201.371 Z=9254.457)
-    "Trench House Scraps 18" : base_id + 1266, # ItemPickup172_50 DeadWoodsEnvironment (X=69064.219 Y=-48796.352 Z=9770.164)
-    "Trench House Chest Scraps 1" : base_id + 1267, # ItemPickup75123123 Secret8_BasementHouseDetails (X=75042.141 Y=-50830.891 Z=8005.156)
-    "Trench House Chest Scraps 2" : base_id + 1268, # ItemPickup741123 Secret8_BasementHouseDetails (X=75066.516 Y=-50824.398 Z=7995.000)
-    "Trench House Chest Scraps 3" : base_id + 1269, # ItemPickup729842 Secret8_BasementHouseDetails (X=75072.789 Y=-50818.441 Z=7986.979)
-    "Trench House Chest Scraps 4" : base_id + 1270, # ItemPickup711123 Secret8_BasementHouseDetails (X=75038.656 Y=-50827.566 Z=7973.354)
-    "Trench House Chest Scraps 5" : base_id + 1271, # ItemPickup73 Secret8_BasementHouseDetails (X=75060.406 Y=-50828.102 Z=7965.915)
-    "Trench House Chest Scraps 6" : base_id + 1272 # ItemPickup7075674 Secret8_BasementHouseDetails (X=75056.648 Y=-50818.125 Z=7959.868)
+    "Trench House Scraps 1": base_id + 1249, # ItemPickup157_2 DeadWoodsEnvironment (X=76340.328 Y=-42886.191 Z=9567.521)
+    "Trench House Scraps 2": base_id + 1250, # ItemPickup158_5 DeadWoodsEnvironment (X=76013.594 Y=-44140.141 Z=9413.147)
+    "Trench House Scraps 3": base_id + 1251, # ItemPickup159_11 DeadWoodsEnvironment (X=74408.320 Y=-45424.000 Z=9446.966)
+    "Trench House Scraps 4": base_id + 1252, # ItemPickup69_14 Secret8_BasementHouseDetails (X=75196.344 Y=-48321.504 Z=9453.302)
+    "Trench House Scraps 5": base_id + 1253, # ItemPickup160_14 DeadWoodsEnvironment (X=73467.273 Y=-48995.738 Z=9355.070)
+    "Trench House Scraps 6": base_id + 1254, # ItemPickup163_23 DeadWoodsEnvironment (X=76418.469 Y=-53239.539 Z=9276.892)
+    "Trench House Scraps 7": base_id + 1255, # ItemPickup173_56 DeadWoodsEnvironment (X=70719.875 Y=-54290.117 Z=9357.084)
+    "Trench House Scraps 8": base_id + 1256, # ItemPickup165_29 DeadWoodsEnvironment (X=70075.938 Y=-53041.973 Z=9675.481)
+    "Trench House Scraps 9": base_id + 1257, # ItemPickup162_20 DeadWoodsEnvironment (X=74745.711 Y=-52304.027 Z=9073.130)
+    "Trench House Scraps 10": base_id + 1258, # ItemPickup68_11 Secret8_BasementHouseDetails (X=74519.750 Y=-53603.063 Z=9078.054)
+    "Trench House Scraps 11": base_id + 1259, # ItemPickup161_17 DeadWoodsEnvironment (X=73747.492 Y=-52589.906 Z=9104.748)
+    "Trench House Scraps 12": base_id + 1260, # ItemPickup67_8 Secret8_BasementHouseDetails (X=74333.125 Y=-52847.961 Z=9124.773)
+    "Trench House Scraps 13": base_id + 1261, # ItemPickup66_5 Secret8_BasementHouseDetails (X=74062.195 Y=-52663.043 Z=9122.827)
+    "Trench House Scraps 14": base_id + 1262, # ItemPickup65_2 Secret8_BasementHouseDetails (X=74820.492 Y=-51350.051 Z=7956.387)
+    "Trench House Scraps 15": base_id + 1263, # ItemPickup164_26 DeadWoodsEnvironment (X=75286.289 Y=-51164.098 Z=7957.081)
+    "Trench House Scraps 16": base_id + 1264, # ItemPickup174_59 DeadWoodsEnvironment (X=68413.258 Y=-56872.816 Z=9349.443)
+    "Trench House Scraps 17": base_id + 1265, # ItemPickup175_62 DeadWoodsEnvironment (X=67281.281 Y=-59201.371 Z=9254.457)
+    "Trench House Scraps 18": base_id + 1266, # ItemPickup172_50 DeadWoodsEnvironment (X=69064.219 Y=-48796.352 Z=9770.164)
+    "Trench House Chest Scraps 1": base_id + 1267, # ItemPickup75123123 Secret8_BasementHouseDetails (X=75042.141 Y=-50830.891 Z=8005.156)
+    "Trench House Chest Scraps 2": base_id + 1268, # ItemPickup741123 Secret8_BasementHouseDetails (X=75066.516 Y=-50824.398 Z=7995.000)
+    "Trench House Chest Scraps 3": base_id + 1269, # ItemPickup729842 Secret8_BasementHouseDetails (X=75072.789 Y=-50818.441 Z=7986.979)
+    "Trench House Chest Scraps 4": base_id + 1270, # ItemPickup711123 Secret8_BasementHouseDetails (X=75038.656 Y=-50827.566 Z=7973.354)
+    "Trench House Chest Scraps 5": base_id + 1271, # ItemPickup73 Secret8_BasementHouseDetails (X=75060.406 Y=-50828.102 Z=7965.915)
+    "Trench House Chest Scraps 6": base_id + 1272 # ItemPickup7075674 Secret8_BasementHouseDetails (X=75056.648 Y=-50818.125 Z=7959.868)
 }
 
 loc_doll_woods = {
-    "Doll Woods Scraps 1" : base_id + 1273, # ItemPickup78_2 DeadWoodsDolls (X=60126.234 Y=-49668.906 Z=9970.880)
-    "Doll Woods Scraps 2" : base_id + 1274, # ItemPickup166_32 DeadWoodsEnvironment (X=59854.066 Y=-47313.121 Z=10376.684)
-    "Doll Woods Scraps 3" : base_id + 1275, # ItemPickup80_8 DeadWoodsDolls (X=59130.613 Y=-49597.789 Z=9930.675)
-    "Doll Woods Scraps 4" : base_id + 1276, # ItemPickup168_38 DeadWoodsEnvironment (X=59785.973 Y=-51269.684 Z=10180.019)
-    "Doll Woods Scraps 5" : base_id + 1277, # ItemPickup81_11 DeadWoodsDolls (X=58226.449 Y=-52660.801 Z=10576.626)
-    "Doll Woods Scraps 6" : base_id + 1278, # ItemPickup167_35 DeadWoodsEnvironment (X=56243.176 Y=-49097.793 Z=10869.889)
-    "Doll Woods Scraps 7" : base_id + 1279, # ItemPickup79_5 DeadWoodsDolls (X=59481.672 Y=-45288.137 Z=10897.672)
-    "Doll Woods Scraps 8" : base_id + 1280, # ItemPickup170_44 DeadWoodsEnvironment (X=63807.668 Y=-44674.734 Z=10337.434)
-    "Doll Woods Scraps 9" : base_id + 1281, # ItemPickup171_47 DeadWoodsEnvironment (X=68406.664 Y=-45721.813 Z=10021.356)
-    "Doll Woods Scraps 10" : base_id + 1282 # ItemPickup169_41 DeadWoodsEnvironment (X=62898.469 Y=-47565.703 Z=10744.431)
+    "Doll Woods Scraps 1": base_id + 1273, # ItemPickup78_2 DeadWoodsDolls (X=60126.234 Y=-49668.906 Z=9970.880)
+    "Doll Woods Scraps 2": base_id + 1274, # ItemPickup166_32 DeadWoodsEnvironment (X=59854.066 Y=-47313.121 Z=10376.684)
+    "Doll Woods Scraps 3": base_id + 1275, # ItemPickup80_8 DeadWoodsDolls (X=59130.613 Y=-49597.789 Z=9930.675)
+    "Doll Woods Scraps 4": base_id + 1276, # ItemPickup168_38 DeadWoodsEnvironment (X=59785.973 Y=-51269.684 Z=10180.019)
+    "Doll Woods Scraps 5": base_id + 1277, # ItemPickup81_11 DeadWoodsDolls (X=58226.449 Y=-52660.801 Z=10576.626)
+    "Doll Woods Scraps 6": base_id + 1278, # ItemPickup167_35 DeadWoodsEnvironment (X=56243.176 Y=-49097.793 Z=10869.889)
+    "Doll Woods Scraps 7": base_id + 1279, # ItemPickup79_5 DeadWoodsDolls (X=59481.672 Y=-45288.137 Z=10897.672)
+    "Doll Woods Scraps 8": base_id + 1280, # ItemPickup170_44 DeadWoodsEnvironment (X=63807.668 Y=-44674.734 Z=10337.434)
+    "Doll Woods Scraps 9": base_id + 1281, # ItemPickup171_47 DeadWoodsEnvironment (X=68406.664 Y=-45721.813 Z=10021.356)
+    "Doll Woods Scraps 10": base_id + 1282 # ItemPickup169_41 DeadWoodsEnvironment (X=62898.469 Y=-47565.703 Z=10744.431)
 }
 
 loc_lost_stairs = {
-    "Lost Stairs Scraps 1" : base_id + 1283, # ItemPickup29_2 Secret1_Stairs2 (X=47087.617 Y=-53476.547 Z=9103.093)
-    "Lost Stairs Scraps 2" : base_id + 1284 # ItemPickup30_5 Secret1_Stairs2 (X=47162.238 Y=-55318.094 Z=9127.096)
+    "Lost Stairs Scraps 1": base_id + 1283, # ItemPickup29_2 Secret1_Stairs2 (X=47087.617 Y=-53476.547 Z=9103.093)
+    "Lost Stairs Scraps 2": base_id + 1284 # ItemPickup30_5 Secret1_Stairs2 (X=47162.238 Y=-55318.094 Z=9127.096)
 }
 
 loc_east_house = {
-    "East House Scraps 1" : base_id + 1285, # ItemPickup409_5 Secret7_CliffHouseEnvironment (X=97507.664 Y=-53201.270 Z=9174.678)
-    "East House Scraps 2" : base_id + 1286, # ItemPickup408_2 Secret7_CliffHouseEnvironment (X=98511.242 Y=-53899.414 Z=9016.314)
-    "East House Scraps 3" : base_id + 1287, # ItemPickup410_8 Secret7_CliffHouseEnvironment (X=100688.102 Y=-54197.578 Z=8919.432)
-    "East House Scraps 4" : base_id + 1288, # ItemPickup411_11 Secret7_CliffHouseEnvironment (X=103149.773 Y=-54659.980 Z=9002.535)
-    "East House Scraps 5" : base_id + 1289, # ItemPickup416_26 Secret7_CliffHouseEnvironment (X=107458.172 Y=-55683.793 Z=9429.004)
-    "East House Scraps 6" : base_id + 1290, # ItemPickup25_2 Secret7_CliffHouseEnvironment (X=109034.164 Y=-54360.703 Z=9495.910)
-    "East House Scraps 7" : base_id + 1291, # ItemPickup413_17 Secret7_CliffHouseEnvironment (X=109245.148 Y=-55045.242 Z=9553.601)
-    "East House Scraps 8" : base_id + 1292, # ItemPickup414_20 Secret7_CliffHouseEnvironment (X=112556.445 Y=-55851.754 Z=10049.954)
-    "East House Scraps 9" : base_id + 1293, # ItemPickup415_23 Secret7_CliffHouseEnvironment (X=113131.469 Y=-56822.508 Z=10038.047)
-    "East House Scraps 10" : base_id + 1294, # ItemPickup2599786 Secret7_CliffHouseDetails (X=112279.828 Y=-56743.781 Z=10029.549)
-    "East House Scraps 11" : base_id + 1295, # ItemPickup253321 Secret7_CliffHouseDetails (X=112445.508 Y=-56280.320 Z=10059.164)
-    "East House Scraps 12" : base_id + 1296, # ItemPickup2532323 Secret7_CliffHouseDetails (X=112562.211 Y=-56736.332 Z=10454.907)
-    "East House Scraps 13" : base_id + 1297, # ItemPickup257655 Secret7_CliffHouseDetails (X=109313.320 Y=-58221.316 Z=9501.283)
-    "East House Scraps 14" : base_id + 1298, # ItemPickup412_14 Secret7_CliffHouseEnvironment (X=104077.805 Y=-55987.301 Z=9066.847)
-    "East House Chest Scraps 1" : base_id + 1299, # ItemPickup76246 Secret7_CliffHouseDetails (X=112317.242 Y=-55820.805 Z=10497.336)
-    "East House Chest Scraps 2" : base_id + 1300, # ItemPickup76245 Secret7_CliffHouseDetails (X=112326.086 Y=-55808.477 Z=10485.685)
-    "East House Chest Scraps 3" : base_id + 1301, # ItemPickup85131 Secret7_CliffHouseDetails (X=112329.031 Y=-55828.438 Z=10478.107)
-    "East House Chest Scraps 4" : base_id + 1302, # ItemPickup56124 Secret7_CliffHouseDetails (X=112315.922 Y=-55820.102 Z=10466.683)
-    "East House Chest Scraps 5" : base_id + 1303 # ItemPickup25123123123 Secret7_CliffHouseDetails (X=112337.922 Y=-55821.848 Z=10456.924)
+    "East House Scraps 1": base_id + 1285, # ItemPickup409_5 Secret7_CliffHouseEnvironment (X=97507.664 Y=-53201.270 Z=9174.678)
+    "East House Scraps 2": base_id + 1286, # ItemPickup408_2 Secret7_CliffHouseEnvironment (X=98511.242 Y=-53899.414 Z=9016.314)
+    "East House Scraps 3": base_id + 1287, # ItemPickup410_8 Secret7_CliffHouseEnvironment (X=100688.102 Y=-54197.578 Z=8919.432)
+    "East House Scraps 4": base_id + 1288, # ItemPickup411_11 Secret7_CliffHouseEnvironment (X=103149.773 Y=-54659.980 Z=9002.535)
+    "East House Scraps 5": base_id + 1289, # ItemPickup416_26 Secret7_CliffHouseEnvironment (X=107458.172 Y=-55683.793 Z=9429.004)
+    "East House Scraps 6": base_id + 1290, # ItemPickup25_2 Secret7_CliffHouseEnvironment (X=109034.164 Y=-54360.703 Z=9495.910)
+    "East House Scraps 7": base_id + 1291, # ItemPickup413_17 Secret7_CliffHouseEnvironment (X=109245.148 Y=-55045.242 Z=9553.601)
+    "East House Scraps 8": base_id + 1292, # ItemPickup414_20 Secret7_CliffHouseEnvironment (X=112556.445 Y=-55851.754 Z=10049.954)
+    "East House Scraps 9": base_id + 1293, # ItemPickup415_23 Secret7_CliffHouseEnvironment (X=113131.469 Y=-56822.508 Z=10038.047)
+    "East House Scraps 10": base_id + 1294, # ItemPickup2599786 Secret7_CliffHouseDetails (X=112279.828 Y=-56743.781 Z=10029.549)
+    "East House Scraps 11": base_id + 1295, # ItemPickup253321 Secret7_CliffHouseDetails (X=112445.508 Y=-56280.320 Z=10059.164)
+    "East House Scraps 12": base_id + 1296, # ItemPickup2532323 Secret7_CliffHouseDetails (X=112562.211 Y=-56736.332 Z=10454.907)
+    "East House Scraps 13": base_id + 1297, # ItemPickup257655 Secret7_CliffHouseDetails (X=109313.320 Y=-58221.316 Z=9501.283)
+    "East House Scraps 14": base_id + 1298, # ItemPickup412_14 Secret7_CliffHouseEnvironment (X=104077.805 Y=-55987.301 Z=9066.847)
+    "East House Chest Scraps 1": base_id + 1299, # ItemPickup76246 Secret7_CliffHouseDetails (X=112317.242 Y=-55820.805 Z=10497.336)
+    "East House Chest Scraps 2": base_id + 1300, # ItemPickup76245 Secret7_CliffHouseDetails (X=112326.086 Y=-55808.477 Z=10485.685)
+    "East House Chest Scraps 3": base_id + 1301, # ItemPickup85131 Secret7_CliffHouseDetails (X=112329.031 Y=-55828.438 Z=10478.107)
+    "East House Chest Scraps 4": base_id + 1302, # ItemPickup56124 Secret7_CliffHouseDetails (X=112315.922 Y=-55820.102 Z=10466.683)
+    "East House Chest Scraps 5": base_id + 1303 # ItemPickup25123123123 Secret7_CliffHouseDetails (X=112337.922 Y=-55821.848 Z=10456.924)
 }
 
 loc_rockets_testing_ground = {
-    "Rockets Testing Ground Timed Dynamite" : base_id + 1304, # Boomer_DynamitePickup Boomer_RangeDetails (X=76476.609 Y=-65286.738 Z=8303.742)
-    "Rockets Testing Ground Scraps 1" : base_id + 1305, # ItemPickup105_14 Boomer_HouseDetails (X=88925.570 Y=-63375.051 Z=8563.354)
-    "Rockets Testing Ground Scraps 2" : base_id + 1306, # ItemPickup106_17 Boomer_HouseDetails (X=84234.016 Y=-64475.551 Z=8382.108)
-    "Rockets Testing Ground Scraps 3" : base_id + 1307, # ItemPickup114_23 Boomer_RangeDetails (X=79349.438 Y=-64225.480 Z=8384.219)
-    "Rockets Testing Ground Scraps 4" : base_id + 1308, # ItemPickup22_0 Boomer_RangeDetails (X=79831.070 Y=-65847.766 Z=8301.337)
-    "Rockets Testing Ground Scraps 5" : base_id + 1309, # ItemPickup109_5 Boomer_RangeDetails (X=76526.500 Y=-65394.875 Z=8223.883)
-    "Rockets Testing Ground Scraps 6" : base_id + 1310, # ItemPickup108_2 Boomer_RangeDetails (X=76237.977 Y=-67087.414 Z=8361.979)
-    "Rockets Testing Ground Scraps 7" : base_id + 1311, # ItemPickup115_26 Boomer_RangeDetails (X=78857.672 Y=-67802.227 Z=8257.150)
-    "Rockets Testing Ground Scraps 8" : base_id + 1312, # ItemPickup110_8 Boomer_RangeDetails (X=74878.570 Y=-62927.297 Z=8749.549)
-    "Rockets Testing Ground Scraps 9" : base_id + 1313, # ItemPickup111_11 Boomer_RangeDetails (X=74542.641 Y=-61301.082 Z=9493.931)
-    "Rockets Testing Ground Scraps 10" : base_id + 1314 # ItemPickup23_0 Boomer_RangeDetails (X=77020.859 Y=-62031.320 Z=8873.663)
+    "Rockets Testing Ground Timed Dynamite": base_id + 1304, # Boomer_DynamitePickup Boomer_RangeDetails (X=76476.609 Y=-65286.738 Z=8303.742)
+    "Rockets Testing Ground Scraps 1": base_id + 1305, # ItemPickup105_14 Boomer_HouseDetails (X=88925.570 Y=-63375.051 Z=8563.354)
+    "Rockets Testing Ground Scraps 2": base_id + 1306, # ItemPickup106_17 Boomer_HouseDetails (X=84234.016 Y=-64475.551 Z=8382.108)
+    "Rockets Testing Ground Scraps 3": base_id + 1307, # ItemPickup114_23 Boomer_RangeDetails (X=79349.438 Y=-64225.480 Z=8384.219)
+    "Rockets Testing Ground Scraps 4": base_id + 1308, # ItemPickup22_0 Boomer_RangeDetails (X=79831.070 Y=-65847.766 Z=8301.337)
+    "Rockets Testing Ground Scraps 5": base_id + 1309, # ItemPickup109_5 Boomer_RangeDetails (X=76526.500 Y=-65394.875 Z=8223.883)
+    "Rockets Testing Ground Scraps 6": base_id + 1310, # ItemPickup108_2 Boomer_RangeDetails (X=76237.977 Y=-67087.414 Z=8361.979)
+    "Rockets Testing Ground Scraps 7": base_id + 1311, # ItemPickup115_26 Boomer_RangeDetails (X=78857.672 Y=-67802.227 Z=8257.150)
+    "Rockets Testing Ground Scraps 8": base_id + 1312, # ItemPickup110_8 Boomer_RangeDetails (X=74878.570 Y=-62927.297 Z=8749.549)
+    "Rockets Testing Ground Scraps 9": base_id + 1313, # ItemPickup111_11 Boomer_RangeDetails (X=74542.641 Y=-61301.082 Z=9493.931)
+    "Rockets Testing Ground Scraps 10": base_id + 1314 # ItemPickup23_0 Boomer_RangeDetails (X=77020.859 Y=-62031.320 Z=8873.663)
     # "Rockets Testing Ground Scraps Glitch 1" ItemPickup107_20 (X=81308.406 Y=-63482.320 Z=8533.338) /!\ Glitched scrap
 }
 
 loc_rockets_testing_bunker = {
-    "Rockets Testing Bunker Scraps 1" : base_id + 1315, # ItemPickup113_20 Boomer_RangeDetails (X=77552.094 Y=-61144.559 Z=8523.195)
-    "Rockets Testing Bunker Scraps 2" : base_id + 1316, # ItemPickup112_14 Boomer_RangeDetails (X=77670.227 Y=-62029.941 Z=8570.785)
-    "Rockets Testing Bunker Box of Rockets" : base_id + 1317 # Boomer_RocketsPickup Boomer_RangeDetails (X=77330.086 Y=-61504.324 Z=8523.195)
+    "Rockets Testing Bunker Scraps 1": base_id + 1315, # ItemPickup113_20 Boomer_RangeDetails (X=77552.094 Y=-61144.559 Z=8523.195)
+    "Rockets Testing Bunker Scraps 2": base_id + 1316, # ItemPickup112_14 Boomer_RangeDetails (X=77670.227 Y=-62029.941 Z=8570.785)
+    "Rockets Testing Bunker Box of Rockets": base_id + 1317 # Boomer_RocketsPickup Boomer_RangeDetails (X=77330.086 Y=-61504.324 Z=8523.195)
 }
 
 loc_workshop = {
-    "Workshop Scraps 1" : base_id + 1318, # ItemPickup103_8 Boomer_HouseDetails (X=93550.773 Y=-61901.797 Z=8828.551)
-    "Workshop Scraps 2" : base_id + 1319, # ItemPickup102_5 Boomer_HouseDetails (X=93508.047 Y=-64009.910 Z=8783.468)
-    "Workshop Scraps 3" : base_id + 1320, # ItemPickup101_2 Boomer_HouseDetails (X=92011.648 Y=-65572.281 Z=8736.709)
-    "Workshop Scraps 4" : base_id + 1321, # ItemPickup24_2 Boomer_HouseDetails (X=92311.594 Y=-63045.211 Z=8749.977)
-    "Workshop Scraps 5" : base_id + 1322, # ItemPickup104_11 Boomer_HouseDetails (X=91392.734 Y=-63527.629 Z=8709.268)
-    "Workshop Scraps 6" : base_id + 1323, # ItemPickup25_1 Boomer_HouseDetails (X=92986.789 Y=-63012.047 Z=9235.383)
-    "Workshop John Smith Mission End" : base_id + 1324 # (dialog 2) -> the_boomer
+    "Workshop Scraps 1": base_id + 1318, # ItemPickup103_8 Boomer_HouseDetails (X=93550.773 Y=-61901.797 Z=8828.551)
+    "Workshop Scraps 2": base_id + 1319, # ItemPickup102_5 Boomer_HouseDetails (X=93508.047 Y=-64009.910 Z=8783.468)
+    "Workshop Scraps 3": base_id + 1320, # ItemPickup101_2 Boomer_HouseDetails (X=92011.648 Y=-65572.281 Z=8736.709)
+    "Workshop Scraps 4": base_id + 1321, # ItemPickup24_2 Boomer_HouseDetails (X=92311.594 Y=-63045.211 Z=8749.977)
+    "Workshop Scraps 5": base_id + 1322, # ItemPickup104_11 Boomer_HouseDetails (X=91392.734 Y=-63527.629 Z=8709.268)
+    "Workshop Scraps 6": base_id + 1323, # ItemPickup25_1 Boomer_HouseDetails (X=92986.789 Y=-63012.047 Z=9235.383)
+    "Workshop John Smith Mission End": base_id + 1324 # (dialog 2) -> the_boomer
 }
 
 loc_east_tower = {
-    "Greg Mission Start" : base_id + 1325, # (dialog 6) -> north_mine_key
-    "East Tower Scraps 1" : base_id + 1326, # ItemPickup231_17 Mine2_NPCHouseDetails (X=95448.250 Y=-67249.156 Z=8607.896)
-    "East Tower Scraps 2" : base_id + 1327, # ItemPickup228_8 Mine2_NPCHouseDetails (X=96339.242 Y=-66374.828 Z=8650.519)
-    "East Tower Scraps 3" : base_id + 1328, # ItemPickup229_11 Mine2_NPCHouseDetails (X=98540.711 Y=-67173.656 Z=8418.825)
-    "East Tower Scraps 4" : base_id + 1329, # ItemPickup230_14 Mine2_NPCHouseDetails (X=97276.414 Y=-68495.008 Z=8337.229)
-    "East Tower Scraps 5" : base_id + 1330, # ItemPickup227_5 Mine2_NPCHouseDetails (X=96470.820 Y=-66540.859 Z=8953.763)
-    "East Tower Scraps 6" : base_id + 1331 # ItemPickup226_2 Mine2_NPCHouseDetails (X=96141.555 Y=-67013.445 Z=9399.308)
+    "Greg Mission Start": base_id + 1325, # (dialog 6) -> north_mine_key
+    "East Tower Scraps 1": base_id + 1326, # ItemPickup231_17 Mine2_NPCHouseDetails (X=95448.250 Y=-67249.156 Z=8607.896)
+    "East Tower Scraps 2": base_id + 1327, # ItemPickup228_8 Mine2_NPCHouseDetails (X=96339.242 Y=-66374.828 Z=8650.519)
+    "East Tower Scraps 3": base_id + 1328, # ItemPickup229_11 Mine2_NPCHouseDetails (X=98540.711 Y=-67173.656 Z=8418.825)
+    "East Tower Scraps 4": base_id + 1329, # ItemPickup230_14 Mine2_NPCHouseDetails (X=97276.414 Y=-68495.008 Z=8337.229)
+    "East Tower Scraps 5": base_id + 1330, # ItemPickup227_5 Mine2_NPCHouseDetails (X=96470.820 Y=-66540.859 Z=8953.763)
+    "East Tower Scraps 6": base_id + 1331 # ItemPickup226_2 Mine2_NPCHouseDetails (X=96141.555 Y=-67013.445 Z=9399.308)
 }
 
 loc_lighthouse = {
     "Lighthouse Scraps 1": base_id + 1332, # ItemPickup200_41 LighthouseTerrainMain (X=100072.813 Y=-68645.688 Z=8150.313)
-    "Lighthouse Scraps 2" : base_id + 1333, # ItemPickup198_35 LighthouseTerrainMain (X=105340.594 Y=-70828.602 Z=8436.780)
-    "Lighthouse Scraps 3" : base_id + 1334, # ItemPickup199_38 LighthouseTerrainMain (X=103851.688 Y=-73396.625 Z=7973.290)
-    "Lighthouse Scraps 4" : base_id + 1335, # ItemPickup196_29 LighthouseTerrainMain (X=107040.711 Y=-74021.555 Z=8303.216)
-    "Lighthouse Scraps 5" : base_id + 1336, # ItemPickup197_32 LighthouseTerrainMain (X=110566.859 Y=-77435.961 Z=7642.565)
-    "Lighthouse Scraps 6" : base_id + 1337, # ItemPickup32_2 LighthouseShed_Main (X=111451.352 Y=-77351.117 Z=7633.413)
-    "Lighthouse Scraps 7" : base_id + 1338, # ItemPickup35_11 Lighthouse_Main (X=113078.500 Y=-78618.281 Z=7180.793)
-    "Lighthouse Scraps 8" : base_id + 1339, # ItemPickup192_17 LighthouseTerrainMain (X=113396.305 Y=-80315.383 Z=7184.260)
-    "Lighthouse Scraps 9" : base_id + 1340, # ItemPickup193_20 LighthouseTerrainMain (X=114057.484 Y=-81517.836 Z=7245.034)
-    "Lighthouse Scraps 10" : base_id + 1341, # ItemPickup194_23 LighthouseTerrainMain (X=110915.156 Y=-78376.609 Z=7676.131)
-    "Lighthouse Scraps 11" : base_id + 1342, # ItemPickup195_26 LighthouseTerrainMain (X=109341.703 Y=-79014.469 Z=8075.679)
-    "Lighthouse Scraps 12" : base_id + 1343, # ItemPickup33_5 Lighthouse_Details (X=107006.578 Y=-81377.711 Z=8821.629)
-    "Lighthouse Scraps 13" : base_id + 1344, # ItemPickup191_14 LighthouseTerrainMain (X=109240.195 Y=-82951.375 Z=8194.619)
-    "Lighthouse Scraps 14" : base_id + 1345, # ItemPickup190_11 LighthouseTerrainMain (X=106295.719 Y=-84190.578 Z=8581.896)
-    "Lighthouse Scraps 15" : base_id + 1346, # ItemPickup189_8 LighthouseTerrainMain (X=104233.883 Y=-84663.328 Z=7806.311)
-    "Lighthouse Scraps 16" : base_id + 1347, # ItemPickup188_5 LighthouseTerrainMain (X=103209.227 Y=-81564.047 Z=8140.578)
-    "Lighthouse Scraps 17" : base_id + 1348, # ItemPickup187_2 LighthouseTerrainMain (X=104795.555 Y=-81344.758 Z=8775.158)
-    "Lighthouse Scraps 18" : base_id + 1349, # ItemPickup34_8 Lighthouse_Main (X=100843.914 Y=-78038.539 Z=7197.542)
-    "Lighthouse Breaker 1" : base_id + 1350, # ItemPickup13_2 LighthouseShed_Main (X=110781.164 Y=-77296.813 Z=7757.248) \!/ Existing match 6
-    "Lighthouse Breaker 2" : base_id + 1351, # ItemPickup14 LighthouseShed_Main (X=110899.227 Y=-77239.031 Z=7757.134) \!/ Existing match 3
-    "Lighthouse Breaker 3" : base_id + 1352, # ItemPickup16 LighthouseShed_Main (X=110948.547 Y=-77253.336 Z=7757.134) \!/ Existing match 2
-    "Lighthouse Breaker 4" : base_id + 1353, # ItemPickup17 LighthouseShed_Main (X=111001.078 Y=-77205.047 Z=7757.134) \!/ Existing match 1
-    "Lighthouse Claire Mission End" : base_id + 1354 # (dialog 2) -> 30_scraps_reward
+    "Lighthouse Scraps 2": base_id + 1333, # ItemPickup198_35 LighthouseTerrainMain (X=105340.594 Y=-70828.602 Z=8436.780)
+    "Lighthouse Scraps 3": base_id + 1334, # ItemPickup199_38 LighthouseTerrainMain (X=103851.688 Y=-73396.625 Z=7973.290)
+    "Lighthouse Scraps 4": base_id + 1335, # ItemPickup196_29 LighthouseTerrainMain (X=107040.711 Y=-74021.555 Z=8303.216)
+    "Lighthouse Scraps 5": base_id + 1336, # ItemPickup197_32 LighthouseTerrainMain (X=110566.859 Y=-77435.961 Z=7642.565)
+    "Lighthouse Scraps 6": base_id + 1337, # ItemPickup32_2 LighthouseShed_Main (X=111451.352 Y=-77351.117 Z=7633.413)
+    "Lighthouse Scraps 7": base_id + 1338, # ItemPickup35_11 Lighthouse_Main (X=113078.500 Y=-78618.281 Z=7180.793)
+    "Lighthouse Scraps 8": base_id + 1339, # ItemPickup192_17 LighthouseTerrainMain (X=113396.305 Y=-80315.383 Z=7184.260)
+    "Lighthouse Scraps 9": base_id + 1340, # ItemPickup193_20 LighthouseTerrainMain (X=114057.484 Y=-81517.836 Z=7245.034)
+    "Lighthouse Scraps 10": base_id + 1341, # ItemPickup194_23 LighthouseTerrainMain (X=110915.156 Y=-78376.609 Z=7676.131)
+    "Lighthouse Scraps 11": base_id + 1342, # ItemPickup195_26 LighthouseTerrainMain (X=109341.703 Y=-79014.469 Z=8075.679)
+    "Lighthouse Scraps 12": base_id + 1343, # ItemPickup33_5 Lighthouse_Details (X=107006.578 Y=-81377.711 Z=8821.629)
+    "Lighthouse Scraps 13": base_id + 1344, # ItemPickup191_14 LighthouseTerrainMain (X=109240.195 Y=-82951.375 Z=8194.619)
+    "Lighthouse Scraps 14": base_id + 1345, # ItemPickup190_11 LighthouseTerrainMain (X=106295.719 Y=-84190.578 Z=8581.896)
+    "Lighthouse Scraps 15": base_id + 1346, # ItemPickup189_8 LighthouseTerrainMain (X=104233.883 Y=-84663.328 Z=7806.311)
+    "Lighthouse Scraps 16": base_id + 1347, # ItemPickup188_5 LighthouseTerrainMain (X=103209.227 Y=-81564.047 Z=8140.578)
+    "Lighthouse Scraps 17": base_id + 1348, # ItemPickup187_2 LighthouseTerrainMain (X=104795.555 Y=-81344.758 Z=8775.158)
+    "Lighthouse Scraps 18": base_id + 1349, # ItemPickup34_8 Lighthouse_Main (X=100843.914 Y=-78038.539 Z=7197.542)
+    "Lighthouse Breaker 1": base_id + 1350, # ItemPickup13_2 LighthouseShed_Main (X=110781.164 Y=-77296.813 Z=7757.248) \!/ Existing match 6
+    "Lighthouse Breaker 2": base_id + 1351, # ItemPickup14 LighthouseShed_Main (X=110899.227 Y=-77239.031 Z=7757.134) \!/ Existing match 3
+    "Lighthouse Breaker 3": base_id + 1352, # ItemPickup16 LighthouseShed_Main (X=110948.547 Y=-77253.336 Z=7757.134) \!/ Existing match 2
+    "Lighthouse Breaker 4": base_id + 1353, # ItemPickup17 LighthouseShed_Main (X=111001.078 Y=-77205.047 Z=7757.134) \!/ Existing match 1
+    "Lighthouse Claire Mission End": base_id + 1354 # (dialog 2) -> 30_scraps_reward
 }
 
 loc_north_mine_outside = {
-    "North Mine Outside Scraps 1" : base_id + 1355, # ItemPickup241_31 Mine2_OutsideDetails (X=-52376.746 Y=-101857.492 Z=10542.841)
-    "North Mine Outside Scraps 2" : base_id + 1356, # ItemPickup242_34 Mine2_OutsideDetails (X=-53786.742 Y=-102067.789 Z=10858.948)
-    "North Mine Outside Scraps 3" : base_id + 1357, # ItemPickup239_25 Mine2_OutsideDetails (X=-57502.777 Y=-105475.336 Z=10609.405)
-    "North Mine Outside Scraps 4" : base_id + 1358, # ItemPickup16_2 Mine2_OutsideDetails (X=-58102.102 Y=-104007.906 Z=11146.535)
-    "North Mine Outside Scraps 5" : base_id + 1359, # ItemPickup238_20 Mine2_OutsideDetails (X=-59474.840 Y=-105053.734 Z=11213.524)
-    "North Mine Outside Scraps 6" : base_id + 1360, # ItemPickup240_28 Mine2_OutsideDetails (X=-55011.750 Y=-104936.359 Z=9935.366)
-    "North Mine Outside Scraps 7" : base_id + 1361, # ItemPickup236_14 Mine2_OutsideDetails (X=-55594.863 Y=-107667.594 Z=9596.611)
-    "North Mine Outside Scraps 8" : base_id + 1362, # ItemPickup15_1 Mine2_Interior2 (X=-56632.578 Y=-109503.406 Z=9280.788)
-    "North Mine Outside Scraps 9" : base_id + 1363, # ItemPickup234_8 Mine2_OutsideDetails (X=-54645.418 Y=-110747.602 Z=9553.452)
-    "North Mine Outside Scraps 10" : base_id + 1364, # ItemPickup232_2 Mine2_OutsideDetails (X=-51561.340 Y=-113574.813 Z=9414.959)
-    "North Mine Outside Scraps 11" : base_id + 1365, # ItemPickup233_5 Mine2_OutsideDetails (X=-54072.105 Y=-112672.031 Z=10077.665)
-    "North Mine Outside Scraps 12" : base_id + 1366, # ItemPickup237_17 Mine2_OutsideDetails (X=-58042.758 Y=-108748.656 Z=9693.470)
-    "North Mine Outside Scraps 13" : base_id + 1367, # ItemPickup235_11 Mine2_OutsideDetails (X=-55717.227 Y=-110610.414 Z=9487.879)
-    "North Mine Outside Scraps 14" : base_id + 1368 # ItemPickup13_2 Mine2_Interior2 (X=-52235.836 Y=-114501.117 Z=9462.438) KO
+    "North Mine Outside Scraps 1": base_id + 1355, # ItemPickup241_31 Mine2_OutsideDetails (X=-52376.746 Y=-101857.492 Z=10542.841)
+    "North Mine Outside Scraps 2": base_id + 1356, # ItemPickup242_34 Mine2_OutsideDetails (X=-53786.742 Y=-102067.789 Z=10858.948)
+    "North Mine Outside Scraps 3": base_id + 1357, # ItemPickup239_25 Mine2_OutsideDetails (X=-57502.777 Y=-105475.336 Z=10609.405)
+    "North Mine Outside Scraps 4": base_id + 1358, # ItemPickup16_2 Mine2_OutsideDetails (X=-58102.102 Y=-104007.906 Z=11146.535)
+    "North Mine Outside Scraps 5": base_id + 1359, # ItemPickup238_20 Mine2_OutsideDetails (X=-59474.840 Y=-105053.734 Z=11213.524)
+    "North Mine Outside Scraps 6": base_id + 1360, # ItemPickup240_28 Mine2_OutsideDetails (X=-55011.750 Y=-104936.359 Z=9935.366)
+    "North Mine Outside Scraps 7": base_id + 1361, # ItemPickup236_14 Mine2_OutsideDetails (X=-55594.863 Y=-107667.594 Z=9596.611)
+    "North Mine Outside Scraps 8": base_id + 1362, # ItemPickup15_1 Mine2_Interior2 (X=-56632.578 Y=-109503.406 Z=9280.788)
+    "North Mine Outside Scraps 9": base_id + 1363, # ItemPickup234_8 Mine2_OutsideDetails (X=-54645.418 Y=-110747.602 Z=9553.452)
+    "North Mine Outside Scraps 10": base_id + 1364, # ItemPickup232_2 Mine2_OutsideDetails (X=-51561.340 Y=-113574.813 Z=9414.959)
+    "North Mine Outside Scraps 11": base_id + 1365, # ItemPickup233_5 Mine2_OutsideDetails (X=-54072.105 Y=-112672.031 Z=10077.665)
+    "North Mine Outside Scraps 12": base_id + 1366, # ItemPickup237_17 Mine2_OutsideDetails (X=-58042.758 Y=-108748.656 Z=9693.470)
+    "North Mine Outside Scraps 13": base_id + 1367, # ItemPickup235_11 Mine2_OutsideDetails (X=-55717.227 Y=-110610.414 Z=9487.879)
+    "North Mine Outside Scraps 14": base_id + 1368 # ItemPickup13_2 Mine2_Interior2 (X=-52235.836 Y=-114501.117 Z=9462.438) KO
 }
 
 loc_north_mine_inside = {
-    "North Mine Inside Scraps 1" : base_id + 1369, # ItemPickup17_2 Mine2_Interior1 (X=-58433.055 Y=-104081.570 Z=9378.083) KO
-    "North Mine Inside Scraps 2" : base_id + 1370, # ItemPickup246_2 Mine2_Interior1 (X=-58987.199 Y=-103262.906 Z=9186.494)
-    "North Mine Inside Scraps 3" : base_id + 1371, # ItemPickup247_5 Mine2_Interior1 (X=-58812.801 Y=-99259.570 Z=8847.714)
-    "North Mine Inside Scraps 4" : base_id + 1372, # ItemPickup248_8 Mine2_Interior1 (X=-56634.379 Y=-99529.563 Z=8851.877)
-    "North Mine Inside Scraps 5" : base_id + 1373, # ItemPickup22_4 Mine2_Interior1 (X=-55604.477 Y=-98342.906 Z=8842.766)
-    "North Mine Inside Scraps 6" : base_id + 1374, # ItemPickup250_14 Mine2_Interior1 (X=-54824.535 Y=-98526.492 Z=8852.156)
-    "North Mine Inside Scraps 7" : base_id + 1375, # ItemPickup21_14 Mine2_Interior1 (X=-54887.254 Y=-99047.141 Z=8849.855)
-    "North Mine Inside Scraps 8" : base_id + 1376, # ItemPickup20_2 Mine2_Interior1 (X=-55610.020 Y=-101877.961 Z=9081.042)
-    "North Mine Inside Scraps 9" : base_id + 1377, # ItemPickup19_2 Mine2_Interior1 (X=-56519.340 Y=-101375.008 Z=9001.270)
-    "North Mine Inside Scraps 10" : base_id + 1378, # ItemPickup249_11 Mine2_Interior1 (X=-53329.922 Y=-99469.773 Z=8848.643)
-    "North Mine Inside Scraps 11" : base_id + 1379, # ItemPickup251_17 Mine2_Interior1 (X=-52814.828 Y=-96286.969 Z=8851.372)
-    "North Mine Inside Scraps 12" : base_id + 1380, # ItemPickup24_1 Mine2_Interior1 (X=-52605.957 Y=-96535.156 Z=8940.480)
-    "North Mine Inside Scraps 13" : base_id + 1381, # ItemPickup23_20 Mine2_Interior1 (X=-53237.699 Y=-96609.461 Z=8846.201)
-    "North Mine Inside Scraps 14" : base_id + 1382, # ItemPickup18_5 Mine2_Interior1 (X=-58543.488 Y=-95879.695 Z=8981.646)
-    "North Mine Inside Blue Egg" : base_id + 1383, # Mine2_Egg Mine2_Interior2 (X=-53592.195 Y=-99177.500 Z=8975.387)
-    "North Mine Inside Blue Paint Can" : base_id + 1384 # PaintCan_2 Mine2_Interior2 (X=-56133.391 Y=-101870.047 Z=9004.720) \!/ Existing match 5
+    "North Mine Inside Scraps 1": base_id + 1369, # ItemPickup17_2 Mine2_Interior1 (X=-58433.055 Y=-104081.570 Z=9378.083) KO
+    "North Mine Inside Scraps 2": base_id + 1370, # ItemPickup246_2 Mine2_Interior1 (X=-58987.199 Y=-103262.906 Z=9186.494)
+    "North Mine Inside Scraps 3": base_id + 1371, # ItemPickup247_5 Mine2_Interior1 (X=-58812.801 Y=-99259.570 Z=8847.714)
+    "North Mine Inside Scraps 4": base_id + 1372, # ItemPickup248_8 Mine2_Interior1 (X=-56634.379 Y=-99529.563 Z=8851.877)
+    "North Mine Inside Scraps 5": base_id + 1373, # ItemPickup22_4 Mine2_Interior1 (X=-55604.477 Y=-98342.906 Z=8842.766)
+    "North Mine Inside Scraps 6": base_id + 1374, # ItemPickup250_14 Mine2_Interior1 (X=-54824.535 Y=-98526.492 Z=8852.156)
+    "North Mine Inside Scraps 7": base_id + 1375, # ItemPickup21_14 Mine2_Interior1 (X=-54887.254 Y=-99047.141 Z=8849.855)
+    "North Mine Inside Scraps 8": base_id + 1376, # ItemPickup20_2 Mine2_Interior1 (X=-55610.020 Y=-101877.961 Z=9081.042)
+    "North Mine Inside Scraps 9": base_id + 1377, # ItemPickup19_2 Mine2_Interior1 (X=-56519.340 Y=-101375.008 Z=9001.270)
+    "North Mine Inside Scraps 10": base_id + 1378, # ItemPickup249_11 Mine2_Interior1 (X=-53329.922 Y=-99469.773 Z=8848.643)
+    "North Mine Inside Scraps 11": base_id + 1379, # ItemPickup251_17 Mine2_Interior1 (X=-52814.828 Y=-96286.969 Z=8851.372)
+    "North Mine Inside Scraps 12": base_id + 1380, # ItemPickup24_1 Mine2_Interior1 (X=-52605.957 Y=-96535.156 Z=8940.480)
+    "North Mine Inside Scraps 13": base_id + 1381, # ItemPickup23_20 Mine2_Interior1 (X=-53237.699 Y=-96609.461 Z=8846.201)
+    "North Mine Inside Scraps 14": base_id + 1382, # ItemPickup18_5 Mine2_Interior1 (X=-58543.488 Y=-95879.695 Z=8981.646)
+    "North Mine Inside Blue Egg": base_id + 1383, # Mine2_Egg Mine2_Interior2 (X=-53592.195 Y=-99177.500 Z=8975.387)
+    "North Mine Inside Blue Paint Can": base_id + 1384 # PaintCan_2 Mine2_Interior2 (X=-56133.391 Y=-101870.047 Z=9004.720) \!/ Existing match 5
     # "North Mine Inside Secret Gear" ItemPickup26_2 (X=-55546.859 Y=-98209.852 Z=8429.085) /!\ Inaccessible gear
 }
 
 loc_wood_bridge = {
-    "Wood Bridge Scraps 1" : base_id + 1385, # ItemPickup127_35 Bridge_Details (X=-66790.141 Y=-110340.367 Z=10454.417)
-    "Wood Bridge Scraps 2" : base_id + 1386, # ItemPickup18613654 Bridge_Details (X=-68364.586 Y=-111691.625 Z=10444.172)
-    "Wood Bridge Scraps 3" : base_id + 1387, # ItemPickup1311221 Bridge_StructureDetails (X=-69013.555 Y=-112353.977 Z=10399.942)
-    "Wood Bridge Scraps 4" : base_id + 1388, # ItemPickup93564 Bridge_StructureDetails (X=-70398.797 Y=-112916.945 Z=10372.192)
-    "Wood Bridge Scraps 5" : base_id + 1389, # ItemPickup161323 Bridge_Details (X=-71336.172 Y=-106966.672 Z=8430.104)
-    "Wood Bridge Scraps 6" : base_id + 1390, # ItemPickup128_38 Bridge_Details (X=-72776.086 Y=-107813.102 Z=8305.589)
-    "Wood Bridge Scraps 7" : base_id + 1391, # ItemPickup17975 Bridge_Details (X=-75224.648 Y=-108280.867 Z=7929.499)
-    "Wood Bridge Scraps 8" : base_id + 1392, # ItemPickup126_32 Bridge_Details (X=-68112.172 Y=-105119.656 Z=9458.937)
-    "Wood Bridge Scraps 9" : base_id + 1393, # ItemPickup118_8 Bridge_Details (X=-71847.625 Y=-103623.203 Z=10707.521)
-    "Wood Bridge Scraps 10" : base_id + 1394, # ItemPickup116_2 Bridge_Details (X=-71812.219 Y=-107256.094 Z=10780.134)
-    "Wood Bridge Scraps 11" : base_id + 1395, # ItemPickup134321 Bridge_Details (X=-72011.570 Y=-109054.547 Z=10866.852)
-    "Wood Bridge Scraps 12" : base_id + 1396, # ItemPickup117_5 Bridge_Details (X=-72862.430 Y=-106144.852 Z=10329.061)
-    "Wood Bridge Scraps 13" : base_id + 1397 # ItemPickup1494567 Bridge_Details (X=-71843.117 Y=-107174.133 Z=10367.116)
+    "Wood Bridge Scraps 1": base_id + 1385, # ItemPickup127_35 Bridge_Details (X=-66790.141 Y=-110340.367 Z=10454.417)
+    "Wood Bridge Scraps 2": base_id + 1386, # ItemPickup18613654 Bridge_Details (X=-68364.586 Y=-111691.625 Z=10444.172)
+    "Wood Bridge Scraps 3": base_id + 1387, # ItemPickup1311221 Bridge_StructureDetails (X=-69013.555 Y=-112353.977 Z=10399.942)
+    "Wood Bridge Scraps 4": base_id + 1388, # ItemPickup93564 Bridge_StructureDetails (X=-70398.797 Y=-112916.945 Z=10372.192)
+    "Wood Bridge Scraps 5": base_id + 1389, # ItemPickup161323 Bridge_Details (X=-71336.172 Y=-106966.672 Z=8430.104)
+    "Wood Bridge Scraps 6": base_id + 1390, # ItemPickup128_38 Bridge_Details (X=-72776.086 Y=-107813.102 Z=8305.589)
+    "Wood Bridge Scraps 7": base_id + 1391, # ItemPickup17975 Bridge_Details (X=-75224.648 Y=-108280.867 Z=7929.499)
+    "Wood Bridge Scraps 8": base_id + 1392, # ItemPickup126_32 Bridge_Details (X=-68112.172 Y=-105119.656 Z=9458.937)
+    "Wood Bridge Scraps 9": base_id + 1393, # ItemPickup118_8 Bridge_Details (X=-71847.625 Y=-103623.203 Z=10707.521)
+    "Wood Bridge Scraps 10": base_id + 1394, # ItemPickup116_2 Bridge_Details (X=-71812.219 Y=-107256.094 Z=10780.134)
+    "Wood Bridge Scraps 11": base_id + 1395, # ItemPickup134321 Bridge_Details (X=-72011.570 Y=-109054.547 Z=10866.852)
+    "Wood Bridge Scraps 12": base_id + 1396, # ItemPickup117_5 Bridge_Details (X=-72862.430 Y=-106144.852 Z=10329.061)
+    "Wood Bridge Scraps 13": base_id + 1397 # ItemPickup1494567 Bridge_Details (X=-71843.117 Y=-107174.133 Z=10367.116)
 }
 
 loc_museum = {
-    "Museum Scraps 1" : base_id + 1398, # ItemPickup119_11 Bridge_Details (X=-69687.773 Y=-100002.406 Z=10806.339)
-    "Museum Scraps 2" : base_id + 1399, # ItemPickup120_14 Bridge_Details (X=-68035.195 Y=-99480.672 Z=11049.731)
-    "Museum Scraps 3" : base_id + 1400, # ItemPickup125_29 Bridge_Details (X=-66912.641 Y=-99976.750 Z=11064.357)
-    "Museum Scraps 4" : base_id + 1401, # ItemPickup13532 Bridge_HouseDetails (X=-64901.117 Y=-99624.953 Z=11176.359)
-    "Museum Scraps 5" : base_id + 1402, # ItemPickup121_17 Bridge_Details (X=-66082.328 Y=-98105.555 Z=11089.308)
-    "Museum Scraps 6" : base_id + 1403, # ItemPickup21765 Bridge_HouseDetails (X=-67402.742 Y=-97735.133 Z=11153.927)
-    "Museum Scraps 7" : base_id + 1404, # ItemPickup124_26 Bridge_Details (X=-66716.031 Y=-98282.508 Z=11195.624)
-    "Museum Scraps 8" : base_id + 1405, # ItemPickup122_20 Bridge_Details (X=-66582.703 Y=-99092.461 Z=11630.082)
-    "Museum Scraps 9" : base_id + 1406, # ItemPickup123_23 Bridge_Details (X=-66798.164 Y=-99550.266 Z=11547.321)
-    "Museum Scraps 10" : base_id + 1407, # ItemPickup183423 Bridge_HouseDetails (X=-66850.336 Y=-99682.844 Z=11543.618)
-    "Museum Scraps 11" : base_id + 1408, # ItemPickup244_40 Mine2_OutsideDetails (X=-60156.828 Y=-98516.953 Z=11811.422)
-    "Museum Scraps 12" : base_id + 1409, # ItemPickup245_43 Mine2_OutsideDetails (X=-61195.203 Y=-98262.422 Z=11779.118)
-    "Museum Paul Mission Start" : base_id + 1410, # (dialog 6) -> remote_explosive (x8)
-    "Museum Paul Mission End" : base_id + 1411 # (dialog 3) -> temple_key
+    "Museum Scraps 1": base_id + 1398, # ItemPickup119_11 Bridge_Details (X=-69687.773 Y=-100002.406 Z=10806.339)
+    "Museum Scraps 2": base_id + 1399, # ItemPickup120_14 Bridge_Details (X=-68035.195 Y=-99480.672 Z=11049.731)
+    "Museum Scraps 3": base_id + 1400, # ItemPickup125_29 Bridge_Details (X=-66912.641 Y=-99976.750 Z=11064.357)
+    "Museum Scraps 4": base_id + 1401, # ItemPickup13532 Bridge_HouseDetails (X=-64901.117 Y=-99624.953 Z=11176.359)
+    "Museum Scraps 5": base_id + 1402, # ItemPickup121_17 Bridge_Details (X=-66082.328 Y=-98105.555 Z=11089.308)
+    "Museum Scraps 6": base_id + 1403, # ItemPickup21765 Bridge_HouseDetails (X=-67402.742 Y=-97735.133 Z=11153.927)
+    "Museum Scraps 7": base_id + 1404, # ItemPickup124_26 Bridge_Details (X=-66716.031 Y=-98282.508 Z=11195.624)
+    "Museum Scraps 8": base_id + 1405, # ItemPickup122_20 Bridge_Details (X=-66582.703 Y=-99092.461 Z=11630.082)
+    "Museum Scraps 9": base_id + 1406, # ItemPickup123_23 Bridge_Details (X=-66798.164 Y=-99550.266 Z=11547.321)
+    "Museum Scraps 10": base_id + 1407, # ItemPickup183423 Bridge_HouseDetails (X=-66850.336 Y=-99682.844 Z=11543.618)
+    "Museum Scraps 11": base_id + 1408, # ItemPickup244_40 Mine2_OutsideDetails (X=-60156.828 Y=-98516.953 Z=11811.422)
+    "Museum Scraps 12": base_id + 1409, # ItemPickup245_43 Mine2_OutsideDetails (X=-61195.203 Y=-98262.422 Z=11779.118)
+    "Museum Paul Mission Start": base_id + 1410, # (dialog 6) -> remote_explosive (x8)
+    "Museum Paul Mission End": base_id + 1411 # (dialog 3) -> temple_key
 }
 
 loc_barbed_shelter = {
-    "Barbed Shelter Gertrude Mission Start" : base_id + 1412, # (dialog 4) -> broken_bob
-    "Barbed Shelter Scraps 1" : base_id + 1413, # ItemPickup100_8 Bob_NPCHouseMain (X=-72525.500 Y=-89333.734 Z=9820.663)
-    "Barbed Shelter Scraps 2" : base_id + 1414, # ItemPickup98_2 Bob_NPCHouseMain (X=-74870.758 Y=-88576.641 Z=9836.814)
-    "Barbed Shelter Scraps 3" : base_id + 1415, # ItemPickup22_1 Bob_NPCHouseDetails (X=-76193.914 Y=-88038.836 Z=9818.776)
-    "Barbed Shelter Scraps 4" : base_id + 1416, # ItemPickup99_5 Bob_NPCHouseMain (X=-74494.859 Y=-87609.969 Z=9837.866)
-    "Barbed Shelter Scraps 5" : base_id + 1417 # ItemPickup23_3 Bob_NPCHouseDetails (X=-74826.930 Y=-88402.039 Z=9929.854)
+    "Barbed Shelter Gertrude Mission Start": base_id + 1412, # (dialog 4) -> broken_bob
+    "Barbed Shelter Scraps 1": base_id + 1413, # ItemPickup100_8 Bob_NPCHouseMain (X=-72525.500 Y=-89333.734 Z=9820.663)
+    "Barbed Shelter Scraps 2": base_id + 1414, # ItemPickup98_2 Bob_NPCHouseMain (X=-74870.758 Y=-88576.641 Z=9836.814)
+    "Barbed Shelter Scraps 3": base_id + 1415, # ItemPickup22_1 Bob_NPCHouseDetails (X=-76193.914 Y=-88038.836 Z=9818.776)
+    "Barbed Shelter Scraps 4": base_id + 1416, # ItemPickup99_5 Bob_NPCHouseMain (X=-74494.859 Y=-87609.969 Z=9837.866)
+    "Barbed Shelter Scraps 5": base_id + 1417 # ItemPickup23_3 Bob_NPCHouseDetails (X=-74826.930 Y=-88402.039 Z=9929.854)
 }
 
 loc_west_beach = {
-    "West Beach Chest Scraps 1" : base_id + 1418, # ItemPickup9122346 Secret11_Details (X=-85934.047 Y=-89532.547 Z=7383.054)
-    "West Beach Chest Scraps 2" : base_id + 1419, # ItemPickup84 Secret11_Details (X=-85933.977 Y=-89532.977 Z=7369.364)
-    "West Beach Chest Scraps 3" : base_id + 1420, # ItemPickup9099877 Secret11_Details (X=-85951.000 Y=-89527.023 Z=7367.054)
-    "West Beach Chest Scraps 4" : base_id + 1421, # ItemPickup89086423 Secret11_Details (X=-85932.461 Y=-89533.148 Z=7354.001)
-    "West Beach Chest Scraps 5" : base_id + 1422, # ItemPickup83 Secret11_Details (X=-85950.930 Y=-89527.453 Z=7353.365)
-    "West Beach Chest Scraps 6" : base_id + 1423, # ItemPickup82_2 Secret11_Details (X=-85932.391 Y=-89533.578 Z=7340.312)
-    "West Beach Scraps 1" : base_id + 1424, # ItemPickup87_13 Secret11_Details (X=-84489.945 Y=-91235.977 Z=8360.803)
-    "West Beach Scraps 2" : base_id + 1425, # ItemPickup349_2 Secret11_Details1 (X=-84386.320 Y=-90391.789 Z=8376.434)
-    "West Beach Scraps 3" : base_id + 1426, # ItemPickup86_10 Secret11_Details (X=-84714.773 Y=-89876.992 Z=7707.064)
-    "West Beach Scraps 4" : base_id + 1427, # ItemPickup350_5 Secret11_Details1 (X=-85478.672 Y=-90648.414 Z=7708.377)
-    "West Beach Scraps 5" : base_id + 1428, # ItemPickup85_7 Secret11_Details (X=-86276.633 Y=-90674.289 Z=7532.364)
-    "West Beach Scraps 6" : base_id + 1429, # ItemPickup88_16 Secret11_Details (X=-84363.055 Y=-87497.938 Z=7582.647)
-    "West Beach Scraps 7" : base_id + 1430, # ItemPickup351_8 Secret11_Details1 (X=-86556.266 Y=-89748.484 Z=7297.274)
-    "West Beach Scraps 8" : base_id + 1431 # ItemPickup352_11 Secret11_Details1 (X=-83210.836 Y=-92551.953 Z=8460.213)
+    "West Beach Chest Scraps 1": base_id + 1418, # ItemPickup9122346 Secret11_Details (X=-85934.047 Y=-89532.547 Z=7383.054)
+    "West Beach Chest Scraps 2": base_id + 1419, # ItemPickup84 Secret11_Details (X=-85933.977 Y=-89532.977 Z=7369.364)
+    "West Beach Chest Scraps 3": base_id + 1420, # ItemPickup9099877 Secret11_Details (X=-85951.000 Y=-89527.023 Z=7367.054)
+    "West Beach Chest Scraps 4": base_id + 1421, # ItemPickup89086423 Secret11_Details (X=-85932.461 Y=-89533.148 Z=7354.001)
+    "West Beach Chest Scraps 5": base_id + 1422, # ItemPickup83 Secret11_Details (X=-85950.930 Y=-89527.453 Z=7353.365)
+    "West Beach Chest Scraps 6": base_id + 1423, # ItemPickup82_2 Secret11_Details (X=-85932.391 Y=-89533.578 Z=7340.312)
+    "West Beach Scraps 1": base_id + 1424, # ItemPickup87_13 Secret11_Details (X=-84489.945 Y=-91235.977 Z=8360.803)
+    "West Beach Scraps 2": base_id + 1425, # ItemPickup349_2 Secret11_Details1 (X=-84386.320 Y=-90391.789 Z=8376.434)
+    "West Beach Scraps 3": base_id + 1426, # ItemPickup86_10 Secret11_Details (X=-84714.773 Y=-89876.992 Z=7707.064)
+    "West Beach Scraps 4": base_id + 1427, # ItemPickup350_5 Secret11_Details1 (X=-85478.672 Y=-90648.414 Z=7708.377)
+    "West Beach Scraps 5": base_id + 1428, # ItemPickup85_7 Secret11_Details (X=-86276.633 Y=-90674.289 Z=7532.364)
+    "West Beach Scraps 6": base_id + 1429, # ItemPickup88_16 Secret11_Details (X=-84363.055 Y=-87497.938 Z=7582.647)
+    "West Beach Scraps 7": base_id + 1430, # ItemPickup351_8 Secret11_Details1 (X=-86556.266 Y=-89748.484 Z=7297.274)
+    "West Beach Scraps 8": base_id + 1431 # ItemPickup352_11 Secret11_Details1 (X=-83210.836 Y=-92551.953 Z=8460.213)
 }
 
 loc_church = {
-    "Church Black Paint Can" : base_id + 1432, # PaintCan_4 Secret5_ChurchDetails (X=-67628.172 Y=-83801.375 Z=9865.983)
-    "Church Scraps 1" : base_id + 1433, # ItemPickup391_11 Secret5_ChurchDetails (X=-64009.039 Y=-84252.156 Z=10258.335)
-    "Church Scraps 2" : base_id + 1434, # ItemPickup389_5 Secret5_ChurchDetails (X=-66870.719 Y=-85202.180 Z=9843.936)
-    "Church Scraps 3" : base_id + 1435, # ItemPickup388_2 Secret5_ChurchDetails (X=-68588.352 Y=-84041.867 Z=9790.541)
-    "Church Scraps 4" : base_id + 1436, # ItemPickup396_26 Secret5_ChurchDetails (X=-67595.797 Y=-82120.094 Z=9818.303)
-    "Church Scraps 5" : base_id + 1437, # ItemPickup390_8 Secret5_ChurchDetails (X=-67291.000 Y=-83324.836 Z=9774.942)
-    "Church Scraps 6" : base_id + 1438, # ItemPickup392_14 Secret5_ChurchDetails (X=-65849.070 Y=-80676.477 Z=9895.943)
-    "Church Scraps 7" : base_id + 1439, # ItemPickup395_23 Secret5_ChurchDetails (X=-65170.266 Y=-79155.227 Z=9904.275)
-    "Church Scraps 8" : base_id + 1440, # ItemPickup24_4 Secret5_GraveyardMain (X=-64837.563 Y=-80885.305 Z=9906.755)
-    "Church Scraps 9" : base_id + 1441, # ItemPickup22_3 Secret5_ChurchDetails (X=-68248.359 Y=-83578.008 Z=9807.300)
-    "Church Scraps 10" : base_id + 1442, # ItemPickup23_5 Secret5_ChurchDetails (X=-67086.102 Y=-84605.086 Z=9805.521)
-    "Church Scraps 11" : base_id + 1443, # ItemPickup393_17 Secret5_ChurchDetails (X=-67901.930 Y=-83477.625 Z=9812.613)
-    "Church Scraps 12" : base_id + 1444 # ItemPickup394_20 Secret5_ChurchDetails (X=-65834.344 Y=-84192.102 Z=9987.823)
+    "Church Black Paint Can": base_id + 1432, # PaintCan_4 Secret5_ChurchDetails (X=-67628.172 Y=-83801.375 Z=9865.983)
+    "Church Scraps 1": base_id + 1433, # ItemPickup391_11 Secret5_ChurchDetails (X=-64009.039 Y=-84252.156 Z=10258.335)
+    "Church Scraps 2": base_id + 1434, # ItemPickup389_5 Secret5_ChurchDetails (X=-66870.719 Y=-85202.180 Z=9843.936)
+    "Church Scraps 3": base_id + 1435, # ItemPickup388_2 Secret5_ChurchDetails (X=-68588.352 Y=-84041.867 Z=9790.541)
+    "Church Scraps 4": base_id + 1436, # ItemPickup396_26 Secret5_ChurchDetails (X=-67595.797 Y=-82120.094 Z=9818.303)
+    "Church Scraps 5": base_id + 1437, # ItemPickup390_8 Secret5_ChurchDetails (X=-67291.000 Y=-83324.836 Z=9774.942)
+    "Church Scraps 6": base_id + 1438, # ItemPickup392_14 Secret5_ChurchDetails (X=-65849.070 Y=-80676.477 Z=9895.943)
+    "Church Scraps 7": base_id + 1439, # ItemPickup395_23 Secret5_ChurchDetails (X=-65170.266 Y=-79155.227 Z=9904.275)
+    "Church Scraps 8": base_id + 1440, # ItemPickup24_4 Secret5_GraveyardMain (X=-64837.563 Y=-80885.305 Z=9906.755)
+    "Church Scraps 9": base_id + 1441, # ItemPickup22_3 Secret5_ChurchDetails (X=-68248.359 Y=-83578.008 Z=9807.300)
+    "Church Scraps 10": base_id + 1442, # ItemPickup23_5 Secret5_ChurchDetails (X=-67086.102 Y=-84605.086 Z=9805.521)
+    "Church Scraps 11": base_id + 1443, # ItemPickup393_17 Secret5_ChurchDetails (X=-67901.930 Y=-83477.625 Z=9812.613)
+    "Church Scraps 12": base_id + 1444 # ItemPickup394_20 Secret5_ChurchDetails (X=-65834.344 Y=-84192.102 Z=9987.823)
 }
 
 loc_west_cottage = {
-    "West Cottage Gale Mission Start" : base_id + 1445, # (dialog 10) -> mountain_ruin_key
-    "West Cottage Scraps 1" : base_id + 1446, # ItemPickup15_3 Mine3_NPCHouse (X=-74407.695 Y=-81781.250 Z=10120.775)
-    "West Cottage Scraps 2" : base_id + 1447, # ItemPickup283_5 Mine3_NPCHouseDetails (X=-73784.695 Y=-79414.359 Z=10128.285)
-    "West Cottage Scraps 3" : base_id + 1448, # ItemPickup13_1 Mine3_NPCHouse (X=-73992.391 Y=-78600.094 Z=10162.495)
-    "West Cottage Scraps 4" : base_id + 1449, # ItemPickup284_8 Mine3_NPCHouseDetails (X=-71623.000 Y=-75998.023 Z=10275.477)
-    "West Cottage Scraps 5" : base_id + 1450 # ItemPickup282_2 Mine3_NPCHouseDetails (X=-72626.453 Y=-79391.070 Z=10211.037)
+    "West Cottage Gale Mission Start": base_id + 1445, # (dialog 10) -> mountain_ruin_key
+    "West Cottage Scraps 1": base_id + 1446, # ItemPickup15_3 Mine3_NPCHouse (X=-74407.695 Y=-81781.250 Z=10120.775)
+    "West Cottage Scraps 2": base_id + 1447, # ItemPickup283_5 Mine3_NPCHouseDetails (X=-73784.695 Y=-79414.359 Z=10128.285)
+    "West Cottage Scraps 3": base_id + 1448, # ItemPickup13_1 Mine3_NPCHouse (X=-73992.391 Y=-78600.094 Z=10162.495)
+    "West Cottage Scraps 4": base_id + 1449, # ItemPickup284_8 Mine3_NPCHouseDetails (X=-71623.000 Y=-75998.023 Z=10275.477)
+    "West Cottage Scraps 5": base_id + 1450 # ItemPickup282_2 Mine3_NPCHouseDetails (X=-72626.453 Y=-79391.070 Z=10211.037)
 }
 
 loc_caravan = {
-    "Caravan Scraps 1" : base_id + 1451, # ItemPickup348_11 Secret10_PAth (X=-52638.109 Y=-43924.395 Z=10579.809)
-    "Caravan Scraps 2" : base_id + 1452, # ItemPickup347_8 Secret10_PAth (X=-50203.695 Y=-42865.672 Z=10778.871)
-    "Caravan Scraps 3" : base_id + 1453, # ItemPickup346_5 Secret10_PAth (X=-48467.738 Y=-42018.488 Z=10818.758)
-    "Caravan Scraps 4" : base_id + 1454, # ItemPickup77_14 Secret10_Details (X=-46325.219 Y=-41707.512 Z=11003.229)
-    "Caravan Scraps 5" : base_id + 1455, # ItemPickup345_2 Secret10_PAth (X=-44557.043 Y=-40652.930 Z=11076.221)
-    "Caravan Scraps 6" : base_id + 1456, # ItemPickup76_11 Secret10_Details (X=-43380.664 Y=-38207.152 Z=11165.370)
-    "Caravan Scraps 7" : base_id + 1457, # ItemPickup73_2 Secret10_Details (X=-42919.410 Y=-38797.738 Z=11265.633)
-    "Caravan Scraps 8" : base_id + 1458, # ItemPickup74_5 Secret10_Details (X=-42787.523 Y=-38601.820 Z=11254.003)
-    "Caravan Scraps 9" : base_id + 1459, # ItemPickup75_8 Secret10_Details (X=-42711.363 Y=-39141.523 Z=11173.905)
-    "Caravan Chest Scraps 1" : base_id + 1460, # ItemPickup71561 Secret10_Details (X=-42910.668 Y=-38297.309 Z=11233.402)
-    "Caravan Chest Scraps 2" : base_id + 1461, # ItemPickup078654 Secret10_Details (X=-42904.344 Y=-38307.332 Z=11219.678)
-    "Caravan Chest Scraps 3" : base_id + 1462, # ItemPickup02345 Secret10_Details (X=-42904.965 Y=-38280.383 Z=11208.191)
-    "Caravan Chest Scraps 4" : base_id + 1463, # ItemPickup-6546483648 Secret10_Details (X=-42911.680 Y=-38315.254 Z=11204.225)
-    "Caravan Chest Scraps 5" : base_id + 1464 #  ItemPickup176752623547 Secret10_Details (X=-42905.090 Y=-38279.828 Z=11192.738)
+    "Caravan Scraps 1": base_id + 1451, # ItemPickup348_11 Secret10_PAth (X=-52638.109 Y=-43924.395 Z=10579.809)
+    "Caravan Scraps 2": base_id + 1452, # ItemPickup347_8 Secret10_PAth (X=-50203.695 Y=-42865.672 Z=10778.871)
+    "Caravan Scraps 3": base_id + 1453, # ItemPickup346_5 Secret10_PAth (X=-48467.738 Y=-42018.488 Z=10818.758)
+    "Caravan Scraps 4": base_id + 1454, # ItemPickup77_14 Secret10_Details (X=-46325.219 Y=-41707.512 Z=11003.229)
+    "Caravan Scraps 5": base_id + 1455, # ItemPickup345_2 Secret10_PAth (X=-44557.043 Y=-40652.930 Z=11076.221)
+    "Caravan Scraps 6": base_id + 1456, # ItemPickup76_11 Secret10_Details (X=-43380.664 Y=-38207.152 Z=11165.370)
+    "Caravan Scraps 7": base_id + 1457, # ItemPickup73_2 Secret10_Details (X=-42919.410 Y=-38797.738 Z=11265.633)
+    "Caravan Scraps 8": base_id + 1458, # ItemPickup74_5 Secret10_Details (X=-42787.523 Y=-38601.820 Z=11254.003)
+    "Caravan Scraps 9": base_id + 1459, # ItemPickup75_8 Secret10_Details (X=-42711.363 Y=-39141.523 Z=11173.905)
+    "Caravan Chest Scraps 1": base_id + 1460, # ItemPickup71561 Secret10_Details (X=-42910.668 Y=-38297.309 Z=11233.402)
+    "Caravan Chest Scraps 2": base_id + 1461, # ItemPickup078654 Secret10_Details (X=-42904.344 Y=-38307.332 Z=11219.678)
+    "Caravan Chest Scraps 3": base_id + 1462, # ItemPickup02345 Secret10_Details (X=-42904.965 Y=-38280.383 Z=11208.191)
+    "Caravan Chest Scraps 4": base_id + 1463, # ItemPickup-6546483648 Secret10_Details (X=-42911.680 Y=-38315.254 Z=11204.225)
+    "Caravan Chest Scraps 5": base_id + 1464 #  ItemPickup176752623547 Secret10_Details (X=-42905.090 Y=-38279.828 Z=11192.738)
 }
 
 loc_trailer_cabin = {
-    "Trailer Cabin Scraps 1" : base_id + 1465, # ItemPickup493_17 TrailerCabin_Details (X=-50702.449 Y=-38850.020 Z=10810.316)
-    "Trailer Cabin Scraps 2" : base_id + 1466, # ItemPickup489_5 TrailerCabin_Details (X=-51365.684 Y=-38502.379 Z=10875.761)
-    "Trailer Cabin Scraps 3" : base_id + 1467, # ItemPickup491_11 TrailerCabin_Details (X=-52397.570 Y=-37530.145 Z=10873.624)
-    "Trailer Cabin Scraps 4" : base_id + 1468, # ItemPickup490_8 TrailerCabin_Details (X=-50625.746 Y=-37916.758 Z=10886.909)
-    "Trailer Cabin Scraps 5" : base_id + 1469, # ItemPickup488_2 TrailerCabin_Details (X=-51201.051 Y=-37467.137 Z=10910.795)
-    "Trailer Cabin Scraps 6" : base_id + 1470 # ItemPickup492_14 TrailerCabin_Details (X=-51891.320 Y=-40549.492 Z=10675.211)
+    "Trailer Cabin Scraps 1": base_id + 1465, # ItemPickup493_17 TrailerCabin_Details (X=-50702.449 Y=-38850.020 Z=10810.316)
+    "Trailer Cabin Scraps 2": base_id + 1466, # ItemPickup489_5 TrailerCabin_Details (X=-51365.684 Y=-38502.379 Z=10875.761)
+    "Trailer Cabin Scraps 3": base_id + 1467, # ItemPickup491_11 TrailerCabin_Details (X=-52397.570 Y=-37530.145 Z=10873.624)
+    "Trailer Cabin Scraps 4": base_id + 1468, # ItemPickup490_8 TrailerCabin_Details (X=-50625.746 Y=-37916.758 Z=10886.909)
+    "Trailer Cabin Scraps 5": base_id + 1469, # ItemPickup488_2 TrailerCabin_Details (X=-51201.051 Y=-37467.137 Z=10910.795)
+    "Trailer Cabin Scraps 6": base_id + 1470 # ItemPickup492_14 TrailerCabin_Details (X=-51891.320 Y=-40549.492 Z=10675.211)
 }
 
 loc_towers = {
-    "Towers Scraps 1" : base_id + 1471, # ItemPickup486_32 Towers_Environment_Details (X=-24434.766 Y=-25708.373 Z=11200.865)
-    "Towers Scraps 2" : base_id + 1472, # ItemPickup483_23 Towers_Environment_Details (X=-20970.262 Y=-25678.754 Z=11731.241)
-    "Towers Scraps 3" : base_id + 1473, # ItemPickup481_17 Towers_Environment_Details (X=-19812.230 Y=-27768.301 Z=12051.623)
-    "Towers Scraps 4" : base_id + 1474, # ItemPickup484_26 Towers_Environment_Details (X=-19940.912 Y=-25411.576 Z=12035.366)
-    "Towers Scraps 5" : base_id + 1475, # ItemPickup41_17 Towers_Environment (X=-18596.791 Y=-25100.035 Z=12290.350)
-    "Towers Scraps 6" : base_id + 1476, # ItemPickup482_20 Towers_Environment_Details (X=-23302.396 Y=-23270.324 Z=12036.164)
-    "Towers Scraps 7" : base_id + 1477, # ItemPickup487_35 Towers_Environment_Details (X=-22955.039 Y=-27576.859 Z=11211.258)
-    "Towers Scraps 8" : base_id + 1478, # ItemPickup478_8 Towers_Environment_Details (X=-21485.520 Y=-29634.893 Z=11787.103)
-    "Towers Scraps 9" : base_id + 1479, # ItemPickup477_5 Towers_Environment_Details (X=-23667.957 Y=-29825.240 Z=12035.269)
-    "Towers Scraps 10" : base_id + 1480, # ItemPickup39_11 Towers_Environment (X=-25361.008 Y=-29794.301 Z=12026.073)
-    "Towers Scraps 11" : base_id + 1481, # ItemPickup476_2 Towers_Environment_Details (X=-26549.584 Y=-32768.133 Z=12289.732)
-    "Towers Scraps 12" : base_id + 1482, # ItemPickup38_8 Towers_Environment (X=-27240.127 Y=-27404.748 Z=12027.208)
-    "Towers Scraps 13" : base_id + 1483, # ItemPickup40_14 Towers_Environment (X=-23231.639 Y=-27799.158 Z=11829.792)
-    "Towers Scraps 14" : base_id + 1484, # ItemPickup485_29 Towers_Environment_Details (X=-22949.568 Y=-26146.012 Z=11702.730)
-    "Towers Scraps 15" : base_id + 1485, # ItemPickup479_11 Towers_Environment_Details (X=-19726.715 Y=-32464.682 Z=12118.678)
-    "Towers Scraps 16" : base_id + 1486, # ItemPickup1366543 Tower_BuildingsExteriorDetails (X=-23495.104 Y=-27644.689 Z=11872.844)
-    "Towers Scraps 17" : base_id + 1487, # ItemPickup139978 Tower_BuildingsExteriorDetails (X=-23512.971 Y=-27493.051 Z=12218.543)
-    "Towers Scraps 18" : base_id + 1488, # ItemPickup42_20 Towers_Environment (X=-22731.439 Y=-26331.393 Z=12102.758)
-    "Towers Scraps 19" : base_id + 1489, # ItemPickup131123 Tower_BuildingsExteriorDetails (X=-22599.641 Y=-26454.590 Z=11752.040)
-    "Towers Scraps 20" : base_id + 1490, # ItemPickup196987 Tower_BuildingsExteriorDetails (X=-22589.721 Y=-26397.414 Z=12571.282)
-    "Towers Scraps 21" : base_id + 1491, # ItemPickup138787 Tower_BuildingsExteriorDetails (X=-22163.268 Y=-26775.938 Z=13107.048)
-    "Towers Scraps 22" : base_id + 1492, # ItemPickup43_23 Towers_Environment (X=-21996.184 Y=-26754.393 Z=13105.997)
-    "Towers Scraps 23" : base_id + 1493, # ItemPickup837454 Tower_BuildingsExteriorDetails (X=-24068.221 Y=-27874.443 Z=12819.666)
-    "Towers Scraps 24" : base_id + 1494, # ItemPickup44_29 Towers_Environment (X=-23525.330 Y=-27770.035 Z=12612.871)
-    "Towers Scraps 25" : base_id + 1495, # ItemPickup18932 Tower_BuildingsExteriorDetails (X=-23472.215 Y=-27617.404 Z=13213.256)
-    "Towers Scraps 26" : base_id + 1496, # ItemPickup188348 Tower_BuildingsExteriorDetails (X=-23981.588 Y=-27984.385 Z=13219.854)
-    "Towers Scraps 27" : base_id + 1497, # ItemPickup480_14 Towers_Environment_Details (X=-18696.230 Y=-34511.277 Z=12704.238)
-    "Towers Lime Paint Can" : base_id + 1498, # PaintCan_2 Towers_BuildingsDetails (X=-22288.555 Y=-26022.281 Z=11835.892) \!/ Existing match 5
-    "Towers Employment Contracts" : base_id + 1499, # Towers_Files_Pickup Tower_BuildingsExteriorDetails (X=-24081.414 Y=-27637.459 Z=13679.163)
-    "Towers Ronny Mission End" : base_id + 1500 # (dialog 3) -> 1_scraps_reward
+    "Towers Scraps 1": base_id + 1471, # ItemPickup486_32 Towers_Environment_Details (X=-24434.766 Y=-25708.373 Z=11200.865)
+    "Towers Scraps 2": base_id + 1472, # ItemPickup483_23 Towers_Environment_Details (X=-20970.262 Y=-25678.754 Z=11731.241)
+    "Towers Scraps 3": base_id + 1473, # ItemPickup481_17 Towers_Environment_Details (X=-19812.230 Y=-27768.301 Z=12051.623)
+    "Towers Scraps 4": base_id + 1474, # ItemPickup484_26 Towers_Environment_Details (X=-19940.912 Y=-25411.576 Z=12035.366)
+    "Towers Scraps 5": base_id + 1475, # ItemPickup41_17 Towers_Environment (X=-18596.791 Y=-25100.035 Z=12290.350)
+    "Towers Scraps 6": base_id + 1476, # ItemPickup482_20 Towers_Environment_Details (X=-23302.396 Y=-23270.324 Z=12036.164)
+    "Towers Scraps 7": base_id + 1477, # ItemPickup487_35 Towers_Environment_Details (X=-22955.039 Y=-27576.859 Z=11211.258)
+    "Towers Scraps 8": base_id + 1478, # ItemPickup478_8 Towers_Environment_Details (X=-21485.520 Y=-29634.893 Z=11787.103)
+    "Towers Scraps 9": base_id + 1479, # ItemPickup477_5 Towers_Environment_Details (X=-23667.957 Y=-29825.240 Z=12035.269)
+    "Towers Scraps 10": base_id + 1480, # ItemPickup39_11 Towers_Environment (X=-25361.008 Y=-29794.301 Z=12026.073)
+    "Towers Scraps 11": base_id + 1481, # ItemPickup476_2 Towers_Environment_Details (X=-26549.584 Y=-32768.133 Z=12289.732)
+    "Towers Scraps 12": base_id + 1482, # ItemPickup38_8 Towers_Environment (X=-27240.127 Y=-27404.748 Z=12027.208)
+    "Towers Scraps 13": base_id + 1483, # ItemPickup40_14 Towers_Environment (X=-23231.639 Y=-27799.158 Z=11829.792)
+    "Towers Scraps 14": base_id + 1484, # ItemPickup485_29 Towers_Environment_Details (X=-22949.568 Y=-26146.012 Z=11702.730)
+    "Towers Scraps 15": base_id + 1485, # ItemPickup479_11 Towers_Environment_Details (X=-19726.715 Y=-32464.682 Z=12118.678)
+    "Towers Scraps 16": base_id + 1486, # ItemPickup1366543 Tower_BuildingsExteriorDetails (X=-23495.104 Y=-27644.689 Z=11872.844)
+    "Towers Scraps 17": base_id + 1487, # ItemPickup139978 Tower_BuildingsExteriorDetails (X=-23512.971 Y=-27493.051 Z=12218.543)
+    "Towers Scraps 18": base_id + 1488, # ItemPickup42_20 Towers_Environment (X=-22731.439 Y=-26331.393 Z=12102.758)
+    "Towers Scraps 19": base_id + 1489, # ItemPickup131123 Tower_BuildingsExteriorDetails (X=-22599.641 Y=-26454.590 Z=11752.040)
+    "Towers Scraps 20": base_id + 1490, # ItemPickup196987 Tower_BuildingsExteriorDetails (X=-22589.721 Y=-26397.414 Z=12571.282)
+    "Towers Scraps 21": base_id + 1491, # ItemPickup138787 Tower_BuildingsExteriorDetails (X=-22163.268 Y=-26775.938 Z=13107.048)
+    "Towers Scraps 22": base_id + 1492, # ItemPickup43_23 Towers_Environment (X=-21996.184 Y=-26754.393 Z=13105.997)
+    "Towers Scraps 23": base_id + 1493, # ItemPickup837454 Tower_BuildingsExteriorDetails (X=-24068.221 Y=-27874.443 Z=12819.666)
+    "Towers Scraps 24": base_id + 1494, # ItemPickup44_29 Towers_Environment (X=-23525.330 Y=-27770.035 Z=12612.871)
+    "Towers Scraps 25": base_id + 1495, # ItemPickup18932 Tower_BuildingsExteriorDetails (X=-23472.215 Y=-27617.404 Z=13213.256)
+    "Towers Scraps 26": base_id + 1496, # ItemPickup188348 Tower_BuildingsExteriorDetails (X=-23981.588 Y=-27984.385 Z=13219.854)
+    "Towers Scraps 27": base_id + 1497, # ItemPickup480_14 Towers_Environment_Details (X=-18696.230 Y=-34511.277 Z=12704.238)
+    "Towers Lime Paint Can": base_id + 1498, # PaintCan_2 Towers_BuildingsDetails (X=-22288.555 Y=-26022.281 Z=11835.892) \!/ Existing match 5
+    "Towers Employment Contracts": base_id + 1499, # Towers_Files_Pickup Tower_BuildingsExteriorDetails (X=-24081.414 Y=-27637.459 Z=13679.163)
+    "Towers Ronny Mission End": base_id + 1500 # (dialog 3) -> 1_scraps_reward
 }
 
 loc_north_beach = {
-    "North Beach Chest Scraps 1" : base_id + 1501, # ItemPickup9254 Secret3_CampDetails (X=-74444.648 Y=-130627.672 Z=8793.757)
-    "North Beach Chest Scraps 2" : base_id + 1502, # ItemPickup14523 Secret3_CampDetails (X=-74426.539 Y=-130626.547 Z=8781.948)
-    "North Beach Chest Scraps 3" : base_id + 1503, # ItemPickup084537 Secret3_CampDetails (X=-74448.852 Y=-130632.367 Z=8772.555)
-    "North Beach Chest Scraps 4" : base_id + 1504, # ItemPickup17754234 Secret3_CampDetails (X=-74425.523 Y=-130622.875 Z=8755.526)
-    "North Beach Scraps 1" : base_id + 1505, # ItemPickup376_5 Secret3_CampDetails (X=-75003.078 Y=-131084.016 Z=8729.731)
-    "North Beach Scraps 2" : base_id + 1506, # ItemPickup378_11 Secret3_CampDetails (X=-75477.758 Y=-129413.750 Z=9082.617)
-    "North Beach Scraps 3" : base_id + 1507, # ItemPickup377_8 Secret3_CampDetails (X=-75608.453 Y=-130483.430 Z=8909.659)
-    "North Beach Scraps 4" : base_id + 1508, # ItemPickup375_2 Secret3_CampDetails (X=-74143.469 Y=-131117.953 Z=8752.130)
-    "North Beach Scraps 5" : base_id + 1509, # ItemPickup387_6 Secret4_BeachHouseMain (X=-80847.078 Y=-135628.719 Z=7915.444)
-    "North Beach Scraps 6" : base_id + 1510, # ItemPickup386_3 Secret4_BeachHouseMain (X=-84044.789 Y=-137591.000 Z=7359.172)
-    "North Beach Scraps 7" : base_id + 1511, # ItemPickup379_2 Secret4_BeachHouseDetails (X=-83992.836 Y=-132933.531 Z=7941.225)
-    "North Beach Scraps 8" : base_id + 1512, # ItemPickup380_5 Secret4_BeachHouseDetails (X=-87355.734 Y=-134216.438 Z=7237.310)
-    "North Beach Scraps 9" : base_id + 1513, # ItemPickup384_17 Secret4_BeachHouseDetails (X=-89213.844 Y=-134625.922 Z=7185.133)
-    "North Beach Scraps 10" : base_id + 1514, # ItemPickup25_0 Secret4_BeachHouseDetails (X=-88423.430 Y=-135922.969 Z=7290.801)
-    "North Beach Scraps 11" : base_id + 1515, # ItemPickup381_8 Secret4_BeachHouseDetails (X=-87668.977 Y=-136850.359 Z=7275.346)
-    "North Beach Scraps 12" : base_id + 1516, # ItemPickup383_14 Secret4_BeachHouseDetails (X=-90241.328 Y=-136381.000 Z=7199.622)
-    "North Beach Scraps 13" : base_id + 1517, # ItemPickup27_8 Secret4_BeachHouseDetails (X=-91728.680 Y=-135288.203 Z=7319.699)
-    "North Beach Scraps 14" : base_id + 1518, # ItemPickup26_2 Secret4_BeachHouseDetails (X=-88789.039 Y=-135461.719 Z=7305.800)
-    "North Beach Scraps 15" : base_id + 1519, # ItemPickup382_11 Secret4_BeachHouseDetails (X=-88572.078 Y=-135970.734 Z=7302.674)
-    "North Beach Teal Paint Can" : base_id + 1520 # PaintCan_2 Secret4_BeachHouseDetails (X=-91706.805 Y=-134988.453 Z=7347.827) \!/ Existing match 5
+    "North Beach Chest Scraps 1": base_id + 1501, # ItemPickup9254 Secret3_CampDetails (X=-74444.648 Y=-130627.672 Z=8793.757)
+    "North Beach Chest Scraps 2": base_id + 1502, # ItemPickup14523 Secret3_CampDetails (X=-74426.539 Y=-130626.547 Z=8781.948)
+    "North Beach Chest Scraps 3": base_id + 1503, # ItemPickup084537 Secret3_CampDetails (X=-74448.852 Y=-130632.367 Z=8772.555)
+    "North Beach Chest Scraps 4": base_id + 1504, # ItemPickup17754234 Secret3_CampDetails (X=-74425.523 Y=-130622.875 Z=8755.526)
+    "North Beach Scraps 1": base_id + 1505, # ItemPickup376_5 Secret3_CampDetails (X=-75003.078 Y=-131084.016 Z=8729.731)
+    "North Beach Scraps 2": base_id + 1506, # ItemPickup378_11 Secret3_CampDetails (X=-75477.758 Y=-129413.750 Z=9082.617)
+    "North Beach Scraps 3": base_id + 1507, # ItemPickup377_8 Secret3_CampDetails (X=-75608.453 Y=-130483.430 Z=8909.659)
+    "North Beach Scraps 4": base_id + 1508, # ItemPickup375_2 Secret3_CampDetails (X=-74143.469 Y=-131117.953 Z=8752.130)
+    "North Beach Scraps 5": base_id + 1509, # ItemPickup387_6 Secret4_BeachHouseMain (X=-80847.078 Y=-135628.719 Z=7915.444)
+    "North Beach Scraps 6": base_id + 1510, # ItemPickup386_3 Secret4_BeachHouseMain (X=-84044.789 Y=-137591.000 Z=7359.172)
+    "North Beach Scraps 7": base_id + 1511, # ItemPickup379_2 Secret4_BeachHouseDetails (X=-83992.836 Y=-132933.531 Z=7941.225)
+    "North Beach Scraps 8": base_id + 1512, # ItemPickup380_5 Secret4_BeachHouseDetails (X=-87355.734 Y=-134216.438 Z=7237.310)
+    "North Beach Scraps 9": base_id + 1513, # ItemPickup384_17 Secret4_BeachHouseDetails (X=-89213.844 Y=-134625.922 Z=7185.133)
+    "North Beach Scraps 10": base_id + 1514, # ItemPickup25_0 Secret4_BeachHouseDetails (X=-88423.430 Y=-135922.969 Z=7290.801)
+    "North Beach Scraps 11": base_id + 1515, # ItemPickup381_8 Secret4_BeachHouseDetails (X=-87668.977 Y=-136850.359 Z=7275.346)
+    "North Beach Scraps 12": base_id + 1516, # ItemPickup383_14 Secret4_BeachHouseDetails (X=-90241.328 Y=-136381.000 Z=7199.622)
+    "North Beach Scraps 13": base_id + 1517, # ItemPickup27_8 Secret4_BeachHouseDetails (X=-91728.680 Y=-135288.203 Z=7319.699)
+    "North Beach Scraps 14": base_id + 1518, # ItemPickup26_2 Secret4_BeachHouseDetails (X=-88789.039 Y=-135461.719 Z=7305.800)
+    "North Beach Scraps 15": base_id + 1519, # ItemPickup382_11 Secret4_BeachHouseDetails (X=-88572.078 Y=-135970.734 Z=7302.674)
+    "North Beach Teal Paint Can": base_id + 1520 # PaintCan_2 Secret4_BeachHouseDetails (X=-91706.805 Y=-134988.453 Z=7347.827) \!/ Existing match 5
     # "North Beach Scraps Glitch 1" ItemPickup385_20 (X=-77651.938 Y=-139721.453 Z=7261.729) /!\ Glitched scrap
 }
 
 loc_mine_shaft = {
-    "Mine Shaft Chest Scraps 1" : base_id + 1521, # ItemPickup0934569 Secret13_Details (X=-17360.789 Y=-74064.367 Z=8038.313)
-    "Mine Shaft Chest Scraps 2" : base_id + 1522, # ItemPickup17234455622 Secret13_Details (X=-17360.814 Y=-74064.367 Z=8024.187)
-    "Mine Shaft Chest Scraps 3" : base_id + 1523, # ItemPickup856743 Secret13_Details (X=-17361.059 Y=-74049.234 Z=8015.940)
-    "Mine Shaft Chest Scraps 4" : base_id + 1524, # ItemPickup16456456 Secret13_Details (X=-17336.465 Y=-74087.063 Z=8009.707)
-    "Mine Shaft Chest Scraps 5" : base_id + 1525, # ItemPickup234743 Secret13_Details (X=-17349.941 Y=-74075.484 Z=8004.179)
-    "Mine Shaft Chest Scraps 6" : base_id + 1526, # ItemPickup1434563456 Secret13_Details (X=-17361.084 Y=-74049.234 Z=8001.814)
-    "Mine Shaft Chest Scraps 7" : base_id + 1527, # ItemPickup13634563456 Secret13_Details (X=-17349.967 Y=-74075.484 Z=7990.054)
-    "Mine Shaft Scraps 1" : base_id + 1528, # ItemPickup369_23 Secret13_Details (X=-16985.645 Y=-70377.273 Z=10837.127)
-    "Mine Shaft Scraps 2" : base_id + 1529, # ItemPickup368_20 Secret13_Details (X=-18292.045 Y=-71003.563 Z=10975.308)
-    "Mine Shaft Scraps 3" : base_id + 1530, # ItemPickup367_17 Secret13_Details (X=-16150.797 Y=-72075.289 Z=10609.141)
-    "Mine Shaft Scraps 4" : base_id + 1531, # ItemPickup24456463 Secret13_EntranceDetails1 (X=-18404.480 Y=-71894.367 Z=10968.230)
-    "Mine Shaft Scraps 5" : base_id + 1532, # ItemPickup2565644 Secret13_Details (X=-17777.268 Y=-71467.172 Z=10441.745)
-    "Mine Shaft Scraps 6" : base_id + 1533, # ItemPickup366_14 Secret13_Details (X=-17630.971 Y=-72800.641 Z=8842.322)
-    "Mine Shaft Scraps 7" : base_id + 1534, # ItemPickup18_8 Secret13_Details (X=-17979.719 Y=-73413.563 Z=8118.260)
-    "Mine Shaft Scraps 8" : base_id + 1535, # ItemPickup21_11 Secret13_Details (X=-16554.467 Y=-74139.781 Z=7892.738)
-    "Mine Shaft Scraps 9" : base_id + 1536, # ItemPickup365_11 Secret13_Details (X=-16343.033 Y=-74617.555 Z=7298.177)
-    "Mine Shaft Scraps 10" : base_id + 1537, # ItemPickup22123 Secret13_Details (X=-12390.332 Y=-77620.320 Z=7324.504)
-    "Mine Shaft Scraps 11" : base_id + 1538, # ItemPickup364_8 Secret13_Details (X=-10969.702 Y=-77961.477 Z=7297.171)
-    "Mine Shaft Scraps 12" : base_id + 1539, # ItemPickup363_5 Secret13_Details (X=-9888.596 Y=-78208.930 Z=7269.473)
-    "Mine Shaft Scraps 13" : base_id + 1540, # ItemPickup362_2 Secret13_Details (X=-8865.696 Y=-79063.977 Z=7247.677)
-    "Mine Shaft Scraps 14" : base_id + 1541 # ItemPickup238976 Secret13_ExitDetails (X=-8143.984 Y=-79764.617 Z=7222.096)
+    "Mine Shaft Chest Scraps 1": base_id + 1521, # ItemPickup0934569 Secret13_Details (X=-17360.789 Y=-74064.367 Z=8038.313)
+    "Mine Shaft Chest Scraps 2": base_id + 1522, # ItemPickup17234455622 Secret13_Details (X=-17360.814 Y=-74064.367 Z=8024.187)
+    "Mine Shaft Chest Scraps 3": base_id + 1523, # ItemPickup856743 Secret13_Details (X=-17361.059 Y=-74049.234 Z=8015.940)
+    "Mine Shaft Chest Scraps 4": base_id + 1524, # ItemPickup16456456 Secret13_Details (X=-17336.465 Y=-74087.063 Z=8009.707)
+    "Mine Shaft Chest Scraps 5": base_id + 1525, # ItemPickup234743 Secret13_Details (X=-17349.941 Y=-74075.484 Z=8004.179)
+    "Mine Shaft Chest Scraps 6": base_id + 1526, # ItemPickup1434563456 Secret13_Details (X=-17361.084 Y=-74049.234 Z=8001.814)
+    "Mine Shaft Chest Scraps 7": base_id + 1527, # ItemPickup13634563456 Secret13_Details (X=-17349.967 Y=-74075.484 Z=7990.054)
+    "Mine Shaft Scraps 1": base_id + 1528, # ItemPickup369_23 Secret13_Details (X=-16985.645 Y=-70377.273 Z=10837.127)
+    "Mine Shaft Scraps 2": base_id + 1529, # ItemPickup368_20 Secret13_Details (X=-18292.045 Y=-71003.563 Z=10975.308)
+    "Mine Shaft Scraps 3": base_id + 1530, # ItemPickup367_17 Secret13_Details (X=-16150.797 Y=-72075.289 Z=10609.141)
+    "Mine Shaft Scraps 4": base_id + 1531, # ItemPickup24456463 Secret13_EntranceDetails1 (X=-18404.480 Y=-71894.367 Z=10968.230)
+    "Mine Shaft Scraps 5": base_id + 1532, # ItemPickup2565644 Secret13_Details (X=-17777.268 Y=-71467.172 Z=10441.745)
+    "Mine Shaft Scraps 6": base_id + 1533, # ItemPickup366_14 Secret13_Details (X=-17630.971 Y=-72800.641 Z=8842.322)
+    "Mine Shaft Scraps 7": base_id + 1534, # ItemPickup18_8 Secret13_Details (X=-17979.719 Y=-73413.563 Z=8118.260)
+    "Mine Shaft Scraps 8": base_id + 1535, # ItemPickup21_11 Secret13_Details (X=-16554.467 Y=-74139.781 Z=7892.738)
+    "Mine Shaft Scraps 9": base_id + 1536, # ItemPickup365_11 Secret13_Details (X=-16343.033 Y=-74617.555 Z=7298.177)
+    "Mine Shaft Scraps 10": base_id + 1537, # ItemPickup22123 Secret13_Details (X=-12390.332 Y=-77620.320 Z=7324.504)
+    "Mine Shaft Scraps 11": base_id + 1538, # ItemPickup364_8 Secret13_Details (X=-10969.702 Y=-77961.477 Z=7297.171)
+    "Mine Shaft Scraps 12": base_id + 1539, # ItemPickup363_5 Secret13_Details (X=-9888.596 Y=-78208.930 Z=7269.473)
+    "Mine Shaft Scraps 13": base_id + 1540, # ItemPickup362_2 Secret13_Details (X=-8865.696 Y=-79063.977 Z=7247.677)
+    "Mine Shaft Scraps 14": base_id + 1541 # ItemPickup238976 Secret13_ExitDetails (X=-8143.984 Y=-79764.617 Z=7222.096)
 }
 
 loc_mob_camp = {
-    "Mob Camp Key" : base_id + 1542, # ItemPickup29_0 Bob_CampDetails2 (X=-29114.480 Y=-53608.520 Z=12839.528)
-    "Mob Camp Scraps 1" : base_id + 1543, # ItemPickup25_5 Bob_CampDetails2 (X=-27373.525 Y=-53008.668 Z=12706.465)
-    "Mob Camp Scraps 2" : base_id + 1544, # ItemPickup26_1 Bob_CampDetails2 (X=-28786.941 Y=-53009.762 Z=12760.727)
-    "Mob Camp Scraps 3" : base_id + 1545, # ItemPickup13_14 Mine3_Mountain (X=-29650.207 Y=-53328.070 Z=12724.598)
-    "Mob Camp Scraps 4" : base_id + 1546, # ItemPickup90_5 Bob_CampDetails2 (X=-31515.057 Y=-55533.324 Z=12344.274)
-    "Mob Camp Scraps 5" : base_id + 1547, # ItemPickup49513294 Mine3_Mountain (X=-31847.229 Y=-55152.352 Z=11574.255)
-    "Mob Camp Scraps 6" : base_id + 1548, # ItemPickup92_14 Bob_CampDetails2 (X=-31323.533 Y=-55432.871 Z=11245.139)
-    "Mob Camp Scraps 7" : base_id + 1549, # ItemPickup91_8 Bob_CampDetails2 (X=-31583.443 Y=-55475.805 Z=11234.112)
-    "Mob Camp Scraps 8" : base_id + 1550, # ItemPickup95_23 Bob_CampDetails2 (X=-32925.406 Y=-57157.605 Z=11086.322)
-    "Mob Camp Scraps 9" : base_id + 1551, # ItemPickup96_26 Bob_CampDetails2 (X=-33052.488 Y=-58560.098 Z=11101.021)
-    "Mob Camp Scraps 10" : base_id + 1552, # ItemPickup13121212 Mine3_Mountain (X=-32422.406 Y=-60145.063 Z=11203.182)
-    "Mob Camp Scraps 11" : base_id + 1553, # ItemPickup93_17 Bob_CampDetails2 (X=-30891.457 Y=-60046.465 Z=11237.567)
-    "Mob Camp Scraps 12" : base_id + 1554, # ItemPickup97_29 Bob_CampDetails2 (X=-31888.428 Y=-59222.645 Z=11179.302)
-    "Mob Camp Scraps 13" : base_id + 1555, # ItemPickup62156 Mine3_Mountain (X=-31161.750 Y=-57410.789 Z=11279.820)
-    "Mob Camp Scraps 14" : base_id + 1556, # ItemPickup24_3 Bob_CampDetails2 (X=-31256.545 Y=-59865.809 Z=11904.155)
-    "Mob Camp Scraps 15" : base_id + 1557, # ItemPickup27_0 Bob_CampDetails2 (X=-31757.953 Y=-57179.258 Z=11295.150)
-    "Mob Camp Scraps 16" : base_id + 1558 # ItemPickup89_2 Bob_CampDetails2 (X=-29137.043 Y=-54824.797 Z=12418.673)
+    "Mob Camp Key": base_id + 1542, # ItemPickup29_0 Bob_CampDetails2 (X=-29114.480 Y=-53608.520 Z=12839.528)
+    "Mob Camp Scraps 1": base_id + 1543, # ItemPickup25_5 Bob_CampDetails2 (X=-27373.525 Y=-53008.668 Z=12706.465)
+    "Mob Camp Scraps 2": base_id + 1544, # ItemPickup26_1 Bob_CampDetails2 (X=-28786.941 Y=-53009.762 Z=12760.727)
+    "Mob Camp Scraps 3": base_id + 1545, # ItemPickup13_14 Mine3_Mountain (X=-29650.207 Y=-53328.070 Z=12724.598)
+    "Mob Camp Scraps 4": base_id + 1546, # ItemPickup90_5 Bob_CampDetails2 (X=-31515.057 Y=-55533.324 Z=12344.274)
+    "Mob Camp Scraps 5": base_id + 1547, # ItemPickup49513294 Mine3_Mountain (X=-31847.229 Y=-55152.352 Z=11574.255)
+    "Mob Camp Scraps 6": base_id + 1548, # ItemPickup92_14 Bob_CampDetails2 (X=-31323.533 Y=-55432.871 Z=11245.139)
+    "Mob Camp Scraps 7": base_id + 1549, # ItemPickup91_8 Bob_CampDetails2 (X=-31583.443 Y=-55475.805 Z=11234.112)
+    "Mob Camp Scraps 8": base_id + 1550, # ItemPickup95_23 Bob_CampDetails2 (X=-32925.406 Y=-57157.605 Z=11086.322)
+    "Mob Camp Scraps 9": base_id + 1551, # ItemPickup96_26 Bob_CampDetails2 (X=-33052.488 Y=-58560.098 Z=11101.021)
+    "Mob Camp Scraps 10": base_id + 1552, # ItemPickup13121212 Mine3_Mountain (X=-32422.406 Y=-60145.063 Z=11203.182)
+    "Mob Camp Scraps 11": base_id + 1553, # ItemPickup93_17 Bob_CampDetails2 (X=-30891.457 Y=-60046.465 Z=11237.567)
+    "Mob Camp Scraps 12": base_id + 1554, # ItemPickup97_29 Bob_CampDetails2 (X=-31888.428 Y=-59222.645 Z=11179.302)
+    "Mob Camp Scraps 13": base_id + 1555, # ItemPickup62156 Mine3_Mountain (X=-31161.750 Y=-57410.789 Z=11279.820)
+    "Mob Camp Scraps 14": base_id + 1556, # ItemPickup24_3 Bob_CampDetails2 (X=-31256.545 Y=-59865.809 Z=11904.155)
+    "Mob Camp Scraps 15": base_id + 1557, # ItemPickup27_0 Bob_CampDetails2 (X=-31757.953 Y=-57179.258 Z=11295.150)
+    "Mob Camp Scraps 16": base_id + 1558 # ItemPickup89_2 Bob_CampDetails2 (X=-29137.043 Y=-54824.797 Z=12418.673)
 }
 
 loc_mob_camp_locked_room = {
-    "Mob Camp Locked Room Scraps 1" : base_id + 1559, # ItemPickup94_20 Bob_CampDetails2 (X=-31736.459 Y=-59761.465 Z=11211.379)
-    "Mob Camp Locked Room Scraps 2" : base_id + 1560, # ItemPickup28_14 Bob_CampDetails2 (X=-32150.889 Y=-59879.594 Z=11297.058)
-    "Mob Camp Locked Room Stolen Bob" : base_id + 1561 # Bob_Clickbox (X=-31771.172 Y=-59892.449 Z=11323.562)
+    "Mob Camp Locked Room Scraps 1": base_id + 1559, # ItemPickup94_20 Bob_CampDetails2 (X=-31736.459 Y=-59761.465 Z=11211.379)
+    "Mob Camp Locked Room Scraps 2": base_id + 1560, # ItemPickup28_14 Bob_CampDetails2 (X=-32150.889 Y=-59879.594 Z=11297.058)
+    "Mob Camp Locked Room Stolen Bob": base_id + 1561 # Bob_Clickbox (X=-31771.172 Y=-59892.449 Z=11323.562)
 }
 
 loc_mine_elevator_exit = {
-    "Mine Elevator Exit Scraps 1" : base_id + 1562, # ItemPickup266_19 Mine3_ExitCampDetails (X=-29587.271 Y=-42650.797 Z=12515.042)
-    "Mine Elevator Exit Scraps 2" : base_id + 1563, # ItemPickup265_16 Mine3_ExitCampDetails (X=-30727.555 Y=-42715.438 Z=12485.763)
-    "Mine Elevator Exit Scraps 3" : base_id + 1564, # ItemPickup267_22 Mine3_ExitCampDetails (X=-29814.680 Y=-43722.777 Z=12518.878)
-    "Mine Elevator Exit Scraps 4" : base_id + 1565, # ItemPickup261_2 Mine3_ExitCampDetails (X=-30983.000 Y=-42943.754 Z=12474.396)
-    "Mine Elevator Exit Scraps 5" : base_id + 1566, # ItemPickup262_5 Mine3_ExitCampDetails (X=-31824.576 Y=-43997.270 Z=12345.908)
-    "Mine Elevator Exit Scraps 6" : base_id + 1567, # ItemPickup268_25 Mine3_ExitCampDetails (X=-32553.924 Y=-44761.855 Z=12341.698)
-    "Mine Elevator Exit Scraps 7" : base_id + 1568, # ItemPickup263_10 Mine3_ExitCampDetails (X=-33598.023 Y=-44369.297 Z=12438.430)
-    "Mine Elevator Exit Scraps 8" : base_id + 1569, # ItemPickup264_13 Mine3_ExitCampDetails (X=-31947.459 Y=-42017.137 Z=12384.311)
-    "Mine Elevator Exit Scraps 9" : base_id + 1570 # ItemPickup269_28 Mine3_ExitCampDetails (X=-30127.123 Y=-46004.891 Z=12229.104)
+    "Mine Elevator Exit Scraps 1": base_id + 1562, # ItemPickup266_19 Mine3_ExitCampDetails (X=-29587.271 Y=-42650.797 Z=12515.042)
+    "Mine Elevator Exit Scraps 2": base_id + 1563, # ItemPickup265_16 Mine3_ExitCampDetails (X=-30727.555 Y=-42715.438 Z=12485.763)
+    "Mine Elevator Exit Scraps 3": base_id + 1564, # ItemPickup267_22 Mine3_ExitCampDetails (X=-29814.680 Y=-43722.777 Z=12518.878)
+    "Mine Elevator Exit Scraps 4": base_id + 1565, # ItemPickup261_2 Mine3_ExitCampDetails (X=-30983.000 Y=-42943.754 Z=12474.396)
+    "Mine Elevator Exit Scraps 5": base_id + 1566, # ItemPickup262_5 Mine3_ExitCampDetails (X=-31824.576 Y=-43997.270 Z=12345.908)
+    "Mine Elevator Exit Scraps 6": base_id + 1567, # ItemPickup268_25 Mine3_ExitCampDetails (X=-32553.924 Y=-44761.855 Z=12341.698)
+    "Mine Elevator Exit Scraps 7": base_id + 1568, # ItemPickup263_10 Mine3_ExitCampDetails (X=-33598.023 Y=-44369.297 Z=12438.430)
+    "Mine Elevator Exit Scraps 8": base_id + 1569, # ItemPickup264_13 Mine3_ExitCampDetails (X=-31947.459 Y=-42017.137 Z=12384.311)
+    "Mine Elevator Exit Scraps 9": base_id + 1570 # ItemPickup269_28 Mine3_ExitCampDetails (X=-30127.123 Y=-46004.891 Z=12229.104)
 }
 
 loc_mountain_ruin_outside = {
-    "Mountain Ruin Outside Scraps 1" : base_id + 1571, # ItemPickup112345556 Mine3_Outside (X=-2218.456 Y=-43914.789 Z=11238.952)
-    "Mountain Ruin Outside Scraps 2" : base_id + 1572, # ItemPickup35621 Mine3_Outside (X=-2402.206 Y=-45494.766 Z=11244.650)
-    "Mountain Ruin Outside Scraps 3" : base_id + 1573, # ItemPickup13000 Mine3_Outside (X=-2781.385 Y=-47365.313 Z=11235.389)
-    "Mountain Ruin Outside Scraps 4" : base_id + 1574, # ItemPickup995959 Mine3_Outside (X=-2961.431 Y=-45445.973 Z=11255.289)
-    "Mountain Ruin Outside Scraps 5" : base_id + 1575, # ItemPickup136999 Mine3_Outside (X=-5873.435 Y=-46300.633 Z=11228.667)
-    "Mountain Ruin Outside Scraps 6" : base_id + 1576, # ItemPickup1589994 Mine3_Outside (X=-1823.357 Y=-47071.813 Z=11161.523)
-    "Mountain Ruin Outside Scraps 7" : base_id + 1577, # ItemPickup09871230948 Mine3_Outside (X=-3478.155 Y=-49094.965 Z=11083.230)
-    "Mountain Ruin Outside Scraps 8" : base_id + 1578, # ItemPickup258_20 Mine3_Camp (X=-4606.678 Y=-50246.180 Z=11613.938)
-    "Mountain Ruin Outside Scraps 9" : base_id + 1579, # ItemPickup257_17 Mine3_Camp (X=-5454.638 Y=-53508.004 Z=12062.944)
-    "Mountain Ruin Outside Scraps 10" : base_id + 1580, # ItemPickup18_3 Mine3_Camp (X=-8192.042 Y=-53726.535 Z=11947.394)
-    "Mountain Ruin Outside Scraps 11" : base_id + 1581, # ItemPickup252_2 Mine3_Camp (X=-9409.834 Y=-53970.621 Z=11923.256)
-    "Mountain Ruin Outside Scraps 12" : base_id + 1582, # ItemPickup254_8 Mine3_Camp (X=-8977.424 Y=-57134.637 Z=12232.596)
-    "Mountain Ruin Outside Scraps 13" : base_id + 1583, # ItemPickup19_1 Mine3_Camp (X=-10449.292 Y=-56481.938 Z=12274.706)
-    "Mountain Ruin Outside Scraps 14" : base_id + 1584, # ItemPickup255_11 Mine3_Camp (X=-10490.690 Y=-56584.301 Z=12281.096)
-    "Mountain Ruin Outside Scraps 15" : base_id + 1585, # ItemPickup256_14 Mine3_Camp (X=-11600.937 Y=-55831.191 Z=12388.329)
-    "Mountain Ruin Outside Scraps 16" : base_id + 1586, # ItemPickup259_23 Mine3_Camp (X=-3307.077 Y=-49973.461 Z=11282.041)
-    "Mountain Ruin Outside Scraps 17" : base_id + 1587 # ItemPickup260_26 Mine3_Camp (X=-8878.345 Y=-49816.922 Z=13700.768)
+    "Mountain Ruin Outside Scraps 1": base_id + 1571, # ItemPickup112345556 Mine3_Outside (X=-2218.456 Y=-43914.789 Z=11238.952)
+    "Mountain Ruin Outside Scraps 2": base_id + 1572, # ItemPickup35621 Mine3_Outside (X=-2402.206 Y=-45494.766 Z=11244.650)
+    "Mountain Ruin Outside Scraps 3": base_id + 1573, # ItemPickup13000 Mine3_Outside (X=-2781.385 Y=-47365.313 Z=11235.389)
+    "Mountain Ruin Outside Scraps 4": base_id + 1574, # ItemPickup995959 Mine3_Outside (X=-2961.431 Y=-45445.973 Z=11255.289)
+    "Mountain Ruin Outside Scraps 5": base_id + 1575, # ItemPickup136999 Mine3_Outside (X=-5873.435 Y=-46300.633 Z=11228.667)
+    "Mountain Ruin Outside Scraps 6": base_id + 1576, # ItemPickup1589994 Mine3_Outside (X=-1823.357 Y=-47071.813 Z=11161.523)
+    "Mountain Ruin Outside Scraps 7": base_id + 1577, # ItemPickup09871230948 Mine3_Outside (X=-3478.155 Y=-49094.965 Z=11083.230)
+    "Mountain Ruin Outside Scraps 8": base_id + 1578, # ItemPickup258_20 Mine3_Camp (X=-4606.678 Y=-50246.180 Z=11613.938)
+    "Mountain Ruin Outside Scraps 9": base_id + 1579, # ItemPickup257_17 Mine3_Camp (X=-5454.638 Y=-53508.004 Z=12062.944)
+    "Mountain Ruin Outside Scraps 10": base_id + 1580, # ItemPickup18_3 Mine3_Camp (X=-8192.042 Y=-53726.535 Z=11947.394)
+    "Mountain Ruin Outside Scraps 11": base_id + 1581, # ItemPickup252_2 Mine3_Camp (X=-9409.834 Y=-53970.621 Z=11923.256)
+    "Mountain Ruin Outside Scraps 12": base_id + 1582, # ItemPickup254_8 Mine3_Camp (X=-8977.424 Y=-57134.637 Z=12232.596)
+    "Mountain Ruin Outside Scraps 13": base_id + 1583, # ItemPickup19_1 Mine3_Camp (X=-10449.292 Y=-56481.938 Z=12274.706)
+    "Mountain Ruin Outside Scraps 14": base_id + 1584, # ItemPickup255_11 Mine3_Camp (X=-10490.690 Y=-56584.301 Z=12281.096)
+    "Mountain Ruin Outside Scraps 15": base_id + 1585, # ItemPickup256_14 Mine3_Camp (X=-11600.937 Y=-55831.191 Z=12388.329)
+    "Mountain Ruin Outside Scraps 16": base_id + 1586, # ItemPickup259_23 Mine3_Camp (X=-3307.077 Y=-49973.461 Z=11282.041)
+    "Mountain Ruin Outside Scraps 17": base_id + 1587 # ItemPickup260_26 Mine3_Camp (X=-8878.345 Y=-49816.922 Z=13700.768)
 }
 
 loc_mountain_ruin_inside = {
-    "Mountain Ruin Inside Scraps 1" : base_id + 1588, # ItemPickup253_5 Mine3_Camp (X=-10647.446 Y=-52039.848 Z=11925.344)
-    "Mountain Ruin Inside Scraps 2" : base_id + 1589, # ItemPickup270_2 Mine3_Interior1 (X=-12834.990 Y=-48683.176 Z=10200.083)
-    "Mountain Ruin Inside Scraps 3" : base_id + 1590, # ItemPickup271_5 Mine3_Interior1 (X=-15748.594 Y=-44925.523 Z=10199.975)
-    "Mountain Ruin Inside Scraps 4" : base_id + 1591, # ItemPickup20_3 Mine3_Interior1 (X=-15312.152 Y=-43957.055 Z=10350.783)
-    "Mountain Ruin Inside Scraps 5" : base_id + 1592, # ItemPickup273_11 Mine3_Interior1 (X=-16709.586 Y=-44997.316 Z=10198.888)
-    "Mountain Ruin Inside Scraps 6" : base_id + 1593, # ItemPickup272_8 Mine3_Interior1 (X=-17412.561 Y=-46041.977 Z=10349.650)
-    "Mountain Ruin Inside Scraps 7" : base_id + 1594, # ItemPickup274_14 Mine3_Interior1 (X=-17452.596 Y=-43804.941 Z=10201.436)
-    "Mountain Ruin Inside Scraps 8" : base_id + 1595, # ItemPickup21_2 Mine3_Interior1 (X=-18119.473 Y=-42001.453 Z=10198.855)
-    "Mountain Ruin Inside Scraps 9" : base_id + 1596, # ItemPickup276_20 Mine3_Interior1 (X=-18975.068 Y=-42906.488 Z=10279.690)
-    "Mountain Ruin Inside Scraps 10" : base_id + 1597, # ItemPickup277_26 Mine3_Interior1 (X=-19727.902 Y=-41581.039 Z=10199.614)
-    "Mountain Ruin Inside Scraps 11" : base_id + 1598, # ItemPickup275_17 Mine3_Interior1 (X=-19187.891 Y=-40516.941 Z=10201.049)
-    "Mountain Ruin Inside Scraps 12" : base_id + 1599, # ItemPickup278_29 Mine3_Interior1 (X=-22470.986 Y=-41602.875 Z=10073.847)
-    "Mountain Ruin Inside Scraps 13" : base_id + 1600, # ItemPickup279_2 Mine3_Interior2 (X=-23717.383 Y=-42597.141 Z=7455.452)
-    "Mountain Ruin Inside Scraps 14" : base_id + 1601, # ItemPickup22_7 Mine3_Interior2 (X=-24494.582 Y=-44598.086 Z=7433.633)
-    "Mountain Ruin Inside Scraps 15" : base_id + 1602, # ItemPickup280_5 Mine3_Interior2 (X=-26783.293 Y=-42331.145 Z=7446.357)
-    "Mountain Ruin Inside Scraps 16" : base_id + 1603, # ItemPickup281_8 Mine3_Interior2 (X=-28636.996 Y=-46745.340 Z=7430.463)
-    "Mountain Ruin Inside Scraps 17" : base_id + 1604, # ItemPickup23_1 Mine3_Interior2 (X=-27752.643 Y=-47453.973 Z=7445.047)
-    "Mountain Ruin Inside Red Egg" : base_id + 1605, # Mine3_EggPickup Mine3_Interior2 (X=-28254.400 Y=-45702.844 Z=7551.568)
-    "Mountain Ruin Inside Red Paint Can" : base_id + 1606 # PaintCan_2 Mine3_Interior2 (X=-31391.293 Y=-44953.223 Z=7448.648) \!/ Existing match 5
+    "Mountain Ruin Inside Scraps 1": base_id + 1588, # ItemPickup253_5 Mine3_Camp (X=-10647.446 Y=-52039.848 Z=11925.344)
+    "Mountain Ruin Inside Scraps 2": base_id + 1589, # ItemPickup270_2 Mine3_Interior1 (X=-12834.990 Y=-48683.176 Z=10200.083)
+    "Mountain Ruin Inside Scraps 3": base_id + 1590, # ItemPickup271_5 Mine3_Interior1 (X=-15748.594 Y=-44925.523 Z=10199.975)
+    "Mountain Ruin Inside Scraps 4": base_id + 1591, # ItemPickup20_3 Mine3_Interior1 (X=-15312.152 Y=-43957.055 Z=10350.783)
+    "Mountain Ruin Inside Scraps 5": base_id + 1592, # ItemPickup273_11 Mine3_Interior1 (X=-16709.586 Y=-44997.316 Z=10198.888)
+    "Mountain Ruin Inside Scraps 6": base_id + 1593, # ItemPickup272_8 Mine3_Interior1 (X=-17412.561 Y=-46041.977 Z=10349.650)
+    "Mountain Ruin Inside Scraps 7": base_id + 1594, # ItemPickup274_14 Mine3_Interior1 (X=-17452.596 Y=-43804.941 Z=10201.436)
+    "Mountain Ruin Inside Scraps 8": base_id + 1595, # ItemPickup21_2 Mine3_Interior1 (X=-18119.473 Y=-42001.453 Z=10198.855)
+    "Mountain Ruin Inside Scraps 9": base_id + 1596, # ItemPickup276_20 Mine3_Interior1 (X=-18975.068 Y=-42906.488 Z=10279.690)
+    "Mountain Ruin Inside Scraps 10": base_id + 1597, # ItemPickup277_26 Mine3_Interior1 (X=-19727.902 Y=-41581.039 Z=10199.614)
+    "Mountain Ruin Inside Scraps 11": base_id + 1598, # ItemPickup275_17 Mine3_Interior1 (X=-19187.891 Y=-40516.941 Z=10201.049)
+    "Mountain Ruin Inside Scraps 12": base_id + 1599, # ItemPickup278_29 Mine3_Interior1 (X=-22470.986 Y=-41602.875 Z=10073.847)
+    "Mountain Ruin Inside Scraps 13": base_id + 1600, # ItemPickup279_2 Mine3_Interior2 (X=-23717.383 Y=-42597.141 Z=7455.452)
+    "Mountain Ruin Inside Scraps 14": base_id + 1601, # ItemPickup22_7 Mine3_Interior2 (X=-24494.582 Y=-44598.086 Z=7433.633)
+    "Mountain Ruin Inside Scraps 15": base_id + 1602, # ItemPickup280_5 Mine3_Interior2 (X=-26783.293 Y=-42331.145 Z=7446.357)
+    "Mountain Ruin Inside Scraps 16": base_id + 1603, # ItemPickup281_8 Mine3_Interior2 (X=-28636.996 Y=-46745.340 Z=7430.463)
+    "Mountain Ruin Inside Scraps 17": base_id + 1604, # ItemPickup23_1 Mine3_Interior2 (X=-27752.643 Y=-47453.973 Z=7445.047)
+    "Mountain Ruin Inside Red Egg": base_id + 1605, # Mine3_EggPickup Mine3_Interior2 (X=-28254.400 Y=-45702.844 Z=7551.568)
+    "Mountain Ruin Inside Red Paint Can": base_id + 1606 # PaintCan_2 Mine3_Interior2 (X=-31391.293 Y=-44953.223 Z=7448.648) \!/ Existing match 5
 }
 
 loc_pickle_val = {
-    "Pickle Val Scraps 1" : base_id + 1607, # ItemPickup56_2 Pickles_HouseDetails (X=60402.582 Y=25252.434 Z=11151.982)
-    "Pickle Val Scraps 2" : base_id + 1608, # ItemPickup57_5 Pickles_HouseDetails (X=58717.516 Y=24457.180 Z=11343.938)
-    "Pickle Val Scraps 3" : base_id + 1609, # ItemPickup311_14 Pickles_EnvironmentDetails (X=56455.688 Y=22324.875 Z=11655.192)
-    "Pickle Val Scraps 4" : base_id + 1610, # ItemPickup310_11 Pickles_EnvironmentDetails (X=52888.387 Y=22541.955 Z=12428.012)
-    "Pickle Val Scraps 5" : base_id + 1611, # ItemPickup58_2 Pickles_EnvironmentDetails (X=50374.863 Y=22073.027 Z=12591.468)
-    "Pickle Val Scraps 6" : base_id + 1612, # ItemPickup309_8 Pickles_EnvironmentDetails (X=45985.988 Y=23063.826 Z=13043.497)
-    "Pickle Val Scraps 7" : base_id + 1613, # ItemPickup316_27 Pickles_EnvironmentDetails (X=45533.469 Y=24876.168 Z=13015.539)
-    "Pickle Val Scraps 8" : base_id + 1614, # ItemPickup317_30 Pickles_EnvironmentDetails (X=44928.848 Y=30913.396 Z=14273.230)
-    "Pickle Val Scraps 9" : base_id + 1615, # ItemPickup321_42 Pickles_EnvironmentDetails (X=41572.684 Y=37403.539 Z=13527.379)
-    "Pickle Val Scraps 10" : base_id + 1616, # ItemPickup61_11 Pickles_EnvironmentDetails (X=42266.566 Y=30556.238 Z=13584.196)
-    "Pickle Val Scraps 11" : base_id + 1617, # ItemPickup314_21 Pickles_EnvironmentDetails (X=43356.219 Y=29465.746 Z=13449.486)
-    "Pickle Val Scraps 12" : base_id + 1618, # ItemPickup323_48 Pickles_EnvironmentDetails (X=40893.461 Y=30669.398 Z=13465.039)
-    "Pickle Val Scraps 13" : base_id + 1619, # ItemPickup318_33 Pickles_EnvironmentDetails (X=41276.863 Y=32313.068 Z=13480.846)
-    "Pickle Val Scraps 14" : base_id + 1620, # ItemPickup319_36 Pickles_EnvironmentDetails (X=38630.031 Y=30471.996 Z=13571.207)
-    "Pickle Val Scraps 15" : base_id + 1621, # ItemPickup320_39 Pickles_EnvironmentDetails (X=38596.938 Y=30050.293 Z=13559.574)
-    "Pickle Val Scraps 16" : base_id + 1622, # ItemPickup60_8 Pickles_EnvironmentDetails (X=42042.520 Y=25136.820 Z=13077.339)
-    "Pickle Val Scraps 17" : base_id + 1623, # ItemPickup308_5 Pickles_EnvironmentDetails (X=43770.914 Y=23307.234 Z=12374.002)
-    "Pickle Val Scraps 18" : base_id + 1624, # ItemPickup59_5 Pickles_EnvironmentDetails (X=44672.641 Y=20936.520 Z=12198.017)
-    "Pickle Val Scraps 19" : base_id + 1625, # ItemPickup307_2 Pickles_EnvironmentDetails (X=42844.730 Y=22869.387 Z=12832.900)
-    "Pickle Val Scraps 20" : base_id + 1626, # ItemPickup315_24 Pickles_EnvironmentDetails (X=43397.758 Y=26367.248 Z=13005.097)
-    "Pickle Val Scraps 21" : base_id + 1627, # ItemPickup322_45 Pickles_EnvironmentDetails (X=39352.430 Y=32668.316 Z=14494.778)
-    "Pickle Val Scraps 22" : base_id + 1628, # ItemPickup313 Pickles_EnvironmentDetails (X=59688.781 Y=25266.756 Z=11425.324)
-    "Pickle Val Scraps 23" : base_id + 1629, # ItemPickup312_17 Pickles_EnvironmentDetails (X=59197.871 Y=24760.773 Z=11425.324)
-    "Pickle Val Purple Paint Can" : base_id + 1630, # PaintCan_7 Pickles_EnvironmentDetails (X=40394.855 Y=31546.465 Z=13472.573)
-    "Pickle Val Jar of Pickles" : base_id + 1631, # Pickles_Pickup Pickles_Cave (X=38227.535 Y=30234.848 Z=13593.506)
-    "Pickle Val Pickle Lady Mission End" : base_id + 1632 # (dialog 4) -> 30_scraps_reward
+    "Pickle Val Scraps 1": base_id + 1607, # ItemPickup56_2 Pickles_HouseDetails (X=60402.582 Y=25252.434 Z=11151.982)
+    "Pickle Val Scraps 2": base_id + 1608, # ItemPickup57_5 Pickles_HouseDetails (X=58717.516 Y=24457.180 Z=11343.938)
+    "Pickle Val Scraps 3": base_id + 1609, # ItemPickup311_14 Pickles_EnvironmentDetails (X=56455.688 Y=22324.875 Z=11655.192)
+    "Pickle Val Scraps 4": base_id + 1610, # ItemPickup310_11 Pickles_EnvironmentDetails (X=52888.387 Y=22541.955 Z=12428.012)
+    "Pickle Val Scraps 5": base_id + 1611, # ItemPickup58_2 Pickles_EnvironmentDetails (X=50374.863 Y=22073.027 Z=12591.468)
+    "Pickle Val Scraps 6": base_id + 1612, # ItemPickup309_8 Pickles_EnvironmentDetails (X=45985.988 Y=23063.826 Z=13043.497)
+    "Pickle Val Scraps 7": base_id + 1613, # ItemPickup316_27 Pickles_EnvironmentDetails (X=45533.469 Y=24876.168 Z=13015.539)
+    "Pickle Val Scraps 8": base_id + 1614, # ItemPickup317_30 Pickles_EnvironmentDetails (X=44928.848 Y=30913.396 Z=14273.230)
+    "Pickle Val Scraps 9": base_id + 1615, # ItemPickup321_42 Pickles_EnvironmentDetails (X=41572.684 Y=37403.539 Z=13527.379)
+    "Pickle Val Scraps 10": base_id + 1616, # ItemPickup61_11 Pickles_EnvironmentDetails (X=42266.566 Y=30556.238 Z=13584.196)
+    "Pickle Val Scraps 11": base_id + 1617, # ItemPickup314_21 Pickles_EnvironmentDetails (X=43356.219 Y=29465.746 Z=13449.486)
+    "Pickle Val Scraps 12": base_id + 1618, # ItemPickup323_48 Pickles_EnvironmentDetails (X=40893.461 Y=30669.398 Z=13465.039)
+    "Pickle Val Scraps 13": base_id + 1619, # ItemPickup318_33 Pickles_EnvironmentDetails (X=41276.863 Y=32313.068 Z=13480.846)
+    "Pickle Val Scraps 14": base_id + 1620, # ItemPickup319_36 Pickles_EnvironmentDetails (X=38630.031 Y=30471.996 Z=13571.207)
+    "Pickle Val Scraps 15": base_id + 1621, # ItemPickup320_39 Pickles_EnvironmentDetails (X=38596.938 Y=30050.293 Z=13559.574)
+    "Pickle Val Scraps 16": base_id + 1622, # ItemPickup60_8 Pickles_EnvironmentDetails (X=42042.520 Y=25136.820 Z=13077.339)
+    "Pickle Val Scraps 17": base_id + 1623, # ItemPickup308_5 Pickles_EnvironmentDetails (X=43770.914 Y=23307.234 Z=12374.002)
+    "Pickle Val Scraps 18": base_id + 1624, # ItemPickup59_5 Pickles_EnvironmentDetails (X=44672.641 Y=20936.520 Z=12198.017)
+    "Pickle Val Scraps 19": base_id + 1625, # ItemPickup307_2 Pickles_EnvironmentDetails (X=42844.730 Y=22869.387 Z=12832.900)
+    "Pickle Val Scraps 20": base_id + 1626, # ItemPickup315_24 Pickles_EnvironmentDetails (X=43397.758 Y=26367.248 Z=13005.097)
+    "Pickle Val Scraps 21": base_id + 1627, # ItemPickup322_45 Pickles_EnvironmentDetails (X=39352.430 Y=32668.316 Z=14494.778)
+    "Pickle Val Scraps 22": base_id + 1628, # ItemPickup313 Pickles_EnvironmentDetails (X=59688.781 Y=25266.756 Z=11425.324)
+    "Pickle Val Scraps 23": base_id + 1629, # ItemPickup312_17 Pickles_EnvironmentDetails (X=59197.871 Y=24760.773 Z=11425.324)
+    "Pickle Val Purple Paint Can": base_id + 1630, # PaintCan_7 Pickles_EnvironmentDetails (X=40394.855 Y=31546.465 Z=13472.573)
+    "Pickle Val Jar of Pickles": base_id + 1631, # Pickles_Pickup Pickles_Cave (X=38227.535 Y=30234.848 Z=13593.506)
+    "Pickle Val Pickle Lady Mission End": base_id + 1632 # (dialog 4) -> 30_scraps_reward
 }
 
 loc_shrine_near_temple = {
-    "Shrine Near Temple Scraps 1" : base_id + 1633, # ItemPickup3 Photorealistic_Island (X=-4675.183 Y=-21143.846 Z=11984.782)
-    "Shrine Near Temple Scraps 2" : base_id + 1634, # ItemPickup_2 Photorealistic_Island (X=-4994.117 Y=-20496.621 Z=11874.112)
-    "Shrine Near Temple Scraps 3" : base_id + 1635 # ItemPickup2 Photorealistic_Island (X=-4196.896 Y=-20477.025 Z=11882.833)
+    "Shrine Near Temple Scraps 1": base_id + 1633, # ItemPickup3 Photorealistic_Island (X=-4675.183 Y=-21143.846 Z=11984.782)
+    "Shrine Near Temple Scraps 2": base_id + 1634, # ItemPickup_2 Photorealistic_Island (X=-4994.117 Y=-20496.621 Z=11874.112)
+    "Shrine Near Temple Scraps 3": base_id + 1635 # ItemPickup2 Photorealistic_Island (X=-4196.896 Y=-20477.025 Z=11882.833)
 }
 
 loc_morse_bunker = {
-    "Morse Bunker Chest Scraps 1" : base_id + 1636, # ItemPickup6512 Secret6_BunkerDetails (X=-47961.078 Y=-85433.031 Z=10615.777)
-    "Morse Bunker Chest Scraps 2" : base_id + 1637, # ItemPickup9363 Secret6_BunkerDetails (X=-47958.617 Y=-85444.805 Z=10604.365)
-    "Morse Bunker Chest Scraps 3" : base_id + 1638, # ItemPickup921436 Secret6_BunkerDetails (X=-47953.637 Y=-85426.172 Z=10592.347)
-    "Morse Bunker Chest Scraps 4" : base_id + 1639, # ItemPickup0128704 Secret6_BunkerDetails (X=-47958.691 Y=-85444.805 Z=10587.060)
-    "Morse Bunker Chest Scraps 5" : base_id + 1640, # ItemPickup64_8 Secret6_BunkerDetails (X=-47953.617 Y=-85426.172 Z=10574.149)
-    "Morse Bunker Scraps 1" : base_id + 1641, # ItemPickup397_2 Secret6_BunkerDetails (X=-48336.863 Y=-85458.453 Z=10574.537)
-    "Morse Bunker Scraps 2" : base_id + 1642, # ItemPickup62_2 Secret6_BunkerDetails (X=-48253.844 Y=-84944.609 Z=10573.793)
-    "Morse Bunker Scraps 3" : base_id + 1643, # ItemPickup63_5 Secret6_BunkerDetails (X=-47272.422 Y=-84549.945 Z=10543.671)
-    "Morse Bunker Scraps 4" : base_id + 1644, # ItemPickup398_5 Secret6_BunkerDetails (X=-47080.836 Y=-85268.281 Z=10564.355)
-    "Morse Bunker Scraps 5" : base_id + 1645, # ItemPickup406_31 Secret6_BunkerDetails (X=-47913.855 Y=-85234.258 Z=10819.314)
-    "Morse Bunker Scraps 6" : base_id + 1646, # ItemPickup405_28 Secret6_BunkerDetails (X=-46410.227 Y=-83293.742 Z=10361.746)
-    "Morse Bunker Scraps 7" : base_id + 1647, # ItemPickup399_8 Secret6_BunkerDetails (X=-45204.199 Y=-84841.211 Z=10329.200)
-    "Morse Bunker Scraps 8" : base_id + 1648, # ItemPickup401_14 Secret6_BunkerDetails (X=-43895.801 Y=-83794.750 Z=10265.661)
-    "Morse Bunker Scraps 9" : base_id + 1649, # ItemPickup402_17 Secret6_BunkerDetails (X=-45163.078 Y=-80832.828 Z=10090.777)
-    "Morse Bunker Scraps 10" : base_id + 1650, # ItemPickup403_20 Secret6_BunkerDetails (X=-46782.027 Y=-82284.805 Z=10289.180)
-    "Morse Bunker Scraps 11" : base_id + 1651, # ItemPickup404_23 Secret6_BunkerDetails (X=-49240.047 Y=-83654.961 Z=10898.540)
-    "Morse Bunker Scraps 12" : base_id + 1652, # ItemPickup407_34 Secret6_BunkerDetails (X=-46571.930 Y=-85962.773 Z=10697.339)
-    "Morse Bunker Scraps 13" : base_id + 1653 # ItemPickup400_11 Secret6_BunkerDetails (X=-43472.793 Y=-85983.805 Z=10310.322)
+    "Morse Bunker Chest Scraps 1": base_id + 1636, # ItemPickup6512 Secret6_BunkerDetails (X=-47961.078 Y=-85433.031 Z=10615.777)
+    "Morse Bunker Chest Scraps 2": base_id + 1637, # ItemPickup9363 Secret6_BunkerDetails (X=-47958.617 Y=-85444.805 Z=10604.365)
+    "Morse Bunker Chest Scraps 3": base_id + 1638, # ItemPickup921436 Secret6_BunkerDetails (X=-47953.637 Y=-85426.172 Z=10592.347)
+    "Morse Bunker Chest Scraps 4": base_id + 1639, # ItemPickup0128704 Secret6_BunkerDetails (X=-47958.691 Y=-85444.805 Z=10587.060)
+    "Morse Bunker Chest Scraps 5": base_id + 1640, # ItemPickup64_8 Secret6_BunkerDetails (X=-47953.617 Y=-85426.172 Z=10574.149)
+    "Morse Bunker Scraps 1": base_id + 1641, # ItemPickup397_2 Secret6_BunkerDetails (X=-48336.863 Y=-85458.453 Z=10574.537)
+    "Morse Bunker Scraps 2": base_id + 1642, # ItemPickup62_2 Secret6_BunkerDetails (X=-48253.844 Y=-84944.609 Z=10573.793)
+    "Morse Bunker Scraps 3": base_id + 1643, # ItemPickup63_5 Secret6_BunkerDetails (X=-47272.422 Y=-84549.945 Z=10543.671)
+    "Morse Bunker Scraps 4": base_id + 1644, # ItemPickup398_5 Secret6_BunkerDetails (X=-47080.836 Y=-85268.281 Z=10564.355)
+    "Morse Bunker Scraps 5": base_id + 1645, # ItemPickup406_31 Secret6_BunkerDetails (X=-47913.855 Y=-85234.258 Z=10819.314)
+    "Morse Bunker Scraps 6": base_id + 1646, # ItemPickup405_28 Secret6_BunkerDetails (X=-46410.227 Y=-83293.742 Z=10361.746)
+    "Morse Bunker Scraps 7": base_id + 1647, # ItemPickup399_8 Secret6_BunkerDetails (X=-45204.199 Y=-84841.211 Z=10329.200)
+    "Morse Bunker Scraps 8": base_id + 1648, # ItemPickup401_14 Secret6_BunkerDetails (X=-43895.801 Y=-83794.750 Z=10265.661)
+    "Morse Bunker Scraps 9": base_id + 1649, # ItemPickup402_17 Secret6_BunkerDetails (X=-45163.078 Y=-80832.828 Z=10090.777)
+    "Morse Bunker Scraps 10": base_id + 1650, # ItemPickup403_20 Secret6_BunkerDetails (X=-46782.027 Y=-82284.805 Z=10289.180)
+    "Morse Bunker Scraps 11": base_id + 1651, # ItemPickup404_23 Secret6_BunkerDetails (X=-49240.047 Y=-83654.961 Z=10898.540)
+    "Morse Bunker Scraps 12": base_id + 1652, # ItemPickup407_34 Secret6_BunkerDetails (X=-46571.930 Y=-85962.773 Z=10697.339)
+    "Morse Bunker Scraps 13": base_id + 1653 # ItemPickup400_11 Secret6_BunkerDetails (X=-43472.793 Y=-85983.805 Z=10310.322)
 }
 
 loc_prism_temple = {
-    "Prism Temple Chest Scraps 1" : base_id + 1654, # ItemPickup16632 MainShrine_DetailsREPAIRED (X=12659.641 Y=-27827.016 Z=10930.621)
-    "Prism Temple Chest Scraps 2" : base_id + 1655, # ItemPickup148864 MainShrine_DetailsREPAIRED (X=12648.021 Y=-27825.189 Z=10916.296)
-    "Prism Temple Chest Scraps 3" : base_id + 1656, # ItemPickup13123 MainShrine_DetailsREPAIRED (X=12665.557 Y=-27836.633 Z=10905.999)
-    "Prism Temple Scraps 1" : base_id + 1657, # ItemPickup225_77 MainShrine_ExteriorDetails (X=5281.087 Y=-16620.387 Z=10520.609)
-    "Prism Temple Scraps 2" : base_id + 1658, # ItemPickup223_71 MainShrine_ExteriorDetails (X=15032.147 Y=-16788.352 Z=10992.200)
-    "Prism Temple Scraps 3" : base_id + 1659, # ItemPickup222_68 MainShrine_ExteriorDetails (X=16591.920 Y=-18725.771 Z=11004.751)
-    "Prism Temple Scraps 4" : base_id + 1660, # ItemPickup135123 MainShrine_DetailsREPAIRED (X=17940.854 Y=-20726.746 Z=10999.944)
-    "Prism Temple Scraps 5" : base_id + 1661, # ItemPickup220_62 MainShrine_ExteriorDetails (X=18187.346 Y=-21390.066 Z=11025.650)
-    "Prism Temple Scraps 6" : base_id + 1662, # ItemPickup218_56 MainShrine_ExteriorDetails (X=19218.670 Y=-24017.619 Z=10906.966)
-    "Prism Temple Scraps 7" : base_id + 1663, # ItemPickup209_29 MainShrine_ExteriorDetails (X=7710.977 Y=-23469.254 Z=11012.888)
-    "Prism Temple Scraps 8" : base_id + 1664, # ItemPickup138765 MainShrine_DetailsREPAIRED (X=8160.002 Y=-22335.266 Z=11016.638)
-    "Prism Temple Scraps 9" : base_id + 1665, # ItemPickup210_32 MainShrine_ExteriorDetails (X=8637.903 Y=-24295.850 Z=10929.299)
-    "Prism Temple Scraps 10" : base_id + 1666, # ItemPickup1112 MainShrine_DetailsREPAIRED (X=7923.367 Y=-25204.055 Z=10832.877)
-    "Prism Temple Scraps 11" : base_id + 1667, # ItemPickup214_44 MainShrine_ExteriorDetails (X=10694.420 Y=-27246.365 Z=10569.074)
-    "Prism Temple Scraps 12" : base_id + 1668, # ItemPickup215_47 MainShrine_ExteriorDetails (X=12892.631 Y=-26743.068 Z=10868.578)
-    "Prism Temple Scraps 13" : base_id + 1669, # ItemPickup213_41 MainShrine_ExteriorDetails (X=12483.535 Y=-27253.867 Z=10876.461)
-    "Prism Temple Scraps 14" : base_id + 1670, # ItemPickup212_38 MainShrine_ExteriorDetails (X=13259.813 Y=-27092.033 Z=10887.968)
-    "Prism Temple Scraps 15" : base_id + 1671, # ItemPickup211_35 MainShrine_ExteriorDetails (X=9303.245 Y=-25057.908 Z=10943.273)
-    "Prism Temple Scraps 16" : base_id + 1672, # ItemPickup201_2 MainShrine_ExteriorDetails (X=11750.875 Y=-22999.371 Z=12426.734)
-    "Prism Temple Scraps 17" : base_id + 1673, # ItemPickup203_8 MainShrine_ExteriorDetails (X=12966.615 Y=-23568.324 Z=12519.387)
-    "Prism Temple Scraps 18" : base_id + 1674, # ItemPickup204_11 MainShrine_ExteriorDetails (X=14093.343 Y=-22393.182 Z=12426.847)
-    "Prism Temple Scraps 19" : base_id + 1675, # ItemPickup206_17 MainShrine_ExteriorDetails (X=13767.980 Y=-21269.568 Z=12425.791)
-    "Prism Temple Scraps 20" : base_id + 1676, # ItemPickup207_23 MainShrine_ExteriorDetails (X=12882.754 Y=-20027.527 Z=12516.095)
-    "Prism Temple Scraps 21" : base_id + 1677, # ItemPickup114535 MainShrine_DetailsREPAIRED (X=11883.399 Y=-20801.344 Z=12428.452)
-    "Prism Temple Scraps 22" : base_id + 1678, # ItemPickup208_26 MainShrine_ExteriorDetails (X=13281.792 Y=-21302.344 Z=12902.728)
-    "Prism Temple Scraps 23" : base_id + 1679, # ItemPickup205_14 MainShrine_ExteriorDetails (X=14190.678 Y=-23671.621 Z=11781.533)
-    "Prism Temple Scraps 24" : base_id + 1680, # ItemPickup8903 MainShrine_DetailsREPAIRED (X=14311.736 Y=-22347.758 Z=11765.781)
-    "Prism Temple Scraps 25" : base_id + 1681, # ItemPickup654 MainShrine_DetailsREPAIRED (X=13826.154 Y=-19923.131 Z=11755.189)
-    "Prism Temple Scraps 26" : base_id + 1682, # ItemPickup224_74 MainShrine_ExteriorDetails (X=12443.228 Y=-18577.926 Z=11240.455)
-    "Prism Temple Scraps 27" : base_id + 1683, # ItemPickup202_5 MainShrine_ExteriorDetails (X=10993.180 Y=-23783.047 Z=11754.121)
-    "Prism Temple Scraps 28" : base_id + 1684, # ItemPickup13098 MainShrine_DetailsREPAIRED (X=16762.963 Y=-23634.342 Z=11031.588)
-    "Prism Temple Scraps 29" : base_id + 1685, # ItemPickup221_65 MainShrine_ExteriorDetails (X=17804.979 Y=-23512.395 Z=11066.884)
-    "Prism Temple Scraps 30" : base_id + 1686, # ItemPickup17123123565 MainShrine_DetailsREPAIRED (X=16998.229 Y=-23241.652 Z=11055.539)
-    "Prism Temple Scraps 31" : base_id + 1687, # ItemPickup10812783 MainShrine_DetailsREPAIRED (X=17613.518 Y=-23799.813 Z=11057.277)
-    "Prism Temple Scraps 32" : base_id + 1688, # ItemPickup216_50 MainShrine_ExteriorDetails (X=15342.375 Y=-24807.357 Z=11024.192)
-    "Prism Temple Scraps 33" : base_id + 1689, # ItemPickup217_53 MainShrine_ExteriorDetails (X=15963.284 Y=-24834.156 Z=11021.444)
-    "Prism Temple Scraps 34" : base_id + 1690 # ItemPickup219_59 MainShrine_ExteriorDetails (X=21563.559 Y=-23705.184 Z=10895.696)
-}
-
-
-## All locations
+    "Prism Temple Chest Scraps 1": base_id + 1654, # ItemPickup16632 MainShrine_DetailsREPAIRED (X=12659.641 Y=-27827.016 Z=10930.621)
+    "Prism Temple Chest Scraps 2": base_id + 1655, # ItemPickup148864 MainShrine_DetailsREPAIRED (X=12648.021 Y=-27825.189 Z=10916.296)
+    "Prism Temple Chest Scraps 3": base_id + 1656, # ItemPickup13123 MainShrine_DetailsREPAIRED (X=12665.557 Y=-27836.633 Z=10905.999)
+    "Prism Temple Scraps 1": base_id + 1657, # ItemPickup225_77 MainShrine_ExteriorDetails (X=5281.087 Y=-16620.387 Z=10520.609)
+    "Prism Temple Scraps 2": base_id + 1658, # ItemPickup223_71 MainShrine_ExteriorDetails (X=15032.147 Y=-16788.352 Z=10992.200)
+    "Prism Temple Scraps 3": base_id + 1659, # ItemPickup222_68 MainShrine_ExteriorDetails (X=16591.920 Y=-18725.771 Z=11004.751)
+    "Prism Temple Scraps 4": base_id + 1660, # ItemPickup135123 MainShrine_DetailsREPAIRED (X=17940.854 Y=-20726.746 Z=10999.944)
+    "Prism Temple Scraps 5": base_id + 1661, # ItemPickup220_62 MainShrine_ExteriorDetails (X=18187.346 Y=-21390.066 Z=11025.650)
+    "Prism Temple Scraps 6": base_id + 1662, # ItemPickup218_56 MainShrine_ExteriorDetails (X=19218.670 Y=-24017.619 Z=10906.966)
+    "Prism Temple Scraps 7": base_id + 1663, # ItemPickup209_29 MainShrine_ExteriorDetails (X=7710.977 Y=-23469.254 Z=11012.888)
+    "Prism Temple Scraps 8": base_id + 1664, # ItemPickup138765 MainShrine_DetailsREPAIRED (X=8160.002 Y=-22335.266 Z=11016.638)
+    "Prism Temple Scraps 9": base_id + 1665, # ItemPickup210_32 MainShrine_ExteriorDetails (X=8637.903 Y=-24295.850 Z=10929.299)
+    "Prism Temple Scraps 10": base_id + 1666, # ItemPickup1112 MainShrine_DetailsREPAIRED (X=7923.367 Y=-25204.055 Z=10832.877)
+    "Prism Temple Scraps 11": base_id + 1667, # ItemPickup214_44 MainShrine_ExteriorDetails (X=10694.420 Y=-27246.365 Z=10569.074)
+    "Prism Temple Scraps 12": base_id + 1668, # ItemPickup215_47 MainShrine_ExteriorDetails (X=12892.631 Y=-26743.068 Z=10868.578)
+    "Prism Temple Scraps 13": base_id + 1669, # ItemPickup213_41 MainShrine_ExteriorDetails (X=12483.535 Y=-27253.867 Z=10876.461)
+    "Prism Temple Scraps 14": base_id + 1670, # ItemPickup212_38 MainShrine_ExteriorDetails (X=13259.813 Y=-27092.033 Z=10887.968)
+    "Prism Temple Scraps 15": base_id + 1671, # ItemPickup211_35 MainShrine_ExteriorDetails (X=9303.245 Y=-25057.908 Z=10943.273)
+    "Prism Temple Scraps 16": base_id + 1672, # ItemPickup201_2 MainShrine_ExteriorDetails (X=11750.875 Y=-22999.371 Z=12426.734)
+    "Prism Temple Scraps 17": base_id + 1673, # ItemPickup203_8 MainShrine_ExteriorDetails (X=12966.615 Y=-23568.324 Z=12519.387)
+    "Prism Temple Scraps 18": base_id + 1674, # ItemPickup204_11 MainShrine_ExteriorDetails (X=14093.343 Y=-22393.182 Z=12426.847)
+    "Prism Temple Scraps 19": base_id + 1675, # ItemPickup206_17 MainShrine_ExteriorDetails (X=13767.980 Y=-21269.568 Z=12425.791)
+    "Prism Temple Scraps 20": base_id + 1676, # ItemPickup207_23 MainShrine_ExteriorDetails (X=12882.754 Y=-20027.527 Z=12516.095)
+    "Prism Temple Scraps 21": base_id + 1677, # ItemPickup114535 MainShrine_DetailsREPAIRED (X=11883.399 Y=-20801.344 Z=12428.452)
+    "Prism Temple Scraps 22": base_id + 1678, # ItemPickup208_26 MainShrine_ExteriorDetails (X=13281.792 Y=-21302.344 Z=12902.728)
+    "Prism Temple Scraps 23": base_id + 1679, # ItemPickup205_14 MainShrine_ExteriorDetails (X=14190.678 Y=-23671.621 Z=11781.533)
+    "Prism Temple Scraps 24": base_id + 1680, # ItemPickup8903 MainShrine_DetailsREPAIRED (X=14311.736 Y=-22347.758 Z=11765.781)
+    "Prism Temple Scraps 25": base_id + 1681, # ItemPickup654 MainShrine_DetailsREPAIRED (X=13826.154 Y=-19923.131 Z=11755.189)
+    "Prism Temple Scraps 26": base_id + 1682, # ItemPickup224_74 MainShrine_ExteriorDetails (X=12443.228 Y=-18577.926 Z=11240.455)
+    "Prism Temple Scraps 27": base_id + 1683, # ItemPickup202_5 MainShrine_ExteriorDetails (X=10993.180 Y=-23783.047 Z=11754.121)
+    "Prism Temple Scraps 28": base_id + 1684, # ItemPickup13098 MainShrine_DetailsREPAIRED (X=16762.963 Y=-23634.342 Z=11031.588)
+    "Prism Temple Scraps 29": base_id + 1685, # ItemPickup221_65 MainShrine_ExteriorDetails (X=17804.979 Y=-23512.395 Z=11066.884)
+    "Prism Temple Scraps 30": base_id + 1686, # ItemPickup17123123565 MainShrine_DetailsREPAIRED (X=16998.229 Y=-23241.652 Z=11055.539)
+    "Prism Temple Scraps 31": base_id + 1687, # ItemPickup10812783 MainShrine_DetailsREPAIRED (X=17613.518 Y=-23799.813 Z=11057.277)
+    "Prism Temple Scraps 32": base_id + 1688, # ItemPickup216_50 MainShrine_ExteriorDetails (X=15342.375 Y=-24807.357 Z=11024.192)
+    "Prism Temple Scraps 33": base_id + 1689, # ItemPickup217_53 MainShrine_ExteriorDetails (X=15963.284 Y=-24834.156 Z=11021.444)
+    "Prism Temple Scraps 34": base_id + 1690 # ItemPickup219_59 MainShrine_ExteriorDetails (X=21563.559 Y=-23705.184 Z=10895.696)
+}
+
+
+# All locations
 location_table: dict[str, int] = {
     **loc_start_camp,
     **loc_tony_tiddle_mission,
diff --git a/worlds/cccharles/Regions.py b/worlds/cccharles/Regions.py
index 9e5364678bf3..55702e0a4995 100644
--- a/worlds/cccharles/Regions.py
+++ b/worlds/cccharles/Regions.py
@@ -1,5 +1,5 @@
 from BaseClasses import MultiWorld, Region, ItemClassification
-from . import CCCharlesItem
+from .Items import CCCharlesItem
 from .Options import CCCharlesOptions
 from .Locations import (
     CCCharlesLocation, loc_start_camp, loc_tony_tiddle_mission, loc_barn, loc_candice_mission, \
@@ -16,10 +16,7 @@
 )
 
 
-class CCCharlesRegion(Region):
-    regions = []
-
-def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int):
+def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) -> None:
     menu_region = Region("Menu", player, world, "Aranearum")
     world.regions.append(menu_region)
 
diff --git a/worlds/cccharles/Rules.py b/worlds/cccharles/Rules.py
index 5a7bc3a05727..ace863b7788d 100644
--- a/worlds/cccharles/Rules.py
+++ b/worlds/cccharles/Rules.py
@@ -2,7 +2,7 @@
 from ..generic.Rules import set_rule
 from .Options import CCCharlesOptions
 
-# Go mode : Green Egg + Blue Egg + Ref Egg + Temple Key + Bug Spray (+ Remote Explosive x8 but the base game ignores it)
+# Go mode: Green Egg + Blue Egg + Ref Egg + Temple Key + Bug Spray (+ Remote Explosive x8 but the base game ignores it)
 
 def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None:
     # Tony Tiddle
@@ -108,7 +108,7 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
     # Paul
     set_rule(world.get_location("Museum Paul Mission End", player),
         lambda state: state.has("Remote Explosive x8", player))
-        # lambda state: state.has("Remote Explosive", player, 8)) # TODO : Add an option to split remote explosives
+        # lambda state: state.has("Remote Explosive", player, 8)) # TODO: Add an option to split remote explosives
 
     # West Beach
     set_rule(world.get_location("West Beach Chest Scraps 1", player),
diff --git a/worlds/cccharles/__init__.py b/worlds/cccharles/__init__.py
index e2d602a65cfd..0c5a75b64037 100644
--- a/worlds/cccharles/__init__.py
+++ b/worlds/cccharles/__init__.py
@@ -1,8 +1,8 @@
 from .Items import CCCharlesItem, unique_item_dict, full_item_list, item_groups
-from .Locations import CCCharlesLocation, location_table
+from .Locations import location_table
 from .Options import CCCharlesOptions
 from .Rules import set_rules
-from .Regions import CCCharlesRegion, create_regions
+from .Regions import create_regions
 from BaseClasses import Tutorial, ItemClassification
 from worlds.AutoWorld import World, WebWorld
 
@@ -61,98 +61,98 @@ class CCCharlesWorld(World):
     # Typing hints for all the options we defined
     options: CCCharlesOptions
 
-    topology_present = True  # show path to required location checks in spoiler
+    topology_present = True  # Show path to required location checks in spoiler
 
-    def create_regions(self) -> None :
+    def create_regions(self) -> None:
         create_regions(self.multiworld, self.options, self.player)
 
     def create_item(self, name: str) -> CCCharlesItem:
         item_id = unique_item_dict[name]
 
         match name:
-            case "Scraps" :
+            case "Scraps":
                 classification = ItemClassification.useful
-            case "30 Scraps Reward" :
+            case "30 Scraps Reward":
                 classification = ItemClassification.useful
-            case "25 Scraps Reward" :
+            case "25 Scraps Reward":
                 classification = ItemClassification.useful
-            case "35 Scraps Reward" :
+            case "35 Scraps Reward":
                 classification = ItemClassification.useful
-            case "40 Scraps Reward" :
+            case "40 Scraps Reward":
                 classification = ItemClassification.useful
-            case "South Mine Key" :
+            case "South Mine Key":
                 classification = ItemClassification.progression
-            case "North Mine Key" :
+            case "North Mine Key":
                 classification = ItemClassification.progression
-            case "Mountain Ruin Key" :
+            case "Mountain Ruin Key":
                 classification = ItemClassification.progression
-            case "Barn Key" :
+            case "Barn Key":
                 classification = ItemClassification.progression
-            case "Candice's Key" :
+            case "Candice's Key":
                 classification = ItemClassification.progression
-            case "Dead Fish" :
+            case "Dead Fish":
                 classification = ItemClassification.progression
-            case "Lockpicks" :
+            case "Lockpicks":
                 classification = ItemClassification.progression
-            case "Ancient Tablet" :
+            case "Ancient Tablet":
                 classification = ItemClassification.progression
-            case "Blue Box" :
+            case "Blue Box":
                 classification = ItemClassification.progression
-            case "Page Drawing" :
+            case "Page Drawing":
                 classification = ItemClassification.progression
-            case "Journal" :
+            case "Journal":
                 classification = ItemClassification.progression
-            case "Timed Dynamite" :
+            case "Timed Dynamite":
                 classification = ItemClassification.progression
-            case "Box of Rockets" :
+            case "Box of Rockets":
                 classification = ItemClassification.progression
-            case "Breaker" :
+            case "Breaker":
                 classification = ItemClassification.progression
-            case "Broken Bob" :
+            case "Broken Bob":
                 classification = ItemClassification.progression
-            case "Employment Contracts" :
+            case "Employment Contracts":
                 classification = ItemClassification.progression
-            case "Mob Camp Key" :
+            case "Mob Camp Key":
                 classification = ItemClassification.progression
-            case "Jar of Pickles" :
+            case "Jar of Pickles":
                 classification = ItemClassification.progression
-            case "Orange Paint Can" :
+            case "Orange Paint Can":
                 classification = ItemClassification.filler
-            case "Green Paint Can" :
+            case "Green Paint Can":
                 classification = ItemClassification.filler
-            case "White Paint Can" :
+            case "White Paint Can":
                 classification = ItemClassification.filler
-            case "Pink Paint Can" :
+            case "Pink Paint Can":
                 classification = ItemClassification.filler
-            case "Grey Paint Can" :
+            case "Grey Paint Can":
                 classification = ItemClassification.filler
-            case "Blue Paint Can" :
+            case "Blue Paint Can":
                 classification = ItemClassification.filler
-            case "Black Paint Can" :
+            case "Black Paint Can":
                 classification = ItemClassification.filler
-            case "Lime Paint Can" :
+            case "Lime Paint Can":
                 classification = ItemClassification.filler
-            case "Teal Paint Can" :
+            case "Teal Paint Can":
                 classification = ItemClassification.filler
-            case "Red Paint Can" :
+            case "Red Paint Can":
                 classification = ItemClassification.filler
-            case "Purple Paint Can" :
+            case "Purple Paint Can":
                 classification = ItemClassification.filler
-            case "The Boomer" :
+            case "The Boomer":
                 classification = ItemClassification.filler
-            case "Bob" :
+            case "Bob":
                 classification = ItemClassification.filler
-            case "Green Egg" :
+            case "Green Egg":
                 classification = ItemClassification.progression
-            case "Blue Egg" :
+            case "Blue Egg":
                 classification = ItemClassification.progression
-            case "Red Egg" :
+            case "Red Egg":
                 classification = ItemClassification.progression
-            case "Remote Explosive" :
+            case "Remote Explosive":
                 classification = ItemClassification.progression
-            case "Remote Explosive x8" :
+            case "Remote Explosive x8":
                 classification = ItemClassification.progression
-            case "Temple Key" :
+            case "Temple Key":
                 classification = ItemClassification.progression
             case "Bug spray":
                 classification = ItemClassification.progression
@@ -160,7 +160,7 @@ def create_item(self, name: str) -> CCCharlesItem:
                 classification = ItemClassification.filler
 
         return CCCharlesItem(name, classification, item_id, self.player)
-    
+
     def create_items(self) -> None:
         self.multiworld.itempool += [self.create_item(item) for item in full_item_list]
 
diff --git a/worlds/cccharles/docs/en_Choo-Choo Charles.md b/worlds/cccharles/docs/en_Choo-Choo Charles.md
index 5305a362bd4f..6d8ed39e03ea 100644
--- a/worlds/cccharles/docs/en_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/en_Choo-Choo Charles.md	
@@ -15,7 +15,7 @@ Beating the evil train from Hell named "Charles".
 ## How is the game managed in Nightmare mode?
 At death, the player has to restart a brand-new game, giving him the choice to stay under the Nightmare mode or continuing with the Normal mode if considered too hard.
 In this case, all collected items will be redistributed in the inventory and the missions states will be kept.
-The Deathlink is not implemented yet. When this option will be available, a choice will be provided to :
+The Deathlink is not implemented yet. When this option will be available, a choice will be provided to:
 * Disable the Deathlink
 * Enable the soft Deathlink with respawn at Player Train when a Deathlink event is received
 * Enable the hard Deathlink with removal of the game save when a Deathlink event is received
@@ -30,9 +30,9 @@ The same method is used for hints.
 
 ## Is it possible to use hints in the game?
 No, this is a work in progress.
-The following options will be possible once the implementations are available :
+The following options will be possible once the implementations are available:
 
-At any moment, the player can press one of the following keys to display a console in the game :
+At any moment, the player can press one of the following keys to display a console in the game:
 * "~" or "`" (qwerty)
 * "²" (azerty)
 * "F10"
diff --git a/worlds/cccharles/docs/setup_en.md b/worlds/cccharles/docs/setup_en.md
index 13bd31dc5ee6..ee1e1147589e 100644
--- a/worlds/cccharles/docs/setup_en.md
+++ b/worlds/cccharles/docs/setup_en.md
@@ -10,7 +10,7 @@ This page is a simplified guide of the [Choo-Choo Charles Multiworld Randomizer
 To install the Mod, open the [Choo-Choo Charles Multiworld Randomizer Mod page](https://github.com/lgbarrere/CCCharles-Random) page and follow the steps below.
 
 ### Game Setup
-The releases of this game are currently unofficial. However, the Mod can be installed and played by following these instructions :
+The releases of this game are currently unofficial. However, the Mod can be installed and played by following these instructions:
 1. Click the green "<> Code" button
 2. Click "Download ZIP" and unzip the downloaded archive or clone this project
 3. From this folder, in **Release/**, copy the **Obscure/** folder to **\<GameFolder\>** (where the **Obscure/** folder and **Obscure.exe** are placed)
@@ -34,7 +34,7 @@ See **[Game Setup](setup_en#game-setup)** section to have the **Release/** folde
 
 In this section, **Archipelago/** refers to the path where [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases) is installed locally.
 
-Follow these steps to host a remote multiplayer or a local single-player session :
+Follow these steps to host a remote multiplayer or a local single-player session:
 1. Double-click the **cccharles.apworld** in **Release/** to automatically install the world randomization logic
 2. Put the **CCCharles.yaml** from **Release/** to **Archipelago/Players/** with the YAML of each player to host
 3. Launch the Archipelago launcher and click "Generate" to configure a game with the YAML in **Archipelago/output/**
@@ -49,6 +49,6 @@ For a local single-player session, click "Host" in the Archipelago launcher by u
 * If the player receives the **Box of Rockets**, the bunker at the **Training Explosive** region will be opened once loaded. It may be possible to break the mission state if the player interacts with elements in unexpected order.
 
 ### Minor issues
-* The current version of the command parser does not accept console commands with a player names containing whitespaces. It is recommended to use underscores "_" instead, for instance : CCCharles_Player_1.
+* The current version of the command parser does not accept console commands with a player names containing whitespaces. It is recommended to use underscores "_" instead, for instance: CCCharles_Player_1.
 * Sometimes, an item reception or sending a location can fail (rare cases). Reloading the game is supposed to respawn all items on the ground and restarting a new game retrieves all unlocked items from Archipelago, that can be used as workarounds.
 * When an egg is received, if the player goes to one of the three mine exits before talking to the NPC who gives its entrance key, the player will no longer be able to interact with this NPC. Make sure to talk to them before approaching their respective mines. Restart a new game otherwise.
diff --git a/worlds/cccharles/test/TestAccess.py b/worlds/cccharles/test/TestAccess.py
index 4ef816f81e8e..b512e09b1463 100644
--- a/worlds/cccharles/test/TestAccess.py
+++ b/worlds/cccharles/test/TestAccess.py
@@ -2,8 +2,6 @@
 
 
 class TestAccess(CCCharlesTestBase):
-    game = "Choo-Choo Charles"
-
     def test_claire_breakers(self) -> None:
         """Test locations that require 4 Breakers"""
         locations = ["Lighthouse Claire Mission End"]

From 12cd39df22850931d38e4368adb77b8d0818d8f1 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Tue, 26 Aug 2025 17:32:41 +0200
Subject: [PATCH 10/23] Update the guides according to releases

> Updated the depreciated guides because the may to release the Mod has been changed
> Removed the fixed issues from 'Known Issues'
> Add the "Mod Download" section to simplify the others sections.
---
 worlds/cccharles/docs/setup_en.md | 28 +++++++++++++---------------
 worlds/cccharles/docs/setup_fr.md | 28 +++++++++++++---------------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/worlds/cccharles/docs/setup_en.md b/worlds/cccharles/docs/setup_en.md
index ee1e1147589e..8df0188c031b 100644
--- a/worlds/cccharles/docs/setup_en.md
+++ b/worlds/cccharles/docs/setup_en.md
@@ -7,16 +7,16 @@ This page is a simplified guide of the [Choo-Choo Charles Multiworld Randomizer
 * A legal copy of the Choo-Choo Charles original game (can be found on [Steam](https://store.steampowered.com/app/1766740/ChooChoo_Charles/))
 
 ## Mod Installation for playing
-To install the Mod, open the [Choo-Choo Charles Multiworld Randomizer Mod page](https://github.com/lgbarrere/CCCharles-Random) page and follow the steps below.
+### Mod Download
+All the required files of the Mod can be found in the [Releases](https://github.com/lgbarrere/CCCharles-Random/releases).
+To use the Mod, download and unzip **CCCharles_Random.zip** somewhere safe, then follow the instructions in the next sections of this guide. This archive contains:
+* The **Obscure/** folder loading the Mod itself, it runs the code handling all the randomized elements
+* The **cccharles.apworld** file containing the randomization logic, used by the host to generate a random seed with the others games
 
 ### Game Setup
-The releases of this game are currently unofficial. However, the Mod can be installed and played by following these instructions:
-1. Click the green "<> Code" button
-2. Click "Download ZIP" and unzip the downloaded archive or clone this project
-3. From this folder, in **Release/**, copy the **Obscure/** folder to **\<GameFolder\>** (where the **Obscure/** folder and **Obscure.exe** are placed)
-4. Launch the game, if "OFFLINE" is written in the upper-right corner of the screen, the Mod is working
-
-The content from the **Release/** folder can be manually placed while the paths to files are respected.
+The Mod can be installed and played by following these steps (see the [Mod Download](setup_en#mod-download) section to get **CCCharles_Random.zip**):
+1. Copy the **Obscure/** folder from **CCCharles_Random.zip** to **\<GameFolder\>** (where the **Obscure/** folder and **Obscure.exe** are placed)
+2. Launch the game, if "OFFLINE" is visible in the upper-right corner of the screen, the Mod is working
 
 ### Create a Config (.yaml) File
 The purpose of a YAML file is described in the [Basic Multiworld Setup Guide](https://archipelago.gg/tutorial/Archipelago/setup/en#generating-a-game).
@@ -30,14 +30,14 @@ Before playing, it is highly recommended to check out the **[Known Issues](setup
 * Disconnection is automatic at game closure but can be manually done with ``/disconnect``
 
 ## Hosting a MultiWorld or Single-Player Game
-See **[Game Setup](setup_en#game-setup)** section to have the **Release/** folder downloaded.
+See the [Mod Download](setup_en#mod-download) section to get the **cccharles.apworld** file.
 
 In this section, **Archipelago/** refers to the path where [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases) is installed locally.
 
 Follow these steps to host a remote multiplayer or a local single-player session:
-1. Double-click the **cccharles.apworld** in **Release/** to automatically install the world randomization logic
-2. Put the **CCCharles.yaml** from **Release/** to **Archipelago/Players/** with the YAML of each player to host
-3. Launch the Archipelago launcher and click "Generate" to configure a game with the YAML in **Archipelago/output/**
+1. Double-click the **cccharles.apworld** to automatically install the world randomization logic
+2. Put the **CCCharles.yaml** to **Archipelago/Players/** with the YAML of each player to host
+3. Launch the Archipelago launcher and click "Generate" to configure a game with the YAMLs in **Archipelago/output/**
 4. For a multiplayer session, go to the [Archipelago HOST GAME page](https://archipelago.gg/uploads)
 5. Click "Upload File" and select the generated **AP_\<seed\>.zip** in **Archipelago/output/**
 6. Send the generated room page to each player
@@ -46,9 +46,7 @@ For a local single-player session, click "Host" in the Archipelago launcher by u
 
 ## Known Issues
 ### Major issues
-* If the player receives the **Box of Rockets**, the bunker at the **Training Explosive** region will be opened once loaded. It may be possible to break the mission state if the player interacts with elements in unexpected order.
+No major issue found.
 
 ### Minor issues
 * The current version of the command parser does not accept console commands with a player names containing whitespaces. It is recommended to use underscores "_" instead, for instance: CCCharles_Player_1.
-* Sometimes, an item reception or sending a location can fail (rare cases). Reloading the game is supposed to respawn all items on the ground and restarting a new game retrieves all unlocked items from Archipelago, that can be used as workarounds.
-* When an egg is received, if the player goes to one of the three mine exits before talking to the NPC who gives its entrance key, the player will no longer be able to interact with this NPC. Make sure to talk to them before approaching their respective mines. Restart a new game otherwise.
diff --git a/worlds/cccharles/docs/setup_fr.md b/worlds/cccharles/docs/setup_fr.md
index 0f46d9258930..11cfd38a1ec4 100644
--- a/worlds/cccharles/docs/setup_fr.md
+++ b/worlds/cccharles/docs/setup_fr.md
@@ -7,16 +7,16 @@ Cette page est un guide simplifié de la [page du Mod Randomiseur Multiworld de
 * Une copie légale du jeu original Choo-Choo Charles (peut être trouvé sur [Steam](https://store.steampowered.com/app/1766740/ChooChoo_Charles/)
 
 ## Installation du Mod pour jouer
-Pour installer le Mod, ouvrir la [page du Mod Randomiseur Multiworld de Choo-Choo Charles](https://github.com/lgbarrere/CCCharles-Random) et suivre les étapes ci-dessous.
+### Téléchargement du Mod
+Tous les fichiers nécessaires du Mod se trouvent dans les [Releases](https://github.com/lgbarrere/CCCharles-Random/releases).
+Pour utiliser le Mod, télécharger et désarchiver **CCCharles_Random.zip** à un endroit sûr, puis suivre les instructions dans les sections suivantes de ce guide. Cette archive contient:
+* Le dossier **Obscure/** qui charge le Mod lui-même, il lance le code qui gère tous les éléments randomisés
+* Le fichier **cccharles.apworld** qui contient la logique de randomisation, utilisé par l'hôte pour générer une graine aléatoire avec les autres jeux
 
 ### Préparation du Jeu
-Les sorties de ce jeu ne sont actuellement pas officielles. Cependant, le Mod peut être installé et joué en suivant ces instructions :
-1. Cliquer sur le bouton vert "<> Code"
-2. Cliquer "Download ZIP" et désarchiver l'archive téléchargée ou cloner ce projet
-3. Depuis ce dossier, dans **Release/**, copier le dossier **Obscure/** dans **\<DossierDuJeu\>** (où se situent le dossier **Obscure/** et **Obscure.exe**)
-4. Lancer le jeu, si "OFFLINE" est marqué dans le coin en haut à droite de l'écran, le Mod est actif
-
-Le contenu du dossier **Release/** peut être placé manuellement tant que les chemins des fichiers sont respectés.
+Le Mod peut être installé et joué en suivant les étapes suivantes (voir la section [Téléchargement du Mod](setup_fr#téléchargement-du-mod) pour récupérer **CCCharles_Random.zip**) :
+1. Copier le dossier **Obscure/** de **CCCharles_Random.zip** vers **\<GameFolder\>** (où se situent le dossier **Obscure/** et **Obscure.exe**)
+2. Lancer le jeu, si "OFFLINE" est visible dans le coin en haut à droite de l'écran, le Mod est actif
 
 ### Créer un Fichier de Configuration (.yaml)
 L'objectif d'un fichier YAML est décrit dans le [Guide d'Installation Basique du Multiworld](https://archipelago.gg/tutorial/Archipelago/setup/en#generating-a-game) (en anglais).
@@ -30,14 +30,14 @@ Avant de jouer, il est fortement recommandé de consulter la section **[Problèm
 * La déconnexion est automatique à la fermeture du jeu mais peut être faite manuellement avec ``/disconnect``
 
 ## Héberger une partie MultiWorld ou un Seul Joueur
-Voir la section **[Préparation du Jeu](setup_fr#pr%C3%A9paration-du-jeu)** pour télécharger le dossier **Release/**.
+Voir la section [Téléchargement du Mod](setup_fr#téléchargement-du-mod) pour récupérer le fichier **cccharles.apworld**.
 
 Dans cette section, **Archipelago/** fait référence au chemin d'accès où [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases) est installé localement.
 
 Suivre ces étapes pour héberger une session multijoueur à distance ou locale pour un seul joueur :
-1. Double-cliquer sur **cccharles.apworld** dans **Release/** pour installer automatiquement la logique de randomisation du monde
-2. Copier **CCCharles.yaml** depuis **Release/** vers **Archipelago/Players/** avec le YAML de chaque joueur à héberger
-3. Exécuter le lanceur Archipelago et cliquer sur "Generate" pour configurer une partie avec le YAML dans **Archipelago/output/**
+1. Double-cliquer sur **cccharles.apworld** pour installer automatiquement la logique de randomisation du monde
+2. Placer le **CCCharles.yaml** dans **Archipelago/Players/** avec le YAML de chaque joueur à héberger
+3. Exécuter le lanceur Archipelago et cliquer sur "Generate" pour configurer une partie avec les YAML dans **Archipelago/output/**
 4. Pour une session multijoueur, aller à la [page Archipelago HOST GAME](https://archipelago.gg/uploads)
 5. Cliquer sur "Upload File" et selectionner le **AP_\<seed\>.zip** généré dans **Archipelago/output/**
 6. Envoyer la page de la partie générée à chaque joueur
@@ -46,9 +46,7 @@ Pour une session locale à un seul joueur, cliquer sur "Host" dans le lanceur Ar
 
 ## Problèmes Connus
 ### Problèmes majeurs
-* Si le joueur reçoit la **Box of Rockets**, le bunker de la région **Training Explosive** sera ouvert une fois la zone chargée. Il peut être possible de casser l'état de la mission si le joueur interagit avec des éléments dans un ordre inattendu.
+Aucun problème majeur trouvé.
 
 ### Problèmes mineurs
 * La version actuelle de l'analyseur de commandes n'accepte pas des commandes de la console dont le nom du joueur contient des espaces. Il est recommandé d'utiliser des soulignés "_" à la place, par exemple : CCCharles_Player_1.
-* Parfois, la réception d'un objet ou l'envoie d'un emplacement peut échouer (cas rares). Recharger le jeu est supposé faire réapparaître tous les objets au sol et relancer une nouvelle partie récupère tous les objets débloqués sur Archipelago, ceci peut être utilisé comme solution de contournement.
-* Quand un oeuf est reçu, si le joueur va vers l'une des trois sorties de mines avant de parler au PNJ qui en donne la clef d'entrée, le joueur ne sera plus capable d'interagir avec le PNJ. Il faut s'assurer de leur parler avant de s'approcher de leur mine respective. Recommencer une nouvelle partie si cela se produit.

From 1dad35d106ae0f37b7b8d1df7241e325c1ff7f9c Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Tue, 26 Aug 2025 20:53:35 +0200
Subject: [PATCH 11/23] Handled PR remark

> base_id reduced to ensure it fits to signed int (32 bits) in case of future AP improvements
---
 worlds/cccharles/BaseID.py        | 2 +-
 worlds/cccharles/docs/setup_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/cccharles/BaseID.py b/worlds/cccharles/BaseID.py
index d8b609e5308f..ab88fb7a0608 100644
--- a/worlds/cccharles/BaseID.py
+++ b/worlds/cccharles/BaseID.py
@@ -1,2 +1,2 @@
 # CCCharles base ID
-base_id = 6660000000
+base_id = 66600000
diff --git a/worlds/cccharles/docs/setup_fr.md b/worlds/cccharles/docs/setup_fr.md
index 11cfd38a1ec4..386ec02587c6 100644
--- a/worlds/cccharles/docs/setup_fr.md
+++ b/worlds/cccharles/docs/setup_fr.md
@@ -9,7 +9,7 @@ Cette page est un guide simplifié de la [page du Mod Randomiseur Multiworld de
 ## Installation du Mod pour jouer
 ### Téléchargement du Mod
 Tous les fichiers nécessaires du Mod se trouvent dans les [Releases](https://github.com/lgbarrere/CCCharles-Random/releases).
-Pour utiliser le Mod, télécharger et désarchiver **CCCharles_Random.zip** à un endroit sûr, puis suivre les instructions dans les sections suivantes de ce guide. Cette archive contient:
+Pour utiliser le Mod, télécharger et désarchiver **CCCharles_Random.zip** à un endroit sûr, puis suivre les instructions dans les sections suivantes de ce guide. Cette archive contient :
 * Le dossier **Obscure/** qui charge le Mod lui-même, il lance le code qui gère tous les éléments randomisés
 * Le fichier **cccharles.apworld** qui contient la logique de randomisation, utilisé par l'hôte pour générer une graine aléatoire avec les autres jeux
 

From 5ea8a5f7b36ec8ad1be65ac5f3d88855129a01c2 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Sun, 7 Sep 2025 16:09:26 +0200
Subject: [PATCH 12/23] Handled PR remarks

> Set topology_present to False because unnecessary
> Added an exception in case of unknown item instead of using filler classification
> Fixed an issue that caused the "Bug Spray" to be considered as filler
> Reworked the test_claire_breakers() test to ensure the lighthouse mission can only be finished if at least 4 breakers are collected
---
 worlds/cccharles/__init__.py        |  6 +++---
 worlds/cccharles/test/TestAccess.py | 25 +++++++++++++++++++++----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/worlds/cccharles/__init__.py b/worlds/cccharles/__init__.py
index 0c5a75b64037..6d40c0172d66 100644
--- a/worlds/cccharles/__init__.py
+++ b/worlds/cccharles/__init__.py
@@ -61,7 +61,7 @@ class CCCharlesWorld(World):
     # Typing hints for all the options we defined
     options: CCCharlesOptions
 
-    topology_present = True  # Show path to required location checks in spoiler
+    topology_present = False # Hide path to required location checks in spoiler
 
     def create_regions(self) -> None:
         create_regions(self.multiworld, self.options, self.player)
@@ -154,10 +154,10 @@ def create_item(self, name: str) -> CCCharlesItem:
                 classification = ItemClassification.progression
             case "Temple Key":
                 classification = ItemClassification.progression
-            case "Bug spray":
+            case "Bug Spray":
                 classification = ItemClassification.progression
             case _: # Should not occur
-                classification = ItemClassification.filler
+                raise Exception("Unexpected case met: classification cannot be set for unknown item \"" + name + "\"")
 
         return CCCharlesItem(name, classification, item_id, self.player)
 
diff --git a/worlds/cccharles/test/TestAccess.py b/worlds/cccharles/test/TestAccess.py
index b512e09b1463..d088457c7a60 100644
--- a/worlds/cccharles/test/TestAccess.py
+++ b/worlds/cccharles/test/TestAccess.py
@@ -1,10 +1,27 @@
+from BaseClasses import CollectionState
 from .bases import CCCharlesTestBase
 
 
 class TestAccess(CCCharlesTestBase):
     def test_claire_breakers(self) -> None:
         """Test locations that require 4 Breakers"""
-        locations = ["Lighthouse Claire Mission End"]
-        items = [["Breaker"] * 4]
-        # Test locations cannot be accessed without 4 "Breaker", but can be accessed once obtained
-        self.assertAccessDependency(locations, items)
+        lighthouse_claire_mission_end = self.world.get_location("Lighthouse Claire Mission End")
+
+        state = CollectionState(self.multiworld)
+        self.collect_all_but("Breaker")
+
+        breakers_in_pool = self.get_items_by_name("Breaker")
+        self.assertGreaterEqual(len(breakers_in_pool), 4) # Check at least 4 Breakers are in the item pool
+
+        for breaker in breakers_in_pool[:3]:
+            state.collect(breaker) # Collect 3 Breakers into state
+        self.assertFalse(
+            lighthouse_claire_mission_end.can_reach(state),
+            "Lighthouse Claire Mission End should not be reachable with only three Breakers"
+        )
+
+        state.collect(breakers_in_pool[3]) # Collect 4th breaker into state
+        self.assertTrue(
+            lighthouse_claire_mission_end.can_reach(state),
+            "Lighthouse Claire Mission End should have been reachable with four Breakers"
+        )

From aa6d5eb182be5ad66ed049c37036367c396c518a Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Sun, 7 Sep 2025 16:31:14 +0200
Subject: [PATCH 13/23] Added Choo-Choo Charles to README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0431049b849c..fa87190565dd 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ Currently, the following games are supported:
 * shapez
 * Paint
 * Celeste (Open World)
+* Choo-Choo Charles
 
 For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/).
 Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled

From b3abd95c13c1d4d3bcee1f9bf1bb0b1c77834d84 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Sun, 7 Sep 2025 23:26:17 +0200
Subject: [PATCH 14/23] CCCharles: Added rules to win

> The victory could be accessed from sphere 1, this is now fixed by adding the following items as requirements:
- Temple Key
- Green Egg
- Blue Egg
- Red Egg
---
 worlds/cccharles/Regions.py |  9 ++++-----
 worlds/cccharles/Rules.py   | 21 +++++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/worlds/cccharles/Regions.py b/worlds/cccharles/Regions.py
index 55702e0a4995..422301453c4e 100644
--- a/worlds/cccharles/Regions.py
+++ b/worlds/cccharles/Regions.py
@@ -224,11 +224,10 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     morse_bunker_region.add_locations(loc_morse_bunker, CCCharlesLocation)
     world.regions.append(morse_bunker_region)
 
-    # Include Victory event
-    loc_final_boss = CCCharlesLocation(player, "Final Boss", None, menu_region)
+    # Place "Victory" event at "Final Boss" location
+    loc_final_boss = CCCharlesLocation(player, "Final Boss", None, prism_temple_region)
     loc_final_boss.place_locked_item(CCCharlesItem("Victory", ItemClassification.progression, None, player))
-
-    menu_region.locations.append(loc_final_boss)
+    prism_temple_region.locations.append(loc_final_boss)
 
     # Connect the Regions by named Entrances that must have access Rules
     menu_region.connect(start_camp_region)
@@ -280,7 +279,7 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     menu_region.connect(mine_shaft_region)
     menu_region.connect(mob_camp_region)
     menu_region.connect(mob_camp_locked_room_region)
-    mob_camp_region.connect(mob_camp_locked_room_region, 'Mob Camp Locked Door')
+    mob_camp_region.connect(mob_camp_locked_room_region, "Mob Camp Locked Door")
     menu_region.connect(mine_elevator_exit_region)
     menu_region.connect(mountain_ruin_outside_region)
     menu_region.connect(mountain_ruin_inside_region)
diff --git a/worlds/cccharles/Rules.py b/worlds/cccharles/Rules.py
index ace863b7788d..979aacd5294b 100644
--- a/worlds/cccharles/Rules.py
+++ b/worlds/cccharles/Rules.py
@@ -2,7 +2,7 @@
 from ..generic.Rules import set_rule
 from .Options import CCCharlesOptions
 
-# Go mode: Green Egg + Blue Egg + Ref Egg + Temple Key + Bug Spray (+ Remote Explosive x8 but the base game ignores it)
+# Go mode: Green Egg + Blue Egg + Red Egg + Temple Key + Bug Spray (+ Remote Explosive x8 but the base game ignores it)
 
 def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None:
     # Tony Tiddle
@@ -33,9 +33,9 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
     set_rule(world.get_location("South House Chest Scraps 4", player),
         lambda state: state.has("Lockpicks", player))
     set_rule(world.get_location("South House Chest Scraps 5", player),
-         lambda state: state.has("Lockpicks", player))
+        lambda state: state.has("Lockpicks", player))
     set_rule(world.get_location("South House Chest Scraps 6", player),
-         lambda state: state.has("Lockpicks", player))
+        lambda state: state.has("Lockpicks", player))
 
     # South Mine
     set_rule(world.get_entrance("South Mine Gate", player),
@@ -54,7 +54,7 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
 
     # Sasha
     set_rule(world.get_location("Haunted House Sasha Mission End", player),
-            lambda state: state.has("Page Drawing", player, 8))
+        lambda state: state.has("Page Drawing", player, 8))
 
     # Santiago
     set_rule(world.get_location("Port Santiago Mission End", player),
@@ -92,7 +92,7 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
 
     # John Smith
     set_rule(world.get_location("Workshop John Smith Mission End", player),
-         lambda state: state.has("Box of Rockets", player))
+        lambda state: state.has("Box of Rockets", player))
 
     # Claire
     set_rule(world.get_location("Lighthouse Claire Mission End", player),
@@ -175,7 +175,7 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
 
     # Mountain Ruin
     set_rule(world.get_entrance("Mountain Ruin Gate", player),
-             lambda state: state.has("Mountain Ruin Key", player))
+        lambda state: state.has("Mountain Ruin Key", player))
 
     set_rule(world.get_location("Mountain Ruin Inside Red Paint Can", player),
         lambda state: state.has("Lockpicks", player))
@@ -192,7 +192,7 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
     set_rule(world.get_location("Pickle Val Jar of Pickles", player),
         lambda state: state.has("Lockpicks", player))
     set_rule(world.get_location("Pickle Val Pickle Lady Mission End", player),
-         lambda state: state.has("Jar of Pickles", player))
+        lambda state: state.has("Jar of Pickles", player))
 
     # Morse Bunker
     set_rule(world.get_location("Morse Bunker Chest Scraps 1", player),
@@ -206,5 +206,10 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
     set_rule(world.get_location("Morse Bunker Chest Scraps 5", player),
         lambda state: state.has("Lockpicks", player))
 
-    # Place "Victory" at "Final Boss" and set collection as win condition
+    # Add rules to reach the "Go mode"
+    set_rule(world.get_location("Final Boss", player),
+        lambda state: state.has("Temple Key", player)
+            and state.has("Green Egg", player)
+            and state.has("Blue Egg", player)
+            and state.has("Red Egg", player))
     world.completion_condition[player] = lambda state: state.has("Victory", player)

From bd51888ff15bf4b25a3105f4e20a30b9c857f9fa Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Fri, 12 Sep 2025 12:21:04 +0200
Subject: [PATCH 15/23] CCCharles: Fixed cyclic Entrances connections

---
 worlds/cccharles/Regions.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/worlds/cccharles/Regions.py b/worlds/cccharles/Regions.py
index 422301453c4e..68239dc060f1 100644
--- a/worlds/cccharles/Regions.py
+++ b/worlds/cccharles/Regions.py
@@ -232,11 +232,9 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     # Connect the Regions by named Entrances that must have access Rules
     menu_region.connect(start_camp_region)
     menu_region.connect(tony_tiddle_mission_region)
-    menu_region.connect(barn_region)
-    tony_tiddle_mission_region.connect(barn_region, "Barn Door")
+    menu_region.connect(barn_region, "Barn Door")
     menu_region.connect(candice_mission_region)
-    menu_region.connect(tutorial_house_region)
-    candice_mission_region.connect(tutorial_house_region, "Tutorial House Door")
+    menu_region.connect(tutorial_house_region, "Tutorial House Door")
     menu_region.connect(swamp_edges_region)
     menu_region.connect(swamp_mission_region)
     menu_region.connect(junkyard_area_region)
@@ -244,7 +242,6 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     menu_region.connect(junkyard_shed_region)
     menu_region.connect(military_base_region)
     menu_region.connect(south_mine_outside_region)
-    menu_region.connect(south_mine_inside_region)
     south_mine_outside_region.connect(south_mine_inside_region, "South Mine Gate")
     menu_region.connect(middle_station_region)
     menu_region.connect(canyon_region)
@@ -258,13 +255,11 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     menu_region.connect(lost_stairs_region)
     menu_region.connect(east_house_region)
     menu_region.connect(rockets_testing_ground_region)
-    menu_region.connect(rockets_testing_bunker_region)
     rockets_testing_ground_region.connect(rockets_testing_bunker_region, "Stuck Bunker Door")
     menu_region.connect(workshop_region)
     menu_region.connect(east_tower_region)
     menu_region.connect(lighthouse_region)
     menu_region.connect(north_mine_outside_region)
-    menu_region.connect(north_mine_inside_region)
     north_mine_outside_region.connect(north_mine_inside_region, "North Mine Gate")
     menu_region.connect(wood_bridge_region)
     menu_region.connect(museum_region)
@@ -278,11 +273,9 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     menu_region.connect(north_beach_region)
     menu_region.connect(mine_shaft_region)
     menu_region.connect(mob_camp_region)
-    menu_region.connect(mob_camp_locked_room_region)
     mob_camp_region.connect(mob_camp_locked_room_region, "Mob Camp Locked Door")
     menu_region.connect(mine_elevator_exit_region)
     menu_region.connect(mountain_ruin_outside_region)
-    menu_region.connect(mountain_ruin_inside_region)
     mountain_ruin_outside_region.connect(mountain_ruin_inside_region, "Mountain Ruin Gate")
     menu_region.connect(prism_temple_region)
     menu_region.connect(pickle_val_region)

From 800b50ac009ed88d78eee004279ef4549ff73048 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Sat, 8 Nov 2025 14:20:43 +0100
Subject: [PATCH 16/23] Fix editorial issues from Setup Guides

---
 worlds/cccharles/docs/en_Choo-Choo Charles.md | 2 +-
 worlds/cccharles/docs/fr_Choo-Choo Charles.md | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/worlds/cccharles/docs/en_Choo-Choo Charles.md b/worlds/cccharles/docs/en_Choo-Choo Charles.md
index 6d8ed39e03ea..3f568c73a049 100644
--- a/worlds/cccharles/docs/en_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/en_Choo-Choo Charles.md	
@@ -13,7 +13,7 @@ All scraps or any collectable item on the ground (except from Loot Crates) and i
 Beating the evil train from Hell named "Charles".
 
 ## How is the game managed in Nightmare mode?
-At death, the player has to restart a brand-new game, giving him the choice to stay under the Nightmare mode or continuing with the Normal mode if considered too hard.
+At death, the player has to restart a brand-new game, giving them the choice to stay under the Nightmare mode or continuing with the Normal mode if considered too hard.
 In this case, all collected items will be redistributed in the inventory and the missions states will be kept.
 The Deathlink is not implemented yet. When this option will be available, a choice will be provided to:
 * Disable the Deathlink
diff --git a/worlds/cccharles/docs/fr_Choo-Choo Charles.md b/worlds/cccharles/docs/fr_Choo-Choo Charles.md
index 42f0c48396c6..6105ba1ee03e 100644
--- a/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
@@ -4,13 +4,13 @@
 La [page d'options du joueur pour ce jeu](../player-options) contient toutes les options pour configurer et exporter un fichier de configuration yaml.
 
 ## Qu'est ce que la randomisation fait au jeu ?
-Tous les débrits ou n'importe quel objet ramassable au sol (excepté les Caisses à Butin) et objets reçus par les missions de PNJs sont considérés comme emplacements à vérifier.
+Tous les débris ou n'importe quel objet ramassable au sol (excepté les Caisses à Butin) et objets reçus par les missions de PNJs sont considérés comme emplacements à vérifier.
 
 ## Quel est le but de Choo-Choo Charles lorsqu'il est randomisé ?
 Vaincre le train démoniaque de l'Enfer nommé "Charles".
 
 ## Comment le jeu est-il géré en mode Nightmare ?
-À sa mort, le joueur doit relancer une toute nouvelle partie, lui donnant la possisilité de rester en mode Nightmare ou de poursuivre la partie en mode Normal s'il considère la partie trop difficile.
+À sa mort, le joueur doit relancer une toute nouvelle partie, lui donnant la possibilité de rester en mode Nightmare ou de poursuivre la partie en mode Normal s'il considère la partie trop difficile.
 Dans ce cas, tous les objets collectés seront redistribués dans l'inventaire et les états des missions seront conservés.
 Le Deathlink n'est pas implémenté pour l'instant. Lorsque cette option sera disponible, un choix sera fourni pour :
 * Désactiver le Deathlink
@@ -18,7 +18,7 @@ Le Deathlink n'est pas implémenté pour l'instant. Lorsque cette option sera di
 * Activer le Deathlink strict avec suppression de la sauvegarde lorsqu'un évènement Deathlink est reçu
 
 ## À quoi ressemble un objet d'un autre monde dans Choo-Choo Charles ?
-Les apparances des objets sont conservés.
+Les apparances des objets sont conservées.
 Tout indice qui ne peut pas être représenté normalement dans le jeu est remplacé par l'Easter Egg "DeadDuck" miniaturisé qui peut être vu en dehors des limites murales physiques du jeu original.
 
 ## Comment le joueur est-il informé par une transmission d'objet et des indices ?

From d73e8159219f729d599620d0f334723f8200b310 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Sat, 8 Nov 2025 21:02:24 +0100
Subject: [PATCH 17/23] Fix editorial issues in documentations

---
 worlds/cccharles/docs/en_Choo-Choo Charles.md | 2 +-
 worlds/cccharles/docs/fr_Choo-Choo Charles.md | 6 +++---
 worlds/cccharles/docs/setup_fr.md             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/worlds/cccharles/docs/en_Choo-Choo Charles.md b/worlds/cccharles/docs/en_Choo-Choo Charles.md
index 3f568c73a049..f880865ff817 100644
--- a/worlds/cccharles/docs/en_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/en_Choo-Choo Charles.md	
@@ -13,7 +13,7 @@ All scraps or any collectable item on the ground (except from Loot Crates) and i
 Beating the evil train from Hell named "Charles".
 
 ## How is the game managed in Nightmare mode?
-At death, the player has to restart a brand-new game, giving them the choice to stay under the Nightmare mode or continuing with the Normal mode if considered too hard.
+At death, the player has to restart a brand-new game, giving them the choice to stay under the Nightmare Mode or continuing with the Classic Mode if considered too hard.
 In this case, all collected items will be redistributed in the inventory and the missions states will be kept.
 The Deathlink is not implemented yet. When this option will be available, a choice will be provided to:
 * Disable the Deathlink
diff --git a/worlds/cccharles/docs/fr_Choo-Choo Charles.md b/worlds/cccharles/docs/fr_Choo-Choo Charles.md
index 6105ba1ee03e..74cff89bc264 100644
--- a/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
@@ -9,8 +9,8 @@ Tous les débris ou n'importe quel objet ramassable au sol (excepté les Caisses
 ## Quel est le but de Choo-Choo Charles lorsqu'il est randomisé ?
 Vaincre le train démoniaque de l'Enfer nommé "Charles".
 
-## Comment le jeu est-il géré en mode Nightmare ?
-À sa mort, le joueur doit relancer une toute nouvelle partie, lui donnant la possibilité de rester en mode Nightmare ou de poursuivre la partie en mode Normal s'il considère la partie trop difficile.
+## Comment le jeu est-il géré en Mode Cauchemar ?
+À sa mort, le joueur doit relancer une toute nouvelle partie, lui donnant la possibilité de rester en Mode Cauchemar ou de poursuivre la partie en Mode Classique s'il considère la partie trop difficile.
 Dans ce cas, tous les objets collectés seront redistribués dans l'inventaire et les états des missions seront conservés.
 Le Deathlink n'est pas implémenté pour l'instant. Lorsque cette option sera disponible, un choix sera fourni pour :
 * Désactiver le Deathlink
@@ -29,7 +29,7 @@ La même méthode est utilisée pour les indices.
 Non, ceci est un travail en cours.
 Les options suivantes seront possibles une fois les implémentations disponibles :
 
-À n'importe quel moment, le joueur peu appuyer sur l'une des touches suivantes pour afficher la console dans le jeu :
+À n'importe quel moment, le joueur peut appuyer sur l'une des touches suivantes pour afficher la console dans le jeu :
 * "~" (qwerty)
 * "²" (azerty)
 * "F10"
diff --git a/worlds/cccharles/docs/setup_fr.md b/worlds/cccharles/docs/setup_fr.md
index 386ec02587c6..c6d97de09d1a 100644
--- a/worlds/cccharles/docs/setup_fr.md
+++ b/worlds/cccharles/docs/setup_fr.md
@@ -4,7 +4,7 @@ Cette page est un guide simplifié de la [page du Mod Randomiseur Multiworld de
 ## Exigences et Logiciels Nécessaires
 * Un ordinateur utilisant Windows (le Mod n'est pas utilisable sous Linux ou Mac)
 * [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
-* Une copie légale du jeu original Choo-Choo Charles (peut être trouvé sur [Steam](https://store.steampowered.com/app/1766740/ChooChoo_Charles/)
+* Une copie légale du jeu original Choo-Choo Charles (peut être trouvé sur [Steam](https://store.steampowered.com/app/1766740/ChooChoo_Charles/))
 
 ## Installation du Mod pour jouer
 ### Téléchargement du Mod

From 3c1397b1bfffd6f475f9df6c91f591f21c66d8c3 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Sat, 8 Nov 2025 21:21:59 +0100
Subject: [PATCH 18/23] Fix extra typos in documentations

---
 worlds/cccharles/docs/fr_Choo-Choo Charles.md | 4 ++--
 worlds/cccharles/docs/setup_en.md             | 2 +-
 worlds/cccharles/docs/setup_fr.md             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/worlds/cccharles/docs/fr_Choo-Choo Charles.md b/worlds/cccharles/docs/fr_Choo-Choo Charles.md
index 74cff89bc264..7d1a3f37d050 100644
--- a/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
+++ b/worlds/cccharles/docs/fr_Choo-Choo Charles.md	
@@ -3,7 +3,7 @@
 ## Où est la page d'options ?
 La [page d'options du joueur pour ce jeu](../player-options) contient toutes les options pour configurer et exporter un fichier de configuration yaml.
 
-## Qu'est ce que la randomisation fait au jeu ?
+## Qu'est-ce que la randomisation fait au jeu ?
 Tous les débris ou n'importe quel objet ramassable au sol (excepté les Caisses à Butin) et objets reçus par les missions de PNJs sont considérés comme emplacements à vérifier.
 
 ## Quel est le but de Choo-Choo Charles lorsqu'il est randomisé ?
@@ -18,7 +18,7 @@ Le Deathlink n'est pas implémenté pour l'instant. Lorsque cette option sera di
 * Activer le Deathlink strict avec suppression de la sauvegarde lorsqu'un évènement Deathlink est reçu
 
 ## À quoi ressemble un objet d'un autre monde dans Choo-Choo Charles ?
-Les apparances des objets sont conservées.
+Les apparences des objets sont conservées.
 Tout indice qui ne peut pas être représenté normalement dans le jeu est remplacé par l'Easter Egg "DeadDuck" miniaturisé qui peut être vu en dehors des limites murales physiques du jeu original.
 
 ## Comment le joueur est-il informé par une transmission d'objet et des indices ?
diff --git a/worlds/cccharles/docs/setup_en.md b/worlds/cccharles/docs/setup_en.md
index 8df0188c031b..1daccf474d9a 100644
--- a/worlds/cccharles/docs/setup_en.md
+++ b/worlds/cccharles/docs/setup_en.md
@@ -27,7 +27,7 @@ The [Player Options page](/games/Choo-Choo%20Charles/player-options) allows to c
 Before playing, it is highly recommended to check out the **[Known Issues](setup_en#known-issues)** section
 * The game console must be opened to type Archipelago commands, press "F10" key or "`" (or "~") key in querty ("²" key in azerty)
 * Type ``/connect <IP> <PlayerName>`` with \<IP\> and \<PlayerName\> found on the hosting Archipelago web page in the form ``archipelago.gg:XXXXX`` and ``CCCharles``
-* Disconnection is automatic at game closure but can be manually done with ``/disconnect``
+* Disconnection is automatic at game closure, but can be manually done with ``/disconnect``
 
 ## Hosting a MultiWorld or Single-Player Game
 See the [Mod Download](setup_en#mod-download) section to get the **cccharles.apworld** file.
diff --git a/worlds/cccharles/docs/setup_fr.md b/worlds/cccharles/docs/setup_fr.md
index c6d97de09d1a..d613e0d1efa0 100644
--- a/worlds/cccharles/docs/setup_fr.md
+++ b/worlds/cccharles/docs/setup_fr.md
@@ -27,7 +27,7 @@ La [page d'Options Joueur](/games/Choo-Choo%20Charles/player-options) permet de
 Avant de jouer, il est fortement recommandé de consulter la section **[Problèmes Connus](setup_fr#probl%C3%A8mes-connus)**.
 * La console du jeu doit être ouverte pour taper des commandes Archipelago, appuyer sur la touche "F10" ou "`" (ou "~") en querty (touche "²" en azerty)
 * Taper ``/connect <IP> <NomDuJoueur>`` avec \<IP\> et \<NomDuJoueur\> trouvés sur la page web d'hébergement Archipelago sous la forme ``archipelago.gg:XXXXX`` et ``CCCharles``
-* La déconnexion est automatique à la fermeture du jeu mais peut être faite manuellement avec ``/disconnect``
+* La déconnexion est automatique à la fermeture du jeu, mais peut être faite manuellement avec ``/disconnect``
 
 ## Héberger une partie MultiWorld ou un Seul Joueur
 Voir la section [Téléchargement du Mod](setup_fr#téléchargement-du-mod) pour récupérer le fichier **cccharles.apworld**.
@@ -39,7 +39,7 @@ Suivre ces étapes pour héberger une session multijoueur à distance ou locale
 2. Placer le **CCCharles.yaml** dans **Archipelago/Players/** avec le YAML de chaque joueur à héberger
 3. Exécuter le lanceur Archipelago et cliquer sur "Generate" pour configurer une partie avec les YAML dans **Archipelago/output/**
 4. Pour une session multijoueur, aller à la [page Archipelago HOST GAME](https://archipelago.gg/uploads)
-5. Cliquer sur "Upload File" et selectionner le **AP_\<seed\>.zip** généré dans **Archipelago/output/**
+5. Cliquer sur "Upload File" et sélectionner le **AP_\<seed\>.zip** généré dans **Archipelago/output/**
 6. Envoyer la page de la partie générée à chaque joueur
 
 Pour une session locale à un seul joueur, cliquer sur "Host" dans le lanceur Archipelago en utilisant **AP_\<seed\>.zip** généré dans **Archipelago/output/**

From 39f1345ea0450aee943b95c919faab50ee0f5808 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Sat, 22 Nov 2025 19:02:25 +0100
Subject: [PATCH 19/23] CCCharles: Add 1 missed Scraps piece to logic

> "North Mine Outside Scraps 15" added, IDs shifted accordingly
> Replaced old comments "KO" by "\!/ Existing match [...]"
---
 worlds/cccharles/Items.py     |   4 +-
 worlds/cccharles/Locations.py | 661 +++++++++++++++++-----------------
 2 files changed, 333 insertions(+), 332 deletions(-)

diff --git a/worlds/cccharles/Items.py b/worlds/cccharles/Items.py
index 0cf7ced0389b..9d9ca01caa02 100644
--- a/worlds/cccharles/Items.py
+++ b/worlds/cccharles/Items.py
@@ -121,9 +121,9 @@ class CCCharlesItem(Item):
 # All items excepted the duplications (no item amount)
 unique_item_dict = {**optional_items, **useless_items, **progression_items}
 
-# All 691 items to add to the item pool
+# All 692 items to add to the item pool
 full_item_list = []
-full_item_list += ["Scraps"] * 637 # 636 + 1 as Scrap Reward (from Ronny)
+full_item_list += ["Scraps"] * 638 # 637 + 1 as Scrap Reward (from Ronny)
 full_item_list += ["30 Scraps Reward"] * 3
 full_item_list += ["25 Scraps Reward"] * 1
 full_item_list += ["35 Scraps Reward"] * 2
diff --git a/worlds/cccharles/Locations.py b/worlds/cccharles/Locations.py
index 63b502bcf460..a421d6871887 100644
--- a/worlds/cccharles/Locations.py
+++ b/worlds/cccharles/Locations.py
@@ -34,7 +34,7 @@ class CCCharlesLocation(Location):
 }
 
 loc_tutorial_house = {
-    "Tutorial House Scraps 1": base_id + 1013, # ItemPickup17_2 Photorealistic_Island (X=74745.852 Y=73865.555 Z=11426.619)
+    "Tutorial House Scraps 1": base_id + 1013, # ItemPickup17_2 Photorealistic_Island (X=74745.852 Y=73865.555 Z=11426.619) \!/ Existing match 8
     "Tutorial House Scraps 2": base_id + 1014, # ItemPickup18_2 Photorealistic_Island (X=74864.102 Y=73900.094 Z=11426.619)
     "Tutorial House Scraps 3": base_id + 1015, # ItemPickup14_2 Photorealistic_Island (X=74877.625 Y=73738.594 Z=11422.057) \!/ Existing match 4
     "Tutorial House Scraps 4": base_id + 1016, # ItemPickup15_8 Photorealistic_Island (X=75068.992 Y=73971.133 Z=11426.619)
@@ -122,7 +122,7 @@ class CCCharlesLocation(Location):
     "South House Chest Scraps 1": base_id + 1086, # ItemPickup21 Secret12_Details (X=82079.922 Y=110808.602 Z=8739.324)
     "South House Chest Scraps 2": base_id + 1087, # ItemPickup18 Secret12_Details (X=82102.664 Y=110813.664 Z=8726.308)
     "South House Chest Scraps 3": base_id + 1088, # ItemPickup17 Secret12_Details (X=82091.547 Y=110810.906 Z=8721.354) \!/ Existing match 1
-    "South House Chest Scraps 4": base_id + 1089, # ItemPickup16 Secret12_Details (X=82102.664 Y=110813.664 Z=8708.337) KO
+    "South House Chest Scraps 4": base_id + 1089, # ItemPickup16 Secret12_Details (X=82102.664 Y=110813.664 Z=8708.337) \!/ Existing match 2
     "South House Chest Scraps 5": base_id + 1090, # ItemPickup14 Secret12_Details (X=82091.516 Y=110810.898 Z=8701.793) \!/ Existing match 3
     "South House Chest Scraps 6": base_id + 1091 # ItemPickup13_7 Secret12_Details (X=82102.664 Y=110813.625 Z=8688.776)
 }
@@ -160,7 +160,7 @@ class CCCharlesLocation(Location):
     "South Mine Outside Scraps 1": base_id + 1115, # ItemPickup20_1 Mine_1_OutsideMain (X=114794.375 Y=57211.855 Z=8523.348)
     "South Mine Outside Scraps 2": base_id + 1116, # ItemPickup15_2 Mine_1_OutsideDetails (X=112523.438 Y=57693.836 Z=8639.382)
     "South Mine Outside Scraps 3": base_id + 1117, # ItemPickup22_5 Mine_1_OutsideMain (X=112348.586 Y=59174.289 Z=8945.143)
-    "South Mine Outside Scraps 4": base_id + 1118, # ItemPickup13_2 Mine_1_OutsideDetails (X=110989.156 Y=57840.090 Z=8700.936)
+    "South Mine Outside Scraps 4": base_id + 1118, # ItemPickup13_2 Mine_1_OutsideDetails (X=110989.156 Y=57840.090 Z=8700.936) \!/ Existing match 6
     "South Mine Outside Scraps 5": base_id + 1119, # ItemPickup16_1 Mine_1_OutsideDetails (X=110487.281 Y=54528.535 Z=8589.910)
     "South Mine Outside Scraps 6": base_id + 1120, # ItemPickup18_1 Mine_1_OutsideMain (X=113727.297 Y=54791.703 Z=8424.460)
     "South Mine Outside Scraps 7": base_id + 1121 # ItemPickup17_3 Mine_1_OutsideMain (X=113965.211 Y=53289.539 Z=8402.346)
@@ -312,10 +312,10 @@ class CCCharlesLocation(Location):
     "Port Scraps 13": base_id + 1241, # ItemPickup326_8 Port_Main (X=77330.414 Y=-11640.151 Z=7189.003)
     "Port Scraps 14": base_id + 1242, # ItemPickup327_11 Port_Main (X=76403.516 Y=-12484.995 Z=7440.368)
     "Port Scraps 15": base_id + 1243, # ItemPickup324_2 Port_Main (X=78651.977 Y=-12233.159 Z=7439.514)
-    "Port Scraps 16": base_id + 1244, # ItemPickup14_5 Port_Main (X=80336.297 Y=-12276.590 Z=7436.639)
+    "Port Scraps 16": base_id + 1244, # ItemPickup14_5 Port_Main (X=80336.297 Y=-12276.590 Z=7436.639) \!/ Existing match 7
     "Port Scraps 17": base_id + 1245, # ItemPickup325_5 Port_Main (X=79845.086 Y=-13410.705 Z=7440.597)
-    "Port Scraps 18": base_id + 1246, # ItemPickup13_2 Port_Main (X=76156.719 Y=-12816.718 Z=7439.269) KO
-    "Port Scraps 19": base_id + 1247, # ItemPickup16 Port_Main (X=80754.914 Y=-14055.545 Z=7445.339) KO
+    "Port Scraps 18": base_id + 1246, # ItemPickup13_2 Port_Main (X=76156.719 Y=-12816.718 Z=7439.269) \!/ Existing match 6
+    "Port Scraps 19": base_id + 1247, # ItemPickup16 Port_Main (X=80754.914 Y=-14055.545 Z=7445.339) \!/ Existing match 2
     "Port Santiago Mission End": base_id + 1248 # (dialog 3) -> 35_scraps_reward
 }
 
@@ -467,394 +467,395 @@ class CCCharlesLocation(Location):
     "North Mine Outside Scraps 11": base_id + 1365, # ItemPickup233_5 Mine2_OutsideDetails (X=-54072.105 Y=-112672.031 Z=10077.665)
     "North Mine Outside Scraps 12": base_id + 1366, # ItemPickup237_17 Mine2_OutsideDetails (X=-58042.758 Y=-108748.656 Z=9693.470)
     "North Mine Outside Scraps 13": base_id + 1367, # ItemPickup235_11 Mine2_OutsideDetails (X=-55717.227 Y=-110610.414 Z=9487.879)
-    "North Mine Outside Scraps 14": base_id + 1368 # ItemPickup13_2 Mine2_Interior2 (X=-52235.836 Y=-114501.117 Z=9462.438) KO
+    "North Mine Outside Scraps 14": base_id + 1368, # ItemPickup13_2 Mine2_Interior2 (X=-52235.836 Y=-114501.117 Z=9462.438) \!/ Existing match 6
+    "North Mine Outside Scraps 15": base_id + 1369 # ItemPickup14_5 Mine2_Interior2 (X=-53470.418 Y=-109766.102 Z=10252.304) \!/ Existing match 7
 }
 
 loc_north_mine_inside = {
-    "North Mine Inside Scraps 1": base_id + 1369, # ItemPickup17_2 Mine2_Interior1 (X=-58433.055 Y=-104081.570 Z=9378.083) KO
-    "North Mine Inside Scraps 2": base_id + 1370, # ItemPickup246_2 Mine2_Interior1 (X=-58987.199 Y=-103262.906 Z=9186.494)
-    "North Mine Inside Scraps 3": base_id + 1371, # ItemPickup247_5 Mine2_Interior1 (X=-58812.801 Y=-99259.570 Z=8847.714)
-    "North Mine Inside Scraps 4": base_id + 1372, # ItemPickup248_8 Mine2_Interior1 (X=-56634.379 Y=-99529.563 Z=8851.877)
-    "North Mine Inside Scraps 5": base_id + 1373, # ItemPickup22_4 Mine2_Interior1 (X=-55604.477 Y=-98342.906 Z=8842.766)
-    "North Mine Inside Scraps 6": base_id + 1374, # ItemPickup250_14 Mine2_Interior1 (X=-54824.535 Y=-98526.492 Z=8852.156)
-    "North Mine Inside Scraps 7": base_id + 1375, # ItemPickup21_14 Mine2_Interior1 (X=-54887.254 Y=-99047.141 Z=8849.855)
-    "North Mine Inside Scraps 8": base_id + 1376, # ItemPickup20_2 Mine2_Interior1 (X=-55610.020 Y=-101877.961 Z=9081.042)
-    "North Mine Inside Scraps 9": base_id + 1377, # ItemPickup19_2 Mine2_Interior1 (X=-56519.340 Y=-101375.008 Z=9001.270)
-    "North Mine Inside Scraps 10": base_id + 1378, # ItemPickup249_11 Mine2_Interior1 (X=-53329.922 Y=-99469.773 Z=8848.643)
-    "North Mine Inside Scraps 11": base_id + 1379, # ItemPickup251_17 Mine2_Interior1 (X=-52814.828 Y=-96286.969 Z=8851.372)
-    "North Mine Inside Scraps 12": base_id + 1380, # ItemPickup24_1 Mine2_Interior1 (X=-52605.957 Y=-96535.156 Z=8940.480)
-    "North Mine Inside Scraps 13": base_id + 1381, # ItemPickup23_20 Mine2_Interior1 (X=-53237.699 Y=-96609.461 Z=8846.201)
-    "North Mine Inside Scraps 14": base_id + 1382, # ItemPickup18_5 Mine2_Interior1 (X=-58543.488 Y=-95879.695 Z=8981.646)
-    "North Mine Inside Blue Egg": base_id + 1383, # Mine2_Egg Mine2_Interior2 (X=-53592.195 Y=-99177.500 Z=8975.387)
-    "North Mine Inside Blue Paint Can": base_id + 1384 # PaintCan_2 Mine2_Interior2 (X=-56133.391 Y=-101870.047 Z=9004.720) \!/ Existing match 5
-    # "North Mine Inside Secret Gear" ItemPickup26_2 (X=-55546.859 Y=-98209.852 Z=8429.085) /!\ Inaccessible gear
+    "North Mine Inside Scraps 1": base_id + 1370, # ItemPickup17_2 Mine2_Interior1 (X=-58433.055 Y=-104081.570 Z=9378.083) \!/ Existing match 8
+    "North Mine Inside Scraps 2": base_id + 1371, # ItemPickup246_2 Mine2_Interior1 (X=-58987.199 Y=-103262.906 Z=9186.494)
+    "North Mine Inside Scraps 3": base_id + 1372, # ItemPickup247_5 Mine2_Interior1 (X=-58812.801 Y=-99259.570 Z=8847.714)
+    "North Mine Inside Scraps 4": base_id + 1373, # ItemPickup248_8 Mine2_Interior1 (X=-56634.379 Y=-99529.563 Z=8851.877)
+    "North Mine Inside Scraps 5": base_id + 1374, # ItemPickup22_4 Mine2_Interior1 (X=-55604.477 Y=-98342.906 Z=8842.766)
+    "North Mine Inside Scraps 6": base_id + 1375, # ItemPickup250_14 Mine2_Interior1 (X=-54824.535 Y=-98526.492 Z=8852.156)
+    "North Mine Inside Scraps 7": base_id + 1376, # ItemPickup21_14 Mine2_Interior1 (X=-54887.254 Y=-99047.141 Z=8849.855)
+    "North Mine Inside Scraps 8": base_id + 1377, # ItemPickup20_2 Mine2_Interior1 (X=-55610.020 Y=-101877.961 Z=9081.042)
+    "North Mine Inside Scraps 9": base_id + 1378, # ItemPickup19_2 Mine2_Interior1 (X=-56519.340 Y=-101375.008 Z=9001.270)
+    "North Mine Inside Scraps 10": base_id + 1379, # ItemPickup249_11 Mine2_Interior1 (X=-53329.922 Y=-99469.773 Z=8848.643)
+    "North Mine Inside Scraps 11": base_id + 1380, # ItemPickup251_17 Mine2_Interior1 (X=-52814.828 Y=-96286.969 Z=8851.372)
+    "North Mine Inside Scraps 12": base_id + 1381, # ItemPickup24_1 Mine2_Interior1 (X=-52605.957 Y=-96535.156 Z=8940.480)
+    "North Mine Inside Scraps 13": base_id + 1382, # ItemPickup23_20 Mine2_Interior1 (X=-53237.699 Y=-96609.461 Z=8846.201)
+    "North Mine Inside Scraps 14": base_id + 1383, # ItemPickup18_5 Mine2_Interior1 (X=-58543.488 Y=-95879.695 Z=8981.646)
+    "North Mine Inside Blue Egg": base_id + 1384, # Mine2_Egg Mine2_Interior2 (X=-53592.195 Y=-99177.500 Z=8975.387)
+    "North Mine Inside Blue Paint Can": base_id + 1385 # PaintCan_2 Mine2_Interior2 (X=-56133.391 Y=-101870.047 Z=9004.720) \!/ Existing match 5
+    # "North Mine Inside Secret Gear" ItemPickup26_2 Mine2_Interior2 (X=-55546.859 Y=-98209.852 Z=8429.085) /!\ Inaccessible gear
 }
 
 loc_wood_bridge = {
-    "Wood Bridge Scraps 1": base_id + 1385, # ItemPickup127_35 Bridge_Details (X=-66790.141 Y=-110340.367 Z=10454.417)
-    "Wood Bridge Scraps 2": base_id + 1386, # ItemPickup18613654 Bridge_Details (X=-68364.586 Y=-111691.625 Z=10444.172)
-    "Wood Bridge Scraps 3": base_id + 1387, # ItemPickup1311221 Bridge_StructureDetails (X=-69013.555 Y=-112353.977 Z=10399.942)
-    "Wood Bridge Scraps 4": base_id + 1388, # ItemPickup93564 Bridge_StructureDetails (X=-70398.797 Y=-112916.945 Z=10372.192)
-    "Wood Bridge Scraps 5": base_id + 1389, # ItemPickup161323 Bridge_Details (X=-71336.172 Y=-106966.672 Z=8430.104)
-    "Wood Bridge Scraps 6": base_id + 1390, # ItemPickup128_38 Bridge_Details (X=-72776.086 Y=-107813.102 Z=8305.589)
-    "Wood Bridge Scraps 7": base_id + 1391, # ItemPickup17975 Bridge_Details (X=-75224.648 Y=-108280.867 Z=7929.499)
-    "Wood Bridge Scraps 8": base_id + 1392, # ItemPickup126_32 Bridge_Details (X=-68112.172 Y=-105119.656 Z=9458.937)
-    "Wood Bridge Scraps 9": base_id + 1393, # ItemPickup118_8 Bridge_Details (X=-71847.625 Y=-103623.203 Z=10707.521)
-    "Wood Bridge Scraps 10": base_id + 1394, # ItemPickup116_2 Bridge_Details (X=-71812.219 Y=-107256.094 Z=10780.134)
-    "Wood Bridge Scraps 11": base_id + 1395, # ItemPickup134321 Bridge_Details (X=-72011.570 Y=-109054.547 Z=10866.852)
-    "Wood Bridge Scraps 12": base_id + 1396, # ItemPickup117_5 Bridge_Details (X=-72862.430 Y=-106144.852 Z=10329.061)
-    "Wood Bridge Scraps 13": base_id + 1397 # ItemPickup1494567 Bridge_Details (X=-71843.117 Y=-107174.133 Z=10367.116)
+    "Wood Bridge Scraps 1": base_id + 1386, # ItemPickup127_35 Bridge_Details (X=-66790.141 Y=-110340.367 Z=10454.417)
+    "Wood Bridge Scraps 2": base_id + 1387, # ItemPickup18613654 Bridge_Details (X=-68364.586 Y=-111691.625 Z=10444.172)
+    "Wood Bridge Scraps 3": base_id + 1388, # ItemPickup1311221 Bridge_StructureDetails (X=-69013.555 Y=-112353.977 Z=10399.942)
+    "Wood Bridge Scraps 4": base_id + 1389, # ItemPickup93564 Bridge_StructureDetails (X=-70398.797 Y=-112916.945 Z=10372.192)
+    "Wood Bridge Scraps 5": base_id + 1390, # ItemPickup161323 Bridge_Details (X=-71336.172 Y=-106966.672 Z=8430.104)
+    "Wood Bridge Scraps 6": base_id + 1391, # ItemPickup128_38 Bridge_Details (X=-72776.086 Y=-107813.102 Z=8305.589)
+    "Wood Bridge Scraps 7": base_id + 1392, # ItemPickup17975 Bridge_Details (X=-75224.648 Y=-108280.867 Z=7929.499)
+    "Wood Bridge Scraps 8": base_id + 1393, # ItemPickup126_32 Bridge_Details (X=-68112.172 Y=-105119.656 Z=9458.937)
+    "Wood Bridge Scraps 9": base_id + 1394, # ItemPickup118_8 Bridge_Details (X=-71847.625 Y=-103623.203 Z=10707.521)
+    "Wood Bridge Scraps 10": base_id + 1395, # ItemPickup116_2 Bridge_Details (X=-71812.219 Y=-107256.094 Z=10780.134)
+    "Wood Bridge Scraps 11": base_id + 1396, # ItemPickup134321 Bridge_Details (X=-72011.570 Y=-109054.547 Z=10866.852)
+    "Wood Bridge Scraps 12": base_id + 1397, # ItemPickup117_5 Bridge_Details (X=-72862.430 Y=-106144.852 Z=10329.061)
+    "Wood Bridge Scraps 13": base_id + 1398 # ItemPickup1494567 Bridge_Details (X=-71843.117 Y=-107174.133 Z=10367.116)
 }
 
 loc_museum = {
-    "Museum Scraps 1": base_id + 1398, # ItemPickup119_11 Bridge_Details (X=-69687.773 Y=-100002.406 Z=10806.339)
-    "Museum Scraps 2": base_id + 1399, # ItemPickup120_14 Bridge_Details (X=-68035.195 Y=-99480.672 Z=11049.731)
-    "Museum Scraps 3": base_id + 1400, # ItemPickup125_29 Bridge_Details (X=-66912.641 Y=-99976.750 Z=11064.357)
-    "Museum Scraps 4": base_id + 1401, # ItemPickup13532 Bridge_HouseDetails (X=-64901.117 Y=-99624.953 Z=11176.359)
-    "Museum Scraps 5": base_id + 1402, # ItemPickup121_17 Bridge_Details (X=-66082.328 Y=-98105.555 Z=11089.308)
-    "Museum Scraps 6": base_id + 1403, # ItemPickup21765 Bridge_HouseDetails (X=-67402.742 Y=-97735.133 Z=11153.927)
-    "Museum Scraps 7": base_id + 1404, # ItemPickup124_26 Bridge_Details (X=-66716.031 Y=-98282.508 Z=11195.624)
-    "Museum Scraps 8": base_id + 1405, # ItemPickup122_20 Bridge_Details (X=-66582.703 Y=-99092.461 Z=11630.082)
-    "Museum Scraps 9": base_id + 1406, # ItemPickup123_23 Bridge_Details (X=-66798.164 Y=-99550.266 Z=11547.321)
-    "Museum Scraps 10": base_id + 1407, # ItemPickup183423 Bridge_HouseDetails (X=-66850.336 Y=-99682.844 Z=11543.618)
-    "Museum Scraps 11": base_id + 1408, # ItemPickup244_40 Mine2_OutsideDetails (X=-60156.828 Y=-98516.953 Z=11811.422)
-    "Museum Scraps 12": base_id + 1409, # ItemPickup245_43 Mine2_OutsideDetails (X=-61195.203 Y=-98262.422 Z=11779.118)
-    "Museum Paul Mission Start": base_id + 1410, # (dialog 6) -> remote_explosive (x8)
-    "Museum Paul Mission End": base_id + 1411 # (dialog 3) -> temple_key
+    "Museum Scraps 1": base_id + 1399, # ItemPickup119_11 Bridge_Details (X=-69687.773 Y=-100002.406 Z=10806.339)
+    "Museum Scraps 2": base_id + 1400, # ItemPickup120_14 Bridge_Details (X=-68035.195 Y=-99480.672 Z=11049.731)
+    "Museum Scraps 3": base_id + 1401, # ItemPickup125_29 Bridge_Details (X=-66912.641 Y=-99976.750 Z=11064.357)
+    "Museum Scraps 4": base_id + 1402, # ItemPickup13532 Bridge_HouseDetails (X=-64901.117 Y=-99624.953 Z=11176.359)
+    "Museum Scraps 5": base_id + 1403, # ItemPickup121_17 Bridge_Details (X=-66082.328 Y=-98105.555 Z=11089.308)
+    "Museum Scraps 6": base_id + 1404, # ItemPickup21765 Bridge_HouseDetails (X=-67402.742 Y=-97735.133 Z=11153.927)
+    "Museum Scraps 7": base_id + 1405, # ItemPickup124_26 Bridge_Details (X=-66716.031 Y=-98282.508 Z=11195.624)
+    "Museum Scraps 8": base_id + 1406, # ItemPickup122_20 Bridge_Details (X=-66582.703 Y=-99092.461 Z=11630.082)
+    "Museum Scraps 9": base_id + 1407, # ItemPickup123_23 Bridge_Details (X=-66798.164 Y=-99550.266 Z=11547.321)
+    "Museum Scraps 10": base_id + 1408, # ItemPickup183423 Bridge_HouseDetails (X=-66850.336 Y=-99682.844 Z=11543.618)
+    "Museum Scraps 11": base_id + 1409, # ItemPickup244_40 Mine2_OutsideDetails (X=-60156.828 Y=-98516.953 Z=11811.422)
+    "Museum Scraps 12": base_id + 1410, # ItemPickup245_43 Mine2_OutsideDetails (X=-61195.203 Y=-98262.422 Z=11779.118)
+    "Museum Paul Mission Start": base_id + 1411, # (dialog 6) -> remote_explosive (x8)
+    "Museum Paul Mission End": base_id + 1412 # (dialog 3) -> temple_key
 }
 
 loc_barbed_shelter = {
-    "Barbed Shelter Gertrude Mission Start": base_id + 1412, # (dialog 4) -> broken_bob
-    "Barbed Shelter Scraps 1": base_id + 1413, # ItemPickup100_8 Bob_NPCHouseMain (X=-72525.500 Y=-89333.734 Z=9820.663)
-    "Barbed Shelter Scraps 2": base_id + 1414, # ItemPickup98_2 Bob_NPCHouseMain (X=-74870.758 Y=-88576.641 Z=9836.814)
-    "Barbed Shelter Scraps 3": base_id + 1415, # ItemPickup22_1 Bob_NPCHouseDetails (X=-76193.914 Y=-88038.836 Z=9818.776)
-    "Barbed Shelter Scraps 4": base_id + 1416, # ItemPickup99_5 Bob_NPCHouseMain (X=-74494.859 Y=-87609.969 Z=9837.866)
-    "Barbed Shelter Scraps 5": base_id + 1417 # ItemPickup23_3 Bob_NPCHouseDetails (X=-74826.930 Y=-88402.039 Z=9929.854)
+    "Barbed Shelter Gertrude Mission Start": base_id + 1413, # (dialog 4) -> broken_bob
+    "Barbed Shelter Scraps 1": base_id + 1414, # ItemPickup100_8 Bob_NPCHouseMain (X=-72525.500 Y=-89333.734 Z=9820.663)
+    "Barbed Shelter Scraps 2": base_id + 1415, # ItemPickup98_2 Bob_NPCHouseMain (X=-74870.758 Y=-88576.641 Z=9836.814)
+    "Barbed Shelter Scraps 3": base_id + 1416, # ItemPickup22_1 Bob_NPCHouseDetails (X=-76193.914 Y=-88038.836 Z=9818.776)
+    "Barbed Shelter Scraps 4": base_id + 1417, # ItemPickup99_5 Bob_NPCHouseMain (X=-74494.859 Y=-87609.969 Z=9837.866)
+    "Barbed Shelter Scraps 5": base_id + 1418 # ItemPickup23_3 Bob_NPCHouseDetails (X=-74826.930 Y=-88402.039 Z=9929.854)
 }
 
 loc_west_beach = {
-    "West Beach Chest Scraps 1": base_id + 1418, # ItemPickup9122346 Secret11_Details (X=-85934.047 Y=-89532.547 Z=7383.054)
-    "West Beach Chest Scraps 2": base_id + 1419, # ItemPickup84 Secret11_Details (X=-85933.977 Y=-89532.977 Z=7369.364)
-    "West Beach Chest Scraps 3": base_id + 1420, # ItemPickup9099877 Secret11_Details (X=-85951.000 Y=-89527.023 Z=7367.054)
-    "West Beach Chest Scraps 4": base_id + 1421, # ItemPickup89086423 Secret11_Details (X=-85932.461 Y=-89533.148 Z=7354.001)
-    "West Beach Chest Scraps 5": base_id + 1422, # ItemPickup83 Secret11_Details (X=-85950.930 Y=-89527.453 Z=7353.365)
-    "West Beach Chest Scraps 6": base_id + 1423, # ItemPickup82_2 Secret11_Details (X=-85932.391 Y=-89533.578 Z=7340.312)
-    "West Beach Scraps 1": base_id + 1424, # ItemPickup87_13 Secret11_Details (X=-84489.945 Y=-91235.977 Z=8360.803)
-    "West Beach Scraps 2": base_id + 1425, # ItemPickup349_2 Secret11_Details1 (X=-84386.320 Y=-90391.789 Z=8376.434)
-    "West Beach Scraps 3": base_id + 1426, # ItemPickup86_10 Secret11_Details (X=-84714.773 Y=-89876.992 Z=7707.064)
-    "West Beach Scraps 4": base_id + 1427, # ItemPickup350_5 Secret11_Details1 (X=-85478.672 Y=-90648.414 Z=7708.377)
-    "West Beach Scraps 5": base_id + 1428, # ItemPickup85_7 Secret11_Details (X=-86276.633 Y=-90674.289 Z=7532.364)
-    "West Beach Scraps 6": base_id + 1429, # ItemPickup88_16 Secret11_Details (X=-84363.055 Y=-87497.938 Z=7582.647)
-    "West Beach Scraps 7": base_id + 1430, # ItemPickup351_8 Secret11_Details1 (X=-86556.266 Y=-89748.484 Z=7297.274)
-    "West Beach Scraps 8": base_id + 1431 # ItemPickup352_11 Secret11_Details1 (X=-83210.836 Y=-92551.953 Z=8460.213)
+    "West Beach Chest Scraps 1": base_id + 1419, # ItemPickup9122346 Secret11_Details (X=-85934.047 Y=-89532.547 Z=7383.054)
+    "West Beach Chest Scraps 2": base_id + 1420, # ItemPickup84 Secret11_Details (X=-85933.977 Y=-89532.977 Z=7369.364)
+    "West Beach Chest Scraps 3": base_id + 1421, # ItemPickup9099877 Secret11_Details (X=-85951.000 Y=-89527.023 Z=7367.054)
+    "West Beach Chest Scraps 4": base_id + 1422, # ItemPickup89086423 Secret11_Details (X=-85932.461 Y=-89533.148 Z=7354.001)
+    "West Beach Chest Scraps 5": base_id + 1423, # ItemPickup83 Secret11_Details (X=-85950.930 Y=-89527.453 Z=7353.365)
+    "West Beach Chest Scraps 6": base_id + 1424, # ItemPickup82_2 Secret11_Details (X=-85932.391 Y=-89533.578 Z=7340.312)
+    "West Beach Scraps 1": base_id + 1425, # ItemPickup87_13 Secret11_Details (X=-84489.945 Y=-91235.977 Z=8360.803)
+    "West Beach Scraps 2": base_id + 1426, # ItemPickup349_2 Secret11_Details1 (X=-84386.320 Y=-90391.789 Z=8376.434)
+    "West Beach Scraps 3": base_id + 1427, # ItemPickup86_10 Secret11_Details (X=-84714.773 Y=-89876.992 Z=7707.064)
+    "West Beach Scraps 4": base_id + 1428, # ItemPickup350_5 Secret11_Details1 (X=-85478.672 Y=-90648.414 Z=7708.377)
+    "West Beach Scraps 5": base_id + 1429, # ItemPickup85_7 Secret11_Details (X=-86276.633 Y=-90674.289 Z=7532.364)
+    "West Beach Scraps 6": base_id + 1430, # ItemPickup88_16 Secret11_Details (X=-84363.055 Y=-87497.938 Z=7582.647)
+    "West Beach Scraps 7": base_id + 1431, # ItemPickup351_8 Secret11_Details1 (X=-86556.266 Y=-89748.484 Z=7297.274)
+    "West Beach Scraps 8": base_id + 1432 # ItemPickup352_11 Secret11_Details1 (X=-83210.836 Y=-92551.953 Z=8460.213)
 }
 
 loc_church = {
-    "Church Black Paint Can": base_id + 1432, # PaintCan_4 Secret5_ChurchDetails (X=-67628.172 Y=-83801.375 Z=9865.983)
-    "Church Scraps 1": base_id + 1433, # ItemPickup391_11 Secret5_ChurchDetails (X=-64009.039 Y=-84252.156 Z=10258.335)
-    "Church Scraps 2": base_id + 1434, # ItemPickup389_5 Secret5_ChurchDetails (X=-66870.719 Y=-85202.180 Z=9843.936)
-    "Church Scraps 3": base_id + 1435, # ItemPickup388_2 Secret5_ChurchDetails (X=-68588.352 Y=-84041.867 Z=9790.541)
-    "Church Scraps 4": base_id + 1436, # ItemPickup396_26 Secret5_ChurchDetails (X=-67595.797 Y=-82120.094 Z=9818.303)
-    "Church Scraps 5": base_id + 1437, # ItemPickup390_8 Secret5_ChurchDetails (X=-67291.000 Y=-83324.836 Z=9774.942)
-    "Church Scraps 6": base_id + 1438, # ItemPickup392_14 Secret5_ChurchDetails (X=-65849.070 Y=-80676.477 Z=9895.943)
-    "Church Scraps 7": base_id + 1439, # ItemPickup395_23 Secret5_ChurchDetails (X=-65170.266 Y=-79155.227 Z=9904.275)
-    "Church Scraps 8": base_id + 1440, # ItemPickup24_4 Secret5_GraveyardMain (X=-64837.563 Y=-80885.305 Z=9906.755)
-    "Church Scraps 9": base_id + 1441, # ItemPickup22_3 Secret5_ChurchDetails (X=-68248.359 Y=-83578.008 Z=9807.300)
-    "Church Scraps 10": base_id + 1442, # ItemPickup23_5 Secret5_ChurchDetails (X=-67086.102 Y=-84605.086 Z=9805.521)
-    "Church Scraps 11": base_id + 1443, # ItemPickup393_17 Secret5_ChurchDetails (X=-67901.930 Y=-83477.625 Z=9812.613)
-    "Church Scraps 12": base_id + 1444 # ItemPickup394_20 Secret5_ChurchDetails (X=-65834.344 Y=-84192.102 Z=9987.823)
+    "Church Black Paint Can": base_id + 1433, # PaintCan_4 Secret5_ChurchDetails (X=-67628.172 Y=-83801.375 Z=9865.983)
+    "Church Scraps 1": base_id + 1434, # ItemPickup391_11 Secret5_ChurchDetails (X=-64009.039 Y=-84252.156 Z=10258.335)
+    "Church Scraps 2": base_id + 1435, # ItemPickup389_5 Secret5_ChurchDetails (X=-66870.719 Y=-85202.180 Z=9843.936)
+    "Church Scraps 3": base_id + 1436, # ItemPickup388_2 Secret5_ChurchDetails (X=-68588.352 Y=-84041.867 Z=9790.541)
+    "Church Scraps 4": base_id + 1437, # ItemPickup396_26 Secret5_ChurchDetails (X=-67595.797 Y=-82120.094 Z=9818.303)
+    "Church Scraps 5": base_id + 1438, # ItemPickup390_8 Secret5_ChurchDetails (X=-67291.000 Y=-83324.836 Z=9774.942)
+    "Church Scraps 6": base_id + 1439, # ItemPickup392_14 Secret5_ChurchDetails (X=-65849.070 Y=-80676.477 Z=9895.943)
+    "Church Scraps 7": base_id + 1440, # ItemPickup395_23 Secret5_ChurchDetails (X=-65170.266 Y=-79155.227 Z=9904.275)
+    "Church Scraps 8": base_id + 1441, # ItemPickup24_4 Secret5_GraveyardMain (X=-64837.563 Y=-80885.305 Z=9906.755)
+    "Church Scraps 9": base_id + 1442, # ItemPickup22_3 Secret5_ChurchDetails (X=-68248.359 Y=-83578.008 Z=9807.300)
+    "Church Scraps 10": base_id + 1443, # ItemPickup23_5 Secret5_ChurchDetails (X=-67086.102 Y=-84605.086 Z=9805.521)
+    "Church Scraps 11": base_id + 1444, # ItemPickup393_17 Secret5_ChurchDetails (X=-67901.930 Y=-83477.625 Z=9812.613)
+    "Church Scraps 12": base_id + 1445 # ItemPickup394_20 Secret5_ChurchDetails (X=-65834.344 Y=-84192.102 Z=9987.823)
 }
 
 loc_west_cottage = {
-    "West Cottage Gale Mission Start": base_id + 1445, # (dialog 10) -> mountain_ruin_key
-    "West Cottage Scraps 1": base_id + 1446, # ItemPickup15_3 Mine3_NPCHouse (X=-74407.695 Y=-81781.250 Z=10120.775)
-    "West Cottage Scraps 2": base_id + 1447, # ItemPickup283_5 Mine3_NPCHouseDetails (X=-73784.695 Y=-79414.359 Z=10128.285)
-    "West Cottage Scraps 3": base_id + 1448, # ItemPickup13_1 Mine3_NPCHouse (X=-73992.391 Y=-78600.094 Z=10162.495)
-    "West Cottage Scraps 4": base_id + 1449, # ItemPickup284_8 Mine3_NPCHouseDetails (X=-71623.000 Y=-75998.023 Z=10275.477)
-    "West Cottage Scraps 5": base_id + 1450 # ItemPickup282_2 Mine3_NPCHouseDetails (X=-72626.453 Y=-79391.070 Z=10211.037)
+    "West Cottage Gale Mission Start": base_id + 1446, # (dialog 10) -> mountain_ruin_key
+    "West Cottage Scraps 1": base_id + 1447, # ItemPickup15_3 Mine3_NPCHouse (X=-74407.695 Y=-81781.250 Z=10120.775)
+    "West Cottage Scraps 2": base_id + 1448, # ItemPickup283_5 Mine3_NPCHouseDetails (X=-73784.695 Y=-79414.359 Z=10128.285)
+    "West Cottage Scraps 3": base_id + 1449, # ItemPickup13_1 Mine3_NPCHouse (X=-73992.391 Y=-78600.094 Z=10162.495)
+    "West Cottage Scraps 4": base_id + 1450, # ItemPickup284_8 Mine3_NPCHouseDetails (X=-71623.000 Y=-75998.023 Z=10275.477)
+    "West Cottage Scraps 5": base_id + 1451 # ItemPickup282_2 Mine3_NPCHouseDetails (X=-72626.453 Y=-79391.070 Z=10211.037)
 }
 
 loc_caravan = {
-    "Caravan Scraps 1": base_id + 1451, # ItemPickup348_11 Secret10_PAth (X=-52638.109 Y=-43924.395 Z=10579.809)
-    "Caravan Scraps 2": base_id + 1452, # ItemPickup347_8 Secret10_PAth (X=-50203.695 Y=-42865.672 Z=10778.871)
-    "Caravan Scraps 3": base_id + 1453, # ItemPickup346_5 Secret10_PAth (X=-48467.738 Y=-42018.488 Z=10818.758)
-    "Caravan Scraps 4": base_id + 1454, # ItemPickup77_14 Secret10_Details (X=-46325.219 Y=-41707.512 Z=11003.229)
-    "Caravan Scraps 5": base_id + 1455, # ItemPickup345_2 Secret10_PAth (X=-44557.043 Y=-40652.930 Z=11076.221)
-    "Caravan Scraps 6": base_id + 1456, # ItemPickup76_11 Secret10_Details (X=-43380.664 Y=-38207.152 Z=11165.370)
-    "Caravan Scraps 7": base_id + 1457, # ItemPickup73_2 Secret10_Details (X=-42919.410 Y=-38797.738 Z=11265.633)
-    "Caravan Scraps 8": base_id + 1458, # ItemPickup74_5 Secret10_Details (X=-42787.523 Y=-38601.820 Z=11254.003)
-    "Caravan Scraps 9": base_id + 1459, # ItemPickup75_8 Secret10_Details (X=-42711.363 Y=-39141.523 Z=11173.905)
-    "Caravan Chest Scraps 1": base_id + 1460, # ItemPickup71561 Secret10_Details (X=-42910.668 Y=-38297.309 Z=11233.402)
-    "Caravan Chest Scraps 2": base_id + 1461, # ItemPickup078654 Secret10_Details (X=-42904.344 Y=-38307.332 Z=11219.678)
-    "Caravan Chest Scraps 3": base_id + 1462, # ItemPickup02345 Secret10_Details (X=-42904.965 Y=-38280.383 Z=11208.191)
-    "Caravan Chest Scraps 4": base_id + 1463, # ItemPickup-6546483648 Secret10_Details (X=-42911.680 Y=-38315.254 Z=11204.225)
-    "Caravan Chest Scraps 5": base_id + 1464 #  ItemPickup176752623547 Secret10_Details (X=-42905.090 Y=-38279.828 Z=11192.738)
+    "Caravan Scraps 1": base_id + 1452, # ItemPickup348_11 Secret10_PAth (X=-52638.109 Y=-43924.395 Z=10579.809)
+    "Caravan Scraps 2": base_id + 1453, # ItemPickup347_8 Secret10_PAth (X=-50203.695 Y=-42865.672 Z=10778.871)
+    "Caravan Scraps 3": base_id + 1454, # ItemPickup346_5 Secret10_PAth (X=-48467.738 Y=-42018.488 Z=10818.758)
+    "Caravan Scraps 4": base_id + 1455, # ItemPickup77_14 Secret10_Details (X=-46325.219 Y=-41707.512 Z=11003.229)
+    "Caravan Scraps 5": base_id + 1456, # ItemPickup345_2 Secret10_PAth (X=-44557.043 Y=-40652.930 Z=11076.221)
+    "Caravan Scraps 6": base_id + 1457, # ItemPickup76_11 Secret10_Details (X=-43380.664 Y=-38207.152 Z=11165.370)
+    "Caravan Scraps 7": base_id + 1458, # ItemPickup73_2 Secret10_Details (X=-42919.410 Y=-38797.738 Z=11265.633)
+    "Caravan Scraps 8": base_id + 1459, # ItemPickup74_5 Secret10_Details (X=-42787.523 Y=-38601.820 Z=11254.003)
+    "Caravan Scraps 9": base_id + 1460, # ItemPickup75_8 Secret10_Details (X=-42711.363 Y=-39141.523 Z=11173.905)
+    "Caravan Chest Scraps 1": base_id + 1461, # ItemPickup71561 Secret10_Details (X=-42910.668 Y=-38297.309 Z=11233.402)
+    "Caravan Chest Scraps 2": base_id + 1462, # ItemPickup078654 Secret10_Details (X=-42904.344 Y=-38307.332 Z=11219.678)
+    "Caravan Chest Scraps 3": base_id + 1463, # ItemPickup02345 Secret10_Details (X=-42904.965 Y=-38280.383 Z=11208.191)
+    "Caravan Chest Scraps 4": base_id + 1464, # ItemPickup-6546483648 Secret10_Details (X=-42911.680 Y=-38315.254 Z=11204.225)
+    "Caravan Chest Scraps 5": base_id + 1465 #  ItemPickup176752623547 Secret10_Details (X=-42905.090 Y=-38279.828 Z=11192.738)
 }
 
 loc_trailer_cabin = {
-    "Trailer Cabin Scraps 1": base_id + 1465, # ItemPickup493_17 TrailerCabin_Details (X=-50702.449 Y=-38850.020 Z=10810.316)
-    "Trailer Cabin Scraps 2": base_id + 1466, # ItemPickup489_5 TrailerCabin_Details (X=-51365.684 Y=-38502.379 Z=10875.761)
-    "Trailer Cabin Scraps 3": base_id + 1467, # ItemPickup491_11 TrailerCabin_Details (X=-52397.570 Y=-37530.145 Z=10873.624)
-    "Trailer Cabin Scraps 4": base_id + 1468, # ItemPickup490_8 TrailerCabin_Details (X=-50625.746 Y=-37916.758 Z=10886.909)
-    "Trailer Cabin Scraps 5": base_id + 1469, # ItemPickup488_2 TrailerCabin_Details (X=-51201.051 Y=-37467.137 Z=10910.795)
-    "Trailer Cabin Scraps 6": base_id + 1470 # ItemPickup492_14 TrailerCabin_Details (X=-51891.320 Y=-40549.492 Z=10675.211)
+    "Trailer Cabin Scraps 1": base_id + 1466, # ItemPickup493_17 TrailerCabin_Details (X=-50702.449 Y=-38850.020 Z=10810.316)
+    "Trailer Cabin Scraps 2": base_id + 1467, # ItemPickup489_5 TrailerCabin_Details (X=-51365.684 Y=-38502.379 Z=10875.761)
+    "Trailer Cabin Scraps 3": base_id + 1468, # ItemPickup491_11 TrailerCabin_Details (X=-52397.570 Y=-37530.145 Z=10873.624)
+    "Trailer Cabin Scraps 4": base_id + 1469, # ItemPickup490_8 TrailerCabin_Details (X=-50625.746 Y=-37916.758 Z=10886.909)
+    "Trailer Cabin Scraps 5": base_id + 1470, # ItemPickup488_2 TrailerCabin_Details (X=-51201.051 Y=-37467.137 Z=10910.795)
+    "Trailer Cabin Scraps 6": base_id + 1471 # ItemPickup492_14 TrailerCabin_Details (X=-51891.320 Y=-40549.492 Z=10675.211)
 }
 
 loc_towers = {
-    "Towers Scraps 1": base_id + 1471, # ItemPickup486_32 Towers_Environment_Details (X=-24434.766 Y=-25708.373 Z=11200.865)
-    "Towers Scraps 2": base_id + 1472, # ItemPickup483_23 Towers_Environment_Details (X=-20970.262 Y=-25678.754 Z=11731.241)
-    "Towers Scraps 3": base_id + 1473, # ItemPickup481_17 Towers_Environment_Details (X=-19812.230 Y=-27768.301 Z=12051.623)
-    "Towers Scraps 4": base_id + 1474, # ItemPickup484_26 Towers_Environment_Details (X=-19940.912 Y=-25411.576 Z=12035.366)
-    "Towers Scraps 5": base_id + 1475, # ItemPickup41_17 Towers_Environment (X=-18596.791 Y=-25100.035 Z=12290.350)
-    "Towers Scraps 6": base_id + 1476, # ItemPickup482_20 Towers_Environment_Details (X=-23302.396 Y=-23270.324 Z=12036.164)
-    "Towers Scraps 7": base_id + 1477, # ItemPickup487_35 Towers_Environment_Details (X=-22955.039 Y=-27576.859 Z=11211.258)
-    "Towers Scraps 8": base_id + 1478, # ItemPickup478_8 Towers_Environment_Details (X=-21485.520 Y=-29634.893 Z=11787.103)
-    "Towers Scraps 9": base_id + 1479, # ItemPickup477_5 Towers_Environment_Details (X=-23667.957 Y=-29825.240 Z=12035.269)
-    "Towers Scraps 10": base_id + 1480, # ItemPickup39_11 Towers_Environment (X=-25361.008 Y=-29794.301 Z=12026.073)
-    "Towers Scraps 11": base_id + 1481, # ItemPickup476_2 Towers_Environment_Details (X=-26549.584 Y=-32768.133 Z=12289.732)
-    "Towers Scraps 12": base_id + 1482, # ItemPickup38_8 Towers_Environment (X=-27240.127 Y=-27404.748 Z=12027.208)
-    "Towers Scraps 13": base_id + 1483, # ItemPickup40_14 Towers_Environment (X=-23231.639 Y=-27799.158 Z=11829.792)
-    "Towers Scraps 14": base_id + 1484, # ItemPickup485_29 Towers_Environment_Details (X=-22949.568 Y=-26146.012 Z=11702.730)
-    "Towers Scraps 15": base_id + 1485, # ItemPickup479_11 Towers_Environment_Details (X=-19726.715 Y=-32464.682 Z=12118.678)
-    "Towers Scraps 16": base_id + 1486, # ItemPickup1366543 Tower_BuildingsExteriorDetails (X=-23495.104 Y=-27644.689 Z=11872.844)
-    "Towers Scraps 17": base_id + 1487, # ItemPickup139978 Tower_BuildingsExteriorDetails (X=-23512.971 Y=-27493.051 Z=12218.543)
-    "Towers Scraps 18": base_id + 1488, # ItemPickup42_20 Towers_Environment (X=-22731.439 Y=-26331.393 Z=12102.758)
-    "Towers Scraps 19": base_id + 1489, # ItemPickup131123 Tower_BuildingsExteriorDetails (X=-22599.641 Y=-26454.590 Z=11752.040)
-    "Towers Scraps 20": base_id + 1490, # ItemPickup196987 Tower_BuildingsExteriorDetails (X=-22589.721 Y=-26397.414 Z=12571.282)
-    "Towers Scraps 21": base_id + 1491, # ItemPickup138787 Tower_BuildingsExteriorDetails (X=-22163.268 Y=-26775.938 Z=13107.048)
-    "Towers Scraps 22": base_id + 1492, # ItemPickup43_23 Towers_Environment (X=-21996.184 Y=-26754.393 Z=13105.997)
-    "Towers Scraps 23": base_id + 1493, # ItemPickup837454 Tower_BuildingsExteriorDetails (X=-24068.221 Y=-27874.443 Z=12819.666)
-    "Towers Scraps 24": base_id + 1494, # ItemPickup44_29 Towers_Environment (X=-23525.330 Y=-27770.035 Z=12612.871)
-    "Towers Scraps 25": base_id + 1495, # ItemPickup18932 Tower_BuildingsExteriorDetails (X=-23472.215 Y=-27617.404 Z=13213.256)
-    "Towers Scraps 26": base_id + 1496, # ItemPickup188348 Tower_BuildingsExteriorDetails (X=-23981.588 Y=-27984.385 Z=13219.854)
-    "Towers Scraps 27": base_id + 1497, # ItemPickup480_14 Towers_Environment_Details (X=-18696.230 Y=-34511.277 Z=12704.238)
-    "Towers Lime Paint Can": base_id + 1498, # PaintCan_2 Towers_BuildingsDetails (X=-22288.555 Y=-26022.281 Z=11835.892) \!/ Existing match 5
-    "Towers Employment Contracts": base_id + 1499, # Towers_Files_Pickup Tower_BuildingsExteriorDetails (X=-24081.414 Y=-27637.459 Z=13679.163)
-    "Towers Ronny Mission End": base_id + 1500 # (dialog 3) -> 1_scraps_reward
+    "Towers Scraps 1": base_id + 1472, # ItemPickup486_32 Towers_Environment_Details (X=-24434.766 Y=-25708.373 Z=11200.865)
+    "Towers Scraps 2": base_id + 1473, # ItemPickup483_23 Towers_Environment_Details (X=-20970.262 Y=-25678.754 Z=11731.241)
+    "Towers Scraps 3": base_id + 1474, # ItemPickup481_17 Towers_Environment_Details (X=-19812.230 Y=-27768.301 Z=12051.623)
+    "Towers Scraps 4": base_id + 1475, # ItemPickup484_26 Towers_Environment_Details (X=-19940.912 Y=-25411.576 Z=12035.366)
+    "Towers Scraps 5": base_id + 1476, # ItemPickup41_17 Towers_Environment (X=-18596.791 Y=-25100.035 Z=12290.350)
+    "Towers Scraps 6": base_id + 1477, # ItemPickup482_20 Towers_Environment_Details (X=-23302.396 Y=-23270.324 Z=12036.164)
+    "Towers Scraps 7": base_id + 1478, # ItemPickup487_35 Towers_Environment_Details (X=-22955.039 Y=-27576.859 Z=11211.258)
+    "Towers Scraps 8": base_id + 1479, # ItemPickup478_8 Towers_Environment_Details (X=-21485.520 Y=-29634.893 Z=11787.103)
+    "Towers Scraps 9": base_id + 1480, # ItemPickup477_5 Towers_Environment_Details (X=-23667.957 Y=-29825.240 Z=12035.269)
+    "Towers Scraps 10": base_id + 1481, # ItemPickup39_11 Towers_Environment (X=-25361.008 Y=-29794.301 Z=12026.073)
+    "Towers Scraps 11": base_id + 1482, # ItemPickup476_2 Towers_Environment_Details (X=-26549.584 Y=-32768.133 Z=12289.732)
+    "Towers Scraps 12": base_id + 1483, # ItemPickup38_8 Towers_Environment (X=-27240.127 Y=-27404.748 Z=12027.208)
+    "Towers Scraps 13": base_id + 1484, # ItemPickup40_14 Towers_Environment (X=-23231.639 Y=-27799.158 Z=11829.792)
+    "Towers Scraps 14": base_id + 1485, # ItemPickup485_29 Towers_Environment_Details (X=-22949.568 Y=-26146.012 Z=11702.730)
+    "Towers Scraps 15": base_id + 1486, # ItemPickup479_11 Towers_Environment_Details (X=-19726.715 Y=-32464.682 Z=12118.678)
+    "Towers Scraps 16": base_id + 1487, # ItemPickup1366543 Tower_BuildingsExteriorDetails (X=-23495.104 Y=-27644.689 Z=11872.844)
+    "Towers Scraps 17": base_id + 1488, # ItemPickup139978 Tower_BuildingsExteriorDetails (X=-23512.971 Y=-27493.051 Z=12218.543)
+    "Towers Scraps 18": base_id + 1489, # ItemPickup42_20 Towers_Environment (X=-22731.439 Y=-26331.393 Z=12102.758)
+    "Towers Scraps 19": base_id + 1490, # ItemPickup131123 Tower_BuildingsExteriorDetails (X=-22599.641 Y=-26454.590 Z=11752.040)
+    "Towers Scraps 20": base_id + 1491, # ItemPickup196987 Tower_BuildingsExteriorDetails (X=-22589.721 Y=-26397.414 Z=12571.282)
+    "Towers Scraps 21": base_id + 1492, # ItemPickup138787 Tower_BuildingsExteriorDetails (X=-22163.268 Y=-26775.938 Z=13107.048)
+    "Towers Scraps 22": base_id + 1493, # ItemPickup43_23 Towers_Environment (X=-21996.184 Y=-26754.393 Z=13105.997)
+    "Towers Scraps 23": base_id + 1494, # ItemPickup837454 Tower_BuildingsExteriorDetails (X=-24068.221 Y=-27874.443 Z=12819.666)
+    "Towers Scraps 24": base_id + 1495, # ItemPickup44_29 Towers_Environment (X=-23525.330 Y=-27770.035 Z=12612.871)
+    "Towers Scraps 25": base_id + 1496, # ItemPickup18932 Tower_BuildingsExteriorDetails (X=-23472.215 Y=-27617.404 Z=13213.256)
+    "Towers Scraps 26": base_id + 1497, # ItemPickup188348 Tower_BuildingsExteriorDetails (X=-23981.588 Y=-27984.385 Z=13219.854)
+    "Towers Scraps 27": base_id + 1498, # ItemPickup480_14 Towers_Environment_Details (X=-18696.230 Y=-34511.277 Z=12704.238)
+    "Towers Lime Paint Can": base_id + 1499, # PaintCan_2 Towers_BuildingsDetails (X=-22288.555 Y=-26022.281 Z=11835.892) \!/ Existing match 5
+    "Towers Employment Contracts": base_id + 1500, # Towers_Files_Pickup Tower_BuildingsExteriorDetails (X=-24081.414 Y=-27637.459 Z=13679.163)
+    "Towers Ronny Mission End": base_id + 1501 # (dialog 3) -> 1_scraps_reward
 }
 
 loc_north_beach = {
-    "North Beach Chest Scraps 1": base_id + 1501, # ItemPickup9254 Secret3_CampDetails (X=-74444.648 Y=-130627.672 Z=8793.757)
-    "North Beach Chest Scraps 2": base_id + 1502, # ItemPickup14523 Secret3_CampDetails (X=-74426.539 Y=-130626.547 Z=8781.948)
-    "North Beach Chest Scraps 3": base_id + 1503, # ItemPickup084537 Secret3_CampDetails (X=-74448.852 Y=-130632.367 Z=8772.555)
-    "North Beach Chest Scraps 4": base_id + 1504, # ItemPickup17754234 Secret3_CampDetails (X=-74425.523 Y=-130622.875 Z=8755.526)
-    "North Beach Scraps 1": base_id + 1505, # ItemPickup376_5 Secret3_CampDetails (X=-75003.078 Y=-131084.016 Z=8729.731)
-    "North Beach Scraps 2": base_id + 1506, # ItemPickup378_11 Secret3_CampDetails (X=-75477.758 Y=-129413.750 Z=9082.617)
-    "North Beach Scraps 3": base_id + 1507, # ItemPickup377_8 Secret3_CampDetails (X=-75608.453 Y=-130483.430 Z=8909.659)
-    "North Beach Scraps 4": base_id + 1508, # ItemPickup375_2 Secret3_CampDetails (X=-74143.469 Y=-131117.953 Z=8752.130)
-    "North Beach Scraps 5": base_id + 1509, # ItemPickup387_6 Secret4_BeachHouseMain (X=-80847.078 Y=-135628.719 Z=7915.444)
-    "North Beach Scraps 6": base_id + 1510, # ItemPickup386_3 Secret4_BeachHouseMain (X=-84044.789 Y=-137591.000 Z=7359.172)
-    "North Beach Scraps 7": base_id + 1511, # ItemPickup379_2 Secret4_BeachHouseDetails (X=-83992.836 Y=-132933.531 Z=7941.225)
-    "North Beach Scraps 8": base_id + 1512, # ItemPickup380_5 Secret4_BeachHouseDetails (X=-87355.734 Y=-134216.438 Z=7237.310)
-    "North Beach Scraps 9": base_id + 1513, # ItemPickup384_17 Secret4_BeachHouseDetails (X=-89213.844 Y=-134625.922 Z=7185.133)
-    "North Beach Scraps 10": base_id + 1514, # ItemPickup25_0 Secret4_BeachHouseDetails (X=-88423.430 Y=-135922.969 Z=7290.801)
-    "North Beach Scraps 11": base_id + 1515, # ItemPickup381_8 Secret4_BeachHouseDetails (X=-87668.977 Y=-136850.359 Z=7275.346)
-    "North Beach Scraps 12": base_id + 1516, # ItemPickup383_14 Secret4_BeachHouseDetails (X=-90241.328 Y=-136381.000 Z=7199.622)
-    "North Beach Scraps 13": base_id + 1517, # ItemPickup27_8 Secret4_BeachHouseDetails (X=-91728.680 Y=-135288.203 Z=7319.699)
-    "North Beach Scraps 14": base_id + 1518, # ItemPickup26_2 Secret4_BeachHouseDetails (X=-88789.039 Y=-135461.719 Z=7305.800)
-    "North Beach Scraps 15": base_id + 1519, # ItemPickup382_11 Secret4_BeachHouseDetails (X=-88572.078 Y=-135970.734 Z=7302.674)
-    "North Beach Teal Paint Can": base_id + 1520 # PaintCan_2 Secret4_BeachHouseDetails (X=-91706.805 Y=-134988.453 Z=7347.827) \!/ Existing match 5
+    "North Beach Chest Scraps 1": base_id + 1502, # ItemPickup9254 Secret3_CampDetails (X=-74444.648 Y=-130627.672 Z=8793.757)
+    "North Beach Chest Scraps 2": base_id + 1503, # ItemPickup14523 Secret3_CampDetails (X=-74426.539 Y=-130626.547 Z=8781.948)
+    "North Beach Chest Scraps 3": base_id + 1504, # ItemPickup084537 Secret3_CampDetails (X=-74448.852 Y=-130632.367 Z=8772.555)
+    "North Beach Chest Scraps 4": base_id + 1505, # ItemPickup17754234 Secret3_CampDetails (X=-74425.523 Y=-130622.875 Z=8755.526)
+    "North Beach Scraps 1": base_id + 1506, # ItemPickup376_5 Secret3_CampDetails (X=-75003.078 Y=-131084.016 Z=8729.731)
+    "North Beach Scraps 2": base_id + 1507, # ItemPickup378_11 Secret3_CampDetails (X=-75477.758 Y=-129413.750 Z=9082.617)
+    "North Beach Scraps 3": base_id + 1508, # ItemPickup377_8 Secret3_CampDetails (X=-75608.453 Y=-130483.430 Z=8909.659)
+    "North Beach Scraps 4": base_id + 1509, # ItemPickup375_2 Secret3_CampDetails (X=-74143.469 Y=-131117.953 Z=8752.130)
+    "North Beach Scraps 5": base_id + 1510, # ItemPickup387_6 Secret4_BeachHouseMain (X=-80847.078 Y=-135628.719 Z=7915.444)
+    "North Beach Scraps 6": base_id + 1511, # ItemPickup386_3 Secret4_BeachHouseMain (X=-84044.789 Y=-137591.000 Z=7359.172)
+    "North Beach Scraps 7": base_id + 1512, # ItemPickup379_2 Secret4_BeachHouseDetails (X=-83992.836 Y=-132933.531 Z=7941.225)
+    "North Beach Scraps 8": base_id + 1513, # ItemPickup380_5 Secret4_BeachHouseDetails (X=-87355.734 Y=-134216.438 Z=7237.310)
+    "North Beach Scraps 9": base_id + 1514, # ItemPickup384_17 Secret4_BeachHouseDetails (X=-89213.844 Y=-134625.922 Z=7185.133)
+    "North Beach Scraps 10": base_id + 1515, # ItemPickup25_0 Secret4_BeachHouseDetails (X=-88423.430 Y=-135922.969 Z=7290.801)
+    "North Beach Scraps 11": base_id + 1516, # ItemPickup381_8 Secret4_BeachHouseDetails (X=-87668.977 Y=-136850.359 Z=7275.346)
+    "North Beach Scraps 12": base_id + 1517, # ItemPickup383_14 Secret4_BeachHouseDetails (X=-90241.328 Y=-136381.000 Z=7199.622)
+    "North Beach Scraps 13": base_id + 1518, # ItemPickup27_8 Secret4_BeachHouseDetails (X=-91728.680 Y=-135288.203 Z=7319.699)
+    "North Beach Scraps 14": base_id + 1519, # ItemPickup26_2 Secret4_BeachHouseDetails (X=-88789.039 Y=-135461.719 Z=7305.800)
+    "North Beach Scraps 15": base_id + 1520, # ItemPickup382_11 Secret4_BeachHouseDetails (X=-88572.078 Y=-135970.734 Z=7302.674)
+    "North Beach Teal Paint Can": base_id + 1521 # PaintCan_2 Secret4_BeachHouseDetails (X=-91706.805 Y=-134988.453 Z=7347.827) \!/ Existing match 5
     # "North Beach Scraps Glitch 1" ItemPickup385_20 (X=-77651.938 Y=-139721.453 Z=7261.729) /!\ Glitched scrap
 }
 
 loc_mine_shaft = {
-    "Mine Shaft Chest Scraps 1": base_id + 1521, # ItemPickup0934569 Secret13_Details (X=-17360.789 Y=-74064.367 Z=8038.313)
-    "Mine Shaft Chest Scraps 2": base_id + 1522, # ItemPickup17234455622 Secret13_Details (X=-17360.814 Y=-74064.367 Z=8024.187)
-    "Mine Shaft Chest Scraps 3": base_id + 1523, # ItemPickup856743 Secret13_Details (X=-17361.059 Y=-74049.234 Z=8015.940)
-    "Mine Shaft Chest Scraps 4": base_id + 1524, # ItemPickup16456456 Secret13_Details (X=-17336.465 Y=-74087.063 Z=8009.707)
-    "Mine Shaft Chest Scraps 5": base_id + 1525, # ItemPickup234743 Secret13_Details (X=-17349.941 Y=-74075.484 Z=8004.179)
-    "Mine Shaft Chest Scraps 6": base_id + 1526, # ItemPickup1434563456 Secret13_Details (X=-17361.084 Y=-74049.234 Z=8001.814)
-    "Mine Shaft Chest Scraps 7": base_id + 1527, # ItemPickup13634563456 Secret13_Details (X=-17349.967 Y=-74075.484 Z=7990.054)
-    "Mine Shaft Scraps 1": base_id + 1528, # ItemPickup369_23 Secret13_Details (X=-16985.645 Y=-70377.273 Z=10837.127)
-    "Mine Shaft Scraps 2": base_id + 1529, # ItemPickup368_20 Secret13_Details (X=-18292.045 Y=-71003.563 Z=10975.308)
-    "Mine Shaft Scraps 3": base_id + 1530, # ItemPickup367_17 Secret13_Details (X=-16150.797 Y=-72075.289 Z=10609.141)
-    "Mine Shaft Scraps 4": base_id + 1531, # ItemPickup24456463 Secret13_EntranceDetails1 (X=-18404.480 Y=-71894.367 Z=10968.230)
-    "Mine Shaft Scraps 5": base_id + 1532, # ItemPickup2565644 Secret13_Details (X=-17777.268 Y=-71467.172 Z=10441.745)
-    "Mine Shaft Scraps 6": base_id + 1533, # ItemPickup366_14 Secret13_Details (X=-17630.971 Y=-72800.641 Z=8842.322)
-    "Mine Shaft Scraps 7": base_id + 1534, # ItemPickup18_8 Secret13_Details (X=-17979.719 Y=-73413.563 Z=8118.260)
-    "Mine Shaft Scraps 8": base_id + 1535, # ItemPickup21_11 Secret13_Details (X=-16554.467 Y=-74139.781 Z=7892.738)
-    "Mine Shaft Scraps 9": base_id + 1536, # ItemPickup365_11 Secret13_Details (X=-16343.033 Y=-74617.555 Z=7298.177)
-    "Mine Shaft Scraps 10": base_id + 1537, # ItemPickup22123 Secret13_Details (X=-12390.332 Y=-77620.320 Z=7324.504)
-    "Mine Shaft Scraps 11": base_id + 1538, # ItemPickup364_8 Secret13_Details (X=-10969.702 Y=-77961.477 Z=7297.171)
-    "Mine Shaft Scraps 12": base_id + 1539, # ItemPickup363_5 Secret13_Details (X=-9888.596 Y=-78208.930 Z=7269.473)
-    "Mine Shaft Scraps 13": base_id + 1540, # ItemPickup362_2 Secret13_Details (X=-8865.696 Y=-79063.977 Z=7247.677)
-    "Mine Shaft Scraps 14": base_id + 1541 # ItemPickup238976 Secret13_ExitDetails (X=-8143.984 Y=-79764.617 Z=7222.096)
+    "Mine Shaft Chest Scraps 1": base_id + 1522, # ItemPickup0934569 Secret13_Details (X=-17360.789 Y=-74064.367 Z=8038.313)
+    "Mine Shaft Chest Scraps 2": base_id + 1523, # ItemPickup17234455622 Secret13_Details (X=-17360.814 Y=-74064.367 Z=8024.187)
+    "Mine Shaft Chest Scraps 3": base_id + 1524, # ItemPickup856743 Secret13_Details (X=-17361.059 Y=-74049.234 Z=8015.940)
+    "Mine Shaft Chest Scraps 4": base_id + 1525, # ItemPickup16456456 Secret13_Details (X=-17336.465 Y=-74087.063 Z=8009.707)
+    "Mine Shaft Chest Scraps 5": base_id + 1526, # ItemPickup234743 Secret13_Details (X=-17349.941 Y=-74075.484 Z=8004.179)
+    "Mine Shaft Chest Scraps 6": base_id + 1527, # ItemPickup1434563456 Secret13_Details (X=-17361.084 Y=-74049.234 Z=8001.814)
+    "Mine Shaft Chest Scraps 7": base_id + 1528, # ItemPickup13634563456 Secret13_Details (X=-17349.967 Y=-74075.484 Z=7990.054)
+    "Mine Shaft Scraps 1": base_id + 1529, # ItemPickup369_23 Secret13_Details (X=-16985.645 Y=-70377.273 Z=10837.127)
+    "Mine Shaft Scraps 2": base_id + 1530, # ItemPickup368_20 Secret13_Details (X=-18292.045 Y=-71003.563 Z=10975.308)
+    "Mine Shaft Scraps 3": base_id + 1531, # ItemPickup367_17 Secret13_Details (X=-16150.797 Y=-72075.289 Z=10609.141)
+    "Mine Shaft Scraps 4": base_id + 1532, # ItemPickup24456463 Secret13_EntranceDetails1 (X=-18404.480 Y=-71894.367 Z=10968.230)
+    "Mine Shaft Scraps 5": base_id + 1533, # ItemPickup2565644 Secret13_Details (X=-17777.268 Y=-71467.172 Z=10441.745)
+    "Mine Shaft Scraps 6": base_id + 1534, # ItemPickup366_14 Secret13_Details (X=-17630.971 Y=-72800.641 Z=8842.322)
+    "Mine Shaft Scraps 7": base_id + 1535, # ItemPickup18_8 Secret13_Details (X=-17979.719 Y=-73413.563 Z=8118.260)
+    "Mine Shaft Scraps 8": base_id + 1536, # ItemPickup21_11 Secret13_Details (X=-16554.467 Y=-74139.781 Z=7892.738)
+    "Mine Shaft Scraps 9": base_id + 1537, # ItemPickup365_11 Secret13_Details (X=-16343.033 Y=-74617.555 Z=7298.177)
+    "Mine Shaft Scraps 10": base_id + 1538, # ItemPickup22123 Secret13_Details (X=-12390.332 Y=-77620.320 Z=7324.504)
+    "Mine Shaft Scraps 11": base_id + 1539, # ItemPickup364_8 Secret13_Details (X=-10969.702 Y=-77961.477 Z=7297.171)
+    "Mine Shaft Scraps 12": base_id + 1540, # ItemPickup363_5 Secret13_Details (X=-9888.596 Y=-78208.930 Z=7269.473)
+    "Mine Shaft Scraps 13": base_id + 1541, # ItemPickup362_2 Secret13_Details (X=-8865.696 Y=-79063.977 Z=7247.677)
+    "Mine Shaft Scraps 14": base_id + 1542 # ItemPickup238976 Secret13_ExitDetails (X=-8143.984 Y=-79764.617 Z=7222.096)
 }
 
 loc_mob_camp = {
-    "Mob Camp Key": base_id + 1542, # ItemPickup29_0 Bob_CampDetails2 (X=-29114.480 Y=-53608.520 Z=12839.528)
-    "Mob Camp Scraps 1": base_id + 1543, # ItemPickup25_5 Bob_CampDetails2 (X=-27373.525 Y=-53008.668 Z=12706.465)
-    "Mob Camp Scraps 2": base_id + 1544, # ItemPickup26_1 Bob_CampDetails2 (X=-28786.941 Y=-53009.762 Z=12760.727)
-    "Mob Camp Scraps 3": base_id + 1545, # ItemPickup13_14 Mine3_Mountain (X=-29650.207 Y=-53328.070 Z=12724.598)
-    "Mob Camp Scraps 4": base_id + 1546, # ItemPickup90_5 Bob_CampDetails2 (X=-31515.057 Y=-55533.324 Z=12344.274)
-    "Mob Camp Scraps 5": base_id + 1547, # ItemPickup49513294 Mine3_Mountain (X=-31847.229 Y=-55152.352 Z=11574.255)
-    "Mob Camp Scraps 6": base_id + 1548, # ItemPickup92_14 Bob_CampDetails2 (X=-31323.533 Y=-55432.871 Z=11245.139)
-    "Mob Camp Scraps 7": base_id + 1549, # ItemPickup91_8 Bob_CampDetails2 (X=-31583.443 Y=-55475.805 Z=11234.112)
-    "Mob Camp Scraps 8": base_id + 1550, # ItemPickup95_23 Bob_CampDetails2 (X=-32925.406 Y=-57157.605 Z=11086.322)
-    "Mob Camp Scraps 9": base_id + 1551, # ItemPickup96_26 Bob_CampDetails2 (X=-33052.488 Y=-58560.098 Z=11101.021)
-    "Mob Camp Scraps 10": base_id + 1552, # ItemPickup13121212 Mine3_Mountain (X=-32422.406 Y=-60145.063 Z=11203.182)
-    "Mob Camp Scraps 11": base_id + 1553, # ItemPickup93_17 Bob_CampDetails2 (X=-30891.457 Y=-60046.465 Z=11237.567)
-    "Mob Camp Scraps 12": base_id + 1554, # ItemPickup97_29 Bob_CampDetails2 (X=-31888.428 Y=-59222.645 Z=11179.302)
-    "Mob Camp Scraps 13": base_id + 1555, # ItemPickup62156 Mine3_Mountain (X=-31161.750 Y=-57410.789 Z=11279.820)
-    "Mob Camp Scraps 14": base_id + 1556, # ItemPickup24_3 Bob_CampDetails2 (X=-31256.545 Y=-59865.809 Z=11904.155)
-    "Mob Camp Scraps 15": base_id + 1557, # ItemPickup27_0 Bob_CampDetails2 (X=-31757.953 Y=-57179.258 Z=11295.150)
-    "Mob Camp Scraps 16": base_id + 1558 # ItemPickup89_2 Bob_CampDetails2 (X=-29137.043 Y=-54824.797 Z=12418.673)
+    "Mob Camp Key": base_id + 1543, # ItemPickup29_0 Bob_CampDetails2 (X=-29114.480 Y=-53608.520 Z=12839.528)
+    "Mob Camp Scraps 1": base_id + 1544, # ItemPickup25_5 Bob_CampDetails2 (X=-27373.525 Y=-53008.668 Z=12706.465)
+    "Mob Camp Scraps 2": base_id + 1545, # ItemPickup26_1 Bob_CampDetails2 (X=-28786.941 Y=-53009.762 Z=12760.727)
+    "Mob Camp Scraps 3": base_id + 1546, # ItemPickup13_14 Mine3_Mountain (X=-29650.207 Y=-53328.070 Z=12724.598)
+    "Mob Camp Scraps 4": base_id + 1547, # ItemPickup90_5 Bob_CampDetails2 (X=-31515.057 Y=-55533.324 Z=12344.274)
+    "Mob Camp Scraps 5": base_id + 1548, # ItemPickup49513294 Mine3_Mountain (X=-31847.229 Y=-55152.352 Z=11574.255)
+    "Mob Camp Scraps 6": base_id + 1549, # ItemPickup92_14 Bob_CampDetails2 (X=-31323.533 Y=-55432.871 Z=11245.139)
+    "Mob Camp Scraps 7": base_id + 1550, # ItemPickup91_8 Bob_CampDetails2 (X=-31583.443 Y=-55475.805 Z=11234.112)
+    "Mob Camp Scraps 8": base_id + 1551, # ItemPickup95_23 Bob_CampDetails2 (X=-32925.406 Y=-57157.605 Z=11086.322)
+    "Mob Camp Scraps 9": base_id + 1552, # ItemPickup96_26 Bob_CampDetails2 (X=-33052.488 Y=-58560.098 Z=11101.021)
+    "Mob Camp Scraps 10": base_id + 1553, # ItemPickup13121212 Mine3_Mountain (X=-32422.406 Y=-60145.063 Z=11203.182)
+    "Mob Camp Scraps 11": base_id + 1554, # ItemPickup93_17 Bob_CampDetails2 (X=-30891.457 Y=-60046.465 Z=11237.567)
+    "Mob Camp Scraps 12": base_id + 1555, # ItemPickup97_29 Bob_CampDetails2 (X=-31888.428 Y=-59222.645 Z=11179.302)
+    "Mob Camp Scraps 13": base_id + 1556, # ItemPickup62156 Mine3_Mountain (X=-31161.750 Y=-57410.789 Z=11279.820)
+    "Mob Camp Scraps 14": base_id + 1557, # ItemPickup24_3 Bob_CampDetails2 (X=-31256.545 Y=-59865.809 Z=11904.155)
+    "Mob Camp Scraps 15": base_id + 1558, # ItemPickup27_0 Bob_CampDetails2 (X=-31757.953 Y=-57179.258 Z=11295.150)
+    "Mob Camp Scraps 16": base_id + 1559 # ItemPickup89_2 Bob_CampDetails2 (X=-29137.043 Y=-54824.797 Z=12418.673)
 }
 
 loc_mob_camp_locked_room = {
-    "Mob Camp Locked Room Scraps 1": base_id + 1559, # ItemPickup94_20 Bob_CampDetails2 (X=-31736.459 Y=-59761.465 Z=11211.379)
-    "Mob Camp Locked Room Scraps 2": base_id + 1560, # ItemPickup28_14 Bob_CampDetails2 (X=-32150.889 Y=-59879.594 Z=11297.058)
-    "Mob Camp Locked Room Stolen Bob": base_id + 1561 # Bob_Clickbox (X=-31771.172 Y=-59892.449 Z=11323.562)
+    "Mob Camp Locked Room Scraps 1": base_id + 1560, # ItemPickup94_20 Bob_CampDetails2 (X=-31736.459 Y=-59761.465 Z=11211.379)
+    "Mob Camp Locked Room Scraps 2": base_id + 1561, # ItemPickup28_14 Bob_CampDetails2 (X=-32150.889 Y=-59879.594 Z=11297.058)
+    "Mob Camp Locked Room Stolen Bob": base_id + 1562 # Bob_Clickbox (X=-31771.172 Y=-59892.449 Z=11323.562)
 }
 
 loc_mine_elevator_exit = {
-    "Mine Elevator Exit Scraps 1": base_id + 1562, # ItemPickup266_19 Mine3_ExitCampDetails (X=-29587.271 Y=-42650.797 Z=12515.042)
-    "Mine Elevator Exit Scraps 2": base_id + 1563, # ItemPickup265_16 Mine3_ExitCampDetails (X=-30727.555 Y=-42715.438 Z=12485.763)
-    "Mine Elevator Exit Scraps 3": base_id + 1564, # ItemPickup267_22 Mine3_ExitCampDetails (X=-29814.680 Y=-43722.777 Z=12518.878)
-    "Mine Elevator Exit Scraps 4": base_id + 1565, # ItemPickup261_2 Mine3_ExitCampDetails (X=-30983.000 Y=-42943.754 Z=12474.396)
-    "Mine Elevator Exit Scraps 5": base_id + 1566, # ItemPickup262_5 Mine3_ExitCampDetails (X=-31824.576 Y=-43997.270 Z=12345.908)
-    "Mine Elevator Exit Scraps 6": base_id + 1567, # ItemPickup268_25 Mine3_ExitCampDetails (X=-32553.924 Y=-44761.855 Z=12341.698)
-    "Mine Elevator Exit Scraps 7": base_id + 1568, # ItemPickup263_10 Mine3_ExitCampDetails (X=-33598.023 Y=-44369.297 Z=12438.430)
-    "Mine Elevator Exit Scraps 8": base_id + 1569, # ItemPickup264_13 Mine3_ExitCampDetails (X=-31947.459 Y=-42017.137 Z=12384.311)
-    "Mine Elevator Exit Scraps 9": base_id + 1570 # ItemPickup269_28 Mine3_ExitCampDetails (X=-30127.123 Y=-46004.891 Z=12229.104)
+    "Mine Elevator Exit Scraps 1": base_id + 1563, # ItemPickup266_19 Mine3_ExitCampDetails (X=-29587.271 Y=-42650.797 Z=12515.042)
+    "Mine Elevator Exit Scraps 2": base_id + 1564, # ItemPickup265_16 Mine3_ExitCampDetails (X=-30727.555 Y=-42715.438 Z=12485.763)
+    "Mine Elevator Exit Scraps 3": base_id + 1565, # ItemPickup267_22 Mine3_ExitCampDetails (X=-29814.680 Y=-43722.777 Z=12518.878)
+    "Mine Elevator Exit Scraps 4": base_id + 1566, # ItemPickup261_2 Mine3_ExitCampDetails (X=-30983.000 Y=-42943.754 Z=12474.396)
+    "Mine Elevator Exit Scraps 5": base_id + 1567, # ItemPickup262_5 Mine3_ExitCampDetails (X=-31824.576 Y=-43997.270 Z=12345.908)
+    "Mine Elevator Exit Scraps 6": base_id + 1568, # ItemPickup268_25 Mine3_ExitCampDetails (X=-32553.924 Y=-44761.855 Z=12341.698)
+    "Mine Elevator Exit Scraps 7": base_id + 1569, # ItemPickup263_10 Mine3_ExitCampDetails (X=-33598.023 Y=-44369.297 Z=12438.430)
+    "Mine Elevator Exit Scraps 8": base_id + 1570, # ItemPickup264_13 Mine3_ExitCampDetails (X=-31947.459 Y=-42017.137 Z=12384.311)
+    "Mine Elevator Exit Scraps 9": base_id + 1571 # ItemPickup269_28 Mine3_ExitCampDetails (X=-30127.123 Y=-46004.891 Z=12229.104)
 }
 
 loc_mountain_ruin_outside = {
-    "Mountain Ruin Outside Scraps 1": base_id + 1571, # ItemPickup112345556 Mine3_Outside (X=-2218.456 Y=-43914.789 Z=11238.952)
-    "Mountain Ruin Outside Scraps 2": base_id + 1572, # ItemPickup35621 Mine3_Outside (X=-2402.206 Y=-45494.766 Z=11244.650)
-    "Mountain Ruin Outside Scraps 3": base_id + 1573, # ItemPickup13000 Mine3_Outside (X=-2781.385 Y=-47365.313 Z=11235.389)
-    "Mountain Ruin Outside Scraps 4": base_id + 1574, # ItemPickup995959 Mine3_Outside (X=-2961.431 Y=-45445.973 Z=11255.289)
-    "Mountain Ruin Outside Scraps 5": base_id + 1575, # ItemPickup136999 Mine3_Outside (X=-5873.435 Y=-46300.633 Z=11228.667)
-    "Mountain Ruin Outside Scraps 6": base_id + 1576, # ItemPickup1589994 Mine3_Outside (X=-1823.357 Y=-47071.813 Z=11161.523)
-    "Mountain Ruin Outside Scraps 7": base_id + 1577, # ItemPickup09871230948 Mine3_Outside (X=-3478.155 Y=-49094.965 Z=11083.230)
-    "Mountain Ruin Outside Scraps 8": base_id + 1578, # ItemPickup258_20 Mine3_Camp (X=-4606.678 Y=-50246.180 Z=11613.938)
-    "Mountain Ruin Outside Scraps 9": base_id + 1579, # ItemPickup257_17 Mine3_Camp (X=-5454.638 Y=-53508.004 Z=12062.944)
-    "Mountain Ruin Outside Scraps 10": base_id + 1580, # ItemPickup18_3 Mine3_Camp (X=-8192.042 Y=-53726.535 Z=11947.394)
-    "Mountain Ruin Outside Scraps 11": base_id + 1581, # ItemPickup252_2 Mine3_Camp (X=-9409.834 Y=-53970.621 Z=11923.256)
-    "Mountain Ruin Outside Scraps 12": base_id + 1582, # ItemPickup254_8 Mine3_Camp (X=-8977.424 Y=-57134.637 Z=12232.596)
-    "Mountain Ruin Outside Scraps 13": base_id + 1583, # ItemPickup19_1 Mine3_Camp (X=-10449.292 Y=-56481.938 Z=12274.706)
-    "Mountain Ruin Outside Scraps 14": base_id + 1584, # ItemPickup255_11 Mine3_Camp (X=-10490.690 Y=-56584.301 Z=12281.096)
-    "Mountain Ruin Outside Scraps 15": base_id + 1585, # ItemPickup256_14 Mine3_Camp (X=-11600.937 Y=-55831.191 Z=12388.329)
-    "Mountain Ruin Outside Scraps 16": base_id + 1586, # ItemPickup259_23 Mine3_Camp (X=-3307.077 Y=-49973.461 Z=11282.041)
-    "Mountain Ruin Outside Scraps 17": base_id + 1587 # ItemPickup260_26 Mine3_Camp (X=-8878.345 Y=-49816.922 Z=13700.768)
+    "Mountain Ruin Outside Scraps 1": base_id + 1572, # ItemPickup112345556 Mine3_Outside (X=-2218.456 Y=-43914.789 Z=11238.952)
+    "Mountain Ruin Outside Scraps 2": base_id + 1573, # ItemPickup35621 Mine3_Outside (X=-2402.206 Y=-45494.766 Z=11244.650)
+    "Mountain Ruin Outside Scraps 3": base_id + 1574, # ItemPickup13000 Mine3_Outside (X=-2781.385 Y=-47365.313 Z=11235.389)
+    "Mountain Ruin Outside Scraps 4": base_id + 1575, # ItemPickup995959 Mine3_Outside (X=-2961.431 Y=-45445.973 Z=11255.289)
+    "Mountain Ruin Outside Scraps 5": base_id + 1576, # ItemPickup136999 Mine3_Outside (X=-5873.435 Y=-46300.633 Z=11228.667)
+    "Mountain Ruin Outside Scraps 6": base_id + 1577, # ItemPickup1589994 Mine3_Outside (X=-1823.357 Y=-47071.813 Z=11161.523)
+    "Mountain Ruin Outside Scraps 7": base_id + 1578, # ItemPickup09871230948 Mine3_Outside (X=-3478.155 Y=-49094.965 Z=11083.230)
+    "Mountain Ruin Outside Scraps 8": base_id + 1579, # ItemPickup258_20 Mine3_Camp (X=-4606.678 Y=-50246.180 Z=11613.938)
+    "Mountain Ruin Outside Scraps 9": base_id + 1580, # ItemPickup257_17 Mine3_Camp (X=-5454.638 Y=-53508.004 Z=12062.944)
+    "Mountain Ruin Outside Scraps 10": base_id + 1581, # ItemPickup18_3 Mine3_Camp (X=-8192.042 Y=-53726.535 Z=11947.394)
+    "Mountain Ruin Outside Scraps 11": base_id + 1582, # ItemPickup252_2 Mine3_Camp (X=-9409.834 Y=-53970.621 Z=11923.256)
+    "Mountain Ruin Outside Scraps 12": base_id + 1583, # ItemPickup254_8 Mine3_Camp (X=-8977.424 Y=-57134.637 Z=12232.596)
+    "Mountain Ruin Outside Scraps 13": base_id + 1584, # ItemPickup19_1 Mine3_Camp (X=-10449.292 Y=-56481.938 Z=12274.706)
+    "Mountain Ruin Outside Scraps 14": base_id + 1585, # ItemPickup255_11 Mine3_Camp (X=-10490.690 Y=-56584.301 Z=12281.096)
+    "Mountain Ruin Outside Scraps 15": base_id + 1586, # ItemPickup256_14 Mine3_Camp (X=-11600.937 Y=-55831.191 Z=12388.329)
+    "Mountain Ruin Outside Scraps 16": base_id + 1587, # ItemPickup259_23 Mine3_Camp (X=-3307.077 Y=-49973.461 Z=11282.041)
+    "Mountain Ruin Outside Scraps 17": base_id + 1588 # ItemPickup260_26 Mine3_Camp (X=-8878.345 Y=-49816.922 Z=13700.768)
 }
 
 loc_mountain_ruin_inside = {
-    "Mountain Ruin Inside Scraps 1": base_id + 1588, # ItemPickup253_5 Mine3_Camp (X=-10647.446 Y=-52039.848 Z=11925.344)
-    "Mountain Ruin Inside Scraps 2": base_id + 1589, # ItemPickup270_2 Mine3_Interior1 (X=-12834.990 Y=-48683.176 Z=10200.083)
-    "Mountain Ruin Inside Scraps 3": base_id + 1590, # ItemPickup271_5 Mine3_Interior1 (X=-15748.594 Y=-44925.523 Z=10199.975)
-    "Mountain Ruin Inside Scraps 4": base_id + 1591, # ItemPickup20_3 Mine3_Interior1 (X=-15312.152 Y=-43957.055 Z=10350.783)
-    "Mountain Ruin Inside Scraps 5": base_id + 1592, # ItemPickup273_11 Mine3_Interior1 (X=-16709.586 Y=-44997.316 Z=10198.888)
-    "Mountain Ruin Inside Scraps 6": base_id + 1593, # ItemPickup272_8 Mine3_Interior1 (X=-17412.561 Y=-46041.977 Z=10349.650)
-    "Mountain Ruin Inside Scraps 7": base_id + 1594, # ItemPickup274_14 Mine3_Interior1 (X=-17452.596 Y=-43804.941 Z=10201.436)
-    "Mountain Ruin Inside Scraps 8": base_id + 1595, # ItemPickup21_2 Mine3_Interior1 (X=-18119.473 Y=-42001.453 Z=10198.855)
-    "Mountain Ruin Inside Scraps 9": base_id + 1596, # ItemPickup276_20 Mine3_Interior1 (X=-18975.068 Y=-42906.488 Z=10279.690)
-    "Mountain Ruin Inside Scraps 10": base_id + 1597, # ItemPickup277_26 Mine3_Interior1 (X=-19727.902 Y=-41581.039 Z=10199.614)
-    "Mountain Ruin Inside Scraps 11": base_id + 1598, # ItemPickup275_17 Mine3_Interior1 (X=-19187.891 Y=-40516.941 Z=10201.049)
-    "Mountain Ruin Inside Scraps 12": base_id + 1599, # ItemPickup278_29 Mine3_Interior1 (X=-22470.986 Y=-41602.875 Z=10073.847)
-    "Mountain Ruin Inside Scraps 13": base_id + 1600, # ItemPickup279_2 Mine3_Interior2 (X=-23717.383 Y=-42597.141 Z=7455.452)
-    "Mountain Ruin Inside Scraps 14": base_id + 1601, # ItemPickup22_7 Mine3_Interior2 (X=-24494.582 Y=-44598.086 Z=7433.633)
-    "Mountain Ruin Inside Scraps 15": base_id + 1602, # ItemPickup280_5 Mine3_Interior2 (X=-26783.293 Y=-42331.145 Z=7446.357)
-    "Mountain Ruin Inside Scraps 16": base_id + 1603, # ItemPickup281_8 Mine3_Interior2 (X=-28636.996 Y=-46745.340 Z=7430.463)
-    "Mountain Ruin Inside Scraps 17": base_id + 1604, # ItemPickup23_1 Mine3_Interior2 (X=-27752.643 Y=-47453.973 Z=7445.047)
-    "Mountain Ruin Inside Red Egg": base_id + 1605, # Mine3_EggPickup Mine3_Interior2 (X=-28254.400 Y=-45702.844 Z=7551.568)
-    "Mountain Ruin Inside Red Paint Can": base_id + 1606 # PaintCan_2 Mine3_Interior2 (X=-31391.293 Y=-44953.223 Z=7448.648) \!/ Existing match 5
+    "Mountain Ruin Inside Scraps 1": base_id + 1589, # ItemPickup253_5 Mine3_Camp (X=-10647.446 Y=-52039.848 Z=11925.344)
+    "Mountain Ruin Inside Scraps 2": base_id + 1590, # ItemPickup270_2 Mine3_Interior1 (X=-12834.990 Y=-48683.176 Z=10200.083)
+    "Mountain Ruin Inside Scraps 3": base_id + 1591, # ItemPickup271_5 Mine3_Interior1 (X=-15748.594 Y=-44925.523 Z=10199.975)
+    "Mountain Ruin Inside Scraps 4": base_id + 1592, # ItemPickup20_3 Mine3_Interior1 (X=-15312.152 Y=-43957.055 Z=10350.783)
+    "Mountain Ruin Inside Scraps 5": base_id + 1593, # ItemPickup273_11 Mine3_Interior1 (X=-16709.586 Y=-44997.316 Z=10198.888)
+    "Mountain Ruin Inside Scraps 6": base_id + 1594, # ItemPickup272_8 Mine3_Interior1 (X=-17412.561 Y=-46041.977 Z=10349.650)
+    "Mountain Ruin Inside Scraps 7": base_id + 1595, # ItemPickup274_14 Mine3_Interior1 (X=-17452.596 Y=-43804.941 Z=10201.436)
+    "Mountain Ruin Inside Scraps 8": base_id + 1596, # ItemPickup21_2 Mine3_Interior1 (X=-18119.473 Y=-42001.453 Z=10198.855)
+    "Mountain Ruin Inside Scraps 9": base_id + 1597, # ItemPickup276_20 Mine3_Interior1 (X=-18975.068 Y=-42906.488 Z=10279.690)
+    "Mountain Ruin Inside Scraps 10": base_id + 1598, # ItemPickup277_26 Mine3_Interior1 (X=-19727.902 Y=-41581.039 Z=10199.614)
+    "Mountain Ruin Inside Scraps 11": base_id + 1599, # ItemPickup275_17 Mine3_Interior1 (X=-19187.891 Y=-40516.941 Z=10201.049)
+    "Mountain Ruin Inside Scraps 12": base_id + 1600, # ItemPickup278_29 Mine3_Interior1 (X=-22470.986 Y=-41602.875 Z=10073.847)
+    "Mountain Ruin Inside Scraps 13": base_id + 1601, # ItemPickup279_2 Mine3_Interior2 (X=-23717.383 Y=-42597.141 Z=7455.452)
+    "Mountain Ruin Inside Scraps 14": base_id + 1602, # ItemPickup22_7 Mine3_Interior2 (X=-24494.582 Y=-44598.086 Z=7433.633)
+    "Mountain Ruin Inside Scraps 15": base_id + 1603, # ItemPickup280_5 Mine3_Interior2 (X=-26783.293 Y=-42331.145 Z=7446.357)
+    "Mountain Ruin Inside Scraps 16": base_id + 1604, # ItemPickup281_8 Mine3_Interior2 (X=-28636.996 Y=-46745.340 Z=7430.463)
+    "Mountain Ruin Inside Scraps 17": base_id + 1605, # ItemPickup23_1 Mine3_Interior2 (X=-27752.643 Y=-47453.973 Z=7445.047)
+    "Mountain Ruin Inside Red Egg": base_id + 1606, # Mine3_EggPickup Mine3_Interior2 (X=-28254.400 Y=-45702.844 Z=7551.568)
+    "Mountain Ruin Inside Red Paint Can": base_id + 1607 # PaintCan_2 Mine3_Interior2 (X=-31391.293 Y=-44953.223 Z=7448.648) \!/ Existing match 5
 }
 
 loc_pickle_val = {
-    "Pickle Val Scraps 1": base_id + 1607, # ItemPickup56_2 Pickles_HouseDetails (X=60402.582 Y=25252.434 Z=11151.982)
-    "Pickle Val Scraps 2": base_id + 1608, # ItemPickup57_5 Pickles_HouseDetails (X=58717.516 Y=24457.180 Z=11343.938)
-    "Pickle Val Scraps 3": base_id + 1609, # ItemPickup311_14 Pickles_EnvironmentDetails (X=56455.688 Y=22324.875 Z=11655.192)
-    "Pickle Val Scraps 4": base_id + 1610, # ItemPickup310_11 Pickles_EnvironmentDetails (X=52888.387 Y=22541.955 Z=12428.012)
-    "Pickle Val Scraps 5": base_id + 1611, # ItemPickup58_2 Pickles_EnvironmentDetails (X=50374.863 Y=22073.027 Z=12591.468)
-    "Pickle Val Scraps 6": base_id + 1612, # ItemPickup309_8 Pickles_EnvironmentDetails (X=45985.988 Y=23063.826 Z=13043.497)
-    "Pickle Val Scraps 7": base_id + 1613, # ItemPickup316_27 Pickles_EnvironmentDetails (X=45533.469 Y=24876.168 Z=13015.539)
-    "Pickle Val Scraps 8": base_id + 1614, # ItemPickup317_30 Pickles_EnvironmentDetails (X=44928.848 Y=30913.396 Z=14273.230)
-    "Pickle Val Scraps 9": base_id + 1615, # ItemPickup321_42 Pickles_EnvironmentDetails (X=41572.684 Y=37403.539 Z=13527.379)
-    "Pickle Val Scraps 10": base_id + 1616, # ItemPickup61_11 Pickles_EnvironmentDetails (X=42266.566 Y=30556.238 Z=13584.196)
-    "Pickle Val Scraps 11": base_id + 1617, # ItemPickup314_21 Pickles_EnvironmentDetails (X=43356.219 Y=29465.746 Z=13449.486)
-    "Pickle Val Scraps 12": base_id + 1618, # ItemPickup323_48 Pickles_EnvironmentDetails (X=40893.461 Y=30669.398 Z=13465.039)
-    "Pickle Val Scraps 13": base_id + 1619, # ItemPickup318_33 Pickles_EnvironmentDetails (X=41276.863 Y=32313.068 Z=13480.846)
-    "Pickle Val Scraps 14": base_id + 1620, # ItemPickup319_36 Pickles_EnvironmentDetails (X=38630.031 Y=30471.996 Z=13571.207)
-    "Pickle Val Scraps 15": base_id + 1621, # ItemPickup320_39 Pickles_EnvironmentDetails (X=38596.938 Y=30050.293 Z=13559.574)
-    "Pickle Val Scraps 16": base_id + 1622, # ItemPickup60_8 Pickles_EnvironmentDetails (X=42042.520 Y=25136.820 Z=13077.339)
-    "Pickle Val Scraps 17": base_id + 1623, # ItemPickup308_5 Pickles_EnvironmentDetails (X=43770.914 Y=23307.234 Z=12374.002)
-    "Pickle Val Scraps 18": base_id + 1624, # ItemPickup59_5 Pickles_EnvironmentDetails (X=44672.641 Y=20936.520 Z=12198.017)
-    "Pickle Val Scraps 19": base_id + 1625, # ItemPickup307_2 Pickles_EnvironmentDetails (X=42844.730 Y=22869.387 Z=12832.900)
-    "Pickle Val Scraps 20": base_id + 1626, # ItemPickup315_24 Pickles_EnvironmentDetails (X=43397.758 Y=26367.248 Z=13005.097)
-    "Pickle Val Scraps 21": base_id + 1627, # ItemPickup322_45 Pickles_EnvironmentDetails (X=39352.430 Y=32668.316 Z=14494.778)
-    "Pickle Val Scraps 22": base_id + 1628, # ItemPickup313 Pickles_EnvironmentDetails (X=59688.781 Y=25266.756 Z=11425.324)
-    "Pickle Val Scraps 23": base_id + 1629, # ItemPickup312_17 Pickles_EnvironmentDetails (X=59197.871 Y=24760.773 Z=11425.324)
-    "Pickle Val Purple Paint Can": base_id + 1630, # PaintCan_7 Pickles_EnvironmentDetails (X=40394.855 Y=31546.465 Z=13472.573)
-    "Pickle Val Jar of Pickles": base_id + 1631, # Pickles_Pickup Pickles_Cave (X=38227.535 Y=30234.848 Z=13593.506)
-    "Pickle Val Pickle Lady Mission End": base_id + 1632 # (dialog 4) -> 30_scraps_reward
+    "Pickle Val Scraps 1": base_id + 1608, # ItemPickup56_2 Pickles_HouseDetails (X=60402.582 Y=25252.434 Z=11151.982)
+    "Pickle Val Scraps 2": base_id + 1609, # ItemPickup57_5 Pickles_HouseDetails (X=58717.516 Y=24457.180 Z=11343.938)
+    "Pickle Val Scraps 3": base_id + 1610, # ItemPickup311_14 Pickles_EnvironmentDetails (X=56455.688 Y=22324.875 Z=11655.192)
+    "Pickle Val Scraps 4": base_id + 1611, # ItemPickup310_11 Pickles_EnvironmentDetails (X=52888.387 Y=22541.955 Z=12428.012)
+    "Pickle Val Scraps 5": base_id + 1612, # ItemPickup58_2 Pickles_EnvironmentDetails (X=50374.863 Y=22073.027 Z=12591.468)
+    "Pickle Val Scraps 6": base_id + 1613, # ItemPickup309_8 Pickles_EnvironmentDetails (X=45985.988 Y=23063.826 Z=13043.497)
+    "Pickle Val Scraps 7": base_id + 1614, # ItemPickup316_27 Pickles_EnvironmentDetails (X=45533.469 Y=24876.168 Z=13015.539)
+    "Pickle Val Scraps 8": base_id + 1615, # ItemPickup317_30 Pickles_EnvironmentDetails (X=44928.848 Y=30913.396 Z=14273.230)
+    "Pickle Val Scraps 9": base_id + 1616, # ItemPickup321_42 Pickles_EnvironmentDetails (X=41572.684 Y=37403.539 Z=13527.379)
+    "Pickle Val Scraps 10": base_id + 1617, # ItemPickup61_11 Pickles_EnvironmentDetails (X=42266.566 Y=30556.238 Z=13584.196)
+    "Pickle Val Scraps 11": base_id + 1618, # ItemPickup314_21 Pickles_EnvironmentDetails (X=43356.219 Y=29465.746 Z=13449.486)
+    "Pickle Val Scraps 12": base_id + 1619, # ItemPickup323_48 Pickles_EnvironmentDetails (X=40893.461 Y=30669.398 Z=13465.039)
+    "Pickle Val Scraps 13": base_id + 1620, # ItemPickup318_33 Pickles_EnvironmentDetails (X=41276.863 Y=32313.068 Z=13480.846)
+    "Pickle Val Scraps 14": base_id + 1621, # ItemPickup319_36 Pickles_EnvironmentDetails (X=38630.031 Y=30471.996 Z=13571.207)
+    "Pickle Val Scraps 15": base_id + 1622, # ItemPickup320_39 Pickles_EnvironmentDetails (X=38596.938 Y=30050.293 Z=13559.574)
+    "Pickle Val Scraps 16": base_id + 1623, # ItemPickup60_8 Pickles_EnvironmentDetails (X=42042.520 Y=25136.820 Z=13077.339)
+    "Pickle Val Scraps 17": base_id + 1624, # ItemPickup308_5 Pickles_EnvironmentDetails (X=43770.914 Y=23307.234 Z=12374.002)
+    "Pickle Val Scraps 18": base_id + 1625, # ItemPickup59_5 Pickles_EnvironmentDetails (X=44672.641 Y=20936.520 Z=12198.017)
+    "Pickle Val Scraps 19": base_id + 1626, # ItemPickup307_2 Pickles_EnvironmentDetails (X=42844.730 Y=22869.387 Z=12832.900)
+    "Pickle Val Scraps 20": base_id + 1627, # ItemPickup315_24 Pickles_EnvironmentDetails (X=43397.758 Y=26367.248 Z=13005.097)
+    "Pickle Val Scraps 21": base_id + 1628, # ItemPickup322_45 Pickles_EnvironmentDetails (X=39352.430 Y=32668.316 Z=14494.778)
+    "Pickle Val Scraps 22": base_id + 1629, # ItemPickup313 Pickles_EnvironmentDetails (X=59688.781 Y=25266.756 Z=11425.324)
+    "Pickle Val Scraps 23": base_id + 1630, # ItemPickup312_17 Pickles_EnvironmentDetails (X=59197.871 Y=24760.773 Z=11425.324)
+    "Pickle Val Purple Paint Can": base_id + 1631, # PaintCan_7 Pickles_EnvironmentDetails (X=40394.855 Y=31546.465 Z=13472.573)
+    "Pickle Val Jar of Pickles": base_id + 1632, # Pickles_Pickup Pickles_Cave (X=38227.535 Y=30234.848 Z=13593.506)
+    "Pickle Val Pickle Lady Mission End": base_id + 1633 # (dialog 4) -> 30_scraps_reward
 }
 
 loc_shrine_near_temple = {
-    "Shrine Near Temple Scraps 1": base_id + 1633, # ItemPickup3 Photorealistic_Island (X=-4675.183 Y=-21143.846 Z=11984.782)
-    "Shrine Near Temple Scraps 2": base_id + 1634, # ItemPickup_2 Photorealistic_Island (X=-4994.117 Y=-20496.621 Z=11874.112)
-    "Shrine Near Temple Scraps 3": base_id + 1635 # ItemPickup2 Photorealistic_Island (X=-4196.896 Y=-20477.025 Z=11882.833)
+    "Shrine Near Temple Scraps 1": base_id + 1634, # ItemPickup3 Photorealistic_Island (X=-4675.183 Y=-21143.846 Z=11984.782)
+    "Shrine Near Temple Scraps 2": base_id + 1635, # ItemPickup_2 Photorealistic_Island (X=-4994.117 Y=-20496.621 Z=11874.112)
+    "Shrine Near Temple Scraps 3": base_id + 1636 # ItemPickup2 Photorealistic_Island (X=-4196.896 Y=-20477.025 Z=11882.833)
 }
 
 loc_morse_bunker = {
-    "Morse Bunker Chest Scraps 1": base_id + 1636, # ItemPickup6512 Secret6_BunkerDetails (X=-47961.078 Y=-85433.031 Z=10615.777)
-    "Morse Bunker Chest Scraps 2": base_id + 1637, # ItemPickup9363 Secret6_BunkerDetails (X=-47958.617 Y=-85444.805 Z=10604.365)
-    "Morse Bunker Chest Scraps 3": base_id + 1638, # ItemPickup921436 Secret6_BunkerDetails (X=-47953.637 Y=-85426.172 Z=10592.347)
-    "Morse Bunker Chest Scraps 4": base_id + 1639, # ItemPickup0128704 Secret6_BunkerDetails (X=-47958.691 Y=-85444.805 Z=10587.060)
-    "Morse Bunker Chest Scraps 5": base_id + 1640, # ItemPickup64_8 Secret6_BunkerDetails (X=-47953.617 Y=-85426.172 Z=10574.149)
-    "Morse Bunker Scraps 1": base_id + 1641, # ItemPickup397_2 Secret6_BunkerDetails (X=-48336.863 Y=-85458.453 Z=10574.537)
-    "Morse Bunker Scraps 2": base_id + 1642, # ItemPickup62_2 Secret6_BunkerDetails (X=-48253.844 Y=-84944.609 Z=10573.793)
-    "Morse Bunker Scraps 3": base_id + 1643, # ItemPickup63_5 Secret6_BunkerDetails (X=-47272.422 Y=-84549.945 Z=10543.671)
-    "Morse Bunker Scraps 4": base_id + 1644, # ItemPickup398_5 Secret6_BunkerDetails (X=-47080.836 Y=-85268.281 Z=10564.355)
-    "Morse Bunker Scraps 5": base_id + 1645, # ItemPickup406_31 Secret6_BunkerDetails (X=-47913.855 Y=-85234.258 Z=10819.314)
-    "Morse Bunker Scraps 6": base_id + 1646, # ItemPickup405_28 Secret6_BunkerDetails (X=-46410.227 Y=-83293.742 Z=10361.746)
-    "Morse Bunker Scraps 7": base_id + 1647, # ItemPickup399_8 Secret6_BunkerDetails (X=-45204.199 Y=-84841.211 Z=10329.200)
-    "Morse Bunker Scraps 8": base_id + 1648, # ItemPickup401_14 Secret6_BunkerDetails (X=-43895.801 Y=-83794.750 Z=10265.661)
-    "Morse Bunker Scraps 9": base_id + 1649, # ItemPickup402_17 Secret6_BunkerDetails (X=-45163.078 Y=-80832.828 Z=10090.777)
-    "Morse Bunker Scraps 10": base_id + 1650, # ItemPickup403_20 Secret6_BunkerDetails (X=-46782.027 Y=-82284.805 Z=10289.180)
-    "Morse Bunker Scraps 11": base_id + 1651, # ItemPickup404_23 Secret6_BunkerDetails (X=-49240.047 Y=-83654.961 Z=10898.540)
-    "Morse Bunker Scraps 12": base_id + 1652, # ItemPickup407_34 Secret6_BunkerDetails (X=-46571.930 Y=-85962.773 Z=10697.339)
-    "Morse Bunker Scraps 13": base_id + 1653 # ItemPickup400_11 Secret6_BunkerDetails (X=-43472.793 Y=-85983.805 Z=10310.322)
+    "Morse Bunker Chest Scraps 1": base_id + 1637, # ItemPickup6512 Secret6_BunkerDetails (X=-47961.078 Y=-85433.031 Z=10615.777)
+    "Morse Bunker Chest Scraps 2": base_id + 1638, # ItemPickup9363 Secret6_BunkerDetails (X=-47958.617 Y=-85444.805 Z=10604.365)
+    "Morse Bunker Chest Scraps 3": base_id + 1639, # ItemPickup921436 Secret6_BunkerDetails (X=-47953.637 Y=-85426.172 Z=10592.347)
+    "Morse Bunker Chest Scraps 4": base_id + 1640, # ItemPickup0128704 Secret6_BunkerDetails (X=-47958.691 Y=-85444.805 Z=10587.060)
+    "Morse Bunker Chest Scraps 5": base_id + 1641, # ItemPickup64_8 Secret6_BunkerDetails (X=-47953.617 Y=-85426.172 Z=10574.149)
+    "Morse Bunker Scraps 1": base_id + 1642, # ItemPickup397_2 Secret6_BunkerDetails (X=-48336.863 Y=-85458.453 Z=10574.537)
+    "Morse Bunker Scraps 2": base_id + 1643, # ItemPickup62_2 Secret6_BunkerDetails (X=-48253.844 Y=-84944.609 Z=10573.793)
+    "Morse Bunker Scraps 3": base_id + 1644, # ItemPickup63_5 Secret6_BunkerDetails (X=-47272.422 Y=-84549.945 Z=10543.671)
+    "Morse Bunker Scraps 4": base_id + 1645, # ItemPickup398_5 Secret6_BunkerDetails (X=-47080.836 Y=-85268.281 Z=10564.355)
+    "Morse Bunker Scraps 5": base_id + 1646, # ItemPickup406_31 Secret6_BunkerDetails (X=-47913.855 Y=-85234.258 Z=10819.314)
+    "Morse Bunker Scraps 6": base_id + 1647, # ItemPickup405_28 Secret6_BunkerDetails (X=-46410.227 Y=-83293.742 Z=10361.746)
+    "Morse Bunker Scraps 7": base_id + 1648, # ItemPickup399_8 Secret6_BunkerDetails (X=-45204.199 Y=-84841.211 Z=10329.200)
+    "Morse Bunker Scraps 8": base_id + 1649, # ItemPickup401_14 Secret6_BunkerDetails (X=-43895.801 Y=-83794.750 Z=10265.661)
+    "Morse Bunker Scraps 9": base_id + 1650, # ItemPickup402_17 Secret6_BunkerDetails (X=-45163.078 Y=-80832.828 Z=10090.777)
+    "Morse Bunker Scraps 10": base_id + 1651, # ItemPickup403_20 Secret6_BunkerDetails (X=-46782.027 Y=-82284.805 Z=10289.180)
+    "Morse Bunker Scraps 11": base_id + 1652, # ItemPickup404_23 Secret6_BunkerDetails (X=-49240.047 Y=-83654.961 Z=10898.540)
+    "Morse Bunker Scraps 12": base_id + 1653, # ItemPickup407_34 Secret6_BunkerDetails (X=-46571.930 Y=-85962.773 Z=10697.339)
+    "Morse Bunker Scraps 13": base_id + 1654 # ItemPickup400_11 Secret6_BunkerDetails (X=-43472.793 Y=-85983.805 Z=10310.322)
 }
 
 loc_prism_temple = {
-    "Prism Temple Chest Scraps 1": base_id + 1654, # ItemPickup16632 MainShrine_DetailsREPAIRED (X=12659.641 Y=-27827.016 Z=10930.621)
-    "Prism Temple Chest Scraps 2": base_id + 1655, # ItemPickup148864 MainShrine_DetailsREPAIRED (X=12648.021 Y=-27825.189 Z=10916.296)
-    "Prism Temple Chest Scraps 3": base_id + 1656, # ItemPickup13123 MainShrine_DetailsREPAIRED (X=12665.557 Y=-27836.633 Z=10905.999)
-    "Prism Temple Scraps 1": base_id + 1657, # ItemPickup225_77 MainShrine_ExteriorDetails (X=5281.087 Y=-16620.387 Z=10520.609)
-    "Prism Temple Scraps 2": base_id + 1658, # ItemPickup223_71 MainShrine_ExteriorDetails (X=15032.147 Y=-16788.352 Z=10992.200)
-    "Prism Temple Scraps 3": base_id + 1659, # ItemPickup222_68 MainShrine_ExteriorDetails (X=16591.920 Y=-18725.771 Z=11004.751)
-    "Prism Temple Scraps 4": base_id + 1660, # ItemPickup135123 MainShrine_DetailsREPAIRED (X=17940.854 Y=-20726.746 Z=10999.944)
-    "Prism Temple Scraps 5": base_id + 1661, # ItemPickup220_62 MainShrine_ExteriorDetails (X=18187.346 Y=-21390.066 Z=11025.650)
-    "Prism Temple Scraps 6": base_id + 1662, # ItemPickup218_56 MainShrine_ExteriorDetails (X=19218.670 Y=-24017.619 Z=10906.966)
-    "Prism Temple Scraps 7": base_id + 1663, # ItemPickup209_29 MainShrine_ExteriorDetails (X=7710.977 Y=-23469.254 Z=11012.888)
-    "Prism Temple Scraps 8": base_id + 1664, # ItemPickup138765 MainShrine_DetailsREPAIRED (X=8160.002 Y=-22335.266 Z=11016.638)
-    "Prism Temple Scraps 9": base_id + 1665, # ItemPickup210_32 MainShrine_ExteriorDetails (X=8637.903 Y=-24295.850 Z=10929.299)
-    "Prism Temple Scraps 10": base_id + 1666, # ItemPickup1112 MainShrine_DetailsREPAIRED (X=7923.367 Y=-25204.055 Z=10832.877)
-    "Prism Temple Scraps 11": base_id + 1667, # ItemPickup214_44 MainShrine_ExteriorDetails (X=10694.420 Y=-27246.365 Z=10569.074)
-    "Prism Temple Scraps 12": base_id + 1668, # ItemPickup215_47 MainShrine_ExteriorDetails (X=12892.631 Y=-26743.068 Z=10868.578)
-    "Prism Temple Scraps 13": base_id + 1669, # ItemPickup213_41 MainShrine_ExteriorDetails (X=12483.535 Y=-27253.867 Z=10876.461)
-    "Prism Temple Scraps 14": base_id + 1670, # ItemPickup212_38 MainShrine_ExteriorDetails (X=13259.813 Y=-27092.033 Z=10887.968)
-    "Prism Temple Scraps 15": base_id + 1671, # ItemPickup211_35 MainShrine_ExteriorDetails (X=9303.245 Y=-25057.908 Z=10943.273)
-    "Prism Temple Scraps 16": base_id + 1672, # ItemPickup201_2 MainShrine_ExteriorDetails (X=11750.875 Y=-22999.371 Z=12426.734)
-    "Prism Temple Scraps 17": base_id + 1673, # ItemPickup203_8 MainShrine_ExteriorDetails (X=12966.615 Y=-23568.324 Z=12519.387)
-    "Prism Temple Scraps 18": base_id + 1674, # ItemPickup204_11 MainShrine_ExteriorDetails (X=14093.343 Y=-22393.182 Z=12426.847)
-    "Prism Temple Scraps 19": base_id + 1675, # ItemPickup206_17 MainShrine_ExteriorDetails (X=13767.980 Y=-21269.568 Z=12425.791)
-    "Prism Temple Scraps 20": base_id + 1676, # ItemPickup207_23 MainShrine_ExteriorDetails (X=12882.754 Y=-20027.527 Z=12516.095)
-    "Prism Temple Scraps 21": base_id + 1677, # ItemPickup114535 MainShrine_DetailsREPAIRED (X=11883.399 Y=-20801.344 Z=12428.452)
-    "Prism Temple Scraps 22": base_id + 1678, # ItemPickup208_26 MainShrine_ExteriorDetails (X=13281.792 Y=-21302.344 Z=12902.728)
-    "Prism Temple Scraps 23": base_id + 1679, # ItemPickup205_14 MainShrine_ExteriorDetails (X=14190.678 Y=-23671.621 Z=11781.533)
-    "Prism Temple Scraps 24": base_id + 1680, # ItemPickup8903 MainShrine_DetailsREPAIRED (X=14311.736 Y=-22347.758 Z=11765.781)
-    "Prism Temple Scraps 25": base_id + 1681, # ItemPickup654 MainShrine_DetailsREPAIRED (X=13826.154 Y=-19923.131 Z=11755.189)
-    "Prism Temple Scraps 26": base_id + 1682, # ItemPickup224_74 MainShrine_ExteriorDetails (X=12443.228 Y=-18577.926 Z=11240.455)
-    "Prism Temple Scraps 27": base_id + 1683, # ItemPickup202_5 MainShrine_ExteriorDetails (X=10993.180 Y=-23783.047 Z=11754.121)
-    "Prism Temple Scraps 28": base_id + 1684, # ItemPickup13098 MainShrine_DetailsREPAIRED (X=16762.963 Y=-23634.342 Z=11031.588)
-    "Prism Temple Scraps 29": base_id + 1685, # ItemPickup221_65 MainShrine_ExteriorDetails (X=17804.979 Y=-23512.395 Z=11066.884)
-    "Prism Temple Scraps 30": base_id + 1686, # ItemPickup17123123565 MainShrine_DetailsREPAIRED (X=16998.229 Y=-23241.652 Z=11055.539)
-    "Prism Temple Scraps 31": base_id + 1687, # ItemPickup10812783 MainShrine_DetailsREPAIRED (X=17613.518 Y=-23799.813 Z=11057.277)
-    "Prism Temple Scraps 32": base_id + 1688, # ItemPickup216_50 MainShrine_ExteriorDetails (X=15342.375 Y=-24807.357 Z=11024.192)
-    "Prism Temple Scraps 33": base_id + 1689, # ItemPickup217_53 MainShrine_ExteriorDetails (X=15963.284 Y=-24834.156 Z=11021.444)
-    "Prism Temple Scraps 34": base_id + 1690 # ItemPickup219_59 MainShrine_ExteriorDetails (X=21563.559 Y=-23705.184 Z=10895.696)
+    "Prism Temple Chest Scraps 1": base_id + 1655, # ItemPickup16632 MainShrine_DetailsREPAIRED (X=12659.641 Y=-27827.016 Z=10930.621)
+    "Prism Temple Chest Scraps 2": base_id + 1656, # ItemPickup148864 MainShrine_DetailsREPAIRED (X=12648.021 Y=-27825.189 Z=10916.296)
+    "Prism Temple Chest Scraps 3": base_id + 1657, # ItemPickup13123 MainShrine_DetailsREPAIRED (X=12665.557 Y=-27836.633 Z=10905.999)
+    "Prism Temple Scraps 1": base_id + 1658, # ItemPickup225_77 MainShrine_ExteriorDetails (X=5281.087 Y=-16620.387 Z=10520.609)
+    "Prism Temple Scraps 2": base_id + 1659, # ItemPickup223_71 MainShrine_ExteriorDetails (X=15032.147 Y=-16788.352 Z=10992.200)
+    "Prism Temple Scraps 3": base_id + 1660, # ItemPickup222_68 MainShrine_ExteriorDetails (X=16591.920 Y=-18725.771 Z=11004.751)
+    "Prism Temple Scraps 4": base_id + 1661, # ItemPickup135123 MainShrine_DetailsREPAIRED (X=17940.854 Y=-20726.746 Z=10999.944)
+    "Prism Temple Scraps 5": base_id + 1662, # ItemPickup220_62 MainShrine_ExteriorDetails (X=18187.346 Y=-21390.066 Z=11025.650)
+    "Prism Temple Scraps 6": base_id + 1663, # ItemPickup218_56 MainShrine_ExteriorDetails (X=19218.670 Y=-24017.619 Z=10906.966)
+    "Prism Temple Scraps 7": base_id + 1664, # ItemPickup209_29 MainShrine_ExteriorDetails (X=7710.977 Y=-23469.254 Z=11012.888)
+    "Prism Temple Scraps 8": base_id + 1665, # ItemPickup138765 MainShrine_DetailsREPAIRED (X=8160.002 Y=-22335.266 Z=11016.638)
+    "Prism Temple Scraps 9": base_id + 1666, # ItemPickup210_32 MainShrine_ExteriorDetails (X=8637.903 Y=-24295.850 Z=10929.299)
+    "Prism Temple Scraps 10": base_id + 1667, # ItemPickup1112 MainShrine_DetailsREPAIRED (X=7923.367 Y=-25204.055 Z=10832.877)
+    "Prism Temple Scraps 11": base_id + 1668, # ItemPickup214_44 MainShrine_ExteriorDetails (X=10694.420 Y=-27246.365 Z=10569.074)
+    "Prism Temple Scraps 12": base_id + 1669, # ItemPickup215_47 MainShrine_ExteriorDetails (X=12892.631 Y=-26743.068 Z=10868.578)
+    "Prism Temple Scraps 13": base_id + 1670, # ItemPickup213_41 MainShrine_ExteriorDetails (X=12483.535 Y=-27253.867 Z=10876.461)
+    "Prism Temple Scraps 14": base_id + 1671, # ItemPickup212_38 MainShrine_ExteriorDetails (X=13259.813 Y=-27092.033 Z=10887.968)
+    "Prism Temple Scraps 15": base_id + 1672, # ItemPickup211_35 MainShrine_ExteriorDetails (X=9303.245 Y=-25057.908 Z=10943.273)
+    "Prism Temple Scraps 16": base_id + 1673, # ItemPickup201_2 MainShrine_ExteriorDetails (X=11750.875 Y=-22999.371 Z=12426.734)
+    "Prism Temple Scraps 17": base_id + 1674, # ItemPickup203_8 MainShrine_ExteriorDetails (X=12966.615 Y=-23568.324 Z=12519.387)
+    "Prism Temple Scraps 18": base_id + 1675, # ItemPickup204_11 MainShrine_ExteriorDetails (X=14093.343 Y=-22393.182 Z=12426.847)
+    "Prism Temple Scraps 19": base_id + 1676, # ItemPickup206_17 MainShrine_ExteriorDetails (X=13767.980 Y=-21269.568 Z=12425.791)
+    "Prism Temple Scraps 20": base_id + 1677, # ItemPickup207_23 MainShrine_ExteriorDetails (X=12882.754 Y=-20027.527 Z=12516.095)
+    "Prism Temple Scraps 21": base_id + 1678, # ItemPickup114535 MainShrine_DetailsREPAIRED (X=11883.399 Y=-20801.344 Z=12428.452)
+    "Prism Temple Scraps 22": base_id + 1679, # ItemPickup208_26 MainShrine_ExteriorDetails (X=13281.792 Y=-21302.344 Z=12902.728)
+    "Prism Temple Scraps 23": base_id + 1680, # ItemPickup205_14 MainShrine_ExteriorDetails (X=14190.678 Y=-23671.621 Z=11781.533)
+    "Prism Temple Scraps 24": base_id + 1681, # ItemPickup8903 MainShrine_DetailsREPAIRED (X=14311.736 Y=-22347.758 Z=11765.781)
+    "Prism Temple Scraps 25": base_id + 1682, # ItemPickup654 MainShrine_DetailsREPAIRED (X=13826.154 Y=-19923.131 Z=11755.189)
+    "Prism Temple Scraps 26": base_id + 1683, # ItemPickup224_74 MainShrine_ExteriorDetails (X=12443.228 Y=-18577.926 Z=11240.455)
+    "Prism Temple Scraps 27": base_id + 1684, # ItemPickup202_5 MainShrine_ExteriorDetails (X=10993.180 Y=-23783.047 Z=11754.121)
+    "Prism Temple Scraps 28": base_id + 1685, # ItemPickup13098 MainShrine_DetailsREPAIRED (X=16762.963 Y=-23634.342 Z=11031.588)
+    "Prism Temple Scraps 29": base_id + 1686, # ItemPickup221_65 MainShrine_ExteriorDetails (X=17804.979 Y=-23512.395 Z=11066.884)
+    "Prism Temple Scraps 30": base_id + 1687, # ItemPickup17123123565 MainShrine_DetailsREPAIRED (X=16998.229 Y=-23241.652 Z=11055.539)
+    "Prism Temple Scraps 31": base_id + 1688, # ItemPickup10812783 MainShrine_DetailsREPAIRED (X=17613.518 Y=-23799.813 Z=11057.277)
+    "Prism Temple Scraps 32": base_id + 1689, # ItemPickup216_50 MainShrine_ExteriorDetails (X=15342.375 Y=-24807.357 Z=11024.192)
+    "Prism Temple Scraps 33": base_id + 1690, # ItemPickup217_53 MainShrine_ExteriorDetails (X=15963.284 Y=-24834.156 Z=11021.444)
+    "Prism Temple Scraps 34": base_id + 1691 # ItemPickup219_59 MainShrine_ExteriorDetails (X=21563.559 Y=-23705.184 Z=10895.696)
 }
 
 

From 0def79eff6a51a43af9b08a7b3ecbae4fb47f6a5 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Wed, 26 Nov 2025 11:59:56 +0100
Subject: [PATCH 20/23] Replace Scraps numbering by descriptions

---
 worlds/cccharles/Locations.py | 1202 ++++++++++++++++-----------------
 1 file changed, 601 insertions(+), 601 deletions(-)

diff --git a/worlds/cccharles/Locations.py b/worlds/cccharles/Locations.py
index a421d6871887..d0139797d4b6 100644
--- a/worlds/cccharles/Locations.py
+++ b/worlds/cccharles/Locations.py
@@ -9,8 +9,8 @@ class CCCharlesLocation(Location):
 # /!\ NOT CONSIDERED YET: train_keypickup Train_KeyPickup Photorealistic_Island (X=-8816.341 Y=23392.416 Z=10219.855)
 
 loc_start_camp = {
-    "Start Camp Scraps 1": base_id + 1000, # ItemPickup139_5 Camp (X=24006.348 Y=53777.297 Z=10860.107)
-    "Start Camp Scraps 2": base_id + 1001 # ItemPickup140_8 Camp (X=23951.754 Y=54897.230 Z=10895.235)
+    "Start Camp Scraps Near Barrier": base_id + 1000, # ItemPickup139_5 Camp (X=24006.348 Y=53777.297 Z=10860.107)
+    "Start Camp Scraps Behind Tent": base_id + 1001 # ItemPickup140_8 Camp (X=23951.754 Y=54897.230 Z=10895.235)
 }
 
 loc_tony_tiddle_mission = {
@@ -18,15 +18,15 @@ class CCCharlesLocation(Location):
 }
 
 loc_barn = {
-    "Barn Scraps 1": base_id + 1003, # ItemPickup12 Photorealistic_Island (X=70582.805 Y=52591.066 Z=11976.719)
-    "Barn Scraps 2": base_id + 1004, # ItemPickup4_2 Photorealistic_Island (X=70536.641 Y=51890.633 Z=11986.488)
-    "Barn Scraps 3": base_id + 1005, # ItemPickup6 Photorealistic_Island (X=70750.336 Y=52275.828 Z=11994.434)
-    "Barn Scraps 4": base_id + 1006, # ItemPickup11 Photorealistic_Island (X=70937.719 Y=52989.066 Z=12003.523)
-    "Barn Scraps 5": base_id + 1007, # ItemPickup5 Photorealistic_Island (X=71303.508 Y=52232.188 Z=12003.997)
-    "Barn Scraps 6": base_id + 1008, # ItemPickup7 Photorealistic_Island (X=71678.672 Y=52825.531 Z=11977.212)
-    "Barn Scraps 7": base_id + 1009, # ItemPickup8 Photorealistic_Island (X=71506.961 Y=52357.293 Z=12362.159)
-    "Barn Scraps 8": base_id + 1010, # ItemPickup9 Photorealistic_Island (X=71029.875 Y=52384.613 Z=12362.159)
-    "Barn Scraps 9": base_id + 1011 # ItemPickup10 Photorealistic_Island (X=71129.594 Y=52600.262 Z=12364.142)
+    "Barn Scraps Front Of Stairs": base_id + 1003, # ItemPickup12 Photorealistic_Island (X=70582.805 Y=52591.066 Z=11976.719)
+    "Barn Scraps Near Three Crates": base_id + 1004, # ItemPickup4_2 Photorealistic_Island (X=70536.641 Y=51890.633 Z=11986.488)
+    "Barn Scraps Under Supply List": base_id + 1005, # ItemPickup6 Photorealistic_Island (X=70750.336 Y=52275.828 Z=11994.434)
+    "Barn Scraps Right Of Stairs": base_id + 1006, # ItemPickup11 Photorealistic_Island (X=70937.719 Y=52989.066 Z=12003.523)
+    "Barn Scraps Left Of Stairs": base_id + 1007, # ItemPickup5 Photorealistic_Island (X=71303.508 Y=52232.188 Z=12003.997)
+    "Barn Scraps Behind Stairs": base_id + 1008, # ItemPickup7 Photorealistic_Island (X=71678.672 Y=52825.531 Z=11977.212)
+    "Barn Scraps 1st floor Near Crates": base_id + 1009, # ItemPickup8 Photorealistic_Island (X=71506.961 Y=52357.293 Z=12362.159)
+    "Barn Scraps 1st floor Near Balustrade": base_id + 1010, # ItemPickup9 Photorealistic_Island (X=71029.875 Y=52384.613 Z=12362.159)
+    "Barn Scraps 1st floor Near Table": base_id + 1011 # ItemPickup10 Photorealistic_Island (X=71129.594 Y=52600.262 Z=12364.142)
 }
 
 loc_candice_mission = {
@@ -34,91 +34,91 @@ class CCCharlesLocation(Location):
 }
 
 loc_tutorial_house = {
-    "Tutorial House Scraps 1": base_id + 1013, # ItemPickup17_2 Photorealistic_Island (X=74745.852 Y=73865.555 Z=11426.619) \!/ Existing match 8
-    "Tutorial House Scraps 2": base_id + 1014, # ItemPickup18_2 Photorealistic_Island (X=74864.102 Y=73900.094 Z=11426.619)
-    "Tutorial House Scraps 3": base_id + 1015, # ItemPickup14_2 Photorealistic_Island (X=74877.625 Y=73738.594 Z=11422.057) \!/ Existing match 4
-    "Tutorial House Scraps 4": base_id + 1016, # ItemPickup15_8 Photorealistic_Island (X=75068.992 Y=73971.133 Z=11426.619)
-    "Tutorial House Scraps 5": base_id + 1017, # ItemPickup21_1 Photorealistic_Island (X=74923.500 Y=73571.648 Z=11426.619)
-    "Tutorial House Scraps 6": base_id + 1018, # ItemPickup19 Photorealistic_Island (X=75194.906 Y=73495.719 Z=11426.619)
-    "Tutorial House Scraps 7": base_id + 1019, # ItemPickup13_3 Photorealistic_Island (X=75320.102 Y=73446.352 Z=11487.376)
-    "Tutorial House Scraps 8": base_id + 1020, # ItemPickup20 Photorealistic_Island (X=75298.680 Y=73580.531 Z=11426.619)
-    "Tutorial House Scraps 9": base_id + 1021 # ItemPickup16_3 Photorealistic_Island (X=75310.008 Y=73770.742 Z=11489.709)
+    "Tutorial House Scraps Under Shelves": base_id + 1013, # ItemPickup17_2 Photorealistic_Island (X=74745.852 Y=73865.555 Z=11426.619) \!/ Existing match 8
+    "Tutorial House Scraps Near Bed": base_id + 1014, # ItemPickup18_2 Photorealistic_Island (X=74864.102 Y=73900.094 Z=11426.619)
+    "Tutorial House Scraps Center of Room": base_id + 1015, # ItemPickup14_2 Photorealistic_Island (X=74877.625 Y=73738.594 Z=11422.057) \!/ Existing match 4
+    "Tutorial House Scraps Near Table": base_id + 1016, # ItemPickup15_8 Photorealistic_Island (X=75068.992 Y=73971.133 Z=11426.619)
+    "Tutorial House Scraps Near Door": base_id + 1017, # ItemPickup21_1 Photorealistic_Island (X=74923.500 Y=73571.648 Z=11426.619)
+    "Tutorial House Scraps Front Of Crates": base_id + 1018, # ItemPickup19 Photorealistic_Island (X=75194.906 Y=73495.719 Z=11426.619)
+    "Tutorial House Scraps On Left Crate": base_id + 1019, # ItemPickup13_3 Photorealistic_Island (X=75320.102 Y=73446.352 Z=11487.376)
+    "Tutorial House Scraps Between Crates": base_id + 1020, # ItemPickup20 Photorealistic_Island (X=75298.680 Y=73580.531 Z=11426.619)
+    "Tutorial House Scraps On Mid Crate": base_id + 1021 # ItemPickup16_3 Photorealistic_Island (X=75310.008 Y=73770.742 Z=11489.709)
 }
 
 loc_swamp_edges = {
-    "Swamp Edges Scraps 1": base_id + 1022, # ItemPickup465_67 Swamp_EnvironmentDetails (X=81964.398 Y=72167.305 Z=10116.385)
-    "Swamp Edges Scraps 2": base_id + 1023, # ItemPickup460_52 Swamp_EnvironmentDetails (X=89674.047 Y=71610.008 Z=9482.095)
-    "Swamp Edges Scraps 3": base_id + 1024, # ItemPickup459_49 Swamp_EnvironmentDetails (X=91637.156 Y=73345.672 Z=9492.019)
-    "Swamp Edges Scraps 4": base_id + 1025, # ItemPickup458_46 Swamp_EnvironmentDetails (X=94601.117 Y=75064.117 Z=9567.464)
-    "Swamp Edges Scraps 5": base_id + 1026, # ItemPickup457_43 Swamp_EnvironmentDetails (X=95536.641 Y=72622.969 Z=9512.531)
-    "Swamp Edges Scraps 6": base_id + 1027, # ItemPickup456_40 Swamp_EnvironmentDetails (X=96419.922 Y=65508.676 Z=9838.949)
-    "Swamp Edges Scraps 7": base_id + 1028, # ItemPickup455_37 Swamp_EnvironmentDetails (X=98158.680 Y=63191.629 Z=10477.084)
-    "Swamp Edges Scraps 8": base_id + 1029, # ItemPickup55_29 Swamp_EnvironmentDetails (X=93421.820 Y=59200.461 Z=9545.312)
-    "Swamp Edges Scraps 9": base_id + 1030, # ItemPickup453_31 Swamp_EnvironmentDetails(X=92951.648 Y=56453.527 Z=9560.638)
-    "Swamp Edges Scraps 10": base_id + 1031, # ItemPickup454_34 Swamp_EnvironmentDetails (X=96943.297 Y=58754.043 Z=10728.124)
-    "Swamp Edges Scraps 11": base_id + 1032, # ItemPickup452_28 Swamp_EnvironmentDetails (X=95000.617 Y=53070.859 Z=10258.078)
-    "Swamp Edges Scraps 12": base_id + 1033, # ItemPickup451_25 Swamp_EnvironmentDetails (X=91390.703 Y=53628.707 Z=9498.378)
-    "Swamp Edges Scraps 13": base_id + 1034, # ItemPickup53_23 Swamp_EnvironmentDetails (X=87628.742 Y=51614.957 Z=9487.013)
-    "Swamp Edges Scraps 14": base_id + 1035, # ItemPickup448_16 Swamp_EnvironmentDetails (X=89785.992 Y=48603.844 Z=9573.859)
-    "Swamp Edges Scraps 15": base_id + 1036, # ItemPickup447_11 Swamp_EnvironmentDetails (X=89925.383 Y=46288.707 Z=9499.904)
-    "Swamp Edges Scraps 16": base_id + 1037, # ItemPickup446_8 Swamp_EnvironmentDetails (X=90848.938 Y=43133.535 Z=9729.535)
-    "Swamp Edges Scraps 17": base_id + 1038, # ItemPickup445_5 Swamp_EnvironmentDetails (X=87382.383 Y=42475.191 Z=9509.929)
-    "Swamp Edges Scraps 18": base_id + 1039, # ItemPickup444_2 Swamp_EnvironmentDetails (X=87481.820 Y=39316.820 Z=9757.511)
-    "Swamp Edges Scraps 19": base_id + 1040, # ItemPickup54_26 Swamp_EnvironmentDetails (X=86039.180 Y=37135.004 Z=9826.263)
-    "Swamp Edges Scraps 20": base_id + 1041, # ItemPickup475_97 Swamp_EnvironmentDetails (X=81798.609 Y=36766.922 Z=9479.318)
-    "Swamp Edges Scraps 21": base_id + 1042, # ItemPickup474_94 Swamp_EnvironmentDetails (X=79254.055 Y=40120.293 Z=9879.539)
-    "Swamp Edges Scraps 22": base_id + 1043, # ItemPickup473_91 Swamp_EnvironmentDetails (X=82251.773 Y=42454.027 Z=9482.057)
-    "Swamp Edges Scraps 23": base_id + 1044, # ItemPickup472_88 Swamp_EnvironmentDetails (X=84903.977 Y=48323.543 Z=9503.382)
-    "Swamp Edges Scraps 24": base_id + 1045, # ItemPickup471_85 Swamp_EnvironmentDetails (X=84238.609 Y=51239.547 Z=9529.745)
-    "Swamp Edges Scraps 25": base_id + 1046, # ItemPickup470_82 Swamp_EnvironmentDetails (X=84439.063 Y=53501.563 Z=9491.291)
-    "Swamp Edges Scraps 26": base_id + 1047, # ItemPickup52_20 Swamp_EnvironmentDetails (X=83025.086 Y=53275.348 Z=9694.177)
-    "Swamp Edges Scraps 27": base_id + 1048, # ItemPickup469_79 Swamp_EnvironmentDetails (X=79827.055 Y=54791.504 Z=10121.452)
-    "Swamp Edges Scraps 28": base_id + 1049, # ItemPickup468_76 Swamp_EnvironmentDetails (X=82266.461 Y=58126.316 Z=9660.493)
-    "Swamp Edges Scraps 29": base_id + 1050, # ItemPickup467_73 Swamp_EnvironmentDetails (X=75911.297 Y=65155.836 Z=10660.832)
-    "Swamp Edges Scraps 30": base_id + 1051, # ItemPickup466_70 Swamp_EnvironmentDetails (X=81171.641 Y=66836.125 Z=9673.756)
-    "Swamp Edges Scraps 31": base_id + 1052, # ItemPickup449_19 Swamp_EnvironmentDetails (X=95254.992 Y=40910.563 Z=10503.727)
-    "Swamp Edges Scraps 32": base_id + 1053 # ItemPickup450_22 Swamp_EnvironmentDetails (X=93992.992 Y=50773.484 Z=10238.064)
+    "Swamp Edges Scraps South Path To Candice": base_id + 1022, # ItemPickup465_67 Swamp_EnvironmentDetails (X=81964.398 Y=72167.305 Z=10116.385)
+    "Swamp Edges Scraps South Near Cauldron": base_id + 1023, # ItemPickup460_52 Swamp_EnvironmentDetails (X=89674.047 Y=71610.008 Z=9482.095)
+    "Swamp Edges Scraps South In Clovers": base_id + 1024, # ItemPickup459_49 Swamp_EnvironmentDetails (X=91637.156 Y=73345.672 Z=9492.019)
+    "Swamp Edges Scraps South Crossroads": base_id + 1025, # ItemPickup458_46 Swamp_EnvironmentDetails (X=94601.117 Y=75064.117 Z=9567.464)
+    "Swamp Edges Scraps South Near Lantern": base_id + 1026, # ItemPickup457_43 Swamp_EnvironmentDetails (X=95536.641 Y=72622.969 Z=9512.531)
+    "Swamp Edges Scraps Southeast Near Minecart": base_id + 1027, # ItemPickup456_40 Swamp_EnvironmentDetails (X=96419.922 Y=65508.676 Z=9838.949)
+    "Swamp Edges Scraps Southeast Crossroads": base_id + 1028, # ItemPickup455_37 Swamp_EnvironmentDetails (X=98158.680 Y=63191.629 Z=10477.084)
+    "Swamp Edges Scraps East Above Path Cutoff": base_id + 1029, # ItemPickup55_29 Swamp_EnvironmentDetails (X=93421.820 Y=59200.461 Z=9545.312)
+    "Swamp Edges Scraps East Crossroads": base_id + 1030, # ItemPickup453_31 Swamp_EnvironmentDetails(X=92951.648 Y=56453.527 Z=9560.638)
+    "Swamp Edges Scraps East Under Lantern": base_id + 1031, # ItemPickup454_34 Swamp_EnvironmentDetails (X=96943.297 Y=58754.043 Z=10728.124)
+    "Swamp Edges Scraps East On Crates": base_id + 1032, # ItemPickup452_28 Swamp_EnvironmentDetails (X=95000.617 Y=53070.859 Z=10258.078)
+    "Swamp Edges Scraps East Near Long Barrier": base_id + 1033, # ItemPickup451_25 Swamp_EnvironmentDetails (X=91390.703 Y=53628.707 Z=9498.378)
+    "Swamp Edges Scraps Middle Near Bridge": base_id + 1034, # ItemPickup53_23 Swamp_EnvironmentDetails (X=87628.742 Y=51614.957 Z=9487.013)
+    "Swamp Edges Scraps Northeast Behind Lantern": base_id + 1035, # ItemPickup448_16 Swamp_EnvironmentDetails (X=89785.992 Y=48603.844 Z=9573.859)
+    "Swamp Edges Scraps Northeast Along Path": base_id + 1036, # ItemPickup447_11 Swamp_EnvironmentDetails (X=89925.383 Y=46288.707 Z=9499.904)
+    "Swamp Edges Scraps Northeast Under Lantern": base_id + 1037, # ItemPickup446_8 Swamp_EnvironmentDetails (X=90848.938 Y=43133.535 Z=9729.535)
+    "Swamp Edges Scraps Northeast Near Pond": base_id + 1038, # ItemPickup445_5 Swamp_EnvironmentDetails (X=87382.383 Y=42475.191 Z=9509.929)
+    "Swamp Edges Scraps North Under Lantern": base_id + 1039, # ItemPickup444_2 Swamp_EnvironmentDetails (X=87481.820 Y=39316.820 Z=9757.511)
+    "Swamp Edges Scraps North On Crates": base_id + 1040, # ItemPickup54_26 Swamp_EnvironmentDetails (X=86039.180 Y=37135.004 Z=9826.263)
+    "Swamp Edges Scraps North Near Pond": base_id + 1041, # ItemPickup475_97 Swamp_EnvironmentDetails (X=81798.609 Y=36766.922 Z=9479.318)
+    "Swamp Edges Scraps North Near Barrier": base_id + 1042, # ItemPickup474_94 Swamp_EnvironmentDetails (X=79254.055 Y=40120.293 Z=9879.539)
+    "Swamp Edges Scraps Northwest In Clovers": base_id + 1043, # ItemPickup473_91 Swamp_EnvironmentDetails (X=82251.773 Y=42454.027 Z=9482.057)
+    "Swamp Edges Scraps Northwest Near Pond": base_id + 1044, # ItemPickup472_88 Swamp_EnvironmentDetails (X=84903.977 Y=48323.543 Z=9503.382)
+    "Swamp Edges Scraps West Near Minecart": base_id + 1045, # ItemPickup471_85 Swamp_EnvironmentDetails (X=84238.609 Y=51239.547 Z=9529.745)
+    "Swamp Edges Scraps West Near Bridge": base_id + 1046, # ItemPickup470_82 Swamp_EnvironmentDetails (X=84439.063 Y=53501.563 Z=9491.291)
+    "Swamp Edges Scraps West Under Lantern": base_id + 1047, # ItemPickup52_20 Swamp_EnvironmentDetails (X=83025.086 Y=53275.348 Z=9694.177)
+    "Swamp Edges Scraps West Path To Barn": base_id + 1048, # ItemPickup469_79 Swamp_EnvironmentDetails (X=79827.055 Y=54791.504 Z=10121.452)
+    "Swamp Edges Scraps West Behind Lantern": base_id + 1049, # ItemPickup468_76 Swamp_EnvironmentDetails (X=82266.461 Y=58126.316 Z=9660.493)
+    "Swamp Edges Scraps West Between Crossroads": base_id + 1050, # ItemPickup467_73 Swamp_EnvironmentDetails (X=75911.297 Y=65155.836 Z=10660.832)
+    "Swamp Edges Scraps Southwest Behind Crates": base_id + 1051, # ItemPickup466_70 Swamp_EnvironmentDetails (X=81171.641 Y=66836.125 Z=9673.756)
+    "Swamp Edges Scraps Northeast Crossroads": base_id + 1052, # ItemPickup449_19 Swamp_EnvironmentDetails (X=95254.992 Y=40910.563 Z=10503.727)
+    "Swamp Edges Scraps East Near Short Barrier": base_id + 1053 # ItemPickup450_22 Swamp_EnvironmentDetails (X=93992.992 Y=50773.484 Z=10238.064)
 }
 
 loc_swamp_mission = {
-    "Swamp Shack Scraps 1": base_id + 1054, # ItemPickup51_17 Swamp_EnvironmentDetails (X=87685.797 Y=69754.008 Z=9629.617)
-    "Swamp Shack Scraps 2": base_id + 1055, # ItemPickup461_55 Swamp_EnvironmentDetails (X=87308.883 Y=69096.789 Z=9624.543)
-    "Swamp Islet Scraps 1": base_id + 1056, # ItemPickup462_58 Swamp_EnvironmentDetails (X=88101.219 Y=64553.148 Z=9557.692)
-    "Swamp Islet Scraps 2": base_id + 1057, # ItemPickup463_61 Swamp_EnvironmentDetails (X=87100.922 Y=63590.965 Z=9582.900)
-    "Swamp Islet Scraps 3": base_id + 1058, # ItemPickup464_64 Swamp_EnvironmentDetails (X=86399.656 Y=64290.805 Z=9493.576)
+    "Swamp Shack Scraps Inside Shack": base_id + 1054, # ItemPickup51_17 Swamp_EnvironmentDetails (X=87685.797 Y=69754.008 Z=9629.617)
+    "Swamp Shack Scraps Floating Bridge": base_id + 1055, # ItemPickup461_55 Swamp_EnvironmentDetails (X=87308.883 Y=69096.789 Z=9624.543)
+    "Swamp Islet Scraps East": base_id + 1056, # ItemPickup462_58 Swamp_EnvironmentDetails (X=88101.219 Y=64553.148 Z=9557.692)
+    "Swamp Islet Scraps North": base_id + 1057, # ItemPickup463_61 Swamp_EnvironmentDetails (X=87100.922 Y=63590.965 Z=9582.900)
+    "Swamp Islet Scraps West": base_id + 1058, # ItemPickup464_64 Swamp_EnvironmentDetails (X=86399.656 Y=64290.805 Z=9493.576)
     "Swamp Islet Dead Fish": base_id + 1059, # Swamp_FishPickup Swamp_EnvironmentDetails (X=87288.945 Y=64278.273 Z=9550.320)
     "Swamp Lizbeth Murkwater Mission End": base_id + 1060 # (dialog 2) -> 30_scraps_reward
 }
 
 loc_junkyard_area = {
-    "Junkyard Area Scraps 1": base_id + 1061, # ItemPickup185_29 Junkyard_Details1 (X=94184.391 Y=89760.258 Z=9331.188)
-    "Junkyard Area Scraps 2": base_id + 1062, # ItemPickup177_5 Junkyard_Details1 (X=91919.469 Y=89681.602 Z=9407.639)
-    "Junkyard Area Scraps 3": base_id + 1063, # ItemPickup46_5 Junkyard_Details (X=91696.078 Y=90453.563 Z=9480.997)
-    "Junkyard Area Scraps 4": base_id + 1064, # ItemPickup178_8 Junkyard_Details1 (X=92453.719 Y=91142.531 Z=9398.951)
-    "Junkyard Area Scraps 5": base_id + 1065, # ItemPickup182_20 Junkyard_Details1 (X=88645.453 Y=90374.930 Z=9507.291)
-    "Junkyard Area Scraps 6": base_id + 1066, # ItemPickup48_11 Junkyard_Details (X=88461.953 Y=92077.531 Z=9712.173)
-    "Junkyard Area Scraps 7": base_id + 1067, # ItemPickup49_14 Junkyard_Details (X=91521.555 Y=93773.641 Z=9421.457)
-    "Junkyard Area Scraps 8": base_id + 1068, # ItemPickup50_17 Junkyard_Details (X=94741.484 Y=92565.938 Z=9221.093)
-    "Junkyard Area Scraps 9": base_id + 1069, # ItemPickup186_32 Junkyard_Details1 (X=95256.008 Y=91356.789 Z=9251.082)
-    "Junkyard Area Scraps 10": base_id + 1070, # ItemPickup45_2 Junkyard_Details (X=94289.664 Y=89951.477 Z=9367.076)
+    "Junkyard Area Scraps Inside Workshop": base_id + 1061, # ItemPickup185_29 Junkyard_Details1 (X=94184.391 Y=89760.258 Z=9331.188)
+    "Junkyard Area Scraps Inside Top Wagon": base_id + 1062, # ItemPickup177_5 Junkyard_Details1 (X=91919.469 Y=89681.602 Z=9407.639)
+    "Junkyard Area Scraps Inside Middle Wagon": base_id + 1063, # ItemPickup46_5 Junkyard_Details (X=91696.078 Y=90453.563 Z=9480.997)
+    "Junkyard Area Scraps Inside Bottom Wagon": base_id + 1064, # ItemPickup178_8 Junkyard_Details1 (X=92453.719 Y=91142.531 Z=9398.951)
+    "Junkyard Area Scraps Near Junk Stacks": base_id + 1065, # ItemPickup182_20 Junkyard_Details1 (X=88645.453 Y=90374.930 Z=9507.291)
+    "Junkyard Area Scraps On Junk Stacks": base_id + 1066, # ItemPickup48_11 Junkyard_Details (X=88461.953 Y=92077.531 Z=9712.173)
+    "Junkyard Area Scraps On Crates": base_id + 1067, # ItemPickup49_14 Junkyard_Details (X=91521.555 Y=93773.641 Z=9421.457)
+    "Junkyard Area Scraps Behind Beams": base_id + 1068, # ItemPickup50_17 Junkyard_Details (X=94741.484 Y=92565.938 Z=9221.093)
+    "Junkyard Area Scraps Near Campfire": base_id + 1069, # ItemPickup186_32 Junkyard_Details1 (X=95256.008 Y=91356.789 Z=9251.082)
+    "Junkyard Area Scraps On Table": base_id + 1070, # ItemPickup45_2 Junkyard_Details (X=94289.664 Y=89951.477 Z=9367.076)
     "Junkyard Area Daryl Mission Start": base_id + 1071, # (dialog 4) -> Lockpicks (4)
     "Junkyard Area Chest Ancient Tablet": base_id + 1072, # Junkyard_TabletPickup Junkyard_Details (X=90715.367 Y=92168.563 Z=9402.729)
     "Junkyard Area Daryl Mission End": base_id + 1073 # (dialog 3) -> 25_scraps_reward
 }
 
 loc_south_house = {
-    "South House Scraps 1": base_id + 1074, # ItemPickup361_26 Secret12_ExteriorDetails (X=85865.969 Y=103869.656 Z=9453.063)
-    "South House Scraps 2": base_id + 1075, # ItemPickup360_23 Secret12_ExteriorDetails (X=84403.742 Y=107229.039 Z=9067.245)
-    "South House Scraps 3": base_id + 1076, # ItemPickup359_20 Secret12_ExteriorDetails (X=83389.789 Y=108817.992 Z=8752.255)
-    "South House Scraps 4": base_id + 1077, # ItemPickup353_2 Secret12_ExteriorDetails (X=82413.547 Y=109697.477 Z=8637.677)
-    "South House Scraps 5": base_id + 1078, # ItemPickup354_5 Secret12_ExteriorDetails (X=83000.359 Y=110323.664 Z=8560.229)
-    "South House Scraps 6": base_id + 1079, # ItemPickup358_17 Secret12_ExteriorDetails (X=82072.625 Y=110482.664 Z=8682.441)
-    "South House Scraps 7": base_id + 1080, # ItemPickup24_30 Secret12_Details (X=81970.766 Y=111082.117 Z=8647.703)
-    "South House Scraps 8": base_id + 1081, # ItemPickup356_11 Secret12_ExteriorDetails (X=80915.375 Y=108689.758 Z=8377.754)
-    "South House Scraps 9": base_id + 1082, # ItemPickup355_8 Secret12_ExteriorDetails (X=81762.180 Y=111371.023 Z=7876.312)
-    "South House Scraps 10": base_id + 1083, # ItemPickup357_14 Secret12_ExteriorDetails (X=80663.336 Y=113306.695 Z=7226.475)
-    "South House Scraps 11": base_id + 1084, # ItemPickup23_21 Secret12_Details (X=80520.367 Y=113747.039 Z=7252.808)
-    "South House Scraps 12": base_id + 1085, # ItemPickup22_18 Secret12_Details (X=80830.273 Y=113871.383 Z=7201.687)
+    "South House Scraps Under Top Lantern": base_id + 1074, # ItemPickup361_26 Secret12_ExteriorDetails (X=85865.969 Y=103869.656 Z=9453.063)
+    "South House Scraps Under Middle Lantern": base_id + 1075, # ItemPickup360_23 Secret12_ExteriorDetails (X=84403.742 Y=107229.039 Z=9067.245)
+    "South House Scraps Under Bottom Lantern": base_id + 1076, # ItemPickup359_20 Secret12_ExteriorDetails (X=83389.789 Y=108817.992 Z=8752.255)
+    "South House Scraps Under House Lantern": base_id + 1077, # ItemPickup353_2 Secret12_ExteriorDetails (X=82413.547 Y=109697.477 Z=8637.677)
+    "South House Scraps Near Water Tank": base_id + 1078, # ItemPickup354_5 Secret12_ExteriorDetails (X=83000.359 Y=110323.664 Z=8560.229)
+    "South House Scraps Inside House": base_id + 1079, # ItemPickup358_17 Secret12_ExteriorDetails (X=82072.625 Y=110482.664 Z=8682.441)
+    "South House Scraps On Balcony": base_id + 1080, # ItemPickup24_30 Secret12_Details (X=81970.766 Y=111082.117 Z=8647.703)
+    "South House Scraps Atop Downhill Path": base_id + 1081, # ItemPickup356_11 Secret12_ExteriorDetails (X=80915.375 Y=108689.758 Z=8377.754)
+    "South House Scraps Along Downhill Path": base_id + 1082, # ItemPickup355_8 Secret12_ExteriorDetails (X=81762.180 Y=111371.023 Z=7876.312)
+    "South House Scraps Near Blood Trail": base_id + 1083, # ItemPickup357_14 Secret12_ExteriorDetails (X=80663.336 Y=113306.695 Z=7226.475)
+    "South House Scraps In Boat": base_id + 1084, # ItemPickup23_21 Secret12_Details (X=80520.367 Y=113747.039 Z=7252.808)
+    "South House Scraps Behind Boat": base_id + 1085, # ItemPickup22_18 Secret12_Details (X=80830.273 Y=113871.383 Z=7201.687)
     "South House Chest Scraps 1": base_id + 1086, # ItemPickup21 Secret12_Details (X=82079.922 Y=110808.602 Z=8739.324)
     "South House Chest Scraps 2": base_id + 1087, # ItemPickup18 Secret12_Details (X=82102.664 Y=110813.664 Z=8726.308)
     "South House Chest Scraps 3": base_id + 1088, # ItemPickup17 Secret12_Details (X=82091.547 Y=110810.906 Z=8721.354) \!/ Existing match 1
@@ -129,215 +129,215 @@ class CCCharlesLocation(Location):
 
 loc_junkyard_shed = {
     "Junkyard Shed Helen Mission Start": base_id + 1092, # (dialog 8) -> south_mine_key (6)
-    "Junkyard Shed Scraps 1": base_id + 1093, # ItemPickup424_23 Settlement_A_House_1 (X=98303.992 Y=84476.016 Z=9376.540)
-    "Junkyard Shed Scraps 2": base_id + 1094, # ItemPickup419_8 Settlement_A_House_1 (X=98174.680 Y=84067.383 Z=9249.197)
-    "Junkyard Shed Scraps 3": base_id + 1095, # ItemPickup418_5 Settlement_A_House_1 (X=97948.977 Y=83354.656 Z=9339.430)
-    "Junkyard Shed Scraps 4": base_id + 1096, # ItemPickup417_2 Settlement_A_House_1 (X=98208.391 Y=83088.047 Z=9273.632)
-    "Junkyard Shed Scraps 5": base_id + 1097, # ItemPickup420_11 Settlement_A_House_1 (X=97757.773 Y=82995.656 Z=9298.597)
-    "Junkyard Shed Scraps 6": base_id + 1098, # ItemPickup422_17 Settlement_A_House_1 (X=98776.102 Y=80881.133 Z=9286.782)
-    "Junkyard Shed Scraps 7": base_id + 1099, # ItemPickup421_14 Settlement_A_House_1 (X=99198.508 Y=82057.820 Z=9248.227)
-    "Junkyard Shed Scraps 8": base_id + 1100 # ItemPickup423_20 Settlement_A_House_1 (X=99208.617 Y=84383.125 Z=9257.880)
+    "Junkyard Shed Scraps On Platform": base_id + 1093, # ItemPickup424_23 Settlement_A_House_1 (X=98303.992 Y=84476.016 Z=9376.540)
+    "Junkyard Shed Scraps Half Sheltered": base_id + 1094, # ItemPickup419_8 Settlement_A_House_1 (X=98174.680 Y=84067.383 Z=9249.197)
+    "Junkyard Shed Scraps On Table": base_id + 1095, # ItemPickup418_5 Settlement_A_House_1 (X=97948.977 Y=83354.656 Z=9339.430)
+    "Junkyard Shed Scraps Near Crates": base_id + 1096, # ItemPickup417_2 Settlement_A_House_1 (X=98208.391 Y=83088.047 Z=9273.632)
+    "Junkyard Shed Scraps Behind Shed": base_id + 1097, # ItemPickup420_11 Settlement_A_House_1 (X=97757.773 Y=82995.656 Z=9298.597)
+    "Junkyard Shed Scraps Near Lantern": base_id + 1098, # ItemPickup422_17 Settlement_A_House_1 (X=98776.102 Y=80881.133 Z=9286.782)
+    "Junkyard Shed Scraps Along Path": base_id + 1099, # ItemPickup421_14 Settlement_A_House_1 (X=99198.508 Y=82057.820 Z=9248.227)
+    "Junkyard Shed Scraps Near Platform": base_id + 1100 # ItemPickup423_20 Settlement_A_House_1 (X=99208.617 Y=84383.125 Z=9257.880)
 }
 
 loc_military_base = {
     "Military Base Sgt Flint Mission End": base_id + 1101, # (dialog 2) -> bug_spray
-    "Military Base Scraps 1": base_id + 1102, # ItemPickup134_17 Bugspray_Main (X=105743.531 Y=83017.492 Z=9423.290)
-    "Military Base Scraps 2": base_id + 1103, # ItemPickup129_2 Bugspray_Main (X=108495.805 Y=81616.992 Z=9139.340)
-    "Military Base Scraps 3": base_id + 1104, # ItemPickup135_20 Bugspray_Main (X=108709.219 Y=85981.016 Z=9650.472)
-    "Military Base Scraps 4": base_id + 1105, # ItemPickup130_5 Bugspray_Main (X=112004.195 Y=83811.313 Z=8887.996)
-    "Military Base Scraps 5": base_id + 1106, # ItemPickup131_8 Bugspray_Main (X=110904.867 Y=82024.781 Z=9581.007)
-    "Military Base Scraps 6": base_id + 1107, # ItemPickup132_11 Bugspray_Main (X=112458.563 Y=81967.945 Z=9850.968)
-    "Military Base Scraps 7": base_id + 1108, # ItemPickup22_9 Bugspray_Details (X=112541.695 Y=81345.875 Z=9896.940)
-    "Military Base Scraps 8": base_id + 1109, # ItemPickup133_14 Bugspray_Main (X=111943.391 Y=79970.016 Z=10025.820)
-    "Military Base Scraps 9": base_id + 1110, # ItemPickup24_8 Bugspray_Details (X=112074.063 Y=83533.398 Z=9008.831)
-    "Military Base Scraps 10": base_id + 1111, # ItemPickup23_2 Bugspray_Details (X=110738.523 Y=85389.852 Z=9082.626)
-    "Military Base Scraps 11": base_id + 1112, # ItemPickup136_23 Bugspray_Main (X=112962.594 Y=85872.922 Z=8638.805)
-    "Military Base Scraps 12": base_id + 1113, # ItemPickup137_26 Bugspray_Main (X=116230.563 Y=84357.602 Z=8580.226)
+    "Military Base Scraps Along Bottom Path": base_id + 1102, # ItemPickup134_17 Bugspray_Main (X=105743.531 Y=83017.492 Z=9423.290)
+    "Military Base Scraps Along Top Path": base_id + 1103, # ItemPickup129_2 Bugspray_Main (X=108495.805 Y=81616.992 Z=9139.340)
+    "Military Base Scraps Atop Rocks": base_id + 1104, # ItemPickup135_20 Bugspray_Main (X=108709.219 Y=85981.016 Z=9650.472)
+    "Military Base Scraps Near Burning Workshop": base_id + 1105, # ItemPickup130_5 Bugspray_Main (X=112004.195 Y=83811.313 Z=8887.996)
+    "Military Base Scraps On Stairs": base_id + 1106, # ItemPickup131_8 Bugspray_Main (X=110904.867 Y=82024.781 Z=9581.007)
+    "Military Base Scraps Near Water Tank": base_id + 1107, # ItemPickup132_11 Bugspray_Main (X=112458.563 Y=81967.945 Z=9850.968)
+    "Military Base Scraps Behind Beams": base_id + 1108, # ItemPickup22_9 Bugspray_Details (X=112541.695 Y=81345.875 Z=9896.940)
+    "Military Base Scraps Atop Downhill Path": base_id + 1109, # ItemPickup133_14 Bugspray_Main (X=111943.391 Y=79970.016 Z=10025.820)
+    "Military Base Scraps Inside Burning Workshop": base_id + 1110, # ItemPickup24_8 Bugspray_Details (X=112074.063 Y=83533.398 Z=9008.831)
+    "Military Base Scraps Sheltered": base_id + 1111, # ItemPickup23_2 Bugspray_Details (X=110738.523 Y=85389.852 Z=9082.626)
+    "Military Base Scraps Between Gates": base_id + 1112, # ItemPickup136_23 Bugspray_Main (X=112962.594 Y=85872.922 Z=8638.805)
+    "Military Base Scraps Outside Path": base_id + 1113, # ItemPickup137_26 Bugspray_Main (X=116230.563 Y=84357.602 Z=8580.226)
     "Military Base Orange Paint Can": base_id + 1114 # PaintCan_5 Bugspray_Details (X=111916.102 Y=83066.195 Z=9094.554)
 }
 
 loc_south_mine_outside = {
-    "South Mine Outside Scraps 1": base_id + 1115, # ItemPickup20_1 Mine_1_OutsideMain (X=114794.375 Y=57211.855 Z=8523.348)
-    "South Mine Outside Scraps 2": base_id + 1116, # ItemPickup15_2 Mine_1_OutsideDetails (X=112523.438 Y=57693.836 Z=8639.382)
-    "South Mine Outside Scraps 3": base_id + 1117, # ItemPickup22_5 Mine_1_OutsideMain (X=112348.586 Y=59174.289 Z=8945.143)
-    "South Mine Outside Scraps 4": base_id + 1118, # ItemPickup13_2 Mine_1_OutsideDetails (X=110989.156 Y=57840.090 Z=8700.936) \!/ Existing match 6
-    "South Mine Outside Scraps 5": base_id + 1119, # ItemPickup16_1 Mine_1_OutsideDetails (X=110487.281 Y=54528.535 Z=8589.910)
-    "South Mine Outside Scraps 6": base_id + 1120, # ItemPickup18_1 Mine_1_OutsideMain (X=113727.297 Y=54791.703 Z=8424.460)
-    "South Mine Outside Scraps 7": base_id + 1121 # ItemPickup17_3 Mine_1_OutsideMain (X=113965.211 Y=53289.539 Z=8402.346)
+    "South Mine Outside Scraps Along Main Rails": base_id + 1115, # ItemPickup20_1 Mine_1_OutsideMain (X=114794.375 Y=57211.855 Z=8523.348)
+    "South Mine Outside Scraps Near Minecarts": base_id + 1116, # ItemPickup15_2 Mine_1_OutsideDetails (X=112523.438 Y=57693.836 Z=8639.382)
+    "South Mine Outside Scraps On Rocks": base_id + 1117, # ItemPickup22_5 Mine_1_OutsideMain (X=112348.586 Y=59174.289 Z=8945.143)
+    "South Mine Outside Scraps Near Mine Door": base_id + 1118, # ItemPickup13_2 Mine_1_OutsideDetails (X=110989.156 Y=57840.090 Z=8700.936) \!/ Existing match 6
+    "South Mine Outside Scraps Inside Small Shelter": base_id + 1119, # ItemPickup16_1 Mine_1_OutsideDetails (X=110487.281 Y=54528.535 Z=8589.910)
+    "South Mine Outside Scraps Between Barriers": base_id + 1120, # ItemPickup18_1 Mine_1_OutsideMain (X=113727.297 Y=54791.703 Z=8424.460)
+    "South Mine Outside Scraps Inside Rest Shelter": base_id + 1121 # ItemPickup17_3 Mine_1_OutsideMain (X=113965.211 Y=53289.539 Z=8402.346)
 }
 
 loc_south_mine_inside = {
-    "South Mine Inside Scraps 1": base_id + 1122, # ItemPickup23_4 Mine_1_Interior_1 (X=108659.945 Y=58712.691 Z=8763.015)
-    "South Mine Inside Scraps 2": base_id + 1123, # ItemPickup24_0 Mine_1_Interior_1 (X=104954.602 Y=61540.488 Z=7876.374)
-    "South Mine Inside Scraps 3": base_id + 1124, # ItemPickup26_0 Mine_1_Interior_1 (X=104436.758 Y=64091.211 Z=7872.767)
-    "South Mine Inside Scraps 4": base_id + 1125, # ItemPickup290_20 Mine_1_Interior_2 (X=101356.625 Y=66110.906 Z=8034.738)
-    "South Mine Inside Scraps 5": base_id + 1126, # ItemPickup287_8 Mine_1_Interior_2 (X=96888.820 Y=64458.559 Z=7917.468)
-    "South Mine Inside Scraps 6": base_id + 1127, # ItemPickup289_14 Mine_1_Interior_2 (X=95863.180 Y=63252.902 Z=7847.054)
-    "South Mine Inside Scraps 7": base_id + 1128, # ItemPickup288_11 Mine_1_Interior_2 (X=97337.219 Y=62921.438 Z=7884.393)
-    "South Mine Inside Scraps 8": base_id + 1129, # ItemPickup285_2 Mine_1_Interior_2 (X=96689.203 Y=61880.895 Z=7806.810)
-    "South Mine Inside Scraps 9": base_id + 1130, # ItemPickup286_5 Mine_1_Interior_2 (X=98403.227 Y=62812.531 Z=7880.947)
+    "South Mine Inside Scraps Near Mine Door": base_id + 1122, # ItemPickup23_4 Mine_1_Interior_1 (X=108659.945 Y=58712.691 Z=8763.015)
+    "South Mine Inside Scraps In Dead End": base_id + 1123, # ItemPickup24_0 Mine_1_Interior_1 (X=104954.602 Y=61540.488 Z=7876.374)
+    "South Mine Inside Scraps Along Tunnel": base_id + 1124, # ItemPickup26_0 Mine_1_Interior_1 (X=104436.758 Y=64091.211 Z=7872.767)
+    "South Mine Inside Scraps Near Barricaded Gates": base_id + 1125, # ItemPickup290_20 Mine_1_Interior_2 (X=101356.625 Y=66110.906 Z=8034.738)
+    "South Mine Inside Scraps Near Table": base_id + 1126, # ItemPickup287_8 Mine_1_Interior_2 (X=96888.820 Y=64458.559 Z=7917.468)
+    "South Mine Inside Scraps Behind Crates": base_id + 1127, # ItemPickup289_14 Mine_1_Interior_2 (X=95863.180 Y=63252.902 Z=7847.054)
+    "South Mine Inside Scraps Near Egg": base_id + 1128, # ItemPickup288_11 Mine_1_Interior_2 (X=97337.219 Y=62921.438 Z=7884.393)
+    "South Mine Inside Scraps In Corner": base_id + 1129, # ItemPickup285_2 Mine_1_Interior_2 (X=96689.203 Y=61880.895 Z=7806.810)
+    "South Mine Inside Scraps Near Beds": base_id + 1130, # ItemPickup286_5 Mine_1_Interior_2 (X=98403.227 Y=62812.531 Z=7880.947)
     "South Mine Inside Green Egg": base_id + 1131, # ItemPickup14_2 Mine_1_Interior_2 (X=96753.219 Y=62909.504 Z=8030.018) \!/ Existing match 4
     "South Mine Inside Green Paint Can": base_id + 1132 # PaintCan_2 Mine_1_Interior_1 (X=108293.281 Y=64192.094 Z=7872.770) \!/ Existing match 5
 }
 
 loc_middle_station = {
     "Middle Station White Paint Can": base_id + 1133, # PaintCan_2 Station_Details1 (X=34554.141 Y=-7395.408 Z=11897.556) \!/ Existing match 5
-    "Middle Station Scraps 1": base_id + 1134, # ItemPickup431_20 Station_BuildingDetails (X=37710.504 Y=-6462.562 Z=11356.691)
-    "Middle Station Scraps 2": base_id + 1135, # ItemPickup425_2 Station_BuildingDetails (X=37034.340 Y=-4923.256 Z=11348.328)
-    "Middle Station Scraps 3": base_id + 1136, # ItemPickup427_8 Station_BuildingDetails (X=36689.164 Y=-3727.466 Z=11353.597)
-    "Middle Station Scraps 4": base_id + 1137, # ItemPickup426_5 Station_BuildingDetails (X=37207.629 Y=-3393.977 Z=11379.110)
-    "Middle Station Scraps 5": base_id + 1138, # ItemPickup429_14 Station_BuildingDetails (X=37988.219 Y=-3365.906 Z=11350.225)
-    "Middle Station Scraps 6": base_id + 1139, # ItemPickup428_11 Station_BuildingDetails (X=36956.242 Y=-2746.948 Z=11353.506)
-    "Middle Station Scraps 7": base_id + 1140, # ItemPickup430_17 Station_BuildingDetails (X=36638.492 Y=-6410.017 Z=11353.546)
-    "Middle Station Scraps 8": base_id + 1141, # ItemPickup433_26 Station_BuildingDetails (X=35931.168 Y=-7558.021 Z=11899.232)
-    "Middle Station Scraps 9": base_id + 1142, # ItemPickup434 Station_BuildingDetails (X=35636.855 Y=-7628.500 Z=11903.627)
-    "Middle Station Scraps 10": base_id + 1143, # ItemPickup435 Station_BuildingDetails (X=34894.152 Y=-7537.087 Z=11903.627)
-    "Middle Station Scraps 11": base_id + 1144, # ItemPickup13_4 Station_BuildingDetails (X=33505.609 Y=-7742.843 Z=11898.971)
-    "Middle Station Scraps 12": base_id + 1145, # ItemPickup440_5 Station_Details1 (X=37394.004 Y=-8395.084 Z=11389.296)
-    "Middle Station Scraps 13": base_id + 1146, # ItemPickup432_23 Station_BuildingDetails (X=36040.695 Y=-8068.016 Z=11456.609)
-    "Middle Station Scraps 14": base_id + 1147, # ItemPickup16_4 Station_BuildingDetails (X=35360.320 Y=-8441.443 Z=11457.823)
-    "Middle Station Scraps 15": base_id + 1148, # ItemPickup439_2 Station_Details1 (X=36311.324 Y=-9563.938 Z=11468.039)
-    "Middle Station Scraps 16": base_id + 1149, # ItemPickup442_11 Station_Details1 (X=33335.656 Y=-13872.785 Z=11189.906)
-    "Middle Station Scraps 17": base_id + 1150, # ItemPickup441_8 Station_Details1 (X=33129.984 Y=-14073.978 Z=11189.906)
-    "Middle Station Scraps 18": base_id + 1151, # ItemPickup436_31 Station_BuildingDetails (X=33587.488 Y=-7828.651 Z=11529.446)
-    "Middle Station Scraps 19": base_id + 1152, # ItemPickup14_3 Station_BuildingDetails (X=34007.254 Y=-7749.381 Z=11533.760)
-    "Middle Station Scraps 20": base_id + 1153, # ItemPickup443_14 Station_Details1 (X=31457.752 Y=-7120.744 Z=11421.197)
+    "Middle Station Scraps Near Beams": base_id + 1134, # ItemPickup431_20 Station_BuildingDetails (X=37710.504 Y=-6462.562 Z=11356.691)
+    "Middle Station Scraps Path To House": base_id + 1135, # ItemPickup425_2 Station_BuildingDetails (X=37034.340 Y=-4923.256 Z=11348.328)
+    "Middle Station Scraps Near House": base_id + 1136, # ItemPickup427_8 Station_BuildingDetails (X=36689.164 Y=-3727.466 Z=11353.597)
+    "Middle Station Scraps Under House Roof": base_id + 1137, # ItemPickup426_5 Station_BuildingDetails (X=37207.629 Y=-3393.977 Z=11379.110)
+    "Middle Station Scraps Under House Lantern": base_id + 1138, # ItemPickup429_14 Station_BuildingDetails (X=37988.219 Y=-3365.906 Z=11350.225)
+    "Middle Station Scraps Behind House": base_id + 1139, # ItemPickup428_11 Station_BuildingDetails (X=36956.242 Y=-2746.948 Z=11353.506)
+    "Middle Station Scraps Down Stairs": base_id + 1140, # ItemPickup430_17 Station_BuildingDetails (X=36638.492 Y=-6410.017 Z=11353.546)
+    "Middle Station Scraps On Balcony": base_id + 1141, # ItemPickup433_26 Station_BuildingDetails (X=35931.168 Y=-7558.021 Z=11899.232)
+    "Middle Station Scraps Near Table": base_id + 1142, # ItemPickup434 Station_BuildingDetails (X=35636.855 Y=-7628.500 Z=11903.627)
+    "Middle Station Scraps Near Beds": base_id + 1143, # ItemPickup435 Station_BuildingDetails (X=34894.152 Y=-7537.087 Z=11903.627)
+    "Middle Station Scraps On Footbridge": base_id + 1144, # ItemPickup13_4 Station_BuildingDetails (X=33505.609 Y=-7742.843 Z=11898.971)
+    "Middle Station Scraps Near Railcar": base_id + 1145, # ItemPickup440_5 Station_Details1 (X=37394.004 Y=-8395.084 Z=11389.296)
+    "Middle Station Scraps Near Bench": base_id + 1146, # ItemPickup432_23 Station_BuildingDetails (X=36040.695 Y=-8068.016 Z=11456.609)
+    "Middle Station Scraps Behind Station": base_id + 1147, # ItemPickup16_4 Station_BuildingDetails (X=35360.320 Y=-8441.443 Z=11457.823)
+    "Middle Station Scraps On Rock Foundations": base_id + 1148, # ItemPickup439_2 Station_Details1 (X=36311.324 Y=-9563.938 Z=11468.039)
+    "Middle Station Scraps Half Sheltered": base_id + 1149, # ItemPickup442_11 Station_Details1 (X=33335.656 Y=-13872.785 Z=11189.906)
+    "Middle Station Scraps Sheltered": base_id + 1150, # ItemPickup441_8 Station_Details1 (X=33129.984 Y=-14073.978 Z=11189.906)
+    "Middle Station Scraps Inside Railcar Near Stool": base_id + 1151, # ItemPickup436_31 Station_BuildingDetails (X=33587.488 Y=-7828.651 Z=11529.446)
+    "Middle Station Scraps Inside Railcar Near Crate": base_id + 1152, # ItemPickup14_3 Station_BuildingDetails (X=34007.254 Y=-7749.381 Z=11533.760)
+    "Middle Station Scraps Along Rails": base_id + 1153, # ItemPickup443_14 Station_Details1 (X=31457.752 Y=-7120.744 Z=11421.197)
     "Middle Station Theodore Mission End": base_id + 1154 # (dialog 2) -> 35_scraps_reward
     # "Middle Station Scraps Glitch 1" ItemPickup437_34 (X=34217.613 Y=-9481.271 Z=11505.686) /!\ Glitched scrap
     # "Middle Station Scraps Glitch 2" ItemPickup438_37 (X=36101.633 Y=-10459.024 Z=11385.937) /!\ Glitched scrap
 }
 
 loc_canyon = {
-    "Canyon Scraps 1": base_id + 1155, # ItemPickup156_47 Canyon_Main (X=29432.162 Y=-3164.300 Z=11540.294)
-    "Canyon Scraps 2": base_id + 1156, # ItemPickup155_44 Canyon_Main (X=26331.086 Y=3036.740 Z=11701.688)
-    "Canyon Scraps 3": base_id + 1157, # ItemPickup154_41 Canyon_Main (X=22688.129 Y=3906.730 Z=12249.182)
-    "Canyon Scraps 4": base_id + 1158, # ItemPickup147_20 Canyon_Main (X=20546.193 Y=4371.471 Z=12128.874)
-    "Canyon Scraps 5": base_id + 1159, # ItemPickup148_23 Canyon_Main (X=20006.584 Y=4928.478 Z=12174.837)
-    "Canyon Scraps 6": base_id + 1160, # ItemPickup146_17 Canyon_Main (X=19251.633 Y=3798.014 Z=12170.390)
-    "Canyon Scraps 7": base_id + 1161, # ItemPickup149_26 Canyon_Main (X=18302.678 Y=7323.849 Z=12595.085)
-    "Canyon Scraps 8": base_id + 1162, # ItemPickup150_29 Canyon_Main (X=19019.563 Y=8172.146 Z=12640.462)
-    "Canyon Scraps 9": base_id + 1163, # ItemPickup142_5 Canyon_Main (X=18001.689 Y=11138.320 Z=13035.360)
-    "Canyon Scraps 10": base_id + 1164, # ItemPickup143_8 Canyon_Main (X=16381.525 Y=7191.394 Z=13682.453)
-    "Canyon Scraps 11": base_id + 1165, # ItemPickup144_11 Canyon_Main (X=18294.928 Y=7870.372 Z=14350.015)
-    "Canyon Scraps 12": base_id + 1166, # ItemPickup31_2 CanyonCamp_Details (X=20730.520 Y=8032.158 Z=14439.826)
-    "Canyon Scraps 13": base_id + 1167, # ItemPickup145_14 Canyon_Main (X=24752.658 Y=7959.624 Z=14363.087)
-    "Canyon Scraps 14": base_id + 1168, # ItemPickup141_2 Canyon_Main (X=20181.992 Y=13816.017 Z=14897.407)
-    "Canyon Scraps 15": base_id + 1169, # ItemPickup151_32 Canyon_Main (X=23172.160 Y=2842.120 Z=12954.566)
-    "Canyon Scraps 16": base_id + 1170, # ItemPickup152_35 Canyon_Main (X=22307.621 Y=-1180.840 Z=12451.548)
-    "Canyon Scraps 17": base_id + 1171, # ItemPickup153_38 Canyon_Main (X=28473.596 Y=6741.842 Z=13314.166)
+    "Canyon Scraps Along Rails": base_id + 1155, # ItemPickup156_47 Canyon_Main (X=29432.162 Y=-3164.300 Z=11540.294)
+    "Canyon Scraps Under Unlit Lantern": base_id + 1156, # ItemPickup155_44 Canyon_Main (X=26331.086 Y=3036.740 Z=11701.688)
+    "Canyon Scraps Inside Overturned Railcar": base_id + 1157, # ItemPickup154_41 Canyon_Main (X=22688.129 Y=3906.730 Z=12249.182)
+    "Canyon Scraps Near Lonely Tent": base_id + 1158, # ItemPickup147_20 Canyon_Main (X=20546.193 Y=4371.471 Z=12128.874)
+    "Canyon Scraps Behind Railcar": base_id + 1159, # ItemPickup148_23 Canyon_Main (X=20006.584 Y=4928.478 Z=12174.837)
+    "Canyon Scraps Near Twin Tents": base_id + 1160, # ItemPickup146_17 Canyon_Main (X=19251.633 Y=3798.014 Z=12170.390)
+    "Canyon Scraps Near Shelter": base_id + 1161, # ItemPickup149_26 Canyon_Main (X=18302.678 Y=7323.849 Z=12595.085)
+    "Canyon Scraps Under Bridge": base_id + 1162, # ItemPickup150_29 Canyon_Main (X=19019.563 Y=8172.146 Z=12640.462)
+    "Canyon Scraps South Between Rocks": base_id + 1163, # ItemPickup142_5 Canyon_Main (X=18001.689 Y=11138.320 Z=13035.360)
+    "Canyon Scraps Bridge Left": base_id + 1164, # ItemPickup143_8 Canyon_Main (X=16381.525 Y=7191.394 Z=13682.453)
+    "Canyon Scraps Bridge Middle": base_id + 1165, # ItemPickup144_11 Canyon_Main (X=18294.928 Y=7870.372 Z=14350.015)
+    "Canyon Scraps Bridge Right": base_id + 1166, # ItemPickup31_2 CanyonCamp_Details (X=20730.520 Y=8032.158 Z=14439.826)
+    "Canyon Scraps East Top Mountain": base_id + 1167, # ItemPickup145_14 Canyon_Main (X=24752.658 Y=7959.624 Z=14363.087)
+    "Canyon Scraps South Top Mountain": base_id + 1168, # ItemPickup141_2 Canyon_Main (X=20181.992 Y=13816.017 Z=14897.407)
+    "Canyon Scraps Above Overturned Railcar": base_id + 1169, # ItemPickup151_32 Canyon_Main (X=23172.160 Y=2842.120 Z=12954.566)
+    "Canyon Scraps East On Lonely Rocks": base_id + 1170, # ItemPickup152_35 Canyon_Main (X=22307.621 Y=-1180.840 Z=12451.548)
+    "Canyon Scraps North On Lonely Rocks": base_id + 1171, # ItemPickup153_38 Canyon_Main (X=28473.596 Y=6741.842 Z=13314.166)
     "Canyon Blue Box": base_id + 1172 # Canyon_BlueBoxPickup CanyonCamp_Details (X=20338.525 Y=4989.111 Z=12323.649)
 }
 
 loc_watchtower = {
-    "Watchtower Scraps 1": base_id + 1173, # ItemPickup373_13 Secret2_WatchTowerDetails (X=32760.389 Y=-28814.084 Z=10997.447)
-    "Watchtower Scraps 2": base_id + 1174, # ItemPickup22_6 Secret2_WatchTowerDetails (X=32801.668 Y=-31660.041 Z=10643.390)
-    "Watchtower Scraps 3": base_id + 1175, # ItemPickup372_10 Secret2_WatchTowerDetails (X=31018.063 Y=-33375.313 Z=11100.126)
-    "Watchtower Scraps 4": base_id + 1176, # ItemPickup22_16 Secret2_WatchTowerDetails (X=33308.215 Y=-35928.578 Z=10614.347)
-    "Watchtower Scraps 5": base_id + 1177, # ItemPickup22_2 Secret2_WatchTowerDetails (X=34304.262 Y=-33446.063 Z=10674.936)
-    "Watchtower Scraps 6": base_id + 1178, # ItemPickup370_2 Secret2_WatchTowerDetails (X=32869.453 Y=-33184.094 Z=10612.040)
-    "Watchtower Scraps 7": base_id + 1179, # ItemPickup374_16 Secret2_WatchTowerDetails (X=33210.707 Y=-32097.611 Z=11211.031)
-    "Watchtower Scraps 8": base_id + 1180, # ItemPickup22_10 Secret2_WatchTowerDetails (X=33246.262 Y=-32046.697 Z=11851.025)
-    "Watchtower Scraps 9": base_id + 1181, # ItemPickup22_8 Secret2_WatchTowerDetails (X=33553.156 Y=-31810.645 Z=11849.521)
-    "Watchtower Scraps 10": base_id + 1182, # ItemPickup371_7 Secret2_WatchTowerDetails (X=36151.621 Y=-31791.633 Z=11093.785)
+    "Watchtower Scraps Along South Path": base_id + 1173, # ItemPickup373_13 Secret2_WatchTowerDetails (X=32760.389 Y=-28814.084 Z=10997.447)
+    "Watchtower Scraps Between Tents": base_id + 1174, # ItemPickup22_6 Secret2_WatchTowerDetails (X=32801.668 Y=-31660.041 Z=10643.390)
+    "Watchtower Scraps On Rocks": base_id + 1175, # ItemPickup372_10 Secret2_WatchTowerDetails (X=31018.063 Y=-33375.313 Z=11100.126)
+    "Watchtower Scraps Along North Path": base_id + 1176, # ItemPickup22_16 Secret2_WatchTowerDetails (X=33308.215 Y=-35928.578 Z=10614.347)
+    "Watchtower Scraps Behind Right Beams": base_id + 1177, # ItemPickup22_2 Secret2_WatchTowerDetails (X=34304.262 Y=-33446.063 Z=10674.936)
+    "Watchtower Scraps Near Left Beams": base_id + 1178, # ItemPickup370_2 Secret2_WatchTowerDetails (X=32869.453 Y=-33184.094 Z=10612.040)
+    "Watchtower Scraps In Stairs": base_id + 1179, # ItemPickup374_16 Secret2_WatchTowerDetails (X=33210.707 Y=-32097.611 Z=11211.031)
+    "Watchtower Scraps Near Chest": base_id + 1180, # ItemPickup22_10 Secret2_WatchTowerDetails (X=33246.262 Y=-32046.697 Z=11851.025)
+    "Watchtower Scraps Under Schedule notes": base_id + 1181, # ItemPickup22_8 Secret2_WatchTowerDetails (X=33553.156 Y=-31810.645 Z=11849.521)
+    "Watchtower Scraps Along West Path": base_id + 1182, # ItemPickup371_7 Secret2_WatchTowerDetails (X=36151.621 Y=-31791.633 Z=11093.785)
     "Watchtower Pink Paint Can": base_id + 1183 # PaintCan_2 Secret2_WatchTowerDetails (X=33069.133 Y=-32168.045 Z=11859.582) \!/ Existing match 5
 }
 
 loc_boulder_field = {
-    "Boulder Field Page Drawing 1": base_id + 1184, # Pages_Drawing1 Pages_Environment_Details (X=46232.703 Y=-37052.875 Z=9531.116)
-    "Boulder Field Page Drawing 2": base_id + 1185, # Pages_Drawing2 Pages_Environment_Details (X=51854.980 Y=-31332.070 Z=9804.927)
-    "Boulder Field Page Drawing 3": base_id + 1186, # Pages_Drawing3 Pages_Environment_Details (X=47595.750 Y=-29931.740 Z=9308.014)
-    "Boulder Field Page Drawing 4": base_id + 1187, # Pages_Drawing4 Pages_Environment_Details (X=43819.680 Y=-30378.770 Z=9706.599)
-    "Boulder Field Page Drawing 5": base_id + 1188, # Pages_Drawing5 Pages_Environment_Details (X=47494.746 Y=-20884.781 Z=9812.398)
-    "Boulder Field Page Drawing 6": base_id + 1189, # Pages_Drawing6 Pages_Environment_Details (X=43725.148 Y=-21952.570 Z=9744.351)
-    "Boulder Field Page Drawing 7": base_id + 1190, # Pages_Drawing7 Pages_Environment_Details (X=44752.465 Y=-16362.510 Z=10147.004)
-    "Boulder Field Page Drawing 8": base_id + 1191, # Pages_Drawing8 Pages_Environment_Details (X=50496.270 Y=-26090.533 Z=9835.365)
-    "Boulder Field Scraps 1": base_id + 1192, # ItemPickup293_8 Pages_Environment_Main (X=41385.406 Y=-32281.871 Z=10240.781)
-    "Boulder Field Scraps 2": base_id + 1193, # ItemPickup987321 Pages_House_Main (X=46654.969 Y=-38859.254 Z=9920.861)
-    "Boulder Field Scraps 3": base_id + 1194, # ItemPickup516121 Pages_House_Main (X=44765.836 Y=-41675.559 Z=9938.179)
-    "Boulder Field Scraps 4": base_id + 1195, # ItemPickup291_2 Pages_Environment_Main (X=50088.270 Y=-30669.107 Z=9267.371)
-    "Boulder Field Scraps 5": base_id + 1196, # ItemPickup303_38 Pages_Environment_Main (X=48014.609 Y=-28971.115 Z=9199.659)
-    "Boulder Field Scraps 6": base_id + 1197, # ItemPickup302_35 Pages_Environment_Main (X=50190.266 Y=-26243.977 Z=9648.289)
-    "Boulder Field Scraps 7": base_id + 1198, # ItemPickup305_44 Pages_Environment_Main (X=47802.246 Y=-22594.684 Z=9631.879)
-    "Boulder Field Scraps 8": base_id + 1199, # ItemPickup294_11 Pages_Environment_Main (X=44345.996 Y=-23408.535 Z=9659.643)
-    "Boulder Field Scraps 9": base_id + 1200, # ItemPickup295_14 Pages_Environment_Main (X=41620.590 Y=-22982.641 Z=9720.177)
-    "Boulder Field Scraps 10": base_id + 1201, # ItemPickup300_29 Pages_Environment_Main (X=52003.172 Y=-19163.049 Z=9925.105)
-    "Boulder Field Scraps 11": base_id + 1202, # ItemPickup301_32 Pages_Environment_Main (X=51422.176 Y=-22319.322 Z=10663.813)
-    "Boulder Field Scraps 12": base_id + 1203, # ItemPickup296_17 Pages_Environment_Main (X=43527.176 Y=-17952.570 Z=10812.458)
-    "Boulder Field Scraps 13": base_id + 1204, # ItemPickup297_20 Pages_Environment_Main (X=45241.871 Y=-15847.636 Z=9952.198)
-    "Boulder Field Scraps 14": base_id + 1205, # ItemPickup298_23 Pages_Environment_Main (X=46238.027 Y=-18407.420 Z=10199.825)
-    "Boulder Field Scraps 15": base_id + 1206, # ItemPickup299_26 Pages_Environment_Main (X=49835.617 Y=-17379.959 Z=9810.836)
-    "Boulder Field Scraps 16": base_id + 1207, # ItemPickup306_47 Pages_Environment_Main (X=45144.594 Y=-33817.090 Z=10136.658)
-    "Boulder Field Scraps 17": base_id + 1208, # ItemPickup292_5 Pages_Environment_Main (X=44336.184 Y=-37162.367 Z=9789.548)
-    "Boulder Field Scraps 18": base_id + 1209 # ItemPickup304_41 Pages_Environment_Main (X=44490.160 Y=-26442.754 Z=9974.022)
+    "Boulder Field Page Drawing North": base_id + 1184, # Pages_Drawing1 Pages_Environment_Details (X=46232.703 Y=-37052.875 Z=9531.116)
+    "Boulder Field Page Drawing Northwest": base_id + 1185, # Pages_Drawing2 Pages_Environment_Details (X=51854.980 Y=-31332.070 Z=9804.927)
+    "Boulder Field Page Drawing Middle": base_id + 1186, # Pages_Drawing3 Pages_Environment_Details (X=47595.750 Y=-29931.740 Z=9308.014)
+    "Boulder Field Page Drawing West": base_id + 1187, # Pages_Drawing4 Pages_Environment_Details (X=43819.680 Y=-30378.770 Z=9706.599)
+    "Boulder Field Page Drawing Southeast": base_id + 1188, # Pages_Drawing5 Pages_Environment_Details (X=47494.746 Y=-20884.781 Z=9812.398)
+    "Boulder Field Page Drawing Southwest": base_id + 1189, # Pages_Drawing6 Pages_Environment_Details (X=43725.148 Y=-21952.570 Z=9744.351)
+    "Boulder Field Page Drawing South": base_id + 1190, # Pages_Drawing7 Pages_Environment_Details (X=44752.465 Y=-16362.510 Z=10147.004)
+    "Boulder Field Page Drawing East": base_id + 1191, # Pages_Drawing8 Pages_Environment_Details (X=50496.270 Y=-26090.533 Z=9835.365)
+    "Boulder Field Scraps Northwest On Rocks": base_id + 1192, # ItemPickup293_8 Pages_Environment_Main (X=41385.406 Y=-32281.871 Z=10240.781)
+    "Boulder Field Scraps North Behind Lantern": base_id + 1193, # ItemPickup987321 Pages_House_Main (X=46654.969 Y=-38859.254 Z=9920.861)
+    "Boulder Field Scraps North Near Barrier": base_id + 1194, # ItemPickup516121 Pages_House_Main (X=44765.836 Y=-41675.559 Z=9938.179)
+    "Boulder Field Scraps Northwest Near Crates": base_id + 1195, # ItemPickup291_2 Pages_Environment_Main (X=50088.270 Y=-30669.107 Z=9267.371)
+    "Boulder Field Scraps Middle Near Drawing": base_id + 1196, # ItemPickup303_38 Pages_Environment_Main (X=48014.609 Y=-28971.115 Z=9199.659)
+    "Boulder Field Scraps West Near Drawing": base_id + 1197, # ItemPickup302_35 Pages_Environment_Main (X=50190.266 Y=-26243.977 Z=9648.289)
+    "Boulder Field Scraps Middle Under Rocks": base_id + 1198, # ItemPickup305_44 Pages_Environment_Main (X=47802.246 Y=-22594.684 Z=9631.879)
+    "Boulder Field Scraps South Between Rocks": base_id + 1199, # ItemPickup294_11 Pages_Environment_Main (X=44345.996 Y=-23408.535 Z=9659.643)
+    "Boulder Field Scraps Southwest Lonely": base_id + 1200, # ItemPickup295_14 Pages_Environment_Main (X=41620.590 Y=-22982.641 Z=9720.177)
+    "Boulder Field Scraps South Near Crates": base_id + 1201, # ItemPickup300_29 Pages_Environment_Main (X=52003.172 Y=-19163.049 Z=9925.105)
+    "Boulder Field Scraps Southeast Hill": base_id + 1202, # ItemPickup301_32 Pages_Environment_Main (X=51422.176 Y=-22319.322 Z=10663.813)
+    "Boulder Field Scraps South Hill Atop": base_id + 1203, # ItemPickup296_17 Pages_Environment_Main (X=43527.176 Y=-17952.570 Z=10812.458)
+    "Boulder Field Scraps South Near Drawing": base_id + 1204, # ItemPickup297_20 Pages_Environment_Main (X=45241.871 Y=-15847.636 Z=9952.198)
+    "Boulder Field Scraps South Hill Between Trees": base_id + 1205, # ItemPickup298_23 Pages_Environment_Main (X=46238.027 Y=-18407.420 Z=10199.825)
+    "Boulder Field Scraps South Along Path": base_id + 1206, # ItemPickup299_26 Pages_Environment_Main (X=49835.617 Y=-17379.959 Z=9810.836)
+    "Boulder Field Scraps North Hill": base_id + 1207, # ItemPickup306_47 Pages_Environment_Main (X=45144.594 Y=-33817.090 Z=10136.658)
+    "Boulder Field Scraps North Behind Rock": base_id + 1208, # ItemPickup292_5 Pages_Environment_Main (X=44336.184 Y=-37162.367 Z=9789.548)
+    "Boulder Field Scraps Middle Hill": base_id + 1209 # ItemPickup304_41 Pages_Environment_Main (X=44490.160 Y=-26442.754 Z=9974.022)
 }
 
 loc_haunted_house = {
     "Haunted House Sasha Mission End": base_id + 1210, # (dialog 2) -> 40_scraps_reward
-    "Haunted House Scraps 1": base_id + 1211, # ItemPickup1309876 Pages_House_Main (X=42900.188 Y=-43760.617 Z=9900.531)
-    "Haunted House Scraps 2": base_id + 1212, # ItemPickup22213 Pages_House_Main (X=43608.078 Y=-44642.434 Z=9922.888)
-    "Haunted House Scraps 3": base_id + 1213, # ItemPickup5423189 Pages_House_Main (X=43992.387 Y=-44259.336 Z=9877.623)
-    "Haunted House Scraps 4": base_id + 1214, # ItemPickup1312312 Pages_House_Main (X=43340.012 Y=-45362.617 Z=9882.796)
-    "Haunted House Scraps 5": base_id + 1215, # ItemPickup1596 Pages_House_Main (X=45105.383 Y=-45980.879 Z=9854.796)
-    "Haunted House Scraps 6": base_id + 1216 # ItemPickup8624 Pages_House_Main (X=45888.406 Y=-46050.246 Z=9555.326)
+    "Haunted House Scraps Behind House": base_id + 1211, # ItemPickup1309876 Pages_House_Main (X=42900.188 Y=-43760.617 Z=9900.531)
+    "Haunted House Scraps Under House Roof": base_id + 1212, # ItemPickup22213 Pages_House_Main (X=43608.078 Y=-44642.434 Z=9922.888)
+    "Haunted House Scraps Near Crates": base_id + 1213, # ItemPickup5423189 Pages_House_Main (X=43992.387 Y=-44259.336 Z=9877.623)
+    "Haunted House Scraps Sheltered": base_id + 1214, # ItemPickup1312312 Pages_House_Main (X=43340.012 Y=-45362.617 Z=9882.796)
+    "Haunted House Scraps Bridge": base_id + 1215, # ItemPickup1596 Pages_House_Main (X=45105.383 Y=-45980.879 Z=9854.796)
+    "Haunted House Scraps Under Bridge": base_id + 1216 # ItemPickup8624 Pages_House_Main (X=45888.406 Y=-46050.246 Z=9555.326)
 }
 
 loc_santiago_house = {
-    "Santiago House Scraps 1": base_id + 1217, # ItemPickup342_19 PortNPCHouse_Details (X=37271.445 Y=-46075.598 Z=10648.827)
-    "Santiago House Scraps 2": base_id + 1218, # ItemPickup37_5 PortNPCHouse_Details (X=38330.512 Y=-47184.668 Z=10387.618)
-    "Santiago House Scraps 3": base_id + 1219, # ItemPickup337_2 PortNPCHouse_Details (X=35720.422 Y=-49536.328 Z=10098.503)
-    "Santiago House Scraps 4": base_id + 1220, # ItemPickup344_25 PortNPCHouse_Details (X=35466.285 Y=-50363.078 Z=10098.504)
-    "Santiago House Scraps 5": base_id + 1221, # ItemPickup338_7 PortNPCHouse_Details (X=34274.289 Y=-49947.578 Z=10098.501)
-    "Santiago House Scraps 6": base_id + 1222, # ItemPickup341_16 PortNPCHouse_Details (X=35584.359 Y=-48195.172 Z=10323.833)
-    "Santiago House Scraps 7": base_id + 1223, # ItemPickup340_13 PortNPCHouse_Details (X=35019.766 Y=-49904.113 Z=10124.169)
-    "Santiago House Scraps 8": base_id + 1224, # ItemPickup339_10 PortNPCHouse_Details (X=35527.711 Y=-49614.801 Z=10124.016)
-    "Santiago House Scraps 9": base_id + 1225, # ItemPickup36_2 PortNPCHouse_Details (X=34471.707 Y=-49497.000 Z=10199.790)
-    "Santiago House Scraps 10": base_id + 1226, # ItemPickup343_22 PortNPCHouse_Details (X=37920.277 Y=-51867.754 Z=9847.511)
+    "Santiago House Scraps On Shrine": base_id + 1217, # ItemPickup342_19 PortNPCHouse_Details (X=37271.445 Y=-46075.598 Z=10648.827)
+    "Santiago House Scraps Near Shrine": base_id + 1218, # ItemPickup37_5 PortNPCHouse_Details (X=38330.512 Y=-47184.668 Z=10387.618)
+    "Santiago House Scraps Near Crates Outside": base_id + 1219, # ItemPickup337_2 PortNPCHouse_Details (X=35720.422 Y=-49536.328 Z=10098.503)
+    "Santiago House Scraps Near House": base_id + 1220, # ItemPickup344_25 PortNPCHouse_Details (X=35466.285 Y=-50363.078 Z=10098.504)
+    "Santiago House Scraps Behind House": base_id + 1221, # ItemPickup338_7 PortNPCHouse_Details (X=34274.289 Y=-49947.578 Z=10098.501)
+    "Santiago House Scraps On Rocks": base_id + 1222, # ItemPickup341_16 PortNPCHouse_Details (X=35584.359 Y=-48195.172 Z=10323.833)
+    "Santiago House Scraps Near Table": base_id + 1223, # ItemPickup340_13 PortNPCHouse_Details (X=35019.766 Y=-49904.113 Z=10124.169)
+    "Santiago House Scraps Near Crates Inside": base_id + 1224, # ItemPickup339_10 PortNPCHouse_Details (X=35527.711 Y=-49614.801 Z=10124.016)
+    "Santiago House Scraps On Crates": base_id + 1225, # ItemPickup36_2 PortNPCHouse_Details (X=34471.707 Y=-49497.000 Z=10199.790)
+    "Santiago House Scraps Along Path": base_id + 1226, # ItemPickup343_22 PortNPCHouse_Details (X=37920.277 Y=-51867.754 Z=9847.511)
     "Santiago House Journal": base_id + 1227 # Port_Journal_Pickup PortNPCHouse_Details (X=34690.777 Y=-49788.359 Z=10214.353)
 }
 
 loc_port = {
     "Port Grey Paint Can": base_id + 1228, # PaintCan_13 Port_Details (X=74641.648 Y=-11320.948 Z=7551.767)
-    "Port Scraps 1": base_id + 1229, # ItemPickup334_32 Port_Main (X=67315.281 Y=-13828.055 Z=10101.339)
-    "Port Scraps 2": base_id + 1230, # ItemPickup335_35 Port_Main (X=67679.508 Y=-14127.952 Z=10061.037)
-    "Port Scraps 3": base_id + 1231, # ItemPickup336_38 Port_Main (X=67062.219 Y=-15626.003 Z=10065.956)
-    "Port Scraps 4": base_id + 1232, # ItemPickup21_15 Port_Main (X=66140.914 Y=-16079.730 Z=10092.268)
-    "Port Scraps 5": base_id + 1233, # ItemPickup18_12 Port_Main (X=66824.719 Y=-14729.157 Z=10125.234)
-    "Port Scraps 6": base_id + 1234, # ItemPickup333_29 Port_Main (X=69777.258 Y=-8371.526 Z=9391.735)
-    "Port Scraps 7": base_id + 1235, # ItemPickup332_26 Port_Main (X=70339.695 Y=-11066.703 Z=8912.465)
-    "Port Scraps 8": base_id + 1236, # ItemPickup331_23 Port_Main (X=72729.508 Y=-7048.998 Z=8245.522)
-    "Port Scraps 9": base_id + 1237, # ItemPickup329_17 Port_Main (X=75896.070 Y=-8705.214 Z=7514.992)
-    "Port Scraps 10": base_id + 1238, # ItemPickup330_20 Port_Main (X=74264.211 Y=-10553.446 Z=7520.141)
-    "Port Scraps 11": base_id + 1239, # ItemPickup17_9 Port_Main (X=74328.117 Y=-11423.852 Z=7511.827)
-    "Port Scraps 12": base_id + 1240, # ItemPickup328_14 Port_Main (X=76753.164 Y=-10744.933 Z=7437.174)
-    "Port Scraps 13": base_id + 1241, # ItemPickup326_8 Port_Main (X=77330.414 Y=-11640.151 Z=7189.003)
-    "Port Scraps 14": base_id + 1242, # ItemPickup327_11 Port_Main (X=76403.516 Y=-12484.995 Z=7440.368)
-    "Port Scraps 15": base_id + 1243, # ItemPickup324_2 Port_Main (X=78651.977 Y=-12233.159 Z=7439.514)
-    "Port Scraps 16": base_id + 1244, # ItemPickup14_5 Port_Main (X=80336.297 Y=-12276.590 Z=7436.639) \!/ Existing match 7
-    "Port Scraps 17": base_id + 1245, # ItemPickup325_5 Port_Main (X=79845.086 Y=-13410.705 Z=7440.597)
-    "Port Scraps 18": base_id + 1246, # ItemPickup13_2 Port_Main (X=76156.719 Y=-12816.718 Z=7439.269) \!/ Existing match 6
-    "Port Scraps 19": base_id + 1247, # ItemPickup16 Port_Main (X=80754.914 Y=-14055.545 Z=7445.339) \!/ Existing match 2
+    "Port Scraps Station Near Shelter": base_id + 1229, # ItemPickup334_32 Port_Main (X=67315.281 Y=-13828.055 Z=10101.339)
+    "Port Scraps Station Half Sheltered": base_id + 1230, # ItemPickup335_35 Port_Main (X=67679.508 Y=-14127.952 Z=10061.037)
+    "Port Scraps Station Near Tent": base_id + 1231, # ItemPickup336_38 Port_Main (X=67062.219 Y=-15626.003 Z=10065.956)
+    "Port Scraps Station Near Beams": base_id + 1232, # ItemPickup21_15 Port_Main (X=66140.914 Y=-16079.730 Z=10092.268)
+    "Port Scraps Station Near Note": base_id + 1233, # ItemPickup18_12 Port_Main (X=66824.719 Y=-14729.157 Z=10125.234)
+    "Port Scraps Path Summit": base_id + 1234, # ItemPickup333_29 Port_Main (X=69777.258 Y=-8371.526 Z=9391.735)
+    "Port Scraps Path Near Lit Lantern": base_id + 1235, # ItemPickup332_26 Port_Main (X=70339.695 Y=-11066.703 Z=8912.465)
+    "Port Scraps Path Under Unlit Lantern": base_id + 1236, # ItemPickup331_23 Port_Main (X=72729.508 Y=-7048.998 Z=8245.522)
+    "Port Scraps Path Near Tent": base_id + 1237, # ItemPickup329_17 Port_Main (X=75896.070 Y=-8705.214 Z=7514.992)
+    "Port Scraps Docks Near Shelter": base_id + 1238, # ItemPickup330_20 Port_Main (X=74264.211 Y=-10553.446 Z=7520.141)
+    "Port Scraps Docks Sheltered": base_id + 1239, # ItemPickup17_9 Port_Main (X=74328.117 Y=-11423.852 Z=7511.827)
+    "Port Scraps Docks Platform Start": base_id + 1240, # ItemPickup328_14 Port_Main (X=76753.164 Y=-10744.933 Z=7437.174)
+    "Port Scraps Docks Under Platform": base_id + 1241, # ItemPickup326_8 Port_Main (X=77330.414 Y=-11640.151 Z=7189.003)
+    "Port Scraps Docks Near Beds": base_id + 1242, # ItemPickup327_11 Port_Main (X=76403.516 Y=-12484.995 Z=7440.368)
+    "Port Scraps Docks Between Lanterns": base_id + 1243, # ItemPickup324_2 Port_Main (X=78651.977 Y=-12233.159 Z=7439.514)
+    "Port Scraps Docks Near Crates": base_id + 1244, # ItemPickup14_5 Port_Main (X=80336.297 Y=-12276.590 Z=7436.639) \!/ Existing match 7
+    "Port Scraps Docks On Gangway": base_id + 1245, # ItemPickup325_5 Port_Main (X=79845.086 Y=-13410.705 Z=7440.597)
+    "Port Scraps Docks Behind House": base_id + 1246, # ItemPickup13_2 Port_Main (X=76156.719 Y=-12816.718 Z=7439.269) \!/ Existing match 6
+    "Port Scraps Docks In Gangway Corner": base_id + 1247, # ItemPickup16 Port_Main (X=80754.914 Y=-14055.545 Z=7445.339) \!/ Existing match 2
     "Port Santiago Mission End": base_id + 1248 # (dialog 3) -> 35_scraps_reward
 }
 
 loc_trench_house = {
-    "Trench House Scraps 1": base_id + 1249, # ItemPickup157_2 DeadWoodsEnvironment (X=76340.328 Y=-42886.191 Z=9567.521)
-    "Trench House Scraps 2": base_id + 1250, # ItemPickup158_5 DeadWoodsEnvironment (X=76013.594 Y=-44140.141 Z=9413.147)
-    "Trench House Scraps 3": base_id + 1251, # ItemPickup159_11 DeadWoodsEnvironment (X=74408.320 Y=-45424.000 Z=9446.966)
-    "Trench House Scraps 4": base_id + 1252, # ItemPickup69_14 Secret8_BasementHouseDetails (X=75196.344 Y=-48321.504 Z=9453.302)
-    "Trench House Scraps 5": base_id + 1253, # ItemPickup160_14 DeadWoodsEnvironment (X=73467.273 Y=-48995.738 Z=9355.070)
-    "Trench House Scraps 6": base_id + 1254, # ItemPickup163_23 DeadWoodsEnvironment (X=76418.469 Y=-53239.539 Z=9276.892)
-    "Trench House Scraps 7": base_id + 1255, # ItemPickup173_56 DeadWoodsEnvironment (X=70719.875 Y=-54290.117 Z=9357.084)
-    "Trench House Scraps 8": base_id + 1256, # ItemPickup165_29 DeadWoodsEnvironment (X=70075.938 Y=-53041.973 Z=9675.481)
-    "Trench House Scraps 9": base_id + 1257, # ItemPickup162_20 DeadWoodsEnvironment (X=74745.711 Y=-52304.027 Z=9073.130)
-    "Trench House Scraps 10": base_id + 1258, # ItemPickup68_11 Secret8_BasementHouseDetails (X=74519.750 Y=-53603.063 Z=9078.054)
-    "Trench House Scraps 11": base_id + 1259, # ItemPickup161_17 DeadWoodsEnvironment (X=73747.492 Y=-52589.906 Z=9104.748)
-    "Trench House Scraps 12": base_id + 1260, # ItemPickup67_8 Secret8_BasementHouseDetails (X=74333.125 Y=-52847.961 Z=9124.773)
-    "Trench House Scraps 13": base_id + 1261, # ItemPickup66_5 Secret8_BasementHouseDetails (X=74062.195 Y=-52663.043 Z=9122.827)
-    "Trench House Scraps 14": base_id + 1262, # ItemPickup65_2 Secret8_BasementHouseDetails (X=74820.492 Y=-51350.051 Z=7956.387)
-    "Trench House Scraps 15": base_id + 1263, # ItemPickup164_26 DeadWoodsEnvironment (X=75286.289 Y=-51164.098 Z=7957.081)
-    "Trench House Scraps 16": base_id + 1264, # ItemPickup174_59 DeadWoodsEnvironment (X=68413.258 Y=-56872.816 Z=9349.443)
-    "Trench House Scraps 17": base_id + 1265, # ItemPickup175_62 DeadWoodsEnvironment (X=67281.281 Y=-59201.371 Z=9254.457)
-    "Trench House Scraps 18": base_id + 1266, # ItemPickup172_50 DeadWoodsEnvironment (X=69064.219 Y=-48796.352 Z=9770.164)
+    "Trench House Scraps South Near Rails": base_id + 1249, # ItemPickup157_2 DeadWoodsEnvironment (X=76340.328 Y=-42886.191 Z=9567.521)
+    "Trench House Scraps South Near Crate": base_id + 1250, # ItemPickup158_5 DeadWoodsEnvironment (X=76013.594 Y=-44140.141 Z=9413.147)
+    "Trench House Scraps South Near Lantern": base_id + 1251, # ItemPickup159_11 DeadWoodsEnvironment (X=74408.320 Y=-45424.000 Z=9446.966)
+    "Trench House Scraps South Behind Rock": base_id + 1252, # ItemPickup69_14 Secret8_BasementHouseDetails (X=75196.344 Y=-48321.504 Z=9453.302)
+    "Trench House Scraps South Lonely": base_id + 1253, # ItemPickup160_14 DeadWoodsEnvironment (X=73467.273 Y=-48995.738 Z=9355.070)
+    "Trench House Scraps East Near Trench": base_id + 1254, # ItemPickup163_23 DeadWoodsEnvironment (X=76418.469 Y=-53239.539 Z=9276.892)
+    "Trench House Scraps West Near Shrine": base_id + 1255, # ItemPickup173_56 DeadWoodsEnvironment (X=70719.875 Y=-54290.117 Z=9357.084)
+    "Trench House Scraps West On Shrine": base_id + 1256, # ItemPickup165_29 DeadWoodsEnvironment (X=70075.938 Y=-53041.973 Z=9675.481)
+    "Trench House Scraps Middle Near Door": base_id + 1257, # ItemPickup162_20 DeadWoodsEnvironment (X=74745.711 Y=-52304.027 Z=9073.130)
+    "Trench House Scraps Middle Behind House": base_id + 1258, # ItemPickup68_11 Secret8_BasementHouseDetails (X=74519.750 Y=-53603.063 Z=9078.054)
+    "Trench House Scraps Middle Near Water Tank": base_id + 1259, # ItemPickup161_17 DeadWoodsEnvironment (X=73747.492 Y=-52589.906 Z=9104.748)
+    "Trench House Scraps Inside Under Table": base_id + 1260, # ItemPickup67_8 Secret8_BasementHouseDetails (X=74333.125 Y=-52847.961 Z=9124.773)
+    "Trench House Scraps Inside Above Stairs": base_id + 1261, # ItemPickup66_5 Secret8_BasementHouseDetails (X=74062.195 Y=-52663.043 Z=9122.827)
+    "Trench House Scraps Inside Behind Crates": base_id + 1262, # ItemPickup65_2 Secret8_BasementHouseDetails (X=74820.492 Y=-51350.051 Z=7956.387)
+    "Trench House Scraps Inside Near Tables": base_id + 1263, # ItemPickup164_26 DeadWoodsEnvironment (X=75286.289 Y=-51164.098 Z=7957.081)
+    "Trench House Scraps Northwest Under Lantern": base_id + 1264, # ItemPickup174_59 DeadWoodsEnvironment (X=68413.258 Y=-56872.816 Z=9349.443)
+    "Trench House Scraps Northwest Near Rock": base_id + 1265, # ItemPickup175_62 DeadWoodsEnvironment (X=67281.281 Y=-59201.371 Z=9254.457)
+    "Trench House Scraps Southwest Near Rock": base_id + 1266, # ItemPickup172_50 DeadWoodsEnvironment (X=69064.219 Y=-48796.352 Z=9770.164)
     "Trench House Chest Scraps 1": base_id + 1267, # ItemPickup75123123 Secret8_BasementHouseDetails (X=75042.141 Y=-50830.891 Z=8005.156)
     "Trench House Chest Scraps 2": base_id + 1268, # ItemPickup741123 Secret8_BasementHouseDetails (X=75066.516 Y=-50824.398 Z=7995.000)
     "Trench House Chest Scraps 3": base_id + 1269, # ItemPickup729842 Secret8_BasementHouseDetails (X=75072.789 Y=-50818.441 Z=7986.979)
@@ -347,38 +347,38 @@ class CCCharlesLocation(Location):
 }
 
 loc_doll_woods = {
-    "Doll Woods Scraps 1": base_id + 1273, # ItemPickup78_2 DeadWoodsDolls (X=60126.234 Y=-49668.906 Z=9970.880)
-    "Doll Woods Scraps 2": base_id + 1274, # ItemPickup166_32 DeadWoodsEnvironment (X=59854.066 Y=-47313.121 Z=10376.684)
-    "Doll Woods Scraps 3": base_id + 1275, # ItemPickup80_8 DeadWoodsDolls (X=59130.613 Y=-49597.789 Z=9930.675)
-    "Doll Woods Scraps 4": base_id + 1276, # ItemPickup168_38 DeadWoodsEnvironment (X=59785.973 Y=-51269.684 Z=10180.019)
-    "Doll Woods Scraps 5": base_id + 1277, # ItemPickup81_11 DeadWoodsDolls (X=58226.449 Y=-52660.801 Z=10576.626)
-    "Doll Woods Scraps 6": base_id + 1278, # ItemPickup167_35 DeadWoodsEnvironment (X=56243.176 Y=-49097.793 Z=10869.889)
-    "Doll Woods Scraps 7": base_id + 1279, # ItemPickup79_5 DeadWoodsDolls (X=59481.672 Y=-45288.137 Z=10897.672)
-    "Doll Woods Scraps 8": base_id + 1280, # ItemPickup170_44 DeadWoodsEnvironment (X=63807.668 Y=-44674.734 Z=10337.434)
-    "Doll Woods Scraps 9": base_id + 1281, # ItemPickup171_47 DeadWoodsEnvironment (X=68406.664 Y=-45721.813 Z=10021.356)
-    "Doll Woods Scraps 10": base_id + 1282 # ItemPickup169_41 DeadWoodsEnvironment (X=62898.469 Y=-47565.703 Z=10744.431)
+    "Doll Woods Scraps Middle Under Doll Tree": base_id + 1273, # ItemPickup78_2 DeadWoodsDolls (X=60126.234 Y=-49668.906 Z=9970.880)
+    "Doll Woods Scraps South Under Doll Tree": base_id + 1274, # ItemPickup166_32 DeadWoodsEnvironment (X=59854.066 Y=-47313.121 Z=10376.684)
+    "Doll Woods Scraps Middle Near Campfire": base_id + 1275, # ItemPickup80_8 DeadWoodsDolls (X=59130.613 Y=-49597.789 Z=9930.675)
+    "Doll Woods Scraps Middle Under High Rock": base_id + 1276, # ItemPickup168_38 DeadWoodsEnvironment (X=59785.973 Y=-51269.684 Z=10180.019)
+    "Doll Woods Scraps North Lonely": base_id + 1277, # ItemPickup81_11 DeadWoodsDolls (X=58226.449 Y=-52660.801 Z=10576.626)
+    "Doll Woods Scraps West Near High Rock": base_id + 1278, # ItemPickup167_35 DeadWoodsEnvironment (X=56243.176 Y=-49097.793 Z=10869.889)
+    "Doll Woods Scraps South Behind Tree": base_id + 1279, # ItemPickup79_5 DeadWoodsDolls (X=59481.672 Y=-45288.137 Z=10897.672)
+    "Doll Woods Scraps Southeast On Path Further": base_id + 1280, # ItemPickup170_44 DeadWoodsEnvironment (X=63807.668 Y=-44674.734 Z=10337.434)
+    "Doll Woods Scraps Southeast Behind Rock": base_id + 1281, # ItemPickup171_47 DeadWoodsEnvironment (X=68406.664 Y=-45721.813 Z=10021.356)
+    "Doll Woods Scraps Southeast On Path": base_id + 1282 # ItemPickup169_41 DeadWoodsEnvironment (X=62898.469 Y=-47565.703 Z=10744.431)
 }
 
 loc_lost_stairs = {
-    "Lost Stairs Scraps 1": base_id + 1283, # ItemPickup29_2 Secret1_Stairs2 (X=47087.617 Y=-53476.547 Z=9103.093)
-    "Lost Stairs Scraps 2": base_id + 1284 # ItemPickup30_5 Secret1_Stairs2 (X=47162.238 Y=-55318.094 Z=9127.096)
+    "Lost Stairs Scraps Down Stairs": base_id + 1283, # ItemPickup29_2 Secret1_Stairs2 (X=47087.617 Y=-53476.547 Z=9103.093)
+    "Lost Stairs Scraps Near Stairs": base_id + 1284 # ItemPickup30_5 Secret1_Stairs2 (X=47162.238 Y=-55318.094 Z=9127.096)
 }
 
 loc_east_house = {
-    "East House Scraps 1": base_id + 1285, # ItemPickup409_5 Secret7_CliffHouseEnvironment (X=97507.664 Y=-53201.270 Z=9174.678)
-    "East House Scraps 2": base_id + 1286, # ItemPickup408_2 Secret7_CliffHouseEnvironment (X=98511.242 Y=-53899.414 Z=9016.314)
-    "East House Scraps 3": base_id + 1287, # ItemPickup410_8 Secret7_CliffHouseEnvironment (X=100688.102 Y=-54197.578 Z=8919.432)
-    "East House Scraps 4": base_id + 1288, # ItemPickup411_11 Secret7_CliffHouseEnvironment (X=103149.773 Y=-54659.980 Z=9002.535)
-    "East House Scraps 5": base_id + 1289, # ItemPickup416_26 Secret7_CliffHouseEnvironment (X=107458.172 Y=-55683.793 Z=9429.004)
-    "East House Scraps 6": base_id + 1290, # ItemPickup25_2 Secret7_CliffHouseEnvironment (X=109034.164 Y=-54360.703 Z=9495.910)
-    "East House Scraps 7": base_id + 1291, # ItemPickup413_17 Secret7_CliffHouseEnvironment (X=109245.148 Y=-55045.242 Z=9553.601)
-    "East House Scraps 8": base_id + 1292, # ItemPickup414_20 Secret7_CliffHouseEnvironment (X=112556.445 Y=-55851.754 Z=10049.954)
-    "East House Scraps 9": base_id + 1293, # ItemPickup415_23 Secret7_CliffHouseEnvironment (X=113131.469 Y=-56822.508 Z=10038.047)
-    "East House Scraps 10": base_id + 1294, # ItemPickup2599786 Secret7_CliffHouseDetails (X=112279.828 Y=-56743.781 Z=10029.549)
-    "East House Scraps 11": base_id + 1295, # ItemPickup253321 Secret7_CliffHouseDetails (X=112445.508 Y=-56280.320 Z=10059.164)
-    "East House Scraps 12": base_id + 1296, # ItemPickup2532323 Secret7_CliffHouseDetails (X=112562.211 Y=-56736.332 Z=10454.907)
-    "East House Scraps 13": base_id + 1297, # ItemPickup257655 Secret7_CliffHouseDetails (X=109313.320 Y=-58221.316 Z=9501.283)
-    "East House Scraps 14": base_id + 1298, # ItemPickup412_14 Secret7_CliffHouseEnvironment (X=104077.805 Y=-55987.301 Z=9066.847)
+    "East House Scraps South Path Near Rails": base_id + 1285, # ItemPickup409_5 Secret7_CliffHouseEnvironment (X=97507.664 Y=-53201.270 Z=9174.678)
+    "East House Scraps South Path Near First Lantern": base_id + 1286, # ItemPickup408_2 Secret7_CliffHouseEnvironment (X=98511.242 Y=-53899.414 Z=9016.314)
+    "East House Scraps South Path Near Second Lantern": base_id + 1287, # ItemPickup410_8 Secret7_CliffHouseEnvironment (X=100688.102 Y=-54197.578 Z=8919.432)
+    "East House Scraps South Path Near Third Lantern": base_id + 1288, # ItemPickup411_11 Secret7_CliffHouseEnvironment (X=103149.773 Y=-54659.980 Z=9002.535)
+    "East House Scraps South Path Fifth Lantern": base_id + 1289, # ItemPickup416_26 Secret7_CliffHouseEnvironment (X=107458.172 Y=-55683.793 Z=9429.004)
+    "East House Scraps Right Path Near Tent": base_id + 1290, # ItemPickup25_2 Secret7_CliffHouseEnvironment (X=109034.164 Y=-54360.703 Z=9495.910)
+    "East House Scraps Right Under Lantern": base_id + 1291, # ItemPickup413_17 Secret7_CliffHouseEnvironment (X=109245.148 Y=-55045.242 Z=9553.601)
+    "East House Scraps Summit Behind House": base_id + 1292, # ItemPickup414_20 Secret7_CliffHouseEnvironment (X=112556.445 Y=-55851.754 Z=10049.954)
+    "East House Scraps Summit Near Door": base_id + 1293, # ItemPickup415_23 Secret7_CliffHouseEnvironment (X=113131.469 Y=-56822.508 Z=10038.047)
+    "East House Scraps Summit Near Minecart": base_id + 1294, # ItemPickup2599786 Secret7_CliffHouseDetails (X=112279.828 Y=-56743.781 Z=10029.549)
+    "East House Scraps Inside Near Bed": base_id + 1295, # ItemPickup253321 Secret7_CliffHouseDetails (X=112445.508 Y=-56280.320 Z=10059.164)
+    "East House Scraps Inside First Floor": base_id + 1296, # ItemPickup2532323 Secret7_CliffHouseDetails (X=112562.211 Y=-56736.332 Z=10454.907)
+    "East House Scraps Left Path Near Lantern": base_id + 1297, # ItemPickup257655 Secret7_CliffHouseDetails (X=109313.320 Y=-58221.316 Z=9501.283)
+    "East House Scraps South Path On Shortcut": base_id + 1298, # ItemPickup412_14 Secret7_CliffHouseEnvironment (X=104077.805 Y=-55987.301 Z=9066.847)
     "East House Chest Scraps 1": base_id + 1299, # ItemPickup76246 Secret7_CliffHouseDetails (X=112317.242 Y=-55820.805 Z=10497.336)
     "East House Chest Scraps 2": base_id + 1300, # ItemPickup76245 Secret7_CliffHouseDetails (X=112326.086 Y=-55808.477 Z=10485.685)
     "East House Chest Scraps 3": base_id + 1301, # ItemPickup85131 Secret7_CliffHouseDetails (X=112329.031 Y=-55828.438 Z=10478.107)
@@ -388,64 +388,64 @@ class CCCharlesLocation(Location):
 
 loc_rockets_testing_ground = {
     "Rockets Testing Ground Timed Dynamite": base_id + 1304, # Boomer_DynamitePickup Boomer_RangeDetails (X=76476.609 Y=-65286.738 Z=8303.742)
-    "Rockets Testing Ground Scraps 1": base_id + 1305, # ItemPickup105_14 Boomer_HouseDetails (X=88925.570 Y=-63375.051 Z=8563.354)
-    "Rockets Testing Ground Scraps 2": base_id + 1306, # ItemPickup106_17 Boomer_HouseDetails (X=84234.016 Y=-64475.551 Z=8382.108)
-    "Rockets Testing Ground Scraps 3": base_id + 1307, # ItemPickup114_23 Boomer_RangeDetails (X=79349.438 Y=-64225.480 Z=8384.219)
-    "Rockets Testing Ground Scraps 4": base_id + 1308, # ItemPickup22_0 Boomer_RangeDetails (X=79831.070 Y=-65847.766 Z=8301.337)
-    "Rockets Testing Ground Scraps 5": base_id + 1309, # ItemPickup109_5 Boomer_RangeDetails (X=76526.500 Y=-65394.875 Z=8223.883)
-    "Rockets Testing Ground Scraps 6": base_id + 1310, # ItemPickup108_2 Boomer_RangeDetails (X=76237.977 Y=-67087.414 Z=8361.979)
-    "Rockets Testing Ground Scraps 7": base_id + 1311, # ItemPickup115_26 Boomer_RangeDetails (X=78857.672 Y=-67802.227 Z=8257.150)
-    "Rockets Testing Ground Scraps 8": base_id + 1312, # ItemPickup110_8 Boomer_RangeDetails (X=74878.570 Y=-62927.297 Z=8749.549)
-    "Rockets Testing Ground Scraps 9": base_id + 1313, # ItemPickup111_11 Boomer_RangeDetails (X=74542.641 Y=-61301.082 Z=9493.931)
-    "Rockets Testing Ground Scraps 10": base_id + 1314 # ItemPickup23_0 Boomer_RangeDetails (X=77020.859 Y=-62031.320 Z=8873.663)
+    "Rockets Testing Ground Scraps East Near Lantern": base_id + 1305, # ItemPickup105_14 Boomer_HouseDetails (X=88925.570 Y=-63375.051 Z=8563.354)
+    "Rockets Testing Ground Scraps East Near Barrier": base_id + 1306, # ItemPickup106_17 Boomer_HouseDetails (X=84234.016 Y=-64475.551 Z=8382.108)
+    "Rockets Testing Ground Scraps Middle Near Dirt Heap": base_id + 1307, # ItemPickup114_23 Boomer_RangeDetails (X=79349.438 Y=-64225.480 Z=8384.219)
+    "Rockets Testing Ground Scraps Middle Near Planks": base_id + 1308, # ItemPickup22_0 Boomer_RangeDetails (X=79831.070 Y=-65847.766 Z=8301.337)
+    "Rockets Testing Ground Scraps Middle Near Crate": base_id + 1309, # ItemPickup109_5 Boomer_RangeDetails (X=76526.500 Y=-65394.875 Z=8223.883)
+    "Rockets Testing Ground Scraps Middle Near Lantern": base_id + 1310, # ItemPickup108_2 Boomer_RangeDetails (X=76237.977 Y=-67087.414 Z=8361.979)
+    "Rockets Testing Ground Scraps North Under Explosive Sign": base_id + 1311, # ItemPickup115_26 Boomer_RangeDetails (X=78857.672 Y=-67802.227 Z=8257.150)
+    "Rockets Testing Ground Scraps Middle Near Rock": base_id + 1312, # ItemPickup110_8 Boomer_RangeDetails (X=74878.570 Y=-62927.297 Z=8749.549)
+    "Rockets Testing Ground Scraps Southwest Above Door": base_id + 1313, # ItemPickup111_11 Boomer_RangeDetails (X=74542.641 Y=-61301.082 Z=9493.931)
+    "Rockets Testing Ground Scraps South Above Bunker": base_id + 1314 # ItemPickup23_0 Boomer_RangeDetails (X=77020.859 Y=-62031.320 Z=8873.663)
     # "Rockets Testing Ground Scraps Glitch 1" ItemPickup107_20 (X=81308.406 Y=-63482.320 Z=8533.338) /!\ Glitched scrap
 }
 
 loc_rockets_testing_bunker = {
-    "Rockets Testing Bunker Scraps 1": base_id + 1315, # ItemPickup113_20 Boomer_RangeDetails (X=77552.094 Y=-61144.559 Z=8523.195)
-    "Rockets Testing Bunker Scraps 2": base_id + 1316, # ItemPickup112_14 Boomer_RangeDetails (X=77670.227 Y=-62029.941 Z=8570.785)
+    "Rockets Testing Bunker Scraps Near Explosives": base_id + 1315, # ItemPickup113_20 Boomer_RangeDetails (X=77552.094 Y=-61144.559 Z=8523.195)
+    "Rockets Testing Bunker Scraps In Corner": base_id + 1316, # ItemPickup112_14 Boomer_RangeDetails (X=77670.227 Y=-62029.941 Z=8570.785)
     "Rockets Testing Bunker Box of Rockets": base_id + 1317 # Boomer_RocketsPickup Boomer_RangeDetails (X=77330.086 Y=-61504.324 Z=8523.195)
 }
 
 loc_workshop = {
-    "Workshop Scraps 1": base_id + 1318, # ItemPickup103_8 Boomer_HouseDetails (X=93550.773 Y=-61901.797 Z=8828.551)
-    "Workshop Scraps 2": base_id + 1319, # ItemPickup102_5 Boomer_HouseDetails (X=93508.047 Y=-64009.910 Z=8783.468)
-    "Workshop Scraps 3": base_id + 1320, # ItemPickup101_2 Boomer_HouseDetails (X=92011.648 Y=-65572.281 Z=8736.709)
-    "Workshop Scraps 4": base_id + 1321, # ItemPickup24_2 Boomer_HouseDetails (X=92311.594 Y=-63045.211 Z=8749.977)
-    "Workshop Scraps 5": base_id + 1322, # ItemPickup104_11 Boomer_HouseDetails (X=91392.734 Y=-63527.629 Z=8709.268)
-    "Workshop Scraps 6": base_id + 1323, # ItemPickup25_1 Boomer_HouseDetails (X=92986.789 Y=-63012.047 Z=9235.383)
+    "Workshop Scraps Sheltered": base_id + 1318, # ItemPickup103_8 Boomer_HouseDetails (X=93550.773 Y=-61901.797 Z=8828.551)
+    "Workshop Scraps Platform": base_id + 1319, # ItemPickup102_5 Boomer_HouseDetails (X=93508.047 Y=-64009.910 Z=8783.468)
+    "Workshop Scraps On Path": base_id + 1320, # ItemPickup101_2 Boomer_HouseDetails (X=92011.648 Y=-65572.281 Z=8736.709)
+    "Workshop Scraps Water Path": base_id + 1321, # ItemPickup24_2 Boomer_HouseDetails (X=92311.594 Y=-63045.211 Z=8749.977)
+    "Workshop Scraps Under Lantern": base_id + 1322, # ItemPickup104_11 Boomer_HouseDetails (X=91392.734 Y=-63527.629 Z=8709.268)
+    "Workshop Scraps Near Beds": base_id + 1323, # ItemPickup25_1 Boomer_HouseDetails (X=92986.789 Y=-63012.047 Z=9235.383)
     "Workshop John Smith Mission End": base_id + 1324 # (dialog 2) -> the_boomer
 }
 
 loc_east_tower = {
     "Greg Mission Start": base_id + 1325, # (dialog 6) -> north_mine_key
-    "East Tower Scraps 1": base_id + 1326, # ItemPickup231_17 Mine2_NPCHouseDetails (X=95448.250 Y=-67249.156 Z=8607.896)
-    "East Tower Scraps 2": base_id + 1327, # ItemPickup228_8 Mine2_NPCHouseDetails (X=96339.242 Y=-66374.828 Z=8650.519)
-    "East Tower Scraps 3": base_id + 1328, # ItemPickup229_11 Mine2_NPCHouseDetails (X=98540.711 Y=-67173.656 Z=8418.825)
-    "East Tower Scraps 4": base_id + 1329, # ItemPickup230_14 Mine2_NPCHouseDetails (X=97276.414 Y=-68495.008 Z=8337.229)
-    "East Tower Scraps 5": base_id + 1330, # ItemPickup227_5 Mine2_NPCHouseDetails (X=96470.820 Y=-66540.859 Z=8953.763)
-    "East Tower Scraps 6": base_id + 1331 # ItemPickup226_2 Mine2_NPCHouseDetails (X=96141.555 Y=-67013.445 Z=9399.308)
+    "East Tower Scraps Between Crates": base_id + 1326, # ItemPickup231_17 Mine2_NPCHouseDetails (X=95448.250 Y=-67249.156 Z=8607.896)
+    "East Tower Scraps Near Minecart": base_id + 1327, # ItemPickup228_8 Mine2_NPCHouseDetails (X=96339.242 Y=-66374.828 Z=8650.519)
+    "East Tower Scraps Under Lantern": base_id + 1328, # ItemPickup229_11 Mine2_NPCHouseDetails (X=98540.711 Y=-67173.656 Z=8418.825)
+    "East Tower Scraps Near Barrier": base_id + 1329, # ItemPickup230_14 Mine2_NPCHouseDetails (X=97276.414 Y=-68495.008 Z=8337.229)
+    "East Tower Scraps In Stairs": base_id + 1330, # ItemPickup227_5 Mine2_NPCHouseDetails (X=96470.820 Y=-66540.859 Z=8953.763)
+    "East Tower Scraps Near Note": base_id + 1331 # ItemPickup226_2 Mine2_NPCHouseDetails (X=96141.555 Y=-67013.445 Z=9399.308)
 }
 
 loc_lighthouse = {
-    "Lighthouse Scraps 1": base_id + 1332, # ItemPickup200_41 LighthouseTerrainMain (X=100072.813 Y=-68645.688 Z=8150.313)
-    "Lighthouse Scraps 2": base_id + 1333, # ItemPickup198_35 LighthouseTerrainMain (X=105340.594 Y=-70828.602 Z=8436.780)
-    "Lighthouse Scraps 3": base_id + 1334, # ItemPickup199_38 LighthouseTerrainMain (X=103851.688 Y=-73396.625 Z=7973.290)
-    "Lighthouse Scraps 4": base_id + 1335, # ItemPickup196_29 LighthouseTerrainMain (X=107040.711 Y=-74021.555 Z=8303.216)
-    "Lighthouse Scraps 5": base_id + 1336, # ItemPickup197_32 LighthouseTerrainMain (X=110566.859 Y=-77435.961 Z=7642.565)
-    "Lighthouse Scraps 6": base_id + 1337, # ItemPickup32_2 LighthouseShed_Main (X=111451.352 Y=-77351.117 Z=7633.413)
-    "Lighthouse Scraps 7": base_id + 1338, # ItemPickup35_11 Lighthouse_Main (X=113078.500 Y=-78618.281 Z=7180.793)
-    "Lighthouse Scraps 8": base_id + 1339, # ItemPickup192_17 LighthouseTerrainMain (X=113396.305 Y=-80315.383 Z=7184.260)
-    "Lighthouse Scraps 9": base_id + 1340, # ItemPickup193_20 LighthouseTerrainMain (X=114057.484 Y=-81517.836 Z=7245.034)
-    "Lighthouse Scraps 10": base_id + 1341, # ItemPickup194_23 LighthouseTerrainMain (X=110915.156 Y=-78376.609 Z=7676.131)
-    "Lighthouse Scraps 11": base_id + 1342, # ItemPickup195_26 LighthouseTerrainMain (X=109341.703 Y=-79014.469 Z=8075.679)
-    "Lighthouse Scraps 12": base_id + 1343, # ItemPickup33_5 Lighthouse_Details (X=107006.578 Y=-81377.711 Z=8821.629)
-    "Lighthouse Scraps 13": base_id + 1344, # ItemPickup191_14 LighthouseTerrainMain (X=109240.195 Y=-82951.375 Z=8194.619)
-    "Lighthouse Scraps 14": base_id + 1345, # ItemPickup190_11 LighthouseTerrainMain (X=106295.719 Y=-84190.578 Z=8581.896)
-    "Lighthouse Scraps 15": base_id + 1346, # ItemPickup189_8 LighthouseTerrainMain (X=104233.883 Y=-84663.328 Z=7806.311)
-    "Lighthouse Scraps 16": base_id + 1347, # ItemPickup188_5 LighthouseTerrainMain (X=103209.227 Y=-81564.047 Z=8140.578)
-    "Lighthouse Scraps 17": base_id + 1348, # ItemPickup187_2 LighthouseTerrainMain (X=104795.555 Y=-81344.758 Z=8775.158)
-    "Lighthouse Scraps 18": base_id + 1349, # ItemPickup34_8 Lighthouse_Main (X=100843.914 Y=-78038.539 Z=7197.542)
+    "Lighthouse Scraps Southwest Path Start": base_id + 1332, # ItemPickup200_41 LighthouseTerrainMain (X=100072.813 Y=-68645.688 Z=8150.313)
+    "Lighthouse Scraps Southwest Near Tent": base_id + 1333, # ItemPickup198_35 LighthouseTerrainMain (X=105340.594 Y=-70828.602 Z=8436.780)
+    "Lighthouse Scraps Southwest Under Lantern": base_id + 1334, # ItemPickup199_38 LighthouseTerrainMain (X=103851.688 Y=-73396.625 Z=7973.290)
+    "Lighthouse Scraps South Lonely": base_id + 1335, # ItemPickup196_29 LighthouseTerrainMain (X=107040.711 Y=-74021.555 Z=8303.216)
+    "Lighthouse Scraps Southeast Under Lantern": base_id + 1336, # ItemPickup197_32 LighthouseTerrainMain (X=110566.859 Y=-77435.961 Z=7642.565)
+    "Lighthouse Scraps Southeast Near Shelter": base_id + 1337, # ItemPickup32_2 LighthouseShed_Main (X=111451.352 Y=-77351.117 Z=7633.413)
+    "Lighthouse Scraps Southeast Near Crates": base_id + 1338, # ItemPickup35_11 Lighthouse_Main (X=113078.500 Y=-78618.281 Z=7180.793)
+    "Lighthouse Scraps East Under Lantern": base_id + 1339, # ItemPickup192_17 LighthouseTerrainMain (X=113396.305 Y=-80315.383 Z=7184.260)
+    "Lighthouse Scraps East On Floating Bridge": base_id + 1340, # ItemPickup193_20 LighthouseTerrainMain (X=114057.484 Y=-81517.836 Z=7245.034)
+    "Lighthouse Scraps Southeast On Path": base_id + 1341, # ItemPickup194_23 LighthouseTerrainMain (X=110915.156 Y=-78376.609 Z=7676.131)
+    "Lighthouse Scraps Middle On Path": base_id + 1342, # ItemPickup195_26 LighthouseTerrainMain (X=109341.703 Y=-79014.469 Z=8075.679)
+    "Lighthouse Scraps Middle In Corner": base_id + 1343, # ItemPickup33_5 Lighthouse_Details (X=107006.578 Y=-81377.711 Z=8821.629)
+    "Lighthouse Scraps Middle Among Rocks": base_id + 1344, # ItemPickup191_14 LighthouseTerrainMain (X=109240.195 Y=-82951.375 Z=8194.619)
+    "Lighthouse Scraps Middle Near Barrier": base_id + 1345, # ItemPickup190_11 LighthouseTerrainMain (X=106295.719 Y=-84190.578 Z=8581.896)
+    "Lighthouse Scraps Middle Near Crates": base_id + 1346, # ItemPickup189_8 LighthouseTerrainMain (X=104233.883 Y=-84663.328 Z=7806.311)
+    "Lighthouse Scraps Middle Lonely": base_id + 1347, # ItemPickup188_5 LighthouseTerrainMain (X=103209.227 Y=-81564.047 Z=8140.578)
+    "Lighthouse Scraps Middle Near Lantern": base_id + 1348, # ItemPickup187_2 LighthouseTerrainMain (X=104795.555 Y=-81344.758 Z=8775.158)
+    "Lighthouse Scraps West On Beach": base_id + 1349, # ItemPickup34_8 Lighthouse_Main (X=100843.914 Y=-78038.539 Z=7197.542)
     "Lighthouse Breaker 1": base_id + 1350, # ItemPickup13_2 LighthouseShed_Main (X=110781.164 Y=-77296.813 Z=7757.248) \!/ Existing match 6
     "Lighthouse Breaker 2": base_id + 1351, # ItemPickup14 LighthouseShed_Main (X=110899.227 Y=-77239.031 Z=7757.134) \!/ Existing match 3
     "Lighthouse Breaker 3": base_id + 1352, # ItemPickup16 LighthouseShed_Main (X=110948.547 Y=-77253.336 Z=7757.134) \!/ Existing match 2
@@ -454,83 +454,83 @@ class CCCharlesLocation(Location):
 }
 
 loc_north_mine_outside = {
-    "North Mine Outside Scraps 1": base_id + 1355, # ItemPickup241_31 Mine2_OutsideDetails (X=-52376.746 Y=-101857.492 Z=10542.841)
-    "North Mine Outside Scraps 2": base_id + 1356, # ItemPickup242_34 Mine2_OutsideDetails (X=-53786.742 Y=-102067.789 Z=10858.948)
-    "North Mine Outside Scraps 3": base_id + 1357, # ItemPickup239_25 Mine2_OutsideDetails (X=-57502.777 Y=-105475.336 Z=10609.405)
-    "North Mine Outside Scraps 4": base_id + 1358, # ItemPickup16_2 Mine2_OutsideDetails (X=-58102.102 Y=-104007.906 Z=11146.535)
-    "North Mine Outside Scraps 5": base_id + 1359, # ItemPickup238_20 Mine2_OutsideDetails (X=-59474.840 Y=-105053.734 Z=11213.524)
-    "North Mine Outside Scraps 6": base_id + 1360, # ItemPickup240_28 Mine2_OutsideDetails (X=-55011.750 Y=-104936.359 Z=9935.366)
-    "North Mine Outside Scraps 7": base_id + 1361, # ItemPickup236_14 Mine2_OutsideDetails (X=-55594.863 Y=-107667.594 Z=9596.611)
-    "North Mine Outside Scraps 8": base_id + 1362, # ItemPickup15_1 Mine2_Interior2 (X=-56632.578 Y=-109503.406 Z=9280.788)
-    "North Mine Outside Scraps 9": base_id + 1363, # ItemPickup234_8 Mine2_OutsideDetails (X=-54645.418 Y=-110747.602 Z=9553.452)
-    "North Mine Outside Scraps 10": base_id + 1364, # ItemPickup232_2 Mine2_OutsideDetails (X=-51561.340 Y=-113574.813 Z=9414.959)
-    "North Mine Outside Scraps 11": base_id + 1365, # ItemPickup233_5 Mine2_OutsideDetails (X=-54072.105 Y=-112672.031 Z=10077.665)
-    "North Mine Outside Scraps 12": base_id + 1366, # ItemPickup237_17 Mine2_OutsideDetails (X=-58042.758 Y=-108748.656 Z=9693.470)
-    "North Mine Outside Scraps 13": base_id + 1367, # ItemPickup235_11 Mine2_OutsideDetails (X=-55717.227 Y=-110610.414 Z=9487.879)
-    "North Mine Outside Scraps 14": base_id + 1368, # ItemPickup13_2 Mine2_Interior2 (X=-52235.836 Y=-114501.117 Z=9462.438) \!/ Existing match 6
-    "North Mine Outside Scraps 15": base_id + 1369 # ItemPickup14_5 Mine2_Interior2 (X=-53470.418 Y=-109766.102 Z=10252.304) \!/ Existing match 7
+    "North Mine Outside Scraps South Near Crossroads": base_id + 1355, # ItemPickup241_31 Mine2_OutsideDetails (X=-52376.746 Y=-101857.492 Z=10542.841)
+    "North Mine Outside Scraps South Along Downhill Path": base_id + 1356, # ItemPickup242_34 Mine2_OutsideDetails (X=-53786.742 Y=-102067.789 Z=10858.948)
+    "North Mine Outside Scraps Southeast Above Door": base_id + 1357, # ItemPickup239_25 Mine2_OutsideDetails (X=-57502.777 Y=-105475.336 Z=10609.405)
+    "North Mine Outside Scraps Southeast Along Path": base_id + 1358, # ItemPickup16_2 Mine2_OutsideDetails (X=-58102.102 Y=-104007.906 Z=11146.535)
+    "North Mine Outside Scraps Southeast Topmost": base_id + 1359, # ItemPickup238_20 Mine2_OutsideDetails (X=-59474.840 Y=-105053.734 Z=11213.524)
+    "North Mine Outside Scraps South Near Lantern": base_id + 1360, # ItemPickup240_28 Mine2_OutsideDetails (X=-55011.750 Y=-104936.359 Z=9935.366)
+    "North Mine Outside Scraps Middle Near Shelter": base_id + 1361, # ItemPickup236_14 Mine2_OutsideDetails (X=-55594.863 Y=-107667.594 Z=9596.611)
+    "North Mine Outside Scraps Middle Among Rocks": base_id + 1362, # ItemPickup15_1 Mine2_Interior2 (X=-56632.578 Y=-109503.406 Z=9280.788)
+    "North Mine Outside Scraps North East Near Stairs": base_id + 1363, # ItemPickup234_8 Mine2_OutsideDetails (X=-54645.418 Y=-110747.602 Z=9553.452)
+    "North Mine Outside Scraps North East Near Barrier": base_id + 1364, # ItemPickup232_2 Mine2_OutsideDetails (X=-51561.340 Y=-113574.813 Z=9414.959)
+    "North Mine Outside Scraps North East Near Pillars": base_id + 1365, # ItemPickup233_5 Mine2_OutsideDetails (X=-54072.105 Y=-112672.031 Z=10077.665)
+    "North Mine Outside Scraps Middle Along Path": base_id + 1366, # ItemPickup237_17 Mine2_OutsideDetails (X=-58042.758 Y=-108748.656 Z=9693.470)
+    "North Mine Outside Scraps Middle Near Minecart": base_id + 1367, # ItemPickup235_11 Mine2_OutsideDetails (X=-55717.227 Y=-110610.414 Z=9487.879)
+    "North Mine Outside Scraps North East Sheltered": base_id + 1368, # ItemPickup13_2 Mine2_Interior2 (X=-52235.836 Y=-114501.117 Z=9462.438) \!/ Existing match 6
+    "North Mine Outside Scraps North East On Rocks": base_id + 1369 # ItemPickup14_5 Mine2_Interior2 (X=-53470.418 Y=-109766.102 Z=10252.304) \!/ Existing match 7
 }
 
 loc_north_mine_inside = {
-    "North Mine Inside Scraps 1": base_id + 1370, # ItemPickup17_2 Mine2_Interior1 (X=-58433.055 Y=-104081.570 Z=9378.083) \!/ Existing match 8
-    "North Mine Inside Scraps 2": base_id + 1371, # ItemPickup246_2 Mine2_Interior1 (X=-58987.199 Y=-103262.906 Z=9186.494)
-    "North Mine Inside Scraps 3": base_id + 1372, # ItemPickup247_5 Mine2_Interior1 (X=-58812.801 Y=-99259.570 Z=8847.714)
-    "North Mine Inside Scraps 4": base_id + 1373, # ItemPickup248_8 Mine2_Interior1 (X=-56634.379 Y=-99529.563 Z=8851.877)
-    "North Mine Inside Scraps 5": base_id + 1374, # ItemPickup22_4 Mine2_Interior1 (X=-55604.477 Y=-98342.906 Z=8842.766)
-    "North Mine Inside Scraps 6": base_id + 1375, # ItemPickup250_14 Mine2_Interior1 (X=-54824.535 Y=-98526.492 Z=8852.156)
-    "North Mine Inside Scraps 7": base_id + 1376, # ItemPickup21_14 Mine2_Interior1 (X=-54887.254 Y=-99047.141 Z=8849.855)
-    "North Mine Inside Scraps 8": base_id + 1377, # ItemPickup20_2 Mine2_Interior1 (X=-55610.020 Y=-101877.961 Z=9081.042)
-    "North Mine Inside Scraps 9": base_id + 1378, # ItemPickup19_2 Mine2_Interior1 (X=-56519.340 Y=-101375.008 Z=9001.270)
-    "North Mine Inside Scraps 10": base_id + 1379, # ItemPickup249_11 Mine2_Interior1 (X=-53329.922 Y=-99469.773 Z=8848.643)
-    "North Mine Inside Scraps 11": base_id + 1380, # ItemPickup251_17 Mine2_Interior1 (X=-52814.828 Y=-96286.969 Z=8851.372)
-    "North Mine Inside Scraps 12": base_id + 1381, # ItemPickup24_1 Mine2_Interior1 (X=-52605.957 Y=-96535.156 Z=8940.480)
-    "North Mine Inside Scraps 13": base_id + 1382, # ItemPickup23_20 Mine2_Interior1 (X=-53237.699 Y=-96609.461 Z=8846.201)
-    "North Mine Inside Scraps 14": base_id + 1383, # ItemPickup18_5 Mine2_Interior1 (X=-58543.488 Y=-95879.695 Z=8981.646)
+    "North Mine Inside Scraps Entrance Near Door": base_id + 1370, # ItemPickup17_2 Mine2_Interior1 (X=-58433.055 Y=-104081.570 Z=9378.083) \!/ Existing match 8
+    "North Mine Inside Scraps Entrance Along Rails": base_id + 1371, # ItemPickup246_2 Mine2_Interior1 (X=-58987.199 Y=-103262.906 Z=9186.494)
+    "North Mine Inside Scraps Entrance Intersection": base_id + 1372, # ItemPickup247_5 Mine2_Interior1 (X=-58812.801 Y=-99259.570 Z=8847.714)
+    "North Mine Inside Scraps Corridors Near Door": base_id + 1373, # ItemPickup248_8 Mine2_Interior1 (X=-56634.379 Y=-99529.563 Z=8851.877)
+    "North Mine Inside Scraps Corridors Near Map": base_id + 1374, # ItemPickup22_4 Mine2_Interior1 (X=-55604.477 Y=-98342.906 Z=8842.766)
+    "North Mine Inside Scraps Corridors Near Table": base_id + 1375, # ItemPickup250_14 Mine2_Interior1 (X=-54824.535 Y=-98526.492 Z=8852.156)
+    "North Mine Inside Scraps Corridors Behind Crates": base_id + 1376, # ItemPickup21_14 Mine2_Interior1 (X=-54887.254 Y=-99047.141 Z=8849.855)
+    "North Mine Inside Scraps Rest Room On Table": base_id + 1377, # ItemPickup20_2 Mine2_Interior1 (X=-55610.020 Y=-101877.961 Z=9081.042)
+    "North Mine Inside Scraps Rest Room Near Beds": base_id + 1378, # ItemPickup19_2 Mine2_Interior1 (X=-56519.340 Y=-101375.008 Z=9001.270)
+    "North Mine Inside Scraps Egg Room": base_id + 1379, # ItemPickup249_11 Mine2_Interior1 (X=-53329.922 Y=-99469.773 Z=8848.643)
+    "North Mine Inside Scraps Guardroom Near Crates": base_id + 1380, # ItemPickup251_17 Mine2_Interior1 (X=-52814.828 Y=-96286.969 Z=8851.372)
+    "North Mine Inside Scraps Guardroom On Table": base_id + 1381, # ItemPickup24_1 Mine2_Interior1 (X=-52605.957 Y=-96535.156 Z=8940.480)
+    "North Mine Inside Scraps Guardroom Near Table": base_id + 1382, # ItemPickup23_20 Mine2_Interior1 (X=-53237.699 Y=-96609.461 Z=8846.201)
+    "North Mine Inside Scraps Drawbridge": base_id + 1383, # ItemPickup18_5 Mine2_Interior1 (X=-58543.488 Y=-95879.695 Z=8981.646)
     "North Mine Inside Blue Egg": base_id + 1384, # Mine2_Egg Mine2_Interior2 (X=-53592.195 Y=-99177.500 Z=8975.387)
     "North Mine Inside Blue Paint Can": base_id + 1385 # PaintCan_2 Mine2_Interior2 (X=-56133.391 Y=-101870.047 Z=9004.720) \!/ Existing match 5
     # "North Mine Inside Secret Gear" ItemPickup26_2 Mine2_Interior2 (X=-55546.859 Y=-98209.852 Z=8429.085) /!\ Inaccessible gear
 }
 
 loc_wood_bridge = {
-    "Wood Bridge Scraps 1": base_id + 1386, # ItemPickup127_35 Bridge_Details (X=-66790.141 Y=-110340.367 Z=10454.417)
-    "Wood Bridge Scraps 2": base_id + 1387, # ItemPickup18613654 Bridge_Details (X=-68364.586 Y=-111691.625 Z=10444.172)
-    "Wood Bridge Scraps 3": base_id + 1388, # ItemPickup1311221 Bridge_StructureDetails (X=-69013.555 Y=-112353.977 Z=10399.942)
-    "Wood Bridge Scraps 4": base_id + 1389, # ItemPickup93564 Bridge_StructureDetails (X=-70398.797 Y=-112916.945 Z=10372.192)
-    "Wood Bridge Scraps 5": base_id + 1390, # ItemPickup161323 Bridge_Details (X=-71336.172 Y=-106966.672 Z=8430.104)
-    "Wood Bridge Scraps 6": base_id + 1391, # ItemPickup128_38 Bridge_Details (X=-72776.086 Y=-107813.102 Z=8305.589)
-    "Wood Bridge Scraps 7": base_id + 1392, # ItemPickup17975 Bridge_Details (X=-75224.648 Y=-108280.867 Z=7929.499)
-    "Wood Bridge Scraps 8": base_id + 1393, # ItemPickup126_32 Bridge_Details (X=-68112.172 Y=-105119.656 Z=9458.937)
-    "Wood Bridge Scraps 9": base_id + 1394, # ItemPickup118_8 Bridge_Details (X=-71847.625 Y=-103623.203 Z=10707.521)
-    "Wood Bridge Scraps 10": base_id + 1395, # ItemPickup116_2 Bridge_Details (X=-71812.219 Y=-107256.094 Z=10780.134)
-    "Wood Bridge Scraps 11": base_id + 1396, # ItemPickup134321 Bridge_Details (X=-72011.570 Y=-109054.547 Z=10866.852)
-    "Wood Bridge Scraps 12": base_id + 1397, # ItemPickup117_5 Bridge_Details (X=-72862.430 Y=-106144.852 Z=10329.061)
-    "Wood Bridge Scraps 13": base_id + 1398 # ItemPickup1494567 Bridge_Details (X=-71843.117 Y=-107174.133 Z=10367.116)
+    "Wood Bridge Scraps Arch Near Barrier": base_id + 1386, # ItemPickup127_35 Bridge_Details (X=-66790.141 Y=-110340.367 Z=10454.417)
+    "Wood Bridge Scraps Arch Along Path": base_id + 1387, # ItemPickup18613654 Bridge_Details (X=-68364.586 Y=-111691.625 Z=10444.172)
+    "Wood Bridge Scraps Arch Left Pillar": base_id + 1388, # ItemPickup1311221 Bridge_StructureDetails (X=-69013.555 Y=-112353.977 Z=10399.942)
+    "Wood Bridge Scraps Arch Right Pillar": base_id + 1389, # ItemPickup93564 Bridge_StructureDetails (X=-70398.797 Y=-112916.945 Z=10372.192)
+    "Wood Bridge Scraps Bottom Near High Tree": base_id + 1390, # ItemPickup161323 Bridge_Details (X=-71336.172 Y=-106966.672 Z=8430.104)
+    "Wood Bridge Scraps Bottom Near Small Tree": base_id + 1391, # ItemPickup128_38 Bridge_Details (X=-72776.086 Y=-107813.102 Z=8305.589)
+    "Wood Bridge Scraps Bottom Furthest": base_id + 1392, # ItemPickup17975 Bridge_Details (X=-75224.648 Y=-108280.867 Z=7929.499)
+    "Wood Bridge Scraps Bottom Under Lantern": base_id + 1393, # ItemPickup126_32 Bridge_Details (X=-68112.172 Y=-105119.656 Z=9458.937)
+    "Wood Bridge Scraps Top Under Lantern": base_id + 1394, # ItemPickup118_8 Bridge_Details (X=-71847.625 Y=-103623.203 Z=10707.521)
+    "Wood Bridge Scraps Top Near Middle": base_id + 1395, # ItemPickup116_2 Bridge_Details (X=-71812.219 Y=-107256.094 Z=10780.134)
+    "Wood Bridge Scraps Top Near Stairs": base_id + 1396, # ItemPickup134321 Bridge_Details (X=-72011.570 Y=-109054.547 Z=10866.852)
+    "Wood Bridge Scraps Scaffolding Near Stairs": base_id + 1397, # ItemPickup117_5 Bridge_Details (X=-72862.430 Y=-106144.852 Z=10329.061)
+    "Wood Bridge Scraps Scaffolding Near Middle": base_id + 1398 # ItemPickup1494567 Bridge_Details (X=-71843.117 Y=-107174.133 Z=10367.116)
 }
 
 loc_museum = {
-    "Museum Scraps 1": base_id + 1399, # ItemPickup119_11 Bridge_Details (X=-69687.773 Y=-100002.406 Z=10806.339)
-    "Museum Scraps 2": base_id + 1400, # ItemPickup120_14 Bridge_Details (X=-68035.195 Y=-99480.672 Z=11049.731)
-    "Museum Scraps 3": base_id + 1401, # ItemPickup125_29 Bridge_Details (X=-66912.641 Y=-99976.750 Z=11064.357)
-    "Museum Scraps 4": base_id + 1402, # ItemPickup13532 Bridge_HouseDetails (X=-64901.117 Y=-99624.953 Z=11176.359)
-    "Museum Scraps 5": base_id + 1403, # ItemPickup121_17 Bridge_Details (X=-66082.328 Y=-98105.555 Z=11089.308)
-    "Museum Scraps 6": base_id + 1404, # ItemPickup21765 Bridge_HouseDetails (X=-67402.742 Y=-97735.133 Z=11153.927)
-    "Museum Scraps 7": base_id + 1405, # ItemPickup124_26 Bridge_Details (X=-66716.031 Y=-98282.508 Z=11195.624)
-    "Museum Scraps 8": base_id + 1406, # ItemPickup122_20 Bridge_Details (X=-66582.703 Y=-99092.461 Z=11630.082)
-    "Museum Scraps 9": base_id + 1407, # ItemPickup123_23 Bridge_Details (X=-66798.164 Y=-99550.266 Z=11547.321)
-    "Museum Scraps 10": base_id + 1408, # ItemPickup183423 Bridge_HouseDetails (X=-66850.336 Y=-99682.844 Z=11543.618)
-    "Museum Scraps 11": base_id + 1409, # ItemPickup244_40 Mine2_OutsideDetails (X=-60156.828 Y=-98516.953 Z=11811.422)
-    "Museum Scraps 12": base_id + 1410, # ItemPickup245_43 Mine2_OutsideDetails (X=-61195.203 Y=-98262.422 Z=11779.118)
+    "Museum Scraps Around Near Unlit Lantern": base_id + 1399, # ItemPickup119_11 Bridge_Details (X=-69687.773 Y=-100002.406 Z=10806.339)
+    "Museum Scraps Around Behind Sign": base_id + 1400, # ItemPickup120_14 Bridge_Details (X=-68035.195 Y=-99480.672 Z=11049.731)
+    "Museum Scraps Around Near Platform": base_id + 1401, # ItemPickup125_29 Bridge_Details (X=-66912.641 Y=-99976.750 Z=11064.357)
+    "Museum Scraps Around Near Trees": base_id + 1402, # ItemPickup13532 Bridge_HouseDetails (X=-64901.117 Y=-99624.953 Z=11176.359)
+    "Museum Scraps Around Behind Museum": base_id + 1403, # ItemPickup121_17 Bridge_Details (X=-66082.328 Y=-98105.555 Z=11089.308)
+    "Museum Scraps Inside Mutiny Room": base_id + 1404, # ItemPickup21765 Bridge_HouseDetails (X=-67402.742 Y=-97735.133 Z=11153.927)
+    "Museum Scraps Inside Under Stairs": base_id + 1405, # ItemPickup124_26 Bridge_Details (X=-66716.031 Y=-98282.508 Z=11195.624)
+    "Museum Scraps Inside On Table": base_id + 1406, # ItemPickup122_20 Bridge_Details (X=-66582.703 Y=-99092.461 Z=11630.082)
+    "Museum Scraps Inside Behind Tables": base_id + 1407, # ItemPickup123_23 Bridge_Details (X=-66798.164 Y=-99550.266 Z=11547.321)
+    "Museum Scraps Inside On Balcony": base_id + 1408, # ItemPickup183423 Bridge_HouseDetails (X=-66850.336 Y=-99682.844 Z=11543.618)
+    "Museum Scraps Hill Near High Tree": base_id + 1409, # ItemPickup244_40 Mine2_OutsideDetails (X=-60156.828 Y=-98516.953 Z=11811.422)
+    "Museum Scraps Hill Near Small Tree": base_id + 1410, # ItemPickup245_43 Mine2_OutsideDetails (X=-61195.203 Y=-98262.422 Z=11779.118)
     "Museum Paul Mission Start": base_id + 1411, # (dialog 6) -> remote_explosive (x8)
     "Museum Paul Mission End": base_id + 1412 # (dialog 3) -> temple_key
 }
 
 loc_barbed_shelter = {
     "Barbed Shelter Gertrude Mission Start": base_id + 1413, # (dialog 4) -> broken_bob
-    "Barbed Shelter Scraps 1": base_id + 1414, # ItemPickup100_8 Bob_NPCHouseMain (X=-72525.500 Y=-89333.734 Z=9820.663)
-    "Barbed Shelter Scraps 2": base_id + 1415, # ItemPickup98_2 Bob_NPCHouseMain (X=-74870.758 Y=-88576.641 Z=9836.814)
-    "Barbed Shelter Scraps 3": base_id + 1416, # ItemPickup22_1 Bob_NPCHouseDetails (X=-76193.914 Y=-88038.836 Z=9818.776)
-    "Barbed Shelter Scraps 4": base_id + 1417, # ItemPickup99_5 Bob_NPCHouseMain (X=-74494.859 Y=-87609.969 Z=9837.866)
-    "Barbed Shelter Scraps 5": base_id + 1418 # ItemPickup23_3 Bob_NPCHouseDetails (X=-74826.930 Y=-88402.039 Z=9929.854)
+    "Barbed Shelter Scraps Near Rails": base_id + 1414, # ItemPickup100_8 Bob_NPCHouseMain (X=-72525.500 Y=-89333.734 Z=9820.663)
+    "Barbed Shelter Scraps Under Barbed Wire": base_id + 1415, # ItemPickup98_2 Bob_NPCHouseMain (X=-74870.758 Y=-88576.641 Z=9836.814)
+    "Barbed Shelter Scraps Along Path": base_id + 1416, # ItemPickup22_1 Bob_NPCHouseDetails (X=-76193.914 Y=-88038.836 Z=9818.776)
+    "Barbed Shelter Scraps Behind Beams": base_id + 1417, # ItemPickup99_5 Bob_NPCHouseMain (X=-74494.859 Y=-87609.969 Z=9837.866)
+    "Barbed Shelter Scraps Sheltered": base_id + 1418 # ItemPickup23_3 Bob_NPCHouseDetails (X=-74826.930 Y=-88402.039 Z=9929.854)
 }
 
 loc_west_beach = {
@@ -540,51 +540,51 @@ class CCCharlesLocation(Location):
     "West Beach Chest Scraps 4": base_id + 1422, # ItemPickup89086423 Secret11_Details (X=-85932.461 Y=-89533.148 Z=7354.001)
     "West Beach Chest Scraps 5": base_id + 1423, # ItemPickup83 Secret11_Details (X=-85950.930 Y=-89527.453 Z=7353.365)
     "West Beach Chest Scraps 6": base_id + 1424, # ItemPickup82_2 Secret11_Details (X=-85932.391 Y=-89533.578 Z=7340.312)
-    "West Beach Scraps 1": base_id + 1425, # ItemPickup87_13 Secret11_Details (X=-84489.945 Y=-91235.977 Z=8360.803)
-    "West Beach Scraps 2": base_id + 1426, # ItemPickup349_2 Secret11_Details1 (X=-84386.320 Y=-90391.789 Z=8376.434)
-    "West Beach Scraps 3": base_id + 1427, # ItemPickup86_10 Secret11_Details (X=-84714.773 Y=-89876.992 Z=7707.064)
-    "West Beach Scraps 4": base_id + 1428, # ItemPickup350_5 Secret11_Details1 (X=-85478.672 Y=-90648.414 Z=7708.377)
-    "West Beach Scraps 5": base_id + 1429, # ItemPickup85_7 Secret11_Details (X=-86276.633 Y=-90674.289 Z=7532.364)
-    "West Beach Scraps 6": base_id + 1430, # ItemPickup88_16 Secret11_Details (X=-84363.055 Y=-87497.938 Z=7582.647)
-    "West Beach Scraps 7": base_id + 1431, # ItemPickup351_8 Secret11_Details1 (X=-86556.266 Y=-89748.484 Z=7297.274)
-    "West Beach Scraps 8": base_id + 1432 # ItemPickup352_11 Secret11_Details1 (X=-83210.836 Y=-92551.953 Z=8460.213)
+    "West Beach Scraps Top Footbridge Right": base_id + 1425, # ItemPickup87_13 Secret11_Details (X=-84489.945 Y=-91235.977 Z=8360.803)
+    "West Beach Scraps Top Footbridge Left": base_id + 1426, # ItemPickup349_2 Secret11_Details1 (X=-84386.320 Y=-90391.789 Z=8376.434)
+    "West Beach Scraps Bottom Near Crate": base_id + 1427, # ItemPickup86_10 Secret11_Details (X=-84714.773 Y=-89876.992 Z=7707.064)
+    "West Beach Scraps Bottom Near Minecart": base_id + 1428, # ItemPickup350_5 Secret11_Details1 (X=-85478.672 Y=-90648.414 Z=7708.377)
+    "West Beach Scraps Bottom In Corner": base_id + 1429, # ItemPickup85_7 Secret11_Details (X=-86276.633 Y=-90674.289 Z=7532.364)
+    "West Beach Scraps Laying On Sand": base_id + 1430, # ItemPickup88_16 Secret11_Details (X=-84363.055 Y=-87497.938 Z=7582.647)
+    "West Beach Scraps Laying Under Stairs": base_id + 1431, # ItemPickup351_8 Secret11_Details1 (X=-86556.266 Y=-89748.484 Z=7297.274)
+    "West Beach Scraps Top Near Beams": base_id + 1432 # ItemPickup352_11 Secret11_Details1 (X=-83210.836 Y=-92551.953 Z=8460.213)
 }
 
 loc_church = {
     "Church Black Paint Can": base_id + 1433, # PaintCan_4 Secret5_ChurchDetails (X=-67628.172 Y=-83801.375 Z=9865.983)
-    "Church Scraps 1": base_id + 1434, # ItemPickup391_11 Secret5_ChurchDetails (X=-64009.039 Y=-84252.156 Z=10258.335)
-    "Church Scraps 2": base_id + 1435, # ItemPickup389_5 Secret5_ChurchDetails (X=-66870.719 Y=-85202.180 Z=9843.936)
-    "Church Scraps 3": base_id + 1436, # ItemPickup388_2 Secret5_ChurchDetails (X=-68588.352 Y=-84041.867 Z=9790.541)
-    "Church Scraps 4": base_id + 1437, # ItemPickup396_26 Secret5_ChurchDetails (X=-67595.797 Y=-82120.094 Z=9818.303)
-    "Church Scraps 5": base_id + 1438, # ItemPickup390_8 Secret5_ChurchDetails (X=-67291.000 Y=-83324.836 Z=9774.942)
-    "Church Scraps 6": base_id + 1439, # ItemPickup392_14 Secret5_ChurchDetails (X=-65849.070 Y=-80676.477 Z=9895.943)
-    "Church Scraps 7": base_id + 1440, # ItemPickup395_23 Secret5_ChurchDetails (X=-65170.266 Y=-79155.227 Z=9904.275)
-    "Church Scraps 8": base_id + 1441, # ItemPickup24_4 Secret5_GraveyardMain (X=-64837.563 Y=-80885.305 Z=9906.755)
-    "Church Scraps 9": base_id + 1442, # ItemPickup22_3 Secret5_ChurchDetails (X=-68248.359 Y=-83578.008 Z=9807.300)
-    "Church Scraps 10": base_id + 1443, # ItemPickup23_5 Secret5_ChurchDetails (X=-67086.102 Y=-84605.086 Z=9805.521)
-    "Church Scraps 11": base_id + 1444, # ItemPickup393_17 Secret5_ChurchDetails (X=-67901.930 Y=-83477.625 Z=9812.613)
-    "Church Scraps 12": base_id + 1445 # ItemPickup394_20 Secret5_ChurchDetails (X=-65834.344 Y=-84192.102 Z=9987.823)
+    "Church Scraps Around Along Downhill Path": base_id + 1434, # ItemPickup391_11 Secret5_ChurchDetails (X=-64009.039 Y=-84252.156 Z=10258.335)
+    "Church Scraps Around Along Path": base_id + 1435, # ItemPickup389_5 Secret5_ChurchDetails (X=-66870.719 Y=-85202.180 Z=9843.936)
+    "Church Scraps Around Near Door": base_id + 1436, # ItemPickup388_2 Secret5_ChurchDetails (X=-68588.352 Y=-84041.867 Z=9790.541)
+    "Church Scraps Graveyard Along Path": base_id + 1437, # ItemPickup396_26 Secret5_ChurchDetails (X=-67595.797 Y=-82120.094 Z=9818.303)
+    "Church Scraps Around Under Window": base_id + 1438, # ItemPickup390_8 Secret5_ChurchDetails (X=-67291.000 Y=-83324.836 Z=9774.942)
+    "Church Scraps Graveyard Near Hole": base_id + 1439, # ItemPickup392_14 Secret5_ChurchDetails (X=-65849.070 Y=-80676.477 Z=9895.943)
+    "Church Scraps Graveyard Farthest": base_id + 1440, # ItemPickup395_23 Secret5_ChurchDetails (X=-65170.266 Y=-79155.227 Z=9904.275)
+    "Church Scraps Graveyard Between Graves": base_id + 1441, # ItemPickup24_4 Secret5_GraveyardMain (X=-64837.563 Y=-80885.305 Z=9906.755)
+    "Church Scraps Inside Near Door": base_id + 1442, # ItemPickup22_3 Secret5_ChurchDetails (X=-68248.359 Y=-83578.008 Z=9807.300)
+    "Church Scraps Inside Near Sermon Note": base_id + 1443, # ItemPickup23_5 Secret5_ChurchDetails (X=-67086.102 Y=-84605.086 Z=9805.521)
+    "Church Scraps Inside Black Corner": base_id + 1444, # ItemPickup393_17 Secret5_ChurchDetails (X=-67901.930 Y=-83477.625 Z=9812.613)
+    "Church Scraps Around Behind Trees": base_id + 1445 # ItemPickup394_20 Secret5_ChurchDetails (X=-65834.344 Y=-84192.102 Z=9987.823)
 }
 
 loc_west_cottage = {
     "West Cottage Gale Mission Start": base_id + 1446, # (dialog 10) -> mountain_ruin_key
-    "West Cottage Scraps 1": base_id + 1447, # ItemPickup15_3 Mine3_NPCHouse (X=-74407.695 Y=-81781.250 Z=10120.775)
-    "West Cottage Scraps 2": base_id + 1448, # ItemPickup283_5 Mine3_NPCHouseDetails (X=-73784.695 Y=-79414.359 Z=10128.285)
-    "West Cottage Scraps 3": base_id + 1449, # ItemPickup13_1 Mine3_NPCHouse (X=-73992.391 Y=-78600.094 Z=10162.495)
-    "West Cottage Scraps 4": base_id + 1450, # ItemPickup284_8 Mine3_NPCHouseDetails (X=-71623.000 Y=-75998.023 Z=10275.477)
-    "West Cottage Scraps 5": base_id + 1451 # ItemPickup282_2 Mine3_NPCHouseDetails (X=-72626.453 Y=-79391.070 Z=10211.037)
+    "West Cottage Scraps Near Tent": base_id + 1447, # ItemPickup15_3 Mine3_NPCHouse (X=-74407.695 Y=-81781.250 Z=10120.775)
+    "West Cottage Scraps Near Crate": base_id + 1448, # ItemPickup283_5 Mine3_NPCHouseDetails (X=-73784.695 Y=-79414.359 Z=10128.285)
+    "West Cottage Scraps Near Beams": base_id + 1449, # ItemPickup13_1 Mine3_NPCHouse (X=-73992.391 Y=-78600.094 Z=10162.495)
+    "West Cottage Scraps Near Barrier": base_id + 1450, # ItemPickup284_8 Mine3_NPCHouseDetails (X=-71623.000 Y=-75998.023 Z=10275.477)
+    "West Cottage Scraps Near Note": base_id + 1451 # ItemPickup282_2 Mine3_NPCHouseDetails (X=-72626.453 Y=-79391.070 Z=10211.037)
 }
 
 loc_caravan = {
-    "Caravan Scraps 1": base_id + 1452, # ItemPickup348_11 Secret10_PAth (X=-52638.109 Y=-43924.395 Z=10579.809)
-    "Caravan Scraps 2": base_id + 1453, # ItemPickup347_8 Secret10_PAth (X=-50203.695 Y=-42865.672 Z=10778.871)
-    "Caravan Scraps 3": base_id + 1454, # ItemPickup346_5 Secret10_PAth (X=-48467.738 Y=-42018.488 Z=10818.758)
-    "Caravan Scraps 4": base_id + 1455, # ItemPickup77_14 Secret10_Details (X=-46325.219 Y=-41707.512 Z=11003.229)
-    "Caravan Scraps 5": base_id + 1456, # ItemPickup345_2 Secret10_PAth (X=-44557.043 Y=-40652.930 Z=11076.221)
-    "Caravan Scraps 6": base_id + 1457, # ItemPickup76_11 Secret10_Details (X=-43380.664 Y=-38207.152 Z=11165.370)
-    "Caravan Scraps 7": base_id + 1458, # ItemPickup73_2 Secret10_Details (X=-42919.410 Y=-38797.738 Z=11265.633)
-    "Caravan Scraps 8": base_id + 1459, # ItemPickup74_5 Secret10_Details (X=-42787.523 Y=-38601.820 Z=11254.003)
-    "Caravan Scraps 9": base_id + 1460, # ItemPickup75_8 Secret10_Details (X=-42711.363 Y=-39141.523 Z=11173.905)
+    "Caravan Scraps Along Rails": base_id + 1452, # ItemPickup348_11 Secret10_PAth (X=-52638.109 Y=-43924.395 Z=10579.809)
+    "Caravan Scraps Under Lantern": base_id + 1453, # ItemPickup347_8 Secret10_PAth (X=-50203.695 Y=-42865.672 Z=10778.871)
+    "Caravan Scraps Near Footbridge": base_id + 1454, # ItemPickup346_5 Secret10_PAth (X=-48467.738 Y=-42018.488 Z=10818.758)
+    "Caravan Scraps Near Grave": base_id + 1455, # ItemPickup77_14 Secret10_Details (X=-46325.219 Y=-41707.512 Z=11003.229)
+    "Caravan Scraps Along Path": base_id + 1456, # ItemPickup345_2 Secret10_PAth (X=-44557.043 Y=-40652.930 Z=11076.221)
+    "Caravan Scraps Near Tent": base_id + 1457, # ItemPickup76_11 Secret10_Details (X=-43380.664 Y=-38207.152 Z=11165.370)
+    "Caravan Scraps Inside Railcar Left": base_id + 1458, # ItemPickup73_2 Secret10_Details (X=-42919.410 Y=-38797.738 Z=11265.633)
+    "Caravan Scraps Inside Railcar Right": base_id + 1459, # ItemPickup74_5 Secret10_Details (X=-42787.523 Y=-38601.820 Z=11254.003)
+    "Caravan Scraps Behind Railcar": base_id + 1460, # ItemPickup75_8 Secret10_Details (X=-42711.363 Y=-39141.523 Z=11173.905)
     "Caravan Chest Scraps 1": base_id + 1461, # ItemPickup71561 Secret10_Details (X=-42910.668 Y=-38297.309 Z=11233.402)
     "Caravan Chest Scraps 2": base_id + 1462, # ItemPickup078654 Secret10_Details (X=-42904.344 Y=-38307.332 Z=11219.678)
     "Caravan Chest Scraps 3": base_id + 1463, # ItemPickup02345 Secret10_Details (X=-42904.965 Y=-38280.383 Z=11208.191)
@@ -593,42 +593,42 @@ class CCCharlesLocation(Location):
 }
 
 loc_trailer_cabin = {
-    "Trailer Cabin Scraps 1": base_id + 1466, # ItemPickup493_17 TrailerCabin_Details (X=-50702.449 Y=-38850.020 Z=10810.316)
-    "Trailer Cabin Scraps 2": base_id + 1467, # ItemPickup489_5 TrailerCabin_Details (X=-51365.684 Y=-38502.379 Z=10875.761)
-    "Trailer Cabin Scraps 3": base_id + 1468, # ItemPickup491_11 TrailerCabin_Details (X=-52397.570 Y=-37530.145 Z=10873.624)
-    "Trailer Cabin Scraps 4": base_id + 1469, # ItemPickup490_8 TrailerCabin_Details (X=-50625.746 Y=-37916.758 Z=10886.909)
-    "Trailer Cabin Scraps 5": base_id + 1470, # ItemPickup488_2 TrailerCabin_Details (X=-51201.051 Y=-37467.137 Z=10910.795)
-    "Trailer Cabin Scraps 6": base_id + 1471 # ItemPickup492_14 TrailerCabin_Details (X=-51891.320 Y=-40549.492 Z=10675.211)
+    "Trailer Cabin Scraps Along Rails Near Cabin": base_id + 1466, # ItemPickup493_17 TrailerCabin_Details (X=-50702.449 Y=-38850.020 Z=10810.316)
+    "Trailer Cabin Scraps Near Crates": base_id + 1467, # ItemPickup489_5 TrailerCabin_Details (X=-51365.684 Y=-38502.379 Z=10875.761)
+    "Trailer Cabin Scraps Behind Cabin": base_id + 1468, # ItemPickup491_11 TrailerCabin_Details (X=-52397.570 Y=-37530.145 Z=10873.624)
+    "Trailer Cabin Scraps Near Platform": base_id + 1469, # ItemPickup490_8 TrailerCabin_Details (X=-50625.746 Y=-37916.758 Z=10886.909)
+    "Trailer Cabin Scraps Under Cabin Roof": base_id + 1470, # ItemPickup488_2 TrailerCabin_Details (X=-51201.051 Y=-37467.137 Z=10910.795)
+    "Trailer Cabin Scraps Along Rails Furthest": base_id + 1471 # ItemPickup492_14 TrailerCabin_Details (X=-51891.320 Y=-40549.492 Z=10675.211)
 }
 
 loc_towers = {
-    "Towers Scraps 1": base_id + 1472, # ItemPickup486_32 Towers_Environment_Details (X=-24434.766 Y=-25708.373 Z=11200.865)
-    "Towers Scraps 2": base_id + 1473, # ItemPickup483_23 Towers_Environment_Details (X=-20970.262 Y=-25678.754 Z=11731.241)
-    "Towers Scraps 3": base_id + 1474, # ItemPickup481_17 Towers_Environment_Details (X=-19812.230 Y=-27768.301 Z=12051.623)
-    "Towers Scraps 4": base_id + 1475, # ItemPickup484_26 Towers_Environment_Details (X=-19940.912 Y=-25411.576 Z=12035.366)
-    "Towers Scraps 5": base_id + 1476, # ItemPickup41_17 Towers_Environment (X=-18596.791 Y=-25100.035 Z=12290.350)
-    "Towers Scraps 6": base_id + 1477, # ItemPickup482_20 Towers_Environment_Details (X=-23302.396 Y=-23270.324 Z=12036.164)
-    "Towers Scraps 7": base_id + 1478, # ItemPickup487_35 Towers_Environment_Details (X=-22955.039 Y=-27576.859 Z=11211.258)
-    "Towers Scraps 8": base_id + 1479, # ItemPickup478_8 Towers_Environment_Details (X=-21485.520 Y=-29634.893 Z=11787.103)
-    "Towers Scraps 9": base_id + 1480, # ItemPickup477_5 Towers_Environment_Details (X=-23667.957 Y=-29825.240 Z=12035.269)
-    "Towers Scraps 10": base_id + 1481, # ItemPickup39_11 Towers_Environment (X=-25361.008 Y=-29794.301 Z=12026.073)
-    "Towers Scraps 11": base_id + 1482, # ItemPickup476_2 Towers_Environment_Details (X=-26549.584 Y=-32768.133 Z=12289.732)
-    "Towers Scraps 12": base_id + 1483, # ItemPickup38_8 Towers_Environment (X=-27240.127 Y=-27404.748 Z=12027.208)
-    "Towers Scraps 13": base_id + 1484, # ItemPickup40_14 Towers_Environment (X=-23231.639 Y=-27799.158 Z=11829.792)
-    "Towers Scraps 14": base_id + 1485, # ItemPickup485_29 Towers_Environment_Details (X=-22949.568 Y=-26146.012 Z=11702.730)
-    "Towers Scraps 15": base_id + 1486, # ItemPickup479_11 Towers_Environment_Details (X=-19726.715 Y=-32464.682 Z=12118.678)
-    "Towers Scraps 16": base_id + 1487, # ItemPickup1366543 Tower_BuildingsExteriorDetails (X=-23495.104 Y=-27644.689 Z=11872.844)
-    "Towers Scraps 17": base_id + 1488, # ItemPickup139978 Tower_BuildingsExteriorDetails (X=-23512.971 Y=-27493.051 Z=12218.543)
-    "Towers Scraps 18": base_id + 1489, # ItemPickup42_20 Towers_Environment (X=-22731.439 Y=-26331.393 Z=12102.758)
-    "Towers Scraps 19": base_id + 1490, # ItemPickup131123 Tower_BuildingsExteriorDetails (X=-22599.641 Y=-26454.590 Z=11752.040)
-    "Towers Scraps 20": base_id + 1491, # ItemPickup196987 Tower_BuildingsExteriorDetails (X=-22589.721 Y=-26397.414 Z=12571.282)
-    "Towers Scraps 21": base_id + 1492, # ItemPickup138787 Tower_BuildingsExteriorDetails (X=-22163.268 Y=-26775.938 Z=13107.048)
-    "Towers Scraps 22": base_id + 1493, # ItemPickup43_23 Towers_Environment (X=-21996.184 Y=-26754.393 Z=13105.997)
-    "Towers Scraps 23": base_id + 1494, # ItemPickup837454 Tower_BuildingsExteriorDetails (X=-24068.221 Y=-27874.443 Z=12819.666)
-    "Towers Scraps 24": base_id + 1495, # ItemPickup44_29 Towers_Environment (X=-23525.330 Y=-27770.035 Z=12612.871)
-    "Towers Scraps 25": base_id + 1496, # ItemPickup18932 Tower_BuildingsExteriorDetails (X=-23472.215 Y=-27617.404 Z=13213.256)
-    "Towers Scraps 26": base_id + 1497, # ItemPickup188348 Tower_BuildingsExteriorDetails (X=-23981.588 Y=-27984.385 Z=13219.854)
-    "Towers Scraps 27": base_id + 1498, # ItemPickup480_14 Towers_Environment_Details (X=-18696.230 Y=-34511.277 Z=12704.238)
+    "Towers Scraps Middle Under Footbridge": base_id + 1472, # ItemPickup486_32 Towers_Environment_Details (X=-24434.766 Y=-25708.373 Z=11200.865)
+    "Towers Scraps East Along Downhill Path": base_id + 1473, # ItemPickup483_23 Towers_Environment_Details (X=-20970.262 Y=-25678.754 Z=11731.241)
+    "Towers Scraps East Near Beams": base_id + 1474, # ItemPickup481_17 Towers_Environment_Details (X=-19812.230 Y=-27768.301 Z=12051.623)
+    "Towers Scraps East Near Tree": base_id + 1475, # ItemPickup484_26 Towers_Environment_Details (X=-19940.912 Y=-25411.576 Z=12035.366)
+    "Towers Scraps East Under Lantern": base_id + 1476, # ItemPickup41_17 Towers_Environment (X=-18596.791 Y=-25100.035 Z=12290.350)
+    "Towers Scraps Southeast Near Beams": base_id + 1477, # ItemPickup482_20 Towers_Environment_Details (X=-23302.396 Y=-23270.324 Z=12036.164)
+    "Towers Scraps Middle Along Path": base_id + 1478, # ItemPickup487_35 Towers_Environment_Details (X=-22955.039 Y=-27576.859 Z=11211.258)
+    "Towers Scraps Northeast Near Barrier": base_id + 1479, # ItemPickup478_8 Towers_Environment_Details (X=-21485.520 Y=-29634.893 Z=11787.103)
+    "Towers Scraps North On Rocks": base_id + 1480, # ItemPickup477_5 Towers_Environment_Details (X=-23667.957 Y=-29825.240 Z=12035.269)
+    "Towers Scraps North Near Minecart": base_id + 1481, # ItemPickup39_11 Towers_Environment (X=-25361.008 Y=-29794.301 Z=12026.073)
+    "Towers Scraps North Along Path": base_id + 1482, # ItemPickup476_2 Towers_Environment_Details (X=-26549.584 Y=-32768.133 Z=12289.732)
+    "Towers Scraps Northwest On Rocks": base_id + 1483, # ItemPickup38_8 Towers_Environment (X=-27240.127 Y=-27404.748 Z=12027.208)
+    "Towers Scraps Left Tower Footbridge": base_id + 1484, # ItemPickup40_14 Towers_Environment (X=-23231.639 Y=-27799.158 Z=11829.792)
+    "Towers Scraps Right Tower Footbridge ": base_id + 1485, # ItemPickup485_29 Towers_Environment_Details (X=-22949.568 Y=-26146.012 Z=11702.730)
+    "Towers Scraps Northeast Under Lit Lantern": base_id + 1486, # ItemPickup479_11 Towers_Environment_Details (X=-19726.715 Y=-32464.682 Z=12118.678)
+    "Towers Scraps Left Tower Ground Floor": base_id + 1487, # ItemPickup1366543 Tower_BuildingsExteriorDetails (X=-23495.104 Y=-27644.689 Z=11872.844)
+    "Towers Scraps Left Tower First Floor": base_id + 1488, # ItemPickup139978 Tower_BuildingsExteriorDetails (X=-23512.971 Y=-27493.051 Z=12218.543)
+    "Towers Scraps Right Tower First Floor": base_id + 1489, # ItemPickup42_20 Towers_Environment (X=-22731.439 Y=-26331.393 Z=12102.758)
+    "Towers Scraps Right Tower Ground Floor": base_id + 1490, # ItemPickup131123 Tower_BuildingsExteriorDetails (X=-22599.641 Y=-26454.590 Z=11752.040)
+    "Towers Scraps Right Tower Second Floor On Table": base_id + 1491, # ItemPickup196987 Tower_BuildingsExteriorDetails (X=-22589.721 Y=-26397.414 Z=12571.282)
+    "Towers Scraps Right Tower Third Floor Front": base_id + 1492, # ItemPickup138787 Tower_BuildingsExteriorDetails (X=-22163.268 Y=-26775.938 Z=13107.048)
+    "Towers Scraps Right Tower Third Floor Back": base_id + 1493, # ItemPickup43_23 Towers_Environment (X=-21996.184 Y=-26754.393 Z=13105.997)
+    "Towers Scraps Left Tower Second Floor Near Barrier": base_id + 1494, # ItemPickup837454 Tower_BuildingsExteriorDetails (X=-24068.221 Y=-27874.443 Z=12819.666)
+    "Towers Scraps Left Tower Second Floor In Broken Stairs": base_id + 1495, # ItemPickup44_29 Towers_Environment (X=-23525.330 Y=-27770.035 Z=12612.871)
+    "Towers Scraps Left Tower Third Floor Near Stairs": base_id + 1496, # ItemPickup18932 Tower_BuildingsExteriorDetails (X=-23472.215 Y=-27617.404 Z=13213.256)
+    "Towers Scraps Left Tower Third Floor Near Minecart": base_id + 1497, # ItemPickup188348 Tower_BuildingsExteriorDetails (X=-23981.588 Y=-27984.385 Z=13219.854)
+    "Towers Scraps Northeast Near Unlit Lantern": base_id + 1498, # ItemPickup480_14 Towers_Environment_Details (X=-18696.230 Y=-34511.277 Z=12704.238)
     "Towers Lime Paint Can": base_id + 1499, # PaintCan_2 Towers_BuildingsDetails (X=-22288.555 Y=-26022.281 Z=11835.892) \!/ Existing match 5
     "Towers Employment Contracts": base_id + 1500, # Towers_Files_Pickup Tower_BuildingsExteriorDetails (X=-24081.414 Y=-27637.459 Z=13679.163)
     "Towers Ronny Mission End": base_id + 1501 # (dialog 3) -> 1_scraps_reward
@@ -639,21 +639,21 @@ class CCCharlesLocation(Location):
     "North Beach Chest Scraps 2": base_id + 1503, # ItemPickup14523 Secret3_CampDetails (X=-74426.539 Y=-130626.547 Z=8781.948)
     "North Beach Chest Scraps 3": base_id + 1504, # ItemPickup084537 Secret3_CampDetails (X=-74448.852 Y=-130632.367 Z=8772.555)
     "North Beach Chest Scraps 4": base_id + 1505, # ItemPickup17754234 Secret3_CampDetails (X=-74425.523 Y=-130622.875 Z=8755.526)
-    "North Beach Scraps 1": base_id + 1506, # ItemPickup376_5 Secret3_CampDetails (X=-75003.078 Y=-131084.016 Z=8729.731)
-    "North Beach Scraps 2": base_id + 1507, # ItemPickup378_11 Secret3_CampDetails (X=-75477.758 Y=-129413.750 Z=9082.617)
-    "North Beach Scraps 3": base_id + 1508, # ItemPickup377_8 Secret3_CampDetails (X=-75608.453 Y=-130483.430 Z=8909.659)
-    "North Beach Scraps 4": base_id + 1509, # ItemPickup375_2 Secret3_CampDetails (X=-74143.469 Y=-131117.953 Z=8752.130)
-    "North Beach Scraps 5": base_id + 1510, # ItemPickup387_6 Secret4_BeachHouseMain (X=-80847.078 Y=-135628.719 Z=7915.444)
-    "North Beach Scraps 6": base_id + 1511, # ItemPickup386_3 Secret4_BeachHouseMain (X=-84044.789 Y=-137591.000 Z=7359.172)
-    "North Beach Scraps 7": base_id + 1512, # ItemPickup379_2 Secret4_BeachHouseDetails (X=-83992.836 Y=-132933.531 Z=7941.225)
-    "North Beach Scraps 8": base_id + 1513, # ItemPickup380_5 Secret4_BeachHouseDetails (X=-87355.734 Y=-134216.438 Z=7237.310)
-    "North Beach Scraps 9": base_id + 1514, # ItemPickup384_17 Secret4_BeachHouseDetails (X=-89213.844 Y=-134625.922 Z=7185.133)
-    "North Beach Scraps 10": base_id + 1515, # ItemPickup25_0 Secret4_BeachHouseDetails (X=-88423.430 Y=-135922.969 Z=7290.801)
-    "North Beach Scraps 11": base_id + 1516, # ItemPickup381_8 Secret4_BeachHouseDetails (X=-87668.977 Y=-136850.359 Z=7275.346)
-    "North Beach Scraps 12": base_id + 1517, # ItemPickup383_14 Secret4_BeachHouseDetails (X=-90241.328 Y=-136381.000 Z=7199.622)
-    "North Beach Scraps 13": base_id + 1518, # ItemPickup27_8 Secret4_BeachHouseDetails (X=-91728.680 Y=-135288.203 Z=7319.699)
-    "North Beach Scraps 14": base_id + 1519, # ItemPickup26_2 Secret4_BeachHouseDetails (X=-88789.039 Y=-135461.719 Z=7305.800)
-    "North Beach Scraps 15": base_id + 1520, # ItemPickup382_11 Secret4_BeachHouseDetails (X=-88572.078 Y=-135970.734 Z=7302.674)
+    "North Beach Scraps Campfire Near Crate Tents": base_id + 1506, # ItemPickup376_5 Secret3_CampDetails (X=-75003.078 Y=-131084.016 Z=8729.731)
+    "North Beach Scraps Shrine Near Middle": base_id + 1507, # ItemPickup378_11 Secret3_CampDetails (X=-75477.758 Y=-129413.750 Z=9082.617)
+    "North Beach Scraps Shrine In Corner": base_id + 1508, # ItemPickup377_8 Secret3_CampDetails (X=-75608.453 Y=-130483.430 Z=8909.659)
+    "North Beach Scraps Campfire Near Bed Tents": base_id + 1509, # ItemPickup375_2 Secret3_CampDetails (X=-74143.469 Y=-131117.953 Z=8752.130)
+    "North Beach Scraps Laying Rightmost": base_id + 1510, # ItemPickup387_6 Secret4_BeachHouseMain (X=-80847.078 Y=-135628.719 Z=7915.444)
+    "North Beach Scraps Laying Downhill": base_id + 1511, # ItemPickup386_3 Secret4_BeachHouseMain (X=-84044.789 Y=-137591.000 Z=7359.172)
+    "North Beach Scraps Laying Blinky": base_id + 1512, # ItemPickup379_2 Secret4_BeachHouseDetails (X=-83992.836 Y=-132933.531 Z=7941.225)
+    "North Beach Scraps Shack Near Grave": base_id + 1513, # ItemPickup380_5 Secret4_BeachHouseDetails (X=-87355.734 Y=-134216.438 Z=7237.310)
+    "North Beach Scraps Shack Near Drying rack": base_id + 1514, # ItemPickup384_17 Secret4_BeachHouseDetails (X=-89213.844 Y=-134625.922 Z=7185.133)
+    "North Beach Scraps Shack Near Water Tank": base_id + 1515, # ItemPickup25_0 Secret4_BeachHouseDetails (X=-88423.430 Y=-135922.969 Z=7290.801)
+    "North Beach Scraps Shack Near Beams": base_id + 1516, # ItemPickup381_8 Secret4_BeachHouseDetails (X=-87668.977 Y=-136850.359 Z=7275.346)
+    "North Beach Scraps Shack Near Floating Bridge": base_id + 1517, # ItemPickup383_14 Secret4_BeachHouseDetails (X=-90241.328 Y=-136381.000 Z=7199.622)
+    "North Beach Scraps Shack On Floating Bridge": base_id + 1518, # ItemPickup27_8 Secret4_BeachHouseDetails (X=-91728.680 Y=-135288.203 Z=7319.699)
+    "North Beach Scraps Shack Behind Door": base_id + 1519, # ItemPickup26_2 Secret4_BeachHouseDetails (X=-88789.039 Y=-135461.719 Z=7305.800)
+    "North Beach Scraps Shack Near Note": base_id + 1520, # ItemPickup382_11 Secret4_BeachHouseDetails (X=-88572.078 Y=-135970.734 Z=7302.674)
     "North Beach Teal Paint Can": base_id + 1521 # PaintCan_2 Secret4_BeachHouseDetails (X=-91706.805 Y=-134988.453 Z=7347.827) \!/ Existing match 5
     # "North Beach Scraps Glitch 1" ItemPickup385_20 (X=-77651.938 Y=-139721.453 Z=7261.729) /!\ Glitched scrap
 }
@@ -666,135 +666,135 @@ class CCCharlesLocation(Location):
     "Mine Shaft Chest Scraps 5": base_id + 1526, # ItemPickup234743 Secret13_Details (X=-17349.941 Y=-74075.484 Z=8004.179)
     "Mine Shaft Chest Scraps 6": base_id + 1527, # ItemPickup1434563456 Secret13_Details (X=-17361.084 Y=-74049.234 Z=8001.814)
     "Mine Shaft Chest Scraps 7": base_id + 1528, # ItemPickup13634563456 Secret13_Details (X=-17349.967 Y=-74075.484 Z=7990.054)
-    "Mine Shaft Scraps 1": base_id + 1529, # ItemPickup369_23 Secret13_Details (X=-16985.645 Y=-70377.273 Z=10837.127)
-    "Mine Shaft Scraps 2": base_id + 1530, # ItemPickup368_20 Secret13_Details (X=-18292.045 Y=-71003.563 Z=10975.308)
-    "Mine Shaft Scraps 3": base_id + 1531, # ItemPickup367_17 Secret13_Details (X=-16150.797 Y=-72075.289 Z=10609.141)
-    "Mine Shaft Scraps 4": base_id + 1532, # ItemPickup24456463 Secret13_EntranceDetails1 (X=-18404.480 Y=-71894.367 Z=10968.230)
-    "Mine Shaft Scraps 5": base_id + 1533, # ItemPickup2565644 Secret13_Details (X=-17777.268 Y=-71467.172 Z=10441.745)
-    "Mine Shaft Scraps 6": base_id + 1534, # ItemPickup366_14 Secret13_Details (X=-17630.971 Y=-72800.641 Z=8842.322)
-    "Mine Shaft Scraps 7": base_id + 1535, # ItemPickup18_8 Secret13_Details (X=-17979.719 Y=-73413.563 Z=8118.260)
-    "Mine Shaft Scraps 8": base_id + 1536, # ItemPickup21_11 Secret13_Details (X=-16554.467 Y=-74139.781 Z=7892.738)
-    "Mine Shaft Scraps 9": base_id + 1537, # ItemPickup365_11 Secret13_Details (X=-16343.033 Y=-74617.555 Z=7298.177)
-    "Mine Shaft Scraps 10": base_id + 1538, # ItemPickup22123 Secret13_Details (X=-12390.332 Y=-77620.320 Z=7324.504)
-    "Mine Shaft Scraps 11": base_id + 1539, # ItemPickup364_8 Secret13_Details (X=-10969.702 Y=-77961.477 Z=7297.171)
-    "Mine Shaft Scraps 12": base_id + 1540, # ItemPickup363_5 Secret13_Details (X=-9888.596 Y=-78208.930 Z=7269.473)
-    "Mine Shaft Scraps 13": base_id + 1541, # ItemPickup362_2 Secret13_Details (X=-8865.696 Y=-79063.977 Z=7247.677)
-    "Mine Shaft Scraps 14": base_id + 1542 # ItemPickup238976 Secret13_ExitDetails (X=-8143.984 Y=-79764.617 Z=7222.096)
+    "Mine Shaft Scraps Outside Near Beams": base_id + 1529, # ItemPickup369_23 Secret13_Details (X=-16985.645 Y=-70377.273 Z=10837.127)
+    "Mine Shaft Scraps Outside Near Minecart": base_id + 1530, # ItemPickup368_20 Secret13_Details (X=-18292.045 Y=-71003.563 Z=10975.308)
+    "Mine Shaft Scraps Outside Near Platform": base_id + 1531, # ItemPickup367_17 Secret13_Details (X=-16150.797 Y=-72075.289 Z=10609.141)
+    "Mine Shaft Scraps Outside Near Crates": base_id + 1532, # ItemPickup24456463 Secret13_EntranceDetails1 (X=-18404.480 Y=-71894.367 Z=10968.230)
+    "Mine Shaft Scraps Inside Topmost": base_id + 1533, # ItemPickup2565644 Secret13_Details (X=-17777.268 Y=-71467.172 Z=10441.745)
+    "Mine Shaft Scraps Inside After Freefall": base_id + 1534, # ItemPickup366_14 Secret13_Details (X=-17630.971 Y=-72800.641 Z=8842.322)
+    "Mine Shaft Scraps Inside Near Table": base_id + 1535, # ItemPickup18_8 Secret13_Details (X=-17979.719 Y=-73413.563 Z=8118.260)
+    "Mine Shaft Scraps Inside Near Chest": base_id + 1536, # ItemPickup21_11 Secret13_Details (X=-16554.467 Y=-74139.781 Z=7892.738)
+    "Mine Shaft Scraps Inside On Rocks": base_id + 1537, # ItemPickup365_11 Secret13_Details (X=-16343.033 Y=-74617.555 Z=7298.177)
+    "Mine Shaft Scraps Inside Near Explosives": base_id + 1538, # ItemPickup22123 Secret13_Details (X=-12390.332 Y=-77620.320 Z=7324.504)
+    "Mine Shaft Scraps Inside Near Exit": base_id + 1539, # ItemPickup364_8 Secret13_Details (X=-10969.702 Y=-77961.477 Z=7297.171)
+    "Mine Shaft Scraps Exit Along Rails": base_id + 1540, # ItemPickup363_5 Secret13_Details (X=-9888.596 Y=-78208.930 Z=7269.473)
+    "Mine Shaft Scraps Exit End Rails": base_id + 1541, # ItemPickup362_2 Secret13_Details (X=-8865.696 Y=-79063.977 Z=7247.677)
+    "Mine Shaft Scraps Exit Near Minecart": base_id + 1542 # ItemPickup238976 Secret13_ExitDetails (X=-8143.984 Y=-79764.617 Z=7222.096)
 }
 
 loc_mob_camp = {
     "Mob Camp Key": base_id + 1543, # ItemPickup29_0 Bob_CampDetails2 (X=-29114.480 Y=-53608.520 Z=12839.528)
-    "Mob Camp Scraps 1": base_id + 1544, # ItemPickup25_5 Bob_CampDetails2 (X=-27373.525 Y=-53008.668 Z=12706.465)
-    "Mob Camp Scraps 2": base_id + 1545, # ItemPickup26_1 Bob_CampDetails2 (X=-28786.941 Y=-53009.762 Z=12760.727)
-    "Mob Camp Scraps 3": base_id + 1546, # ItemPickup13_14 Mine3_Mountain (X=-29650.207 Y=-53328.070 Z=12724.598)
-    "Mob Camp Scraps 4": base_id + 1547, # ItemPickup90_5 Bob_CampDetails2 (X=-31515.057 Y=-55533.324 Z=12344.274)
-    "Mob Camp Scraps 5": base_id + 1548, # ItemPickup49513294 Mine3_Mountain (X=-31847.229 Y=-55152.352 Z=11574.255)
-    "Mob Camp Scraps 6": base_id + 1549, # ItemPickup92_14 Bob_CampDetails2 (X=-31323.533 Y=-55432.871 Z=11245.139)
-    "Mob Camp Scraps 7": base_id + 1550, # ItemPickup91_8 Bob_CampDetails2 (X=-31583.443 Y=-55475.805 Z=11234.112)
-    "Mob Camp Scraps 8": base_id + 1551, # ItemPickup95_23 Bob_CampDetails2 (X=-32925.406 Y=-57157.605 Z=11086.322)
-    "Mob Camp Scraps 9": base_id + 1552, # ItemPickup96_26 Bob_CampDetails2 (X=-33052.488 Y=-58560.098 Z=11101.021)
-    "Mob Camp Scraps 10": base_id + 1553, # ItemPickup13121212 Mine3_Mountain (X=-32422.406 Y=-60145.063 Z=11203.182)
-    "Mob Camp Scraps 11": base_id + 1554, # ItemPickup93_17 Bob_CampDetails2 (X=-30891.457 Y=-60046.465 Z=11237.567)
-    "Mob Camp Scraps 12": base_id + 1555, # ItemPickup97_29 Bob_CampDetails2 (X=-31888.428 Y=-59222.645 Z=11179.302)
-    "Mob Camp Scraps 13": base_id + 1556, # ItemPickup62156 Mine3_Mountain (X=-31161.750 Y=-57410.789 Z=11279.820)
-    "Mob Camp Scraps 14": base_id + 1557, # ItemPickup24_3 Bob_CampDetails2 (X=-31256.545 Y=-59865.809 Z=11904.155)
-    "Mob Camp Scraps 15": base_id + 1558, # ItemPickup27_0 Bob_CampDetails2 (X=-31757.953 Y=-57179.258 Z=11295.150)
-    "Mob Camp Scraps 16": base_id + 1559 # ItemPickup89_2 Bob_CampDetails2 (X=-29137.043 Y=-54824.797 Z=12418.673)
+    "Mob Camp Scraps Topmost Near Campfire": base_id + 1544, # ItemPickup25_5 Bob_CampDetails2 (X=-27373.525 Y=-53008.668 Z=12706.465)
+    "Mob Camp Scraps Topmost Near Beds": base_id + 1545, # ItemPickup26_1 Bob_CampDetails2 (X=-28786.941 Y=-53009.762 Z=12760.727)
+    "Mob Camp Scraps Topmost On Balcony": base_id + 1546, # ItemPickup13_14 Mine3_Mountain (X=-29650.207 Y=-53328.070 Z=12724.598)
+    "Mob Camp Scraps Mask Tower Near Note": base_id + 1547, # ItemPickup90_5 Bob_CampDetails2 (X=-31515.057 Y=-55533.324 Z=12344.274)
+    "Mob Camp Scraps Mask Tower Stairs": base_id + 1548, # ItemPickup49513294 Mine3_Mountain (X=-31847.229 Y=-55152.352 Z=11574.255)
+    "Mob Camp Scraps Mask Tower Left": base_id + 1549, # ItemPickup92_14 Bob_CampDetails2 (X=-31323.533 Y=-55432.871 Z=11245.139)
+    "Mob Camp Scraps Mask Tower Right": base_id + 1550, # ItemPickup91_8 Bob_CampDetails2 (X=-31583.443 Y=-55475.805 Z=11234.112)
+    "Mob Camp Scraps Rest Shelter Between Crates Tents": base_id + 1551, # ItemPickup95_23 Bob_CampDetails2 (X=-32925.406 Y=-57157.605 Z=11086.322)
+    "Mob Camp Scraps Rest Shelter Between Explosives Tents": base_id + 1552, # ItemPickup96_26 Bob_CampDetails2 (X=-33052.488 Y=-58560.098 Z=11101.021)
+    "Mob Camp Scraps Workshop Near Beams": base_id + 1553, # ItemPickup13121212 Mine3_Mountain (X=-32422.406 Y=-60145.063 Z=11203.182)
+    "Mob Camp Scraps Workshop Under Stairs": base_id + 1554, # ItemPickup93_17 Bob_CampDetails2 (X=-30891.457 Y=-60046.465 Z=11237.567)
+    "Mob Camp Scraps Workshop Water Tank": base_id + 1555, # ItemPickup97_29 Bob_CampDetails2 (X=-31888.428 Y=-59222.645 Z=11179.302)
+    "Mob Camp Scraps Rest Shelter Near Campfire": base_id + 1556, # ItemPickup62156 Mine3_Mountain (X=-31161.750 Y=-57410.789 Z=11279.820)
+    "Mob Camp Scraps Workshop Tower": base_id + 1557, # ItemPickup24_3 Bob_CampDetails2 (X=-31256.545 Y=-59865.809 Z=11904.155)
+    "Mob Camp Scraps Rest Shelter Inside": base_id + 1558, # ItemPickup27_0 Bob_CampDetails2 (X=-31757.953 Y=-57179.258 Z=11295.150)
+    "Mob Camp Scraps Topmost On Bridge": base_id + 1559 # ItemPickup89_2 Bob_CampDetails2 (X=-29137.043 Y=-54824.797 Z=12418.673)
 }
 
 loc_mob_camp_locked_room = {
-    "Mob Camp Locked Room Scraps 1": base_id + 1560, # ItemPickup94_20 Bob_CampDetails2 (X=-31736.459 Y=-59761.465 Z=11211.379)
-    "Mob Camp Locked Room Scraps 2": base_id + 1561, # ItemPickup28_14 Bob_CampDetails2 (X=-32150.889 Y=-59879.594 Z=11297.058)
+    "Mob Camp Locked Room Scraps Near Table": base_id + 1560, # ItemPickup94_20 Bob_CampDetails2 (X=-31736.459 Y=-59761.465 Z=11211.379)
+    "Mob Camp Locked Room Scraps On Shelves": base_id + 1561, # ItemPickup28_14 Bob_CampDetails2 (X=-32150.889 Y=-59879.594 Z=11297.058)
     "Mob Camp Locked Room Stolen Bob": base_id + 1562 # Bob_Clickbox (X=-31771.172 Y=-59892.449 Z=11323.562)
 }
 
 loc_mine_elevator_exit = {
-    "Mine Elevator Exit Scraps 1": base_id + 1563, # ItemPickup266_19 Mine3_ExitCampDetails (X=-29587.271 Y=-42650.797 Z=12515.042)
-    "Mine Elevator Exit Scraps 2": base_id + 1564, # ItemPickup265_16 Mine3_ExitCampDetails (X=-30727.555 Y=-42715.438 Z=12485.763)
-    "Mine Elevator Exit Scraps 3": base_id + 1565, # ItemPickup267_22 Mine3_ExitCampDetails (X=-29814.680 Y=-43722.777 Z=12518.878)
-    "Mine Elevator Exit Scraps 4": base_id + 1566, # ItemPickup261_2 Mine3_ExitCampDetails (X=-30983.000 Y=-42943.754 Z=12474.396)
-    "Mine Elevator Exit Scraps 5": base_id + 1567, # ItemPickup262_5 Mine3_ExitCampDetails (X=-31824.576 Y=-43997.270 Z=12345.908)
-    "Mine Elevator Exit Scraps 6": base_id + 1568, # ItemPickup268_25 Mine3_ExitCampDetails (X=-32553.924 Y=-44761.855 Z=12341.698)
-    "Mine Elevator Exit Scraps 7": base_id + 1569, # ItemPickup263_10 Mine3_ExitCampDetails (X=-33598.023 Y=-44369.297 Z=12438.430)
-    "Mine Elevator Exit Scraps 8": base_id + 1570, # ItemPickup264_13 Mine3_ExitCampDetails (X=-31947.459 Y=-42017.137 Z=12384.311)
-    "Mine Elevator Exit Scraps 9": base_id + 1571 # ItemPickup269_28 Mine3_ExitCampDetails (X=-30127.123 Y=-46004.891 Z=12229.104)
+    "Mine Elevator Exit Scraps Near Campfire": base_id + 1563, # ItemPickup266_19 Mine3_ExitCampDetails (X=-29587.271 Y=-42650.797 Z=12515.042)
+    "Mine Elevator Exit Scraps Behind Shelter": base_id + 1564, # ItemPickup265_16 Mine3_ExitCampDetails (X=-30727.555 Y=-42715.438 Z=12485.763)
+    "Mine Elevator Exit Scraps Near Tents": base_id + 1565, # ItemPickup267_22 Mine3_ExitCampDetails (X=-29814.680 Y=-43722.777 Z=12518.878)
+    "Mine Elevator Exit Scraps Sheltered": base_id + 1566, # ItemPickup261_2 Mine3_ExitCampDetails (X=-30983.000 Y=-42943.754 Z=12474.396)
+    "Mine Elevator Exit Scraps Near Hole": base_id + 1567, # ItemPickup262_5 Mine3_ExitCampDetails (X=-31824.576 Y=-43997.270 Z=12345.908)
+    "Mine Elevator Exit Scraps Behind Minecart": base_id + 1568, # ItemPickup268_25 Mine3_ExitCampDetails (X=-32553.924 Y=-44761.855 Z=12341.698)
+    "Mine Elevator Exit Scraps Behind Dirt Heaps": base_id + 1569, # ItemPickup263_10 Mine3_ExitCampDetails (X=-33598.023 Y=-44369.297 Z=12438.430)
+    "Mine Elevator Exit Scraps Behind Rocks": base_id + 1570, # ItemPickup264_13 Mine3_ExitCampDetails (X=-31947.459 Y=-42017.137 Z=12384.311)
+    "Mine Elevator Exit Scraps Along Downhill Path": base_id + 1571 # ItemPickup269_28 Mine3_ExitCampDetails (X=-30127.123 Y=-46004.891 Z=12229.104)
 }
 
 loc_mountain_ruin_outside = {
-    "Mountain Ruin Outside Scraps 1": base_id + 1572, # ItemPickup112345556 Mine3_Outside (X=-2218.456 Y=-43914.789 Z=11238.952)
-    "Mountain Ruin Outside Scraps 2": base_id + 1573, # ItemPickup35621 Mine3_Outside (X=-2402.206 Y=-45494.766 Z=11244.650)
-    "Mountain Ruin Outside Scraps 3": base_id + 1574, # ItemPickup13000 Mine3_Outside (X=-2781.385 Y=-47365.313 Z=11235.389)
-    "Mountain Ruin Outside Scraps 4": base_id + 1575, # ItemPickup995959 Mine3_Outside (X=-2961.431 Y=-45445.973 Z=11255.289)
-    "Mountain Ruin Outside Scraps 5": base_id + 1576, # ItemPickup136999 Mine3_Outside (X=-5873.435 Y=-46300.633 Z=11228.667)
-    "Mountain Ruin Outside Scraps 6": base_id + 1577, # ItemPickup1589994 Mine3_Outside (X=-1823.357 Y=-47071.813 Z=11161.523)
-    "Mountain Ruin Outside Scraps 7": base_id + 1578, # ItemPickup09871230948 Mine3_Outside (X=-3478.155 Y=-49094.965 Z=11083.230)
-    "Mountain Ruin Outside Scraps 8": base_id + 1579, # ItemPickup258_20 Mine3_Camp (X=-4606.678 Y=-50246.180 Z=11613.938)
-    "Mountain Ruin Outside Scraps 9": base_id + 1580, # ItemPickup257_17 Mine3_Camp (X=-5454.638 Y=-53508.004 Z=12062.944)
-    "Mountain Ruin Outside Scraps 10": base_id + 1581, # ItemPickup18_3 Mine3_Camp (X=-8192.042 Y=-53726.535 Z=11947.394)
-    "Mountain Ruin Outside Scraps 11": base_id + 1582, # ItemPickup252_2 Mine3_Camp (X=-9409.834 Y=-53970.621 Z=11923.256)
-    "Mountain Ruin Outside Scraps 12": base_id + 1583, # ItemPickup254_8 Mine3_Camp (X=-8977.424 Y=-57134.637 Z=12232.596)
-    "Mountain Ruin Outside Scraps 13": base_id + 1584, # ItemPickup19_1 Mine3_Camp (X=-10449.292 Y=-56481.938 Z=12274.706)
-    "Mountain Ruin Outside Scraps 14": base_id + 1585, # ItemPickup255_11 Mine3_Camp (X=-10490.690 Y=-56584.301 Z=12281.096)
-    "Mountain Ruin Outside Scraps 15": base_id + 1586, # ItemPickup256_14 Mine3_Camp (X=-11600.937 Y=-55831.191 Z=12388.329)
-    "Mountain Ruin Outside Scraps 16": base_id + 1587, # ItemPickup259_23 Mine3_Camp (X=-3307.077 Y=-49973.461 Z=11282.041)
-    "Mountain Ruin Outside Scraps 17": base_id + 1588 # ItemPickup260_26 Mine3_Camp (X=-8878.345 Y=-49816.922 Z=13700.768)
+    "Mountain Ruin Outside Scraps Bottom Sheltered": base_id + 1572, # ItemPickup112345556 Mine3_Outside (X=-2218.456 Y=-43914.789 Z=11238.952)
+    "Mountain Ruin Outside Scraps Bottom Near Minecarts": base_id + 1573, # ItemPickup35621 Mine3_Outside (X=-2402.206 Y=-45494.766 Z=11244.650)
+    "Mountain Ruin Outside Scraps Bottom Near Twin Tents": base_id + 1574, # ItemPickup13000 Mine3_Outside (X=-2781.385 Y=-47365.313 Z=11235.389)
+    "Mountain Ruin Outside Scraps Bottom Near Crates": base_id + 1575, # ItemPickup995959 Mine3_Outside (X=-2961.431 Y=-45445.973 Z=11255.289)
+    "Mountain Ruin Outside Scraps Bottom Collapsed Mines": base_id + 1576, # ItemPickup136999 Mine3_Outside (X=-5873.435 Y=-46300.633 Z=11228.667)
+    "Mountain Ruin Outside Scraps Bottom Between Tents": base_id + 1577, # ItemPickup1589994 Mine3_Outside (X=-1823.357 Y=-47071.813 Z=11161.523)
+    "Mountain Ruin Outside Scraps Bottom Under Lantern": base_id + 1578, # ItemPickup09871230948 Mine3_Outside (X=-3478.155 Y=-49094.965 Z=11083.230)
+    "Mountain Ruin Outside Scraps Downhill Path Top": base_id + 1579, # ItemPickup258_20 Mine3_Camp (X=-4606.678 Y=-50246.180 Z=11613.938)
+    "Mountain Ruin Outside Scraps Downhill Barrier": base_id + 1580, # ItemPickup257_17 Mine3_Camp (X=-5454.638 Y=-53508.004 Z=12062.944)
+    "Mountain Ruin Outside Scraps Pillars Near Minecart": base_id + 1581, # ItemPickup18_3 Mine3_Camp (X=-8192.042 Y=-53726.535 Z=11947.394)
+    "Mountain Ruin Outside Scraps Pillars Near Crate": base_id + 1582, # ItemPickup252_2 Mine3_Camp (X=-9409.834 Y=-53970.621 Z=11923.256)
+    "Mountain Ruin Outside Scraps Pillars Near Dirt Heaps": base_id + 1583, # ItemPickup254_8 Mine3_Camp (X=-8977.424 Y=-57134.637 Z=12232.596)
+    "Mountain Ruin Outside Scraps Pillars Near Tents Right": base_id + 1584, # ItemPickup19_1 Mine3_Camp (X=-10449.292 Y=-56481.938 Z=12274.706)
+    "Mountain Ruin Outside Scraps Pillars Near Tents Left": base_id + 1585, # ItemPickup255_11 Mine3_Camp (X=-10490.690 Y=-56584.301 Z=12281.096)
+    "Mountain Ruin Outside Scraps Pillars Behind Tent": base_id + 1586, # ItemPickup256_14 Mine3_Camp (X=-11600.937 Y=-55831.191 Z=12388.329)
+    "Mountain Ruin Outside Scraps Downhill Path Bottom": base_id + 1587, # ItemPickup259_23 Mine3_Camp (X=-3307.077 Y=-49973.461 Z=11282.041)
+    "Mountain Ruin Outside Scraps Topmost On Rocks": base_id + 1588 # ItemPickup260_26 Mine3_Camp (X=-8878.345 Y=-49816.922 Z=13700.768)
 }
 
 loc_mountain_ruin_inside = {
-    "Mountain Ruin Inside Scraps 1": base_id + 1589, # ItemPickup253_5 Mine3_Camp (X=-10647.446 Y=-52039.848 Z=11925.344)
-    "Mountain Ruin Inside Scraps 2": base_id + 1590, # ItemPickup270_2 Mine3_Interior1 (X=-12834.990 Y=-48683.176 Z=10200.083)
-    "Mountain Ruin Inside Scraps 3": base_id + 1591, # ItemPickup271_5 Mine3_Interior1 (X=-15748.594 Y=-44925.523 Z=10199.975)
-    "Mountain Ruin Inside Scraps 4": base_id + 1592, # ItemPickup20_3 Mine3_Interior1 (X=-15312.152 Y=-43957.055 Z=10350.783)
-    "Mountain Ruin Inside Scraps 5": base_id + 1593, # ItemPickup273_11 Mine3_Interior1 (X=-16709.586 Y=-44997.316 Z=10198.888)
-    "Mountain Ruin Inside Scraps 6": base_id + 1594, # ItemPickup272_8 Mine3_Interior1 (X=-17412.561 Y=-46041.977 Z=10349.650)
-    "Mountain Ruin Inside Scraps 7": base_id + 1595, # ItemPickup274_14 Mine3_Interior1 (X=-17452.596 Y=-43804.941 Z=10201.436)
-    "Mountain Ruin Inside Scraps 8": base_id + 1596, # ItemPickup21_2 Mine3_Interior1 (X=-18119.473 Y=-42001.453 Z=10198.855)
-    "Mountain Ruin Inside Scraps 9": base_id + 1597, # ItemPickup276_20 Mine3_Interior1 (X=-18975.068 Y=-42906.488 Z=10279.690)
-    "Mountain Ruin Inside Scraps 10": base_id + 1598, # ItemPickup277_26 Mine3_Interior1 (X=-19727.902 Y=-41581.039 Z=10199.614)
-    "Mountain Ruin Inside Scraps 11": base_id + 1599, # ItemPickup275_17 Mine3_Interior1 (X=-19187.891 Y=-40516.941 Z=10201.049)
-    "Mountain Ruin Inside Scraps 12": base_id + 1600, # ItemPickup278_29 Mine3_Interior1 (X=-22470.986 Y=-41602.875 Z=10073.847)
-    "Mountain Ruin Inside Scraps 13": base_id + 1601, # ItemPickup279_2 Mine3_Interior2 (X=-23717.383 Y=-42597.141 Z=7455.452)
-    "Mountain Ruin Inside Scraps 14": base_id + 1602, # ItemPickup22_7 Mine3_Interior2 (X=-24494.582 Y=-44598.086 Z=7433.633)
-    "Mountain Ruin Inside Scraps 15": base_id + 1603, # ItemPickup280_5 Mine3_Interior2 (X=-26783.293 Y=-42331.145 Z=7446.357)
-    "Mountain Ruin Inside Scraps 16": base_id + 1604, # ItemPickup281_8 Mine3_Interior2 (X=-28636.996 Y=-46745.340 Z=7430.463)
-    "Mountain Ruin Inside Scraps 17": base_id + 1605, # ItemPickup23_1 Mine3_Interior2 (X=-27752.643 Y=-47453.973 Z=7445.047)
+    "Mountain Ruin Inside Scraps Entrance Near Door": base_id + 1589, # ItemPickup253_5 Mine3_Camp (X=-10647.446 Y=-52039.848 Z=11925.344)
+    "Mountain Ruin Inside Scraps Entrance Down Stairs": base_id + 1590, # ItemPickup270_2 Mine3_Interior1 (X=-12834.990 Y=-48683.176 Z=10200.083)
+    "Mountain Ruin Inside Scraps Hideout Near First Plank": base_id + 1591, # ItemPickup271_5 Mine3_Interior1 (X=-15748.594 Y=-44925.523 Z=10199.975)
+    "Mountain Ruin Inside Scraps Hideout Rest Area": base_id + 1592, # ItemPickup20_3 Mine3_Interior1 (X=-15312.152 Y=-43957.055 Z=10350.783)
+    "Mountain Ruin Inside Scraps Hideout Near Second Plank": base_id + 1593, # ItemPickup273_11 Mine3_Interior1 (X=-16709.586 Y=-44997.316 Z=10198.888)
+    "Mountain Ruin Inside Scraps Hideout Workspace": base_id + 1594, # ItemPickup272_8 Mine3_Interior1 (X=-17412.561 Y=-46041.977 Z=10349.650)
+    "Mountain Ruin Inside Scraps Guardroom Near Minecart": base_id + 1595, # ItemPickup274_14 Mine3_Interior1 (X=-17452.596 Y=-43804.941 Z=10201.436)
+    "Mountain Ruin Inside Scraps Guardroom Behind Plank": base_id + 1596, # ItemPickup21_2 Mine3_Interior1 (X=-18119.473 Y=-42001.453 Z=10198.855)
+    "Mountain Ruin Inside Scraps Guardroom On Table": base_id + 1597, # ItemPickup276_20 Mine3_Interior1 (X=-18975.068 Y=-42906.488 Z=10279.690)
+    "Mountain Ruin Inside Scraps Guardroom Near Broken Wall": base_id + 1598, # ItemPickup277_26 Mine3_Interior1 (X=-19727.902 Y=-41581.039 Z=10199.614)
+    "Mountain Ruin Inside Scraps Guardroom Near Map": base_id + 1599, # ItemPickup275_17 Mine3_Interior1 (X=-19187.891 Y=-40516.941 Z=10201.049)
+    "Mountain Ruin Inside Scraps Guardroom Near Elevator": base_id + 1600, # ItemPickup278_29 Mine3_Interior1 (X=-22470.986 Y=-41602.875 Z=10073.847)
+    "Mountain Ruin Inside Scraps Tunnels Behind Plank": base_id + 1601, # ItemPickup279_2 Mine3_Interior2 (X=-23717.383 Y=-42597.141 Z=7455.452)
+    "Mountain Ruin Inside Scraps Tunnels Right Dead End": base_id + 1602, # ItemPickup22_7 Mine3_Interior2 (X=-24494.582 Y=-44598.086 Z=7433.633)
+    "Mountain Ruin Inside Scraps Tunnels Left Dead End": base_id + 1603, # ItemPickup280_5 Mine3_Interior2 (X=-26783.293 Y=-42331.145 Z=7446.357)
+    "Mountain Ruin Inside Scraps Tunnels Intersection": base_id + 1604, # ItemPickup281_8 Mine3_Interior2 (X=-28636.996 Y=-46745.340 Z=7430.463)
+    "Mountain Ruin Inside Scraps Tunnels Last Dead End": base_id + 1605, # ItemPickup23_1 Mine3_Interior2 (X=-27752.643 Y=-47453.973 Z=7445.047)
     "Mountain Ruin Inside Red Egg": base_id + 1606, # Mine3_EggPickup Mine3_Interior2 (X=-28254.400 Y=-45702.844 Z=7551.568)
     "Mountain Ruin Inside Red Paint Can": base_id + 1607 # PaintCan_2 Mine3_Interior2 (X=-31391.293 Y=-44953.223 Z=7448.648) \!/ Existing match 5
 }
 
 loc_pickle_val = {
-    "Pickle Val Scraps 1": base_id + 1608, # ItemPickup56_2 Pickles_HouseDetails (X=60402.582 Y=25252.434 Z=11151.982)
-    "Pickle Val Scraps 2": base_id + 1609, # ItemPickup57_5 Pickles_HouseDetails (X=58717.516 Y=24457.180 Z=11343.938)
-    "Pickle Val Scraps 3": base_id + 1610, # ItemPickup311_14 Pickles_EnvironmentDetails (X=56455.688 Y=22324.875 Z=11655.192)
-    "Pickle Val Scraps 4": base_id + 1611, # ItemPickup310_11 Pickles_EnvironmentDetails (X=52888.387 Y=22541.955 Z=12428.012)
-    "Pickle Val Scraps 5": base_id + 1612, # ItemPickup58_2 Pickles_EnvironmentDetails (X=50374.863 Y=22073.027 Z=12591.468)
-    "Pickle Val Scraps 6": base_id + 1613, # ItemPickup309_8 Pickles_EnvironmentDetails (X=45985.988 Y=23063.826 Z=13043.497)
-    "Pickle Val Scraps 7": base_id + 1614, # ItemPickup316_27 Pickles_EnvironmentDetails (X=45533.469 Y=24876.168 Z=13015.539)
-    "Pickle Val Scraps 8": base_id + 1615, # ItemPickup317_30 Pickles_EnvironmentDetails (X=44928.848 Y=30913.396 Z=14273.230)
-    "Pickle Val Scraps 9": base_id + 1616, # ItemPickup321_42 Pickles_EnvironmentDetails (X=41572.684 Y=37403.539 Z=13527.379)
-    "Pickle Val Scraps 10": base_id + 1617, # ItemPickup61_11 Pickles_EnvironmentDetails (X=42266.566 Y=30556.238 Z=13584.196)
-    "Pickle Val Scraps 11": base_id + 1618, # ItemPickup314_21 Pickles_EnvironmentDetails (X=43356.219 Y=29465.746 Z=13449.486)
-    "Pickle Val Scraps 12": base_id + 1619, # ItemPickup323_48 Pickles_EnvironmentDetails (X=40893.461 Y=30669.398 Z=13465.039)
-    "Pickle Val Scraps 13": base_id + 1620, # ItemPickup318_33 Pickles_EnvironmentDetails (X=41276.863 Y=32313.068 Z=13480.846)
-    "Pickle Val Scraps 14": base_id + 1621, # ItemPickup319_36 Pickles_EnvironmentDetails (X=38630.031 Y=30471.996 Z=13571.207)
-    "Pickle Val Scraps 15": base_id + 1622, # ItemPickup320_39 Pickles_EnvironmentDetails (X=38596.938 Y=30050.293 Z=13559.574)
-    "Pickle Val Scraps 16": base_id + 1623, # ItemPickup60_8 Pickles_EnvironmentDetails (X=42042.520 Y=25136.820 Z=13077.339)
-    "Pickle Val Scraps 17": base_id + 1624, # ItemPickup308_5 Pickles_EnvironmentDetails (X=43770.914 Y=23307.234 Z=12374.002)
-    "Pickle Val Scraps 18": base_id + 1625, # ItemPickup59_5 Pickles_EnvironmentDetails (X=44672.641 Y=20936.520 Z=12198.017)
-    "Pickle Val Scraps 19": base_id + 1626, # ItemPickup307_2 Pickles_EnvironmentDetails (X=42844.730 Y=22869.387 Z=12832.900)
-    "Pickle Val Scraps 20": base_id + 1627, # ItemPickup315_24 Pickles_EnvironmentDetails (X=43397.758 Y=26367.248 Z=13005.097)
-    "Pickle Val Scraps 21": base_id + 1628, # ItemPickup322_45 Pickles_EnvironmentDetails (X=39352.430 Y=32668.316 Z=14494.778)
-    "Pickle Val Scraps 22": base_id + 1629, # ItemPickup313 Pickles_EnvironmentDetails (X=59688.781 Y=25266.756 Z=11425.324)
-    "Pickle Val Scraps 23": base_id + 1630, # ItemPickup312_17 Pickles_EnvironmentDetails (X=59197.871 Y=24760.773 Z=11425.324)
+    "Pickle Val Scraps Near Platform": base_id + 1608, # ItemPickup56_2 Pickles_HouseDetails (X=60402.582 Y=25252.434 Z=11151.982)
+    "Pickle Val Scraps Near Water Tank": base_id + 1609, # ItemPickup57_5 Pickles_HouseDetails (X=58717.516 Y=24457.180 Z=11343.938)
+    "Pickle Val Scraps Under Unlit Lantern": base_id + 1610, # ItemPickup311_14 Pickles_EnvironmentDetails (X=56455.688 Y=22324.875 Z=11655.192)
+    "Pickle Val Scraps On Rocks": base_id + 1611, # ItemPickup310_11 Pickles_EnvironmentDetails (X=52888.387 Y=22541.955 Z=12428.012)
+    "Pickle Val Scraps Under Lit Lantern": base_id + 1612, # ItemPickup58_2 Pickles_EnvironmentDetails (X=50374.863 Y=22073.027 Z=12591.468)
+    "Pickle Val Scraps Behind Barrier": base_id + 1613, # ItemPickup309_8 Pickles_EnvironmentDetails (X=45985.988 Y=23063.826 Z=13043.497)
+    "Pickle Val Scraps Near Unstacked Bottom Crates": base_id + 1614, # ItemPickup316_27 Pickles_EnvironmentDetails (X=45533.469 Y=24876.168 Z=13015.539)
+    "Pickle Val Scraps Under Top Explosive Sign": base_id + 1615, # ItemPickup317_30 Pickles_EnvironmentDetails (X=44928.848 Y=30913.396 Z=14273.230)
+    "Pickle Val Scraps Near Two Explosive Signs": base_id + 1616, # ItemPickup321_42 Pickles_EnvironmentDetails (X=41572.684 Y=37403.539 Z=13527.379)
+    "Pickle Val Scraps Near Tent": base_id + 1617, # ItemPickup61_11 Pickles_EnvironmentDetails (X=42266.566 Y=30556.238 Z=13584.196)
+    "Pickle Val Scraps Near Unstacked Middle Crates": base_id + 1618, # ItemPickup314_21 Pickles_EnvironmentDetails (X=43356.219 Y=29465.746 Z=13449.486)
+    "Pickle Val Scraps Under Tree": base_id + 1619, # ItemPickup323_48 Pickles_EnvironmentDetails (X=40893.461 Y=30669.398 Z=13465.039)
+    "Pickle Val Scraps Near Beams": base_id + 1620, # ItemPickup318_33 Pickles_EnvironmentDetails (X=41276.863 Y=32313.068 Z=13480.846)
+    "Pickle Val Scraps Near Sheltered Crates": base_id + 1621, # ItemPickup319_36 Pickles_EnvironmentDetails (X=38630.031 Y=30471.996 Z=13571.207)
+    "Pickle Val Scraps Near Sheltered Table": base_id + 1622, # ItemPickup320_39 Pickles_EnvironmentDetails (X=38596.938 Y=30050.293 Z=13559.574)
+    "Pickle Val Scraps Along Top Path": base_id + 1623, # ItemPickup60_8 Pickles_EnvironmentDetails (X=42042.520 Y=25136.820 Z=13077.339)
+    "Pickle Val Scraps Near Explosives": base_id + 1624, # ItemPickup308_5 Pickles_EnvironmentDetails (X=43770.914 Y=23307.234 Z=12374.002)
+    "Pickle Val Scraps Near Stacked Crates": base_id + 1625, # ItemPickup59_5 Pickles_EnvironmentDetails (X=44672.641 Y=20936.520 Z=12198.017)
+    "Pickle Val Scraps Under Bottom Explosive Sign": base_id + 1626, # ItemPickup307_2 Pickles_EnvironmentDetails (X=42844.730 Y=22869.387 Z=12832.900)
+    "Pickle Val Scraps Near Crossroad Crates": base_id + 1627, # ItemPickup315_24 Pickles_EnvironmentDetails (X=43397.758 Y=26367.248 Z=13005.097)
+    "Pickle Val Scraps Above Pickle Cave": base_id + 1628, # ItemPickup322_45 Pickles_EnvironmentDetails (X=39352.430 Y=32668.316 Z=14494.778)
+    "Pickle Val Scraps Inside House Near Table": base_id + 1629, # ItemPickup313 Pickles_EnvironmentDetails (X=59688.781 Y=25266.756 Z=11425.324)
+    "Pickle Val Scraps Inside House Near Beds": base_id + 1630, # ItemPickup312_17 Pickles_EnvironmentDetails (X=59197.871 Y=24760.773 Z=11425.324)
     "Pickle Val Purple Paint Can": base_id + 1631, # PaintCan_7 Pickles_EnvironmentDetails (X=40394.855 Y=31546.465 Z=13472.573)
     "Pickle Val Jar of Pickles": base_id + 1632, # Pickles_Pickup Pickles_Cave (X=38227.535 Y=30234.848 Z=13593.506)
     "Pickle Val Pickle Lady Mission End": base_id + 1633 # (dialog 4) -> 30_scraps_reward
 }
 
 loc_shrine_near_temple = {
-    "Shrine Near Temple Scraps 1": base_id + 1634, # ItemPickup3 Photorealistic_Island (X=-4675.183 Y=-21143.846 Z=11984.782)
-    "Shrine Near Temple Scraps 2": base_id + 1635, # ItemPickup_2 Photorealistic_Island (X=-4994.117 Y=-20496.621 Z=11874.112)
-    "Shrine Near Temple Scraps 3": base_id + 1636 # ItemPickup2 Photorealistic_Island (X=-4196.896 Y=-20477.025 Z=11882.833)
+    "Shrine Near Temple Scraps Near Rocks": base_id + 1634, # ItemPickup3 Photorealistic_Island (X=-4675.183 Y=-21143.846 Z=11984.782)
+    "Shrine Near Temple Scraps Along Path": base_id + 1635, # ItemPickup_2 Photorealistic_Island (X=-4994.117 Y=-20496.621 Z=11874.112)
+    "Shrine Near Temple Scraps Near Barriers": base_id + 1636 # ItemPickup2 Photorealistic_Island (X=-4196.896 Y=-20477.025 Z=11882.833)
 }
 
 loc_morse_bunker = {
@@ -803,59 +803,59 @@ class CCCharlesLocation(Location):
     "Morse Bunker Chest Scraps 3": base_id + 1639, # ItemPickup921436 Secret6_BunkerDetails (X=-47953.637 Y=-85426.172 Z=10592.347)
     "Morse Bunker Chest Scraps 4": base_id + 1640, # ItemPickup0128704 Secret6_BunkerDetails (X=-47958.691 Y=-85444.805 Z=10587.060)
     "Morse Bunker Chest Scraps 5": base_id + 1641, # ItemPickup64_8 Secret6_BunkerDetails (X=-47953.617 Y=-85426.172 Z=10574.149)
-    "Morse Bunker Scraps 1": base_id + 1642, # ItemPickup397_2 Secret6_BunkerDetails (X=-48336.863 Y=-85458.453 Z=10574.537)
-    "Morse Bunker Scraps 2": base_id + 1643, # ItemPickup62_2 Secret6_BunkerDetails (X=-48253.844 Y=-84944.609 Z=10573.793)
-    "Morse Bunker Scraps 3": base_id + 1644, # ItemPickup63_5 Secret6_BunkerDetails (X=-47272.422 Y=-84549.945 Z=10543.671)
-    "Morse Bunker Scraps 4": base_id + 1645, # ItemPickup398_5 Secret6_BunkerDetails (X=-47080.836 Y=-85268.281 Z=10564.355)
-    "Morse Bunker Scraps 5": base_id + 1646, # ItemPickup406_31 Secret6_BunkerDetails (X=-47913.855 Y=-85234.258 Z=10819.314)
-    "Morse Bunker Scraps 6": base_id + 1647, # ItemPickup405_28 Secret6_BunkerDetails (X=-46410.227 Y=-83293.742 Z=10361.746)
-    "Morse Bunker Scraps 7": base_id + 1648, # ItemPickup399_8 Secret6_BunkerDetails (X=-45204.199 Y=-84841.211 Z=10329.200)
-    "Morse Bunker Scraps 8": base_id + 1649, # ItemPickup401_14 Secret6_BunkerDetails (X=-43895.801 Y=-83794.750 Z=10265.661)
-    "Morse Bunker Scraps 9": base_id + 1650, # ItemPickup402_17 Secret6_BunkerDetails (X=-45163.078 Y=-80832.828 Z=10090.777)
-    "Morse Bunker Scraps 10": base_id + 1651, # ItemPickup403_20 Secret6_BunkerDetails (X=-46782.027 Y=-82284.805 Z=10289.180)
-    "Morse Bunker Scraps 11": base_id + 1652, # ItemPickup404_23 Secret6_BunkerDetails (X=-49240.047 Y=-83654.961 Z=10898.540)
-    "Morse Bunker Scraps 12": base_id + 1653, # ItemPickup407_34 Secret6_BunkerDetails (X=-46571.930 Y=-85962.773 Z=10697.339)
-    "Morse Bunker Scraps 13": base_id + 1654 # ItemPickup400_11 Secret6_BunkerDetails (X=-43472.793 Y=-85983.805 Z=10310.322)
+    "Morse Bunker Scraps Inside Near Morse Note": base_id + 1642, # ItemPickup397_2 Secret6_BunkerDetails (X=-48336.863 Y=-85458.453 Z=10574.537)
+    "Morse Bunker Scraps Inside Near Minecart": base_id + 1643, # ItemPickup62_2 Secret6_BunkerDetails (X=-48253.844 Y=-84944.609 Z=10573.793)
+    "Morse Bunker Scraps Near Short Barriers": base_id + 1644, # ItemPickup63_5 Secret6_BunkerDetails (X=-47272.422 Y=-84549.945 Z=10543.671)
+    "Morse Bunker Scraps Under Tree": base_id + 1645, # ItemPickup398_5 Secret6_BunkerDetails (X=-47080.836 Y=-85268.281 Z=10564.355)
+    "Morse Bunker Scraps Above Doors": base_id + 1646, # ItemPickup406_31 Secret6_BunkerDetails (X=-47913.855 Y=-85234.258 Z=10819.314)
+    "Morse Bunker Scraps Downhill Path Near": base_id + 1647, # ItemPickup405_28 Secret6_BunkerDetails (X=-46410.227 Y=-83293.742 Z=10361.746)
+    "Morse Bunker Scraps Main Path": base_id + 1648, # ItemPickup399_8 Secret6_BunkerDetails (X=-45204.199 Y=-84841.211 Z=10329.200)
+    "Morse Bunker Scraps Near Long Barrier": base_id + 1649, # ItemPickup401_14 Secret6_BunkerDetails (X=-43895.801 Y=-83794.750 Z=10265.661)
+    "Morse Bunker Scraps Crossroads": base_id + 1650, # ItemPickup402_17 Secret6_BunkerDetails (X=-45163.078 Y=-80832.828 Z=10090.777)
+    "Morse Bunker Scraps Downhill Path Top": base_id + 1651, # ItemPickup403_20 Secret6_BunkerDetails (X=-46782.027 Y=-82284.805 Z=10289.180)
+    "Morse Bunker Scraps Downhill Path Bottom": base_id + 1652, # ItemPickup404_23 Secret6_BunkerDetails (X=-49240.047 Y=-83654.961 Z=10898.540)
+    "Morse Bunker Scraps On Rocks": base_id + 1653, # ItemPickup407_34 Secret6_BunkerDetails (X=-46571.930 Y=-85962.773 Z=10697.339)
+    "Morse Bunker Scraps Under Lantern": base_id + 1654 # ItemPickup400_11 Secret6_BunkerDetails (X=-43472.793 Y=-85983.805 Z=10310.322)
 }
 
 loc_prism_temple = {
-    "Prism Temple Chest Scraps 1": base_id + 1655, # ItemPickup16632 MainShrine_DetailsREPAIRED (X=12659.641 Y=-27827.016 Z=10930.621)
-    "Prism Temple Chest Scraps 2": base_id + 1656, # ItemPickup148864 MainShrine_DetailsREPAIRED (X=12648.021 Y=-27825.189 Z=10916.296)
-    "Prism Temple Chest Scraps 3": base_id + 1657, # ItemPickup13123 MainShrine_DetailsREPAIRED (X=12665.557 Y=-27836.633 Z=10905.999)
-    "Prism Temple Scraps 1": base_id + 1658, # ItemPickup225_77 MainShrine_ExteriorDetails (X=5281.087 Y=-16620.387 Z=10520.609)
-    "Prism Temple Scraps 2": base_id + 1659, # ItemPickup223_71 MainShrine_ExteriorDetails (X=15032.147 Y=-16788.352 Z=10992.200)
-    "Prism Temple Scraps 3": base_id + 1660, # ItemPickup222_68 MainShrine_ExteriorDetails (X=16591.920 Y=-18725.771 Z=11004.751)
-    "Prism Temple Scraps 4": base_id + 1661, # ItemPickup135123 MainShrine_DetailsREPAIRED (X=17940.854 Y=-20726.746 Z=10999.944)
-    "Prism Temple Scraps 5": base_id + 1662, # ItemPickup220_62 MainShrine_ExteriorDetails (X=18187.346 Y=-21390.066 Z=11025.650)
-    "Prism Temple Scraps 6": base_id + 1663, # ItemPickup218_56 MainShrine_ExteriorDetails (X=19218.670 Y=-24017.619 Z=10906.966)
-    "Prism Temple Scraps 7": base_id + 1664, # ItemPickup209_29 MainShrine_ExteriorDetails (X=7710.977 Y=-23469.254 Z=11012.888)
-    "Prism Temple Scraps 8": base_id + 1665, # ItemPickup138765 MainShrine_DetailsREPAIRED (X=8160.002 Y=-22335.266 Z=11016.638)
-    "Prism Temple Scraps 9": base_id + 1666, # ItemPickup210_32 MainShrine_ExteriorDetails (X=8637.903 Y=-24295.850 Z=10929.299)
-    "Prism Temple Scraps 10": base_id + 1667, # ItemPickup1112 MainShrine_DetailsREPAIRED (X=7923.367 Y=-25204.055 Z=10832.877)
-    "Prism Temple Scraps 11": base_id + 1668, # ItemPickup214_44 MainShrine_ExteriorDetails (X=10694.420 Y=-27246.365 Z=10569.074)
-    "Prism Temple Scraps 12": base_id + 1669, # ItemPickup215_47 MainShrine_ExteriorDetails (X=12892.631 Y=-26743.068 Z=10868.578)
-    "Prism Temple Scraps 13": base_id + 1670, # ItemPickup213_41 MainShrine_ExteriorDetails (X=12483.535 Y=-27253.867 Z=10876.461)
-    "Prism Temple Scraps 14": base_id + 1671, # ItemPickup212_38 MainShrine_ExteriorDetails (X=13259.813 Y=-27092.033 Z=10887.968)
-    "Prism Temple Scraps 15": base_id + 1672, # ItemPickup211_35 MainShrine_ExteriorDetails (X=9303.245 Y=-25057.908 Z=10943.273)
-    "Prism Temple Scraps 16": base_id + 1673, # ItemPickup201_2 MainShrine_ExteriorDetails (X=11750.875 Y=-22999.371 Z=12426.734)
-    "Prism Temple Scraps 17": base_id + 1674, # ItemPickup203_8 MainShrine_ExteriorDetails (X=12966.615 Y=-23568.324 Z=12519.387)
-    "Prism Temple Scraps 18": base_id + 1675, # ItemPickup204_11 MainShrine_ExteriorDetails (X=14093.343 Y=-22393.182 Z=12426.847)
-    "Prism Temple Scraps 19": base_id + 1676, # ItemPickup206_17 MainShrine_ExteriorDetails (X=13767.980 Y=-21269.568 Z=12425.791)
-    "Prism Temple Scraps 20": base_id + 1677, # ItemPickup207_23 MainShrine_ExteriorDetails (X=12882.754 Y=-20027.527 Z=12516.095)
-    "Prism Temple Scraps 21": base_id + 1678, # ItemPickup114535 MainShrine_DetailsREPAIRED (X=11883.399 Y=-20801.344 Z=12428.452)
-    "Prism Temple Scraps 22": base_id + 1679, # ItemPickup208_26 MainShrine_ExteriorDetails (X=13281.792 Y=-21302.344 Z=12902.728)
-    "Prism Temple Scraps 23": base_id + 1680, # ItemPickup205_14 MainShrine_ExteriorDetails (X=14190.678 Y=-23671.621 Z=11781.533)
-    "Prism Temple Scraps 24": base_id + 1681, # ItemPickup8903 MainShrine_DetailsREPAIRED (X=14311.736 Y=-22347.758 Z=11765.781)
-    "Prism Temple Scraps 25": base_id + 1682, # ItemPickup654 MainShrine_DetailsREPAIRED (X=13826.154 Y=-19923.131 Z=11755.189)
-    "Prism Temple Scraps 26": base_id + 1683, # ItemPickup224_74 MainShrine_ExteriorDetails (X=12443.228 Y=-18577.926 Z=11240.455)
-    "Prism Temple Scraps 27": base_id + 1684, # ItemPickup202_5 MainShrine_ExteriorDetails (X=10993.180 Y=-23783.047 Z=11754.121)
-    "Prism Temple Scraps 28": base_id + 1685, # ItemPickup13098 MainShrine_DetailsREPAIRED (X=16762.963 Y=-23634.342 Z=11031.588)
-    "Prism Temple Scraps 29": base_id + 1686, # ItemPickup221_65 MainShrine_ExteriorDetails (X=17804.979 Y=-23512.395 Z=11066.884)
-    "Prism Temple Scraps 30": base_id + 1687, # ItemPickup17123123565 MainShrine_DetailsREPAIRED (X=16998.229 Y=-23241.652 Z=11055.539)
-    "Prism Temple Scraps 31": base_id + 1688, # ItemPickup10812783 MainShrine_DetailsREPAIRED (X=17613.518 Y=-23799.813 Z=11057.277)
-    "Prism Temple Scraps 32": base_id + 1689, # ItemPickup216_50 MainShrine_ExteriorDetails (X=15342.375 Y=-24807.357 Z=11024.192)
-    "Prism Temple Scraps 33": base_id + 1690, # ItemPickup217_53 MainShrine_ExteriorDetails (X=15963.284 Y=-24834.156 Z=11021.444)
-    "Prism Temple Scraps 34": base_id + 1691 # ItemPickup219_59 MainShrine_ExteriorDetails (X=21563.559 Y=-23705.184 Z=10895.696)
+    "Temple Chest Scraps 1": base_id + 1655, # ItemPickup16632 MainShrine_DetailsREPAIRED (X=12659.641 Y=-27827.016 Z=10930.621)
+    "Temple Chest Scraps 2": base_id + 1656, # ItemPickup148864 MainShrine_DetailsREPAIRED (X=12648.021 Y=-27825.189 Z=10916.296)
+    "Temple Chest Scraps 3": base_id + 1657, # ItemPickup13123 MainShrine_DetailsREPAIRED (X=12665.557 Y=-27836.633 Z=10905.999)
+    "Temple Scraps Ground Southwest Along Path": base_id + 1658, # ItemPickup225_77 MainShrine_ExteriorDetails (X=5281.087 Y=-16620.387 Z=10520.609)
+    "Temple Scraps Ground South Lonely": base_id + 1659, # ItemPickup223_71 MainShrine_ExteriorDetails (X=15032.147 Y=-16788.352 Z=10992.200)
+    "Temple Scraps Ground Southeast Between Tents": base_id + 1660, # ItemPickup222_68 MainShrine_ExteriorDetails (X=16591.920 Y=-18725.771 Z=11004.751)
+    "Temple Scraps Ground East Near Sheltered Boxes": base_id + 1661, # ItemPickup135123 MainShrine_DetailsREPAIRED (X=17940.854 Y=-20726.746 Z=10999.944)
+    "Temple Scraps Ground East Between Sheltered Junks": base_id + 1662, # ItemPickup220_62 MainShrine_ExteriorDetails (X=18187.346 Y=-21390.066 Z=11025.650)
+    "Temple Scraps Ground East Near Barriers": base_id + 1663, # ItemPickup218_56 MainShrine_ExteriorDetails (X=19218.670 Y=-24017.619 Z=10906.966)
+    "Temple Scraps West Rest Shelter Door": base_id + 1664, # ItemPickup209_29 MainShrine_ExteriorDetails (X=7710.977 Y=-23469.254 Z=11012.888)
+    "Temple Scraps West Rest Shelter Beds": base_id + 1665, # ItemPickup138765 MainShrine_DetailsREPAIRED (X=8160.002 Y=-22335.266 Z=11016.638)
+    "Temple Scraps West Explosive Shelter": base_id + 1666, # ItemPickup210_32 MainShrine_ExteriorDetails (X=8637.903 Y=-24295.850 Z=10929.299)
+    "Temple Scraps West Empty Shelter": base_id + 1667, # ItemPickup1112 MainShrine_DetailsREPAIRED (X=7923.367 Y=-25204.055 Z=10832.877)
+    "Temple Scraps Ground Northwest Along Path": base_id + 1668, # ItemPickup214_44 MainShrine_ExteriorDetails (X=10694.420 Y=-27246.365 Z=10569.074)
+    "Temple Scraps Ground Behind Beams": base_id + 1669, # ItemPickup215_47 MainShrine_ExteriorDetails (X=12892.631 Y=-26743.068 Z=10868.578)
+    "Temple Scraps North House Near Door": base_id + 1670, # ItemPickup213_41 MainShrine_ExteriorDetails (X=12483.535 Y=-27253.867 Z=10876.461)
+    "Temple Scraps North House Between Lockers": base_id + 1671, # ItemPickup212_38 MainShrine_ExteriorDetails (X=13259.813 Y=-27092.033 Z=10887.968)
+    "Temple Scraps Ground West Near Shelters": base_id + 1672, # ItemPickup211_35 MainShrine_ExteriorDetails (X=9303.245 Y=-25057.908 Z=10943.273)
+    "Temple Scraps Top Northwest Under Lantern": base_id + 1673, # ItemPickup201_2 MainShrine_ExteriorDetails (X=11750.875 Y=-22999.371 Z=12426.734)
+    "Temple Scraps Scaffolding North": base_id + 1674, # ItemPickup203_8 MainShrine_ExteriorDetails (X=12966.615 Y=-23568.324 Z=12519.387)
+    "Temple Scraps Top Northeast Near Telescope": base_id + 1675, # ItemPickup204_11 MainShrine_ExteriorDetails (X=14093.343 Y=-22393.182 Z=12426.847)
+    "Temple Scraps Top Southeast Near Boxes": base_id + 1676, # ItemPickup206_17 MainShrine_ExteriorDetails (X=13767.980 Y=-21269.568 Z=12425.791)
+    "Temple Scraps Scaffolding South": base_id + 1677, # ItemPickup207_23 MainShrine_ExteriorDetails (X=12882.754 Y=-20027.527 Z=12516.095)
+    "Temple Scraps Top Southwest Near Lantern": base_id + 1678, # ItemPickup114535 MainShrine_DetailsREPAIRED (X=11883.399 Y=-20801.344 Z=12428.452)
+    "Temple Scraps Topmost": base_id + 1679, # ItemPickup208_26 MainShrine_ExteriorDetails (X=13281.792 Y=-21302.344 Z=12902.728)
+    "Temple Scraps Bottom Northeast Under Stairs": base_id + 1680, # ItemPickup205_14 MainShrine_ExteriorDetails (X=14190.678 Y=-23671.621 Z=11781.533)
+    "Temple Scraps Bottom Northeast In Corner": base_id + 1681, # ItemPickup8903 MainShrine_DetailsREPAIRED (X=14311.736 Y=-22347.758 Z=11765.781)
+    "Temple Scraps Bottom Southeast Near Crates": base_id + 1682, # ItemPickup654 MainShrine_DetailsREPAIRED (X=13826.154 Y=-19923.131 Z=11755.189)
+    "Temple Scraps Ground South Down Stairs": base_id + 1683, # ItemPickup224_74 MainShrine_ExteriorDetails (X=12443.228 Y=-18577.926 Z=11240.455)
+    "Temple Scraps Bottom Northwest In Clovers": base_id + 1684, # ItemPickup202_5 MainShrine_ExteriorDetails (X=10993.180 Y=-23783.047 Z=11754.121)
+    "Temple Scraps Northeast Near Tables Outside": base_id + 1685, # ItemPickup13098 MainShrine_DetailsREPAIRED (X=16762.963 Y=-23634.342 Z=11031.588)
+    "Temple Scraps Northeast Under House Roof": base_id + 1686, # ItemPickup221_65 MainShrine_ExteriorDetails (X=17804.979 Y=-23512.395 Z=11066.884)
+    "Temple Scraps Northeast Between Crates Inside": base_id + 1687, # ItemPickup17123123565 MainShrine_DetailsREPAIRED (X=16998.229 Y=-23241.652 Z=11055.539)
+    "Temple Scraps Northeast Near Table Inside": base_id + 1688, # ItemPickup10812783 MainShrine_DetailsREPAIRED (X=17613.518 Y=-23799.813 Z=11057.277)
+    "Temple Scraps Northeast Between Beams": base_id + 1689, # ItemPickup216_50 MainShrine_ExteriorDetails (X=15342.375 Y=-24807.357 Z=11024.192)
+    "Temple Scraps Northeast Near Beams": base_id + 1690, # ItemPickup217_53 MainShrine_ExteriorDetails (X=15963.284 Y=-24834.156 Z=11021.444)
+    "Temple Scraps Ground East Along Path": base_id + 1691 # ItemPickup219_59 MainShrine_ExteriorDetails (X=21563.559 Y=-23705.184 Z=10895.696)
 }
 
 

From 036a09392402700273eeab7f3c54bcd9d85d77f4 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Tue, 2 Dec 2025 00:34:04 +0100
Subject: [PATCH 21/23] Locations and Regions renaming

> Locations have a dash '-' when a description is required to differentiate items
> Locations now have better descriptions
> Some Regions are slightly renamed to be shorter
---
 worlds/cccharles/Locations.py | 1338 ++++++++++++++++-----------------
 worlds/cccharles/Regions.py   |   42 +-
 worlds/cccharles/Rules.py     |   96 +--
 3 files changed, 738 insertions(+), 738 deletions(-)

diff --git a/worlds/cccharles/Locations.py b/worlds/cccharles/Locations.py
index d0139797d4b6..4aeccd23f0ec 100644
--- a/worlds/cccharles/Locations.py
+++ b/worlds/cccharles/Locations.py
@@ -9,8 +9,8 @@ class CCCharlesLocation(Location):
 # /!\ NOT CONSIDERED YET: train_keypickup Train_KeyPickup Photorealistic_Island (X=-8816.341 Y=23392.416 Z=10219.855)
 
 loc_start_camp = {
-    "Start Camp Scraps Near Barrier": base_id + 1000, # ItemPickup139_5 Camp (X=24006.348 Y=53777.297 Z=10860.107)
-    "Start Camp Scraps Behind Tent": base_id + 1001 # ItemPickup140_8 Camp (X=23951.754 Y=54897.230 Z=10895.235)
+    "Start Camp Scraps - Near Barrier": base_id + 1000, # ItemPickup139_5 Camp (X=24006.348 Y=53777.297 Z=10860.107)
+    "Start Camp Scraps - Behind Tent": base_id + 1001 # ItemPickup140_8 Camp (X=23951.754 Y=54897.230 Z=10895.235)
 }
 
 loc_tony_tiddle_mission = {
@@ -18,15 +18,15 @@ class CCCharlesLocation(Location):
 }
 
 loc_barn = {
-    "Barn Scraps Front Of Stairs": base_id + 1003, # ItemPickup12 Photorealistic_Island (X=70582.805 Y=52591.066 Z=11976.719)
-    "Barn Scraps Near Three Crates": base_id + 1004, # ItemPickup4_2 Photorealistic_Island (X=70536.641 Y=51890.633 Z=11986.488)
-    "Barn Scraps Under Supply List": base_id + 1005, # ItemPickup6 Photorealistic_Island (X=70750.336 Y=52275.828 Z=11994.434)
-    "Barn Scraps Right Of Stairs": base_id + 1006, # ItemPickup11 Photorealistic_Island (X=70937.719 Y=52989.066 Z=12003.523)
-    "Barn Scraps Left Of Stairs": base_id + 1007, # ItemPickup5 Photorealistic_Island (X=71303.508 Y=52232.188 Z=12003.997)
-    "Barn Scraps Behind Stairs": base_id + 1008, # ItemPickup7 Photorealistic_Island (X=71678.672 Y=52825.531 Z=11977.212)
-    "Barn Scraps 1st floor Near Crates": base_id + 1009, # ItemPickup8 Photorealistic_Island (X=71506.961 Y=52357.293 Z=12362.159)
-    "Barn Scraps 1st floor Near Balustrade": base_id + 1010, # ItemPickup9 Photorealistic_Island (X=71029.875 Y=52384.613 Z=12362.159)
-    "Barn Scraps 1st floor Near Table": base_id + 1011 # ItemPickup10 Photorealistic_Island (X=71129.594 Y=52600.262 Z=12364.142)
+    "Barn Scraps - 1": base_id + 1003, # ItemPickup12 Photorealistic_Island (X=70582.805 Y=52591.066 Z=11976.719)
+    "Barn Scraps - 2": base_id + 1004, # ItemPickup4_2 Photorealistic_Island (X=70536.641 Y=51890.633 Z=11986.488)
+    "Barn Scraps - 3": base_id + 1005, # ItemPickup6 Photorealistic_Island (X=70750.336 Y=52275.828 Z=11994.434)
+    "Barn Scraps - 4": base_id + 1006, # ItemPickup11 Photorealistic_Island (X=70937.719 Y=52989.066 Z=12003.523)
+    "Barn Scraps - 5": base_id + 1007, # ItemPickup5 Photorealistic_Island (X=71303.508 Y=52232.188 Z=12003.997)
+    "Barn Scraps - 6": base_id + 1008, # ItemPickup7 Photorealistic_Island (X=71678.672 Y=52825.531 Z=11977.212)
+    "Barn Scraps - 7": base_id + 1009, # ItemPickup8 Photorealistic_Island (X=71506.961 Y=52357.293 Z=12362.159)
+    "Barn Scraps - 8": base_id + 1010, # ItemPickup9 Photorealistic_Island (X=71029.875 Y=52384.613 Z=12362.159)
+    "Barn Scraps - 9": base_id + 1011 # ItemPickup10 Photorealistic_Island (X=71129.594 Y=52600.262 Z=12364.142)
 }
 
 loc_candice_mission = {
@@ -34,828 +34,828 @@ class CCCharlesLocation(Location):
 }
 
 loc_tutorial_house = {
-    "Tutorial House Scraps Under Shelves": base_id + 1013, # ItemPickup17_2 Photorealistic_Island (X=74745.852 Y=73865.555 Z=11426.619) \!/ Existing match 8
-    "Tutorial House Scraps Near Bed": base_id + 1014, # ItemPickup18_2 Photorealistic_Island (X=74864.102 Y=73900.094 Z=11426.619)
-    "Tutorial House Scraps Center of Room": base_id + 1015, # ItemPickup14_2 Photorealistic_Island (X=74877.625 Y=73738.594 Z=11422.057) \!/ Existing match 4
-    "Tutorial House Scraps Near Table": base_id + 1016, # ItemPickup15_8 Photorealistic_Island (X=75068.992 Y=73971.133 Z=11426.619)
-    "Tutorial House Scraps Near Door": base_id + 1017, # ItemPickup21_1 Photorealistic_Island (X=74923.500 Y=73571.648 Z=11426.619)
-    "Tutorial House Scraps Front Of Crates": base_id + 1018, # ItemPickup19 Photorealistic_Island (X=75194.906 Y=73495.719 Z=11426.619)
-    "Tutorial House Scraps On Left Crate": base_id + 1019, # ItemPickup13_3 Photorealistic_Island (X=75320.102 Y=73446.352 Z=11487.376)
-    "Tutorial House Scraps Between Crates": base_id + 1020, # ItemPickup20 Photorealistic_Island (X=75298.680 Y=73580.531 Z=11426.619)
-    "Tutorial House Scraps On Mid Crate": base_id + 1021 # ItemPickup16_3 Photorealistic_Island (X=75310.008 Y=73770.742 Z=11489.709)
-}
-
-loc_swamp_edges = {
-    "Swamp Edges Scraps South Path To Candice": base_id + 1022, # ItemPickup465_67 Swamp_EnvironmentDetails (X=81964.398 Y=72167.305 Z=10116.385)
-    "Swamp Edges Scraps South Near Cauldron": base_id + 1023, # ItemPickup460_52 Swamp_EnvironmentDetails (X=89674.047 Y=71610.008 Z=9482.095)
-    "Swamp Edges Scraps South In Clovers": base_id + 1024, # ItemPickup459_49 Swamp_EnvironmentDetails (X=91637.156 Y=73345.672 Z=9492.019)
-    "Swamp Edges Scraps South Crossroads": base_id + 1025, # ItemPickup458_46 Swamp_EnvironmentDetails (X=94601.117 Y=75064.117 Z=9567.464)
-    "Swamp Edges Scraps South Near Lantern": base_id + 1026, # ItemPickup457_43 Swamp_EnvironmentDetails (X=95536.641 Y=72622.969 Z=9512.531)
-    "Swamp Edges Scraps Southeast Near Minecart": base_id + 1027, # ItemPickup456_40 Swamp_EnvironmentDetails (X=96419.922 Y=65508.676 Z=9838.949)
-    "Swamp Edges Scraps Southeast Crossroads": base_id + 1028, # ItemPickup455_37 Swamp_EnvironmentDetails (X=98158.680 Y=63191.629 Z=10477.084)
-    "Swamp Edges Scraps East Above Path Cutoff": base_id + 1029, # ItemPickup55_29 Swamp_EnvironmentDetails (X=93421.820 Y=59200.461 Z=9545.312)
-    "Swamp Edges Scraps East Crossroads": base_id + 1030, # ItemPickup453_31 Swamp_EnvironmentDetails(X=92951.648 Y=56453.527 Z=9560.638)
-    "Swamp Edges Scraps East Under Lantern": base_id + 1031, # ItemPickup454_34 Swamp_EnvironmentDetails (X=96943.297 Y=58754.043 Z=10728.124)
-    "Swamp Edges Scraps East On Crates": base_id + 1032, # ItemPickup452_28 Swamp_EnvironmentDetails (X=95000.617 Y=53070.859 Z=10258.078)
-    "Swamp Edges Scraps East Near Long Barrier": base_id + 1033, # ItemPickup451_25 Swamp_EnvironmentDetails (X=91390.703 Y=53628.707 Z=9498.378)
-    "Swamp Edges Scraps Middle Near Bridge": base_id + 1034, # ItemPickup53_23 Swamp_EnvironmentDetails (X=87628.742 Y=51614.957 Z=9487.013)
-    "Swamp Edges Scraps Northeast Behind Lantern": base_id + 1035, # ItemPickup448_16 Swamp_EnvironmentDetails (X=89785.992 Y=48603.844 Z=9573.859)
-    "Swamp Edges Scraps Northeast Along Path": base_id + 1036, # ItemPickup447_11 Swamp_EnvironmentDetails (X=89925.383 Y=46288.707 Z=9499.904)
-    "Swamp Edges Scraps Northeast Under Lantern": base_id + 1037, # ItemPickup446_8 Swamp_EnvironmentDetails (X=90848.938 Y=43133.535 Z=9729.535)
-    "Swamp Edges Scraps Northeast Near Pond": base_id + 1038, # ItemPickup445_5 Swamp_EnvironmentDetails (X=87382.383 Y=42475.191 Z=9509.929)
-    "Swamp Edges Scraps North Under Lantern": base_id + 1039, # ItemPickup444_2 Swamp_EnvironmentDetails (X=87481.820 Y=39316.820 Z=9757.511)
-    "Swamp Edges Scraps North On Crates": base_id + 1040, # ItemPickup54_26 Swamp_EnvironmentDetails (X=86039.180 Y=37135.004 Z=9826.263)
-    "Swamp Edges Scraps North Near Pond": base_id + 1041, # ItemPickup475_97 Swamp_EnvironmentDetails (X=81798.609 Y=36766.922 Z=9479.318)
-    "Swamp Edges Scraps North Near Barrier": base_id + 1042, # ItemPickup474_94 Swamp_EnvironmentDetails (X=79254.055 Y=40120.293 Z=9879.539)
-    "Swamp Edges Scraps Northwest In Clovers": base_id + 1043, # ItemPickup473_91 Swamp_EnvironmentDetails (X=82251.773 Y=42454.027 Z=9482.057)
-    "Swamp Edges Scraps Northwest Near Pond": base_id + 1044, # ItemPickup472_88 Swamp_EnvironmentDetails (X=84903.977 Y=48323.543 Z=9503.382)
-    "Swamp Edges Scraps West Near Minecart": base_id + 1045, # ItemPickup471_85 Swamp_EnvironmentDetails (X=84238.609 Y=51239.547 Z=9529.745)
-    "Swamp Edges Scraps West Near Bridge": base_id + 1046, # ItemPickup470_82 Swamp_EnvironmentDetails (X=84439.063 Y=53501.563 Z=9491.291)
-    "Swamp Edges Scraps West Under Lantern": base_id + 1047, # ItemPickup52_20 Swamp_EnvironmentDetails (X=83025.086 Y=53275.348 Z=9694.177)
-    "Swamp Edges Scraps West Path To Barn": base_id + 1048, # ItemPickup469_79 Swamp_EnvironmentDetails (X=79827.055 Y=54791.504 Z=10121.452)
-    "Swamp Edges Scraps West Behind Lantern": base_id + 1049, # ItemPickup468_76 Swamp_EnvironmentDetails (X=82266.461 Y=58126.316 Z=9660.493)
-    "Swamp Edges Scraps West Between Crossroads": base_id + 1050, # ItemPickup467_73 Swamp_EnvironmentDetails (X=75911.297 Y=65155.836 Z=10660.832)
-    "Swamp Edges Scraps Southwest Behind Crates": base_id + 1051, # ItemPickup466_70 Swamp_EnvironmentDetails (X=81171.641 Y=66836.125 Z=9673.756)
-    "Swamp Edges Scraps Northeast Crossroads": base_id + 1052, # ItemPickup449_19 Swamp_EnvironmentDetails (X=95254.992 Y=40910.563 Z=10503.727)
-    "Swamp Edges Scraps East Near Short Barrier": base_id + 1053 # ItemPickup450_22 Swamp_EnvironmentDetails (X=93992.992 Y=50773.484 Z=10238.064)
+    "Tutorial House Scraps - 1": base_id + 1013, # ItemPickup17_2 Photorealistic_Island (X=74745.852 Y=73865.555 Z=11426.619) \!/ Existing match 8
+    "Tutorial House Scraps - 2": base_id + 1014, # ItemPickup18_2 Photorealistic_Island (X=74864.102 Y=73900.094 Z=11426.619)
+    "Tutorial House Scraps - 3": base_id + 1015, # ItemPickup14_2 Photorealistic_Island (X=74877.625 Y=73738.594 Z=11422.057) \!/ Existing match 4
+    "Tutorial House Scraps - 4": base_id + 1016, # ItemPickup15_8 Photorealistic_Island (X=75068.992 Y=73971.133 Z=11426.619)
+    "Tutorial House Scraps - 5": base_id + 1017, # ItemPickup21_1 Photorealistic_Island (X=74923.500 Y=73571.648 Z=11426.619)
+    "Tutorial House Scraps - 6": base_id + 1018, # ItemPickup19 Photorealistic_Island (X=75194.906 Y=73495.719 Z=11426.619)
+    "Tutorial House Scraps - 7": base_id + 1019, # ItemPickup13_3 Photorealistic_Island (X=75320.102 Y=73446.352 Z=11487.376)
+    "Tutorial House Scraps - 8": base_id + 1020, # ItemPickup20 Photorealistic_Island (X=75298.680 Y=73580.531 Z=11426.619)
+    "Tutorial House Scraps - 9": base_id + 1021 # ItemPickup16_3 Photorealistic_Island (X=75310.008 Y=73770.742 Z=11489.709)
+}
+
+loc_swamp = {
+    "Swamp Scraps - South Path To Candice": base_id + 1022, # ItemPickup465_67 Swamp_EnvironmentDetails (X=81964.398 Y=72167.305 Z=10116.385)
+    "Swamp Scraps - South Between Trees": base_id + 1023, # ItemPickup460_52 Swamp_EnvironmentDetails (X=89674.047 Y=71610.008 Z=9482.095)
+    "Swamp Scraps - South In Clover": base_id + 1024, # ItemPickup459_49 Swamp_EnvironmentDetails (X=91637.156 Y=73345.672 Z=9492.019)
+    "Swamp Scraps - South At Crossroads": base_id + 1025, # ItemPickup458_46 Swamp_EnvironmentDetails (X=94601.117 Y=75064.117 Z=9567.464)
+    "Swamp Scraps - South Behind Lantern": base_id + 1026, # ItemPickup457_43 Swamp_EnvironmentDetails (X=95536.641 Y=72622.969 Z=9512.531)
+    "Swamp Scraps - Southeast Near Minecart": base_id + 1027, # ItemPickup456_40 Swamp_EnvironmentDetails (X=96419.922 Y=65508.676 Z=9838.949)
+    "Swamp Scraps - Southeast At Crossroads": base_id + 1028, # ItemPickup455_37 Swamp_EnvironmentDetails (X=98158.680 Y=63191.629 Z=10477.084)
+    "Swamp Scraps - East Near Pathway Pool": base_id + 1029, # ItemPickup55_29 Swamp_EnvironmentDetails (X=93421.820 Y=59200.461 Z=9545.312)
+    "Swamp Scraps - East At Crossroads": base_id + 1030, # ItemPickup453_31 Swamp_EnvironmentDetails(X=92951.648 Y=56453.527 Z=9560.638)
+    "Swamp Scraps - East Near Lantern": base_id + 1031, # ItemPickup454_34 Swamp_EnvironmentDetails (X=96943.297 Y=58754.043 Z=10728.124)
+    "Swamp Scraps - East On Crates": base_id + 1032, # ItemPickup452_28 Swamp_EnvironmentDetails (X=95000.617 Y=53070.859 Z=10258.078)
+    "Swamp Scraps - East Near Long Barrier": base_id + 1033, # ItemPickup451_25 Swamp_EnvironmentDetails (X=91390.703 Y=53628.707 Z=9498.378)
+    "Swamp Scraps - Middle Near Bridge": base_id + 1034, # ItemPickup53_23 Swamp_EnvironmentDetails (X=87628.742 Y=51614.957 Z=9487.013)
+    "Swamp Scraps - Northeast Behind Unlit Lantern": base_id + 1035, # ItemPickup448_16 Swamp_EnvironmentDetails (X=89785.992 Y=48603.844 Z=9573.859)
+    "Swamp Scraps - Northeast Near Puddles": base_id + 1036, # ItemPickup447_11 Swamp_EnvironmentDetails (X=89925.383 Y=46288.707 Z=9499.904)
+    "Swamp Scraps - Northeast Under Lit Lantern": base_id + 1037, # ItemPickup446_8 Swamp_EnvironmentDetails (X=90848.938 Y=43133.535 Z=9729.535)
+    "Swamp Scraps - Northeast Near Pond": base_id + 1038, # ItemPickup445_5 Swamp_EnvironmentDetails (X=87382.383 Y=42475.191 Z=9509.929)
+    "Swamp Scraps - North Under Lantern": base_id + 1039, # ItemPickup444_2 Swamp_EnvironmentDetails (X=87481.820 Y=39316.820 Z=9757.511)
+    "Swamp Scraps - North On Crates": base_id + 1040, # ItemPickup54_26 Swamp_EnvironmentDetails (X=86039.180 Y=37135.004 Z=9826.263)
+    "Swamp Scraps - North Near Pond": base_id + 1041, # ItemPickup475_97 Swamp_EnvironmentDetails (X=81798.609 Y=36766.922 Z=9479.318)
+    "Swamp Scraps - North Near Barrier": base_id + 1042, # ItemPickup474_94 Swamp_EnvironmentDetails (X=79254.055 Y=40120.293 Z=9879.539)
+    "Swamp Scraps - Northwest In Clover": base_id + 1043, # ItemPickup473_91 Swamp_EnvironmentDetails (X=82251.773 Y=42454.027 Z=9482.057)
+    "Swamp Scraps - Northwest Near Pond": base_id + 1044, # ItemPickup472_88 Swamp_EnvironmentDetails (X=84903.977 Y=48323.543 Z=9503.382)
+    "Swamp Scraps - West Near Minecart": base_id + 1045, # ItemPickup471_85 Swamp_EnvironmentDetails (X=84238.609 Y=51239.547 Z=9529.745)
+    "Swamp Scraps - West Near Puddles": base_id + 1046, # ItemPickup470_82 Swamp_EnvironmentDetails (X=84439.063 Y=53501.563 Z=9491.291)
+    "Swamp Scraps - West Under Lit Lantern": base_id + 1047, # ItemPickup52_20 Swamp_EnvironmentDetails (X=83025.086 Y=53275.348 Z=9694.177)
+    "Swamp Scraps - West Path To Barn": base_id + 1048, # ItemPickup469_79 Swamp_EnvironmentDetails (X=79827.055 Y=54791.504 Z=10121.452)
+    "Swamp Scraps - West Behind Unlit Lantern": base_id + 1049, # ItemPickup468_76 Swamp_EnvironmentDetails (X=82266.461 Y=58126.316 Z=9660.493)
+    "Swamp Scraps - West Between Crossroads": base_id + 1050, # ItemPickup467_73 Swamp_EnvironmentDetails (X=75911.297 Y=65155.836 Z=10660.832)
+    "Swamp Scraps - Southwest Near Lantern": base_id + 1051, # ItemPickup466_70 Swamp_EnvironmentDetails (X=81171.641 Y=66836.125 Z=9673.756)
+    "Swamp Scraps - Northeast At Crossroads": base_id + 1052, # ItemPickup449_19 Swamp_EnvironmentDetails (X=95254.992 Y=40910.563 Z=10503.727)
+    "Swamp Scraps - East Near Short Barrier": base_id + 1053 # ItemPickup450_22 Swamp_EnvironmentDetails (X=93992.992 Y=50773.484 Z=10238.064)
 }
 
 loc_swamp_mission = {
-    "Swamp Shack Scraps Inside Shack": base_id + 1054, # ItemPickup51_17 Swamp_EnvironmentDetails (X=87685.797 Y=69754.008 Z=9629.617)
-    "Swamp Shack Scraps Floating Bridge": base_id + 1055, # ItemPickup461_55 Swamp_EnvironmentDetails (X=87308.883 Y=69096.789 Z=9624.543)
-    "Swamp Islet Scraps East": base_id + 1056, # ItemPickup462_58 Swamp_EnvironmentDetails (X=88101.219 Y=64553.148 Z=9557.692)
-    "Swamp Islet Scraps North": base_id + 1057, # ItemPickup463_61 Swamp_EnvironmentDetails (X=87100.922 Y=63590.965 Z=9582.900)
-    "Swamp Islet Scraps West": base_id + 1058, # ItemPickup464_64 Swamp_EnvironmentDetails (X=86399.656 Y=64290.805 Z=9493.576)
-    "Swamp Islet Dead Fish": base_id + 1059, # Swamp_FishPickup Swamp_EnvironmentDetails (X=87288.945 Y=64278.273 Z=9550.320)
+    "Swamp Scraps - South Inside Shack": base_id + 1054, # ItemPickup51_17 Swamp_EnvironmentDetails (X=87685.797 Y=69754.008 Z=9629.617)
+    "Swamp Scraps - South On Floating Bridge": base_id + 1055, # ItemPickup461_55 Swamp_EnvironmentDetails (X=87308.883 Y=69096.789 Z=9624.543)
+    "Swamp Scraps - Islet 1": base_id + 1056, # ItemPickup462_58 Swamp_EnvironmentDetails (X=88101.219 Y=64553.148 Z=9557.692)
+    "Swamp Scraps - Islet 2": base_id + 1057, # ItemPickup463_61 Swamp_EnvironmentDetails (X=87100.922 Y=63590.965 Z=9582.900)
+    "Swamp Scraps - Islet 3": base_id + 1058, # ItemPickup464_64 Swamp_EnvironmentDetails (X=86399.656 Y=64290.805 Z=9493.576)
+    "Swamp Dead Fish": base_id + 1059, # Swamp_FishPickup Swamp_EnvironmentDetails (X=87288.945 Y=64278.273 Z=9550.320)
     "Swamp Lizbeth Murkwater Mission End": base_id + 1060 # (dialog 2) -> 30_scraps_reward
 }
 
 loc_junkyard_area = {
-    "Junkyard Area Scraps Inside Workshop": base_id + 1061, # ItemPickup185_29 Junkyard_Details1 (X=94184.391 Y=89760.258 Z=9331.188)
-    "Junkyard Area Scraps Inside Top Wagon": base_id + 1062, # ItemPickup177_5 Junkyard_Details1 (X=91919.469 Y=89681.602 Z=9407.639)
-    "Junkyard Area Scraps Inside Middle Wagon": base_id + 1063, # ItemPickup46_5 Junkyard_Details (X=91696.078 Y=90453.563 Z=9480.997)
-    "Junkyard Area Scraps Inside Bottom Wagon": base_id + 1064, # ItemPickup178_8 Junkyard_Details1 (X=92453.719 Y=91142.531 Z=9398.951)
-    "Junkyard Area Scraps Near Junk Stacks": base_id + 1065, # ItemPickup182_20 Junkyard_Details1 (X=88645.453 Y=90374.930 Z=9507.291)
-    "Junkyard Area Scraps On Junk Stacks": base_id + 1066, # ItemPickup48_11 Junkyard_Details (X=88461.953 Y=92077.531 Z=9712.173)
-    "Junkyard Area Scraps On Crates": base_id + 1067, # ItemPickup49_14 Junkyard_Details (X=91521.555 Y=93773.641 Z=9421.457)
-    "Junkyard Area Scraps Behind Beams": base_id + 1068, # ItemPickup50_17 Junkyard_Details (X=94741.484 Y=92565.938 Z=9221.093)
-    "Junkyard Area Scraps Near Campfire": base_id + 1069, # ItemPickup186_32 Junkyard_Details1 (X=95256.008 Y=91356.789 Z=9251.082)
-    "Junkyard Area Scraps On Table": base_id + 1070, # ItemPickup45_2 Junkyard_Details (X=94289.664 Y=89951.477 Z=9367.076)
+    "Junkyard Area Scraps - Inside Workshop": base_id + 1061, # ItemPickup185_29 Junkyard_Details1 (X=94184.391 Y=89760.258 Z=9331.188)
+    "Junkyard Area Scraps - Inside Railcar 1": base_id + 1062, # ItemPickup177_5 Junkyard_Details1 (X=91919.469 Y=89681.602 Z=9407.639)
+    "Junkyard Area Scraps - Inside Railcar 2": base_id + 1063, # ItemPickup46_5 Junkyard_Details (X=91696.078 Y=90453.563 Z=9480.997)
+    "Junkyard Area Scraps - Inside Railcar 3": base_id + 1064, # ItemPickup178_8 Junkyard_Details1 (X=92453.719 Y=91142.531 Z=9398.951)
+    "Junkyard Area Scraps - Near Junk Stacks": base_id + 1065, # ItemPickup182_20 Junkyard_Details1 (X=88645.453 Y=90374.930 Z=9507.291)
+    "Junkyard Area Scraps - On Junk Stacks": base_id + 1066, # ItemPickup48_11 Junkyard_Details (X=88461.953 Y=92077.531 Z=9712.173)
+    "Junkyard Area Scraps - On Crates": base_id + 1067, # ItemPickup49_14 Junkyard_Details (X=91521.555 Y=93773.641 Z=9421.457)
+    "Junkyard Area Scraps - Behind Beams": base_id + 1068, # ItemPickup50_17 Junkyard_Details (X=94741.484 Y=92565.938 Z=9221.093)
+    "Junkyard Area Scraps - Near Campfire": base_id + 1069, # ItemPickup186_32 Junkyard_Details1 (X=95256.008 Y=91356.789 Z=9251.082)
+    "Junkyard Area Scraps - On Table": base_id + 1070, # ItemPickup45_2 Junkyard_Details (X=94289.664 Y=89951.477 Z=9367.076)
     "Junkyard Area Daryl Mission Start": base_id + 1071, # (dialog 4) -> Lockpicks (4)
     "Junkyard Area Chest Ancient Tablet": base_id + 1072, # Junkyard_TabletPickup Junkyard_Details (X=90715.367 Y=92168.563 Z=9402.729)
     "Junkyard Area Daryl Mission End": base_id + 1073 # (dialog 3) -> 25_scraps_reward
 }
 
 loc_south_house = {
-    "South House Scraps Under Top Lantern": base_id + 1074, # ItemPickup361_26 Secret12_ExteriorDetails (X=85865.969 Y=103869.656 Z=9453.063)
-    "South House Scraps Under Middle Lantern": base_id + 1075, # ItemPickup360_23 Secret12_ExteriorDetails (X=84403.742 Y=107229.039 Z=9067.245)
-    "South House Scraps Under Bottom Lantern": base_id + 1076, # ItemPickup359_20 Secret12_ExteriorDetails (X=83389.789 Y=108817.992 Z=8752.255)
-    "South House Scraps Under House Lantern": base_id + 1077, # ItemPickup353_2 Secret12_ExteriorDetails (X=82413.547 Y=109697.477 Z=8637.677)
-    "South House Scraps Near Water Tank": base_id + 1078, # ItemPickup354_5 Secret12_ExteriorDetails (X=83000.359 Y=110323.664 Z=8560.229)
-    "South House Scraps Inside House": base_id + 1079, # ItemPickup358_17 Secret12_ExteriorDetails (X=82072.625 Y=110482.664 Z=8682.441)
-    "South House Scraps On Balcony": base_id + 1080, # ItemPickup24_30 Secret12_Details (X=81970.766 Y=111082.117 Z=8647.703)
-    "South House Scraps Atop Downhill Path": base_id + 1081, # ItemPickup356_11 Secret12_ExteriorDetails (X=80915.375 Y=108689.758 Z=8377.754)
-    "South House Scraps Along Downhill Path": base_id + 1082, # ItemPickup355_8 Secret12_ExteriorDetails (X=81762.180 Y=111371.023 Z=7876.312)
-    "South House Scraps Near Blood Trail": base_id + 1083, # ItemPickup357_14 Secret12_ExteriorDetails (X=80663.336 Y=113306.695 Z=7226.475)
-    "South House Scraps In Boat": base_id + 1084, # ItemPickup23_21 Secret12_Details (X=80520.367 Y=113747.039 Z=7252.808)
-    "South House Scraps Behind Boat": base_id + 1085, # ItemPickup22_18 Secret12_Details (X=80830.273 Y=113871.383 Z=7201.687)
-    "South House Chest Scraps 1": base_id + 1086, # ItemPickup21 Secret12_Details (X=82079.922 Y=110808.602 Z=8739.324)
-    "South House Chest Scraps 2": base_id + 1087, # ItemPickup18 Secret12_Details (X=82102.664 Y=110813.664 Z=8726.308)
-    "South House Chest Scraps 3": base_id + 1088, # ItemPickup17 Secret12_Details (X=82091.547 Y=110810.906 Z=8721.354) \!/ Existing match 1
-    "South House Chest Scraps 4": base_id + 1089, # ItemPickup16 Secret12_Details (X=82102.664 Y=110813.664 Z=8708.337) \!/ Existing match 2
-    "South House Chest Scraps 5": base_id + 1090, # ItemPickup14 Secret12_Details (X=82091.516 Y=110810.898 Z=8701.793) \!/ Existing match 3
-    "South House Chest Scraps 6": base_id + 1091 # ItemPickup13_7 Secret12_Details (X=82102.664 Y=110813.625 Z=8688.776)
+    "South House Scraps - Under Lantern 1": base_id + 1074, # ItemPickup361_26 Secret12_ExteriorDetails (X=85865.969 Y=103869.656 Z=9453.063)
+    "South House Scraps - Under Lantern 2": base_id + 1075, # ItemPickup360_23 Secret12_ExteriorDetails (X=84403.742 Y=107229.039 Z=9067.245)
+    "South House Scraps - Under Lantern 3": base_id + 1076, # ItemPickup359_20 Secret12_ExteriorDetails (X=83389.789 Y=108817.992 Z=8752.255)
+    "South House Scraps - Under Lantern 4": base_id + 1077, # ItemPickup353_2 Secret12_ExteriorDetails (X=82413.547 Y=109697.477 Z=8637.677)
+    "South House Scraps - Near Water Tank": base_id + 1078, # ItemPickup354_5 Secret12_ExteriorDetails (X=83000.359 Y=110323.664 Z=8560.229)
+    "South House Scraps - Inside House": base_id + 1079, # ItemPickup358_17 Secret12_ExteriorDetails (X=82072.625 Y=110482.664 Z=8682.441)
+    "South House Scraps - On Balcony": base_id + 1080, # ItemPickup24_30 Secret12_Details (X=81970.766 Y=111082.117 Z=8647.703)
+    "South House Scraps - Top Of Downhill Path": base_id + 1081, # ItemPickup356_11 Secret12_ExteriorDetails (X=80915.375 Y=108689.758 Z=8377.754)
+    "South House Scraps - Halfway On Downhill Path": base_id + 1082, # ItemPickup355_8 Secret12_ExteriorDetails (X=81762.180 Y=111371.023 Z=7876.312)
+    "South House Scraps - Near Boat 1": base_id + 1083, # ItemPickup357_14 Secret12_ExteriorDetails (X=80663.336 Y=113306.695 Z=7226.475)
+    "South House Scraps - Near Boat 2": base_id + 1084, # ItemPickup23_21 Secret12_Details (X=80520.367 Y=113747.039 Z=7252.808)
+    "South House Scraps - Near Boat 3": base_id + 1085, # ItemPickup22_18 Secret12_Details (X=80830.273 Y=113871.383 Z=7201.687)
+    "South House Chest Scraps - 1": base_id + 1086, # ItemPickup21 Secret12_Details (X=82079.922 Y=110808.602 Z=8739.324)
+    "South House Chest Scraps - 2": base_id + 1087, # ItemPickup18 Secret12_Details (X=82102.664 Y=110813.664 Z=8726.308)
+    "South House Chest Scraps - 3": base_id + 1088, # ItemPickup17 Secret12_Details (X=82091.547 Y=110810.906 Z=8721.354) \!/ Existing match 1
+    "South House Chest Scraps - 4": base_id + 1089, # ItemPickup16 Secret12_Details (X=82102.664 Y=110813.664 Z=8708.337) \!/ Existing match 2
+    "South House Chest Scraps - 5": base_id + 1090, # ItemPickup14 Secret12_Details (X=82091.516 Y=110810.898 Z=8701.793) \!/ Existing match 3
+    "South House Chest Scraps - 6": base_id + 1091 # ItemPickup13_7 Secret12_Details (X=82102.664 Y=110813.625 Z=8688.776)
 }
 
 loc_junkyard_shed = {
     "Junkyard Shed Helen Mission Start": base_id + 1092, # (dialog 8) -> south_mine_key (6)
-    "Junkyard Shed Scraps On Platform": base_id + 1093, # ItemPickup424_23 Settlement_A_House_1 (X=98303.992 Y=84476.016 Z=9376.540)
-    "Junkyard Shed Scraps Half Sheltered": base_id + 1094, # ItemPickup419_8 Settlement_A_House_1 (X=98174.680 Y=84067.383 Z=9249.197)
-    "Junkyard Shed Scraps On Table": base_id + 1095, # ItemPickup418_5 Settlement_A_House_1 (X=97948.977 Y=83354.656 Z=9339.430)
-    "Junkyard Shed Scraps Near Crates": base_id + 1096, # ItemPickup417_2 Settlement_A_House_1 (X=98208.391 Y=83088.047 Z=9273.632)
-    "Junkyard Shed Scraps Behind Shed": base_id + 1097, # ItemPickup420_11 Settlement_A_House_1 (X=97757.773 Y=82995.656 Z=9298.597)
-    "Junkyard Shed Scraps Near Lantern": base_id + 1098, # ItemPickup422_17 Settlement_A_House_1 (X=98776.102 Y=80881.133 Z=9286.782)
-    "Junkyard Shed Scraps Along Path": base_id + 1099, # ItemPickup421_14 Settlement_A_House_1 (X=99198.508 Y=82057.820 Z=9248.227)
-    "Junkyard Shed Scraps Near Platform": base_id + 1100 # ItemPickup423_20 Settlement_A_House_1 (X=99208.617 Y=84383.125 Z=9257.880)
+    "Junkyard Shed Scraps - On Platform": base_id + 1093, # ItemPickup424_23 Settlement_A_House_1 (X=98303.992 Y=84476.016 Z=9376.540)
+    "Junkyard Shed Scraps - Sheltered 1": base_id + 1094, # ItemPickup419_8 Settlement_A_House_1 (X=98174.680 Y=84067.383 Z=9249.197)
+    "Junkyard Shed Scraps - Sheltered 2": base_id + 1095, # ItemPickup418_5 Settlement_A_House_1 (X=97948.977 Y=83354.656 Z=9339.430)
+    "Junkyard Shed Scraps - Sheltered 3": base_id + 1096, # ItemPickup417_2 Settlement_A_House_1 (X=98208.391 Y=83088.047 Z=9273.632)
+    "Junkyard Shed Scraps - Behind Shelter": base_id + 1097, # ItemPickup420_11 Settlement_A_House_1 (X=97757.773 Y=82995.656 Z=9298.597)
+    "Junkyard Shed Scraps - Near Lantern": base_id + 1098, # ItemPickup422_17 Settlement_A_House_1 (X=98776.102 Y=80881.133 Z=9286.782)
+    "Junkyard Shed Scraps - Behind Shed": base_id + 1099, # ItemPickup421_14 Settlement_A_House_1 (X=99198.508 Y=82057.820 Z=9248.227)
+    "Junkyard Shed Scraps - Near Platform": base_id + 1100 # ItemPickup423_20 Settlement_A_House_1 (X=99208.617 Y=84383.125 Z=9257.880)
 }
 
 loc_military_base = {
     "Military Base Sgt Flint Mission End": base_id + 1101, # (dialog 2) -> bug_spray
-    "Military Base Scraps Along Bottom Path": base_id + 1102, # ItemPickup134_17 Bugspray_Main (X=105743.531 Y=83017.492 Z=9423.290)
-    "Military Base Scraps Along Top Path": base_id + 1103, # ItemPickup129_2 Bugspray_Main (X=108495.805 Y=81616.992 Z=9139.340)
-    "Military Base Scraps Atop Rocks": base_id + 1104, # ItemPickup135_20 Bugspray_Main (X=108709.219 Y=85981.016 Z=9650.472)
-    "Military Base Scraps Near Burning Workshop": base_id + 1105, # ItemPickup130_5 Bugspray_Main (X=112004.195 Y=83811.313 Z=8887.996)
-    "Military Base Scraps On Stairs": base_id + 1106, # ItemPickup131_8 Bugspray_Main (X=110904.867 Y=82024.781 Z=9581.007)
-    "Military Base Scraps Near Water Tank": base_id + 1107, # ItemPickup132_11 Bugspray_Main (X=112458.563 Y=81967.945 Z=9850.968)
-    "Military Base Scraps Behind Beams": base_id + 1108, # ItemPickup22_9 Bugspray_Details (X=112541.695 Y=81345.875 Z=9896.940)
-    "Military Base Scraps Atop Downhill Path": base_id + 1109, # ItemPickup133_14 Bugspray_Main (X=111943.391 Y=79970.016 Z=10025.820)
-    "Military Base Scraps Inside Burning Workshop": base_id + 1110, # ItemPickup24_8 Bugspray_Details (X=112074.063 Y=83533.398 Z=9008.831)
-    "Military Base Scraps Sheltered": base_id + 1111, # ItemPickup23_2 Bugspray_Details (X=110738.523 Y=85389.852 Z=9082.626)
-    "Military Base Scraps Between Gates": base_id + 1112, # ItemPickup136_23 Bugspray_Main (X=112962.594 Y=85872.922 Z=8638.805)
-    "Military Base Scraps Outside Path": base_id + 1113, # ItemPickup137_26 Bugspray_Main (X=116230.563 Y=84357.602 Z=8580.226)
+    "Military Base Scraps - On Entrance Path 1": base_id + 1102, # ItemPickup134_17 Bugspray_Main (X=105743.531 Y=83017.492 Z=9423.290)
+    "Military Base Scraps - On Entrance Path 2": base_id + 1103, # ItemPickup129_2 Bugspray_Main (X=108495.805 Y=81616.992 Z=9139.340)
+    "Military Base Scraps - On Rock Wall": base_id + 1104, # ItemPickup135_20 Bugspray_Main (X=108709.219 Y=85981.016 Z=9650.472)
+    "Military Base Scraps - Near Burning Workshop": base_id + 1105, # ItemPickup130_5 Bugspray_Main (X=112004.195 Y=83811.313 Z=8887.996)
+    "Military Base Scraps - On Stairs": base_id + 1106, # ItemPickup131_8 Bugspray_Main (X=110904.867 Y=82024.781 Z=9581.007)
+    "Military Base Scraps - Near Water Tank": base_id + 1107, # ItemPickup132_11 Bugspray_Main (X=112458.563 Y=81967.945 Z=9850.968)
+    "Military Base Scraps - Behind Beams": base_id + 1108, # ItemPickup22_9 Bugspray_Details (X=112541.695 Y=81345.875 Z=9896.940)
+    "Military Base Scraps - Top Of Downhill Path": base_id + 1109, # ItemPickup133_14 Bugspray_Main (X=111943.391 Y=79970.016 Z=10025.820)
+    "Military Base Scraps - Inside Burning Workshop": base_id + 1110, # ItemPickup24_8 Bugspray_Details (X=112074.063 Y=83533.398 Z=9008.831)
+    "Military Base Scraps - Sheltered": base_id + 1111, # ItemPickup23_2 Bugspray_Details (X=110738.523 Y=85389.852 Z=9082.626)
+    "Military Base Scraps - Between Back Gates": base_id + 1112, # ItemPickup136_23 Bugspray_Main (X=112962.594 Y=85872.922 Z=8638.805)
+    "Military Base Scraps - On Back Path": base_id + 1113, # ItemPickup137_26 Bugspray_Main (X=116230.563 Y=84357.602 Z=8580.226)
     "Military Base Orange Paint Can": base_id + 1114 # PaintCan_5 Bugspray_Details (X=111916.102 Y=83066.195 Z=9094.554)
 }
 
 loc_south_mine_outside = {
-    "South Mine Outside Scraps Along Main Rails": base_id + 1115, # ItemPickup20_1 Mine_1_OutsideMain (X=114794.375 Y=57211.855 Z=8523.348)
-    "South Mine Outside Scraps Near Minecarts": base_id + 1116, # ItemPickup15_2 Mine_1_OutsideDetails (X=112523.438 Y=57693.836 Z=8639.382)
-    "South Mine Outside Scraps On Rocks": base_id + 1117, # ItemPickup22_5 Mine_1_OutsideMain (X=112348.586 Y=59174.289 Z=8945.143)
-    "South Mine Outside Scraps Near Mine Door": base_id + 1118, # ItemPickup13_2 Mine_1_OutsideDetails (X=110989.156 Y=57840.090 Z=8700.936) \!/ Existing match 6
-    "South Mine Outside Scraps Inside Small Shelter": base_id + 1119, # ItemPickup16_1 Mine_1_OutsideDetails (X=110487.281 Y=54528.535 Z=8589.910)
-    "South Mine Outside Scraps Between Barriers": base_id + 1120, # ItemPickup18_1 Mine_1_OutsideMain (X=113727.297 Y=54791.703 Z=8424.460)
-    "South Mine Outside Scraps Inside Rest Shelter": base_id + 1121 # ItemPickup17_3 Mine_1_OutsideMain (X=113965.211 Y=53289.539 Z=8402.346)
+    "South Mine Outside Scraps - Near Main Rails": base_id + 1115, # ItemPickup20_1 Mine_1_OutsideMain (X=114794.375 Y=57211.855 Z=8523.348)
+    "South Mine Outside Scraps - Near Minecarts": base_id + 1116, # ItemPickup15_2 Mine_1_OutsideDetails (X=112523.438 Y=57693.836 Z=8639.382)
+    "South Mine Outside Scraps - On Rocks": base_id + 1117, # ItemPickup22_5 Mine_1_OutsideMain (X=112348.586 Y=59174.289 Z=8945.143)
+    "South Mine Outside Scraps - Near Mine Door": base_id + 1118, # ItemPickup13_2 Mine_1_OutsideDetails (X=110989.156 Y=57840.090 Z=8700.936) \!/ Existing match 6
+    "South Mine Outside Scraps - Inside Small Shelter": base_id + 1119, # ItemPickup16_1 Mine_1_OutsideDetails (X=110487.281 Y=54528.535 Z=8589.910)
+    "South Mine Outside Scraps - Between Barriers": base_id + 1120, # ItemPickup18_1 Mine_1_OutsideMain (X=113727.297 Y=54791.703 Z=8424.460)
+    "South Mine Outside Scraps - Inside Rest Shelter": base_id + 1121 # ItemPickup17_3 Mine_1_OutsideMain (X=113965.211 Y=53289.539 Z=8402.346)
 }
 
 loc_south_mine_inside = {
-    "South Mine Inside Scraps Near Mine Door": base_id + 1122, # ItemPickup23_4 Mine_1_Interior_1 (X=108659.945 Y=58712.691 Z=8763.015)
-    "South Mine Inside Scraps In Dead End": base_id + 1123, # ItemPickup24_0 Mine_1_Interior_1 (X=104954.602 Y=61540.488 Z=7876.374)
-    "South Mine Inside Scraps Along Tunnel": base_id + 1124, # ItemPickup26_0 Mine_1_Interior_1 (X=104436.758 Y=64091.211 Z=7872.767)
-    "South Mine Inside Scraps Near Barricaded Gates": base_id + 1125, # ItemPickup290_20 Mine_1_Interior_2 (X=101356.625 Y=66110.906 Z=8034.738)
-    "South Mine Inside Scraps Near Table": base_id + 1126, # ItemPickup287_8 Mine_1_Interior_2 (X=96888.820 Y=64458.559 Z=7917.468)
-    "South Mine Inside Scraps Behind Crates": base_id + 1127, # ItemPickup289_14 Mine_1_Interior_2 (X=95863.180 Y=63252.902 Z=7847.054)
-    "South Mine Inside Scraps Near Egg": base_id + 1128, # ItemPickup288_11 Mine_1_Interior_2 (X=97337.219 Y=62921.438 Z=7884.393)
-    "South Mine Inside Scraps In Corner": base_id + 1129, # ItemPickup285_2 Mine_1_Interior_2 (X=96689.203 Y=61880.895 Z=7806.810)
-    "South Mine Inside Scraps Near Beds": base_id + 1130, # ItemPickup286_5 Mine_1_Interior_2 (X=98403.227 Y=62812.531 Z=7880.947)
+    "South Mine Inside Scraps - Near Mine Door": base_id + 1122, # ItemPickup23_4 Mine_1_Interior_1 (X=108659.945 Y=58712.691 Z=8763.015)
+    "South Mine Inside Scraps - In Dead End": base_id + 1123, # ItemPickup24_0 Mine_1_Interior_1 (X=104954.602 Y=61540.488 Z=7876.374)
+    "South Mine Inside Scraps - In Main Tunnel": base_id + 1124, # ItemPickup26_0 Mine_1_Interior_1 (X=104436.758 Y=64091.211 Z=7872.767)
+    "South Mine Inside Scraps - Near Sealed Gates": base_id + 1125, # ItemPickup290_20 Mine_1_Interior_2 (X=101356.625 Y=66110.906 Z=8034.738)
+    "South Mine Inside Scraps - Near Table": base_id + 1126, # ItemPickup287_8 Mine_1_Interior_2 (X=96888.820 Y=64458.559 Z=7917.468)
+    "South Mine Inside Scraps - Behind Crates": base_id + 1127, # ItemPickup289_14 Mine_1_Interior_2 (X=95863.180 Y=63252.902 Z=7847.054)
+    "South Mine Inside Scraps - Near Egg": base_id + 1128, # ItemPickup288_11 Mine_1_Interior_2 (X=97337.219 Y=62921.438 Z=7884.393)
+    "South Mine Inside Scraps - In Corner": base_id + 1129, # ItemPickup285_2 Mine_1_Interior_2 (X=96689.203 Y=61880.895 Z=7806.810)
+    "South Mine Inside Scraps - Near Beds": base_id + 1130, # ItemPickup286_5 Mine_1_Interior_2 (X=98403.227 Y=62812.531 Z=7880.947)
     "South Mine Inside Green Egg": base_id + 1131, # ItemPickup14_2 Mine_1_Interior_2 (X=96753.219 Y=62909.504 Z=8030.018) \!/ Existing match 4
     "South Mine Inside Green Paint Can": base_id + 1132 # PaintCan_2 Mine_1_Interior_1 (X=108293.281 Y=64192.094 Z=7872.770) \!/ Existing match 5
 }
 
 loc_middle_station = {
     "Middle Station White Paint Can": base_id + 1133, # PaintCan_2 Station_Details1 (X=34554.141 Y=-7395.408 Z=11897.556) \!/ Existing match 5
-    "Middle Station Scraps Near Beams": base_id + 1134, # ItemPickup431_20 Station_BuildingDetails (X=37710.504 Y=-6462.562 Z=11356.691)
-    "Middle Station Scraps Path To House": base_id + 1135, # ItemPickup425_2 Station_BuildingDetails (X=37034.340 Y=-4923.256 Z=11348.328)
-    "Middle Station Scraps Near House": base_id + 1136, # ItemPickup427_8 Station_BuildingDetails (X=36689.164 Y=-3727.466 Z=11353.597)
-    "Middle Station Scraps Under House Roof": base_id + 1137, # ItemPickup426_5 Station_BuildingDetails (X=37207.629 Y=-3393.977 Z=11379.110)
-    "Middle Station Scraps Under House Lantern": base_id + 1138, # ItemPickup429_14 Station_BuildingDetails (X=37988.219 Y=-3365.906 Z=11350.225)
-    "Middle Station Scraps Behind House": base_id + 1139, # ItemPickup428_11 Station_BuildingDetails (X=36956.242 Y=-2746.948 Z=11353.506)
-    "Middle Station Scraps Down Stairs": base_id + 1140, # ItemPickup430_17 Station_BuildingDetails (X=36638.492 Y=-6410.017 Z=11353.546)
-    "Middle Station Scraps On Balcony": base_id + 1141, # ItemPickup433_26 Station_BuildingDetails (X=35931.168 Y=-7558.021 Z=11899.232)
-    "Middle Station Scraps Near Table": base_id + 1142, # ItemPickup434 Station_BuildingDetails (X=35636.855 Y=-7628.500 Z=11903.627)
-    "Middle Station Scraps Near Beds": base_id + 1143, # ItemPickup435 Station_BuildingDetails (X=34894.152 Y=-7537.087 Z=11903.627)
-    "Middle Station Scraps On Footbridge": base_id + 1144, # ItemPickup13_4 Station_BuildingDetails (X=33505.609 Y=-7742.843 Z=11898.971)
-    "Middle Station Scraps Near Railcar": base_id + 1145, # ItemPickup440_5 Station_Details1 (X=37394.004 Y=-8395.084 Z=11389.296)
-    "Middle Station Scraps Near Bench": base_id + 1146, # ItemPickup432_23 Station_BuildingDetails (X=36040.695 Y=-8068.016 Z=11456.609)
-    "Middle Station Scraps Behind Station": base_id + 1147, # ItemPickup16_4 Station_BuildingDetails (X=35360.320 Y=-8441.443 Z=11457.823)
-    "Middle Station Scraps On Rock Foundations": base_id + 1148, # ItemPickup439_2 Station_Details1 (X=36311.324 Y=-9563.938 Z=11468.039)
-    "Middle Station Scraps Half Sheltered": base_id + 1149, # ItemPickup442_11 Station_Details1 (X=33335.656 Y=-13872.785 Z=11189.906)
-    "Middle Station Scraps Sheltered": base_id + 1150, # ItemPickup441_8 Station_Details1 (X=33129.984 Y=-14073.978 Z=11189.906)
-    "Middle Station Scraps Inside Railcar Near Stool": base_id + 1151, # ItemPickup436_31 Station_BuildingDetails (X=33587.488 Y=-7828.651 Z=11529.446)
-    "Middle Station Scraps Inside Railcar Near Crate": base_id + 1152, # ItemPickup14_3 Station_BuildingDetails (X=34007.254 Y=-7749.381 Z=11533.760)
-    "Middle Station Scraps Along Rails": base_id + 1153, # ItemPickup443_14 Station_Details1 (X=31457.752 Y=-7120.744 Z=11421.197)
+    "Middle Station Scraps - Near Beams": base_id + 1134, # ItemPickup431_20 Station_BuildingDetails (X=37710.504 Y=-6462.562 Z=11356.691)
+    "Middle Station Scraps - Path To House": base_id + 1135, # ItemPickup425_2 Station_BuildingDetails (X=37034.340 Y=-4923.256 Z=11348.328)
+    "Middle Station Scraps - Near House": base_id + 1136, # ItemPickup427_8 Station_BuildingDetails (X=36689.164 Y=-3727.466 Z=11353.597)
+    "Middle Station Scraps - Under House Roof": base_id + 1137, # ItemPickup426_5 Station_BuildingDetails (X=37207.629 Y=-3393.977 Z=11379.110)
+    "Middle Station Scraps - Under House Lantern": base_id + 1138, # ItemPickup429_14 Station_BuildingDetails (X=37988.219 Y=-3365.906 Z=11350.225)
+    "Middle Station Scraps - Behind House": base_id + 1139, # ItemPickup428_11 Station_BuildingDetails (X=36956.242 Y=-2746.948 Z=11353.506)
+    "Middle Station Scraps - Foot Of Stairs": base_id + 1140, # ItemPickup430_17 Station_BuildingDetails (X=36638.492 Y=-6410.017 Z=11353.546)
+    "Middle Station Scraps - On Balcony": base_id + 1141, # ItemPickup433_26 Station_BuildingDetails (X=35931.168 Y=-7558.021 Z=11899.232)
+    "Middle Station Scraps - Near Table": base_id + 1142, # ItemPickup434 Station_BuildingDetails (X=35636.855 Y=-7628.500 Z=11903.627)
+    "Middle Station Scraps - Near Beds": base_id + 1143, # ItemPickup435 Station_BuildingDetails (X=34894.152 Y=-7537.087 Z=11903.627)
+    "Middle Station Scraps - On Footbridge": base_id + 1144, # ItemPickup13_4 Station_BuildingDetails (X=33505.609 Y=-7742.843 Z=11898.971)
+    "Middle Station Scraps - Near Railcar": base_id + 1145, # ItemPickup440_5 Station_Details1 (X=37394.004 Y=-8395.084 Z=11389.296)
+    "Middle Station Scraps - Near Bench": base_id + 1146, # ItemPickup432_23 Station_BuildingDetails (X=36040.695 Y=-8068.016 Z=11456.609)
+    "Middle Station Scraps - Behind Station (Blinky)": base_id + 1147, # ItemPickup16_4 Station_BuildingDetails (X=35360.320 Y=-8441.443 Z=11457.823)
+    "Middle Station Scraps - On Rock Foundations": base_id + 1148, # ItemPickup439_2 Station_Details1 (X=36311.324 Y=-9563.938 Z=11468.039)
+    "Middle Station Scraps - Sheltered 1": base_id + 1149, # ItemPickup442_11 Station_Details1 (X=33335.656 Y=-13872.785 Z=11189.906)
+    "Middle Station Scraps - Sheltered 2": base_id + 1150, # ItemPickup441_8 Station_Details1 (X=33129.984 Y=-14073.978 Z=11189.906)
+    "Middle Station Scraps - Inside Railcar Near Stool": base_id + 1151, # ItemPickup436_31 Station_BuildingDetails (X=33587.488 Y=-7828.651 Z=11529.446)
+    "Middle Station Scraps - Inside Railcar Near Crate": base_id + 1152, # ItemPickup14_3 Station_BuildingDetails (X=34007.254 Y=-7749.381 Z=11533.760)
+    "Middle Station Scraps - Near Rails": base_id + 1153, # ItemPickup443_14 Station_Details1 (X=31457.752 Y=-7120.744 Z=11421.197)
     "Middle Station Theodore Mission End": base_id + 1154 # (dialog 2) -> 35_scraps_reward
     # "Middle Station Scraps Glitch 1" ItemPickup437_34 (X=34217.613 Y=-9481.271 Z=11505.686) /!\ Glitched scrap
     # "Middle Station Scraps Glitch 2" ItemPickup438_37 (X=36101.633 Y=-10459.024 Z=11385.937) /!\ Glitched scrap
 }
 
 loc_canyon = {
-    "Canyon Scraps Along Rails": base_id + 1155, # ItemPickup156_47 Canyon_Main (X=29432.162 Y=-3164.300 Z=11540.294)
-    "Canyon Scraps Under Unlit Lantern": base_id + 1156, # ItemPickup155_44 Canyon_Main (X=26331.086 Y=3036.740 Z=11701.688)
-    "Canyon Scraps Inside Overturned Railcar": base_id + 1157, # ItemPickup154_41 Canyon_Main (X=22688.129 Y=3906.730 Z=12249.182)
-    "Canyon Scraps Near Lonely Tent": base_id + 1158, # ItemPickup147_20 Canyon_Main (X=20546.193 Y=4371.471 Z=12128.874)
-    "Canyon Scraps Behind Railcar": base_id + 1159, # ItemPickup148_23 Canyon_Main (X=20006.584 Y=4928.478 Z=12174.837)
-    "Canyon Scraps Near Twin Tents": base_id + 1160, # ItemPickup146_17 Canyon_Main (X=19251.633 Y=3798.014 Z=12170.390)
-    "Canyon Scraps Near Shelter": base_id + 1161, # ItemPickup149_26 Canyon_Main (X=18302.678 Y=7323.849 Z=12595.085)
-    "Canyon Scraps Under Bridge": base_id + 1162, # ItemPickup150_29 Canyon_Main (X=19019.563 Y=8172.146 Z=12640.462)
-    "Canyon Scraps South Between Rocks": base_id + 1163, # ItemPickup142_5 Canyon_Main (X=18001.689 Y=11138.320 Z=13035.360)
-    "Canyon Scraps Bridge Left": base_id + 1164, # ItemPickup143_8 Canyon_Main (X=16381.525 Y=7191.394 Z=13682.453)
-    "Canyon Scraps Bridge Middle": base_id + 1165, # ItemPickup144_11 Canyon_Main (X=18294.928 Y=7870.372 Z=14350.015)
-    "Canyon Scraps Bridge Right": base_id + 1166, # ItemPickup31_2 CanyonCamp_Details (X=20730.520 Y=8032.158 Z=14439.826)
-    "Canyon Scraps East Top Mountain": base_id + 1167, # ItemPickup145_14 Canyon_Main (X=24752.658 Y=7959.624 Z=14363.087)
-    "Canyon Scraps South Top Mountain": base_id + 1168, # ItemPickup141_2 Canyon_Main (X=20181.992 Y=13816.017 Z=14897.407)
-    "Canyon Scraps Above Overturned Railcar": base_id + 1169, # ItemPickup151_32 Canyon_Main (X=23172.160 Y=2842.120 Z=12954.566)
-    "Canyon Scraps East On Lonely Rocks": base_id + 1170, # ItemPickup152_35 Canyon_Main (X=22307.621 Y=-1180.840 Z=12451.548)
-    "Canyon Scraps North On Lonely Rocks": base_id + 1171, # ItemPickup153_38 Canyon_Main (X=28473.596 Y=6741.842 Z=13314.166)
+    "Canyon Scraps - Entry Near Rails": base_id + 1155, # ItemPickup156_47 Canyon_Main (X=29432.162 Y=-3164.300 Z=11540.294)
+    "Canyon Scraps - Entry Under Unlit Lantern": base_id + 1156, # ItemPickup155_44 Canyon_Main (X=26331.086 Y=3036.740 Z=11701.688)
+    "Canyon Scraps - Middle Inside Overturned Railcar": base_id + 1157, # ItemPickup154_41 Canyon_Main (X=22688.129 Y=3906.730 Z=12249.182)
+    "Canyon Scraps - Middle Near Lonely Tent": base_id + 1158, # ItemPickup147_20 Canyon_Main (X=20546.193 Y=4371.471 Z=12128.874)
+    "Canyon Scraps - Middle Behind Railcar": base_id + 1159, # ItemPickup148_23 Canyon_Main (X=20006.584 Y=4928.478 Z=12174.837)
+    "Canyon Scraps - Middle Near Twin Tents": base_id + 1160, # ItemPickup146_17 Canyon_Main (X=19251.633 Y=3798.014 Z=12170.390)
+    "Canyon Scraps - Middle Under Bridge 1": base_id + 1161, # ItemPickup149_26 Canyon_Main (X=18302.678 Y=7323.849 Z=12595.085)
+    "Canyon Scraps - Middle Under Bridge 2": base_id + 1162, # ItemPickup150_29 Canyon_Main (X=19019.563 Y=8172.146 Z=12640.462)
+    "Canyon Scraps - South Between Rocks": base_id + 1163, # ItemPickup142_5 Canyon_Main (X=18001.689 Y=11138.320 Z=13035.360)
+    "Canyon Scraps - Bridge Top 1": base_id + 1164, # ItemPickup143_8 Canyon_Main (X=16381.525 Y=7191.394 Z=13682.453)
+    "Canyon Scraps - Bridge Top 2": base_id + 1165, # ItemPickup144_11 Canyon_Main (X=18294.928 Y=7870.372 Z=14350.015)
+    "Canyon Scraps - Bridge Top 3": base_id + 1166, # ItemPickup31_2 CanyonCamp_Details (X=20730.520 Y=8032.158 Z=14439.826)
+    "Canyon Scraps - East Top Mountain": base_id + 1167, # ItemPickup145_14 Canyon_Main (X=24752.658 Y=7959.624 Z=14363.087)
+    "Canyon Scraps - South Top Mountain": base_id + 1168, # ItemPickup141_2 Canyon_Main (X=20181.992 Y=13816.017 Z=14897.407)
+    "Canyon Scraps - North Above Overturned Railcar": base_id + 1169, # ItemPickup151_32 Canyon_Main (X=23172.160 Y=2842.120 Z=12954.566)
+    "Canyon Scraps - East On Lonely Rocks": base_id + 1170, # ItemPickup152_35 Canyon_Main (X=22307.621 Y=-1180.840 Z=12451.548)
+    "Canyon Scraps - North On Lonely Rocks": base_id + 1171, # ItemPickup153_38 Canyon_Main (X=28473.596 Y=6741.842 Z=13314.166)
     "Canyon Blue Box": base_id + 1172 # Canyon_BlueBoxPickup CanyonCamp_Details (X=20338.525 Y=4989.111 Z=12323.649)
 }
 
 loc_watchtower = {
-    "Watchtower Scraps Along South Path": base_id + 1173, # ItemPickup373_13 Secret2_WatchTowerDetails (X=32760.389 Y=-28814.084 Z=10997.447)
-    "Watchtower Scraps Between Tents": base_id + 1174, # ItemPickup22_6 Secret2_WatchTowerDetails (X=32801.668 Y=-31660.041 Z=10643.390)
-    "Watchtower Scraps On Rocks": base_id + 1175, # ItemPickup372_10 Secret2_WatchTowerDetails (X=31018.063 Y=-33375.313 Z=11100.126)
-    "Watchtower Scraps Along North Path": base_id + 1176, # ItemPickup22_16 Secret2_WatchTowerDetails (X=33308.215 Y=-35928.578 Z=10614.347)
-    "Watchtower Scraps Behind Right Beams": base_id + 1177, # ItemPickup22_2 Secret2_WatchTowerDetails (X=34304.262 Y=-33446.063 Z=10674.936)
-    "Watchtower Scraps Near Left Beams": base_id + 1178, # ItemPickup370_2 Secret2_WatchTowerDetails (X=32869.453 Y=-33184.094 Z=10612.040)
-    "Watchtower Scraps In Stairs": base_id + 1179, # ItemPickup374_16 Secret2_WatchTowerDetails (X=33210.707 Y=-32097.611 Z=11211.031)
-    "Watchtower Scraps Near Chest": base_id + 1180, # ItemPickup22_10 Secret2_WatchTowerDetails (X=33246.262 Y=-32046.697 Z=11851.025)
-    "Watchtower Scraps Under Schedule notes": base_id + 1181, # ItemPickup22_8 Secret2_WatchTowerDetails (X=33553.156 Y=-31810.645 Z=11849.521)
-    "Watchtower Scraps Along West Path": base_id + 1182, # ItemPickup371_7 Secret2_WatchTowerDetails (X=36151.621 Y=-31791.633 Z=11093.785)
+    "Watchtower Scraps - On South Path": base_id + 1173, # ItemPickup373_13 Secret2_WatchTowerDetails (X=32760.389 Y=-28814.084 Z=10997.447)
+    "Watchtower Scraps - Between Tents": base_id + 1174, # ItemPickup22_6 Secret2_WatchTowerDetails (X=32801.668 Y=-31660.041 Z=10643.390)
+    "Watchtower Scraps - On Rocks": base_id + 1175, # ItemPickup372_10 Secret2_WatchTowerDetails (X=31018.063 Y=-33375.313 Z=11100.126)
+    "Watchtower Scraps - On North Path": base_id + 1176, # ItemPickup22_16 Secret2_WatchTowerDetails (X=33308.215 Y=-35928.578 Z=10614.347)
+    "Watchtower Scraps - Near Beams 1": base_id + 1177, # ItemPickup22_2 Secret2_WatchTowerDetails (X=34304.262 Y=-33446.063 Z=10674.936)
+    "Watchtower Scraps - Near Beams 2": base_id + 1178, # ItemPickup370_2 Secret2_WatchTowerDetails (X=32869.453 Y=-33184.094 Z=10612.040)
+    "Watchtower Scraps - On Stairs": base_id + 1179, # ItemPickup374_16 Secret2_WatchTowerDetails (X=33210.707 Y=-32097.611 Z=11211.031)
+    "Watchtower Scraps - Near Chest": base_id + 1180, # ItemPickup22_10 Secret2_WatchTowerDetails (X=33246.262 Y=-32046.697 Z=11851.025)
+    "Watchtower Scraps - Under Schedule notes": base_id + 1181, # ItemPickup22_8 Secret2_WatchTowerDetails (X=33553.156 Y=-31810.645 Z=11849.521)
+    "Watchtower Scraps - On West Path": base_id + 1182, # ItemPickup371_7 Secret2_WatchTowerDetails (X=36151.621 Y=-31791.633 Z=11093.785)
     "Watchtower Pink Paint Can": base_id + 1183 # PaintCan_2 Secret2_WatchTowerDetails (X=33069.133 Y=-32168.045 Z=11859.582) \!/ Existing match 5
 }
 
 loc_boulder_field = {
-    "Boulder Field Page Drawing North": base_id + 1184, # Pages_Drawing1 Pages_Environment_Details (X=46232.703 Y=-37052.875 Z=9531.116)
-    "Boulder Field Page Drawing Northwest": base_id + 1185, # Pages_Drawing2 Pages_Environment_Details (X=51854.980 Y=-31332.070 Z=9804.927)
-    "Boulder Field Page Drawing Middle": base_id + 1186, # Pages_Drawing3 Pages_Environment_Details (X=47595.750 Y=-29931.740 Z=9308.014)
-    "Boulder Field Page Drawing West": base_id + 1187, # Pages_Drawing4 Pages_Environment_Details (X=43819.680 Y=-30378.770 Z=9706.599)
-    "Boulder Field Page Drawing Southeast": base_id + 1188, # Pages_Drawing5 Pages_Environment_Details (X=47494.746 Y=-20884.781 Z=9812.398)
-    "Boulder Field Page Drawing Southwest": base_id + 1189, # Pages_Drawing6 Pages_Environment_Details (X=43725.148 Y=-21952.570 Z=9744.351)
-    "Boulder Field Page Drawing South": base_id + 1190, # Pages_Drawing7 Pages_Environment_Details (X=44752.465 Y=-16362.510 Z=10147.004)
-    "Boulder Field Page Drawing East": base_id + 1191, # Pages_Drawing8 Pages_Environment_Details (X=50496.270 Y=-26090.533 Z=9835.365)
-    "Boulder Field Scraps Northwest On Rocks": base_id + 1192, # ItemPickup293_8 Pages_Environment_Main (X=41385.406 Y=-32281.871 Z=10240.781)
-    "Boulder Field Scraps North Behind Lantern": base_id + 1193, # ItemPickup987321 Pages_House_Main (X=46654.969 Y=-38859.254 Z=9920.861)
-    "Boulder Field Scraps North Near Barrier": base_id + 1194, # ItemPickup516121 Pages_House_Main (X=44765.836 Y=-41675.559 Z=9938.179)
-    "Boulder Field Scraps Northwest Near Crates": base_id + 1195, # ItemPickup291_2 Pages_Environment_Main (X=50088.270 Y=-30669.107 Z=9267.371)
-    "Boulder Field Scraps Middle Near Drawing": base_id + 1196, # ItemPickup303_38 Pages_Environment_Main (X=48014.609 Y=-28971.115 Z=9199.659)
-    "Boulder Field Scraps West Near Drawing": base_id + 1197, # ItemPickup302_35 Pages_Environment_Main (X=50190.266 Y=-26243.977 Z=9648.289)
-    "Boulder Field Scraps Middle Under Rocks": base_id + 1198, # ItemPickup305_44 Pages_Environment_Main (X=47802.246 Y=-22594.684 Z=9631.879)
-    "Boulder Field Scraps South Between Rocks": base_id + 1199, # ItemPickup294_11 Pages_Environment_Main (X=44345.996 Y=-23408.535 Z=9659.643)
-    "Boulder Field Scraps Southwest Lonely": base_id + 1200, # ItemPickup295_14 Pages_Environment_Main (X=41620.590 Y=-22982.641 Z=9720.177)
-    "Boulder Field Scraps South Near Crates": base_id + 1201, # ItemPickup300_29 Pages_Environment_Main (X=52003.172 Y=-19163.049 Z=9925.105)
-    "Boulder Field Scraps Southeast Hill": base_id + 1202, # ItemPickup301_32 Pages_Environment_Main (X=51422.176 Y=-22319.322 Z=10663.813)
-    "Boulder Field Scraps South Hill Atop": base_id + 1203, # ItemPickup296_17 Pages_Environment_Main (X=43527.176 Y=-17952.570 Z=10812.458)
-    "Boulder Field Scraps South Near Drawing": base_id + 1204, # ItemPickup297_20 Pages_Environment_Main (X=45241.871 Y=-15847.636 Z=9952.198)
-    "Boulder Field Scraps South Hill Between Trees": base_id + 1205, # ItemPickup298_23 Pages_Environment_Main (X=46238.027 Y=-18407.420 Z=10199.825)
-    "Boulder Field Scraps South Along Path": base_id + 1206, # ItemPickup299_26 Pages_Environment_Main (X=49835.617 Y=-17379.959 Z=9810.836)
-    "Boulder Field Scraps North Hill": base_id + 1207, # ItemPickup306_47 Pages_Environment_Main (X=45144.594 Y=-33817.090 Z=10136.658)
-    "Boulder Field Scraps North Behind Rock": base_id + 1208, # ItemPickup292_5 Pages_Environment_Main (X=44336.184 Y=-37162.367 Z=9789.548)
-    "Boulder Field Scraps Middle Hill": base_id + 1209 # ItemPickup304_41 Pages_Environment_Main (X=44490.160 Y=-26442.754 Z=9974.022)
+    "Boulder Field Page Drawing - North": base_id + 1184, # Pages_Drawing1 Pages_Environment_Details (X=46232.703 Y=-37052.875 Z=9531.116)
+    "Boulder Field Page Drawing - Northwest": base_id + 1185, # Pages_Drawing2 Pages_Environment_Details (X=51854.980 Y=-31332.070 Z=9804.927)
+    "Boulder Field Page Drawing - Middle": base_id + 1186, # Pages_Drawing3 Pages_Environment_Details (X=47595.750 Y=-29931.740 Z=9308.014)
+    "Boulder Field Page Drawing - West": base_id + 1187, # Pages_Drawing4 Pages_Environment_Details (X=43819.680 Y=-30378.770 Z=9706.599)
+    "Boulder Field Page Drawing - Southeast": base_id + 1188, # Pages_Drawing5 Pages_Environment_Details (X=47494.746 Y=-20884.781 Z=9812.398)
+    "Boulder Field Page Drawing - Southwest": base_id + 1189, # Pages_Drawing6 Pages_Environment_Details (X=43725.148 Y=-21952.570 Z=9744.351)
+    "Boulder Field Page Drawing - South": base_id + 1190, # Pages_Drawing7 Pages_Environment_Details (X=44752.465 Y=-16362.510 Z=10147.004)
+    "Boulder Field Page Drawing - East": base_id + 1191, # Pages_Drawing8 Pages_Environment_Details (X=50496.270 Y=-26090.533 Z=9835.365)
+    "Boulder Field Scraps - Northwest On Rocks": base_id + 1192, # ItemPickup293_8 Pages_Environment_Main (X=41385.406 Y=-32281.871 Z=10240.781)
+    "Boulder Field Scraps - North Behind Lantern": base_id + 1193, # ItemPickup987321 Pages_House_Main (X=46654.969 Y=-38859.254 Z=9920.861)
+    "Boulder Field Scraps - North Near Barrier": base_id + 1194, # ItemPickup516121 Pages_House_Main (X=44765.836 Y=-41675.559 Z=9938.179)
+    "Boulder Field Scraps - Northwest Near Crates": base_id + 1195, # ItemPickup291_2 Pages_Environment_Main (X=50088.270 Y=-30669.107 Z=9267.371)
+    "Boulder Field Scraps - Middle Near Drawing": base_id + 1196, # ItemPickup303_38 Pages_Environment_Main (X=48014.609 Y=-28971.115 Z=9199.659)
+    "Boulder Field Scraps - West Near Drawing": base_id + 1197, # ItemPickup302_35 Pages_Environment_Main (X=50190.266 Y=-26243.977 Z=9648.289)
+    "Boulder Field Scraps - Middle Under Rocks": base_id + 1198, # ItemPickup305_44 Pages_Environment_Main (X=47802.246 Y=-22594.684 Z=9631.879)
+    "Boulder Field Scraps - South Between Rocks": base_id + 1199, # ItemPickup294_11 Pages_Environment_Main (X=44345.996 Y=-23408.535 Z=9659.643)
+    "Boulder Field Scraps - Southwest Lonely": base_id + 1200, # ItemPickup295_14 Pages_Environment_Main (X=41620.590 Y=-22982.641 Z=9720.177)
+    "Boulder Field Scraps - South Near Crates": base_id + 1201, # ItemPickup300_29 Pages_Environment_Main (X=52003.172 Y=-19163.049 Z=9925.105)
+    "Boulder Field Scraps - Southeast Hill": base_id + 1202, # ItemPickup301_32 Pages_Environment_Main (X=51422.176 Y=-22319.322 Z=10663.813)
+    "Boulder Field Scraps - South Hill Atop": base_id + 1203, # ItemPickup296_17 Pages_Environment_Main (X=43527.176 Y=-17952.570 Z=10812.458)
+    "Boulder Field Scraps - South Near Drawing": base_id + 1204, # ItemPickup297_20 Pages_Environment_Main (X=45241.871 Y=-15847.636 Z=9952.198)
+    "Boulder Field Scraps - South Hill Between Trees": base_id + 1205, # ItemPickup298_23 Pages_Environment_Main (X=46238.027 Y=-18407.420 Z=10199.825)
+    "Boulder Field Scraps - South On Path": base_id + 1206, # ItemPickup299_26 Pages_Environment_Main (X=49835.617 Y=-17379.959 Z=9810.836)
+    "Boulder Field Scraps - North Hill": base_id + 1207, # ItemPickup306_47 Pages_Environment_Main (X=45144.594 Y=-33817.090 Z=10136.658)
+    "Boulder Field Scraps - North Behind Rock": base_id + 1208, # ItemPickup292_5 Pages_Environment_Main (X=44336.184 Y=-37162.367 Z=9789.548)
+    "Boulder Field Scraps - Middle Hill": base_id + 1209 # ItemPickup304_41 Pages_Environment_Main (X=44490.160 Y=-26442.754 Z=9974.022)
 }
 
 loc_haunted_house = {
     "Haunted House Sasha Mission End": base_id + 1210, # (dialog 2) -> 40_scraps_reward
-    "Haunted House Scraps Behind House": base_id + 1211, # ItemPickup1309876 Pages_House_Main (X=42900.188 Y=-43760.617 Z=9900.531)
-    "Haunted House Scraps Under House Roof": base_id + 1212, # ItemPickup22213 Pages_House_Main (X=43608.078 Y=-44642.434 Z=9922.888)
-    "Haunted House Scraps Near Crates": base_id + 1213, # ItemPickup5423189 Pages_House_Main (X=43992.387 Y=-44259.336 Z=9877.623)
-    "Haunted House Scraps Sheltered": base_id + 1214, # ItemPickup1312312 Pages_House_Main (X=43340.012 Y=-45362.617 Z=9882.796)
-    "Haunted House Scraps Bridge": base_id + 1215, # ItemPickup1596 Pages_House_Main (X=45105.383 Y=-45980.879 Z=9854.796)
-    "Haunted House Scraps Under Bridge": base_id + 1216 # ItemPickup8624 Pages_House_Main (X=45888.406 Y=-46050.246 Z=9555.326)
+    "Haunted House Scraps - Behind House": base_id + 1211, # ItemPickup1309876 Pages_House_Main (X=42900.188 Y=-43760.617 Z=9900.531)
+    "Haunted House Scraps - Under House Roof": base_id + 1212, # ItemPickup22213 Pages_House_Main (X=43608.078 Y=-44642.434 Z=9922.888)
+    "Haunted House Scraps - Near Crates": base_id + 1213, # ItemPickup5423189 Pages_House_Main (X=43992.387 Y=-44259.336 Z=9877.623)
+    "Haunted House Scraps - Sheltered": base_id + 1214, # ItemPickup1312312 Pages_House_Main (X=43340.012 Y=-45362.617 Z=9882.796)
+    "Haunted House Scraps - On Bridge": base_id + 1215, # ItemPickup1596 Pages_House_Main (X=45105.383 Y=-45980.879 Z=9854.796)
+    "Haunted House Scraps - Under Bridge": base_id + 1216 # ItemPickup8624 Pages_House_Main (X=45888.406 Y=-46050.246 Z=9555.326)
 }
 
 loc_santiago_house = {
-    "Santiago House Scraps On Shrine": base_id + 1217, # ItemPickup342_19 PortNPCHouse_Details (X=37271.445 Y=-46075.598 Z=10648.827)
-    "Santiago House Scraps Near Shrine": base_id + 1218, # ItemPickup37_5 PortNPCHouse_Details (X=38330.512 Y=-47184.668 Z=10387.618)
-    "Santiago House Scraps Near Crates Outside": base_id + 1219, # ItemPickup337_2 PortNPCHouse_Details (X=35720.422 Y=-49536.328 Z=10098.503)
-    "Santiago House Scraps Near House": base_id + 1220, # ItemPickup344_25 PortNPCHouse_Details (X=35466.285 Y=-50363.078 Z=10098.504)
-    "Santiago House Scraps Behind House": base_id + 1221, # ItemPickup338_7 PortNPCHouse_Details (X=34274.289 Y=-49947.578 Z=10098.501)
-    "Santiago House Scraps On Rocks": base_id + 1222, # ItemPickup341_16 PortNPCHouse_Details (X=35584.359 Y=-48195.172 Z=10323.833)
-    "Santiago House Scraps Near Table": base_id + 1223, # ItemPickup340_13 PortNPCHouse_Details (X=35019.766 Y=-49904.113 Z=10124.169)
-    "Santiago House Scraps Near Crates Inside": base_id + 1224, # ItemPickup339_10 PortNPCHouse_Details (X=35527.711 Y=-49614.801 Z=10124.016)
-    "Santiago House Scraps On Crates": base_id + 1225, # ItemPickup36_2 PortNPCHouse_Details (X=34471.707 Y=-49497.000 Z=10199.790)
-    "Santiago House Scraps Along Path": base_id + 1226, # ItemPickup343_22 PortNPCHouse_Details (X=37920.277 Y=-51867.754 Z=9847.511)
+    "Santiago House Scraps - On Shrine": base_id + 1217, # ItemPickup342_19 PortNPCHouse_Details (X=37271.445 Y=-46075.598 Z=10648.827)
+    "Santiago House Scraps - Near Shrine": base_id + 1218, # ItemPickup37_5 PortNPCHouse_Details (X=38330.512 Y=-47184.668 Z=10387.618)
+    "Santiago House Scraps - Near Crates Outside": base_id + 1219, # ItemPickup337_2 PortNPCHouse_Details (X=35720.422 Y=-49536.328 Z=10098.503)
+    "Santiago House Scraps - Behind Lit Lantern": base_id + 1220, # ItemPickup344_25 PortNPCHouse_Details (X=35466.285 Y=-50363.078 Z=10098.504)
+    "Santiago House Scraps - Behind House": base_id + 1221, # ItemPickup338_7 PortNPCHouse_Details (X=34274.289 Y=-49947.578 Z=10098.501)
+    "Santiago House Scraps - On Rocks": base_id + 1222, # ItemPickup341_16 PortNPCHouse_Details (X=35584.359 Y=-48195.172 Z=10323.833)
+    "Santiago House Scraps - Near Table": base_id + 1223, # ItemPickup340_13 PortNPCHouse_Details (X=35019.766 Y=-49904.113 Z=10124.169)
+    "Santiago House Scraps - Near Crates Inside": base_id + 1224, # ItemPickup339_10 PortNPCHouse_Details (X=35527.711 Y=-49614.801 Z=10124.016)
+    "Santiago House Scraps - On Crates Inside": base_id + 1225, # ItemPickup36_2 PortNPCHouse_Details (X=34471.707 Y=-49497.000 Z=10199.790)
+    "Santiago House Scraps - On Path": base_id + 1226, # ItemPickup343_22 PortNPCHouse_Details (X=37920.277 Y=-51867.754 Z=9847.511)
     "Santiago House Journal": base_id + 1227 # Port_Journal_Pickup PortNPCHouse_Details (X=34690.777 Y=-49788.359 Z=10214.353)
 }
 
 loc_port = {
     "Port Grey Paint Can": base_id + 1228, # PaintCan_13 Port_Details (X=74641.648 Y=-11320.948 Z=7551.767)
-    "Port Scraps Station Near Shelter": base_id + 1229, # ItemPickup334_32 Port_Main (X=67315.281 Y=-13828.055 Z=10101.339)
-    "Port Scraps Station Half Sheltered": base_id + 1230, # ItemPickup335_35 Port_Main (X=67679.508 Y=-14127.952 Z=10061.037)
-    "Port Scraps Station Near Tent": base_id + 1231, # ItemPickup336_38 Port_Main (X=67062.219 Y=-15626.003 Z=10065.956)
-    "Port Scraps Station Near Beams": base_id + 1232, # ItemPickup21_15 Port_Main (X=66140.914 Y=-16079.730 Z=10092.268)
-    "Port Scraps Station Near Note": base_id + 1233, # ItemPickup18_12 Port_Main (X=66824.719 Y=-14729.157 Z=10125.234)
-    "Port Scraps Path Summit": base_id + 1234, # ItemPickup333_29 Port_Main (X=69777.258 Y=-8371.526 Z=9391.735)
-    "Port Scraps Path Near Lit Lantern": base_id + 1235, # ItemPickup332_26 Port_Main (X=70339.695 Y=-11066.703 Z=8912.465)
-    "Port Scraps Path Under Unlit Lantern": base_id + 1236, # ItemPickup331_23 Port_Main (X=72729.508 Y=-7048.998 Z=8245.522)
-    "Port Scraps Path Near Tent": base_id + 1237, # ItemPickup329_17 Port_Main (X=75896.070 Y=-8705.214 Z=7514.992)
-    "Port Scraps Docks Near Shelter": base_id + 1238, # ItemPickup330_20 Port_Main (X=74264.211 Y=-10553.446 Z=7520.141)
-    "Port Scraps Docks Sheltered": base_id + 1239, # ItemPickup17_9 Port_Main (X=74328.117 Y=-11423.852 Z=7511.827)
-    "Port Scraps Docks Platform Start": base_id + 1240, # ItemPickup328_14 Port_Main (X=76753.164 Y=-10744.933 Z=7437.174)
-    "Port Scraps Docks Under Platform": base_id + 1241, # ItemPickup326_8 Port_Main (X=77330.414 Y=-11640.151 Z=7189.003)
-    "Port Scraps Docks Near Beds": base_id + 1242, # ItemPickup327_11 Port_Main (X=76403.516 Y=-12484.995 Z=7440.368)
-    "Port Scraps Docks Between Lanterns": base_id + 1243, # ItemPickup324_2 Port_Main (X=78651.977 Y=-12233.159 Z=7439.514)
-    "Port Scraps Docks Near Crates": base_id + 1244, # ItemPickup14_5 Port_Main (X=80336.297 Y=-12276.590 Z=7436.639) \!/ Existing match 7
-    "Port Scraps Docks On Gangway": base_id + 1245, # ItemPickup325_5 Port_Main (X=79845.086 Y=-13410.705 Z=7440.597)
-    "Port Scraps Docks Behind House": base_id + 1246, # ItemPickup13_2 Port_Main (X=76156.719 Y=-12816.718 Z=7439.269) \!/ Existing match 6
-    "Port Scraps Docks In Gangway Corner": base_id + 1247, # ItemPickup16 Port_Main (X=80754.914 Y=-14055.545 Z=7445.339) \!/ Existing match 2
+    "Port Scraps - Station Near Shelter": base_id + 1229, # ItemPickup334_32 Port_Main (X=67315.281 Y=-13828.055 Z=10101.339)
+    "Port Scraps - Station Sheltered": base_id + 1230, # ItemPickup335_35 Port_Main (X=67679.508 Y=-14127.952 Z=10061.037)
+    "Port Scraps - Station Near Tent": base_id + 1231, # ItemPickup336_38 Port_Main (X=67062.219 Y=-15626.003 Z=10065.956)
+    "Port Scraps - Station Near Beams": base_id + 1232, # ItemPickup21_15 Port_Main (X=66140.914 Y=-16079.730 Z=10092.268)
+    "Port Scraps - Station Near Note": base_id + 1233, # ItemPickup18_12 Port_Main (X=66824.719 Y=-14729.157 Z=10125.234)
+    "Port Scraps - Path Topmost": base_id + 1234, # ItemPickup333_29 Port_Main (X=69777.258 Y=-8371.526 Z=9391.735)
+    "Port Scraps - Path Near Lit Lantern": base_id + 1235, # ItemPickup332_26 Port_Main (X=70339.695 Y=-11066.703 Z=8912.465)
+    "Port Scraps - Path Under Unlit Lantern": base_id + 1236, # ItemPickup331_23 Port_Main (X=72729.508 Y=-7048.998 Z=8245.522)
+    "Port Scraps - Path Near Tent": base_id + 1237, # ItemPickup329_17 Port_Main (X=75896.070 Y=-8705.214 Z=7514.992)
+    "Port Scraps - Docks Near Shelter": base_id + 1238, # ItemPickup330_20 Port_Main (X=74264.211 Y=-10553.446 Z=7520.141)
+    "Port Scraps - Docks Sheltered": base_id + 1239, # ItemPickup17_9 Port_Main (X=74328.117 Y=-11423.852 Z=7511.827)
+    "Port Scraps - Docks Platform Start": base_id + 1240, # ItemPickup328_14 Port_Main (X=76753.164 Y=-10744.933 Z=7437.174)
+    "Port Scraps - Docks Under Platform": base_id + 1241, # ItemPickup326_8 Port_Main (X=77330.414 Y=-11640.151 Z=7189.003)
+    "Port Scraps - Docks Near Beds": base_id + 1242, # ItemPickup327_11 Port_Main (X=76403.516 Y=-12484.995 Z=7440.368)
+    "Port Scraps - Docks Between Lanterns": base_id + 1243, # ItemPickup324_2 Port_Main (X=78651.977 Y=-12233.159 Z=7439.514)
+    "Port Scraps - Docks Near Crates": base_id + 1244, # ItemPickup14_5 Port_Main (X=80336.297 Y=-12276.590 Z=7436.639) \!/ Existing match 7
+    "Port Scraps - Docks On Gangway": base_id + 1245, # ItemPickup325_5 Port_Main (X=79845.086 Y=-13410.705 Z=7440.597)
+    "Port Scraps - Docks Behind House": base_id + 1246, # ItemPickup13_2 Port_Main (X=76156.719 Y=-12816.718 Z=7439.269) \!/ Existing match 6
+    "Port Scraps - Docks In Gangway Corner": base_id + 1247, # ItemPickup16 Port_Main (X=80754.914 Y=-14055.545 Z=7445.339) \!/ Existing match 2
     "Port Santiago Mission End": base_id + 1248 # (dialog 3) -> 35_scraps_reward
 }
 
 loc_trench_house = {
-    "Trench House Scraps South Near Rails": base_id + 1249, # ItemPickup157_2 DeadWoodsEnvironment (X=76340.328 Y=-42886.191 Z=9567.521)
-    "Trench House Scraps South Near Crate": base_id + 1250, # ItemPickup158_5 DeadWoodsEnvironment (X=76013.594 Y=-44140.141 Z=9413.147)
-    "Trench House Scraps South Near Lantern": base_id + 1251, # ItemPickup159_11 DeadWoodsEnvironment (X=74408.320 Y=-45424.000 Z=9446.966)
-    "Trench House Scraps South Behind Rock": base_id + 1252, # ItemPickup69_14 Secret8_BasementHouseDetails (X=75196.344 Y=-48321.504 Z=9453.302)
-    "Trench House Scraps South Lonely": base_id + 1253, # ItemPickup160_14 DeadWoodsEnvironment (X=73467.273 Y=-48995.738 Z=9355.070)
-    "Trench House Scraps East Near Trench": base_id + 1254, # ItemPickup163_23 DeadWoodsEnvironment (X=76418.469 Y=-53239.539 Z=9276.892)
-    "Trench House Scraps West Near Shrine": base_id + 1255, # ItemPickup173_56 DeadWoodsEnvironment (X=70719.875 Y=-54290.117 Z=9357.084)
-    "Trench House Scraps West On Shrine": base_id + 1256, # ItemPickup165_29 DeadWoodsEnvironment (X=70075.938 Y=-53041.973 Z=9675.481)
-    "Trench House Scraps Middle Near Door": base_id + 1257, # ItemPickup162_20 DeadWoodsEnvironment (X=74745.711 Y=-52304.027 Z=9073.130)
-    "Trench House Scraps Middle Behind House": base_id + 1258, # ItemPickup68_11 Secret8_BasementHouseDetails (X=74519.750 Y=-53603.063 Z=9078.054)
-    "Trench House Scraps Middle Near Water Tank": base_id + 1259, # ItemPickup161_17 DeadWoodsEnvironment (X=73747.492 Y=-52589.906 Z=9104.748)
-    "Trench House Scraps Inside Under Table": base_id + 1260, # ItemPickup67_8 Secret8_BasementHouseDetails (X=74333.125 Y=-52847.961 Z=9124.773)
-    "Trench House Scraps Inside Above Stairs": base_id + 1261, # ItemPickup66_5 Secret8_BasementHouseDetails (X=74062.195 Y=-52663.043 Z=9122.827)
-    "Trench House Scraps Inside Behind Crates": base_id + 1262, # ItemPickup65_2 Secret8_BasementHouseDetails (X=74820.492 Y=-51350.051 Z=7956.387)
-    "Trench House Scraps Inside Near Tables": base_id + 1263, # ItemPickup164_26 DeadWoodsEnvironment (X=75286.289 Y=-51164.098 Z=7957.081)
-    "Trench House Scraps Northwest Under Lantern": base_id + 1264, # ItemPickup174_59 DeadWoodsEnvironment (X=68413.258 Y=-56872.816 Z=9349.443)
-    "Trench House Scraps Northwest Near Rock": base_id + 1265, # ItemPickup175_62 DeadWoodsEnvironment (X=67281.281 Y=-59201.371 Z=9254.457)
-    "Trench House Scraps Southwest Near Rock": base_id + 1266, # ItemPickup172_50 DeadWoodsEnvironment (X=69064.219 Y=-48796.352 Z=9770.164)
-    "Trench House Chest Scraps 1": base_id + 1267, # ItemPickup75123123 Secret8_BasementHouseDetails (X=75042.141 Y=-50830.891 Z=8005.156)
-    "Trench House Chest Scraps 2": base_id + 1268, # ItemPickup741123 Secret8_BasementHouseDetails (X=75066.516 Y=-50824.398 Z=7995.000)
-    "Trench House Chest Scraps 3": base_id + 1269, # ItemPickup729842 Secret8_BasementHouseDetails (X=75072.789 Y=-50818.441 Z=7986.979)
-    "Trench House Chest Scraps 4": base_id + 1270, # ItemPickup711123 Secret8_BasementHouseDetails (X=75038.656 Y=-50827.566 Z=7973.354)
-    "Trench House Chest Scraps 5": base_id + 1271, # ItemPickup73 Secret8_BasementHouseDetails (X=75060.406 Y=-50828.102 Z=7965.915)
-    "Trench House Chest Scraps 6": base_id + 1272 # ItemPickup7075674 Secret8_BasementHouseDetails (X=75056.648 Y=-50818.125 Z=7959.868)
+    "Trench House Scraps - South On Path 1": base_id + 1249, # ItemPickup157_2 DeadWoodsEnvironment (X=76340.328 Y=-42886.191 Z=9567.521)
+    "Trench House Scraps - South On Path 2": base_id + 1250, # ItemPickup158_5 DeadWoodsEnvironment (X=76013.594 Y=-44140.141 Z=9413.147)
+    "Trench House Scraps - South On Path 3": base_id + 1251, # ItemPickup159_11 DeadWoodsEnvironment (X=74408.320 Y=-45424.000 Z=9446.966)
+    "Trench House Scraps - South Behind Rock": base_id + 1252, # ItemPickup69_14 Secret8_BasementHouseDetails (X=75196.344 Y=-48321.504 Z=9453.302)
+    "Trench House Scraps - South Lonely": base_id + 1253, # ItemPickup160_14 DeadWoodsEnvironment (X=73467.273 Y=-48995.738 Z=9355.070)
+    "Trench House Scraps - East Near Trench": base_id + 1254, # ItemPickup163_23 DeadWoodsEnvironment (X=76418.469 Y=-53239.539 Z=9276.892)
+    "Trench House Scraps - West Near Shrine": base_id + 1255, # ItemPickup173_56 DeadWoodsEnvironment (X=70719.875 Y=-54290.117 Z=9357.084)
+    "Trench House Scraps - West On Shrine": base_id + 1256, # ItemPickup165_29 DeadWoodsEnvironment (X=70075.938 Y=-53041.973 Z=9675.481)
+    "Trench House Scraps - Middle Near Door": base_id + 1257, # ItemPickup162_20 DeadWoodsEnvironment (X=74745.711 Y=-52304.027 Z=9073.130)
+    "Trench House Scraps - Middle Behind House": base_id + 1258, # ItemPickup68_11 Secret8_BasementHouseDetails (X=74519.750 Y=-53603.063 Z=9078.054)
+    "Trench House Scraps - Middle Near Water Tank": base_id + 1259, # ItemPickup161_17 DeadWoodsEnvironment (X=73747.492 Y=-52589.906 Z=9104.748)
+    "Trench House Scraps - Inside Under Table": base_id + 1260, # ItemPickup67_8 Secret8_BasementHouseDetails (X=74333.125 Y=-52847.961 Z=9124.773)
+    "Trench House Scraps - Inside Above Stairs": base_id + 1261, # ItemPickup66_5 Secret8_BasementHouseDetails (X=74062.195 Y=-52663.043 Z=9122.827)
+    "Trench House Scraps - Inside Behind Crates": base_id + 1262, # ItemPickup65_2 Secret8_BasementHouseDetails (X=74820.492 Y=-51350.051 Z=7956.387)
+    "Trench House Scraps - Inside Near Tables": base_id + 1263, # ItemPickup164_26 DeadWoodsEnvironment (X=75286.289 Y=-51164.098 Z=7957.081)
+    "Trench House Scraps - Northwest Under Lantern": base_id + 1264, # ItemPickup174_59 DeadWoodsEnvironment (X=68413.258 Y=-56872.816 Z=9349.443)
+    "Trench House Scraps - Northwest Near Rock": base_id + 1265, # ItemPickup175_62 DeadWoodsEnvironment (X=67281.281 Y=-59201.371 Z=9254.457)
+    "Trench House Scraps - Southwest Near Rock": base_id + 1266, # ItemPickup172_50 DeadWoodsEnvironment (X=69064.219 Y=-48796.352 Z=9770.164)
+    "Trench House Chest Scraps - 1": base_id + 1267, # ItemPickup75123123 Secret8_BasementHouseDetails (X=75042.141 Y=-50830.891 Z=8005.156)
+    "Trench House Chest Scraps - 2": base_id + 1268, # ItemPickup741123 Secret8_BasementHouseDetails (X=75066.516 Y=-50824.398 Z=7995.000)
+    "Trench House Chest Scraps - 3": base_id + 1269, # ItemPickup729842 Secret8_BasementHouseDetails (X=75072.789 Y=-50818.441 Z=7986.979)
+    "Trench House Chest Scraps - 4": base_id + 1270, # ItemPickup711123 Secret8_BasementHouseDetails (X=75038.656 Y=-50827.566 Z=7973.354)
+    "Trench House Chest Scraps - 5": base_id + 1271, # ItemPickup73 Secret8_BasementHouseDetails (X=75060.406 Y=-50828.102 Z=7965.915)
+    "Trench House Chest Scraps - 6": base_id + 1272 # ItemPickup7075674 Secret8_BasementHouseDetails (X=75056.648 Y=-50818.125 Z=7959.868)
 }
 
 loc_doll_woods = {
-    "Doll Woods Scraps Middle Under Doll Tree": base_id + 1273, # ItemPickup78_2 DeadWoodsDolls (X=60126.234 Y=-49668.906 Z=9970.880)
-    "Doll Woods Scraps South Under Doll Tree": base_id + 1274, # ItemPickup166_32 DeadWoodsEnvironment (X=59854.066 Y=-47313.121 Z=10376.684)
-    "Doll Woods Scraps Middle Near Campfire": base_id + 1275, # ItemPickup80_8 DeadWoodsDolls (X=59130.613 Y=-49597.789 Z=9930.675)
-    "Doll Woods Scraps Middle Under High Rock": base_id + 1276, # ItemPickup168_38 DeadWoodsEnvironment (X=59785.973 Y=-51269.684 Z=10180.019)
-    "Doll Woods Scraps North Lonely": base_id + 1277, # ItemPickup81_11 DeadWoodsDolls (X=58226.449 Y=-52660.801 Z=10576.626)
-    "Doll Woods Scraps West Near High Rock": base_id + 1278, # ItemPickup167_35 DeadWoodsEnvironment (X=56243.176 Y=-49097.793 Z=10869.889)
-    "Doll Woods Scraps South Behind Tree": base_id + 1279, # ItemPickup79_5 DeadWoodsDolls (X=59481.672 Y=-45288.137 Z=10897.672)
-    "Doll Woods Scraps Southeast On Path Further": base_id + 1280, # ItemPickup170_44 DeadWoodsEnvironment (X=63807.668 Y=-44674.734 Z=10337.434)
-    "Doll Woods Scraps Southeast Behind Rock": base_id + 1281, # ItemPickup171_47 DeadWoodsEnvironment (X=68406.664 Y=-45721.813 Z=10021.356)
-    "Doll Woods Scraps Southeast On Path": base_id + 1282 # ItemPickup169_41 DeadWoodsEnvironment (X=62898.469 Y=-47565.703 Z=10744.431)
+    "Doll Woods Scraps - Middle Under Doll Tree": base_id + 1273, # ItemPickup78_2 DeadWoodsDolls (X=60126.234 Y=-49668.906 Z=9970.880)
+    "Doll Woods Scraps - South Under Doll Tree": base_id + 1274, # ItemPickup166_32 DeadWoodsEnvironment (X=59854.066 Y=-47313.121 Z=10376.684)
+    "Doll Woods Scraps - Middle Near Campfire": base_id + 1275, # ItemPickup80_8 DeadWoodsDolls (X=59130.613 Y=-49597.789 Z=9930.675)
+    "Doll Woods Scraps - Middle Under High Rock": base_id + 1276, # ItemPickup168_38 DeadWoodsEnvironment (X=59785.973 Y=-51269.684 Z=10180.019)
+    "Doll Woods Scraps - North Lonely": base_id + 1277, # ItemPickup81_11 DeadWoodsDolls (X=58226.449 Y=-52660.801 Z=10576.626)
+    "Doll Woods Scraps - West Near High Rock": base_id + 1278, # ItemPickup167_35 DeadWoodsEnvironment (X=56243.176 Y=-49097.793 Z=10869.889)
+    "Doll Woods Scraps - South Behind Tree": base_id + 1279, # ItemPickup79_5 DeadWoodsDolls (X=59481.672 Y=-45288.137 Z=10897.672)
+    "Doll Woods Scraps - Southeast On Path 1": base_id + 1280, # ItemPickup170_44 DeadWoodsEnvironment (X=63807.668 Y=-44674.734 Z=10337.434)
+    "Doll Woods Scraps - Southeast Behind Rock": base_id + 1281, # ItemPickup171_47 DeadWoodsEnvironment (X=68406.664 Y=-45721.813 Z=10021.356)
+    "Doll Woods Scraps - Southeast On Path 2": base_id + 1282 # ItemPickup169_41 DeadWoodsEnvironment (X=62898.469 Y=-47565.703 Z=10744.431)
 }
 
 loc_lost_stairs = {
-    "Lost Stairs Scraps Down Stairs": base_id + 1283, # ItemPickup29_2 Secret1_Stairs2 (X=47087.617 Y=-53476.547 Z=9103.093)
-    "Lost Stairs Scraps Near Stairs": base_id + 1284 # ItemPickup30_5 Secret1_Stairs2 (X=47162.238 Y=-55318.094 Z=9127.096)
+    "Lost Stairs Scraps - Stairs 1": base_id + 1283, # ItemPickup29_2 Secret1_Stairs2 (X=47087.617 Y=-53476.547 Z=9103.093)
+    "Lost Stairs Scraps - Stairs 2": base_id + 1284 # ItemPickup30_5 Secret1_Stairs2 (X=47162.238 Y=-55318.094 Z=9127.096)
 }
 
 loc_east_house = {
-    "East House Scraps South Path Near Rails": base_id + 1285, # ItemPickup409_5 Secret7_CliffHouseEnvironment (X=97507.664 Y=-53201.270 Z=9174.678)
-    "East House Scraps South Path Near First Lantern": base_id + 1286, # ItemPickup408_2 Secret7_CliffHouseEnvironment (X=98511.242 Y=-53899.414 Z=9016.314)
-    "East House Scraps South Path Near Second Lantern": base_id + 1287, # ItemPickup410_8 Secret7_CliffHouseEnvironment (X=100688.102 Y=-54197.578 Z=8919.432)
-    "East House Scraps South Path Near Third Lantern": base_id + 1288, # ItemPickup411_11 Secret7_CliffHouseEnvironment (X=103149.773 Y=-54659.980 Z=9002.535)
-    "East House Scraps South Path Fifth Lantern": base_id + 1289, # ItemPickup416_26 Secret7_CliffHouseEnvironment (X=107458.172 Y=-55683.793 Z=9429.004)
-    "East House Scraps Right Path Near Tent": base_id + 1290, # ItemPickup25_2 Secret7_CliffHouseEnvironment (X=109034.164 Y=-54360.703 Z=9495.910)
-    "East House Scraps Right Under Lantern": base_id + 1291, # ItemPickup413_17 Secret7_CliffHouseEnvironment (X=109245.148 Y=-55045.242 Z=9553.601)
-    "East House Scraps Summit Behind House": base_id + 1292, # ItemPickup414_20 Secret7_CliffHouseEnvironment (X=112556.445 Y=-55851.754 Z=10049.954)
-    "East House Scraps Summit Near Door": base_id + 1293, # ItemPickup415_23 Secret7_CliffHouseEnvironment (X=113131.469 Y=-56822.508 Z=10038.047)
-    "East House Scraps Summit Near Minecart": base_id + 1294, # ItemPickup2599786 Secret7_CliffHouseDetails (X=112279.828 Y=-56743.781 Z=10029.549)
-    "East House Scraps Inside Near Bed": base_id + 1295, # ItemPickup253321 Secret7_CliffHouseDetails (X=112445.508 Y=-56280.320 Z=10059.164)
-    "East House Scraps Inside First Floor": base_id + 1296, # ItemPickup2532323 Secret7_CliffHouseDetails (X=112562.211 Y=-56736.332 Z=10454.907)
-    "East House Scraps Left Path Near Lantern": base_id + 1297, # ItemPickup257655 Secret7_CliffHouseDetails (X=109313.320 Y=-58221.316 Z=9501.283)
-    "East House Scraps South Path On Shortcut": base_id + 1298, # ItemPickup412_14 Secret7_CliffHouseEnvironment (X=104077.805 Y=-55987.301 Z=9066.847)
-    "East House Chest Scraps 1": base_id + 1299, # ItemPickup76246 Secret7_CliffHouseDetails (X=112317.242 Y=-55820.805 Z=10497.336)
-    "East House Chest Scraps 2": base_id + 1300, # ItemPickup76245 Secret7_CliffHouseDetails (X=112326.086 Y=-55808.477 Z=10485.685)
-    "East House Chest Scraps 3": base_id + 1301, # ItemPickup85131 Secret7_CliffHouseDetails (X=112329.031 Y=-55828.438 Z=10478.107)
-    "East House Chest Scraps 4": base_id + 1302, # ItemPickup56124 Secret7_CliffHouseDetails (X=112315.922 Y=-55820.102 Z=10466.683)
-    "East House Chest Scraps 5": base_id + 1303 # ItemPickup25123123123 Secret7_CliffHouseDetails (X=112337.922 Y=-55821.848 Z=10456.924)
-}
-
-loc_rockets_testing_ground = {
-    "Rockets Testing Ground Timed Dynamite": base_id + 1304, # Boomer_DynamitePickup Boomer_RangeDetails (X=76476.609 Y=-65286.738 Z=8303.742)
-    "Rockets Testing Ground Scraps East Near Lantern": base_id + 1305, # ItemPickup105_14 Boomer_HouseDetails (X=88925.570 Y=-63375.051 Z=8563.354)
-    "Rockets Testing Ground Scraps East Near Barrier": base_id + 1306, # ItemPickup106_17 Boomer_HouseDetails (X=84234.016 Y=-64475.551 Z=8382.108)
-    "Rockets Testing Ground Scraps Middle Near Dirt Heap": base_id + 1307, # ItemPickup114_23 Boomer_RangeDetails (X=79349.438 Y=-64225.480 Z=8384.219)
-    "Rockets Testing Ground Scraps Middle Near Planks": base_id + 1308, # ItemPickup22_0 Boomer_RangeDetails (X=79831.070 Y=-65847.766 Z=8301.337)
-    "Rockets Testing Ground Scraps Middle Near Crate": base_id + 1309, # ItemPickup109_5 Boomer_RangeDetails (X=76526.500 Y=-65394.875 Z=8223.883)
-    "Rockets Testing Ground Scraps Middle Near Lantern": base_id + 1310, # ItemPickup108_2 Boomer_RangeDetails (X=76237.977 Y=-67087.414 Z=8361.979)
-    "Rockets Testing Ground Scraps North Under Explosive Sign": base_id + 1311, # ItemPickup115_26 Boomer_RangeDetails (X=78857.672 Y=-67802.227 Z=8257.150)
-    "Rockets Testing Ground Scraps Middle Near Rock": base_id + 1312, # ItemPickup110_8 Boomer_RangeDetails (X=74878.570 Y=-62927.297 Z=8749.549)
-    "Rockets Testing Ground Scraps Southwest Above Door": base_id + 1313, # ItemPickup111_11 Boomer_RangeDetails (X=74542.641 Y=-61301.082 Z=9493.931)
-    "Rockets Testing Ground Scraps South Above Bunker": base_id + 1314 # ItemPickup23_0 Boomer_RangeDetails (X=77020.859 Y=-62031.320 Z=8873.663)
-    # "Rockets Testing Ground Scraps Glitch 1" ItemPickup107_20 (X=81308.406 Y=-63482.320 Z=8533.338) /!\ Glitched scrap
-}
-
-loc_rockets_testing_bunker = {
-    "Rockets Testing Bunker Scraps Near Explosives": base_id + 1315, # ItemPickup113_20 Boomer_RangeDetails (X=77552.094 Y=-61144.559 Z=8523.195)
-    "Rockets Testing Bunker Scraps In Corner": base_id + 1316, # ItemPickup112_14 Boomer_RangeDetails (X=77670.227 Y=-62029.941 Z=8570.785)
-    "Rockets Testing Bunker Box of Rockets": base_id + 1317 # Boomer_RocketsPickup Boomer_RangeDetails (X=77330.086 Y=-61504.324 Z=8523.195)
+    "East House Scraps - South Path Near Rails": base_id + 1285, # ItemPickup409_5 Secret7_CliffHouseEnvironment (X=97507.664 Y=-53201.270 Z=9174.678)
+    "East House Scraps - South Path Near Lantern 1": base_id + 1286, # ItemPickup408_2 Secret7_CliffHouseEnvironment (X=98511.242 Y=-53899.414 Z=9016.314)
+    "East House Scraps - South Path Near Lantern 2": base_id + 1287, # ItemPickup410_8 Secret7_CliffHouseEnvironment (X=100688.102 Y=-54197.578 Z=8919.432)
+    "East House Scraps - South Path Near Lantern 3": base_id + 1288, # ItemPickup411_11 Secret7_CliffHouseEnvironment (X=103149.773 Y=-54659.980 Z=9002.535)
+    "East House Scraps - South Path Near Lantern 4": base_id + 1289, # ItemPickup416_26 Secret7_CliffHouseEnvironment (X=107458.172 Y=-55683.793 Z=9429.004)
+    "East House Scraps - Cliffside Path Near Tent": base_id + 1290, # ItemPickup25_2 Secret7_CliffHouseEnvironment (X=109034.164 Y=-54360.703 Z=9495.910)
+    "East House Scraps - Cliffside Path Under Lantern": base_id + 1291, # ItemPickup413_17 Secret7_CliffHouseEnvironment (X=109245.148 Y=-55045.242 Z=9553.601)
+    "East House Scraps - Clifftop Behind House": base_id + 1292, # ItemPickup414_20 Secret7_CliffHouseEnvironment (X=112556.445 Y=-55851.754 Z=10049.954)
+    "East House Scraps - Clifftop Near Door": base_id + 1293, # ItemPickup415_23 Secret7_CliffHouseEnvironment (X=113131.469 Y=-56822.508 Z=10038.047)
+    "East House Scraps - Clifftop Near Minecart": base_id + 1294, # ItemPickup2599786 Secret7_CliffHouseDetails (X=112279.828 Y=-56743.781 Z=10029.549)
+    "East House Scraps - Inside Near Bed": base_id + 1295, # ItemPickup253321 Secret7_CliffHouseDetails (X=112445.508 Y=-56280.320 Z=10059.164)
+    "East House Scraps - Inside First Floor": base_id + 1296, # ItemPickup2532323 Secret7_CliffHouseDetails (X=112562.211 Y=-56736.332 Z=10454.907)
+    "East House Scraps - Wooded Path Near Lantern": base_id + 1297, # ItemPickup257655 Secret7_CliffHouseDetails (X=109313.320 Y=-58221.316 Z=9501.283)
+    "East House Scraps - South Path On Shortcut Trails": base_id + 1298, # ItemPickup412_14 Secret7_CliffHouseEnvironment (X=104077.805 Y=-55987.301 Z=9066.847)
+    "East House Chest Scraps - 1": base_id + 1299, # ItemPickup76246 Secret7_CliffHouseDetails (X=112317.242 Y=-55820.805 Z=10497.336)
+    "East House Chest Scraps - 2": base_id + 1300, # ItemPickup76245 Secret7_CliffHouseDetails (X=112326.086 Y=-55808.477 Z=10485.685)
+    "East House Chest Scraps - 3": base_id + 1301, # ItemPickup85131 Secret7_CliffHouseDetails (X=112329.031 Y=-55828.438 Z=10478.107)
+    "East House Chest Scraps - 4": base_id + 1302, # ItemPickup56124 Secret7_CliffHouseDetails (X=112315.922 Y=-55820.102 Z=10466.683)
+    "East House Chest Scraps - 5": base_id + 1303 # ItemPickup25123123123 Secret7_CliffHouseDetails (X=112337.922 Y=-55821.848 Z=10456.924)
+}
+
+loc_rocket_grounds = {
+    "Rocket Grounds Timed Dynamite": base_id + 1304, # Boomer_DynamitePickup Boomer_RangeDetails (X=76476.609 Y=-65286.738 Z=8303.742)
+    "Rocket Grounds Scraps - East Near Lantern": base_id + 1305, # ItemPickup105_14 Boomer_HouseDetails (X=88925.570 Y=-63375.051 Z=8563.354)
+    "Rocket Grounds Scraps - East Near Barrier": base_id + 1306, # ItemPickup106_17 Boomer_HouseDetails (X=84234.016 Y=-64475.551 Z=8382.108)
+    "Rocket Grounds Scraps - Middle Near Dirt Heap": base_id + 1307, # ItemPickup114_23 Boomer_RangeDetails (X=79349.438 Y=-64225.480 Z=8384.219)
+    "Rocket Grounds Scraps - Middle Near Planks": base_id + 1308, # ItemPickup22_0 Boomer_RangeDetails (X=79831.070 Y=-65847.766 Z=8301.337)
+    "Rocket Grounds Scraps - Middle Near Crate": base_id + 1309, # ItemPickup109_5 Boomer_RangeDetails (X=76526.500 Y=-65394.875 Z=8223.883)
+    "Rocket Grounds Scraps - Middle Near Lantern": base_id + 1310, # ItemPickup108_2 Boomer_RangeDetails (X=76237.977 Y=-67087.414 Z=8361.979)
+    "Rocket Grounds Scraps - North Under Sign": base_id + 1311, # ItemPickup115_26 Boomer_RangeDetails (X=78857.672 Y=-67802.227 Z=8257.150)
+    "Rocket Grounds Scraps - Middle Near Rock": base_id + 1312, # ItemPickup110_8 Boomer_RangeDetails (X=74878.570 Y=-62927.297 Z=8749.549)
+    "Rocket Grounds Scraps - Southwest Above Door": base_id + 1313, # ItemPickup111_11 Boomer_RangeDetails (X=74542.641 Y=-61301.082 Z=9493.931)
+    "Rocket Grounds Scraps - South Above Bunker": base_id + 1314 # ItemPickup23_0 Boomer_RangeDetails (X=77020.859 Y=-62031.320 Z=8873.663)
+    # "Rocket Grounds Scraps Glitch 1" ItemPickup107_20 (X=81308.406 Y=-63482.320 Z=8533.338) /!\ Glitched scrap
+}
+
+loc_rocket_bunker = {
+    "Rocket Bunker Scraps - 1": base_id + 1315, # ItemPickup113_20 Boomer_RangeDetails (X=77552.094 Y=-61144.559 Z=8523.195)
+    "Rocket Bunker Scraps - 2": base_id + 1316, # ItemPickup112_14 Boomer_RangeDetails (X=77670.227 Y=-62029.941 Z=8570.785)
+    "Rocket Bunker Box of Rockets": base_id + 1317 # Boomer_RocketsPickup Boomer_RangeDetails (X=77330.086 Y=-61504.324 Z=8523.195)
 }
 
 loc_workshop = {
-    "Workshop Scraps Sheltered": base_id + 1318, # ItemPickup103_8 Boomer_HouseDetails (X=93550.773 Y=-61901.797 Z=8828.551)
-    "Workshop Scraps Platform": base_id + 1319, # ItemPickup102_5 Boomer_HouseDetails (X=93508.047 Y=-64009.910 Z=8783.468)
-    "Workshop Scraps On Path": base_id + 1320, # ItemPickup101_2 Boomer_HouseDetails (X=92011.648 Y=-65572.281 Z=8736.709)
-    "Workshop Scraps Water Path": base_id + 1321, # ItemPickup24_2 Boomer_HouseDetails (X=92311.594 Y=-63045.211 Z=8749.977)
-    "Workshop Scraps Under Lantern": base_id + 1322, # ItemPickup104_11 Boomer_HouseDetails (X=91392.734 Y=-63527.629 Z=8709.268)
-    "Workshop Scraps Near Beds": base_id + 1323, # ItemPickup25_1 Boomer_HouseDetails (X=92986.789 Y=-63012.047 Z=9235.383)
+    "Workshop Scraps - Sheltered": base_id + 1318, # ItemPickup103_8 Boomer_HouseDetails (X=93550.773 Y=-61901.797 Z=8828.551)
+    "Workshop Scraps - On Platform": base_id + 1319, # ItemPickup102_5 Boomer_HouseDetails (X=93508.047 Y=-64009.910 Z=8783.468)
+    "Workshop Scraps - On Side Path": base_id + 1320, # ItemPickup101_2 Boomer_HouseDetails (X=92011.648 Y=-65572.281 Z=8736.709)
+    "Workshop Scraps - Near Water Tank": base_id + 1321, # ItemPickup24_2 Boomer_HouseDetails (X=92311.594 Y=-63045.211 Z=8749.977)
+    "Workshop Scraps - Under Lantern": base_id + 1322, # ItemPickup104_11 Boomer_HouseDetails (X=91392.734 Y=-63527.629 Z=8709.268)
+    "Workshop Scraps - Near Beds": base_id + 1323, # ItemPickup25_1 Boomer_HouseDetails (X=92986.789 Y=-63012.047 Z=9235.383)
     "Workshop John Smith Mission End": base_id + 1324 # (dialog 2) -> the_boomer
 }
 
 loc_east_tower = {
     "Greg Mission Start": base_id + 1325, # (dialog 6) -> north_mine_key
-    "East Tower Scraps Between Crates": base_id + 1326, # ItemPickup231_17 Mine2_NPCHouseDetails (X=95448.250 Y=-67249.156 Z=8607.896)
-    "East Tower Scraps Near Minecart": base_id + 1327, # ItemPickup228_8 Mine2_NPCHouseDetails (X=96339.242 Y=-66374.828 Z=8650.519)
-    "East Tower Scraps Under Lantern": base_id + 1328, # ItemPickup229_11 Mine2_NPCHouseDetails (X=98540.711 Y=-67173.656 Z=8418.825)
-    "East Tower Scraps Near Barrier": base_id + 1329, # ItemPickup230_14 Mine2_NPCHouseDetails (X=97276.414 Y=-68495.008 Z=8337.229)
-    "East Tower Scraps In Stairs": base_id + 1330, # ItemPickup227_5 Mine2_NPCHouseDetails (X=96470.820 Y=-66540.859 Z=8953.763)
-    "East Tower Scraps Near Note": base_id + 1331 # ItemPickup226_2 Mine2_NPCHouseDetails (X=96141.555 Y=-67013.445 Z=9399.308)
+    "East Tower Scraps - Between Crates": base_id + 1326, # ItemPickup231_17 Mine2_NPCHouseDetails (X=95448.250 Y=-67249.156 Z=8607.896)
+    "East Tower Scraps - Near Minecart": base_id + 1327, # ItemPickup228_8 Mine2_NPCHouseDetails (X=96339.242 Y=-66374.828 Z=8650.519)
+    "East Tower Scraps - Near Barrier 1": base_id + 1328, # ItemPickup229_11 Mine2_NPCHouseDetails (X=98540.711 Y=-67173.656 Z=8418.825)
+    "East Tower Scraps - Near Barrier 2": base_id + 1329, # ItemPickup230_14 Mine2_NPCHouseDetails (X=97276.414 Y=-68495.008 Z=8337.229)
+    "East Tower Scraps - On Stairs": base_id + 1330, # ItemPickup227_5 Mine2_NPCHouseDetails (X=96470.820 Y=-66540.859 Z=8953.763)
+    "East Tower Scraps - Near Note": base_id + 1331 # ItemPickup226_2 Mine2_NPCHouseDetails (X=96141.555 Y=-67013.445 Z=9399.308)
 }
 
 loc_lighthouse = {
-    "Lighthouse Scraps Southwest Path Start": base_id + 1332, # ItemPickup200_41 LighthouseTerrainMain (X=100072.813 Y=-68645.688 Z=8150.313)
-    "Lighthouse Scraps Southwest Near Tent": base_id + 1333, # ItemPickup198_35 LighthouseTerrainMain (X=105340.594 Y=-70828.602 Z=8436.780)
-    "Lighthouse Scraps Southwest Under Lantern": base_id + 1334, # ItemPickup199_38 LighthouseTerrainMain (X=103851.688 Y=-73396.625 Z=7973.290)
-    "Lighthouse Scraps South Lonely": base_id + 1335, # ItemPickup196_29 LighthouseTerrainMain (X=107040.711 Y=-74021.555 Z=8303.216)
-    "Lighthouse Scraps Southeast Under Lantern": base_id + 1336, # ItemPickup197_32 LighthouseTerrainMain (X=110566.859 Y=-77435.961 Z=7642.565)
-    "Lighthouse Scraps Southeast Near Shelter": base_id + 1337, # ItemPickup32_2 LighthouseShed_Main (X=111451.352 Y=-77351.117 Z=7633.413)
-    "Lighthouse Scraps Southeast Near Crates": base_id + 1338, # ItemPickup35_11 Lighthouse_Main (X=113078.500 Y=-78618.281 Z=7180.793)
-    "Lighthouse Scraps East Under Lantern": base_id + 1339, # ItemPickup192_17 LighthouseTerrainMain (X=113396.305 Y=-80315.383 Z=7184.260)
-    "Lighthouse Scraps East On Floating Bridge": base_id + 1340, # ItemPickup193_20 LighthouseTerrainMain (X=114057.484 Y=-81517.836 Z=7245.034)
-    "Lighthouse Scraps Southeast On Path": base_id + 1341, # ItemPickup194_23 LighthouseTerrainMain (X=110915.156 Y=-78376.609 Z=7676.131)
-    "Lighthouse Scraps Middle On Path": base_id + 1342, # ItemPickup195_26 LighthouseTerrainMain (X=109341.703 Y=-79014.469 Z=8075.679)
-    "Lighthouse Scraps Middle In Corner": base_id + 1343, # ItemPickup33_5 Lighthouse_Details (X=107006.578 Y=-81377.711 Z=8821.629)
-    "Lighthouse Scraps Middle Among Rocks": base_id + 1344, # ItemPickup191_14 LighthouseTerrainMain (X=109240.195 Y=-82951.375 Z=8194.619)
-    "Lighthouse Scraps Middle Near Barrier": base_id + 1345, # ItemPickup190_11 LighthouseTerrainMain (X=106295.719 Y=-84190.578 Z=8581.896)
-    "Lighthouse Scraps Middle Near Crates": base_id + 1346, # ItemPickup189_8 LighthouseTerrainMain (X=104233.883 Y=-84663.328 Z=7806.311)
-    "Lighthouse Scraps Middle Lonely": base_id + 1347, # ItemPickup188_5 LighthouseTerrainMain (X=103209.227 Y=-81564.047 Z=8140.578)
-    "Lighthouse Scraps Middle Near Lantern": base_id + 1348, # ItemPickup187_2 LighthouseTerrainMain (X=104795.555 Y=-81344.758 Z=8775.158)
-    "Lighthouse Scraps West On Beach": base_id + 1349, # ItemPickup34_8 Lighthouse_Main (X=100843.914 Y=-78038.539 Z=7197.542)
-    "Lighthouse Breaker 1": base_id + 1350, # ItemPickup13_2 LighthouseShed_Main (X=110781.164 Y=-77296.813 Z=7757.248) \!/ Existing match 6
-    "Lighthouse Breaker 2": base_id + 1351, # ItemPickup14 LighthouseShed_Main (X=110899.227 Y=-77239.031 Z=7757.134) \!/ Existing match 3
-    "Lighthouse Breaker 3": base_id + 1352, # ItemPickup16 LighthouseShed_Main (X=110948.547 Y=-77253.336 Z=7757.134) \!/ Existing match 2
-    "Lighthouse Breaker 4": base_id + 1353, # ItemPickup17 LighthouseShed_Main (X=111001.078 Y=-77205.047 Z=7757.134) \!/ Existing match 1
+    "Lighthouse Scraps - Southwest Near Lit Lantern": base_id + 1332, # ItemPickup200_41 LighthouseTerrainMain (X=100072.813 Y=-68645.688 Z=8150.313)
+    "Lighthouse Scraps - Southwest Near Tent": base_id + 1333, # ItemPickup198_35 LighthouseTerrainMain (X=105340.594 Y=-70828.602 Z=8436.780)
+    "Lighthouse Scraps - Southwest Under Unlit Lantern": base_id + 1334, # ItemPickup199_38 LighthouseTerrainMain (X=103851.688 Y=-73396.625 Z=7973.290)
+    "Lighthouse Scraps - South Near Lanternless Post": base_id + 1335, # ItemPickup196_29 LighthouseTerrainMain (X=107040.711 Y=-74021.555 Z=8303.216)
+    "Lighthouse Scraps - Southeast Under Lit Lantern": base_id + 1336, # ItemPickup197_32 LighthouseTerrainMain (X=110566.859 Y=-77435.961 Z=7642.565)
+    "Lighthouse Scraps - Southeast Behind Shelter": base_id + 1337, # ItemPickup32_2 LighthouseShed_Main (X=111451.352 Y=-77351.117 Z=7633.413)
+    "Lighthouse Scraps - Southeast Near Crates": base_id + 1338, # ItemPickup35_11 Lighthouse_Main (X=113078.500 Y=-78618.281 Z=7180.793)
+    "Lighthouse Scraps - East Under Lit Lantern": base_id + 1339, # ItemPickup192_17 LighthouseTerrainMain (X=113396.305 Y=-80315.383 Z=7184.260)
+    "Lighthouse Scraps - East On Floating Bridge": base_id + 1340, # ItemPickup193_20 LighthouseTerrainMain (X=114057.484 Y=-81517.836 Z=7245.034)
+    "Lighthouse Scraps - Southeast On Path Intersection": base_id + 1341, # ItemPickup194_23 LighthouseTerrainMain (X=110915.156 Y=-78376.609 Z=7676.131)
+    "Lighthouse Scraps - Middle On Downhill Path": base_id + 1342, # ItemPickup195_26 LighthouseTerrainMain (X=109341.703 Y=-79014.469 Z=8075.679)
+    "Lighthouse Scraps - Middle Near Breaker Box": base_id + 1343, # ItemPickup33_5 Lighthouse_Details (X=107006.578 Y=-81377.711 Z=8821.629)
+    "Lighthouse Scraps - Middle On Lower Rock Ledge": base_id + 1344, # ItemPickup191_14 LighthouseTerrainMain (X=109240.195 Y=-82951.375 Z=8194.619)
+    "Lighthouse Scraps - Middle Near Barrier": base_id + 1345, # ItemPickup190_11 LighthouseTerrainMain (X=106295.719 Y=-84190.578 Z=8581.896)
+    "Lighthouse Scraps - Middle Near Crates": base_id + 1346, # ItemPickup189_8 LighthouseTerrainMain (X=104233.883 Y=-84663.328 Z=7806.311)
+    "Lighthouse Scraps - Middle Coast Overlook": base_id + 1347, # ItemPickup188_5 LighthouseTerrainMain (X=103209.227 Y=-81564.047 Z=8140.578)
+    "Lighthouse Scraps - Middle Near Unlit Lantern": base_id + 1348, # ItemPickup187_2 LighthouseTerrainMain (X=104795.555 Y=-81344.758 Z=8775.158)
+    "Lighthouse Scraps - West On Coast": base_id + 1349, # ItemPickup34_8 Lighthouse_Main (X=100843.914 Y=-78038.539 Z=7197.542)
+    "Lighthouse Breaker - 1": base_id + 1350, # ItemPickup13_2 LighthouseShed_Main (X=110781.164 Y=-77296.813 Z=7757.248) \!/ Existing match 6
+    "Lighthouse Breaker - 2": base_id + 1351, # ItemPickup14 LighthouseShed_Main (X=110899.227 Y=-77239.031 Z=7757.134) \!/ Existing match 3
+    "Lighthouse Breaker - 3": base_id + 1352, # ItemPickup16 LighthouseShed_Main (X=110948.547 Y=-77253.336 Z=7757.134) \!/ Existing match 2
+    "Lighthouse Breaker - 4": base_id + 1353, # ItemPickup17 LighthouseShed_Main (X=111001.078 Y=-77205.047 Z=7757.134) \!/ Existing match 1
     "Lighthouse Claire Mission End": base_id + 1354 # (dialog 2) -> 30_scraps_reward
 }
 
 loc_north_mine_outside = {
-    "North Mine Outside Scraps South Near Crossroads": base_id + 1355, # ItemPickup241_31 Mine2_OutsideDetails (X=-52376.746 Y=-101857.492 Z=10542.841)
-    "North Mine Outside Scraps South Along Downhill Path": base_id + 1356, # ItemPickup242_34 Mine2_OutsideDetails (X=-53786.742 Y=-102067.789 Z=10858.948)
-    "North Mine Outside Scraps Southeast Above Door": base_id + 1357, # ItemPickup239_25 Mine2_OutsideDetails (X=-57502.777 Y=-105475.336 Z=10609.405)
-    "North Mine Outside Scraps Southeast Along Path": base_id + 1358, # ItemPickup16_2 Mine2_OutsideDetails (X=-58102.102 Y=-104007.906 Z=11146.535)
-    "North Mine Outside Scraps Southeast Topmost": base_id + 1359, # ItemPickup238_20 Mine2_OutsideDetails (X=-59474.840 Y=-105053.734 Z=11213.524)
-    "North Mine Outside Scraps South Near Lantern": base_id + 1360, # ItemPickup240_28 Mine2_OutsideDetails (X=-55011.750 Y=-104936.359 Z=9935.366)
-    "North Mine Outside Scraps Middle Near Shelter": base_id + 1361, # ItemPickup236_14 Mine2_OutsideDetails (X=-55594.863 Y=-107667.594 Z=9596.611)
-    "North Mine Outside Scraps Middle Among Rocks": base_id + 1362, # ItemPickup15_1 Mine2_Interior2 (X=-56632.578 Y=-109503.406 Z=9280.788)
-    "North Mine Outside Scraps North East Near Stairs": base_id + 1363, # ItemPickup234_8 Mine2_OutsideDetails (X=-54645.418 Y=-110747.602 Z=9553.452)
-    "North Mine Outside Scraps North East Near Barrier": base_id + 1364, # ItemPickup232_2 Mine2_OutsideDetails (X=-51561.340 Y=-113574.813 Z=9414.959)
-    "North Mine Outside Scraps North East Near Pillars": base_id + 1365, # ItemPickup233_5 Mine2_OutsideDetails (X=-54072.105 Y=-112672.031 Z=10077.665)
-    "North Mine Outside Scraps Middle Along Path": base_id + 1366, # ItemPickup237_17 Mine2_OutsideDetails (X=-58042.758 Y=-108748.656 Z=9693.470)
-    "North Mine Outside Scraps Middle Near Minecart": base_id + 1367, # ItemPickup235_11 Mine2_OutsideDetails (X=-55717.227 Y=-110610.414 Z=9487.879)
-    "North Mine Outside Scraps North East Sheltered": base_id + 1368, # ItemPickup13_2 Mine2_Interior2 (X=-52235.836 Y=-114501.117 Z=9462.438) \!/ Existing match 6
-    "North Mine Outside Scraps North East On Rocks": base_id + 1369 # ItemPickup14_5 Mine2_Interior2 (X=-53470.418 Y=-109766.102 Z=10252.304) \!/ Existing match 7
+    "North Mine Outside Scraps - South Near Crossroads": base_id + 1355, # ItemPickup241_31 Mine2_OutsideDetails (X=-52376.746 Y=-101857.492 Z=10542.841)
+    "North Mine Outside Scraps - South On Downhill Path 1": base_id + 1356, # ItemPickup242_34 Mine2_OutsideDetails (X=-53786.742 Y=-102067.789 Z=10858.948)
+    "North Mine Outside Scraps - South Above Door": base_id + 1357, # ItemPickup239_25 Mine2_OutsideDetails (X=-57502.777 Y=-105475.336 Z=10609.405)
+    "North Mine Outside Scraps - South On Downhill Path 2": base_id + 1358, # ItemPickup16_2 Mine2_OutsideDetails (X=-58102.102 Y=-104007.906 Z=11146.535)
+    "North Mine Outside Scraps - South On Downhill Path 3": base_id + 1359, # ItemPickup238_20 Mine2_OutsideDetails (X=-59474.840 Y=-105053.734 Z=11213.524)
+    "North Mine Outside Scraps - South Near Lantern": base_id + 1360, # ItemPickup240_28 Mine2_OutsideDetails (X=-55011.750 Y=-104936.359 Z=9935.366)
+    "North Mine Outside Scraps - Middle Near Shelter": base_id + 1361, # ItemPickup236_14 Mine2_OutsideDetails (X=-55594.863 Y=-107667.594 Z=9596.611)
+    "North Mine Outside Scraps - Middle In Rock Pit": base_id + 1362, # ItemPickup15_1 Mine2_Interior2 (X=-56632.578 Y=-109503.406 Z=9280.788)
+    "North Mine Outside Scraps - North East On Arch Path": base_id + 1363, # ItemPickup234_8 Mine2_OutsideDetails (X=-54645.418 Y=-110747.602 Z=9553.452)
+    "North Mine Outside Scraps - North East Near Barrier": base_id + 1364, # ItemPickup232_2 Mine2_OutsideDetails (X=-51561.340 Y=-113574.813 Z=9414.959)
+    "North Mine Outside Scraps - North East Near Pillars": base_id + 1365, # ItemPickup233_5 Mine2_OutsideDetails (X=-54072.105 Y=-112672.031 Z=10077.665)
+    "North Mine Outside Scraps - Middle On Path": base_id + 1366, # ItemPickup237_17 Mine2_OutsideDetails (X=-58042.758 Y=-108748.656 Z=9693.470)
+    "North Mine Outside Scraps - Middle Near Minecart": base_id + 1367, # ItemPickup235_11 Mine2_OutsideDetails (X=-55717.227 Y=-110610.414 Z=9487.879)
+    "North Mine Outside Scraps - North East Sheltered": base_id + 1368, # ItemPickup13_2 Mine2_Interior2 (X=-52235.836 Y=-114501.117 Z=9462.438) \!/ Existing match 6
+    "North Mine Outside Scraps - North East On Rocks": base_id + 1369 # ItemPickup14_5 Mine2_Interior2 (X=-53470.418 Y=-109766.102 Z=10252.304) \!/ Existing match 7
 }
 
 loc_north_mine_inside = {
-    "North Mine Inside Scraps Entrance Near Door": base_id + 1370, # ItemPickup17_2 Mine2_Interior1 (X=-58433.055 Y=-104081.570 Z=9378.083) \!/ Existing match 8
-    "North Mine Inside Scraps Entrance Along Rails": base_id + 1371, # ItemPickup246_2 Mine2_Interior1 (X=-58987.199 Y=-103262.906 Z=9186.494)
-    "North Mine Inside Scraps Entrance Intersection": base_id + 1372, # ItemPickup247_5 Mine2_Interior1 (X=-58812.801 Y=-99259.570 Z=8847.714)
-    "North Mine Inside Scraps Corridors Near Door": base_id + 1373, # ItemPickup248_8 Mine2_Interior1 (X=-56634.379 Y=-99529.563 Z=8851.877)
-    "North Mine Inside Scraps Corridors Near Map": base_id + 1374, # ItemPickup22_4 Mine2_Interior1 (X=-55604.477 Y=-98342.906 Z=8842.766)
-    "North Mine Inside Scraps Corridors Near Table": base_id + 1375, # ItemPickup250_14 Mine2_Interior1 (X=-54824.535 Y=-98526.492 Z=8852.156)
-    "North Mine Inside Scraps Corridors Behind Crates": base_id + 1376, # ItemPickup21_14 Mine2_Interior1 (X=-54887.254 Y=-99047.141 Z=8849.855)
-    "North Mine Inside Scraps Rest Room On Table": base_id + 1377, # ItemPickup20_2 Mine2_Interior1 (X=-55610.020 Y=-101877.961 Z=9081.042)
-    "North Mine Inside Scraps Rest Room Near Beds": base_id + 1378, # ItemPickup19_2 Mine2_Interior1 (X=-56519.340 Y=-101375.008 Z=9001.270)
-    "North Mine Inside Scraps Egg Room": base_id + 1379, # ItemPickup249_11 Mine2_Interior1 (X=-53329.922 Y=-99469.773 Z=8848.643)
-    "North Mine Inside Scraps Guardroom Near Crates": base_id + 1380, # ItemPickup251_17 Mine2_Interior1 (X=-52814.828 Y=-96286.969 Z=8851.372)
-    "North Mine Inside Scraps Guardroom On Table": base_id + 1381, # ItemPickup24_1 Mine2_Interior1 (X=-52605.957 Y=-96535.156 Z=8940.480)
-    "North Mine Inside Scraps Guardroom Near Table": base_id + 1382, # ItemPickup23_20 Mine2_Interior1 (X=-53237.699 Y=-96609.461 Z=8846.201)
-    "North Mine Inside Scraps Drawbridge": base_id + 1383, # ItemPickup18_5 Mine2_Interior1 (X=-58543.488 Y=-95879.695 Z=8981.646)
+    "North Mine Inside Scraps - Entrance In Tunnel 1": base_id + 1370, # ItemPickup17_2 Mine2_Interior1 (X=-58433.055 Y=-104081.570 Z=9378.083) \!/ Existing match 8
+    "North Mine Inside Scraps - Entrance In Tunnel 2": base_id + 1371, # ItemPickup246_2 Mine2_Interior1 (X=-58987.199 Y=-103262.906 Z=9186.494)
+    "North Mine Inside Scraps - Entrance At Intersection": base_id + 1372, # ItemPickup247_5 Mine2_Interior1 (X=-58812.801 Y=-99259.570 Z=8847.714)
+    "North Mine Inside Scraps - Corridors Near Door": base_id + 1373, # ItemPickup248_8 Mine2_Interior1 (X=-56634.379 Y=-99529.563 Z=8851.877)
+    "North Mine Inside Scraps - Corridors Near Map": base_id + 1374, # ItemPickup22_4 Mine2_Interior1 (X=-55604.477 Y=-98342.906 Z=8842.766)
+    "North Mine Inside Scraps - Corridors Near Table": base_id + 1375, # ItemPickup250_14 Mine2_Interior1 (X=-54824.535 Y=-98526.492 Z=8852.156)
+    "North Mine Inside Scraps - Corridors Behind Crates": base_id + 1376, # ItemPickup21_14 Mine2_Interior1 (X=-54887.254 Y=-99047.141 Z=8849.855)
+    "North Mine Inside Scraps - Rest Room On Table": base_id + 1377, # ItemPickup20_2 Mine2_Interior1 (X=-55610.020 Y=-101877.961 Z=9081.042)
+    "North Mine Inside Scraps - Rest Room Near Beds": base_id + 1378, # ItemPickup19_2 Mine2_Interior1 (X=-56519.340 Y=-101375.008 Z=9001.270)
+    "North Mine Inside Scraps - Egg Room": base_id + 1379, # ItemPickup249_11 Mine2_Interior1 (X=-53329.922 Y=-99469.773 Z=8848.643)
+    "North Mine Inside Scraps - Guardroom Near Crates": base_id + 1380, # ItemPickup251_17 Mine2_Interior1 (X=-52814.828 Y=-96286.969 Z=8851.372)
+    "North Mine Inside Scraps - Guardroom On Table": base_id + 1381, # ItemPickup24_1 Mine2_Interior1 (X=-52605.957 Y=-96535.156 Z=8940.480)
+    "North Mine Inside Scraps - Guardroom Near Table": base_id + 1382, # ItemPickup23_20 Mine2_Interior1 (X=-53237.699 Y=-96609.461 Z=8846.201)
+    "North Mine Inside Scraps - Drawbridge": base_id + 1383, # ItemPickup18_5 Mine2_Interior1 (X=-58543.488 Y=-95879.695 Z=8981.646)
     "North Mine Inside Blue Egg": base_id + 1384, # Mine2_Egg Mine2_Interior2 (X=-53592.195 Y=-99177.500 Z=8975.387)
     "North Mine Inside Blue Paint Can": base_id + 1385 # PaintCan_2 Mine2_Interior2 (X=-56133.391 Y=-101870.047 Z=9004.720) \!/ Existing match 5
     # "North Mine Inside Secret Gear" ItemPickup26_2 Mine2_Interior2 (X=-55546.859 Y=-98209.852 Z=8429.085) /!\ Inaccessible gear
 }
 
 loc_wood_bridge = {
-    "Wood Bridge Scraps Arch Near Barrier": base_id + 1386, # ItemPickup127_35 Bridge_Details (X=-66790.141 Y=-110340.367 Z=10454.417)
-    "Wood Bridge Scraps Arch Along Path": base_id + 1387, # ItemPickup18613654 Bridge_Details (X=-68364.586 Y=-111691.625 Z=10444.172)
-    "Wood Bridge Scraps Arch Left Pillar": base_id + 1388, # ItemPickup1311221 Bridge_StructureDetails (X=-69013.555 Y=-112353.977 Z=10399.942)
-    "Wood Bridge Scraps Arch Right Pillar": base_id + 1389, # ItemPickup93564 Bridge_StructureDetails (X=-70398.797 Y=-112916.945 Z=10372.192)
-    "Wood Bridge Scraps Bottom Near High Tree": base_id + 1390, # ItemPickup161323 Bridge_Details (X=-71336.172 Y=-106966.672 Z=8430.104)
-    "Wood Bridge Scraps Bottom Near Small Tree": base_id + 1391, # ItemPickup128_38 Bridge_Details (X=-72776.086 Y=-107813.102 Z=8305.589)
-    "Wood Bridge Scraps Bottom Furthest": base_id + 1392, # ItemPickup17975 Bridge_Details (X=-75224.648 Y=-108280.867 Z=7929.499)
-    "Wood Bridge Scraps Bottom Under Lantern": base_id + 1393, # ItemPickup126_32 Bridge_Details (X=-68112.172 Y=-105119.656 Z=9458.937)
-    "Wood Bridge Scraps Top Under Lantern": base_id + 1394, # ItemPickup118_8 Bridge_Details (X=-71847.625 Y=-103623.203 Z=10707.521)
-    "Wood Bridge Scraps Top Near Middle": base_id + 1395, # ItemPickup116_2 Bridge_Details (X=-71812.219 Y=-107256.094 Z=10780.134)
-    "Wood Bridge Scraps Top Near Stairs": base_id + 1396, # ItemPickup134321 Bridge_Details (X=-72011.570 Y=-109054.547 Z=10866.852)
-    "Wood Bridge Scraps Scaffolding Near Stairs": base_id + 1397, # ItemPickup117_5 Bridge_Details (X=-72862.430 Y=-106144.852 Z=10329.061)
-    "Wood Bridge Scraps Scaffolding Near Middle": base_id + 1398 # ItemPickup1494567 Bridge_Details (X=-71843.117 Y=-107174.133 Z=10367.116)
+    "Wood Bridge Scraps - Arch Near Barrier": base_id + 1386, # ItemPickup127_35 Bridge_Details (X=-66790.141 Y=-110340.367 Z=10454.417)
+    "Wood Bridge Scraps - Arch On Path": base_id + 1387, # ItemPickup18613654 Bridge_Details (X=-68364.586 Y=-111691.625 Z=10444.172)
+    "Wood Bridge Scraps - Arch Left Pillar": base_id + 1388, # ItemPickup1311221 Bridge_StructureDetails (X=-69013.555 Y=-112353.977 Z=10399.942)
+    "Wood Bridge Scraps - Arch Right Pillar": base_id + 1389, # ItemPickup93564 Bridge_StructureDetails (X=-70398.797 Y=-112916.945 Z=10372.192)
+    "Wood Bridge Scraps - Bottom Near High Tree": base_id + 1390, # ItemPickup161323 Bridge_Details (X=-71336.172 Y=-106966.672 Z=8430.104)
+    "Wood Bridge Scraps - Bottom Near Small Tree": base_id + 1391, # ItemPickup128_38 Bridge_Details (X=-72776.086 Y=-107813.102 Z=8305.589)
+    "Wood Bridge Scraps - Bottom Further": base_id + 1392, # ItemPickup17975 Bridge_Details (X=-75224.648 Y=-108280.867 Z=7929.499)
+    "Wood Bridge Scraps - Bottom Under Lantern": base_id + 1393, # ItemPickup126_32 Bridge_Details (X=-68112.172 Y=-105119.656 Z=9458.937)
+    "Wood Bridge Scraps - Top Under Lantern": base_id + 1394, # ItemPickup118_8 Bridge_Details (X=-71847.625 Y=-103623.203 Z=10707.521)
+    "Wood Bridge Scraps - Top Near Middle": base_id + 1395, # ItemPickup116_2 Bridge_Details (X=-71812.219 Y=-107256.094 Z=10780.134)
+    "Wood Bridge Scraps - Top Near Stairs": base_id + 1396, # ItemPickup134321 Bridge_Details (X=-72011.570 Y=-109054.547 Z=10866.852)
+    "Wood Bridge Scraps - Scaffolding Near Stairs": base_id + 1397, # ItemPickup117_5 Bridge_Details (X=-72862.430 Y=-106144.852 Z=10329.061)
+    "Wood Bridge Scraps - Scaffolding Near Middle": base_id + 1398 # ItemPickup1494567 Bridge_Details (X=-71843.117 Y=-107174.133 Z=10367.116)
 }
 
 loc_museum = {
-    "Museum Scraps Around Near Unlit Lantern": base_id + 1399, # ItemPickup119_11 Bridge_Details (X=-69687.773 Y=-100002.406 Z=10806.339)
-    "Museum Scraps Around Behind Sign": base_id + 1400, # ItemPickup120_14 Bridge_Details (X=-68035.195 Y=-99480.672 Z=11049.731)
-    "Museum Scraps Around Near Platform": base_id + 1401, # ItemPickup125_29 Bridge_Details (X=-66912.641 Y=-99976.750 Z=11064.357)
-    "Museum Scraps Around Near Trees": base_id + 1402, # ItemPickup13532 Bridge_HouseDetails (X=-64901.117 Y=-99624.953 Z=11176.359)
-    "Museum Scraps Around Behind Museum": base_id + 1403, # ItemPickup121_17 Bridge_Details (X=-66082.328 Y=-98105.555 Z=11089.308)
-    "Museum Scraps Inside Mutiny Room": base_id + 1404, # ItemPickup21765 Bridge_HouseDetails (X=-67402.742 Y=-97735.133 Z=11153.927)
-    "Museum Scraps Inside Under Stairs": base_id + 1405, # ItemPickup124_26 Bridge_Details (X=-66716.031 Y=-98282.508 Z=11195.624)
-    "Museum Scraps Inside On Table": base_id + 1406, # ItemPickup122_20 Bridge_Details (X=-66582.703 Y=-99092.461 Z=11630.082)
-    "Museum Scraps Inside Behind Tables": base_id + 1407, # ItemPickup123_23 Bridge_Details (X=-66798.164 Y=-99550.266 Z=11547.321)
-    "Museum Scraps Inside On Balcony": base_id + 1408, # ItemPickup183423 Bridge_HouseDetails (X=-66850.336 Y=-99682.844 Z=11543.618)
-    "Museum Scraps Hill Near High Tree": base_id + 1409, # ItemPickup244_40 Mine2_OutsideDetails (X=-60156.828 Y=-98516.953 Z=11811.422)
-    "Museum Scraps Hill Near Small Tree": base_id + 1410, # ItemPickup245_43 Mine2_OutsideDetails (X=-61195.203 Y=-98262.422 Z=11779.118)
+    "Museum Scraps - Around Near Unlit Lantern": base_id + 1399, # ItemPickup119_11 Bridge_Details (X=-69687.773 Y=-100002.406 Z=10806.339)
+    "Museum Scraps - Around Behind Sign": base_id + 1400, # ItemPickup120_14 Bridge_Details (X=-68035.195 Y=-99480.672 Z=11049.731)
+    "Museum Scraps - Around Near Platform": base_id + 1401, # ItemPickup125_29 Bridge_Details (X=-66912.641 Y=-99976.750 Z=11064.357)
+    "Museum Scraps - Around Near Trees": base_id + 1402, # ItemPickup13532 Bridge_HouseDetails (X=-64901.117 Y=-99624.953 Z=11176.359)
+    "Museum Scraps - Around Behind Museum": base_id + 1403, # ItemPickup121_17 Bridge_Details (X=-66082.328 Y=-98105.555 Z=11089.308)
+    "Museum Scraps - Inside Near Mutiny Note": base_id + 1404, # ItemPickup21765 Bridge_HouseDetails (X=-67402.742 Y=-97735.133 Z=11153.927)
+    "Museum Scraps - Inside Under Stairs": base_id + 1405, # ItemPickup124_26 Bridge_Details (X=-66716.031 Y=-98282.508 Z=11195.624)
+    "Museum Scraps - Inside On Table": base_id + 1406, # ItemPickup122_20 Bridge_Details (X=-66582.703 Y=-99092.461 Z=11630.082)
+    "Museum Scraps - Inside Behind Tables": base_id + 1407, # ItemPickup123_23 Bridge_Details (X=-66798.164 Y=-99550.266 Z=11547.321)
+    "Museum Scraps - Inside On Balcony": base_id + 1408, # ItemPickup183423 Bridge_HouseDetails (X=-66850.336 Y=-99682.844 Z=11543.618)
+    "Museum Scraps - Hill 1": base_id + 1409, # ItemPickup244_40 Mine2_OutsideDetails (X=-60156.828 Y=-98516.953 Z=11811.422)
+    "Museum Scraps - Hill 2": base_id + 1410, # ItemPickup245_43 Mine2_OutsideDetails (X=-61195.203 Y=-98262.422 Z=11779.118)
     "Museum Paul Mission Start": base_id + 1411, # (dialog 6) -> remote_explosive (x8)
     "Museum Paul Mission End": base_id + 1412 # (dialog 3) -> temple_key
 }
 
 loc_barbed_shelter = {
     "Barbed Shelter Gertrude Mission Start": base_id + 1413, # (dialog 4) -> broken_bob
-    "Barbed Shelter Scraps Near Rails": base_id + 1414, # ItemPickup100_8 Bob_NPCHouseMain (X=-72525.500 Y=-89333.734 Z=9820.663)
-    "Barbed Shelter Scraps Under Barbed Wire": base_id + 1415, # ItemPickup98_2 Bob_NPCHouseMain (X=-74870.758 Y=-88576.641 Z=9836.814)
-    "Barbed Shelter Scraps Along Path": base_id + 1416, # ItemPickup22_1 Bob_NPCHouseDetails (X=-76193.914 Y=-88038.836 Z=9818.776)
-    "Barbed Shelter Scraps Behind Beams": base_id + 1417, # ItemPickup99_5 Bob_NPCHouseMain (X=-74494.859 Y=-87609.969 Z=9837.866)
-    "Barbed Shelter Scraps Sheltered": base_id + 1418 # ItemPickup23_3 Bob_NPCHouseDetails (X=-74826.930 Y=-88402.039 Z=9929.854)
+    "Barbed Shelter Scraps - Near Rails": base_id + 1414, # ItemPickup100_8 Bob_NPCHouseMain (X=-72525.500 Y=-89333.734 Z=9820.663)
+    "Barbed Shelter Scraps - Under Barbed Wire": base_id + 1415, # ItemPickup98_2 Bob_NPCHouseMain (X=-74870.758 Y=-88576.641 Z=9836.814)
+    "Barbed Shelter Scraps - On Path": base_id + 1416, # ItemPickup22_1 Bob_NPCHouseDetails (X=-76193.914 Y=-88038.836 Z=9818.776)
+    "Barbed Shelter Scraps - Behind Beams": base_id + 1417, # ItemPickup99_5 Bob_NPCHouseMain (X=-74494.859 Y=-87609.969 Z=9837.866)
+    "Barbed Shelter Scraps - Sheltered": base_id + 1418 # ItemPickup23_3 Bob_NPCHouseDetails (X=-74826.930 Y=-88402.039 Z=9929.854)
 }
 
 loc_west_beach = {
-    "West Beach Chest Scraps 1": base_id + 1419, # ItemPickup9122346 Secret11_Details (X=-85934.047 Y=-89532.547 Z=7383.054)
-    "West Beach Chest Scraps 2": base_id + 1420, # ItemPickup84 Secret11_Details (X=-85933.977 Y=-89532.977 Z=7369.364)
-    "West Beach Chest Scraps 3": base_id + 1421, # ItemPickup9099877 Secret11_Details (X=-85951.000 Y=-89527.023 Z=7367.054)
-    "West Beach Chest Scraps 4": base_id + 1422, # ItemPickup89086423 Secret11_Details (X=-85932.461 Y=-89533.148 Z=7354.001)
-    "West Beach Chest Scraps 5": base_id + 1423, # ItemPickup83 Secret11_Details (X=-85950.930 Y=-89527.453 Z=7353.365)
-    "West Beach Chest Scraps 6": base_id + 1424, # ItemPickup82_2 Secret11_Details (X=-85932.391 Y=-89533.578 Z=7340.312)
-    "West Beach Scraps Top Footbridge Right": base_id + 1425, # ItemPickup87_13 Secret11_Details (X=-84489.945 Y=-91235.977 Z=8360.803)
-    "West Beach Scraps Top Footbridge Left": base_id + 1426, # ItemPickup349_2 Secret11_Details1 (X=-84386.320 Y=-90391.789 Z=8376.434)
-    "West Beach Scraps Bottom Near Crate": base_id + 1427, # ItemPickup86_10 Secret11_Details (X=-84714.773 Y=-89876.992 Z=7707.064)
-    "West Beach Scraps Bottom Near Minecart": base_id + 1428, # ItemPickup350_5 Secret11_Details1 (X=-85478.672 Y=-90648.414 Z=7708.377)
-    "West Beach Scraps Bottom In Corner": base_id + 1429, # ItemPickup85_7 Secret11_Details (X=-86276.633 Y=-90674.289 Z=7532.364)
-    "West Beach Scraps Laying On Sand": base_id + 1430, # ItemPickup88_16 Secret11_Details (X=-84363.055 Y=-87497.938 Z=7582.647)
-    "West Beach Scraps Laying Under Stairs": base_id + 1431, # ItemPickup351_8 Secret11_Details1 (X=-86556.266 Y=-89748.484 Z=7297.274)
-    "West Beach Scraps Top Near Beams": base_id + 1432 # ItemPickup352_11 Secret11_Details1 (X=-83210.836 Y=-92551.953 Z=8460.213)
+    "West Beach Chest Scraps - 1": base_id + 1419, # ItemPickup9122346 Secret11_Details (X=-85934.047 Y=-89532.547 Z=7383.054)
+    "West Beach Chest Scraps - 2": base_id + 1420, # ItemPickup84 Secret11_Details (X=-85933.977 Y=-89532.977 Z=7369.364)
+    "West Beach Chest Scraps - 3": base_id + 1421, # ItemPickup9099877 Secret11_Details (X=-85951.000 Y=-89527.023 Z=7367.054)
+    "West Beach Chest Scraps - 4": base_id + 1422, # ItemPickup89086423 Secret11_Details (X=-85932.461 Y=-89533.148 Z=7354.001)
+    "West Beach Chest Scraps - 5": base_id + 1423, # ItemPickup83 Secret11_Details (X=-85950.930 Y=-89527.453 Z=7353.365)
+    "West Beach Chest Scraps - 6": base_id + 1424, # ItemPickup82_2 Secret11_Details (X=-85932.391 Y=-89533.578 Z=7340.312)
+    "West Beach Scraps - Top Near Footbridge 1": base_id + 1425, # ItemPickup87_13 Secret11_Details (X=-84489.945 Y=-91235.977 Z=8360.803)
+    "West Beach Scraps - Top Near Footbridge 2": base_id + 1426, # ItemPickup349_2 Secret11_Details1 (X=-84386.320 Y=-90391.789 Z=8376.434)
+    "West Beach Scraps - Bottom Foot Of Stairs": base_id + 1427, # ItemPickup86_10 Secret11_Details (X=-84714.773 Y=-89876.992 Z=7707.064)
+    "West Beach Scraps - Bottom Near Minecart": base_id + 1428, # ItemPickup350_5 Secret11_Details1 (X=-85478.672 Y=-90648.414 Z=7708.377)
+    "West Beach Scraps - Bottom In Corner": base_id + 1429, # ItemPickup85_7 Secret11_Details (X=-86276.633 Y=-90674.289 Z=7532.364)
+    "West Beach Scraps - Laying On Sand": base_id + 1430, # ItemPickup88_16 Secret11_Details (X=-84363.055 Y=-87497.938 Z=7582.647)
+    "West Beach Scraps - Laying Under Stairs": base_id + 1431, # ItemPickup351_8 Secret11_Details1 (X=-86556.266 Y=-89748.484 Z=7297.274)
+    "West Beach Scraps - Top Near Beams": base_id + 1432 # ItemPickup352_11 Secret11_Details1 (X=-83210.836 Y=-92551.953 Z=8460.213)
 }
 
 loc_church = {
     "Church Black Paint Can": base_id + 1433, # PaintCan_4 Secret5_ChurchDetails (X=-67628.172 Y=-83801.375 Z=9865.983)
-    "Church Scraps Around Along Downhill Path": base_id + 1434, # ItemPickup391_11 Secret5_ChurchDetails (X=-64009.039 Y=-84252.156 Z=10258.335)
-    "Church Scraps Around Along Path": base_id + 1435, # ItemPickup389_5 Secret5_ChurchDetails (X=-66870.719 Y=-85202.180 Z=9843.936)
-    "Church Scraps Around Near Door": base_id + 1436, # ItemPickup388_2 Secret5_ChurchDetails (X=-68588.352 Y=-84041.867 Z=9790.541)
-    "Church Scraps Graveyard Along Path": base_id + 1437, # ItemPickup396_26 Secret5_ChurchDetails (X=-67595.797 Y=-82120.094 Z=9818.303)
-    "Church Scraps Around Under Window": base_id + 1438, # ItemPickup390_8 Secret5_ChurchDetails (X=-67291.000 Y=-83324.836 Z=9774.942)
-    "Church Scraps Graveyard Near Hole": base_id + 1439, # ItemPickup392_14 Secret5_ChurchDetails (X=-65849.070 Y=-80676.477 Z=9895.943)
-    "Church Scraps Graveyard Farthest": base_id + 1440, # ItemPickup395_23 Secret5_ChurchDetails (X=-65170.266 Y=-79155.227 Z=9904.275)
-    "Church Scraps Graveyard Between Graves": base_id + 1441, # ItemPickup24_4 Secret5_GraveyardMain (X=-64837.563 Y=-80885.305 Z=9906.755)
-    "Church Scraps Inside Near Door": base_id + 1442, # ItemPickup22_3 Secret5_ChurchDetails (X=-68248.359 Y=-83578.008 Z=9807.300)
-    "Church Scraps Inside Near Sermon Note": base_id + 1443, # ItemPickup23_5 Secret5_ChurchDetails (X=-67086.102 Y=-84605.086 Z=9805.521)
-    "Church Scraps Inside Black Corner": base_id + 1444, # ItemPickup393_17 Secret5_ChurchDetails (X=-67901.930 Y=-83477.625 Z=9812.613)
-    "Church Scraps Around Behind Trees": base_id + 1445 # ItemPickup394_20 Secret5_ChurchDetails (X=-65834.344 Y=-84192.102 Z=9987.823)
+    "Church Scraps - Around On Downhill Path": base_id + 1434, # ItemPickup391_11 Secret5_ChurchDetails (X=-64009.039 Y=-84252.156 Z=10258.335)
+    "Church Scraps - Around On Back Path 1": base_id + 1435, # ItemPickup389_5 Secret5_ChurchDetails (X=-66870.719 Y=-85202.180 Z=9843.936)
+    "Church Scraps - Around Near Door": base_id + 1436, # ItemPickup388_2 Secret5_ChurchDetails (X=-68588.352 Y=-84041.867 Z=9790.541)
+    "Church Scraps - Graveyard On Path": base_id + 1437, # ItemPickup396_26 Secret5_ChurchDetails (X=-67595.797 Y=-82120.094 Z=9818.303)
+    "Church Scraps - Around Under Window": base_id + 1438, # ItemPickup390_8 Secret5_ChurchDetails (X=-67291.000 Y=-83324.836 Z=9774.942)
+    "Church Scraps - Graveyard Near Graves 1": base_id + 1439, # ItemPickup392_14 Secret5_ChurchDetails (X=-65849.070 Y=-80676.477 Z=9895.943)
+    "Church Scraps - Graveyard Near Graves 2": base_id + 1440, # ItemPickup395_23 Secret5_ChurchDetails (X=-65170.266 Y=-79155.227 Z=9904.275)
+    "Church Scraps - Graveyard Near Graves 3": base_id + 1441, # ItemPickup24_4 Secret5_GraveyardMain (X=-64837.563 Y=-80885.305 Z=9906.755)
+    "Church Scraps - Inside Near Door": base_id + 1442, # ItemPickup22_3 Secret5_ChurchDetails (X=-68248.359 Y=-83578.008 Z=9807.300)
+    "Church Scraps - Inside Near Sermon Note": base_id + 1443, # ItemPickup23_5 Secret5_ChurchDetails (X=-67086.102 Y=-84605.086 Z=9805.521)
+    "Church Scraps - Inside In Black Corner": base_id + 1444, # ItemPickup393_17 Secret5_ChurchDetails (X=-67901.930 Y=-83477.625 Z=9812.613)
+    "Church Scraps - Around On Back Path 2": base_id + 1445 # ItemPickup394_20 Secret5_ChurchDetails (X=-65834.344 Y=-84192.102 Z=9987.823)
 }
 
 loc_west_cottage = {
     "West Cottage Gale Mission Start": base_id + 1446, # (dialog 10) -> mountain_ruin_key
-    "West Cottage Scraps Near Tent": base_id + 1447, # ItemPickup15_3 Mine3_NPCHouse (X=-74407.695 Y=-81781.250 Z=10120.775)
-    "West Cottage Scraps Near Crate": base_id + 1448, # ItemPickup283_5 Mine3_NPCHouseDetails (X=-73784.695 Y=-79414.359 Z=10128.285)
-    "West Cottage Scraps Near Beams": base_id + 1449, # ItemPickup13_1 Mine3_NPCHouse (X=-73992.391 Y=-78600.094 Z=10162.495)
-    "West Cottage Scraps Near Barrier": base_id + 1450, # ItemPickup284_8 Mine3_NPCHouseDetails (X=-71623.000 Y=-75998.023 Z=10275.477)
-    "West Cottage Scraps Near Note": base_id + 1451 # ItemPickup282_2 Mine3_NPCHouseDetails (X=-72626.453 Y=-79391.070 Z=10211.037)
+    "West Cottage Scraps - Near Tent": base_id + 1447, # ItemPickup15_3 Mine3_NPCHouse (X=-74407.695 Y=-81781.250 Z=10120.775)
+    "West Cottage Scraps - Near Crate": base_id + 1448, # ItemPickup283_5 Mine3_NPCHouseDetails (X=-73784.695 Y=-79414.359 Z=10128.285)
+    "West Cottage Scraps - Near Beams": base_id + 1449, # ItemPickup13_1 Mine3_NPCHouse (X=-73992.391 Y=-78600.094 Z=10162.495)
+    "West Cottage Scraps - Near Far Barrier": base_id + 1450, # ItemPickup284_8 Mine3_NPCHouseDetails (X=-71623.000 Y=-75998.023 Z=10275.477)
+    "West Cottage Scraps - Near Note": base_id + 1451 # ItemPickup282_2 Mine3_NPCHouseDetails (X=-72626.453 Y=-79391.070 Z=10211.037)
 }
 
 loc_caravan = {
-    "Caravan Scraps Along Rails": base_id + 1452, # ItemPickup348_11 Secret10_PAth (X=-52638.109 Y=-43924.395 Z=10579.809)
-    "Caravan Scraps Under Lantern": base_id + 1453, # ItemPickup347_8 Secret10_PAth (X=-50203.695 Y=-42865.672 Z=10778.871)
-    "Caravan Scraps Near Footbridge": base_id + 1454, # ItemPickup346_5 Secret10_PAth (X=-48467.738 Y=-42018.488 Z=10818.758)
-    "Caravan Scraps Near Grave": base_id + 1455, # ItemPickup77_14 Secret10_Details (X=-46325.219 Y=-41707.512 Z=11003.229)
-    "Caravan Scraps Along Path": base_id + 1456, # ItemPickup345_2 Secret10_PAth (X=-44557.043 Y=-40652.930 Z=11076.221)
-    "Caravan Scraps Near Tent": base_id + 1457, # ItemPickup76_11 Secret10_Details (X=-43380.664 Y=-38207.152 Z=11165.370)
-    "Caravan Scraps Inside Railcar Left": base_id + 1458, # ItemPickup73_2 Secret10_Details (X=-42919.410 Y=-38797.738 Z=11265.633)
-    "Caravan Scraps Inside Railcar Right": base_id + 1459, # ItemPickup74_5 Secret10_Details (X=-42787.523 Y=-38601.820 Z=11254.003)
-    "Caravan Scraps Behind Railcar": base_id + 1460, # ItemPickup75_8 Secret10_Details (X=-42711.363 Y=-39141.523 Z=11173.905)
-    "Caravan Chest Scraps 1": base_id + 1461, # ItemPickup71561 Secret10_Details (X=-42910.668 Y=-38297.309 Z=11233.402)
-    "Caravan Chest Scraps 2": base_id + 1462, # ItemPickup078654 Secret10_Details (X=-42904.344 Y=-38307.332 Z=11219.678)
-    "Caravan Chest Scraps 3": base_id + 1463, # ItemPickup02345 Secret10_Details (X=-42904.965 Y=-38280.383 Z=11208.191)
-    "Caravan Chest Scraps 4": base_id + 1464, # ItemPickup-6546483648 Secret10_Details (X=-42911.680 Y=-38315.254 Z=11204.225)
-    "Caravan Chest Scraps 5": base_id + 1465 #  ItemPickup176752623547 Secret10_Details (X=-42905.090 Y=-38279.828 Z=11192.738)
+    "Caravan Scraps - Near Rails": base_id + 1452, # ItemPickup348_11 Secret10_PAth (X=-52638.109 Y=-43924.395 Z=10579.809)
+    "Caravan Scraps - Under Lantern": base_id + 1453, # ItemPickup347_8 Secret10_PAth (X=-50203.695 Y=-42865.672 Z=10778.871)
+    "Caravan Scraps - Near Footbridge": base_id + 1454, # ItemPickup346_5 Secret10_PAth (X=-48467.738 Y=-42018.488 Z=10818.758)
+    "Caravan Scraps - Near Grave": base_id + 1455, # ItemPickup77_14 Secret10_Details (X=-46325.219 Y=-41707.512 Z=11003.229)
+    "Caravan Scraps - On Path": base_id + 1456, # ItemPickup345_2 Secret10_PAth (X=-44557.043 Y=-40652.930 Z=11076.221)
+    "Caravan Scraps - Near Tent": base_id + 1457, # ItemPickup76_11 Secret10_Details (X=-43380.664 Y=-38207.152 Z=11165.370)
+    "Caravan Scraps - Inside Railcar 1": base_id + 1458, # ItemPickup73_2 Secret10_Details (X=-42919.410 Y=-38797.738 Z=11265.633)
+    "Caravan Scraps - Inside Railcar 2": base_id + 1459, # ItemPickup74_5 Secret10_Details (X=-42787.523 Y=-38601.820 Z=11254.003)
+    "Caravan Scraps - Behind Railcar": base_id + 1460, # ItemPickup75_8 Secret10_Details (X=-42711.363 Y=-39141.523 Z=11173.905)
+    "Caravan Chest Scraps - 1": base_id + 1461, # ItemPickup71561 Secret10_Details (X=-42910.668 Y=-38297.309 Z=11233.402)
+    "Caravan Chest Scraps - 2": base_id + 1462, # ItemPickup078654 Secret10_Details (X=-42904.344 Y=-38307.332 Z=11219.678)
+    "Caravan Chest Scraps - 3": base_id + 1463, # ItemPickup02345 Secret10_Details (X=-42904.965 Y=-38280.383 Z=11208.191)
+    "Caravan Chest Scraps - 4": base_id + 1464, # ItemPickup-6546483648 Secret10_Details (X=-42911.680 Y=-38315.254 Z=11204.225)
+    "Caravan Chest Scraps - 5": base_id + 1465 #  ItemPickup176752623547 Secret10_Details (X=-42905.090 Y=-38279.828 Z=11192.738)
 }
 
 loc_trailer_cabin = {
-    "Trailer Cabin Scraps Along Rails Near Cabin": base_id + 1466, # ItemPickup493_17 TrailerCabin_Details (X=-50702.449 Y=-38850.020 Z=10810.316)
-    "Trailer Cabin Scraps Near Crates": base_id + 1467, # ItemPickup489_5 TrailerCabin_Details (X=-51365.684 Y=-38502.379 Z=10875.761)
-    "Trailer Cabin Scraps Behind Cabin": base_id + 1468, # ItemPickup491_11 TrailerCabin_Details (X=-52397.570 Y=-37530.145 Z=10873.624)
-    "Trailer Cabin Scraps Near Platform": base_id + 1469, # ItemPickup490_8 TrailerCabin_Details (X=-50625.746 Y=-37916.758 Z=10886.909)
-    "Trailer Cabin Scraps Under Cabin Roof": base_id + 1470, # ItemPickup488_2 TrailerCabin_Details (X=-51201.051 Y=-37467.137 Z=10910.795)
-    "Trailer Cabin Scraps Along Rails Furthest": base_id + 1471 # ItemPickup492_14 TrailerCabin_Details (X=-51891.320 Y=-40549.492 Z=10675.211)
+    "Trailer Cabin Scraps - Near Rails 1": base_id + 1466, # ItemPickup493_17 TrailerCabin_Details (X=-50702.449 Y=-38850.020 Z=10810.316)
+    "Trailer Cabin Scraps - Near Crates": base_id + 1467, # ItemPickup489_5 TrailerCabin_Details (X=-51365.684 Y=-38502.379 Z=10875.761)
+    "Trailer Cabin Scraps - Behind Cabin": base_id + 1468, # ItemPickup491_11 TrailerCabin_Details (X=-52397.570 Y=-37530.145 Z=10873.624)
+    "Trailer Cabin Scraps - Near Platform": base_id + 1469, # ItemPickup490_8 TrailerCabin_Details (X=-50625.746 Y=-37916.758 Z=10886.909)
+    "Trailer Cabin Scraps - Under Cabin Roof": base_id + 1470, # ItemPickup488_2 TrailerCabin_Details (X=-51201.051 Y=-37467.137 Z=10910.795)
+    "Trailer Cabin Scraps - Near Rails 2": base_id + 1471 # ItemPickup492_14 TrailerCabin_Details (X=-51891.320 Y=-40549.492 Z=10675.211)
 }
 
 loc_towers = {
-    "Towers Scraps Middle Under Footbridge": base_id + 1472, # ItemPickup486_32 Towers_Environment_Details (X=-24434.766 Y=-25708.373 Z=11200.865)
-    "Towers Scraps East Along Downhill Path": base_id + 1473, # ItemPickup483_23 Towers_Environment_Details (X=-20970.262 Y=-25678.754 Z=11731.241)
-    "Towers Scraps East Near Beams": base_id + 1474, # ItemPickup481_17 Towers_Environment_Details (X=-19812.230 Y=-27768.301 Z=12051.623)
-    "Towers Scraps East Near Tree": base_id + 1475, # ItemPickup484_26 Towers_Environment_Details (X=-19940.912 Y=-25411.576 Z=12035.366)
-    "Towers Scraps East Under Lantern": base_id + 1476, # ItemPickup41_17 Towers_Environment (X=-18596.791 Y=-25100.035 Z=12290.350)
-    "Towers Scraps Southeast Near Beams": base_id + 1477, # ItemPickup482_20 Towers_Environment_Details (X=-23302.396 Y=-23270.324 Z=12036.164)
-    "Towers Scraps Middle Along Path": base_id + 1478, # ItemPickup487_35 Towers_Environment_Details (X=-22955.039 Y=-27576.859 Z=11211.258)
-    "Towers Scraps Northeast Near Barrier": base_id + 1479, # ItemPickup478_8 Towers_Environment_Details (X=-21485.520 Y=-29634.893 Z=11787.103)
-    "Towers Scraps North On Rocks": base_id + 1480, # ItemPickup477_5 Towers_Environment_Details (X=-23667.957 Y=-29825.240 Z=12035.269)
-    "Towers Scraps North Near Minecart": base_id + 1481, # ItemPickup39_11 Towers_Environment (X=-25361.008 Y=-29794.301 Z=12026.073)
-    "Towers Scraps North Along Path": base_id + 1482, # ItemPickup476_2 Towers_Environment_Details (X=-26549.584 Y=-32768.133 Z=12289.732)
-    "Towers Scraps Northwest On Rocks": base_id + 1483, # ItemPickup38_8 Towers_Environment (X=-27240.127 Y=-27404.748 Z=12027.208)
-    "Towers Scraps Left Tower Footbridge": base_id + 1484, # ItemPickup40_14 Towers_Environment (X=-23231.639 Y=-27799.158 Z=11829.792)
-    "Towers Scraps Right Tower Footbridge ": base_id + 1485, # ItemPickup485_29 Towers_Environment_Details (X=-22949.568 Y=-26146.012 Z=11702.730)
-    "Towers Scraps Northeast Under Lit Lantern": base_id + 1486, # ItemPickup479_11 Towers_Environment_Details (X=-19726.715 Y=-32464.682 Z=12118.678)
-    "Towers Scraps Left Tower Ground Floor": base_id + 1487, # ItemPickup1366543 Tower_BuildingsExteriorDetails (X=-23495.104 Y=-27644.689 Z=11872.844)
-    "Towers Scraps Left Tower First Floor": base_id + 1488, # ItemPickup139978 Tower_BuildingsExteriorDetails (X=-23512.971 Y=-27493.051 Z=12218.543)
-    "Towers Scraps Right Tower First Floor": base_id + 1489, # ItemPickup42_20 Towers_Environment (X=-22731.439 Y=-26331.393 Z=12102.758)
-    "Towers Scraps Right Tower Ground Floor": base_id + 1490, # ItemPickup131123 Tower_BuildingsExteriorDetails (X=-22599.641 Y=-26454.590 Z=11752.040)
-    "Towers Scraps Right Tower Second Floor On Table": base_id + 1491, # ItemPickup196987 Tower_BuildingsExteriorDetails (X=-22589.721 Y=-26397.414 Z=12571.282)
-    "Towers Scraps Right Tower Third Floor Front": base_id + 1492, # ItemPickup138787 Tower_BuildingsExteriorDetails (X=-22163.268 Y=-26775.938 Z=13107.048)
-    "Towers Scraps Right Tower Third Floor Back": base_id + 1493, # ItemPickup43_23 Towers_Environment (X=-21996.184 Y=-26754.393 Z=13105.997)
-    "Towers Scraps Left Tower Second Floor Near Barrier": base_id + 1494, # ItemPickup837454 Tower_BuildingsExteriorDetails (X=-24068.221 Y=-27874.443 Z=12819.666)
-    "Towers Scraps Left Tower Second Floor In Broken Stairs": base_id + 1495, # ItemPickup44_29 Towers_Environment (X=-23525.330 Y=-27770.035 Z=12612.871)
-    "Towers Scraps Left Tower Third Floor Near Stairs": base_id + 1496, # ItemPickup18932 Tower_BuildingsExteriorDetails (X=-23472.215 Y=-27617.404 Z=13213.256)
-    "Towers Scraps Left Tower Third Floor Near Minecart": base_id + 1497, # ItemPickup188348 Tower_BuildingsExteriorDetails (X=-23981.588 Y=-27984.385 Z=13219.854)
-    "Towers Scraps Northeast Near Unlit Lantern": base_id + 1498, # ItemPickup480_14 Towers_Environment_Details (X=-18696.230 Y=-34511.277 Z=12704.238)
+    "Towers Scraps - Middle Under Footbridge": base_id + 1472, # ItemPickup486_32 Towers_Environment_Details (X=-24434.766 Y=-25708.373 Z=11200.865)
+    "Towers Scraps - East On Downhill Path": base_id + 1473, # ItemPickup483_23 Towers_Environment_Details (X=-20970.262 Y=-25678.754 Z=11731.241)
+    "Towers Scraps - East Near Beams": base_id + 1474, # ItemPickup481_17 Towers_Environment_Details (X=-19812.230 Y=-27768.301 Z=12051.623)
+    "Towers Scraps - East Near Tree": base_id + 1475, # ItemPickup484_26 Towers_Environment_Details (X=-19940.912 Y=-25411.576 Z=12035.366)
+    "Towers Scraps - East Under Lantern": base_id + 1476, # ItemPickup41_17 Towers_Environment (X=-18596.791 Y=-25100.035 Z=12290.350)
+    "Towers Scraps - Southeast Near Beams": base_id + 1477, # ItemPickup482_20 Towers_Environment_Details (X=-23302.396 Y=-23270.324 Z=12036.164)
+    "Towers Scraps - Middle On Path": base_id + 1478, # ItemPickup487_35 Towers_Environment_Details (X=-22955.039 Y=-27576.859 Z=11211.258)
+    "Towers Scraps - Northeast Near Barrier": base_id + 1479, # ItemPickup478_8 Towers_Environment_Details (X=-21485.520 Y=-29634.893 Z=11787.103)
+    "Towers Scraps - North On Rocks": base_id + 1480, # ItemPickup477_5 Towers_Environment_Details (X=-23667.957 Y=-29825.240 Z=12035.269)
+    "Towers Scraps - North Near Minecart": base_id + 1481, # ItemPickup39_11 Towers_Environment (X=-25361.008 Y=-29794.301 Z=12026.073)
+    "Towers Scraps - North On Path": base_id + 1482, # ItemPickup476_2 Towers_Environment_Details (X=-26549.584 Y=-32768.133 Z=12289.732)
+    "Towers Scraps - Northwest On Rocks": base_id + 1483, # ItemPickup38_8 Towers_Environment (X=-27240.127 Y=-27404.748 Z=12027.208)
+    "Towers Scraps - Ruined Tower Footbridge": base_id + 1484, # ItemPickup40_14 Towers_Environment (X=-23231.639 Y=-27799.158 Z=11829.792)
+    "Towers Scraps - Locked Tower Footbridge ": base_id + 1485, # ItemPickup485_29 Towers_Environment_Details (X=-22949.568 Y=-26146.012 Z=11702.730)
+    "Towers Scraps - Northeast Under Lit Lantern": base_id + 1486, # ItemPickup479_11 Towers_Environment_Details (X=-19726.715 Y=-32464.682 Z=12118.678)
+    "Towers Scraps - Ruined Tower Floor 1": base_id + 1487, # ItemPickup1366543 Tower_BuildingsExteriorDetails (X=-23495.104 Y=-27644.689 Z=11872.844)
+    "Towers Scraps - Ruined Tower Floor 2": base_id + 1488, # ItemPickup139978 Tower_BuildingsExteriorDetails (X=-23512.971 Y=-27493.051 Z=12218.543)
+    "Towers Scraps - Locked Tower Floor 2": base_id + 1489, # ItemPickup42_20 Towers_Environment (X=-22731.439 Y=-26331.393 Z=12102.758)
+    "Towers Scraps - Locked Tower Floor 1": base_id + 1490, # ItemPickup131123 Tower_BuildingsExteriorDetails (X=-22599.641 Y=-26454.590 Z=11752.040)
+    "Towers Scraps - Locked Tower Floor 3 On Table": base_id + 1491, # ItemPickup196987 Tower_BuildingsExteriorDetails (X=-22589.721 Y=-26397.414 Z=12571.282)
+    "Towers Scraps - Locked Tower Floor 4 Front": base_id + 1492, # ItemPickup138787 Tower_BuildingsExteriorDetails (X=-22163.268 Y=-26775.938 Z=13107.048)
+    "Towers Scraps - Locked Tower Floor 4 Back": base_id + 1493, # ItemPickup43_23 Towers_Environment (X=-21996.184 Y=-26754.393 Z=13105.997)
+    "Towers Scraps - Ruined Tower Floor 3 Near Barrier": base_id + 1494, # ItemPickup837454 Tower_BuildingsExteriorDetails (X=-24068.221 Y=-27874.443 Z=12819.666)
+    "Towers Scraps - Ruined Tower Floor 3 On Broken Stairs": base_id + 1495, # ItemPickup44_29 Towers_Environment (X=-23525.330 Y=-27770.035 Z=12612.871)
+    "Towers Scraps - Ruined Tower Floor 4 Near Stairs": base_id + 1496, # ItemPickup18932 Tower_BuildingsExteriorDetails (X=-23472.215 Y=-27617.404 Z=13213.256)
+    "Towers Scraps - Ruined Tower Floor 4 Near Minecart": base_id + 1497, # ItemPickup188348 Tower_BuildingsExteriorDetails (X=-23981.588 Y=-27984.385 Z=13219.854)
+    "Towers Scraps - Northeast Near Unlit Lantern": base_id + 1498, # ItemPickup480_14 Towers_Environment_Details (X=-18696.230 Y=-34511.277 Z=12704.238)
     "Towers Lime Paint Can": base_id + 1499, # PaintCan_2 Towers_BuildingsDetails (X=-22288.555 Y=-26022.281 Z=11835.892) \!/ Existing match 5
     "Towers Employment Contracts": base_id + 1500, # Towers_Files_Pickup Tower_BuildingsExteriorDetails (X=-24081.414 Y=-27637.459 Z=13679.163)
     "Towers Ronny Mission End": base_id + 1501 # (dialog 3) -> 1_scraps_reward
 }
 
 loc_north_beach = {
-    "North Beach Chest Scraps 1": base_id + 1502, # ItemPickup9254 Secret3_CampDetails (X=-74444.648 Y=-130627.672 Z=8793.757)
-    "North Beach Chest Scraps 2": base_id + 1503, # ItemPickup14523 Secret3_CampDetails (X=-74426.539 Y=-130626.547 Z=8781.948)
-    "North Beach Chest Scraps 3": base_id + 1504, # ItemPickup084537 Secret3_CampDetails (X=-74448.852 Y=-130632.367 Z=8772.555)
-    "North Beach Chest Scraps 4": base_id + 1505, # ItemPickup17754234 Secret3_CampDetails (X=-74425.523 Y=-130622.875 Z=8755.526)
-    "North Beach Scraps Campfire Near Crate Tents": base_id + 1506, # ItemPickup376_5 Secret3_CampDetails (X=-75003.078 Y=-131084.016 Z=8729.731)
-    "North Beach Scraps Shrine Near Middle": base_id + 1507, # ItemPickup378_11 Secret3_CampDetails (X=-75477.758 Y=-129413.750 Z=9082.617)
-    "North Beach Scraps Shrine In Corner": base_id + 1508, # ItemPickup377_8 Secret3_CampDetails (X=-75608.453 Y=-130483.430 Z=8909.659)
-    "North Beach Scraps Campfire Near Bed Tents": base_id + 1509, # ItemPickup375_2 Secret3_CampDetails (X=-74143.469 Y=-131117.953 Z=8752.130)
-    "North Beach Scraps Laying Rightmost": base_id + 1510, # ItemPickup387_6 Secret4_BeachHouseMain (X=-80847.078 Y=-135628.719 Z=7915.444)
-    "North Beach Scraps Laying Downhill": base_id + 1511, # ItemPickup386_3 Secret4_BeachHouseMain (X=-84044.789 Y=-137591.000 Z=7359.172)
-    "North Beach Scraps Laying Blinky": base_id + 1512, # ItemPickup379_2 Secret4_BeachHouseDetails (X=-83992.836 Y=-132933.531 Z=7941.225)
-    "North Beach Scraps Shack Near Grave": base_id + 1513, # ItemPickup380_5 Secret4_BeachHouseDetails (X=-87355.734 Y=-134216.438 Z=7237.310)
-    "North Beach Scraps Shack Near Drying rack": base_id + 1514, # ItemPickup384_17 Secret4_BeachHouseDetails (X=-89213.844 Y=-134625.922 Z=7185.133)
-    "North Beach Scraps Shack Near Water Tank": base_id + 1515, # ItemPickup25_0 Secret4_BeachHouseDetails (X=-88423.430 Y=-135922.969 Z=7290.801)
-    "North Beach Scraps Shack Near Beams": base_id + 1516, # ItemPickup381_8 Secret4_BeachHouseDetails (X=-87668.977 Y=-136850.359 Z=7275.346)
-    "North Beach Scraps Shack Near Floating Bridge": base_id + 1517, # ItemPickup383_14 Secret4_BeachHouseDetails (X=-90241.328 Y=-136381.000 Z=7199.622)
-    "North Beach Scraps Shack On Floating Bridge": base_id + 1518, # ItemPickup27_8 Secret4_BeachHouseDetails (X=-91728.680 Y=-135288.203 Z=7319.699)
-    "North Beach Scraps Shack Behind Door": base_id + 1519, # ItemPickup26_2 Secret4_BeachHouseDetails (X=-88789.039 Y=-135461.719 Z=7305.800)
-    "North Beach Scraps Shack Near Note": base_id + 1520, # ItemPickup382_11 Secret4_BeachHouseDetails (X=-88572.078 Y=-135970.734 Z=7302.674)
+    "North Beach Chest Scraps - 1": base_id + 1502, # ItemPickup9254 Secret3_CampDetails (X=-74444.648 Y=-130627.672 Z=8793.757)
+    "North Beach Chest Scraps - 2": base_id + 1503, # ItemPickup14523 Secret3_CampDetails (X=-74426.539 Y=-130626.547 Z=8781.948)
+    "North Beach Chest Scraps - 3": base_id + 1504, # ItemPickup084537 Secret3_CampDetails (X=-74448.852 Y=-130632.367 Z=8772.555)
+    "North Beach Chest Scraps - 4": base_id + 1505, # ItemPickup17754234 Secret3_CampDetails (X=-74425.523 Y=-130622.875 Z=8755.526)
+    "North Beach Scraps - Campfire Near Crate Tents": base_id + 1506, # ItemPickup376_5 Secret3_CampDetails (X=-75003.078 Y=-131084.016 Z=8729.731)
+    "North Beach Scraps - Shrine Near Middle": base_id + 1507, # ItemPickup378_11 Secret3_CampDetails (X=-75477.758 Y=-129413.750 Z=9082.617)
+    "North Beach Scraps - Shrine In Corner": base_id + 1508, # ItemPickup377_8 Secret3_CampDetails (X=-75608.453 Y=-130483.430 Z=8909.659)
+    "North Beach Scraps - Campfire Near Bed Tents": base_id + 1509, # ItemPickup375_2 Secret3_CampDetails (X=-74143.469 Y=-131117.953 Z=8752.130)
+    "North Beach Scraps - Laying 1": base_id + 1510, # ItemPickup387_6 Secret4_BeachHouseMain (X=-80847.078 Y=-135628.719 Z=7915.444)
+    "North Beach Scraps - Laying 2": base_id + 1511, # ItemPickup386_3 Secret4_BeachHouseMain (X=-84044.789 Y=-137591.000 Z=7359.172)
+    "North Beach Scraps - Laying 3 (Blinky)": base_id + 1512, # ItemPickup379_2 Secret4_BeachHouseDetails (X=-83992.836 Y=-132933.531 Z=7941.225)
+    "North Beach Scraps - Shack Near Grave": base_id + 1513, # ItemPickup380_5 Secret4_BeachHouseDetails (X=-87355.734 Y=-134216.438 Z=7237.310)
+    "North Beach Scraps - Shack Near Drying rack": base_id + 1514, # ItemPickup384_17 Secret4_BeachHouseDetails (X=-89213.844 Y=-134625.922 Z=7185.133)
+    "North Beach Scraps - Shack Near Water Tank": base_id + 1515, # ItemPickup25_0 Secret4_BeachHouseDetails (X=-88423.430 Y=-135922.969 Z=7290.801)
+    "North Beach Scraps - Shack Near Beams": base_id + 1516, # ItemPickup381_8 Secret4_BeachHouseDetails (X=-87668.977 Y=-136850.359 Z=7275.346)
+    "North Beach Scraps - Shack Near Floating Bridge": base_id + 1517, # ItemPickup383_14 Secret4_BeachHouseDetails (X=-90241.328 Y=-136381.000 Z=7199.622)
+    "North Beach Scraps - Shack On Floating Bridge": base_id + 1518, # ItemPickup27_8 Secret4_BeachHouseDetails (X=-91728.680 Y=-135288.203 Z=7319.699)
+    "North Beach Scraps - Shack Behind Door": base_id + 1519, # ItemPickup26_2 Secret4_BeachHouseDetails (X=-88789.039 Y=-135461.719 Z=7305.800)
+    "North Beach Scraps - Shack Near Note": base_id + 1520, # ItemPickup382_11 Secret4_BeachHouseDetails (X=-88572.078 Y=-135970.734 Z=7302.674)
     "North Beach Teal Paint Can": base_id + 1521 # PaintCan_2 Secret4_BeachHouseDetails (X=-91706.805 Y=-134988.453 Z=7347.827) \!/ Existing match 5
     # "North Beach Scraps Glitch 1" ItemPickup385_20 (X=-77651.938 Y=-139721.453 Z=7261.729) /!\ Glitched scrap
 }
 
 loc_mine_shaft = {
-    "Mine Shaft Chest Scraps 1": base_id + 1522, # ItemPickup0934569 Secret13_Details (X=-17360.789 Y=-74064.367 Z=8038.313)
-    "Mine Shaft Chest Scraps 2": base_id + 1523, # ItemPickup17234455622 Secret13_Details (X=-17360.814 Y=-74064.367 Z=8024.187)
-    "Mine Shaft Chest Scraps 3": base_id + 1524, # ItemPickup856743 Secret13_Details (X=-17361.059 Y=-74049.234 Z=8015.940)
-    "Mine Shaft Chest Scraps 4": base_id + 1525, # ItemPickup16456456 Secret13_Details (X=-17336.465 Y=-74087.063 Z=8009.707)
-    "Mine Shaft Chest Scraps 5": base_id + 1526, # ItemPickup234743 Secret13_Details (X=-17349.941 Y=-74075.484 Z=8004.179)
-    "Mine Shaft Chest Scraps 6": base_id + 1527, # ItemPickup1434563456 Secret13_Details (X=-17361.084 Y=-74049.234 Z=8001.814)
-    "Mine Shaft Chest Scraps 7": base_id + 1528, # ItemPickup13634563456 Secret13_Details (X=-17349.967 Y=-74075.484 Z=7990.054)
-    "Mine Shaft Scraps Outside Near Beams": base_id + 1529, # ItemPickup369_23 Secret13_Details (X=-16985.645 Y=-70377.273 Z=10837.127)
-    "Mine Shaft Scraps Outside Near Minecart": base_id + 1530, # ItemPickup368_20 Secret13_Details (X=-18292.045 Y=-71003.563 Z=10975.308)
-    "Mine Shaft Scraps Outside Near Platform": base_id + 1531, # ItemPickup367_17 Secret13_Details (X=-16150.797 Y=-72075.289 Z=10609.141)
-    "Mine Shaft Scraps Outside Near Crates": base_id + 1532, # ItemPickup24456463 Secret13_EntranceDetails1 (X=-18404.480 Y=-71894.367 Z=10968.230)
-    "Mine Shaft Scraps Inside Topmost": base_id + 1533, # ItemPickup2565644 Secret13_Details (X=-17777.268 Y=-71467.172 Z=10441.745)
-    "Mine Shaft Scraps Inside After Freefall": base_id + 1534, # ItemPickup366_14 Secret13_Details (X=-17630.971 Y=-72800.641 Z=8842.322)
-    "Mine Shaft Scraps Inside Near Table": base_id + 1535, # ItemPickup18_8 Secret13_Details (X=-17979.719 Y=-73413.563 Z=8118.260)
-    "Mine Shaft Scraps Inside Near Chest": base_id + 1536, # ItemPickup21_11 Secret13_Details (X=-16554.467 Y=-74139.781 Z=7892.738)
-    "Mine Shaft Scraps Inside On Rocks": base_id + 1537, # ItemPickup365_11 Secret13_Details (X=-16343.033 Y=-74617.555 Z=7298.177)
-    "Mine Shaft Scraps Inside Near Explosives": base_id + 1538, # ItemPickup22123 Secret13_Details (X=-12390.332 Y=-77620.320 Z=7324.504)
-    "Mine Shaft Scraps Inside Near Exit": base_id + 1539, # ItemPickup364_8 Secret13_Details (X=-10969.702 Y=-77961.477 Z=7297.171)
-    "Mine Shaft Scraps Exit Along Rails": base_id + 1540, # ItemPickup363_5 Secret13_Details (X=-9888.596 Y=-78208.930 Z=7269.473)
-    "Mine Shaft Scraps Exit End Rails": base_id + 1541, # ItemPickup362_2 Secret13_Details (X=-8865.696 Y=-79063.977 Z=7247.677)
-    "Mine Shaft Scraps Exit Near Minecart": base_id + 1542 # ItemPickup238976 Secret13_ExitDetails (X=-8143.984 Y=-79764.617 Z=7222.096)
+    "Mine Shaft Chest Scraps - 1": base_id + 1522, # ItemPickup0934569 Secret13_Details (X=-17360.789 Y=-74064.367 Z=8038.313)
+    "Mine Shaft Chest Scraps - 2": base_id + 1523, # ItemPickup17234455622 Secret13_Details (X=-17360.814 Y=-74064.367 Z=8024.187)
+    "Mine Shaft Chest Scraps - 3": base_id + 1524, # ItemPickup856743 Secret13_Details (X=-17361.059 Y=-74049.234 Z=8015.940)
+    "Mine Shaft Chest Scraps - 4": base_id + 1525, # ItemPickup16456456 Secret13_Details (X=-17336.465 Y=-74087.063 Z=8009.707)
+    "Mine Shaft Chest Scraps - 5": base_id + 1526, # ItemPickup234743 Secret13_Details (X=-17349.941 Y=-74075.484 Z=8004.179)
+    "Mine Shaft Chest Scraps - 6": base_id + 1527, # ItemPickup1434563456 Secret13_Details (X=-17361.084 Y=-74049.234 Z=8001.814)
+    "Mine Shaft Chest Scraps - 7": base_id + 1528, # ItemPickup13634563456 Secret13_Details (X=-17349.967 Y=-74075.484 Z=7990.054)
+    "Mine Shaft Scraps - Outside Near Beams": base_id + 1529, # ItemPickup369_23 Secret13_Details (X=-16985.645 Y=-70377.273 Z=10837.127)
+    "Mine Shaft Scraps - Outside Near Minecarts": base_id + 1530, # ItemPickup368_20 Secret13_Details (X=-18292.045 Y=-71003.563 Z=10975.308)
+    "Mine Shaft Scraps - Outside Near Platform": base_id + 1531, # ItemPickup367_17 Secret13_Details (X=-16150.797 Y=-72075.289 Z=10609.141)
+    "Mine Shaft Scraps - Outside Near Crates": base_id + 1532, # ItemPickup24456463 Secret13_EntranceDetails1 (X=-18404.480 Y=-71894.367 Z=10968.230)
+    "Mine Shaft Scraps - Inside Topmost": base_id + 1533, # ItemPickup2565644 Secret13_Details (X=-17777.268 Y=-71467.172 Z=10441.745)
+    "Mine Shaft Scraps - Inside After Freefall": base_id + 1534, # ItemPickup366_14 Secret13_Details (X=-17630.971 Y=-72800.641 Z=8842.322)
+    "Mine Shaft Scraps - Inside Near Table": base_id + 1535, # ItemPickup18_8 Secret13_Details (X=-17979.719 Y=-73413.563 Z=8118.260)
+    "Mine Shaft Scraps - Inside Near Chest": base_id + 1536, # ItemPickup21_11 Secret13_Details (X=-16554.467 Y=-74139.781 Z=7892.738)
+    "Mine Shaft Scraps - Inside On Rocks": base_id + 1537, # ItemPickup365_11 Secret13_Details (X=-16343.033 Y=-74617.555 Z=7298.177)
+    "Mine Shaft Scraps - Inside Near Rails 1": base_id + 1538, # ItemPickup22123 Secret13_Details (X=-12390.332 Y=-77620.320 Z=7324.504)
+    "Mine Shaft Scraps - Inside Near Rails 2": base_id + 1539, # ItemPickup364_8 Secret13_Details (X=-10969.702 Y=-77961.477 Z=7297.171)
+    "Mine Shaft Scraps - Inside Near Rails 3": base_id + 1540, # ItemPickup363_5 Secret13_Details (X=-9888.596 Y=-78208.930 Z=7269.473)
+    "Mine Shaft Scraps - Exit End Rails": base_id + 1541, # ItemPickup362_2 Secret13_Details (X=-8865.696 Y=-79063.977 Z=7247.677)
+    "Mine Shaft Scraps - Exit Near Minecart": base_id + 1542 # ItemPickup238976 Secret13_ExitDetails (X=-8143.984 Y=-79764.617 Z=7222.096)
 }
 
 loc_mob_camp = {
     "Mob Camp Key": base_id + 1543, # ItemPickup29_0 Bob_CampDetails2 (X=-29114.480 Y=-53608.520 Z=12839.528)
-    "Mob Camp Scraps Topmost Near Campfire": base_id + 1544, # ItemPickup25_5 Bob_CampDetails2 (X=-27373.525 Y=-53008.668 Z=12706.465)
-    "Mob Camp Scraps Topmost Near Beds": base_id + 1545, # ItemPickup26_1 Bob_CampDetails2 (X=-28786.941 Y=-53009.762 Z=12760.727)
-    "Mob Camp Scraps Topmost On Balcony": base_id + 1546, # ItemPickup13_14 Mine3_Mountain (X=-29650.207 Y=-53328.070 Z=12724.598)
-    "Mob Camp Scraps Mask Tower Near Note": base_id + 1547, # ItemPickup90_5 Bob_CampDetails2 (X=-31515.057 Y=-55533.324 Z=12344.274)
-    "Mob Camp Scraps Mask Tower Stairs": base_id + 1548, # ItemPickup49513294 Mine3_Mountain (X=-31847.229 Y=-55152.352 Z=11574.255)
-    "Mob Camp Scraps Mask Tower Left": base_id + 1549, # ItemPickup92_14 Bob_CampDetails2 (X=-31323.533 Y=-55432.871 Z=11245.139)
-    "Mob Camp Scraps Mask Tower Right": base_id + 1550, # ItemPickup91_8 Bob_CampDetails2 (X=-31583.443 Y=-55475.805 Z=11234.112)
-    "Mob Camp Scraps Rest Shelter Between Crates Tents": base_id + 1551, # ItemPickup95_23 Bob_CampDetails2 (X=-32925.406 Y=-57157.605 Z=11086.322)
-    "Mob Camp Scraps Rest Shelter Between Explosives Tents": base_id + 1552, # ItemPickup96_26 Bob_CampDetails2 (X=-33052.488 Y=-58560.098 Z=11101.021)
-    "Mob Camp Scraps Workshop Near Beams": base_id + 1553, # ItemPickup13121212 Mine3_Mountain (X=-32422.406 Y=-60145.063 Z=11203.182)
-    "Mob Camp Scraps Workshop Under Stairs": base_id + 1554, # ItemPickup93_17 Bob_CampDetails2 (X=-30891.457 Y=-60046.465 Z=11237.567)
-    "Mob Camp Scraps Workshop Water Tank": base_id + 1555, # ItemPickup97_29 Bob_CampDetails2 (X=-31888.428 Y=-59222.645 Z=11179.302)
-    "Mob Camp Scraps Rest Shelter Near Campfire": base_id + 1556, # ItemPickup62156 Mine3_Mountain (X=-31161.750 Y=-57410.789 Z=11279.820)
-    "Mob Camp Scraps Workshop Tower": base_id + 1557, # ItemPickup24_3 Bob_CampDetails2 (X=-31256.545 Y=-59865.809 Z=11904.155)
-    "Mob Camp Scraps Rest Shelter Inside": base_id + 1558, # ItemPickup27_0 Bob_CampDetails2 (X=-31757.953 Y=-57179.258 Z=11295.150)
-    "Mob Camp Scraps Topmost On Bridge": base_id + 1559 # ItemPickup89_2 Bob_CampDetails2 (X=-29137.043 Y=-54824.797 Z=12418.673)
+    "Mob Camp Scraps - Topmost Near Campfire": base_id + 1544, # ItemPickup25_5 Bob_CampDetails2 (X=-27373.525 Y=-53008.668 Z=12706.465)
+    "Mob Camp Scraps - Topmost Near Beds": base_id + 1545, # ItemPickup26_1 Bob_CampDetails2 (X=-28786.941 Y=-53009.762 Z=12760.727)
+    "Mob Camp Scraps - Topmost On Balcony": base_id + 1546, # ItemPickup13_14 Mine3_Mountain (X=-29650.207 Y=-53328.070 Z=12724.598)
+    "Mob Camp Scraps - Mask Tower Near Note": base_id + 1547, # ItemPickup90_5 Bob_CampDetails2 (X=-31515.057 Y=-55533.324 Z=12344.274)
+    "Mob Camp Scraps - Mask Tower On Stairs": base_id + 1548, # ItemPickup49513294 Mine3_Mountain (X=-31847.229 Y=-55152.352 Z=11574.255)
+    "Mob Camp Scraps - Mask Tower Sheltered 1": base_id + 1549, # ItemPickup92_14 Bob_CampDetails2 (X=-31323.533 Y=-55432.871 Z=11245.139)
+    "Mob Camp Scraps - Mask Tower Sheltered 2": base_id + 1550, # ItemPickup91_8 Bob_CampDetails2 (X=-31583.443 Y=-55475.805 Z=11234.112)
+    "Mob Camp Scraps - Rest Shelter Between Tents 1": base_id + 1551, # ItemPickup95_23 Bob_CampDetails2 (X=-32925.406 Y=-57157.605 Z=11086.322)
+    "Mob Camp Scraps - Rest Shelter Between Tents 2": base_id + 1552, # ItemPickup96_26 Bob_CampDetails2 (X=-33052.488 Y=-58560.098 Z=11101.021)
+    "Mob Camp Scraps - Workshop Near Beams": base_id + 1553, # ItemPickup13121212 Mine3_Mountain (X=-32422.406 Y=-60145.063 Z=11203.182)
+    "Mob Camp Scraps - Workshop Under Stairs": base_id + 1554, # ItemPickup93_17 Bob_CampDetails2 (X=-30891.457 Y=-60046.465 Z=11237.567)
+    "Mob Camp Scraps - Workshop Near Water Tank": base_id + 1555, # ItemPickup97_29 Bob_CampDetails2 (X=-31888.428 Y=-59222.645 Z=11179.302)
+    "Mob Camp Scraps - Rest Shelter Near Campfire": base_id + 1556, # ItemPickup62156 Mine3_Mountain (X=-31161.750 Y=-57410.789 Z=11279.820)
+    "Mob Camp Scraps - Workshop In Tower": base_id + 1557, # ItemPickup24_3 Bob_CampDetails2 (X=-31256.545 Y=-59865.809 Z=11904.155)
+    "Mob Camp Scraps - Rest Shelter Inside": base_id + 1558, # ItemPickup27_0 Bob_CampDetails2 (X=-31757.953 Y=-57179.258 Z=11295.150)
+    "Mob Camp Scraps - Topmost On Bridge": base_id + 1559 # ItemPickup89_2 Bob_CampDetails2 (X=-29137.043 Y=-54824.797 Z=12418.673)
 }
 
 loc_mob_camp_locked_room = {
-    "Mob Camp Locked Room Scraps Near Table": base_id + 1560, # ItemPickup94_20 Bob_CampDetails2 (X=-31736.459 Y=-59761.465 Z=11211.379)
-    "Mob Camp Locked Room Scraps On Shelves": base_id + 1561, # ItemPickup28_14 Bob_CampDetails2 (X=-32150.889 Y=-59879.594 Z=11297.058)
+    "Mob Camp Locked Room Scraps - Near Table": base_id + 1560, # ItemPickup94_20 Bob_CampDetails2 (X=-31736.459 Y=-59761.465 Z=11211.379)
+    "Mob Camp Locked Room Scraps - On Shelves": base_id + 1561, # ItemPickup28_14 Bob_CampDetails2 (X=-32150.889 Y=-59879.594 Z=11297.058)
     "Mob Camp Locked Room Stolen Bob": base_id + 1562 # Bob_Clickbox (X=-31771.172 Y=-59892.449 Z=11323.562)
 }
 
 loc_mine_elevator_exit = {
-    "Mine Elevator Exit Scraps Near Campfire": base_id + 1563, # ItemPickup266_19 Mine3_ExitCampDetails (X=-29587.271 Y=-42650.797 Z=12515.042)
-    "Mine Elevator Exit Scraps Behind Shelter": base_id + 1564, # ItemPickup265_16 Mine3_ExitCampDetails (X=-30727.555 Y=-42715.438 Z=12485.763)
-    "Mine Elevator Exit Scraps Near Tents": base_id + 1565, # ItemPickup267_22 Mine3_ExitCampDetails (X=-29814.680 Y=-43722.777 Z=12518.878)
-    "Mine Elevator Exit Scraps Sheltered": base_id + 1566, # ItemPickup261_2 Mine3_ExitCampDetails (X=-30983.000 Y=-42943.754 Z=12474.396)
-    "Mine Elevator Exit Scraps Near Hole": base_id + 1567, # ItemPickup262_5 Mine3_ExitCampDetails (X=-31824.576 Y=-43997.270 Z=12345.908)
-    "Mine Elevator Exit Scraps Behind Minecart": base_id + 1568, # ItemPickup268_25 Mine3_ExitCampDetails (X=-32553.924 Y=-44761.855 Z=12341.698)
-    "Mine Elevator Exit Scraps Behind Dirt Heaps": base_id + 1569, # ItemPickup263_10 Mine3_ExitCampDetails (X=-33598.023 Y=-44369.297 Z=12438.430)
-    "Mine Elevator Exit Scraps Behind Rocks": base_id + 1570, # ItemPickup264_13 Mine3_ExitCampDetails (X=-31947.459 Y=-42017.137 Z=12384.311)
-    "Mine Elevator Exit Scraps Along Downhill Path": base_id + 1571 # ItemPickup269_28 Mine3_ExitCampDetails (X=-30127.123 Y=-46004.891 Z=12229.104)
+    "Mine Elevator Exit Scraps - Near Campfire": base_id + 1563, # ItemPickup266_19 Mine3_ExitCampDetails (X=-29587.271 Y=-42650.797 Z=12515.042)
+    "Mine Elevator Exit Scraps - Behind Shelter": base_id + 1564, # ItemPickup265_16 Mine3_ExitCampDetails (X=-30727.555 Y=-42715.438 Z=12485.763)
+    "Mine Elevator Exit Scraps - Near Tents": base_id + 1565, # ItemPickup267_22 Mine3_ExitCampDetails (X=-29814.680 Y=-43722.777 Z=12518.878)
+    "Mine Elevator Exit Scraps - Sheltered": base_id + 1566, # ItemPickup261_2 Mine3_ExitCampDetails (X=-30983.000 Y=-42943.754 Z=12474.396)
+    "Mine Elevator Exit Scraps - Near Hole": base_id + 1567, # ItemPickup262_5 Mine3_ExitCampDetails (X=-31824.576 Y=-43997.270 Z=12345.908)
+    "Mine Elevator Exit Scraps - Behind Minecart": base_id + 1568, # ItemPickup268_25 Mine3_ExitCampDetails (X=-32553.924 Y=-44761.855 Z=12341.698)
+    "Mine Elevator Exit Scraps - Behind Dirt Heaps": base_id + 1569, # ItemPickup263_10 Mine3_ExitCampDetails (X=-33598.023 Y=-44369.297 Z=12438.430)
+    "Mine Elevator Exit Scraps - Behind Rocks": base_id + 1570, # ItemPickup264_13 Mine3_ExitCampDetails (X=-31947.459 Y=-42017.137 Z=12384.311)
+    "Mine Elevator Exit Scraps - On Downhill Path": base_id + 1571 # ItemPickup269_28 Mine3_ExitCampDetails (X=-30127.123 Y=-46004.891 Z=12229.104)
 }
 
 loc_mountain_ruin_outside = {
-    "Mountain Ruin Outside Scraps Bottom Sheltered": base_id + 1572, # ItemPickup112345556 Mine3_Outside (X=-2218.456 Y=-43914.789 Z=11238.952)
-    "Mountain Ruin Outside Scraps Bottom Near Minecarts": base_id + 1573, # ItemPickup35621 Mine3_Outside (X=-2402.206 Y=-45494.766 Z=11244.650)
-    "Mountain Ruin Outside Scraps Bottom Near Twin Tents": base_id + 1574, # ItemPickup13000 Mine3_Outside (X=-2781.385 Y=-47365.313 Z=11235.389)
-    "Mountain Ruin Outside Scraps Bottom Near Crates": base_id + 1575, # ItemPickup995959 Mine3_Outside (X=-2961.431 Y=-45445.973 Z=11255.289)
-    "Mountain Ruin Outside Scraps Bottom Collapsed Mines": base_id + 1576, # ItemPickup136999 Mine3_Outside (X=-5873.435 Y=-46300.633 Z=11228.667)
-    "Mountain Ruin Outside Scraps Bottom Between Tents": base_id + 1577, # ItemPickup1589994 Mine3_Outside (X=-1823.357 Y=-47071.813 Z=11161.523)
-    "Mountain Ruin Outside Scraps Bottom Under Lantern": base_id + 1578, # ItemPickup09871230948 Mine3_Outside (X=-3478.155 Y=-49094.965 Z=11083.230)
-    "Mountain Ruin Outside Scraps Downhill Path Top": base_id + 1579, # ItemPickup258_20 Mine3_Camp (X=-4606.678 Y=-50246.180 Z=11613.938)
-    "Mountain Ruin Outside Scraps Downhill Barrier": base_id + 1580, # ItemPickup257_17 Mine3_Camp (X=-5454.638 Y=-53508.004 Z=12062.944)
-    "Mountain Ruin Outside Scraps Pillars Near Minecart": base_id + 1581, # ItemPickup18_3 Mine3_Camp (X=-8192.042 Y=-53726.535 Z=11947.394)
-    "Mountain Ruin Outside Scraps Pillars Near Crate": base_id + 1582, # ItemPickup252_2 Mine3_Camp (X=-9409.834 Y=-53970.621 Z=11923.256)
-    "Mountain Ruin Outside Scraps Pillars Near Dirt Heaps": base_id + 1583, # ItemPickup254_8 Mine3_Camp (X=-8977.424 Y=-57134.637 Z=12232.596)
-    "Mountain Ruin Outside Scraps Pillars Near Tents Right": base_id + 1584, # ItemPickup19_1 Mine3_Camp (X=-10449.292 Y=-56481.938 Z=12274.706)
-    "Mountain Ruin Outside Scraps Pillars Near Tents Left": base_id + 1585, # ItemPickup255_11 Mine3_Camp (X=-10490.690 Y=-56584.301 Z=12281.096)
-    "Mountain Ruin Outside Scraps Pillars Behind Tent": base_id + 1586, # ItemPickup256_14 Mine3_Camp (X=-11600.937 Y=-55831.191 Z=12388.329)
-    "Mountain Ruin Outside Scraps Downhill Path Bottom": base_id + 1587, # ItemPickup259_23 Mine3_Camp (X=-3307.077 Y=-49973.461 Z=11282.041)
-    "Mountain Ruin Outside Scraps Topmost On Rocks": base_id + 1588 # ItemPickup260_26 Mine3_Camp (X=-8878.345 Y=-49816.922 Z=13700.768)
+    "Mountain Ruin Outside Scraps - Bottom Sheltered": base_id + 1572, # ItemPickup112345556 Mine3_Outside (X=-2218.456 Y=-43914.789 Z=11238.952)
+    "Mountain Ruin Outside Scraps - Bottom Near Minecarts": base_id + 1573, # ItemPickup35621 Mine3_Outside (X=-2402.206 Y=-45494.766 Z=11244.650)
+    "Mountain Ruin Outside Scraps - Bottom Near Tents 1": base_id + 1574, # ItemPickup13000 Mine3_Outside (X=-2781.385 Y=-47365.313 Z=11235.389)
+    "Mountain Ruin Outside Scraps - Bottom Near Crates": base_id + 1575, # ItemPickup995959 Mine3_Outside (X=-2961.431 Y=-45445.973 Z=11255.289)
+    "Mountain Ruin Outside Scraps - Bottom Collapsed Mines": base_id + 1576, # ItemPickup136999 Mine3_Outside (X=-5873.435 Y=-46300.633 Z=11228.667)
+    "Mountain Ruin Outside Scraps - Bottom Near Tents 2": base_id + 1577, # ItemPickup1589994 Mine3_Outside (X=-1823.357 Y=-47071.813 Z=11161.523)
+    "Mountain Ruin Outside Scraps - Bottom Under Lantern": base_id + 1578, # ItemPickup09871230948 Mine3_Outside (X=-3478.155 Y=-49094.965 Z=11083.230)
+    "Mountain Ruin Outside Scraps - Downhill Path On Rocks 1": base_id + 1579, # ItemPickup258_20 Mine3_Camp (X=-4606.678 Y=-50246.180 Z=11613.938)
+    "Mountain Ruin Outside Scraps - Downhill Path Near Barrier": base_id + 1580, # ItemPickup257_17 Mine3_Camp (X=-5454.638 Y=-53508.004 Z=12062.944)
+    "Mountain Ruin Outside Scraps - Pillars Near Minecart": base_id + 1581, # ItemPickup18_3 Mine3_Camp (X=-8192.042 Y=-53726.535 Z=11947.394)
+    "Mountain Ruin Outside Scraps - Pillars Near Crate": base_id + 1582, # ItemPickup252_2 Mine3_Camp (X=-9409.834 Y=-53970.621 Z=11923.256)
+    "Mountain Ruin Outside Scraps - Pillars Near Dirt Heaps": base_id + 1583, # ItemPickup254_8 Mine3_Camp (X=-8977.424 Y=-57134.637 Z=12232.596)
+    "Mountain Ruin Outside Scraps - Pillars Near Tents 1": base_id + 1584, # ItemPickup19_1 Mine3_Camp (X=-10449.292 Y=-56481.938 Z=12274.706)
+    "Mountain Ruin Outside Scraps - Pillars Near Tents 2": base_id + 1585, # ItemPickup255_11 Mine3_Camp (X=-10490.690 Y=-56584.301 Z=12281.096)
+    "Mountain Ruin Outside Scraps - Pillars Behind Tent": base_id + 1586, # ItemPickup256_14 Mine3_Camp (X=-11600.937 Y=-55831.191 Z=12388.329)
+    "Mountain Ruin Outside Scraps - Downhill Path On Rocks 2": base_id + 1587, # ItemPickup259_23 Mine3_Camp (X=-3307.077 Y=-49973.461 Z=11282.041)
+    "Mountain Ruin Outside Scraps - Topmost On Rocks": base_id + 1588 # ItemPickup260_26 Mine3_Camp (X=-8878.345 Y=-49816.922 Z=13700.768)
 }
 
 loc_mountain_ruin_inside = {
-    "Mountain Ruin Inside Scraps Entrance Near Door": base_id + 1589, # ItemPickup253_5 Mine3_Camp (X=-10647.446 Y=-52039.848 Z=11925.344)
-    "Mountain Ruin Inside Scraps Entrance Down Stairs": base_id + 1590, # ItemPickup270_2 Mine3_Interior1 (X=-12834.990 Y=-48683.176 Z=10200.083)
-    "Mountain Ruin Inside Scraps Hideout Near First Plank": base_id + 1591, # ItemPickup271_5 Mine3_Interior1 (X=-15748.594 Y=-44925.523 Z=10199.975)
-    "Mountain Ruin Inside Scraps Hideout Rest Area": base_id + 1592, # ItemPickup20_3 Mine3_Interior1 (X=-15312.152 Y=-43957.055 Z=10350.783)
-    "Mountain Ruin Inside Scraps Hideout Near Second Plank": base_id + 1593, # ItemPickup273_11 Mine3_Interior1 (X=-16709.586 Y=-44997.316 Z=10198.888)
-    "Mountain Ruin Inside Scraps Hideout Workspace": base_id + 1594, # ItemPickup272_8 Mine3_Interior1 (X=-17412.561 Y=-46041.977 Z=10349.650)
-    "Mountain Ruin Inside Scraps Guardroom Near Minecart": base_id + 1595, # ItemPickup274_14 Mine3_Interior1 (X=-17452.596 Y=-43804.941 Z=10201.436)
-    "Mountain Ruin Inside Scraps Guardroom Behind Plank": base_id + 1596, # ItemPickup21_2 Mine3_Interior1 (X=-18119.473 Y=-42001.453 Z=10198.855)
-    "Mountain Ruin Inside Scraps Guardroom On Table": base_id + 1597, # ItemPickup276_20 Mine3_Interior1 (X=-18975.068 Y=-42906.488 Z=10279.690)
-    "Mountain Ruin Inside Scraps Guardroom Near Broken Wall": base_id + 1598, # ItemPickup277_26 Mine3_Interior1 (X=-19727.902 Y=-41581.039 Z=10199.614)
-    "Mountain Ruin Inside Scraps Guardroom Near Map": base_id + 1599, # ItemPickup275_17 Mine3_Interior1 (X=-19187.891 Y=-40516.941 Z=10201.049)
-    "Mountain Ruin Inside Scraps Guardroom Near Elevator": base_id + 1600, # ItemPickup278_29 Mine3_Interior1 (X=-22470.986 Y=-41602.875 Z=10073.847)
-    "Mountain Ruin Inside Scraps Tunnels Behind Plank": base_id + 1601, # ItemPickup279_2 Mine3_Interior2 (X=-23717.383 Y=-42597.141 Z=7455.452)
-    "Mountain Ruin Inside Scraps Tunnels Right Dead End": base_id + 1602, # ItemPickup22_7 Mine3_Interior2 (X=-24494.582 Y=-44598.086 Z=7433.633)
-    "Mountain Ruin Inside Scraps Tunnels Left Dead End": base_id + 1603, # ItemPickup280_5 Mine3_Interior2 (X=-26783.293 Y=-42331.145 Z=7446.357)
-    "Mountain Ruin Inside Scraps Tunnels Intersection": base_id + 1604, # ItemPickup281_8 Mine3_Interior2 (X=-28636.996 Y=-46745.340 Z=7430.463)
-    "Mountain Ruin Inside Scraps Tunnels Last Dead End": base_id + 1605, # ItemPickup23_1 Mine3_Interior2 (X=-27752.643 Y=-47453.973 Z=7445.047)
+    "Mountain Ruin Inside Scraps - Entrance Near Door": base_id + 1589, # ItemPickup253_5 Mine3_Camp (X=-10647.446 Y=-52039.848 Z=11925.344)
+    "Mountain Ruin Inside Scraps - Entrance Foot Of Stairs": base_id + 1590, # ItemPickup270_2 Mine3_Interior1 (X=-12834.990 Y=-48683.176 Z=10200.083)
+    "Mountain Ruin Inside Scraps - Hideout Near Plank 1": base_id + 1591, # ItemPickup271_5 Mine3_Interior1 (X=-15748.594 Y=-44925.523 Z=10199.975)
+    "Mountain Ruin Inside Scraps - Hideout In Rest Area": base_id + 1592, # ItemPickup20_3 Mine3_Interior1 (X=-15312.152 Y=-43957.055 Z=10350.783)
+    "Mountain Ruin Inside Scraps - Hideout Near Plank 2": base_id + 1593, # ItemPickup273_11 Mine3_Interior1 (X=-16709.586 Y=-44997.316 Z=10198.888)
+    "Mountain Ruin Inside Scraps - Hideout In Workspace": base_id + 1594, # ItemPickup272_8 Mine3_Interior1 (X=-17412.561 Y=-46041.977 Z=10349.650)
+    "Mountain Ruin Inside Scraps - Guardroom Near Minecart": base_id + 1595, # ItemPickup274_14 Mine3_Interior1 (X=-17452.596 Y=-43804.941 Z=10201.436)
+    "Mountain Ruin Inside Scraps - Guardroom Behind Plank": base_id + 1596, # ItemPickup21_2 Mine3_Interior1 (X=-18119.473 Y=-42001.453 Z=10198.855)
+    "Mountain Ruin Inside Scraps - Guardroom On Table": base_id + 1597, # ItemPickup276_20 Mine3_Interior1 (X=-18975.068 Y=-42906.488 Z=10279.690)
+    "Mountain Ruin Inside Scraps - Guardroom Near Broken Wall": base_id + 1598, # ItemPickup277_26 Mine3_Interior1 (X=-19727.902 Y=-41581.039 Z=10199.614)
+    "Mountain Ruin Inside Scraps - Guardroom Near Map": base_id + 1599, # ItemPickup275_17 Mine3_Interior1 (X=-19187.891 Y=-40516.941 Z=10201.049)
+    "Mountain Ruin Inside Scraps - Guardroom Near Elevator": base_id + 1600, # ItemPickup278_29 Mine3_Interior1 (X=-22470.986 Y=-41602.875 Z=10073.847)
+    "Mountain Ruin Inside Scraps - Tunnels Behind Plank": base_id + 1601, # ItemPickup279_2 Mine3_Interior2 (X=-23717.383 Y=-42597.141 Z=7455.452)
+    "Mountain Ruin Inside Scraps - Tunnels Right Dead End": base_id + 1602, # ItemPickup22_7 Mine3_Interior2 (X=-24494.582 Y=-44598.086 Z=7433.633)
+    "Mountain Ruin Inside Scraps - Tunnels Left Dead End": base_id + 1603, # ItemPickup280_5 Mine3_Interior2 (X=-26783.293 Y=-42331.145 Z=7446.357)
+    "Mountain Ruin Inside Scraps - Tunnels Intersection": base_id + 1604, # ItemPickup281_8 Mine3_Interior2 (X=-28636.996 Y=-46745.340 Z=7430.463)
+    "Mountain Ruin Inside Scraps - Tunnels Last Dead End": base_id + 1605, # ItemPickup23_1 Mine3_Interior2 (X=-27752.643 Y=-47453.973 Z=7445.047)
     "Mountain Ruin Inside Red Egg": base_id + 1606, # Mine3_EggPickup Mine3_Interior2 (X=-28254.400 Y=-45702.844 Z=7551.568)
     "Mountain Ruin Inside Red Paint Can": base_id + 1607 # PaintCan_2 Mine3_Interior2 (X=-31391.293 Y=-44953.223 Z=7448.648) \!/ Existing match 5
 }
 
 loc_pickle_val = {
-    "Pickle Val Scraps Near Platform": base_id + 1608, # ItemPickup56_2 Pickles_HouseDetails (X=60402.582 Y=25252.434 Z=11151.982)
-    "Pickle Val Scraps Near Water Tank": base_id + 1609, # ItemPickup57_5 Pickles_HouseDetails (X=58717.516 Y=24457.180 Z=11343.938)
-    "Pickle Val Scraps Under Unlit Lantern": base_id + 1610, # ItemPickup311_14 Pickles_EnvironmentDetails (X=56455.688 Y=22324.875 Z=11655.192)
-    "Pickle Val Scraps On Rocks": base_id + 1611, # ItemPickup310_11 Pickles_EnvironmentDetails (X=52888.387 Y=22541.955 Z=12428.012)
-    "Pickle Val Scraps Under Lit Lantern": base_id + 1612, # ItemPickup58_2 Pickles_EnvironmentDetails (X=50374.863 Y=22073.027 Z=12591.468)
-    "Pickle Val Scraps Behind Barrier": base_id + 1613, # ItemPickup309_8 Pickles_EnvironmentDetails (X=45985.988 Y=23063.826 Z=13043.497)
-    "Pickle Val Scraps Near Unstacked Bottom Crates": base_id + 1614, # ItemPickup316_27 Pickles_EnvironmentDetails (X=45533.469 Y=24876.168 Z=13015.539)
-    "Pickle Val Scraps Under Top Explosive Sign": base_id + 1615, # ItemPickup317_30 Pickles_EnvironmentDetails (X=44928.848 Y=30913.396 Z=14273.230)
-    "Pickle Val Scraps Near Two Explosive Signs": base_id + 1616, # ItemPickup321_42 Pickles_EnvironmentDetails (X=41572.684 Y=37403.539 Z=13527.379)
-    "Pickle Val Scraps Near Tent": base_id + 1617, # ItemPickup61_11 Pickles_EnvironmentDetails (X=42266.566 Y=30556.238 Z=13584.196)
-    "Pickle Val Scraps Near Unstacked Middle Crates": base_id + 1618, # ItemPickup314_21 Pickles_EnvironmentDetails (X=43356.219 Y=29465.746 Z=13449.486)
-    "Pickle Val Scraps Under Tree": base_id + 1619, # ItemPickup323_48 Pickles_EnvironmentDetails (X=40893.461 Y=30669.398 Z=13465.039)
-    "Pickle Val Scraps Near Beams": base_id + 1620, # ItemPickup318_33 Pickles_EnvironmentDetails (X=41276.863 Y=32313.068 Z=13480.846)
-    "Pickle Val Scraps Near Sheltered Crates": base_id + 1621, # ItemPickup319_36 Pickles_EnvironmentDetails (X=38630.031 Y=30471.996 Z=13571.207)
-    "Pickle Val Scraps Near Sheltered Table": base_id + 1622, # ItemPickup320_39 Pickles_EnvironmentDetails (X=38596.938 Y=30050.293 Z=13559.574)
-    "Pickle Val Scraps Along Top Path": base_id + 1623, # ItemPickup60_8 Pickles_EnvironmentDetails (X=42042.520 Y=25136.820 Z=13077.339)
-    "Pickle Val Scraps Near Explosives": base_id + 1624, # ItemPickup308_5 Pickles_EnvironmentDetails (X=43770.914 Y=23307.234 Z=12374.002)
-    "Pickle Val Scraps Near Stacked Crates": base_id + 1625, # ItemPickup59_5 Pickles_EnvironmentDetails (X=44672.641 Y=20936.520 Z=12198.017)
-    "Pickle Val Scraps Under Bottom Explosive Sign": base_id + 1626, # ItemPickup307_2 Pickles_EnvironmentDetails (X=42844.730 Y=22869.387 Z=12832.900)
-    "Pickle Val Scraps Near Crossroad Crates": base_id + 1627, # ItemPickup315_24 Pickles_EnvironmentDetails (X=43397.758 Y=26367.248 Z=13005.097)
-    "Pickle Val Scraps Above Pickle Cave": base_id + 1628, # ItemPickup322_45 Pickles_EnvironmentDetails (X=39352.430 Y=32668.316 Z=14494.778)
-    "Pickle Val Scraps Inside House Near Table": base_id + 1629, # ItemPickup313 Pickles_EnvironmentDetails (X=59688.781 Y=25266.756 Z=11425.324)
-    "Pickle Val Scraps Inside House Near Beds": base_id + 1630, # ItemPickup312_17 Pickles_EnvironmentDetails (X=59197.871 Y=24760.773 Z=11425.324)
+    "Pickle Val Scraps - House Near Platform": base_id + 1608, # ItemPickup56_2 Pickles_HouseDetails (X=60402.582 Y=25252.434 Z=11151.982)
+    "Pickle Val Scraps - House Near Water Tank": base_id + 1609, # ItemPickup57_5 Pickles_HouseDetails (X=58717.516 Y=24457.180 Z=11343.938)
+    "Pickle Val Scraps - Main Path Under Unlit Lantern": base_id + 1610, # ItemPickup311_14 Pickles_EnvironmentDetails (X=56455.688 Y=22324.875 Z=11655.192)
+    "Pickle Val Scraps - Main Path On Rocks": base_id + 1611, # ItemPickup310_11 Pickles_EnvironmentDetails (X=52888.387 Y=22541.955 Z=12428.012)
+    "Pickle Val Scraps - Main Path Under Lit Lantern": base_id + 1612, # ItemPickup58_2 Pickles_EnvironmentDetails (X=50374.863 Y=22073.027 Z=12591.468)
+    "Pickle Val Scraps - Main Path Behind Barrier": base_id + 1613, # ItemPickup309_8 Pickles_EnvironmentDetails (X=45985.988 Y=23063.826 Z=13043.497)
+    "Pickle Val Scraps - Rising Slope Path Intersection": base_id + 1614, # ItemPickup316_27 Pickles_EnvironmentDetails (X=45533.469 Y=24876.168 Z=13015.539)
+    "Pickle Val Scraps - Rising Slope Path Under Sign": base_id + 1615, # ItemPickup317_30 Pickles_EnvironmentDetails (X=44928.848 Y=30913.396 Z=14273.230)
+    "Pickle Val Scraps - Cross-Val Path Near Two Signs": base_id + 1616, # ItemPickup321_42 Pickles_EnvironmentDetails (X=41572.684 Y=37403.539 Z=13527.379)
+    "Pickle Val Scraps - Cross-Val Path Near Tent": base_id + 1617, # ItemPickup61_11 Pickles_EnvironmentDetails (X=42266.566 Y=30556.238 Z=13584.196)
+    "Pickle Val Scraps - Cross-Val Path Unstacked Crates": base_id + 1618, # ItemPickup314_21 Pickles_EnvironmentDetails (X=43356.219 Y=29465.746 Z=13449.486)
+    "Pickle Val Scraps - Main Path Under High Tree": base_id + 1619, # ItemPickup323_48 Pickles_EnvironmentDetails (X=40893.461 Y=30669.398 Z=13465.039)
+    "Pickle Val Scraps - Main Path Near Beams": base_id + 1620, # ItemPickup318_33 Pickles_EnvironmentDetails (X=41276.863 Y=32313.068 Z=13480.846)
+    "Pickle Val Scraps - Cave Near Crates": base_id + 1621, # ItemPickup319_36 Pickles_EnvironmentDetails (X=38630.031 Y=30471.996 Z=13571.207)
+    "Pickle Val Scraps - Cave Near Table": base_id + 1622, # ItemPickup320_39 Pickles_EnvironmentDetails (X=38596.938 Y=30050.293 Z=13559.574)
+    "Pickle Val Scraps - Cross-Val Path Near Small Tree": base_id + 1623, # ItemPickup60_8 Pickles_EnvironmentDetails (X=42042.520 Y=25136.820 Z=13077.339)
+    "Pickle Val Scraps - Lower Hollow Path Near Explosives": base_id + 1624, # ItemPickup308_5 Pickles_EnvironmentDetails (X=43770.914 Y=23307.234 Z=12374.002)
+    "Pickle Val Scraps - Lower Hollow Path Near Lantern": base_id + 1625, # ItemPickup59_5 Pickles_EnvironmentDetails (X=44672.641 Y=20936.520 Z=12198.017)
+    "Pickle Val Scraps - Cross-Val Path Under Sign": base_id + 1626, # ItemPickup307_2 Pickles_EnvironmentDetails (X=42844.730 Y=22869.387 Z=12832.900)
+    "Pickle Val Scraps - Main Path Near Crossroads Crates": base_id + 1627, # ItemPickup315_24 Pickles_EnvironmentDetails (X=43397.758 Y=26367.248 Z=13005.097)
+    "Pickle Val Scraps - Height Above Pickle Cave": base_id + 1628, # ItemPickup322_45 Pickles_EnvironmentDetails (X=39352.430 Y=32668.316 Z=14494.778)
+    "Pickle Val Scraps - House Inside Near Table": base_id + 1629, # ItemPickup313 Pickles_EnvironmentDetails (X=59688.781 Y=25266.756 Z=11425.324)
+    "Pickle Val Scraps - House Inside Near Beds": base_id + 1630, # ItemPickup312_17 Pickles_EnvironmentDetails (X=59197.871 Y=24760.773 Z=11425.324)
     "Pickle Val Purple Paint Can": base_id + 1631, # PaintCan_7 Pickles_EnvironmentDetails (X=40394.855 Y=31546.465 Z=13472.573)
     "Pickle Val Jar of Pickles": base_id + 1632, # Pickles_Pickup Pickles_Cave (X=38227.535 Y=30234.848 Z=13593.506)
     "Pickle Val Pickle Lady Mission End": base_id + 1633 # (dialog 4) -> 30_scraps_reward
 }
 
 loc_shrine_near_temple = {
-    "Shrine Near Temple Scraps Near Rocks": base_id + 1634, # ItemPickup3 Photorealistic_Island (X=-4675.183 Y=-21143.846 Z=11984.782)
-    "Shrine Near Temple Scraps Along Path": base_id + 1635, # ItemPickup_2 Photorealistic_Island (X=-4994.117 Y=-20496.621 Z=11874.112)
-    "Shrine Near Temple Scraps Near Barriers": base_id + 1636 # ItemPickup2 Photorealistic_Island (X=-4196.896 Y=-20477.025 Z=11882.833)
+    "Shrine Near Temple Scraps - Near Rocks": base_id + 1634, # ItemPickup3 Photorealistic_Island (X=-4675.183 Y=-21143.846 Z=11984.782)
+    "Shrine Near Temple Scraps - On Path": base_id + 1635, # ItemPickup_2 Photorealistic_Island (X=-4994.117 Y=-20496.621 Z=11874.112)
+    "Shrine Near Temple Scraps - Near Barriers": base_id + 1636 # ItemPickup2 Photorealistic_Island (X=-4196.896 Y=-20477.025 Z=11882.833)
 }
 
 loc_morse_bunker = {
-    "Morse Bunker Chest Scraps 1": base_id + 1637, # ItemPickup6512 Secret6_BunkerDetails (X=-47961.078 Y=-85433.031 Z=10615.777)
-    "Morse Bunker Chest Scraps 2": base_id + 1638, # ItemPickup9363 Secret6_BunkerDetails (X=-47958.617 Y=-85444.805 Z=10604.365)
-    "Morse Bunker Chest Scraps 3": base_id + 1639, # ItemPickup921436 Secret6_BunkerDetails (X=-47953.637 Y=-85426.172 Z=10592.347)
-    "Morse Bunker Chest Scraps 4": base_id + 1640, # ItemPickup0128704 Secret6_BunkerDetails (X=-47958.691 Y=-85444.805 Z=10587.060)
-    "Morse Bunker Chest Scraps 5": base_id + 1641, # ItemPickup64_8 Secret6_BunkerDetails (X=-47953.617 Y=-85426.172 Z=10574.149)
-    "Morse Bunker Scraps Inside Near Morse Note": base_id + 1642, # ItemPickup397_2 Secret6_BunkerDetails (X=-48336.863 Y=-85458.453 Z=10574.537)
-    "Morse Bunker Scraps Inside Near Minecart": base_id + 1643, # ItemPickup62_2 Secret6_BunkerDetails (X=-48253.844 Y=-84944.609 Z=10573.793)
-    "Morse Bunker Scraps Near Short Barriers": base_id + 1644, # ItemPickup63_5 Secret6_BunkerDetails (X=-47272.422 Y=-84549.945 Z=10543.671)
-    "Morse Bunker Scraps Under Tree": base_id + 1645, # ItemPickup398_5 Secret6_BunkerDetails (X=-47080.836 Y=-85268.281 Z=10564.355)
-    "Morse Bunker Scraps Above Doors": base_id + 1646, # ItemPickup406_31 Secret6_BunkerDetails (X=-47913.855 Y=-85234.258 Z=10819.314)
-    "Morse Bunker Scraps Downhill Path Near": base_id + 1647, # ItemPickup405_28 Secret6_BunkerDetails (X=-46410.227 Y=-83293.742 Z=10361.746)
-    "Morse Bunker Scraps Main Path": base_id + 1648, # ItemPickup399_8 Secret6_BunkerDetails (X=-45204.199 Y=-84841.211 Z=10329.200)
-    "Morse Bunker Scraps Near Long Barrier": base_id + 1649, # ItemPickup401_14 Secret6_BunkerDetails (X=-43895.801 Y=-83794.750 Z=10265.661)
-    "Morse Bunker Scraps Crossroads": base_id + 1650, # ItemPickup402_17 Secret6_BunkerDetails (X=-45163.078 Y=-80832.828 Z=10090.777)
-    "Morse Bunker Scraps Downhill Path Top": base_id + 1651, # ItemPickup403_20 Secret6_BunkerDetails (X=-46782.027 Y=-82284.805 Z=10289.180)
-    "Morse Bunker Scraps Downhill Path Bottom": base_id + 1652, # ItemPickup404_23 Secret6_BunkerDetails (X=-49240.047 Y=-83654.961 Z=10898.540)
-    "Morse Bunker Scraps On Rocks": base_id + 1653, # ItemPickup407_34 Secret6_BunkerDetails (X=-46571.930 Y=-85962.773 Z=10697.339)
-    "Morse Bunker Scraps Under Lantern": base_id + 1654 # ItemPickup400_11 Secret6_BunkerDetails (X=-43472.793 Y=-85983.805 Z=10310.322)
-}
-
-loc_prism_temple = {
-    "Temple Chest Scraps 1": base_id + 1655, # ItemPickup16632 MainShrine_DetailsREPAIRED (X=12659.641 Y=-27827.016 Z=10930.621)
-    "Temple Chest Scraps 2": base_id + 1656, # ItemPickup148864 MainShrine_DetailsREPAIRED (X=12648.021 Y=-27825.189 Z=10916.296)
-    "Temple Chest Scraps 3": base_id + 1657, # ItemPickup13123 MainShrine_DetailsREPAIRED (X=12665.557 Y=-27836.633 Z=10905.999)
-    "Temple Scraps Ground Southwest Along Path": base_id + 1658, # ItemPickup225_77 MainShrine_ExteriorDetails (X=5281.087 Y=-16620.387 Z=10520.609)
-    "Temple Scraps Ground South Lonely": base_id + 1659, # ItemPickup223_71 MainShrine_ExteriorDetails (X=15032.147 Y=-16788.352 Z=10992.200)
-    "Temple Scraps Ground Southeast Between Tents": base_id + 1660, # ItemPickup222_68 MainShrine_ExteriorDetails (X=16591.920 Y=-18725.771 Z=11004.751)
-    "Temple Scraps Ground East Near Sheltered Boxes": base_id + 1661, # ItemPickup135123 MainShrine_DetailsREPAIRED (X=17940.854 Y=-20726.746 Z=10999.944)
-    "Temple Scraps Ground East Between Sheltered Junks": base_id + 1662, # ItemPickup220_62 MainShrine_ExteriorDetails (X=18187.346 Y=-21390.066 Z=11025.650)
-    "Temple Scraps Ground East Near Barriers": base_id + 1663, # ItemPickup218_56 MainShrine_ExteriorDetails (X=19218.670 Y=-24017.619 Z=10906.966)
-    "Temple Scraps West Rest Shelter Door": base_id + 1664, # ItemPickup209_29 MainShrine_ExteriorDetails (X=7710.977 Y=-23469.254 Z=11012.888)
-    "Temple Scraps West Rest Shelter Beds": base_id + 1665, # ItemPickup138765 MainShrine_DetailsREPAIRED (X=8160.002 Y=-22335.266 Z=11016.638)
-    "Temple Scraps West Explosive Shelter": base_id + 1666, # ItemPickup210_32 MainShrine_ExteriorDetails (X=8637.903 Y=-24295.850 Z=10929.299)
-    "Temple Scraps West Empty Shelter": base_id + 1667, # ItemPickup1112 MainShrine_DetailsREPAIRED (X=7923.367 Y=-25204.055 Z=10832.877)
-    "Temple Scraps Ground Northwest Along Path": base_id + 1668, # ItemPickup214_44 MainShrine_ExteriorDetails (X=10694.420 Y=-27246.365 Z=10569.074)
-    "Temple Scraps Ground Behind Beams": base_id + 1669, # ItemPickup215_47 MainShrine_ExteriorDetails (X=12892.631 Y=-26743.068 Z=10868.578)
-    "Temple Scraps North House Near Door": base_id + 1670, # ItemPickup213_41 MainShrine_ExteriorDetails (X=12483.535 Y=-27253.867 Z=10876.461)
-    "Temple Scraps North House Between Lockers": base_id + 1671, # ItemPickup212_38 MainShrine_ExteriorDetails (X=13259.813 Y=-27092.033 Z=10887.968)
-    "Temple Scraps Ground West Near Shelters": base_id + 1672, # ItemPickup211_35 MainShrine_ExteriorDetails (X=9303.245 Y=-25057.908 Z=10943.273)
-    "Temple Scraps Top Northwest Under Lantern": base_id + 1673, # ItemPickup201_2 MainShrine_ExteriorDetails (X=11750.875 Y=-22999.371 Z=12426.734)
-    "Temple Scraps Scaffolding North": base_id + 1674, # ItemPickup203_8 MainShrine_ExteriorDetails (X=12966.615 Y=-23568.324 Z=12519.387)
-    "Temple Scraps Top Northeast Near Telescope": base_id + 1675, # ItemPickup204_11 MainShrine_ExteriorDetails (X=14093.343 Y=-22393.182 Z=12426.847)
-    "Temple Scraps Top Southeast Near Boxes": base_id + 1676, # ItemPickup206_17 MainShrine_ExteriorDetails (X=13767.980 Y=-21269.568 Z=12425.791)
-    "Temple Scraps Scaffolding South": base_id + 1677, # ItemPickup207_23 MainShrine_ExteriorDetails (X=12882.754 Y=-20027.527 Z=12516.095)
-    "Temple Scraps Top Southwest Near Lantern": base_id + 1678, # ItemPickup114535 MainShrine_DetailsREPAIRED (X=11883.399 Y=-20801.344 Z=12428.452)
-    "Temple Scraps Topmost": base_id + 1679, # ItemPickup208_26 MainShrine_ExteriorDetails (X=13281.792 Y=-21302.344 Z=12902.728)
-    "Temple Scraps Bottom Northeast Under Stairs": base_id + 1680, # ItemPickup205_14 MainShrine_ExteriorDetails (X=14190.678 Y=-23671.621 Z=11781.533)
-    "Temple Scraps Bottom Northeast In Corner": base_id + 1681, # ItemPickup8903 MainShrine_DetailsREPAIRED (X=14311.736 Y=-22347.758 Z=11765.781)
-    "Temple Scraps Bottom Southeast Near Crates": base_id + 1682, # ItemPickup654 MainShrine_DetailsREPAIRED (X=13826.154 Y=-19923.131 Z=11755.189)
-    "Temple Scraps Ground South Down Stairs": base_id + 1683, # ItemPickup224_74 MainShrine_ExteriorDetails (X=12443.228 Y=-18577.926 Z=11240.455)
-    "Temple Scraps Bottom Northwest In Clovers": base_id + 1684, # ItemPickup202_5 MainShrine_ExteriorDetails (X=10993.180 Y=-23783.047 Z=11754.121)
-    "Temple Scraps Northeast Near Tables Outside": base_id + 1685, # ItemPickup13098 MainShrine_DetailsREPAIRED (X=16762.963 Y=-23634.342 Z=11031.588)
-    "Temple Scraps Northeast Under House Roof": base_id + 1686, # ItemPickup221_65 MainShrine_ExteriorDetails (X=17804.979 Y=-23512.395 Z=11066.884)
-    "Temple Scraps Northeast Between Crates Inside": base_id + 1687, # ItemPickup17123123565 MainShrine_DetailsREPAIRED (X=16998.229 Y=-23241.652 Z=11055.539)
-    "Temple Scraps Northeast Near Table Inside": base_id + 1688, # ItemPickup10812783 MainShrine_DetailsREPAIRED (X=17613.518 Y=-23799.813 Z=11057.277)
-    "Temple Scraps Northeast Between Beams": base_id + 1689, # ItemPickup216_50 MainShrine_ExteriorDetails (X=15342.375 Y=-24807.357 Z=11024.192)
-    "Temple Scraps Northeast Near Beams": base_id + 1690, # ItemPickup217_53 MainShrine_ExteriorDetails (X=15963.284 Y=-24834.156 Z=11021.444)
-    "Temple Scraps Ground East Along Path": base_id + 1691 # ItemPickup219_59 MainShrine_ExteriorDetails (X=21563.559 Y=-23705.184 Z=10895.696)
+    "Morse Bunker Chest Scraps - 1": base_id + 1637, # ItemPickup6512 Secret6_BunkerDetails (X=-47961.078 Y=-85433.031 Z=10615.777)
+    "Morse Bunker Chest Scraps - 2": base_id + 1638, # ItemPickup9363 Secret6_BunkerDetails (X=-47958.617 Y=-85444.805 Z=10604.365)
+    "Morse Bunker Chest Scraps - 3": base_id + 1639, # ItemPickup921436 Secret6_BunkerDetails (X=-47953.637 Y=-85426.172 Z=10592.347)
+    "Morse Bunker Chest Scraps - 4": base_id + 1640, # ItemPickup0128704 Secret6_BunkerDetails (X=-47958.691 Y=-85444.805 Z=10587.060)
+    "Morse Bunker Chest Scraps - 5": base_id + 1641, # ItemPickup64_8 Secret6_BunkerDetails (X=-47953.617 Y=-85426.172 Z=10574.149)
+    "Morse Bunker Scraps - Inside Near Morse Note": base_id + 1642, # ItemPickup397_2 Secret6_BunkerDetails (X=-48336.863 Y=-85458.453 Z=10574.537)
+    "Morse Bunker Scraps - Inside Near Minecart": base_id + 1643, # ItemPickup62_2 Secret6_BunkerDetails (X=-48253.844 Y=-84944.609 Z=10573.793)
+    "Morse Bunker Scraps - Near Short Barriers": base_id + 1644, # ItemPickup63_5 Secret6_BunkerDetails (X=-47272.422 Y=-84549.945 Z=10543.671)
+    "Morse Bunker Scraps - Under Tree": base_id + 1645, # ItemPickup398_5 Secret6_BunkerDetails (X=-47080.836 Y=-85268.281 Z=10564.355)
+    "Morse Bunker Scraps - Above Doors": base_id + 1646, # ItemPickup406_31 Secret6_BunkerDetails (X=-47913.855 Y=-85234.258 Z=10819.314)
+    "Morse Bunker Scraps - Downhill Path Near": base_id + 1647, # ItemPickup405_28 Secret6_BunkerDetails (X=-46410.227 Y=-83293.742 Z=10361.746)
+    "Morse Bunker Scraps - Main Path": base_id + 1648, # ItemPickup399_8 Secret6_BunkerDetails (X=-45204.199 Y=-84841.211 Z=10329.200)
+    "Morse Bunker Scraps - Near Long Barrier": base_id + 1649, # ItemPickup401_14 Secret6_BunkerDetails (X=-43895.801 Y=-83794.750 Z=10265.661)
+    "Morse Bunker Scraps - At Crossroads": base_id + 1650, # ItemPickup402_17 Secret6_BunkerDetails (X=-45163.078 Y=-80832.828 Z=10090.777)
+    "Morse Bunker Scraps - Downhill Path Top": base_id + 1651, # ItemPickup403_20 Secret6_BunkerDetails (X=-46782.027 Y=-82284.805 Z=10289.180)
+    "Morse Bunker Scraps - Downhill Path Bottom": base_id + 1652, # ItemPickup404_23 Secret6_BunkerDetails (X=-49240.047 Y=-83654.961 Z=10898.540)
+    "Morse Bunker Scraps - On Rocks": base_id + 1653, # ItemPickup407_34 Secret6_BunkerDetails (X=-46571.930 Y=-85962.773 Z=10697.339)
+    "Morse Bunker Scraps - Under Lantern": base_id + 1654 # ItemPickup400_11 Secret6_BunkerDetails (X=-43472.793 Y=-85983.805 Z=10310.322)
+}
+
+loc_temple = {
+    "Temple Chest Scraps - 1": base_id + 1655, # ItemPickup16632 MainShrine_DetailsREPAIRED (X=12659.641 Y=-27827.016 Z=10930.621)
+    "Temple Chest Scraps - 2": base_id + 1656, # ItemPickup148864 MainShrine_DetailsREPAIRED (X=12648.021 Y=-27825.189 Z=10916.296)
+    "Temple Chest Scraps - 3": base_id + 1657, # ItemPickup13123 MainShrine_DetailsREPAIRED (X=12665.557 Y=-27836.633 Z=10905.999)
+    "Temple Scraps - Around Southwest On Path": base_id + 1658, # ItemPickup225_77 MainShrine_ExteriorDetails (X=5281.087 Y=-16620.387 Z=10520.609)
+    "Temple Scraps - Around South Lonely": base_id + 1659, # ItemPickup223_71 MainShrine_ExteriorDetails (X=15032.147 Y=-16788.352 Z=10992.200)
+    "Temple Scraps - Around Southeast Between Tents": base_id + 1660, # ItemPickup222_68 MainShrine_ExteriorDetails (X=16591.920 Y=-18725.771 Z=11004.751)
+    "Temple Scraps - Around East Near Sheltered Boxes": base_id + 1661, # ItemPickup135123 MainShrine_DetailsREPAIRED (X=17940.854 Y=-20726.746 Z=10999.944)
+    "Temple Scraps - Around East Between Sheltered Junks": base_id + 1662, # ItemPickup220_62 MainShrine_ExteriorDetails (X=18187.346 Y=-21390.066 Z=11025.650)
+    "Temple Scraps - Around East Near Barriers": base_id + 1663, # ItemPickup218_56 MainShrine_ExteriorDetails (X=19218.670 Y=-24017.619 Z=10906.966)
+    "Temple Scraps - Around West Near Rest Shelter Door": base_id + 1664, # ItemPickup209_29 MainShrine_ExteriorDetails (X=7710.977 Y=-23469.254 Z=11012.888)
+    "Temple Scraps - Around West Near Rest Shelter Beds": base_id + 1665, # ItemPickup138765 MainShrine_DetailsREPAIRED (X=8160.002 Y=-22335.266 Z=11016.638)
+    "Temple Scraps - Around West In Explosive Shelter": base_id + 1666, # ItemPickup210_32 MainShrine_ExteriorDetails (X=8637.903 Y=-24295.850 Z=10929.299)
+    "Temple Scraps - Around West In Empty Shelter": base_id + 1667, # ItemPickup1112 MainShrine_DetailsREPAIRED (X=7923.367 Y=-25204.055 Z=10832.877)
+    "Temple Scraps - Around Northwest On Path": base_id + 1668, # ItemPickup214_44 MainShrine_ExteriorDetails (X=10694.420 Y=-27246.365 Z=10569.074)
+    "Temple Scraps - Around North Behind Beams": base_id + 1669, # ItemPickup215_47 MainShrine_ExteriorDetails (X=12892.631 Y=-26743.068 Z=10868.578)
+    "Temple Scraps - Around North Near House Door": base_id + 1670, # ItemPickup213_41 MainShrine_ExteriorDetails (X=12483.535 Y=-27253.867 Z=10876.461)
+    "Temple Scraps - Around North Between House Lockers": base_id + 1671, # ItemPickup212_38 MainShrine_ExteriorDetails (X=13259.813 Y=-27092.033 Z=10887.968)
+    "Temple Scraps - Around West Near Shelters": base_id + 1672, # ItemPickup211_35 MainShrine_ExteriorDetails (X=9303.245 Y=-25057.908 Z=10943.273)
+    "Temple Scraps - Top Northwest Under Lantern": base_id + 1673, # ItemPickup201_2 MainShrine_ExteriorDetails (X=11750.875 Y=-22999.371 Z=12426.734)
+    "Temple Scraps - Top North On Scaffolding": base_id + 1674, # ItemPickup203_8 MainShrine_ExteriorDetails (X=12966.615 Y=-23568.324 Z=12519.387)
+    "Temple Scraps - Top Northeast Near Telescope": base_id + 1675, # ItemPickup204_11 MainShrine_ExteriorDetails (X=14093.343 Y=-22393.182 Z=12426.847)
+    "Temple Scraps - Top Southeast Near Boxes": base_id + 1676, # ItemPickup206_17 MainShrine_ExteriorDetails (X=13767.980 Y=-21269.568 Z=12425.791)
+    "Temple Scraps - Top South On Scaffolding": base_id + 1677, # ItemPickup207_23 MainShrine_ExteriorDetails (X=12882.754 Y=-20027.527 Z=12516.095)
+    "Temple Scraps - Top Southwest Near Lantern": base_id + 1678, # ItemPickup114535 MainShrine_DetailsREPAIRED (X=11883.399 Y=-20801.344 Z=12428.452)
+    "Temple Scraps - Middle Topmost": base_id + 1679, # ItemPickup208_26 MainShrine_ExteriorDetails (X=13281.792 Y=-21302.344 Z=12902.728)
+    "Temple Scraps - Bottom Northeast Under Stairs": base_id + 1680, # ItemPickup205_14 MainShrine_ExteriorDetails (X=14190.678 Y=-23671.621 Z=11781.533)
+    "Temple Scraps - Bottom Northeast In Corner": base_id + 1681, # ItemPickup8903 MainShrine_DetailsREPAIRED (X=14311.736 Y=-22347.758 Z=11765.781)
+    "Temple Scraps - Bottom Southeast Near Crates": base_id + 1682, # ItemPickup654 MainShrine_DetailsREPAIRED (X=13826.154 Y=-19923.131 Z=11755.189)
+    "Temple Scraps - Around South Foot Of Stairs": base_id + 1683, # ItemPickup224_74 MainShrine_ExteriorDetails (X=12443.228 Y=-18577.926 Z=11240.455)
+    "Temple Scraps - Bottom Northwest In Clover": base_id + 1684, # ItemPickup202_5 MainShrine_ExteriorDetails (X=10993.180 Y=-23783.047 Z=11754.121)
+    "Temple Scraps - Around Northeast Near Tables Outside": base_id + 1685, # ItemPickup13098 MainShrine_DetailsREPAIRED (X=16762.963 Y=-23634.342 Z=11031.588)
+    "Temple Scraps - Around Northeast Under House Roof": base_id + 1686, # ItemPickup221_65 MainShrine_ExteriorDetails (X=17804.979 Y=-23512.395 Z=11066.884)
+    "Temple Scraps - Around Northeast Between Crates Inside": base_id + 1687, # ItemPickup17123123565 MainShrine_DetailsREPAIRED (X=16998.229 Y=-23241.652 Z=11055.539)
+    "Temple Scraps - Around Northeast Near Table Inside": base_id + 1688, # ItemPickup10812783 MainShrine_DetailsREPAIRED (X=17613.518 Y=-23799.813 Z=11057.277)
+    "Temple Scraps - Around Northeast Near Beams 1": base_id + 1689, # ItemPickup216_50 MainShrine_ExteriorDetails (X=15342.375 Y=-24807.357 Z=11024.192)
+    "Temple Scraps - Around Northeast Near Beams 2": base_id + 1690, # ItemPickup217_53 MainShrine_ExteriorDetails (X=15963.284 Y=-24834.156 Z=11021.444)
+    "Temple Scraps - Around East On Path": base_id + 1691 # ItemPickup219_59 MainShrine_ExteriorDetails (X=21563.559 Y=-23705.184 Z=10895.696)
 }
 
 
@@ -866,7 +866,7 @@ class CCCharlesLocation(Location):
     **loc_barn,
     **loc_candice_mission,
     **loc_tutorial_house,
-    **loc_swamp_edges,
+    **loc_swamp,
     **loc_swamp_mission,
     **loc_junkyard_area,
     **loc_south_house,
@@ -885,8 +885,8 @@ class CCCharlesLocation(Location):
     **loc_doll_woods,
     **loc_lost_stairs,
     **loc_east_house,
-    **loc_rockets_testing_ground,
-    **loc_rockets_testing_bunker,
+    **loc_rocket_grounds,
+    **loc_rocket_bunker,
     **loc_workshop,
     **loc_east_tower,
     **loc_lighthouse,
@@ -908,7 +908,7 @@ class CCCharlesLocation(Location):
     **loc_mine_elevator_exit,
     **loc_mountain_ruin_outside,
     **loc_mountain_ruin_inside,
-    **loc_prism_temple,
+    **loc_temple,
     **loc_pickle_val,
     **loc_shrine_near_temple,
     **loc_morse_bunker
diff --git a/worlds/cccharles/Regions.py b/worlds/cccharles/Regions.py
index 68239dc060f1..3bab85917e0d 100644
--- a/worlds/cccharles/Regions.py
+++ b/worlds/cccharles/Regions.py
@@ -3,15 +3,15 @@
 from .Options import CCCharlesOptions
 from .Locations import (
     CCCharlesLocation, loc_start_camp, loc_tony_tiddle_mission, loc_barn, loc_candice_mission, \
-    loc_tutorial_house, loc_swamp_edges, loc_swamp_mission, loc_junkyard_area, loc_south_house, \
+    loc_tutorial_house, loc_swamp, loc_swamp_mission, loc_junkyard_area, loc_south_house, \
     loc_junkyard_shed, loc_military_base, loc_south_mine_outside, loc_south_mine_inside, \
     loc_middle_station, loc_canyon, loc_watchtower, loc_boulder_field, loc_haunted_house, \
     loc_santiago_house, loc_port, loc_trench_house, loc_doll_woods, loc_lost_stairs, loc_east_house, \
-    loc_rockets_testing_ground, loc_rockets_testing_bunker, loc_workshop, loc_east_tower, \
+    loc_rocket_grounds, loc_rocket_bunker, loc_workshop, loc_east_tower, \
     loc_lighthouse, loc_north_mine_outside, loc_north_mine_inside, loc_wood_bridge, loc_museum, \
     loc_barbed_shelter, loc_west_beach, loc_church, loc_west_cottage, loc_caravan, loc_trailer_cabin, \
     loc_towers, loc_north_beach, loc_mine_shaft, loc_mob_camp, loc_mob_camp_locked_room, \
-    loc_mine_elevator_exit, loc_mountain_ruin_outside, loc_mountain_ruin_inside, loc_prism_temple, \
+    loc_mine_elevator_exit, loc_mountain_ruin_outside, loc_mountain_ruin_inside, loc_temple, \
     loc_pickle_val, loc_shrine_near_temple, loc_morse_bunker
 )
 
@@ -40,9 +40,9 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     tutorial_house_region.add_locations(loc_tutorial_house, CCCharlesLocation)
     world.regions.append(tutorial_house_region)
 
-    swamp_edges_region = Region("Swamp Edges", player, world)
-    swamp_edges_region.add_locations(loc_swamp_edges, CCCharlesLocation)
-    world.regions.append(swamp_edges_region)
+    swamp_region = Region("Swamp", player, world)
+    swamp_region.add_locations(loc_swamp, CCCharlesLocation)
+    world.regions.append(swamp_region)
 
     swamp_mission_region = Region("Swamp Mission", player, world)
     swamp_mission_region.add_locations(loc_swamp_mission, CCCharlesLocation)
@@ -116,13 +116,13 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     east_house_region.add_locations(loc_east_house, CCCharlesLocation)
     world.regions.append(east_house_region)
 
-    rockets_testing_ground_region = Region("Rockets Testing Ground", player, world)
-    rockets_testing_ground_region.add_locations(loc_rockets_testing_ground, CCCharlesLocation)
-    world.regions.append(rockets_testing_ground_region)
+    rocket_grounds_region = Region("Rocket Grounds", player, world)
+    rocket_grounds_region.add_locations(loc_rocket_grounds, CCCharlesLocation)
+    world.regions.append(rocket_grounds_region)
 
-    rockets_testing_bunker_region = Region("Rockets Testing Bunker", player, world)
-    rockets_testing_bunker_region.add_locations(loc_rockets_testing_bunker, CCCharlesLocation)
-    world.regions.append(rockets_testing_bunker_region)
+    rocket_bunker_region = Region("Rocket Bunker", player, world)
+    rocket_bunker_region.add_locations(loc_rocket_bunker, CCCharlesLocation)
+    world.regions.append(rocket_bunker_region)
 
     workshop_region = Region("Workshop", player, world)
     workshop_region.add_locations(loc_workshop, CCCharlesLocation)
@@ -208,9 +208,9 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     mountain_ruin_inside_region.add_locations(loc_mountain_ruin_inside, CCCharlesLocation)
     world.regions.append(mountain_ruin_inside_region)
 
-    prism_temple_region = Region("Prism Temple", player, world)
-    prism_temple_region.add_locations(loc_prism_temple, CCCharlesLocation)
-    world.regions.append(prism_temple_region)
+    temple_region = Region("Temple", player, world)
+    temple_region.add_locations(loc_temple, CCCharlesLocation)
+    world.regions.append(temple_region)
 
     pickle_val_region = Region("Pickle Val", player, world)
     pickle_val_region.add_locations(loc_pickle_val, CCCharlesLocation)
@@ -225,9 +225,9 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     world.regions.append(morse_bunker_region)
 
     # Place "Victory" event at "Final Boss" location
-    loc_final_boss = CCCharlesLocation(player, "Final Boss", None, prism_temple_region)
+    loc_final_boss = CCCharlesLocation(player, "Final Boss", None, temple_region)
     loc_final_boss.place_locked_item(CCCharlesItem("Victory", ItemClassification.progression, None, player))
-    prism_temple_region.locations.append(loc_final_boss)
+    temple_region.locations.append(loc_final_boss)
 
     # Connect the Regions by named Entrances that must have access Rules
     menu_region.connect(start_camp_region)
@@ -235,7 +235,7 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     menu_region.connect(barn_region, "Barn Door")
     menu_region.connect(candice_mission_region)
     menu_region.connect(tutorial_house_region, "Tutorial House Door")
-    menu_region.connect(swamp_edges_region)
+    menu_region.connect(swamp_region)
     menu_region.connect(swamp_mission_region)
     menu_region.connect(junkyard_area_region)
     menu_region.connect(south_house_region)
@@ -254,8 +254,8 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     menu_region.connect(doll_woods_region)
     menu_region.connect(lost_stairs_region)
     menu_region.connect(east_house_region)
-    menu_region.connect(rockets_testing_ground_region)
-    rockets_testing_ground_region.connect(rockets_testing_bunker_region, "Stuck Bunker Door")
+    menu_region.connect(rocket_grounds_region)
+    rocket_grounds_region.connect(rocket_bunker_region, "Stuck Bunker Door")
     menu_region.connect(workshop_region)
     menu_region.connect(east_tower_region)
     menu_region.connect(lighthouse_region)
@@ -277,7 +277,7 @@ def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) ->
     menu_region.connect(mine_elevator_exit_region)
     menu_region.connect(mountain_ruin_outside_region)
     mountain_ruin_outside_region.connect(mountain_ruin_inside_region, "Mountain Ruin Gate")
-    menu_region.connect(prism_temple_region)
+    menu_region.connect(temple_region)
     menu_region.connect(pickle_val_region)
     menu_region.connect(shrine_near_temple_region)
     menu_region.connect(morse_bunker_region)
diff --git a/worlds/cccharles/Rules.py b/worlds/cccharles/Rules.py
index 979aacd5294b..95bad8cc51e3 100644
--- a/worlds/cccharles/Rules.py
+++ b/worlds/cccharles/Rules.py
@@ -24,17 +24,17 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
         lambda state: state.has("Ancient Tablet", player))
 
     # South House
-    set_rule(world.get_location("South House Chest Scraps 1", player),
+    set_rule(world.get_location("South House Chest Scraps - 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("South House Chest Scraps 2", player),
+    set_rule(world.get_location("South House Chest Scraps - 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("South House Chest Scraps 3", player),
+    set_rule(world.get_location("South House Chest Scraps - 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("South House Chest Scraps 4", player),
+    set_rule(world.get_location("South House Chest Scraps - 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("South House Chest Scraps 5", player),
+    set_rule(world.get_location("South House Chest Scraps - 5", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("South House Chest Scraps 6", player),
+    set_rule(world.get_location("South House Chest Scraps - 6", player),
         lambda state: state.has("Lockpicks", player))
 
     # South Mine
@@ -61,29 +61,29 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
         lambda state: state.has("Journal", player))
 
     # Trench House
-    set_rule(world.get_location("Trench House Chest Scraps 1", player),
+    set_rule(world.get_location("Trench House Chest Scraps - 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Trench House Chest Scraps 2", player),
+    set_rule(world.get_location("Trench House Chest Scraps - 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Trench House Chest Scraps 3", player),
+    set_rule(world.get_location("Trench House Chest Scraps - 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Trench House Chest Scraps 4", player),
+    set_rule(world.get_location("Trench House Chest Scraps - 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Trench House Chest Scraps 5", player),
+    set_rule(world.get_location("Trench House Chest Scraps - 5", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Trench House Chest Scraps 6", player),
+    set_rule(world.get_location("Trench House Chest Scraps - 6", player),
         lambda state: state.has("Lockpicks", player))
 
     # East House
-    set_rule(world.get_location("East House Chest Scraps 1", player),
+    set_rule(world.get_location("East House Chest Scraps - 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("East House Chest Scraps 2", player),
+    set_rule(world.get_location("East House Chest Scraps - 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("East House Chest Scraps 3", player),
+    set_rule(world.get_location("East House Chest Scraps - 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("East House Chest Scraps 4", player),
+    set_rule(world.get_location("East House Chest Scraps - 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("East House Chest Scraps 5", player),
+    set_rule(world.get_location("East House Chest Scraps - 5", player),
         lambda state: state.has("Lockpicks", player))
 
     # Rocket Testing Bunker
@@ -111,29 +111,29 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
         # lambda state: state.has("Remote Explosive", player, 8)) # TODO: Add an option to split remote explosives
 
     # West Beach
-    set_rule(world.get_location("West Beach Chest Scraps 1", player),
+    set_rule(world.get_location("West Beach Chest Scraps - 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("West Beach Chest Scraps 2", player),
+    set_rule(world.get_location("West Beach Chest Scraps - 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("West Beach Chest Scraps 3", player),
+    set_rule(world.get_location("West Beach Chest Scraps - 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("West Beach Chest Scraps 4", player),
+    set_rule(world.get_location("West Beach Chest Scraps - 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("West Beach Chest Scraps 5", player),
+    set_rule(world.get_location("West Beach Chest Scraps - 5", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("West Beach Chest Scraps 6", player),
+    set_rule(world.get_location("West Beach Chest Scraps - 6", player),
         lambda state: state.has("Lockpicks", player))
 
     # Caravan
-    set_rule(world.get_location("Caravan Chest Scraps 1", player),
+    set_rule(world.get_location("Caravan Chest Scraps - 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Caravan Chest Scraps 2", player),
+    set_rule(world.get_location("Caravan Chest Scraps - 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Caravan Chest Scraps 3", player),
+    set_rule(world.get_location("Caravan Chest Scraps - 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Caravan Chest Scraps 4", player),
+    set_rule(world.get_location("Caravan Chest Scraps - 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Caravan Chest Scraps 5", player),
+    set_rule(world.get_location("Caravan Chest Scraps - 5", player),
         lambda state: state.has("Lockpicks", player))
 
     # Ronny
@@ -141,29 +141,29 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
         lambda state: state.has("Employment Contracts", player))
 
     # North Beach
-    set_rule(world.get_location("North Beach Chest Scraps 1", player),
+    set_rule(world.get_location("North Beach Chest Scraps - 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("North Beach Chest Scraps 2", player),
+    set_rule(world.get_location("North Beach Chest Scraps - 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("North Beach Chest Scraps 3", player),
+    set_rule(world.get_location("North Beach Chest Scraps - 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("North Beach Chest Scraps 4", player),
+    set_rule(world.get_location("North Beach Chest Scraps - 4", player),
         lambda state: state.has("Lockpicks", player))
 
     # Mine Shaft
-    set_rule(world.get_location("Mine Shaft Chest Scraps 1", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps - 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Mine Shaft Chest Scraps 2", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps - 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Mine Shaft Chest Scraps 3", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps - 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Mine Shaft Chest Scraps 4", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps - 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Mine Shaft Chest Scraps 5", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps - 5", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Mine Shaft Chest Scraps 6", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps - 6", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Mine Shaft Chest Scraps 7", player),
+    set_rule(world.get_location("Mine Shaft Chest Scraps - 7", player),
         lambda state: state.has("Lockpicks", player))
 
     # Mob Camp
@@ -180,12 +180,12 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
     set_rule(world.get_location("Mountain Ruin Inside Red Paint Can", player),
         lambda state: state.has("Lockpicks", player))
 
-    # Prism Temple
-    set_rule(world.get_location("Prism Temple Chest Scraps 1", player),
+    # Temple
+    set_rule(world.get_location("Temple Chest Scraps - 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Prism Temple Chest Scraps 2", player),
+    set_rule(world.get_location("Temple Chest Scraps - 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Prism Temple Chest Scraps 3", player),
+    set_rule(world.get_location("Temple Chest Scraps - 3", player),
         lambda state: state.has("Lockpicks", player))
 
     # Pickle Lady
@@ -195,15 +195,15 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
         lambda state: state.has("Jar of Pickles", player))
 
     # Morse Bunker
-    set_rule(world.get_location("Morse Bunker Chest Scraps 1", player),
+    set_rule(world.get_location("Morse Bunker Chest Scraps - 1", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Morse Bunker Chest Scraps 2", player),
+    set_rule(world.get_location("Morse Bunker Chest Scraps - 2", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Morse Bunker Chest Scraps 3", player),
+    set_rule(world.get_location("Morse Bunker Chest Scraps - 3", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Morse Bunker Chest Scraps 4", player),
+    set_rule(world.get_location("Morse Bunker Chest Scraps - 4", player),
         lambda state: state.has("Lockpicks", player))
-    set_rule(world.get_location("Morse Bunker Chest Scraps 5", player),
+    set_rule(world.get_location("Morse Bunker Chest Scraps - 5", player),
         lambda state: state.has("Lockpicks", player))
 
     # Add rules to reach the "Go mode"

From 3c0f670420d2da58ffee2e1f4877a20c31836e57 Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Tue, 2 Dec 2025 00:38:51 +0100
Subject: [PATCH 22/23] Fixed missed renaming issues

---
 worlds/cccharles/Locations.py | 2 +-
 worlds/cccharles/Rules.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/worlds/cccharles/Locations.py b/worlds/cccharles/Locations.py
index 4aeccd23f0ec..8f1a675cb3dd 100644
--- a/worlds/cccharles/Locations.py
+++ b/worlds/cccharles/Locations.py
@@ -46,7 +46,7 @@ class CCCharlesLocation(Location):
 }
 
 loc_swamp = {
-    "Swamp Scraps - South Path To Candice": base_id + 1022, # ItemPickup465_67 Swamp_EnvironmentDetails (X=81964.398 Y=72167.305 Z=10116.385)
+    "Swamp Scraps - South Path To Tutorial House": base_id + 1022, # ItemPickup465_67 Swamp_EnvironmentDetails (X=81964.398 Y=72167.305 Z=10116.385)
     "Swamp Scraps - South Between Trees": base_id + 1023, # ItemPickup460_52 Swamp_EnvironmentDetails (X=89674.047 Y=71610.008 Z=9482.095)
     "Swamp Scraps - South In Clover": base_id + 1024, # ItemPickup459_49 Swamp_EnvironmentDetails (X=91637.156 Y=73345.672 Z=9492.019)
     "Swamp Scraps - South At Crossroads": base_id + 1025, # ItemPickup458_46 Swamp_EnvironmentDetails (X=94601.117 Y=75064.117 Z=9567.464)
diff --git a/worlds/cccharles/Rules.py b/worlds/cccharles/Rules.py
index 95bad8cc51e3..9768f05befc6 100644
--- a/worlds/cccharles/Rules.py
+++ b/worlds/cccharles/Rules.py
@@ -86,7 +86,7 @@ def set_rules(world: MultiWorld, options: CCCharlesOptions, player: int) -> None
     set_rule(world.get_location("East House Chest Scraps - 5", player),
         lambda state: state.has("Lockpicks", player))
 
-    # Rocket Testing Bunker
+    # Rocket Bunker
     set_rule(world.get_entrance("Stuck Bunker Door", player),
         lambda state: state.has("Timed Dynamite", player))
 

From b833e065d1cd1bfd4badc4905fdeeb6896b1de9b Mon Sep 17 00:00:00 2001
From: lgbarrere <louis.gabriel.barrere@gmail.com>
Date: Fri, 12 Dec 2025 23:37:16 +0100
Subject: [PATCH 23/23] CCCharles: Add world_version to check mismatch

---
 worlds/cccharles/__init__.py      | 8 ++++++++
 worlds/cccharles/archipelago.json | 6 ++++++
 2 files changed, 14 insertions(+)
 create mode 100644 worlds/cccharles/archipelago.json

diff --git a/worlds/cccharles/__init__.py b/worlds/cccharles/__init__.py
index 0888d8a8505d..27d240ce7a32 100644
--- a/worlds/cccharles/__init__.py
+++ b/worlds/cccharles/__init__.py
@@ -5,6 +5,7 @@
 from .Regions import create_regions
 from BaseClasses import Tutorial, ItemClassification
 from worlds.AutoWorld import InvalidItemError, World, WebWorld
+from typing import Any
 
 
 class CCCharlesWeb(WebWorld):
@@ -169,3 +170,10 @@ def set_rules(self) -> None:
 
     def get_filler_item_name(self) -> str:
         return "Scraps"
+
+    def fill_slot_data(self) -> dict[str, Any]:
+        slot_data = {
+            # See world_version in archipelago.json: used to check mod compliance with apworld
+            "world_version": self.world_version.as_simple_string()
+        }
+        return slot_data
diff --git a/worlds/cccharles/archipelago.json b/worlds/cccharles/archipelago.json
new file mode 100644
index 000000000000..d6a17eb606b4
--- /dev/null
+++ b/worlds/cccharles/archipelago.json
@@ -0,0 +1,6 @@
+{
+  "game": "Choo-Choo Charles",
+  "minimum_ap_version": "0.6.4",
+  "world_version": "1.0.0",
+  "authors": ["Yaranorgoth"]
+}