Docs: Add deprioritized to AP API doc

Did this on my phone while in the bathroom :)

.github/workflows/docker.yml

@@ -1,154 +0,0 @@
-name: Build and Publish Docker Images
-
-on:
-  push:
-    paths:
-      - "**"
-      - "!docs/**"
-      - "!deploy/**"
-      - "!setup.py"
-      - "!.gitignore"
-      - "!.github/workflows/**"
-      - ".github/workflows/docker.yml"
-    branches:
-      - "*"
-    tags:
-      - "v?[0-9]+.[0-9]+.[0-9]*"
-  workflow_dispatch:
-
-env:
-  REGISTRY: ghcr.io
-
-jobs:
-  prepare:
-    runs-on: ubuntu-latest
-    outputs:
-      image-name: ${{ steps.image.outputs.name }}
-      tags: ${{ steps.meta.outputs.tags }}
-      labels: ${{ steps.meta.outputs.labels }}
-      package-name: ${{ steps.package.outputs.name }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set lowercase image name
-        id: image
-        run: |
-          echo "name=${GITHUB_REPOSITORY,,}" >> $GITHUB_OUTPUT
-
-      - name: Set package name
-        id: package
-        run: |
-          echo "name=$(basename ${GITHUB_REPOSITORY,,})" >> $GITHUB_OUTPUT
-
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ steps.image.outputs.name }}
-          tags: |
-            type=ref,event=branch,enable={{is_not_default_branch}}
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=nightly,enable={{is_default_branch}}
-
-      - name: Compute final tags
-        id: final-tags
-        run: |
-          readarray -t tags <<< "${{ steps.meta.outputs.tags }}"
-
-          if [[ "${{ github.ref_type }}" == "tag" ]]; then
-            tag="${{ github.ref_name }}"
-            if [[ "$tag" =~ ^v?[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-              full_latest="${{ env.REGISTRY }}/${{ steps.image.outputs.name }}:latest"
-              # Check if latest is already in tags to avoid duplicates
-              if ! printf '%s\n' "${tags[@]}" | grep -q "^$full_latest$"; then
-                tags+=("$full_latest")
-              fi
-            fi
-          fi
-
-          # Set multiline output
-          echo "tags<<EOF" >> $GITHUB_OUTPUT
-          printf '%s\n' "${tags[@]}" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
-  build:
-    needs: prepare
-    runs-on: ${{ matrix.runner }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      matrix:
-        include:
-          - platform: amd64
-            runner: ubuntu-latest
-            suffix: amd64
-            cache-scope: amd64
-          - platform: arm64
-            runner: ubuntu-24.04-arm
-            suffix: arm64
-            cache-scope: arm64
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Compute suffixed tags
-        id: tags
-        run: |
-          readarray -t tags <<< "${{ needs.prepare.outputs.tags }}"
-          suffixed=()
-          for t in "${tags[@]}"; do
-            suffixed+=("$t-${{ matrix.suffix }}")
-          done
-          echo "tags=$(IFS=','; echo "${suffixed[*]}")" >> $GITHUB_OUTPUT
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/${{ matrix.platform }}
-          push: true
-          tags: ${{ steps.tags.outputs.tags }}
-          labels: ${{ needs.prepare.outputs.labels }}
-          cache-from: type=gha,scope=${{ matrix.cache-scope }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.cache-scope }}
-          provenance: false
-
-  manifest:
-    needs: [prepare, build]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Create and push multi-arch manifest
-        run: |
-          readarray -t tag_array <<< "${{ needs.prepare.outputs.tags }}"
-
-          for tag in "${tag_array[@]}"; do
-            docker manifest create "$tag" \
-              "$tag-amd64" \
-              "$tag-arm64"
-            
-            docker manifest push "$tag"
-          done

.github/workflows/label-pull-requests.yml

@@ -12,6 +12,7 @@ env:
 jobs:
   labeler:
     name: 'Apply content-based labels'
+    if: github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'synchronize'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/labeler@v5

.github/workflows/release.yml

@@ -5,7 +5,7 @@ name: Release
 on:
   push:
     tags:
-      - 'v?[0-9]+.[0-9]+.[0-9]*'
+      - '*.*.*'
 
 env:
   ENEMIZER_VERSION: 7.1

.github/workflows/unittests.yml

@@ -41,13 +41,12 @@ jobs:
         python:
           - {version: '3.11.2'} # Change to '3.11' around 2026-06-10
           - {version: '3.12'}
-          - {version: '3.13'}
         include:
           - python: {version: '3.11'}  # old compat
             os: windows-latest
-          - python: {version: '3.13'}  # current
+          - python: {version: '3.12'}  # current
             os: windows-latest
-          - python: {version: '3.13'}  # current
+          - python: {version: '3.12'}  # current
             os: macos-latest
 
     steps:
@@ -75,7 +74,7 @@ jobs:
         os:
           - ubuntu-latest
         python:
-          - {version: '3.13'}  # current
+          - {version: '3.12'}  # current
 
     steps:
     - uses: actions/checkout@v4

BaseClasses.py

@@ -261,7 +261,6 @@ class MultiWorld():
                         "local_items": set(item_link.get("local_items", [])),
                         "non_local_items": set(item_link.get("non_local_items", [])),
                         "link_replacement": replacement_prio.index(item_link["link_replacement"]),
-                        "skip_if_solo": item_link.get("skip_if_solo", False),
                     }
 
         for _name, item_link in item_links.items():
@@ -285,8 +284,6 @@ class MultiWorld():
 
         for group_name, item_link in item_links.items():
             game = item_link["game"]
-            if item_link["skip_if_solo"] and len(item_link["players"]) == 1:
-                continue
             group_id, group = self.add_group(group_name, game, set(item_link["players"]))
 
             group["item_pool"] = item_link["item_pool"]

CommonClient.py

@@ -99,6 +99,17 @@ class ClientCommandProcessor(CommandProcessor):
             self.ctx.on_print_json({"data": parts, "cmd": "PrintJSON"})
         return True
 
+    def get_current_datapackage(self) -> dict[str, typing.Any]:
+        """
+        Return datapackage for current game if known.
+
+        :return: The datapackage for the currently registered game. If not found, an empty dictionary will be returned.
+        """
+        if not self.ctx.game:
+            return {}
+        checksum = self.ctx.checksums[self.ctx.game]
+        return Utils.load_data_package_for_checksum(self.ctx.game, checksum)
+
     def _cmd_missing(self, filter_text = "") -> bool:
         """List all missing location checks, from your local game state.
         Can be given text, which will be used as filter."""
@@ -108,8 +119,8 @@ class ClientCommandProcessor(CommandProcessor):
         count = 0
         checked_count = 0
 
-        lookup = self.ctx.location_names[self.ctx.game]
-        for location_id, location in lookup.items():
+        lookup = self.get_current_datapackage().get("location_name_to_id", {})
+        for location, location_id in lookup.items():
             if filter_text and filter_text not in location:
                 continue
             if location_id < 0:
@@ -130,10 +141,11 @@ class ClientCommandProcessor(CommandProcessor):
             self.output("No missing location checks found.")
         return True
 
-    def output_datapackage_part(self, name: typing.Literal["Item Names", "Location Names"]) -> bool:
+    def output_datapackage_part(self, key: str, name: str) -> bool:
         """
         Helper to digest a specific section of this game's datapackage.
 
+        :param key: The dictionary key in the datapackage.
         :param name: Printed to the user as context for the part.
 
         :return: Whether the process was successful.
@@ -142,20 +154,23 @@ class ClientCommandProcessor(CommandProcessor):
             self.output(f"No game set, cannot determine {name}.")
             return False
 
-        lookup = self.ctx.item_names if name == "Item Names" else self.ctx.location_names
-        lookup = lookup[self.ctx.game]
+        lookup = self.get_current_datapackage().get(key)
+        if lookup is None:
+            self.output("datapackage not yet loaded, try again")
+            return False
+
         self.output(f"{name} for {self.ctx.game}")
-        for name in lookup.values():
-            self.output(name)
+        for key in lookup:
+            self.output(key)
         return True
 
     def _cmd_items(self) -> bool:
         """List all item names for the currently running game."""
-        return self.output_datapackage_part("Item Names")
+        return self.output_datapackage_part("item_name_to_id", "Item Names")
 
     def _cmd_locations(self) -> bool:
         """List all location names for the currently running game."""
-        return self.output_datapackage_part("Location Names")
+        return self.output_datapackage_part("location_name_to_id", "Location Names")
 
     def output_group_part(self, group_key: typing.Literal["item_name_groups", "location_name_groups"],
                           filter_key: str,

Fill.py

@@ -549,12 +549,10 @@ def distribute_items_restrictive(multiworld: MultiWorld,
         if prioritylocations and regular_progression:
             # retry with one_item_per_player off because some priority fills can fail to fill with that optimization
             # deprioritized items are still not in the mix, so they need to be collected into state first.
-            # allow_partial should only be set if there is deprioritized progression to fall back on.
             priority_retry_state = sweep_from_pool(multiworld.state, deprioritized_progression)
             fill_restrictive(multiworld, priority_retry_state, prioritylocations, regular_progression,
                              single_player_placement=single_player, swap=False, on_place=mark_for_locking,
-                             name="Priority Retry", one_item_per_player=False,
-                             allow_partial=bool(deprioritized_progression))
+                             name="Priority Retry", one_item_per_player=False, allow_partial=True)
 
         if prioritylocations and deprioritized_progression:
             # There are no more regular progression items that can be placed on any priority locations.

Generate.py

@@ -166,10 +166,19 @@ def main(args=None) -> tuple[argparse.Namespace, int]:
                         f"A mix is also permitted.")
 
     from worlds.AutoWorld import AutoWorldRegister
-    args.outputname = seed_name
-    args.sprite = dict.fromkeys(range(1, args.multi+1), None)
-    args.sprite_pool = dict.fromkeys(range(1, args.multi+1), None)
-    args.name = {}
+    from worlds.alttp.EntranceRandomizer import parse_arguments
+    erargs = parse_arguments(['--multi', str(args.multi)])
+    erargs.seed = seed
+    erargs.plando_options = args.plando
+    erargs.spoiler = args.spoiler
+    erargs.race = args.race
+    erargs.outputname = seed_name
+    erargs.outputpath = args.outputpath
+    erargs.skip_prog_balancing = args.skip_prog_balancing
+    erargs.skip_output = args.skip_output
+    erargs.spoiler_only = args.spoiler_only
+    erargs.name = {}
+    erargs.csv_output = args.csv_output
 
     settings_cache: dict[str, tuple[argparse.Namespace, ...]] = \
         {fname: (tuple(roll_settings(yaml, args.plando) for yaml in yamls) if args.sameoptions else None)
@@ -196,7 +205,7 @@ def main(args=None) -> tuple[argparse.Namespace, int]:
     for player in range(1, args.multi + 1):
         player_path_cache[player] = player_files.get(player, args.weights_file_path)
     name_counter = Counter()
-    args.player_options = {}
+    erargs.player_options = {}
 
     player = 1
     while player <= args.multi:
@@ -209,21 +218,21 @@ def main(args=None) -> tuple[argparse.Namespace, int]:
                     for k, v in vars(settingsObject).items():
                         if v is not None:
                             try:
-                                getattr(args, k)[player] = v
+                                getattr(erargs, k)[player] = v
                             except AttributeError:
-                                setattr(args, k, {player: v})
+                                setattr(erargs, k, {player: v})
                             except Exception as e:
                                 raise Exception(f"Error setting {k} to {v} for player {player}") from e
 
                     # name was not specified
-                    if player not in args.name:
+                    if player not in erargs.name:
                         if path == args.weights_file_path:
                             # weights file, so we need to make the name unique
-                            args.name[player] = f"Player{player}"
+                            erargs.name[player] = f"Player{player}"
                         else:
                             # use the filename
-                            args.name[player] = os.path.splitext(os.path.split(path)[-1])[0]
-                    args.name[player] = handle_name(args.name[player], player, name_counter)
+                            erargs.name[player] = os.path.splitext(os.path.split(path)[-1])[0]
+                    erargs.name[player] = handle_name(erargs.name[player], player, name_counter)
 
                     player += 1
             except Exception as e:
@@ -231,10 +240,10 @@ def main(args=None) -> tuple[argparse.Namespace, int]:
         else:
             raise RuntimeError(f'No weights specified for player {player}')
 
-    if len(set(name.lower() for name in args.name.values())) != len(args.name):
-        raise Exception(f"Names have to be unique. Names: {Counter(name.lower() for name in args.name.values())}")
+    if len(set(name.lower() for name in erargs.name.values())) != len(erargs.name):
+        raise Exception(f"Names have to be unique. Names: {Counter(name.lower() for name in erargs.name.values())}")
 
-    return args, seed
+    return erargs, seed
 
 
 def read_weights_yamls(path) -> tuple[Any, ...]:
@@ -486,22 +495,7 @@ def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.b
             if required_plando_options:
                 raise Exception(f"Settings reports required plando module {str(required_plando_options)}, "
                                 f"which is not enabled.")
-        games = requirements.get("game", {})
-        for game, version in games.items():
-            if game not in AutoWorldRegister.world_types:
-                continue
-            if not version:
-                raise Exception(f"Invalid version for game {game}: {version}.")
-            if isinstance(version, str):
-                version = {"min": version}
-            if "min" in version and tuplize_version(version["min"]) > AutoWorldRegister.world_types[game].world_version:
-                raise Exception(f"Settings reports required version of world \"{game}\" is at least {version['min']}, "
-                                f"however world is of version "
-                                f"{AutoWorldRegister.world_types[game].world_version.as_simple_string()}.")
-            if "max" in version and tuplize_version(version["max"]) < AutoWorldRegister.world_types[game].world_version:
-                raise Exception(f"Settings reports required version of world \"{game}\" is no later than {version['max']}, "
-                                f"however world is of version "
-                                f"{AutoWorldRegister.world_types[game].world_version.as_simple_string()}.")
+
     ret = argparse.Namespace()
     for option_key in Options.PerGameCommonOptions.type_hints:
         if option_key in weights and option_key not in Options.CommonOptions.type_hints:

KH1Client.py

@@ -0,0 +1,9 @@
+if __name__ == '__main__':
+    import ModuleUpdate
+    ModuleUpdate.update()
+
+    import Utils
+    Utils.init_logging("KH1Client", exception_logger="Client")
+
+    from worlds.kh1.Client import launch
+    launch()

KH2Client.py

@@ -0,0 +1,8 @@
+import ModuleUpdate
+import Utils
+from worlds.kh2.Client import launch
+ModuleUpdate.update()
+
+if __name__ == '__main__':
+    Utils.init_logging("KH2Client", exception_logger="Client")
+    launch()

Launcher.py

@@ -484,7 +484,7 @@ def main(args: argparse.Namespace | dict | None = None):
 
 if __name__ == '__main__':
     init_logging('Launcher')
-    multiprocessing.freeze_support()
+    Utils.freeze_support()
     multiprocessing.set_start_method("spawn")  # if launched process uses kivy, fork won't work
     parser = argparse.ArgumentParser(
         description='Archipelago Launcher',

LinksAwakeningClient.py

@@ -412,10 +412,10 @@ class LinksAwakeningClient():
             status = (await self.gameboy.async_read_memory_safe(LAClientConstants.wLinkStatusBits))[0]
 
         item_id -= LABaseID
-        # The player name table only goes up to 101, so don't go past that
+        # The player name table only goes up to 100, so don't go past that
         # Even if it didn't, the remote player _index_ byte is just a byte, so 255 max
-        if from_player > 101:
-            from_player = 101
+        if from_player > 100:
+            from_player = 100
 
         next_index += 1
         self.gameboy.write_memory(LAClientConstants.wLinkGiveItem, [

Main.py

@@ -37,7 +37,7 @@ def main(args, seed=None, baked_server_options: dict[str, object] | None = None)
 
     logger = logging.getLogger()
     multiworld.set_seed(seed, args.race, str(args.outputname) if args.outputname else None)
-    multiworld.plando_options = args.plando
+    multiworld.plando_options = args.plando_options
     multiworld.game = args.game.copy()
     multiworld.player_name = args.name.copy()
     multiworld.sprite = args.sprite.copy()
@@ -59,9 +59,7 @@ def main(args, seed=None, baked_server_options: dict[str, object] | None = None)
 
     for name, cls in AutoWorld.AutoWorldRegister.world_types.items():
         if not cls.hidden and len(cls.item_names) > 0:
-            logger.info(f" {name:{longest_name}}: "
-                        f"v{cls.world_version.as_simple_string()} |"
-                        f"Items: {len(cls.item_names):{item_count}} | "
+            logger.info(f" {name:{longest_name}}: Items: {len(cls.item_names):{item_count}} | "
                         f"Locations: {len(cls.location_names):{location_count}}")
 
     del item_count, location_count

MultiServer.py

@@ -1135,13 +1135,8 @@ def register_location_checks(ctx: Context, team: int, slot: int, locations: typi
         ctx.save()
 
 
-def collect_hints(ctx: Context, team: int, slot: int, item: typing.Union[int, str],
-                  status: HintStatus | None = None) -> typing.List[Hint]:
-    """
-    Collect a new hint for a given item id or name, with a given status.
-    If status is None (which is the default value), an automatic status will be determined from the item's quality.
-    """
-
+def collect_hints(ctx: Context, team: int, slot: int, item: typing.Union[int, str], auto_status: HintStatus) \
+        -> typing.List[Hint]:
     hints = []
     slots: typing.Set[int] = {slot}
     for group_id, group in ctx.groups.items():
@@ -1157,38 +1152,25 @@ def collect_hints(ctx: Context, team: int, slot: int, item: typing.Union[int, st
         else:
             found = location_id in ctx.location_checks[team, finding_player]
             entrance = ctx.er_hint_data.get(finding_player, {}).get(location_id, "")
-
+            new_status = auto_status
             if found:
-                status = HintStatus.HINT_FOUND
-            elif status is None:
-                if item_flags & ItemClassification.trap:
-                    status = HintStatus.HINT_AVOID
-                else:
-                    status = HintStatus.HINT_PRIORITY
-
-            hints.append(
-                Hint(receiving_player, finding_player, location_id, item_id, found, entrance, item_flags, status)
-            )
+                new_status = HintStatus.HINT_FOUND
+            elif item_flags & ItemClassification.trap:
+                new_status = HintStatus.HINT_AVOID
+            hints.append(Hint(receiving_player, finding_player, location_id, item_id, found, entrance,
+                                       item_flags, new_status))
 
     return hints
 
 
-def collect_hint_location_name(ctx: Context, team: int, slot: int, location: str,
-                               status: HintStatus | None = HintStatus.HINT_UNSPECIFIED) -> typing.List[Hint]:
-    """
-    Collect a new hint for a given location name, with a given status (defaults to "unspecified").
-    If None is passed for the status, then an automatic status will be determined from the item's quality.
-    """
+def collect_hint_location_name(ctx: Context, team: int, slot: int, location: str, auto_status: HintStatus) \
+        -> typing.List[Hint]:
     seeked_location: int = ctx.location_names_for_game(ctx.games[slot])[location]
-    return collect_hint_location_id(ctx, team, slot, seeked_location, status)
+    return collect_hint_location_id(ctx, team, slot, seeked_location, auto_status)
 
 
-def collect_hint_location_id(ctx: Context, team: int, slot: int, seeked_location: int,
-                             status: HintStatus | None = HintStatus.HINT_UNSPECIFIED) -> typing.List[Hint]:
-    """
-    Collect a new hint for a given location id, with a given status (defaults to "unspecified").
-    If None is passed for the status, then an automatic status will be determined from the item's quality.
-    """
+def collect_hint_location_id(ctx: Context, team: int, slot: int, seeked_location: int, auto_status: HintStatus) \
+        -> typing.List[Hint]:
     prev_hint = ctx.get_hint(team, slot, seeked_location)
     if prev_hint:
         return [prev_hint]
@@ -1198,16 +1180,13 @@ def collect_hint_location_id(ctx: Context, team: int, slot: int, seeked_location
 
         found = seeked_location in ctx.location_checks[team, slot]
         entrance = ctx.er_hint_data.get(slot, {}).get(seeked_location, "")
-
+        new_status = auto_status
         if found:
-            status = HintStatus.HINT_FOUND
-        elif status is None:
-            if item_flags & ItemClassification.trap:
-                status = HintStatus.HINT_AVOID
-            else:
-                status = HintStatus.HINT_PRIORITY
-
-        return [Hint(receiving_player, slot, seeked_location, item_id, found, entrance, item_flags, status)]
+            new_status = HintStatus.HINT_FOUND
+        elif item_flags & ItemClassification.trap:
+            new_status = HintStatus.HINT_AVOID
+        return [Hint(receiving_player, slot, seeked_location, item_id, found, entrance, item_flags,
+                              new_status)]
     return []
 
 
@@ -1321,8 +1300,7 @@ class CommandProcessor(metaclass=CommandMeta):
                         argname += "=" + parameter.default
                 argtext += argname
                 argtext += " "
-            doctext = '\n    '.join(inspect.getdoc(method).split('\n'))
-            s += f"{self.marker}{command} {argtext}\n    {doctext}\n"
+            s += f"{self.marker}{command} {argtext}\n    {method.__doc__}\n"
         return s
 
     def _cmd_help(self):
@@ -1351,6 +1329,19 @@ class CommandProcessor(metaclass=CommandMeta):
 class CommonCommandProcessor(CommandProcessor):
     ctx: Context
 
+    def _cmd_countdown(self, seconds: str = "10") -> bool:
+        """Start a countdown in seconds"""
+        try:
+            timer = int(seconds, 10)
+        except ValueError:
+            timer = 10
+        else:
+            if timer > 60 * 60:
+                raise ValueError(f"{timer} is invalid. Maximum is 1 hour.")
+
+        async_start(countdown(self.ctx, timer))
+        return True
+
     def _cmd_options(self):
         """List all current options. Warning: lists password."""
         self.output("Current options:")
@@ -1619,6 +1610,7 @@ class ClientMessageProcessor(CommonCommandProcessor):
     def get_hints(self, input_text: str, for_location: bool = False) -> bool:
         points_available = get_client_points(self.ctx, self.client)
         cost = self.ctx.get_hint_cost(self.client.slot)
+        auto_status = HintStatus.HINT_UNSPECIFIED if for_location else HintStatus.HINT_PRIORITY
         if not input_text:
             hints = {hint.re_check(self.ctx, self.client.team) for hint in
                      self.ctx.hints[self.client.team, self.client.slot]}
@@ -1644,9 +1636,9 @@ class ClientMessageProcessor(CommonCommandProcessor):
                 self.output(f"Sorry, \"{hint_name}\" is marked as non-hintable.")
                 hints = []
             elif not for_location:
-                hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_id)
+                hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_id, auto_status)
             else:
-                hints = collect_hint_location_id(self.ctx, self.client.team, self.client.slot, hint_id)
+                hints = collect_hint_location_id(self.ctx, self.client.team, self.client.slot, hint_id, auto_status)
 
         else:
             game = self.ctx.games[self.client.slot]
@@ -1666,18 +1658,16 @@ class ClientMessageProcessor(CommonCommandProcessor):
                     hints = []
                     for item_name in self.ctx.item_name_groups[game][hint_name]:
                         if item_name in self.ctx.item_names_for_game(game):  # ensure item has an ID
-                            hints.extend(collect_hints(self.ctx, self.client.team, self.client.slot, item_name))
+                            hints.extend(collect_hints(self.ctx, self.client.team, self.client.slot, item_name, auto_status))
                 elif not for_location and hint_name in self.ctx.item_names_for_game(game):  # item name
-                    hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_name)
+                    hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_name, auto_status)
                 elif hint_name in self.ctx.location_name_groups[game]:  # location group name
                     hints = []
                     for loc_name in self.ctx.location_name_groups[game][hint_name]:
                         if loc_name in self.ctx.location_names_for_game(game):
-                            hints.extend(
-                                collect_hint_location_name(self.ctx, self.client.team, self.client.slot, loc_name)
-                            )
+                            hints.extend(collect_hint_location_name(self.ctx, self.client.team, self.client.slot, loc_name, auto_status))
                 else:  # location name
-                    hints = collect_hint_location_name(self.ctx, self.client.team, self.client.slot, hint_name)
+                    hints = collect_hint_location_name(self.ctx, self.client.team, self.client.slot, hint_name, auto_status)
 
             else:
                 self.output(response)
@@ -1955,7 +1945,8 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
 
                 target_item, target_player, flags = ctx.locations[client.slot][location]
                 if create_as_hint:
-                    hints.extend(collect_hint_location_id(ctx, client.team, client.slot, location))
+                    hints.extend(collect_hint_location_id(ctx, client.team, client.slot, location,
+                                                          HintStatus.HINT_UNSPECIFIED))
                 locs.append(NetworkItem(target_item, location, target_player, flags))
             ctx.notify_hints(client.team, hints, only_new=create_as_hint == 2, persist_even_if_found=True)
             if locs and create_as_hint:
@@ -1970,16 +1961,6 @@ async def process_client_cmd(ctx: Context, client: Client, args: dict):
             if not locations:
                 await ctx.send_msgs(client, [{"cmd": "InvalidPacket", "type": "arguments",
                                               "text": "CreateHints: No locations specified.", "original_cmd": cmd}])
-                return
-
-            try:
-                status = HintStatus(status)
-            except ValueError as err:
-                await ctx.send_msgs(client,
-                                    [{"cmd": "InvalidPacket", "type": "arguments",
-                                      "text": f"Unknown Status: {err}",
-                                      "original_cmd": cmd}])
-                return
 
             hints = []
 
@@ -2247,19 +2228,6 @@ class ServerCommandProcessor(CommonCommandProcessor):
         self.output(f"Could not find player {player_name} to collect")
         return False
 
-    def _cmd_countdown(self, seconds: str = "10") -> bool:
-        """Start a countdown in seconds"""
-        try:
-            timer = int(seconds, 10)
-        except ValueError:
-            timer = 10
-        else:
-            if timer > 60 * 60:
-                raise ValueError(f"{timer} is invalid. Maximum is 1 hour.")
-
-        async_start(countdown(self.ctx, timer))
-        return True
-
     @mark_raw
     def _cmd_release(self, player_name: str) -> bool:
         """Send out the remaining items from a player to their intended recipients."""
@@ -2381,9 +2349,9 @@ class ServerCommandProcessor(CommonCommandProcessor):
                     hints = []
                     for item_name_from_group in self.ctx.item_name_groups[game][item]:
                         if item_name_from_group in self.ctx.item_names_for_game(game):  # ensure item has an ID
-                            hints.extend(collect_hints(self.ctx, team, slot, item_name_from_group))
+                            hints.extend(collect_hints(self.ctx, team, slot, item_name_from_group, HintStatus.HINT_PRIORITY))
                 else:  # item name or id
-                    hints = collect_hints(self.ctx, team, slot, item)
+                    hints = collect_hints(self.ctx, team, slot, item, HintStatus.HINT_PRIORITY)
 
                 if hints:
                     self.ctx.notify_hints(team, hints)
@@ -2417,14 +2385,17 @@ class ServerCommandProcessor(CommonCommandProcessor):
 
             if usable:
                 if isinstance(location, int):
-                    hints = collect_hint_location_id(self.ctx, team, slot, location)
+                    hints = collect_hint_location_id(self.ctx, team, slot, location,
+                                                     HintStatus.HINT_UNSPECIFIED)
                 elif game in self.ctx.location_name_groups and location in self.ctx.location_name_groups[game]:
                     hints = []
                     for loc_name_from_group in self.ctx.location_name_groups[game][location]:
                         if loc_name_from_group in self.ctx.location_names_for_game(game):
-                            hints.extend(collect_hint_location_name(self.ctx, team, slot, loc_name_from_group))
+                            hints.extend(collect_hint_location_name(self.ctx, team, slot, loc_name_from_group,
+                                                                    HintStatus.HINT_UNSPECIFIED))
                 else:
-                    hints = collect_hint_location_name(self.ctx, team, slot, location)
+                    hints = collect_hint_location_name(self.ctx, team, slot, location,
+                                                       HintStatus.HINT_UNSPECIFIED)
                 if hints:
                     self.ctx.notify_hints(team, hints)
                 else:

Options.py

@@ -1446,7 +1446,6 @@ class ItemLinks(OptionList):
             Optional("local_items"): [And(str, len)],
             Optional("non_local_items"): [And(str, len)],
             Optional("link_replacement"): Or(None, bool),
-            Optional("skip_if_solo"): Or(None, bool),
         }
     ])
 
@@ -1710,7 +1709,7 @@ def generate_yaml_templates(target_folder: typing.Union[str, "pathlib.Path"], ge
     from jinja2 import Template
 
     from worlds import AutoWorldRegister
-    from Utils import local_path, __version__, tuplize_version
+    from Utils import local_path, __version__
 
     full_path: str
 
@@ -1753,10 +1752,7 @@ def generate_yaml_templates(target_folder: typing.Union[str, "pathlib.Path"], ge
 
             res = template.render(
                 option_groups=option_groups,
-                __version__=__version__,
-                game=game_name,
-                world_version=world.world_version.as_simple_string(),
-                yaml_dump=yaml_dump_scalar,
+                __version__=__version__, game=game_name, yaml_dump=yaml_dump_scalar,
                 dictify_range=dictify_range,
                 cleandoc=cleandoc,
             )

README.md

@@ -20,6 +20,7 @@ Currently, the following games are supported:
 * Meritous
 * Super Metroid/Link to the Past combo randomizer (SMZ3)
 * ChecksFinder
+* ArchipIDLE
 * Hollow Knight
 * The Witness
 * Sonic Adventure 2: Battle
@@ -80,8 +81,6 @@ Currently, the following games are supported:
 * Super Mario Land 2: 6 Golden Coins
 * 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

Starcraft2Client.py

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+import ModuleUpdate
+ModuleUpdate.update()
+
+from worlds.sc2.Client import launch
+import Utils
+
+if __name__ == "__main__":
+    Utils.init_logging("Starcraft2Client", exception_logger="Client")
+    launch()

Utils.py

@@ -49,7 +49,6 @@ class Version(typing.NamedTuple):
 
 __version__ = "0.6.4"
 version_tuple = tuplize_version(__version__)
-version = Version(*version_tuple)
 
 is_linux = sys.platform.startswith("linux")
 is_macos = sys.platform == "darwin"
@@ -323,13 +322,11 @@ def get_options() -> Settings:
     return get_settings()
 
 
-def persistent_store(category: str, key: str, value: typing.Any, force_store: bool = False):
+def persistent_store(category: str, key: str, value: typing.Any):
+    path = user_path("_persistent_storage.yaml")
     storage = persistent_load()
-    if not force_store and category in storage and key in storage[category] and storage[category][key] == value:
-        return  # no changes necessary
     category_dict = storage.setdefault(category, {})
     category_dict[key] = value
-    path = user_path("_persistent_storage.yaml")
     with open(path, "wt") as f:
         f.write(dump(storage, Dumper=Dumper))
 
@@ -943,15 +940,15 @@ class DeprecateDict(dict):
 
 
 def _extend_freeze_support() -> None:
-    """Extend multiprocessing.freeze_support() to also work on Non-Windows and without setting spawn method first."""
-    # original upstream issue: https://github.com/python/cpython/issues/76327
+    """Extend multiprocessing.freeze_support() to also work on Non-Windows for spawn."""
+    # upstream issue: https://github.com/python/cpython/issues/76327
     # code based on https://github.com/pyinstaller/pyinstaller/blob/develop/PyInstaller/hooks/rthooks/pyi_rth_multiprocessing.py#L26
     import multiprocessing
     import multiprocessing.spawn
 
     def _freeze_support() -> None:
         """Minimal freeze_support. Only apply this if frozen."""
-        from subprocess import _args_from_interpreter_flags  # noqa
+        from subprocess import _args_from_interpreter_flags
 
         # Prevent `spawn` from trying to read `__main__` in from the main script
         multiprocessing.process.ORIGINAL_DIR = None
@@ -978,23 +975,17 @@ def _extend_freeze_support() -> None:
             multiprocessing.spawn.spawn_main(**kwargs)
             sys.exit()
 
-    def _noop() -> None:
-        pass
-
-    multiprocessing.freeze_support = multiprocessing.spawn.freeze_support = _freeze_support if is_frozen() else _noop
+    if not is_windows and is_frozen():
+        multiprocessing.freeze_support = multiprocessing.spawn.freeze_support = _freeze_support
 
 
 def freeze_support() -> None:
-    """This now only calls multiprocessing.freeze_support since we are patching freeze_support on module load."""
+    """This behaves like multiprocessing.freeze_support but also works on Non-Windows."""
     import multiprocessing
-
-    deprecate("Use multiprocessing.freeze_support() instead")
+    _extend_freeze_support()
     multiprocessing.freeze_support()
 
 
-_extend_freeze_support()
-
-
 def visualize_regions(root_region: Region, file_name: str, *,
                       show_entrance_names: bool = False, show_locations: bool = True, show_other_regions: bool = True,
                       linetype_ortho: bool = True, regions_to_highlight: set[Region] | None = None) -> None:

WebHost.py

@@ -99,11 +99,11 @@ if __name__ == "__main__":
     multiprocessing.set_start_method('spawn')
     logging.basicConfig(format='[%(asctime)s] %(message)s', level=logging.INFO)
 
+    from WebHostLib.lttpsprites import update_sprites_lttp
     from WebHostLib.autolauncher import autohost, autogen, stop
     from WebHostLib.options import create as create_options_files
 
     try:
-        from WebHostLib.lttpsprites import update_sprites_lttp
         update_sprites_lttp()
     except Exception as e:
         logging.exception(e)

WebHostLib/api/generate.py

@@ -1,16 +1,15 @@
 import json
-import typing
 from uuid import UUID
 
 from flask import request, session, url_for
 from markupsafe import Markup
-from pony.orm import commit, select
+from pony.orm import commit
 
 from Utils import restricted_dumps
-from WebHostLib import app, cache
+from WebHostLib import app
 from WebHostLib.check import get_yaml_data, roll_options
 from WebHostLib.generate import get_meta
-from WebHostLib.models import Generation, STATE_QUEUED, STATE_STARTED, Seed, STATE_ERROR
+from WebHostLib.models import Generation, STATE_QUEUED, Seed, STATE_ERROR
 from . import api_endpoints
 
 
@@ -75,23 +74,12 @@ def generate_api():
 def wait_seed_api(seed: UUID):
     seed_id = seed
     seed = Seed.get(id=seed_id)
-    reply_dict: dict[str, typing.Any] = {"queue_len": get_queue_length()}
     if seed:
-        reply_dict["text"] = "Generation done"
-        return reply_dict, 201
+        return {"text": "Generation done"}, 201
     generation = Generation.get(id=seed_id)
 
     if not generation:
-        reply_dict["text"] = "Generation not found"
-        return reply_dict, 404
+        return {"text": "Generation not found"}, 404
     elif generation.state == STATE_ERROR:
-        reply_dict["text"] = "Generation failed"
-        return reply_dict, 500
-    reply_dict["text"] = "Generation running"
-    return reply_dict, 202
-
-
-@cache.memoize(timeout=5)
-def get_queue_length() -> int:
-    return select(generation for generation in Generation if
-                  generation.state == STATE_STARTED or generation.state == STATE_QUEUED).count()
+        return {"text": "Generation failed"}, 500
+    return {"text": "Generation running"}, 202

WebHostLib/api/tracker.py

@@ -11,53 +11,6 @@ from WebHostLib.models import Room
 from WebHostLib.tracker import TrackerData
 
 
-class PlayerAlias(TypedDict):
-    team: int
-    player: int
-    alias: str | None
-
-
-class PlayerItemsReceived(TypedDict):
-    team: int
-    player: int
-    items: list[NetworkItem]
-
-
-class PlayerChecksDone(TypedDict):
-    team: int
-    player: int
-    locations: list[int]
-
-
-class TeamTotalChecks(TypedDict):
-    team: int
-    checks_done: int
-
-
-class PlayerHints(TypedDict):
-    team: int
-    player: int
-    hints: list[Hint]
-
-
-class PlayerTimer(TypedDict):
-    team: int
-    player: int
-    time: datetime | None
-
-
-class PlayerStatus(TypedDict):
-    team: int
-    player: int
-    status: ClientStatus
-
-
-class PlayerLocationsTotal(TypedDict):
-    team: int
-    player: int
-    total_locations: int
-
-
 @api_endpoints.route("/tracker/<suuid:tracker>")
 @cache.memoize(timeout=60)
 def tracker_data(tracker: UUID) -> dict[str, Any]:
@@ -76,77 +29,120 @@ def tracker_data(tracker: UUID) -> dict[str, Any]:
 
     all_players: dict[int, list[int]] = tracker_data.get_all_players()
 
-    player_aliases: list[PlayerAlias] = []
+    class PlayerAlias(TypedDict):
+        player: int
+        name: str | None
+
+    player_aliases: list[dict[str, int | list[PlayerAlias]]] = []
     """Slot aliases of all players."""
     for team, players in all_players.items():
+        team_player_aliases: list[PlayerAlias] = []
+        team_aliases = {"team": team, "players": team_player_aliases}
+        player_aliases.append(team_aliases)
         for player in players:
-            player_aliases.append({"team": team, "player": player, "alias": tracker_data.get_player_alias(team, player)})
+            team_player_aliases.append({"player": player, "alias": tracker_data.get_player_alias(team, player)})
 
-    player_items_received: list[PlayerItemsReceived] = []
+    class PlayerItemsReceived(TypedDict):
+        player: int
+        items: list[NetworkItem]
+
+    player_items_received: list[dict[str, int | list[PlayerItemsReceived]]] = []
     """Items received by each player."""
     for team, players in all_players.items():
+        player_received_items: list[PlayerItemsReceived] = []
+        team_items_received = {"team": team, "players": player_received_items}
+        player_items_received.append(team_items_received)
         for player in players:
-            player_items_received.append(
-                {"team": team, "player": player, "items": tracker_data.get_player_received_items(team, player)})
+            player_received_items.append(
+                {"player": player, "items": tracker_data.get_player_received_items(team, player)})
 
-    player_checks_done: list[PlayerChecksDone] = []
+    class PlayerChecksDone(TypedDict):
+        player: int
+        locations: list[int]
+
+    player_checks_done: list[dict[str, int | list[PlayerChecksDone]]] = []
     """ID of all locations checked by each player."""
     for team, players in all_players.items():
+        per_player_checks: list[PlayerChecksDone] = []
+        team_checks_done = {"team": team, "players": per_player_checks}
+        player_checks_done.append(team_checks_done)
         for player in players:
-            player_checks_done.append(
-                {"team": team, "player": player, "locations": sorted(tracker_data.get_player_checked_locations(team, player))})
+            per_player_checks.append(
+                {"player": player, "locations": sorted(tracker_data.get_player_checked_locations(team, player))})
 
-    total_checks_done: list[TeamTotalChecks] = [
+    total_checks_done: list[dict[str, int]] = [
         {"team": team, "checks_done": checks_done}
         for team, checks_done in tracker_data.get_team_locations_checked_count().items()
     ]
     """Total number of locations checked for the entire multiworld per team."""
 
-    hints: list[PlayerHints] = []
+    class PlayerHints(TypedDict):
+        player: int
+        hints: list[Hint]
+
+    hints: list[dict[str, int | list[PlayerHints]]] = []
     """Hints that all players have used or received."""
     for team, players in tracker_data.get_all_slots().items():
+        per_player_hints: list[PlayerHints] = []
+        team_hints = {"team": team, "players": per_player_hints}
+        hints.append(team_hints)
         for player in players:
             player_hints = sorted(tracker_data.get_player_hints(team, player))
-            hints.append({"team": team, "player": player, "hints": player_hints})
-            slot_info = tracker_data.get_slot_info(player)
+            per_player_hints.append({"player": player, "hints": player_hints})
+            slot_info = tracker_data.get_slot_info(team, player)
             # this assumes groups are always after players
             if slot_info.type != SlotType.group:
                 continue
             for member in slot_info.group_members:
-                hints[member - 1]["hints"] += player_hints
+                team_hints[member]["hints"] += player_hints
 
-    activity_timers: list[PlayerTimer] = []
+    class PlayerTimer(TypedDict):
+        player: int
+        time: datetime | None
+
+    activity_timers: list[dict[str, int | list[PlayerTimer]]] = []
     """Time of last activity per player. Returned as RFC 1123 format and null if no connection has been made."""
     for team, players in all_players.items():
+        player_timers: list[PlayerTimer] = []
+        team_timers = {"team": team, "players": player_timers}
+        activity_timers.append(team_timers)
         for player in players:
-            activity_timers.append({"team": team, "player": player, "time": None})
+            player_timers.append({"player": player, "time": None})
 
-    for (team, player), timestamp in tracker_data._multisave.get("client_activity_timers", []):
-        for entry in activity_timers:
-            if entry["team"] == team and entry["player"] == player:
-                entry["time"] = datetime.fromtimestamp(timestamp, timezone.utc)
-                break
+    client_activity_timers: tuple[tuple[int, int], float] = tracker_data._multisave.get("client_activity_timers", ())
+    for (team, player), timestamp in client_activity_timers:
+        # use index since we can rely on order
+        activity_timers[team]["player_timers"][player - 1]["time"] = datetime.fromtimestamp(timestamp, timezone.utc)
 
-    connection_timers: list[PlayerTimer] = []
+    connection_timers: list[dict[str, int | list[PlayerTimer]]] = []
     """Time of last connection per player. Returned as RFC 1123 format and null if no connection has been made."""
     for team, players in all_players.items():
+        player_timers: list[PlayerTimer] = []
+        team_connection_timers = {"team": team, "players": player_timers}
+        connection_timers.append(team_connection_timers)
         for player in players:
-            connection_timers.append({"team": team, "player": player, "time": None})
+            player_timers.append({"player": player, "time": None})
 
-    for (team, player), timestamp in tracker_data._multisave.get("client_connection_timers", []):
-        # find the matching entry
-        for entry in connection_timers:
-            if entry["team"] == team and entry["player"] == player:
-                entry["time"] = datetime.fromtimestamp(timestamp, timezone.utc)
-                break
+    client_connection_timers: tuple[tuple[int, int], float] = tracker_data._multisave.get(
+        "client_connection_timers", ())
+    for (team, player), timestamp in client_connection_timers:
+        connection_timers[team]["players"][player - 1]["time"] = datetime.fromtimestamp(timestamp, timezone.utc)
 
-    player_status: list[PlayerStatus] = []
+    class PlayerStatus(TypedDict):
+        player: int
+        status: ClientStatus
+
+    player_status: list[dict[str, int | list[PlayerStatus]]] = []
     """The current client status for each player."""
     for team, players in all_players.items():
+        player_statuses: list[PlayerStatus] = []
+        team_status = {"team": team, "players": player_statuses}
+        player_status.append(team_status)
         for player in players:
-            player_status.append({"team": team, "player": player, "status": tracker_data.get_player_client_status(team, player)})
+            player_statuses.append({"player": player, "status": tracker_data.get_player_client_status(team, player)})
 
     return {
+        **get_static_tracker_data(room),
         "aliases": player_aliases,
         "player_items_received": player_items_received,
         "player_checks_done": player_checks_done,
@@ -155,87 +151,80 @@ def tracker_data(tracker: UUID) -> dict[str, Any]:
         "activity_timers": activity_timers,
         "connection_timers": connection_timers,
         "player_status": player_status,
+        "datapackage": tracker_data._multidata["datapackage"],
     }
 
-
-class PlayerGroups(TypedDict):
-    slot: int
-    name: str
-    members: list[int]
-
-
-class PlayerSlotData(TypedDict):
-    player: int
-    slot_data: dict[str, Any]
-
-
-@api_endpoints.route("/static_tracker/<suuid:tracker>")
-@cache.memoize(timeout=300)
-def static_tracker_data(tracker: UUID) -> dict[str, Any]:
+@cache.memoize()
+def get_static_tracker_data(room: Room) -> dict[str, Any]:
     """
-    Outputs json data to <root_path>/api/static_tracker/<id of current session tracker>.
-
-    :param tracker: UUID of current session tracker.
-
-    :return: Static tracking data for all players in the room. Typing and docstrings describe the format of each value.
+    Builds and caches the static data for this active session tracker, so that it doesn't need to be recalculated.
     """
-    room: Room | None = Room.get(tracker=tracker)
-    if not room:
-        abort(404)
+
     tracker_data = TrackerData(room)
 
     all_players: dict[int, list[int]] = tracker_data.get_all_players()
 
-    groups: list[PlayerGroups] = []
+    class PlayerGroups(TypedDict):
+        slot: int
+        name: str
+        members: list[int]
+
+    groups: list[dict[str, int | list[PlayerGroups]]] = []
     """The Slot ID of groups and the IDs of the group's members."""
     for team, players in tracker_data.get_all_slots().items():
+        groups_in_team: list[PlayerGroups] = []
+        team_groups = {"team": team, "groups": groups_in_team}
+        groups.append(team_groups)
         for player in players:
-            slot_info = tracker_data.get_slot_info(player)
+            slot_info = tracker_data.get_slot_info(team, player)
             if slot_info.type != SlotType.group or not slot_info.group_members:
                 continue
-            groups.append(
+            groups_in_team.append(
                 {
                     "slot": player,
                     "name": slot_info.name,
                     "members": list(slot_info.group_members),
                 })
-        break
+    class PlayerName(TypedDict):
+        player: int
+        name: str
 
-    player_locations_total: list[PlayerLocationsTotal] = []
+    player_names: list[dict[str, str | list[PlayerName]]] = []
+    """Slot names of all players."""
     for team, players in all_players.items():
+        per_team_player_names: list[PlayerName] = []
+        team_names = {"team": team, "players": per_team_player_names}
+        player_names.append(team_names)
         for player in players:
-            player_locations_total.append(
-                {"team": team, "player": player, "total_locations": len(tracker_data.get_player_locations(player))})
+            per_team_player_names.append({"player": player, "name": tracker_data.get_player_name(team, player)})
+
+    class PlayerGame(TypedDict):
+        player: int
+        game: str
+
+    games: list[dict[str, int | list[PlayerGame]]] = []
+    """The game each player is playing."""
+    for team, players in all_players.items():
+        player_games: list[PlayerGame] = []
+        team_games = {"team": team, "players": player_games}
+        games.append(team_games)
+        for player in players:
+            player_games.append({"player": player, "game": tracker_data.get_player_game(team, player)})
+
+    class PlayerSlotData(TypedDict):
+        player: int
+        slot_data: dict[str, Any]
+
+    slot_data: list[dict[str, int | list[PlayerSlotData]]] = []
+    """Slot data for each player."""
+    for team, players in all_players.items():
+        player_slot_data: list[PlayerSlotData] = []
+        team_slot_data = {"team": team, "players": player_slot_data}
+        slot_data.append(team_slot_data)
+        for player in players:
+            player_slot_data.append({"player": player, "slot_data": tracker_data.get_slot_data(team, player)})
 
     return {
         "groups": groups,
-        "datapackage": tracker_data._multidata["datapackage"],
-        "player_locations_total": player_locations_total,
+        "slot_data": slot_data,
     }
-
-# It should be exceedingly rare that slot data is needed, so it's separated out.
-@api_endpoints.route("/slot_data_tracker/<suuid:tracker>")
-@cache.memoize(timeout=300)
-def tracker_slot_data(tracker: UUID) -> list[PlayerSlotData]:
-    """
-    Outputs json data to <root_path>/api/slot_data_tracker/<id of current session tracker>.
-
-    :param tracker: UUID of current session tracker.
-
-    :return: Slot data for all players in the room. Typing completely arbitrary per game.
-    """
-    room: Room | None = Room.get(tracker=tracker)
-    if not room:
-        abort(404)
-    tracker_data = TrackerData(room)
-
-    all_players: dict[int, list[int]] = tracker_data.get_all_players()
-
-    slot_data: list[PlayerSlotData] = []
-    """Slot data for each player."""
-    for team, players in all_players.items():
-        for player in players:
-            slot_data.append({"player": player, "slot_data": tracker_data.get_slot_data(player)})
-        break
-
-    return slot_data

WebHostLib/generate.py

@@ -12,11 +12,12 @@ from flask import flash, redirect, render_template, request, session, url_for
 from pony.orm import commit, db_session
 
 from BaseClasses import get_seed, seeddigits
-from Generate import PlandoOptions, handle_name, mystery_argparse
+from Generate import PlandoOptions, handle_name
 from Main import main as ERmain
 from Utils import __version__, restricted_dumps
 from WebHostLib import app
 from settings import ServerOptions, GeneratorOptions
+from worlds.alttp.EntranceRandomizer import parse_arguments
 from .check import get_yaml_data, roll_options
 from .models import Generation, STATE_ERROR, STATE_QUEUED, Seed, UUID
 from .upload import upload_zip_to_db
@@ -128,39 +129,36 @@ def gen_game(gen_options: dict, meta: dict[str, Any] | None = None, owner=None,
 
         seedname = "W" + (f"{random.randint(0, pow(10, seeddigits) - 1)}".zfill(seeddigits))
 
-        args = mystery_argparse()
-        args.multi = playercount
-        args.seed = seed
-        args.name = {x: "" for x in range(1, playercount + 1)}  # only so it can be overwritten in mystery
-        args.spoiler = meta["generator_options"].get("spoiler", 0)
-        args.race = race
-        args.outputname = seedname
-        args.outputpath = target.name
-        args.teams = 1
-        args.plando_options = PlandoOptions.from_set(meta.setdefault("plando_options",
-                                                                     {"bosses", "items", "connections", "texts"}))
-        args.skip_prog_balancing = False
-        args.skip_output = False
-        args.spoiler_only = False
-        args.csv_output = False
-        args.sprite = dict.fromkeys(range(1, args.multi+1), None)
-        args.sprite_pool = dict.fromkeys(range(1, args.multi+1), None)
+        erargs = parse_arguments(['--multi', str(playercount)])
+        erargs.seed = seed
+        erargs.name = {x: "" for x in range(1, playercount + 1)}  # only so it can be overwritten in mystery
+        erargs.spoiler = meta["generator_options"].get("spoiler", 0)
+        erargs.race = race
+        erargs.outputname = seedname
+        erargs.outputpath = target.name
+        erargs.teams = 1
+        erargs.plando_options = PlandoOptions.from_set(meta.setdefault("plando_options",
+                                                                       {"bosses", "items", "connections", "texts"}))
+        erargs.skip_prog_balancing = False
+        erargs.skip_output = False
+        erargs.spoiler_only = False
+        erargs.csv_output = False
 
         name_counter = Counter()
         for player, (playerfile, settings) in enumerate(gen_options.items(), 1):
             for k, v in settings.items():
                 if v is not None:
-                    if hasattr(args, k):
-                        getattr(args, k)[player] = v
+                    if hasattr(erargs, k):
+                        getattr(erargs, k)[player] = v
                     else:
-                        setattr(args, k, {player: v})
+                        setattr(erargs, k, {player: v})
 
-            if not args.name[player]:
-                args.name[player] = os.path.splitext(os.path.split(playerfile)[-1])[0]
-            args.name[player] = handle_name(args.name[player], player, name_counter)
-        if len(set(args.name.values())) != len(args.name):
-            raise Exception(f"Names have to be unique. Names: {Counter(args.name.values())}")
-        ERmain(args, seed, baked_server_options=meta["server_options"])
+            if not erargs.name[player]:
+                erargs.name[player] = os.path.splitext(os.path.split(playerfile)[-1])[0]
+            erargs.name[player] = handle_name(erargs.name[player], player, name_counter)
+        if len(set(erargs.name.values())) != len(erargs.name):
+            raise Exception(f"Names have to be unique. Names: {Counter(erargs.name.values())}")
+        ERmain(erargs, seed, baked_server_options=meta["server_options"])
 
         return upload_to_db(target.name, sid, owner, race)
     thread_pool = concurrent.futures.ThreadPoolExecutor(max_workers=1)

WebHostLib/lttpsprites.py

@@ -3,10 +3,10 @@ import threading
 import json
 
 from Utils import local_path, user_path
+from worlds.alttp.Rom import Sprite
 
 
 def update_sprites_lttp():
-    from worlds.alttp.Rom import Sprite
     from tkinter import Tk
     from LttPAdjuster import get_image_for_sprite
     from LttPAdjuster import BackgroundTaskProgress

WebHostLib/misc.py

@@ -260,10 +260,7 @@ def host_room(room: UUID):
     # indicate that the page should reload to get the assigned port
     should_refresh = ((not room.last_port and now - room.creation_time < datetime.timedelta(seconds=3))
                       or room.last_activity < now - datetime.timedelta(seconds=room.timeout))
-
-    if now - room.last_activity > datetime.timedelta(minutes=1):
-        # we only set last_activity if needed, otherwise parallel access on /room will cause an internal server error
-        # due to "pony.orm.core.OptimisticCheckError: Object Room was updated outside of current transaction"
+    with db_session:
         room.last_activity = now  # will trigger a spinup, if it's not already running
 
     browser_tokens = "Mozilla", "Chrome", "Safari"

WebHostLib/options.py

@@ -155,9 +155,7 @@ def generate_weighted_yaml(game: str):
         options = {}
 
         for key, val in request.form.items():
-            if val == "_ensure-empty-list":
-                options[key] = {}
-            elif "||" not in key:
+            if "||" not in key:
                 if len(str(val)) == 0:
                     continue
 
@@ -214,11 +212,8 @@ def generate_yaml(game: str):
     if request.method == "POST":
         options = {}
         intent_generate = False
-
         for key, val in request.form.items(multi=True):
-            if val == "_ensure-empty-list":
-                options[key] = []
-            elif options.get(key):
+            if key in options:
                 if not isinstance(options[key], list):
                     options[key] = [options[key]]
                 options[key].append(val)

WebHostLib/requirements.txt

@@ -1,7 +1,6 @@
 flask>=3.1.1
 werkzeug>=3.1.3
-pony>=0.7.19; python_version <= '3.12'
-pony @ git+https://github.com/black-sliver/pony@7feb1221953b7fa4a6735466bf21a8b4d35e33ba#0.7.19; python_version >= '3.13'
+pony>=0.7.19
 waitress>=3.0.2
 Flask-Caching>=2.3.0
 Flask-Compress>=1.17

WebHostLib/static/assets/sc2Tracker.js

@@ -1,43 +1,49 @@
-let updateSection = (sectionName, fakeDOM) => {
-    document.getElementById(sectionName).innerHTML = fakeDOM.getElementById(sectionName).innerHTML;
-}
-
 window.addEventListener('load', () => {
-    // Reload tracker every 60 seconds (sync'd)
-    const url = window.location;
-    // Note: This synchronization code is adapted from code in trackerCommon.js
-    const targetSecond = parseInt(document.getElementById('player-tracker').getAttribute('data-second')) + 3;
-    console.log("Target second of refresh: " + targetSecond);
+  // Reload tracker every 15 seconds
+  const url = window.location;
+  setInterval(() => {
+    const ajax = new XMLHttpRequest();
+    ajax.onreadystatechange = () => {
+      if (ajax.readyState !== 4) { return; }
 
-    let getSleepTimeSeconds = () => {
-        // -40 % 60 is -40, which is absolutely wrong and should burn
-        var sleepSeconds = (((targetSecond - new Date().getSeconds()) % 60) + 60) % 60;
-        return sleepSeconds || 60;
-    };
+      // Create a fake DOM using the returned HTML
+      const domParser = new DOMParser();
+      const fakeDOM = domParser.parseFromString(ajax.responseText, 'text/html');
 
-    let updateTracker = () => {
-        const ajax = new XMLHttpRequest();
-        ajax.onreadystatechange = () => {
-            if (ajax.readyState !== 4) { return; }
-    
-            // Create a fake DOM using the returned HTML
-            const domParser = new DOMParser();
-            const fakeDOM = domParser.parseFromString(ajax.responseText, 'text/html');
-    
-            // Update dynamic sections
-            updateSection('player-info', fakeDOM);
-            updateSection('section-filler', fakeDOM);
-            updateSection('section-terran', fakeDOM);
-            updateSection('section-zerg', fakeDOM);
-            updateSection('section-protoss', fakeDOM);
-            updateSection('section-nova', fakeDOM);
-            updateSection('section-kerrigan', fakeDOM);
-            updateSection('section-keys', fakeDOM);
-            updateSection('section-locations', fakeDOM);
-        };
-        ajax.open('GET', url);
-        ajax.send();
-        updater = setTimeout(updateTracker, getSleepTimeSeconds() * 1000);
+      // Update item tracker
+      document.getElementById('inventory-table').innerHTML = fakeDOM.getElementById('inventory-table').innerHTML;
+      // Update only counters in the location-table
+      let counters = document.getElementsByClassName('counter');
+      const fakeCounters = fakeDOM.getElementsByClassName('counter');
+      for (let i = 0; i < counters.length; i++) {
+        counters[i].innerHTML = fakeCounters[i].innerHTML;
+      }
     };
-    window.updater = setTimeout(updateTracker, getSleepTimeSeconds() * 1000);
+    ajax.open('GET', url);
+    ajax.send();
+  }, 15000)
+
+  // Collapsible advancement sections
+  const categories = document.getElementsByClassName("location-category");
+  for (let category of categories) {
+    let hide_id = category.id.split('_')[0];
+    if (hide_id === 'Total') {
+      continue;
+    }
+    category.addEventListener('click', function() {
+      // Toggle the advancement list
+      document.getElementById(hide_id).classList.toggle("hide");
+      // Change text of the header
+      const tab_header = document.getElementById(hide_id+'_header').children[0];
+      const orig_text = tab_header.innerHTML;
+      let new_text;
+      if (orig_text.includes("▼")) {
+        new_text = orig_text.replace("▼", "▲");
+      }
+      else {
+        new_text = orig_text.replace("▲", "▼");
+      }
+      tab_header.innerHTML = new_text;
+    });
+  }
 });

WebHostLib/static/styles/sc2Tracker.css

@@ -1,279 +1,160 @@
-*{
-  margin: 0;
-  font-family: "JuraBook", monospace;
-}
-body{
-  --icon-size: 36px;
-  --item-class-padding: 4px;
-}
-a{
-  color: #1ae;
+#player-tracker-wrapper{
+    margin: 0;
 }
 
-/* Section colours */
-#player-info{
-  background-color: #37a;
-}
-.player-tracker{
-  max-width: 100%;
-}
-.tracker-section{
-  background-color: grey;
-}
-#terran-items{
-  background-color: #3a7;
-}
-#zerg-items{
-  background-color: #d94;
-}
-#protoss-items{
-  background-color: #37a;
-}
-#nova-items{
-  background-color: #777;
-}
-#kerrigan-items{
-  background-color: #a37;
-}
-#keys{
-  background-color: #aa2;
+#tracker-table td {
+    vertical-align: top;
 }
 
