pickle is no longer used directly

# Conflicts:
#	WebHostLib/api/generate.py

.github/workflows/docker.yml

@@ -0,0 +1,154 @@
+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,7 +12,6 @@ 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

BaseClasses.py

@@ -261,6 +261,7 @@ 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():
@@ -284,6 +285,8 @@ 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"]

Generate.py

@@ -486,7 +486,22 @@ 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

@@ -1,9 +0,0 @@
-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

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

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 100, so don't go past that
+        # The player name table only goes up to 101, 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 > 100:
-            from_player = 100
+        if from_player > 101:
+            from_player = 101
 
         next_index += 1
         self.gameboy.write_memory(LAClientConstants.wLinkGiveItem, [

Main.py

@@ -59,7 +59,9 @@ 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}}: Items: {len(cls.item_names):{item_count}} | "
+            logger.info(f" {name:{longest_name}}: "
+                        f"v{cls.world_version.as_simple_string()} |"
+                        f"Items: {len(cls.item_names):{item_count}} | "
                         f"Locations: {len(cls.location_names):{location_count}}")
 
     del item_count, location_count

MultiServer.py

@@ -1135,8 +1135,13 @@ 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], auto_status: HintStatus) \
-        -> typing.List[Hint]:
+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.
+    """
+
     hints = []
     slots: typing.Set[int] = {slot}
     for group_id, group in ctx.groups.items():
@@ -1152,25 +1157,38 @@ 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:
-                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))
+                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)
+            )
 
     return hints
 
 
-def collect_hint_location_name(ctx: Context, team: int, slot: int, location: str, auto_status: HintStatus) \
-        -> typing.List[Hint]:
+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.
+    """
     seeked_location: int = ctx.location_names_for_game(ctx.games[slot])[location]
-    return collect_hint_location_id(ctx, team, slot, seeked_location, auto_status)
+    return collect_hint_location_id(ctx, team, slot, seeked_location, status)
 
 
-def collect_hint_location_id(ctx: Context, team: int, slot: int, seeked_location: int, auto_status: HintStatus) \
-        -> typing.List[Hint]:
+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.
+    """
     prev_hint = ctx.get_hint(team, slot, seeked_location)
     if prev_hint:
         return [prev_hint]
@@ -1180,13 +1198,16 @@ 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:
-            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)]
+            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)]
     return []
 
 
@@ -1300,7 +1321,8 @@ class CommandProcessor(metaclass=CommandMeta):
                         argname += "=" + parameter.default
                 argtext += argname
                 argtext += " "
-            s += f"{self.marker}{command} {argtext}\n    {method.__doc__}\n"
+            doctext = '\n    '.join(inspect.getdoc(method).split('\n'))
+            s += f"{self.marker}{command} {argtext}\n    {doctext}\n"
         return s
 
     def _cmd_help(self):
@@ -1329,19 +1351,6 @@ 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:")
@@ -1610,7 +1619,6 @@ 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]}
@@ -1636,9 +1644,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, auto_status)
+                hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_id)
             else:
-                hints = collect_hint_location_id(self.ctx, self.client.team, self.client.slot, hint_id, auto_status)
+                hints = collect_hint_location_id(self.ctx, self.client.team, self.client.slot, hint_id)
 
         else:
             game = self.ctx.games[self.client.slot]
@@ -1658,16 +1666,18 @@ 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, auto_status))
+                            hints.extend(collect_hints(self.ctx, self.client.team, self.client.slot, item_name))
                 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, auto_status)
+                    hints = collect_hints(self.ctx, self.client.team, self.client.slot, hint_name)
                 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, auto_status))
+                            hints.extend(
+                                collect_hint_location_name(self.ctx, self.client.team, self.client.slot, loc_name)
+                            )
                 else:  # location name
-                    hints = collect_hint_location_name(self.ctx, self.client.team, self.client.slot, hint_name, auto_status)
+                    hints = collect_hint_location_name(self.ctx, self.client.team, self.client.slot, hint_name)
 
             else:
                 self.output(response)
@@ -1945,8 +1955,7 @@ 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,
-                                                          HintStatus.HINT_UNSPECIFIED))
+                    hints.extend(collect_hint_location_id(ctx, client.team, client.slot, location))
                 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:
@@ -2238,6 +2247,19 @@ 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."""
@@ -2359,9 +2381,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, HintStatus.HINT_PRIORITY))
+                            hints.extend(collect_hints(self.ctx, team, slot, item_name_from_group))
                 else:  # item name or id
-                    hints = collect_hints(self.ctx, team, slot, item, HintStatus.HINT_PRIORITY)
+                    hints = collect_hints(self.ctx, team, slot, item)
 
                 if hints:
                     self.ctx.notify_hints(team, hints)
@@ -2395,17 +2417,14 @@ class ServerCommandProcessor(CommonCommandProcessor):
 
             if usable:
                 if isinstance(location, int):
-                    hints = collect_hint_location_id(self.ctx, team, slot, location,
-                                                     HintStatus.HINT_UNSPECIFIED)
+                    hints = collect_hint_location_id(self.ctx, team, slot, location)
                 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,
-                                                                    HintStatus.HINT_UNSPECIFIED))
+                            hints.extend(collect_hint_location_name(self.ctx, team, slot, loc_name_from_group))
                 else:
-                    hints = collect_hint_location_name(self.ctx, team, slot, location,
-                                                       HintStatus.HINT_UNSPECIFIED)
+                    hints = collect_hint_location_name(self.ctx, team, slot, location)
                 if hints:
                     self.ctx.notify_hints(team, hints)
                 else:

Options.py

@@ -1446,6 +1446,7 @@ 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),
         }
     ])
 
@@ -1709,7 +1710,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__
+    from Utils import local_path, __version__, tuplize_version
 
     full_path: str
 
@@ -1752,7 +1753,10 @@ def generate_yaml_templates(target_folder: typing.Union[str, "pathlib.Path"], ge
 
             res = template.render(
                 option_groups=option_groups,
-                __version__=__version__, game=game_name, yaml_dump=yaml_dump_scalar,
+                __version__=__version__,
+                game=game_name,
+                world_version=world.world_version.as_simple_string(),
+                yaml_dump=yaml_dump_scalar,
                 dictify_range=dictify_range,
                 cleandoc=cleandoc,
             )

Utils.py

@@ -49,6 +49,7 @@ 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"
@@ -322,11 +323,13 @@ def get_options() -> Settings:
     return get_settings()
 
 
-def persistent_store(category: str, key: str, value: typing.Any):
-    path = user_path("_persistent_storage.yaml")
+def persistent_store(category: str, key: str, value: typing.Any, force_store: bool = False):
     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))
 

WebHostLib/api/generate.py

@@ -1,15 +1,16 @@
 import json
+import typing
 from uuid import UUID
 
 from flask import request, session, url_for
 from markupsafe import Markup
-from pony.orm import commit
+from pony.orm import commit, select
 
 from Utils import restricted_dumps
-from WebHostLib import app
+from WebHostLib import app, cache
 from WebHostLib.check import get_yaml_data, roll_options
 from WebHostLib.generate import get_meta
-from WebHostLib.models import Generation, STATE_QUEUED, Seed, STATE_ERROR
+from WebHostLib.models import Generation, STATE_QUEUED, STATE_STARTED, Seed, STATE_ERROR
 from . import api_endpoints
 
 
@@ -74,12 +75,23 @@ 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:
-        return {"text": "Generation done"}, 201
+        reply_dict["text"] = "Generation done"
+        return reply_dict, 201
     generation = Generation.get(id=seed_id)
 
     if not generation:
-        return {"text": "Generation not found"}, 404
+        reply_dict["text"] = "Generation not found"
+        return reply_dict, 404
     elif generation.state == STATE_ERROR:
-        return {"text": "Generation failed"}, 500
-    return {"text": "Generation running"}, 202
+        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()

WebHostLib/api/tracker.py

@@ -11,6 +11,53 @@ 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]:
@@ -29,122 +76,77 @@ def tracker_data(tracker: UUID) -> dict[str, Any]:
 
     all_players: dict[int, list[int]] = tracker_data.get_all_players()
 
-    class PlayerAlias(TypedDict):
-        player: int
-        name: str | None
-
-    player_aliases: list[dict[str, int | list[PlayerAlias]]] = []
+    player_aliases: 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:
-            team_player_aliases.append({"player": player, "alias": tracker_data.get_player_alias(team, player)})
+            player_aliases.append({"team": team, "player": player, "alias": tracker_data.get_player_alias(team, player)})
 
-    class PlayerItemsReceived(TypedDict):
-        player: int
-        items: list[NetworkItem]
-
-    player_items_received: list[dict[str, int | list[PlayerItemsReceived]]] = []
+    player_items_received: 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_received_items.append(
-                {"player": player, "items": tracker_data.get_player_received_items(team, player)})
+            player_items_received.append(
+                {"team": team, "player": player, "items": tracker_data.get_player_received_items(team, player)})
 
-    class PlayerChecksDone(TypedDict):
-        player: int
-        locations: list[int]
-
-    player_checks_done: list[dict[str, int | list[PlayerChecksDone]]] = []
+    player_checks_done: 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:
-            per_player_checks.append(
-                {"player": player, "locations": sorted(tracker_data.get_player_checked_locations(team, player))})
+            player_checks_done.append(
+                {"team": team, "player": player, "locations": sorted(tracker_data.get_player_checked_locations(team, player))})
 
-    total_checks_done: list[dict[str, int]] = [
+    total_checks_done: list[TeamTotalChecks] = [
         {"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."""
 
-    class PlayerHints(TypedDict):
-        player: int
-        hints: list[Hint]
-
-    hints: list[dict[str, int | list[PlayerHints]]] = []
+    hints: 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))
-            per_player_hints.append({"player": player, "hints": player_hints})
-            slot_info = tracker_data.get_slot_info(team, player)
+            hints.append({"team": team, "player": player, "hints": player_hints})
+            slot_info = tracker_data.get_slot_info(player)
             # this assumes groups are always after players
             if slot_info.type != SlotType.group:
                 continue
             for member in slot_info.group_members:
-                team_hints[member]["hints"] += player_hints
+                hints[member - 1]["hints"] += player_hints
 
-    class PlayerTimer(TypedDict):
-        player: int
-        time: datetime | None
-
-    activity_timers: list[dict[str, int | list[PlayerTimer]]] = []
+    activity_timers: 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:
-            player_timers.append({"player": player, "time": None})
+            activity_timers.append({"team": team, "player": player, "time": None})
 
-    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
-        # FIX: key is "players" (not "player_timers")
-        activity_timers[team]["players"][player - 1]["time"] = datetime.fromtimestamp(timestamp, timezone.utc)
+    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
 
-
-    connection_timers: list[dict[str, int | list[PlayerTimer]]] = []
+    connection_timers: 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:
-            player_timers.append({"player": player, "time": None})
+            connection_timers.append({"team": team, "player": player, "time": None})
 
-    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)
+    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
 
-    class PlayerStatus(TypedDict):
-        player: int
-        status: ClientStatus
-
-    player_status: list[dict[str, int | list[PlayerStatus]]] = []
+    player_status: 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_statuses.append({"player": player, "status": tracker_data.get_player_client_status(team, player)})
+            player_status.append({"team": team, "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,
@@ -153,80 +155,87 @@ 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"],
     }
 
-@cache.memoize()
-def get_static_tracker_data(room: Room) -> dict[str, Any]:
-    """
-    Builds and caches the static data for this active session tracker, so that it doesn't need to be recalculated.
-    """
 
+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]:
+    """
+    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.
+    """
+    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()
 
-    class PlayerGroups(TypedDict):
-        slot: int
-        name: str
-        members: list[int]
-
-    groups: list[dict[str, int | list[PlayerGroups]]] = []
+    groups: 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(team, player)
+            slot_info = tracker_data.get_slot_info(player)
             if slot_info.type != SlotType.group or not slot_info.group_members:
                 continue
-            groups_in_team.append(
+            groups.append(
                 {
                     "slot": player,
                     "name": slot_info.name,
                     "members": list(slot_info.group_members),
                 })
-    class PlayerName(TypedDict):
-        player: int
-        name: str
+        break
 
-    player_names: list[dict[str, str | list[PlayerName]]] = []
-    """Slot names of all players."""
+    player_locations_total: list[PlayerLocationsTotal] = []
     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:
-            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)})
+            player_locations_total.append(
+                {"team": team, "player": player, "total_locations": len(tracker_data.get_player_locations(player))})
 
     return {
         "groups": groups,
-        "slot_data": slot_data,
+        "datapackage": tracker_data._multidata["datapackage"],
+        "player_locations_total": player_locations_total,
     }
+
+# 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/misc.py

@@ -260,7 +260,10 @@ 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))
-    with db_session:
+
+    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"
         room.last_activity = now  # will trigger a spinup, if it's not already running
 
     browser_tokens = "Mozilla", "Chrome", "Safari"

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(team, hint.finding_player).type == 2 %}
+                                {% elif get_slot_info(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(team, hint.receiving_player).type == 2 %}
+                                {% elif get_slot_info(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(team, player) %}
-                        {%- set player_location_data = tracker_data.get_player_locations(team, player) %}
+                        {%- set finder_game = tracker_data.get_player_game(player) %}
+                        {%- set player_location_data = tracker_data.get_player_locations(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(team, receiver) %}
+                            {%- set receiver_game = tracker_data.get_player_game(receiver) %}
                             <td>{{ current_sphere }}</td>
-                            <td>{{ tracker_data.get_player_name(team, player) }}</td>
-                            <td>{{ tracker_data.get_player_name(team, receiver) }}</td>
+                            <td>{{ tracker_data.get_player_name(player) }}</td>
+                            <td>{{ tracker_data.get_player_name(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(team, hint.finding_player).type == 2 %}
+                            {% if get_slot_info(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(team, hint.receiving_player).type == 2 %}
+                            {% if get_slot_info(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/waitSeed.html

@@ -30,10 +30,21 @@
                 }
 
                 const data = await response.json();
-                waitSeedDiv.innerHTML = `
-                    <h1>Generation in Progress</h1>
-                    <p>${data.text}</p>
-                `;
+                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>
+                    `;
+                }
+
 
                 setTimeout(checkStatus, 1000); // Continue polling.
             } catch (error) {

WebHostLib/tracker.py

@@ -17,7 +17,6 @@ from .models import GameDataPackage, Room
 # Multisave is currently updated, at most, every minute.
 TRACKER_CACHE_TIMEOUT_IN_SECONDS = 60
 
-_multidata_cache = {}
 _multiworld_trackers: Dict[str, Callable] = {}
 _player_trackers: Dict[str, Callable] = {}
 
@@ -85,27 +84,27 @@ class TrackerData:
         """Retrieves the seed name."""
         return self._multidata["seed_name"]
 
-    def get_slot_data(self, team: int, player: int) -> Dict[str, Any]:
+    def get_slot_data(self, player: int) -> Dict[str, Any]:
         """Retrieves the slot data for a given player."""
         return self._multidata["slot_data"][player]
 
-    def get_slot_info(self, team: int, player: int) -> NetworkSlot:
+    def get_slot_info(self, player: int) -> NetworkSlot:
         """Retrieves the NetworkSlot data for a given player."""
         return self._multidata["slot_info"][player]
 
-    def get_player_name(self, team: int, player: int) -> str:
+    def get_player_name(self, player: int) -> str:
         """Retrieves the slot name for a given player."""
-        return self.get_slot_info(team, player).name
+        return self.get_slot_info(player).name
 
-    def get_player_game(self, team: int, player: int) -> str:
+    def get_player_game(self, player: int) -> str:
         """Retrieves the game for a given player."""
-        return self.get_slot_info(team, player).game
+        return self.get_slot_info(player).game
 
-    def get_player_locations(self, team: int, player: int) -> Dict[int, ItemMetadata]:
+    def get_player_locations(self, player: int) -> Dict[int, ItemMetadata]:
         """Retrieves all locations with their containing item's metadata for a given player."""
         return self._multidata["locations"][player]
 
-    def get_player_starting_inventory(self, team: int, player: int) -> List[int]:
+    def get_player_starting_inventory(self, player: int) -> List[int]:
         """Retrieves a list of all item codes a given slot starts with."""
         return self._multidata["precollected_items"][player]
 
@@ -116,7 +115,7 @@ class TrackerData:
     @_cache_results
     def get_player_missing_locations(self, team: int, player: int) -> Set[int]:
         """Retrieves the set of all locations not marked complete by this player."""
-        return set(self.get_player_locations(team, player)) - self.get_player_checked_locations(team, player)
+        return set(self.get_player_locations(player)) - self.get_player_checked_locations(team, player)
 
     def get_player_received_items(self, team: int, player: int) -> List[NetworkItem]:
         """Returns all items received to this player in order of received."""
@@ -126,7 +125,7 @@ class TrackerData:
     def get_player_inventory_counts(self, team: int, player: int) -> collections.Counter:
         """Retrieves a dictionary of all items received by their id and their received count."""
         received_items = self.get_player_received_items(team, player)
-        starting_items = self.get_player_starting_inventory(team, player)
+        starting_items = self.get_player_starting_inventory(player)
         inventory = collections.Counter()
         for item in received_items:
             inventory[item.item] += 1
@@ -179,7 +178,7 @@ class TrackerData:
     def get_team_locations_total_count(self) -> Dict[int, int]:
         """Retrieves a dictionary of total player locations each team has."""
         return {
-            team: sum(len(self.get_player_locations(team, player)) for player in players)
+            team: sum(len(self.get_player_locations(player)) for player in players)
             for team, players in self.get_all_players().items()
         }
 
@@ -210,7 +209,7 @@ class TrackerData:
         return {
             0: [
                 player for player, slot_info in self._multidata["slot_info"].items()
-                if self.get_slot_info(0, player).type == SlotType.player
+                if self.get_slot_info(player).type == SlotType.player
             ]
         }
 
@@ -226,7 +225,7 @@ class TrackerData:
     def get_room_locations(self) -> Dict[TeamPlayer, Dict[int, ItemMetadata]]:
         """Retrieves a dictionary of all locations and their associated item metadata per player."""
         return {
-            (team, player): self.get_player_locations(team, player)
+            (team, player): self.get_player_locations(player)
             for team, players in self.get_all_players().items() for player in players
         }
 
@@ -234,7 +233,7 @@ class TrackerData:
     def get_room_games(self) -> Dict[TeamPlayer, str]:
         """Retrieves a dictionary of games for each player."""
         return {
-            (team, player): self.get_player_game(team, player)
+            (team, player): self.get_player_game(player)
             for team, players in self.get_all_slots().items() for player in players
         }
 
@@ -262,9 +261,9 @@ class TrackerData:
             for player in players:
                 alias = self.get_player_alias(team, player)
                 if alias:
-                    long_player_names[team, player] = f"{alias} ({self.get_player_name(team, player)})"
+                    long_player_names[team, player] = f"{alias} ({self.get_player_name(player)})"
                 else:
-                    long_player_names[team, player] = self.get_player_name(team, player)
+                    long_player_names[team, player] = self.get_player_name(player)
 
         return long_player_names
 
@@ -344,7 +343,7 @@ def get_timeout_and_player_tracker(room: Room, tracked_team: int, tracked_player
     tracker_data = TrackerData(room)
 
     # Load and render the game-specific player tracker, or fallback to generic tracker if none exists.
-    game_specific_tracker = _player_trackers.get(tracker_data.get_player_game(tracked_team, tracked_player), None)
+    game_specific_tracker = _player_trackers.get(tracker_data.get_player_game(tracked_player), None)
     if game_specific_tracker and not generic:
         tracker = game_specific_tracker(tracker_data, tracked_team, tracked_player)
     else:
@@ -409,10 +408,10 @@ def get_enabled_multiworld_trackers(room: Room) -> Dict[str, Callable]:
 
 
 def render_generic_tracker(tracker_data: TrackerData, team: int, player: int) -> str:
-    game = tracker_data.get_player_game(team, player)
+    game = tracker_data.get_player_game(player)
 
     received_items_in_order = {}
-    starting_inventory = tracker_data.get_player_starting_inventory(team, player)
+    starting_inventory = tracker_data.get_player_starting_inventory(player)
     for index, item in enumerate(starting_inventory):
         received_items_in_order[item] = index
     for index, network_item in enumerate(tracker_data.get_player_received_items(team, player),
@@ -428,7 +427,7 @@ def render_generic_tracker(tracker_data: TrackerData, team: int, player: int) ->
         player=player,
         player_name=tracker_data.get_room_long_player_names()[team, player],
         inventory=tracker_data.get_player_inventory_counts(team, player),
-        locations=tracker_data.get_player_locations(team, player),
+        locations=tracker_data.get_player_locations(player),
         checked_locations=tracker_data.get_player_checked_locations(team, player),
         received_items=received_items_in_order,
         saving_second=tracker_data.get_room_saving_second(),
@@ -500,7 +499,7 @@ if "Factorio" in network_data_package["games"]:
                 tracker_data.item_id_to_name["Factorio"][item_id]: count
                 for item_id, count in tracker_data.get_player_inventory_counts(team, player).items()
             }) for team, players in tracker_data.get_all_players().items() for player in players
-            if tracker_data.get_player_game(team, player) == "Factorio"
+            if tracker_data.get_player_game(player) == "Factorio"
         }
 
         return render_template(
@@ -589,7 +588,7 @@ if "A Link to the Past" in network_data_package["games"]:
 
         # Highlight 'bombs' if we received any bomb upgrades in bombless start.
         # In race mode, we'll just assume bombless start for simplicity.
-        if tracker_data.get_slot_data(team, player).get("bombless_start", True):
+        if tracker_data.get_slot_data(player).get("bombless_start", True):
             inventory["Bombs"] = sum(count for item, count in inventory.items() if item.startswith("Bomb Upgrade"))
         else:
             inventory["Bombs"] = 1
@@ -605,7 +604,7 @@ if "A Link to the Past" in network_data_package["games"]:
                 for code, count in tracker_data.get_player_inventory_counts(team, player).items()
             })
             for team, players in tracker_data.get_all_players().items()
-            for player in players if tracker_data.get_slot_info(team, player).game == "A Link to the Past"
+            for player in players if tracker_data.get_slot_info(player).game == "A Link to the Past"
         }
 
         # Translate non-progression items to progression items for tracker simplicity.
@@ -624,7 +623,7 @@ if "A Link to the Past" in network_data_package["games"]:
                 for region_name in known_regions
             }
             for team, players in tracker_data.get_all_players().items()
-            for player in players if tracker_data.get_slot_info(team, player).game == "A Link to the Past"
+            for player in players if tracker_data.get_slot_info(player).game == "A Link to the Past"
         }
 
         # Get a totals count.
@@ -698,7 +697,7 @@ if "A Link to the Past" in network_data_package["games"]:
             team=team,
             player=player,
             inventory=inventory,
-            player_name=tracker_data.get_player_name(team, player),
+            player_name=tracker_data.get_player_name(player),
             regions=regions,
             known_regions=known_regions,
         )
@@ -845,7 +844,7 @@ if "Ocarina of Time" in network_data_package["games"]:
                 return full_name[len(area):]
             return full_name
 
-        locations = tracker_data.get_player_locations(team, player)
+        locations = tracker_data.get_player_locations(player)
         checked_locations = tracker_data.get_player_checked_locations(team, player).intersection(set(locations))
         location_info = {}
         checks_done = {}
@@ -907,7 +906,7 @@ if "Ocarina of Time" in network_data_package["games"]:
             player=player,
             team=team,
             room=tracker_data.room,
-            player_name=tracker_data.get_player_name(team, player),
+            player_name=tracker_data.get_player_name(player),
             icons=icons,
             acquired_items={lookup_any_item_id_to_name[id] for id, count in inventory.items() if count > 0},
             checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
@@ -954,57 +953,37 @@ if "Timespinner" in network_data_package["games"]:
             "Lab Glasses":         "https://timespinnerwiki.com/mediawiki/images/4/4a/Lab_Glasses.png",
             "Eye Orb":             "https://timespinnerwiki.com/mediawiki/images/a/a4/Eye_Orb.png",
             "Lab Coat":            "https://timespinnerwiki.com/mediawiki/images/5/51/Lab_Coat.png", 
-            "Demon":               "https://timespinnerwiki.com/mediawiki/images/f/f8/Familiar_Demon.png", 
+            "Demon":               "https://timespinnerwiki.com/mediawiki/images/f/f8/Familiar_Demon.png",
+            "Cube of Bodie":       "https://timespinnerwiki.com/mediawiki/images/1/14/Menu_Icon_Stats.png"
         }
 
         timespinner_location_ids = {
-            "Present":         [
-                1337000, 1337001, 1337002, 1337003, 1337004, 1337005, 1337006, 1337007, 1337008, 1337009,
-                1337010, 1337011, 1337012, 1337013, 1337014, 1337015, 1337016, 1337017, 1337018, 1337019,
-                1337020, 1337021, 1337022, 1337023, 1337024, 1337025, 1337026, 1337027, 1337028, 1337029,
-                1337030, 1337031, 1337032, 1337033, 1337034, 1337035, 1337036, 1337037, 1337038, 1337039,
-                1337040, 1337041, 1337042, 1337043, 1337044, 1337045, 1337046, 1337047, 1337048, 1337049,
-                1337050, 1337051, 1337052, 1337053, 1337054, 1337055, 1337056, 1337057, 1337058, 1337059,
-                1337060, 1337061, 1337062, 1337063, 1337064, 1337065, 1337066, 1337067, 1337068, 1337069,
-                1337070, 1337071, 1337072, 1337073, 1337074, 1337075, 1337076, 1337077, 1337078, 1337079,
-                1337080, 1337081, 1337082, 1337083, 1337084, 1337085],
-            "Past":            [
-                1337086, 1337087, 1337088, 1337089,
-                1337090, 1337091, 1337092, 1337093, 1337094, 1337095, 1337096, 1337097, 1337098, 1337099,
-                1337100, 1337101, 1337102, 1337103, 1337104, 1337105, 1337106, 1337107, 1337108, 1337109,
-                1337110, 1337111, 1337112, 1337113, 1337114, 1337115, 1337116, 1337117, 1337118, 1337119,
-                1337120, 1337121, 1337122, 1337123, 1337124, 1337125, 1337126, 1337127, 1337128, 1337129,
-                1337130, 1337131, 1337132, 1337133, 1337134, 1337135, 1337136, 1337137, 1337138, 1337139,
-                1337140, 1337141, 1337142, 1337143, 1337144, 1337145, 1337146, 1337147, 1337148, 1337149,
-                1337150, 1337151, 1337152, 1337153, 1337154, 1337155,
-                1337171, 1337172, 1337173, 1337174, 1337175],
+            "Present": list(range(1337000, 1337085)),
+            "Past": list(range(1337086, 1337175)),
             "Ancient Pyramid": [
                 1337236,
                 1337246, 1337247, 1337248, 1337249]
         }
 
-        slot_data = tracker_data.get_slot_data(team, player)
+        slot_data = tracker_data.get_slot_data(player)
         if (slot_data["DownloadableItems"]):
-            timespinner_location_ids["Present"] += [
-                1337156, 1337157, 1337159,
-                1337160, 1337161, 1337162, 1337163, 1337164, 1337165, 1337166, 1337167, 1337168, 1337169,
-                1337170]
+            timespinner_location_ids["Present"] += [1337156, 1337157] + list(range(1337159, 1337170))
         if (slot_data["Cantoran"]):
             timespinner_location_ids["Past"].append(1337176)
         if (slot_data["LoreChecks"]):
-            timespinner_location_ids["Present"] += [
-                1337177, 1337178, 1337179,
-                1337180, 1337181, 1337182, 1337183, 1337184, 1337185, 1337186, 1337187]
-            timespinner_location_ids["Past"] += [
-                1337188, 1337189,
-                1337190, 1337191, 1337192, 1337193, 1337194, 1337195, 1337196, 1337197, 1337198]
+            timespinner_location_ids["Present"] += list(range(1337177, 1337187))
+            timespinner_location_ids["Past"] += list(range(1337188, 1337198))
         if (slot_data["GyreArchives"]):
-            timespinner_location_ids["Ancient Pyramid"] += [
-                1337237, 1337238, 1337239,
-                1337240, 1337241, 1337242, 1337243, 1337244, 1337245]
+            timespinner_location_ids["Ancient Pyramid"] += list(range(1337237, 1337245))
         if (slot_data["PyramidStart"]):
             timespinner_location_ids["Ancient Pyramid"] += [
                 1337233, 1337234, 1337235]
+        if (slot_data["PureTorcher"]):
+            timespinner_location_ids["Present"] += list(range(1337250, 1337352)) + list(range(1337422, 1337496)) + [1337506] + list(range(1337712, 1337779)) + [1337781, 1337782]
+            timespinner_location_ids["Past"] += list(range(1337497, 1337505)) + list(range(1337507, 1337711)) + [1337780]
+            timespinner_location_ids["Ancient Pyramid"] += list(range(1337369, 1337421))
+            if (slot_data["GyreArchives"]):
+                timespinner_location_ids["Ancient Pyramid"] += list(range(1337353, 1337368))
 
         display_data = {}
 
@@ -1035,7 +1014,7 @@ if "Timespinner" in network_data_package["games"]:
             player=player,
             team=team,
             room=tracker_data.room,
-            player_name=tracker_data.get_player_name(team, player),
+            player_name=tracker_data.get_player_name(player),
             checks_done=checks_done,
             checks_in_area=checks_in_area,
             location_info=location_info,
@@ -1144,7 +1123,7 @@ if "Super Metroid" in network_data_package["games"]:
             player=player,
             team=team,
             room=tracker_data.room,
-            player_name=tracker_data.get_player_name(team, player),
+            player_name=tracker_data.get_player_name(player),
             checks_done=checks_done,
             checks_in_area=checks_in_area,
             location_info=location_info,
@@ -1194,7 +1173,7 @@ if "ChecksFinder" in network_data_package["games"]:
 
         display_data = {}
         inventory = tracker_data.get_player_inventory_counts(team, player)
-        locations = tracker_data.get_player_locations(team, player)
+        locations = tracker_data.get_player_locations(player)
 
         # Multi-items
         multi_items = {
@@ -1236,7 +1215,7 @@ if "ChecksFinder" in network_data_package["games"]:
             player=player,
             team=team,
             room=tracker_data.room,
-            player_name=tracker_data.get_player_name(team, player),
+            player_name=tracker_data.get_player_name(player),
             checks_done=checks_done,
             checks_in_area=checks_in_area,
             location_info=location_info,
@@ -1264,7 +1243,7 @@ if "Starcraft 2" in network_data_package["games"]:
         UPGRADE_RESEARCH_SPEED_ITEM_ID = 1807
         UPGRADE_RESEARCH_COST_ITEM_ID = 1808
         REDUCED_MAX_SUPPLY_ITEM_ID = 1850
-        slot_data = tracker_data.get_slot_data(team, player)
+        slot_data = tracker_data.get_slot_data(player)
         inventory: collections.Counter[int] = tracker_data.get_player_inventory_counts(team, player)
         item_id_to_name = tracker_data.item_id_to_name["Starcraft 2"]
         location_id_to_name = tracker_data.location_id_to_name["Starcraft 2"]
@@ -1280,10 +1259,10 @@ if "Starcraft 2" in network_data_package["games"]:
         display_data["shield_regen_count"] = inventory.get(SHIELD_REGENERATION_ITEM_ID, 0)
         display_data["upgrade_speed_count"] = inventory.get(UPGRADE_RESEARCH_SPEED_ITEM_ID, 0)
         display_data["research_cost_count"] = inventory.get(UPGRADE_RESEARCH_COST_ITEM_ID, 0)
-        
+
         # Locations
         have_nco_locations = False
-        locations = tracker_data.get_player_locations(team, player)
+        locations = tracker_data.get_player_locations(player)
         checked_locations = tracker_data.get_player_checked_locations(team, player)
         missions: dict[str, list[tuple[str, bool]]] = {}
         for location_id in locations:
@@ -1438,7 +1417,7 @@ if "Starcraft 2" in network_data_package["games"]:
                     # the maximum bundle contribution, not the sum
                     inventory[upgrade_id] = bundle_amount
 
-        
+
         # Victory condition
         game_state = tracker_data.get_player_client_status(team, player)
         display_data["game_finished"] = game_state == ClientStatus.CLIENT_GOAL
@@ -1456,7 +1435,7 @@ if "Starcraft 2" in network_data_package["games"]:
             player=player,
             team=team,
             room=tracker_data.room,
-            player_name=tracker_data.get_player_name(team, player),
+            player_name=tracker_data.get_player_name(player),
             missions=missions,
             locations=locations,
             checked_locations=checked_locations,

data/options.yaml

@@ -33,6 +33,10 @@ 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.

docs/CODEOWNERS

@@ -72,6 +72,9 @@
 # Faxanadu
 /worlds/faxanadu/ @Daivuk
 
+# Final Fantasy (1)
+/worlds/ff1/ @Rosalie-A
+
 # Final Fantasy Mystic Quest
 /worlds/ffmq/ @Alchav @wildham0
 
@@ -241,9 +244,6 @@
 # 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/apworld specification.md

@@ -19,7 +19,21 @@ the world's folder in `worlds/`. I.e. `worlds/ror2.apworld` containing `ror2/__i
 
 ## Metadata
 
-No metadata is specified yet.
+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
 
 
 ## 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)\[int\]\] | Mapping of permission name to [Permission](#Permission), keys are: "release", "collect" and "remaining".                                                                                                                              |
+| permissions           | dict\[str, [Permission](#Permission)\]        | 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,13 +662,14 @@ class SlotType(enum.IntFlag):
 An object representing static information about a slot.
 
 ```python
-import typing
+from collections.abc import Sequence
+from typing import NamedTuple
 from NetUtils import SlotType
-class NetworkSlot(typing.NamedTuple):
+class NetworkSlot(NamedTuple):
    name: str
    game: str
    type: SlotType
-   group_members: typing.List[int] = []  # only populated if type == group
+   group_members: Sequence[int] = []  # only populated if type == group
 ```
 
 ### Permission
@@ -686,8 +687,8 @@ class Permission(enum.IntEnum):
 ### Hint
 An object representing a Hint.
 ```python
-import typing
-class Hint(typing.NamedTuple):
+from typing import NamedTuple
+class Hint(NamedTuple):
     receiving_player: int
     finding_player: int
     location: int

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`, define it as `typing.Optional` and assign `None`.
+Each value needs to have a default. If the default should be `None`, annotate it using `T | None = None`.
 
 To access a "global" config value, with correct typing, use one of
 ```python

docs/style.md

@@ -15,8 +15,10 @@
 * 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.
+* 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]]`).
 * 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
@@ -60,3 +62,9 @@
 * 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 [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.
+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.
 
 #### Parametrization
 
@@ -102,8 +102,7 @@ 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 `TestBase` or `unittest.TestCase` directly
-  or setting `WorldTestBase.run_default_tests` to False.
+  extra CPU time. Consider using `unittest.TestCase` directly or setting `WorldTestBase.run_default_tests` to False.
 
 #### Performance Considerations
 

docs/webhost api.md

@@ -18,6 +18,8 @@ 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)
@@ -254,8 +256,6 @@ 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,111 +265,55 @@ 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,
-      "players": [
-        {
-          "player": 1,
-          "alias": "Incompetence"
-        },
-        {
-          "player": 2,
-          "alias": "Slot_Name_2"
-        }
-      ]
+      "player": 1,
+      "alias": "Incompetence"
+    },
+    {
+      "team": 0,
+      "player": 2,
+      "alias": "Slot_Name_2"
     }
   ],
   "player_items_received": [
     {
       "team": 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": 1,
+      "items": [
+        [1, 1, 1, 0],
+        [2, 2, 2, 1]
+      ]
+    },
+    {
+      "team": 0,
+      "player": 2,
+      "items": [
+        [1, 1, 1, 2],
+        [2, 2, 2, 0]
       ]
     }
   ],
   "player_checks_done": [
     {
       "team": 0,
-      "players": [
-        {
-          "player": 1,
-          "locations": [
-            1,
-            2
-          ]
-        },
-        {
-          "player": 2,
-          "locations": [
-            1,
-            2
-          ]
-        }
+      "player": 1,
+      "locations": [
+        1,
+        2
+      ]
+    },
+    {
+      "team": 0,
+      "player": 2,
+      "locations": [
+        1,
+        2
       ]
     }
   ],
@@ -382,76 +326,132 @@ Example:
   "hints": [
     {
       "team": 0,
-      "players": [
-        {
-          "player": 1,
-          "hints": [
-            [1, 2, 4, 6, 0, "", 4, 0]
-          ]
-        },
-        {
-          "player": 2,
-          "hints": []
-        }
+      "player": 1,
+      "hints": [
+        [1, 2, 4, 6, 0, "", 4, 0]
       ]
+    },
+    {
+      "team": 0,
+      "player": 2,
+      "hints": []
     }
   ],
   "activity_timers": [
     {
       "team": 0,
-      "players": [
-        {
-          "player": 1,
-          "time": "Fri, 18 Apr 2025 20:35:45 GMT"
-        },
-        {
-          "player": 2,
-          "time": "Fri, 18 Apr 2025 20:42:46 GMT"
-        }
-      ]
+      "player": 1,
+      "time": "Fri, 18 Apr 2025 20:35:45 GMT"
+    },
+    {
+      "team": 0,
+      "player": 2,
+      "time": "Fri, 18 Apr 2025 20:42:46 GMT"
     }
   ],
   "connection_timers": [
     {
       "team": 0,
-      "players": [
-        {
-          "player": 1,
-          "time": "Fri, 18 Apr 2025 20:38:25 GMT"
-        },
-        {
-          "player": 2,
-          "time": "Fri, 18 Apr 2025 21:03:00 GMT"
-        }
-      ]
+      "player": 1,
+      "time": "Fri, 18 Apr 2025 20:38:25 GMT"
+    },
+    {
+      "team": 0,
+      "player": 2,
+      "time": "Fri, 18 Apr 2025 21:03:00 GMT"
     }
   ],
   "player_status": [
     {
       "team": 0,
-      "players": [
-        {
-          "player": 1,
-          "status": 0
-        },
-        {
-          "player": 2,
-          "status": 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
       ]
     }
   ],
   "datapackage": {
     "Archipelago": {
       "checksum": "ac9141e9ad0318df2fa27da5f20c50a842afeecb",
-      "version": 0
     },
     "The Messenger": {
       "checksum": "6991cbcda7316b65bcb072667f3ee4c4cae71c0b",
-      "version": 0
+    }
+  },
+  "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
     }
   }
-}
+]
 ```
 
 ## 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")
 ```

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.0.0'
+requirement = 'cx-Freeze==8.4.0'
 try:
     import pkg_resources
     try:
@@ -371,6 +371,8 @@ 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] = []
@@ -379,13 +381,26 @@ 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
-                with zipfile.ZipFile(self.libfolder / "worlds" / (file_name + ".apworld"), "x", zipfile.ZIP_DEFLATED,
+                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,
                                      compresslevel=9) as zf:
                     for path in world_directory.rglob("*.*"):
                         relative_path = os.path.join(*path.parts[path.parts.index("worlds")+1:])
-                        zf.write(path, relative_path)
+                        if not relative_path.endswith("archipelago.json"):
+                            zf.write(path, relative_path)
+                    zf.writestr(apworld.manifest_path, json.dumps(manifest))
                     folders_to_remove.append(file_name)
                 shutil.rmtree(world_directory)
         shutil.copyfile("meta.yaml", self.buildfolder / "Players" / "Templates" / "meta.yaml")

test/bases.py

@@ -9,98 +9,7 @@ from test.general import gen_steps
 from worlds import AutoWorld
 from worlds.AutoWorld import World, call_all
 
-from BaseClasses import Location, MultiWorld, CollectionState, ItemClassification, Item
-from worlds.alttp.Items import item_factory
-
-
-class TestBase(unittest.TestCase):
-    multiworld: MultiWorld
-    _state_cache = {}
-
-    def get_state(self, items):
-        if (self.multiworld, tuple(items)) in self._state_cache:
-            return self._state_cache[self.multiworld, tuple(items)]
-        state = CollectionState(self.multiworld)
-        for item in items:
-            item.classification = ItemClassification.progression
-            state.collect(item, prevent_sweep=True)
-        state.sweep_for_advancements()
-        state.update_reachable_regions(1)
-        self._state_cache[self.multiworld, tuple(items)] = state
-        return state
-
-    def get_path(self, state, region):
-        def flist_to_iter(node):
-            while node:
-                value, node = node
-                yield value
-
-        from itertools import zip_longest
-        reversed_path_as_flist = state.path.get(region, (region, None))
-        string_path_flat = reversed(list(map(str, flist_to_iter(reversed_path_as_flist))))
-        # Now we combine the flat string list into (region, exit) pairs
-        pathsiter = iter(string_path_flat)
-        pathpairs = zip_longest(pathsiter, pathsiter)
-        return list(pathpairs)
-
-    def run_location_tests(self, access_pool):
-        for i, (location, access, *item_pool) in enumerate(access_pool):
-            items = item_pool[0]
-            all_except = item_pool[1] if len(item_pool) > 1 else None
-            state = self._get_items(item_pool, all_except)
-            path = self.get_path(state, self.multiworld.get_location(location, 1).parent_region)
-            with self.subTest(msg="Reach Location", location=location, access=access, items=items,
-                              all_except=all_except, path=path, entry=i):
-
-                self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), access,
-                                 f"failed {self.multiworld.get_location(location, 1)} with: {item_pool}")
-
-            # check for partial solution
-            if not all_except and access:  # we are not supposed to be able to reach location with partial inventory
-                for missing_item in item_pool[0]:
-                    with self.subTest(msg="Location reachable without required item", location=location,
-                                      items=item_pool[0], missing_item=missing_item, entry=i):
-                        state = self._get_items_partial(item_pool, missing_item)
-
-                        self.assertEqual(self.multiworld.get_location(location, 1).can_reach(state), False,
-                                         f"failed {self.multiworld.get_location(location, 1)}: succeeded with "
-                                         f"{missing_item} removed from: {item_pool}")
-
-    def run_entrance_tests(self, access_pool):
-        for i, (entrance, access, *item_pool) in enumerate(access_pool):
-            items = item_pool[0]
-            all_except = item_pool[1] if len(item_pool) > 1 else None
-            state = self._get_items(item_pool, all_except)
-            path = self.get_path(state, self.multiworld.get_entrance(entrance, 1).parent_region)
-            with self.subTest(msg="Reach Entrance", entrance=entrance, access=access, items=items,
-                              all_except=all_except, path=path, entry=i):
-
-                self.assertEqual(self.multiworld.get_entrance(entrance, 1).can_reach(state), access)
-
-            # check for partial solution
-            if not all_except and access:  # we are not supposed to be able to reach location with partial inventory
-                for missing_item in item_pool[0]:
-                    with self.subTest(msg="Entrance reachable without required item", entrance=entrance,
-                                      items=item_pool[0], missing_item=missing_item, entry=i):
-                        state = self._get_items_partial(item_pool, missing_item)
-                        self.assertEqual(self.multiworld.get_entrance(entrance, 1).can_reach(state), False,
-                                         f"failed {self.multiworld.get_entrance(entrance, 1)} with: {item_pool}")
-
-    def _get_items(self, item_pool, all_except):
-        if all_except and len(all_except) > 0:
-            items = self.multiworld.itempool[:]
-            items = [item for item in items if
-                     item.name not in all_except and not ("Bottle" in item.name and "AnyBottle" in all_except)]
-            items.extend(item_factory(item_pool[0], self.multiworld.worlds[1]))
-        else:
-            items = item_factory(item_pool[0], self.multiworld.worlds[1])
-        return self.get_state(items)
-
-    def _get_items_partial(self, item_pool, missing_item):
-        new_items = item_pool[0].copy()
-        new_items.remove(missing_item)
-        items = item_factory(new_items, self.multiworld.worlds[1])
-        return self.get_state(items)
+from BaseClasses import Location, MultiWorld, CollectionState, Item
 
 
 class WorldTestBase(unittest.TestCase):

test/general/__init__.py

@@ -1,5 +1,5 @@
 from argparse import Namespace
-from typing import List, Optional, Tuple, Type, Union
+from typing import Any, List, Optional, Tuple, Type
 
 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: Union[List[Type[World]], Type[World]], steps: Tuple[str, ...] = gen_steps,
-                     seed: Optional[int] = None) -> MultiWorld:
+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:
     """
     Creates a multiworld with a player for each provided world type, allowing duplicates, setting default options, and
     calling the provided gen steps.
@@ -40,20 +40,27 @@ def setup_multiworld(worlds: Union[List[Type[World]], Type[World]], steps: Tuple
     :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 in enumerate(worlds, 1):
+    for player, (world_type, option_overrides) in enumerate(zip(worlds, options), 1):
         for key, option in world_type.options_dataclass.type_hints.items():
             updated_options = getattr(args, key, {})
-            updated_options[player] = option.from_any(option.default)
+            updated_options[player] = option.from_any(option_overrides.get(key, option.default))
             setattr(args, key, updated_options)
     multiworld.set_options(args)
     multiworld.state = CollectionState(multiworld)

test/webhost/test_tracker.py

@@ -93,3 +93,13 @@ 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 deprecate
+from Utils import Version
 
 if TYPE_CHECKING:
     from BaseClasses import MultiWorld, Item, Location, Tutorial, Region, Entrance
@@ -75,6 +75,10 @@ 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)
@@ -337,6 +341,8 @@ 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,7 +8,8 @@ import os
 import threading
 from io import BytesIO
 
-from typing import ClassVar, Dict, List, Literal, Tuple, Any, Optional, Union, BinaryIO, overload, Sequence
+from typing import (ClassVar, Dict, List, Literal, Tuple, Any, Optional, Union, BinaryIO, overload, Sequence,
+                    TYPE_CHECKING)
 
 import bsdiff4
 
@@ -16,6 +17,9 @@ 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]] = {}
@@ -65,7 +69,7 @@ class AutoPatchExtensionRegister(abc.ABCMeta):
             return handler
 
 
-container_version: int = 6
+container_version: int = 7
 
 
 def is_ap_player_container(game: str, data: bytes, player: int):
@@ -92,7 +96,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):
@@ -116,7 +120,7 @@ class APContainer:
         except Exception as e:
             raise Exception(f"Manifest {manifest} did not convert to json.") from e
         else:
-            opened_zipfile.writestr("archipelago.json", manifest_str)
+            opened_zipfile.writestr(self.manifest_path, 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."""
@@ -137,7 +141,18 @@ 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]:
-        with opened_zipfile.open("archipelago.json", "r") as f:
+        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:
             manifest = json.load(f)
         if manifest["compatible_version"] > self.version:
             raise Exception(f"File (version: {manifest['compatible_version']}) too new "
@@ -152,6 +167,33 @@ 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
@@ -248,10 +290,8 @@ class APProcedurePatch(APAutoPatchInterface):
             manifest["compatible_version"] = 5
         return manifest
 
-    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)
+    def read_contents(self, opened_zipfile: zipfile.ZipFile) -> Dict[str, Any]:
+        manifest = super(APProcedurePatch, self).read_contents(opened_zipfile)
         if "procedure" not in manifest:
             # support patching files made before moving to procedures
             self.procedure = [("apply_bsdiff4", ["delta.bsdiff4"])]
@@ -260,6 +300,7 @@ 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
+from Utils import local_path, open_filename, is_frozen, is_kivy_running
 
 
 class Type(Enum):
@@ -177,10 +177,9 @@ 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:
-        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.")
+    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.")
     world_source = worlds.WorldSource(str(target), is_zip=True)
     bisect.insort(worlds.world_sources, world_source)
     world_source.load()
@@ -197,7 +196,7 @@ def install_apworld(apworld_path: str = "") -> None:
         source, target = res
     except Exception as e:
         import Utils
-        Utils.messagebox(e.__class__.__name__, str(e), error=True)
+        Utils.messagebox("Notice", str(e), error=True)
         logging.exception(e)
     else:
         import Utils
@@ -243,3 +242,39 @@ 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,10 +7,11 @@ 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
+from Utils import local_path, user_path, Version, version_tuple, tuplize_version
 
 local_folder = os.path.dirname(__file__)
 user_folder = user_path("worlds") if user_path() != local_path() else user_path("custom_worlds")
@@ -38,6 +39,7 @@ 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})"
@@ -102,12 +104,94 @@ 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:
-    world_source.load()
+    # load all loose files first:
+    if world_source.is_zip:
+        apworlds.append(world_source)
+    else:
+        world_source.load()
+
 
-# Build the data package for each game.
 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
+
+# Build the data package for each game.
 network_data_package: DataPackage = {
     "games": {world_name: world.get_data_package_data() for world_name, world in AutoWorldRegister.world_types.items()},
 }

worlds/alttp/test/__init__.py

@@ -1,22 +0,0 @@
-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

@@ -0,0 +1,113 @@
+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 import LTTPTestBase
+from worlds.alttp.test.bases import LTTPTestBase
 
 
 class TestDungeon(LTTPTestBase):

worlds/alttp/test/inverted/TestInverted.py

@@ -1,13 +1,12 @@
-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 ...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.test import LTTPTestBase
+from ..bases import LTTPTestBase, TestBase
 
 
 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 import LTTPTestBase
+from worlds.alttp.test.bases import LTTPTestBase
 
 
 class TestInvertedBombRules(LTTPTestBase):

worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py

@@ -1,14 +1,13 @@
-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 ...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.test import LTTPTestBase
+from ..bases import LTTPTestBase, TestBase
 
 
 class TestInvertedMinor(TestBase, LTTPTestBase):

worlds/alttp/test/inverted_owg/TestInvertedOWG.py

@@ -1,14 +1,13 @@
-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 ...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.test import LTTPTestBase
+from ..bases import LTTPTestBase, TestBase
 
 
 class TestInvertedOWG(TestBase, LTTPTestBase):

worlds/alttp/test/items/TestDifficulty.py

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

worlds/alttp/test/minor_glitches/TestMinor.py

@@ -1,11 +1,10 @@
-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 ...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.test import LTTPTestBase
+from ..bases import LTTPTestBase, TestBase
 
 
 class TestMinor(TestBase, LTTPTestBase):

worlds/alttp/test/owg/TestVanillaOWG.py

@@ -1,11 +1,10 @@
-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 ...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.test import LTTPTestBase
+from ..bases import LTTPTestBase, TestBase
 
 
 class TestVanillaOWG(TestBase, LTTPTestBase):

worlds/alttp/test/shops/TestSram.py

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

worlds/alttp/test/vanilla/TestVanilla.py

@@ -1,10 +1,10 @@
-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
+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
 
 
 class TestVanilla(TestBase, LTTPTestBase):

worlds/bumpstik/archipelago.json

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

worlds/cccharles/Regions.py

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

worlds/cccharles/__init__.py

@@ -4,7 +4,7 @@ from .Options import CCCharlesOptions
 from .Rules import set_rules
 from .Regions import create_regions
 from BaseClasses import Tutorial, ItemClassification
-from worlds.AutoWorld import InvalidItemError, World, WebWorld
+from worlds.AutoWorld import World, WebWorld
 
 
 class CCCharlesWeb(WebWorld):
@@ -157,7 +157,7 @@ class CCCharlesWorld(World):
             case "Bug Spray":
                 classification = ItemClassification.progression
             case _: # Should not occur
-                raise InvalidItemError("Unexpected case met: classification cannot be set for unknown item \"" + name + "\"")
+                raise Exception("Unexpected case met: classification cannot be set for unknown item \"" + name + "\"")
 
         return CCCharlesItem(name, classification, item_id, self.player)
 

worlds/factorio/Client.py

@@ -59,6 +59,19 @@ class FactorioCommandProcessor(ClientCommandProcessor):
     def _cmd_toggle_chat(self):
         """Toggle sending of chat messages from players on the Factorio server to Archipelago."""
         self.ctx.toggle_bridge_chat_out()
+        
+    def _cmd_rcon_reconnect(self) -> bool:
+        """Reconnect the RCON client if its disconnected."""
+        try:
+            result = self.ctx.rcon_client.send_command("/help")
+            if result:
+                self.output("RCON Client already connected.")
+            return True
+        except factorio_rcon.RCONNetworkError:
+            self.ctx.rcon_client = factorio_rcon.RCONClient("localhost", self.ctx.rcon_port, self.ctx.rcon_password, timeout=5)
+            self.output("RCON Client successfully reconnected.")
+            return True
+        return False
 
 
 class FactorioContext(CommonContext):
@@ -242,7 +255,13 @@ async def game_watcher(ctx: FactorioContext):
             if ctx.rcon_client and time.perf_counter() > next_bridge:
                 next_bridge = time.perf_counter() + 1
                 ctx.awaiting_bridge = False
-                data = json.loads(ctx.rcon_client.send_command("/ap-sync"))
+                try:
+                    data = json.loads(ctx.rcon_client.send_command("/ap-sync"))
+                except factorio_rcon.RCONNotConnected:
+                    continue
+                except factorio_rcon.RCONNetworkError:
+                    bridge_logger.warning("RCON Client has unexpectedly lost connection. Please issue /rcon_reconnect.")
+                    continue
                 if not ctx.auth:
                     pass  # auth failed, wait for new attempt
                 elif data["slot_name"] != ctx.auth:
@@ -294,9 +313,13 @@ async def game_watcher(ctx: FactorioContext):
                                     "cmd": "Set", "key": ctx.energylink_key, "operations":
                                         [{"operation": "add", "value": value}]
                                 }]))
-                                ctx.rcon_client.send_command(
-                                    f"/ap-energylink -{value}")
-                                logger.debug(f"EnergyLink: Sent {format_SI_prefix(value)}J")
+                                try:
+                                    ctx.rcon_client.send_command(
+                                        f"/ap-energylink -{value}")
+                                except factorio_rcon.RCONNetworkError:
+                                    bridge_logger.warning("RCON Client has unexpectedly lost connection. Please issue /rcon_reconnect.")
+                                else:
+                                    logger.debug(f"EnergyLink: Sent {format_SI_prefix(value)}J")
 
             await asyncio.sleep(0.1)
 

worlds/generic/docs/advanced_settings_en.md

@@ -81,7 +81,8 @@ are `description`, `name`, `game`, `requires`, and the name of the games you wan
 * `requires` details different requirements from the generator for the YAML to work as you expect it to. Generally this
   is good for detailing the version of Archipelago this YAML was prepared for. If it is rolled on an older version,
   options may be missing and as such it will not work as expected. If any plando is used in the file then requiring it
-  here to ensure it will be used is good practice.
+  here to ensure it will be used is good practice. Specific versions of custom worlds can also be required, ensuring 
+  that the generator is using a compatible version.
 
 ## Game Options
 
@@ -165,7 +166,9 @@ game:
   A Link to the Past: 10
   Timespinner: 10
 requires: 
-  version: 0.4.1
+  version: 0.6.4
+  game:
+      A Link to the Past: 0.6.4
 A Link to the Past:
   accessibility: minimal
   progression_balancing: 50
@@ -214,12 +217,13 @@ Timespinner:
   progression_balancing: 50
   item_links: # Share part of your item pool with other players.
     - name: TSAll
-      item_pool: 
+      item_pool:
         - Everything
       local_items:
         - Twin Pyramid Key
         - Timespinner Wheel
       replacement_item: null
+      skip_if_solo: true
 ```
 
 #### This is a fully functional yaml file that will do all the following things:
@@ -228,7 +232,7 @@ Timespinner:
 * `name` is `Example Player` and this will be used in the server console when sending and receiving items.
 * `game` has an equal chance of being either `A Link to the Past` or `Timespinner` with a 10/20 chance for each. This is
   because each game has a weight of 10 and the total of all weights is 20.
-* `requires` is set to required release version 0.3.2 or higher.
+* `requires` is set to require Archipelago release version 0.6.4 or higher, as well as A Link to the Past version 0.6.4.
 * `accessibility` for both games is set to `minimal` which will set this seed to beatable only, so some locations and
   items may be completely inaccessible but the seed will still be completable.
 * `progression_balancing` for both games is set to 50, the default value, meaning we will likely receive important items
@@ -262,7 +266,7 @@ Timespinner:
   * For `Timespinner` all players in the `TSAll` item link group will share their entire item pool and the `Twin Pyramid
     Key` and `Timespinner Wheel` will be forced among the worlds of those in the group. The `null` replacement item
     will, instead of forcing a specific chosen item, allow the generator to randomly pick a filler item to replace the
-    player items.
+    player items. This item link will only be created if there are at least two players in the group.
 * `triggers` allows us to define a trigger such that if our `smallkey_shuffle` option happens to roll the `any_world`
   result it will also ensure that `bigkey_shuffle`, `map_shuffle`, and `compass_shuffle` are also forced to the
   `any_world` result. More information on triggers can be found in the

worlds/jakanddaxter/archipelago.json

@@ -0,0 +1,6 @@
+{
+    "game": "Jak and Daxter: The Precursor Legacy",
+    "world_version": "1.0.0",
+    "minimum_ap_version": "0.6.2",
+    "authors": ["markustulliuscicero"]
+}

worlds/jakanddaxter/test/test_trades.py

@@ -6,7 +6,8 @@ class TradesCostNothingTest(JakAndDaxterTestBase):
         "enable_orbsanity": 2,
         "global_orbsanity_bundle_size": 10,
         "citizen_orb_trade_amount": 0,
-        "oracle_orb_trade_amount": 0
+        "oracle_orb_trade_amount": 0,
+        "start_inventory": {"Power Cell": 100},
     }
 
     def test_orb_items_are_filler(self):
@@ -24,7 +25,8 @@ class TradesCostEverythingTest(JakAndDaxterTestBase):
         "enable_orbsanity": 2,
         "global_orbsanity_bundle_size": 10,
         "citizen_orb_trade_amount": 120,
-        "oracle_orb_trade_amount": 150
+        "oracle_orb_trade_amount": 150,
+        "start_inventory": {"Power Cell": 100},
     }
 
     def test_orb_items_are_progression(self):

worlds/kdl3/__init__.py

@@ -303,9 +303,6 @@ class KDL3World(World):
 
     def generate_basic(self) -> None:
         self.stage_shuffle_enabled = self.options.stage_shuffle > 0
-        goal = self.options.goal.value
-        goal_location = self.multiworld.get_location(location_name.goals[goal], self.player)
-        goal_location.place_locked_item(KDL3Item("Love-Love Rod", ItemClassification.progression, None, self.player))
         for level in range(1, 6):
             self.multiworld.get_location(f"Level {level} Boss - Defeated", self.player) \
                 .place_locked_item(
@@ -313,7 +310,6 @@ class KDL3World(World):
             self.multiworld.get_location(f"Level {level} Boss - Purified", self.player) \
                 .place_locked_item(
                 KDL3Item(f"Level {level} Boss Purified", ItemClassification.progression, None, self.player))
-        self.multiworld.completion_condition[self.player] = lambda state: state.has("Love-Love Rod", self.player)
         # this can technically be done at any point before generate_output
         if self.options.allow_bb:
             if self.options.allow_bb == self.options.allow_bb.option_enforced:

worlds/kdl3/rules.py

@@ -1,6 +1,8 @@
+from BaseClasses import ItemClassification
 from worlds.generic.Rules import set_rule, add_rule
-from .names import location_name, enemy_abilities, animal_friend_spawns
+from .items import KDL3Item
 from .locations import location_table
+from .names import location_name, enemy_abilities, animal_friend_spawns
 from .options import GoalSpeed
 import typing
 
@@ -111,6 +113,11 @@ def can_fix_angel_wings(state: "CollectionState", player: int, copy_abilities: t
 
 
 def set_rules(world: "KDL3World") -> None:
+    goal = world.options.goal.value
+    goal_location = world.multiworld.get_location(location_name.goals[goal], world.player)
+    goal_location.place_locked_item(KDL3Item("Love-Love Rod", ItemClassification.progression, None, world.player))
+    world.multiworld.completion_condition[world.player] = lambda state: state.has("Love-Love Rod", world.player)
+
     # Level 1
     set_rule(world.multiworld.get_location(location_name.grass_land_muchi, world.player),
              lambda state: can_reach_chuchu(state, world.player))

worlds/kh1/Client.py

@@ -13,8 +13,6 @@ import ModuleUpdate
 ModuleUpdate.update()
 
 import Utils
-death_link = False
-item_num = 1
 
 logger = logging.getLogger("Client")
 
@@ -34,62 +32,57 @@ class KH1ClientCommandProcessor(ClientCommandProcessor):
     def __init__(self, ctx):
         super().__init__(ctx)
     
+    def _cmd_slot_data(self):
+        """Prints slot data settings for the connected seed"""
+        for key in self.ctx.slot_data.keys():
+            if key not in ["remote_location_ids", "synthesis_item_name_byte_arrays"]:
+                self.output(str(key) + ": " + str(self.ctx.slot_data[key]))
+    
     def _cmd_deathlink(self):
-        """Toggles Deathlink"""
-        global death_link
-        if death_link:
-            death_link = False
-            self.output(f"Death Link turned off")
-        else:
-            death_link = True
-            self.output(f"Death Link turned on")
-    
-    def _cmd_goal(self):
-        """Prints goal setting"""
-        if "goal" in self.ctx.slot_data.keys():
-            self.output(str(self.ctx.slot_data["goal"]))
-        else:
-            self.output("Unknown")
-    
-    def _cmd_eotw_unlock(self):
-        """Prints End of the World Unlock setting"""
-        if "required_reports_door" in self.ctx.slot_data.keys():
-            if self.ctx.slot_data["required_reports_door"] > 13:
-                self.output("Item")
+        """If your Death Link setting is set to "Toggle", use this command to turn Death Link on and off."""
+        if "death_link" in self.ctx.slot_data.keys():
+            if self.ctx.slot_data["death_link"] == "toggle":
+                if self.ctx.death_link:
+                    self.ctx.death_link = False
+                    self.output(f"Death Link turned off")
+                else:
+                    self.ctx.death_link = True
+                    self.output(f"Death Link turned on")
             else:
-                self.output(str(self.ctx.slot_data["required_reports_eotw"]) + " reports")
+                self.output(f"'death_link' is not set to 'toggle' for this seed.")
+                self.output(f"'death_link' = " + str(self.ctx.slot_data["death_link"]))
         else:
-            self.output("Unknown")
+            self.output(f"No 'death_link' in slot_data keys. You probably aren't connected or are playing an older seed.")
     
-    def _cmd_door_unlock(self):
-        """Prints Final Rest Door Unlock setting"""
-        if "door" in self.ctx.slot_data.keys():
-            if self.ctx.slot_data["door"] == "reports":
-                self.output(str(self.ctx.slot_data["required_reports_door"]) + " reports")
-            else:
-                self.output(str(self.ctx.slot_data["door"]))
+    def _cmd_communication_path(self):
+        """Opens a file browser to allow Linux users to manually set their %LOCALAPPDATA% path"""
+        directory = Utils.open_directory("Select %LOCALAPPDATA% dir", "~/.local/share/Steam/steamapps/compatdata/2552430/pfx/drive_c/users/steamuser/AppData/Local")
+        if directory:
+            directory += "/KH1FM"
+            if not os.path.exists(directory):
+                os.makedirs(directory)
+            self.ctx.game_communication_path = directory
         else:
-            self.output("Unknown")
-    
-    def _cmd_advanced_logic(self):
-        """Prints advanced logic setting"""
-        if "advanced_logic" in self.ctx.slot_data.keys():
-            self.output(str(self.ctx.slot_data["advanced_logic"]))
-        else:
-            self.output("Unknown")
+            self.output(self.ctx.game_communication_path)
 
 class KH1Context(CommonContext):
     command_processor: int = KH1ClientCommandProcessor
     game = "Kingdom Hearts"
-    items_handling = 0b111  # full remote
+    items_handling = 0b011  # full remote except start inventory
 
     def __init__(self, server_address, password):
         super(KH1Context, self).__init__(server_address, password)
         self.send_index: int = 0
         self.syncing = False
         self.awaiting_bridge = False
-        self.hinted_synth_location_ids = False
-        self.slot_data = {}
+        self.hinted_location_ids: list[int] = []
+        self.slot_data: dict = {}
+
+        # Moved globals into instance attributes
+        self.death_link: bool = False
+        self.item_num: int = 1
+        self.remote_location_ids: list[int] = []
+
         # self.game_communication_path: files go in this path to pass data between us and the actual game
         if "localappdata" in os.environ:
             self.game_communication_path = os.path.expandvars(r"%localappdata%/KH1FM")
@@ -103,6 +96,10 @@ class KH1Context(CommonContext):
                     os.remove(root+"/"+file)
 
     async def server_auth(self, password_requested: bool = False):
+        for root, dirs, files in os.walk(self.game_communication_path):
+            for file in files:
+                if file.find("obtain") <= -1:
+                    os.remove(root+"/"+file)
         if password_requested and not self.password:
             await super(KH1Context, self).server_auth(password_requested)
         await self.get_username()
@@ -114,8 +111,7 @@ class KH1Context(CommonContext):
             for file in files:
                 if file.find("obtain") <= -1:
                     os.remove(root + "/" + file)
-        global item_num
-        item_num = 1
+        self.item_num = 1
 
     @property
     def endpoints(self):
@@ -130,8 +126,7 @@ class KH1Context(CommonContext):
             for file in files:
                 if file.find("obtain") <= -1:
                     os.remove(root+"/"+file)
-        global item_num
-        item_num = 1
+        self.item_num = 1
 
     def on_package(self, cmd: str, args: dict):
         if cmd in {"Connected"}:
@@ -142,38 +137,34 @@ class KH1Context(CommonContext):
                 with open(os.path.join(self.game_communication_path, filename), 'w') as f:
                     f.close()
             
-            #Handle Slot Data
+            # Handle Slot Data
             self.slot_data = args['slot_data']
             for key in list(args['slot_data'].keys()):
                 with open(os.path.join(self.game_communication_path, key + ".cfg"), 'w') as f:
                     f.write(str(args['slot_data'][key]))
                     f.close()
-                    
-            ###Support Legacy Games
-            if "Required Reports" in list(args['slot_data'].keys()) and "required_reports_eotw" not in list(args['slot_data'].keys()):
-                reports_required = args['slot_data']["Required Reports"]
-                with open(os.path.join(self.game_communication_path, "required_reports.cfg"), 'w') as f:
-                    f.write(str(reports_required))
-                    f.close()
-            ###End Support Legacy Games
-            
-            #End Handle Slot Data
+                if key == "remote_location_ids":
+                    self.remote_location_ids = args['slot_data'][key]
+                if key == "death_link":
+                    if args['slot_data']["death_link"] != "off":
+                        self.death_link = True
+            # End Handle Slot Data
 
         if cmd in {"ReceivedItems"}:
             start_index = args["index"]
             if start_index != len(self.items_received):
-                global item_num
                 for item in args['items']:
                     found = False
-                    item_filename = f"AP_{str(item_num)}.item"
+                    item_filename = f"AP_{str(self.item_num)}.item"
                     for filename in os.listdir(self.game_communication_path):
                         if filename == item_filename:
                             found = True
                     if not found:
-                        with open(os.path.join(self.game_communication_path, item_filename), 'w') as f:
-                            f.write(str(NetworkItem(*item).item) + "\n" + str(NetworkItem(*item).location) + "\n" + str(NetworkItem(*item).player))
-                            f.close()
-                            item_num = item_num + 1
+                        if (NetworkItem(*item).player == self.slot and (NetworkItem(*item).location in self.remote_location_ids) or (NetworkItem(*item).location < 0)) or NetworkItem(*item).player != self.slot:
+                            with open(os.path.join(self.game_communication_path, item_filename), 'w') as f:
+                                f.write(str(NetworkItem(*item).item) + "\n" + str(NetworkItem(*item).location) + "\n" + str(NetworkItem(*item).player))
+                                f.close()
+                                self.item_num += 1
 
         if cmd in {"RoomUpdate"}:
             if "checked_locations" in args:
@@ -186,21 +177,39 @@ class KH1Context(CommonContext):
             if args["type"] == "ItemSend":
                 item = args["item"]
                 networkItem = NetworkItem(*item)
-                recieverID = args["receiving"]
+                receiverID = args["receiving"]
                 senderID = networkItem.player
                 locationID = networkItem.location
-                if recieverID != self.slot and senderID == self.slot:
-                    itemName = self.item_names.lookup_in_slot(networkItem.item, recieverID)
+                if receiverID == self.slot or senderID == self.slot:
+                    itemName = self.item_names.lookup_in_slot(networkItem.item, receiverID)[:20]
                     itemCategory = networkItem.flags
-                    recieverName = self.player_names[recieverID]
-                    filename = "sent"
-                    with open(os.path.join(self.game_communication_path, filename), 'w') as f:
-                        f.write(
-                          re.sub('[^A-Za-z0-9 ]+', '',str(itemName))[:15] + "\n"
-                        + re.sub('[^A-Za-z0-9 ]+', '',str(recieverName))[:6] + "\n"
-                        + str(itemCategory) + "\n"
-                        + str(locationID))
-                        f.close()
+                    receiverName = self.player_names[receiverID][:20]
+                    senderName = self.player_names[senderID][:20]
+                    message = ""
+                    if receiverID == self.slot and receiverID != senderID: # Item received from someone else
+                        message = "From " + senderName + "\n" + itemName
+                    elif senderID == self.slot and receiverID != senderID: # Item sent to someone else
+                        message = itemName + "\nTo " + receiverName
+                    elif locationID in self.remote_location_ids: # Found a remote item
+                        message = itemName
+                    filename = "msg"
+                    if message != "":
+                        if not os.path.exists(self.game_communication_path + "/" + filename):
+                            with open(os.path.join(self.game_communication_path, filename), 'w') as f:
+                                f.write(message)
+                                f.close()
+            if args["type"] == "ItemCheat":
+                item = args["item"]
+                networkItem = NetworkItem(*item)
+                receiverID = args["receiving"]
+                if receiverID == self.slot:
+                    itemName = self.item_names.lookup_in_slot(networkItem.item, receiverID)[:20]
+                    filename = "msg"
+                    message = "Received " + itemName + "\nfrom server"
+                    if not os.path.exists(self.game_communication_path + "/" + filename):
+                        with open(os.path.join(self.game_communication_path, filename), 'w') as f:
+                            f.write(message)
+                            f.close()
 
     def on_deathlink(self, data: dict[str, object]):
         self.last_death_link = max(data["time"], self.last_death_link)
@@ -230,12 +239,11 @@ class KH1Context(CommonContext):
 async def game_watcher(ctx: KH1Context):
     from .Locations import lookup_id_to_name
     while not ctx.exit_event.is_set():
-        global death_link
-        if death_link and "DeathLink" not in ctx.tags:
-            await ctx.update_death_link(death_link)
-        if not death_link and "DeathLink" in ctx.tags:
-            await ctx.update_death_link(death_link)
-        if ctx.syncing == True:
+        if ctx.death_link and "DeathLink" not in ctx.tags:
+            await ctx.update_death_link(ctx.death_link)
+        if not ctx.death_link and "DeathLink" in ctx.tags:
+            await ctx.update_death_link(ctx.death_link)
+        if ctx.syncing is True:
             sync_msg = [{'cmd': 'Sync'}]
             if ctx.locations_checked:
                 sync_msg.append({"cmd": "LocationChecks", "locations": list(ctx.locations_checked)})
@@ -256,17 +264,17 @@ async def game_watcher(ctx: KH1Context):
                     if st != "nil":
                         if timegm(time.strptime(st, '%Y%m%d%H%M%S')) > ctx.last_death_link and int(time.time()) % int(timegm(time.strptime(st, '%Y%m%d%H%M%S'))) < 10:
                             await ctx.send_death(death_text = "Sora was defeated!")
-                if file.find("insynthshop") > -1:
-                    if not ctx.hinted_synth_location_ids:
+                if file.find("hint") > -1:
+                    hint_location_id = int(file.split("hint", -1)[1])
+                    if hint_location_id not in ctx.hinted_location_ids:
                         await ctx.send_msgs([{
                             "cmd": "LocationScouts",
-                            "locations": [2656401,2656402,2656403,2656404,2656405,2656406],
+                            "locations": [hint_location_id],
                             "create_as_hint": 2
                         }])
-                        ctx.hinted_synth_location_ids = True
+                        ctx.hinted_location_ids.append(hint_location_id)
         ctx.locations_checked = sending
-        message = [{"cmd": 'LocationChecks', "locations": sending}]
-        await ctx.send_msgs(message)
+        await ctx.check_locations(sending)
         if not ctx.finished_game and victory:
             await ctx.send_msgs([{"cmd": "StatusUpdate", "status": ClientStatus.CLIENT_GOAL}])
             ctx.finished_game = True

worlds/kh1/Data.py

@@ -0,0 +1,202 @@
+VANILLA_KEYBLADE_STATS = [
+    {"STR":  3, "CRR":  20, "CRB":  0, "REC": 30, "MP":  0}, # Kingdom Key
+    {"STR":  1, "CRR":  20, "CRB":  0, "REC": 30, "MP":  0}, # Dream Sword
+    {"STR":  1, "CRR":   0, "CRB":  0, "REC": 60, "MP":  0}, # Dream Shield
+    {"STR":  1, "CRR":  10, "CRB":  0, "REC": 30, "MP":  0}, # Dream Rod
+    {"STR":  0, "CRR":  20, "CRB":  0, "REC": 30, "MP":  0}, # Wooden Sword
+    {"STR":  5, "CRR":  10, "CRB":  0, "REC":  1, "MP":  0}, # Jungle King
+    {"STR":  6, "CRR":  20, "CRB":  0, "REC": 60, "MP":  0}, # Three Wishes
+    {"STR":  8, "CRR":  10, "CRB":  2, "REC": 30, "MP":  1}, # Fairy Harp
+    {"STR":  7, "CRR":  40, "CRB":  0, "REC":  1, "MP":  0}, # Pumpkinhead
+    {"STR":  6, "CRR":  20, "CRB":  0, "REC": 30, "MP":  1}, # Crabclaw
+    {"STR": 13, "CRR":  40, "CRB":  0, "REC": 60, "MP":  0}, # Divine Rose
+    {"STR":  4, "CRR":  20, "CRB":  0, "REC": 30, "MP":  2}, # Spellbinder
+    {"STR": 10, "CRR":  20, "CRB":  2, "REC": 90, "MP":  0}, # Olympia
+    {"STR": 10, "CRR":  20, "CRB":  0, "REC": 30, "MP":  1}, # Lionheart
+    {"STR":  9, "CRR":   2, "CRB":  0, "REC": 90, "MP": -1}, # Metal Chocobo
+    {"STR":  9, "CRR":  40, "CRB":  0, "REC":  1, "MP":  1}, # Oathkeeper
+    {"STR": 11, "CRR":  20, "CRB":  2, "REC": 30, "MP": -1}, # Oblivion
+    {"STR":  7, "CRR":  20, "CRB":  0, "REC":  1, "MP":  2}, # Lady Luck
+    {"STR":  5, "CRR": 200, "CRB":  2, "REC":  1, "MP":  0}, # Wishing Star
+    {"STR": 14, "CRR":  40, "CRB":  2, "REC": 90, "MP":  2}, # Ultima Weapon
+    {"STR":  3, "CRR":  20, "CRB":  0, "REC":  1, "MP":  3}, # Diamond Dust
+    {"STR":  8, "CRR":  10, "CRB": 16, "REC": 90, "MP": -2}, # One-Winged Angel
+    ]
+VANILLA_PUPPY_LOCATIONS = [
+    "Traverse Town Mystical House Glide Chest",
+    "Traverse Town Alleyway Behind Crates Chest",
+    "Traverse Town Item Workshop Left Chest",
+    "Traverse Town Secret Waterway Near Stairs Chest",
+    "Wonderland Queen's Castle Hedge Right Blue Chest",
+    "Wonderland Lotus Forest Nut Chest",
+    "Wonderland Tea Party Garden Above Lotus Forest Entrance 1st Chest",
+    "Olympus Coliseum Coliseum Gates Right Blue Trinity Chest",
+    "Deep Jungle Hippo's Lagoon Center Chest",
+    "Deep Jungle Vines 2 Chest",
+    "Deep Jungle Waterfall Cavern Middle Chest",
+    "Deep Jungle Camp Blue Trinity Chest",
+    "Agrabah Cave of Wonders Treasure Room Across Platforms Chest",
+    "Halloween Town Oogie's Manor Hollow Chest",
+    "Neverland Pirate Ship Deck White Trinity Chest",
+    "Agrabah Cave of Wonders Hidden Room Left Chest",
+    "Agrabah Cave of Wonders Entrance Tall Tower Chest",
+    "Agrabah Palace Gates High Opposite Palace Chest",
+    "Monstro Chamber 3 Platform Above Chamber 2 Entrance Chest",
+    "Wonderland Lotus Forest Through the Painting Thunder Plant Chest",
+    "Hollow Bastion Grand Hall Left of Gate Chest",
+    "Halloween Town Cemetery By Cat Shape Chest",
+    "Halloween Town Moonlight Hill White Trinity Chest",
+    "Halloween Town Guillotine Square Pumpkin Structure Right Chest",
+    "Monstro Mouth High Platform Across from Boat Chest",
+    "Monstro Chamber 6 Low Chest",
+    "Monstro Chamber 5 Atop Barrel Chest",
+    "Neverland Hold Flight 1st Chest",
+    "Neverland Hold Yellow Trinity Green Chest",
+    "Neverland Captain's Cabin Chest",
+    "Hollow Bastion Rising Falls Floating Platform Near Save Chest",
+    "Hollow Bastion Castle Gates Gravity Chest",
+    "Hollow Bastion Lift Stop Outside Library Gravity Chest"
+    ]
+CHAR_TO_KH = {
+    " ": 0x01,
+    "0": 0x21,
+    "1": 0x22,
+    "2": 0x23,
+    "3": 0x24,
+    "4": 0x25,
+    "5": 0x26,
+    "6": 0x27,
+    "7": 0x28,
+    "8": 0x29,
+    "9": 0x2A,
+    "A": 0x2B,
+    "B": 0x2C,
+    "C": 0x2D,
+    "D": 0x2E,
+    "E": 0x2F,
+    "F": 0x30,
+    "G": 0x31,
+    "H": 0x32,
+    "I": 0x33,
+    "J": 0x34,
+    "K": 0x35,
+    "L": 0x36,
+    "M": 0x37,
+    "N": 0x38,
+    "O": 0x39,
+    "P": 0x3A,
+    "Q": 0x3B,
+    "R": 0x3C,
+    "S": 0x3D,
+    "T": 0x3E,
+    "U": 0x3F,
+    "V": 0x40,
+    "W": 0x41,
+    "X": 0x42,
+    "Y": 0x43,
+    "Z": 0x44,
+    "a": 0x45,
+    "b": 0x46,
+    "c": 0x47,
+    "d": 0x48,
+    "e": 0x49,
+    "f": 0x4A,
+    "g": 0x4B,
+    "h": 0x4C,
+    "i": 0x4D,
+    "j": 0x4E,
+    "k": 0x4F,
+    "l": 0x50,
+    "m": 0x51,
+    "n": 0x52,
+    "o": 0x53,
+    "p": 0x54,
+    "q": 0x55,
+    "r": 0x56,
+    "s": 0x57,
+    "t": 0x58,
+    "u": 0x59,
+    "v": 0x5A,
+    "w": 0x5B,
+    "x": 0x5C,
+    "y": 0x5D,
+    "z": 0x5E
+    }
+VANILLA_ABILITY_AP_COSTS = [
+    {"Ability Name": "Treasure Magnet", "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Combo Plus",      "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Air Combo Plus",  "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Critical Plus",   "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Second Wind",     "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Scan",            "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Sonic Blade",     "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Ars Arcanum",     "AP Cost": 4, "Randomize": True},
+    {"Ability Name": "Strike Raid",     "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Ragnarok",        "AP Cost": 4, "Randomize": True},
+    {"Ability Name": "Trinity Limit",   "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Cheer",           "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Vortex",          "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Aerial Sweep",    "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Counter Attack",  "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Blitz",           "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Guard",           "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Dodge Roll",      "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "MP Haste",        "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "MP Rage",         "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Second Chance",   "AP Cost": 5, "Randomize": True},
+    {"Ability Name": "Berserk",         "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Jackpot",         "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Lucky Strike",    "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Charge",          "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Rocket",          "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Tornado",         "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "MP Gift",         "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Raging Boar",     "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Asp's Bite",      "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Healing Herb",    "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Wind Armor",      "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Crescent",        "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Sandstorm",       "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Applause!",       "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Blazing Fury",    "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Icy Terror",      "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Bolts of Sorrow", "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Ghostly Scream",  "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Hummingbird",     "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Time-Out",        "AP Cost": 4, "Randomize": True},
+    {"Ability Name": "Storm´s Eye",     "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Ferocious Lunge", "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Furious Bellow",  "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Spiral Wave",     "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Thunder Potion",  "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Cure Potion",     "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Aero Potion",     "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Slapshot",        "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Sliding Dash",    "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Hurricane Blast", "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Ripple Drive",    "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "Stun Impact",     "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Gravity Break",   "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Zantetsuken",     "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Tech Boost",      "AP Cost": 2, "Randomize": True},
+    {"Ability Name": "Encounter Plus",  "AP Cost": 1, "Randomize": True},
+    {"Ability Name": "Leaf Bracer",     "AP Cost": 5, "Randomize": True},
+    {"Ability Name": "Evolution",       "AP Cost": 3, "Randomize": True},
+    {"Ability Name": "EXP Zero",        "AP Cost": 0, "Randomize": True},
+    {"Ability Name": "Combo Master",    "AP Cost": 3, "Randomize": True}
+    ]
+
+WORLD_KEY_ITEMS = {
+    "Footprints": "Wonderland",
+    "Entry Pass": "Olympus Coliseum",
+    "Slides": "Deep Jungle",
+    "Crystal Trident": "Atlantica",
+    "Forget-Me-Not": "Halloween Town",
+    "Jack-In-The-Box": "Halloween Town",
+    "Theon Vol. 6": "Hollow Bastion"
+}
+
+LOGIC_BEGINNER = 0
+LOGIC_NORMAL = 5
+LOGIC_PROUD = 10
+LOGIC_MINIMAL = 15

worlds/kh1/GenerateJSON.py

@@ -0,0 +1,67 @@
+import logging
+
+import yaml
+import os
+import io
+from typing import TYPE_CHECKING, Dict, List, Optional, cast
+import Utils
+import zipfile
+import json
+
+from .Locations import KH1Location, location_table
+
+from worlds.Files import APPlayerContainer
+
+
+
+class KH1Container(APPlayerContainer):
+    game: str = 'Kingdom Hearts'
+    patch_file_ending = ".zip"
+
+    def __init__(self, patch_data: Dict[str, str] | io.BytesIO, base_path: str = "", output_directory: str = "",
+        player: Optional[int] = None, player_name: str = "", server: str = ""):
+        self.patch_data = patch_data
+        self.file_path = base_path
+        container_path = os.path.join(output_directory, base_path + ".zip")
+        super().__init__(container_path, player, player_name, server)
+
+    def write_contents(self, opened_zipfile: zipfile.ZipFile) -> None:
+        for filename, text in self.patch_data.items():
+            opened_zipfile.writestr(filename, text)
+        super().write_contents(opened_zipfile)
+
+
+def generate_json(world, output_directory):
+    mod_name = f"AP-{world.multiworld.seed_name}-P{world.player}-{world.multiworld.get_file_safe_player_name(world.player)}"
+    mod_dir = os.path.join(output_directory, mod_name + "_" + Utils.__version__)
+    
+    item_location_map = get_item_location_map(world)
+    settings = get_settings(world)
+    
+    files = {
+        "item_location_map.json":  json.dumps(item_location_map),
+        "keyblade_stats.json":     json.dumps(world.get_keyblade_stats()),
+        "settings.json":           json.dumps(settings),
+        "ap_costs.json":           json.dumps(world.get_ap_costs())
+    }
+
+    mod = KH1Container(files, mod_dir, output_directory, world.player,
+            world.multiworld.get_file_safe_player_name(world.player))
+    mod.write()
+
+def get_item_location_map(world):
+    location_item_map = {}
+    for location in world.multiworld.get_filled_locations(world.player):
+        if location.name != "Final Ansem":
+            if world.player != location.item.player or (world.player == location.item.player and world.options.remote_items.current_key == "full" and (location_table[location.name].code < 2656800 or location_table[location.name].code > 2656814)):
+                item_id = 2641230
+            else:
+                item_id = location.item.code
+            location_data = location_table[location.name]
+            location_id = location_data.code
+            location_item_map[location_id] = item_id
+    return location_item_map
+
+def get_settings(world):
+    settings = world.fill_slot_data()
+    return settings

worlds/kh1/Items.py

@@ -10,518 +10,341 @@ class KH1Item(Item):
 class KH1ItemData(NamedTuple):
     category: str
     code: int
+    type: str
     classification: ItemClassification = ItemClassification.filler
     max_quantity: int = 1
     weight: int = 1
 
 
 def get_items_by_category(category: str) -> Dict[str, KH1ItemData]:
-    item_dict: Dict[str, KH1ItemData] = {}
-    for name, data in item_table.items():
-        if data.category == category:
-            item_dict.setdefault(name, data)
-
-    return item_dict
-
+    return {name: data for name, data in item_table.items() if data.category == category}
 
 item_table: Dict[str, KH1ItemData] = {
-    "Victory":                           KH1ItemData("VIC",              code = 264_0000, classification = ItemClassification.progression,                  ),
-    "Potion":                            KH1ItemData("Item",             code = 264_1001, classification = ItemClassification.filler,                       ),
-    "Hi-Potion":                         KH1ItemData("Item",             code = 264_1002, classification = ItemClassification.filler,                       ),
-    "Ether":                             KH1ItemData("Item",             code = 264_1003, classification = ItemClassification.filler,                       ),
-    "Elixir":                            KH1ItemData("Item",             code = 264_1004, classification = ItemClassification.filler,                       ),
-    #"B05":                              KH1ItemData("Item",             code = 264_1005, classification = ItemClassification.filler,                       ),
-    "Mega-Potion":                       KH1ItemData("Item",             code = 264_1006, classification = ItemClassification.filler,                       ),
-    "Mega-Ether":                        KH1ItemData("Item",             code = 264_1007, classification = ItemClassification.filler,                       ),
-    "Megalixir":                         KH1ItemData("Item",             code = 264_1008, classification = ItemClassification.filler,                       ),
-    #"Fury Stone":                       KH1ItemData("Synthesis",        code = 264_1009, classification = ItemClassification.filler,                       ),
-    #"Power Stone":                      KH1ItemData("Synthesis",        code = 264_1010, classification = ItemClassification.filler,                       ),
-    #"Energy Stone":                     KH1ItemData("Synthesis",        code = 264_1011, classification = ItemClassification.filler,                       ),
-    #"Blazing Stone":                    KH1ItemData("Synthesis",        code = 264_1012, classification = ItemClassification.filler,                       ),
-    #"Frost Stone":                      KH1ItemData("Synthesis",        code = 264_1013, classification = ItemClassification.filler,                       ),
-    #"Lightning Stone":                  KH1ItemData("Synthesis",        code = 264_1014, classification = ItemClassification.filler,                       ),
-    #"Dazzling Stone":                   KH1ItemData("Synthesis",        code = 264_1015, classification = ItemClassification.filler,                       ),
-    #"Stormy Stone":                     KH1ItemData("Synthesis",        code = 264_1016, classification = ItemClassification.filler,                       ),
-    "Protect Chain":                     KH1ItemData("Accessory",        code = 264_1017, classification = ItemClassification.useful,                       ),
-    "Protera Chain":                     KH1ItemData("Accessory",        code = 264_1018, classification = ItemClassification.useful,                       ),
-    "Protega Chain":                     KH1ItemData("Accessory",        code = 264_1019, classification = ItemClassification.useful,                       ),
-    "Fire Ring":                         KH1ItemData("Accessory",        code = 264_1020, classification = ItemClassification.useful,                       ),
-    "Fira Ring":                         KH1ItemData("Accessory",        code = 264_1021, classification = ItemClassification.useful,                       ),
-    "Firaga Ring":                       KH1ItemData("Accessory",        code = 264_1022, classification = ItemClassification.useful,                       ),
-    "Blizzard Ring":                     KH1ItemData("Accessory",        code = 264_1023, classification = ItemClassification.useful,                       ),
-    "Blizzara Ring":                     KH1ItemData("Accessory",        code = 264_1024, classification = ItemClassification.useful,                       ),
-    "Blizzaga Ring":                     KH1ItemData("Accessory",        code = 264_1025, classification = ItemClassification.useful,                       ),
-    "Thunder Ring":                      KH1ItemData("Accessory",        code = 264_1026, classification = ItemClassification.useful,                       ),
-    "Thundara Ring":                     KH1ItemData("Accessory",        code = 264_1027, classification = ItemClassification.useful,                       ),
-    "Thundaga Ring":                     KH1ItemData("Accessory",        code = 264_1028, classification = ItemClassification.useful,                       ),
-    "Ability Stud":                      KH1ItemData("Accessory",        code = 264_1029, classification = ItemClassification.useful,                       ),
-    "Guard Earring":                     KH1ItemData("Accessory",        code = 264_1030, classification = ItemClassification.useful,                       ),
-    "Master Earring":                    KH1ItemData("Accessory",        code = 264_1031, classification = ItemClassification.useful,                       ),
-    "Chaos Ring":                        KH1ItemData("Accessory",        code = 264_1032, classification = ItemClassification.useful,                       ),
-    "Dark Ring":                         KH1ItemData("Accessory",        code = 264_1033, classification = ItemClassification.useful,                       ),
-    "Element Ring":                      KH1ItemData("Accessory",        code = 264_1034, classification = ItemClassification.useful,                       ),
-    "Three Stars":                       KH1ItemData("Accessory",        code = 264_1035, classification = ItemClassification.useful,                       ),
-    "Power Chain":                       KH1ItemData("Accessory",        code = 264_1036, classification = ItemClassification.useful,                       ),
-    "Golem Chain":                       KH1ItemData("Accessory",        code = 264_1037, classification = ItemClassification.useful,                       ),
-    "Titan Chain":                       KH1ItemData("Accessory",        code = 264_1038, classification = ItemClassification.useful,                       ),
-    "Energy Bangle":                     KH1ItemData("Accessory",        code = 264_1039, classification = ItemClassification.useful,                       ),
-    "Angel Bangle":                      KH1ItemData("Accessory",        code = 264_1040, classification = ItemClassification.useful,                       ),
-    "Gaia Bangle":                       KH1ItemData("Accessory",        code = 264_1041, classification = ItemClassification.useful,                       ),
-    "Magic Armlet":                      KH1ItemData("Accessory",        code = 264_1042, classification = ItemClassification.useful,                       ),
-    "Rune Armlet":                       KH1ItemData("Accessory",        code = 264_1043, classification = ItemClassification.useful,                       ),
-    "Atlas Armlet":                      KH1ItemData("Accessory",        code = 264_1044, classification = ItemClassification.useful,                       ),
-    "Heartguard":                        KH1ItemData("Accessory",        code = 264_1045, classification = ItemClassification.useful,                       ),
-    "Ribbon":                            KH1ItemData("Accessory",        code = 264_1046, classification = ItemClassification.useful,                       ),
-    "Crystal Crown":                     KH1ItemData("Accessory",        code = 264_1047, classification = ItemClassification.useful,                       ),
-    "Brave Warrior":                     KH1ItemData("Accessory",        code = 264_1048, classification = ItemClassification.useful,                       ),
-    "Ifrit's Horn":                      KH1ItemData("Accessory",        code = 264_1049, classification = ItemClassification.useful,                       ),
-    "Inferno Band":                      KH1ItemData("Accessory",        code = 264_1050, classification = ItemClassification.useful,                       ),
-    "White Fang":                        KH1ItemData("Accessory",        code = 264_1051, classification = ItemClassification.useful,                       ),
-    "Ray of Light":                      KH1ItemData("Accessory",        code = 264_1052, classification = ItemClassification.useful,                       ),
-    "Holy Circlet":                      KH1ItemData("Accessory",        code = 264_1053, classification = ItemClassification.useful,                       ),
-    "Raven's Claw":                      KH1ItemData("Accessory",        code = 264_1054, classification = ItemClassification.useful,                       ),
-    "Omega Arts":                        KH1ItemData("Accessory",        code = 264_1055, classification = ItemClassification.useful,                       ),
-    "EXP Earring":                       KH1ItemData("Accessory",        code = 264_1056, classification = ItemClassification.useful,                       ),
-    #"A41":                              KH1ItemData("Accessory",        code = 264_1057, classification = ItemClassification.useful,                       ),
-    "EXP Ring":                          KH1ItemData("Accessory",        code = 264_1058, classification = ItemClassification.useful,                       ),
-    "EXP Bracelet":                      KH1ItemData("Accessory",        code = 264_1059, classification = ItemClassification.useful,                       ),
-    "EXP Necklace":                      KH1ItemData("Accessory",        code = 264_1060, classification = ItemClassification.useful,                       ),
-    "Firagun Band":                      KH1ItemData("Accessory",        code = 264_1061, classification = ItemClassification.useful,                       ),
-    "Blizzagun Band":                    KH1ItemData("Accessory",        code = 264_1062, classification = ItemClassification.useful,                       ),
-    "Thundagun Band":                    KH1ItemData("Accessory",        code = 264_1063, classification = ItemClassification.useful,                       ),
-    "Ifrit Belt":                        KH1ItemData("Accessory",        code = 264_1064, classification = ItemClassification.useful,                       ),
-    "Shiva Belt":                        KH1ItemData("Accessory",        code = 264_1065, classification = ItemClassification.useful,                       ),
-    "Ramuh Belt":                        KH1ItemData("Accessory",        code = 264_1066, classification = ItemClassification.useful,                       ),
-    "Moogle Badge":                      KH1ItemData("Accessory",        code = 264_1067, classification = ItemClassification.useful,                       ),
-    "Cosmic Arts":                       KH1ItemData("Accessory",        code = 264_1068, classification = ItemClassification.useful,                       ),
-    "Royal Crown":                       KH1ItemData("Accessory",        code = 264_1069, classification = ItemClassification.useful,                       ),
-    "Prime Cap":                         KH1ItemData("Accessory",        code = 264_1070, classification = ItemClassification.useful,                       ),
-    "Obsidian Ring":                     KH1ItemData("Accessory",        code = 264_1071, classification = ItemClassification.useful,                       ),
-    #"A56":                              KH1ItemData("Accessory",        code = 264_1072, classification = ItemClassification.filler,                       ),
-    #"A57":                              KH1ItemData("Accessory",        code = 264_1073, classification = ItemClassification.filler,                       ),
-    #"A58":                              KH1ItemData("Accessory",        code = 264_1074, classification = ItemClassification.filler,                       ),
-    #"A59":                              KH1ItemData("Accessory",        code = 264_1075, classification = ItemClassification.filler,                       ),
-    #"A60":                              KH1ItemData("Accessory",        code = 264_1076, classification = ItemClassification.filler,                       ),
-    #"A61":                              KH1ItemData("Accessory",        code = 264_1077, classification = ItemClassification.filler,                       ),
-    #"A62":                              KH1ItemData("Accessory",        code = 264_1078, classification = ItemClassification.filler,                       ),
-    #"A63":                              KH1ItemData("Accessory",        code = 264_1079, classification = ItemClassification.filler,                       ),
-    #"A64":                              KH1ItemData("Accessory",        code = 264_1080, classification = ItemClassification.filler,                       ),
-    #"Kingdom Key":                      KH1ItemData("Keyblades",        code = 264_1081, classification = ItemClassification.useful,                       ),
-    #"Dream Sword":                      KH1ItemData("Keyblades",        code = 264_1082, classification = ItemClassification.useful,                       ),
-    #"Dream Shield":                     KH1ItemData("Keyblades",        code = 264_1083, classification = ItemClassification.useful,                       ),
-    #"Dream Rod":                        KH1ItemData("Keyblades",        code = 264_1084, classification = ItemClassification.useful,                       ),
-    "Wooden Sword":                      KH1ItemData("Keyblades",        code = 264_1085, classification = ItemClassification.useful,                       ),
-    "Jungle King":                       KH1ItemData("Keyblades",        code = 264_1086, classification = ItemClassification.progression,                  ),
-    "Three Wishes":                      KH1ItemData("Keyblades",        code = 264_1087, classification = ItemClassification.progression,                  ),
-    "Fairy Harp":                        KH1ItemData("Keyblades",        code = 264_1088, classification = ItemClassification.progression,                  ),
-    "Pumpkinhead":                       KH1ItemData("Keyblades",        code = 264_1089, classification = ItemClassification.progression,                  ),
-    "Crabclaw":                          KH1ItemData("Keyblades",        code = 264_1090, classification = ItemClassification.useful,                       ),
-    "Divine Rose":                       KH1ItemData("Keyblades",        code = 264_1091, classification = ItemClassification.progression,                  ),
-    "Spellbinder":                       KH1ItemData("Keyblades",        code = 264_1092, classification = ItemClassification.useful,                       ),
-    "Olympia":                           KH1ItemData("Keyblades",        code = 264_1093, classification = ItemClassification.progression,                  ),
-    "Lionheart":                         KH1ItemData("Keyblades",        code = 264_1094, classification = ItemClassification.progression,                  ),
-    "Metal Chocobo":                     KH1ItemData("Keyblades",        code = 264_1095, classification = ItemClassification.useful,                       ),
-    "Oathkeeper":                        KH1ItemData("Keyblades",        code = 264_1096, classification = ItemClassification.progression,                  ),
-    "Oblivion":                          KH1ItemData("Keyblades",        code = 264_1097, classification = ItemClassification.progression,                  ),
-    "Lady Luck":                         KH1ItemData("Keyblades",        code = 264_1098, classification = ItemClassification.progression,                  ),
-    "Wishing Star":                      KH1ItemData("Keyblades",        code = 264_1099, classification = ItemClassification.progression,                  ),
-    "Ultima Weapon":                     KH1ItemData("Keyblades",        code = 264_1100, classification = ItemClassification.useful,                       ),
-    "Diamond Dust":                      KH1ItemData("Keyblades",        code = 264_1101, classification = ItemClassification.useful,                       ),
-    "One-Winged Angel":                  KH1ItemData("Keyblades",        code = 264_1102, classification = ItemClassification.useful,                       ),
-    #"Mage's Staff":                     KH1ItemData("Weapons",          code = 264_1103, classification = ItemClassification.filler,                       ),
-    "Morning Star":                      KH1ItemData("Weapons",          code = 264_1104, classification = ItemClassification.useful,                       ),
-    "Shooting Star":                     KH1ItemData("Weapons",          code = 264_1105, classification = ItemClassification.useful,                       ),
-    "Magus Staff":                       KH1ItemData("Weapons",          code = 264_1106, classification = ItemClassification.useful,                       ),
-    "Wisdom Staff":                      KH1ItemData("Weapons",          code = 264_1107, classification = ItemClassification.useful,                       ),
-    "Warhammer":                         KH1ItemData("Weapons",          code = 264_1108, classification = ItemClassification.useful,                       ),
-    "Silver Mallet":                     KH1ItemData("Weapons",          code = 264_1109, classification = ItemClassification.useful,                       ),
-    "Grand Mallet":                      KH1ItemData("Weapons",          code = 264_1110, classification = ItemClassification.useful,                       ),
-    "Lord Fortune":                      KH1ItemData("Weapons",          code = 264_1111, classification = ItemClassification.useful,                       ),
-    "Violetta":                          KH1ItemData("Weapons",          code = 264_1112, classification = ItemClassification.useful,                       ),
-    "Dream Rod (Donald)":                KH1ItemData("Weapons",          code = 264_1113, classification = ItemClassification.useful,                       ),
-    "Save the Queen":                    KH1ItemData("Weapons",          code = 264_1114, classification = ItemClassification.useful,                       ),
-    "Wizard's Relic":                    KH1ItemData("Weapons",          code = 264_1115, classification = ItemClassification.useful,                       ),
-    "Meteor Strike":                     KH1ItemData("Weapons",          code = 264_1116, classification = ItemClassification.useful,                       ),
-    "Fantasista":                        KH1ItemData("Weapons",          code = 264_1117, classification = ItemClassification.useful,                       ),
-    #"Unused (Donald)":                  KH1ItemData("Weapons",          code = 264_1118, classification = ItemClassification.filler,                       ),
-    #"Knight's Shield":                  KH1ItemData("Weapons",          code = 264_1119, classification = ItemClassification.filler,                       ),
-    "Mythril Shield":                    KH1ItemData("Weapons",          code = 264_1120, classification = ItemClassification.useful,                       ),
-    "Onyx Shield":                       KH1ItemData("Weapons",          code = 264_1121, classification = ItemClassification.useful,                       ),
-    "Stout Shield":                      KH1ItemData("Weapons",          code = 264_1122, classification = ItemClassification.useful,                       ),
-    "Golem Shield":                      KH1ItemData("Weapons",          code = 264_1123, classification = ItemClassification.useful,                       ),
-    "Adamant Shield":                    KH1ItemData("Weapons",          code = 264_1124, classification = ItemClassification.useful,                       ),
-    "Smasher":                           KH1ItemData("Weapons",          code = 264_1125, classification = ItemClassification.useful,                       ),
-    "Gigas Fist":                        KH1ItemData("Weapons",          code = 264_1126, classification = ItemClassification.useful,                       ),
-    "Genji Shield":                      KH1ItemData("Weapons",          code = 264_1127, classification = ItemClassification.useful,                       ),
-    "Herc's Shield":                     KH1ItemData("Weapons",          code = 264_1128, classification = ItemClassification.useful,                       ),
-    "Dream Shield (Goofy)":              KH1ItemData("Weapons",          code = 264_1129, classification = ItemClassification.useful,                       ),
-    "Save the King":                     KH1ItemData("Weapons",          code = 264_1130, classification = ItemClassification.useful,                       ),
-    "Defender":                          KH1ItemData("Weapons",          code = 264_1131, classification = ItemClassification.useful,                       ),
-    "Mighty Shield":                     KH1ItemData("Weapons",          code = 264_1132, classification = ItemClassification.useful,                       ),
-    "Seven Elements":                    KH1ItemData("Weapons",          code = 264_1133, classification = ItemClassification.useful,                       ),
-    #"Unused (Goofy)":                   KH1ItemData("Weapons",          code = 264_1134, classification = ItemClassification.filler,                       ),
-    #"Spear":                            KH1ItemData("Weapons",          code = 264_1135, classification = ItemClassification.filler,                       ),
-    #"No Weapon":                        KH1ItemData("Weapons",          code = 264_1136, classification = ItemClassification.filler,                       ),
-    #"Genie":                            KH1ItemData("Weapons",          code = 264_1137, classification = ItemClassification.filler,                       ),
-    #"No Weapon":                        KH1ItemData("Weapons",          code = 264_1138, classification = ItemClassification.filler,                       ),
-    #"No Weapon":                        KH1ItemData("Weapons",          code = 264_1139, classification = ItemClassification.filler,                       ),
-    #"Tinker Bell":                      KH1ItemData("Weapons",          code = 264_1140, classification = ItemClassification.filler,                       ),
-    #"Claws":                            KH1ItemData("Weapons",          code = 264_1141, classification = ItemClassification.filler,                       ),
-    "Tent":                              KH1ItemData("Camping",          code = 264_1142, classification = ItemClassification.filler,                       ),
-    "Camping Set":                       KH1ItemData("Camping",          code = 264_1143, classification = ItemClassification.filler,                       ),
-    "Cottage":                           KH1ItemData("Camping",          code = 264_1144, classification = ItemClassification.filler,                       ),
-    #"C04":                              KH1ItemData("Camping",          code = 264_1145, classification = ItemClassification.filler,                       ),
-    #"C05":                              KH1ItemData("Camping",          code = 264_1146, classification = ItemClassification.filler,                       ),
-    #"C06":                              KH1ItemData("Camping",          code = 264_1147, classification = ItemClassification.filler,                       ),
-    #"C07":                              KH1ItemData("Camping",          code = 264_1148, classification = ItemClassification.filler,                       ),
-    "Ansem's Report 11":                 KH1ItemData("Reports",          code = 264_1149, classification = ItemClassification.progression,                  ),
-    "Ansem's Report 12":                 KH1ItemData("Reports",          code = 264_1150, classification = ItemClassification.progression,                  ),
-    "Ansem's Report 13":                 KH1ItemData("Reports",          code = 264_1151, classification = ItemClassification.progression,                  ),
-    "Power Up":                          KH1ItemData("Stat Ups",         code = 264_1152, classification = ItemClassification.filler,                       ),
-    "Defense Up":                        KH1ItemData("Stat Ups",         code = 264_1153, classification = ItemClassification.filler,                       ),
-    "AP Up":                             KH1ItemData("Stat Ups",         code = 264_1154, classification = ItemClassification.filler,                       ),
-    #"Serenity Power":                   KH1ItemData("Synthesis",        code = 264_1155, classification = ItemClassification.filler,                       ),
-    #"Dark Matter":                      KH1ItemData("Synthesis",        code = 264_1156, classification = ItemClassification.filler,                       ),
-    #"Mythril Stone":                    KH1ItemData("Synthesis",        code = 264_1157, classification = ItemClassification.filler,                       ),
-    "Fire Arts":                         KH1ItemData("Key",              code = 264_1158, classification = ItemClassification.progression,                  ),
-    "Blizzard Arts":                     KH1ItemData("Key",              code = 264_1159, classification = ItemClassification.progression,                  ),
-    "Thunder Arts":                      KH1ItemData("Key",              code = 264_1160, classification = ItemClassification.progression,                  ),
-    "Cure Arts":                         KH1ItemData("Key",              code = 264_1161, classification = ItemClassification.progression,                  ),
-    "Gravity Arts":                      KH1ItemData("Key",              code = 264_1162, classification = ItemClassification.progression,                  ),
-    "Stop Arts":                         KH1ItemData("Key",              code = 264_1163, classification = ItemClassification.progression,                  ),
-    "Aero Arts":                         KH1ItemData("Key",              code = 264_1164, classification = ItemClassification.progression,                  ),
-    #"Shiitank Rank":                    KH1ItemData("Synthesis",        code = 264_1165, classification = ItemClassification.filler,                       ),
-    #"Matsutake Rank":                   KH1ItemData("Synthesis",        code = 264_1166, classification = ItemClassification.filler,                       ),
-    #"Mystery Mold":                     KH1ItemData("Synthesis",        code = 264_1167, classification = ItemClassification.filler,                       ),
-    "Ansem's Report 1":                  KH1ItemData("Reports",          code = 264_1168, classification = ItemClassification.progression,                  ),
-    "Ansem's Report 2":                  KH1ItemData("Reports",          code = 264_1169, classification = ItemClassification.progression,                  ),
-    "Ansem's Report 3":                  KH1ItemData("Reports",          code = 264_1170, classification = ItemClassification.progression,                  ),
-    "Ansem's Report 4":                  KH1ItemData("Reports",          code = 264_1171, classification = ItemClassification.progression,                  ),
-    "Ansem's Report 5":                  KH1ItemData("Reports",          code = 264_1172, classification = ItemClassification.progression,                  ),
-    "Ansem's Report 6":                  KH1ItemData("Reports",          code = 264_1173, classification = ItemClassification.progression,                  ),
-    "Ansem's Report 7":                  KH1ItemData("Reports",          code = 264_1174, classification = ItemClassification.progression,                  ),
-    "Ansem's Report 8":                  KH1ItemData("Reports",          code = 264_1175, classification = ItemClassification.progression,                  ),
-    "Ansem's Report 9":                  KH1ItemData("Reports",          code = 264_1176, classification = ItemClassification.progression,                  ),
-    "Ansem's Report 10":                 KH1ItemData("Reports",          code = 264_1177, classification = ItemClassification.progression,                  ),
-    #"Khama Vol. 8":                     KH1ItemData("Key",              code = 264_1178, classification = ItemClassification.progression,                  ),
-    #"Salegg Vol. 6":                    KH1ItemData("Key",              code = 264_1179, classification = ItemClassification.progression,                  ),
-    #"Azal Vol. 3":                      KH1ItemData("Key",              code = 264_1180, classification = ItemClassification.progression,                  ),
-    #"Mava Vol. 3":                      KH1ItemData("Key",              code = 264_1181, classification = ItemClassification.progression,                  ),
-    #"Mava Vol. 6":                      KH1ItemData("Key",              code = 264_1182, classification = ItemClassification.progression,                  ),
-    "Theon Vol. 6":                      KH1ItemData("Key",              code = 264_1183, classification = ItemClassification.progression,                  ),
-    #"Nahara Vol. 5":                    KH1ItemData("Key",              code = 264_1184, classification = ItemClassification.progression,                  ),
-    #"Hafet Vol. 4":                     KH1ItemData("Key",              code = 264_1185, classification = ItemClassification.progression,                  ),
-    "Empty Bottle":                      KH1ItemData("Key",              code = 264_1186, classification = ItemClassification.progression, max_quantity = 6 ),
-    #"Old Book":                         KH1ItemData("Key",              code = 264_1187, classification = ItemClassification.progression,                  ),
-    "Emblem Piece (Flame)":              KH1ItemData("Key",              code = 264_1188, classification = ItemClassification.progression,                  ),
-    "Emblem Piece (Chest)":              KH1ItemData("Key",              code = 264_1189, classification = ItemClassification.progression,                  ),
-    "Emblem Piece (Statue)":             KH1ItemData("Key",              code = 264_1190, classification = ItemClassification.progression,                  ),
-    "Emblem Piece (Fountain)":           KH1ItemData("Key",              code = 264_1191, classification = ItemClassification.progression,                  ),
-    #"Log":                              KH1ItemData("Key",              code = 264_1192, classification = ItemClassification.progression,                  ),
-    #"Cloth":                            KH1ItemData("Key",              code = 264_1193, classification = ItemClassification.progression,                  ),
-    #"Rope":                             KH1ItemData("Key",              code = 264_1194, classification = ItemClassification.progression,                  ),
-    #"Seagull Egg":                      KH1ItemData("Key",              code = 264_1195, classification = ItemClassification.progression,                  ),
-    #"Fish":                             KH1ItemData("Key",              code = 264_1196, classification = ItemClassification.progression,                  ),
-    #"Mushroom":                         KH1ItemData("Key",              code = 264_1197, classification = ItemClassification.progression,                  ),
-    #"Coconut":                          KH1ItemData("Key",              code = 264_1198, classification = ItemClassification.progression,                  ),
-    #"Drinking Water":                   KH1ItemData("Key",              code = 264_1199, classification = ItemClassification.progression,                  ),
-    #"Navi-G Piece 1":                   KH1ItemData("Key",              code = 264_1200, classification = ItemClassification.progression,                  ),
-    #"Navi-G Piece 2":                   KH1ItemData("Key",              code = 264_1201, classification = ItemClassification.progression,                  ),
-    #"Navi-Gummi Unused":                KH1ItemData("Key",              code = 264_1202, classification = ItemClassification.progression,                  ),
-    #"Navi-G Piece 3":                   KH1ItemData("Key",              code = 264_1203, classification = ItemClassification.progression,                  ),
-    #"Navi-G Piece 4":                   KH1ItemData("Key",              code = 264_1204, classification = ItemClassification.progression,                  ),
-    #"Navi-Gummi":                       KH1ItemData("Key",              code = 264_1205, classification = ItemClassification.progression,                  ),
-    #"Watergleam":                       KH1ItemData("Key",              code = 264_1206, classification = ItemClassification.progression,                  ),
-    #"Naturespark":                      KH1ItemData("Key",              code = 264_1207, classification = ItemClassification.progression,                  ),
-    #"Fireglow":                         KH1ItemData("Key",              code = 264_1208, classification = ItemClassification.progression,                  ),
-    #"Earthshine":                       KH1ItemData("Key",              code = 264_1209, classification = ItemClassification.progression,                  ),
-    "Crystal Trident":                   KH1ItemData("Key",              code = 264_1210, classification = ItemClassification.progression,                  ),
-    "Postcard":                          KH1ItemData("Key",              code = 264_1211, classification = ItemClassification.progression, max_quantity = 10),
-    "Torn Page 1":                       KH1ItemData("Torn Pages",       code = 264_1212, classification = ItemClassification.progression,                  ),
-    "Torn Page 2":                       KH1ItemData("Torn Pages",       code = 264_1213, classification = ItemClassification.progression,                  ),
-    "Torn Page 3":                       KH1ItemData("Torn Pages",       code = 264_1214, classification = ItemClassification.progression,                  ),
-    "Torn Page 4":                       KH1ItemData("Torn Pages",       code = 264_1215, classification = ItemClassification.progression,                  ),
-    "Torn Page 5":                       KH1ItemData("Torn Pages",       code = 264_1216, classification = ItemClassification.progression,                  ),
-    "Slides":                            KH1ItemData("Key",              code = 264_1217, classification = ItemClassification.progression,                  ),
-    #"Slide 2":                          KH1ItemData("Key",              code = 264_1218, classification = ItemClassification.progression,                  ),
-    #"Slide 3":                          KH1ItemData("Key",              code = 264_1219, classification = ItemClassification.progression,                  ),
-    #"Slide 4":                          KH1ItemData("Key",              code = 264_1220, classification = ItemClassification.progression,                  ),
-    #"Slide 5":                          KH1ItemData("Key",              code = 264_1221, classification = ItemClassification.progression,                  ),
-    #"Slide 6":                          KH1ItemData("Key",              code = 264_1222, classification = ItemClassification.progression,                  ),
-    "Footprints":                        KH1ItemData("Key",              code = 264_1223, classification = ItemClassification.progression,                  ),
-    #"Claw Marks":                       KH1ItemData("Key",              code = 264_1224, classification = ItemClassification.progression,                  ),
-    #"Stench":                           KH1ItemData("Key",              code = 264_1225, classification = ItemClassification.progression,                  ),
-    #"Antenna":                          KH1ItemData("Key",              code = 264_1226, classification = ItemClassification.progression,                  ),
-    "Forget-Me-Not":                     KH1ItemData("Key",              code = 264_1227, classification = ItemClassification.progression,                  ),
-    "Jack-In-The-Box":                   KH1ItemData("Key",              code = 264_1228, classification = ItemClassification.progression,                  ),
-    "Entry Pass":                        KH1ItemData("Key",              code = 264_1229, classification = ItemClassification.progression,                  ),
-    #"Hero License":                     KH1ItemData("Key",              code = 264_1230, classification = ItemClassification.progression,                  ),
-    #"Pretty Stone":                     KH1ItemData("Synthesis",        code = 264_1231, classification = ItemClassification.filler,                       ),
-    #"N41":                              KH1ItemData("Synthesis",        code = 264_1232, classification = ItemClassification.filler,                       ),
-    #"Lucid Shard":                      KH1ItemData("Synthesis",        code = 264_1233, classification = ItemClassification.filler,                       ),
-    #"Lucid Gem":                        KH1ItemData("Synthesis",        code = 264_1234, classification = ItemClassification.filler,                       ),
-    #"Lucid Crystal":                    KH1ItemData("Synthesis",        code = 264_1235, classification = ItemClassification.filler,                       ),
-    #"Spirit Shard":                     KH1ItemData("Synthesis",        code = 264_1236, classification = ItemClassification.filler,                       ),
-    #"Spirit Gem":                       KH1ItemData("Synthesis",        code = 264_1237, classification = ItemClassification.filler,                       ),
-    #"Power Shard":                      KH1ItemData("Synthesis",        code = 264_1238, classification = ItemClassification.filler,                       ),
-    #"Power Gem":                        KH1ItemData("Synthesis",        code = 264_1239, classification = ItemClassification.filler,                       ),
-    #"Power Crystal":                    KH1ItemData("Synthesis",        code = 264_1240, classification = ItemClassification.filler,                       ),
-    #"Blaze Shard":                      KH1ItemData("Synthesis",        code = 264_1241, classification = ItemClassification.filler,                       ),
-    #"Blaze Gem":                        KH1ItemData("Synthesis",        code = 264_1242, classification = ItemClassification.filler,                       ),
-    #"Frost Shard":                      KH1ItemData("Synthesis",        code = 264_1243, classification = ItemClassification.filler,                       ),
-    #"Frost Gem":                        KH1ItemData("Synthesis",        code = 264_1244, classification = ItemClassification.filler,                       ),
-    #"Thunder Shard":                    KH1ItemData("Synthesis",        code = 264_1245, classification = ItemClassification.filler,                       ),
-    #"Thunder Gem":                      KH1ItemData("Synthesis",        code = 264_1246, classification = ItemClassification.filler,                       ),
-    #"Shiny Crystal":                    KH1ItemData("Synthesis",        code = 264_1247, classification = ItemClassification.filler,                       ),
-    #"Bright Shard":                     KH1ItemData("Synthesis",        code = 264_1248, classification = ItemClassification.filler,                       ),
-    #"Bright Gem":                       KH1ItemData("Synthesis",        code = 264_1249, classification = ItemClassification.filler,                       ),
-    #"Bright Crystal":                   KH1ItemData("Synthesis",        code = 264_1250, classification = ItemClassification.filler,                       ),
-    #"Mystery Goo":                      KH1ItemData("Synthesis",        code = 264_1251, classification = ItemClassification.filler,                       ),
-    #"Gale":                             KH1ItemData("Synthesis",        code = 264_1252, classification = ItemClassification.filler,                       ),
-    #"Mythril Shard":                    KH1ItemData("Synthesis",        code = 264_1253, classification = ItemClassification.filler,                       ),
-    #"Mythril":                          KH1ItemData("Synthesis",        code = 264_1254, classification = ItemClassification.filler,                       ),
-    #"Orichalcum":                       KH1ItemData("Synthesis",        code = 264_1255, classification = ItemClassification.filler,                       ),
-    "High Jump":                         KH1ItemData("Shared Abilities", code = 264_2001, classification = ItemClassification.progression,                  ),
-    "Mermaid Kick":                      KH1ItemData("Shared Abilities", code = 264_2002, classification = ItemClassification.progression,                  ),
-    "Progressive Glide":                 KH1ItemData("Shared Abilities", code = 264_2003, classification = ItemClassification.progression, max_quantity = 2 ),
-    #"Superglide":                       KH1ItemData("Shared Abilities", code = 264_2004, classification = ItemClassification.progression,                  ),
-    "Puppy 01":                          KH1ItemData("Puppies",          code = 264_2101, classification = ItemClassification.progression,                  ),
-    "Puppy 02":                          KH1ItemData("Puppies",          code = 264_2102, classification = ItemClassification.progression,                  ),
-    "Puppy 03":                          KH1ItemData("Puppies",          code = 264_2103, classification = ItemClassification.progression,                  ),
-    "Puppy 04":                          KH1ItemData("Puppies",          code = 264_2104, classification = ItemClassification.progression,                  ),
-    "Puppy 05":                          KH1ItemData("Puppies",          code = 264_2105, classification = ItemClassification.progression,                  ),
-    "Puppy 06":                          KH1ItemData("Puppies",          code = 264_2106, classification = ItemClassification.progression,                  ),
-    "Puppy 07":                          KH1ItemData("Puppies",          code = 264_2107, classification = ItemClassification.progression,                  ),
-    "Puppy 08":                          KH1ItemData("Puppies",          code = 264_2108, classification = ItemClassification.progression,                  ),
-    "Puppy 09":                          KH1ItemData("Puppies",          code = 264_2109, classification = ItemClassification.progression,                  ),
-    "Puppy 10":                          KH1ItemData("Puppies",          code = 264_2110, classification = ItemClassification.progression,                  ),
-    "Puppy 11":                          KH1ItemData("Puppies",          code = 264_2111, classification = ItemClassification.progression,                  ),
-    "Puppy 12":                          KH1ItemData("Puppies",          code = 264_2112, classification = ItemClassification.progression,                  ),
-    "Puppy 13":                          KH1ItemData("Puppies",          code = 264_2113, classification = ItemClassification.progression,                  ),
-    "Puppy 14":                          KH1ItemData("Puppies",          code = 264_2114, classification = ItemClassification.progression,                  ),
-    "Puppy 15":                          KH1ItemData("Puppies",          code = 264_2115, classification = ItemClassification.progression,                  ),
-    "Puppy 16":                          KH1ItemData("Puppies",          code = 264_2116, classification = ItemClassification.progression,                  ),
-    "Puppy 17":                          KH1ItemData("Puppies",          code = 264_2117, classification = ItemClassification.progression,                  ),
-    "Puppy 18":                          KH1ItemData("Puppies",          code = 264_2118, classification = ItemClassification.progression,                  ),
-    "Puppy 19":                          KH1ItemData("Puppies",          code = 264_2119, classification = ItemClassification.progression,                  ),
-    "Puppy 20":                          KH1ItemData("Puppies",          code = 264_2120, classification = ItemClassification.progression,                  ),
-    "Puppy 21":                          KH1ItemData("Puppies",          code = 264_2121, classification = ItemClassification.progression,                  ),
-    "Puppy 22":                          KH1ItemData("Puppies",          code = 264_2122, classification = ItemClassification.progression,                  ),
-    "Puppy 23":                          KH1ItemData("Puppies",          code = 264_2123, classification = ItemClassification.progression,                  ),
-    "Puppy 24":                          KH1ItemData("Puppies",          code = 264_2124, classification = ItemClassification.progression,                  ),
-    "Puppy 25":                          KH1ItemData("Puppies",          code = 264_2125, classification = ItemClassification.progression,                  ),
-    "Puppy 26":                          KH1ItemData("Puppies",          code = 264_2126, classification = ItemClassification.progression,                  ),
-    "Puppy 27":                          KH1ItemData("Puppies",          code = 264_2127, classification = ItemClassification.progression,                  ),
-    "Puppy 28":                          KH1ItemData("Puppies",          code = 264_2128, classification = ItemClassification.progression,                  ),
-    "Puppy 29":                          KH1ItemData("Puppies",          code = 264_2129, classification = ItemClassification.progression,                  ),
-    "Puppy 30":                          KH1ItemData("Puppies",          code = 264_2130, classification = ItemClassification.progression,                  ),
-    "Puppy 31":                          KH1ItemData("Puppies",          code = 264_2131, classification = ItemClassification.progression,                  ),
-    "Puppy 32":                          KH1ItemData("Puppies",          code = 264_2132, classification = ItemClassification.progression,                  ),
-    "Puppy 33":                          KH1ItemData("Puppies",          code = 264_2133, classification = ItemClassification.progression,                  ),
-    "Puppy 34":                          KH1ItemData("Puppies",          code = 264_2134, classification = ItemClassification.progression,                  ),
-    "Puppy 35":                          KH1ItemData("Puppies",          code = 264_2135, classification = ItemClassification.progression,                  ),
-    "Puppy 36":                          KH1ItemData("Puppies",          code = 264_2136, classification = ItemClassification.progression,                  ),
-    "Puppy 37":                          KH1ItemData("Puppies",          code = 264_2137, classification = ItemClassification.progression,                  ),
-    "Puppy 38":                          KH1ItemData("Puppies",          code = 264_2138, classification = ItemClassification.progression,                  ),
-    "Puppy 39":                          KH1ItemData("Puppies",          code = 264_2139, classification = ItemClassification.progression,                  ),
-    "Puppy 40":                          KH1ItemData("Puppies",          code = 264_2140, classification = ItemClassification.progression,                  ),
-    "Puppy 41":                          KH1ItemData("Puppies",          code = 264_2141, classification = ItemClassification.progression,                  ),
-    "Puppy 42":                          KH1ItemData("Puppies",          code = 264_2142, classification = ItemClassification.progression,                  ),
-    "Puppy 43":                          KH1ItemData("Puppies",          code = 264_2143, classification = ItemClassification.progression,                  ),
-    "Puppy 44":                          KH1ItemData("Puppies",          code = 264_2144, classification = ItemClassification.progression,                  ),
-    "Puppy 45":                          KH1ItemData("Puppies",          code = 264_2145, classification = ItemClassification.progression,                  ),
-    "Puppy 46":                          KH1ItemData("Puppies",          code = 264_2146, classification = ItemClassification.progression,                  ),
-    "Puppy 47":                          KH1ItemData("Puppies",          code = 264_2147, classification = ItemClassification.progression,                  ),
-    "Puppy 48":                          KH1ItemData("Puppies",          code = 264_2148, classification = ItemClassification.progression,                  ),
-    "Puppy 49":                          KH1ItemData("Puppies",          code = 264_2149, classification = ItemClassification.progression,                  ),
-    "Puppy 50":                          KH1ItemData("Puppies",          code = 264_2150, classification = ItemClassification.progression,                  ),
-    "Puppy 51":                          KH1ItemData("Puppies",          code = 264_2151, classification = ItemClassification.progression,                  ),
-    "Puppy 52":                          KH1ItemData("Puppies",          code = 264_2152, classification = ItemClassification.progression,                  ),
-    "Puppy 53":                          KH1ItemData("Puppies",          code = 264_2153, classification = ItemClassification.progression,                  ),
-    "Puppy 54":                          KH1ItemData("Puppies",          code = 264_2154, classification = ItemClassification.progression,                  ),
-    "Puppy 55":                          KH1ItemData("Puppies",          code = 264_2155, classification = ItemClassification.progression,                  ),
-    "Puppy 56":                          KH1ItemData("Puppies",          code = 264_2156, classification = ItemClassification.progression,                  ),
-    "Puppy 57":                          KH1ItemData("Puppies",          code = 264_2157, classification = ItemClassification.progression,                  ),
-    "Puppy 58":                          KH1ItemData("Puppies",          code = 264_2158, classification = ItemClassification.progression,                  ),
-    "Puppy 59":                          KH1ItemData("Puppies",          code = 264_2159, classification = ItemClassification.progression,                  ),
-    "Puppy 60":                          KH1ItemData("Puppies",          code = 264_2160, classification = ItemClassification.progression,                  ),
-    "Puppy 61":                          KH1ItemData("Puppies",          code = 264_2161, classification = ItemClassification.progression,                  ),
-    "Puppy 62":                          KH1ItemData("Puppies",          code = 264_2162, classification = ItemClassification.progression,                  ),
-    "Puppy 63":                          KH1ItemData("Puppies",          code = 264_2163, classification = ItemClassification.progression,                  ),
-    "Puppy 64":                          KH1ItemData("Puppies",          code = 264_2164, classification = ItemClassification.progression,                  ),
-    "Puppy 65":                          KH1ItemData("Puppies",          code = 264_2165, classification = ItemClassification.progression,                  ),
-    "Puppy 66":                          KH1ItemData("Puppies",          code = 264_2166, classification = ItemClassification.progression,                  ),
-    "Puppy 67":                          KH1ItemData("Puppies",          code = 264_2167, classification = ItemClassification.progression,                  ),
-    "Puppy 68":                          KH1ItemData("Puppies",          code = 264_2168, classification = ItemClassification.progression,                  ),
-    "Puppy 69":                          KH1ItemData("Puppies",          code = 264_2169, classification = ItemClassification.progression,                  ),
-    "Puppy 70":                          KH1ItemData("Puppies",          code = 264_2170, classification = ItemClassification.progression,                  ),
-    "Puppy 71":                          KH1ItemData("Puppies",          code = 264_2171, classification = ItemClassification.progression,                  ),
-    "Puppy 72":                          KH1ItemData("Puppies",          code = 264_2172, classification = ItemClassification.progression,                  ),
-    "Puppy 73":                          KH1ItemData("Puppies",          code = 264_2173, classification = ItemClassification.progression,                  ),
-    "Puppy 74":                          KH1ItemData("Puppies",          code = 264_2174, classification = ItemClassification.progression,                  ),
-    "Puppy 75":                          KH1ItemData("Puppies",          code = 264_2175, classification = ItemClassification.progression,                  ),
-    "Puppy 76":                          KH1ItemData("Puppies",          code = 264_2176, classification = ItemClassification.progression,                  ),
-    "Puppy 77":                          KH1ItemData("Puppies",          code = 264_2177, classification = ItemClassification.progression,                  ),
-    "Puppy 78":                          KH1ItemData("Puppies",          code = 264_2178, classification = ItemClassification.progression,                  ),
-    "Puppy 79":                          KH1ItemData("Puppies",          code = 264_2179, classification = ItemClassification.progression,                  ),
-    "Puppy 80":                          KH1ItemData("Puppies",          code = 264_2180, classification = ItemClassification.progression,                  ),
-    "Puppy 81":                          KH1ItemData("Puppies",          code = 264_2181, classification = ItemClassification.progression,                  ),
-    "Puppy 82":                          KH1ItemData("Puppies",          code = 264_2182, classification = ItemClassification.progression,                  ),
-    "Puppy 83":                          KH1ItemData("Puppies",          code = 264_2183, classification = ItemClassification.progression,                  ),
-    "Puppy 84":                          KH1ItemData("Puppies",          code = 264_2184, classification = ItemClassification.progression,                  ),
-    "Puppy 85":                          KH1ItemData("Puppies",          code = 264_2185, classification = ItemClassification.progression,                  ),
-    "Puppy 86":                          KH1ItemData("Puppies",          code = 264_2186, classification = ItemClassification.progression,                  ),
-    "Puppy 87":                          KH1ItemData("Puppies",          code = 264_2187, classification = ItemClassification.progression,                  ),
-    "Puppy 88":                          KH1ItemData("Puppies",          code = 264_2188, classification = ItemClassification.progression,                  ),
-    "Puppy 89":                          KH1ItemData("Puppies",          code = 264_2189, classification = ItemClassification.progression,                  ),
-    "Puppy 90":                          KH1ItemData("Puppies",          code = 264_2190, classification = ItemClassification.progression,                  ),
-    "Puppy 91":                          KH1ItemData("Puppies",          code = 264_2191, classification = ItemClassification.progression,                  ),
-    "Puppy 92":                          KH1ItemData("Puppies",          code = 264_2192, classification = ItemClassification.progression,                  ),
-    "Puppy 93":                          KH1ItemData("Puppies",          code = 264_2193, classification = ItemClassification.progression,                  ),
-    "Puppy 94":                          KH1ItemData("Puppies",          code = 264_2194, classification = ItemClassification.progression,                  ),
-    "Puppy 95":                          KH1ItemData("Puppies",          code = 264_2195, classification = ItemClassification.progression,                  ),
-    "Puppy 96":                          KH1ItemData("Puppies",          code = 264_2196, classification = ItemClassification.progression,                  ),
-    "Puppy 97":                          KH1ItemData("Puppies",          code = 264_2197, classification = ItemClassification.progression,                  ),
-    "Puppy 98":                          KH1ItemData("Puppies",          code = 264_2198, classification = ItemClassification.progression,                  ),
-    "Puppy 99":                          KH1ItemData("Puppies",          code = 264_2199, classification = ItemClassification.progression,                  ),
-    "Puppies 01-03":                     KH1ItemData("Puppies",          code = 264_2201, classification = ItemClassification.progression,                  ),
-    "Puppies 04-06":                     KH1ItemData("Puppies",          code = 264_2202, classification = ItemClassification.progression,                  ),
-    "Puppies 07-09":                     KH1ItemData("Puppies",          code = 264_2203, classification = ItemClassification.progression,                  ),
-    "Puppies 10-12":                     KH1ItemData("Puppies",          code = 264_2204, classification = ItemClassification.progression,                  ),
-    "Puppies 13-15":                     KH1ItemData("Puppies",          code = 264_2205, classification = ItemClassification.progression,                  ),
-    "Puppies 16-18":                     KH1ItemData("Puppies",          code = 264_2206, classification = ItemClassification.progression,                  ),
-    "Puppies 19-21":                     KH1ItemData("Puppies",          code = 264_2207, classification = ItemClassification.progression,                  ),
-    "Puppies 22-24":                     KH1ItemData("Puppies",          code = 264_2208, classification = ItemClassification.progression,                  ),
-    "Puppies 25-27":                     KH1ItemData("Puppies",          code = 264_2209, classification = ItemClassification.progression,                  ),
-    "Puppies 28-30":                     KH1ItemData("Puppies",          code = 264_2210, classification = ItemClassification.progression,                  ),
-    "Puppies 31-33":                     KH1ItemData("Puppies",          code = 264_2211, classification = ItemClassification.progression,                  ),
-    "Puppies 34-36":                     KH1ItemData("Puppies",          code = 264_2212, classification = ItemClassification.progression,                  ),
-    "Puppies 37-39":                     KH1ItemData("Puppies",          code = 264_2213, classification = ItemClassification.progression,                  ),
-    "Puppies 40-42":                     KH1ItemData("Puppies",          code = 264_2214, classification = ItemClassification.progression,                  ),
-    "Puppies 43-45":                     KH1ItemData("Puppies",          code = 264_2215, classification = ItemClassification.progression,                  ),
-    "Puppies 46-48":                     KH1ItemData("Puppies",          code = 264_2216, classification = ItemClassification.progression,                  ),
-    "Puppies 49-51":                     KH1ItemData("Puppies",          code = 264_2217, classification = ItemClassification.progression,                  ),
-    "Puppies 52-54":                     KH1ItemData("Puppies",          code = 264_2218, classification = ItemClassification.progression,                  ),
-    "Puppies 55-57":                     KH1ItemData("Puppies",          code = 264_2219, classification = ItemClassification.progression,                  ),
-    "Puppies 58-60":                     KH1ItemData("Puppies",          code = 264_2220, classification = ItemClassification.progression,                  ),
-    "Puppies 61-63":                     KH1ItemData("Puppies",          code = 264_2221, classification = ItemClassification.progression,                  ),
-    "Puppies 64-66":                     KH1ItemData("Puppies",          code = 264_2222, classification = ItemClassification.progression,                  ),
-    "Puppies 67-69":                     KH1ItemData("Puppies",          code = 264_2223, classification = ItemClassification.progression,                  ),
-    "Puppies 70-72":                     KH1ItemData("Puppies",          code = 264_2224, classification = ItemClassification.progression,                  ),
-    "Puppies 73-75":                     KH1ItemData("Puppies",          code = 264_2225, classification = ItemClassification.progression,                  ),
-    "Puppies 76-78":                     KH1ItemData("Puppies",          code = 264_2226, classification = ItemClassification.progression,                  ),
-    "Puppies 79-81":                     KH1ItemData("Puppies",          code = 264_2227, classification = ItemClassification.progression,                  ),
-    "Puppies 82-84":                     KH1ItemData("Puppies",          code = 264_2228, classification = ItemClassification.progression,                  ),
-    "Puppies 85-87":                     KH1ItemData("Puppies",          code = 264_2229, classification = ItemClassification.progression,                  ),
-    "Puppies 88-90":                     KH1ItemData("Puppies",          code = 264_2230, classification = ItemClassification.progression,                  ),
-    "Puppies 91-93":                     KH1ItemData("Puppies",          code = 264_2231, classification = ItemClassification.progression,                  ),
-    "Puppies 94-96":                     KH1ItemData("Puppies",          code = 264_2232, classification = ItemClassification.progression,                  ),
-    "Puppies 97-99":                     KH1ItemData("Puppies",          code = 264_2233, classification = ItemClassification.progression,                  ),
-    "All Puppies":                       KH1ItemData("Puppies",          code = 264_2240, classification = ItemClassification.progression,                  ),
-    "Treasure Magnet":                   KH1ItemData("Abilities",        code = 264_3005, classification = ItemClassification.useful,      max_quantity = 2 ),
-    "Combo Plus":                        KH1ItemData("Abilities",        code = 264_3006, classification = ItemClassification.useful,      max_quantity = 4 ),
-    "Air Combo Plus":                    KH1ItemData("Abilities",        code = 264_3007, classification = ItemClassification.useful,      max_quantity = 2 ),
-    "Critical Plus":                     KH1ItemData("Abilities",        code = 264_3008, classification = ItemClassification.useful,      max_quantity = 3 ),
-    #"Second Wind":                      KH1ItemData("Abilities",        code = 264_3009, classification = ItemClassification.useful,                       ),
-    "Scan":                              KH1ItemData("Abilities",        code = 264_3010, classification = ItemClassification.useful,                       ),
-    "Sonic Blade":                       KH1ItemData("Abilities",        code = 264_3011, classification = ItemClassification.useful,                       ),
-    "Ars Arcanum":                       KH1ItemData("Abilities",        code = 264_3012, classification = ItemClassification.useful,                       ),
-    "Strike Raid":                       KH1ItemData("Abilities",        code = 264_3013, classification = ItemClassification.useful,                       ),
-    "Ragnarok":                          KH1ItemData("Abilities",        code = 264_3014, classification = ItemClassification.useful,                       ),
-    "Trinity Limit":                     KH1ItemData("Abilities",        code = 264_3015, classification = ItemClassification.useful,                       ),
-    "Cheer":                             KH1ItemData("Abilities",        code = 264_3016, classification = ItemClassification.useful,                       ),
-    "Vortex":                            KH1ItemData("Abilities",        code = 264_3017, classification = ItemClassification.useful,                       ),
-    "Aerial Sweep":                      KH1ItemData("Abilities",        code = 264_3018, classification = ItemClassification.useful,                       ),
-    "Counterattack":                     KH1ItemData("Abilities",        code = 264_3019, classification = ItemClassification.useful,                       ),
-    "Blitz":                             KH1ItemData("Abilities",        code = 264_3020, classification = ItemClassification.useful,                       ),
-    "Guard":                             KH1ItemData("Abilities",        code = 264_3021, classification = ItemClassification.progression,                  ),
-    "Dodge Roll":                        KH1ItemData("Abilities",        code = 264_3022, classification = ItemClassification.progression,                  ),
-    "MP Haste":                          KH1ItemData("Abilities",        code = 264_3023, classification = ItemClassification.useful,                       ),
-    "MP Rage":                           KH1ItemData("Abilities",        code = 264_3024, classification = ItemClassification.progression,                  ),
-    "Second Chance":                     KH1ItemData("Abilities",        code = 264_3025, classification = ItemClassification.progression,                  ),
-    "Berserk":                           KH1ItemData("Abilities",        code = 264_3026, classification = ItemClassification.useful,                       ),
-    "Jackpot":                           KH1ItemData("Abilities",        code = 264_3027, classification = ItemClassification.useful,                       ),
-    "Lucky Strike":                      KH1ItemData("Abilities",        code = 264_3028, classification = ItemClassification.useful,                       ),
-    #"Charge":                           KH1ItemData("Abilities",        code = 264_3029, classification = ItemClassification.useful,                       ),
-    #"Rocket":                           KH1ItemData("Abilities",        code = 264_3030, classification = ItemClassification.useful,                       ),
-    #"Tornado":                          KH1ItemData("Abilities",        code = 264_3031, classification = ItemClassification.useful,                       ),
-    #"MP Gift":                          KH1ItemData("Abilities",        code = 264_3032, classification = ItemClassification.useful,                       ),
-    #"Raging Boar":                      KH1ItemData("Abilities",        code = 264_3033, classification = ItemClassification.useful,                       ),
-    #"Asp's Bite":                       KH1ItemData("Abilities",        code = 264_3034, classification = ItemClassification.useful,                       ),
-    #"Healing Herb":                     KH1ItemData("Abilities",        code = 264_3035, classification = ItemClassification.useful,                       ),
-    #"Wind Armor":                       KH1ItemData("Abilities",        code = 264_3036, classification = ItemClassification.useful,                       ),
-    #"Crescent":                         KH1ItemData("Abilities",        code = 264_3037, classification = ItemClassification.useful,                       ),
-    #"Sandstorm":                        KH1ItemData("Abilities",        code = 264_3038, classification = ItemClassification.useful,                       ),
-    #"Applause!":                        KH1ItemData("Abilities",        code = 264_3039, classification = ItemClassification.useful,                       ),
-    #"Blazing Fury":                     KH1ItemData("Abilities",        code = 264_3040, classification = ItemClassification.useful,                       ),
-    #"Icy Terror":                       KH1ItemData("Abilities",        code = 264_3041, classification = ItemClassification.useful,                       ),
-    #"Bolts of Sorrow":                  KH1ItemData("Abilities",        code = 264_3042, classification = ItemClassification.useful,                       ),
-    #"Ghostly Scream":                   KH1ItemData("Abilities",        code = 264_3043, classification = ItemClassification.useful,                       ),
-    #"Humming Bird":                     KH1ItemData("Abilities",        code = 264_3044, classification = ItemClassification.useful,                       ),
-    #"Time-Out":                         KH1ItemData("Abilities",        code = 264_3045, classification = ItemClassification.useful,                       ),
-    #"Storm's Eye":                      KH1ItemData("Abilities",        code = 264_3046, classification = ItemClassification.useful,                       ),
-    #"Ferocious Lunge":                  KH1ItemData("Abilities",        code = 264_3047, classification = ItemClassification.useful,                       ),
-    #"Furious Bellow":                   KH1ItemData("Abilities",        code = 264_3048, classification = ItemClassification.useful,                       ),
-    #"Spiral Wave":                      KH1ItemData("Abilities",        code = 264_3049, classification = ItemClassification.useful,                       ),
-    #"Thunder Potion":                   KH1ItemData("Abilities",        code = 264_3050, classification = ItemClassification.useful,                       ),
-    #"Cure Potion":                      KH1ItemData("Abilities",        code = 264_3051, classification = ItemClassification.useful,                       ),
-    #"Aero Potion":                      KH1ItemData("Abilities",        code = 264_3052, classification = ItemClassification.useful,                       ),
-    "Slapshot":                          KH1ItemData("Abilities",        code = 264_3053, classification = ItemClassification.useful,                       ),
-    "Sliding Dash":                      KH1ItemData("Abilities",        code = 264_3054, classification = ItemClassification.useful,                       ),
-    "Hurricane Blast":                   KH1ItemData("Abilities",        code = 264_3055, classification = ItemClassification.useful,                       ),
-    "Ripple Drive":                      KH1ItemData("Abilities",        code = 264_3056, classification = ItemClassification.useful,                       ),
-    "Stun Impact":                       KH1ItemData("Abilities",        code = 264_3057, classification = ItemClassification.useful,                       ),
-    "Gravity Break":                     KH1ItemData("Abilities",        code = 264_3058, classification = ItemClassification.useful,                       ),
-    "Zantetsuken":                       KH1ItemData("Abilities",        code = 264_3059, classification = ItemClassification.useful,                       ),
-    "Tech Boost":                        KH1ItemData("Abilities",        code = 264_3060, classification = ItemClassification.useful,      max_quantity = 4 ),
-    "Encounter Plus":                    KH1ItemData("Abilities",        code = 264_3061, classification = ItemClassification.useful,                       ),
-    "Leaf Bracer":                       KH1ItemData("Abilities",        code = 264_3062, classification = ItemClassification.progression,                  ),
-    #"Evolution":                        KH1ItemData("Abilities",        code = 264_3063, classification = ItemClassification.useful,                       ),
-    "EXP Zero":                          KH1ItemData("Abilities",        code = 264_3064, classification = ItemClassification.useful,                       ),
-    "Combo Master":                      KH1ItemData("Abilities",        code = 264_3065, classification = ItemClassification.progression,                  ),
-    "Max HP Increase":                   KH1ItemData("Level Up",         code = 264_4001, classification = ItemClassification.useful,      max_quantity = 15),
-    "Max MP Increase":                   KH1ItemData("Level Up",         code = 264_4002, classification = ItemClassification.useful,      max_quantity = 15),
-    "Max AP Increase":                   KH1ItemData("Level Up",         code = 264_4003, classification = ItemClassification.useful,      max_quantity = 15),
-    "Strength Increase":                 KH1ItemData("Level Up",         code = 264_4004, classification = ItemClassification.useful,      max_quantity = 15),
-    "Defense Increase":                  KH1ItemData("Level Up",         code = 264_4005, classification = ItemClassification.useful,      max_quantity = 15),
-    "Accessory Slot Increase":           KH1ItemData("Limited Level Up", code = 264_4006, classification = ItemClassification.useful,      max_quantity = 15),
-    "Item Slot Increase":                KH1ItemData("Limited Level Up", code = 264_4007, classification = ItemClassification.useful,      max_quantity = 15),
-    "Dumbo":                             KH1ItemData("Summons",          code = 264_5000, classification = ItemClassification.progression,                  ),
-    "Bambi":                             KH1ItemData("Summons",          code = 264_5001, classification = ItemClassification.progression,                  ),
-    "Genie":                             KH1ItemData("Summons",          code = 264_5002, classification = ItemClassification.progression,                  ),
-    "Tinker Bell":                       KH1ItemData("Summons",          code = 264_5003, classification = ItemClassification.progression,                  ),
-    "Mushu":                             KH1ItemData("Summons",          code = 264_5004, classification = ItemClassification.progression,                  ),
-    "Simba":                             KH1ItemData("Summons",          code = 264_5005, classification = ItemClassification.progression,                  ),
-    "Progressive Fire":                  KH1ItemData("Magic",            code = 264_6001, classification = ItemClassification.progression, max_quantity = 3 ),
-    "Progressive Blizzard":              KH1ItemData("Magic",            code = 264_6002, classification = ItemClassification.progression, max_quantity = 3 ),
-    "Progressive Thunder":               KH1ItemData("Magic",            code = 264_6003, classification = ItemClassification.progression, max_quantity = 3 ),
-    "Progressive Cure":                  KH1ItemData("Magic",            code = 264_6004, classification = ItemClassification.progression, max_quantity = 3 ),
-    "Progressive Gravity":               KH1ItemData("Magic",            code = 264_6005, classification = ItemClassification.progression, max_quantity = 3 ),
-    "Progressive Stop":                  KH1ItemData("Magic",            code = 264_6006, classification = ItemClassification.progression, max_quantity = 3 ),
-    "Progressive Aero":                  KH1ItemData("Magic",            code = 264_6007, classification = ItemClassification.progression, max_quantity = 3 ),
-    #"Traverse Town":                    KH1ItemData("Worlds",           code = 264_7001, classification = ItemClassification.progression,                  ),
-    "Wonderland":                        KH1ItemData("Worlds",           code = 264_7002, classification = ItemClassification.progression,                  ),
-    "Olympus Coliseum":                  KH1ItemData("Worlds",           code = 264_7003, classification = ItemClassification.progression,                  ),
-    "Deep Jungle":                       KH1ItemData("Worlds",           code = 264_7004, classification = ItemClassification.progression,                  ),
-    "Agrabah":                           KH1ItemData("Worlds",           code = 264_7005, classification = ItemClassification.progression,                  ),
-    "Halloween Town":                    KH1ItemData("Worlds",           code = 264_7006, classification = ItemClassification.progression,                  ),
-    "Atlantica":                         KH1ItemData("Worlds",           code = 264_7007, classification = ItemClassification.progression,                  ),
-    "Neverland":                         KH1ItemData("Worlds",           code = 264_7008, classification = ItemClassification.progression,                  ),
-    "Hollow Bastion":                    KH1ItemData("Worlds",           code = 264_7009, classification = ItemClassification.progression,                  ),
-    "End of the World":                  KH1ItemData("Worlds",           code = 264_7010, classification = ItemClassification.progression,                  ),
-    "Monstro":                           KH1ItemData("Worlds",           code = 264_7011, classification = ItemClassification.progression,                  ),
-    "Blue Trinity":                      KH1ItemData("Trinities",        code = 264_8001, classification = ItemClassification.progression,                  ),
-    "Red Trinity":                       KH1ItemData("Trinities",        code = 264_8002, classification = ItemClassification.progression,                  ),
-    "Green Trinity":                     KH1ItemData("Trinities",        code = 264_8003, classification = ItemClassification.progression,                  ),
-    "Yellow Trinity":                    KH1ItemData("Trinities",        code = 264_8004, classification = ItemClassification.progression,                  ),
-    "White Trinity":                     KH1ItemData("Trinities",        code = 264_8005, classification = ItemClassification.progression,                  ),
-    "Phil Cup":                          KH1ItemData("Cups",             code = 264_9001, classification = ItemClassification.progression,                  ),
-    "Pegasus Cup":                       KH1ItemData("Cups",             code = 264_9002, classification = ItemClassification.progression,                  ),
-    "Hercules Cup":                      KH1ItemData("Cups",             code = 264_9003, classification = ItemClassification.progression,                  ),
-    #"Hades Cup":                        KH1ItemData("Cups",             code = 264_9004, classification = ItemClassification.progression,                  ),
+    "Potion":                            KH1ItemData("Item",             code = 264_1001, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Hi-Potion":                         KH1ItemData("Item",             code = 264_1002, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Ether":                             KH1ItemData("Item",             code = 264_1003, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Elixir":                            KH1ItemData("Item",             code = 264_1004, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"B05":                              KH1ItemData("Item",             code = 264_1005, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Mega-Potion":                       KH1ItemData("Item",             code = 264_1006, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Mega-Ether":                        KH1ItemData("Item",             code = 264_1007, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Megalixir":                         KH1ItemData("Item",             code = 264_1008, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Torn Page":                         KH1ItemData("Torn Pages",       code = 264_1009, classification = ItemClassification.progression, type = "Item",           max_quantity = 5 ),
+    "Final Door Key":                    KH1ItemData("Key",              code = 264_1010, classification = ItemClassification.progression, type = "Item",                            ),
+    "Destiny Islands":                   KH1ItemData("Worlds",           code = 264_1011, classification = ItemClassification.progression, type = "Item",                            ),
+    "Raft Materials":                    KH1ItemData("Key",              code = 264_1012, classification = ItemClassification.progression, type = "Item",           max_quantity = 2 ),
+    #"Frost Stone":                      KH1ItemData("Synthesis",        code = 264_1013, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Lightning Stone":                  KH1ItemData("Synthesis",        code = 264_1014, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Dazzling Stone":                   KH1ItemData("Synthesis",        code = 264_1015, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Stormy Stone":                     KH1ItemData("Synthesis",        code = 264_1016, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Protect Chain":                     KH1ItemData("Accessory",        code = 264_1017, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Protera Chain":                     KH1ItemData("Accessory",        code = 264_1018, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Protega Chain":                     KH1ItemData("Accessory",        code = 264_1019, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Fire Ring":                         KH1ItemData("Accessory",        code = 264_1020, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Fira Ring":                         KH1ItemData("Accessory",        code = 264_1021, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Firaga Ring":                       KH1ItemData("Accessory",        code = 264_1022, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Blizzard Ring":                     KH1ItemData("Accessory",        code = 264_1023, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Blizzara Ring":                     KH1ItemData("Accessory",        code = 264_1024, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Blizzaga Ring":                     KH1ItemData("Accessory",        code = 264_1025, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Thunder Ring":                      KH1ItemData("Accessory",        code = 264_1026, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Thundara Ring":                     KH1ItemData("Accessory",        code = 264_1027, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Thundaga Ring":                     KH1ItemData("Accessory",        code = 264_1028, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Ability Stud":                      KH1ItemData("Accessory",        code = 264_1029, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Guard Earring":                     KH1ItemData("Accessory",        code = 264_1030, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Master Earring":                    KH1ItemData("Accessory",        code = 264_1031, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Chaos Ring":                        KH1ItemData("Accessory",        code = 264_1032, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Dark Ring":                         KH1ItemData("Accessory",        code = 264_1033, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Element Ring":                      KH1ItemData("Accessory",        code = 264_1034, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Three Stars":                       KH1ItemData("Accessory",        code = 264_1035, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Power Chain":                       KH1ItemData("Accessory",        code = 264_1036, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Golem Chain":                       KH1ItemData("Accessory",        code = 264_1037, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Titan Chain":                       KH1ItemData("Accessory",        code = 264_1038, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Energy Bangle":                     KH1ItemData("Accessory",        code = 264_1039, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Angel Bangle":                      KH1ItemData("Accessory",        code = 264_1040, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Gaia Bangle":                       KH1ItemData("Accessory",        code = 264_1041, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Magic Armlet":                      KH1ItemData("Accessory",        code = 264_1042, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Rune Armlet":                       KH1ItemData("Accessory",        code = 264_1043, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Atlas Armlet":                      KH1ItemData("Accessory",        code = 264_1044, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Heartguard":                        KH1ItemData("Accessory",        code = 264_1045, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Ribbon":                            KH1ItemData("Accessory",        code = 264_1046, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Crystal Crown":                     KH1ItemData("Accessory",        code = 264_1047, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Brave Warrior":                     KH1ItemData("Accessory",        code = 264_1048, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Ifrit's Horn":                      KH1ItemData("Accessory",        code = 264_1049, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Inferno Band":                      KH1ItemData("Accessory",        code = 264_1050, classification = ItemClassification.useful,      type = "Item",                            ),
+    "White Fang":                        KH1ItemData("Accessory",        code = 264_1051, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Ray of Light":                      KH1ItemData("Accessory",        code = 264_1052, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Holy Circlet":                      KH1ItemData("Accessory",        code = 264_1053, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Raven's Claw":                      KH1ItemData("Accessory",        code = 264_1054, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Omega Arts":                        KH1ItemData("Accessory",        code = 264_1055, classification = ItemClassification.useful,      type = "Item",                            ),
+    "EXP Earring":                       KH1ItemData("Accessory",        code = 264_1056, classification = ItemClassification.useful,      type = "Item",                            ),
+    #"A41":                              KH1ItemData("Accessory",        code = 264_1057, classification = ItemClassification.useful,      type = "Item",                            ),
+    "EXP Ring":                          KH1ItemData("Accessory",        code = 264_1058, classification = ItemClassification.useful,      type = "Item",                            ),
+    "EXP Bracelet":                      KH1ItemData("Accessory",        code = 264_1059, classification = ItemClassification.useful,      type = "Item",                            ),
+    "EXP Necklace":                      KH1ItemData("Accessory",        code = 264_1060, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Firagun Band":                      KH1ItemData("Accessory",        code = 264_1061, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Blizzagun Band":                    KH1ItemData("Accessory",        code = 264_1062, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Thundagun Band":                    KH1ItemData("Accessory",        code = 264_1063, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Ifrit Belt":                        KH1ItemData("Accessory",        code = 264_1064, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Shiva Belt":                        KH1ItemData("Accessory",        code = 264_1065, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Ramuh Belt":                        KH1ItemData("Accessory",        code = 264_1066, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Moogle Badge":                      KH1ItemData("Accessory",        code = 264_1067, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Cosmic Arts":                       KH1ItemData("Accessory",        code = 264_1068, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Royal Crown":                       KH1ItemData("Accessory",        code = 264_1069, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Prime Cap":                         KH1ItemData("Accessory",        code = 264_1070, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Obsidian Ring":                     KH1ItemData("Accessory",        code = 264_1071, classification = ItemClassification.useful,      type = "Item",                            ),
+    #"A56":                              KH1ItemData("Accessory",        code = 264_1072, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"A57":                              KH1ItemData("Accessory",        code = 264_1073, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"A58":                              KH1ItemData("Accessory",        code = 264_1074, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"A59":                              KH1ItemData("Accessory",        code = 264_1075, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"A60":                              KH1ItemData("Accessory",        code = 264_1076, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"A61":                              KH1ItemData("Accessory",        code = 264_1077, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"A62":                              KH1ItemData("Accessory",        code = 264_1078, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"A63":                              KH1ItemData("Accessory",        code = 264_1079, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"A64":                              KH1ItemData("Accessory",        code = 264_1080, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Kingdom Key":                      KH1ItemData("Keyblades",        code = 264_1081, classification = ItemClassification.useful,      type = "Item",                            ),
+    #"Dream Sword":                      KH1ItemData("Keyblades",        code = 264_1082, classification = ItemClassification.useful,      type = "Item",                            ),
+    #"Dream Shield":                     KH1ItemData("Keyblades",        code = 264_1083, classification = ItemClassification.useful,      type = "Item",                            ),
+    #"Dream Rod":                        KH1ItemData("Keyblades",        code = 264_1084, classification = ItemClassification.useful,      type = "Item",                            ),
+    #"Wooden Sword":                     KH1ItemData("Keyblades",        code = 264_1085, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Jungle King":                       KH1ItemData("Keyblades",        code = 264_1086, classification = ItemClassification.progression, type = "Item",                            ),
+    "Three Wishes":                      KH1ItemData("Keyblades",        code = 264_1087, classification = ItemClassification.progression, type = "Item",                            ),
+    "Fairy Harp":                        KH1ItemData("Keyblades",        code = 264_1088, classification = ItemClassification.progression, type = "Item",                            ),
+    "Pumpkinhead":                       KH1ItemData("Keyblades",        code = 264_1089, classification = ItemClassification.progression, type = "Item",                            ),
+    "Crabclaw":                          KH1ItemData("Keyblades",        code = 264_1090, classification = ItemClassification.progression, type = "Item",                            ),
+    "Divine Rose":                       KH1ItemData("Keyblades",        code = 264_1091, classification = ItemClassification.progression, type = "Item",                            ),
+    "Spellbinder":                       KH1ItemData("Keyblades",        code = 264_1092, classification = ItemClassification.progression, type = "Item",                            ),
+    "Olympia":                           KH1ItemData("Keyblades",        code = 264_1093, classification = ItemClassification.progression, type = "Item",                            ),
+    "Lionheart":                         KH1ItemData("Keyblades",        code = 264_1094, classification = ItemClassification.progression, type = "Item",                            ),
+    "Metal Chocobo":                     KH1ItemData("Keyblades",        code = 264_1095, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Oathkeeper":                        KH1ItemData("Keyblades",        code = 264_1096, classification = ItemClassification.progression, type = "Item",                            ),
+    "Oblivion":                          KH1ItemData("Keyblades",        code = 264_1097, classification = ItemClassification.progression, type = "Item",                            ),
+    "Lady Luck":                         KH1ItemData("Keyblades",        code = 264_1098, classification = ItemClassification.progression, type = "Item",                            ),
+    "Wishing Star":                      KH1ItemData("Keyblades",        code = 264_1099, classification = ItemClassification.progression, type = "Item",                            ),
+    "Ultima Weapon":                     KH1ItemData("Keyblades",        code = 264_1100, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Diamond Dust":                      KH1ItemData("Keyblades",        code = 264_1101, classification = ItemClassification.useful,      type = "Item",                            ),
+    "One-Winged Angel":                  KH1ItemData("Keyblades",        code = 264_1102, classification = ItemClassification.useful,      type = "Item",                            ),
+    #"Mage's Staff":                     KH1ItemData("Weapons",          code = 264_1103, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Morning Star":                      KH1ItemData("Weapons",          code = 264_1104, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Shooting Star":                     KH1ItemData("Weapons",          code = 264_1105, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Magus Staff":                       KH1ItemData("Weapons",          code = 264_1106, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Wisdom Staff":                      KH1ItemData("Weapons",          code = 264_1107, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Warhammer":                         KH1ItemData("Weapons",          code = 264_1108, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Silver Mallet":                     KH1ItemData("Weapons",          code = 264_1109, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Grand Mallet":                      KH1ItemData("Weapons",          code = 264_1110, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Lord Fortune":                      KH1ItemData("Weapons",          code = 264_1111, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Violetta":                          KH1ItemData("Weapons",          code = 264_1112, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Dream Rod (Donald)":                KH1ItemData("Weapons",          code = 264_1113, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Save the Queen":                    KH1ItemData("Weapons",          code = 264_1114, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Wizard's Relic":                    KH1ItemData("Weapons",          code = 264_1115, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Meteor Strike":                     KH1ItemData("Weapons",          code = 264_1116, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Fantasista":                        KH1ItemData("Weapons",          code = 264_1117, classification = ItemClassification.useful,      type = "Item",                            ),
+    #"Unused (Donald)":                  KH1ItemData("Weapons",          code = 264_1118, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Knight's Shield":                  KH1ItemData("Weapons",          code = 264_1119, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Mythril Shield":                    KH1ItemData("Weapons",          code = 264_1120, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Onyx Shield":                       KH1ItemData("Weapons",          code = 264_1121, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Stout Shield":                      KH1ItemData("Weapons",          code = 264_1122, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Golem Shield":                      KH1ItemData("Weapons",          code = 264_1123, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Adamant Shield":                    KH1ItemData("Weapons",          code = 264_1124, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Smasher":                           KH1ItemData("Weapons",          code = 264_1125, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Gigas Fist":                        KH1ItemData("Weapons",          code = 264_1126, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Genji Shield":                      KH1ItemData("Weapons",          code = 264_1127, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Herc's Shield":                     KH1ItemData("Weapons",          code = 264_1128, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Dream Shield (Goofy)":              KH1ItemData("Weapons",          code = 264_1129, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Save the King":                     KH1ItemData("Weapons",          code = 264_1130, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Defender":                          KH1ItemData("Weapons",          code = 264_1131, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Mighty Shield":                     KH1ItemData("Weapons",          code = 264_1132, classification = ItemClassification.useful,      type = "Item",                            ),
+    "Seven Elements":                    KH1ItemData("Weapons",          code = 264_1133, classification = ItemClassification.useful,      type = "Item",                            ),
+    #"Unused (Goofy)":                   KH1ItemData("Weapons",          code = 264_1134, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Spear":                            KH1ItemData("Weapons",          code = 264_1135, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"No Weapon":                        KH1ItemData("Weapons",          code = 264_1136, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Genie":                            KH1ItemData("Weapons",          code = 264_1137, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"No Weapon":                        KH1ItemData("Weapons",          code = 264_1138, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"No Weapon":                        KH1ItemData("Weapons",          code = 264_1139, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Dagger":                           KH1ItemData("Weapons",          code = 264_1140, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Claws":                            KH1ItemData("Weapons",          code = 264_1141, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Tent":                              KH1ItemData("Camping",          code = 264_1142, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Camping Set":                       KH1ItemData("Camping",          code = 264_1143, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Cottage":                           KH1ItemData("Camping",          code = 264_1144, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"C04":                              KH1ItemData("Camping",          code = 264_1145, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"C05":                              KH1ItemData("Camping",          code = 264_1146, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"C06":                              KH1ItemData("Camping",          code = 264_1147, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"C07":                              KH1ItemData("Camping",          code = 264_1148, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Wonderland":                        KH1ItemData("Worlds",           code = 264_1149, classification = ItemClassification.progression, type = "Item",                            ),
+    "Olympus Coliseum":                  KH1ItemData("Worlds",           code = 264_1150, classification = ItemClassification.progression, type = "Item",                            ),
+    "Deep Jungle":                       KH1ItemData("Worlds",           code = 264_1151, classification = ItemClassification.progression, type = "Item",                            ),
+    "Power Up":                          KH1ItemData("Stat Ups",         code = 264_1152, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Defense Up":                        KH1ItemData("Stat Ups",         code = 264_1153, classification = ItemClassification.filler,      type = "Item",                            ),
+    "AP Up":                             KH1ItemData("Stat Ups",         code = 264_1154, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Agrabah":                           KH1ItemData("Worlds",           code = 264_1155, classification = ItemClassification.progression, type = "Item",                            ),
+    "Monstro":                           KH1ItemData("Worlds",           code = 264_1156, classification = ItemClassification.progression, type = "Item",                            ),
+    "Atlantica":                         KH1ItemData("Worlds",           code = 264_1157, classification = ItemClassification.progression, type = "Item",                            ),
+    "Fire Arts":                         KH1ItemData("Key",              code = 264_1158, classification = ItemClassification.progression, type = "Item",                            ),
+    "Blizzard Arts":                     KH1ItemData("Key",              code = 264_1159, classification = ItemClassification.progression, type = "Item",                            ),
+    "Thunder Arts":                      KH1ItemData("Key",              code = 264_1160, classification = ItemClassification.progression, type = "Item",                            ),
+    "Cure Arts":                         KH1ItemData("Key",              code = 264_1161, classification = ItemClassification.progression, type = "Item",                            ),
+    "Gravity Arts":                      KH1ItemData("Key",              code = 264_1162, classification = ItemClassification.progression, type = "Item",                            ),
+    "Stop Arts":                         KH1ItemData("Key",              code = 264_1163, classification = ItemClassification.progression, type = "Item",                            ),
+    "Aero Arts":                         KH1ItemData("Key",              code = 264_1164, classification = ItemClassification.progression, type = "Item",                            ),
+    "Neverland":                         KH1ItemData("Worlds",           code = 264_1165, classification = ItemClassification.progression, type = "Item",                            ),
+    "Halloween Town":                    KH1ItemData("Worlds",           code = 264_1166, classification = ItemClassification.progression, type = "Item",                            ),
+    "Puppy":                             KH1ItemData("Key",              code = 264_1167, classification = ItemClassification.progression, type = "Item",                            ),
+    "Hollow Bastion":                    KH1ItemData("Worlds",           code = 264_1168, classification = ItemClassification.progression, type = "Item",                            ),
+    "End of the World":                  KH1ItemData("Worlds",           code = 264_1169, classification = ItemClassification.progression, type = "Item",                            ),
+    "Blue Trinity":                      KH1ItemData("Trinities",        code = 264_1170, classification = ItemClassification.progression, type = "Item",                            ),
+    "Red Trinity":                       KH1ItemData("Trinities",        code = 264_1171, classification = ItemClassification.progression, type = "Item",                            ),
+    "Green Trinity":                     KH1ItemData("Trinities",        code = 264_1172, classification = ItemClassification.progression, type = "Item",                            ),
+    "Yellow Trinity":                    KH1ItemData("Trinities",        code = 264_1173, classification = ItemClassification.progression, type = "Item",                            ),
+    "White Trinity":                     KH1ItemData("Trinities",        code = 264_1174, classification = ItemClassification.progression, type = "Item",                            ),
+    "Progressive Fire":                  KH1ItemData("Magic",            code = 264_1175, classification = ItemClassification.progression, type = "Item",           max_quantity = 3 ),
+    "Progressive Blizzard":              KH1ItemData("Magic",            code = 264_1176, classification = ItemClassification.progression, type = "Item",           max_quantity = 3 ),
+    "Progressive Thunder":               KH1ItemData("Magic",            code = 264_1177, classification = ItemClassification.progression, type = "Item",           max_quantity = 3 ),
+    "Progressive Cure":                  KH1ItemData("Magic",            code = 264_1178, classification = ItemClassification.progression, type = "Item",           max_quantity = 3 ),
+    "Progressive Gravity":               KH1ItemData("Magic",            code = 264_1179, classification = ItemClassification.progression, type = "Item",           max_quantity = 3 ),
+    "Progressive Stop":                  KH1ItemData("Magic",            code = 264_1180, classification = ItemClassification.progression, type = "Item",           max_quantity = 3 ),
+    "Progressive Aero":                  KH1ItemData("Magic",            code = 264_1181, classification = ItemClassification.progression, type = "Item",           max_quantity = 3 ),
+    "Phil Cup":                          KH1ItemData("Cups",             code = 264_1182, classification = ItemClassification.progression, type = "Item",                            ),
+    "Theon Vol. 6":                      KH1ItemData("Key",              code = 264_1183, classification = ItemClassification.progression, type = "Item",                            ),
+    "Pegasus Cup":                       KH1ItemData("Cups",             code = 264_1184, classification = ItemClassification.progression, type = "Item",                            ),
+    "Hercules Cup":                      KH1ItemData("Cups",             code = 264_1185, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Empty Bottle":                     KH1ItemData("Key",              code = 264_1186, classification = ItemClassification.progression, type = "Item",           max_quantity = 6 ),
+    #"Old Book":                         KH1ItemData("Key",              code = 264_1187, classification = ItemClassification.progression, type = "Item",                            ),
+    "Emblem Piece (Flame)":              KH1ItemData("Key",              code = 264_1188, classification = ItemClassification.progression, type = "Item",                            ),
+    "Emblem Piece (Chest)":              KH1ItemData("Key",              code = 264_1189, classification = ItemClassification.progression, type = "Item",                            ),
+    "Emblem Piece (Statue)":             KH1ItemData("Key",              code = 264_1190, classification = ItemClassification.progression, type = "Item",                            ),
+    "Emblem Piece (Fountain)":           KH1ItemData("Key",              code = 264_1191, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Log":                              KH1ItemData("DI",               code = 264_1192, classification = ItemClassification.progression, type = "Item",           max_quantity = 2 ),
+    #"Cloth":                            KH1ItemData("DI",               code = 264_1193, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Rope":                             KH1ItemData("DI",               code = 264_1194, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Seagull Egg":                      KH1ItemData("DI",               code = 264_1195, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Fish":                             KH1ItemData("DI",               code = 264_1196, classification = ItemClassification.progression, type = "Item",           max_quantity = 3 ),
+    #"Mushroom":                         KH1ItemData("DI",               code = 264_1197, classification = ItemClassification.progression, type = "Item",           max_quantity = 3 ),
+    #"Coconut":                          KH1ItemData("DI",               code = 264_1198, classification = ItemClassification.progression, type = "Item",           max_quantity = 2 ),
+    #"Drinking Water":                   KH1ItemData("DI",               code = 264_1199, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Navi-G Piece 1":                   KH1ItemData("Key",              code = 264_1200, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Navi-G Piece 2":                   KH1ItemData("Key",              code = 264_1201, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Navi-Gummi Unused":                KH1ItemData("Key",              code = 264_1202, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Navi-G Piece 3":                   KH1ItemData("Key",              code = 264_1203, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Navi-G Piece 4":                   KH1ItemData("Key",              code = 264_1204, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Navi-Gummi":                       KH1ItemData("Key",              code = 264_1205, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Watergleam":                       KH1ItemData("Key",              code = 264_1206, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Naturespark":                      KH1ItemData("Key",              code = 264_1207, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Fireglow":                         KH1ItemData("Key",              code = 264_1208, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Earthshine":                       KH1ItemData("Key",              code = 264_1209, classification = ItemClassification.progression, type = "Item",                            ),
+    "Crystal Trident":                   KH1ItemData("Key",              code = 264_1210, classification = ItemClassification.progression, type = "Item",                            ),
+    "Postcard":                          KH1ItemData("Key",              code = 264_1211, classification = ItemClassification.progression, type = "Item",           max_quantity = 10),
+   #"Torn Page 1":                       KH1ItemData("Torn Pages",       code = 264_1212, classification = ItemClassification.progression, type = "Item",                            ),
+   #"Torn Page 2":                       KH1ItemData("Torn Pages",       code = 264_1213, classification = ItemClassification.progression, type = "Item",                            ),
+   #"Torn Page 3":                       KH1ItemData("Torn Pages",       code = 264_1214, classification = ItemClassification.progression, type = "Item",                            ),
+   #"Torn Page 4":                       KH1ItemData("Torn Pages",       code = 264_1215, classification = ItemClassification.progression, type = "Item",                            ),
+   #"Torn Page 5":                       KH1ItemData("Torn Pages",       code = 264_1216, classification = ItemClassification.progression, type = "Item",                            ),
+    "Slides":                            KH1ItemData("Key",              code = 264_1217, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Slide 2":                          KH1ItemData("Key",              code = 264_1218, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Slide 3":                          KH1ItemData("Key",              code = 264_1219, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Slide 4":                          KH1ItemData("Key",              code = 264_1220, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Slide 5":                          KH1ItemData("Key",              code = 264_1221, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Slide 6":                          KH1ItemData("Key",              code = 264_1222, classification = ItemClassification.progression, type = "Item",                            ),
+    "Footprints":                        KH1ItemData("Key",              code = 264_1223, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Claw Marks":                       KH1ItemData("Key",              code = 264_1224, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Stench":                           KH1ItemData("Key",              code = 264_1225, classification = ItemClassification.progression, type = "Item",                            ),
+    #"Antenna":                          KH1ItemData("Key",              code = 264_1226, classification = ItemClassification.progression, type = "Item",                            ),
+    "Forget-Me-Not":                     KH1ItemData("Key",              code = 264_1227, classification = ItemClassification.progression, type = "Item",                            ),
+    "Jack-In-The-Box":                   KH1ItemData("Key",              code = 264_1228, classification = ItemClassification.progression, type = "Item",                            ),
+    "Entry Pass":                        KH1ItemData("Key",              code = 264_1229, classification = ItemClassification.progression, type = "Item",                            ),
+    #"AP Item":                          KH1ItemData("Key",              code = 264_1230, classification = ItemClassification.progression, type = "Item",                            ),
+    "Dumbo":                             KH1ItemData("Summons",          code = 264_1231, classification = ItemClassification.progression, type = "Item",                            ),
+    #"N41":                              KH1ItemData("Synthesis",        code = 264_1232, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Bambi":                             KH1ItemData("Summons",          code = 264_1233, classification = ItemClassification.progression, type = "Item",                            ),
+    "Genie":                             KH1ItemData("Summons",          code = 264_1234, classification = ItemClassification.progression, type = "Item",                            ),
+    "Tinker Bell":                       KH1ItemData("Summons",          code = 264_1235, classification = ItemClassification.progression, type = "Item",                            ),
+    "Mushu":                             KH1ItemData("Summons",          code = 264_1236, classification = ItemClassification.progression, type = "Item",                            ),
+    "Simba":                             KH1ItemData("Summons",          code = 264_1237, classification = ItemClassification.progression, type = "Item",                            ),
+    "Lucky Emblem":                      KH1ItemData("Key",              code = 264_1238, classification = ItemClassification.progression, type = "Item",                            ),
+    "Max HP Increase":                   KH1ItemData("Level Up",         code = 264_1239, classification = ItemClassification.useful,      type = "Item",           max_quantity = 15),
+    "Max MP Increase":                   KH1ItemData("Level Up",         code = 264_1240, classification = ItemClassification.useful,      type = "Item",           max_quantity = 15),
+    "Max AP Increase":                   KH1ItemData("Level Up",         code = 264_1241, classification = ItemClassification.useful,      type = "Item",           max_quantity = 15),
+    "Strength Increase":                 KH1ItemData("Level Up",         code = 264_1242, classification = ItemClassification.useful,      type = "Item",           max_quantity = 15),
+    "Defense Increase":                  KH1ItemData("Level Up",         code = 264_1243, classification = ItemClassification.useful,      type = "Item",           max_quantity = 15),
+    "Item Slot Increase":                KH1ItemData("Limited Level Up", code = 264_1244, classification = ItemClassification.useful,      type = "Item",           max_quantity = 15),
+    "Accessory Slot Increase":           KH1ItemData("Limited Level Up", code = 264_1245, classification = ItemClassification.useful,      type = "Item",           max_quantity = 15),
+    #"Thunder Gem":                      KH1ItemData("Synthesis",        code = 264_1246, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Shiny Crystal":                    KH1ItemData("Synthesis",        code = 264_1247, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Bright Shard":                     KH1ItemData("Synthesis",        code = 264_1248, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Bright Gem":                       KH1ItemData("Synthesis",        code = 264_1249, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Bright Crystal":                   KH1ItemData("Synthesis",        code = 264_1250, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Mystery Goo":                      KH1ItemData("Synthesis",        code = 264_1251, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Gale":                             KH1ItemData("Synthesis",        code = 264_1252, classification = ItemClassification.filler,      type = "Item",                            ),
+    #"Mythril Shard":                    KH1ItemData("Synthesis",        code = 264_1253, classification = ItemClassification.filler,      type = "Item",                            ),
+    "Mythril":                           KH1ItemData("Key",              code = 264_1254, classification = ItemClassification.progression, type = "Item",           max_quantity = 16),
+    "Orichalcum":                        KH1ItemData("Key",              code = 264_1255, classification = ItemClassification.progression, type = "Item",           max_quantity = 17),
+    "High Jump":                         KH1ItemData("Shared Abilities", code = 264_2001, classification = ItemClassification.progression, type = "Shared Ability",                  ),
+    "Mermaid Kick":                      KH1ItemData("Shared Abilities", code = 264_2002, classification = ItemClassification.progression, type = "Shared Ability",                  ),
+    "Progressive Glide":                 KH1ItemData("Shared Abilities", code = 264_2003, classification = ItemClassification.progression, type = "Shared Ability", max_quantity = 2 ),
+    #"Superglide":                       KH1ItemData("Shared Abilities", code = 264_2004, classification = ItemClassification.progression, type = "Ability",                         ),
+    "Treasure Magnet":                   KH1ItemData("Abilities",        code = 264_3005, classification = ItemClassification.useful,      type = "Ability",        max_quantity = 2 ),
+    "Combo Plus":                        KH1ItemData("Abilities",        code = 264_3006, classification = ItemClassification.useful,      type = "Ability",        max_quantity = 4 ),
+    "Air Combo Plus":                    KH1ItemData("Abilities",        code = 264_3007, classification = ItemClassification.progression, type = "Ability",        max_quantity = 2 ),
+    "Critical Plus":                     KH1ItemData("Abilities",        code = 264_3008, classification = ItemClassification.useful,      type = "Ability",        max_quantity = 3 ),
+    #"Second Wind":                      KH1ItemData("Abilities",        code = 264_3009, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Scan":                              KH1ItemData("Abilities",        code = 264_3010, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Sonic Blade":                       KH1ItemData("Abilities",        code = 264_3011, classification = ItemClassification.progression, type = "Ability",                         ),
+    "Ars Arcanum":                       KH1ItemData("Abilities",        code = 264_3012, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Strike Raid":                       KH1ItemData("Abilities",        code = 264_3013, classification = ItemClassification.progression, type = "Ability",                         ),
+    "Ragnarok":                          KH1ItemData("Abilities",        code = 264_3014, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Trinity Limit":                     KH1ItemData("Abilities",        code = 264_3015, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Cheer":                             KH1ItemData("Abilities",        code = 264_3016, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Vortex":                            KH1ItemData("Abilities",        code = 264_3017, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Aerial Sweep":                      KH1ItemData("Abilities",        code = 264_3018, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Counterattack":                     KH1ItemData("Abilities",        code = 264_3019, classification = ItemClassification.progression, type = "Ability",                         ),
+    "Blitz":                             KH1ItemData("Abilities",        code = 264_3020, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Guard":                             KH1ItemData("Abilities",        code = 264_3021, classification = ItemClassification.progression, type = "Ability",                         ),
+    "Dodge Roll":                        KH1ItemData("Abilities",        code = 264_3022, classification = ItemClassification.progression, type = "Ability",                         ),
+    "MP Haste":                          KH1ItemData("Abilities",        code = 264_3023, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "MP Rage":                           KH1ItemData("Abilities",        code = 264_3024, classification = ItemClassification.progression, type = "Ability",                         ),
+    "Second Chance":                     KH1ItemData("Abilities",        code = 264_3025, classification = ItemClassification.progression, type = "Ability",                         ),
+    "Berserk":                           KH1ItemData("Abilities",        code = 264_3026, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Jackpot":                           KH1ItemData("Abilities",        code = 264_3027, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Lucky Strike":                      KH1ItemData("Abilities",        code = 264_3028, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Charge":                           KH1ItemData("Abilities",        code = 264_3029, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Rocket":                           KH1ItemData("Abilities",        code = 264_3030, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Tornado":                          KH1ItemData("Abilities",        code = 264_3031, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"MP Gift":                          KH1ItemData("Abilities",        code = 264_3032, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Raging Boar":                      KH1ItemData("Abilities",        code = 264_3033, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Asp's Bite":                       KH1ItemData("Abilities",        code = 264_3034, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Healing Herb":                     KH1ItemData("Abilities",        code = 264_3035, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Wind Armor":                       KH1ItemData("Abilities",        code = 264_3036, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Crescent":                         KH1ItemData("Abilities",        code = 264_3037, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Sandstorm":                        KH1ItemData("Abilities",        code = 264_3038, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Applause!":                        KH1ItemData("Abilities",        code = 264_3039, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Blazing Fury":                     KH1ItemData("Abilities",        code = 264_3040, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Icy Terror":                       KH1ItemData("Abilities",        code = 264_3041, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Bolts of Sorrow":                  KH1ItemData("Abilities",        code = 264_3042, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Ghostly Scream":                   KH1ItemData("Abilities",        code = 264_3043, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Humming Bird":                     KH1ItemData("Abilities",        code = 264_3044, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Time-Out":                         KH1ItemData("Abilities",        code = 264_3045, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Storm's Eye":                      KH1ItemData("Abilities",        code = 264_3046, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Ferocious Lunge":                  KH1ItemData("Abilities",        code = 264_3047, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Furious Bellow":                   KH1ItemData("Abilities",        code = 264_3048, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Spiral Wave":                      KH1ItemData("Abilities",        code = 264_3049, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Thunder Potion":                   KH1ItemData("Abilities",        code = 264_3050, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Cure Potion":                      KH1ItemData("Abilities",        code = 264_3051, classification = ItemClassification.useful,      type = "Ability",                         ),
+    #"Aero Potion":                      KH1ItemData("Abilities",        code = 264_3052, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Slapshot":                          KH1ItemData("Abilities",        code = 264_3053, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Sliding Dash":                      KH1ItemData("Abilities",        code = 264_3054, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Hurricane Blast":                   KH1ItemData("Abilities",        code = 264_3055, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Ripple Drive":                      KH1ItemData("Abilities",        code = 264_3056, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Stun Impact":                       KH1ItemData("Abilities",        code = 264_3057, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Gravity Break":                     KH1ItemData("Abilities",        code = 264_3058, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Zantetsuken":                       KH1ItemData("Abilities",        code = 264_3059, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Tech Boost":                        KH1ItemData("Abilities",        code = 264_3060, classification = ItemClassification.useful,      type = "Ability",        max_quantity = 4 ),
+    "Encounter Plus":                    KH1ItemData("Abilities",        code = 264_3061, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Leaf Bracer":                       KH1ItemData("Abilities",        code = 264_3062, classification = ItemClassification.progression, type = "Ability",                         ),
+    #"Evolution":                        KH1ItemData("Abilities",        code = 264_3063, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "EXP Zero":                          KH1ItemData("Abilities",        code = 264_3064, classification = ItemClassification.useful,      type = "Ability",                         ),
+    "Combo Master":                      KH1ItemData("Abilities",        code = 264_3065, classification = ItemClassification.progression, type = "Ability",                         )
 }
 
-event_item_table: Dict[str, KH1ItemData] = {}
+event_item_table: Dict[str, KH1ItemData] = {
+    "Victory": KH1ItemData("Event", code = None, classification = ItemClassification.progression, type = "Event")
+}
 
 #Make item categories
 item_name_groups: Dict[str, Set[str]] = {}

worlds/kh1/Options.py

@@ -6,8 +6,9 @@ class StrengthIncrease(Range):
     """
     Determines the number of Strength Increases to add to the multiworld.
     
-    The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld.
-    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random.
+    The randomizer will add all stat ups defined here into a pool and choose up to 99 to add to the multiworld.
+    
+    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 99 total) are chosen at random.
     """
     display_name = "STR Increases"
     range_start = 0
@@ -18,8 +19,9 @@ class DefenseIncrease(Range):
     """
     Determines the number of Defense Increases to add to the multiworld.
     
-    The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld.
-    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random.
+    The randomizer will add all stat ups defined here into a pool and choose up to 99 to add to the multiworld.
+    
+    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 99 total) are chosen at random.
     """
     display_name = "DEF Increases"
     range_start = 0
@@ -30,8 +32,9 @@ class HPIncrease(Range):
     """
     Determines the number of HP Increases to add to the multiworld.
     
-    The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld.
-    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random.
+    The randomizer will add all stat ups defined here into a pool and choose up to 99 to add to the multiworld.
+    
+    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 99 total) are chosen at random.
     """
     display_name = "HP Increases"
     range_start = 0
@@ -42,8 +45,9 @@ class APIncrease(Range):
     """
     Determines the number of AP Increases to add to the multiworld.
     
-    The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld.
-    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random.
+    The randomizer will add all stat ups defined here into a pool and choose up to 99 to add to the multiworld.
+    
+    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 99 total) are chosen at random.
     """
     display_name = "AP Increases"
     range_start = 0
@@ -54,8 +58,9 @@ class MPIncrease(Range):
     """
     Determines the number of MP Increases to add to the multiworld.
     
-    The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld.
-    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random.
+    The randomizer will add all stat ups defined here into a pool and choose up to 99 to add to the multiworld.
+    
+    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 99 total) are chosen at random.
     """
     display_name = "MP Increases"
     range_start = 0
@@ -66,8 +71,9 @@ class AccessorySlotIncrease(Range):
     """
     Determines the number of Accessory Slot Increases to add to the multiworld.
     
-    The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld.
-    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random.
+    The randomizer will add all stat ups defined here into a pool and choose up to 99 to add to the multiworld.
+    
+    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 99 total) are chosen at random.
     """
     display_name = "Accessory Slot Increases"
     range_start = 0
@@ -78,8 +84,9 @@ class ItemSlotIncrease(Range):
     """
     Determines the number of Item Slot Increases to add to the multiworld.
     
-    The randomizer will add all stat ups defined here into a pool and choose up to 100 to add to the multiworld.
-    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 100 total) are chosen at random.
+    The randomizer will add all stat ups defined here into a pool and choose up to 99 to add to the multiworld.
+    
+    Accessory Slot Increases and Item Slot Increases are prioritized first, then the remaining items (up to 99 total) are chosen at random.
     """
     display_name = "Item Slot Increases"
     range_start = 0
@@ -104,29 +111,45 @@ class SuperBosses(Toggle):
     """
     display_name = "Super Bosses"
 
-class Cups(Toggle):
+class Cups(Choice):
     """
-    Toggle whether to include checks behind completing Phil, Pegasus, Hercules, or Hades cups.
-    Please note that the cup items will still appear in the multiworld even if toggled off, as they are required to challenge Sephiroth.
+    Determines which cups have their locations added to the multiworld.
+    
+    Please note that the cup items will still appear in the multiworld even if set to off, as they are required to challenge Sephiroth.
+
+    Off: All cup locations are removed
+    
+    Cups: Phil, Pegasus, and Hercules cups are included
+    
+    Hades Cup: Hades Cup is included in addition to Phil, Pegasus, and Hercules cups. If Super Bosses are enabled, then Ice Titan is included
     """
     display_name = "Cups"
+    option_off = 0
+    option_cups = 1
+    option_hades_cup = 2
+    default = 0
 
-class Goal(Choice):
+class FinalRestDoorKey(Choice):
     """
-    Determines when victory is achieved in your playthrough.
+    Determines what grants the player the Final Rest Door Key.
     
     Sephiroth: Defeat Sephiroth
+    
     Unknown: Defeat Unknown
-    Postcards: Turn in all 10 postcards in Traverse Town
+    
+    Postcards: Turn in an amount of postcards in Traverse Town
+    
     Final Ansem: Enter End of the World and defeat Ansem as normal
-    Puppies: Rescue and return all 99 puppies in Traverse Town
+    
+    Puppies: Rescue and return an amount of puppies in Traverse Town
+    
     Final Rest: Open the chest in End of the World Final Rest
     """
-    display_name = "Goal"
+    display_name = "Final Rest Door Key"
     option_sephiroth = 0
     option_unknown = 1
     option_postcards = 2
-    option_final_ansem = 3
+    option_lucky_emblems = 3
     option_puppies = 4
     option_final_rest = 5
     default = 3
@@ -135,89 +158,115 @@ class EndoftheWorldUnlock(Choice):
     """Determines how End of the World is unlocked.
     
     Item: You can receive an item called "End of the World" which unlocks the world
-    Reports: A certain amount of reports are required to unlock End of the World, which is defined in your options"""
+    
+    Lucky Emblems: A certain amount of lucky emblems are required to unlock End of the World, which is defined in your options"""
     display_name = "End of the World Unlock"
     option_item = 0
-    option_reports = 1
+    option_lucky_emblems = 1
     default = 1
 
-class FinalRestDoor(Choice):
-    """Determines what conditions need to be met to manifest the door in Final Rest, allowing the player to challenge Ansem.
+class RequiredPostcards(Range):
+    """
+    If "Final Rest Door Key" is set to "Postcards", defines how many postcards are required.
+    """
+    display_name = "Required Postcards"
+    default = 8
+    range_start = 1
+    range_end = 10
+
+class RequiredPuppies(Choice):
+    """
+    If "Final Rest Door Key" is set to "Puppies", defines how many puppies are required.
+    """
+    display_name = "Required Puppies"
+    default = 80
+    option_10 = 10
+    option_20 = 20
+    option_30 = 30
+    option_40 = 40
+    option_50 = 50
+    option_60 = 60
+    option_70 = 70
+    option_80 = 80
+    option_90 = 90
+    option_99 = 99
+
+class PuppyValue(Range):
+    """
+    Determines how many dalmatian puppies are given when a puppy item is found.
+    """
+    display_name = "Puppy Value"
+    default = 3
+    range_start = 1
+    range_end = 99
+
+class RandomizePuppies(DefaultOnToggle):
+    """
+    If OFF, the "Puppy" item is worth 3 puppies and puppies are placed in vanilla locations.
     
-    Reports: A certain number of Ansem's Reports are required, determined by the "Reports to Open Final Rest Door" option
-    Puppies: Having all 99 puppies is required
-    Postcards: Turning in all 10 postcards is required
-    Superbosses: Defeating Sephiroth, Unknown, Kurt Zisa, and Phantom are required
+    If ON, the "Puppy" item is worth an amount of puppies defined by "Puppy Value", and are shuffled randomly.
     """
-    display_name = "Final Rest Door"
-    option_reports = 0
-    option_puppies = 1
-    option_postcards = 2
-    option_superbosses = 3
-
-class Puppies(Choice):
-    """
-    Determines how dalmatian puppies are shuffled into the pool.
-    Full: All puppies are in one location
-    Triplets: Puppies are found in triplets just as they are in the base game
-    Individual: One puppy can be found per location
-    """
-    display_name = "Puppies"
-    option_full = 0
-    option_triplets = 1
-    option_individual = 2
-    default = 1
+    display_name = "Randomize Puppies"
 
 class EXPMultiplier(NamedRange):
     """
     Determines the multiplier to apply to EXP gained.
     """
     display_name = "EXP Multiplier"
-    default = 16
-    range_start = default // 4
+    default = 16 * 4
+    range_start = 16 // 4
     range_end = 128
     special_range_names = {
-        "0.25x": int(default // 4),
-        "0.5x": int(default // 2),
-        "1x": default,
-        "2x": default * 2,
-        "3x": default * 3,
-        "4x": default * 4,
-        "8x": default * 8,
+        "0.25x": int(16 // 4),
+        "0.5x": int(16 // 2),
+        "1x": 16,
+        "2x": 16 * 2,
+        "3x": 16 * 3,
+        "4x": 16 * 4,
+        "8x": 16 * 8,
     }
 
-class RequiredReportsEotW(Range):
+class RequiredLuckyEmblemsEotW(Range):
     """
-    If End of the World Unlock is set to "Reports", determines the number of Ansem's Reports required to open End of the World.
+    If End of the World Unlock is set to "Lucky Emblems", determines the number of Lucky Emblems required.
     """
-    display_name = "Reports to Open End of the World"
-    default = 4
+    display_name = "Lucky Emblems to Open End of the World"
+    default = 7
     range_start = 0
-    range_end = 13
+    range_end = 20
 
-class RequiredReportsDoor(Range):
+class RequiredLuckyEmblemsDoor(Range):
     """
-    If Final Rest Door is set to "Reports", determines the number of Ansem's Reports required to manifest the door in Final Rest to challenge Ansem.
+    If Final Rest Door Key is set to "Lucky Emblems", determines the number of Lucky Emblems required.
     """
-    display_name = "Reports to Open Final Rest Door"
-    default = 4
+    display_name = "Lucky Emblems to Open Final Rest Door"
+    default = 10
     range_start = 0
-    range_end = 13
+    range_end = 20
 
-class ReportsInPool(Range):
+class LuckyEmblemsInPool(Range):
     """
-    Determines the number of Ansem's Reports in the item pool.
+    Determines the number of Lucky Emblems in the item pool.
     """
-    display_name = "Reports in Pool"
-    default = 4
+    display_name = "Lucky Emblems in Pool"
+    default = 13
     range_start = 0
-    range_end = 13
+    range_end = 20
 
-class RandomizeKeybladeStats(DefaultOnToggle):
+class KeybladeStats(Choice):
     """
     Determines whether Keyblade stats should be randomized.
+    
+    Randomize: Randomly generates stats for each keyblade between the defined minimums and maximums.
+    
+    Shuffle: Shuffles the stats of the vanilla keyblades amongst each other.
+    
+    Vanilla: Keyblade stats are unchanged.
     """
-    display_name = "Randomize Keyblade Stats"
+    display_name = "Keyblade Stats"
+    option_randomize = 0
+    option_shuffle = 1
+    option_vanilla = 2
 
 class KeybladeMinStrength(Range):
     """
@@ -237,6 +286,60 @@ class KeybladeMaxStrength(Range):
     range_start = 0
     range_end = 20
 
+class KeybladeMinCritRateBonus(Range):
+    """
+    Determines the minimum Crit Rate bonus a keyblade can have.
+    """
+    display_name = "Keyblade Minimum Crit Rate Bonus"
+    default = 0
+    range_start = 0
+    range_end = 200
+
+class KeybladeMaxCritRateBonus(Range):
+    """
+    Determines the maximum Crit Rate bonus a keyblade can have.
+    """
+    display_name = "Keyblade Maximum Crit Rate Bonus"
+    default = 200
+    range_start = 0
+    range_end = 200
+
+class KeybladeMinCritSTRBonus(Range):
+    """
+    Determines the minimum Crit STR bonus a keyblade can have.
+    """
+    display_name = "Keyblade Minimum Crit Rate Bonus"
+    default = 0
+    range_start = 0
+    range_end = 16
+
+class KeybladeMaxCritSTRBonus(Range):
+    """
+    Determines the maximum Crit STR bonus a keyblade can have.
+    """
+    display_name = "Keyblade Maximum Crit Rate Bonus"
+    default = 16
+    range_start = 0
+    range_end = 16
+
+class KeybladeMinRecoil(Range):
+    """
+    Determines the minimum recoil a keyblade can have.
+    """
+    display_name = "Keyblade Minimum Recoil"
+    default = 1
+    range_start = 1
+    range_end = 90
+
+class KeybladeMaxRecoil(Range):
+    """
+    Determines the maximum recoil a keyblade can have.
+    """
+    display_name = "Keyblade Maximum Recoil"
+    default = 90
+    range_start = 1
+    range_end = 90
+
 class KeybladeMinMP(Range):
     """
     Determines the minimum MP bonus a keyblade can have.
@@ -260,31 +363,43 @@ class LevelChecks(Range):
     Determines the maximum level for which checks can be obtained.
     """
     display_name = "Level Checks"
-    default = 100
+    default = 99
     range_start = 0
-    range_end = 100
+    range_end = 99
 
 class ForceStatsOnLevels(NamedRange):
     """
     If this value is less than the value for Level Checks, this determines the minimum level from which only stat ups are obtained at level up locations.
-    For example, if you want to be able to find any multiworld item from levels 1-50, then just stat ups for levels 51-100, set this value to 51.
+    
+    For example, if you want to be able to find any multiworld item from levels 2-50, then just stat ups for levels 51-100, set this value to 51.
     """
     display_name = "Force Stats on Level Starting From"
-    default = 1
-    range_start = 1
+    default = 2
+    range_start = 2
     range_end = 101
     special_range_names = {
         "none": 101,
         "multiworld-to-level-50": 51,
-        "all": 1
+        "all": 2
     }
 
 class BadStartingWeapons(Toggle):
     """
-    Forces Kingdom Key, Dream Sword, Dream Shield, and Dream Staff to have bad stats.
+    Forces Kingdom Key, Dream Sword, Dream Shield, and Dream Staff to have vanilla stats.
     """
     display_name = "Bad Starting Weapons"
 
+class DeathLink(Choice):
+    """
+    If Sora is KO'ed, the other players with "Death Link" on will also be KO'ed.
+    The opposite is also true.
+    """
+    display_name = "Death Link"
+    option_off = 0
+    option_toggle = 1
+    option_on = 2
+    default = 0
+
 class DonaldDeathLink(Toggle):
     """
     If Donald is KO'ed, so is Sora.  If Death Link is toggled on in your client, this will send a death to everyone who enabled death link.
@@ -300,35 +415,61 @@ class GoofyDeathLink(Toggle):
 class KeybladesUnlockChests(Toggle):
     """
     If toggled on, the player is required to have a certain keyblade to open chests in certain worlds.
+    
     TT   - Lionheart
+    
     WL   - Lady Luck
+    
     OC   - Olympia
+    
     DJ   - Jungle King
+    
     AG   - Three Wishes
+    
     MS   - Wishing Star
+    
     HT   - Pumpkinhead
+    
     NL   - Fairy Harp
+    
     HB   - Divine Rose
+    
     EotW - Oblivion
-    HAW  - Oathkeeper
+    
+    HAW  - Spellbinder
+    
+    DI   - Oathkeeper
     
     Note: Does not apply to Atlantica, the emblem and carousel chests in Hollow Bastion, or the Aero chest in Neverland currently.
     """
     display_name = "Keyblades Unlock Chests"
 
-class InteractInBattle(Toggle):
+class InteractInBattle(DefaultOnToggle):
     """
     Allow Sora to talk to people, examine objects, and open chests in battle.
     """
     display_name = "Interact in Battle"
 
-class AdvancedLogic(Toggle):
+class LogicDifficulty(Choice):
     """
-    If on, logic may expect you to do advanced skips like using Combo Master, Dumbo, and other unusual methods to reach locations.
-    """
-    display_name = "Advanced Logic"
+    Determines what the randomizer logic may expect you to do to reach certain locations.
 
-class ExtraSharedAbilities(Toggle):
+    Beginner: Logic only expects what would be the natural solution in vanilla gameplay or similar, as well as a guarantee of tools for boss fights.
+    
+    Normal: Logic expects some clever use of abilities, exploration of options, and competent combat ability; generally does not require advanced knowledge.
+    
+    Proud: Logic expects advanced knowledge of tricks and obscure interactions, such as using Combo Master, Dumbo, and other unusual methods to reach locations.
+    
+    Minimal: Logic expects the bare minimum to get to locations; may require extensive grinding, beating fights with no tools, and performing very difficult or tedious tricks.
+    """
+    display_name = "Logic Difficulty"
+    option_beginner = 0
+    option_normal = 5
+    option_proud = 10
+    option_minimal = 15
+    default = 5
+
+class ExtraSharedAbilities(DefaultOnToggle):
     """
     If on, adds extra shared abilities to the pool.  These can stack, so multiple high jumps make you jump higher and multiple glides make you superglide faster.
     """
@@ -340,51 +481,361 @@ class EXPZeroInPool(Toggle):
     """
     display_name = "EXP Zero in Pool"
 
-class VanillaEmblemPieces(DefaultOnToggle):
+class RandomizeEmblemPieces(Toggle):
     """
-    If on, the Hollow Bastion emblem pieces are in their vanilla locations.
+    If off, the Hollow Bastion emblem pieces are in their vanilla locations.
     """
-    display_name = "Vanilla Emblem Pieces"
+    display_name = "Randomize Emblem Pieces"
+
+class RandomizePostcards(Choice):
+    """
+    Determines how Postcards are randomized
+
+    All: All Postcards are randomized
+    
+    Chests: Only the 3 Postcards in chests are randomized
+    
+    Vanilla: Postcards are in their original location
+    """
+    display_name = "Randomize Postcards"
+    option_all = 0
+    option_chests = 1
+    option_vanilla = 2
+
+class JungleSlider(Toggle):
+    """
+    Determines whether checks are behind the Jungle Slider minigame.
+    """
+    display_name = "Jungle Slider"
 
 class StartingWorlds(Range):
     """
-    Number of random worlds to start with in addition to Traverse Town, which is always available.  Will only consider Atlantica if toggled, and will only consider End of the World if its unlock is set to "Item".
+    Number of random worlds to start with in addition to Traverse Town, which is always available.
+    
+    Will only consider Atlantica if toggled, and will only consider End of the World if its unlock is set to "Item".
+    
+    These are given by the server, and are received after connection.
     """
     display_name = "Starting Worlds"
-    default = 0
+    default = 4
     range_start = 0
     range_end = 10
+    
+class StartingTools(DefaultOnToggle):
+    """
+    Determines whether you start with Scan and Dodge Roll.
+    
+    These are given by the server, and are received after connection.
+    """
+    display_name = "Starting Tools"
+
+class RemoteItems(Choice):
+    """
+    Determines if items can be placed on locations in your own world in such a way that will force them to be remote items.
+    
+    Off: When your items are placed in your world, they can only be placed in locations that they can be acquired without server connection (stats on levels, items in chests, etc).
+    
+    Allow: When your items are placed in your world, items that normally can't be placed in a location in-game are simply made remote (abilities on static events, etc).
+    
+    Full: All items are remote.  Use this when doing something like a co-op seed.
+    """
+    display_name = "Remote Items"
+    option_off = 0
+    option_allow = 1
+    option_full = 2
+    default = 0
+
+class Slot2LevelChecks(Range):
+    """
+    Determines how many levels have an additional item.
+    
+    If Remote Items is OFF, these checks will only contain abilities or items for other players.
+    """
+    display_name = "Slot 2 Level Checks"
+    default = 0
+    range_start = 0
+    range_end = 33
+
+class ShortenGoMode(DefaultOnToggle):
+    """
+    If on, the player warps to the final cutscene after defeating Ansem 1 > Darkside > Ansem 2, skipping World of Chaos.
+    """
+    display_name = "Shorten Go Mode"
+
+class DestinyIslands(Toggle):
+    """
+    If on, Adds a Destiny Islands item and a number of Raft Materials items to the pool.
+    
+    When "Destiny Islands" is found, Traverse Town will have an additional place to land - Seashore.
+    
+    "Raft Materials" allow progress into Day 2 and to Homecoming.  The amount is defined in Day 2 Materials and Homecoming Materials.
+    """
+    display_name = "Destiny Islands"
+
+class MythrilInPool(Range):
+    """
+    Determines how much Mythril, one of the two synthesis items, is in the item pool.
+    
+    You need 16 to synth every recipe that requires it.
+    """
+    display_name = "Mythril In Pool"
+    default = 20
+    range_start = 16
+    range_end = 30
+
+class OrichalcumInPool(Range):
+    """
+    Determines how much Orichalcum, one of the two synthesis items, is in the item pool.
+    
+    You need 17 to synth every recipe that requires it.
+    """
+    display_name = "Mythril In Pool"
+    default = 20
+    range_start = 17
+    range_end = 30
+
+class MythrilPrice(Range):
+    """
+    Determines the cost of Mythril in each shop.
+    """
+    display_name = "Mythril Price"
+    default = 500
+    range_start = 100
+    range_end = 5000
+
+class OrichalcumPrice(Range):
+    """
+    Determines the cost of Orichalcum in each shop.
+    """
+    display_name = "Orichalcum Price"
+    default = 500
+    range_start = 100
+    range_end = 5000
+
+class OneHP(Toggle):
+    """
+    If on, forces Sora's max HP to 1 and removes the low health warning sound.
+    """
+    display_name = "One HP"
+
+class FourByThree(Toggle):
+    """
+    If on, changes the aspect ratio to 4 by 3.
+    """
+    display_name = "4 by 3"
+
+class AutoAttack(Toggle):
+    """
+    If on, you can combo by holding confirm.
+    """
+    display_name = "Auto Attack"
+
+class BeepHack(Toggle):
+    """
+    If on, removes low health warning sound.  Works up to max health of 41.
+    """
+    display_name = "Beep Hack"
+
+class ConsistentFinishers(Toggle):
+    """
+    If on, 30% chance finishers are now 100% chance.
+    """
+    display_name = "Consistent Finishers"
+
+class EarlySkip(DefaultOnToggle):
+    """
+    If on, allows skipping cutscenes immediately that normally take time to be able to skip.
+    """
+    display_name = "Early Skip"
+
+class FastCamera(Toggle):
+    """
+    If on, speeds up camera movement and camera centering.
+    """
+    display_name = "Fast Camera"
+
+class FasterAnimations(DefaultOnToggle):
+    """
+    If on, speeds up animations during which you can't play.
+    """
+    display_name = "Faster Animations"
+
+class Unlock0Volume(Toggle):
+    """
+    If on, volume 1 mutes the audio channel.
+    """
+    display_name = "Unlock 0 Volume"
+
+class Unskippable(DefaultOnToggle):
+    """
+    If on, makes unskippable cutscenes skippable.
+    """
+    display_name = "Unskippable"
+
+class AutoSave(DefaultOnToggle):
+    """
+    If on, enables auto saving.
+    
+    Press L1+L2+R1+R2+D-Pad Left to instantly load continue state.
+    
+    Press L1+L2+R1+R2+D-Pad Right to instantly load autosave.
+    """
+    display_name = "AutoSave"
+
+class WarpAnywhere(Toggle):
+    """
+    If on, enables the player to warp at any time, even when not at a save point.
+    
+    Press L1+L2+R2+Select to open the Save/Warp menu at any time.
+    """
+    display_name = "WarpAnywhere"
+
+class RandomizePartyMemberStartingAccessories(DefaultOnToggle):
+    """
+    If on, the 10 accessories that some party members (Aladdin, Ariel, Jack, Peter Pan, Beast) start with are randomized.
+    
+    10 random accessories will be distributed amongst any party member aside from Sora in their starting equipment.
+    """
+    display_name = "Randomize Party Member Starting Accessories"
+
+class MaxLevelForSlot2LevelChecks(Range):
+    """
+    Determines the max level for slot 2 level checks.
+    """
+    display_name = "Max Level for Slot 2 Level Checks"
+    default = 50
+    range_start = 2
+    range_end = 100
+
+class RandomizeAPCosts(Choice):
+    """
+    Off: No randomization
+    Shuffle: Ability AP Costs will be shuffled amongst themselves.
+    
+    Randomize: Ability AP Costs will be randomized to the specified max and min.
+    
+    Distribute: Ability AP Costs will totalled and re-distributed randomly between the specified max and min.
+    """
+    display_name = "Randomize AP Costs"
+    option_off = 0
+    option_shuffle = 1
+    option_randomize = 2
+    option_distribute = 3
+    default = 0
+
+class MaxAPCost(Range):
+    """
+    If Randomize AP Costs is set to Randomize or Distribute, this defined the max AP cost an ability can have.
+    """
+    display_name = "Max AP Cost"
+    default = 5
+    range_start = 4
+    range_end = 9
+
+class MinAPCost(Range):
+    """
+    If Randomize AP Costs is set to Randomize or Distribute, this defined the min AP cost an ability can have.
+    """
+    display_name = "Min AP Cost"
+    default = 0
+    range_start = 0
+    range_end = 2
+
+class Day2Materials(Range):
+    """
+    The amount of Raft Materials required to access Day 2.
+    """
+    display_name = "Day 2 Materials"
+    default = 4
+    range_start = 0
+    range_end = 20
+
+class HomecomingMaterials(Range):
+    """
+    The amount of Raft Materials required to access Homecoming.
+    """
+    display_name = "Homecoming Materials"
+    default = 10
+    range_start = 0
+    range_end = 20
+
+class MaterialsInPool(Range):
+    """
+    The amount of Raft Materials required to access Homecoming.
+    """
+    display_name = "Materials in Pool"
+    default = 16
+    range_start = 0
+    range_end = 20
+
+class StackingWorldItems(DefaultOnToggle):
+    """
+    Multiple world items give you the world's associated key item.
+    
+    WL - Footprints
+    
+    OC - Entry Pass
+    
+    DJ - Slides
+    
+    HT - Forget-Me-Not and Jack-In-The-Box
+    
+    HB - Theon Vol. 6
+    
+    Adds an extra world to the pool for each that has a key item (WL, OC, DJ, HT, HB).
+    
+    Forces Halloween Town Key Item Bundle ON.
+    """
+    display_name = "Stacking World Items"
+
+class HalloweenTownKeyItemBundle(DefaultOnToggle):
+    """
+    Obtaining the Forget-Me-Not automatically gives Jack-in-the-Box as well.
+    
+    Removes Jack-in-the-Box from the pool.
+    """
+    display_name = "Halloween Town Key Item Bundle"
 
 @dataclass
 class KH1Options(PerGameCommonOptions):
-    goal: Goal
+    final_rest_door_key: FinalRestDoorKey
     end_of_the_world_unlock: EndoftheWorldUnlock
-    final_rest_door: FinalRestDoor
-    required_reports_eotw: RequiredReportsEotW
-    required_reports_door: RequiredReportsDoor
-    reports_in_pool: ReportsInPool
+    required_lucky_emblems_eotw: RequiredLuckyEmblemsEotW
+    required_lucky_emblems_door: RequiredLuckyEmblemsDoor
+    lucky_emblems_in_pool: LuckyEmblemsInPool
+    required_postcards: RequiredPostcards
+    required_puppies: RequiredPuppies
     super_bosses: SuperBosses
     atlantica: Atlantica
     hundred_acre_wood: HundredAcreWood
     cups: Cups
-    puppies: Puppies
+    randomize_puppies: RandomizePuppies
+    puppy_value: PuppyValue
     starting_worlds: StartingWorlds
     keyblades_unlock_chests: KeybladesUnlockChests
     interact_in_battle: InteractInBattle
     exp_multiplier: EXPMultiplier
-    advanced_logic: AdvancedLogic
+    logic_difficulty: LogicDifficulty
     extra_shared_abilities: ExtraSharedAbilities
     exp_zero_in_pool: EXPZeroInPool
-    vanilla_emblem_pieces: VanillaEmblemPieces
+    randomize_emblem_pieces: RandomizeEmblemPieces
+    randomize_postcards: RandomizePostcards
     donald_death_link: DonaldDeathLink
     goofy_death_link: GoofyDeathLink
-    randomize_keyblade_stats: RandomizeKeybladeStats
+    keyblade_stats: KeybladeStats
     bad_starting_weapons: BadStartingWeapons
     keyblade_min_str: KeybladeMinStrength
     keyblade_max_str: KeybladeMaxStrength
+    keyblade_min_crit_rate: KeybladeMinCritRateBonus
+    keyblade_max_crit_rate: KeybladeMaxCritRateBonus
+    keyblade_min_crit_str: KeybladeMinCritSTRBonus
+    keyblade_max_crit_str: KeybladeMaxCritSTRBonus
+    keyblade_min_recoil: KeybladeMinRecoil
+    keyblade_max_recoil: KeybladeMaxRecoil
     keyblade_min_mp: KeybladeMinMP
     keyblade_max_mp: KeybladeMaxMP
     level_checks: LevelChecks
+    slot_2_level_checks: Slot2LevelChecks
     force_stats_on_levels: ForceStatsOnLevels
     strength_increase: StrengthIncrease
     defense_increase: DefenseIncrease
@@ -394,26 +845,68 @@ class KH1Options(PerGameCommonOptions):
     accessory_slot_increase: AccessorySlotIncrease
     item_slot_increase: ItemSlotIncrease
     start_inventory_from_pool: StartInventoryPool
+    jungle_slider: JungleSlider
+    starting_tools: StartingTools
+    remote_items: RemoteItems
+    shorten_go_mode: ShortenGoMode
+    death_link: DeathLink
+    destiny_islands: DestinyIslands
+    orichalcum_in_pool: OrichalcumInPool
+    orichalcum_price: OrichalcumPrice
+    mythril_in_pool: MythrilInPool
+    mythril_price: MythrilPrice
+    one_hp: OneHP
+    four_by_three: FourByThree
+    auto_attack: AutoAttack
+    beep_hack: BeepHack
+    consistent_finishers: ConsistentFinishers
+    early_skip: EarlySkip
+    fast_camera: FastCamera
+    faster_animations: FasterAnimations
+    unlock_0_volume: Unlock0Volume
+    unskippable: Unskippable
+    auto_save: AutoSave
+    warp_anywhere: WarpAnywhere
+    randomize_party_member_starting_accessories: RandomizePartyMemberStartingAccessories
+    max_level_for_slot_2_level_checks: MaxLevelForSlot2LevelChecks
+    randomize_ap_costs: RandomizeAPCosts
+    max_ap_cost: MaxAPCost
+    min_ap_cost: MinAPCost
+    day_2_materials: Day2Materials
+    homecoming_materials: HomecomingMaterials
+    materials_in_pool: MaterialsInPool
+    stacking_world_items: StackingWorldItems
+    halloween_town_key_item_bundle: HalloweenTownKeyItemBundle
+    
 
 kh1_option_groups = [
     OptionGroup("Goal", [
-        Goal,
+        FinalRestDoorKey,
         EndoftheWorldUnlock,
-        FinalRestDoor,
-        RequiredReportsDoor,
-        RequiredReportsEotW,
-        ReportsInPool,
+        RequiredLuckyEmblemsDoor,
+        RequiredLuckyEmblemsEotW,
+        LuckyEmblemsInPool,
+        RequiredPostcards,
+        RequiredPuppies,
+        DestinyIslands,
+        Day2Materials,
+        HomecomingMaterials,
+        MaterialsInPool,
     ]),
     OptionGroup("Locations", [
         SuperBosses,
         Atlantica,
         Cups,
         HundredAcreWood,
-        VanillaEmblemPieces,
+        JungleSlider,
+        RandomizeEmblemPieces,
+        RandomizePostcards,
     ]),
     OptionGroup("Levels", [
         EXPMultiplier,
         LevelChecks,
+        Slot2LevelChecks,
+        MaxLevelForSlot2LevelChecks,
         ForceStatsOnLevels,
         StrengthIncrease,
         DefenseIncrease,
@@ -425,21 +918,58 @@ kh1_option_groups = [
     ]),
     OptionGroup("Keyblades", [
         KeybladesUnlockChests,
-        RandomizeKeybladeStats,
+        KeybladeStats,
         BadStartingWeapons,
-        KeybladeMaxStrength,
         KeybladeMinStrength,
-        KeybladeMaxMP,
+        KeybladeMaxStrength,
+        KeybladeMinCritRateBonus,
+        KeybladeMaxCritRateBonus,
+        KeybladeMinCritSTRBonus,
+        KeybladeMaxCritSTRBonus,
+        KeybladeMinRecoil,
+        KeybladeMaxRecoil,
         KeybladeMinMP,
+        KeybladeMaxMP,
+    ]),
+    OptionGroup("Synth", [
+        OrichalcumInPool,
+        OrichalcumPrice,
+        MythrilInPool,
+        MythrilPrice,
+    ]),
+    OptionGroup("AP Costs", [
+        RandomizeAPCosts,
+        MaxAPCost,
+        MinAPCost
     ]),
     OptionGroup("Misc", [
         StartingWorlds,
-        Puppies,
+        StartingTools,
+        RandomizePuppies,
+        PuppyValue,
         InteractInBattle,
-        AdvancedLogic,
+        LogicDifficulty,
         ExtraSharedAbilities,
+        StackingWorldItems,
+        HalloweenTownKeyItemBundle,
         EXPZeroInPool,
+        RandomizePartyMemberStartingAccessories,
+        DeathLink,
         DonaldDeathLink,
         GoofyDeathLink,
+        RemoteItems,
+        ShortenGoMode,
+        OneHP,
+        FourByThree,
+        AutoAttack,
+        BeepHack,
+        ConsistentFinishers,
+        EarlySkip,
+        FastCamera,
+        FasterAnimations,
+        Unlock0Volume,
+        Unskippable,
+        AutoSave,
+        WarpAnywhere
     ])
 ]

worlds/kh1/Presets.py

@@ -3,24 +3,33 @@ from typing import Any, Dict
 from .Options import *
 
 kh1_option_presets: Dict[str, Dict[str, Any]] = {
-    # Standard playthrough where your goal is to defeat Ansem, reaching him by acquiring enough reports.
+    # Standard playthrough where your goal is to defeat Ansem, reaching him by acquiring enough lucky emblems.
     "Final Ansem": {
-        "goal": Goal.option_final_ansem,
-        "end_of_the_world_unlock": EndoftheWorldUnlock.option_reports,
-        "final_rest_door": FinalRestDoor.option_reports,
-        "required_reports_eotw": 7,
-        "required_reports_door": 10,
-        "reports_in_pool": 13,
+        "final_rest_door_key": FinalRestDoorKey.option_lucky_emblems,
+        "end_of_the_world_unlock": EndoftheWorldUnlock.option_lucky_emblems,
+        "required_lucky_emblems_eotw": 7,
+        "required_lucky_emblems_door": 10,
+        "lucky_emblems_in_pool": 13,
+        "required_postcards": 10,
+        "required_puppies": 99,
+        "destiny_islands": True,
+        "day_2_materials": 4,
+        "homecoming_materials": 10,
+        "materials_in_pool": 13,
         
         "super_bosses": False,
         "atlantica": False,
         "hundred_acre_wood": False,
-        "cups": False,
-        "vanilla_emblem_pieces": True,
+        "cups": Cups.option_off,
+        "jungle_slider": False,
+        "randomize_emblem_pieces": False,
+        "randomize_postcards": RandomizePostcards.option_all,
         
-        "exp_multiplier": 48,
-        "level_checks": 100,
-        "force_stats_on_levels": 1,
+        "exp_multiplier": 64,
+        "level_checks": 99,
+        "slot_2_level_checks": 33,
+        "max_level_for_slot_2_level_checks": 50,
+        "force_stats_on_levels": 2,
         "strength_increase": 24,
         "defense_increase": 24,
         "hp_increase": 23,
@@ -30,40 +39,83 @@ kh1_option_presets: Dict[str, Dict[str, Any]] = {
         "item_slot_increase": 3,
         
         "keyblades_unlock_chests": False,
-        "randomize_keyblade_stats": True,
+        "keyblade_stats": KeybladeStats.option_shuffle,
         "bad_starting_weapons": False,
         "keyblade_max_str": 14,
         "keyblade_min_str": 3,
+        "keyblade_max_crit_rate": 200,
+        "keyblade_min_crit_rate": 0,
+        "keyblade_max_crit_str": 16,
+        "keyblade_min_crit_str": 0,
+        "keyblade_max_recoil": 90,
+        "keyblade_min_recoil": 1,
         "keyblade_max_mp": 3,
         "keyblade_min_mp": -2,
         
-        "puppies": Puppies.option_triplets,
-        "starting_worlds": 0,
-        "interact_in_battle": False,
-        "advanced_logic": False,
-        "extra_shared_abilities": False,
+        "orichalcum_in_pool": 20,
+        "orichalcum_price": 500,
+        "mythril_in_pool": 20,
+        "mythril_price": 500,
+        
+        "randomize_ap_costs": RandomizeAPCosts.option_off,
+        "max_ap_cost": 5,
+        "min_ap_cost": 0,
+        
+        "randomize_puppies": True,
+        "puppy_value": 3,
+        "starting_worlds": 4,
+        "starting_tools": True,
+        "interact_in_battle": True,
+        "logic_difficulty": LogicDifficulty.option_normal,
+        "extra_shared_abilities": True,
+        "stacking_world_items": True,
+        "halloween_town_key_item_bundle": True,
         "exp_zero_in_pool": False,
+        "randomize_party_member_starting_accessories": True,
+        "death_link": False,
         "donald_death_link": False,
-        "goofy_death_link": False
+        "goofy_death_link": False,
+        "remote_items": RemoteItems.option_off,
+        "shorten_go_mode": True,
+        "one_hp": False,
+        "four_by_three": False,
+        "beep_hack": False,
+        "consistent_finishers": False,
+        "early_skip": True,
+        "fast_camera": False,
+        "faster_animations": True,
+        "unlock_0_volume": False,
+        "unskippable": True,
+        "auto_save": True,
+        "warp_anywhere": False
     },
     # Puppies are found individually, and the goal is to return them all.
     "Puppy Hunt": {
-        "goal": Goal.option_puppies,
+        "final_rest_door_key": FinalRestDoorKey.option_puppies,
         "end_of_the_world_unlock": EndoftheWorldUnlock.option_item,
-        "final_rest_door": FinalRestDoor.option_puppies,
-        "required_reports_eotw": 13,
-        "required_reports_door": 13,
-        "reports_in_pool": 13,
+        "required_lucky_emblems_eotw": 13,
+        "required_lucky_emblems_door": 13,
+        "lucky_emblems_in_pool": 13,
+        "required_postcards": 10,
+        "required_puppies": 99,
+        "destiny_islands": False,
+        "day_2_materials": 4,
+        "homecoming_materials": 10,
+        "materials_in_pool": 13,
         
         "super_bosses": False,
         "atlantica": False,
         "hundred_acre_wood": False,
-        "cups": False,
-        "vanilla_emblem_pieces": True,
+        "cups": Cups.option_off,
+        "jungle_slider": False,
+        "randomize_emblem_pieces": False,
+        "randomize_postcards": RandomizePostcards.option_all,
         
-        "exp_multiplier": 48,
-        "level_checks": 100,
-        "force_stats_on_levels": 1,
+        "exp_multiplier": 64,
+        "level_checks": 99,
+        "slot_2_level_checks": 33,
+        "max_level_for_slot_2_level_checks": 50,
+        "force_stats_on_levels": 2,
         "strength_increase": 24,
         "defense_increase": 24,
         "hp_increase": 23,
@@ -73,40 +125,83 @@ kh1_option_presets: Dict[str, Dict[str, Any]] = {
         "item_slot_increase": 3,
         
         "keyblades_unlock_chests": False,
-        "randomize_keyblade_stats": True,
+        "keyblade_stats": KeybladeStats.option_shuffle,
         "bad_starting_weapons": False,
         "keyblade_max_str": 14,
         "keyblade_min_str": 3,
+        "keyblade_max_crit_rate": 200,
+        "keyblade_min_crit_rate": 0,
+        "keyblade_max_crit_str": 16,
+        "keyblade_min_crit_str": 0,
+        "keyblade_max_recoil": 90,
+        "keyblade_min_recoil": 1,
         "keyblade_max_mp": 3,
         "keyblade_min_mp": -2,
         
-        "puppies": Puppies.option_individual,
+        "orichalcum_in_pool": 20,
+        "orichalcum_price": 500,
+        "mythril_in_pool": 20,
+        "mythril_price": 500,
+        
+        "randomize_ap_costs": RandomizeAPCosts.option_off,
+        "max_ap_cost": 5,
+        "min_ap_cost": 0,
+        
+        "randomize_puppies": True,
+        "puppy_value": 1,
         "starting_worlds": 0,
-        "interact_in_battle": False,
-        "advanced_logic": False,
-        "extra_shared_abilities": False,
+        "starting_tools": True,
+        "interact_in_battle": True,
+        "logic_difficulty": LogicDifficulty.option_normal,
+        "extra_shared_abilities": True,
+        "stacking_world_items": True,
+        "halloween_town_key_item_bundle": True,
         "exp_zero_in_pool": False,
+        "randomize_party_member_starting_accessories": True,
+        "death_link": False,
         "donald_death_link": False,
-        "goofy_death_link": False
+        "goofy_death_link": False,
+        "remote_items": RemoteItems.option_off,
+        "shorten_go_mode": True,
+        "one_hp": False,
+        "four_by_three": False,
+        "beep_hack": False,
+        "consistent_finishers": False,
+        "early_skip": True,
+        "fast_camera": False,
+        "faster_animations": True,
+        "unlock_0_volume": False,
+        "unskippable": True,
+        "auto_save": True,
+        "warp_anywhere": False
     },
     # Advanced playthrough with most settings on.
     "Advanced": {
-        "goal": Goal.option_final_ansem,
-        "end_of_the_world_unlock": EndoftheWorldUnlock.option_reports,
-        "final_rest_door": FinalRestDoor.option_reports,
-        "required_reports_eotw": 7,
-        "required_reports_door": 10,
-        "reports_in_pool": 13,
+        "final_rest_door_key": FinalRestDoorKey.option_lucky_emblems,
+        "end_of_the_world_unlock": EndoftheWorldUnlock.option_lucky_emblems,
+        "required_lucky_emblems_eotw": 7,
+        "required_lucky_emblems_door": 10,
+        "lucky_emblems_in_pool": 13,
+        "required_postcards": 10,
+        "required_puppies": 99,
+        "destiny_islands": True,
+        "day_2_materials": 4,
+        "homecoming_materials": 10,
+        "materials_in_pool": 13,
         
         "super_bosses": True,
         "atlantica": True,
         "hundred_acre_wood": True,
-        "cups": True,
-        "vanilla_emblem_pieces": False,
+        "cups": Cups.option_off,
+        "jungle_slider": True,
+        "randomize_emblem_pieces": True,
+        "randomize_postcards": RandomizePostcards.option_all,
         
-        "exp_multiplier": 48,
-        "level_checks": 100,
-        "force_stats_on_levels": 1,
+        "exp_multiplier": 64,
+        "level_checks": 99,
+        "slot_2_level_checks": 33,
+        "max_level_for_slot_2_level_checks": 50,
+        "force_stats_on_levels": 2,
         "strength_increase": 24,
         "defense_increase": 24,
         "hp_increase": 23,
@@ -116,40 +211,83 @@ kh1_option_presets: Dict[str, Dict[str, Any]] = {
         "item_slot_increase": 3,
         
         "keyblades_unlock_chests": True,
-        "randomize_keyblade_stats": True,
+        "keyblade_stats": KeybladeStats.option_shuffle,
         "bad_starting_weapons": True,
         "keyblade_max_str": 14,
         "keyblade_min_str": 3,
+        "keyblade_max_crit_rate": 200,
+        "keyblade_min_crit_rate": 0,
+        "keyblade_max_crit_str": 16,
+        "keyblade_min_crit_str": 0,
+        "keyblade_max_recoil": 90,
+        "keyblade_min_recoil": 1,
         "keyblade_max_mp": 3,
         "keyblade_min_mp": -2,
         
-        "puppies": Puppies.option_triplets,
+        "orichalcum_in_pool": 20,
+        "orichalcum_price": 500,
+        "mythril_in_pool": 20,
+        "mythril_price": 500,
+        
+        "randomize_ap_costs": RandomizeAPCosts.option_off,
+        "max_ap_cost": 5,
+        "min_ap_cost": 0,
+        
+        "randomize_puppies": True,
+        "puppy_value": 3,
         "starting_worlds": 0,
+        "starting_tools": True,
         "interact_in_battle": True,
-        "advanced_logic": True,
+        "logic_difficulty": LogicDifficulty.option_proud,
         "extra_shared_abilities": True,
+        "stacking_world_items": True,
+        "halloween_town_key_item_bundle": True,
         "exp_zero_in_pool": True,
+        "randomize_party_member_starting_accessories": True,
+        "death_link": False,
         "donald_death_link": False,
-        "goofy_death_link": False
+        "goofy_death_link": False,
+        "remote_items": RemoteItems.option_off,
+        "shorten_go_mode": True,
+        "one_hp": False,
+        "four_by_three": False,
+        "beep_hack": False,
+        "consistent_finishers": False,
+        "early_skip": True,
+        "fast_camera": False,
+        "faster_animations": True,
+        "unlock_0_volume": False,
+        "unskippable": True,
+        "auto_save": True,
+        "warp_anywhere": False
     },
     # Playthrough meant to enhance the level 1 experience.
     "Level 1": {
-        "goal": Goal.option_final_ansem,
-        "end_of_the_world_unlock": EndoftheWorldUnlock.option_reports,
-        "final_rest_door": FinalRestDoor.option_reports,
-        "required_reports_eotw": 7,
-        "required_reports_door": 10,
-        "reports_in_pool": 13,
+        "final_rest_door_key": FinalRestDoorKey.option_lucky_emblems,
+        "end_of_the_world_unlock": EndoftheWorldUnlock.option_lucky_emblems,
+        "required_lucky_emblems_eotw": 7,
+        "required_lucky_emblems_door": 10,
+        "lucky_emblems_in_pool": 13,
+        "required_postcards": 10,
+        "required_puppies": 99,
+        "destiny_islands": True,
+        "day_2_materials": 4,
+        "homecoming_materials": 10,
+        "materials_in_pool": 13,
         
         "super_bosses": False,
         "atlantica": False,
         "hundred_acre_wood": False,
-        "cups": False,
-        "vanilla_emblem_pieces": True,
+        "cups": Cups.option_off,
+        "jungle_slider": False,
+        "randomize_emblem_pieces": False,
+        "randomize_postcards": RandomizePostcards.option_all,
         
         "exp_multiplier": 16,
         "level_checks": 0,
-        "force_stats_on_levels": 101,
+        "slot_2_level_checks": 0,
+        "max_level_for_slot_2_level_checks": 50,
+        "force_stats_on_levels": 2,
         "strength_increase": 0,
         "defense_increase": 0,
         "hp_increase": 0,
@@ -158,20 +296,54 @@ kh1_option_presets: Dict[str, Dict[str, Any]] = {
         "item_slot_increase": 5,
         
         "keyblades_unlock_chests": False,
-        "randomize_keyblade_stats": True,
+        "keyblade_stats": KeybladeStats.option_shuffle,
         "bad_starting_weapons": False,
         "keyblade_max_str": 14,
         "keyblade_min_str": 3,
+        "keyblade_max_crit_rate": 200,
+        "keyblade_min_crit_rate": 0,
+        "keyblade_max_crit_str": 16,
+        "keyblade_min_crit_str": 0,
+        "keyblade_max_recoil": 90,
+        "keyblade_min_recoil": 1,
         "keyblade_max_mp": 3,
         "keyblade_min_mp": -2,
         
-        "puppies": Puppies.option_triplets,
+        "orichalcum_in_pool": 20,
+        "orichalcum_price": 500,
+        "mythril_in_pool": 20,
+        "mythril_price": 500,
+        
+        "randomize_ap_costs": RandomizeAPCosts.option_off,
+        "max_ap_cost": 5,
+        "min_ap_cost": 0,
+        
+        "randomize_puppies": True,
+        "puppy_value": 3,
         "starting_worlds": 0,
-        "interact_in_battle": False,
-        "advanced_logic": False,
-        "extra_shared_abilities": False,
+        "starting_tools": True,
+        "interact_in_battle": True,
+        "logic_difficulty": LogicDifficulty.option_normal,
+        "extra_shared_abilities": True,
+        "stacking_world_items": True,
+        "halloween_town_key_item_bundle": True,
         "exp_zero_in_pool": False,
+        "randomize_party_member_starting_accessories": True,
+        "death_link": False,
         "donald_death_link": False,
-        "goofy_death_link": False
+        "goofy_death_link": False,
+        "remote_items": RemoteItems.option_off,
+        "shorten_go_mode": True,
+        "one_hp": False,
+        "four_by_three": False,
+        "beep_hack": False,
+        "consistent_finishers": True,
+        "early_skip": True,
+        "fast_camera": False,
+        "faster_animations": True,
+        "unlock_0_volume": False,
+        "unskippable": True,
+        "auto_save": True,
+        "warp_anywhere": False
     }
 }

worlds/kh1/Regions.py

@@ -9,12 +9,16 @@ class KH1RegionData(NamedTuple):
     region_exits: Optional[List[str]]
 
 
-def create_regions(multiworld: MultiWorld, player: int, options):
+def create_regions(kh1world):
+    multiworld = kh1world.multiworld
+    player     = kh1world.player
+    options    = kh1world.options
+    
     regions: Dict[str, KH1RegionData] = {
-        "Menu":             KH1RegionData([], ["Awakening", "Levels"]),
-        "Awakening":        KH1RegionData([],   ["Destiny Islands"]),
-        "Destiny Islands":  KH1RegionData([],   ["Traverse Town"]),
-        "Traverse Town":    KH1RegionData([],   ["World Map"]),
+        "Menu":             KH1RegionData([], ["Awakening", "Levels", "World Map"]),
+        "Awakening":        KH1RegionData([],   []),
+        "Destiny Islands":  KH1RegionData([],   []),
+        "Traverse Town":    KH1RegionData([],   []),
         "Wonderland":       KH1RegionData([],   []),
         "Olympus Coliseum": KH1RegionData([],   []),
         "Deep Jungle":      KH1RegionData([],   []),
@@ -27,17 +31,27 @@ def create_regions(multiworld: MultiWorld, player: int, options):
         "End of the World": KH1RegionData([],   []),
         "100 Acre Wood":    KH1RegionData([],   []),
         "Levels":           KH1RegionData([],   []),
-        "World Map":        KH1RegionData([],   ["Wonderland", "Olympus Coliseum", "Deep Jungle",
+        "Homecoming":       KH1RegionData([],   []),
+        "World Map":        KH1RegionData([],   ["Destiny Islands", "Traverse Town", 
+                                         "Wonderland", "Olympus Coliseum", "Deep Jungle",
                                          "Agrabah", "Monstro", "Atlantica",
                                          "Halloween Town", "Neverland", "Hollow Bastion",
-                                         "End of the World", "100 Acre Wood"])
+                                         "End of the World", "100 Acre Wood", "Homecoming"])
     }
+    
+    if not options.atlantica:
+        del regions["Atlantica"]
+        regions["World Map"].region_exits.remove("Atlantica")
+    if not options.destiny_islands:
+        del regions["Destiny Islands"]
+        regions["World Map"].region_exits.remove("Destiny Islands")
 
     # Set up locations
     regions["Agrabah"].locations.append("Agrabah Aladdin's House Main Street Entrance Chest")
     regions["Agrabah"].locations.append("Agrabah Aladdin's House Plaza Entrance Chest")
     regions["Agrabah"].locations.append("Agrabah Alley Chest")
     regions["Agrabah"].locations.append("Agrabah Bazaar Across Windows Chest")
+    regions["Agrabah"].locations.append("Agrabah Bazaar Blue Trinity")
     regions["Agrabah"].locations.append("Agrabah Bazaar High Corner Chest")
     regions["Agrabah"].locations.append("Agrabah Cave of Wonders Bottomless Hall Across Chasm Chest")
     regions["Agrabah"].locations.append("Agrabah Cave of Wonders Bottomless Hall Pillar Chest")
@@ -59,6 +73,7 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Agrabah"].locations.append("Agrabah Cave of Wonders Treasure Room Above Fire Chest")
     regions["Agrabah"].locations.append("Agrabah Cave of Wonders Treasure Room Across Platforms Chest")
     regions["Agrabah"].locations.append("Agrabah Cave of Wonders Treasure Room Large Treasure Pile Chest")
+    regions["Agrabah"].locations.append("Agrabah Cave of Wonders Treasure Room Red Trinity")
     regions["Agrabah"].locations.append("Agrabah Cave of Wonders Treasure Room Small Treasure Pile Chest")
     regions["Agrabah"].locations.append("Agrabah Defeat Jafar Blizzard Event")
     regions["Agrabah"].locations.append("Agrabah Defeat Jafar Genie Ansem's Report 1")
@@ -96,15 +111,11 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Deep Jungle"].locations.append("Deep Jungle Hippo's Lagoon Center Chest")
     regions["Deep Jungle"].locations.append("Deep Jungle Hippo's Lagoon Left Chest")
     regions["Deep Jungle"].locations.append("Deep Jungle Hippo's Lagoon Right Chest")
-    regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 10 Fruits")
-    regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 20 Fruits")
-    regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 30 Fruits")
-    regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 40 Fruits")
-    regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 50 Fruits")
     regions["Deep Jungle"].locations.append("Deep Jungle Seal Keyhole Jungle King Event")
     regions["Deep Jungle"].locations.append("Deep Jungle Seal Keyhole Red Trinity Event")
     regions["Deep Jungle"].locations.append("Deep Jungle Tent Chest")
     regions["Deep Jungle"].locations.append("Deep Jungle Tent Protect-G Event")
+    regions["Deep Jungle"].locations.append("Deep Jungle Treetop Green Trinity")
     regions["Deep Jungle"].locations.append("Deep Jungle Tree House Beneath Tree House Chest")
     regions["Deep Jungle"].locations.append("Deep Jungle Tree House Rooftop Chest")
     regions["Deep Jungle"].locations.append("Deep Jungle Tree House Save Gorillas")
@@ -138,7 +149,7 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["End of the World"].locations.append("End of the World World Terminus Atlantica Chest")
     regions["End of the World"].locations.append("End of the World World Terminus Deep Jungle Chest")
     regions["End of the World"].locations.append("End of the World World Terminus Halloween Town Chest")
-    #regions["End of the World"].locations.append("End of the World World Terminus Hollow Bastion Chest")
+    regions["End of the World"].locations.append("End of the World World Terminus Hollow Bastion Chest")
     regions["End of the World"].locations.append("End of the World World Terminus Neverland Chest")
     regions["End of the World"].locations.append("End of the World World Terminus Olympus Coliseum Chest")
     regions["End of the World"].locations.append("End of the World World Terminus Traverse Town Chest")
@@ -181,6 +192,7 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Maleficent Donald Cheer Event")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Riku I White Trinity Event")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Riku II Ragnarok Event")
+    regions["Hollow Bastion"].locations.append("Hollow Bastion Dungeon Blue Trinity")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Dungeon By Candles Chest")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Dungeon Corner Chest")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Entrance Hall Emblem Piece (Chest)")
@@ -192,6 +204,7 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Hollow Bastion"].locations.append("Hollow Bastion Grand Hall Oblivion Chest")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Grand Hall Steps Right Side Chest")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Great Crest After Battle Platform Chest")
+    regions["Hollow Bastion"].locations.append("Hollow Bastion Great Crest Blue Trinity")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Great Crest Lower Chest")
     regions["Hollow Bastion"].locations.append("Hollow Bastion High Tower 1st Gravity Chest")
     regions["Hollow Bastion"].locations.append("Hollow Bastion High Tower 2nd Gravity Chest")
@@ -203,6 +216,7 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Hollow Bastion"].locations.append("Hollow Bastion Library Speak to Belle Divine Rose")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Library Top of Bookshelf Chest")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Library Top of Bookshelf Turn the Carousel Chest")
+    regions["Hollow Bastion"].locations.append("Hollow Bastion Lift Stop from Waterway Examine Node")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Lift Stop Heartless Sigil Door Gravity Chest")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Lift Stop Library Node After High Tower Switch Gravity Chest")
     regions["Hollow Bastion"].locations.append("Hollow Bastion Lift Stop Library Node Gravity Chest")
@@ -230,6 +244,7 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Monstro"].locations.append("Monstro Chamber 3 Platform Above Chamber 2 Entrance Chest")
     regions["Monstro"].locations.append("Monstro Chamber 3 Platform Near Chamber 6 Entrance Chest")
     regions["Monstro"].locations.append("Monstro Chamber 5 Atop Barrel Chest")
+    regions["Monstro"].locations.append("Monstro Chamber 5 Blue Trinity")
     regions["Monstro"].locations.append("Monstro Chamber 5 Low 1st Chest")
     regions["Monstro"].locations.append("Monstro Chamber 5 Low 2nd Chest")
     regions["Monstro"].locations.append("Monstro Chamber 5 Platform Chest")
@@ -240,26 +255,28 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Monstro"].locations.append("Monstro Chamber 6 White Trinity Chest")
     regions["Monstro"].locations.append("Monstro Defeat Parasite Cage I Goofy Cheer Event")
     regions["Monstro"].locations.append("Monstro Defeat Parasite Cage II Stop Event")
+    regions["Monstro"].locations.append("Monstro Mouth Blue Trinity")
     regions["Monstro"].locations.append("Monstro Mouth Boat Deck Chest")
     regions["Monstro"].locations.append("Monstro Mouth Green Trinity Top of Boat Chest")
     regions["Monstro"].locations.append("Monstro Mouth High Platform Across from Boat Chest")
     regions["Monstro"].locations.append("Monstro Mouth High Platform Boat Side Chest")
     regions["Monstro"].locations.append("Monstro Mouth High Platform Near Teeth Chest")
     regions["Monstro"].locations.append("Monstro Mouth Near Ship Chest")
+    regions["Monstro"].locations.append("Monstro Throat Blue Trinity")
     regions["Neverland"].locations.append("Neverland Cabin Chest")
     regions["Neverland"].locations.append("Neverland Captain's Cabin Chest")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 01:00 Door")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 02:00 Door")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 03:00 Door")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 04:00 Door")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 05:00 Door")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 06:00 Door")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 07:00 Door")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 08:00 Door")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 09:00 Door")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 10:00 Door")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 11:00 Door")
-    #regions["Neverland"].locations.append("Neverland Clock Tower 12:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 01:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 02:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 03:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 04:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 05:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 06:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 07:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 08:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 09:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 10:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 11:00 Door")
+    regions["Neverland"].locations.append("Neverland Clock Tower 12:00 Door")
     regions["Neverland"].locations.append("Neverland Clock Tower Chest")
     regions["Neverland"].locations.append("Neverland Defeat Anti Sora Raven's Claw Event")
     regions["Neverland"].locations.append("Neverland Defeat Captain Hook Ars Arcanum Event")
@@ -276,6 +293,7 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Neverland"].locations.append("Neverland Pirate Ship Deck White Trinity Chest")
     regions["Neverland"].locations.append("Neverland Seal Keyhole Fairy Harp Event")
     regions["Neverland"].locations.append("Neverland Seal Keyhole Glide Event")
+    regions["Neverland"].locations.append("Neverland Seal Keyhole Navi-G Piece Event")
     regions["Neverland"].locations.append("Neverland Seal Keyhole Tinker Bell Event")
     regions["Olympus Coliseum"].locations.append("Olympus Coliseum Clear Phil's Training Thunder Event")
     regions["Olympus Coliseum"].locations.append("Olympus Coliseum Cloud Sonic Blade Event")
@@ -292,14 +310,16 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Traverse Town"].locations.append("Traverse Town 1st District Accessory Shop Roof Chest")
     #regions["Traverse Town"].locations.append("Traverse Town 1st District Aerith Gift")
     regions["Traverse Town"].locations.append("Traverse Town 1st District Blue Trinity Balcony Chest")
+    regions["Traverse Town"].locations.append("Traverse Town 1st District Blue Trinity by Exit Door")
     regions["Traverse Town"].locations.append("Traverse Town 1st District Candle Puzzle Chest")
-    #regions["Traverse Town"].locations.append("Traverse Town 1st District Leon Gift")
+    regions["Traverse Town"].locations.append("Traverse Town 1st District Leon Gift")
     regions["Traverse Town"].locations.append("Traverse Town 1st District Safe Postcard")
-    regions["Traverse Town"].locations.append("Traverse Town 1st District Speak with Cid Event")
+   #regions["Traverse Town"].locations.append("Traverse Town 1st District Speak with Cid Event")
     regions["Traverse Town"].locations.append("Traverse Town 2nd District Boots and Shoes Awning Chest")
     regions["Traverse Town"].locations.append("Traverse Town 2nd District Gizmo Shop Facade Chest")
     regions["Traverse Town"].locations.append("Traverse Town 2nd District Rooftop Chest")
     regions["Traverse Town"].locations.append("Traverse Town 3rd District Balcony Postcard")
+    regions["Traverse Town"].locations.append("Traverse Town 3rd District Blue Trinity")
     regions["Traverse Town"].locations.append("Traverse Town Accessory Shop Chest")
     regions["Traverse Town"].locations.append("Traverse Town Alleyway Balcony Chest")
     regions["Traverse Town"].locations.append("Traverse Town Alleyway Behind Crates Chest")
@@ -310,6 +330,7 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Traverse Town"].locations.append("Traverse Town Defeat Guard Armor Dodge Roll Event")
     regions["Traverse Town"].locations.append("Traverse Town Defeat Guard Armor Fire Event")
     regions["Traverse Town"].locations.append("Traverse Town Defeat Opposite Armor Aero Event")
+    regions["Traverse Town"].locations.append("Traverse Town Defeat Opposite Armor Navi-G Piece Event")
     regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Chest")
     regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Geppetto All Summons Reward")
     regions["Traverse Town"].locations.append("Traverse Town Geppetto's House Geppetto Reward 1")
@@ -329,6 +350,7 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Traverse Town"].locations.append("Traverse Town Item Workshop Right Chest")
     regions["Traverse Town"].locations.append("Traverse Town Kairi Secret Waterway Oathkeeper Event")
     regions["Traverse Town"].locations.append("Traverse Town Leon Secret Waterway Earthshine Event")
+    regions["Traverse Town"].locations.append("Traverse Town Magician's Study Blue Trinity")
     regions["Traverse Town"].locations.append("Traverse Town Magician's Study Obtained All Arts Items")
     regions["Traverse Town"].locations.append("Traverse Town Magician's Study Obtained All LV1 Magic")
     regions["Traverse Town"].locations.append("Traverse Town Magician's Study Obtained All LV3 Magic")
@@ -357,26 +379,62 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 99 Puppies Reward 1")
     regions["Traverse Town"].locations.append("Traverse Town Piano Room Return 99 Puppies Reward 2")
     regions["Traverse Town"].locations.append("Traverse Town Red Room Chest")
+    regions["Traverse Town"].locations.append("Traverse Town Secret Waterway Navi Gummi Event")
     regions["Traverse Town"].locations.append("Traverse Town Secret Waterway Near Stairs Chest")
     regions["Traverse Town"].locations.append("Traverse Town Secret Waterway White Trinity Chest")
-    regions["Traverse Town"].locations.append("Traverse Town Synth Cloth")
-    regions["Traverse Town"].locations.append("Traverse Town Synth Fish")
-    regions["Traverse Town"].locations.append("Traverse Town Synth Log")
-    regions["Traverse Town"].locations.append("Traverse Town Synth Mushroom")
-    regions["Traverse Town"].locations.append("Traverse Town Synth Rope")
-    regions["Traverse Town"].locations.append("Traverse Town Synth Seagull Egg")
+    regions["Traverse Town"].locations.append("Traverse Town Synth 15 Items")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 01")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 02")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 03")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 04")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 05")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 06")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 07")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 08")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 09")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 10")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 11")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 12")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 13")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 14")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 15")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 16")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 17")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 18")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 19")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 20")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 21")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 22")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 23")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 24")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 25")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 26")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 27")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 28")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 29")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 30")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 31")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 32")
+    regions["Traverse Town"].locations.append("Traverse Town Synth Item 33")
+    regions["Wonderland"].locations.append("Wonderland Bizarre Room Examine Flower Pot")
     regions["Wonderland"].locations.append("Wonderland Bizarre Room Green Trinity Chest")
     regions["Wonderland"].locations.append("Wonderland Bizarre Room Lamp Chest")
     regions["Wonderland"].locations.append("Wonderland Bizarre Room Navi-G Piece Event")
     regions["Wonderland"].locations.append("Wonderland Bizarre Room Read Book")
     regions["Wonderland"].locations.append("Wonderland Defeat Trickmaster Blizzard Event")
     regions["Wonderland"].locations.append("Wonderland Defeat Trickmaster Ifrit's Horn Event")
+    regions["Wonderland"].locations.append("Wonderland Lotus Forest Blue Trinity in Alcove")
+    regions["Wonderland"].locations.append("Wonderland Lotus Forest Blue Trinity by Moving Boulder")
     regions["Wonderland"].locations.append("Wonderland Lotus Forest Corner Chest")
     regions["Wonderland"].locations.append("Wonderland Lotus Forest Glide Chest")
     regions["Wonderland"].locations.append("Wonderland Lotus Forest Nut Chest")
+    regions["Wonderland"].locations.append("Wonderland Lotus Forest Red Flower Raise Lily Pads")
+    regions["Wonderland"].locations.append("Wonderland Lotus Forest Red Flowers on the Main Path")
     regions["Wonderland"].locations.append("Wonderland Lotus Forest Through the Painting Thunder Plant Chest")
     regions["Wonderland"].locations.append("Wonderland Lotus Forest Through the Painting White Trinity Chest")
     regions["Wonderland"].locations.append("Wonderland Lotus Forest Thunder Plant Chest")
+    regions["Wonderland"].locations.append("Wonderland Lotus Forest Yellow Elixir Flower Through Painting")
+    regions["Wonderland"].locations.append("Wonderland Lotus Forest Yellow Flowers in Middle Clearing and Through Painting")
     regions["Wonderland"].locations.append("Wonderland Queen's Castle Hedge Left Red Chest")
     regions["Wonderland"].locations.append("Wonderland Queen's Castle Hedge Right Blue Chest")
     regions["Wonderland"].locations.append("Wonderland Queen's Castle Hedge Right Red Chest")
@@ -388,6 +446,11 @@ def create_regions(multiworld: MultiWorld, player: int, options):
     regions["Wonderland"].locations.append("Wonderland Tea Party Garden Above Lotus Forest Entrance 2nd Chest")
     regions["Wonderland"].locations.append("Wonderland Tea Party Garden Across From Bizarre Room Entrance Chest")
     regions["Wonderland"].locations.append("Wonderland Tea Party Garden Bear and Clock Puzzle Chest")
+    regions["Wonderland"].locations.append("Wonderland Tea Party Garden Left Cushioned Chair")
+    regions["Wonderland"].locations.append("Wonderland Tea Party Garden Left Gray Chair")
+    regions["Wonderland"].locations.append("Wonderland Tea Party Garden Left Pink Chair")
+    regions["Wonderland"].locations.append("Wonderland Tea Party Garden Right Brown Chair")
+    regions["Wonderland"].locations.append("Wonderland Tea Party Garden Right Yellow Chair")
     if options.hundred_acre_wood:
         regions["100 Acre Wood"].locations.append("100 Acre Wood Meadow Inside Log Chest")
         regions["100 Acre Wood"].locations.append("100 Acre Wood Bouncing Spot Left Cliff Chest")
@@ -440,7 +503,7 @@ def create_regions(multiworld: MultiWorld, player: int, options):
         regions["Atlantica"].locations.append("Atlantica Undersea Cave Clam")
         regions["Atlantica"].locations.append("Atlantica Sunken Ship Crystal Trident Event")
         regions["Atlantica"].locations.append("Atlantica Defeat Ursula II Ansem's Report 3")
-    if options.cups:
+    if options.cups.current_key != "off":
         regions["Olympus Coliseum"].locations.append("Complete Phil Cup")
         regions["Olympus Coliseum"].locations.append("Complete Phil Cup Solo")
         regions["Olympus Coliseum"].locations.append("Complete Phil Cup Time Trial")
@@ -450,50 +513,84 @@ def create_regions(multiworld: MultiWorld, player: int, options):
         regions["Olympus Coliseum"].locations.append("Complete Hercules Cup")
         regions["Olympus Coliseum"].locations.append("Complete Hercules Cup Solo")
         regions["Olympus Coliseum"].locations.append("Complete Hercules Cup Time Trial")
-        regions["Olympus Coliseum"].locations.append("Complete Hades Cup")
-        regions["Olympus Coliseum"].locations.append("Complete Hades Cup Solo")
-        regions["Olympus Coliseum"].locations.append("Complete Hades Cup Time Trial")
-        regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Cloud and Leon Event")
-        regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Yuffie Event")
-        regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Cerberus Event")
-        regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Behemoth Event")
-        regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Hades Event")
         regions["Olympus Coliseum"].locations.append("Hercules Cup Defeat Cloud Event")
         regions["Olympus Coliseum"].locations.append("Hercules Cup Yellow Trinity Event")
-        regions["Olympus Coliseum"].locations.append("Olympus Coliseum Defeat Hades Ansem's Report 8")
         regions["Olympus Coliseum"].locations.append("Olympus Coliseum Olympia Chest")
-        regions["Olympus Coliseum"].locations.append("Olympus Coliseum Defeat Ice Titan Diamond Dust Event")
-        regions["Olympus Coliseum"].locations.append("Olympus Coliseum Gates Purple Jar After Defeating Hades")
+        if options.cups.current_key == "hades_cup":
+            regions["Olympus Coliseum"].locations.append("Complete Hades Cup")
+            regions["Olympus Coliseum"].locations.append("Complete Hades Cup Solo")
+            regions["Olympus Coliseum"].locations.append("Complete Hades Cup Time Trial")
+            regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Cloud and Leon Event")
+            regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Yuffie Event")
+            regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Cerberus Event")
+            regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Behemoth Event")
+            regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Hades Event")
+            regions["Olympus Coliseum"].locations.append("Olympus Coliseum Defeat Hades Ansem's Report 8")
+            regions["Olympus Coliseum"].locations.append("Olympus Coliseum Gates Purple Jar After Defeating Hades")
+        if options.cups.current_key == "hades_cup" and options.super_bosses:
+            regions["Olympus Coliseum"].locations.append("Olympus Coliseum Defeat Ice Titan Diamond Dust Event")
     if options.super_bosses:
         regions["Neverland"].locations.append("Neverland Defeat Phantom Stop Event")
         regions["Agrabah"].locations.append("Agrabah Defeat Kurt Zisa Zantetsuken Event")
         regions["Agrabah"].locations.append("Agrabah Defeat Kurt Zisa Ansem's Report 11")
-    if options.super_bosses or options.goal.current_key == "sephiroth":
+    if options.super_bosses or options.final_rest_door_key.current_key == "sephiroth":
         regions["Olympus Coliseum"].locations.append("Olympus Coliseum Defeat Sephiroth Ansem's Report 12")
         regions["Olympus Coliseum"].locations.append("Olympus Coliseum Defeat Sephiroth One-Winged Angel Event")
-    if options.super_bosses or options.goal.current_key == "unknown":
+    if options.super_bosses or options.final_rest_door_key.current_key == "unknown":
         regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Unknown Ansem's Report 13")
         regions["Hollow Bastion"].locations.append("Hollow Bastion Defeat Unknown EXP Necklace Event")
-    for i in range(options.level_checks):
-        regions["Levels"].locations.append("Level " + str(i+1).rjust(3, '0'))
-    if options.goal.current_key == "final_ansem":
-        regions["End of the World"].locations.append("Final Ansem")
+    if options.jungle_slider:
+        regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 10 Fruits")
+        regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 20 Fruits")
+        regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 30 Fruits")
+        regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 40 Fruits")
+        regions["Deep Jungle"].locations.append("Deep Jungle Jungle Slider 50 Fruits")
+    for i in range(1,options.level_checks+1):
+        regions["Levels"].locations.append("Level " + str(i+1).rjust(3, '0') + " (Slot 1)")
+        if i+1 in kh1world.get_slot_2_levels():
+            regions["Levels"].locations.append("Level " + str(i+1).rjust(3, '0') + " (Slot 2)")
+    if options.destiny_islands:
+        regions["Destiny Islands"].locations.append("Destiny Islands Seashore Capture Fish 1 (Day 2)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Seashore Capture Fish 2 (Day 2)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Seashore Capture Fish 3 (Day 2)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Seashore Gather Seagull Egg (Day 2)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Seashore Log on Riku's Island (Day 1)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Seashore Log under Bridge (Day 1)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Seashore Gather Cloth (Day 1)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Seashore Gather Rope (Day 1)")
+       #regions["Destiny Islands"].locations.append("Destiny Islands Seashore Deliver Kairi Items (Day 1)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Secret Place Gather Mushroom (Day 2)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Cove Gather Mushroom Near Zip Line (Day 2)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Cove Gather Mushroom in Small Cave (Day 2)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Cove Talk to Kairi (Day 2)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Gather Drinking Water (Day 2)")
+       #regions["Destiny Islands"].locations.append("Destiny Islands Cove Deliver Kairi Items (Day 2)")
+        regions["Destiny Islands"].locations.append("Destiny Islands Chest")
+    regions["Homecoming"].locations.append("Final Ansem")
+    
+    for location in kh1world.get_starting_accessory_locations():
+        regions[location_table[location].category].locations.append(location)
 
     # Set up the regions correctly.
     for name, data in regions.items():
         multiworld.regions.append(create_region(multiworld, player, name, data))
 
-
-def connect_entrances(multiworld: MultiWorld, player: int):
+def connect_entrances(kh1world):
+    multiworld = kh1world.multiworld
+    player     = kh1world.player
+    options    = kh1world.options
+    
     multiworld.get_entrance("Awakening", player).connect(multiworld.get_region("Awakening", player))
-    multiworld.get_entrance("Destiny Islands", player).connect(multiworld.get_region("Destiny Islands", player))
+    if options.destiny_islands:
+        multiworld.get_entrance("Destiny Islands", player).connect(multiworld.get_region("Destiny Islands", player))
     multiworld.get_entrance("Traverse Town", player).connect(multiworld.get_region("Traverse Town", player))
     multiworld.get_entrance("Wonderland", player).connect(multiworld.get_region("Wonderland", player))
     multiworld.get_entrance("Olympus Coliseum", player).connect(multiworld.get_region("Olympus Coliseum", player))
     multiworld.get_entrance("Deep Jungle", player).connect(multiworld.get_region("Deep Jungle", player))
     multiworld.get_entrance("Agrabah", player).connect(multiworld.get_region("Agrabah", player))
     multiworld.get_entrance("Monstro", player).connect(multiworld.get_region("Monstro", player))
-    multiworld.get_entrance("Atlantica", player).connect(multiworld.get_region("Atlantica", player))
+    if options.atlantica:
+        multiworld.get_entrance("Atlantica", player).connect(multiworld.get_region("Atlantica", player))
     multiworld.get_entrance("Halloween Town", player).connect(multiworld.get_region("Halloween Town", player))
     multiworld.get_entrance("Neverland", player).connect(multiworld.get_region("Neverland", player))
     multiworld.get_entrance("Hollow Bastion", player).connect(multiworld.get_region("Hollow Bastion", player))
@@ -501,7 +598,7 @@ def connect_entrances(multiworld: MultiWorld, player: int):
     multiworld.get_entrance("100 Acre Wood", player).connect(multiworld.get_region("100 Acre Wood", player))
     multiworld.get_entrance("World Map", player).connect(multiworld.get_region("World Map", player))
     multiworld.get_entrance("Levels", player).connect(multiworld.get_region("Levels", player))
-
+    multiworld.get_entrance("Homecoming", player).connect(multiworld.get_region("Homecoming", player))
 
 def create_region(multiworld: MultiWorld, player: int, name: str, data: KH1RegionData):
     region = Region(name, player, multiworld)

worlds/kh1/__init__.py

@@ -1,23 +1,29 @@
 import logging
+import re
 from typing import List
+from math import ceil
 
 from BaseClasses import Tutorial
 from worlds.AutoWorld import WebWorld, World
 from .Items import KH1Item, KH1ItemData, event_item_table, get_items_by_category, item_table, item_name_groups
-from .Locations import KH1Location, location_table, get_locations_by_category, location_name_groups
+from .Locations import KH1Location, location_table, get_locations_by_type, location_name_groups
 from .Options import KH1Options, kh1_option_groups
 from .Regions import connect_entrances, create_regions
 from .Rules import set_rules
 from .Presets import kh1_option_presets
-from worlds.LauncherComponents import Component, components, Type, launch as launch_component
-
+from worlds.LauncherComponents import Component, components, Type, launch as launch_component, icon_paths
+from .GenerateJSON import generate_json
+from .Data import VANILLA_KEYBLADE_STATS, VANILLA_PUPPY_LOCATIONS, CHAR_TO_KH, VANILLA_ABILITY_AP_COSTS, WORLD_KEY_ITEMS
+from worlds.LauncherComponents import Component, components, Type, launch_subprocess
 
 def launch_client():
     from .Client import launch
     launch_component(launch, name="KH1 Client")
 
 
-components.append(Component("KH1 Client", "KH1Client", func=launch_client, component_type=Type.CLIENT))
+components.append(Component("KH1 Client", func=launch_client, component_type=Type.CLIENT, icon="kh1_heart"))
+
+icon_paths["kh1_heart"] = f"ap:{__name__}/icons/kh1_heart.png"
 
 
 class KH1Web(WebWorld):
@@ -54,6 +60,19 @@ class KH1World(World):
     fillers.update(get_items_by_category("Item"))
     fillers.update(get_items_by_category("Camping"))
     fillers.update(get_items_by_category("Stat Ups"))
+    slot_2_levels: list[int]
+    keyblade_stats: list[dict[str, int]]
+    starting_accessory_locations: list[str]
+    starting_accessories: list[str]
+    ap_costs: list[dict[str, str | int | bool]]
+
+    def __init__(self, multiworld, player):
+        super(KH1World, self).__init__(multiworld, player)
+        self.slot_2_levels = None
+        self.keyblade_stats = None
+        self.starting_accessory_locations = None
+        self.starting_accessories = None
+        self.ap_costs = None
 
     def create_items(self):
         self.place_predetermined_items()
@@ -63,12 +82,29 @@ class KH1World(World):
             possible_starting_worlds = ["Wonderland", "Olympus Coliseum", "Deep Jungle", "Agrabah", "Monstro", "Halloween Town", "Neverland", "Hollow Bastion"]
             if self.options.atlantica:
                 possible_starting_worlds.append("Atlantica")
+            if self.options.destiny_islands:
+                possible_starting_worlds.append("Destiny Islands")
             if self.options.end_of_the_world_unlock == "item":
                 possible_starting_worlds.append("End of the World")
             starting_worlds = self.random.sample(possible_starting_worlds, min(self.options.starting_worlds.value, len(possible_starting_worlds)))
             for starting_world in starting_worlds:
                 self.multiworld.push_precollected(self.create_item(starting_world))
         
+        # Handle starting tools
+        starting_tools = []
+        if self.options.starting_tools:
+            starting_tools = ["Scan", "Dodge Roll"]
+            self.multiworld.push_precollected(self.create_item("Scan"))
+            self.multiworld.push_precollected(self.create_item("Dodge Roll"))
+        
+        # Handle starting party member accessories
+        starting_party_member_accessories = []
+        starting_party_member_locations = []
+        starting_party_member_locations = self.get_starting_accessory_locations()
+        starting_party_member_accessories = self.get_starting_accessories()
+        for i in range(len(starting_party_member_locations)):
+            self.get_location(self.starting_accessory_locations[i]).place_locked_item(self.create_item(self.starting_accessories[i]))
+        
         item_pool: List[KH1Item] = []
         possible_level_up_item_pool = []
         level_up_item_pool = []
@@ -94,19 +130,26 @@ class KH1World(World):
 
         # Fill remaining pool with items from other pool
         self.random.shuffle(possible_level_up_item_pool)
-        level_up_item_pool = level_up_item_pool + possible_level_up_item_pool[:(100 - len(level_up_item_pool))]
-
-        level_up_locations = list(get_locations_by_category("Levels").keys())
+        level_up_item_pool = level_up_item_pool + possible_level_up_item_pool[:(99 - len(level_up_item_pool))]
+        
+        level_up_locations = list(get_locations_by_type("Level Slot 1").keys())
         self.random.shuffle(level_up_item_pool)
-        current_level_for_placing_stats = self.options.force_stats_on_levels.value
-        while len(level_up_item_pool) > 0 and current_level_for_placing_stats <= self.options.level_checks:
-            self.get_location(level_up_locations[current_level_for_placing_stats - 1]).place_locked_item(self.create_item(level_up_item_pool.pop()))
-            current_level_for_placing_stats += 1
+        current_level_index_for_placing_stats = self.options.force_stats_on_levels.value - 2 # Level 2 is index 0, Level 3 is index 1, etc
+        if self.options.remote_items.current_key == "off" and self.options.force_stats_on_levels.value != 2:
+            logging.info(f"{self.player_name}'s value {self.options.force_stats_on_levels.value} for force_stats_on_levels was changed\n"
+                         f"Set to 2 as remote_items if \"off\"")
+            self.options.force_stats_on_levels.value = 2
+            current_level_index_for_placing_stats = 0
+        while len(level_up_item_pool) > 0 and current_level_index_for_placing_stats < self.options.level_checks: # With all levels in location pool, 99 level ups so need to go index 0-98
+            self.get_location(level_up_locations[current_level_index_for_placing_stats]).place_locked_item(self.create_item(level_up_item_pool.pop()))
+            current_level_index_for_placing_stats += 1
+        
+        
         
         # Calculate prefilled locations and items
-        prefilled_items = []
-        if self.options.vanilla_emblem_pieces:
-            prefilled_items = prefilled_items + ["Emblem Piece (Flame)", "Emblem Piece (Chest)", "Emblem Piece (Fountain)", "Emblem Piece (Statue)"]
+        exclude_items = ["Final Door Key", "Lucky Emblem"]
+        if not self.options.randomize_emblem_pieces:
+            exclude_items = exclude_items + ["Emblem Piece (Flame)", "Emblem Piece (Chest)", "Emblem Piece (Fountain)", "Emblem Piece (Statue)"]
         
         total_locations = len(self.multiworld.get_unfilled_locations(self.player))
         
@@ -117,27 +160,29 @@ class KH1World(World):
             quantity = data.max_quantity
             if data.category not in non_filler_item_categories:
                 continue
-            if name in starting_worlds:
+            if name in starting_worlds or name in starting_tools or name in starting_party_member_accessories:
                 continue
-            if data.category == "Puppies":
-                if self.options.puppies == "triplets" and "-" in name:
-                    item_pool += [self.create_item(name) for _ in range(quantity)]
-                if self.options.puppies == "individual" and "Puppy" in name:
-                    item_pool += [self.create_item(name) for _ in range(0, quantity)]
-                if self.options.puppies == "full" and name == "All Puppies":
-                    item_pool += [self.create_item(name) for _ in range(0, quantity)]
+            if self.options.stacking_world_items and name in WORLD_KEY_ITEMS.keys() and name not in ("Crystal Trident", "Jack-In-The-Box"): # Handling these special cases separately
+                item_pool += [self.create_item(WORLD_KEY_ITEMS[name]) for _ in range(0, 1)]
+            elif self.options.halloween_town_key_item_bundle and name == "Jack-In-The-Box":
+                continue
+            elif name == "Puppy":
+                if self.options.randomize_puppies:
+                    item_pool += [self.create_item(name) for _ in range(ceil(99/self.options.puppy_value.value))]
             elif name == "Atlantica":
                 if self.options.atlantica:
                     item_pool += [self.create_item(name) for _ in range(0, quantity)]
             elif name == "Mermaid Kick":
-                if self.options.atlantica:
-                    if self.options.extra_shared_abilities:
-                        item_pool += [self.create_item(name) for _ in range(0, 2)]
-                    else:
-                        item_pool += [self.create_item(name) for _ in range(0, quantity)]
+                if self.options.atlantica and self.options.extra_shared_abilities:
+                    item_pool += [self.create_item(name) for _ in range(0, 2)]
+                else:
+                    item_pool += [self.create_item(name) for _ in range(0, quantity)]
             elif name == "Crystal Trident":
                 if self.options.atlantica:
-                    item_pool += [self.create_item(name) for _ in range(0, quantity)]
+                    if self.options.stacking_world_items:
+                        item_pool += [self.create_item(WORLD_KEY_ITEMS[name]) for _ in range(0, 1)]
+                    else:
+                        item_pool += [self.create_item(name) for _ in range(0, quantity)]
             elif name == "High Jump":
                 if self.options.extra_shared_abilities:
                     item_pool += [self.create_item(name) for _ in range(0, 3)]
@@ -154,11 +199,26 @@ class KH1World(World):
             elif name == "EXP Zero":
                 if self.options.exp_zero_in_pool:
                     item_pool += [self.create_item(name) for _ in range(0, quantity)]
-            elif name not in prefilled_items:
+            elif name == "Postcard":
+                if self.options.randomize_postcards.current_key == "chests":
+                    item_pool += [self.create_item(name) for _ in range(0, 3)]
+                if self.options.randomize_postcards.current_key == "all":
+                    item_pool += [self.create_item(name) for _ in range(0, quantity)]
+            elif name == "Orichalcum":
+                item_pool += [self.create_item(name) for _ in range(0, self.options.orichalcum_in_pool.value)]
+            elif name == "Mythril":
+                item_pool += [self.create_item(name) for _ in range(0, self.options.mythril_in_pool.value)]
+            elif name == "Destiny Islands":
+                if self.options.destiny_islands:
+                    item_pool += [self.create_item(name) for _ in range(0, quantity)]
+            elif name == "Raft Materials":
+                if self.options.destiny_islands:
+                    item_pool += [self.create_item(name) for _ in range(0, self.options.materials_in_pool.value)]
+            elif name not in exclude_items:
                 item_pool += [self.create_item(name) for _ in range(0, quantity)]
         
-        for i in range(self.determine_reports_in_pool()):
-            item_pool += [self.create_item("Ansem's Report " + str(i+1))]
+        for i in range(self.determine_lucky_emblems_in_pool()):
+            item_pool += [self.create_item("Lucky Emblem")]
         
         while len(item_pool) < total_locations and len(level_up_item_pool) > 0:
             item_pool += [self.create_item(level_up_item_pool.pop())]
@@ -170,63 +230,117 @@ class KH1World(World):
         self.multiworld.itempool += item_pool
 
     def place_predetermined_items(self) -> None:
-        goal_dict = {
-            "sephiroth":       "Olympus Coliseum Defeat Sephiroth Ansem's Report 12",
-            "unknown":         "Hollow Bastion Defeat Unknown Ansem's Report 13",
-            "postcards":       "Traverse Town Mail Postcard 10 Event",
-            "final_ansem":     "Final Ansem",
-            "puppies":         "Traverse Town Piano Room Return 99 Puppies Reward 2",
-            "final_rest":      "End of the World Final Rest Chest"
-        }
-        self.get_location(goal_dict[self.options.goal.current_key]).place_locked_item(self.create_item("Victory"))
-        if self.options.vanilla_emblem_pieces:
+        if self.options.final_rest_door_key.current_key not in ["puppies", "postcards", "lucky_emblems"]:
+            goal_dict = {
+                "sephiroth":       "Olympus Coliseum Defeat Sephiroth Ansem's Report 12",
+                "unknown":         "Hollow Bastion Defeat Unknown Ansem's Report 13",
+                "final_rest":      "End of the World Final Rest Chest"
+            }
+            goal_location_name = goal_dict[self.options.final_rest_door_key.current_key]
+        elif self.options.final_rest_door_key.current_key == "postcards":
+            lpad_number = str(self.options.required_postcards).rjust(2, "0")
+            goal_location_name = "Traverse Town Mail Postcard " + lpad_number + " Event"
+        elif self.options.final_rest_door_key.current_key == "puppies":
+            required_puppies = self.options.required_puppies.value
+            goal_location_name = "Traverse Town Piano Room Return " + str(required_puppies) + " Puppies"
+            if required_puppies == 50 or required_puppies == 99:
+                goal_location_name = goal_location_name + " Reward 2"
+        if self.options.final_rest_door_key.current_key != "lucky_emblems":
+            self.get_location(goal_location_name).place_locked_item(self.create_item("Final Door Key"))
+        self.get_location("Final Ansem").place_locked_item(self.create_event("Victory"))
+                
+        if not self.options.randomize_emblem_pieces:
             self.get_location("Hollow Bastion Entrance Hall Emblem Piece (Flame)").place_locked_item(self.create_item("Emblem Piece (Flame)"))
             self.get_location("Hollow Bastion Entrance Hall Emblem Piece (Statue)").place_locked_item(self.create_item("Emblem Piece (Statue)"))
             self.get_location("Hollow Bastion Entrance Hall Emblem Piece (Fountain)").place_locked_item(self.create_item("Emblem Piece (Fountain)"))
             self.get_location("Hollow Bastion Entrance Hall Emblem Piece (Chest)").place_locked_item(self.create_item("Emblem Piece (Chest)"))
+        if self.options.randomize_postcards != "all":
+            self.get_location("Traverse Town Item Shop Postcard").place_locked_item(self.create_item("Postcard"))
+            self.get_location("Traverse Town 1st District Safe Postcard").place_locked_item(self.create_item("Postcard"))
+            self.get_location("Traverse Town Gizmo Shop Postcard 1").place_locked_item(self.create_item("Postcard"))
+            self.get_location("Traverse Town Gizmo Shop Postcard 2").place_locked_item(self.create_item("Postcard"))
+            self.get_location("Traverse Town Item Workshop Postcard").place_locked_item(self.create_item("Postcard"))
+            self.get_location("Traverse Town 3rd District Balcony Postcard").place_locked_item(self.create_item("Postcard"))
+            self.get_location("Traverse Town Geppetto's House Postcard").place_locked_item(self.create_item("Postcard"))
+        if self.options.randomize_postcards.current_key == "vanilla":
+            self.get_location("Traverse Town 1st District Accessory Shop Roof Chest").place_locked_item(self.create_item("Postcard"))
+            self.get_location("Traverse Town 2nd District Boots and Shoes Awning Chest").place_locked_item(self.create_item("Postcard"))
+            self.get_location("Traverse Town 1st District Blue Trinity Balcony Chest").place_locked_item(self.create_item("Postcard"))
+        if not self.options.randomize_puppies:
+            if self.options.puppy_value.value != 3:
+                self.options.puppy_value.value = 3
+                logging.info(f"{self.player_name}'s value of {self.options.puppy_value.value} for puppy value was changed to 3 as Randomize Puppies is OFF")
+            for i, location in enumerate(VANILLA_PUPPY_LOCATIONS):
+                self.get_location(location).place_locked_item(self.create_item("Puppy"))
 
     def get_filler_item_name(self) -> str:
         weights = [data.weight for data in self.fillers.values()]
         return self.random.choices([filler for filler in self.fillers.keys()], weights)[0]
 
     def fill_slot_data(self) -> dict:
-        slot_data = {"xpmult": int(self.options.exp_multiplier)/16,
-                    "required_reports_eotw": self.determine_reports_required_to_open_end_of_the_world(),
-                    "required_reports_door": self.determine_reports_required_to_open_final_rest_door(),
-                    "door": self.options.final_rest_door.current_key,
-                    "seed": self.multiworld.seed_name,
-                    "advanced_logic": bool(self.options.advanced_logic),
-                    "hundred_acre_wood": bool(self.options.hundred_acre_wood),
+        slot_data = {
                     "atlantica": bool(self.options.atlantica),
-                    "goal": str(self.options.goal.current_key)}
-        if self.options.randomize_keyblade_stats:
-            min_str_bonus = min(self.options.keyblade_min_str.value, self.options.keyblade_max_str.value)
-            max_str_bonus = max(self.options.keyblade_min_str.value, self.options.keyblade_max_str.value)
-            self.options.keyblade_min_str.value = min_str_bonus
-            self.options.keyblade_max_str.value = max_str_bonus
-            min_mp_bonus = min(self.options.keyblade_min_mp.value, self.options.keyblade_max_mp.value)
-            max_mp_bonus = max(self.options.keyblade_min_mp.value, self.options.keyblade_max_mp.value)
-            self.options.keyblade_min_mp.value = min_mp_bonus
-            self.options.keyblade_max_mp.value = max_mp_bonus
-            slot_data["keyblade_stats"] = ""
-            for i in range(22):
-                if i < 4 and self.options.bad_starting_weapons:
-                    slot_data["keyblade_stats"] = slot_data["keyblade_stats"] + "1,0,"
-                else:
-                    str_bonus = int(self.random.randint(min_str_bonus, max_str_bonus))
-                    mp_bonus = int(self.random.randint(min_mp_bonus, max_mp_bonus))
-                    slot_data["keyblade_stats"] = slot_data["keyblade_stats"] + str(str_bonus) + "," + str(mp_bonus) + ","
-            slot_data["keyblade_stats"] = slot_data["keyblade_stats"][:-1]
-        if self.options.donald_death_link:
-            slot_data["donalddl"] = ""
-        if self.options.goofy_death_link:
-            slot_data["goofydl"] = ""
-        if self.options.keyblades_unlock_chests:
-            slot_data["chestslocked"] = ""
-        else:
-            slot_data["chestsunlocked"] = ""
-        if self.options.interact_in_battle:
-            slot_data["interactinbattle"] = ""
+                    "auto_attack": bool(self.options.auto_attack),
+                    "auto_save": bool(self.options.auto_save),
+                    "bad_starting_weapons": bool(self.options.bad_starting_weapons),
+                    "beep_hack": bool(self.options.beep_hack),
+                    "consistent_finishers": bool(self.options.consistent_finishers),
+                    "cups": str(self.options.cups.current_key),
+                    "day_2_materials": int(self.options.day_2_materials.value),
+                    "death_link": str(self.options.death_link.current_key),
+                    "destiny_islands": bool(self.options.destiny_islands),
+                    "donald_death_link": bool(self.options.donald_death_link),
+                    "early_skip": bool(self.options.early_skip),
+                    "end_of_the_world_unlock": str(self.options.end_of_the_world_unlock.current_key),
+                    "exp_multiplier": int(self.options.exp_multiplier.value)/16,
+                    "exp_zero_in_pool": bool(self.options.exp_zero_in_pool),
+                    "extra_shared_abilities": bool(self.options.extra_shared_abilities),
+                    "fast_camera": bool(self.options.fast_camera),
+                    "faster_animations": bool(self.options.faster_animations),
+                    "final_rest_door_key": str(self.options.final_rest_door_key.current_key),
+                    "force_stats_on_levels": int(self.options.force_stats_on_levels.value),
+                    "four_by_three": bool(self.options.four_by_three),
+                    "goofy_death_link": bool(self.options.goofy_death_link),
+                    "halloween_town_key_item_bundle": bool(self.options.halloween_town_key_item_bundle),
+                    "homecoming_materials": int(self.options.homecoming_materials.value),
+                    "hundred_acre_wood": bool(self.options.hundred_acre_wood),
+                    "interact_in_battle": bool(self.options.interact_in_battle),
+                    "jungle_slider": bool(self.options.jungle_slider),
+                    "keyblades_unlock_chests": bool(self.options.keyblades_unlock_chests),
+                    "level_checks": int(self.options.level_checks.value),
+                    "logic_difficulty": str(self.options.logic_difficulty.current_key),
+                    "materials_in_pool": int(self.options.materials_in_pool.value),
+                    "max_ap_cost": int(self.options.max_ap_cost.value),
+                    "min_ap_cost": int(self.options.min_ap_cost.value),
+                    "mythril_in_pool": int(self.options.mythril_in_pool.value),
+                    "mythril_price": int(self.options.mythril_price.value),
+                    "one_hp": bool(self.options.one_hp),
+                    "orichalcum_in_pool": int(self.options.orichalcum_in_pool.value),
+                    "orichalcum_price": int(self.options.orichalcum_price.value),
+                    "puppy_value": int(self.options.puppy_value.value),
+                    "randomize_ap_costs": str(self.options.randomize_ap_costs.current_key),
+                    "randomize_emblem_pieces": bool(self.options.exp_zero_in_pool),
+                    "randomize_party_member_starting_accessories": bool(self.options.randomize_party_member_starting_accessories),
+                    "randomize_postcards": str(self.options.randomize_postcards.current_key),
+                    "randomize_puppies": str(self.options.randomize_puppies.current_key),
+                    "remote_items": str(self.options.remote_items.current_key),
+                    "remote_location_ids": self.get_remote_location_ids(),
+                    "required_lucky_emblems_door": self.determine_lucky_emblems_required_to_open_final_rest_door(),
+                    "required_lucky_emblems_eotw": self.determine_lucky_emblems_required_to_open_end_of_the_world(),
+                    "required_postcards": int(self.options.required_postcards.value),
+                    "required_puppies": int(self.options.required_puppies.value),
+                    "seed": self.multiworld.seed_name,
+                    "shorten_go_mode": bool(self.options.shorten_go_mode),
+                    "slot_2_level_checks": int(self.options.slot_2_level_checks.value),
+                    "stacking_world_items": bool(self.options.stacking_world_items),
+                    "starting_items": [item.code for item in self.multiworld.precollected_items[self.player]],
+                    "starting_tools": bool(self.options.starting_tools),
+                    "super_bosses": bool(self.options.super_bosses),
+                    "synthesis_item_name_byte_arrays": self.get_synthesis_item_name_byte_arrays(),
+                    "unlock_0_volume": bool(self.options.unlock_0_volume),
+                    "unskippable": bool(self.options.unskippable),
+                    "warp_anywhere": bool(self.options.warp_anywhere)
+                    }
         return slot_data
     
     def create_item(self, name: str) -> KH1Item:
@@ -241,45 +355,260 @@ class KH1World(World):
         set_rules(self)
 
     def create_regions(self):
-        create_regions(self.multiworld, self.player, self.options)
-
+        create_regions(self)
+    
     def connect_entrances(self):
-        connect_entrances(self.multiworld, self.player)
+        connect_entrances(self)
+    
+    def generate_output(self, output_directory: str):
+        """
+        Generates the json file for use with mod generator.
+        """
+        generate_json(self, output_directory)
     
     def generate_early(self):
-        value_names = ["Reports to Open End of the World", "Reports to Open Final Rest Door", "Reports in Pool"]
-        initial_report_settings = [self.options.required_reports_eotw.value, self.options.required_reports_door.value, self.options.reports_in_pool.value]
-        self.change_numbers_of_reports_to_consider()
-        new_report_settings = [self.options.required_reports_eotw.value, self.options.required_reports_door.value, self.options.reports_in_pool.value]
+        self.determine_level_checks()
+        
+        value_names = ["Lucky Emblems to Open End of the World", "Lucky Emblems to Open Final Rest Door", "Lucky Emblems in Pool"]
+        initial_lucky_emblem_settings = [self.options.required_lucky_emblems_eotw.value, self.options.required_lucky_emblems_door.value, self.options.lucky_emblems_in_pool.value]
+        self.change_numbers_of_lucky_emblems_to_consider()
+        new_lucky_emblem_settings = [self.options.required_lucky_emblems_eotw.value, self.options.required_lucky_emblems_door.value, self.options.lucky_emblems_in_pool.value]
         for i in range(3):
-            if initial_report_settings[i] != new_report_settings[i]:
-                logging.info(f"{self.player_name}'s value {initial_report_settings[i]} for \"{value_names[i]}\" was invalid\n"
-                             f"Setting \"{value_names[i]}\" value to {new_report_settings[i]}")
+            if initial_lucky_emblem_settings[i] != new_lucky_emblem_settings[i]:
+                logging.info(f"{self.player_name}'s value {initial_lucky_emblem_settings[i]} for \"{value_names[i]}\" was invalid\n"
+                             f"Setting \"{value_names[i]}\" value to {new_lucky_emblem_settings[i]}")
+        
+        value_names = ["Day 2 Materials", "Homecoming Materials", "Materials in Pool"]
+        initial_materials_settings = [self.options.day_2_materials.value, self.options.homecoming_materials.value, self.options.materials_in_pool.value]
+        self.change_numbers_of_materials_to_consider()
+        new_materials_settings = [self.options.day_2_materials.value, self.options.homecoming_materials.value, self.options.materials_in_pool.value]
+        for i in range(3):
+            if initial_materials_settings[i] != new_materials_settings[i]:
+                logging.info(f"{self.player_name}'s value {initial_materials_settings[i]} for \"{value_names[i]}\" was invalid\n"
+                             f"Setting \"{value_names[i]}\" value to {new_materials_settings[i]}")
+        
+        if self.options.stacking_world_items.value and not self.options.halloween_town_key_item_bundle.value:
+            logging.info(f"{self.player_name}'s value {self.options.halloween_town_key_item_bundle.value} for Halloween Town Key Item Bundle must be TRUE when Stacking World Items is on.  Setting to TRUE")
+            self.options.halloween_town_key_item_bundle.value = True
     
-    def change_numbers_of_reports_to_consider(self) -> None:
-        if self.options.end_of_the_world_unlock == "reports" and self.options.final_rest_door == "reports":
-            self.options.required_reports_eotw.value, self.options.required_reports_door.value, self.options.reports_in_pool.value = sorted(
-                [self.options.required_reports_eotw.value, self.options.required_reports_door.value, self.options.reports_in_pool.value])
+    def change_numbers_of_lucky_emblems_to_consider(self) -> None:
+        if self.options.end_of_the_world_unlock == "lucky_emblems" and self.options.final_rest_door_key == "lucky_emblems":
+            self.options.required_lucky_emblems_eotw.value, self.options.required_lucky_emblems_door.value, self.options.lucky_emblems_in_pool.value = sorted(
+                [self.options.required_lucky_emblems_eotw.value, self.options.required_lucky_emblems_door.value, self.options.lucky_emblems_in_pool.value])
 
-        elif self.options.end_of_the_world_unlock == "reports":
-            self.options.required_reports_eotw.value, self.options.reports_in_pool.value = sorted(
-                [self.options.required_reports_eotw.value, self.options.reports_in_pool.value])
+        elif self.options.end_of_the_world_unlock == "lucky_emblems":
+            self.options.required_lucky_emblems_eotw.value, self.options.lucky_emblems_in_pool.value = sorted(
+                [self.options.required_lucky_emblems_eotw.value, self.options.lucky_emblems_in_pool.value])
 
-        elif self.options.final_rest_door == "reports":
-            self.options.required_reports_door.value, self.options.reports_in_pool.value = sorted(
-                [self.options.required_reports_door.value, self.options.reports_in_pool.value])
+        elif self.options.final_rest_door_key == "lucky_emblems":
+            self.options.required_lucky_emblems_door.value, self.options.lucky_emblems_in_pool.value = sorted(
+                [self.options.required_lucky_emblems_door.value, self.options.lucky_emblems_in_pool.value])
 
-    def determine_reports_in_pool(self) -> int:
-        if self.options.end_of_the_world_unlock == "reports" or self.options.final_rest_door == "reports":
-            return self.options.reports_in_pool.value
+    def determine_lucky_emblems_in_pool(self) -> int:
+        if self.options.end_of_the_world_unlock == "lucky_emblems" or self.options.final_rest_door_key == "lucky_emblems":
+            return self.options.lucky_emblems_in_pool.value
         return 0
     
-    def determine_reports_required_to_open_end_of_the_world(self) -> int:
-        if self.options.end_of_the_world_unlock == "reports":
-            return self.options.required_reports_eotw.value
-        return 14
+    def determine_lucky_emblems_required_to_open_end_of_the_world(self) -> int:
+        if self.options.end_of_the_world_unlock == "lucky_emblems":
+            return self.options.required_lucky_emblems_eotw.value
+        return -1
     
-    def determine_reports_required_to_open_final_rest_door(self) -> int:
-        if self.options.final_rest_door == "reports":
-            return self.options.required_reports_door.value
-        return 14     
+    def determine_lucky_emblems_required_to_open_final_rest_door(self) -> int:
+        if self.options.final_rest_door_key == "lucky_emblems":
+            return self.options.required_lucky_emblems_door.value
+        return -1
+    
+    def change_numbers_of_materials_to_consider(self) -> None:
+        if self.options.destiny_islands:
+            self.options.day_2_materials.value, self.options.homecoming_materials.value, self.options.materials_in_pool.value = sorted(
+                [self.options.day_2_materials.value, self.options.homecoming_materials.value, self.options.materials_in_pool.value])
+    
+    def get_remote_location_ids(self):
+        remote_location_ids = []
+        for location in self.multiworld.get_filled_locations(self.player):
+            if location.name != "Final Ansem":
+                location_data = location_table[location.name]
+                if self.options.remote_items.current_key == "full":
+                    if location_data.type != "Starting Accessory":
+                        remote_location_ids.append(location_data.code)
+                elif self.player == location.item.player and location.item.name != "Victory":
+                    item_data = item_table[location.item.name]
+                    if location_data.type == "Chest":
+                        if item_data.type in ["Stats"]:
+                            remote_location_ids.append(location_data.code)
+                    if location_data.type == "Reward":
+                        if item_data.type in ["Stats"]:
+                            remote_location_ids.append(location_data.code)
+                    if location_data.type == "Static":
+                        if item_data.type not in ["Item"]:
+                            remote_location_ids.append(location_data.code)
+                    if location_data.type == "Level Slot 1":
+                        if item_data.category not in ["Level Up", "Limited Level Up"]:
+                            remote_location_ids.append(location_data.code)
+                    if location_data.type == "Level Slot 2":
+                        if item_data.category not in ["Level Up", "Limited Level Up", "Abilities"]:
+                            remote_location_ids.append(location_data.code)
+                    if location_data.type == "Synth":
+                        if item_data.type not in ["Item"]:
+                            remote_location_ids.append(location_data.code)
+                    if location_data.type == "Prize":
+                        if item_data.type not in ["Item"]:
+                            remote_location_ids.append(location_data.code)
+        return remote_location_ids
+    
+    def get_slot_2_levels(self):
+        if self.slot_2_levels is None:
+            self.slot_2_levels = []
+            if self.options.max_level_for_slot_2_level_checks - 1 > self.options.level_checks.value:
+                logging.info(f"{self.player_name}'s value of {self.options.max_level_for_slot_2_level_checks.value} for max level for slot 2 level checks is invalid as it exceeds their value of {self.options.level_checks.value} for Level Checks\n"
+                            f"Setting max level for slot 2 level checks's value to {self.options.level_checks.value + 1}")
+                self.options.max_level_for_slot_2_level_checks.value = self.options.level_checks.value + 1
+            if self.options.slot_2_level_checks.value > self.options.level_checks.value:
+                logging.info(f"{self.player_name}'s value of {self.options.slot_2_level_checks.value} for slot 2 level checks is invalid as it exceeds their value of {self.options.level_checks.value} for Level Checks\n"
+                            f"Setting slot 2 level check's value to {self.options.level_checks.value}")
+                self.options.slot_2_level_checks.value = self.options.level_checks.value
+            if self.options.slot_2_level_checks > self.options.max_level_for_slot_2_level_checks - 1:
+                logging.info(f"{self.player_name}'s value of {self.options.slot_2_level_checks.value} for slot 2 level checks is invalid as it exceeds their value of {self.options.max_level_for_slot_2_level_checks.value} for Max Level for Slot 2 Level Checks\n"
+                            f"Setting slot 2 level check's value to {self.options.max_level_for_slot_2_level_checks.value - 1}")
+                self.options.slot_2_level_checks.value = self.options.max_level_for_slot_2_level_checks.value - 1
+            # Range is exclusive of the top, so if max_level_for_slot_2_level_checks is 2 then the top end of the range needs to be 3 as the only level it can choose is 2.
+            self.slot_2_levels = self.random.sample(range(2,self.options.max_level_for_slot_2_level_checks.value + 1), self.options.slot_2_level_checks.value) 
+        return self.slot_2_levels
+    
+    def get_keyblade_stats(self):
+        # Create keyblade stat array from vanilla
+        keyblade_stats = [x.copy() for x in VANILLA_KEYBLADE_STATS]
+        # Handle shuffling keyblade stats
+        if self.options.keyblade_stats != "vanilla":
+            if self.options.keyblade_stats == "randomize":
+                # Fix any minimum and max values from settings
+                min_str_bonus = min(self.options.keyblade_min_str.value, self.options.keyblade_max_str.value)
+                max_str_bonus = max(self.options.keyblade_min_str.value, self.options.keyblade_max_str.value)
+                self.options.keyblade_min_str.value = min_str_bonus
+                self.options.keyblade_max_str.value = max_str_bonus
+                min_crit_rate = min(self.options.keyblade_min_crit_rate.value, self.options.keyblade_max_crit_rate.value)
+                max_crit_rate = max(self.options.keyblade_min_crit_rate.value, self.options.keyblade_max_crit_rate.value)
+                self.options.keyblade_min_crit_rate.value = min_crit_rate
+                self.options.keyblade_max_crit_rate.value = max_crit_rate
+                min_crit_str = min(self.options.keyblade_min_crit_str.value, self.options.keyblade_max_crit_str.value)
+                max_crit_str = max(self.options.keyblade_min_crit_str.value, self.options.keyblade_max_crit_str.value)
+                self.options.keyblade_min_crit_str.value = min_crit_str
+                self.options.keyblade_max_crit_str.value = max_crit_str
+                min_recoil = min(self.options.keyblade_min_recoil.value, self.options.keyblade_max_recoil.value)
+                max_recoil = max(self.options.keyblade_min_recoil.value, self.options.keyblade_max_recoil.value)
+                self.options.keyblade_min_recoil.value = min_recoil
+                self.options.keyblade_max_recoil.value = max_recoil
+                min_mp_bonus = min(self.options.keyblade_min_mp.value, self.options.keyblade_max_mp.value)
+                max_mp_bonus = max(self.options.keyblade_min_mp.value, self.options.keyblade_max_mp.value)
+                self.options.keyblade_min_mp.value = min_mp_bonus
+                self.options.keyblade_max_mp.value = max_mp_bonus
+                if self.options.bad_starting_weapons:
+                    starting_weapons = keyblade_stats[:4]
+                    other_weapons = keyblade_stats[4:]
+                else:
+                    starting_weapons = []
+                    other_weapons = keyblade_stats
+                for keyblade in other_weapons:
+                        keyblade["STR"] = self.random.randint(min_str_bonus, max_str_bonus)
+                        keyblade["CRR"] = self.random.randint(min_crit_rate, max_crit_rate)
+                        keyblade["CRB"] = self.random.randint(min_crit_str, max_crit_str)
+                        keyblade["REC"] = self.random.randint(min_recoil, max_recoil)
+                        keyblade["MP"]  = self.random.randint(min_mp_bonus, max_mp_bonus)
+                keyblade_stats = starting_weapons + other_weapons
+            elif self.options.keyblade_stats == "shuffle":
+                if self.options.bad_starting_weapons:
+                    starting_weapons = keyblade_stats[:4]
+                    other_weapons = keyblade_stats[4:]
+                    self.random.shuffle(other_weapons)
+                    keyblade_stats = starting_weapons + other_weapons
+                else:
+                    self.random.shuffle(keyblade_stats)
+        return keyblade_stats
+    
+    def determine_level_checks(self):
+        # Handle if remote_items is off and level_checks > number of stats items
+        total_level_up_items = min(99,
+            self.options.strength_increase.value +\
+            self.options.defense_increase.value +\
+            self.options.hp_increase.value +\
+            self.options.mp_increase.value +\
+            self.options.ap_increase.value +\
+            self.options.accessory_slot_increase.value +\
+            self.options.item_slot_increase.value)
+        if self.options.level_checks.value > total_level_up_items and self.options.remote_items.current_key == "off":
+            logging.info(f"{self.player_name}'s value {self.options.level_checks.value} for level_checks was changed.\n"
+                         f"This value cannot be more than the number of stat items in the pool when \"remote_items\" is \"off\".\n"
+                         f"Set to be equal to number of stat items in pool, {total_level_up_items}.")
+            self.options.level_checks.value = total_level_up_items
+    
+    def get_synthesis_item_name_byte_arrays(self):
+        # Get synth item names to show in synthesis menu
+        synthesis_byte_arrays = []
+        for location in self.multiworld.get_filled_locations(self.player):
+            if location.name != "Final Ansem":
+                location_data = location_table[location.name]
+                if location_data.type == "Synth":
+                    item_name = re.sub('[^A-Za-z0-9 ]+', '',str(location.item.name.replace("Progressive", "Prog")))[:14]
+                    byte_array = []
+                    for character in item_name:
+                        byte_array.append(CHAR_TO_KH[character])
+                    synthesis_byte_arrays.append(byte_array)
+        return synthesis_byte_arrays
+    
+    def get_starting_accessory_locations(self):
+        if self.starting_accessory_locations is None:
+            if self.options.randomize_party_member_starting_accessories:
+                self.starting_accessory_locations = list(get_locations_by_type("Starting Accessory").keys())
+                if not self.options.atlantica:
+                    self.starting_accessory_locations.remove("Ariel Starting Accessory 1")
+                    self.starting_accessory_locations.remove("Ariel Starting Accessory 2")
+                    self.starting_accessory_locations.remove("Ariel Starting Accessory 3")
+                self.starting_accessory_locations = self.random.sample(self.starting_accessory_locations, 10)
+            else:
+                self.starting_accessory_locations = []
+        return self.starting_accessory_locations
+    
+    def get_starting_accessories(self):
+        if self.starting_accessories is None:
+            if self.options.randomize_party_member_starting_accessories:
+                self.starting_accessories = list(get_items_by_category("Accessory").keys())
+                self.starting_accessories = self.random.sample(self.starting_accessories, 10)
+            else:
+                self.starting_accessories = []
+        return self.starting_accessories
+    
+    def get_ap_costs(self):
+        if self.ap_costs is None:
+            ap_costs = VANILLA_ABILITY_AP_COSTS.copy()
+            if self.options.randomize_ap_costs.current_key == "shuffle":
+                possible_costs = []
+                for ap_cost in VANILLA_ABILITY_AP_COSTS:
+                    if ap_cost["Randomize"]:
+                        possible_costs.append(ap_cost["AP Cost"])
+                self.random.shuffle(possible_costs)
+                for ap_cost in ap_costs:
+                    if ap_cost["Randomize"]:
+                        ap_cost["AP Cost"] = possible_costs.pop(0)
+            elif self.options.randomize_ap_costs.current_key == "randomize":
+                for ap_cost in ap_costs:
+                    if ap_cost["Randomize"]:
+                        ap_cost["AP Cost"] = self.random.randint(self.options.min_ap_cost.value, self.options.max_ap_cost.value)
+            elif self.options.randomize_ap_costs.current_key == "distribute":
+                total_ap_value = 0
+                for ap_cost in VANILLA_ABILITY_AP_COSTS:
+                    if ap_cost["Randomize"]:
+                        total_ap_value = total_ap_value + ap_cost["AP Cost"]
+                for ap_cost in ap_costs:
+                    if ap_cost["Randomize"]:
+                        total_ap_value = total_ap_value - self.options.min_ap_cost.value
+                        ap_cost["AP Cost"] = self.options.min_ap_cost.value
+                while total_ap_value > 0:
+                    ap_cost = self.random.choice(ap_costs)
+                    if ap_cost["Randomize"]:
+                        if ap_cost["AP Cost"] < self.options.max_ap_cost.value:
+                            amount_to_add = self.random.randint(1, min(self.options.max_ap_cost.value - ap_cost["AP Cost"], total_ap_value))
+                            ap_cost["AP Cost"] = ap_cost["AP Cost"] + amount_to_add
+                            total_ap_value = total_ap_value - amount_to_add
+            self.ap_costs = ap_costs
+        return self.ap_costs

worlds/kh1/docs/en_Kingdom Hearts.md

@@ -7,7 +7,7 @@ configure and export a config file.
 
 ## What does randomization do to this game?
 
-The Kingdom Hearts AP Randomizer randomizes most rewards in the game and adds several items which are used to unlock worlds, Olympus Coliseum cups, and world progression.
+The Kingdom Hearts AP Randomizer randomizes rewards in the game and adds several items which are used to unlock worlds, Olympus Coliseum cups, and world progression.
 
 Worlds can only be accessed by finding the corresponding item.  For example, you need to find the `Monstro` item to enter Monstro.
 
@@ -21,49 +21,26 @@ Any weapon, accessory, spell, trinity, summon, world, key item, stat up, consuma
 
 ### Locations
 
-Locations the player can find items include chests, event rewards, Atlantica clams, level up rewards, 101 Dalmatian rewards, and postcard rewards.
+Locations the player can find items include:
+- Chests
+- Rewards
+- Static Events
+- Map Prizes from things such as Trinities, Wonderland flowers and chairs, etc.
+- Level ups
 
 ## Which items can be in another player's world?
 
 Any of the items which can be shuffled may also be placed into another player's world. It is possible to choose to limit
 certain items to your own world.
+
 ## When the player receives an item, what happens?
 
-When the player receives an item, your client will display a message displaying the item you have obtained.  You will also see a notification in the "LEVEL UP" box.
+When the player receives an item, your client will display a message displaying the item you have obtained.  You will also see a notification in the "INFORMATION" box.
 
 ## What do I do if I encounter a bug with the game?
 
 Please reach out to Gicu#7034 on Discord.
 
-## How do I progress in a certain world?
-
-### The evidence boxes aren't spawning in Wonderland.
-
-Find `Footprints` in the multiworld.
-
-### I can't enter any cups in Olympus Coliseum.
-
-Firstly, find `Entry Pass` in the multiworld.  Additionally, `Phil Cup`, `Pegasus Cup`, and `Hercules Cup` are all multiworld items.  Finding all 3 grant you access to the Hades Cup and the Platinum Match.  Clearing all cups lets you challenge Ice Titan.
-
-### The slides aren't spawning in Deep Jungle.
-
-Find `Slides` in the multiworld.
-
-### I can't progress in Atlantica.
-Find `Crystal Trident` in the multiworld.
-
-### I can't progress in Halloween Town.
-
-Find `Forget-Me-Not` and `Jack-in-the-Box` in the multiworld.
-
-### The Hollow Bastion Library is missing a book.
-
-Find `Theon Vol. 6` in the multiworld.
-
-## How do I enter the End of the World?
-
-You can enter End of the World by obtaining a number of Ansem's Reports or by finding `End of the World` in the multiworld, depending on your options.
-
 ## Credits
 This is a collaborative effort from several individuals in the Kingdom Hearts community, but most of all, denhonator.
 

worlds/kh1/docs/kh1_en.md

@@ -1,54 +1,99 @@
-# Kingdom Hearts Randomizer Setup Guide
+# Kingdom Hearts Archipelago Randomizer Setup Guide
 
-## Setting up the required mods
+<h2 style="text-transform:none";>Required software</h2>
 
-BEFORE MODDING, PLEASE INSTALL AND RUN KH1 AT LEAST ONCE.
+- KINGDOM HEARTS -HD 1.5+2.5 ReMIX- from the [Epic Games Store](https://store.epicgames.com/en-US/discover/kingdom-hearts) or [Steam](https://store.steampowered.com/app/2552430/KINGDOM_HEARTS_HD_1525_ReMIX/)
 
-1. Install OpenKH and the LUA Backend
+- The latest release of [OpenKH](https://github.com/OpenKH/OpenKh/releases)
 
-    Download the [latest release of OpenKH](https://github.com/OpenKH/OpenKh/releases/tag/latest)
-    
-    Extract the files to a directory of your choosing.
-    
-    Open `OpenKh.Tools.ModsManager.exe` and run first time set up
-    
-    When prompted for game edition, choose `PC Release`, select which platform you're using (EGS or Steam), navigate to your `Kingdom Hearts I.5 + II.5` installation folder in the path box and click `Next`
-    
-    When prompted, install Panacea, then click `Next`
-    
-    When prompted, check KH1 plus any other AP game you play and click `Install and configure LUA backend`, then click `Next`
-    
-    Extracting game data for KH1 is unnecessary, but you may want to extract data for KH2 if you plan on playing KH2 AP
-    
-    Click `Finish`
-    
-2. Open `OpenKh.Tools.ModsManager.exe`
+- The latest release of the [Kingdom Hearts 1FM Randomizer Software](https://github.com/gaithern/KH1FM-RANDOMIZER/releases)
 
-3. Click the drop-down menu at the top-right and choose `Kingdom Hearts 1`
+- The latest release of [Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases) for the ArchipelagoKH1Client.exe
 
-4. Click `Mods>Install a New Mod`
+<h2 style="text-transform:none";>Setting up the required software</h2>
 
-5. In `Add a new mod from GitHub` paste `gaithern/KH-1FM-AP-LUA`
+<h3 style="text-transform:none";>OpenKH</h3>
 
-6. Click `Install`
+- Extract the OpenKH files to a directory of your choosing.
+- When prompted for game edition, choose PC Release, select which platform you're using (EGS or Steam), navigate to your `Kingdom Hearts I.5 + II.5` installation folder in the path box and click `Next`.
+- When prompted, install Panacea, then click `Next`.
+- When prompted, check KH1 plus any other AP game you want to play, and click `Install and configure Lua backend`, then click `Next`.
+- Extract the data for KH1.
+- Click `Finish`
 
-7. Navigate to Mod Loader and click `Build and Run`
+<h3 style="text-transform:none";>Kingdom Hearts 1FM Randomizer Software</h3>
 
+- Extract the Kingdom Hearts 1FM Randomizer Software files in a directory of your choosing.
 
-## Configuring your YAML file
+<h2 style="text-transform:none";>Obtaining and using the seed zip</h2>
 
-### What is a YAML file and why do I need one?
+- When you generate a game you will see a download link for a KH1 .zip seed on the room page.
+- After downloading this zip, open `mod_generator.exe` in your Kingdom Hearts 1FM Randomizer Software folder.
+- Direct `mod_generator.exe` to both your seed zip and your KH1 data folder extracted during your OpenKH set up.
+- Click `start`.
+- After some time, you will find a file in your `Output` folder called `mod_YYYYMMDDHHMMSS.zip`
+- Open `OpenKh.Tools.ModsManager.exe` and ensure that the dropdown in the top right is set to `Kingdom Hearts 1`
+- Click the green plus, choose `Select and install Mod Archive or Lua Script`, and direct the prompt to your new mod zip.
+- You should now see a mod on your list called `KH1 Randomizer Seed XYZ` where XYZ is your seed hex value.
+- Ensure this mod is checked, then, if you want to play right away, click `Mod Loader` at the top.
+- Click `Build and Run`.  Your modded game should now open.
 
-Your YAML file contains a set of configuration options which provide the generator with information about how it should
-generate your game. Each player of a multiworld will provide their own YAML file. This setup allows each player to enjoy
-an experience customized for their taste, and different players in the same multiworld can all have different options.
+<h2 style="text-transform:none";>Connecting to your multiworld via the KH1 Client</h2>
 
-### Where do I get a YAML file?
+- Once your game is being hosted, open `ArchipelagoLauncher.exe`.
+- Find `KH1 Client` and open it.
+- At the top, in the `Server:` bar, type in the host address and port.
+- Click the `Connect` button in the top right.
+- If connection to the server was successful, you'll be prompted to type in your slot named in the `Command:` bar at the bottom.
+- After typing your slot name, press enter.
+- If all is well, you are now connected.
 
-you can customize your settings by visiting the [Kingdom Hearts Options Page](/games/Kingdom%20Hearts/player-options).
+<h2 style="text-transform:none";>FAQ</h2>
 
-## Connect to the MultiWorld
+<h3 style="text-transform:none";>The client did not confirm connection to the game, is that normal?</h3>
 
-For first-time players, it is recommended to open your KH1 Client first before opening the game.
+Yes, the game and client communicate via a game communication path set up in your in your `%AppData%` folder, and therefore don't need to establish a socket connection.
 
-On the title screen, open your KH1 Client and connect to your multiworld.
+<h3 style="text-transform:none";>I am not sending or receiving items.</h3>
+
+Check out this [troubleshooting guide](https://docs.google.com/document/d/1oAXxJWrNeqSL-tkB_01bLR0eT0urxz2FBo4URpq3VbM/edit?usp=sharing)
+
+<h3 style="text-transform:none";>Why aren't the evidence boxes spawning in Wonderland?</h3>
+
+You'll need to find `Footprints` in your multiworld.
+
+<h3 style="text-transform:none";>Why won't Phil let me start the Prelims?</h3>
+
+You'll need to find `Entry Pass` in the multiworld.
+
+<h3 style="text-transform:none";>Why aren't the slides spawning in Deep Jungle?</h3>
+
+You'll need to find `Slides` in the multiworld.
+
+<h3 style="text-transform:none";>Why can't I make progress in Atlantica?</h3>
+
+You'll need to find `Crystal Trident` in the multiworld.
+
+<h3 style="text-transform:none";>Why won't the doctor let me progress in Halloween Town?</h3>
+
+You'll need to find either `Forget-Me-Not` or `Jack-in-the-Box` in the multiworld.
+
+<h3 style="text-transform:none";>Why is there a book missing in the Hollow Bastion library?</h3>
+
+You'll need to find `Theon Vol. 6` in the multiworld.
+
+<h3 style="text-transform:none";>How do I unlock End of the World?</h3>
+
+Depending on your settings, your options are either finding a specified amount of `Lucky Emblems` or finding the item `End of the World`.
+
+<h3 style="text-transform:none";>How do I enter Destiny Islands?</h3>
+
+After obtaining the item `Destiny Islands`, you can land there as an additional option in Traverse Town.
+
+<h3 style="text-transform:none";>How do I progress to Destiny Islands Day 2 and 3?</h3>
+
+In order to access Day 2 and 3, you need to collect an amount of `Raft Materials` specified in your settings.  When you start Day 3, you'll be immediately warped to Homecoming.
+
+<h3 style="text-transform:none";>Why can't I use the summon I obtained?</h3>
+
+You need at least one magic spell before you can use summons.

worlds/kh1/test/test_goal.py

@@ -5,29 +5,29 @@ class TestDefault(KH1TestBase):
 
 class TestSephiroth(KH1TestBase):
     options = {
-        "Goal": 0,
+        "Final Rest Door Key": 0,
     }
 
 class TestUnknown(KH1TestBase):
     options = {
-        "Goal": 1,
+        "Final Rest Door Key": 1,
     }
 
 class TestPostcards(KH1TestBase):
     options = {
-        "Goal": 2,
+        "Final Rest Door Key": 2,
     }
 
-class TestFinalAnsem(KH1TestBase):
+class TestLuckyEmblems(KH1TestBase):
     options = {
-        "Goal": 3,
+        "Final Rest Door Key": 3,
     }
 
 class TestPuppies(KH1TestBase):
     options = {
-        "Goal": 4,
+        "Final Rest Door Key": 4,
     }
 class TestFinalRest(KH1TestBase):
     options = {
-        "Goal": 5,
+        "Final Rest Door Key": 5,
     }

worlds/kh2/__init__.py

@@ -20,7 +20,7 @@ def launch_client():
     launch_component(launch, name="KH2Client")
 
 
-components.append(Component("KH2 Client", "KH2Client", func=launch_client, component_type=Type.CLIENT))
+components.append(Component("KH2 Client", func=launch_client, component_type=Type.CLIENT))
 
 
 class KingdomHearts2Web(WebWorld):

worlds/ladx/LADXR/generator.py

@@ -242,9 +242,9 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
     #    patches.health.setStartHealth(rom, 1)
 
     patches.inventory.songSelectAfterOcarinaSelect(rom)
-    if options["quickswap"] == 'a':
+    if options["quickswap"] == Options.Quickswap.option_a:
         patches.core.quickswap(rom, 1)
-    elif options["quickswap"] == 'b':
+    elif options["quickswap"] == Options.Quickswap.option_b:
         patches.core.quickswap(rom, 0)
 
     patches.core.addBootsControls(rom, options["boots_controls"])
@@ -271,9 +271,9 @@ def generateRom(base_rom: bytes, args, patch_data: Dict):
         mw = None
         if spot.item_owner != spot.location_owner:
             mw = spot.item_owner
-            if mw > 100:
+            if mw > 101:
                 # There are only 101 player name slots (99 + "The Server" + "another world"), so don't use more than that
-                mw = 100
+                mw = 101
         spot.patch(rom, spot.item, multiworld=mw)
     patches.enemies.changeBosses(rom, patch_data["world_setup"]["boss_mapping"])
     patches.enemies.changeMiniBosses(rom, patch_data["world_setup"]["miniboss_mapping"])

worlds/ladx/LADXR/locations/beachSword.py

@@ -11,19 +11,18 @@ class BeachSword(DroppedKey):
         super().__init__(0x0F2)
 
     def patch(self, rom: ROM, option: str, *, multiworld: Optional[int] = None) -> None:
-        if option != SWORD or multiworld is not None:
-            # Set the heart piece data
-            super().patch(rom, option, multiworld=multiworld)
+        # Set the heart piece data
+        super().patch(rom, option, multiworld=multiworld)
 
-            # Patch the room to contain a heart piece instead of the sword on the beach
-            re = RoomEditor(rom, 0x0F2)
-            re.removeEntities(0x31)  # remove sword
-            re.addEntity(5, 5, 0x35)  # add heart piece
-            re.store(rom)
+        # Patch the room to contain a heart piece instead of the sword on the beach
+        re = RoomEditor(rom, 0x0F2)
+        re.removeEntities(0x31)  # remove sword
+        re.addEntity(5, 5, 0x35)  # add heart piece
+        re.store(rom)
 
-            # Prevent shield drops from the like-like from turning into swords.
-            rom.patch(0x03, 0x1B9C, ASM("ld a, [$DB4E]"), ASM("ld a, $01"), fill_nop=True)
-            rom.patch(0x03, 0x244D, ASM("ld a, [$DB4E]"), ASM("ld a, $01"), fill_nop=True)
+        # Prevent shield drops from the like-like from turning into swords.
+        rom.patch(0x03, 0x1B9C, ASM("ld a, [$DB4E]"), ASM("ld a, $01"), fill_nop=True)
+        rom.patch(0x03, 0x244D, ASM("ld a, [$DB4E]"), ASM("ld a, $01"), fill_nop=True)
 
     def read(self, rom: ROM) -> str:
         re = RoomEditor(rom, 0x0F2)

worlds/ladx/Options.py

@@ -23,11 +23,24 @@ class LADXROption:
 class Logic(Choice, LADXROption):
     """
     Affects where items are allowed to be placed.
-    [Normal] Playable without using any tricks or glitches. Can require knowledge from a vanilla playthrough, such as how to open Color Dungeon.
-    [Hard] More advanced techniques may be required, but glitches are not. Examples include tricky jumps, killing enemies with only pots.
-    [Glitched] Advanced glitches and techniques may be required, but extremely difficult or tedious tricks are not required. Examples include Bomb Triggers, Super Jumps and Jesus Jumps.
-    [Hell] Obscure knowledge and hard techniques may be required. Examples include featherless jumping with boots and/or hookshot, sequential pit buffers and unclipped superjumps. Things in here can be extremely hard to do or very time consuming."""
+
+    **Normal:** Playable without using any tricks or glitches. Can require
+    knowledge from a vanilla playthrough, such as how to open Color Dungeon.
+
+    **Hard:** More advanced techniques may be required, but glitches are not.
+    Examples include tricky jumps, killing enemies with only pots.
+
+    **Glitched:** Advanced glitches and techniques may be required, but
+    extremely difficult or tedious tricks are not required. Examples include
+    Bomb Triggers, Super Jumps and Jesus Jumps.
+
+    **Hell:** Obscure knowledge and hard techniques may be required. Examples
+    include featherless jumping with boots and/or hookshot, sequential pit
+    buffers and unclipped superjumps. Things in here can be extremely hard to do
+    or very time consuming.
+    """
     display_name = "Logic"
+    rich_text_doc = True
     ladxr_name = "logic"
     # option_casual = 0
     option_normal = 1
@@ -40,8 +53,8 @@ class Logic(Choice, LADXROption):
 
 class TradeQuest(DefaultOffToggle, LADXROption):
     """
-    [On] adds the trade items to the pool (the trade locations will always be local items)
-    [Off] (default) doesn't add them
+    Trade quest items are randomized. Each NPC takes its normal trade quest
+    item and gives a randomized item in return.
     """
     display_name = "Trade Quest"
     ladxr_name = "tradequest"
@@ -49,40 +62,32 @@ class TradeQuest(DefaultOffToggle, LADXROption):
 
 class TextShuffle(DefaultOffToggle):
     """
-    [On] Shuffles all the text in the game
-    [Off] (default) doesn't shuffle them.
+    Shuffles all text in the game.
     """
     display_name = "Text Shuffle"
 
 
 class Rooster(DefaultOnToggle, LADXROption):
     """
-    [On] Adds the rooster to the item pool.
-    [Off] The rooster spot is still a check giving an item. But you will never find the rooster. In that case, any rooster spot is accessible without rooster by other means.
+    Adds the rooster to the item pool. If disabled, the overworld will be
+    modified so that any location requiring the rooster is accessible by other
+    means.
     """
     display_name = "Rooster"
     ladxr_name = "rooster"
 
 
-class Boomerang(Choice):
-    """
-    [Normal] requires Magnifying Lens to get the boomerang.
-    [Gift] The boomerang salesman will give you a random item, and the boomerang is shuffled.
-    """
-    display_name = "Boomerang"
-
-    normal = 0
-    gift = 1
-    default = gift
-
-
 class EntranceShuffle(Choice, LADXROption):
     """
-    [WARNING] Experimental, may fail to fill
-    Randomizes where overworld entrances lead to.
-    [Simple] Single-entrance caves/houses that have items are shuffled amongst each other.
-    If random start location and/or dungeon shuffle is enabled, then these will be shuffled with all the non-connector entrance pool.
-    Note, some entrances can lead into water, use the warp-to-home from the save&quit menu to escape this."""
+    Randomizes where overworld entrances lead.
+
+    **Simple:** Single-entrance caves/houses that have items are shuffled
+    amongst each other.
+
+    If *Dungeon Shuffle* is enabled, then dungeons will be shuffled with all the
+    non-connector entrances in the pool. Note, some entrances can lead into water, use
+    the warp-to-home from the save&quit menu to escape this.
+    """
 
     # [Advanced] Simple, but two-way connector caves are shuffled in their own pool as well.
     # [Expert] Advanced, but caves/houses without items are also shuffled into the Simple entrance pool.
@@ -94,22 +99,22 @@ class EntranceShuffle(Choice, LADXROption):
     # option_expert = 3
     # option_insanity = 4
     default = option_none
-    display_name = "Experimental Entrance Shuffle"
+    display_name = "Entrance Shuffle"
     ladxr_name = "entranceshuffle"
+    rich_text_doc = True
 
 
 class DungeonShuffle(DefaultOffToggle, LADXROption):
     """
-    [WARNING] Experimental, may fail to fill
-    Randomizes dungeon entrances within eachother
+    Randomizes dungeon entrances with each other.
     """
-    display_name = "Experimental Dungeon Shuffle"
+    display_name = "Dungeon Shuffle"
     ladxr_name = "dungeonshuffle"
 
 
 class APTitleScreen(DefaultOnToggle):
     """
-    Enables AP specific title screen and disables the intro cutscene
+    Enables AP specific title screen and disables the intro cutscene.
     """
     display_name = "AP Title Screen"
 
@@ -124,6 +129,7 @@ class BossShuffle(Choice):
 
 class DungeonItemShuffle(Choice):
     display_name = "Dungeon Item Shuffle"
+    rich_text_doc = True
     option_original_dungeon = 0
     option_own_dungeons = 1
     option_own_world = 2
@@ -138,12 +144,15 @@ class DungeonItemShuffle(Choice):
 
 class ShuffleNightmareKeys(DungeonItemShuffle):
     """
-    Shuffle Nightmare Keys
-    [Original Dungeon] The item will be within its original dungeon
-    [Own Dungeons] The item will be within a dungeon in your world
-    [Own World] The item will be somewhere in your world
-    [Any World] The item could be anywhere
-    [Different World] The item will be somewhere in another world
+    **Original Dungeon:** The item will be within its original dungeon.
+
+    **Own Dungeons:** The item will be within a dungeon in your world.
+
+    **Own World:** The item will be somewhere in your world.
+
+    **Any World:** The item could be anywhere.
+
+    **Different World:** The item will be somewhere in another world.
     """
     display_name = "Shuffle Nightmare Keys"
     ladxr_item = "NIGHTMARE_KEY"
@@ -151,12 +160,15 @@ class ShuffleNightmareKeys(DungeonItemShuffle):
 
 class ShuffleSmallKeys(DungeonItemShuffle):
     """
-    Shuffle Small Keys
-    [Original Dungeon] The item will be within its original dungeon
-    [Own Dungeons] The item will be within a dungeon in your world
-    [Own World] The item will be somewhere in your world
-    [Any World] The item could be anywhere
-    [Different World] The item will be somewhere in another world
+    **Original Dungeon:** The item will be within its original dungeon.
+
+    **Own Dungeons:** The item will be within a dungeon in your world.
+
+    **Own World:** The item will be somewhere in your world.
+
+    **Any World:** The item could be anywhere.
+
+    **Different World:** The item will be somewhere in another world.
     """
     display_name = "Shuffle Small Keys"
     ladxr_item = "KEY"
@@ -164,12 +176,15 @@ class ShuffleSmallKeys(DungeonItemShuffle):
 
 class ShuffleMaps(DungeonItemShuffle):
     """
-    Shuffle Dungeon Maps
-    [Original Dungeon] The item will be within its original dungeon
-    [Own Dungeons] The item will be within a dungeon in your world
-    [Own World] The item will be somewhere in your world
-    [Any World] The item could be anywhere
-    [Different World] The item will be somewhere in another world
+    **Original Dungeon:** The item will be within its original dungeon.
+
+    **Own Dungeons:** The item will be within a dungeon in your world.
+
+    **Own World:** The item will be somewhere in your world.
+
+    **Any World:** The item could be anywhere.
+
+    **Different World:** The item will be somewhere in another world.
     """
     display_name = "Shuffle Maps"
     ladxr_item = "MAP"
@@ -177,12 +192,15 @@ class ShuffleMaps(DungeonItemShuffle):
 
 class ShuffleCompasses(DungeonItemShuffle):
     """
-    Shuffle Dungeon Compasses
-    [Original Dungeon] The item will be within its original dungeon
-    [Own Dungeons] The item will be within a dungeon in your world
-    [Own World] The item will be somewhere in your world
-    [Any World] The item could be anywhere
-    [Different World] The item will be somewhere in another world
+    **Original Dungeon:** The item will be within its original dungeon.
+
+    **Own Dungeons:** The item will be within a dungeon in your world.
+
+    **Own World:** The item will be somewhere in your world.
+
+    **Any World:** The item could be anywhere.
+
+    **Different World:** The item will be somewhere in another world.
     """
     display_name = "Shuffle Compasses"
     ladxr_item = "COMPASS"
@@ -190,12 +208,15 @@ class ShuffleCompasses(DungeonItemShuffle):
 
 class ShuffleStoneBeaks(DungeonItemShuffle):
     """
-    Shuffle Owl Beaks
-    [Original Dungeon] The item will be within its original dungeon
-    [Own Dungeons] The item will be within a dungeon in your world
-    [Own World] The item will be somewhere in your world
-    [Any World] The item could be anywhere
-    [Different World] The item will be somewhere in another world
+    **Original Dungeon:** The item will be within its original dungeon.
+
+    **Own Dungeons:** The item will be within a dungeon in your world.
+
+    **Own World:** The item will be somewhere in your world.
+
+    **Any World:** The item could be anywhere.
+
+    **Different World:** The item will be somewhere in another world.
     """
     display_name = "Shuffle Stone Beaks"
     ladxr_item = "STONE_BEAK"
@@ -203,13 +224,17 @@ class ShuffleStoneBeaks(DungeonItemShuffle):
 
 class ShuffleInstruments(DungeonItemShuffle):
     """
-    Shuffle Instruments
-    [Original Dungeon] The item will be within its original dungeon
-    [Own Dungeons] The item will be within a dungeon in your world
-    [Own World] The item will be somewhere in your world
-    [Any World] The item could be anywhere
-    [Different World] The item will be somewhere in another world
-    [Vanilla] The item will be in its vanilla location in your world
+    **Original Dungeon:** The item will be within its original dungeon.
+
+    **Own Dungeons:** The item will be within a dungeon in your world.
+
+    **Own World:** The item will be somewhere in your world.
+
+    **Any World:** The item could be anywhere.
+
+    **Different World:** The item will be somewhere in another world.
+
+    **Vanilla:** The item will be in its vanilla location in your world.
     """
     display_name = "Shuffle Instruments"
     ladxr_item = "INSTRUMENT"
@@ -220,12 +245,18 @@ class ShuffleInstruments(DungeonItemShuffle):
 
 class Goal(Choice, LADXROption):
     """
-    The Goal of the game
-    [Instruments] The Wind Fish's Egg will only open if you have the required number of Instruments of the Sirens, and play the Ballad of the Wind Fish.
-    [Seashells] The Egg will open when you bring 20 seashells. The Ballad and Ocarina are not needed.
-    [Open] The Egg will start pre-opened.
+    The Goal of the game.
+
+    **Instruments:** The Wind Fish's Egg will only open if you have the required
+    number of Instruments of the Sirens, and play the Ballad of the Wind Fish.
+
+    **Seashells:** The Egg will open when you bring 20 seashells. The Ballad and
+    Ocarina are not needed.
+
+    **Open:** The Egg will start pre-opened.
     """
     display_name = "Goal"
+    rich_text_doc = True
     ladxr_name = "goal"
     option_instruments = 1
     option_seashells = 2
@@ -242,7 +273,7 @@ class Goal(Choice, LADXROption):
 
 class InstrumentCount(Range, LADXROption):
     """
-    Sets the number of instruments required to open the Egg
+    Sets the number of instruments required to open the Egg.
     """
     display_name = "Instrument Count"
     ladxr_name = None
@@ -253,7 +284,8 @@ class InstrumentCount(Range, LADXROption):
 
 class NagMessages(DefaultOffToggle, LADXROption):
     """
-    Controls if nag messages are shown when rocks and crystals are touched. Useful for glitches, annoying for everyone else.
+    Controls if nag messages are shown when rocks and crystals are touched.
+    Useful for glitches, annoying for everything else.
     """
     display_name = "Nag Messages"
     ladxr_name = "nagmessages"
@@ -262,31 +294,30 @@ class NagMessages(DefaultOffToggle, LADXROption):
 class MusicChangeCondition(Choice):
     """
     Controls how the music changes.
-    [Sword] When you pick up a sword, the music changes
-    [Always] You always have the post-sword music
+
+    **Sword:** When you pick up a sword, the music changes.
+
+    **Always:** You always have the post-sword music.
     """
     display_name = "Music Change Condition"
+    rich_text_doc = True
     option_sword = 0
     option_always = 1
     default = option_always
 
 
-#             Setting('hpmode', 'Gameplay', 'm', 'Health mode', options=[('default', '', 'Normal'), ('inverted', 'i', 'Inverted'), ('1', '1', 'Start with 1 heart'), ('low', 'l', 'Low max')], default='default',
-#                 description="""
-# [Normal} health works as you would expect.
-# [Inverted] you start with 9 heart containers, but killing a boss will take a heartcontainer instead of giving one.
-# [Start with 1] normal game, you just start with 1 heart instead of 3.
-# [Low max] replace heart containers with heart pieces."""),
-
-
 class HardMode(Choice, LADXROption):
     """
-    [Oracle] Less iframes and health from drops. Bombs damage yourself. Water damages you without flippers. No piece of power or acorn.
-    [Hero] Switch version hero mode, double damage, no heart/fairy drops.
-    [One hit KO] You die on a single hit, always.
+    **Oracle:** Less iframes and health from drops. Bombs damage yourself. Water
+    damages you without flippers. No pieces of power or acorns.
+
+    **Hero:** Switch version hero mode, double damage, no heart/fairy drops.
+
+    **OHKO:** You die on a single hit, always.
     """
     display_name = "Hard Mode"
     ladxr_name = "hardmode"
+    rich_text_doc = True
     option_none = 0
     option_oracle = 1
     option_hero = 2
@@ -294,44 +325,26 @@ class HardMode(Choice, LADXROption):
     default = option_none
 
 
-#             Setting('steal', 'Gameplay', 't', 'Stealing from the shop',
-#                 options=[('always', 'a', 'Always'), ('never', 'n', 'Never'), ('default', '', 'Normal')], default='default',
-#                 description="""Effects when you can steal from the shop. Stealing is bad and never in logic.
-# [Normal] requires the sword before you can steal.
-# [Always] you can always steal from the shop
-# [Never] you can never steal from the shop."""),
-class Bowwow(Choice):
-    """Allows BowWow to be taken into any area.  Certain enemies and bosses are given a new weakness to BowWow.
-    [Normal] BowWow is in the item pool, but can be logically expected as a damage source.
-    [Swordless] The progressive swords are removed from the item pool.
-    """
-    display_name = "BowWow"
-    normal = 0
-    swordless = 1
-    default = normal
-
-
 class Overworld(Choice, LADXROption):
     """
-    [Open Mabe] Replaces rock on the east side of Mabe Village with bushes, allowing access to Ukuku Prairie without Power Bracelet.
+    **Open Mabe:** Replaces rock on the east side of Mabe Village with bushes,
+    allowing access to Ukuku Prairie without Power Bracelet.
     """
     display_name = "Overworld"
     ladxr_name = "overworld"
+    rich_text_doc = True
     option_normal = 0
     option_open_mabe = 1
     default = option_normal
 
 
-# Setting('superweapons', 'Special', 'q', 'Enable super weapons', default=False,
-#    description='All items will be more powerful, faster, harder, bigger stronger. You name it.'),
-
-
 class Quickswap(Choice, LADXROption):
     """
-    Adds that the SELECT button swaps with either A or B. The item is swapped with the top inventory slot. The map is not available when quickswap is enabled.
+    Instead of opening the map, the *SELECT* button swaps the top item of your inventory on to your *A* or *B* button.
     """
     display_name = "Quickswap"
     ladxr_name = "quickswap"
+    rich_text_doc = True
     option_none = 0
     option_a = 1
     option_b = 2
@@ -340,10 +353,11 @@ class Quickswap(Choice, LADXROption):
 
 class TextMode(Choice, LADXROption):
     """
-    [Fast] Makes text appear twice as fast
+    **Fast:** Makes text appear twice as fast.
     """
     display_name = "Text Mode"
     ladxr_name = "textmode"
+    rich_text_doc = True
     option_normal = 0
     option_fast = 1
     default = option_fast
@@ -363,7 +377,8 @@ class LowHpBeep(Choice, LADXROption):
 
 class NoFlash(DefaultOnToggle, LADXROption):
     """
-    Remove the flashing light effects from Mamu, shopkeeper and MadBatter. Useful for capture cards and people that are sensitive to these things.
+    Remove the flashing light effects from Mamu, shopkeeper and MadBatter.
+    Useful for capture cards and people that are sensitive to these things.
     """
     display_name = "No Flash"
     ladxr_name = "noflash"
@@ -371,23 +386,34 @@ class NoFlash(DefaultOnToggle, LADXROption):
 
 class BootsControls(Choice):
     """
-    Adds additional button to activate Pegasus Boots (does nothing if you haven't picked up your boots!)
-    [Vanilla] Nothing changes, you have to equip the boots to use them
-    [Bracelet] Holding down the button for the bracelet also activates boots (somewhat like Link to the Past)
-    [Press A] Holding down A activates boots
-    [Press B] Holding down B activates boots
+    Adds an additional button to activate Pegasus Boots (does nothing if you
+    haven't picked up your boots!)
+
+    **Vanilla:** Nothing changes, you have to equip the boots to use them.
+
+    **Bracelet:** Holding down the button for the bracelet also activates boots
+    (somewhat like Link to the Past).
+
+    **Press A:** Holding down A activates boots.
+
+    **Press B:** Holding down B activates boots.
     """
     display_name = "Boots Controls"
+    rich_text_doc = True
     option_vanilla = 0
     option_bracelet = 1
     option_press_a = 2
+    alias_a = 2
     option_press_b = 3
+    alias_b = 3
 
 
 class LinkPalette(Choice, LADXROption):
     """
-    Sets link's palette
-    A-D are color palettes usually used during the damage animation and can change based on where you are.
+    Sets Link's palette.
+
+    A-D are color palettes usually used during the damage animation and can
+    change based on where you are.
     """
     display_name = "Link's Palette"
     ladxr_name = "linkspalette"
@@ -408,14 +434,21 @@ class LinkPalette(Choice, LADXROption):
 
 class TrendyGame(Choice):
     """
-    [Easy] All of the items hold still for you
-    [Normal] The vanilla behavior
-    [Hard] The trade item also moves
-    [Harder] The items move faster
-    [Hardest] The items move diagonally
-    [Impossible] The items move impossibly fast, may scroll on and off the screen
+    **Easy:** All of the items hold still for you.
+
+    **Normal:** The vanilla behavior.
+
+    **Hard:** The trade item also moves.
+
+    **Harder:** The items move faster.
+
+    **Hardest:** The items move diagonally.
+
+    **Impossible:** The items move impossibly fast, may scroll on and off the
+    screen.
     """
     display_name = "Trendy Game"
+    rich_text_doc = True
     option_easy = 0
     option_normal = 1
     option_hard = 2
@@ -435,15 +468,24 @@ class GfxMod(DefaultOffToggle):
 class Palette(Choice):
     """
     Sets the palette for the game.
-    Note: A few places aren't patched, such as the menu and a few color dungeon tiles.
-    [Normal] The vanilla palette
-    [1-Bit] One bit of color per channel
-    [2-Bit] Two bits of color per channel
-    [Greyscale] Shades of grey
-    [Pink] Aesthetic
-    [Inverted] Inverted
+
+    Note: A few places aren't patched, such as the menu and a few color dungeon
+    tiles.
+
+    **Normal:** The vanilla palette.
+
+    **1-Bit:** One bit of color per channel.
+
+    **2-Bit:** Two bits of color per channel.
+
+    **Greyscale:** Shades of grey.
+
+    **Pink:** Aesthetic.
+
+    **Inverted:** Inverted.
     """
     display_name = "Palette"
+    rich_text_doc = True
     option_normal = 0
     option_1bit = 1
     option_2bit = 2
@@ -454,12 +496,15 @@ class Palette(Choice):
 
 class Music(Choice, LADXROption):
     """
-    [Vanilla] Regular Music
-    [Shuffled] Shuffled Music
-    [Off] No music
+    **Vanilla:** Regular Music
+
+    **Shuffled:** Shuffled Music
+
+    **Off:** No music
     """
     display_name = "Music"
     ladxr_name = "music"
+    rich_text_doc = True
     option_vanilla = 0
     option_shuffled = 1
     option_off = 2
@@ -475,10 +520,14 @@ class Music(Choice, LADXROption):
 
 class Warps(Choice):
     """
-    [Improved] Adds remake style warp screen to the game. Choose your warp destination on the map after jumping in a portal and press B to select.
-    [Improved Additional] Improved warps, and adds a warp point at Crazy Tracy's house (the Mambo teleport spot) and Eagle's Tower.
+    **Improved:** Adds remake style warp screen to the game. Choose your warp
+    destination on the map after jumping in a portal and press *B* to select.
+
+    **Improved Additional:** Improved warps, and adds a warp point at Crazy
+    Tracy's house (the Mambo teleport spot) and Eagle's Tower.
     """
     display_name = "Warps"
+    rich_text_doc = True
     option_vanilla = 0
     option_improved = 1
     option_improved_additional = 2
@@ -487,19 +536,24 @@ class Warps(Choice):
 
 class InGameHints(DefaultOnToggle):
     """
-    When enabled, owl statues and library books may indicate the location of your items in the multiworld.
+    When enabled, owl statues and library books may indicate the location of
+    your items in the multiworld.
     """
     display_name = "In-game Hints"
 
 
 class TarinsGift(Choice):
     """
-    [Local Progression] Forces Tarin's gift to be an item that immediately opens up local checks.
-    Has little effect in single player games, and isn't always necessary with randomized entrances.
-    [Bush Breaker] Forces Tarin's gift to be an item that can destroy bushes.
-    [Any Item] Tarin's gift can be any item for any world
+    **Local Progression:** Forces Tarin's gift to be an item that immediately
+    opens up local checks. Has little effect in single player games, and isn't
+    always necessary with randomized entrances.
+
+    **Bush Breaker:** Forces Tarin's gift to be an item that can destroy bushes.
+
+    **Any Item:** Tarin's gift can be any item for any world
     """
     display_name = "Tarin's Gift"
+    rich_text_doc = True
     option_local_progression = 0
     option_bush_breaker = 1
     option_any_item = 2
@@ -508,67 +562,69 @@ class TarinsGift(Choice):
 
 class StabilizeItemPool(DefaultOffToggle):
     """
-    By default, rupees in the item pool may be randomly swapped with bombs, arrows, powders, or capacity upgrades. This option disables that swapping, which is useful for plando.
+    By default, some rupees in the item pool are randomly swapped with bombs,
+    arrows, powders, or capacity upgrades. This set of items is also used as
+    filler. This option disables that swapping and makes *Nothing* the filler
+    item.
     """
     display_name = "Stabilize Item Pool"
+    rich_text_doc = True
 
 
 class ForeignItemIcons(Choice):
     """
     Choose how to display foreign items.
-    [Guess By Name] Foreign items can look like any Link's Awakening item.
-    [Indicate Progression] Foreign items are either a Piece of Power (progression) or Guardian Acorn (non-progression).
+
+    **Guess By Name:** Foreign items can look like any Link's Awakening item.
+
+    **Indicate Progression:** Foreign items are either a Piece of Power
+    (progression) or Guardian Acorn (non-progression).
     """
     display_name = "Foreign Item Icons"
+    rich_text_doc = True
     option_guess_by_name = 0
     option_indicate_progression = 1
     default = option_guess_by_name
 
 
 ladx_option_groups = [
-    OptionGroup("Goal Options", [
-        Goal,
-        InstrumentCount,
+    OptionGroup("Gameplay Adjustments", [
+        InGameHints,
+        TarinsGift,
+        HardMode,
+        TrendyGame,
     ]),
-    OptionGroup("Shuffles", [
+    OptionGroup("World Layout", [
+        Overworld,
+        Warps,
+        DungeonShuffle,
+        EntranceShuffle,
+    ]),
+    OptionGroup("Item Pool", [
         ShuffleInstruments,
         ShuffleNightmareKeys,
         ShuffleSmallKeys,
         ShuffleMaps,
         ShuffleCompasses,
-        ShuffleStoneBeaks
-    ]),
-    OptionGroup("Warp Points", [
-        Warps,
-    ]),
-    OptionGroup("Miscellaneous", [
+        ShuffleStoneBeaks,
         TradeQuest,
         Rooster,
-        TarinsGift,
-        Overworld,
-        TrendyGame,
-        InGameHints,
-        NagMessages,
         StabilizeItemPool,
+    ]),
+    OptionGroup("Quality of Life & Aesthetic", [
+        NagMessages,
         Quickswap,
-        HardMode,
-        BootsControls
-    ]),
-    OptionGroup("Experimental", [
-        DungeonShuffle,
-        EntranceShuffle
-    ]),
-    OptionGroup("Visuals & Sound", [
+        BootsControls,
+        ForeignItemIcons,
+        GfxMod,
         LinkPalette,
         Palette,
-        TextShuffle,
-        ForeignItemIcons,
         APTitleScreen,
-        GfxMod,
+        TextShuffle,
+        TextMode,
         Music,
         MusicChangeCondition,
         LowHpBeep,
-        TextMode,
         NoFlash,
     ])
 ]
@@ -576,24 +632,12 @@ ladx_option_groups = [
 @dataclass
 class LinksAwakeningOptions(PerGameCommonOptions):
     logic: Logic
-    # 'heartpiece': DefaultOnToggle, # description='Includes heart pieces in the item pool'),
-    # 'seashells': DefaultOnToggle, # description='Randomizes the secret sea shells hiding in the ground/trees. (chest are always randomized)'),
-    # 'heartcontainers': DefaultOnToggle, # description='Includes boss heart container drops in the item pool'),
-    # 'instruments': DefaultOffToggle, # description='Instruments are placed on random locations, dungeon goal will just contain a random item.'),
-    tradequest: TradeQuest  # description='Trade quest items are randomized, each NPC takes its normal trade quest item, but gives a random item'),
-    # 'witch': DefaultOnToggle, # description='Adds both the toadstool and the reward for giving the toadstool to the witch to the item pool'),
-    rooster: Rooster  # description='Adds the rooster to the item pool. Without this option, the rooster spot is still a check giving an item. But you will never find the rooster. Any rooster spot is accessible without rooster by other means.'),
-    # 'boomerang': Boomerang,
-    # 'randomstartlocation': DefaultOffToggle, # 'Randomize where your starting house is located'),
-    experimental_dungeon_shuffle: DungeonShuffle  # 'Randomizes the dungeon that each dungeon entrance leads to'),
+    tradequest: TradeQuest
+    rooster: Rooster
+    experimental_dungeon_shuffle: DungeonShuffle
     experimental_entrance_shuffle: EntranceShuffle
-    # 'bossshuffle': BossShuffle,
-    # 'minibossshuffle': BossShuffle,
     goal: Goal
     instrument_count: InstrumentCount
-    # 'itempool': ItemPool,
-    # 'bowwow': Bowwow,
-    # 'overworld': Overworld,
     link_palette: LinkPalette
     warps: Warps
     trendy_game: TrendyGame

worlds/ladx/__init__.py

@@ -71,7 +71,7 @@ class LinksAwakeningWebWorld(WebWorld):
         "setup/en",
         ["zig"]
     )]
-    theme = "dirt"
+    theme = "ocean"
     option_groups = ladx_option_groups
     options_presets: typing.Dict[str, typing.Dict[str, typing.Any]] = {
         "Keysanity": {

worlds/meritous/archipelago.json

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

worlds/mm2/__init__.py

@@ -96,7 +96,6 @@ class MM2World(World):
     location_name_groups = location_groups
     web = MM2WebWorld()
     rom_name: bytearray
-    world_version: Tuple[int, int, int] = (0, 3, 2)
     wily_5_weapons: Dict[int, List[int]]
 
     def __init__(self, multiworld: MultiWorld, player: int):
@@ -133,6 +132,9 @@ class MM2World(World):
                                                                          Consumables.option_all):
                 stage.add_locations(energy_pickups[region], MM2Location)
             self.multiworld.regions.append(stage)
+        goal_location = self.get_location(dr_wily)
+        goal_location.place_locked_item(MM2Item("Victory", ItemClassification.progression, None, self.player))
+        self.multiworld.completion_condition[self.player] = lambda state: state.has("Victory", self.player)
 
     def create_item(self, name: str) -> MM2Item:
         item = item_table[name]
@@ -189,11 +191,6 @@ class MM2World(World):
                 f"Incompatible starting Robot Master, changing to "
                 f"{self.options.starting_robot_master.current_key.replace('_', ' ').title()}")
 
-    def generate_basic(self) -> None:
-        goal_location = self.get_location(dr_wily)
-        goal_location.place_locked_item(MM2Item("Victory", ItemClassification.progression, None, self.player))
-        self.multiworld.completion_condition[self.player] = lambda state: state.has("Victory", self.player)
-
     def fill_hook(self,
                   progitempool: List["Item"],
                   usefulitempool: List["Item"],

worlds/mm2/archipelago.json

@@ -0,0 +1,5 @@
+{
+  "game": "Mega Man 2",
+  "world_version": "0.3.2",
+  "minimum_ap_version": "0.6.4"
+}

worlds/musedash/MuseDashData.py

@@ -665,4 +665,10 @@ SONG_DATA: Dict[str, SongData] = {
     "Midnight Blue": SongData(2900789, "88-1", "MUSE RADIO FM106", True, 2, 5, 7),
     "overwork feat.Woonoo": SongData(2900790, "88-2", "MUSE RADIO FM106", True, 2, 6, 8),
     "SUPER CITYLIGHTS": SongData(2900791, "88-3", "MUSE RADIO FM106", True, 5, 7, 10),
+    "Flametide": SongData(2900792, "89-0", "Legendary Voyage, Mystic Treasure", True, 5, 7, 9),
+    "Embrace feat. Kiyon": SongData(2900793, "89-1", "Legendary Voyage, Mystic Treasure", True, 2, 5, 8),
+    "Magazines feat. Nia Suzune": SongData(2900794, "89-2", "Legendary Voyage, Mystic Treasure", True, 3, 6, 8),
+    "Temptation": SongData(2900795, "89-3", "Legendary Voyage, Mystic Treasure", False, 5, 8, 10),
+    "PwP": SongData(2900796, "89-4", "Legendary Voyage, Mystic Treasure", True, 3, 6, 9),
+    "I Can Show You": SongData(2900797, "89-5", "Legendary Voyage, Mystic Treasure", False, 5, 7, 9),
 }

worlds/musedash/archipelago.json

@@ -0,0 +1,6 @@
+{
+  "game": "Muse Dash",
+  "authors": ["DeamonHunter"],
+  "world_version": "1.5.25",
+  "minimum_ap_version": "0.6.3"
+}

worlds/noita/archipelago.json

@@ -0,0 +1,6 @@
+{
+  "game": "Noita",
+  "authors": ["Heinermann", "ScipioWright"],
+  "minimum_ap_version": "0.6.4",
+  "world_version": "1.4.0"
+}

worlds/pokemon_emerald/archipelago.json

@@ -0,0 +1,6 @@
+{
+    "game": "Pokemon Emerald",
+    "world_version": "2.4.1",
+    "minimum_ap_version": "0.6.1",
+    "authors": ["Zunawe"]
+}

worlds/pokemon_emerald/pokemon.py

@@ -397,6 +397,10 @@ def randomize_abilities(world: "PokemonEmeraldWorld") -> None:
     ability_blacklist = {ability_label_to_value[label] for label in ability_blacklist_labels}
     ability_whitelist = [a.ability_id for a in data.abilities if a.ability_id not in ability_blacklist]
 
+    # If every ability is blacklisted, set all abilities to Cacophony, effectively disabling abilities
+    if len(ability_whitelist) == 0:
+        ability_whitelist = [data.constants["ABILITY_CACOPHONY"]]
+
     if world.options.abilities == RandomizeAbilities.option_follow_evolutions:
         already_modified: Set[int] = set()
 

worlds/pokemon_emerald/test/test_warps.py

@@ -1,8 +1,8 @@
-from test.bases import TestBase
+from unittest import TestCase
 from ..data import Warp
 
 
-class TestWarps(TestBase):
+class TestWarps(TestCase):
     def test_warps_connect_ltr(self) -> None:
         # 2-way
         self.assertTrue(Warp("FAKE_MAP_A:0/FAKE_MAP_B:0").connects_to(Warp("FAKE_MAP_B:0/FAKE_MAP_A:0")))

worlds/pokemon_rb/__init__.py

@@ -713,7 +713,8 @@ class PokemonRedBlueWorld(World):
             "require_pokedex": self.options.require_pokedex.value,
             "area_1_to_1_mapping": self.options.area_1_to_1_mapping.value,
             "blind_trainers": self.options.blind_trainers.value,
-            "v5_update": True,
+            "game_version": self.options.game_version.value,
+            "exp_all": self.options.exp_all.value,
 
         }
         if self.options.type_chart_seed == "random" or self.options.type_chart_seed.value.isdigit():

worlds/raft/locations.json

@@ -810,7 +810,10 @@
     {
         "id": 48105,
         "name": "Engine controls blueprint",
-        "region": "CaravanIsland"
+        "region": "CaravanIsland",
+        "requiresAccessToItems": [
+            "Zipline tool"
+        ]
     },
     {
         "id": 48106,

worlds/sa2b/AestheticData.py

@@ -170,126 +170,309 @@ sample_chao_names = [
 	"Portia",
 	"Graves",
 	"Kaycee",
+	"Ghandi",
+	"Medli",
+	"Jak",
+	"Wario",
+	"Theo",
 ]
 
-totally_real_item_names = [
-	"Mallet",
-	"Lava Rod",
-	"Master Knife",
-	"Slippers",
-	"Spade",
+totally_real_item_names: dict[str, list[str]] = {
+	"Bumper Stickers": [
+		"Bonus Score",
+		"Boosting Bumper",
+	],
 
-	"Progressive Car Upgrade",
-	"Bonus Token",
+	"Castlevania 64": [
+		"Earth card",
+		"Venus card",
+		"Ax",
+		"Storehouse Key",
+	],
 
-	"Shortnail",
-	"Runmaster",
+	"Celeste 64": [
+		"Blueberry",
+		"Side Flip",
+		"Triple Dash Refills",
+		"Swap Blocks",
+		"Dream Blocks",
+	],
 
-	"Courage Form",
-	"Auto Courage",
-	"Donald Defender",
-	"Goofy Blizzard",
-	"Ultimate Weapon",
+	"Celeste (Open World)": [
+		"Green Boosters",
+		"Triple Dash Refills",
+		"Rising Platforms",
+		"Red Bubbles",
+		"Granny's Car Keys",
+		"Blueberry",
+	],
 
-	"Song of the Sky Whale",
-	"Gryphon Shoes",
-	"Wing Key",
-	"Strength Anklet",
+	"Civilization VI": [
+		"Advanced Trebuchets",
+		"The Wheel 2",
+		"NFTs",
+	],
 
-	"Hairclip",
+	"Donkey Kong Country 3": [
+		"Progressive Car Upgrade",
+		"Bonus Token",
+	],
 
-	"Key of Wisdom",
+	"Factorio": [
+		"logistic-ai",
+		"progressive-militia",
+		"progressive-stronger-explosives",
+		"uranium-food",
+	],
 
-	"Baking",
-	"Progressive Block Mining",
+	"A Hat in Time": [
+		"Fire Hat",
+		"69 Pons",
+		"Relic (Green Canyon)",
+		"Relic (Cooler Cow)",
+		"Time Fragment",
+	],
 
-	"Jar",
-	"Whistle of Space",
-	"Rito Tunic",
+	"Hollow Knight": [
+		"Shortnail",
+		"Runmaster",
+	],
 
-	"Kitchen Sink",
+	"Jak and Daxter The Precursor Legacy": [
+		"69 Precursor Orbs",
+		"Jump Roll",
+		"Roll Kick",
+	],
 
-	"Rock Badge",
-	"Key Card",
-	"Pikachu",
-	"Eevee",
-	"HM02 Strength",
+	"Kirby's Dream Land 3": [
+		"CooCoo",
+	],
 
-	"Progressive Astromancers",
-	"Progressive Chefs",
-	"The Living Safe",
-	"Lady Quinn",
+	"Kingdom Hearts 2": [
+		"Courage Form",
+		"Auto Courage",
+		"Donald Defender",
+		"Goofy Blizzard",
+		"Ultimate Weapon",
+	],
 
-	"Dio's Worst Enemy",
+	"Lingo": [
+		"Art Gallery (First Floor)",
+		"Color Hunt - Pink Barrier",
+	],
 
-	"Pink Chaos Emerald",
-	"Black Chaos Emerald",
-	"Tails - Large Cannon",
-	"Eggman - Bazooka",
-	"Eggman - Booster",
-	"Knuckles - Shades",
-	"Sonic - Magic Shoes",
-	"Shadow - Bounce Bracelet",
-	"Rouge - Air Necklace",
-	"Big Key (Eggman's Pyramid)",
+	"A Link to the Past": [
+		"Mallet",
+		"Lava Rod",
+		"Master Knife",
+		"Slippers",
+		"Spade",
+		"Big Key (Dark Palace)",
+		"Big Key (Hera Tower)",
+	],
 
-	"Sensor Bunker",
-	"Phantom",
-	"Soldier",
+	"Links Awakening DX": [
+		"Song of the Sky Whale",
+		"Gryphon Shoes",
+		"Wing Key",
+		"Strength Anklet",
+	],
 
-	"Plasma Suit",
-	"Gravity Beam",
-	"Hi-Jump Ball",
+	"Mario & Luigi Superstar Saga": [
+		"Mega Nut",
+	],
 
-	"Cannon Unlock LLL",
-	"Feather Cap",
+	"The Messenger": [
+		"Key of Anger",
+		"Time Shard (69)",
+		"Hydro",
+	],
 
-	"Progressive Yoshi",
-	"Purple Switch Palace",
-	"Cape Feather",
+	"Muse Dash": [
+		"U.N. Owen Was Her",
+		"Renai Circulation",
+		"Flyers",
+	],
 
-	"Cane of Bryan",
+	"Noita": [
+		"Gold (69)",
+		"Sphere",
+		"Melee Die",
+	],
 
-	"Van Repair",
-	"Autumn",
-	"Galaxy Knife",
-	"Green Cabbage Seeds",
+	"Ocarina of Time": [
+		"Jar",
+		"Whistle of Space",
+		"Rito Tunic",
+		"Boss Key (Forest Haven)",
+		"Boss Key (Swamp Palace)",
+		"Boss Key (Great Bay Temple)",
+	],
 
-	"Timespinner Cog 1",
+	"Old School Runescape": [
+		"Area: Taverly",
+		"Area: Meiyerditch",
+		"Fire Cape",
+	],
 
-	"Ladder",
+	"Overcooked! 2": [
+		"Kitchen Sink",
+	],
 
-	"Visible Dots",
+	"Paint": [
+		"AI Enhance",
+		"Paint Bucket",
+		"Pen",
+	],
 
-	"CooCoo",
+	"Pokemon Red and Blue": [
+		"Rock Badge",
+		"Key Card",
+		"Pikachu",
+		"Eevee",
+		"HM02 Strength",
+		"HM05 Fly",
+		"HM01 Surf",
+		"Card Key 12F",
+	],
 
-	"Blueberry",
+	"Risk of Rain 2": [
+		"Dio's Worst Enemy",
+		"Stage 5",
+		"Mythical Item",
+	],
 
-	"Ear of Luigi",
+	"Rogue Legacy": [
+		"Progressive Astromancers",
+		"Progressive Chefs",
+		"The Living Safe",
+		"Lady Quinn",
+	],
 
-	"Mega Nut",
+	"Saving Princess": [
+		"Fire Spreadshot",
+		"Volcano Key",
+		"Frozen Key",
+	],
 
-	"DUELIST ALLIANCE",
-	"DUEL OVERLOAD",
-	"POWER OF THE ELEMENTS",
-	"S:P Little Knight",
-	"Red-Eyes Dark Dragoon",
+	"Secret of Evermore": [
+		"Mantis Claw",
+		"Progressive pants",
+		"Deflect",
+	],
 
-	"Fire Hat",
+	"shapez": [
+		"Spinner",
+		"Toggle",
+		"Slicer",
+		"Splitter",
+	],
 
-	"Area: Taverly",
-	"Area: Meiyerditch",
-	"Fire Cape",
+	"SMZ3": [
+		"Cane of Bryan",
+	],
 
-	"Donald Zeta Flare",
+	"Sonic Adventure 2 Battle": [
+		"Pink Chaos Emerald",
+		"Black Chaos Emerald",
+		"Tails - Large Cannon",
+		"Eggman - Bazooka",
+		"Eggman - Booster",
+		"Knuckles - Shades",
+		"Sonic - Magic Shoes",
+		"Shadow - Bounce Bracelet",
+		"Rouge - Air Necklace",
+		"Big Key (Eggman's Pyramid)",
+	],
 
-	"Category One of a Kind",
-	"Category Fuller House",
+	"Starcraft 2": [
+		"Sensor Bunker",
+		"Phantom",
+		"Soldier",
+	],
 
-	"Passive Camoflage",
+	"Stardew Valley": [
+		"Van Repair",
+		"Ship Repair",
+		"Autumn",
+		"Galaxy Knife",
+		"Green Cabbage Seeds",
+		"Casket",
+		"Pet Moonlight Jelly",
+		"Adventurer's Guild Key",
+	],
 
-	"Earth Card",
-]
+	"Super Mario Land 2": [
+		"Luigi Coin",
+		"Luigi Zone Progression",
+		"Hard Mode",
+	],
+
+	"Super Metroid": [
+		"Plasma Suit",
+		"Gravity Beam",
+		"Hi-Jump Ball",
+	],
+
+	"Super Mario 64": [
+		"Cannon Unlock LLL",
+		"Feather Cap",
+	],
+
+	"Super Mario World": [
+		"Progressive Yoshi",
+		"Purple Switch Palace",
+		"Cape Feather",
+		"Fire Flower",
+		"Cling",
+		"Twirl Jump",
+	],
+
+	"Timespinner": [
+		"Timespinner Cog 1",
+		"Leg Cannon",
+	],
+
+	"TUNIC": [
+		"Ladder To West Forest",
+		"Money x69",
+		"Page 69",
+		"Master Sword",
+	],
+
+	"The Wind Waker": [
+		"Ballad of Storms",
+		"Wind God's Song",
+		"Earth God's Song",
+		"Ordon's Pearl",
+	],
+
+	"The Witness": [
+		"Visible Dots",
+	],
+
+	"Yacht Dice": [
+		"Category One of a Kind",
+		"Category Fuller House",
+	],
+
+	"Yoshi's Island": [
+		"Ear of Luigi",
+		"+69 Stars",
+		"Water Melon",
+		"World 7 Gate",
+		"Small Spring Ball",
+	],
+
+	"Yu-Gi-Oh! 2006": [
+		"DUELIST ALLIANCE",
+		"DUEL OVERLOAD",
+		"POWER OF THE ELEMENTS",
+		"S:P Little Knight",
+		"Red-Eyes Dark Dragoon",
+		"Maxx C"
+	],
+}
 
 all_exits = [
 	0x00,  # Lobby to Neutral

worlds/sa2b/Rules.py

@@ -1406,7 +1406,8 @@ def set_mission_upgrade_rules_standard(multiworld: MultiWorld, world: World, pla
                  lambda state: (state.has(ItemName.rouge_mystic_melody, player) and
                                 state.has(ItemName.rouge_treasure_scope, player)))
         add_rule(multiworld.get_location(LocationName.white_jungle_lifebox_2, player),
-                 lambda state: state.has(ItemName.shadow_flame_ring, player))
+                 lambda state: (state.has(ItemName.shadow_flame_ring, player) and
+                                state.has(ItemName.shadow_air_shoes, player)))
 
         add_rule(multiworld.get_location(LocationName.metal_harbor_lifebox_3, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player))
@@ -2062,6 +2063,8 @@ def set_mission_upgrade_rules_standard(multiworld: MultiWorld, world: World, pla
         add_rule(multiworld.get_location(LocationName.mad_space_big, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))
 
+        add_rule(multiworld.get_location(LocationName.cannon_core_big_1, player),
+                 lambda state: state.has(ItemName.tails_booster, player))
         add_rule(multiworld.get_location(LocationName.cannon_core_big_2, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
                                state.has(ItemName.eggman_jet_engine, player))

worlds/sa2b/__init__.py

@@ -613,7 +613,8 @@ class SA2BWorld(World):
            self.options.chao_stats.value > 0 or \
            self.options.chao_animal_parts or \
            self.options.chao_kindergarten or \
-           self.options.black_market_slots.value > 0:
+           self.options.black_market_slots.value > 0 or \
+           self.options.goal.value == 7:
             return True;
 
         return False
@@ -757,13 +758,16 @@ class SA2BWorld(World):
         item_names = []
         player_names = []
         progression_flags = []
-        totally_real_item_names_copy = totally_real_item_names.copy()
         location_names = [(LocationName.chao_black_market_base + str(i)) for i in range(1, self.options.black_market_slots.value + 1)]
         locations = [self.multiworld.get_location(location_name, self.player) for location_name in location_names]
         for location in locations:
             if location.item.classification & ItemClassification.trap:
-                item_name = self.random.choice(totally_real_item_names_copy)
-                totally_real_item_names_copy.remove(item_name)
+                item_name = ""
+                if location.item.game in totally_real_item_names:
+                    item_name = self.random.choice(totally_real_item_names[location.item.game])
+                else:
+                    random_game_names: list[str] = self.random.choice(list(totally_real_item_names.values()))
+                    item_name = self.random.choice(random_game_names)
                 item_names.append(item_name)
             else:
                 item_names.append(location.item.name)

worlds/sc2/__init__.py

@@ -468,7 +468,8 @@ def flag_excludes_by_faction_presence(world: SC2World, item_list: List[FilterIte
 
     for item in item_list:
         # Catch-all for all of a faction's items
-        if not terran_missions and item.data.race == SC2Race.TERRAN:
+        # Unit upgrades required for no-builds will get the FilterExcluded lifted when flagging AllowedOrphan
+        if not terran_build_missions and item.data.race == SC2Race.TERRAN:
             if item.name not in item_groups.nova_equipment:
                 item.flags |= ItemFilterFlags.FilterExcluded
                 continue
@@ -483,10 +484,6 @@ def flag_excludes_by_faction_presence(world: SC2World, item_list: List[FilterIte
             continue
 
         # Faction units
-        if (not terran_build_missions
-            and item.data.type in (item_tables.TerranItemType.Unit, item_tables.TerranItemType.Building, item_tables.TerranItemType.Mercenary)
-        ):
-            item.flags |= ItemFilterFlags.FilterExcluded
         if (not zerg_build_missions
             and item.data.type in (item_tables.ZergItemType.Unit, item_tables.ZergItemType.Mercenary, item_tables.ZergItemType.Evolution_Pit)
         ):
@@ -661,6 +658,7 @@ def flag_allowed_orphan_items(world: SC2World, item_list: List[FilterItem]) -> N
                     item_names.MEDIC_STABILIZER_MEDPACKS, item_names.MARINE_LASER_TARGETING_SYSTEM,
             ):
                 item.flags |= ItemFilterFlags.AllowedOrphan
+                item.flags &= ~ItemFilterFlags.FilterExcluded
     # These rules only trigger on Standard tactics
     if SC2Mission.BELLY_OF_THE_BEAST in missions and world.options.required_tactics == RequiredTactics.option_standard:
         for item in item_list:
@@ -670,6 +668,7 @@ def flag_allowed_orphan_items(world: SC2World, item_list: List[FilterItem]) -> N
                     item_names.FIREBAT_NANO_PROJECTORS, item_names.FIREBAT_JUGGERNAUT_PLATING, item_names.FIREBAT_PROGRESSIVE_STIMPACK
             ):
                 item.flags |= ItemFilterFlags.AllowedOrphan
+                item.flags &= ~ItemFilterFlags.FilterExcluded
     if SC2Mission.EVIL_AWOKEN in missions and world.options.required_tactics == RequiredTactics.option_standard:
         for item in item_list:
             if item.name in (item_names.STALKER_PHASE_REACTOR, item_names.STALKER_INSTIGATOR_SLAYER_DISINTEGRATING_PARTICLES, item_names.STALKER_INSTIGATOR_SLAYER_PARTICLE_REFLECTION):

worlds/sc2/client.py

@@ -21,10 +21,11 @@ import random
 import concurrent.futures
 import time
 import uuid
+import argparse
 from pathlib import Path
 
 # CommonClient import first to trigger ModuleUpdater
-from CommonClient import CommonContext, server_loop, ClientCommandProcessor, gui_enabled, get_base_parser
+from CommonClient import CommonContext, server_loop, ClientCommandProcessor, gui_enabled, get_base_parser, handle_url_arg
 from Utils import init_logging, is_windows, async_start
 from .item import item_names, item_parents, race_to_item_type
 from .item.item_annotations import ITEM_NAME_ANNOTATIONS
@@ -1298,20 +1299,15 @@ class CompatItemHolder(typing.NamedTuple):
     quantity: int = 1
 
 
-def parse_uri(uri: str) -> str:
-    if "://" in uri:
-        uri = uri.split("://", 1)[1]
-    return uri.split('?', 1)[0]
-
-
-async def main():
+async def main(args: typing.Sequence[str] | None):
     multiprocessing.freeze_support()
     parser = get_base_parser()
     parser.add_argument('--name', default=None, help="Slot Name to connect as.")
-    args, uri = parser.parse_known_args()
+    args, uri = parser.parse_known_args(args)
 
     if uri and uri[0].startswith('archipelago://'):
-        args.connect = parse_uri(' '.join(uri))
+        args.url = uri[0]
+        handle_url_arg(args, parser)
 
     ctx = SC2Context(args.connect, args.password)
     ctx.auth = args.name
@@ -2346,7 +2342,7 @@ def force_settings_save_on_close() -> None:
     _has_forced_save = True
 
 
-def launch():
+def launch(*args: str):
     colorama.just_fix_windows_console()
-    asyncio.run(main())
+    asyncio.run(main(args))
     colorama.deinit()

worlds/sc2/item/item_tables.py

@@ -1860,7 +1860,7 @@ item_table = {
     item_names.DARK_TEMPLAR_ARCHON_MERGE: ItemData(417 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_4, 27, SC2Race.PROTOSS, classification=ItemClassification.progression, parent=item_names.DARK_TEMPLAR),
     item_names.ASCENDANT_ARCHON_MERGE: ItemData(418 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_4, 28, SC2Race.PROTOSS, classification=ItemClassification.progression_skip_balancing, parent=item_names.ASCENDANT),
     item_names.SCOUT_SUPPLY_EFFICIENCY: ItemData(419 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_4, 29, SC2Race.PROTOSS, parent=item_names.SCOUT),
-    item_names.REAVER_BARGAIN_BIN_PRICES: ItemData(420 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_5, 0, SC2Race.PROTOSS, parent=item_names.SCOUT),
+    item_names.REAVER_BARGAIN_BIN_PRICES: ItemData(420 + SC2LOTV_ITEM_ID_OFFSET, ProtossItemType.Forge_5, 0, SC2Race.PROTOSS, parent=item_names.REAVER),
 
 
     # War Council

worlds/sc2/locations.py

@@ -2150,8 +2150,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "Victory",
             SC2WOL_LOC_ID_OFFSET + 2800,
             LocationType.VICTORY,
-            lambda state: logic.terran_competent_comp(state)
-            and logic.terran_army_weapon_armor_upgrade_min_level(state) >= 2,
+            lambda state: logic.terran_competent_comp(state, 2),
         ),
         make_location_data(
             SC2Mission.SHATTER_THE_SKY.mission_name,
@@ -2172,24 +2171,21 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "Southeast Coolant Tower",
             SC2WOL_LOC_ID_OFFSET + 2803,
             LocationType.VANILLA,
-            lambda state: logic.terran_competent_comp(state)
-            and logic.terran_army_weapon_armor_upgrade_min_level(state) >= 2,
+            lambda state: logic.terran_competent_comp(state, 2),
         ),
         make_location_data(
             SC2Mission.SHATTER_THE_SKY.mission_name,
             "Southwest Coolant Tower",
             SC2WOL_LOC_ID_OFFSET + 2804,
             LocationType.VANILLA,
-            lambda state: logic.terran_competent_comp(state)
-            and logic.terran_army_weapon_armor_upgrade_min_level(state) >= 2,
+            lambda state: logic.terran_competent_comp(state, 2),
         ),
         make_location_data(
             SC2Mission.SHATTER_THE_SKY.mission_name,
             "Leviathan",
             SC2WOL_LOC_ID_OFFSET + 2805,
             LocationType.VANILLA,
-            lambda state: logic.terran_competent_comp(state)
-            and logic.terran_army_weapon_armor_upgrade_min_level(state) >= 2,
+            lambda state: logic.terran_competent_comp(state, 2),
             hard_rule=logic.terran_any_anti_air,
         ),
         make_location_data(
@@ -2262,7 +2258,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2HOTS_LOC_ID_OFFSET + 100,
             LocationType.VICTORY,
             lambda state: (
-                logic.zerg_common_unit
+                logic.zerg_common_unit(state)
                 or state.has_any((item_names.ZERGLING, item_names.PYGALISK), player)
             ),
         ),
@@ -2279,7 +2275,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             LocationType.VANILLA,
             lambda state: adv_tactics
             or (
-                logic.zerg_common_unit
+                logic.zerg_common_unit(state)
                 or state.has_any((item_names.ZERGLING, item_names.PYGALISK), player)
             ),
         ),
@@ -2290,7 +2286,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             LocationType.VANILLA,
             lambda state: adv_tactics
             or (
-                logic.zerg_common_unit
+                logic.zerg_common_unit(state)
                 or state.has_any((item_names.ZERGLING, item_names.PYGALISK), player)
             ),
         ),
@@ -2301,7 +2297,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             LocationType.VANILLA,
             lambda state: adv_tactics
             or (
-                logic.zerg_common_unit
+                logic.zerg_common_unit(state)
                 or state.has_any((item_names.ZERGLING, item_names.PYGALISK), player)
             ),
         ),
@@ -2324,7 +2320,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             LocationType.EXTRA,
             lambda state: adv_tactics
             or (
-                logic.zerg_common_unit
+                logic.zerg_common_unit(state)
                 or state.has_any((item_names.ZERGLING, item_names.PYGALISK), player)
             ),
         ),
@@ -2334,7 +2330,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2HOTS_LOC_ID_OFFSET + 108,
             LocationType.CHALLENGE,
             lambda state: (
-                logic.zerg_common_unit
+                logic.zerg_common_unit(state)
                 or state.has_any((item_names.ZERGLING, item_names.PYGALISK), player)
             ),
             flags=LocationFlag.SPEEDRUN,
@@ -2345,8 +2341,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2HOTS_LOC_ID_OFFSET + 200,
             LocationType.VICTORY,
             lambda state: logic.basic_kerrigan(state)
-                or kerriganless
-                or logic.grant_story_tech == GrantStoryTech.option_grant,
+                or kerriganless,
             hard_rule=logic.zerg_any_units_back_in_the_saddle_requirement,
         ),
         make_location_data(
@@ -2355,8 +2350,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2HOTS_LOC_ID_OFFSET + 201,
             LocationType.EXTRA,
             lambda state: logic.basic_kerrigan(state)
-                or kerriganless
-                or logic.grant_story_tech == GrantStoryTech.option_grant,
+                or kerriganless,
             hard_rule=logic.zerg_any_units_back_in_the_saddle_requirement,
         ),
         make_location_data(
@@ -2383,8 +2377,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2HOTS_LOC_ID_OFFSET + 205,
             LocationType.EXTRA,
             lambda state: logic.basic_kerrigan(state)
-                or kerriganless
-                or logic.grant_story_tech == GrantStoryTech.option_grant,
+                or kerriganless,
             hard_rule=logic.zerg_any_units_back_in_the_saddle_requirement,
         ),
         make_location_data(
@@ -2450,7 +2443,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             lambda state: (
                 logic.zerg_competent_comp(state)
                 and logic.zerg_competent_anti_air(state)
-                and (logic.basic_kerrigan(state) or kerriganless)
+                and (logic.basic_kerrigan(state, False) or kerriganless)
                 and logic.zerg_defense_rating(state, False, False) >= 3
                 and logic.zerg_power_rating(state) >= 5
             ),
@@ -2542,6 +2535,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             lambda state: (
                 logic.zerg_common_unit(state) and logic.zerg_competent_anti_air(state)
             ),
+            hard_rule=logic.zerg_any_anti_air,
         ),
         make_location_data(
             SC2Mission.SHOOT_THE_MESSENGER.mission_name,
@@ -2576,6 +2570,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             lambda state: (
                 logic.zerg_common_unit(state) and logic.zerg_competent_anti_air(state)
             ),
+            hard_rule=logic.zerg_any_anti_air,
         ),
         make_location_data(
             SC2Mission.SHOOT_THE_MESSENGER.mission_name,
@@ -2617,6 +2612,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2HOTS_LOC_ID_OFFSET + 510,
             LocationType.CHALLENGE,
             logic.zerg_competent_comp_competent_aa,
+            hard_rule=logic.zerg_any_anti_air,
             flags=LocationFlag.BASEBUST,
         ),
         make_location_data(
@@ -2625,6 +2621,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2HOTS_LOC_ID_OFFSET + 511,
             LocationType.CHALLENGE,
             logic.zerg_competent_comp_competent_aa,
+            hard_rule=logic.zerg_any_anti_air,
             flags=LocationFlag.BASEBUST,
         ),
         make_location_data(
@@ -2633,6 +2630,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2HOTS_LOC_ID_OFFSET + 512,
             LocationType.CHALLENGE,
             logic.zerg_competent_comp_competent_aa,
+            hard_rule=logic.zerg_any_anti_air,
             flags=LocationFlag.BASEBUST,
         ),
         make_location_data(
@@ -3534,7 +3532,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
                 kerriganless
                 or (
                     logic.two_kerrigan_actives(state)
-                    and (logic.basic_kerrigan(state) or logic.grant_story_tech == GrantStoryTech.option_grant)
+                    and logic.basic_kerrigan(state)
                     and logic.kerrigan_levels(state, 25)
                 )
             ),
@@ -3558,7 +3556,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
                 kerriganless
                 or (
                     logic.two_kerrigan_actives(state)
-                    and (logic.basic_kerrigan(state) or logic.grant_story_tech == GrantStoryTech.option_grant)
+                    and logic.basic_kerrigan(state)
                     and logic.kerrigan_levels(state, 25)
                 )
             ),
@@ -3862,15 +3860,11 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2LOTV_LOC_ID_OFFSET + 300,
             LocationType.VICTORY,
             lambda state: adv_tactics
-            or state.count_from_list(
-                (
-                    item_names.STALKER_PHASE_REACTOR,
-                    item_names.STALKER_INSTIGATOR_SLAYER_DISINTEGRATING_PARTICLES,
-                    item_names.STALKER_INSTIGATOR_SLAYER_PARTICLE_REFLECTION,
-                ),
-                player,
-            )
-            >= 2,
+            or state.has_any((
+                item_names.STALKER_PHASE_REACTOR,
+                item_names.STALKER_INSTIGATOR_SLAYER_DISINTEGRATING_PARTICLES,
+                item_names.STALKER_INSTIGATOR_SLAYER_PARTICLE_REFLECTION,
+            ), player),
         ),
         make_location_data(
             SC2Mission.EVIL_AWOKEN.mission_name,
@@ -4582,7 +4576,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             lambda state: (
                 logic.protoss_deathball(state)
                 and logic.protoss_power_rating(state) >= 6
-                and (adv_tactics or logic.protoss_fleet(state))
+                and (adv_tactics or logic.protoss_unsealing_the_past_ledge_requirement(state))
             ),
         ),
         make_location_data(
@@ -4593,7 +4587,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             lambda state: (
                 logic.protoss_deathball(state)
                 and logic.protoss_power_rating(state) >= 6
-                and (adv_tactics or logic.protoss_fleet(state))
+                and (adv_tactics or logic.protoss_unsealing_the_past_ledge_requirement(state))
             ),
         ),
         make_location_data(
@@ -7256,7 +7250,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2_RACESWAP_LOC_ID_OFFSET + 1809,
             LocationType.MASTERY,
             lambda state: (
-                logic.protoss_anti_armor_anti_air
+                logic.protoss_anti_armor_anti_air(state)
                 and logic.protoss_defense_rating(state, False) >= 6
                 and logic.protoss_common_unit(state)
                 and logic.protoss_deathball(state)
@@ -9087,7 +9081,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "Close Obelisk",
             SC2_RACESWAP_LOC_ID_OFFSET + 4801,
             LocationType.VANILLA,
-            lambda state: adv_tactics or logic.zerg_common_unit,
+            lambda state: adv_tactics or logic.zerg_common_unit(state),
         ),
         make_location_data(
             SC2Mission.ECHOES_OF_THE_FUTURE_Z.mission_name,
@@ -10053,6 +10047,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
                 logic.terran_common_unit(state)
                 and logic.terran_competent_anti_air(state)
             ),
+            hard_rule=logic.terran_any_anti_air,
         ),
         make_location_data(
             SC2Mission.SHOOT_THE_MESSENGER_T.mission_name,
@@ -10090,6 +10085,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
                 logic.terran_common_unit(state)
                 and logic.terran_competent_anti_air(state)
             ),
+            hard_rule=logic.terran_any_anti_air,
         ),
         make_location_data(
             SC2Mission.SHOOT_THE_MESSENGER_T.mission_name,
@@ -10133,7 +10129,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2_RACESWAP_LOC_ID_OFFSET + 6710,
             LocationType.CHALLENGE,
             lambda state: logic.terran_beats_protoss_deathball(state)
-            and logic.terran_common_unit(state),
+                and logic.terran_common_unit(state),
             flags=LocationFlag.BASEBUST,
         ),
         make_location_data(
@@ -10142,8 +10138,9 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2_RACESWAP_LOC_ID_OFFSET + 6711,
             LocationType.CHALLENGE,
             lambda state: logic.terran_beats_protoss_deathball(state)
-            and logic.terran_competent_ground_to_air(state)
-            and logic.terran_common_unit(state),
+                and logic.terran_competent_ground_to_air(state)
+                and logic.terran_common_unit(state),
+            hard_rule=logic.terran_any_anti_air,
             flags=LocationFlag.BASEBUST,
         ),
         make_location_data(
@@ -10152,8 +10149,9 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2_RACESWAP_LOC_ID_OFFSET + 6712,
             LocationType.CHALLENGE,
             lambda state: logic.terran_beats_protoss_deathball(state)
-            and logic.terran_competent_ground_to_air(state)
-            and logic.terran_common_unit(state),
+                and logic.terran_competent_ground_to_air(state)
+                and logic.terran_common_unit(state),
+            hard_rule=logic.terran_any_anti_air,
             flags=LocationFlag.BASEBUST,
         ),
         make_location_data(
@@ -10165,6 +10163,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
                 logic.protoss_common_unit(state)
                 and logic.protoss_anti_armor_anti_air(state)
             ),
+            hard_rule=logic.protoss_any_anti_air_unit,
         ),
         make_location_data(
             SC2Mission.SHOOT_THE_MESSENGER_P.mission_name,
@@ -10202,6 +10201,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
                 logic.protoss_common_unit(state)
                 and logic.protoss_anti_armor_anti_air(state)
             ),
+            hard_rule=logic.protoss_any_anti_air_unit,
         ),
         make_location_data(
             SC2Mission.SHOOT_THE_MESSENGER_P.mission_name,
@@ -10249,6 +10249,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2_RACESWAP_LOC_ID_OFFSET + 6810,
             LocationType.CHALLENGE,
             logic.protoss_competent_comp,
+            hard_rule=logic.protoss_any_anti_air_unit,
             flags=LocationFlag.BASEBUST,
         ),
         make_location_data(
@@ -10257,6 +10258,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2_RACESWAP_LOC_ID_OFFSET + 6811,
             LocationType.CHALLENGE,
             logic.protoss_competent_comp,
+            hard_rule=logic.protoss_any_anti_air_unit,
             flags=LocationFlag.BASEBUST,
         ),
         make_location_data(
@@ -10265,6 +10267,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2_RACESWAP_LOC_ID_OFFSET + 6812,
             LocationType.CHALLENGE,
             logic.protoss_competent_comp,
+            hard_rule=logic.protoss_any_anti_air_unit,
             flags=LocationFlag.BASEBUST,
         ),
         make_location_data(
@@ -11841,7 +11844,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "Victory",
             SC2_RACESWAP_LOC_ID_OFFSET + 9600,
             LocationType.VICTORY,
-            lambda state: logic.protoss_deathball
+            lambda state: logic.protoss_deathball(state)
             or (adv_tactics and logic.protoss_competent_comp(state)),
         ),
         make_location_data(
@@ -11876,7 +11879,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "Main Path Command Center",
             SC2_RACESWAP_LOC_ID_OFFSET + 9605,
             LocationType.EXTRA,
-            lambda state: logic.protoss_deathball
+            lambda state: logic.protoss_deathball(state)
             or (adv_tactics and logic.protoss_competent_comp(state)),
         ),
         make_location_data(
@@ -12026,7 +12029,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "Victory",
             SC2_RACESWAP_LOC_ID_OFFSET + 10000,
             LocationType.VICTORY,
-            lambda state: logic.zerg_competent_comp
+            lambda state: logic.zerg_competent_comp(state)
             and logic.zerg_moderate_anti_air(state),
         ),
         make_location_data(
@@ -12034,7 +12037,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "First Prisoner Group",
             SC2_RACESWAP_LOC_ID_OFFSET + 10001,
             LocationType.VANILLA,
-            lambda state: logic.zerg_competent_comp
+            lambda state: logic.zerg_competent_comp(state)
             and logic.zerg_moderate_anti_air(state),
         ),
         make_location_data(
@@ -12042,7 +12045,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "Second Prisoner Group",
             SC2_RACESWAP_LOC_ID_OFFSET + 10002,
             LocationType.VANILLA,
-            lambda state: logic.zerg_competent_comp
+            lambda state: logic.zerg_competent_comp(state)
             and logic.zerg_moderate_anti_air(state),
         ),
         make_location_data(
@@ -12050,7 +12053,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "First Pylon",
             SC2_RACESWAP_LOC_ID_OFFSET + 10003,
             LocationType.VANILLA,
-            lambda state: logic.zerg_competent_comp
+            lambda state: logic.zerg_competent_comp(state)
             and logic.zerg_moderate_anti_air(state),
         ),
         make_location_data(
@@ -12058,7 +12061,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             "Second Pylon",
             SC2_RACESWAP_LOC_ID_OFFSET + 10004,
             LocationType.VANILLA,
-            lambda state: logic.zerg_competent_comp
+            lambda state: logic.zerg_competent_comp(state)
             and logic.zerg_moderate_anti_air(state),
         ),
         make_location_data(
@@ -12661,7 +12664,7 @@ def get_locations(world: Optional["SC2World"]) -> Tuple[LocationData, ...]:
             SC2_RACESWAP_LOC_ID_OFFSET + 11406,
             LocationType.CHALLENGE,
             lambda state: (
-                logic.zerg_brothers_in_arms_requirement
+                logic.zerg_brothers_in_arms_requirement(state)
                 and logic.zerg_base_buster(state)
                 and logic.zerg_power_rating(state) >= 8
             ),

worlds/sc2/mission_order/entry_rules.py

@@ -10,6 +10,10 @@ from BaseClasses import CollectionState
 if TYPE_CHECKING:
     from .nodes import SC2MOGenMission
 
+def always_true(state: CollectionState) -> bool:
+    """Helper method to avoid creating trivial lambdas"""
+    return True
+
 
 class EntryRule(ABC):
     buffer_fulfilled: bool
@@ -60,6 +64,11 @@ class EntryRule(ABC):
         """Used in the client to determine accessibility while playing and to populate tooltips."""
         pass
 
+    @abstractmethod
+    def find_mandatory_mission(self) -> SC2MOGenMission | None:
+        """Should return any mission that is mandatory to fulfill the entry rule, or `None` if there is no such mission."""
+        return None
+
 
 @dataclass
 class RuleData(ABC):
@@ -103,6 +112,11 @@ class BeatMissionsEntryRule(EntryRule):
             mission_ids,
             resolved_reqs
         )
+    
+    def find_mandatory_mission(self) -> SC2MOGenMission | None:
+        if len(self.missions_to_beat) > 0:
+            return self.missions_to_beat[0]
+        return None
 
 
 @dataclass
@@ -140,7 +154,7 @@ class CountMissionsEntryRule(EntryRule):
     def __init__(self, missions_to_count: List[SC2MOGenMission], target_amount: int, visual_reqs: List[Union[str, SC2MOGenMission]]):
         super().__init__()
         self.missions_to_count = missions_to_count
-        if target_amount == -1 or target_amount > len(missions_to_count):
+        if target_amount <= -1 or target_amount > len(missions_to_count):
             self.target_amount = len(missions_to_count)
         else:
             self.target_amount = target_amount
@@ -155,7 +169,20 @@ class CountMissionsEntryRule(EntryRule):
         return max(mission_depth, self.target_amount - 1) # -1 because depth is zero-based but amount is one-based
 
     def to_lambda(self, player: int) -> Callable[[CollectionState], bool]:
-        return lambda state: self.target_amount <= sum(state.has(mission.beat_item(), player) for mission in self.missions_to_count)
+        if self.target_amount == 0:
+            return always_true
+        
+        beat_items = [mission.beat_item() for mission in self.missions_to_count]
+        def count_missions(state: CollectionState) -> bool:
+            count = 0
+            for mission in range(len(self.missions_to_count)):
+                if state.has(beat_items[mission], player):
+                    count += 1
+                    if count == self.target_amount:
+                        return True
+            return False
+        
+        return count_missions
     
     def to_slot_data(self) -> RuleData:
         resolved_reqs: List[Union[str, int]] = [req if isinstance(req, str) else req.mission.id for req in self.visual_reqs]
@@ -165,6 +192,11 @@ class CountMissionsEntryRule(EntryRule):
             self.target_amount,
             resolved_reqs
         )
+    
+    def find_mandatory_mission(self) -> SC2MOGenMission | None:
+        if self.target_amount > 0 and self.target_amount == len(self.missions_to_count):
+            return self.missions_to_count[0]
+        return None
 
 
 @dataclass
@@ -216,13 +248,21 @@ class SubRuleEntryRule(EntryRule):
         self.rule_id = rule_id
         self.rules_to_check = rules_to_check
         self.min_depth = -1
-        if target_amount == -1 or target_amount > len(rules_to_check):
+        if target_amount <= -1 or target_amount > len(rules_to_check):
             self.target_amount = len(rules_to_check)
         else:
             self.target_amount = target_amount
 
     def _is_fulfilled(self, beaten_missions: Set[SC2MOGenMission], in_region_check: bool) -> bool:
-        return self.target_amount <= sum(rule.is_fulfilled(beaten_missions, in_region_check) for rule in self.rules_to_check)
+        if len(self.rules_to_check) == 0:
+            return True
+        count = 0
+        for rule in self.rules_to_check:
+            if rule.is_fulfilled(beaten_missions, in_region_check):
+                count += 1
+                if count == self.target_amount:
+                    return True
+        return False
     
     def _get_depth(self, beaten_missions: Set[SC2MOGenMission]) -> int:
         if len(self.rules_to_check) == 0:
@@ -235,7 +275,21 @@ class SubRuleEntryRule(EntryRule):
 
     def to_lambda(self, player: int) -> Callable[[CollectionState], bool]:
         sub_lambdas = [rule.to_lambda(player) for rule in self.rules_to_check]
-        return lambda state, sub_lambdas=sub_lambdas: self.target_amount <= sum(sub_lambda(state) for sub_lambda in sub_lambdas)
+        if self.target_amount == 0:
+            return always_true
+        if len(sub_lambdas) == 1:
+            return sub_lambdas[0]
+        
+        def count_rules(state: CollectionState) -> bool:
+            count = 0
+            for sub_lambda in sub_lambdas:
+                if sub_lambda(state):
+                    count += 1
+                    if count == self.target_amount:
+                        return True
+            return False
+        
+        return count_rules
     
     def to_slot_data(self) -> SubRuleRuleData:
         sub_rules = [rule.to_slot_data() for rule in self.rules_to_check]
@@ -244,6 +298,14 @@ class SubRuleEntryRule(EntryRule):
             sub_rules,
             self.target_amount
         )
+    
+    def find_mandatory_mission(self) -> SC2MOGenMission | None:
+        if self.target_amount > 0 and self.target_amount == len(self.rules_to_check):
+            for sub_rule in self.rules_to_check:
+                mandatory_mission = sub_rule.find_mandatory_mission()
+                if mandatory_mission is not None:
+                    return mandatory_mission
+        return None
 
 
 @dataclass
@@ -362,6 +424,9 @@ class ItemEntryRule(EntryRule):
             item_ids,
             visual_reqs
         )
+    
+    def find_mandatory_mission(self) -> SC2MOGenMission | None:
+        return None
 
 
 @dataclass

worlds/sc2/mission_order/generation.py

@@ -491,23 +491,60 @@ def make_connections(mission_order: SC2MOGenMissionOrder, world: 'SC2World'):
         for layout in campaign.layouts:
             for mission in layout.missions:
                 if not mission.option_empty:
+                    mission_uses_rule = mission.entry_rule.target_amount > 0
                     mission_rule = mission.entry_rule.to_lambda(player)
+                    mandatory_prereq = mission.entry_rule.find_mandatory_mission()
                     # Only layout entrances need to consider campaign & layout prerequisites
                     if mission.option_entrance:
-                        campaign_rule = mission.parent().parent().entry_rule.to_lambda(player)
-                        layout_rule = mission.parent().entry_rule.to_lambda(player)
-                        unlock_rule = lambda state, campaign_rule=campaign_rule, layout_rule=layout_rule, mission_rule=mission_rule: \
-                                             campaign_rule(state) and layout_rule(state) and mission_rule(state)
-                    else:
+                        campaign_uses_rule = campaign.entry_rule.target_amount > 0
+                        campaign_rule = campaign.entry_rule.to_lambda(player)
+                        layout_uses_rule = layout.entry_rule.target_amount > 0
+                        layout_rule = layout.entry_rule.to_lambda(player)
+
+                        # Any mandatory prerequisite mission is good enough
+                        mandatory_prereq = campaign.entry_rule.find_mandatory_mission() if mandatory_prereq is None else mandatory_prereq
+                        mandatory_prereq = layout.entry_rule.find_mandatory_mission() if mandatory_prereq is None else mandatory_prereq
+
+                        # Avoid calling obviously unused lambdas
+                        if campaign_uses_rule:
+                            if layout_uses_rule:
+                                if mission_uses_rule:
+                                    unlock_rule = lambda state, campaign_rule=campaign_rule, layout_rule=layout_rule, mission_rule=mission_rule: \
+                                                         campaign_rule(state) and layout_rule(state) and mission_rule(state)
+                                else:
+                                    unlock_rule = lambda state, campaign_rule=campaign_rule, layout_rule=layout_rule: \
+                                                         campaign_rule(state) and layout_rule(state)
+                            else:
+                                if mission_uses_rule:
+                                    unlock_rule = lambda state, campaign_rule=campaign_rule, mission_rule=mission_rule: \
+                                                         campaign_rule(state) and mission_rule(state)
+                                else:
+                                    unlock_rule = campaign_rule
+                        elif layout_uses_rule:
+                            if mission_uses_rule:
+                                unlock_rule = lambda state, layout_rule=layout_rule, mission_rule=mission_rule: \
+                                                     layout_rule(state) and mission_rule(state)
+                            else:
+                                unlock_rule = layout_rule
+                        elif mission_uses_rule:
+                            unlock_rule = mission_rule
+                        else:
+                            unlock_rule = None
+                    elif mission_uses_rule:
                         unlock_rule = mission_rule
-                    # Individually connect to previous missions
-                    for prev_mission in mission.prev:
-                        connect(world, names, prev_mission.mission.mission_name, mission.mission.mission_name,
-                                lambda state, unlock_rule=unlock_rule: unlock_rule(state))
-                    # If there are no previous missions, connect to Menu instead
-                    if len(mission.prev) == 0:
-                        connect(world, names, "Menu", mission.mission.mission_name,
-                                lambda state, unlock_rule=unlock_rule: unlock_rule(state))
+                    else:
+                        unlock_rule = None
+                    
+                    # Connect to a discovered mandatory mission if possible
+                    if mandatory_prereq is not None:
+                        connect(world, names, mandatory_prereq.mission.mission_name, mission.mission.mission_name, unlock_rule)
+                    else:
+                        # If no mission is known to be mandatory, connect to all previous missions instead
+                        for prev_mission in mission.prev:
+                            connect(world, names, prev_mission.mission.mission_name, mission.mission.mission_name, unlock_rule)
+                        # As a last resort connect to Menu
+                        if len(mission.prev) == 0:
+                            connect(world, names, "Menu", mission.mission.mission_name, unlock_rule)
 
 
 def connect(world: 'SC2World', used_names: Dict[str, int], source: str, target: str,

worlds/sc2/options.py

@@ -63,7 +63,7 @@ class Sc2MissionSet(OptionSet):
         return self.value.__len__()
 
 
-class SelectRaces(OptionSet):
+class SelectedRaces(OptionSet):
     """
     Pick which factions' missions and items can be shuffled into the world.
     """
@@ -152,6 +152,7 @@ class MissionOrder(Choice):
     option_golden_path = 10
     option_hopscotch = 11
     option_custom = 99
+    default = option_golden_path
 
 
 class MaximumCampaignSize(Range):
@@ -170,7 +171,7 @@ class TwoStartPositions(Toggle):
     If turned on and 'grid', 'hopscotch', or 'golden_path' mission orders are selected,
     removes the first mission and allows both of the next two missions to be played from the start.
     """
-    display_name = "Start with two unlocked missions on grid"
+    display_name = "Two start missions"
     default = Toggle.option_false
 
 
@@ -251,10 +252,21 @@ class PlayerColorNova(ColorChoice):
 
 
 class EnabledCampaigns(OptionSet):
-    """Determines which campaign's missions will be used"""
+    """
+    Determines which campaign's missions will be used.
+    Wings of Liberty, Prophecy, and Prologue are the only free-to-play campaigns.
+    Valid campaign names:
+    - 'Wings of Liberty'
+    - 'Prophecy'
+    - 'Heart of the Swarm'
+    - 'Whispers of Oblivion (Legacy of the Void: Prologue)'
+    - 'Legacy of the Void'
+    - 'Into the Void (Legacy of the Void: Epilogue)'
+    - 'Nova Covert Ops'
+    """
     display_name = "Enabled Campaigns"
     valid_keys = {campaign.campaign_name for campaign in SC2Campaign if campaign != SC2Campaign.GLOBAL}
-    default = valid_keys
+    default = set((SC2Campaign.WOL.campaign_name,))
 
 
 class EnableRaceSwapVariants(Choice):
@@ -1053,7 +1065,7 @@ class VictoryCache(Range):
     Controls how many additional checks are awarded for completing a mission.
     Goal missions are unaffected by this option.
     """
-    display_name = "Victory Checks"
+    display_name = "Victory Cache"
     range_start = 0
     range_end = 10
     default = 0
@@ -1342,7 +1354,7 @@ class Starcraft2Options(PerGameCommonOptions):
     player_color_zerg: PlayerColorZerg
     player_color_zerg_primal: PlayerColorZergPrimal
     player_color_nova: PlayerColorNova
-    selected_races: SelectRaces
+    selected_races: SelectedRaces
     enabled_campaigns: EnabledCampaigns
     enable_race_swap: EnableRaceSwapVariants
     mission_race_balancing: EnableMissionRaceBalancing
@@ -1436,7 +1448,7 @@ option_groups = [
         ShuffleCampaigns,
         AllInMap,
         TwoStartPositions,
-        SelectRaces,
+        SelectedRaces,
         ExcludeVeryHardMissions,
         EnableMissionRaceBalancing,
     ]),
@@ -1548,7 +1560,7 @@ def get_option_value(world: Union['SC2World', None], name: str) -> int:
 
 
 def get_enabled_races(world: Optional['SC2World']) -> Set[SC2Race]:
-    race_names = world.options.selected_races.value if world and len(world.options.selected_races.value) > 0 else SelectRaces.valid_keys
+    race_names = world.options.selected_races.value if world and len(world.options.selected_races.value) > 0 else SelectedRaces.valid_keys
     return {race for race in SC2Race if race.get_title() in race_names}