-/* Sections */
-.section-body{
-  display: flex;
-  flex-flow: row wrap;
-  justify-content: flex-start;
-  align-items: flex-start;
-  padding-bottom: 3px;
-}
-.section-body-2{
-  display: flex;
-  flex-direction: column;
-}
-.tracker-section:has(input.collapse-section[type=checkbox]:checked) .section-body,
-.tracker-section:has(input.collapse-section[type=checkbox]:checked) .section-body-2{
-  display: none;
-}
-.section-title{
-  position: relative;
-  border-bottom: 3px solid black;
-  /* Prevent text selection */
-  user-select: none;
-  -webkit-user-select: none;
-  -ms-user-select: none;
-}
-input[type="checkbox"]{
-  position: absolute;
-  cursor: pointer;
-  opacity: 0;
-  z-index: 1;
-  width: 100%;
-  height: 100%;
-}
-.section-title:hover h2{
-  text-shadow: 0 0 4px #ddd;
-}
-.f {
-  display: flex;
-  overflow: hidden;
+.inventory-table-area{
+    border: 2px solid #000000;
+    border-radius: 4px;
+    padding: 3px 10px 3px 10px;
 }
 
-/* Acquire item filters */
-.tracker-section img{
-  height: 100%;
-  width: var(--icon-size);
-  height: var(--icon-size);
-  background-color: black;
-}
-.unacquired, .lvl-0 .f{
-  filter: grayscale(100%) contrast(80%) brightness(42%) blur(0.5px);
-}
-.spacer{
-  width: var(--icon-size);
-  height: var(--icon-size);
+.inventory-table-area:has(.inventory-table-terran) {
+    width: 690px;
+    background-color: #525494;
 }
 
-/* Item groups */
-.item-class{
-  display: flex;
-  flex-flow: column;
-  justify-content: center;
-  padding: var(--item-class-padding);
-}
-.item-class-header{
-  display: flex;
-  flex-flow: row;
-}
-.item-class-upgrades{
-  /* Note: {display: flex; flex-flow: column wrap} */
-  /* just breaks on Firefox (width does not scale to content) */
-  display: grid;
-  grid-template-rows: repeat(4, auto);
-  grid-auto-flow: column;
+.inventory-table-area:has(.inventory-table-zerg) {
+    width: 360px;
+    background-color: #9d60d2;
 }
 
-/* Subsections */
-.section-toc{
-  display: flex;
-  flex-direction: row;
-}
-.toc-box{
-  position: relative;
-  padding-left: 15px;
-  padding-right: 15px;
-}
-.toc-box:hover{
-  text-shadow: 0 0 7px white;
-}
-.ss-header{
-  position: relative;
-  text-align: center;
-  writing-mode: sideways-lr;
-  user-select: none;
-  padding-top: 5px;
-  font-size: 115%;
-}
-.tracker-section:has(input.ss-1-toggle:checked) .ss-1{
-  display: none;
-}
-.tracker-section:has(input.ss-2-toggle:checked) .ss-2{
-  display: none;
-}
-.tracker-section:has(input.ss-3-toggle:checked) .ss-3{
-  display: none;
-}
-.tracker-section:has(input.ss-4-toggle:checked) .ss-4{
-  display: none;
-}
-.tracker-section:has(input.ss-5-toggle:checked) .ss-5{
-  display: none;
-}
-.tracker-section:has(input.ss-6-toggle:checked) .ss-6{
-  display: none;
-}
-.tracker-section:has(input.ss-7-toggle:checked) .ss-7{
-  display: none;
-}
-.tracker-section:has(input.ss-1-toggle:hover) .ss-1{
-  background-color: #fff5;
-  box-shadow: 0 0 1px 1px white;
-}
-.tracker-section:has(input.ss-2-toggle:hover) .ss-2{
-  background-color: #fff5;
-  box-shadow: 0 0 1px 1px white;
-}
-.tracker-section:has(input.ss-3-toggle:hover) .ss-3{
-  background-color: #fff5;
-  box-shadow: 0 0 1px 1px white;
-}
-.tracker-section:has(input.ss-4-toggle:hover) .ss-4{
-  background-color: #fff5;
-  box-shadow: 0 0 1px 1px white;
-}
-.tracker-section:has(input.ss-5-toggle:hover) .ss-5{
-  background-color: #fff5;
-  box-shadow: 0 0 1px 1px white;
-}
-.tracker-section:has(input.ss-6-toggle:hover) .ss-6{
-  background-color: #fff5;
-  box-shadow: 0 0 1px 1px white;
-}
-.tracker-section:has(input.ss-7-toggle:hover) .ss-7{
-  background-color: #fff5;
-  box-shadow: 0 0 1px 1px white;
+.inventory-table-area:has(.inventory-table-protoss) {
+    width: 400px;
+    background-color: #d2b260;
 }
 
-/* Progressive items */
-.progressive{
-  max-height: var(--icon-size);
-  display: contents;
+#tracker-table .inventory-table td{
+    width: 40px;
+    height: 40px;
+    text-align: center;
+    vertical-align: middle;
 }
 
-.lvl-0 > :nth-child(2),
-.lvl-0 > :nth-child(3),
-.lvl-0 > :nth-child(4),
-.lvl-0 > :nth-child(5){
-  display: none;
-}
-.lvl-1 > :nth-child(2),
-.lvl-1 > :nth-child(3),
-.lvl-1 > :nth-child(4),
-.lvl-1 > :nth-child(5){
-  display: none;
-}
-.lvl-2 > :nth-child(1),
-.lvl-2 > :nth-child(3),
-.lvl-2 > :nth-child(4),
-.lvl-2 > :nth-child(5){
-  display: none;
-}
-.lvl-3 > :nth-child(1),
-.lvl-3 > :nth-child(2),
-.lvl-3 > :nth-child(4),
-.lvl-3 > :nth-child(5){
-  display: none;
-}
-.lvl-4 > :nth-child(1),
-.lvl-4 > :nth-child(2),
-.lvl-4 > :nth-child(3),
-.lvl-4 > :nth-child(5){
-  display: none;
-}
-.lvl-5 > :nth-child(1),
-.lvl-5 > :nth-child(2),
-.lvl-5 > :nth-child(3),
-.lvl-5 > :nth-child(4){
-  display: none;
+.inventory-table td.title{
+    padding-top: 10px;
+    height: 20px;
+    font-family: "JuraBook", monospace;
+    font-size: 16px;
+    font-weight: bold;
 }
 
-/* Filler item counters */
-.item-counter{
-  display: table;
-  text-align: center;
-  padding: var(--item-class-padding);
-}
-.item-count{
-  display: table-cell;
-  vertical-align: middle;
-  padding-left: 3px;
-  padding-right: 15px;
+.inventory-table img{
+    height: 100%;
+    max-width: 40px;
+    max-height: 40px;
+    border: 1px solid #000000;
+    filter: grayscale(100%) contrast(75%) brightness(20%);
+    background-color: black;
 }
 
-/* Hidden items */
-.hidden-class:not(:has(img.acquired)){
-  display: none;
-}
-.hidden-item:not(.acquired){
-  display:none;
+.inventory-table img.acquired{
+    filter: none;
+    background-color: black;
 }
 
-/* Keys */
-#keys ol, #keys ul{
-  columns: 3;
-  -webkit-columns: 3;
-  -moz-columns: 3;
-}
-#keys li{
-  padding-right: 15pt;
+.inventory-table .tint-terran img.acquired {
+    filter: sepia(100%) saturate(300%) brightness(130%) hue-rotate(120deg)
 }
 
-/* Locations */
-#section-locations{
-    padding-left: 5px;
-}
-@media only screen and (min-width: 120ch){
-  #section-locations ul{
-    columns: 2;
-    -webkit-columns: 2;
-    -moz-columns: 2;
-  }
-}
-#locations li.checked{
-  list-style-type: "✔ ";
+.inventory-table .tint-protoss img.acquired {
+    filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(180deg)
 }
 
-/* Allowing scrolling down a little further */
-.bottom-padding{
-  min-height: 33vh;
-}
+.inventory-table .tint-level-1 img.acquired {
+    filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg)
+}
+
+.inventory-table .tint-level-2 img.acquired {
+    filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg) hue-rotate(120deg)
+}
+
+.inventory-table .tint-level-3 img.acquired {
+    filter: sepia(100%) saturate(1000%) brightness(110%) hue-rotate(60deg) hue-rotate(240deg)
+}
+
+.inventory-table div.counted-item {
+    position: relative;
+}
+
+.inventory-table div.item-count {
+    width: 160px;
+    text-align: left;
+    color: black;
+    font-family: "JuraBook", monospace;
+    font-weight: bold;
+}
+
+#location-table{
+    border: 2px solid #000000;
+    border-radius: 4px;
+    background-color: #87b678;
+    padding: 10px 3px 3px;
+    font-family: "JuraBook", monospace;
+    font-size: 16px;
+    font-weight: bold;
+    cursor: default;
+}
+
+#location-table table{
+    width: 100%;
+}
+
+#location-table th{
+    vertical-align: middle;
+    text-align: left;
+    padding-right: 10px;
+}
+
+#location-table td{
+    padding-top: 2px;
+    padding-bottom: 2px;
+    line-height: 20px;
+}
+
+#location-table td.counter {
+    text-align: right;
+    font-size: 14px;
+}
+
+#location-table td.toggle-arrow {
+    text-align: right;
+}
+
+#location-table tr#Total-header {
+    font-weight: bold;
+}
+
+#location-table img{
+    height: 100%;
+    max-width: 30px;
+    max-height: 30px;
+}
+
+#location-table tbody.locations {
+    font-size: 16px;
+}
+
+#location-table td.location-name {
+    padding-left: 16px;
+}
+
+#location-table td:has(.location-column) {
+    vertical-align: top;
+}
+
+#location-table .location-column {
+    width: 100%;
+    height: 100%;
+}
+
+#location-table .location-column .spacer {
+    min-height: 24px;
+}
+
+.hide {
+    display: none;
+}

WebHostLib/templates/genericTracker.html

@@ -98,7 +98,7 @@
                             <td>
                                 {% if hint.finding_player == player %}
                                     <b>{{ player_names_with_alias[(team, hint.finding_player)] }}</b>
-                                {% elif get_slot_info(hint.finding_player).type == 2 %}
+                                {% elif get_slot_info(team, hint.finding_player).type == 2 %}
                                     <i>{{ player_names_with_alias[(team, hint.finding_player)] }}</i>
                                 {% else %}
                                     <a href="{{ url_for("get_player_tracker", tracker=room.tracker, tracked_team=team, tracked_player=hint.finding_player) }}">
@@ -109,7 +109,7 @@
                             <td>
                                 {% if hint.receiving_player == player %}
                                     <b>{{ player_names_with_alias[(team, hint.receiving_player)] }}</b>
-                                {% elif get_slot_info(hint.receiving_player).type == 2 %}
+                                {% elif get_slot_info(team, hint.receiving_player).type == 2 %}
                                     <i>{{ player_names_with_alias[(team, hint.receiving_player)] }}</i>
                                 {% else %}
                                     <a href="{{ url_for("get_player_tracker", tracker=room.tracker, tracked_team=team, tracked_player=hint.receiving_player) }}">

WebHostLib/templates/multispheretracker.html

@@ -45,15 +45,15 @@
                     {%- set current_sphere = loop.index %}
                     {%- for player, sphere_location_ids in sphere.items() %}
                         {%- set checked_locations = tracker_data.get_player_checked_locations(team, player) %}
-                        {%- set finder_game = tracker_data.get_player_game(player) %}
-                        {%- set player_location_data = tracker_data.get_player_locations(player) %}
+                        {%- set finder_game = tracker_data.get_player_game(team, player) %}
+                        {%- set player_location_data = tracker_data.get_player_locations(team, player) %}
                         {%- for location_id in sphere_location_ids.intersection(checked_locations) %}
                         <tr>
                             {%- set item_id, receiver, item_flags = player_location_data[location_id] %}
-                            {%- set receiver_game = tracker_data.get_player_game(receiver) %}
+                            {%- set receiver_game = tracker_data.get_player_game(team, receiver) %}
                             <td>{{ current_sphere }}</td>
-                            <td>{{ tracker_data.get_player_name(player) }}</td>
-                            <td>{{ tracker_data.get_player_name(receiver) }}</td>
+                            <td>{{ tracker_data.get_player_name(team, player) }}</td>
+                            <td>{{ tracker_data.get_player_name(team, receiver) }}</td>
                             <td>{{ tracker_data.item_id_to_name[receiver_game][item_id] }}</td>
                             <td>{{ tracker_data.location_id_to_name[finder_game][location_id] }}</td>
                             <td>{{ finder_game }}</td>

WebHostLib/templates/multitrackerHintTable.html

@@ -22,14 +22,14 @@
                 -%}
                     <tr>
                         <td>
-                            {% if get_slot_info(hint.finding_player).type == 2 %}
+                            {% if get_slot_info(team, hint.finding_player).type == 2 %}
                                 <i>{{ player_names_with_alias[(team, hint.finding_player)] }}</i>
                             {% else %}
                                 {{ player_names_with_alias[(team, hint.finding_player)] }}
                             {% endif %}
                         </td>
                         <td>
-                            {% if get_slot_info(hint.receiving_player).type == 2 %}
+                            {% if get_slot_info(team, hint.receiving_player).type == 2 %}
                                 <i>{{ player_names_with_alias[(team, hint.receiving_player)] }}</i>
                             {% else %}
                                 {{ player_names_with_alias[(team, hint.receiving_player)] }}

WebHostLib/templates/playerOptions/macros.html

@@ -134,7 +134,6 @@
 
 {% macro OptionList(option_name, option) %}
     {{ OptionTitle(option_name, option) }}
-    <input type="hidden" id="{{ option_name }}-{{ key }}-hidden" name="{{ option_name }}" value="_ensure-empty-list"/>
     <div class="option-container">
         {% for key in (option.valid_keys if option.valid_keys is ordered else option.valid_keys|sort) %}
             <div class="option-entry">
@@ -147,7 +146,6 @@
 
 {% macro LocationSet(option_name, option) %}
     {{ OptionTitle(option_name, option) }}
-    <input type="hidden" id="{{ option_name }}-{{ key }}-hidden" name="{{ option_name }}" value="_ensure-empty-list"/>
     <div class="option-container">
         {% for group_name in world.location_name_groups.keys()|sort %}
             {% if group_name != "Everywhere" %}
@@ -171,7 +169,6 @@
 
 {% macro ItemSet(option_name, option) %}
     {{ OptionTitle(option_name, option) }}
-    <input type="hidden" id="{{ option_name }}-{{ key }}-hidden" name="{{ option_name }}" value="_ensure-empty-list"/>
     <div class="option-container">
         {% for group_name in world.item_name_groups.keys()|sort %}
             {% if group_name != "Everything" %}
@@ -195,7 +192,6 @@
 
 {% macro OptionSet(option_name, option) %}
     {{ OptionTitle(option_name, option) }}
-    <input type="hidden" id="{{ option_name }}-{{ key }}-hidden" name="{{ option_name }}" value="_ensure-empty-list"/>
     <div class="option-container">
         {% for key in (option.valid_keys if option.valid_keys is ordered else option.valid_keys|sort) %}
             <div class="option-entry">

WebHostLib/templates/waitSeed.html

@@ -30,21 +30,10 @@
                 }
 
                 const data = await response.json();
-                if (data.queue_len === 1){
-                    waitSeedDiv.innerHTML = `
-                        <h1>Generation in Progress</h1>
-                        <p>${data.text}</p>
-                        <p>This is the only generation in the queue.</p>
-                    `;
-                }
-                else {
-                    waitSeedDiv.innerHTML = `
-                        <h1>Generation in Progress</h1>
-                        <p>${data.text}</p>
-                        <p>There are ${data.queue_len} generations in the queue.</p>
-                    `;
-                }
-
+                waitSeedDiv.innerHTML = `
+                    <h1>Generation in Progress</h1>
+                    <p>${data.text}</p>
+                `;
 
                 setTimeout(checkStatus, 1000); // Continue polling.
             } catch (error) {

WebHostLib/templates/weightedOptions/macros.html

@@ -139,7 +139,6 @@
 {% endmacro %}
 
 {% macro OptionList(option_name, option) %}
-    <input type="hidden" id="{{ option_name }}-{{ key }}-hidden" name="{{ option_name }}" value="_ensure-empty-list"/>
     <div class="list-container">
         {% for key in (option.valid_keys if option.valid_keys is ordered else option.valid_keys|sort) %}
             <div class="list-entry">
@@ -159,7 +158,6 @@
 {% endmacro %}
 
 {% macro LocationSet(option_name, option, world) %}
-    <input type="hidden" id="{{ option_name }}-{{ key }}-hidden" name="{{ option_name }}" value="_ensure-empty-list"/>
     <div class="set-container">
         {% for group_name in world.location_name_groups.keys()|sort %}
             {% if group_name != "Everywhere" %}
@@ -182,7 +180,6 @@
 {% endmacro %}
 
 {% macro ItemSet(option_name, option, world) %}
-    <input type="hidden" id="{{ option_name }}-{{ key }}-hidden" name="{{ option_name }}" value="_ensure-empty-list"/>
     <div class="set-container">
         {% for group_name in world.item_name_groups.keys()|sort %}
             {% if group_name != "Everything" %}
@@ -205,7 +202,6 @@
 {% endmacro %}
 
 {% macro OptionSet(option_name, option) %}
-    <input type="hidden" id="{{ option_name }}-{{ key }}-hidden" name="{{ option_name }}" value="_ensure-empty-list"/>
     <div class="set-container">
         {% for key in (option.valid_keys if option.valid_keys is ordered else option.valid_keys|sort) %}
             <div class="set-entry">

Zelda1Client.py

@@ -20,8 +20,6 @@ from worlds.tloz.Items import item_game_ids
 from worlds.tloz.Locations import location_ids
 from worlds.tloz import Items, Locations, Rom
 
-from settings import get_settings
-
 SYSTEM_MESSAGE_ID = 0
 
 CONNECTION_TIMING_OUT_STATUS = "Connection timing out. Please restart your emulator, then restart connector_tloz.lua"
@@ -343,12 +341,13 @@ if __name__ == '__main__':
     # Text Mode to use !hint and such with games that have no text entry
     Utils.init_logging("ZeldaClient")
 
-    DISPLAY_MSGS = get_settings()["tloz_options"]["display_msgs"]
+    options = Utils.get_options()
+    DISPLAY_MSGS = options["tloz_options"]["display_msgs"]
 
 
     async def run_game(romfile: str) -> None:
         auto_start = typing.cast(typing.Union[bool, str],
-                                 get_settings()["tloz_options"].get("rom_start", True))
+                                 Utils.get_options()["tloz_options"].get("rom_start", True))
         if auto_start is True:
             import webbrowser
             webbrowser.open(romfile)

data/client.kv

@@ -220,8 +220,6 @@
 <MessageBoxLabel>:
     theme_text_color: "Custom"
     text_color: 1, 1, 1, 1
-<MessageBox>:
-    height: self.content.texture_size[1] + 80
 <ScrollBox>:
     layout: layout
     bar_width: "12dp"
@@ -235,3 +233,8 @@
         spacing: 10
         size_hint_y: None
         height: self.minimum_height
+<MessageBoxLabel>:
+    valign: "middle"
+    halign: "center"
+    text_size: self.width, None
+    height: self.texture_size[1]

data/options.yaml

@@ -33,10 +33,6 @@ description: {{ yaml_dump("Default %s Template" % game) }}
 game: {{ yaml_dump(game) }}
 requires:
   version: {{ __version__ }} # Version of Archipelago required for this yaml to work as expected.
-  {%- if world_version != "0.0.0" %}
-  game:
-    {{ yaml_dump(game) }}: {{ world_version }} # Version of the world required for this yaml to work as expected.
-  {%- endif %}
 
 {%- macro range_option(option) %}
     # You can define additional values between the minimum and maximum values.

data/sprites/custom/link.apsprite

@@ -0,0 +1,7 @@
+author: Nintendo
+data: null
+game: A Link to the Past
+min_format_version: 1
+name: Link
+format_version: 1
+sprite_version: 1

data/sprites/remote/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

docs/CODEOWNERS

@@ -21,6 +21,9 @@
 # Aquaria
 /worlds/aquaria/ @tioui
 
+# ArchipIDLE
+/worlds/archipidle/ @LegendaryLinux
+
 # Blasphemous
 /worlds/blasphemous/ @TRPG0
 
@@ -39,15 +42,9 @@
 # Celeste 64
 /worlds/celeste64/ @PoryGone
 
-# Celeste (Open World)
-/worlds/celeste_open_world/ @PoryGone
-
 # ChecksFinder
 /worlds/checksfinder/ @SunCatMC
 
-# Choo-Choo Charles
-/worlds/cccharles/ @Yaranorgoth
-
 # Civilization VI
 /worlds/civ6/ @hesto2
 
@@ -72,9 +69,6 @@
 # Faxanadu
 /worlds/faxanadu/ @Daivuk
 
-# Final Fantasy (1)
-/worlds/ff1/ @Rosalie-A
-
 # Final Fantasy Mystic Quest
 /worlds/ffmq/ @Alchav @wildham0
 
@@ -244,6 +238,9 @@
 # compatibility, these worlds may be deleted. If you are interested in stepping up as maintainer for
 # any of these worlds, please review `/docs/world maintainer.md` documentation.
 
+# Final Fantasy (1)
+# /worlds/ff1/
+
 # Ocarina of Time
 # /worlds/oot/
 

docs/adding games.md

@@ -62,24 +62,6 @@ if possible.
 * If your client appears in the Archipelago Launcher, you may define an icon for it that differentiates it from
   other clients. The icon size is 48x48 pixels, but smaller or larger images will scale to that size.
 
-### Launcher Integration
-
-If you have a python client or want to utilize the integration features of the Archipelago Launcher (ex. Slot links in
-webhost) you can define a Component to be a part of the Launcher. `LauncherComponents.components` can be appended to
-with additional Components in order to automatically add them to the Launcher. Most Components only need a
-`display_name` and `func`, but `supports_uri` and `game_name` can be defined to support launching by webhost links,
-`icon` and `description` can be used to customize display in the Launcher UI, and `file_identifier` can be used to
-launch by file.
-
-Additionally, if you use `func` you have access to LauncherComponent.launch or launch_subprocess to run your
-function as a subprocesses that can be utilized side by side other clients.
-```py
-def my_func(*args: str):
-	from .client import run_client
-	LauncherComponent.launch(run_client, name="My Client", args=args)
-```
-
-
 ## World
 
 The world is your game integration for the Archipelago generator, webhost, and multiworld server. It contains all the

docs/apworld specification.md

@@ -19,21 +19,7 @@ the world's folder in `worlds/`. I.e. `worlds/ror2.apworld` containing `ror2/__i
 
 ## Metadata
 
-Metadata about the apworld is defined in an `archipelago.json` file inside the zip archive.
-The current format version has at minimum:
-```json
-{
-    "version": 6,
-    "compatible_version": 5,
-    "game": "Game Name"
-}
-```
-
-with the following optional version fields using the format `"1.0.0"` to represent major.minor.build:
-* `minimum_ap_version` and `maximum_ap_version` - which if present will each be compared against the current
-  Archipelago version respectively to filter those files from being loaded
-* `world_version` - an arbitrary version for that world in order to only load the newest valid world.
-  An apworld without a world_version is always treated as older than one with a version
+No metadata is specified yet.
 
 
 ## Extra Data

docs/entrance randomization.md

@@ -352,14 +352,14 @@ direction_matching_group_lookup = {
 
 Terrain matching or dungeon shuffle:
 ```python
-def randomize_within_same_group(group: int) -> list[int]:
+def randomize_within_same_group(group: int) -> List[int]:
     return [group]
 identity_group_lookup = bake_target_group_lookup(world, randomize_within_same_group)
 ```
 
 Directional + area shuffle:
 ```python
-def get_target_groups(group: int) -> list[int]:
+def get_target_groups(group: int) -> List[int]:
     # example group: LEFT | CAVE
     # example result: [RIGHT | CAVE, DOOR | CAVE]
     direction = group & Groups.DIRECTION_MASK

docs/network protocol.md

@@ -79,7 +79,7 @@ Sent to clients when they connect to an Archipelago server.
 | generator_version     | [NetworkVersion](#NetworkVersion)             | Object denoting the version of Archipelago which generated the multiworld.                                                                                                                                                            |
 | tags                  | list\[str\]                                   | Denotes special features or capabilities that the sender is capable of. Example: `WebHost`                                                                                                                                            |
 | password              | bool                                          | Denoted whether a password is required to join this room.                                                                                                                                                                             |
-| permissions           | dict\[str, [Permission](#Permission)\]        | Mapping of permission name to [Permission](#Permission), keys are: "release", "collect" and "remaining".                                                                                                                              |
+| permissions           | dict\[str, [Permission](#Permission)\[int\]\] | Mapping of permission name to [Permission](#Permission), keys are: "release", "collect" and "remaining".                                                                                                                              |
 | hint_cost             | int                                           | The percentage of total locations that need to be checked to receive a hint from the server.                                                                                                                                          |
 | location_check_points | int                                           | The amount of hint points you receive per item/location check completed.                                                                                                                                                              |
 | games                 | list\[str\]                                   | List of games present in this multiworld.                                                                                                                                                                                             |
@@ -662,14 +662,13 @@ class SlotType(enum.IntFlag):
 An object representing static information about a slot.
 
 ```python
-from collections.abc import Sequence
-from typing import NamedTuple
+import typing
 from NetUtils import SlotType
-class NetworkSlot(NamedTuple):
+class NetworkSlot(typing.NamedTuple):
    name: str
    game: str
    type: SlotType
-   group_members: Sequence[int] = []  # only populated if type == group
+   group_members: typing.List[int] = []  # only populated if type == group
 ```
 
 ### Permission
@@ -687,8 +686,8 @@ class Permission(enum.IntEnum):
 ### Hint
 An object representing a Hint.
 ```python
-from typing import NamedTuple
-class Hint(NamedTuple):
+import typing
+class Hint(typing.NamedTuple):
     receiving_player: int
     finding_player: int
     location: int

docs/running from source.md

@@ -10,7 +10,7 @@ What you'll need:
  * [Python 3.11.9 or newer](https://www.python.org/downloads/), not the Windows Store version
    * On Windows, please consider only using the latest supported version in production environments since security
      updates for older versions are not easily available.
-   * Python 3.13.x is currently the newest supported version
+   * Python 3.12.x is currently the newest supported version
  * pip: included in downloads from python.org, separate in many Linux distributions
  * Matching C compiler
    * possibly optional, read operating system specific sections

docs/settings api.md

@@ -28,7 +28,7 @@ if it does not exist.
 ## Global Settings
 
 All non-world-specific settings are defined directly in settings.py.
-Each value needs to have a default. If the default should be `None`, annotate it using `T | None = None`.
+Each value needs to have a default. If the default should be `None`, define it as `typing.Optional` and assign `None`.
 
 To access a "global" config value, with correct typing, use one of
 ```python

docs/shared_cache.md

@@ -1,18 +0,0 @@
-# Shared Cache
-
-Archipelago maintains a shared folder of information that can be persisted for a machine and reused across Libraries.
-It can be found at the User Cache Directory for appname `Archipelago` in the `Cache` subfolder
-(ex. `%LOCALAPPDATA%/Archipelago/Cache`).
-
-## Common Cache
-
-The Common Cache `common.json` can be used to store any generic data that is expected to be shared across programs
-for the same User.
-
-* `uuid`: A UUID identifier used to identify clients as from the same user/machine, to be sent in the Connect packet
-
-## Data Package Cache
-
-The `datapackage` folder in the shared cache folder is used to store datapackages by game and checksum to be reused
-in order to save network traffic. The expected structure is `datapackage/Game Name/checksum_value.json` with the
-contents of each json file being the no-whitespace datapackage contents.

docs/style.md

@@ -15,10 +15,8 @@
 * Prefer [format string literals](https://peps.python.org/pep-0498/) over string concatenation,
   use single quotes inside them: `f"Like {dct['key']}"`
 * Use type annotations where possible for function signatures and class members.
-* Use type annotations where appropriate for local variables (e.g. `var: list[int] = []`, or when the
-  type is hard or impossible to deduce). Clear annotations help developers look up and validate API calls.
-* Prefer new style type annotations for new code (e.g. `var: dict[str, str | int]` over
-  `var: Dict[str, Union[str, int]]`).
+* Use type annotations where appropriate for local variables (e.g. `var: List[int] = []`, or when the
+  type is hard or impossible to deduce.) Clear annotations help developers look up and validate API calls.
 * If a line ends with an open bracket/brace/parentheses, the matching closing bracket should be at the
   beginning of a line at the same indentation as the beginning of the line with the open bracket.
   ```python
@@ -62,9 +60,3 @@
 * Indent `case` inside `switch ` with 2 spaces.
 * Use single quotes.
 * Semicolons are required after every statement.
-
-## KV
-
-* Style should be defined in `.kv` as much as possible, only Python when unavailable.
-* Should follow [our Python style](#python-code) where appropriate (quotation marks, indentation).
-* When escaping a line break, add a space between code and backslash.

docs/tests.md

@@ -82,10 +82,10 @@ overridden. For more information on what methods are available to your class, ch
 
 #### Alternatives to WorldTestBase
 
-Unit tests can also be created using
-[unittest.TestCase](https://docs.python.org/3/library/unittest.html#unittest.TestCase) directly. These may be useful
-for generating a multiworld under very specific constraints without using the generic world setup, or for testing
-portions of your code that can be tested without relying on a multiworld to be created first.
+Unit tests can also be created using [TestBase](/test/bases.py#L16) or
+[unittest.TestCase](https://docs.python.org/3/library/unittest.html#unittest.TestCase) depending on your use case. These
+may be useful for generating a multiworld under very specific constraints without using the generic world setup, or for
+testing portions of your code that can be tested without relying on a multiworld to be created first.
 
 #### Parametrization
 
@@ -102,7 +102,8 @@ for multiple inputs) the base test. Some important things to consider when attem
 
 * Classes inheriting from `WorldTestBase`, including those created by the helpers in `test.param`, will run all
   base tests by default, make sure the produced tests actually do what you aim for and do not waste a lot of
-  extra CPU time. Consider using `unittest.TestCase` directly or setting `WorldTestBase.run_default_tests` to False.
+  extra CPU time. Consider using `TestBase` or `unittest.TestCase` directly
+  or setting `WorldTestBase.run_default_tests` to False.
 
 #### Performance Considerations
 

docs/webhost api.md

@@ -18,8 +18,6 @@ Current endpoints:
     - [`/room_status/<suuid:room_id>`](#roomstatus)
 - Tracker API
     - [`/tracker/<suuid:tracker>`](#tracker)
-    - [`/static_tracker/<suuid:tracker>`](#statictracker)
-    - [`/slot_data_tracker/<suuid:tracker>`](#slotdatatracker)
 - User API
     - [`/get_rooms`](#getrooms)
     - [`/get_seeds`](#getseeds)
@@ -256,6 +254,8 @@ can either be viewed while on a room tracker page, or from the [room's endpoint]
 <a name=tracker></a>
 Will provide a dict of tracker data with the following keys:
 
+- item_link groups and their players (`groups`)
+- Each player's slot_data (`slot_data`)
 - Each player's current alias (`aliases`)
   - Will return the name if there is none
 - A list of items each player has received as a NetworkItem (`player_items_received`)
@@ -265,55 +265,111 @@ Will provide a dict of tracker data with the following keys:
 - The time of last activity of each player in RFC 1123 format (`activity_timers`)
 - The time of last active connection of each player in RFC 1123 format (`connection_timers`)
 - The current client status of each player (`player_status`)
+- The datapackage hash for each player (`datapackage`)
+  - This hash can then be sent to the datapackage API to receive the appropriate datapackage as necessary
+
 
 Example:
 ```json
 {
+  "groups": [
+    {
+      "team": 0,
+      "groups": [
+        {
+          "slot": 5,
+          "name": "testGroup",
+          "members": [
+            1,
+            2
+          ]
+        },
+        {
+          "slot": 6,
+          "name": "myCoolLink",
+          "members": [
+            3,
+            4
+          ]
+        }
+      ]
+    }
+  ],
+  "slot_data": [
+    {
+      "team": 0,
+      "players": [
+        {
+          "player": 1,
+          "slot_data": {
+            "example_option": 1,
+            "other_option": 3
+          }
+        },
+        {
+          "player": 2,
+          "slot_data": {
+            "example_option": 1,
+            "other_option": 2
+          }
+        }
+      ]
+    }
+  ],
   "aliases": [
     {
       "team": 0,
-      "player": 1,
-      "alias": "Incompetence"
-    },
-    {
-      "team": 0,
-      "player": 2,
-      "alias": "Slot_Name_2"
+      "players": [
+        {
+          "player": 1,
+          "alias": "Incompetence"
+        },
+        {
+          "player": 2,
+          "alias": "Slot_Name_2"
+        }
+      ]
     }
   ],
   "player_items_received": [
     {
       "team": 0,
-      "player": 1,
-      "items": [
-        [1, 1, 1, 0],
-        [2, 2, 2, 1]
-      ]
-    },
-    {
-      "team": 0,
-      "player": 2,
-      "items": [
-        [1, 1, 1, 2],
-        [2, 2, 2, 0]
+      "players": [
+        {
+          "player": 1,
+          "items": [
+            [1, 1, 1, 0],
+            [2, 2, 2, 1]
+          ]
+        },
+        {
+          "player": 2,
+          "items": [
+            [1, 1, 1, 2],
+            [2, 2, 2, 0]
+          ]
+        }
       ]
     }
   ],
   "player_checks_done": [
     {
       "team": 0,
-      "player": 1,
-      "locations": [
-        1,
-        2
-      ]
-    },
-    {
-      "team": 0,
-      "player": 2,
-      "locations": [
-        1,
-        2
+      "players": [
+        {
+          "player": 1,
+          "locations": [
+            1,
+            2
+          ]
+        },
+        {
+          "player": 2,
+          "locations": [
+            1,
+            2
+          ]
+        }
       ]
     }
   ],
@@ -326,132 +382,76 @@ Example:
   "hints": [
     {
       "team": 0,
-      "player": 1,
-      "hints": [
-        [1, 2, 4, 6, 0, "", 4, 0]
+      "players": [
+        {
+          "player": 1,
+          "hints": [
+            [1, 2, 4, 6, 0, "", 4, 0]
+          ]
+        },
+        {
+          "player": 2,
+          "hints": []
+        }
       ]
-    },
-    {
-      "team": 0,
-      "player": 2,
-      "hints": []
     }
   ],
   "activity_timers": [
     {
       "team": 0,
-      "player": 1,
-      "time": "Fri, 18 Apr 2025 20:35:45 GMT"
-    },
-    {
-      "team": 0,
-      "player": 2,
-      "time": "Fri, 18 Apr 2025 20:42:46 GMT"
+      "players": [
+        {
+          "player": 1,
+          "time": "Fri, 18 Apr 2025 20:35:45 GMT"
+        },
+        {
+          "player": 2,
+          "time": "Fri, 18 Apr 2025 20:42:46 GMT"
+        }
+      ]
     }
   ],
   "connection_timers": [
     {
       "team": 0,
-      "player": 1,
-      "time": "Fri, 18 Apr 2025 20:38:25 GMT"
-    },
-    {
-      "team": 0,
-      "player": 2,
-      "time": "Fri, 18 Apr 2025 21:03:00 GMT"
+      "players": [
+        {
+          "player": 1,
+          "time": "Fri, 18 Apr 2025 20:38:25 GMT"
+        },
+        {
+          "player": 2,
+          "time": "Fri, 18 Apr 2025 21:03:00 GMT"
+        }
+      ]
     }
   ],
   "player_status": [
     {
       "team": 0,
-      "player": 1,
-      "status": 0
-    },
-    {
-      "team": 0,
-      "player": 2,
-      "status": 0
-    }
-  ]
-}
-```
-
-### `/static_tracker/<suuid:tracker>`
-<a name=statictracker></a>
-Will provide a dict of static tracker data with the following keys:
-
-- item_link groups and their players (`groups`)
-- The datapackage hash for each game (`datapackage`)
-  - This hash can then be sent to the datapackage API to receive the appropriate datapackage as necessary
-- The number of checks found vs. total checks available per player (`player_locations_total`)
-  - Same logic as the multitracker template: found = len(player_checks_done.locations) / total = player_locations_total.total_locations (all available checks).
-
-Example:
-```json
-{
-  "groups": [
-    {
-      "slot": 5,
-      "name": "testGroup",
-      "members": [
-        1,
-        2
-      ]
-    },
-    {
-      "slot": 6,
-      "name": "myCoolLink",
-      "members": [
-        3,
-        4
+      "players": [
+        {
+          "player": 1,
+          "status": 0
+        },
+        {
+          "player": 2,
+          "status": 0
+        }
       ]
     }
   ],
   "datapackage": {
     "Archipelago": {
       "checksum": "ac9141e9ad0318df2fa27da5f20c50a842afeecb",
+      "version": 0
     },
     "The Messenger": {
       "checksum": "6991cbcda7316b65bcb072667f3ee4c4cae71c0b",
-    }
-  },
-  "player_locations_total": [
-    {
-      "player": 1,
-      "team" : 0,
-      "total_locations": 10
-    },
-    {
-      "player": 2,
-      "team" : 0,
-      "total_locations": 20
-    }
-  ],
-}
-```
-
-### `/slot_data_tracker/<suuid:tracker>`
-<a name=slotdatatracker></a>
-Will provide a list of each player's slot_data.
-
-Example:
-```json
-[
-  {
-    "player": 1,
-    "slot_data": {
-      "example_option": 1,
-      "other_option": 3
-    }
-  },
-  {
-    "player": 2,
-    "slot_data": {
-      "example_option": 1,
-      "other_option": 2
+      "version": 0
     }
   }
-]
+}
 ```
 
 ## User Endpoints
@@ -554,4 +554,4 @@ Example:
         "seed_id": "a528e34c-3b4f-42a9-9f8f-00a4fd40bacb"
     }
 ]
-```
+```

docs/world api.md

@@ -76,8 +76,8 @@ webhost:
 * `game_info_languages` (optional) list of strings for defining the existing game info pages your game supports. The
   documents must be prefixed with the same string as defined here. Default already has 'en'.
 
-* `options_presets` (optional) `dict[str, dict[str, Any]]` where the keys are the names of the presets and the values
-  are the options to be set for that preset. The options are defined as a `dict[str, Any]` where the keys are the names
+* `options_presets` (optional) `Dict[str, Dict[str, Any]]` where the keys are the names of the presets and the values
+  are the options to be set for that preset. The options are defined as a `Dict[str, Any]` where the keys are the names
   of the options and the values are the values to be set for that option. These presets will be available for users to
   select from on the game's options page.
 
@@ -753,7 +753,7 @@ from BaseClasses import CollectionState, MultiWorld
 from worlds.AutoWorld import LogicMixin
 
 class MyGameState(LogicMixin):
-    mygame_defeatable_enemies: dict[int, set[str]]  # per player
+    mygame_defeatable_enemies: Dict[int, Set[str]]  # per player
 
     def init_mixin(self, multiworld: MultiWorld) -> None:
         # Initialize per player with the corresponding "nothing" value, such as 0 or an empty set.
@@ -882,11 +882,11 @@ item/location pairs is unnecessary since the AP server already retains and freel
 that request it. The most common usage of slot data is sending option results that the client needs to be aware of.
 
 ```python
-def fill_slot_data(self) -> dict[str, Any]:
+def fill_slot_data(self) -> Dict[str, Any]:
     # In order for our game client to handle the generated seed correctly we need to know what the user selected
     # for their difficulty and final boss HP.
     # A dictionary returned from this method gets set as the slot_data and will be sent to the client after connecting.
-    # The options dataclass has a method to return a `dict[str, Any]` of each option name provided and the relevant
+    # The options dataclass has a method to return a `Dict[str, Any]` of each option name provided and the relevant
     # option's value.
     return self.options.as_dict("difficulty", "final_boss_hp")
 ```

entrance_rando.py

@@ -74,12 +74,13 @@ class EntranceLookup:
         if entrance in self._expands_graph_cache:
             return self._expands_graph_cache[entrance]
 
-        seen = {entrance.connected_region}
+        visited = set()
         q: deque[Region] = deque()
         q.append(entrance.connected_region)
 
         while q:
             region = q.popleft()
+            visited.add(region)
 
             # check if the region itself is progression
             if region in region.multiworld.indirect_connections:
@@ -102,8 +103,7 @@ class EntranceLookup:
                         and exit_ in self._usable_exits):
                     self._expands_graph_cache[entrance] = True
                     return True
-                elif exit_.connected_region and exit_.connected_region not in seen:
-                    seen.add(exit_.connected_region)
+                elif exit_.connected_region and exit_.connected_region not in visited:
                     q.append(exit_.connected_region)
 
         self._expands_graph_cache[entrance] = False

kvui.py

@@ -720,11 +720,13 @@ class MessageBoxLabel(MDLabel):
 
 
 class MessageBox(Popup):
+
     def __init__(self, title, text, error=False, **kwargs):
-        label = MessageBoxLabel(text=text, padding=("6dp", "0dp"))
+        label = MessageBoxLabel(text=text)
         separator_color = [217 / 255, 129 / 255, 122 / 255, 1.] if error else [47 / 255., 167 / 255., 212 / 255, 1.]
         super().__init__(title=title, content=label, size_hint=(0.5, None), width=max(100, int(label.width) + 40),
                          separator_color=separator_color, **kwargs)
+        self.height += max(0, label.height - 18)
 
 
 class MDNavigationItemBase(MDNavigationItem):

setup.py

@@ -22,7 +22,7 @@ SNI_VERSION = "v0.0.100"  # change back to "latest" once tray icon issues are fi
 
 
 # This is a bit jank. We need cx-Freeze to be able to run anything from this script, so install it
-requirement = 'cx-Freeze==8.4.0'
+requirement = 'cx-Freeze==8.0.0'
 try:
     import pkg_resources
     try:
@@ -65,6 +65,7 @@ from Cython.Build import cythonize
 non_apworlds: set[str] = {
     "A Link to the Past",
     "Adventure",
+    "ArchipIDLE",
     "Archipelago",
     "Lufia II Ancient Cave",
     "Meritous",
@@ -371,8 +372,6 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
         os.makedirs(self.buildfolder / "Players" / "Templates", exist_ok=True)
         from Options import generate_yaml_templates
         from worlds.AutoWorld import AutoWorldRegister
-        from worlds.Files import APWorldContainer
-        from Utils import version
         assert not non_apworlds - set(AutoWorldRegister.world_types), \
             f"Unknown world {non_apworlds - set(AutoWorldRegister.world_types)} designated for .apworld"
         folders_to_remove: list[str] = []
@@ -381,26 +380,13 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
             if worldname not in non_apworlds:
                 file_name = os.path.split(os.path.dirname(worldtype.__file__))[1]
                 world_directory = self.libfolder / "worlds" / file_name
-                if os.path.isfile(world_directory / "archipelago.json"):
-                    manifest = json.load(open(world_directory / "archipelago.json"))
-                else:
-                    manifest = {}
                 # this method creates an apworld that cannot be moved to a different OS or minor python version,
                 # which should be ok
-                zip_path = self.libfolder / "worlds" / (file_name + ".apworld")
-                apworld = APWorldContainer(str(zip_path))
-                apworld.minimum_ap_version = version
-                apworld.maximum_ap_version = version
-                apworld.game = worldtype.game
-                manifest.update(apworld.get_manifest())
-                apworld.manifest_path = f"{file_name}/archipelago.json"
-                with zipfile.ZipFile(zip_path, "x", zipfile.ZIP_DEFLATED,
+                with zipfile.ZipFile(self.libfolder / "worlds" / (file_name + ".apworld"), "x", zipfile.ZIP_DEFLATED,
                                      compresslevel=9) as zf:
                     for path in world_directory.rglob("*.*"):
                         relative_path = os.path.join(*path.parts[path.parts.index("worlds")+1:])
-                        if not relative_path.endswith("archipelago.json"):
-                            zf.write(path, relative_path)
-                    zf.writestr(apworld.manifest_path, json.dumps(manifest))
+                        zf.write(path, relative_path)
                     folders_to_remove.append(file_name)
                 shutil.rmtree(world_directory)
         shutil.copyfile("meta.yaml", self.buildfolder / "Players" / "Templates" / "meta.yaml")

test/TestBase.py

@@ -0,0 +1,3 @@
+from .bases import TestBase, WorldTestBase
+from warnings import warn
+warn("TestBase was renamed to bases", DeprecationWarning)

test/bases.py

@@ -9,7 +9,98 @@ from test.general import gen_steps
 from worlds import AutoWorld
 from worlds.AutoWorld import World, call_all
 
-from BaseClasses import Location, MultiWorld, CollectionState, Item
+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):

test/general/__init__.py

@@ -1,5 +1,5 @@
 from argparse import Namespace
-from typing import Any, List, Optional, Tuple, Type
+from typing import List, Optional, Tuple, Type, Union
 
 from BaseClasses import CollectionState, Item, ItemClassification, Location, MultiWorld, Region
 from worlds import network_data_package
@@ -31,8 +31,8 @@ def setup_solo_multiworld(
     return setup_multiworld(world_type, steps, seed)
 
 
-def setup_multiworld(worlds: list[type[World]] | type[World], steps: tuple[str, ...] = gen_steps,
-                     seed: int | None = None, options: dict[str, Any] | list[dict[str, Any]] = None) -> MultiWorld:
+def setup_multiworld(worlds: Union[List[Type[World]], Type[World]], steps: Tuple[str, ...] = gen_steps,
+                     seed: Optional[int] = None) -> MultiWorld:
     """
     Creates a multiworld with a player for each provided world type, allowing duplicates, setting default options, and
     calling the provided gen steps.
@@ -40,27 +40,20 @@ def setup_multiworld(worlds: list[type[World]] | type[World], steps: tuple[str,
     :param worlds: Type/s of worlds to generate a multiworld for
     :param steps: Gen steps that should be called before returning. Default calls through pre_fill
     :param seed: The seed to be used when creating this multiworld
-    :param options: Options to set on each world. If just one dict of options is passed, it will be used for all worlds.
     :return: The generated multiworld
     """
     if not isinstance(worlds, list):
         worlds = [worlds]
-
-    if options is None:
-        options = [{}] * len(worlds)
-    elif not isinstance(options, list):
-        options = [options] * len(worlds)
-
     players = len(worlds)
     multiworld = MultiWorld(players)
     multiworld.game = {player: world_type.game for player, world_type in enumerate(worlds, 1)}
     multiworld.player_name = {player: f"Tester{player}" for player in multiworld.player_ids}
     multiworld.set_seed(seed)
     args = Namespace()
-    for player, (world_type, option_overrides) in enumerate(zip(worlds, options), 1):
+    for player, world_type in enumerate(worlds, 1):
         for key, option in world_type.options_dataclass.type_hints.items():
             updated_options = getattr(args, key, {})
-            updated_options[player] = option.from_any(option_overrides.get(key, option.default))
+            updated_options[player] = option.from_any(option.default)
             setattr(args, key, updated_options)
     multiworld.set_options(args)
     multiworld.state = CollectionState(multiworld)

test/general/test_implemented.py

@@ -37,11 +37,10 @@ class TestImplemented(unittest.TestCase):
 
     def test_slot_data(self):
         """Tests that if a world creates slot data, it's json serializable."""
-        # has an await for generate_output which isn't being called
-        excluded_games = ("Ocarina of Time",)
-        worlds_to_test = {game: world
-                          for game, world in AutoWorldRegister.world_types.items() if game not in excluded_games}
-        for game_name, world_type in worlds_to_test.items():
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+            # has an await for generate_output which isn't being called
+            if game_name in {"Ocarina of Time"}:
+                continue
             multiworld = setup_solo_multiworld(world_type)
             with self.subTest(game=game_name, seed=multiworld.seed):
                 distribute_items_restrictive(multiworld)

test/general/test_items.py

@@ -150,7 +150,8 @@ class TestBase(unittest.TestCase):
         """Test that worlds don't modify the locality of items after duplicates are resolved"""
         gen_steps = ("generate_early",)
         additional_steps = ("create_regions", "create_items", "set_rules", "connect_entrances", "generate_basic", "pre_fill")
-        for game_name, world_type in AutoWorldRegister.world_types.items():
+        worlds_to_test = {game: world for game, world in AutoWorldRegister.world_types.items()}
+        for game_name, world_type in worlds_to_test.items():
             with self.subTest("Game", game=game_name):
                 multiworld = setup_solo_multiworld(world_type, gen_steps)
                 local_items = multiworld.worlds[1].options.local_items.value.copy()

test/general/test_locations.py

@@ -33,10 +33,7 @@ class TestBase(unittest.TestCase):
     def test_location_creation_steps(self):
         """Tests that Regions and Locations aren't created after `create_items`."""
         gen_steps = ("generate_early", "create_regions", "create_items")
-        excluded_games = ("Ocarina of Time", "Pokemon Red and Blue")
-        worlds_to_test = {game: world
-                          for game, world in AutoWorldRegister.world_types.items() if game not in excluded_games}
-        for game_name, world_type in worlds_to_test.items():
+        for game_name, world_type in AutoWorldRegister.world_types.items():
             with self.subTest("Game", game_name=game_name):
                 multiworld = setup_solo_multiworld(world_type, gen_steps)
                 region_count = len(multiworld.get_regions())
@@ -57,13 +54,13 @@ class TestBase(unittest.TestCase):
                 call_all(multiworld, "generate_basic")
                 self.assertEqual(region_count, len(multiworld.get_regions()),
                                  f"{game_name} modified region count during generate_basic")
-                self.assertEqual(location_count, len(multiworld.get_locations()),
+                self.assertGreaterEqual(location_count, len(multiworld.get_locations()),
                                         f"{game_name} modified locations count during generate_basic")
 
                 call_all(multiworld, "pre_fill")
                 self.assertEqual(region_count, len(multiworld.get_regions()),
                                  f"{game_name} modified region count during pre_fill")
-                self.assertEqual(location_count, len(multiworld.get_locations()),
+                self.assertGreaterEqual(location_count, len(multiworld.get_locations()),
                                         f"{game_name} modified locations count during pre_fill")
     
     def test_location_group(self):

test/webhost/test_tracker.py

@@ -93,13 +93,3 @@ class TestTracker(TestBase):
                 headers={"If-Modified-Since": "Wed, 21 Oct 2015 07:28:00"},  # missing timezone
             )
             self.assertEqual(response.status_code, 400)
-
-    def test_tracker_api(self) -> None:
-        """Verify that tracker api gives a reply for the room."""
-        with self.app.test_request_context():
-            with self.client.open(url_for("api.tracker_data", tracker=self.tracker_uuid)) as response:
-                self.assertEqual(response.status_code, 200)
-            with self.client.open(url_for("api.static_tracker_data", tracker=self.tracker_uuid)) as response:
-                self.assertEqual(response.status_code, 200)
-            with self.client.open(url_for("api.tracker_slot_data", tracker=self.tracker_uuid)) as response:
-                self.assertEqual(response.status_code, 200)

worlds/AutoWorld.py

@@ -12,7 +12,7 @@ from typing import (Any, Callable, ClassVar, Dict, FrozenSet, Iterable, List, Ma
 
 from Options import item_and_loc_options, ItemsAccessibility, OptionGroup, PerGameCommonOptions
 from BaseClasses import CollectionState
-from Utils import Version
+from Utils import deprecate
 
 if TYPE_CHECKING:
     from BaseClasses import MultiWorld, Item, Location, Tutorial, Region, Entrance
@@ -22,10 +22,6 @@ if TYPE_CHECKING:
 perf_logger = logging.getLogger("performance")
 
 
-class InvalidItemError(KeyError):
-    pass
-
-
 class AutoWorldRegister(type):
     world_types: Dict[str, Type[World]] = {}
     __file__: str
@@ -75,10 +71,6 @@ class AutoWorldRegister(type):
                 if "required_client_version" in base.__dict__:
                     dct["required_client_version"] = max(dct["required_client_version"],
                                                          base.__dict__["required_client_version"])
-        if "world_version" in dct:
-            if dct["world_version"] != Version(0, 0, 0):
-                raise RuntimeError(f"{name} is attempting to set 'world_version' from within the class. world_version "
-                                   f"can only be set from manifest.")
 
         # construct class
         new_class = super().__new__(mcs, name, bases, dct)
@@ -341,8 +333,6 @@ class World(metaclass=AutoWorldRegister):
     """If loaded from a .apworld, this is the Path to it."""
     __file__: ClassVar[str]
     """path it was loaded from"""
-    world_version: ClassVar[Version] = Version(0, 0, 0)
-    """Optional world version loaded from archipelago.json"""
 
     def __init__(self, multiworld: "MultiWorld", player: int):
         assert multiworld is not None

worlds/Files.py

@@ -8,8 +8,7 @@ import os
 import threading
 from io import BytesIO
 
-from typing import (ClassVar, Dict, List, Literal, Tuple, Any, Optional, Union, BinaryIO, overload, Sequence,
-                    TYPE_CHECKING)
+from typing import ClassVar, Dict, List, Literal, Tuple, Any, Optional, Union, BinaryIO, overload, Sequence
 
 import bsdiff4
 
@@ -17,9 +16,6 @@ semaphore = threading.Semaphore(os.cpu_count() or 4)
 
 del threading
 
-if TYPE_CHECKING:
-    from Utils import Version
-
 
 class AutoPatchRegister(abc.ABCMeta):
     patch_types: ClassVar[Dict[str, AutoPatchRegister]] = {}
@@ -69,7 +65,7 @@ class AutoPatchExtensionRegister(abc.ABCMeta):
             return handler
 
 
-container_version: int = 7
+container_version: int = 6
 
 
 def is_ap_player_container(game: str, data: bytes, player: int):
@@ -96,7 +92,7 @@ class APContainer:
     version: ClassVar[int] = container_version
     compression_level: ClassVar[int] = 9
     compression_method: ClassVar[int] = zipfile.ZIP_DEFLATED
-    manifest_path: str = "archipelago.json"
+
     path: Optional[str]
 
     def __init__(self, path: Optional[str] = None):
@@ -120,7 +116,7 @@ class APContainer:
         except Exception as e:
             raise Exception(f"Manifest {manifest} did not convert to json.") from e
         else:
-            opened_zipfile.writestr(self.manifest_path, manifest_str)
+            opened_zipfile.writestr("archipelago.json", manifest_str)
 
     def read(self, file: Optional[Union[str, BinaryIO]] = None) -> None:
         """Read data into patch object. file can be file-like, such as an outer zip file's stream."""
@@ -141,18 +137,7 @@ class APContainer:
                 raise InvalidDataError(f"{message}This might be the incorrect world version for this file") from e
 
     def read_contents(self, opened_zipfile: zipfile.ZipFile) -> Dict[str, Any]:
-        try:
-            assert self.manifest_path.endswith("archipelago.json"), "Filename should be archipelago.json"
-            manifest_info = opened_zipfile.getinfo(self.manifest_path)
-        except KeyError as e:
-            for info in opened_zipfile.infolist():
-                if info.filename.endswith("archipelago.json"):
-                    manifest_info = info
-                    self.manifest_path = info.filename
-                    break
-            else:
-                raise e
-        with opened_zipfile.open(manifest_info, "r") as f:
+        with opened_zipfile.open("archipelago.json", "r") as f:
             manifest = json.load(f)
         if manifest["compatible_version"] > self.version:
             raise Exception(f"File (version: {manifest['compatible_version']}) too new "
@@ -167,33 +152,6 @@ class APContainer:
         }
 
 
-class APWorldContainer(APContainer):
-    """A zipfile containing a world implementation."""
-    game: str | None = None
-    world_version: "Version | None" = None
-    minimum_ap_version: "Version | None" = None
-    maximum_ap_version: "Version | None" = None
-
-    def read_contents(self, opened_zipfile: zipfile.ZipFile) -> Dict[str, Any]:
-        from Utils import tuplize_version, Version
-        manifest = super().read_contents(opened_zipfile)
-        self.game = manifest["game"]
-        for version_key in ("world_version", "minimum_ap_version", "maximum_ap_version"):
-            if version_key in manifest:
-                setattr(self, version_key, Version(*tuplize_version(manifest[version_key])))
-        return manifest
-
-    def get_manifest(self) -> Dict[str, Any]:
-        manifest = super().get_manifest()
-        manifest["game"] = self.game
-        manifest["compatible_version"] = 7
-        for version_key in ("world_version", "minimum_ap_version", "maximum_ap_version"):
-            version = getattr(self, version_key)
-            if version:
-                manifest[version_key] = version.as_simple_string()
-        return manifest
-
-
 class APPlayerContainer(APContainer):
     """A zipfile containing at least archipelago.json meant for a player"""
     game: ClassVar[Optional[str]] = None
@@ -290,8 +248,10 @@ class APProcedurePatch(APAutoPatchInterface):
             manifest["compatible_version"] = 5
         return manifest
 
-    def read_contents(self, opened_zipfile: zipfile.ZipFile) -> Dict[str, Any]:
-        manifest = super(APProcedurePatch, self).read_contents(opened_zipfile)
+    def read_contents(self, opened_zipfile: zipfile.ZipFile) -> None:
+        super(APProcedurePatch, self).read_contents(opened_zipfile)
+        with opened_zipfile.open("archipelago.json", "r") as f:
+            manifest = json.load(f)
         if "procedure" not in manifest:
             # support patching files made before moving to procedures
             self.procedure = [("apply_bsdiff4", ["delta.bsdiff4"])]
@@ -300,7 +260,6 @@ class APProcedurePatch(APAutoPatchInterface):
         for file in opened_zipfile.namelist():
             if file not in ["archipelago.json"]:
                 self.files[file] = opened_zipfile.read(file)
-        return manifest
 
     def write_contents(self, opened_zipfile: zipfile.ZipFile) -> None:
         super(APProcedurePatch, self).write_contents(opened_zipfile)

worlds/LauncherComponents.py

@@ -5,7 +5,7 @@ import weakref
 from enum import Enum, auto
 from typing import Optional, Callable, List, Iterable, Tuple
 
-from Utils import local_path, open_filename, is_frozen, is_kivy_running
+from Utils import local_path, open_filename
 
 
 class Type(Enum):
@@ -177,9 +177,10 @@ def _install_apworld(apworld_src: str = "") -> Optional[Tuple[pathlib.Path, path
         if module_name == loaded_name:
             found_already_loaded = True
             break
-    if found_already_loaded and is_kivy_running():
-        raise Exception(f"Installed APWorld successfully, but '{module_name}' is already loaded, "
-                        "so a Launcher restart is required to use the new installation.")
+    if found_already_loaded:
+        raise Exception(f"Installed APWorld successfully, but '{module_name}' is already loaded,\n"
+                        "so a Launcher restart is required to use the new installation.\n"
+                        "If the Launcher is not open, no action needs to be taken.")
     world_source = worlds.WorldSource(str(target), is_zip=True)
     bisect.insort(worlds.world_sources, world_source)
     world_source.load()
@@ -196,7 +197,7 @@ def install_apworld(apworld_path: str = "") -> None:
         source, target = res
     except Exception as e:
         import Utils
-        Utils.messagebox("Notice", str(e), error=True)
+        Utils.messagebox(e.__class__.__name__, str(e), error=True)
         logging.exception(e)
     else:
         import Utils
@@ -228,6 +229,8 @@ components: List[Component] = [
     Component('Zelda 1 Client', 'Zelda1Client', file_identifier=SuffixIdentifier('.aptloz')),
     # ChecksFinder
     Component('ChecksFinder Client', 'ChecksFinderClient'),
+    # Starcraft 2
+    Component('Starcraft 2 Client', 'Starcraft2Client'),
     # Zillion
     Component('Zillion Client', 'ZillionClient',
               file_identifier=SuffixIdentifier('.apzl')),
@@ -242,39 +245,3 @@ icon_paths = {
     'icon': local_path('data', 'icon.png'),
     'discord': local_path('data', 'discord-mark-blue.png'),
 }
-
-if not is_frozen():
-    def _build_apworlds():
-        import json
-        import os
-        import zipfile
-
-        from worlds import AutoWorldRegister
-        from worlds.Files import APWorldContainer
-
-        apworlds_folder = os.path.join("build", "apworlds")
-        os.makedirs(apworlds_folder, exist_ok=True)
-        for worldname, worldtype in AutoWorldRegister.world_types.items():
-            file_name = os.path.split(os.path.dirname(worldtype.__file__))[1]
-            world_directory = os.path.join("worlds", file_name)
-            if os.path.isfile(os.path.join(world_directory, "archipelago.json")):
-                manifest = json.load(open(os.path.join(world_directory, "archipelago.json")))
-            else:
-                manifest = {}
-
-            zip_path = os.path.join(apworlds_folder, file_name + ".apworld")
-            apworld = APWorldContainer(str(zip_path))
-            apworld.game = worldtype.game
-            manifest.update(apworld.get_manifest())
-            apworld.manifest_path = f"{file_name}/archipelago.json"
-            with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED,
-                                 compresslevel=9) as zf:
-                for path in pathlib.Path(world_directory).rglob("*.*"):
-                    relative_path = os.path.join(*path.parts[path.parts.index("worlds") + 1:])
-                    if "__MACOSX" in relative_path or ".DS_STORE" in relative_path or "__pycache__" in relative_path:
-                        continue
-                    if not relative_path.endswith("archipelago.json"):
-                        zf.write(path, relative_path)
-                zf.writestr(apworld.manifest_path, json.dumps(manifest))
-
-    components.append(Component('Build apworlds', func=_build_apworlds, cli=True,))

worlds/__init__.py

@@ -7,11 +7,10 @@ import warnings
 import zipimport
 import time
 import dataclasses
-import json
 from typing import List
 
 from NetUtils import DataPackage
-from Utils import local_path, user_path, Version, version_tuple, tuplize_version
+from Utils import local_path, user_path
 
 local_folder = os.path.dirname(__file__)
 user_folder = user_path("worlds") if user_path() != local_path() else user_path("custom_worlds")
@@ -39,7 +38,6 @@ class WorldSource:
     is_zip: bool = False
     relative: bool = True  # relative to regular world import folder
     time_taken: float = -1.0
-    version: Version = Version(0, 0, 0)
 
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self.path}, is_zip={self.is_zip}, relative={self.relative})"
@@ -104,94 +102,12 @@ for folder in (folder for folder in (user_folder, local_folder) if folder):
 
 # import all submodules to trigger AutoWorldRegister
 world_sources.sort()
-apworlds: list[WorldSource] = []
 for world_source in world_sources:
-    # load all loose files first:
-    if world_source.is_zip:
-        apworlds.append(world_source)
-    else:
-        world_source.load()
-
-
-from .AutoWorld import AutoWorldRegister
-
-for world_source in world_sources:
-    if not world_source.is_zip:
-        # look for manifest
-        manifest = {}
-        for dirpath, dirnames, filenames in os.walk(world_source.resolved_path):
-            for file in filenames:
-                if file.endswith("archipelago.json"):
-                    manifest = json.load(open(os.path.join(dirpath, file), "r"))
-                    break
-            if manifest:
-                break
-        game = manifest.get("game")
-        if game in AutoWorldRegister.world_types:
-            AutoWorldRegister.world_types[game].world_version = Version(*tuplize_version(manifest.get("world_version",
-                                                                                                      "0.0.0")))
-
-if apworlds:
-    # encapsulation for namespace / gc purposes
-    def load_apworlds() -> None:
-        global apworlds
-        from .Files import APWorldContainer, InvalidDataError
-        core_compatible: list[tuple[WorldSource, APWorldContainer]] = []
-
-        def fail_world(game_name: str, reason: str, add_as_failed_to_load: bool = True) -> None:
-            if add_as_failed_to_load:
-                failed_world_loads.append(game_name)
-            logging.warning(reason)
-
-        for apworld_source in apworlds:
-            apworld: APWorldContainer = APWorldContainer(apworld_source.resolved_path)
-            # populate metadata
-            try:
-                apworld.read()
-            except InvalidDataError as e:
-                if version_tuple < (0, 7, 0):
-                    logging.error(
-                        f"Invalid or missing manifest file for {apworld_source.resolved_path}. "
-                        "This apworld will stop working with Archipelago 0.7.0."
-                    )
-                    logging.error(e)
-                else:
-                    raise e
-
-            if apworld.minimum_ap_version and apworld.minimum_ap_version > version_tuple:
-                fail_world(apworld.game,
-                           f"Did not load {apworld_source.path} "
-                           f"as its minimum core version {apworld.minimum_ap_version} "
-                           f"is higher than current core version {version_tuple}.")
-            elif apworld.maximum_ap_version and apworld.maximum_ap_version < version_tuple:
-                fail_world(apworld.game,
-                           f"Did not load {apworld_source.path} "
-                           f"as its maximum core version {apworld.maximum_ap_version} "
-                           f"is lower than current core version {version_tuple}.")
-            else:
-                core_compatible.append((apworld_source, apworld))
-        # load highest version first
-        core_compatible.sort(
-            key=lambda element: element[1].world_version if element[1].world_version else Version(0, 0, 0),
-            reverse=True)
-        for apworld_source, apworld in core_compatible:
-            if apworld.game and apworld.game in AutoWorldRegister.world_types:
-                fail_world(apworld.game,
-                           f"Did not load {apworld_source.path} "
-                           f"as its game {apworld.game} is already loaded.",
-                           add_as_failed_to_load=False)
-            else:
-                apworld_source.load()
-                if apworld.game in AutoWorldRegister.world_types:
-                    # world could fail to load at this point
-                    if apworld.world_version:
-                        AutoWorldRegister.world_types[apworld.game].world_version = apworld.world_version
-    load_apworlds()
-    del load_apworlds
-
-del apworlds
+    world_source.load()
 
 # Build the data package for each game.
+from .AutoWorld import AutoWorldRegister
+
 network_data_package: DataPackage = {
     "games": {world_name: world.get_data_package_data() for world_name, world in AutoWorldRegister.world_types.items()},
 }

worlds/_sc2common/bot/game_data.py

@@ -19,7 +19,7 @@ class GameData:
         """
         :param data:
         """
-        self.abilities: Dict[int, AbilityData] = {a.ability_id: AbilityData(self, a) for a in data.abilities if a.available}
+        self.abilities: Dict[int, AbilityData] = {}
         self.units: Dict[int, UnitTypeData] = {u.unit_id: UnitTypeData(self, u) for u in data.units if u.available}
         self.upgrades: Dict[int, UpgradeData] = {u.upgrade_id: UpgradeData(self, u) for u in data.upgrades}
         # Cached UnitTypeIds so that conversion does not take long. This needs to be moved elsewhere if a new GameData object is created multiple times per game
@@ -40,7 +40,7 @@ class AbilityData:
         self._proto = proto
 
         # What happens if we comment this out? Should this not be commented out? What is its purpose?
-        # assert self.id != 0 # let the world burn
+        assert self.id != 0
 
     def __repr__(self) -> str:
         return f"AbilityData(name={self._proto.button_name})"

worlds/ahit/Options.py

@@ -623,23 +623,6 @@ class ParadeTrapWeight(Range):
     default = 20
 
 
-class DeathLinkAmnesty(Range):
-    """Amount of forgiven deaths before sending a Death Link.
-    0 means that every death will send a Death Link."""
-    display_name = "Death Link Amnesty"
-    range_start = 0
-    range_end = 20
-    default = 0
-
-
-class DWDeathLinkAmnesty(Range):
-    """Amount of forgiven deaths before sending a Death Link during Death Wish levels."""
-    display_name = "Death Wish Amnesty"
-    range_start = 0
-    range_end = 30
-    default = 5
-
-
 @dataclass
 class AHITOptions(PerGameCommonOptions):
     start_inventory_from_pool: StartInventoryPool
@@ -717,8 +700,6 @@ class AHITOptions(PerGameCommonOptions):
     ParadeTrapWeight:         ParadeTrapWeight
 
     death_link:               DeathLink
-    death_link_amnesty:       DeathLinkAmnesty
-    dw_death_link_amnesty:    DWDeathLinkAmnesty
 
 
 ahit_option_groups: Dict[str, List[Any]] = {
@@ -788,6 +769,4 @@ slot_data_options: List[str] = [
     "MaxPonCost",
 
     "death_link",
-    "death_link_amnesty",
-    "dw_death_link_amnesty",
 ]

worlds/alttp/test/__init__.py

@@ -0,0 +1,22 @@
+import unittest
+from argparse import Namespace
+
+from BaseClasses import MultiWorld, CollectionState
+from worlds import AutoWorldRegister
+
+
+class LTTPTestBase(unittest.TestCase):
+    def world_setup(self):
+        from worlds.alttp.Options import Medallion
+        self.multiworld = MultiWorld(1)
+        self.multiworld.game[1] = "A Link to the Past"
+        self.multiworld.set_seed(None)
+        args = Namespace()
+        for name, option in AutoWorldRegister.world_types["A Link to the Past"].options_dataclass.type_hints.items():
+            setattr(args, name, {1: option.from_any(getattr(option, "default"))})
+        self.multiworld.set_options(args)
+        self.multiworld.state = CollectionState(self.multiworld)
+        self.world = self.multiworld.worlds[1]
+        # by default medallion access is randomized, for unittests we set it to vanilla
+        self.world.options.misery_mire_medallion.value = Medallion.option_ether
+        self.world.options.turtle_rock_medallion.value = Medallion.option_quake

worlds/alttp/test/bases.py

@@ -1,113 +0,0 @@
-import unittest
-from argparse import Namespace
-
-from BaseClasses import MultiWorld, CollectionState, ItemClassification
-from worlds import AutoWorldRegister
-from ..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 LTTPTestBase(unittest.TestCase):
-    def world_setup(self):
-        from worlds.alttp.Options import Medallion
-        self.multiworld = MultiWorld(1)
-        self.multiworld.game[1] = "A Link to the Past"
-        self.multiworld.set_seed(None)
-        args = Namespace()
-        for name, option in AutoWorldRegister.world_types["A Link to the Past"].options_dataclass.type_hints.items():
-            setattr(args, name, {1: option.from_any(getattr(option, "default"))})
-        self.multiworld.set_options(args)
-        self.multiworld.state = CollectionState(self.multiworld)
-        self.world = self.multiworld.worlds[1]
-        # by default medallion access is randomized, for unittests we set it to vanilla
-        self.world.options.misery_mire_medallion.value = Medallion.option_ether
-        self.world.options.turtle_rock_medallion.value = Medallion.option_quake

worlds/alttp/test/dungeons/TestDungeon.py

@@ -5,7 +5,7 @@ from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Items import item_factory
 from worlds.alttp.Regions import create_regions
 from worlds.alttp.Shops import create_shops
-from worlds.alttp.test.bases import LTTPTestBase
+from worlds.alttp.test import LTTPTestBase
 
 
 class TestDungeon(LTTPTestBase):

worlds/alttp/test/inverted/TestInverted.py

@@ -1,12 +1,13 @@
-from ...Dungeons import get_dungeon_item_pool
-from ...EntranceShuffle import link_inverted_entrances
-from ...InvertedRegions import create_inverted_regions
-from ...ItemPool import difficulties
-from ...Items import item_factory
-from ...Regions import mark_light_world_regions
-from ...Shops import create_shops
+from worlds.alttp.Dungeons import get_dungeon_item_pool
+from worlds.alttp.EntranceShuffle import link_inverted_entrances
+from worlds.alttp.InvertedRegions import create_inverted_regions
+from worlds.alttp.ItemPool import difficulties
+from worlds.alttp.Items import item_factory
+from worlds.alttp.Regions import mark_light_world_regions
+from worlds.alttp.Shops import create_shops
+from test.bases import TestBase
 
-from ..bases import LTTPTestBase, TestBase
+from worlds.alttp.test import LTTPTestBase
 
 
 class TestInverted(TestBase, LTTPTestBase):

worlds/alttp/test/inverted/TestInvertedBombRules.py

@@ -4,7 +4,7 @@ from worlds.alttp.EntranceShuffle import connect_entrance, Inverted_LW_Entrances
 from worlds.alttp.InvertedRegions import create_inverted_regions
 from worlds.alttp.ItemPool import difficulties
 from worlds.alttp.Rules import set_inverted_big_bomb_rules
-from worlds.alttp.test.bases import LTTPTestBase
+from worlds.alttp.test import LTTPTestBase
 
 
 class TestInvertedBombRules(LTTPTestBase):

worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py

@@ -1,13 +1,14 @@
-from ...Dungeons import get_dungeon_item_pool
-from ...EntranceShuffle import link_inverted_entrances
-from ...InvertedRegions import create_inverted_regions
-from ...ItemPool import difficulties
-from ...Items import item_factory
-from ...Options import GlitchesRequired
-from ...Regions import mark_light_world_regions
-from ...Shops import create_shops
+from worlds.alttp.Dungeons import get_dungeon_item_pool
+from worlds.alttp.EntranceShuffle import link_inverted_entrances
+from worlds.alttp.InvertedRegions import create_inverted_regions
+from worlds.alttp.ItemPool import difficulties
+from worlds.alttp.Items import item_factory
+from worlds.alttp.Options import GlitchesRequired
+from worlds.alttp.Regions import mark_light_world_regions
+from worlds.alttp.Shops import create_shops
+from test.bases import TestBase
 
-from ..bases import LTTPTestBase, TestBase
+from worlds.alttp.test import LTTPTestBase
 
 
 class TestInvertedMinor(TestBase, LTTPTestBase):

worlds/alttp/test/inverted_owg/TestInvertedOWG.py

@@ -1,13 +1,14 @@
-from ...Dungeons import get_dungeon_item_pool
-from ...EntranceShuffle import link_inverted_entrances
-from ...InvertedRegions import create_inverted_regions
-from ...ItemPool import difficulties
-from ...Items import item_factory
-from ...Options import GlitchesRequired
-from ...Regions import mark_light_world_regions
-from ...Shops import create_shops
+from worlds.alttp.Dungeons import get_dungeon_item_pool
+from worlds.alttp.EntranceShuffle import link_inverted_entrances
+from worlds.alttp.InvertedRegions import create_inverted_regions
+from worlds.alttp.ItemPool import difficulties
+from worlds.alttp.Items import item_factory
+from worlds.alttp.Options import GlitchesRequired
+from worlds.alttp.Regions import mark_light_world_regions
+from worlds.alttp.Shops import create_shops
+from test.bases import TestBase
 
-from ..bases import LTTPTestBase, TestBase
+from worlds.alttp.test import LTTPTestBase
 
 
 class TestInvertedOWG(TestBase, LTTPTestBase):

worlds/alttp/test/items/TestDifficulty.py

@@ -1,5 +1,5 @@
-from ...ItemPool import difficulties
-from ..bases import TestBase
+from worlds.alttp.ItemPool import difficulties
+from test.bases import TestBase
 
 base_items = 41
 extra_counts = (15, 15, 10, 5, 25)

worlds/alttp/test/minor_glitches/TestMinor.py

@@ -1,10 +1,11 @@
-from ...Dungeons import get_dungeon_item_pool
-from ...InvertedRegions import mark_dark_world_regions
-from ...ItemPool import difficulties
-from ...Items import item_factory
-from ...Options import GlitchesRequired
+from worlds.alttp.Dungeons import get_dungeon_item_pool
+from worlds.alttp.InvertedRegions import mark_dark_world_regions
+from worlds.alttp.ItemPool import difficulties
+from worlds.alttp.Items import item_factory
+from test.bases import TestBase
+from worlds.alttp.Options import GlitchesRequired
 
-from ..bases import LTTPTestBase, TestBase
+from worlds.alttp.test import LTTPTestBase
 
 
 class TestMinor(TestBase, LTTPTestBase):

worlds/alttp/test/owg/TestVanillaOWG.py

@@ -1,10 +1,11 @@
-from ...Dungeons import get_dungeon_item_pool
-from ...InvertedRegions import mark_dark_world_regions
-from ...ItemPool import difficulties
-from ...Items import item_factory
-from ...Options import GlitchesRequired
+from worlds.alttp.Dungeons import get_dungeon_item_pool
+from worlds.alttp.InvertedRegions import mark_dark_world_regions
+from worlds.alttp.ItemPool import difficulties
+from worlds.alttp.Items import item_factory
+from test.bases import TestBase
+from worlds.alttp.Options import GlitchesRequired
 
-from ..bases import LTTPTestBase, TestBase
+from worlds.alttp.test import LTTPTestBase
 
 
 class TestVanillaOWG(TestBase, LTTPTestBase):

worlds/alttp/test/shops/TestSram.py

@@ -1,5 +1,5 @@
-from ...Shops import shop_table
-from ..bases import TestBase
+from worlds.alttp.Shops import shop_table
+from test.bases import TestBase
 
 
 class TestSram(TestBase):

worlds/alttp/test/vanilla/TestVanilla.py

@@ -1,10 +1,10 @@
-from ...Dungeons import get_dungeon_item_pool
-from ...InvertedRegions import mark_dark_world_regions
-from ...ItemPool import difficulties
-from ...Items import item_factory
-from ...Options import GlitchesRequired
-
-from ..bases import LTTPTestBase, TestBase
+from worlds.alttp.Dungeons import get_dungeon_item_pool
+from worlds.alttp.InvertedRegions import mark_dark_world_regions
+from worlds.alttp.ItemPool import difficulties
+from worlds.alttp.Items import item_factory
+from test.bases import TestBase
+from worlds.alttp.Options import GlitchesRequired
+from worlds.alttp.test import LTTPTestBase
 
 
 class TestVanilla(TestBase, LTTPTestBase):

worlds/archipidle/Items.py

@@ -0,0 +1,315 @@
+item_table = (
+    'An Old GeoCities Profile',
+    'Very Funny Joke',
+    'Motivational Video',
+    'Staples Easy Button',
+    'One Million Dollars',
+    'Replica Master Sword',
+    'VHS Copy of Jurassic Park',
+    '32GB USB Drive',
+    'Pocket Protector',
+    'Leftover Parts from IKEA Furniture',
+    'Half-Empty Ink Cartridge for a Printer',
+    'Watch Battery',
+    'Towel',
+    'Scarf',
+    '2012 Magic the Gathering Core Set Starter Box',
+    'Poke\'mon Booster Pack',
+    'USB Speakers',
+    'Eco-Friendly Spork',
+    'Cheeseburger',
+    'Brand New Car',
+    'Hunting Knife',
+    'Zippo Lighter',
+    'Red Shirt',
+    'One-Up Mushroom',
+    'Nokia N-GAGE',
+    '2-Liter of Sprite',
+    'Free trial of the critically acclaimed MMORPG Final Fantasy XIV, including the entirety of A Realm Reborn and the award winning Heavensward and Stormblood expansions up to level 70 with no restrictions on playtime!',
+    'Can of Compressed Air',
+    'Striped Kitten',
+    'USB Power Adapter',
+    'Fortune Cookie',
+    'Nintendo Power Glove',
+    'The Lampshade of No Real Significance',
+    'Kneepads of Allure',
+    'Get Out of Jail Free Card',
+    'Box Set of Stargate SG-1 Season 4',
+    'The Missing Left Sock',
+    'Poster Tube',
+    'Electronic Picture Frame',
+    'Bottle of Shampoo',
+    'Your Mission, Should You Choose To Accept It',
+    'Fanny Pack',
+    'Robocop T-Shirt',
+    'Suspiciously Small Monocle',
+    'Table Saw',
+    'Cookies and Cream Milkshake',
+    'Deflated Accordion',
+    'Grandma\'s Homemade Pie',
+    'Invisible Lego on the Floor',
+    'Pitfall Trap',
+    'Flathead Screwdriver',
+    'Leftover Pizza',
+    'Voodoo Doll that Looks Like You',
+    'Pink Shoelaces',
+    'Half a Bottle of Scotch',
+    'Reminder Not to Forget Aginah',
+    'Medicine Ball',
+    'Yoga Mat',
+    'Chocolate Orange',
+    'Old Concert Tickets',
+    'The Pick of Destiny',
+    'McGuffin',
+    'Just a Regular McMuffin',
+    '34 Tacos',
+    'Duct Tape',
+    'Copy of Untitled Goose Game',
+    'Partially Used Bed Bath & Beyond Gift Card',
+    'Mostly Popped Bubble Wrap',
+    'Expired Driver\'s License',
+    'The Look, You Know the One',
+    'Transformers Lunch Box',
+    'MP3 Player',
+    'Dry Sharpie',
+    'Chalkboard Eraser',
+    'Overhead Projector',
+    'Physical Copy of the Japanese 1.0 Link to the Past',
+    'Collectable Action Figure',
+    'Box Set of The Lord of the Rings Books',
+    'Lite-Bright',
+    'Stories from the Good-Old-Days',
+    'Un-Reproducable Bug Reports',
+    'Autographed Copy of Shaq-Fu',
+    'Game-Winning Baseball',
+    'Portable Battery Bank',
+    'Blockbuster Membership Card',
+    'Offensive Bumper Sticker',
+    'Last Sunday\'s Crossword Puzzle',
+    'Rubik\'s Cube',
+    'Your First Grey Hair',
+    'Embarrassing Childhood Photo',
+    'Abandoned Sphere One Check',
+    'The Internet',
+    'Late-Night Cartoons',
+    'The Correct Usage of a Semicolon',
+    'Microsoft Windows 95 Resource Kit',
+    'Car-Phone',
+    'Walkman Radio',
+    'Relevant XKCD Comic',
+    'Razor Scooter',
+    'Set of Beyblades',
+    'Box of Pogs',
+    'Beanie-Baby Collection',
+    'Laser Tag Gun',
+    'Radio Controlled Car',
+    'Boogie Board',
+    'Air Jordans',
+    'Rubber Duckie',
+    'The Last Cookie in the Cookie Jar',
+    'Tin-Foil Hat',
+    'Button-Up Shirt',
+    'Designer Brand Bag',
+    'Trapper Keeper',
+    'Fake Moustache',
+    'Colored Pencils',
+    'Pair of 3D Glasses',
+    'Pair of Movie Tickets',
+    'Refrigerator Magnets',
+    'NASCAR Dinner Plates',
+    'The Final Boss',
+    'Unskippable Cutscenes',
+    '24 Rolls of Toilet Paper',
+    'Canned Soup',
+    'Warm Blanket',
+    '3D Printer',
+    'Jetpack',
+    'Hoverboard',
+    'Joycons with No Drift',
+    'Double Rainbow',
+    'Ping Pong Ball',
+    'Area 51 Arcade Cabinet',
+    'Elephant in the Room',
+    'The Pink Panther',
+    'Denim Shorts',
+    'Tennis Racket',
+    'Collection of Stuffed Animals',
+    'Old Cell Phone',
+    'Nintendo Virtual Boy',
+    'Box of 5.25 Inch Floppy Disks',
+    'Bag of Miscellaneous Wires',
+    'Garden Shovel',
+    'Leather Gloves',
+    'Knife of +9 VS Ogres',
+    'Old, Smelly Cheese',
+    'Linksys BEFSR41 Router',
+    'Ethernet Cables for a LAN Party',
+    'Mechanical Pencil',
+    'Book of Graph Paper',
+    '300 Sheets of Printer Paper',
+    'One AAA Battery',
+    'Box of Old Game Controllers',
+    'Sega Dreamcast',
+    'Mario\'s Overalls',
+    'Betamax Player',
+    'Stray Lego',
+    'Chocolate Chip Pancakes',
+    'Two Blueberry Muffins',
+    'Nintendo 64 Controller with a Perfect Thumbstick',
+    'Cuckoo Crossing the Road',
+    'One Eyed, One Horned, Flying Purple People-Eater',
+    'Love Potion Number Nine',
+    'Wireless Headphones',
+    'Festive Keychain',
+    'Bundle of Twisted Cables',
+    'Plank of Wood',
+    'Broken Ant Farm',
+    'Thirty-six American Dollars',
+    'Can of Shaving Cream',
+    'Blue Hair Dye',
+    'Mug Engraved with the AP Logo',
+    'Tube of Toothpaste',
+    'Album of Elevator Music',
+    'Headlight Fluid',
+    'Tickets to the Renaissance Faire',
+    'Bag of Golf Balls',
+    'Box of Packing Peanuts',
+    'Bottle of Peanut Butter',
+    'Breath of the Wild Cookbook',
+    'Stardew Valley Cookbook',
+    'Thirteen Angry Chickens',
+    'Bowl of Cereal',
+    'Rubber Snake',
+    'Stale Sunflower Seeds',
+    'Alarm Clock Without a Snooze Button',
+    'Wet Pineapple',
+    'Set of Scented Candles',
+    'Adorable Stuffed Animal',
+    'The Broodwitch',
+    'Old Photo Album',
+    'Trade Quest Item',
+    'Pair of Fancy Boots',
+    'Shoddy Pickaxe',
+    'Adventurer\'s Sword',
+    'Cute Puppy',
+    'Box of Matches',
+    'Set of Allen Wrenches',
+    'Glass of Water',
+    'Magic Shaggy Carpet',
+    'Macaroni and Cheese',
+    'Chocolate Chip Cookie Dough Ice Cream',
+    'Fresh Strawberries',
+    'Delicious Tacos',
+    'The Krabby Patty Recipe',
+    'Map to Waldo\'s Location',
+    'Stray Cat',
+    'Ham and Cheese Sandwich',
+    'DVD Player',
+    'Motorcycle Helmet',
+    'Fake Flowers',
+    '6-Pack of Sponges',
+    'Heated Pants',
+    'Empty Glass Bottle',
+    'Brown Paper Bag',
+    'Model Train Set',
+    'TV Remote',
+    'RC Car',
+    'Super Soaker 9000',
+    'Giant Sunglasses',
+    'World\'s Smallest Violin',
+    'Pile of Fresh Warm Laundry',
+    'Half-Empty Ice Cube Tray',
+    'Bob Ross Afro Wig',
+    'Empty Cardboard Box',
+    'Packet of Soy Sauce',
+    'Solutions to a Math Test',
+    'Pencil Eraser',
+    'The Great Pumpkin',
+    'Very Expensive Toaster',
+    'Pack of Colored Sharpies',
+    'Bag of Chocolate Chips',
+    'Grandma\'s Homemade Cookies',
+    'Collection of Bottle Caps',
+    'Pack of Playing Cards',
+    'Boom Box',
+    'Toy Sail Boat',
+    'Smooth Nail File',
+    'Colored Chalk',
+    'Missing Button',
+    'Rubber Band Ball',
+    'Joystick',
+    'Galaga Arcade Cabinet',
+    'Anime Mouse Pad',
+    'Orange and Yellow Glow Sticks',
+    'Odd Bookmark',
+    'Stray Dice',
+    'Tooth Picks',
+    'Dirty Dishes',
+    'Poke\'mon Card Game Rule Book (Gen 1)',
+    'Salt Shaker',
+    'Digital Thermometer',
+    'Infinite Improbability Drive',
+    'Fire Extinguisher',
+    'Beeping Smoke Alarm',
+    'Greasy Spatula',
+    'Progressive Auto Insurance',
+    'Mace Windu\'s Purple Lightsaber',
+    'An Old Fixer-Upper',
+    'Gamer Chair',
+    'Comfortable Reclining Chair',
+    'Shirt Covered in Dog Hair',
+    'Angry Praying Mantis',
+    'Card Games on Motorcycles',
+    'Trucker Hat',
+    'The DK Rap',
+    'Three Great Balls',
+    'Some Very Sus Behavior',
+    'Glass of Orange Juice',
+    'Turkey Bacon',
+    'Bald Barbie Doll',
+    'Developer Commentary',
+    'Subscription to Nintendo Power Magazine',
+    'DeLorean Time Machine',
+    'Unkillable Cockroach',
+    'Dungeons & Dragons Rulebook',
+    'Boxed Copy of Quest 64',
+    'James Bond\'s Gadget Wristwatch',
+    'Tube of Go-Gurt',
+    'Digital Watch',
+    'Laser Pointer',
+    'The Secret Cow Level',
+    'AOL Free Trial CD-ROM',
+    'E.T. for Atari 2600',
+    'Season 2 of Knight Rider',
+    'Spam E-Mails',
+    'Half-Life 3 Release Date',
+    'Source Code of Jurassic Park',
+    'Moldy Cheese',
+    'Comic Book Collection',
+    'Hardcover Copy of Scott Pilgrim VS the World',
+    'Old Gym Shorts',
+    'Very Cool Sunglasses',
+    'Your High School Yearbook Picture',
+    'Written Invitation to Prom',
+    'The Star Wars Holiday Special',
+    'Oil Change Coupon',
+    'Finger Guns',
+    'Box of Tabletop Games',
+    'Sock Puppets',
+    'The Dog of Wisdom',
+    'Surprised Chipmunk',
+    'Stonks',
+    'A Shrubbery',
+    'Roomba with a Knife',
+    'Wet Cat',
+    'The missing moderator, Frostwares',
+    '1,793 Crossbows',
+    'Holographic First Edition Charizard (Gen 1)',
+    'VR Headset',
+    'Archipelago 1.0 Release Date',
+    'Strand of Galadriel\'s Hair',
+    'Can of Meow-Mix',
+    'Shake-Weight',
+    'DVD Collection of Billy Mays Infomercials',
+    'Old CD Key',
+)

worlds/archipidle/Rules.py

@@ -0,0 +1,28 @@
+from BaseClasses import MultiWorld
+from worlds.AutoWorld import LogicMixin
+
+
+class ArchipIDLELogic(LogicMixin):
+    def _archipidle_location_is_accessible(self, player_id, items_required):
+        return sum(self.prog_items[player_id].values()) >= items_required
+
+
+def set_rules(world: MultiWorld, player: int):
+    for i in range(16, 31):
+        world.get_location(f"IDLE item number {i}", player).access_rule = lambda \
+            state: state._archipidle_location_is_accessible(player, 4)
+
+    for i in range(31, 51):
+        world.get_location(f"IDLE item number {i}", player).access_rule = lambda \
+            state: state._archipidle_location_is_accessible(player, 10)
+
+    for i in range(51, 101):
+        world.get_location(f"IDLE item number {i}", player).access_rule = lambda \
+            state: state._archipidle_location_is_accessible(player, 20)
+
+    for i in range(101, 201):
+        world.get_location(f"IDLE item number {i}", player).access_rule = lambda \
+            state: state._archipidle_location_is_accessible(player, 40)
+
+    world.completion_condition[player] =\
+        lambda state: state.can_reach(world.get_location("IDLE item number 200", player), "Location", player)

worlds/archipidle/__init__.py

@@ -0,0 +1,128 @@
+from BaseClasses import Item, MultiWorld, Region, Location, Entrance, Tutorial, ItemClassification
+from worlds.AutoWorld import World, WebWorld
+from datetime import datetime
+from .Items import item_table
+from .Rules import set_rules
+
+
+class ArchipIDLEWebWorld(WebWorld):
+    theme = 'partyTime'
+    tutorials = [
+        Tutorial(
+            tutorial_name='Setup Guide',
+            description='A guide to playing Archipidle',
+            language='English',
+            file_name='guide_en.md',
+            link='guide/en',
+            authors=['Farrak Kilhn']
+        ),
+        Tutorial(
+            tutorial_name='Guide d installation',
+            description='Un guide pour jouer à Archipidle',
+            language='Français',
+            file_name='guide_fr.md',
+            link='guide/fr',
+            authors=['TheLynk']
+        )
+    ]
+
+
+class ArchipIDLEWorld(World):
+    """
+    An idle game which sends a check every thirty to sixty seconds, up to two hundred checks.
+    """
+    game = "ArchipIDLE"
+    topology_present = False
+    hidden = (datetime.now().month != 4)  # ArchipIDLE is only visible during April
+    web = ArchipIDLEWebWorld()
+
+    item_name_to_id = {}
+    start_id = 9000
+    for item in item_table:
+        item_name_to_id[item] = start_id
+        start_id += 1
+
+    location_name_to_id = {}
+    start_id = 9000
+    for i in range(1, 201):
+        location_name_to_id[f"IDLE item number {i}"] = start_id
+        start_id += 1
+
+    def set_rules(self):
+        set_rules(self.multiworld, self.player)
+
+    def create_item(self, name: str) -> Item:
+        return Item(name, ItemClassification.progression, self.item_name_to_id[name], self.player)
+
+    def create_items(self):
+        item_pool = [
+            ArchipIDLEItem(
+                item_table[0],
+                ItemClassification.progression,
+                self.item_name_to_id[item_table[0]],
+                self.player
+            )
+        ]
+
+        for i in range(40):
+            item_pool.append(ArchipIDLEItem(
+                item_table[1],
+                ItemClassification.progression,
+                self.item_name_to_id[item_table[1]],
+                self.player
+            ))
+
+        for i in range(40):
+            item_pool.append(ArchipIDLEItem(
+                item_table[2],
+                ItemClassification.filler,
+                self.item_name_to_id[item_table[2]],
+                self.player
+            ))
+
+        item_table_copy = list(item_table[3:])
+        self.random.shuffle(item_table_copy)
+        for i in range(119):
+            item_pool.append(ArchipIDLEItem(
+                item_table_copy[i],
+                ItemClassification.progression if i < 9 else ItemClassification.filler,
+                self.item_name_to_id[item_table_copy[i]],
+                self.player
+            ))
+
+        self.multiworld.itempool += item_pool
+
+    def create_regions(self):
+        self.multiworld.regions += [
+            create_region(self.multiworld, self.player, 'Menu', None, ['Entrance to IDLE Zone']),
+            create_region(self.multiworld, self.player, 'IDLE Zone', self.location_name_to_id)
+        ]
+
+        # link up our region with the entrance we just made
+        self.multiworld.get_entrance('Entrance to IDLE Zone', self.player)\
+            .connect(self.multiworld.get_region('IDLE Zone', self.player))
+
+    def get_filler_item_name(self) -> str:
+        return self.multiworld.random.choice(item_table)
+
+
+def create_region(world: MultiWorld, player: int, name: str, locations=None, exits=None):
+    region = Region(name, player, world)
+    if locations:
+        for location_name in locations.keys():
+            location = ArchipIDLELocation(player, location_name, locations[location_name], region)
+            region.locations.append(location)
+
+    if exits:
+        for _exit in exits:
+            region.exits.append(Entrance(player, _exit, region))
+
+    return region
+
+
+class ArchipIDLEItem(Item):
+    game = "ArchipIDLE"
+
+
+class ArchipIDLELocation(Location):
+    game: str = "ArchipIDLE"

worlds/archipidle/docs/en_ArchipIDLE.md

@@ -0,0 +1,13 @@
+# ArchipIDLE
+
+## What is this game?
+
+ArchipIDLE was originally the 2022 Archipelago April Fools' Day joke. It is an idle game that sends a location check
+on regular intervals. Updated annually with more items, gimmicks, and features, the game is visible
+only during the month of April.
+
+## Where is the options page?
+
+The [player options page for this game](../player-options) contains all the options you need to configure
+and export a config file.
+

worlds/archipidle/docs/guide_en.md

@@ -0,0 +1,12 @@
+# ArchipIdle Setup Guide
+
+## Joining a MultiWorld Game
+1. Generate a `.yaml` file from the [ArchipIDLE Player Options Page](/games/ArchipIDLE/player-options)
+2. Open the ArchipIDLE Client in your web browser by either:
+    - Navigate to the [ArchipIDLE Client](http://idle.multiworld.link)
+    - Download the client and run it locally from the
+      [ArchipIDLE GitHub Releases Page](https://github.com/ArchipelagoMW/archipidle/releases)
+3. Enter the server address in the `Server Address` field and press enter
+4. Enter your slot name when prompted. This should be the same as the `name` you entered on the
+   options page above, or the `name` field in your yaml file.
+5. Click the "Begin!" button.

worlds/archipidle/docs/guide_fr.md

@@ -0,0 +1,11 @@
+# Guide de configuration d'ArchipIdle
+
+## Rejoindre une partie MultiWorld
+1. Générez un fichier `.yaml` à partir de la [page des paramètres du lecteur ArchipIDLE](/games/ArchipIDLE/player-options)
+2. Ouvrez le client ArchipIDLE dans votre navigateur Web en :
+    - Accédez au [Client ArchipIDLE](http://idle.multiworld.link)
+    - Téléchargez le client et exécutez-le localement à partir du [Page des versions d'ArchipIDLE GitHub](https://github.com/ArchipelagoMW/archipidle/releases)
+3. Entrez l'adresse du serveur dans le champ `Server Address` et appuyez sur Entrée
+4. Entrez votre nom d'emplacement lorsque vous y êtes invité. Il doit être le même que le `name` que vous avez saisi sur le
+    page de configuration ci-dessus, ou le champ `name` dans votre fichier yaml.
+5. Cliquez sur "Commencer !" bouton.

worlds/bumpstik/Items.py

@@ -6,6 +6,7 @@
 import typing
 
 from BaseClasses import Item, ItemClassification
+from worlds.alttp import ALTTPWorld
 
 
 class BumpStikLttPText(typing.NamedTuple):
@@ -116,17 +117,13 @@ item_table = {
     item: offset + x for x, item in enumerate(LttPCreditsText.keys())
 }
 
-try:
-    from worlds.alttp import ALTTPWorld
-    ALTTPWorld.pedestal_credit_texts.update({item_table[name]: f"and the {texts.pedestal}"
-                                             for name, texts in LttPCreditsText.items()})
-    ALTTPWorld.sickkid_credit_texts.update(
-        {item_table[name]: texts.sickkid for name, texts in LttPCreditsText.items()})
-    ALTTPWorld.magicshop_credit_texts.update(
-        {item_table[name]: texts.magicshop for name, texts in LttPCreditsText.items()})
-    ALTTPWorld.zora_credit_texts.update(
-        {item_table[name]: texts.zora for name, texts in LttPCreditsText.items()})
-    ALTTPWorld.fluteboy_credit_texts.update(
-        {item_table[name]: texts.fluteboy for name, texts in LttPCreditsText.items()})
-except ModuleNotFoundError:
-    pass
+ALTTPWorld.pedestal_credit_texts.update({item_table[name]: f"and the {texts.pedestal}"
+                                         for name, texts in LttPCreditsText.items()})
+ALTTPWorld.sickkid_credit_texts.update(
+    {item_table[name]: texts.sickkid for name, texts in LttPCreditsText.items()})
+ALTTPWorld.magicshop_credit_texts.update(
+    {item_table[name]: texts.magicshop for name, texts in LttPCreditsText.items()})
+ALTTPWorld.zora_credit_texts.update(
+    {item_table[name]: texts.zora for name, texts in LttPCreditsText.items()})
+ALTTPWorld.fluteboy_credit_texts.update(
+    {item_table[name]: texts.fluteboy for name, texts in LttPCreditsText.items()})

worlds/bumpstik/archipelago.json

@@ -1,6 +0,0 @@
-{
-    "game": "Bumper Stickers",
-    "authors": ["KewlioMZX"],
-    "world_version": "1.0.0",
-    "minimum_ap_version": "0.6.4"
-}

worlds/cccharles/BaseID.py

@@ -1,2 +0,0 @@
-# CCCharles base ID
-base_id = 66600000

worlds/cccharles/Items.py

@@ -1,167 +0,0 @@
-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 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
-}
-
-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",
-        "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)
-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 Rockets"] * 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 += ["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
-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

worlds/cccharles/Locations.py

@@ -1,914 +0,0 @@
-from BaseClasses import Location
-from .BaseID import base_id
-
-
-class CCCharlesLocation(Location):
-    game = "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)
-}
-
-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_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)
-}
-
-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
-}
-
-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 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_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)
-}
-
-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_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
-}
-
-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
-}
-
-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_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)
-}
-
-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)
-}
-
-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_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 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)
-}
-
-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)
-}
-
-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)
-}
-
-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 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)
-}
-
-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_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_pickle_val,
-    **loc_shrine_near_temple,
-    **loc_morse_bunker
-}

worlds/cccharles/Options.py

@@ -1,7 +0,0 @@
-from dataclasses import dataclass
-from Options import PerGameCommonOptions, StartInventoryPool
-
-
-@dataclass
-class CCCharlesOptions(PerGameCommonOptions):
-    start_inventory_from_pool: StartInventoryPool

worlds/cccharles/Regions.py

@@ -1,283 +0,0 @@
-from BaseClasses import MultiWorld, Region, ItemClassification
-from .Items import CCCharlesItem
-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_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_pickle_val, loc_shrine_near_temple, loc_morse_bunker
-)
-
-
-def create_regions(world: MultiWorld, options: CCCharlesOptions, player: int) -> None:
-    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_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)
-
-    barn_region = Region("Barn", player, world)
-    barn_region.add_locations(loc_barn, CCCharlesLocation)
-    world.regions.append(barn_region)
-
-    candice_mission_region = Region("Candice Mission", player, world)
-    candice_mission_region.add_locations(loc_candice_mission, CCCharlesLocation)
-    world.regions.append(candice_mission_region)
-
-    tutorial_house_region = Region("Tutorial House", player, world)
-    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_mission_region = Region("Swamp Mission", player, world)
-    swamp_mission_region.add_locations(loc_swamp_mission, CCCharlesLocation)
-    world.regions.append(swamp_mission_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_military_base, CCCharlesLocation)
-    world.regions.append(military_base_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)
-
-    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)
-
-    middle_station_region = Region("Middle Station", player, world)
-    middle_station_region.add_locations(loc_middle_station, CCCharlesLocation)
-    world.regions.append(middle_station_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)
-
-    boulder_field_region = Region("Boulder Field", player, world)
-    boulder_field_region.add_locations(loc_boulder_field, CCCharlesLocation)
-    world.regions.append(boulder_field_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_santiago_house, CCCharlesLocation)
-    world.regions.append(santiago_house_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)
-    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)
-
-    lost_stairs_region = Region("Lost Stairs", player, world)
-    lost_stairs_region.add_locations(loc_lost_stairs, CCCharlesLocation)
-    world.regions.append(lost_stairs_region)
-
-    east_house_region = Region("East House", player, world)
-    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)
-
-    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)
-
-    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_lighthouse, CCCharlesLocation)
-    world.regions.append(lighthouse_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)
-
-    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)
-
-    museum_region = Region("Museum", player, world)
-    museum_region.add_locations(loc_museum, CCCharlesLocation)
-    world.regions.append(museum_region)
-
-    barbed_shelter_region = Region("Barbed Shelter", player, world)
-    barbed_shelter_region.add_locations(loc_barbed_shelter, CCCharlesLocation)
-    world.regions.append(barbed_shelter_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)
-
-    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)
-
-    trailer_cabin_region = Region("Trailer Cabin", player, world)
-    trailer_cabin_region.add_locations(loc_trailer_cabin, CCCharlesLocation)
-    world.regions.append(trailer_cabin_region)
-
-    towers_region = Region("Towers", player, world)
-    towers_region.add_locations(loc_towers, CCCharlesLocation)
-    world.regions.append(towers_region)
-
-    north_beach_region = Region("North beach", player, world)
-    north_beach_region.add_locations(loc_north_beach, CCCharlesLocation)
-    world.regions.append(north_beach_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)
-
-    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)
-
-    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_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("Shrine Near Temple", player, world)
-    shrine_near_temple_region.add_locations(loc_shrine_near_temple, CCCharlesLocation)
-    world.regions.append(shrine_near_temple_region)
-
-    morse_bunker_region = Region("Morse Bunker", player, world)
-    morse_bunker_region.add_locations(loc_morse_bunker, CCCharlesLocation)
-    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.place_locked_item(CCCharlesItem("Victory", ItemClassification.progression, None, player))
-    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)
-    menu_region.connect(tony_tiddle_mission_region)
-    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_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(south_mine_outside_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(boulder_field_region)
-    menu_region.connect(haunted_house_region)
-    menu_region.connect(santiago_house_region)
-    menu_region.connect(port_region)
-    menu_region.connect(trench_house_region)
-    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(workshop_region)
-    menu_region.connect(east_tower_region)
-    menu_region.connect(lighthouse_region)
-    menu_region.connect(north_mine_outside_region)
-    north_mine_outside_region.connect(north_mine_inside_region, "North Mine Gate")
-    menu_region.connect(wood_bridge_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(west_cottage_region)
-    menu_region.connect(caravan_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)
-    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)
-    mountain_ruin_outside_region.connect(mountain_ruin_inside_region, "Mountain Ruin Gate")
-    menu_region.connect(prism_temple_region)
-    menu_region.connect(pickle_val_region)
-    menu_region.connect(shrine_near_temple_region)
-    menu_region.connect(morse_bunker_region)

worlds/cccharles/Rules.py

@@ -1,215 +0,0 @@
-from BaseClasses import MultiWorld
-from ..generic.Rules import set_rule
-from .Options import CCCharlesOptions
-
-# 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
-    set_rule(world.get_entrance("Barn Door", player),
-        lambda state: state.has("Barn Key", player))
-
-    # Candice
-    set_rule(world.get_entrance("Tutorial House Door", player),
-        lambda state: state.has("Candice's Key", 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 Area Chest Ancient Tablet", player),
-        lambda state: state.has("Lockpicks", 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),
-        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_entrance("South Mine Gate", player),
-        lambda state: state.has("South Mine Key", 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("Middle Station Theodore Mission End", player),
-        lambda state: state.has("Blue Box", player))
-
-    # Watchtower
-    set_rule(world.get_location("Watchtower Pink Paint Can", player),
-        lambda state: state.has("Lockpicks", player))
-
-    # Sasha
-    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),
-        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))
-
-    # Rocket Testing Bunker
-    set_rule(world.get_entrance("Stuck Bunker Door", player),
-        lambda state: state.has("Timed Dynamite", 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),
-        lambda state: state.has("Breaker", player, 4))
-
-    # North Mine
-    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 Blue Paint Can", player),
-        lambda state: 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_entrance("Mob Camp Locked Door", player),
-        lambda state: state.has("Mob Camp Key", 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_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),
-        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 Lady
-    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))
-
-    # 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))
-
-    # 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)

worlds/cccharles/__init__.py

@@ -1,171 +0,0 @@
-from .Items import CCCharlesItem, unique_item_dict, full_item_list, item_groups
-from .Locations import location_table
-from .Options import CCCharlesOptions
-from .Rules import set_rules
-from .Regions import 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"
-
-    setup_en = Tutorial(
-        "Multiworld Setup Guide",
-        "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
-
-
-class CCCharlesWorld(World):
-    """ 
-    An independent 3D horror game, taking place on an island.
-    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"
-
-    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 = False # Hide 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 Rockets":
-                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 "Grey 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
-                raise Exception("Unexpected case met: classification cannot be set for unknown item \"" + name + "\"")
-
-        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)
-
-    def get_filler_item_name(self) -> str:
-        return "Scraps"

worlds/cccharles/docs/en_Choo-Choo Charles.md

@@ -1,39 +0,0 @@
-# Choo-Choo Charles
-
-## Game page in other languages
-* [Français](fr)
-
-## Where is the options page?
-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 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".
-
-## 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:
-* 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?
-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.
-
-## 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:
-* "~" or "`" (qwerty)
-* "²" (azerty)
-* "F10"
-Then, a hint can be revealed by typing "/hint [player] <item>".

worlds/cccharles/docs/fr_Choo-Choo Charles.md

@@ -1,36 +0,0 @@
-# Choo-Choo Charles
-
-## 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 ?
-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".
-
-## 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.
-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 ?
-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 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 :
-* "~" (qwerty)
-* "²" (azerty)
-* "F10"
-Puis, un indice peut être révélé en tapant "/hint [player] <item>"