FF1: Throw exception for Noverworld

Corrects the issue causing the client and lua messaging not displaying properly after the printjson changes

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,35 @@
+name: Bug Report
+description: File a bug report.
+title: "Bug: "
+labels:
+  - bug / fix
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! If this bug occurred during local generation check your 
+        Archipelago install for a log (probably `C:\ProgramData\Archipelago\logs`)
+        and upload it with this report, as well as all yaml files used.
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+    validations:
+      required: true
+  - type: textarea
+    id: expected-results
+    attributes:
+      label: What were the expected results?
+    validations:
+      required: true
+  - type: dropdown
+    id: version
+    attributes:
+      label: Software
+      description: Where did this bug occur?
+      options:
+        - Website
+        - Local generation
+        - While playing
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,17 @@
+name: Feature Request
+description: Request a feature!
+title: "Category: "
+labels:
+  - enhancement
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please replace `Category` in the title with what this feature will be targeting, such as Core generation,
+        website, documentation, or a game.
+        Note: this is not for requesting new games to be added. If you would like to request a game, the best place to
+        ask is about it is in the [discord](https://archipelago.gg/discord).
+  - type: textarea
+    id: feature
+    attributes:
+      label: What feature would you like to see?

.github/ISSUE_TEMPLATE/task.yaml

@@ -0,0 +1,10 @@
+name: Task
+description: Submit a task to be done. If this is not targeting core, it should likely be elsewhere.
+title: "Core: "
+labels:
+  - core
+  - enhancement
+body:
+  - type: textarea
+    attributes:
+      label: What task needs to be completed?

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+Please format your title with what portion of the project this pull request is
+targeting and what it's changing.
+
+ex. "MyGame4: implement new game" or "Docs: add new guide for customizing MyGame3"
+
+## What is this fixing or adding?
+
+
+## How was this tested?
+
+
+## If this makes graphical changes, please attach screenshots.

.github/workflows/build.yml

@@ -4,6 +4,11 @@ name: Build
 
 on: workflow_dispatch
 
+env:
+  SNI_VERSION: v0.0.84
+  ENEMIZER_VERSION: 7.1
+  APPIMAGETOOL_VERSION: 13
+
 jobs:
   # build-release-macos: # LF volunteer
 
@@ -17,9 +22,9 @@ jobs:
           python-version: '3.8'
       - name: Download run-time dependencies
         run: |
-          Invoke-WebRequest -Uri https://github.com/alttpo/sni/releases/download/v0.0.82/sni-v0.0.82-windows-amd64.zip -OutFile sni.zip
+          Invoke-WebRequest -Uri https://github.com/alttpo/sni/releases/download/${Env:SNI_VERSION}/sni-${Env:SNI_VERSION}-windows-amd64.zip -OutFile sni.zip
           Expand-Archive -Path sni.zip -DestinationPath SNI -Force
-          Invoke-WebRequest -Uri https://github.com/Ijwu/Enemizer/releases/download/7.0.1/win-x64.zip -OutFile enemizer.zip
+          Invoke-WebRequest -Uri https://github.com/Ijwu/Enemizer/releases/download/${Env:ENEMIZER_VERSION}/win-x64.zip -OutFile enemizer.zip
           Expand-Archive -Path enemizer.zip -DestinationPath EnemizerCLI -Force
       - name: Build
         run: |
@@ -43,6 +48,7 @@ jobs:
   build-ubuntu1804:
     runs-on: ubuntu-18.04
     steps:
+      # - copy code below to release.yml -
       - uses: actions/checkout@v2
       - name: Install base dependencies
         run: |
@@ -56,18 +62,18 @@ jobs:
       - name: Install build-time dependencies
         run: |
           echo "PYTHON=python3.9" >> $GITHUB_ENV
-          wget -nv https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage
+          wget -nv https://github.com/AppImage/AppImageKit/releases/download/$APPIMAGETOOL_VERSION/appimagetool-x86_64.AppImage
           chmod a+rx appimagetool-x86_64.AppImage
           ./appimagetool-x86_64.AppImage --appimage-extract
           echo -e '#/bin/sh\n./squashfs-root/AppRun "$@"' > appimagetool
           chmod a+rx appimagetool
       - name: Download run-time dependencies
         run: |
-          wget -nv https://github.com/alttpo/sni/releases/download/v0.0.82/sni-v0.0.82-manylinux2014-amd64.tar.xz
+          wget -nv https://github.com/alttpo/sni/releases/download/$SNI_VERSION/sni-$SNI_VERSION-manylinux2014-amd64.tar.xz
           tar xf sni-*.tar.xz
           rm sni-*.tar.xz
           mv sni-* SNI
-          wget -nv https://github.com/Ijwu/Enemizer/releases/download/7.0.1/ubuntu.16.04-x64.7z
+          wget -nv https://github.com/Ijwu/Enemizer/releases/download/$ENEMIZER_VERSION/ubuntu.16.04-x64.7z
           7za x -oEnemizerCLI/ ubuntu.16.04-x64.7z
       - name: Build
         run: |
@@ -84,6 +90,7 @@ jobs:
           (cd build && DIR_NAME="`ls | grep exe`" && mv "$DIR_NAME" Archipelago && tar -czvf ../dist/$TAR_NAME Archipelago && mv Archipelago "$DIR_NAME")
           echo "APPIMAGE_NAME=$APPIMAGE_NAME" >> $GITHUB_ENV
           echo "TAR_NAME=$TAR_NAME" >> $GITHUB_ENV
+      # - copy code above to release.yml -
       - name: Store AppImage
         uses: actions/upload-artifact@v2
         with:

.github/workflows/lint.yml

@@ -18,8 +18,8 @@ jobs:
         python-version: 3.9
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest
+        python -m pip install --upgrade pip wheel
+        pip install flake8 pytest pytest-subtests
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Lint with flake8
       run: |

.github/workflows/release.yml

@@ -7,6 +7,11 @@ on:
     tags:
       - '*.*.*'
 
+env:
+  SNI_VERSION: v0.0.84
+  ENEMIZER_VERSION: 7.1
+  APPIMAGETOOL_VERSION: 13
+
 jobs:
   create-release:
     runs-on: ubuntu-latest
@@ -44,22 +49,23 @@ jobs:
       - name: Install build-time dependencies
         run: |
           echo "PYTHON=python3.9" >> $GITHUB_ENV
-          wget -nv https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage
+          wget -nv https://github.com/AppImage/AppImageKit/releases/download/$APPIMAGETOOL_VERSION/appimagetool-x86_64.AppImage
           chmod a+rx appimagetool-x86_64.AppImage
           ./appimagetool-x86_64.AppImage --appimage-extract
           echo -e '#/bin/sh\n./squashfs-root/AppRun "$@"' > appimagetool
           chmod a+rx appimagetool
       - name: Download run-time dependencies
         run: |
-          wget -nv https://github.com/alttpo/sni/releases/download/v0.0.82/sni-v0.0.82-manylinux2014-amd64.tar.xz
+          wget -nv https://github.com/alttpo/sni/releases/download/$SNI_VERSION/sni-$SNI_VERSION-manylinux2014-amd64.tar.xz
           tar xf sni-*.tar.xz
           rm sni-*.tar.xz
           mv sni-* SNI
-          wget -nv https://github.com/Ijwu/Enemizer/releases/download/7.0.1/ubuntu.16.04-x64.7z
+          wget -nv https://github.com/Ijwu/Enemizer/releases/download/$ENEMIZER_VERSION/ubuntu.16.04-x64.7z
           7za x -oEnemizerCLI/ ubuntu.16.04-x64.7z
       - name: Build
         run: |
-          "${{ env.PYTHON }}" -m pip install --upgrade pip setuptools virtualenv PyGObject  # pygobject should probably move to requirements
+          # pygobject is an optional dependency for kivy that's not in requirements
+          "${{ env.PYTHON }}" -m pip install --upgrade pip virtualenv PyGObject setuptools
           "${{ env.PYTHON }}" -m venv venv
           source venv/bin/activate
           pip install -r requirements.txt

.github/workflows/unittests.yml

@@ -32,8 +32,8 @@ jobs:
         python-version: ${{ matrix.python.version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install flake8 pytest
+        python -m pip install --upgrade pip wheel
+        pip install flake8 pytest pytest-subtests
         python ModuleUpdate.py --yes --force --append "WebHostLib/requirements.txt"
     - name: Unittests
       run: |

.gitignore

@@ -28,6 +28,7 @@ README.html
 .vs/
 EnemizerCLI/
 /Players/
+/SNI/
 /options.yaml
 /config.yaml
 /logs/

CommonClient.py

@@ -5,6 +5,7 @@ import urllib.parse
 import sys
 import typing
 import time
+import functools
 
 import ModuleUpdate
 ModuleUpdate.update()
@@ -17,7 +18,8 @@ if __name__ == "__main__":
     Utils.init_logging("TextClient", exception_logger="Client")
 
 from MultiServer import CommandProcessor
-from NetUtils import Endpoint, decode, NetworkItem, encode, JSONtoTextParser, ClientStatus, Permission, NetworkSlot
+from NetUtils import Endpoint, decode, NetworkItem, encode, JSONtoTextParser, \
+    ClientStatus, Permission, NetworkSlot, RawJSONtoTextParser
 from Utils import Version, stream_input
 from worlds import network_data_package, AutoWorldRegister
 import os
@@ -152,8 +154,9 @@ class CommonContext:
     # locations
     locations_checked: typing.Set[int]  # local state
     locations_scouted: typing.Set[int]
-    missing_locations: typing.Set[int]
+    missing_locations: typing.Set[int]  # server state
     checked_locations: typing.Set[int]  # server state
+    server_locations: typing.Set[int]  # all locations the server knows of, missing_location | checked_locations
     locations_info: typing.Dict[int, NetworkItem]
 
     # internals
@@ -184,8 +187,9 @@ class CommonContext:
         self.locations_checked = set()  # local state
         self.locations_scouted = set()
         self.items_received = []
-        self.missing_locations = set()
+        self.missing_locations = set()  # server state
         self.checked_locations = set()  # server state
+        self.server_locations = set()  # all locations the server knows of, missing_location | checked_locations
         self.locations_info = {}
 
         self.input_queue = asyncio.Queue()
@@ -202,6 +206,10 @@ class CommonContext:
         # execution
         self.keep_alive_task = asyncio.create_task(keep_alive(self), name="Bouncy")
 
+    @functools.cached_property
+    def raw_text_parser(self) -> RawJSONtoTextParser:
+        return RawJSONtoTextParser(self)
+
     @property
     def total_locations(self) -> typing.Optional[int]:
         """Will return None until connected."""
@@ -345,6 +353,8 @@ class CommonContext:
         cache_package = Utils.persistent_load().get("datapackage", {}).get("games", {})
         needed_updates: typing.Set[str] = set()
         for game in relevant_games:
+            if game not in remote_datepackage_versions:
+                continue
             remote_version: int = remote_datepackage_versions[game]
 
             if remote_version == 0:  # custom datapackage for this game
@@ -632,6 +642,7 @@ async def process_server_cmd(ctx: CommonContext, args: dict):
         # when /missing is used for the client side view of what is missing.
         ctx.missing_locations = set(args["missing_locations"])
         ctx.checked_locations = set(args["checked_locations"])
+        ctx.server_locations = ctx.missing_locations | ctx. checked_locations
 
     elif cmd == 'ReceivedItems':
         start_index = args["index"]

FF1Client.py

@@ -1,4 +1,5 @@
 import asyncio
+import copy
 import json
 import time
 from asyncio import StreamReader, StreamWriter
@@ -6,7 +7,7 @@ from typing import List
 
 
 import Utils
-from CommonClient import CommonContext, server_loop, gui_enabled, console_loop, ClientCommandProcessor, logger, \
+from CommonClient import CommonContext, server_loop, gui_enabled, ClientCommandProcessor, logger, \
     get_base_parser
 
 SYSTEM_MESSAGE_ID = 0
@@ -64,7 +65,7 @@ class FF1Context(CommonContext):
 
     def _set_message(self, msg: str, msg_id: int):
         if DISPLAY_MSGS:
-            self.messages[(time.time(), msg_id)] = msg
+            self.messages[time.time(), msg_id] = msg
 
     def on_package(self, cmd: str, args: dict):
         if cmd == 'Connected':
@@ -73,32 +74,28 @@ class FF1Context(CommonContext):
             msg = args['text']
             if ': !' not in msg:
                 self._set_message(msg, SYSTEM_MESSAGE_ID)
-        elif cmd == "ReceivedItems":
-            msg = f"Received {', '.join([self.item_names[item.item] for item in args['items']])}"
-            self._set_message(msg, SYSTEM_MESSAGE_ID)
-        elif cmd == 'PrintJSON':
-            print_type = args['type']
-            item = args['item']
-            receiving_player_id = args['receiving']
-            receiving_player_name = self.player_names[receiving_player_id]
-            sending_player_id = item.player
-            sending_player_name = self.player_names[item.player]
-            if print_type == 'Hint':
-                msg = f"Hint: Your {self.item_names[item.item]} is at" \
-                      f" {self.player_names[item.player]}'s {self.location_names[item.location]}"
-                self._set_message(msg, item.item)
-            elif print_type == 'ItemSend' and receiving_player_id != self.slot:
-                if sending_player_id == self.slot:
-                    if receiving_player_id == self.slot:
-                        msg = f"You found your own {self.item_names[item.item]}"
-                    else:
-                        msg = f"You sent {self.item_names[item.item]} to {receiving_player_name}"
-                else:
-                    if receiving_player_id == sending_player_id:
-                        msg = f"{sending_player_name} found their {self.item_names[item.item]}"
-                    else:
-                        msg = f"{sending_player_name} sent {self.item_names[item.item]} to " \
-                              f"{receiving_player_name}"
+
+    def on_print_json(self, args: dict):
+        if self.ui:
+            self.ui.print_json(copy.deepcopy(args["data"]))
+        else:
+            text = self.jsontotextparser(copy.deepcopy(args["data"]))
+            logger.info(text)
+        relevant = args.get("type", None) in {"Hint", "ItemSend"}
+        if relevant:
+            item = args["item"]
+            # goes to this world
+            if self.slot_concerns_self(args["receiving"]):
+                relevant = True
+            # found in this world
+            elif self.slot_concerns_self(item.player):
+                relevant = True
+            # not related
+            else:
+                relevant = False
+            if relevant:
+                item = args["item"]
+                msg = self.raw_text_parser(copy.deepcopy(args["data"]))
                 self._set_message(msg, item.item)
 
     def run_gui(self):

Generate.py

@@ -63,7 +63,7 @@ class PlandoSettings(enum.IntFlag):
 
     def __str__(self) -> str:
         if self.value:
-            return ", ".join((flag.name for flag in PlandoSettings if self.value & flag.value))
+            return ", ".join(flag.name for flag in PlandoSettings if self.value & flag.value)
         return "Off"
 
 
@@ -84,11 +84,6 @@ def mystery_argparse():
     parser.add_argument('--seed', help='Define seed number to generate.', type=int)
     parser.add_argument('--multi', default=defaults["players"], type=lambda value: max(int(value), 1))
     parser.add_argument('--spoiler', type=int, default=defaults["spoiler"])
-    parser.add_argument('--lttp_rom', default=options["lttp_options"]["rom_file"],
-                        help="Path to the 1.0 JP LttP Baserom.")  # absolute, relative to cwd or relative to app path
-    parser.add_argument('--sm_rom', default=options["sm_options"]["rom_file"],
-                        help="Path to the 1.0 JP SM Baserom.")
-    parser.add_argument('--enemizercli', default=resolve_path(defaults["enemizer_path"], local_path))
     parser.add_argument('--outputpath', default=resolve_path(options["general_options"]["output_path"], user_path),
                         help="Path to output folder. Absolute or relative to cwd.")  # absolute or relative to cwd
     parser.add_argument('--race', action='store_true', default=defaults["race"])
@@ -183,10 +178,6 @@ def main(args=None, callback=ERmain):
 
     Utils.init_logging(f"Generate_{seed}", loglevel=args.log_level)
 
-    erargs.lttp_rom = args.lttp_rom
-    erargs.sm_rom = args.sm_rom
-    erargs.enemizercli = args.enemizercli
-
     settings_cache: Dict[str, Tuple[argparse.Namespace, ...]] = \
         {fname: (tuple(roll_settings(yaml, args.plando) for yaml in yamls) if args.samesettings else None)
          for fname, yamls in weights_cache.items()}

Launcher.py

@@ -10,16 +10,21 @@ Scroll down to components= to add components to the launcher as well as setup.py
 
 
 import argparse
-from os.path import isfile
-import sys
-from typing import Iterable, Sequence, Callable, Union, Optional
-import subprocess
 import itertools
-from Utils import is_frozen, user_path, local_path, init_logging, open_filename, messagebox,\
-    is_windows, is_macos, is_linux
-from shutil import which
 import shlex
+import subprocess
+import sys
 from enum import Enum, auto
+from os.path import isfile
+from shutil import which
+from typing import Iterable, Sequence, Callable, Union, Optional
+
+if __name__ == "__main__":
+    import ModuleUpdate
+    ModuleUpdate.update()
+
+from Utils import is_frozen, user_path, local_path, init_logging, open_filename, messagebox, \
+    is_windows, is_macos, is_linux
 
 
 def open_host_yaml():
@@ -65,6 +70,7 @@ def browse_files():
         webbrowser.open(file)
 
 
+# noinspection PyArgumentList
 class Type(Enum):
     TOOL = auto()
     FUNC = auto()  # not a real component

LttPAdjuster.py

@@ -83,9 +83,9 @@ def main():
     parser.add_argument('--ow_palettes', default='default',
                         choices=['default', 'random', 'blackout', 'puke', 'classic', 'grayscale', 'negative', 'dizzy',
                                  'sick'])
-    parser.add_argument('--link_palettes', default='default',
-                        choices=['default', 'random', 'blackout', 'puke', 'classic', 'grayscale', 'negative', 'dizzy',
-                                 'sick'])
+    # parser.add_argument('--link_palettes', default='default',
+    #                     choices=['default', 'random', 'blackout', 'puke', 'classic', 'grayscale', 'negative', 'dizzy',
+    #                              'sick'])
     parser.add_argument('--shield_palettes', default='default',
                         choices=['default', 'random', 'blackout', 'puke', 'classic', 'grayscale', 'negative', 'dizzy',
                                  'sick'])
@@ -752,6 +752,7 @@ class SpriteSelector():
         self.window['pady'] = 5
         self.spritesPerRow = 32
         self.all_sprites = []
+        self.invalid_sprites = []
         self.sprite_pool = spritePool
 
         def open_custom_sprite_dir(_evt):
@@ -833,6 +834,13 @@ class SpriteSelector():
         self.window.focus()
         tkinter_center_window(self.window)
 
+        if self.invalid_sprites:
+            invalid = sorted(self.invalid_sprites)
+            logging.warning(f"The following sprites are invalid: {', '.join(invalid)}")
+            msg = f"{invalid[0]} "
+            msg += f"and {len(invalid)-1} more are invalid" if len(invalid) > 1 else "is invalid"
+            messagebox.showerror("Invalid sprites detected", msg, parent=self.window)
+
     def remove_from_sprite_pool(self, button, spritename):
         self.callback(("remove", spritename))
         self.spritePoolButtons.buttons.remove(button)
@@ -897,7 +905,13 @@ class SpriteSelector():
         sprites = []
 
         for file in os.listdir(path):
-            sprites.append((file, Sprite(os.path.join(path, file))))
+            if file == '.gitignore':
+                continue
+            sprite = Sprite(os.path.join(path, file))
+            if sprite.valid:
+                sprites.append((file, sprite))
+            else:
+                self.invalid_sprites.append(file)
 
         sprites.sort(key=lambda s: str.lower(s[1].name or "").strip())
 

Main.py

@@ -70,7 +70,6 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
     world.required_medallions = args.required_medallions.copy()
     world.game = args.game.copy()
     world.player_name = args.name.copy()
-    world.enemizer = args.enemizercli
     world.sprite = args.sprite.copy()
     world.glitch_triforce = args.glitch_triforce  # This is enabled/disabled globally, no per player option.
 

MultiServer.py

@@ -36,6 +36,7 @@ from NetUtils import Endpoint, ClientStatus, NetworkItem, decode, encode, Networ
     SlotType
 
 min_client_version = Version(0, 1, 6)
+print_command_compatability_threshold = Version(0, 3, 5) # Remove backwards compatibility around 0.3.7
 colorama.init()
 
 # functions callable on storable data on the server by clients
@@ -291,20 +292,27 @@ class Context:
 
     # text
 
-    def notify_all(self, text):
+    def notify_all(self, text: str):
         logging.info("Notice (all): %s" % text)
-        self.broadcast_all([{"cmd": "Print", "text": text}])
+        broadcast_text_all(self, text)
 
     def notify_client(self, client: Client, text: str):
         if not client.auth:
             return
         logging.info("Notice (Player %s in team %d): %s" % (client.name, client.team + 1, text))
-        asyncio.create_task(self.send_msgs(client, [{"cmd": "Print", "text": text}]))
+        if client.version >= print_command_compatability_threshold:
+            asyncio.create_task(self.send_msgs(client, [{"cmd": "PrintJSON", "data": [{ "text": text }]}]))
+        else:
+            asyncio.create_task(self.send_msgs(client, [{"cmd": "Print", "text": text}]))
 
     def notify_client_multiple(self, client: Client, texts: typing.List[str]):
         if not client.auth:
             return
-        asyncio.create_task(self.send_msgs(client, [{"cmd": "Print", "text": text} for text in texts]))
+        if client.version >= print_command_compatability_threshold:
+            asyncio.create_task(self.send_msgs(client, 
+                [{"cmd": "PrintJSON", "data": [{ "text": text }]} for text in texts]))
+        else:
+            asyncio.create_task(self.send_msgs(client, [{"cmd": "Print", "text": text} for text in texts]))
 
     # loading
 
@@ -585,6 +593,7 @@ class Context:
             forfeit_player(self, client.team, client.slot)
         elif self.forced_auto_forfeits[self.games[client.slot]]:
             forfeit_player(self, client.team, client.slot)
+        self.save()  # save goal completion flag
 
 
 def notify_hints(ctx: Context, team: int, hints: typing.List[NetUtils.Hint], only_new: bool = False):
@@ -721,20 +730,37 @@ async def on_client_left(ctx: Context, client: Client):
     ctx.client_connection_timers[client.team, client.slot] = datetime.datetime.now(datetime.timezone.utc)
 
 
-async def countdown(ctx: Context, timer):
-    ctx.notify_all(f'[Server]: Starting countdown of {timer}s')
+async def countdown(ctx: Context, timer: int):
+    broadcast_countdown(ctx, timer, f"[Server]: Starting countdown of {timer}s")
     if ctx.countdown_timer:
         ctx.countdown_timer = timer  # timer is already running, set it to a different time
     else:
         ctx.countdown_timer = timer
         while ctx.countdown_timer > 0:
-            ctx.notify_all(f'[Server]: {ctx.countdown_timer}')
+            broadcast_countdown(ctx, ctx.countdown_timer, f"[Server]: {ctx.countdown_timer}")
             ctx.countdown_timer -= 1
             await asyncio.sleep(1)
-        ctx.notify_all(f'[Server]: GO')
+        broadcast_countdown(ctx, 0, f"[Server]: GO")
         ctx.countdown_timer = 0
 
 
+def broadcast_text_all(ctx: Context, text: str, additional_arguments: dict = {}):
+    old_clients, new_clients = [], []
+
+    for teams in ctx.clients.values():
+        for clients in teams.values():
+            for client in clients:
+                new_clients.append(client) if client.version >= print_command_compatability_threshold \
+                    else old_clients.append(client)
+
+    ctx.broadcast(old_clients, [{"cmd": "Print", "text": text }])
+    ctx.broadcast(new_clients, [{**{"cmd": "PrintJSON", "data": [{ "text": text }]}, **additional_arguments}])
+
+
+def broadcast_countdown(ctx: Context, timer: int, message: str):
+    broadcast_text_all(ctx, message, {"type": "Countdown", "countdown": timer})
+
+
 def get_players_string(ctx: Context):
     auth_clients = {(c.team, c.slot) for c in ctx.endpoints if c.auth}
 

Options.py

@@ -298,7 +298,7 @@ class Toggle(NumericOption):
         if type(data) == str:
             return cls.from_text(data)
         else:
-            return cls(data)
+            return cls(int(data))
 
     @classmethod
     def get_option_name(cls, value):

Patch.py

@@ -17,7 +17,7 @@ ModuleUpdate.update()
 
 import Utils
 
-current_patch_version = 4
+current_patch_version = 5
 
 
 class AutoPatchRegister(type):
@@ -128,6 +128,7 @@ class APDeltaPatch(APContainer, metaclass=AutoPatchRegister):
         manifest = super(APDeltaPatch, self).get_manifest()
         manifest["base_checksum"] = self.hash
         manifest["result_file_ending"] = self.result_file_ending
+        manifest["patch_file_ending"] = self.patch_file_ending
         return manifest
 
     @classmethod

README.md

@@ -61,26 +61,10 @@ This project makes use of multiple other projects. We wouldn't be here without t
 * [Ocarina of Time Randomizer](https://github.com/TestRunnerSRL/OoT-Randomizer)
 
 ## Contributing
-Contributions are welcome. We have a few asks of any new contributors.
-
-* Ensure that all changes which affect logic are covered by unit tests. 
-* Do not introduce any unit test failures/regressions.
-
-Otherwise, we tend to judge code on a case to case basis. It is a generally good idea to stick to PEP-8 guidelines to ensure consistency with existing code. (And to make the linter happy.)
-
-For adding a new game to Archipelago and other documentation on how Archipelago functions, please see [the docs folder](docs/) for the relevant information and feel free to ask any questions in the #archipelago-dev channel in our discord.
+For contribution guidelines, please see our [Contributing doc.](/docs/contributing.md)
 
 ## FAQ
-For frequently asked questions see the website's [FAQ Page](https://archipelago.gg/faq/en/)
+For Frequently asked questions, please see the website's [FAQ Page.](https://archipelago.gg/faq/en/)
 
 ## Code of Conduct
-We conduct ourselves openly and inclusively here. Please do not contribute to an environment which makes other people uncomfortable. This means that we expect all contributors or participants here to:
-
-* Be welcoming and inclusive in tone and language.
-* Be respectful of others and their abilities.
-* Show empathy when speaking with others.
-* Be gracious and accept feedback and constructive criticism.
-
-These guidelines apply to all channels of communication within this GitHub repository. Please be respectful in both public channels, such as issues, and private, such as private messaging or emails.
-
-Any incidents of abuse may be reported directly to Ijwu at hmfarran@gmail.com.
+Please refer to our [code of conduct.](/docs/code_of_conduct.md)

SNIClient.py

@@ -15,9 +15,6 @@ import typing
 
 from json import loads, dumps
 
-import ModuleUpdate
-ModuleUpdate.update()
-
 from Utils import init_logging, messagebox
 
 if __name__ == "__main__":
@@ -149,8 +146,8 @@ class Context(CommonContext):
     def event_invalid_slot(self):
         if self.snes_socket is not None and not self.snes_socket.closed:
             asyncio.create_task(self.snes_socket.close())
-        raise Exception('Invalid ROM detected, '
-                        'please verify that you have loaded the correct rom and reconnect your snes (/snes)')
+        raise Exception("Invalid ROM detected, "
+                        "please verify that you have loaded the correct rom and reconnect your snes (/snes)")
 
     async def server_auth(self, password_requested: bool = False):
         if password_requested and not self.password:
@@ -158,7 +155,7 @@ class Context(CommonContext):
         if self.rom is None:
             self.awaiting_rom = True
             snes_logger.info(
-                'No ROM detected, awaiting snes connection to authenticate to the multiworld server (/snes)')
+                "No ROM detected, awaiting snes connection to authenticate to the multiworld server (/snes)")
             return
         self.awaiting_rom = False
         self.auth = self.rom
@@ -262,7 +259,7 @@ async def deathlink_kill_player(ctx: Context):
 
 SNES_RECONNECT_DELAY = 5
 
-# LttP
+# FXPAK Pro protocol memory mapping used by SNI
 ROM_START = 0x000000
 WRAM_START = 0xF50000
 WRAM_SIZE = 0x20000
@@ -293,21 +290,24 @@ SHOP_LEN = (len(Shops.shop_table) * 3) + 5
 DEATH_LINK_ACTIVE_ADDR = ROMNAME_START + 0x15       # 1 byte
 
 # SM
-SM_ROMNAME_START = 0x007FC0
+SM_ROMNAME_START = ROM_START + 0x007FC0
 
 SM_INGAME_MODES = {0x07, 0x09, 0x0b}
 SM_ENDGAME_MODES = {0x26, 0x27}
 SM_DEATH_MODES = {0x15, 0x17, 0x18, 0x19, 0x1A}
 
-SM_RECV_PROGRESS_ADDR = SRAM_START + 0x2000         # 2 bytes
-SM_RECV_ITEM_ADDR = SAVEDATA_START + 0x4D2          # 1 byte
-SM_RECV_ITEM_PLAYER_ADDR = SAVEDATA_START + 0x4D3   # 1 byte
+# RECV and SEND are from the gameplay's perspective: SNIClient writes to RECV queue and reads from SEND queue
+SM_RECV_QUEUE_START  = SRAM_START + 0x2000
+SM_RECV_QUEUE_WCOUNT = SRAM_START + 0x2602
+SM_SEND_QUEUE_START  = SRAM_START + 0x2700
+SM_SEND_QUEUE_RCOUNT = SRAM_START + 0x2680
+SM_SEND_QUEUE_WCOUNT = SRAM_START + 0x2682
 
 SM_DEATH_LINK_ACTIVE_ADDR = ROM_START + 0x277f04    # 1 byte
 SM_REMOTE_ITEM_FLAG_ADDR = ROM_START + 0x277f06    # 1 byte
 
 # SMZ3
-SMZ3_ROMNAME_START = 0x00FFC0
+SMZ3_ROMNAME_START = ROM_START + 0x00FFC0
 
 SMZ3_INGAME_MODES = {0x07, 0x09, 0x0b}
 SMZ3_ENDGAME_MODES = {0x26, 0x27}
@@ -1083,6 +1083,9 @@ async def game_watcher(ctx: Context):
 
             if ctx.awaiting_rom:
                 await ctx.server_auth(False)
+            elif ctx.server is None:
+                snes_logger.warning("ROM detected but no active multiworld server connection. " +
+                                    "Connect using command: /connect server:port")
 
         if ctx.auth and ctx.auth != ctx.rom:
             snes_logger.warning("ROM change detected, please reconnect to the multiworld server")
@@ -1159,6 +1162,9 @@ async def game_watcher(ctx: Context):
                 await ctx.send_msgs([{"cmd": "LocationScouts", "locations": [scout_location]}])
             await track_locations(ctx, roomid, roomdata)
         elif ctx.game == GAME_SM:
+            if ctx.server is None or ctx.slot is None:
+                # not successfully connected to a multiworld server, cannot process the game sending items
+                continue
             gamemode = await snes_read(ctx, WRAM_START + 0x0998, 1)
             if "DeathLink" in ctx.tags and gamemode and ctx.last_death_link + 1 < time.time():
                 currently_dead = gamemode[0] in SM_DEATH_MODES
@@ -1169,25 +1175,25 @@ async def game_watcher(ctx: Context):
                     ctx.finished_game = True
                 continue
 
-            data = await snes_read(ctx, SM_RECV_PROGRESS_ADDR + 0x680, 4)
+            data = await snes_read(ctx, SM_SEND_QUEUE_RCOUNT, 4)
             if data is None:
                 continue
 
             recv_index = data[0] | (data[1] << 8)
-            recv_item = data[2] | (data[3] << 8)
+            recv_item = data[2] | (data[3] << 8) # this is actually SM_SEND_QUEUE_WCOUNT
 
             while (recv_index < recv_item):
                 itemAdress = recv_index * 8
-                message = await snes_read(ctx, SM_RECV_PROGRESS_ADDR + 0x700 + itemAdress, 8)
+                message = await snes_read(ctx, SM_SEND_QUEUE_START + itemAdress, 8)
                 # worldId = message[0] | (message[1] << 8)  # unused
                 # itemId = message[2] | (message[3] << 8)  # unused
                 itemIndex = (message[4] | (message[5] << 8)) >> 3
 
                 recv_index += 1
-                snes_buffered_write(ctx, SM_RECV_PROGRESS_ADDR + 0x680,
+                snes_buffered_write(ctx, SM_SEND_QUEUE_RCOUNT,
                                     bytes([recv_index & 0xFF, (recv_index >> 8) & 0xFF]))
 
-                from worlds.sm.Locations import locations_start_id
+                from worlds.sm import locations_start_id
                 location_id = locations_start_id + itemIndex
 
                 ctx.locations_checked.add(location_id)
@@ -1196,15 +1202,14 @@ async def game_watcher(ctx: Context):
                     f'New Check: {location} ({len(ctx.locations_checked)}/{len(ctx.missing_locations) + len(ctx.checked_locations)})')
                 await ctx.send_msgs([{"cmd": 'LocationChecks', "locations": [location_id]}])
 
-            data = await snes_read(ctx, SM_RECV_PROGRESS_ADDR + 0x600, 4)
+            data = await snes_read(ctx, SM_RECV_QUEUE_WCOUNT, 2)
             if data is None:
                 continue
 
-            # recv_itemOutPtr = data[0] | (data[1] << 8) # unused
-            itemOutPtr = data[2] | (data[3] << 8)
+            itemOutPtr = data[0] | (data[1] << 8)
 
-            from worlds.sm.Items import items_start_id
-            from worlds.sm.Locations import locations_start_id
+            from worlds.sm import items_start_id
+            from worlds.sm import locations_start_id
             if itemOutPtr < len(ctx.items_received):
                 item = ctx.items_received[itemOutPtr]
                 itemId = item.item - items_start_id
@@ -1214,10 +1219,10 @@ async def game_watcher(ctx: Context):
                     locationId = 0x00 #backward compat
 
                 playerID = item.player if item.player <= SM_ROM_PLAYER_LIMIT else 0
-                snes_buffered_write(ctx, SM_RECV_PROGRESS_ADDR + itemOutPtr * 4, bytes(
+                snes_buffered_write(ctx, SM_RECV_QUEUE_START + itemOutPtr * 4, bytes(
                 	[playerID & 0xFF, (playerID >> 8) & 0xFF, itemId & 0xFF, locationId & 0xFF]))
                 itemOutPtr += 1
-                snes_buffered_write(ctx, SM_RECV_PROGRESS_ADDR + 0x602,
+                snes_buffered_write(ctx, SM_RECV_QUEUE_WCOUNT,
                                     bytes([itemOutPtr & 0xFF, (itemOutPtr >> 8) & 0xFF]))
                 logging.info('Received %s from %s (%s) (%d/%d in list)' % (
                     color(ctx.item_names[item.item], 'red', 'bold'),
@@ -1225,6 +1230,9 @@ async def game_watcher(ctx: Context):
                     ctx.location_names[item.location], itemOutPtr, len(ctx.items_received)))
             await snes_flush_writes(ctx)
         elif ctx.game == GAME_SMZ3:
+            if ctx.server is None or ctx.slot is None:
+                # not successfully connected to a multiworld server, cannot process the game sending items
+                continue
             currentGame = await snes_read(ctx, SRAM_START + 0x33FE, 2)
             if (currentGame is not None):
                 if (currentGame[0] != 0):
@@ -1260,7 +1268,8 @@ async def game_watcher(ctx: Context):
                 snes_buffered_write(ctx, SMZ3_RECV_PROGRESS_ADDR + 0x680, bytes([recv_index & 0xFF, (recv_index >> 8) & 0xFF]))
 
                 from worlds.smz3.TotalSMZ3.Location import locations_start_id
-                location_id = locations_start_id + itemIndex
+                from worlds.smz3 import convertLocSMZ3IDToAPID
+                location_id = locations_start_id + convertLocSMZ3IDToAPID(itemIndex)
 
                 ctx.locations_checked.add(location_id)
                 location = ctx.location_names[location_id]

Starcraft2Client.py

@@ -1,31 +1,32 @@
 from __future__ import annotations
 
-import multiprocessing
-import logging
 import asyncio
+import copy
+import ctypes
+import logging
+import multiprocessing
 import os.path
+import re
+import sys
+import typing
+import queue
+from pathlib import Path
 
 import nest_asyncio
 import sc2
-
-from sc2.main import run_game
-from sc2.data import Race
 from sc2.bot_ai import BotAI
+from sc2.data import Race
+from sc2.main import run_game
 from sc2.player import Bot
 
-from worlds.sc2wol.Regions import MissionInfo
-from worlds.sc2wol.MissionTables import lookup_id_to_mission
-from worlds.sc2wol.Items import lookup_id_to_name, item_table
-from worlds.sc2wol.Locations import SC2WOL_LOC_ID_OFFSET
-from worlds.sc2wol import SC2WoLWorld
-
-from pathlib import Path
-import re
+import NetUtils
 from MultiServer import mark_raw
-import ctypes
-import sys
-
 from Utils import init_logging, is_windows
+from worlds.sc2wol import SC2WoLWorld
+from worlds.sc2wol.Items import lookup_id_to_name, item_table, ItemData, type_flaggroups
+from worlds.sc2wol.Locations import SC2WOL_LOC_ID_OFFSET
+from worlds.sc2wol.MissionTables import lookup_id_to_mission
+from worlds.sc2wol.Regions import MissionInfo
 
 if __name__ == "__main__":
     init_logging("SC2Client", exception_logger="Client")
@@ -35,10 +36,12 @@ sc2_logger = logging.getLogger("Starcraft2")
 
 import colorama
 
-from NetUtils import *
+from NetUtils import ClientStatus, RawJSONtoTextParser
 from CommonClient import CommonContext, server_loop, ClientCommandProcessor, gui_enabled, get_base_parser
 
 nest_asyncio.apply()
+max_bonus: int = 8
+victory_modulo: int = 100
 
 
 class StarcraftClientProcessor(ClientCommandProcessor):
@@ -98,13 +101,13 @@ class StarcraftClientProcessor(ClientCommandProcessor):
     def _cmd_available(self) -> bool:
         """Get what missions are currently available to play"""
 
-        request_available_missions(self.ctx.checked_locations, self.ctx.mission_req_table, self.ctx.ui)
+        request_available_missions(self.ctx)
         return True
 
     def _cmd_unfinished(self) -> bool:
         """Get what missions are currently available to play and have not had all locations checked"""
 
-        request_unfinished_missions(self.ctx.checked_locations, self.ctx.mission_req_table, self.ctx.ui, self.ctx)
+        request_unfinished_missions(self.ctx)
         return True
 
     @mark_raw
@@ -125,18 +128,19 @@ class SC2Context(CommonContext):
     items_handling = 0b111
     difficulty = -1
     all_in_choice = 0
-    mission_req_table = None
-    items_rec_to_announce = []
-    rec_announce_pos = 0
-    items_sent_to_announce = []
-    sent_announce_pos = 0
-    announcements = []
-    announcement_pos = 0
+    mission_req_table: typing.Dict[str, MissionInfo] = {}
+    announcements = queue.Queue()
     sc2_run_task: typing.Optional[asyncio.Task] = None
-    missions_unlocked = False
+    missions_unlocked: bool = False  # allow launching missions ignoring requirements
     current_tooltip = None
     last_loc_list = None
     difficulty_override = -1
+    mission_id_to_location_ids: typing.Dict[int, typing.List[int]] = {}
+    last_bot: typing.Optional[ArchipelagoBot] = None
+
+    def __init__(self, *args, **kwargs):
+        super(SC2Context, self).__init__(*args, **kwargs)
+        self.raw_text_parser = RawJSONtoTextParser(self)
 
     async def server_auth(self, password_requested: bool = False):
         if password_requested and not self.password:
@@ -149,30 +153,35 @@ class SC2Context(CommonContext):
             self.difficulty = args["slot_data"]["game_difficulty"]
             self.all_in_choice = args["slot_data"]["all_in_map"]
             slot_req_table = args["slot_data"]["mission_req"]
-            self.mission_req_table = {}
-            # Compatibility for 0.3.2 server data.
-            if "category" not in next(iter(slot_req_table)):
-                for i, mission_data in enumerate(slot_req_table.values()):
-                    mission_data["category"] = wol_default_categories[i]
-            for mission in slot_req_table:
-                self.mission_req_table[mission] = MissionInfo(**slot_req_table[mission])
+            self.mission_req_table = {
+                mission: MissionInfo(**slot_req_table[mission]) for mission in slot_req_table
+            }
+
+            self.build_location_to_mission_mapping()
 
             # Look for and set SC2PATH.
             # check_game_install_path() returns True if and only if it finds + sets SC2PATH.
             if "SC2PATH" not in os.environ and check_game_install_path():
                 check_mod_install()
 
-        if cmd in {"PrintJSON"}:
-            if "receiving" in args:
-                if self.slot_concerns_self(args["receiving"]):
-                    self.announcements.append(args["data"])
-                    return
-            if "item" in args:
-                if self.slot_concerns_self(args["item"].player):
-                    self.announcements.append(args["data"])
+    def on_print_json(self, args: dict):
+        # goes to this world
+        if "receiving" in args and self.slot_concerns_self(args["receiving"]):
+            relevant = True
+        # found in this world
+        elif "item" in args and self.slot_concerns_self(args["item"].player):
+            relevant = True
+        # not related
+        else:
+            relevant = False
+
+        if relevant:
+            self.announcements.put(self.raw_text_parser(copy.deepcopy(args["data"])))
+
+        super(SC2Context, self).on_print_json(args)
 
     def run_gui(self):
-        from kvui import GameManager, HoverBehavior, ServerToolTip, fade_in_animation
+        from kvui import GameManager, HoverBehavior, ServerToolTip
         from kivy.app import App
         from kivy.clock import Clock
         from kivy.uix.tabbedpanel import TabbedPanelItem
@@ -190,6 +199,7 @@ class SC2Context(CommonContext):
 
         class MissionButton(HoverableButton):
             tooltip_text = StringProperty("Test")
+            ctx: SC2Context
 
             def __init__(self, *args, **kwargs):
                 super(HoverableButton, self).__init__(*args, **kwargs)
@@ -210,10 +220,7 @@ class SC2Context(CommonContext):
                     self.ctx.current_tooltip = self.layout
 
             def on_leave(self):
-                if self.ctx.current_tooltip:
-                    App.get_running_app().root.remove_widget(self.ctx.current_tooltip)
-
-                self.ctx.current_tooltip = None
+                self.ctx.ui.clear_tooltip()
 
             @property
             def ctx(self) -> CommonContext:
@@ -235,13 +242,20 @@ class SC2Context(CommonContext):
             mission_panel = None
             last_checked_locations = {}
             mission_id_to_button = {}
-            launching = False
+            launching: typing.Union[bool, int] = False  # if int -> mission ID
             refresh_from_launching = True
             first_check = True
+            ctx: SC2Context
 
             def __init__(self, ctx):
                 super().__init__(ctx)
 
+            def clear_tooltip(self):
+                if self.ctx.current_tooltip:
+                    App.get_running_app().root.remove_widget(self.ctx.current_tooltip)
+
+                self.ctx.current_tooltip = None
+
             def build(self):
                 container = super().build()
 
@@ -256,7 +270,7 @@ class SC2Context(CommonContext):
 
             def build_mission_table(self, dt):
                 if (not self.launching and (not self.last_checked_locations == self.ctx.checked_locations or
-                                           not self.refresh_from_launching)) or self.first_check:
+                                            not self.refresh_from_launching)) or self.first_check:
                     self.refresh_from_launching = True
 
                     self.mission_panel.clear_widgets()
@@ -267,12 +281,7 @@ class SC2Context(CommonContext):
 
                         self.mission_id_to_button = {}
                         categories = {}
-                        available_missions = []
-                        unfinished_locations = initialize_blank_mission_dict(self.ctx.mission_req_table)
-                        unfinished_missions = calc_unfinished_missions(self.ctx.checked_locations,
-                                                                       self.ctx.mission_req_table,
-                                                                       self.ctx, available_missions=available_missions,
-                                                                       unfinished_locations=unfinished_locations)
+                        available_missions, unfinished_missions = calc_unfinished_missions(self.ctx)
 
                         # separate missions into categories
                         for mission in self.ctx.mission_req_table:
@@ -283,7 +292,8 @@ class SC2Context(CommonContext):
 
                         for category in categories:
                             category_panel = MissionCategory()
-                            category_panel.add_widget(Label(text=category, size_hint_y=None, height=50, outline_width=1))
+                            category_panel.add_widget(
+                                Label(text=category, size_hint_y=None, height=50, outline_width=1))
 
                             # Map is completed
                             for mission in categories[category]:
@@ -295,7 +305,9 @@ class SC2Context(CommonContext):
                                     text = f"[color=6495ED]{text}[/color]"
 
                                     tooltip = f"Uncollected locations:\n"
-                                    tooltip += "\n".join(location for location in unfinished_locations[mission])
+                                    tooltip += "\n".join([self.ctx.location_names[loc] for loc in
+                                                          self.ctx.locations_for_mission(mission)
+                                                          if loc in self.ctx.missing_locations])
                                 elif mission in available_missions:
                                     text = f"[color=FFFFFF]{text}[/color]"
                                 # Map requirements not met
@@ -303,7 +315,7 @@ class SC2Context(CommonContext):
                                     text = f"[color=a9a9a9]{text}[/color]"
                                     tooltip = f"Requires: "
                                     if len(self.ctx.mission_req_table[mission].required_world) > 0:
-                                        tooltip += ", ".join(list(self.ctx.mission_req_table)[req_mission-1] for
+                                        tooltip += ", ".join(list(self.ctx.mission_req_table)[req_mission - 1] for
                                                              req_mission in
                                                              self.ctx.mission_req_table[mission].required_world)
 
@@ -325,13 +337,16 @@ class SC2Context(CommonContext):
                     self.refresh_from_launching = False
 
                     self.mission_panel.clear_widgets()
-                    self.mission_panel.add_widget(Label(text="Launching Mission"))
+                    self.mission_panel.add_widget(Label(text="Launching Mission: " +
+                                                             lookup_id_to_mission[self.launching]))
+                    if self.ctx.ui:
+                        self.ctx.ui.clear_tooltip()
 
             def mission_callback(self, button):
                 if not self.launching:
-                    self.ctx.play_mission(list(self.mission_id_to_button.keys())
-                                          [list(self.mission_id_to_button.values()).index(button)])
-                    self.launching = True
+                    mission_id: int = next(k for k, v in self.mission_id_to_button.items() if v == button)
+                    self.ctx.play_mission(mission_id)
+                    self.launching = mission_id
                     Clock.schedule_once(self.finish_launching, 10)
 
             def finish_launching(self, dt):
@@ -344,12 +359,14 @@ class SC2Context(CommonContext):
 
     async def shutdown(self):
         await super(SC2Context, self).shutdown()
+        if self.last_bot:
+            self.last_bot.want_close = True
         if self.sc2_run_task:
             self.sc2_run_task.cancel()
 
-    def play_mission(self, mission_id):
+    def play_mission(self, mission_id: int):
         if self.missions_unlocked or \
-                is_mission_available(mission_id, self.checked_locations, self.mission_req_table):
+                is_mission_available(self, mission_id):
             if self.sc2_run_task:
                 if not self.sc2_run_task.done():
                     sc2_logger.warning("Starcraft 2 Client is still running!")
@@ -358,12 +375,29 @@ class SC2Context(CommonContext):
                 sc2_logger.warning("Launching Mission without Archipelago authentication, "
                                    "checks will not be registered to server.")
             self.sc2_run_task = asyncio.create_task(starcraft_launch(self, mission_id),
-                                                        name="Starcraft 2 Launch")
+                                                    name="Starcraft 2 Launch")
         else:
             sc2_logger.info(
                 f"{lookup_id_to_mission[mission_id]} is not currently unlocked.  "
                 f"Use /unfinished or /available to see what is available.")
 
+    def build_location_to_mission_mapping(self):
+        mission_id_to_location_ids: typing.Dict[int, typing.Set[int]] = {
+            mission_info.id: set() for mission_info in self.mission_req_table.values()
+        }
+
+        for loc in self.server_locations:
+            mission_id, objective = divmod(loc - SC2WOL_LOC_ID_OFFSET, victory_modulo)
+            mission_id_to_location_ids[mission_id].add(objective)
+        self.mission_id_to_location_ids = {mission_id: sorted(objectives) for mission_id, objectives in
+                                           mission_id_to_location_ids.items()}
+
+    def locations_for_mission(self, mission: str):
+        mission_id: int = self.mission_req_table[mission].id
+        objectives = self.mission_id_to_location_ids[self.mission_req_table[mission].id]
+        for objective in objectives:
+            yield SC2WOL_LOC_ID_OFFSET + mission_id * 100 + objective
+
 
 async def main():
     multiprocessing.freeze_support()
@@ -403,47 +437,27 @@ wol_default_categories = [
 ]
 
 
-def calculate_items(items):
-    unit_unlocks = 0
-    armory1_unlocks = 0
-    armory2_unlocks = 0
-    upgrade_unlocks = 0
-    building_unlocks = 0
-    merc_unlocks = 0
-    lab_unlocks = 0
-    protoss_unlock = 0
-    minerals = 0
-    vespene = 0
-    supply = 0
+def calculate_items(items: typing.List[NetUtils.NetworkItem]) -> typing.List[int]:
+    network_item: NetUtils.NetworkItem
+    accumulators: typing.List[int] = [0 for _ in type_flaggroups]
 
-    for item in items:
-        data = lookup_id_to_name[item.item]
+    for network_item in items:
+        name: str = lookup_id_to_name[network_item.item]
+        item_data: ItemData = item_table[name]
 
-        if item_table[data].type == "Unit":
-            unit_unlocks += (1 << item_table[data].number)
-        elif item_table[data].type == "Upgrade":
-            upgrade_unlocks += (1 << item_table[data].number)
-        elif item_table[data].type == "Armory 1":
-            armory1_unlocks += (1 << item_table[data].number)
-        elif item_table[data].type == "Armory 2":
-            armory2_unlocks += (1 << item_table[data].number)
-        elif item_table[data].type == "Building":
-            building_unlocks += (1 << item_table[data].number)
-        elif item_table[data].type == "Mercenary":
-            merc_unlocks += (1 << item_table[data].number)
-        elif item_table[data].type == "Laboratory":
-            lab_unlocks += (1 << item_table[data].number)
-        elif item_table[data].type == "Protoss":
-            protoss_unlock += (1 << item_table[data].number)
-        elif item_table[data].type == "Minerals":
-            minerals += item_table[data].number
-        elif item_table[data].type == "Vespene":
-            vespene += item_table[data].number
-        elif item_table[data].type == "Supply":
-            supply += item_table[data].number
+        # exists exactly once
+        if item_data.quantity == 1:
+            accumulators[type_flaggroups[item_data.type]] |= 1 << item_data.number
 
-    return [unit_unlocks, upgrade_unlocks, armory1_unlocks, armory2_unlocks, building_unlocks, merc_unlocks,
-            lab_unlocks, protoss_unlock, minerals, vespene, supply]
+        # exists multiple times
+        elif item_data.type == "Upgrade":
+            accumulators[type_flaggroups[item_data.type]] += 1 << item_data.number
+
+        # sum
+        else:
+            accumulators[type_flaggroups[item_data.type]] += item_data.number
+
+    return accumulators
 
 
 def calc_difficulty(difficulty):
@@ -459,11 +473,7 @@ def calc_difficulty(difficulty):
     return 'X'
 
 
-async def starcraft_launch(ctx: SC2Context, mission_id):
-    ctx.rec_announce_pos = len(ctx.items_rec_to_announce)
-    ctx.sent_announce_pos = len(ctx.items_sent_to_announce)
-    ctx.announcements_pos = len(ctx.announcements)
-
+async def starcraft_launch(ctx: SC2Context, mission_id: int):
     sc2_logger.info(f"Launching {lookup_id_to_mission[mission_id]}. If game does not launch check log file for errors.")
 
     with DllDirectory(None):
@@ -472,32 +482,34 @@ async def starcraft_launch(ctx: SC2Context, mission_id):
 
 
 class ArchipelagoBot(sc2.bot_ai.BotAI):
-    game_running = False
-    mission_completed = False
-    first_bonus = False
-    second_bonus = False
-    third_bonus = False
-    fourth_bonus = False
-    fifth_bonus = False
-    sixth_bonus = False
-    seventh_bonus = False
-    eight_bonus = False
-    ctx: SC2Context = None
-    mission_id = 0
-
+    game_running: bool = False
+    mission_completed: bool = False
+    boni: typing.List[bool]
+    setup_done: bool
+    ctx: SC2Context
+    mission_id: int
+    want_close: bool = False
     can_read_game = False
 
-    last_received_update = 0
+    last_received_update: int = 0
 
     def __init__(self, ctx: SC2Context, mission_id):
+        self.setup_done = False
         self.ctx = ctx
+        self.ctx.last_bot = self
         self.mission_id = mission_id
+        self.boni = [False for _ in range(max_bonus)]
 
         super(ArchipelagoBot, self).__init__()
 
     async def on_step(self, iteration: int):
+        if self.want_close:
+            self.want_close = False
+            await self._client.leave()
+            return
         game_state = 0
-        if iteration == 0:
+        if not self.setup_done:
+            self.setup_done = True
             start_items = calculate_items(self.ctx.items_received)
             if self.ctx.difficulty_override >= 0:
                 difficulty = calc_difficulty(self.ctx.difficulty_override)
@@ -511,36 +523,10 @@ class ArchipelagoBot(sc2.bot_ai.BotAI):
             self.last_received_update = len(self.ctx.items_received)
 
         else:
-            if self.ctx.announcement_pos < len(self.ctx.announcements):
-                index = 0
-                message = ""
-                while index < len(self.ctx.announcements[self.ctx.announcement_pos]):
-                    message += self.ctx.announcements[self.ctx.announcement_pos][index]["text"]
-                    index += 1
-
-                index = 0
-                start_rem_pos = -1
-                # Remove unneeded [Color] tags
-                while index < len(message):
-                    if message[index] == '[':
-                        start_rem_pos = index
-                        index += 1
-                    elif message[index] == ']' and start_rem_pos > -1:
-                        temp_msg = ""
-
-                        if start_rem_pos > 0:
-                            temp_msg = message[:start_rem_pos]
-                        if index < len(message) - 1:
-                            temp_msg += message[index + 1:]
-
-                        message = temp_msg
-                        index += start_rem_pos - index
-                        start_rem_pos = -1
-                    else:
-                        index += 1
-
+            if not self.ctx.announcements.empty():
+                message = self.ctx.announcements.get(timeout=1)
                 await self.chat_send("SendMessage " + message)
-                self.ctx.announcement_pos += 1
+                self.ctx.announcements.task_done()
 
             # Archipelago reads the health
             for unit in self.all_own_units():
@@ -568,169 +554,97 @@ class ArchipelagoBot(sc2.bot_ai.BotAI):
                     if game_state & (1 << 1) and not self.mission_completed:
                         if self.mission_id != 29:
                             print("Mission Completed")
-                            await self.ctx.send_msgs([
-                                {"cmd": 'LocationChecks', "locations": [SC2WOL_LOC_ID_OFFSET + 100 * self.mission_id]}])
+                            await self.ctx.send_msgs(
+                                [{"cmd": 'LocationChecks',
+                                  "locations": [SC2WOL_LOC_ID_OFFSET + victory_modulo * self.mission_id]}])
                             self.mission_completed = True
                         else:
                             print("Game Complete")
                             await self.ctx.send_msgs([{"cmd": 'StatusUpdate', "status": ClientStatus.CLIENT_GOAL}])
                             self.mission_completed = True
 
-                    if game_state & (1 << 2) and not self.first_bonus:
-                        print("1st Bonus Collected")
-                        await self.ctx.send_msgs(
-                            [{"cmd": 'LocationChecks',
-                              "locations": [SC2WOL_LOC_ID_OFFSET + 100 * self.mission_id + 1]}])
-                        self.first_bonus = True
-
-                    if not self.second_bonus and game_state & (1 << 3):
-                        print("2nd Bonus Collected")
-                        await self.ctx.send_msgs(
-                            [{"cmd": 'LocationChecks',
-                              "locations": [SC2WOL_LOC_ID_OFFSET + 100 * self.mission_id + 2]}])
-                        self.second_bonus = True
-
-                    if not self.third_bonus and game_state & (1 << 4):
-                        print("3rd Bonus Collected")
-                        await self.ctx.send_msgs(
-                            [{"cmd": 'LocationChecks',
-                              "locations": [SC2WOL_LOC_ID_OFFSET + 100 * self.mission_id + 3]}])
-                        self.third_bonus = True
-
-                    if not self.fourth_bonus and game_state & (1 << 5):
-                        print("4th Bonus Collected")
-                        await self.ctx.send_msgs(
-                            [{"cmd": 'LocationChecks',
-                              "locations": [SC2WOL_LOC_ID_OFFSET + 100 * self.mission_id + 4]}])
-                        self.fourth_bonus = True
-
-                    if not self.fifth_bonus and game_state & (1 << 6):
-                        print("5th Bonus Collected")
-                        await self.ctx.send_msgs(
-                            [{"cmd": 'LocationChecks',
-                              "locations": [SC2WOL_LOC_ID_OFFSET + 100 * self.mission_id + 5]}])
-                        self.fifth_bonus = True
-
-                    if not self.sixth_bonus and game_state & (1 << 7):
-                        print("6th Bonus Collected")
-                        await self.ctx.send_msgs(
-                            [{"cmd": 'LocationChecks',
-                              "locations": [SC2WOL_LOC_ID_OFFSET + 100 * self.mission_id + 6]}])
-                        self.sixth_bonus = True
-
-                    if not self.seventh_bonus and game_state & (1 << 8):
-                        print("6th Bonus Collected")
-                        await self.ctx.send_msgs(
-                            [{"cmd": 'LocationChecks',
-                              "locations": [SC2WOL_LOC_ID_OFFSET + 100 * self.mission_id + 7]}])
-                        self.seventh_bonus = True
-
-                    if not self.eight_bonus and game_state & (1 << 9):
-                        print("6th Bonus Collected")
-                        await self.ctx.send_msgs(
-                            [{"cmd": 'LocationChecks',
-                              "locations": [SC2WOL_LOC_ID_OFFSET + 100 * self.mission_id + 8]}])
-                        self.eight_bonus = True
+                    for x, completed in enumerate(self.boni):
+                        if not completed and game_state & (1 << (x + 2)):
+                            await self.ctx.send_msgs(
+                                [{"cmd": 'LocationChecks',
+                                  "locations": [SC2WOL_LOC_ID_OFFSET + victory_modulo * self.mission_id + x + 1]}])
+                            self.boni[x] = True
 
                 else:
                     await self.chat_send("LostConnection - Lost connection to game.")
 
 
-def calc_objectives_completed(mission, missions_info, locations_done, unfinished_locations, ctx):
-    objectives_complete = 0
-
-    if missions_info[mission].extra_locations > 0:
-        for i in range(missions_info[mission].extra_locations):
-            if (missions_info[mission].id * 100 + SC2WOL_LOC_ID_OFFSET + i) in locations_done:
-                objectives_complete += 1
-            else:
-                unfinished_locations[mission].append(ctx.location_names[
-                    missions_info[mission].id * 100 + SC2WOL_LOC_ID_OFFSET + i])
-
-        return objectives_complete
-
-    else:
-        return -1
-
-
-def request_unfinished_missions(locations_done, location_table, ui, ctx):
-    if location_table:
+def request_unfinished_missions(ctx: SC2Context):
+    if ctx.mission_req_table:
         message = "Unfinished Missions: "
-        unlocks = initialize_blank_mission_dict(location_table)
-        unfinished_locations = initialize_blank_mission_dict(location_table)
+        unlocks = initialize_blank_mission_dict(ctx.mission_req_table)
+        unfinished_locations = initialize_blank_mission_dict(ctx.mission_req_table)
 
-        unfinished_missions = calc_unfinished_missions(locations_done, location_table, ctx, unlocks=unlocks,
-                                                       unfinished_locations=unfinished_locations)
+        _, unfinished_missions = calc_unfinished_missions(ctx, unlocks=unlocks)
 
-        message += ", ".join(f"{mark_up_mission_name(mission, location_table, ui,unlocks)}[{location_table[mission].id}] " +
+        message += ", ".join(f"{mark_up_mission_name(ctx, mission, unlocks)}[{ctx.mission_req_table[mission].id}] " +
                              mark_up_objectives(
-                                 f"[{unfinished_missions[mission]}/{location_table[mission].extra_locations}]",
+                                 f"[{len(unfinished_missions[mission])}/"
+                                 f"{sum(1 for _ in ctx.locations_for_mission(mission))}]",
                                  ctx, unfinished_locations, mission)
                              for mission in unfinished_missions)
 
-        if ui:
-            ui.log_panels['All'].on_message_markup(message)
-            ui.log_panels['Starcraft2'].on_message_markup(message)
+        if ctx.ui:
+            ctx.ui.log_panels['All'].on_message_markup(message)
+            ctx.ui.log_panels['Starcraft2'].on_message_markup(message)
         else:
             sc2_logger.info(message)
     else:
         sc2_logger.warning("No mission table found, you are likely not connected to a server.")
 
 
-def calc_unfinished_missions(locations_done, locations, ctx, unlocks=None, unfinished_locations=None,
-                             available_missions=[]):
+def calc_unfinished_missions(ctx: SC2Context, unlocks=None):
     unfinished_missions = []
     locations_completed = []
 
     if not unlocks:
-        unlocks = initialize_blank_mission_dict(locations)
+        unlocks = initialize_blank_mission_dict(ctx.mission_req_table)
 
-    if not unfinished_locations:
-        unfinished_locations = initialize_blank_mission_dict(locations)
-
-    if len(available_missions) > 0:
-        available_missions = []
-
-    available_missions.extend(calc_available_missions(locations_done, locations, unlocks))
+    available_missions = calc_available_missions(ctx, unlocks)
 
     for name in available_missions:
-        if not locations[name].extra_locations == -1:
-            objectives_completed = calc_objectives_completed(name, locations, locations_done, unfinished_locations, ctx)
-
-            if objectives_completed < locations[name].extra_locations:
+        objectives = set(ctx.locations_for_mission(name))
+        if objectives:
+            objectives_completed = ctx.checked_locations & objectives
+            if len(objectives_completed) < len(objectives):
                 unfinished_missions.append(name)
                 locations_completed.append(objectives_completed)
 
-        else:
+        else:  # infer that this is the final mission as it has no objectives
             unfinished_missions.append(name)
             locations_completed.append(-1)
 
-    return {unfinished_missions[i]: locations_completed[i] for i in range(len(unfinished_missions))}
+    return available_missions, dict(zip(unfinished_missions, locations_completed))
 
 
-def is_mission_available(mission_id_to_check, locations_done, locations):
-    unfinished_missions = calc_available_missions(locations_done, locations)
+def is_mission_available(ctx: SC2Context, mission_id_to_check):
+    unfinished_missions = calc_available_missions(ctx)
 
-    return any(mission_id_to_check == locations[mission].id for mission in unfinished_missions)
+    return any(mission_id_to_check == ctx.mission_req_table[mission].id for mission in unfinished_missions)
 
 
-def mark_up_mission_name(mission, location_table, ui, unlock_table):
+def mark_up_mission_name(ctx: SC2Context, mission, unlock_table):
     """Checks if the mission is required for game completion and adds '*' to the name to mark that."""
 
-    if location_table[mission].completion_critical:
-        if ui:
+    if ctx.mission_req_table[mission].completion_critical:
+        if ctx.ui:
             message = "[color=AF99EF]" + mission + "[/color]"
         else:
             message = "*" + mission + "*"
     else:
         message = mission
 
-    if ui:
+    if ctx.ui:
         unlocks = unlock_table[mission]
 
         if len(unlocks) > 0:
-            pre_message = f"[ref={list(location_table).index(mission)}|Unlocks: "
-            pre_message += ", ".join(f"{unlock}({location_table[unlock].id})" for unlock in unlocks)
+            pre_message = f"[ref={list(ctx.mission_req_table).index(mission)}|Unlocks: "
+            pre_message += ", ".join(f"{unlock}({ctx.mission_req_table[unlock].id})" for unlock in unlocks)
             pre_message += f"]"
             message = pre_message + message + "[/ref]"
 
@@ -743,7 +657,7 @@ def mark_up_objectives(message, ctx, unfinished_locations, mission):
     if ctx.ui:
         locations = unfinished_locations[mission]
 
-        pre_message = f"[ref={list(ctx.mission_req_table).index(mission)+30}|"
+        pre_message = f"[ref={list(ctx.mission_req_table).index(mission) + 30}|"
         pre_message += "<br>".join(location for location in locations)
         pre_message += f"]"
         formatted_message = pre_message + message + "[/ref]"
@@ -751,90 +665,91 @@ def mark_up_objectives(message, ctx, unfinished_locations, mission):
     return formatted_message
 
 
-def request_available_missions(locations_done, location_table, ui):
-    if location_table:
+def request_available_missions(ctx: SC2Context):
+    if ctx.mission_req_table:
         message = "Available Missions: "
 
         # Initialize mission unlock table
-        unlocks = initialize_blank_mission_dict(location_table)
+        unlocks = initialize_blank_mission_dict(ctx.mission_req_table)
 
-        missions = calc_available_missions(locations_done, location_table, unlocks)
+        missions = calc_available_missions(ctx, unlocks)
         message += \
-            ", ".join(f"{mark_up_mission_name(mission, location_table, ui, unlocks)}[{location_table[mission].id}]"
+            ", ".join(f"{mark_up_mission_name(ctx, mission, unlocks)}"
+                      f"[{ctx.mission_req_table[mission].id}]"
                       for mission in missions)
 
-        if ui:
-            ui.log_panels['All'].on_message_markup(message)
-            ui.log_panels['Starcraft2'].on_message_markup(message)
+        if ctx.ui:
+            ctx.ui.log_panels['All'].on_message_markup(message)
+            ctx.ui.log_panels['Starcraft2'].on_message_markup(message)
         else:
             sc2_logger.info(message)
     else:
         sc2_logger.warning("No mission table found, you are likely not connected to a server.")
 
 
-def calc_available_missions(locations_done, locations, unlocks=None):
+def calc_available_missions(ctx: SC2Context, unlocks=None):
     available_missions = []
     missions_complete = 0
 
     # Get number of missions completed
-    for loc in locations_done:
-        if loc % 100 == 0:
+    for loc in ctx.checked_locations:
+        if loc % victory_modulo == 0:
             missions_complete += 1
 
-    for name in locations:
+    for name in ctx.mission_req_table:
         # Go through the required missions for each mission and fill up unlock table used later for hover-over tooltips
         if unlocks:
-            for unlock in locations[name].required_world:
-                unlocks[list(locations)[unlock-1]].append(name)
+            for unlock in ctx.mission_req_table[name].required_world:
+                unlocks[list(ctx.mission_req_table)[unlock - 1]].append(name)
 
-        if mission_reqs_completed(name, missions_complete, locations_done, locations):
+        if mission_reqs_completed(ctx, name, missions_complete):
             available_missions.append(name)
 
     return available_missions
 
 
-def mission_reqs_completed(location_to_check, missions_complete, locations_done, locations):
+def mission_reqs_completed(ctx: SC2Context, mission_name: str, missions_complete):
     """Returns a bool signifying if the mission has all requirements complete and can be done
 
-    Keyword arguments:
+    Arguments:
+    ctx -- instance of SC2Context
     locations_to_check -- the mission string name to check
     missions_complete -- an int of how many missions have been completed
-    locations_done -- a list of the location ids that have been complete
-    locations -- a dict of MissionInfo for mission requirements for this world"""
-    if len(locations[location_to_check].required_world) >= 1:
+"""
+    if len(ctx.mission_req_table[mission_name].required_world) >= 1:
         # A check for when the requirements are being or'd
         or_success = False
 
         # Loop through required missions
-        for req_mission in locations[location_to_check].required_world:
+        for req_mission in ctx.mission_req_table[mission_name].required_world:
             req_success = True
 
             # Check if required mission has been completed
-            if not (locations[list(locations)[req_mission-1]].id * 100 + SC2WOL_LOC_ID_OFFSET) in locations_done:
-                if not locations[location_to_check].or_requirements:
+            if not (ctx.mission_req_table[list(ctx.mission_req_table)[req_mission - 1]].id *
+                    victory_modulo + SC2WOL_LOC_ID_OFFSET) in ctx.checked_locations:
+                if not ctx.mission_req_table[mission_name].or_requirements:
                     return False
                 else:
                     req_success = False
 
             # Recursively check required mission to see if it's requirements are met, in case !collect has been done
-            if not mission_reqs_completed(list(locations)[req_mission-1], missions_complete, locations_done,
-                                          locations):
-                if not locations[location_to_check].or_requirements:
+            if not mission_reqs_completed(ctx, list(ctx.mission_req_table)[req_mission - 1], missions_complete):
+                if not ctx.mission_req_table[mission_name].or_requirements:
                     return False
                 else:
                     req_success = False
 
             # If requirement check succeeded mark or as satisfied
-            if locations[location_to_check].or_requirements and req_success:
+            if ctx.mission_req_table[mission_name].or_requirements and req_success:
                 or_success = True
 
-        if locations[location_to_check].or_requirements:
+        if ctx.mission_req_table[mission_name].or_requirements:
             # Return false if or requirements not met
             if not or_success:
                 return False
 
         # Check number of missions
-        if missions_complete >= locations[location_to_check].number:
+        if missions_complete >= ctx.mission_req_table[mission_name].number:
             return True
         else:
             return False
@@ -929,7 +844,7 @@ class DllDirectory:
             self.set(self._old)
 
     @staticmethod
-    def get() -> str:
+    def get() -> typing.Optional[str]:
         if sys.platform == "win32":
             n = ctypes.windll.kernel32.GetDllDirectoryW(0, None)
             buf = ctypes.create_unicode_buffer(n)

Utils.py

@@ -35,7 +35,7 @@ class Version(typing.NamedTuple):
     build: int
 
 
-__version__ = "0.3.4"
+__version__ = "0.3.5"
 version_tuple = tuplize_version(__version__)
 
 is_linux = sys.platform.startswith("linux")
@@ -619,7 +619,7 @@ def title_sorted(data: typing.Sequence, key=None, ignore: typing.Set = frozenset
     def sorter(element: str) -> str:
         parts = element.split(maxsplit=1)
         if parts[0].lower() in ignore:
-            return parts[1]
+            return parts[1].lower()
         else:
-            return element
+            return element.lower()
     return sorted(data, key=lambda i: sorter(key(i)) if key else sorter(i))

WebHost.py

@@ -12,7 +12,7 @@ ModuleUpdate.update()
 # in case app gets imported by something like gunicorn
 import Utils
 
-Utils.local_path.cached_path = os.path.dirname(__file__)
+Utils.local_path.cached_path = os.path.dirname(__file__) or "."  # py3.8 is not abs. remove "." when dropping 3.8
 
 from WebHostLib import register, app as raw_app
 from waitress import serve
@@ -104,7 +104,7 @@ def create_ordered_tutorials_file() -> typing.List[typing.Dict[str, typing.Any]]
         for games in data:
             if 'Archipelago' in games['gameTitle']:
                 generic_data = data.pop(data.index(games))
-        sorted_data = [generic_data] + Utils.title_sorted(data, key=lambda entry: entry["gameTitle"].lower())
+        sorted_data = [generic_data] + Utils.title_sorted(data, key=lambda entry: entry["gameTitle"])
         json.dump(sorted_data, json_target, indent=2, ensure_ascii=False)
     return sorted_data
 

WebHostLib/customserver.py

@@ -103,7 +103,7 @@ class WebHostContext(Context):
         room.multisave = pickle.dumps(self.get_save())
         # saving only occurs on activity, so we can "abuse" this information to mark this as last_activity
         if not exit_save:  # we don't want to count a shutdown as activity, which would restart the server again
-            room.last_activity = datetime.utcnow()
+            room.last_activity = datetime.datetime.utcnow()
         return True
 
     def get_save(self) -> dict:

WebHostLib/downloads.py

@@ -32,9 +32,12 @@ def download_patch(room_id, patch_id):
                             new_zip.writestr("archipelago.json", json.dumps(manifest))
                         else:
                             new_zip.writestr(file.filename, zf.read(file), file.compress_type, 9)
-
+            if "patch_file_ending" in manifest:
+                patch_file_ending = manifest["patch_file_ending"]
+            else:
+                patch_file_ending = AutoPatchRegister.patch_types[patch.game].patch_file_ending
             fname = f"P{patch.player_id}_{patch.player_name}_{app.jinja_env.filters['suuid'](room_id)}" \
-                    f"{AutoPatchRegister.patch_types[patch.game].patch_file_ending}"
+                    f"{patch_file_ending}"
             new_file.seek(0)
             return send_file(new_file, as_attachment=True, download_name=fname)
         else:

WebHostLib/options.py

@@ -1,6 +1,6 @@
 import logging
 import os
-from Utils import __version__
+from Utils import __version__, local_path
 from jinja2 import Template
 import yaml
 import json
@@ -9,14 +9,13 @@ import typing
 from worlds.AutoWorld import AutoWorldRegister
 import Options
 
-target_folder = os.path.join("WebHostLib", "static", "generated")
-
 handled_in_js = {"start_inventory", "local_items", "non_local_items", "start_hints", "start_location_hints",
                  "exclude_locations"}
 
 
 def create():
-    os.makedirs(os.path.join(target_folder, 'configs'), exist_ok=True)
+    target_folder = local_path("WebHostLib", "static", "generated")
+    os.makedirs(os.path.join(target_folder, "configs"), exist_ok=True)
 
     def dictify_range(option: typing.Union[Options.Range, Options.SpecialRange]):
         data = {}
@@ -49,6 +48,11 @@ def create():
             return list(default_value)
         return default_value
 
+    def get_html_doc(option_type: type(Options.Option)) -> str:
+        if not option_type.__doc__:
+            return "Please document me!"
+        return "\n".join(line.strip() for line in option_type.__doc__.split("\n")).strip()
+
     weighted_settings = {
         "baseOptions": {
             "description": "Generated by https://archipelago.gg/",
@@ -61,12 +65,16 @@ def create():
     for game_name, world in AutoWorldRegister.world_types.items():
 
         all_options = {**Options.per_game_common_options, **world.option_definitions}
-        res = Template(open(os.path.join("WebHostLib", "templates", "options.yaml")).read()).render(
+        with open(local_path("WebHostLib", "templates", "options.yaml")) as f:
+            file_data = f.read()
+        res = Template(file_data).render(
             options=all_options,
             __version__=__version__, game=game_name, yaml_dump=yaml.dump,
             dictify_range=dictify_range, default_converter=default_converter,
         )
 
+        del file_data
+
         with open(os.path.join(target_folder, 'configs', game_name + ".yaml"), "w") as f:
             f.write(res)
 
@@ -88,7 +96,7 @@ def create():
                 game_options[option_name] = this_option = {
                     "type": "select",
                     "displayName": option.display_name if hasattr(option, "display_name") else option_name,
-                    "description": option.__doc__ if option.__doc__ else "Please document me!",
+                    "description": get_html_doc(option),
                     "defaultValue": None,
                     "options": []
                 }
@@ -114,7 +122,7 @@ def create():
                 game_options[option_name] = {
                     "type": "range",
                     "displayName": option.display_name if hasattr(option, "display_name") else option_name,
-                    "description": option.__doc__ if option.__doc__ else "Please document me!",
+                    "description": get_html_doc(option),
                     "defaultValue": option.default if hasattr(
                         option, "default") and option.default != "random" else option.range_start,
                     "min": option.range_start,
@@ -131,14 +139,14 @@ def create():
                 game_options[option_name] = {
                     "type": "items-list",
                     "displayName": option.display_name if hasattr(option, "display_name") else option_name,
-                    "description": option.__doc__ if option.__doc__ else "Please document me!",
+                    "description": get_html_doc(option),
                 }
 
             elif getattr(option, "verify_location_name", False):
                 game_options[option_name] = {
                     "type": "locations-list",
                     "displayName": option.display_name if hasattr(option, "display_name") else option_name,
-                    "description": option.__doc__ if option.__doc__ else "Please document me!",
+                    "description": get_html_doc(option),
                 }
 
             elif issubclass(option, Options.OptionList) or issubclass(option, Options.OptionSet):
@@ -146,7 +154,7 @@ def create():
                     game_options[option_name] = {
                         "type": "custom-list",
                         "displayName": option.display_name if hasattr(option, "display_name") else option_name,
-                        "description": option.__doc__ if option.__doc__ else "Please document me!",
+                        "description": get_html_doc(option),
                         "options": list(option.valid_keys),
                     }
 

WebHostLib/requirements.txt

@@ -1,7 +1,7 @@
-flask>=2.1.3
+flask>=2.2.2
 pony>=0.7.16
-waitress>=2.1.1
+waitress>=2.1.2
 Flask-Caching>=2.0.1
 Flask-Compress>=1.12
-Flask-Limiter>=2.5.0
+Flask-Limiter>=2.6.2
 bokeh>=2.4.3

WebHostLib/static/assets/player-settings.js

@@ -102,9 +102,15 @@ const buildOptionsTable = (settings, romOpts = false) => {
     // td Left
     const tdl = document.createElement('td');
     const label = document.createElement('label');
+    label.textContent = `${settings[setting].displayName}: `;
     label.setAttribute('for', setting);
-    label.setAttribute('data-tooltip', settings[setting].description);
-    label.innerText = `${settings[setting].displayName}:`;
+
+    const questionSpan = document.createElement('span');
+    questionSpan.classList.add('interactive');
+    questionSpan.setAttribute('data-tooltip', settings[setting].description);
+    questionSpan.innerText = '(?)';
+
+    label.appendChild(questionSpan);
     tdl.appendChild(label);
     tr.appendChild(tdl);
 

WebHostLib/static/styles/generate.css

@@ -56,7 +56,3 @@
 #file-input{
     display: none;
 }
-
-.interactive{
-    color: #ffef00;
-}

WebHostLib/static/styles/globalStyles.css

@@ -105,3 +105,7 @@ h5, h6{
     margin-bottom: 20px;
     background-color: #ffff00;
 }
+
+.interactive{
+    color: #ffef00;
+}

WebHostLib/static/styles/tooltip.css

@@ -14,7 +14,6 @@ give it one of the following classes: tooltip-left, tooltip-right, tooltip-top,
 /* Base styles for the element that has a tooltip */
 [data-tooltip], .tooltip {
 	position: relative;
-	cursor: pointer;
 }
 
 /* Base styles for the entire tooltip */
@@ -55,14 +54,15 @@ give it one of the following classes: tooltip-left, tooltip-right, tooltip-top,
 
 /** Content styles */
 .tooltip:after, [data-tooltip]:after {
+	width: 260px;
 	z-index: 10000;
 	padding: 8px;
-	width: 160px;
     border-radius: 4px;
 	background-color: #000;
 	background-color: hsla(0, 0%, 20%, 0.9);
 	color: #fff;
 	content: attr(data-tooltip);
+	white-space: pre-wrap;
 	font-size: 14px;
 	line-height: 1.2;
 }

WebHostLib/templates/generate.html

@@ -41,12 +41,11 @@
                             <tbody>
                                 <tr>
                                     <td>
-                                        <label for="forfeit_mode">Forfeit Permission:</label>
-                                        <span
-                                                class="interactive"
-                                                data-tooltip="A forfeit releases all remaining items from the locations
-                                                in your world.">(?)
-                                        </span>
+                                        <label for="forfeit_mode">Forfeit Permission:
+                                            <span class="interactive" data-tooltip="A forfeit releases all remaining items from the locations in your world.">
+                                                (?)
+                                            </span>
+                                        </label>
                                     </td>
                                     <td>
                                         <select name="forfeit_mode" id="forfeit_mode">
@@ -63,12 +62,11 @@
 
                                 <tr>
                                     <td>
-                                        <label for="collect_mode">Collect Permission:</label>
-                                        <span
-                                                class="interactive"
-                                                data-tooltip="A collect releases all of your remaining items to you
-                                                from across the multiworld.">(?)
-                                        </span>
+                                        <label for="collect_mode">Collect Permission:
+                                            <span class="interactive" data-tooltip="A collect releases all of your remaining items to you from across the multiworld.">
+                                                (?)
+                                            </span>
+                                        </label>
                                     </td>
                                     <td>
                                         <select name="collect_mode" id="collect_mode">
@@ -85,12 +83,11 @@
 
                                 <tr>
                                     <td>
-                                        <label for="remaining_mode">Remaining Permission:</label>
-                                        <span
-                                            class="interactive"
-                                            data-tooltip="Remaining lists all items still in your world by name only."
-                                        >(?)
-                                        </span>
+                                        <label for="remaining_mode">Remaining Permission:
+                                            <span class="interactive" data-tooltip="Remaining lists all items still in your world by name only.">
+                                                (?)
+                                            </span>
+                                        </label>
                                     </td>
                                     <td>
                                         <select name="remaining_mode" id="remaining_mode">
@@ -106,11 +103,11 @@
                                 </tr>
                                 <tr>
                                     <td>
-                                        <label for="item_cheat">Item Cheat:</label>
-                                        <span
-                                                class="interactive"
-                                                data-tooltip="Allows players to use the !getitem command.">(?)
-                                        </span>
+                                        <label for="item_cheat">Item Cheat:
+                                            <span class="interactive" data-tooltip="Allows players to use the !getitem command.">
+                                                (?)
+                                            </span>
+                                        </label>
                                     </td>
                                     <td>
                                         <select name="item_cheat" id="item_cheat">
@@ -131,12 +128,11 @@
                                 <tbody>
                                     <tr>
                                         <td>
-                                            <label for="hint_cost"> Hint Cost:</label>
-                                            <span
-                                                class="interactive"
-                                                data-tooltip="After gathering this many checks, players can !hint <itemname>
-                                                to get the location of that hint item.">(?)
-                                            </span>
+                                            <label for="hint_cost"> Hint Cost:
+                                                <span class="interactive" data-tooltip="After gathering this many checks, players can !hint <itemname> to get the location of that hint item.">
+                                                    (?)
+                                                </span>
+                                            </label>
                                         </td>
                                         <td>
                                             <select name="hint_cost" id="hint_cost">
@@ -150,11 +146,11 @@
                                     </tr>
                                     <tr>
                                         <td>
-                                            <label for="server_password">Server Password:</label>
-                                            <span
-                                                class="interactive"
-                                                data-tooltip="Allows for issuing of server console commands from any text client or in-game client using the !admin command.">(?)
-                                            </span>
+                                            <label for="server_password">Server Password:
+                                                <span class="interactive" data-tooltip="Allows for issuing of server console commands from any text client or in-game client using the !admin command.">
+                                                    (?)
+                                                </span>
+                                            </label>
                                         </td>
                                         <td>
                                             <input id="server_password" name="server_password">
@@ -162,23 +158,22 @@
                                     </tr>
                                     <tr>
                                         <td>
-                                            <label for="plando_options">Plando Options:</label>
-                                            <span
-                                                class="interactive"
-                                                data-tooltip="Allows players to plan some of the randomization. See the 'Archipelago Plando Guide' in 'Setup Guides' for more information.">(?)
+                                            Plando Options:
+                                            <span class="interactive" data-tooltip="Allows players to plan some of the randomization. See the 'Archipelago Plando Guide' in 'Setup Guides' for more information.">
+                                                (?)
                                             </span>
                                         </td>
                                         <td>
-                                            <input type="checkbox" name="plando_bosses" value="bosses" checked>
+                                            <input type="checkbox" id="plando_bosses" name="plando_bosses" value="bosses" checked>
                                             <label for="plando_bosses">Bosses</label><br>
 
-                                            <input type="checkbox" name="plando_items" value="items" checked>
+                                            <input type="checkbox" id="plando_items" name="plando_items" value="items" checked>
                                             <label for="plando_items">Items</label><br>
 
-                                            <input type="checkbox" name="plando_connections" value="connections" checked>
+                                            <input type="checkbox" id="plando_connections" name="plando_connections" value="connections" checked>
                                             <label for="plando_connections">Connections</label><br>
 
-                                            <input type="checkbox" name="plando_texts" value="texts" checked>
+                                            <input type="checkbox" id="plando_texts" name="plando_texts" value="texts" checked>
                                             <label for="plando_texts">Text</label>
                                         </td>
                                     </tr>

WebHostLib/templates/islandFooter.html

@@ -6,8 +6,6 @@
             -
             <a href="https://github.com/ArchipelagoMW/Archipelago">Source Code</a>
             -
-            <a href="https://github.com/ArchipelagoMW/Archipelago/wiki">Wiki</a>
-            -
             <a href="https://github.com/ArchipelagoMW/Archipelago/graphs/contributors">Contributors</a>
             -
             <a href="https://github.com/ArchipelagoMW/Archipelago/issues">Bug Report</a>

WebHostLib/templates/supportedGames.html

@@ -1,7 +1,7 @@
 {% extends 'pageWrapper.html' %}
 
 {% block head %}
-    <title>Player Settings</title>
+    <title>Supported Games</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/markdown.css") }}" />
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/supportedGames.css") }}" />
 {% endblock %}

data/lua/FF1/ff1_connector.lua

@@ -97,6 +97,11 @@ local extensionConsumableLookup = {
     [443] = 0x3F
 }
 
+local noOverworldItemsLookup = {
+    [499] = 0x2B,
+    [500] = 0x12,
+}
+
 local itemMessages = {}
 local consumableStacks = nil
 local prevstate = ""
@@ -341,7 +346,7 @@ function processBlock(block)
                 -- This is a key item
                 memoryLocation = memoryLocation - 0x0E0
                 wU8(memoryLocation, 0x01)
-            elseif v >= 0x1E0 then
+            elseif v >= 0x1E0 and v <= 0x1F2 then
                 -- This is a movement item
                 -- Minus Offset (0x100) - movement offset (0xE0)
                 memoryLocation = memoryLocation - 0x1E0
@@ -351,7 +356,10 @@ function processBlock(block)
                 else
                     wU8(memoryLocation, 0x01)
                 end
-
+            elseif v >= 0x1F3 and v <= 0x1F4 then
+                -- NoOverworld special items
+                memoryLocation = noOverworldItemsLookup[v]
+                wU8(memoryLocation, 0x01)
             elseif v >= 0x16C and v <= 0x1AF then
                 -- This is a gold item
                 amountToAdd = goldLookup[v]

docs/code_of_conduct.md

@@ -0,0 +1,11 @@
+# Code of Conduct
+We conduct ourselves openly and inclusively here. Please do not contribute to an environment which makes other people uncomfortable. This means that we expect all contributors or participants here to:
+
+* Be welcoming and inclusive in tone and language.
+* Be respectful of others and their abilities.
+* Show empathy when speaking with others.
+* Be gracious and accept feedback and constructive criticism.
+
+These guidelines apply to all channels of communication within this GitHub repository. Please be respectful in both public channels, such as issues, and private ones, such as private messaging or emails.
+
+Any incidents of abuse may be reported directly to ijwu at hmfarran@gmail.com.

docs/contributing.md

@@ -0,0 +1,12 @@
+# Contributing
+Contributions are welcome. We have a few requests of any new contributors.
+
+* Ensure that all changes which affect logic are covered by unit tests. 
+* Do not introduce any unit test failures/regressions.
+* Follow styling as designated in our [styling documentation](/docs/style.md).
+
+Otherwise, we tend to judge code on a case to case basis.
+
+For adding a new game to Archipelago and other documentation on how Archipelago functions, please see 
+[the docs folder](docs/) for the relevant information and feel free to ask any questions in the #archipelago-dev 
+channel in our [Discord](https://archipelago.gg/discord).

docs/network protocol.md

@@ -13,9 +13,18 @@ These steps should be followed in order to establish a gameplay connection with
 
 In the case that the client does not authenticate properly and receives a [ConnectionRefused](#ConnectionRefused) then the server will maintain the connection and allow for follow-up [Connect](#Connect) packet.
 
-There are libraries available that implement this network protocol in [Python](https://github.com/ArchipelagoMW/Archipelago/blob/main/CommonClient.py), [Java](https://github.com/ArchipelagoMW/Archipelago.MultiClient.Java), [.Net](https://github.com/ArchipelagoMW/Archipelago.MultiClient.Net) and [C++](https://github.com/black-sliver/apclientpp)
+There are also a number of community-supported libraries available that implement this network protocol to make integrating with Archipelago easier.
 
-For Super Nintendo games there are clients available in either [Node](https://github.com/ArchipelagoMW/SuperNintendoClient) or [Python](https://github.com/ArchipelagoMW/Archipelago/blob/main/SNIClient.py), There are also game specific clients available for [The Legend of Zelda: Ocarina of Time](https://github.com/ArchipelagoMW/Z5Client) or [Final Fantasy 1](https://github.com/ArchipelagoMW/Archipelago/blob/main/FF1Client.py)
+| Language/Runtime              | Project                                                                                            | Remarks                                                                         |
+|-------------------------------|----------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
+| Python                        | [Archipelago CommonClient](https://github.com/ArchipelagoMW/Archipelago/blob/main/CommonClient.py) |                                                                                 |
+|                               | [Archipelago SNIClient](https://github.com/ArchipelagoMW/Archipelago/blob/main/SNIClient.py)       | For Super Nintendo Game Support; Utilizes [SNI](https://github.com/alttpo/sni). |
+| JVM (Java / Kotlin)           | [Archipelago.MultiClient.Java](https://github.com/ArchipelagoMW/Archipelago.MultiClient.Java)      |                                                                                 |
+| .NET (C# / C++ / F# / VB.NET) | [Archipelago.MultiClient.Net](https://www.nuget.org/packages/Archipelago.MultiClient.Net)          |                                                                                 |
+| C++                           | [apclientpp](https://github.com/black-sliver/apclientpp)                                           | almost-header-only                                                              |
+|                               | [APCpp](https://github.com/N00byKing/APCpp)                                                        | CMake                                                                           |
+| JavaScript / TypeScript       | [archipelago.js](https://www.npmjs.com/package/archipelago.js)                                     | Browser and Node.js Supported                                                   |
+| Haxe                          | [hxArchipelago](https://lib.haxe.org/p/hxArchipelago)                                              |                                                                                 |
 
 ## Synchronizing Items
 When the client receives a [ReceivedItems](#ReceivedItems) packet, if the `index` argument does not match the next index that the client expects then it is expected that the client will re-sync items with the server. This can be accomplished by sending the server a [Sync](#Sync) packet and then a [LocationChecks](#LocationChecks) packet.
@@ -152,7 +161,8 @@ The arguments for RoomUpdate are identical to [RoomInfo](#RoomInfo) barring:
 All arguments for this packet are optional, only changes are sent.
 
 ### Print
-Sent to clients purely to display a message to the player.
+Sent to clients purely to display a message to the player. 
+* *Deprecation warning: clients that connect with version 0.3.5 or higher will nolonger recieve Print packets, instead all messsages are send as [PrintJSON](#PrintJSON)*
 #### Arguments
 | Name | Type | Notes |
 | ---- | ---- | ----- |
@@ -164,10 +174,21 @@ Sent to clients purely to display a message to the player. This packet differs f
 | Name | Type | Notes |
 | ---- | ---- | ----- |
 | data | list\[[JSONMessagePart](#JSONMessagePart)\] | Type of this part of the message. |
-| type | str | May be present to indicate the nature of this message. Known types are Hint and ItemSend. |
+| type | str | May be present to indicate the [PrintJsonType](#PrintJsonType) of this message. |
 | receiving | int | Is present if type is Hint or ItemSend and marks the destination player's ID. |
 | item | [NetworkItem](#NetworkItem) | Is present if type is Hint or ItemSend and marks the source player id, location id, item id and item flags. |
 | found | bool | Is present if type is Hint, denotes whether the location hinted for was checked. |
+| countdown | int | Is present if type is `Countdown`, denotes the amount of seconds remaining on the countdown. |
+
+##### PrintJsonType
+PrintJsonType indicates the type of [PrintJson](#PrintJson) packet, different types can be handled differently by the client and can also contain additional arguments. When receiving an unknown type the data's list\[[JSONMessagePart](#JSONMessagePart)\] should still be printed as normal. 
+
+Currently defined types are:
+| Type | Notes |
+| ---- | ----- |
+| ItemSend | The message is in response to a player receiving an item. |
+| Hint | The message is in response to a player hinting. |
+| Countdown | The message contains information about the current server Countdown. |
 
 ### DataPackage
 Sent to clients to provide what is known as a 'data package' which contains information to enable a client to most easily communicate with the Archipelago server. Contents include things like location id to name mappings, among others; see [Data Package Contents](#Data-Package-Contents) for more info.

docs/running from source.md

@@ -56,3 +56,8 @@ SNI is required to use SNIClient. If not integrated into the project, it has to
 You can get the latest SNI release at [SNI Github releases](https://github.com/alttpo/sni/releases).
 It should be dropped as "SNI" into the root folder of the project. Alternatively, you can point the sni setting in
 host.yaml at your SNI folder.
+
+
+## Running tests
+
+Run `pip install pytest pytest-subtests`, then use your IDE to run tests or run `pytest` from the source folder.

requirements.txt

@@ -3,6 +3,6 @@ websockets>=10.3
 PyYAML>=6.0
 jellyfish>=0.9.0
 jinja2>=3.1.2
-schema>=0.7.4
+schema>=0.7.5
 kivy>=2.1.0
 bsdiff4>=1.2.2

test/general/TestIDs.py

@@ -52,3 +52,13 @@ class TestIDs(unittest.TestCase):
                 else:
                     for location_id in world_type.location_id_to_name:
                         self.assertGreater(location_id, 0)
+
+    def testDuplicateItemIDs(self):
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=gamename):
+                self.assertEqual(len(world_type.item_id_to_name), len(world_type.item_name_to_id))
+
+    def testDuplicateLocationIDs(self):
+        for gamename, world_type in AutoWorldRegister.world_types.items():
+            with self.subTest(game=gamename):
+                self.assertEqual(len(world_type.location_id_to_name), len(world_type.location_name_to_id))

test/general/TestItems.py

@@ -1,5 +1,6 @@
 import unittest
 from worlds.AutoWorld import AutoWorldRegister
+from . import setup_default_world
 
 
 class TestBase(unittest.TestCase):
@@ -29,3 +30,17 @@ class TestBase(unittest.TestCase):
                         with self.subTest(group_name, group_name=group_name):
                             for item in items:
                                 self.assertIn(item, world_type.item_name_to_id)
+
+    def testItemCountGreaterEqualLocations(self):
+        for game_name, world_type in AutoWorldRegister.world_types.items():
+
+            if game_name in {"Final Fantasy"}:
+                continue
+            with self.subTest("Game", game=game_name):
+                world = setup_default_world(world_type)
+                location_count = sum(0 if location.event or location.item else 1 for location in world.get_locations())
+                self.assertGreaterEqual(
+                    len(world.itempool),
+                    location_count,
+                    f"{game_name} Item count MUST meet or exceede the number of locations",
+                )

test/webhost/TestFileGeneration.py

@@ -0,0 +1,23 @@
+"""Tests for successful generation of WebHost cached files. Can catch some other deeper errors."""
+
+import os
+import unittest
+
+import WebHost
+
+
+class TestFileGeneration(unittest.TestCase):
+    def setUp(self) -> None:
+        self.correct_path = os.path.join(os.path.dirname(WebHost.__file__), "WebHostLib")
+        # should not create the folder *here*
+        self.incorrect_path = os.path.join(os.path.split(os.path.dirname(__file__))[0], "WebHostLib")
+
+    def testOptions(self):
+        WebHost.create_options_files()
+        self.assertTrue(os.path.exists(os.path.join(self.correct_path, "static", "generated", "configs")))
+        self.assertFalse(os.path.exists(os.path.join(self.incorrect_path, "static", "generated", "configs")))
+
+    def testTutorial(self):
+        WebHost.create_ordered_tutorials_file()
+        self.assertTrue(os.path.exists(os.path.join(self.correct_path, "static", "generated", "tutorials.json")))
+        self.assertFalse(os.path.exists(os.path.join(self.incorrect_path, "static", "generated", "tutorials.json")))

worlds/AutoWorld.py

@@ -27,7 +27,8 @@ class AutoWorldRegister(type):
 
         # build rest
         dct["item_names"] = frozenset(dct["item_name_to_id"])
-        dct["item_name_groups"] = dct.get("item_name_groups", {})
+        dct["item_name_groups"] = {group_name: frozenset(group_set) for group_name, group_set
+                                   in dct.get("item_name_groups", {}).items()}
         dct["item_name_groups"]["Everything"] = dct["item_names"]
         dct["location_names"] = frozenset(dct["location_name_to_id"])
         dct["all_item_and_group_names"] = frozenset(dct["item_names"] | set(dct.get("item_name_groups", {})))
@@ -97,22 +98,22 @@ def call_stage(world: "MultiWorld", method_name: str, *args: Any) -> None:
 
 class WebWorld:
     """Webhost integration"""
-    # display a settings page. Can be a link to an out-of-ap settings tool too.
+    
     settings_page: Union[bool, str] = True
-
-    # docs folder will be scanned for game info pages using this list in the format '{language}_{game_name}.md'
+    """display a settings page. Can be a link to a specific page or external tool."""
+    
     game_info_languages: List[str] = ['en']
+    """docs folder will be scanned for game info pages using this list in the format '{language}_{game_name}.md'"""
 
-    # docs folder will also be scanned for tutorial guides given the relevant information in this list. Each Tutorial
-    # class is to be used for one guide.
     tutorials: List["Tutorial"]
+    """docs folder will also be scanned for tutorial guides. Each Tutorial class is to be used for one guide."""
 
-    # Choose a theme for your /game/* pages
-    # Available: dirt, grass, grassFlowers, ice, jungle, ocean, partyTime, stone
     theme = "grass"
+    """Choose a theme for you /game/* pages.
+    Available: dirt, grass, grassFlowers, ice, jungle, ocean, partyTime, stone"""
 
-    # display a link to a bug report page, most likely a link to a GitHub issue page.
     bug_report_page: Optional[str]
+    """display a link to a bug report page, most likely a link to a GitHub issue page."""
 
 
 class World(metaclass=AutoWorldRegister):

worlds/alttp/EntranceRandomizer.py

@@ -212,9 +212,7 @@ def parse_arguments(argv, no_defaults=False):
                              Alternatively, can be a ALttP Rom patched with a Link
                              sprite that will be extracted.
                              ''')
-    parser.add_argument('--gui', help='Launch the GUI', action='store_true')
 
-    parser.add_argument('--enemizercli', default=defval('EnemizerCLI/EnemizerCLI.Core'))
     parser.add_argument('--shufflebosses', default=defval('none'), choices=['none', 'basic', 'normal', 'chaos',
                                                                             "singularity"])
 

worlds/alttp/Options.py

@@ -282,8 +282,8 @@ class ShieldPalette(Palette):
     display_name = "Shield Palette"
 
 
-class LinkPalette(Palette):
-    display_name = "Link Palette"
+# class LinkPalette(Palette):
+#     display_name = "Link Palette"
 
 
 class HeartBeep(Choice):
@@ -387,7 +387,7 @@ alttp_options: typing.Dict[str, type(Option)] = {
     "hud_palettes": HUDPalette,
     "sword_palettes": SwordPalette,
     "shield_palettes": ShieldPalette,
-    "link_palettes": LinkPalette,
+    # "link_palettes": LinkPalette,
     "heartbeep": HeartBeep,
     "heartcolor": HeartColor,
     "quickswap": QuickSwap,

worlds/alttp/Rom.py

@@ -34,7 +34,7 @@ from worlds.alttp.Text import KingsReturn_texts, Sanctuary_texts, Kakariko_texts
     DeathMountain_texts, \
     LostWoods_texts, WishingWell_texts, DesertPalace_texts, MountainTower_texts, LinksHouse_texts, Lumberjacks_texts, \
     SickKid_texts, FluteBoy_texts, Zora_texts, MagicShop_texts, Sahasrahla_names
-from Utils import local_path, user_path, int16_as_bytes, int32_as_bytes, snes_to_pc, is_frozen
+from Utils import local_path, user_path, int16_as_bytes, int32_as_bytes, snes_to_pc, is_frozen, parse_yaml
 from worlds.alttp.Items import ItemFactory, item_table, item_name_groups, progression_items
 from worlds.alttp.EntranceShuffle import door_addresses
 from worlds.alttp.Options import smallkey_shuffle
@@ -551,18 +551,22 @@ class Sprite():
         Sprite.base_data = Sprite.sprite + Sprite.palette + Sprite.glove_palette
 
     def from_ap_sprite(self, filedata):
-        filedata = filedata.decode("utf-8-sig")
-        import yaml
-        obj = yaml.safe_load(filedata)
-        if obj["min_format_version"] > 1:
-            raise Exception("Sprite file requires an updated reader.")
-        self.author_name = obj["author"]
-        self.name = obj["name"]
-        if obj["data"]:  # skip patching for vanilla content
-            data = bsdiff4.patch(Sprite.base_data, obj["data"])
-            self.sprite = data[:self.sprite_size]
-            self.palette = data[self.sprite_size:self.palette_size]
-            self.glove_palette = data[self.sprite_size + self.palette_size:]
+        # noinspection PyBroadException
+        try:
+            obj = parse_yaml(filedata.decode("utf-8-sig"))
+            if obj["min_format_version"] > 1:
+                raise Exception("Sprite file requires an updated reader.")
+            self.author_name = obj["author"]
+            self.name = obj["name"]
+            if obj["data"]:  # skip patching for vanilla content
+                data = bsdiff4.patch(Sprite.base_data, obj["data"])
+                self.sprite = data[:self.sprite_size]
+                self.palette = data[self.sprite_size:self.palette_size]
+                self.glove_palette = data[self.sprite_size + self.palette_size:]
+        except Exception:
+            logger = logging.getLogger("apsprite")
+            logger.exception("Error parsing apsprite file")
+            self.valid = False
 
     @property
     def author_game_display(self) -> str:
@@ -659,7 +663,7 @@ class Sprite():
 
     @staticmethod
     def parse_zspr(filedata, expected_kind):
-        logger = logging.getLogger('ZSPR')
+        logger = logging.getLogger("ZSPR")
         headerstr = "<4xBHHIHIHH6x"
         headersize = struct.calcsize(headerstr)
         if len(filedata) < headersize:
@@ -667,7 +671,7 @@ class Sprite():
         version, csum, icsum, sprite_offset, sprite_size, palette_offset, palette_size, kind = struct.unpack_from(
             headerstr, filedata)
         if version not in [1]:
-            logger.error('Error parsing ZSPR file: Version %g not supported', version)
+            logger.error("Error parsing ZSPR file: Version %g not supported", version)
             return None
         if kind != expected_kind:
             return None
@@ -676,36 +680,42 @@ class Sprite():
         stream.seek(headersize)
 
         def read_utf16le(stream):
-            "Decodes a null-terminated UTF-16_LE string of unknown size from a stream"
+            """Decodes a null-terminated UTF-16_LE string of unknown size from a stream"""
             raw = bytearray()
             while True:
                 char = stream.read(2)
-                if char in [b'', b'\x00\x00']:
+                if char in [b"", b"\x00\x00"]:
                     break
                 raw += char
-            return raw.decode('utf-16_le')
+            return raw.decode("utf-16_le")
 
-        sprite_name = read_utf16le(stream)
-        author_name = read_utf16le(stream)
-        author_credits_name = stream.read().split(b"\x00", 1)[0].decode()
+        # noinspection PyBroadException
+        try:
+            sprite_name = read_utf16le(stream)
+            author_name = read_utf16le(stream)
+            author_credits_name = stream.read().split(b"\x00", 1)[0].decode()
 
-        # Ignoring the Author Rom name for the time being.
+            # Ignoring the Author Rom name for the time being.
 
-        real_csum = sum(filedata) % 0x10000
-        if real_csum != csum or real_csum ^ 0xFFFF != icsum:
-            logger.warning('ZSPR file has incorrect checksum. It may be corrupted.')
+            real_csum = sum(filedata) % 0x10000
+            if real_csum != csum or real_csum ^ 0xFFFF != icsum:
+                logger.warning("ZSPR file has incorrect checksum. It may be corrupted.")
 
-        sprite = filedata[sprite_offset:sprite_offset + sprite_size]
-        palette = filedata[palette_offset:palette_offset + palette_size]
+            sprite = filedata[sprite_offset:sprite_offset + sprite_size]
+            palette = filedata[palette_offset:palette_offset + palette_size]
 
-        if len(sprite) != sprite_size or len(palette) != palette_size:
-            logger.error('Error parsing ZSPR file: Unexpected end of file')
+            if len(sprite) != sprite_size or len(palette) != palette_size:
+                logger.error("Error parsing ZSPR file: Unexpected end of file")
+                return None
+
+            return sprite, palette, sprite_name, author_name, author_credits_name
+
+        except Exception:
+            logger.exception("Error parsing ZSPR file")
             return None
 
-        return (sprite, palette, sprite_name, author_name, author_credits_name)
-
     def decode_palette(self):
-        "Returns the palettes as an array of arrays of 15 colors"
+        """Returns the palettes as an array of arrays of 15 colors"""
 
         def array_chunk(arr, size):
             return list(zip(*[iter(arr)] * size))

worlds/alttp/__init__.py

@@ -4,6 +4,7 @@ import random
 import threading
 import typing
 
+import Utils
 from BaseClasses import Item, CollectionState, Tutorial
 from .Dungeons import create_dungeons
 from .EntranceShuffle import link_entrances, link_inverted_entrances, plando_connect
@@ -136,6 +137,10 @@ class ALTTPWorld(World):
 
     create_items = generate_itempool
 
+    enemizer_path: str = Utils.get_options()["generator"]["enemizer_path"] \
+        if os.path.isabs(Utils.get_options()["generator"]["enemizer_path"]) \
+        else Utils.local_path(Utils.get_options()["generator"]["enemizer_path"])
+
     def __init__(self, *args, **kwargs):
         self.dungeon_local_item_names = set()
         self.dungeon_specific_item_names = set()
@@ -150,12 +155,12 @@ class ALTTPWorld(World):
             raise FileNotFoundError(rom_file)
 
     def generate_early(self):
+        if self.use_enemizer():
+            check_enemizer(self.enemizer_path)
+
         player = self.player
         world = self.world
 
-        if self.use_enemizer():
-            check_enemizer(world.enemizer)
-
         # system for sharing ER layouts
         self.er_seed = str(world.random.randint(0, 2 ** 64))
 
@@ -360,7 +365,7 @@ class ALTTPWorld(World):
             patch_rom(world, rom, player, use_enemizer)
 
             if use_enemizer:
-                patch_enemizer(world, player, rom, world.enemizer, output_directory)
+                patch_enemizer(world, player, rom, self.enemizer_path, output_directory)
 
             if world.is_race:
                 patch_race_rom(rom, world, player)
@@ -373,7 +378,7 @@ class ALTTPWorld(World):
                 'hud': world.hud_palettes[player],
                 'sword': world.sword_palettes[player],
                 'shield': world.shield_palettes[player],
-                'link': world.link_palettes[player]
+                # 'link': world.link_palettes[player]
             }
             palettes_options = {key: option.current_key for key, option in palettes_options.items()}
 

worlds/dkc3/Client.py

@@ -66,7 +66,7 @@ async def dkc3_game_watcher(ctx: Context):
             return
 
         new_checks = []
-        from worlds.dkc3.Rom import location_rom_data, item_rom_data
+        from worlds.dkc3.Rom import location_rom_data, item_rom_data, boss_location_ids, level_unlock_map
         for loc_id, loc_data in location_rom_data.items():
             if loc_id not in ctx.locations_checked:
                 data = await snes_read(ctx, WRAM_START + loc_data[0], 1)
@@ -186,22 +186,40 @@ async def dkc3_game_watcher(ctx: Context):
 
         # DKC3_TODO: This method of collect should work, however it does not unlock the next level correctly when previous is flagged
         # Handle Collected Locations
-        #for loc_id in ctx.checked_locations:
-        #    if loc_id not in ctx.locations_checked:
-        #        loc_data = location_rom_data[loc_id]
-        #        data = await snes_read(ctx, WRAM_START + loc_data[0], 1)
-        #        invert_bit = ((len(loc_data) >= 3) and loc_data[2])
-        #        if not invert_bit:
-        #            masked_data = data[0] | (1 << loc_data[1])
-        #            print("Collected Location: ", hex(loc_data[0]), " | ", loc_data[1])
-        #            snes_buffered_write(ctx, WRAM_START + loc_data[0], bytes([masked_data]))
-        #            await snes_flush_writes(ctx)
-        #        else:
-        #            masked_data = data[0] & ~(1 << loc_data[1])
-        #            print("Collected Inverted Location: ", hex(loc_data[0]), " | ", loc_data[1])
-        #            snes_buffered_write(ctx, WRAM_START + loc_data[0], bytes([masked_data]))
-        #            await snes_flush_writes(ctx)
-        #        ctx.locations_checked.add(loc_id)
+        for loc_id in ctx.checked_locations:
+            if loc_id not in ctx.locations_checked and loc_id not in boss_location_ids:
+                loc_data = location_rom_data[loc_id]
+                data = await snes_read(ctx, WRAM_START + loc_data[0], 1)
+                invert_bit = ((len(loc_data) >= 3) and loc_data[2])
+                if not invert_bit:
+                    masked_data = data[0] | (1 << loc_data[1])
+                    #print("Collected Location: ", hex(loc_data[0]), " | ", loc_data[1])
+                    snes_buffered_write(ctx, WRAM_START + loc_data[0], bytes([masked_data]))
+
+                    if (loc_data[1] == 1):
+                        # Make the next levels accessible
+                        level_id = loc_data[0] - 0x632
+                        levels_to_tiles = await snes_read(ctx, ROM_START + 0x3FF800, 0x60)
+                        tiles_to_levels = await snes_read(ctx, ROM_START + 0x3FF860, 0x60)
+                        tile_id = levels_to_tiles[level_id] if levels_to_tiles[level_id] != 0xFF else level_id
+                        tile_id = tile_id + 0x632
+                        #print("Tile ID: ", hex(tile_id))
+                        if tile_id in level_unlock_map:
+                            for next_level_address in level_unlock_map[tile_id]:
+                                next_level_id = next_level_address - 0x632
+                                next_tile_id = tiles_to_levels[next_level_id] if tiles_to_levels[next_level_id] != 0xFF else next_level_id
+                                next_tile_id = next_tile_id + 0x632
+                                #print("Next Level ID: ", hex(next_tile_id))
+                                next_data = await snes_read(ctx, WRAM_START + next_tile_id, 1)
+                                snes_buffered_write(ctx, WRAM_START + next_tile_id, bytes([next_data[0] | 0x01]))
+
+                    await snes_flush_writes(ctx)
+                else:
+                    masked_data = data[0] & ~(1 << loc_data[1])
+                    print("Collected Inverted Location: ", hex(loc_data[0]), " | ", loc_data[1])
+                    snes_buffered_write(ctx, WRAM_START + loc_data[0], bytes([masked_data]))
+                    await snes_flush_writes(ctx)
+                ctx.locations_checked.add(loc_id)
 
         # Calculate Boomer Cost Text
         boomer_cost_text = await snes_read(ctx, WRAM_START + 0xAAFD, 2)

worlds/dkc3/Locations.py

@@ -221,6 +221,55 @@ level_location_table = {
     LocationName.rocket_rush_dk:      0xDC30A0,
 }
 
+kong_location_table = {
+    LocationName.lakeside_limbo_kong: 0xDC3100,
+    LocationName.doorstop_dash_kong:  0xDC3104,
+    LocationName.tidal_trouble_kong:  0xDC3108,
+    LocationName.skiddas_row_kong:    0xDC310C,
+    LocationName.murky_mill_kong:     0xDC3110,
+
+    LocationName.barrel_shield_bust_up_kong: 0xDC3114,
+    LocationName.riverside_race_kong:        0xDC3118,
+    LocationName.squeals_on_wheels_kong:     0xDC311C,
+    LocationName.springin_spiders_kong:      0xDC3120,
+    LocationName.bobbing_barrel_brawl_kong:  0xDC3124,
+
+    LocationName.bazzas_blockade_kong:     0xDC3128,
+    LocationName.rocket_barrel_ride_kong:  0xDC312C,
+    LocationName.kreeping_klasps_kong:     0xDC3130,
+    LocationName.tracker_barrel_trek_kong: 0xDC3134,
+    LocationName.fish_food_frenzy_kong:    0xDC3138,
+
+    LocationName.fire_ball_frenzy_kong:      0xDC313C,
+    LocationName.demolition_drain_pipe_kong: 0xDC3140,
+    LocationName.ripsaw_rage_kong:           0xDC3144,
+    LocationName.blazing_bazookas_kong:      0xDC3148,
+    LocationName.low_g_labyrinth_kong:       0xDC314C,
+
+    LocationName.krevice_kreepers_kong:   0xDC3150,
+    LocationName.tearaway_toboggan_kong:  0xDC3154,
+    LocationName.barrel_drop_bounce_kong: 0xDC3158,
+    LocationName.krack_shot_kroc_kong:    0xDC315C,
+    LocationName.lemguin_lunge_kong:      0xDC3160,
+
+    LocationName.buzzer_barrage_kong:    0xDC3164,
+    LocationName.kong_fused_cliffs_kong: 0xDC3168,
+    LocationName.floodlit_fish_kong:     0xDC316C,
+    LocationName.pothole_panic_kong:     0xDC3170,
+    LocationName.ropey_rumpus_kong:      0xDC3174,
+
+    LocationName.konveyor_rope_clash_kong: 0xDC3178,
+    LocationName.creepy_caverns_kong:      0xDC317C,
+    LocationName.lightning_lookout_kong:   0xDC3180,
+    LocationName.koindozer_klamber_kong:   0xDC3184,
+    LocationName.poisonous_pipeline_kong:  0xDC3188,
+
+    LocationName.stampede_sprint_kong:    0xDC318C,
+    LocationName.criss_cross_cliffs_kong: 0xDC3191,
+    LocationName.tyrant_twin_tussle_kong: 0xDC3195,
+    LocationName.swoopy_salvo_kong:       0xDC319A,
+}
+
 
 boss_location_table = {
     LocationName.belchas_barn:     0xDC30A1,
@@ -266,6 +315,7 @@ all_locations = {
     **boss_location_table,
     **secret_cave_location_table,
     **brothers_bear_location_table,
+    **kong_location_table,
 }
 
 location_table = {}
@@ -277,6 +327,9 @@ def setup_locations(world, player: int):
     if False:#world.include_trade_sequence[player].value:
         location_table.update({**brothers_bear_location_table})
 
+    if world.kongsanity[player].value:
+        location_table.update({**kong_location_table})
+
     return location_table
 
 

worlds/dkc3/Names/LocationName.py

@@ -1,197 +1,236 @@
 # Level Definitions
 lakeside_limbo_flag    = "Lakeside Limbo - Flag"
+lakeside_limbo_kong    = "Lakeside Limbo - KONG"
 lakeside_limbo_bonus_1 = "Lakeside Limbo - Bonus 1"
 lakeside_limbo_bonus_2 = "Lakeside Limbo - Bonus 2"
 lakeside_limbo_dk      = "Lakeside Limbo - DK Coin"
 
 doorstop_dash_flag    = "Doorstop Dash - Flag"
+doorstop_dash_kong    = "Doorstop Dash - KONG"
 doorstop_dash_bonus_1 = "Doorstop Dash - Bonus 1"
 doorstop_dash_bonus_2 = "Doorstop Dash - Bonus 2"
 doorstop_dash_dk      = "Doorstop Dash - DK Coin"
 
 tidal_trouble_flag    = "Tidal Trouble - Flag"
+tidal_trouble_kong    = "Tidal Trouble - KONG"
 tidal_trouble_bonus_1 = "Tidal Trouble - Bonus 1"
 tidal_trouble_bonus_2 = "Tidal Trouble - Bonus 2"
 tidal_trouble_dk      = "Tidal Trouble - DK Coin"
 
 skiddas_row_flag    = "Skidda's Row - Flag"
+skiddas_row_kong    = "Skidda's Row - KONG"
 skiddas_row_bonus_1 = "Skidda's Row - Bonus 1"
 skiddas_row_bonus_2 = "Skidda's Row - Bonus 2"
 skiddas_row_dk      = "Skidda's Row - DK Coin"
 
 murky_mill_flag    = "Murky Mill - Flag"
+murky_mill_kong    = "Murky Mill - KONG"
 murky_mill_bonus_1 = "Murky Mill - Bonus 1"
 murky_mill_bonus_2 = "Murky Mill - Bonus 2"
 murky_mill_dk      = "Murky Mill - DK Coin"
 
 barrel_shield_bust_up_flag    = "Barrel Shield Bust-Up - Flag"
+barrel_shield_bust_up_kong    = "Barrel Shield Bust-Up - KONG"
 barrel_shield_bust_up_bonus_1 = "Barrel Shield Bust-Up - Bonus 1"
 barrel_shield_bust_up_bonus_2 = "Barrel Shield Bust-Up - Bonus 2"
 barrel_shield_bust_up_dk      = "Barrel Shield Bust-Up - DK Coin"
 
 riverside_race_flag    = "Riverside Race - Flag"
+riverside_race_kong    = "Riverside Race - KONG"
 riverside_race_bonus_1 = "Riverside Race - Bonus 1"
 riverside_race_bonus_2 = "Riverside Race - Bonus 2"
 riverside_race_dk      = "Riverside Race - DK Coin"
 
 squeals_on_wheels_flag    = "Squeals On Wheels - Flag"
+squeals_on_wheels_kong    = "Squeals On Wheels - KONG"
 squeals_on_wheels_bonus_1 = "Squeals On Wheels - Bonus 1"
 squeals_on_wheels_bonus_2 = "Squeals On Wheels - Bonus 2"
 squeals_on_wheels_dk      = "Squeals On Wheels - DK Coin"
 
 springin_spiders_flag    = "Springin' Spiders - Flag"
+springin_spiders_kong    = "Springin' Spiders - KONG"
 springin_spiders_bonus_1 = "Springin' Spiders - Bonus 1"
 springin_spiders_bonus_2 = "Springin' Spiders - Bonus 2"
 springin_spiders_dk      = "Springin' Spiders - DK Coin"
 
 bobbing_barrel_brawl_flag    = "Bobbing Barrel Brawl - Flag"
+bobbing_barrel_brawl_kong    = "Bobbing Barrel Brawl - KONG"
 bobbing_barrel_brawl_bonus_1 = "Bobbing Barrel Brawl - Bonus 1"
 bobbing_barrel_brawl_bonus_2 = "Bobbing Barrel Brawl - Bonus 2"
 bobbing_barrel_brawl_dk      = "Bobbing Barrel Brawl - DK Coin"
 
 bazzas_blockade_flag    = "Bazza's Blockade - Flag"
+bazzas_blockade_kong    = "Bazza's Blockade - KONG"
 bazzas_blockade_bonus_1 = "Bazza's Blockade - Bonus 1"
 bazzas_blockade_bonus_2 = "Bazza's Blockade - Bonus 2"
 bazzas_blockade_dk      = "Bazza's Blockade - DK Coin"
 
 rocket_barrel_ride_flag    = "Rocket Barrel Ride - Flag"
+rocket_barrel_ride_kong    = "Rocket Barrel Ride - KONG"
 rocket_barrel_ride_bonus_1 = "Rocket Barrel Ride - Bonus 1"
 rocket_barrel_ride_bonus_2 = "Rocket Barrel Ride - Bonus 2"
 rocket_barrel_ride_dk      = "Rocket Barrel Ride - DK Coin"
 
 kreeping_klasps_flag    = "Kreeping Klasps - Flag"
+kreeping_klasps_kong    = "Kreeping Klasps - KONG"
 kreeping_klasps_bonus_1 = "Kreeping Klasps - Bonus 1"
 kreeping_klasps_bonus_2 = "Kreeping Klasps - Bonus 2"
 kreeping_klasps_dk      = "Kreeping Klasps - DK Coin"
 
 tracker_barrel_trek_flag    = "Tracker Barrel Trek - Flag"
+tracker_barrel_trek_kong    = "Tracker Barrel Trek - KONG"
 tracker_barrel_trek_bonus_1 = "Tracker Barrel Trek - Bonus 1"
 tracker_barrel_trek_bonus_2 = "Tracker Barrel Trek - Bonus 2"
 tracker_barrel_trek_dk      = "Tracker Barrel Trek - DK Coin"
 
 fish_food_frenzy_flag    = "Fish Food Frenzy - Flag"
+fish_food_frenzy_kong    = "Fish Food Frenzy - KONG"
 fish_food_frenzy_bonus_1 = "Fish Food Frenzy - Bonus 1"
 fish_food_frenzy_bonus_2 = "Fish Food Frenzy - Bonus 2"
 fish_food_frenzy_dk      = "Fish Food Frenzy - DK Coin"
 
 fire_ball_frenzy_flag    = "Fire-Ball Frenzy - Flag"
+fire_ball_frenzy_kong    = "Fire-Ball Frenzy - KONG"
 fire_ball_frenzy_bonus_1 = "Fire-Ball Frenzy - Bonus 1"
 fire_ball_frenzy_bonus_2 = "Fire-Ball Frenzy - Bonus 2"
 fire_ball_frenzy_dk      = "Fire-Ball Frenzy - DK Coin"
 
 demolition_drain_pipe_flag    = "Demolition Drain-Pipe - Flag"
+demolition_drain_pipe_kong    = "Demolition Drain-Pipe - KONG"
 demolition_drain_pipe_bonus_1 = "Demolition Drain-Pipe - Bonus 1"
 demolition_drain_pipe_bonus_2 = "Demolition Drain-Pipe - Bonus 2"
 demolition_drain_pipe_dk      = "Demolition Drain-Pipe - DK Coin"
 
 ripsaw_rage_flag    = "Ripsaw Rage - Flag"
+ripsaw_rage_kong    = "Ripsaw Rage - KONG"
 ripsaw_rage_bonus_1 = "Ripsaw Rage - Bonus 1"
 ripsaw_rage_bonus_2 = "Ripsaw Rage - Bonus 2"
 ripsaw_rage_dk      = "Ripsaw Rage - DK Coin"
 
-blazing_bazookas_flag    = "Blazing Bazookas - Flag"
-blazing_bazookas_bonus_1 = "Blazing Bazookas - Bonus 1"
-blazing_bazookas_bonus_2 = "Blazing Bazookas - Bonus 2"
-blazing_bazookas_dk      = "Blazing Bazookas - DK Coin"
+blazing_bazookas_flag    = "Blazing Bazukas - Flag"
+blazing_bazookas_kong    = "Blazing Bazukas - KONG"
+blazing_bazookas_bonus_1 = "Blazing Bazukas - Bonus 1"
+blazing_bazookas_bonus_2 = "Blazing Bazukas - Bonus 2"
+blazing_bazookas_dk      = "Blazing Bazukas - DK Coin"
 
 low_g_labyrinth_flag    = "Low-G Labyrinth - Flag"
+low_g_labyrinth_kong    = "Low-G Labyrinth - KONG"
 low_g_labyrinth_bonus_1 = "Low-G Labyrinth - Bonus 1"
 low_g_labyrinth_bonus_2 = "Low-G Labyrinth - Bonus 2"
 low_g_labyrinth_dk      = "Low-G Labyrinth - DK Coin"
 
 krevice_kreepers_flag    = "Krevice Kreepers - Flag"
+krevice_kreepers_kong    = "Krevice Kreepers - KONG"
 krevice_kreepers_bonus_1 = "Krevice Kreepers - Bonus 1"
 krevice_kreepers_bonus_2 = "Krevice Kreepers - Bonus 2"
 krevice_kreepers_dk      = "Krevice Kreepers - DK Coin"
 
 tearaway_toboggan_flag    = "Tearaway Toboggan - Flag"
+tearaway_toboggan_kong    = "Tearaway Toboggan - KONG"
 tearaway_toboggan_bonus_1 = "Tearaway Toboggan - Bonus 1"
 tearaway_toboggan_bonus_2 = "Tearaway Toboggan - Bonus 2"
 tearaway_toboggan_dk      = "Tearaway Toboggan - DK Coin"
 
 barrel_drop_bounce_flag    = "Barrel Drop Bounce - Flag"
+barrel_drop_bounce_kong    = "Barrel Drop Bounce - KONG"
 barrel_drop_bounce_bonus_1 = "Barrel Drop Bounce - Bonus 1"
 barrel_drop_bounce_bonus_2 = "Barrel Drop Bounce - Bonus 2"
 barrel_drop_bounce_dk      = "Barrel Drop Bounce - DK Coin"
 
 krack_shot_kroc_flag    = "Krack-Shot Kroc - Flag"
+krack_shot_kroc_kong    = "Krack-Shot Kroc - KONG"
 krack_shot_kroc_bonus_1 = "Krack-Shot Kroc - Bonus 1"
 krack_shot_kroc_bonus_2 = "Krack-Shot Kroc - Bonus 2"
 krack_shot_kroc_dk      = "Krack-Shot Kroc - DK Coin"
 
 lemguin_lunge_flag    = "Lemguin Lunge - Flag"
+lemguin_lunge_kong    = "Lemguin Lunge - KONG"
 lemguin_lunge_bonus_1 = "Lemguin Lunge - Bonus 1"
 lemguin_lunge_bonus_2 = "Lemguin Lunge - Bonus 2"
 lemguin_lunge_dk      = "Lemguin Lunge - DK Coin"
 
 buzzer_barrage_flag    = "Buzzer Barrage - Flag"
+buzzer_barrage_kong    = "Buzzer Barrage - KONG"
 buzzer_barrage_bonus_1 = "Buzzer Barrage - Bonus 1"
 buzzer_barrage_bonus_2 = "Buzzer Barrage - Bonus 2"
 buzzer_barrage_dk      = "Buzzer Barrage - DK Coin"
 
 kong_fused_cliffs_flag    = "Kong-Fused Cliffs - Flag"
+kong_fused_cliffs_kong    = "Kong-Fused Cliffs - KONG"
 kong_fused_cliffs_bonus_1 = "Kong-Fused Cliffs - Bonus 1"
 kong_fused_cliffs_bonus_2 = "Kong-Fused Cliffs - Bonus 2"
 kong_fused_cliffs_dk      = "Kong-Fused Cliffs - DK Coin"
 
 floodlit_fish_flag    = "Floodlit Fish - Flag"
+floodlit_fish_kong    = "Floodlit Fish - KONG"
 floodlit_fish_bonus_1 = "Floodlit Fish - Bonus 1"
 floodlit_fish_bonus_2 = "Floodlit Fish - Bonus 2"
 floodlit_fish_dk      = "Floodlit Fish - DK Coin"
 
 pothole_panic_flag    = "Pothole Panic - Flag"
+pothole_panic_kong    = "Pothole Panic - KONG"
 pothole_panic_bonus_1 = "Pothole Panic - Bonus 1"
 pothole_panic_bonus_2 = "Pothole Panic - Bonus 2"
 pothole_panic_dk      = "Pothole Panic - DK Coin"
 
 ropey_rumpus_flag    = "Ropey Rumpus - Flag"
+ropey_rumpus_kong    = "Ropey Rumpus - KONG"
 ropey_rumpus_bonus_1 = "Ropey Rumpus - Bonus 1"
 ropey_rumpus_bonus_2 = "Ropey Rumpus - Bonus 2"
 ropey_rumpus_dk      = "Ropey Rumpus - DK Coin"
 
 konveyor_rope_clash_flag    = "Konveyor Rope Klash - Flag"
+konveyor_rope_clash_kong    = "Konveyor Rope Klash - KONG"
 konveyor_rope_clash_bonus_1 = "Konveyor Rope Klash - Bonus 1"
 konveyor_rope_clash_bonus_2 = "Konveyor Rope Klash - Bonus 2"
 konveyor_rope_clash_dk      = "Konveyor Rope Klash - DK Coin"
 
 creepy_caverns_flag    = "Creepy Caverns - Flag"
+creepy_caverns_kong    = "Creepy Caverns - KONG"
 creepy_caverns_bonus_1 = "Creepy Caverns - Bonus 1"
 creepy_caverns_bonus_2 = "Creepy Caverns - Bonus 2"
 creepy_caverns_dk      = "Creepy Caverns - DK Coin"
 
 lightning_lookout_flag    = "Lightning Lookout - Flag"
+lightning_lookout_kong    = "Lightning Lookout - KONG"
 lightning_lookout_bonus_1 = "Lightning Lookout - Bonus 1"
 lightning_lookout_bonus_2 = "Lightning Lookout - Bonus 2"
 lightning_lookout_dk      = "Lightning Lookout - DK Coin"
 
 koindozer_klamber_flag    = "Koindozer Klamber - Flag"
+koindozer_klamber_kong    = "Koindozer Klamber - KONG"
 koindozer_klamber_bonus_1 = "Koindozer Klamber - Bonus 1"
 koindozer_klamber_bonus_2 = "Koindozer Klamber - Bonus 2"
 koindozer_klamber_dk      = "Koindozer Klamber - DK Coin"
 
 poisonous_pipeline_flag    = "Poisonous Pipeline - Flag"
+poisonous_pipeline_kong    = "Poisonous Pipeline - KONG"
 poisonous_pipeline_bonus_1 = "Poisonous Pipeline - Bonus 1"
 poisonous_pipeline_bonus_2 = "Poisonous Pipeline - Bonus 2"
 poisonous_pipeline_dk      = "Poisonous Pipeline - DK Coin"
 
 stampede_sprint_flag    = "Stampede Sprint - Flag"
+stampede_sprint_kong    = "Stampede Sprint - KONG"
 stampede_sprint_bonus_1 = "Stampede Sprint - Bonus 1"
 stampede_sprint_bonus_2 = "Stampede Sprint - Bonus 2"
 stampede_sprint_bonus_3 = "Stampede Sprint - Bonus 3"
 stampede_sprint_dk      = "Stampede Sprint - DK Coin"
 
 criss_cross_cliffs_flag    = "Criss Kross Cliffs - Flag"
+criss_cross_cliffs_kong    = "Criss Kross Cliffs - KONG"
 criss_cross_cliffs_bonus_1 = "Criss Kross Cliffs - Bonus 1"
 criss_cross_cliffs_bonus_2 = "Criss Kross Cliffs - Bonus 2"
 criss_cross_cliffs_dk      = "Criss Kross Cliffs - DK Coin"
 
 tyrant_twin_tussle_flag    = "Tyrant Twin Tussle - Flag"
+tyrant_twin_tussle_kong    = "Tyrant Twin Tussle - KONG"
 tyrant_twin_tussle_bonus_1 = "Tyrant Twin Tussle - Bonus 1"
 tyrant_twin_tussle_bonus_2 = "Tyrant Twin Tussle - Bonus 2"
 tyrant_twin_tussle_bonus_3 = "Tyrant Twin Tussle - Bonus 3"
 tyrant_twin_tussle_dk      = "Tyrant Twin Tussle - DK Coin"
 
 swoopy_salvo_flag    = "Swoopy Salvo - Flag"
+swoopy_salvo_kong    = "Swoopy Salvo - KONG"
 swoopy_salvo_bonus_1 = "Swoopy Salvo - Bonus 1"
 swoopy_salvo_bonus_2 = "Swoopy Salvo - Bonus 2"
 swoopy_salvo_bonus_3 = "Swoopy Salvo - Bonus 3"

worlds/dkc3/Options.py

@@ -6,7 +6,7 @@ from Options import Choice, Range, Option, Toggle, DeathLink, DefaultOnToggle, O
 class Goal(Choice):
     """
     Determines the goal of the seed
-    Knautilus: Reach the Knautilus and defeat Baron K. Roolenstein
+    Knautilus: Scuttle the Knautilus in Krematoa and defeat Baron K. Roolenstein
     Banana Bird Hunt: Find a certain number of Banana Birds and rescue their mother
     """
     display_name = "Goal"
@@ -75,6 +75,13 @@ class PercentageOfBananaBirds(Range):
     default = 100
 
 
+class KONGsanity(Toggle):
+    """
+    Whether collecting all four KONG letters in each level grants a check
+    """
+    display_name = "KONGsanity"
+
+
 class LevelShuffle(Toggle):
     """
     Whether levels are shuffled
@@ -82,6 +89,41 @@ class LevelShuffle(Toggle):
     display_name = "Level Shuffle"
 
 
+class Difficulty(Choice):
+    """
+    Which Difficulty Level to use
+    NORML: The Normal Difficulty
+    HARDR: Many DK Barrels are removed
+    TUFST: Most DK Barrels and all Midway Barrels are removed
+    """
+    display_name = "Difficulty"
+    option_norml = 0
+    option_hardr = 1
+    option_tufst = 2
+    default = 0
+
+    @classmethod
+    def get_option_name(cls, value) -> str:
+        if cls.auto_display_name:
+            return cls.name_lookup[value].upper()
+        else:
+            return cls.name_lookup[value]
+
+
+class Autosave(DefaultOnToggle):
+    """
+    Whether the game should autosave after each level
+    """
+    display_name = "Autosave"
+
+
+class MERRY(Toggle):
+    """
+    Whether the Bonus Barrels will be Christmas-themed
+    """
+    display_name = "MERRY"
+
+
 class MusicShuffle(Toggle):
     """
     Whether music is shuffled
@@ -125,7 +167,11 @@ dkc3_options: typing.Dict[str, type(Option)] = {
     "percentage_of_extra_bonus_coins": PercentageOfExtraBonusCoins,
     "number_of_banana_birds": NumberOfBananaBirds,
     "percentage_of_banana_birds": PercentageOfBananaBirds,
+    "kongsanity": KONGsanity,
     "level_shuffle": LevelShuffle,
+    "difficulty": Difficulty,
+    "autosave": Autosave,
+    "merry": MERRY,
     "music_shuffle": MusicShuffle,
     "kong_palette_swap": KongPaletteSwap,
     "starting_life_count": StartingLifeCount,

worlds/dkc3/Regions.py

@@ -44,6 +44,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.lakeside_limbo_bonus_2 : [0x657, 3],
         LocationName.lakeside_limbo_dk      : [0x657, 5],
     }
+    if world.kongsanity[player]:
+        lakeside_limbo_region_locations[LocationName.lakeside_limbo_kong] = []
     lakeside_limbo_region = create_region(world, player, active_locations, LocationName.lakeside_limbo_region,
                                           lakeside_limbo_region_locations, None)
 
@@ -53,6 +55,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.doorstop_dash_bonus_2 : [0x65A, 3],
         LocationName.doorstop_dash_dk      : [0x65A, 5],
     }
+    if world.kongsanity[player]:
+        doorstop_dash_region_locations[LocationName.doorstop_dash_kong] = []
     doorstop_dash_region = create_region(world, player, active_locations, LocationName.doorstop_dash_region,
                                          doorstop_dash_region_locations, None)
 
@@ -62,6 +66,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.tidal_trouble_bonus_2 : [0x659, 3],
         LocationName.tidal_trouble_dk      : [0x659, 5],
     }
+    if world.kongsanity[player]:
+        tidal_trouble_region_locations[LocationName.tidal_trouble_kong] = []
     tidal_trouble_region = create_region(world, player, active_locations, LocationName.tidal_trouble_region,
                                          tidal_trouble_region_locations, None)
 
@@ -71,6 +77,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.skiddas_row_bonus_2 : [0x65D, 3],
         LocationName.skiddas_row_dk      : [0x65D, 5],
     }
+    if world.kongsanity[player]:
+        skiddas_row_region_locations[LocationName.skiddas_row_kong] = []
     skiddas_row_region = create_region(world, player, active_locations, LocationName.skiddas_row_region,
                                        skiddas_row_region_locations, None)
 
@@ -80,6 +88,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.murky_mill_bonus_2 : [0x65C, 3],
         LocationName.murky_mill_dk      : [0x65C, 5],
     }
+    if world.kongsanity[player]:
+        murky_mill_region_locations[LocationName.murky_mill_kong] = []
     murky_mill_region = create_region(world, player, active_locations, LocationName.murky_mill_region,
                                       murky_mill_region_locations, None)
 
@@ -89,6 +99,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.barrel_shield_bust_up_bonus_2  : [0x662, 3],
         LocationName.barrel_shield_bust_up_dk       : [0x662, 5],
     }
+    if world.kongsanity[player]:
+        barrel_shield_bust_up_region_locations[LocationName.barrel_shield_bust_up_kong] = []
     barrel_shield_bust_up_region = create_region(world, player, active_locations, LocationName.barrel_shield_bust_up_region,
                                                  barrel_shield_bust_up_region_locations, None)
 
@@ -98,6 +110,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.riverside_race_bonus_2 : [0x664, 3],
         LocationName.riverside_race_dk      : [0x664, 5],
     }
+    if world.kongsanity[player]:
+        riverside_race_region_locations[LocationName.riverside_race_kong] = []
     riverside_race_region = create_region(world, player, active_locations, LocationName.riverside_race_region,
                                           riverside_race_region_locations, None)
 
@@ -107,6 +121,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.squeals_on_wheels_bonus_2 : [0x65B, 3],
         LocationName.squeals_on_wheels_dk      : [0x65B, 5],
     }
+    if world.kongsanity[player]:
+        squeals_on_wheels_region_locations[LocationName.squeals_on_wheels_kong] = []
     squeals_on_wheels_region = create_region(world, player, active_locations, LocationName.squeals_on_wheels_region,
                                              squeals_on_wheels_region_locations, None)
 
@@ -116,6 +132,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.springin_spiders_bonus_2 : [0x661, 3],
         LocationName.springin_spiders_dk      : [0x661, 5],
     }
+    if world.kongsanity[player]:
+        springin_spiders_region_locations[LocationName.springin_spiders_kong] = []
     springin_spiders_region = create_region(world, player, active_locations, LocationName.springin_spiders_region,
                                             springin_spiders_region_locations, None)
 
@@ -125,6 +143,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.bobbing_barrel_brawl_bonus_2  : [0x666, 3],
         LocationName.bobbing_barrel_brawl_dk       : [0x666, 5],
     }
+    if world.kongsanity[player]:
+        bobbing_barrel_brawl_region_locations[LocationName.bobbing_barrel_brawl_kong] = []
     bobbing_barrel_brawl_region = create_region(world, player, active_locations, LocationName.bobbing_barrel_brawl_region,
                                                 bobbing_barrel_brawl_region_locations, None)
 
@@ -134,6 +154,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.bazzas_blockade_bonus_2 : [0x667, 3],
         LocationName.bazzas_blockade_dk      : [0x667, 5],
     }
+    if world.kongsanity[player]:
+        bazzas_blockade_region_locations[LocationName.bazzas_blockade_kong] = []
     bazzas_blockade_region = create_region(world, player, active_locations, LocationName.bazzas_blockade_region,
                                            bazzas_blockade_region_locations, None)
 
@@ -143,6 +165,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.rocket_barrel_ride_bonus_2 : [0x66A, 3],
         LocationName.rocket_barrel_ride_dk      : [0x66A, 5],
     }
+    if world.kongsanity[player]:
+        rocket_barrel_ride_region_locations[LocationName.rocket_barrel_ride_kong] = []
     rocket_barrel_ride_region = create_region(world, player, active_locations, LocationName.rocket_barrel_ride_region,
                                               rocket_barrel_ride_region_locations, None)
 
@@ -152,6 +176,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.kreeping_klasps_bonus_2  : [0x658, 3],
         LocationName.kreeping_klasps_dk       : [0x658, 5],
     }
+    if world.kongsanity[player]:
+        kreeping_klasps_region_locations[LocationName.kreeping_klasps_kong] = []
     kreeping_klasps_region = create_region(world, player, active_locations, LocationName.kreeping_klasps_region,
                                            kreeping_klasps_region_locations, None)
 
@@ -161,6 +187,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.tracker_barrel_trek_bonus_2 : [0x66B, 3],
         LocationName.tracker_barrel_trek_dk      : [0x66B, 5],
     }
+    if world.kongsanity[player]:
+        tracker_barrel_trek_region_locations[LocationName.tracker_barrel_trek_kong] = []
     tracker_barrel_trek_region = create_region(world, player, active_locations, LocationName.tracker_barrel_trek_region,
                                                tracker_barrel_trek_region_locations, None)
 
@@ -170,6 +198,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.fish_food_frenzy_bonus_2 : [0x668, 3],
         LocationName.fish_food_frenzy_dk      : [0x668, 5],
     }
+    if world.kongsanity[player]:
+        fish_food_frenzy_region_locations[LocationName.fish_food_frenzy_kong] = []
     fish_food_frenzy_region = create_region(world, player, active_locations, LocationName.fish_food_frenzy_region,
                                             fish_food_frenzy_region_locations, None)
 
@@ -179,6 +209,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.fire_ball_frenzy_bonus_2 : [0x66D, 3],
         LocationName.fire_ball_frenzy_dk      : [0x66D, 5],
     }
+    if world.kongsanity[player]:
+        fire_ball_frenzy_region_locations[LocationName.fire_ball_frenzy_kong] = []
     fire_ball_frenzy_region = create_region(world, player, active_locations, LocationName.fire_ball_frenzy_region,
                                             fire_ball_frenzy_region_locations, None)
 
@@ -188,6 +220,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.demolition_drain_pipe_bonus_2 : [0x672, 3],
         LocationName.demolition_drain_pipe_dk      : [0x672, 5],
     }
+    if world.kongsanity[player]:
+        demolition_drain_pipe_region_locations[LocationName.demolition_drain_pipe_kong] = []
     demolition_drain_pipe_region = create_region(world, player, active_locations, LocationName.demolition_drain_pipe_region,
                                                  demolition_drain_pipe_region_locations, None)
 
@@ -197,6 +231,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.ripsaw_rage_bonus_2 : [0x660, 3],
         LocationName.ripsaw_rage_dk      : [0x660, 5],
     }
+    if world.kongsanity[player]:
+        ripsaw_rage_region_locations[LocationName.ripsaw_rage_kong] = []
     ripsaw_rage_region = create_region(world, player, active_locations, LocationName.ripsaw_rage_region,
                                        ripsaw_rage_region_locations, None)
 
@@ -206,6 +242,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.blazing_bazookas_bonus_2 : [0x66E, 3],
         LocationName.blazing_bazookas_dk      : [0x66E, 5],
     }
+    if world.kongsanity[player]:
+        blazing_bazookas_region_locations[LocationName.blazing_bazookas_kong] = []
     blazing_bazookas_region = create_region(world, player, active_locations, LocationName.blazing_bazookas_region,
                                             blazing_bazookas_region_locations, None)
 
@@ -215,6 +253,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.low_g_labyrinth_bonus_2  : [0x670, 3],
         LocationName.low_g_labyrinth_dk       : [0x670, 5],
     }
+    if world.kongsanity[player]:
+        low_g_labyrinth_region_locations[LocationName.low_g_labyrinth_kong] = []
     low_g_labyrinth_region = create_region(world, player, active_locations, LocationName.low_g_labyrinth_region,
                                            low_g_labyrinth_region_locations, None)
 
@@ -224,6 +264,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.krevice_kreepers_bonus_2 : [0x673, 3],
         LocationName.krevice_kreepers_dk      : [0x673, 5],
     }
+    if world.kongsanity[player]:
+        krevice_kreepers_region_locations[LocationName.krevice_kreepers_kong] = []
     krevice_kreepers_region = create_region(world, player, active_locations, LocationName.krevice_kreepers_region,
                                             krevice_kreepers_region_locations, None)
 
@@ -233,6 +275,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.tearaway_toboggan_bonus_2 : [0x65F, 3],
         LocationName.tearaway_toboggan_dk      : [0x65F, 5],
     }
+    if world.kongsanity[player]:
+        tearaway_toboggan_region_locations[LocationName.tearaway_toboggan_kong] = []
     tearaway_toboggan_region = create_region(world, player, active_locations, LocationName.tearaway_toboggan_region,
                                              tearaway_toboggan_region_locations, None)
 
@@ -242,6 +286,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.barrel_drop_bounce_bonus_2 : [0x66C, 3],
         LocationName.barrel_drop_bounce_dk      : [0x66C, 5],
     }
+    if world.kongsanity[player]:
+        barrel_drop_bounce_region_locations[LocationName.barrel_drop_bounce_kong] = []
     barrel_drop_bounce_region = create_region(world, player, active_locations, LocationName.barrel_drop_bounce_region,
                                               barrel_drop_bounce_region_locations, None)
 
@@ -251,6 +297,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.krack_shot_kroc_bonus_2 : [0x66F, 3],
         LocationName.krack_shot_kroc_dk      : [0x66F, 5],
     }
+    if world.kongsanity[player]:
+        krack_shot_kroc_region_locations[LocationName.krack_shot_kroc_kong] = []
     krack_shot_kroc_region = create_region(world, player, active_locations, LocationName.krack_shot_kroc_region,
                                            krack_shot_kroc_region_locations, None)
 
@@ -260,6 +308,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.lemguin_lunge_bonus_2 : [0x65E, 3],
         LocationName.lemguin_lunge_dk      : [0x65E, 5],
     }
+    if world.kongsanity[player]:
+        lemguin_lunge_region_locations[LocationName.lemguin_lunge_kong] = []
     lemguin_lunge_region = create_region(world, player, active_locations, LocationName.lemguin_lunge_region,
                                          lemguin_lunge_region_locations, None)
 
@@ -269,6 +319,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.buzzer_barrage_bonus_2 : [0x676, 3],
         LocationName.buzzer_barrage_dk      : [0x676, 5],
     }
+    if world.kongsanity[player]:
+        buzzer_barrage_region_locations[LocationName.buzzer_barrage_kong] = []
     buzzer_barrage_region = create_region(world, player, active_locations, LocationName.buzzer_barrage_region,
                                           buzzer_barrage_region_locations, None)
 
@@ -278,6 +330,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.kong_fused_cliffs_bonus_2 : [0x674, 3],
         LocationName.kong_fused_cliffs_dk      : [0x674, 5],
     }
+    if world.kongsanity[player]:
+        kong_fused_cliffs_region_locations[LocationName.kong_fused_cliffs_kong] = []
     kong_fused_cliffs_region = create_region(world, player, active_locations, LocationName.kong_fused_cliffs_region,
                                              kong_fused_cliffs_region_locations, None)
 
@@ -287,6 +341,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.floodlit_fish_bonus_2 : [0x669, 3],
         LocationName.floodlit_fish_dk      : [0x669, 5],
     }
+    if world.kongsanity[player]:
+        floodlit_fish_region_locations[LocationName.floodlit_fish_kong] = []
     floodlit_fish_region = create_region(world, player, active_locations, LocationName.floodlit_fish_region,
                                          floodlit_fish_region_locations, None)
 
@@ -296,6 +352,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.pothole_panic_bonus_2 : [0x677, 3],
         LocationName.pothole_panic_dk      : [0x677, 5],
     }
+    if world.kongsanity[player]:
+        pothole_panic_region_locations[LocationName.pothole_panic_kong] = []
     pothole_panic_region = create_region(world, player, active_locations, LocationName.pothole_panic_region,
                                          pothole_panic_region_locations, None)
 
@@ -305,6 +363,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.ropey_rumpus_bonus_2 : [0x675, 3],
         LocationName.ropey_rumpus_dk      : [0x675, 5],
     }
+    if world.kongsanity[player]:
+        ropey_rumpus_region_locations[LocationName.ropey_rumpus_kong] = []
     ropey_rumpus_region = create_region(world, player, active_locations, LocationName.ropey_rumpus_region,
                                         ropey_rumpus_region_locations, None)
 
@@ -314,6 +374,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.konveyor_rope_clash_bonus_2  : [0x657, 3],
         LocationName.konveyor_rope_clash_dk       : [0x657, 5],
     }
+    if world.kongsanity[player]:
+        konveyor_rope_clash_region_locations[LocationName.konveyor_rope_clash_kong] = []
     konveyor_rope_clash_region = create_region(world, player, active_locations, LocationName.konveyor_rope_clash_region,
                                                konveyor_rope_clash_region_locations, None)
 
@@ -323,6 +385,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.creepy_caverns_bonus_2 : [0x678, 3],
         LocationName.creepy_caverns_dk      : [0x678, 5],
     }
+    if world.kongsanity[player]:
+        creepy_caverns_region_locations[LocationName.creepy_caverns_kong] = []
     creepy_caverns_region = create_region(world, player, active_locations, LocationName.creepy_caverns_region,
                                           creepy_caverns_region_locations, None)
 
@@ -332,6 +396,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.lightning_lookout_bonus_2  : [0x665, 3],
         LocationName.lightning_lookout_dk       : [0x665, 5],
     }
+    if world.kongsanity[player]:
+        lightning_lookout_region_locations[LocationName.lightning_lookout_kong] = []
     lightning_lookout_region = create_region(world, player, active_locations, LocationName.lightning_lookout_region,
                                              lightning_lookout_region_locations, None)
 
@@ -341,6 +407,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.koindozer_klamber_bonus_2  : [0x679, 3],
         LocationName.koindozer_klamber_dk       : [0x679, 5],
     }
+    if world.kongsanity[player]:
+        koindozer_klamber_region_locations[LocationName.koindozer_klamber_kong] = []
     koindozer_klamber_region = create_region(world, player, active_locations, LocationName.koindozer_klamber_region,
                                              koindozer_klamber_region_locations, None)
 
@@ -350,6 +418,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.poisonous_pipeline_bonus_2 : [0x671, 3],
         LocationName.poisonous_pipeline_dk      : [0x671, 5],
     }
+    if world.kongsanity[player]:
+        poisonous_pipeline_region_locations[LocationName.poisonous_pipeline_kong] = []
     poisonous_pipeline_region = create_region(world, player, active_locations, LocationName.poisonous_pipeline_region,
                                               poisonous_pipeline_region_locations, None)
 
@@ -360,6 +430,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.stampede_sprint_bonus_3  : [0x67B, 4],
         LocationName.stampede_sprint_dk       : [0x67B, 5],
     }
+    if world.kongsanity[player]:
+        stampede_sprint_region_locations[LocationName.stampede_sprint_kong] = []
     stampede_sprint_region = create_region(world, player, active_locations, LocationName.stampede_sprint_region,
                                            stampede_sprint_region_locations, None)
 
@@ -369,6 +441,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.criss_cross_cliffs_bonus_2 : [0x67C, 3],
         LocationName.criss_cross_cliffs_dk      : [0x67C, 5],
     }
+    if world.kongsanity[player]:
+        criss_cross_cliffs_region_locations[LocationName.criss_cross_cliffs_kong] = []
     criss_cross_cliffs_region = create_region(world, player, active_locations, LocationName.criss_cross_cliffs_region,
                                               criss_cross_cliffs_region_locations, None)
 
@@ -379,6 +453,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.tyrant_twin_tussle_bonus_3 : [0x67D, 4],
         LocationName.tyrant_twin_tussle_dk      : [0x67D, 5],
     }
+    if world.kongsanity[player]:
+        tyrant_twin_tussle_region_locations[LocationName.tyrant_twin_tussle_kong] = []
     tyrant_twin_tussle_region = create_region(world, player, active_locations, LocationName.tyrant_twin_tussle_region,
                                               tyrant_twin_tussle_region_locations, None)
 
@@ -389,6 +465,8 @@ def create_regions(world, player: int, active_locations):
         LocationName.swoopy_salvo_bonus_3 : [0x663, 4],
         LocationName.swoopy_salvo_dk      : [0x663, 5],
     }
+    if world.kongsanity[player]:
+        swoopy_salvo_region_locations[LocationName.swoopy_salvo_kong] = []
     swoopy_salvo_region = create_region(world, player, active_locations, LocationName.swoopy_salvo_region,
                                         swoopy_salvo_region_locations, None)
 
@@ -503,9 +581,7 @@ def create_regions(world, player: int, active_locations):
 
     sky_high_secret_region_locations = {}
     if False:#world.include_trade_sequence[player]:
-        sky_high_secret_region_locations.update({
-            LocationName.sky_high_secret: [0x64B, 1],
-        })
+        sky_high_secret_region_locations[LocationName.sky_high_secret] = [0x64B, 1]
     sky_high_secret_region = create_region(world, player, active_locations, LocationName.sky_high_secret_region,
                                            sky_high_secret_region_locations, None)
 
@@ -517,9 +593,7 @@ def create_regions(world, player: int, active_locations):
 
     cifftop_cache_region_locations = {}
     if False:#world.include_trade_sequence[player]:
-        cifftop_cache_region_locations.update({
-            LocationName.cifftop_cache: [0x64D, 1],
-        })
+        cifftop_cache_region_locations[LocationName.cifftop_cache] = [0x64D, 1]
     cifftop_cache_region = create_region(world, player, active_locations, LocationName.cifftop_cache_region,
                                          cifftop_cache_region_locations, None)
 
@@ -622,29 +696,19 @@ def create_regions(world, player: int, active_locations):
             LocationName.bazaars_general_store_2: [0x615, 3, True],
         })
 
-        bramble_region_locations.update({
-            LocationName.brambles_bungalow: [0x619, 2],
-        })
+        bramble_region_locations[LocationName.brambles_bungalow] = [0x619, 2]
 
         #flower_spot_region_locations.update({
         #    LocationName.flower_spot: [0x615, 3, True],
         #})
 
-        barter_region_locations.update({
-            LocationName.barters_swap_shop: [0x61B, 3],
-        })
+        barter_region_locations[LocationName.barters_swap_shop] = [0x61B, 3]
 
-        barnacle_region_locations.update({
-            LocationName.barnacles_island: [0x61D, 2],
-        })
+        barnacle_region_locations[LocationName.barnacles_island] = [0x61D, 2]
 
-        blue_region_locations.update({
-            LocationName.blues_beach_hut: [0x621, 4],
-        })
+        blue_region_locations[LocationName.blues_beach_hut] = [0x621, 4]
 
-        blizzard_region_locations.update({
-            LocationName.blizzards_basecamp: [0x625, 4, True],
-        })
+        blizzard_region_locations[LocationName.blizzards_basecamp] = [0x625, 4, True]
 
     bazaar_region = create_region(world, player, active_locations, LocationName.bazaar_region,
                                   bazaar_region_locations, None)
@@ -817,7 +881,6 @@ def connect_regions(world, player, level_list):
         level_list[32],
         level_list[33],
         level_list[34],
-        LocationName.kastle_kaos_region,
         LocationName.sewer_stockpile_region,
     ]
 
@@ -835,10 +898,16 @@ def connect_regions(world, player, level_list):
 
     for i in range(0, len(krematoa_levels)):
         connect(world, player, names, LocationName.krematoa_region, krematoa_levels[i],
-                lambda state: (state.has(ItemName.bonus_coin, player, world.krematoa_bonus_coin_cost[player].value * (i+1))))
-                
-    connect(world, player, names, LocationName.krematoa_region, LocationName.knautilus_region,
-            lambda state: (state.has(ItemName.krematoa_cog, player, 5)))
+                lambda state, i=i: (state.has(ItemName.bonus_coin, player, world.krematoa_bonus_coin_cost[player].value * (i+1))))
+
+    if world.goal[player] == "knautilus":
+        connect(world, player, names, LocationName.kaos_kore_region, LocationName.knautilus_region)
+        connect(world, player, names, LocationName.krematoa_region, LocationName.kastle_kaos_region,
+                lambda state: (state.has(ItemName.krematoa_cog, player, 5)))
+    else:
+        connect(world, player, names, LocationName.kaos_kore_region, LocationName.kastle_kaos_region)
+        connect(world, player, names, LocationName.krematoa_region, LocationName.knautilus_region,
+                lambda state: (state.has(ItemName.krematoa_cog, player, 5)))
 
 
 def create_region(world: MultiWorld, player: int, active_locations, name: str, locations=None, exits=None):

worlds/dkc3/Rom.py

@@ -11,187 +11,270 @@ import os
 import math
 
 
+level_unlock_map = {
+    0x657: [0x65A],
+    0x65A: [0x680, 0x639, 0x659],
+    0x659: [0x65D],
+    0x65D: [0x65C],
+    0x65C: [0x688, 0x64F],
+
+    0x662: [0x681, 0x664],
+    0x664: [0x65B],
+    0x65B: [0x689, 0x661],
+    0x661: [0x63A, 0x666],
+    0x666: [0x650, 0x649],
+
+    0x667: [0x66A],
+    0x66A: [0x682, 0x658],
+    0x658: [0x68A, 0x66B],
+    0x66B: [0x668],
+    0x668: [0x651],
+
+    0x66D: [0x63C, 0x672],
+    0x672: [0x68B, 0x660],
+    0x660: [0x683, 0x66E],
+    0x66E: [0x670],
+    0x670: [0x652],
+
+    0x673: [0x684, 0x65F],
+    0x65F: [0x66C],
+    0x66C: [0x66F],
+    0x66F: [0x65E],
+    0x65E: [0x63D, 0x653, 0x68C, 0x64C],
+
+    0x676: [0x63E, 0x674, 0x685],
+    0x674: [0x63F, 0x669],
+    0x669: [0x677],
+    0x677: [0x68D, 0x675],
+    0x675: [0x654],
+
+    0x67A: [0x640, 0x678],
+    0x678: [0x665],
+    0x665: [0x686, 0x679],
+    0x679: [0x68E, 0x671],
+
+    0x67B: [0x67C],
+    0x67C: [0x67D],
+    0x67D: [0x663],
+    0x663: [0x67E],
+}
+
 location_rom_data = {
     0xDC3000: [0x657, 1], # Lakeside Limbo
     0xDC3001: [0x657, 2],
     0xDC3002: [0x657, 3],
     0xDC3003: [0x657, 5],
+    0xDC3100: [0x657, 7],
 
     0xDC3004: [0x65A, 1], # Doorstop Dash
     0xDC3005: [0x65A, 2],
     0xDC3006: [0x65A, 3],
     0xDC3007: [0x65A, 5],
+    0xDC3104: [0x65A, 7],
 
     0xDC3008: [0x659, 1], # Tidal Trouble
     0xDC3009: [0x659, 2],
     0xDC300A: [0x659, 3],
     0xDC300B: [0x659, 5],
+    0xDC3108: [0x659, 7],
 
     0xDC300C: [0x65D, 1], # Skidda's Row
     0xDC300D: [0x65D, 2],
     0xDC300E: [0x65D, 3],
     0xDC300F: [0x65D, 5],
+    0xDC310C: [0x65D, 7],
 
     0xDC3010: [0x65C, 1], # Murky Mill
     0xDC3011: [0x65C, 2],
     0xDC3012: [0x65C, 3],
     0xDC3013: [0x65C, 5],
+    0xDC3110: [0x65C, 7],
 
 
     0xDC3014: [0x662, 1], # Barrel Shield Bust-Up
     0xDC3015: [0x662, 2],
     0xDC3016: [0x662, 3],
     0xDC3017: [0x662, 5],
+    0xDC3114: [0x662, 7],
 
     0xDC3018: [0x664, 1], # Riverside Race
     0xDC3019: [0x664, 2],
     0xDC301A: [0x664, 3],
     0xDC301B: [0x664, 5],
+    0xDC3118: [0x664, 7],
 
     0xDC301C: [0x65B, 1], # Squeals on Wheels
     0xDC301D: [0x65B, 2],
     0xDC301E: [0x65B, 3],
     0xDC301F: [0x65B, 5],
+    0xDC311C: [0x65B, 7],
 
     0xDC3020: [0x661, 1], # Springin' Spiders
     0xDC3021: [0x661, 2],
     0xDC3022: [0x661, 3],
     0xDC3023: [0x661, 5],
+    0xDC3120: [0x661, 7],
 
     0xDC3024: [0x666, 1], # Bobbing Barrel Brawl
     0xDC3025: [0x666, 2],
     0xDC3026: [0x666, 3],
     0xDC3027: [0x666, 5],
+    0xDC3124: [0x666, 7],
 
 
     0xDC3028: [0x667, 1], # Bazza's Blockade
     0xDC3029: [0x667, 2],
     0xDC302A: [0x667, 3],
     0xDC302B: [0x667, 5],
+    0xDC3128: [0x667, 7],
 
     0xDC302C: [0x66A, 1], # Rocket Barrel Ride
     0xDC302D: [0x66A, 2],
     0xDC302E: [0x66A, 3],
     0xDC302F: [0x66A, 5],
+    0xDC312C: [0x66A, 7],
 
     0xDC3030: [0x658, 1], # Kreeping Klasps
     0xDC3031: [0x658, 2],
     0xDC3032: [0x658, 3],
     0xDC3033: [0x658, 5],
+    0xDC3130: [0x658, 7],
 
     0xDC3034: [0x66B, 1], # Tracker Barrel Trek
     0xDC3035: [0x66B, 2],
     0xDC3036: [0x66B, 3],
     0xDC3037: [0x66B, 5],
+    0xDC3134: [0x66B, 7],
 
     0xDC3038: [0x668, 1], # Fish Food Frenzy
     0xDC3039: [0x668, 2],
     0xDC303A: [0x668, 3],
     0xDC303B: [0x668, 5],
+    0xDC3138: [0x668, 7],
 
 
     0xDC303C: [0x66D, 1], # Fire-ball Frenzy
     0xDC303D: [0x66D, 2],
     0xDC303E: [0x66D, 3],
     0xDC303F: [0x66D, 5],
+    0xDC313C: [0x66D, 7],
 
     0xDC3040: [0x672, 1], # Demolition Drainpipe
     0xDC3041: [0x672, 2],
     0xDC3042: [0x672, 3],
     0xDC3043: [0x672, 5],
+    0xDC3140: [0x672, 7],
 
     0xDC3044: [0x660, 1], # Ripsaw Rage
     0xDC3045: [0x660, 2],
     0xDC3046: [0x660, 3],
     0xDC3047: [0x660, 5],
+    0xDC3144: [0x660, 7],
 
     0xDC3048: [0x66E, 1], # Blazing Bazukas
     0xDC3049: [0x66E, 2],
     0xDC304A: [0x66E, 3],
     0xDC304B: [0x66E, 5],
+    0xDC3148: [0x66E, 7],
 
     0xDC304C: [0x670, 1], # Low-G Labyrinth
     0xDC304D: [0x670, 2],
     0xDC304E: [0x670, 3],
     0xDC304F: [0x670, 5],
+    0xDC314C: [0x670, 7],
 
 
     0xDC3050: [0x673, 1], # Krevice Kreepers
     0xDC3051: [0x673, 2],
     0xDC3052: [0x673, 3],
     0xDC3053: [0x673, 5],
+    0xDC3150: [0x673, 7],
 
     0xDC3054: [0x65F, 1], # Tearaway Toboggan
     0xDC3055: [0x65F, 2],
     0xDC3056: [0x65F, 3],
     0xDC3057: [0x65F, 5],
+    0xDC3154: [0x65F, 7],
 
     0xDC3058: [0x66C, 1], # Barrel Drop Bounce
     0xDC3059: [0x66C, 2],
     0xDC305A: [0x66C, 3],
     0xDC305B: [0x66C, 5],
+    0xDC3158: [0x66C, 7],
 
     0xDC305C: [0x66F, 1], # Krack-Shot Kroc
     0xDC305D: [0x66F, 2],
     0xDC305E: [0x66F, 3],
     0xDC305F: [0x66F, 5],
+    0xDC315C: [0x66F, 7],
 
     0xDC3060: [0x65E, 1], # Lemguin Lunge
     0xDC3061: [0x65E, 2],
     0xDC3062: [0x65E, 3],
     0xDC3063: [0x65E, 5],
+    0xDC3160: [0x65E, 7],
 
 
     0xDC3064: [0x676, 1], # Buzzer Barrage
     0xDC3065: [0x676, 2],
     0xDC3066: [0x676, 3],
     0xDC3067: [0x676, 5],
+    0xDC3164: [0x676, 7],
 
     0xDC3068: [0x674, 1], # Kong-Fused Cliffs
     0xDC3069: [0x674, 2],
     0xDC306A: [0x674, 3],
     0xDC306B: [0x674, 5],
+    0xDC3168: [0x674, 7],
 
     0xDC306C: [0x669, 1], # Floodlit Fish
     0xDC306D: [0x669, 2],
     0xDC306E: [0x669, 3],
     0xDC306F: [0x669, 5],
+    0xDC316C: [0x669, 7],
 
     0xDC3070: [0x677, 1], # Pothole Panic
     0xDC3071: [0x677, 2],
     0xDC3072: [0x677, 3],
     0xDC3073: [0x677, 5],
+    0xDC3170: [0x677, 7],
 
     0xDC3074: [0x675, 1], # Ropey Rumpus
     0xDC3075: [0x675, 2],
     0xDC3076: [0x675, 3],
     0xDC3077: [0x675, 5],
+    0xDC3174: [0x675, 7],
 
 
     0xDC3078: [0x67A, 1], # Konveyor Rope Klash
     0xDC3079: [0x67A, 2],
     0xDC307A: [0x67A, 3],
     0xDC307B: [0x67A, 5],
+    0xDC3178: [0x67A, 7],
 
     0xDC307C: [0x678, 1], # Creepy Caverns
     0xDC307D: [0x678, 2],
     0xDC307E: [0x678, 3],
     0xDC307F: [0x678, 5],
+    0xDC317C: [0x678, 7],
 
     0xDC3080: [0x665, 1], # Lightning Lookout
     0xDC3081: [0x665, 2],
     0xDC3082: [0x665, 3],
     0xDC3083: [0x665, 5],
+    0xDC3180: [0x665, 7],
 
     0xDC3084: [0x679, 1], # Koindozer Klamber
     0xDC3085: [0x679, 2],
     0xDC3086: [0x679, 3],
     0xDC3087: [0x679, 5],
+    0xDC3184: [0x679, 7],
 
     0xDC3088: [0x671, 1], # Poisonous Pipeline
     0xDC3089: [0x671, 2],
     0xDC308A: [0x671, 3],
     0xDC308B: [0x671, 5],
+    0xDC3188: [0x671, 7],
 
 
     0xDC308C: [0x67B, 1], # Stampede Sprint
@@ -199,23 +282,27 @@ location_rom_data = {
     0xDC308E: [0x67B, 3],
     0xDC308F: [0x67B, 4],
     0xDC3090: [0x67B, 5],
+    0xDC318C: [0x67B, 7],
 
     0xDC3091: [0x67C, 1], # Criss Kross Cliffs
     0xDC3092: [0x67C, 2],
     0xDC3093: [0x67C, 3],
     0xDC3094: [0x67C, 5],
+    0xDC3191: [0x67C, 7],
 
     0xDC3095: [0x67D, 1], # Tyrant Twin Tussle
     0xDC3096: [0x67D, 2],
     0xDC3097: [0x67D, 3],
     0xDC3098: [0x67D, 4],
     0xDC3099: [0x67D, 5],
+    0xDC3195: [0x67D, 7],
 
     0xDC309A: [0x663, 1], # Swoopy Salvo
     0xDC309B: [0x663, 2],
     0xDC309C: [0x663, 3],
     0xDC309D: [0x663, 4],
     0xDC309E: [0x663, 5],
+    0xDC319A: [0x663, 7],
 
     0xDC309F: [0x67E, 1], # Rocket Rush
     0xDC30A0: [0x67E, 5],
@@ -243,7 +330,7 @@ location_rom_data = {
     #0xDC30B4: [0x64D, 1], # Disabled until Trade Sequence
     0xDC30B5: [0x64E, 1],
 
-    0xDC30B6: [0x5FD, 4], # Banana Bird Mother
+    0xDC30B6: [0x5FE, 4], # Banana Bird Mother
 
     # DKC3_TODO: Disabled until Trade Sequence
     #0xDC30B7: [0x615, 2, True],
@@ -256,6 +343,18 @@ location_rom_data = {
     #0xDC30BE: [0x625, 4, True],
 }
 
+boss_location_ids = [
+    0xDC30A1,
+    0xDC30A2,
+    0xDC30A3,
+    0xDC30A4,
+    0xDC30A5,
+    0xDC30A6,
+    0xDC30A7,
+    0xDC30A8,
+    0xDC30B6,
+]
+
 
 item_rom_data = {
     0xDC3001: [0x5D5], # 1-Up Balloon
@@ -400,10 +499,13 @@ def patch_rom(world, rom, player, active_level_list):
     rom.write_byte(0x3484DE, 0xEA)
     rom.write_byte(0x348528, 0x80) # Prevent Single-Ski Lock
 
-
     # Make Swanky free
     rom.write_byte(0x348C48, 0x00)
 
+    rom.write_bytes(0x34AB70, bytearray([0xEA, 0xEA]))
+    rom.write_bytes(0x34ABF7, bytearray([0xEA, 0xEA]))
+    rom.write_bytes(0x34ACD0, bytearray([0xEA, 0xEA]))
+
     # Banana Bird Costs
     if world.goal[player] == "banana_bird_hunt":
         banana_bird_cost = math.floor(world.number_of_banana_birds[player] * world.percentage_of_banana_birds[player] / 100.0)
@@ -462,6 +564,25 @@ def patch_rom(world, rom, player, active_level_list):
     rom.write_byte(0x9130, world.starting_life_count[player].value)
     rom.write_byte(0x913B, world.starting_life_count[player].value)
 
+    # Cheat options
+    cheat_bytes = [0x00, 0x00]
+
+    if world.merry[player]:
+        cheat_bytes[0] |= 0x01
+
+    if world.autosave[player]:
+        cheat_bytes[0] |= 0x02
+
+    if world.difficulty[player] == "tufst":
+        cheat_bytes[0] |= 0x80
+        cheat_bytes[1] |= 0x80
+    elif world.difficulty[player] == "hardr":
+        cheat_bytes[0] |= 0x00
+        cheat_bytes[1] |= 0x00
+    elif world.difficulty[player] == "norml":
+        cheat_bytes[1] |= 0x40
+
+    rom.write_bytes(0x8303, bytearray(cheat_bytes))
 
     # Handle Level Shuffle Here
     if world.level_shuffle[player]:
@@ -469,6 +590,9 @@ def patch_rom(world, rom, player, active_level_list):
             rom.write_byte(level_dict[level_list[i]].nameIDAddress, level_dict[active_level_list[i]].nameID)
             rom.write_byte(level_dict[level_list[i]].levelIDAddress, level_dict[active_level_list[i]].levelID)
 
+            rom.write_byte(0x3FF800 + level_dict[active_level_list[i]].levelID, level_dict[level_list[i]].levelID)
+            rom.write_byte(0x3FF860 + level_dict[level_list[i]].levelID, level_dict[active_level_list[i]].levelID)
+
         # First levels of each world
         rom.write_byte(0x34BC3E, (0x32 + level_dict[active_level_list[0]].levelID))
         rom.write_byte(0x34BC47, (0x32 + level_dict[active_level_list[5]].levelID))
@@ -495,6 +619,52 @@ def patch_rom(world, rom, player, active_level_list):
 
         rom.write_byte(0x32F339, 0x55)
 
+    # Handle KONGsanity Here
+    if world.kongsanity[player]:
+        # Arich's Hoard KONGsanity fix
+        rom.write_bytes(0x34BA8C, bytearray([0xEA, 0xEA]))
+
+        # Don't hide the level flag if the 0x80 bit is set
+        rom.write_bytes(0x34CE92, bytearray([0x80]))
+
+        # Use the `!` next to level name for indicating KONG letters
+        rom.write_bytes(0x34B8F0, bytearray([0x80]))
+        rom.write_bytes(0x34B8F3, bytearray([0x80]))
+
+        # Hijack to code to set the 0x80 flag for the level when you complete KONG
+        rom.write_bytes(0x3BCD4B, bytearray([0x22, 0x80, 0xFA, 0XB8])) # JSL $B8FA80
+
+        rom.write_bytes(0x38FA80, bytearray([0xDA]))             # PHX
+        rom.write_bytes(0x38FA81, bytearray([0x48]))             # PHA
+        rom.write_bytes(0x38FA82, bytearray([0x08]))             # PHP
+        rom.write_bytes(0x38FA83, bytearray([0xE2, 0x20]))       # SEP #20
+        rom.write_bytes(0x38FA85, bytearray([0x48]))             # PHA
+        rom.write_bytes(0x38FA86, bytearray([0x18]))             # CLC
+        rom.write_bytes(0x38FA87, bytearray([0x6D, 0xD3, 0x18])) # ADC $18D3
+        rom.write_bytes(0x38FA8A, bytearray([0x8D, 0xD3, 0x18])) # STA $18D3
+        rom.write_bytes(0x38FA8D, bytearray([0x68]))             # PLA
+        rom.write_bytes(0x38FA8E, bytearray([0xC2, 0x20]))       # REP 20
+        rom.write_bytes(0x38FA90, bytearray([0X18]))             # CLC
+        rom.write_bytes(0x38FA91, bytearray([0x6D, 0xD5, 0x05])) # ADC $05D5
+        rom.write_bytes(0x38FA94, bytearray([0x8D, 0xD5, 0x05])) # STA $05D5
+        rom.write_bytes(0x38FA97, bytearray([0xAE, 0xB9, 0x05])) # LDX $05B9
+        rom.write_bytes(0x38FA9A, bytearray([0xBD, 0x32, 0x06])) # LDA $0632, X
+        rom.write_bytes(0x38FA9D, bytearray([0x09, 0x80, 0x00])) # ORA #8000
+        rom.write_bytes(0x38FAA0, bytearray([0x9D, 0x32, 0x06])) # STA $0632, X
+        rom.write_bytes(0x38FAA3, bytearray([0xAD, 0xD5, 0x18])) # LDA $18D5
+        rom.write_bytes(0x38FAA6, bytearray([0xD0, 0x03]))       # BNE $80EA
+        rom.write_bytes(0x38FAA8, bytearray([0x9C, 0xD9, 0x18])) # STZ $18D9
+        rom.write_bytes(0x38FAAB, bytearray([0xA9, 0x78, 0x00])) # LDA #0078
+        rom.write_bytes(0x38FAAE, bytearray([0x8D, 0xD5, 0x18])) # STA $18D5
+        rom.write_bytes(0x38FAB1, bytearray([0x28]))             # PLP
+        rom.write_bytes(0x38FAB2, bytearray([0x68]))             # PLA
+        rom.write_bytes(0x38FAB3, bytearray([0xFA]))             # PLX
+        rom.write_bytes(0x38FAB4, bytearray([0x6B]))             # RTL
+    # End Handle KONGsanity
+
+    # Handle Credits
+    rom.write_bytes(0x32A5DF, bytearray([0x41, 0x52, 0x43, 0x48, 0x49, 0x50, 0x45, 0x4C, 0x41, 0x47, 0x4F, 0x20, 0x4D, 0x4F, 0xC4])) # "ARCHIPELAGO MOD"
+    rom.write_bytes(0x32A5EE, bytearray([0x00, 0x03, 0x50, 0x4F, 0x52, 0x59, 0x47, 0x4F, 0x4E, 0xC5])) # "PORYGONE"
 
     from Main import __version__
     rom.name = bytearray(f'D3{__version__.replace(".", "")[0:3]}_{player}_{world.seed:11}\0', 'utf8')[:21]
@@ -516,6 +686,17 @@ def patch_rom(world, rom, player, active_level_list):
     rom.write_byte(0x32DD63, 0xEA)
     rom.write_byte(0x32DD64, 0xEA)
 
+    # Don't grant Banana Birds at Bears
+    rom.write_byte(0x3492DB, 0xEA)
+    rom.write_byte(0x3492DC, 0xEA)
+    rom.write_byte(0x3492DD, 0xEA)
+    rom.write_byte(0x3493F4, 0xEA)
+    rom.write_byte(0x3493F5, 0xEA)
+    rom.write_byte(0x3493F6, 0xEA)
+
+    # Don't grant present at Blizzard
+    rom.write_byte(0x8454, 0x00)
+
     # Don't grant Patch and Skis from their bosses
     rom.write_byte(0x3F3762, 0x00)
     rom.write_byte(0x3F377B, 0x00)

worlds/dkc3/__init__.py

@@ -4,7 +4,7 @@ import math
 import threading
 
 from BaseClasses import Item, MultiWorld, Tutorial, ItemClassification
-from .Items import DKC3Item, ItemData, item_table, inventory_table
+from .Items import DKC3Item, ItemData, item_table, inventory_table, junk_table
 from .Locations import DKC3Location, all_locations, setup_locations
 from .Options import dkc3_options
 from .Regions import create_regions, connect_regions
@@ -40,7 +40,7 @@ class DKC3World(World):
     game: str = "Donkey Kong Country 3"
     option_definitions = dkc3_options
     topology_present = False
-    data_version = 1
+    data_version = 2
     #hint_blacklist = {LocationName.rocket_rush_flag}
 
     item_name_to_id = {name: data.code for name, data in item_table.items()}
@@ -99,10 +99,13 @@ class DKC3World(World):
 
         # Bosses
         total_required_locations += number_of_bosses
-        
+
         # Secret Caves
         total_required_locations += 13
 
+        if self.world.kongsanity[self.player]:
+            total_required_locations += 39
+
         ## Brothers Bear
         if False:#self.world.include_trade_sequence[self.player]:
             total_required_locations += 10
@@ -118,7 +121,11 @@ class DKC3World(World):
 
         total_junk_count = total_required_locations - len(itempool)
 
-        itempool += [self.create_item(ItemName.bear_coin)] * total_junk_count
+        junk_pool = []
+        for item_name in self.world.random.choices(list(junk_table.keys()), k=total_junk_count):
+            junk_pool += [self.create_item(item_name)]
+
+        itempool += junk_pool
 
         self.active_level_list = level_list.copy()
 

worlds/factorio/Mod.py

@@ -107,7 +107,7 @@ def generate_mod(world, output_directory: str):
     random = multiworld.slot_seeds[player]
 
     def flop_random(low, high, base=None):
-        """Guarentees 50% below base and 50% above base, uniform distribution in each direction."""
+        """Guarantees 50% below base and 50% above base, uniform distribution in each direction."""
         if base:
             distance = random.random()
             if random.randint(0, 1):

worlds/factorio/data/mod_template/control.lua

@@ -249,6 +249,10 @@ script.on_event(defines.events.on_player_main_inventory_changed, update_player_e
 
 function add_samples(force, name, count)
     local function add_to_table(t)
+        if count <= 0 then
+			-- Fixes a bug with single craft, if a recipe gives 0 of a given item.
+			return
+		end
         t[name] = (t[name] or 0) + count
     end
     -- Add to global table of earned samples for future new players

worlds/factorio/data/mod_template/data.lua

@@ -1,4 +1,15 @@
 {% from "macros.lua" import dict_to_lua %}
+-- TODO: Replace the tinting code with an actual rendered picture of the energy bridge icon.
+-- This tint is so that one is less likely to accidentally mass-produce energy-bridges, then wonder why their rocket is not building.
+function energy_bridge_tint()
+    return { r = 0, g = 1, b = 0.667, a = 1}
+end
+function tint_icon(obj, tint)
+    obj.icons = { {icon = obj.icon, icon_size = obj.icon_size, icon_mipmaps = obj.icon_mipmaps, tint = tint} }
+    obj.icon = nil
+    obj.icon_size = nil
+    obj.icon_mipmaps = nil
+end
 local energy_bridge = table.deepcopy(data.raw["accumulator"]["accumulator"])
 energy_bridge.name = "ap-energy-bridge"
 energy_bridge.minable.result = "ap-energy-bridge"
@@ -6,12 +17,20 @@ energy_bridge.localised_name = "Archipelago EnergyLink Bridge"
 energy_bridge.energy_source.buffer_capacity = "5MJ"
 energy_bridge.energy_source.input_flow_limit = "1MW"
 energy_bridge.energy_source.output_flow_limit = "1MW"
+tint_icon(energy_bridge, energy_bridge_tint())
+energy_bridge.picture.layers[1].tint = energy_bridge_tint()
+energy_bridge.picture.layers[1].hr_version.tint = energy_bridge_tint()
+energy_bridge.charge_animation.layers[1].layers[1].tint = energy_bridge_tint()
+energy_bridge.charge_animation.layers[1].layers[1].hr_version.tint = energy_bridge_tint()
+energy_bridge.discharge_animation.layers[1].layers[1].tint = energy_bridge_tint()
+energy_bridge.discharge_animation.layers[1].layers[1].hr_version.tint = energy_bridge_tint()
 data.raw["accumulator"]["ap-energy-bridge"] = energy_bridge
 
 local energy_bridge_item = table.deepcopy(data.raw["item"]["accumulator"])
 energy_bridge_item.name = "ap-energy-bridge"
 energy_bridge_item.localised_name = "Archipelago EnergyLink Bridge"
 energy_bridge_item.place_result = energy_bridge.name
+tint_icon(energy_bridge_item, energy_bridge_tint())
 data.raw["item"]["ap-energy-bridge"] = energy_bridge_item
 
 local energy_bridge_recipe = table.deepcopy(data.raw["recipe"]["accumulator"])

worlds/factorio/data/mod_template/settings.lua

@@ -1,3 +1,21 @@
+-- Find out if more than one AP mod is loaded, and if so, error out.
+function mod_is_AP(str)
+    -- lua string.match is way more restrictive than regex. Regex would be "^AP-W?\d{20}-P[1-9]\d*-.+$"
+	local result = string.match(str, "^AP%-W?%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%-P[1-9]%d-%-.+$")
+	if result ~= nil then
+		log("Archipelago Mod: " .. result .. " is loaded.")
+	end
+	return result ~= nil
+end
+local ap_mod_count = 0
+for name, _ in pairs(mods) do
+    if mod_is_AP(name) then
+        ap_mod_count = ap_mod_count + 1
+        if ap_mod_count > 1 then
+            error("More than one Archipelago Factorio mod is loaded.")
+        end
+    end
+end
 data:extend({
     {
         type = "bool-setting",

worlds/ff1/Items.py

@@ -20,7 +20,7 @@ FF1_STARTER_ITEMS = [
 
 FF1_PROGRESSION_LIST = [
     "Rod", "Cube", "Lute", "Key", "Chime", "Oxyale",
-    "Ship", "Canoe", "Floater", "Canal",
+    "Ship", "Canoe", "Floater", "Mark", "Sigil", "Canal",
     "Crown", "Crystal", "Herb", "Tnt", "Adamant", "Slab", "Ruby", "Bottle",
     "Shard",
     "EarthOrb", "FireOrb", "WaterOrb", "AirOrb"

worlds/ff1/__init__.py

@@ -31,7 +31,7 @@ class FF1World(World):
     game = "Final Fantasy"
     topology_present = False
     remote_items = True
-    data_version = 1
+    data_version = 2
     remote_start_inventory = True
 
     ff1_items = FF1Items()
@@ -66,7 +66,10 @@ class FF1World(World):
             def goal_rule_and_shards(state):
                 return goal_rule(state) and state.has("Shard", self.player, 32)
             terminated_event.access_rule = goal_rule_and_shards
-
+        if "MARK" in items.keys():
+            # Fail generation for Noverworld and provide link to old FFR website
+            raise Exception("FFR Noverworld seeds must be generated on an older version of FFR. Please ensure you generated the settings using "
+                            "4-4-0.finalfantasyrandomizer.com")
         menu_region.locations.append(terminated_event)
         self.world.regions += [menu_region]
 

worlds/ff1/data/items.json

@@ -190,5 +190,7 @@
   "Ship": 480,
   "Bridge": 488,
   "Canal": 492,
-  "Canoe": 498
+  "Canoe": 498,
+  "Sigil": 499,
+  "Mark": 500
 }

worlds/generic/Rules.py

@@ -49,11 +49,11 @@ def exclusion_rules(world, player: int, exclude_locations: typing.Set[str]):
             location.progress_type = LocationProgressType.EXCLUDED
 
 
-def set_rule(spot, rule: CollectionRule):
+def set_rule(spot: typing.Union["BaseClasses.Location", "BaseClasses.Entrance"], rule: CollectionRule):
     spot.access_rule = rule
 
 
-def add_rule(spot, rule: CollectionRule, combine='and'):
+def add_rule(spot: typing.Union["BaseClasses.Location", "BaseClasses.Entrance"], rule: CollectionRule, combine='and'):
     old_rule = spot.access_rule
     if combine == 'or':
         spot.access_rule = lambda state: rule(state) or old_rule(state)
@@ -61,35 +61,37 @@ def add_rule(spot, rule: CollectionRule, combine='and'):
         spot.access_rule = lambda state: rule(state) and old_rule(state)
 
 
-def forbid_item(location, item: str, player: int):
+def forbid_item(location: "BaseClasses.Location", item: str, player: int):
     old_rule = location.item_rule
     location.item_rule = lambda i: (i.name != item or i.player != player) and old_rule(i)
 
 
-def forbid_items_for_player(location, items: typing.Set[str], player: int):
+def forbid_items_for_player(location: "BaseClasses.Location", items: typing.Set[str], player: int):
     old_rule = location.item_rule
     location.item_rule = lambda i: (i.player != player or i.name not in items) and old_rule(i)
 
 
-def forbid_items(location, items: typing.Set[str]):
+def forbid_items(location: "BaseClasses.Location", items: typing.Set[str]):
     """unused, but kept as a debugging tool."""
     old_rule = location.item_rule
     location.item_rule = lambda i: i.name not in items and old_rule(i)
 
 
-def add_item_rule(location, rule: ItemRule):
+def add_item_rule(location: "BaseClasses.Location", rule: ItemRule):
     old_rule = location.item_rule
     location.item_rule = lambda item: rule(item) and old_rule(item)
 
 
-def item_in_locations(state, item: str, player: int, locations: typing.Sequence):
+def item_in_locations(state: "BaseClasses.CollectionState", item: str, player: int,
+                      locations: typing.Sequence["BaseClasses.Location"]) -> bool:
     for location in locations:
         if item_name(state, location[0], location[1]) == (item, player):
             return True
     return False
 
 
-def item_name(state, location: str, player: int) -> typing.Optional[typing.Tuple[str, int]]:
+def item_name(state: "BaseClasses.CollectionState", location: str, player: int) -> \
+        typing.Optional[typing.Tuple[str, int]]:
     location = state.world.get_location(location, player)
     if location.item is None:
         return None

worlds/minecraft/Rules.py

@@ -276,10 +276,10 @@ def set_advancement_rules(world: MultiWorld, player: int):
 
     # 1.19 advancements
 
-    # can make a cake, and can reach a pillager outposts for allays
-    set_rule(world.get_location("Birthday Song", player), lambda state: state.can_reach("The Lie", "Location", player))
-    # find allay and craft a noteblock
-    set_rule(world.get_location("You've Got a Friend in Me", player), lambda state: state.has("Progressive Tools", player, 2) and state._mc_has_iron_ingots(player))
+    # can make a cake, and a noteblock, and can reach a pillager outposts for allays
+    set_rule(world.get_location("Birthday Song", player), lambda state: state.can_reach("The Lie", "Location", player) and state.has("Progressive Tools", player, 2) and state._mc_has_iron_ingots(player))
+    # can get to outposts.
+    # set_rule(world.get_location("You've Got a Friend in Me", player), lambda state: True)
     # craft bucket and adventure to find frog spawning biome
     set_rule(world.get_location("Bukkit Bukkit", player), lambda state: state.has("Bucket", player) and state._mc_has_iron_ingots(player) and state._mc_can_adventure(player))
     # I don't like this one its way to easy to get. just a pain to find.

worlds/minecraft/docs/en_Minecraft.md

@@ -7,9 +7,9 @@ config file.
 
 ## What does randomization do to this game?
 
-Recipes are removed from the crafting book and shuffled into the item pool. It can also optionally change which
+Some recipes are locked from being able to be crafted and shuffled into the item pool. It can also optionally change which
 structures appear in each dimension. Crafting recipes are re-learned when they are received from other players as item
-checks, and occasionally when completing your own achievements.
+checks, and occasionally when completing your own achievements. See below for which recipes are shuffled.
 
 ## What is considered a location check in minecraft?
 
@@ -25,3 +25,86 @@ inventory directly.
 
 Victory is achieved when the player kills the Ender Dragon, enters the portal in The End, and completes the credits
 sequence either by skipping it or watching hit play out.
+
+## Which recipes are locked?
+
+* Archery
+  * Bow
+  * Arrow
+  * Crossbow
+* Brewing
+  * Blaze Powder
+  * Brewing Stand
+* Enchanting
+  * Enchanting Table
+  * Bookshelf
+* Bucket
+* Flint & Steel
+* All Beds
+* Bottles
+* Shield
+* Fishing Rod
+  * Fishing Rod
+  * Carrot on a Stick
+  * Warped Fungus on a Stick
+* Campfire
+  * Campfire
+  * Soul Campfire
+* Spyglass
+* Lead
+* Progressive Weapons
+  * Tier I
+    * Stone Sword
+    * Stone Axe
+  * Tier II
+    * Iron Sword
+    * Iron Axe
+  * Tier III
+    * Diamond Sword
+    * Diamond Axe
+* Progessive Tools
+  * Tier I
+    * Stone Shovel
+    * Stone Hoe
+  * Tier II
+    * Iron Shovel
+    * Iron Hoe
+  * Tier III
+    * Diamond Shovel
+    * Diamond Hoe
+    * Netherite Ingot
+* Progressive Armor
+  * Tier I
+    * Iron Helmet
+    * Iron Chestplate
+    * Iron Leggings
+    * Iron Boots
+  * Tier II
+    * Diamond Helmet
+    * Diamond Chestplate
+    * Diamond Leggings
+    * Diamond Boots
+* Progressive Resource Crafting
+  * Tier I
+    * Iron Ingot from Nuggets
+    * Iron Nugget
+    * Gold Ingot from Nuggets
+    * Gold Nugget
+    * Furnace
+    * Blast Furnace
+  * Tier II
+    * Redstone
+    * Redstone Block
+    * Glowstone
+    * Iron Ingot from Iron Block
+    * Iron Block
+    * Gold Ingot from Gold Block
+    * Gold Block
+    * Diamond
+    * Diamond Block
+    * Netherite Block
+    * Netherite Ingot from Netherite Block
+    * Anvil
+    * Emerald
+    * Emerald Block
+    * Copper Block

worlds/oot/Hints.py

@@ -129,6 +129,8 @@ def getItemGenericName(item):
 
 
 def isRestrictedDungeonItem(dungeon, item):
+    if not isinstance(item, OOTItem):
+        return False
     if (item.map or item.compass) and dungeon.world.shuffle_mapcompass == 'dungeon':
         return item in dungeon.dungeon_items
     if item.type == 'SmallKey' and dungeon.world.shuffle_smallkeys == 'dungeon':

worlds/oot/ItemPool.py

@@ -1388,6 +1388,10 @@ def get_pool_core(world):
         remove_junk_pool = list(remove_junk_pool) + ['Recovery Heart', 'Bombs (20)', 'Arrows (30)', 'Ice Trap']
 
         junk_candidates = [item for item in pool if item in remove_junk_pool]
+        if len(pending_junk_pool) > len(junk_candidates):
+            excess = len(pending_junk_pool) - len(junk_candidates)
+            if world.triforce_hunt:
+                raise RuntimeError(f"Items in the pool for player {world.player} exceed locations. Add {excess} location(s) or remove {excess} triforce piece(s).")
         while pending_junk_pool:
             pending_item = pending_junk_pool.pop()
             if not junk_candidates:

worlds/oot/Items.py

@@ -22,6 +22,12 @@ def ap_id_to_oot_data(ap_id):
         raise Exception(f'Could not find desired item ID: {ap_id}')
 
 
+def oot_is_item_of_type(item, item_type):
+    if not isinstance(item, OOTItem):
+        return False
+    return item.type == item_type
+
+
 class OOTItem(Item):
     game: str = "Ocarina of Time"
     type: str
@@ -43,7 +49,6 @@ class OOTItem(Item):
         self.type = type
         self.index = index
         self.special = special or {}
-        self.looks_like_item = None
         self.price = special.get('price', None) if special else None
         self.internal = False
 

worlds/oot/Options.py

@@ -158,12 +158,12 @@ class TriforceGoal(Range):
     """Number of Triforce pieces required to complete the game."""
     display_name = "Required Triforce Pieces"
     range_start = 1
-    range_end = 100
+    range_end = 80
     default = 20
 
 
 class ExtraTriforces(Range):
-    """Percentage of additional Triforce pieces in the pool, separate from the item pool setting."""
+    """Percentage of additional Triforce pieces in the pool. With high numbers, you may need to randomize additional locations to have enough items."""
     display_name = "Percentage of Extra Triforce Pieces"
     range_start = 0
     range_end = 100

worlds/oot/Patches.py

@@ -1844,7 +1844,7 @@ def write_rom_item(rom, item_id, item):
 
 
 def get_override_table(world):
-    return list(filter(lambda val: val != None, map(partial(get_override_entry, world.player), world.world.get_filled_locations(world.player))))
+    return list(filter(lambda val: val != None, map(partial(get_override_entry, world), world.world.get_filled_locations(world.player))))
 
 
 override_struct = struct.Struct('>xBBBHBB') # match override_t in get_items.c
@@ -1852,10 +1852,10 @@ def get_override_table_bytes(override_table):
     return b''.join(sorted(itertools.starmap(override_struct.pack, override_table)))
 
 
-def get_override_entry(player_id, location):
+def get_override_entry(ootworld, location):
     scene = location.scene
     default = location.default
-    player_id = 0 if player_id == location.item.player else min(location.item.player, 255)
+    player_id = 0 if ootworld.player == location.item.player else min(location.item.player, 255)
     if location.item.game != 'Ocarina of Time': 
         # This is an AP sendable. It's guaranteed to not be None. 
         if location.item.advancement:
@@ -1869,7 +1869,7 @@ def get_override_entry(player_id, location):
 
     if location.item.trap:
         item_id = 0x7C  # Ice Trap ID, to get "X is a fool" message
-        looks_like_item_id = location.item.looks_like_item.index
+        looks_like_item_id = ootworld.trap_appearances[location.address].index
     else:
         looks_like_item_id = 0
 
@@ -2091,7 +2091,8 @@ def get_locked_doors(rom, world):
                 return [0x00D4 + scene * 0x1C + 0x04 + flag_byte, flag_bits]
 
         # If boss door, set the door's unlock flag
-        if (world.shuffle_bosskeys == 'remove' and scene != 0x0A) or (world.shuffle_ganon_bosskey == 'remove' and scene == 0x0A):
+        if (world.shuffle_bosskeys == 'remove' and scene != 0x0A) or (
+            world.shuffle_ganon_bosskey == 'remove' and scene == 0x0A and not world.triforce_hunt):
             if actor_id == 0x002E and actor_type == 0x05:
                 return [0x00D4 + scene * 0x1C + 0x04 + flag_byte, flag_bits]
 
@@ -2109,23 +2110,20 @@ def place_shop_items(rom, world, shop_items, messages, locations, init_shop_id=F
             rom.write_int16(location.address1, location.item.index)
         else:
             if location.item.trap:
-                item_display = location.item.looks_like_item
-            elif location.item.game != "Ocarina of Time": 
-                item_display = location.item
-                if location.item.advancement:
-                    item_display.index = 0xCB
-                else:
-                    item_display.index = 0xCC
-                item_display.special = {}
+                item_display = world.trap_appearances[location.address]
             else:
                 item_display = location.item
 
             # bottles in shops should look like empty bottles
             # so that that are different than normal shop refils
-            if 'shop_object' in item_display.special:
-                rom_item = read_rom_item(rom, item_display.special['shop_object'])
+            if location.item.trap or location.item.game == "Ocarina of Time":
+                if 'shop_object' in item_display.special:
+                    rom_item = read_rom_item(rom, item_display.special['shop_object'])
+                else:
+                    rom_item = read_rom_item(rom, item_display.index)
             else:
-                rom_item = read_rom_item(rom, item_display.index)
+                display_index = 0xCB if location.item.advancement else 0xCC
+                rom_item = read_rom_item(rom, display_index)
 
             shop_objs.add(rom_item['object_id'])
             shop_id = world.current_shop_id

worlds/oot/Rules.py

@@ -3,6 +3,7 @@ import logging
 
 from .SaveContext import SaveContext
 from .Regions import TimeOfDay
+from .Items import oot_is_item_of_type
 
 from BaseClasses import CollectionState
 from worlds.generic.Rules import set_rule, add_rule, add_item_rule, forbid_item
@@ -138,7 +139,7 @@ def set_rules(ootworld):
         # Sheik in Ice Cavern is the only song location in a dungeon; need to ensure that it cannot be anything else.
         # This is required if map/compass included, or any_dungeon shuffle.
         location = world.get_location('Sheik in Ice Cavern', player)
-        add_item_rule(location, lambda item: item.player == player and item.type == 'Song')
+        add_item_rule(location, lambda item: item.player == player and oot_is_item_of_type(item, 'Song'))
 
     if ootworld.skip_child_zelda:
         # If skip child zelda is on, the item at Song from Impa must be giveable by the save context. 
@@ -181,7 +182,7 @@ def set_shop_rules(ootworld):
     wallet = ootworld.parser.parse_rule('Progressive_Wallet')
     wallet2 = ootworld.parser.parse_rule('(Progressive_Wallet, 2)')
 
-    for location in filter(lambda location: location.item and location.item.type == 'Shop', ootworld.get_locations()):
+    for location in filter(lambda location: location.item and oot_is_item_of_type(location.item, 'Shop'), ootworld.get_locations()):
         # Add wallet requirements
         if location.item.name in ['Buy Arrows (50)', 'Buy Fish', 'Buy Goron Tunic', 'Buy Bombchu (20)', 'Buy Bombs (30)']:
             add_rule(location, wallet)

worlds/oot/__init__.py

@@ -8,7 +8,7 @@ logger = logging.getLogger("Ocarina of Time")
 from .Location import OOTLocation, LocationFactory, location_name_to_id
 from .Entrance import OOTEntrance
 from .EntranceShuffle import shuffle_random_entrances, entrance_shuffle_table, EntranceShuffleError
-from .Items import OOTItem, item_table, oot_data_to_ap_id
+from .Items import OOTItem, item_table, oot_data_to_ap_id, oot_is_item_of_type
 from .ItemPool import generate_itempool, add_dungeon_items, get_junk_item, get_junk_pool
 from .Regions import OOTRegion, TimeOfDay
 from .Rules import set_rules, set_shop_rules, set_entrances_based_rules
@@ -178,6 +178,10 @@ class OOTWorld(World):
         if self.skip_child_zelda:
             self.shuffle_weird_egg = False
 
+        # Ganon boss key should not be in itempool in triforce hunt
+        if self.triforce_hunt:
+            self.shuffle_ganon_bosskey = 'remove'
+
         # Determine skipped trials in GT
         # This needs to be done before the logic rules in GT are parsed
         trial_list = ['Forest', 'Fire', 'Water', 'Spirit', 'Shadow', 'Light']
@@ -186,7 +190,11 @@ class OOTWorld(World):
 
         # Determine which dungeons are MQ
         # Possible future plan: allow user to pick which dungeons are MQ
-        mq_dungeons = self.world.random.sample(dungeon_table, self.mq_dungeons)
+        if self.logic_rules == 'glitchless':
+            mq_dungeons = self.world.random.sample(dungeon_table, self.mq_dungeons)
+        else:
+            self.mq_dungeons = 0
+            mq_dungeons = []
         self.dungeon_mq = {item['name']: (item in mq_dungeons) for item in dungeon_table}
 
         # Determine tricks in logic
@@ -793,7 +801,7 @@ class OOTWorld(World):
         # This includes all locations for which show_in_spoiler is false, and shuffled shop items.
         for loc in self.get_locations():
             if loc.address is not None and (
-                    not loc.show_in_spoiler or (loc.item is not None and loc.item.type == 'Shop')
+                    not loc.show_in_spoiler or oot_is_item_of_type(loc.item, 'Shop')
                     or (self.skip_child_zelda and loc.name in ['HC Zeldas Letter', 'Song from Impa'])):
                 loc.address = None
 
@@ -803,9 +811,10 @@ class OOTWorld(World):
 
         with i_o_limiter:
             # Make traps appear as other random items
-            ice_traps = [loc.item for loc in self.get_locations() if loc.item.trap]
-            for trap in ice_traps:
-                trap.looks_like_item = self.create_item(self.world.slot_seeds[self.player].choice(self.fake_items).name)
+            trap_location_ids = [loc.address for loc in self.get_locations() if loc.item.trap]
+            self.trap_appearances = {}
+            for loc_id in trap_location_ids:
+                self.trap_appearances[loc_id] = self.create_item(self.world.slot_seeds[self.player].choice(self.fake_items).name)
 
             # Seed hint RNG, used for ganon text lines also
             self.hint_rng = self.world.slot_seeds[self.player]
@@ -869,11 +878,11 @@ class OOTWorld(World):
                         autoworld.major_item_locations.append(loc)
 
                     if loc.game == "Ocarina of Time" and loc.item.code and (not loc.locked or
-                        (loc.item.type == 'Song' or
-                            (loc.item.type == 'SmallKey'         and world.worlds[loc.player].shuffle_smallkeys     == 'any_dungeon') or
-                            (loc.item.type == 'HideoutSmallKey'  and world.worlds[loc.player].shuffle_fortresskeys  == 'any_dungeon') or
-                            (loc.item.type == 'BossKey'          and world.worlds[loc.player].shuffle_bosskeys      == 'any_dungeon') or
-                            (loc.item.type == 'GanonBossKey'     and world.worlds[loc.player].shuffle_ganon_bosskey == 'any_dungeon'))):
+                        (oot_is_item_of_type(loc.item, 'Song') or
+                            (oot_is_item_of_type(loc.item, 'SmallKey')         and world.worlds[loc.player].shuffle_smallkeys     == 'any_dungeon') or
+                            (oot_is_item_of_type(loc.item, 'HideoutSmallKey')  and world.worlds[loc.player].shuffle_fortresskeys  == 'any_dungeon') or
+                            (oot_is_item_of_type(loc.item, 'BossKey')          and world.worlds[loc.player].shuffle_bosskeys      == 'any_dungeon') or
+                            (oot_is_item_of_type(loc.item, 'GanonBossKey')     and world.worlds[loc.player].shuffle_ganon_bosskey == 'any_dungeon'))):
                         if loc.player in barren_hint_players:
                             hint_area = get_hint_area(loc)
                             items_by_region[loc.player][hint_area]['weight'] += 1
@@ -888,7 +897,7 @@ class OOTWorld(World):
             elif barren_hint_players or woth_hint_players:  # Check only relevant oot locations for barren/woth
                 for player in (barren_hint_players | woth_hint_players):
                     for loc in world.worlds[player].get_locations():
-                        if loc.item.code and (not loc.locked or loc.item.type == 'Song'):
+                        if loc.item.code and (not loc.locked or oot_is_item_of_type(loc.item, 'Song')):
                             if player in barren_hint_players:
                                 hint_area = get_hint_area(loc)
                                 items_by_region[player][hint_area]['weight'] += 1

worlds/raft/Options.py

@@ -1,8 +1,4 @@
-from Options import Range, Toggle, DefaultOnToggle, Choice
-
-class UseResourcePacks(DefaultOnToggle):
-    """Uses Resource Packs to fill out the item pool from Raft. Resource Packs have basic earlygame items such as planks, plastic, or food."""
-    display_name = "Use resource packs"
+from Options import Range, Toggle, DefaultOnToggle, Choice, DeathLink
 
 class MinimumResourcePackAmount(Range):
     """The minimum amount of resources available in a resource pack"""
@@ -19,23 +15,30 @@ class MaximumResourcePackAmount(Range):
     default = 5
 
 class DuplicateItems(Choice):
-    """Adds duplicates of items to the item pool. These will be selected alongside
-    Resource Packs (if configured). Note that there are not many progression items,
-    and selecting Progression may produce many of the same duplicate item."""
+    """Adds duplicates of items to the item pool (if configured in Filler items). These will be selected alongside Resource Packs (if configured). Note that there are not many progression items, and selecting Progression may produce many of the same duplicate item."""
     display_name = "Duplicate items"
-    option_disabled = 0
-    option_progression = 1
-    option_non_progression = 2
-    option_any = 3
+    option_progression = 0
+    option_non_progression = 1
+    option_any = 2
+    default = 2
+
+class FillerItemTypes(Choice):
+    """Determines whether to use Resource Packs, Duplicate Items (as configured), or both."""
+    display_name = "Filler items"
+    option_resource_packs = 0
+    option_duplicates = 1
+    option_both = 2
 
 class IslandFrequencyLocations(Choice):
     """Sets where frequencies for story islands are located."""
     display_name = "Frequency locations"
     option_vanilla = 0
     option_random_on_island = 1
-    option_progressive = 2
-    option_anywhere = 3
-    default = 1
+    option_random_island_order = 2
+    option_random_on_island_random_order = 3
+    option_progressive = 4
+    option_anywhere = 5
+    default = 2
 
 class IslandGenerationDistance(Choice):
     """Sets how far away islands spawn from you when you input their coordinates into the Receiver."""
@@ -56,7 +59,7 @@ class ProgressiveItems(DefaultOnToggle):
     display_name = "Progressive items"
 
 class BigIslandEarlyCrafting(Toggle):
-    """Allows recipes that require items from big islands (eg leather) to lock earlygame items like the Receiver, Bolt, or Smelter."""
+    """Allows recipes that require items from big islands (eg leather) to lock earlygame items like the Receiver, Bolt, or Smelter. Big islands are available from the start of the game, however it can take a long time to find them."""
     display_name = "Early recipes behind big islands"
 
 class PaddleboardMode(Toggle):
@@ -64,14 +67,15 @@ class PaddleboardMode(Toggle):
     display_name = "Paddleboard Mode"
 
 raft_options = {
-    "use_resource_packs": UseResourcePacks,
     "minimum_resource_pack_amount": MinimumResourcePackAmount,
     "maximum_resource_pack_amount": MaximumResourcePackAmount,
     "duplicate_items": DuplicateItems,
+    "filler_item_types": FillerItemTypes,
     "island_frequency_locations": IslandFrequencyLocations,
     "island_generation_distance": IslandGenerationDistance,
     "expensive_research": ExpensiveResearch,
     "progressive_items": ProgressiveItems,
     "big_island_early_crafting": BigIslandEarlyCrafting,
-    "paddleboard_mode": PaddleboardMode
+    "paddleboard_mode": PaddleboardMode,
+    "death_link": DeathLink
 }

worlds/raft/Rules.py

@@ -12,9 +12,6 @@ class RaftLogic(LogicMixin):
 
     def raft_can_smelt_items(self, player):
         return self.has("Smelter", player)
-    
-    def raft_can_find_titanium(self, player):
-        return self.has("Metal detector", player)
 
     def raft_can_craft_bolt(self, player):
         return self.raft_can_smelt_items(player) and self.has("Bolt", player)
@@ -27,12 +24,19 @@ class RaftLogic(LogicMixin):
 
     def raft_can_craft_circuitBoard(self, player):
         return self.raft_can_smelt_items(player) and self.has("Circuit board", player)
+    
+    def raft_can_craft_shovel(self, player):
+        return self.raft_can_smelt_items(player) and self.has("Shovel", player) and self.raft_can_craft_bolt(player)
 
     def raft_can_craft_reciever(self, player):
         return self.raft_can_craft_circuitBoard(player) and self.raft_can_craft_hinge(player) and self.has("Receiver", player)
 
     def raft_can_craft_antenna(self, player):
         return self.raft_can_craft_circuitBoard(player) and self.raft_can_craft_bolt(player) and self.has("Antenna", player)
+    
+    def raft_can_find_titanium(self, player):
+        return (self.has("Metal detector", player) and self.raft_can_craft_battery(player)
+            and self.raft_can_craft_shovel(player))
 
     def raft_can_craft_plasticBottle(self, player):
         return self.raft_can_smelt_items(player) and self.has("Empty bottle", player)
@@ -60,7 +64,7 @@ class RaftLogic(LogicMixin):
         return self.raft_can_craft_hinge(player) and self.raft_can_craft_bolt(player) and self.has("Zipline tool", player)
 
     def raft_can_get_dirt(self, player):
-        return self.raft_can_smelt_items(player) and self.raft_can_craft_bolt(player) and self.has("Shovel", player)
+        return self.raft_can_craft_shovel(player) and self.raft_big_islands_available(player)
 
     def raft_can_craft_grassPlot(self, player):
         return self.raft_can_get_dirt(player) and self.has("Grass plot", player)
@@ -88,60 +92,69 @@ class RaftLogic(LogicMixin):
         return self.raft_can_access_radio_tower(player)
 
     def raft_can_access_vasagatan(self, player):
-        return self.raft_can_complete_radio_tower(player) and self.raft_can_navigate(player) and self.has("Vasagatan Frequency", player)
+        return self.raft_can_navigate(player) and self.has("Vasagatan Frequency", player)
 
     def raft_can_complete_vasagatan(self, player):
         return self.raft_can_access_vasagatan(player)
 
     def raft_can_access_balboa_island(self, player):
-        return (self.raft_can_complete_vasagatan(player)
-            and self.raft_can_drive(player)
-            and self.has("Balboa Island Frequency", player))
+        return self.raft_can_drive(player) and self.has("Balboa Island Frequency", player)
 
     def raft_can_complete_balboa_island(self, player):
         return self.raft_can_access_balboa_island(player) and self.raft_can_craft_machete(player)
 
     def raft_can_access_caravan_island(self, player):
-        return self.raft_can_complete_balboa_island(player) and self.raft_can_drive(player) and self.has("Caravan Island Frequency", player)
+        return self.raft_can_drive(player) and self.has("Caravan Island Frequency", player)
 
     def raft_can_complete_caravan_island(self, player):
         return self.raft_can_access_caravan_island(player) and self.raft_can_craft_ziplineTool(player)
 
     def raft_can_access_tangaroa(self, player):
-        return self.raft_can_complete_caravan_island(player) and self.raft_can_drive(player) and self.has("Tangaroa Frequency", player)
+        return self.raft_can_drive(player) and self.has("Tangaroa Frequency", player)
 
     def raft_can_complete_tangaroa(self, player):
-        return self.raft_can_access_tangaroa(player)
+        return self.raft_can_access_tangaroa(player) and self.raft_can_craft_ziplineTool(player)
 
     def raft_can_access_varuna_point(self, player):
-        return self.raft_can_complete_tangaroa(player) and self.raft_can_drive(player) and self.has("Varuna Point Frequency", player)
+        return self.raft_can_drive(player) and self.has("Varuna Point Frequency", player)
 
     def raft_can_complete_varuna_point(self, player):
-        return self.raft_can_access_varuna_point(player)
+        return self.raft_can_access_varuna_point(player) and self.raft_can_craft_ziplineTool(player)
 
     def raft_can_access_temperance(self, player):
-        return self.raft_can_complete_varuna_point(player) and self.raft_can_drive(player) and self.has("Temperance Frequency", player)
+        return self.raft_can_drive(player) and self.has("Temperance Frequency", player)
 
     def raft_can_complete_temperance(self, player):
-        return self.raft_can_access_temperance(player)
+        return self.raft_can_access_temperance(player) # No zipline required on Temperance
 
     def raft_can_access_utopia(self, player):
-        return self.raft_can_complete_temperance(player) and self.raft_can_drive(player) and self.has("Utopia Frequency", player)
+        return (self.raft_can_drive(player)
+            # Access checks are to prevent frequencies for other
+            # islands from appearing in Utopia
+            and self.raft_can_access_radio_tower(player)
+            and self.raft_can_access_vasagatan(player)
+            and self.raft_can_access_balboa_island(player)
+            and self.raft_can_access_caravan_island(player)
+            and self.raft_can_access_tangaroa(player)
+            and self.raft_can_access_varuna_point(player)
+            and self.raft_can_access_temperance(player)
+            and self.has("Utopia Frequency", player)
+            and self.raft_can_craft_shovel(player)) # Shovels are available but we don't want to softlock players
 
     def raft_can_complete_utopia(self, player):
-        return self.raft_can_access_utopia(player)
+        return self.raft_can_access_utopia(player) and self.raft_can_craft_ziplineTool(player)
 
 def set_rules(world, player):
     regionChecks = {
         "Raft": lambda state: True,
         "ResearchTable": lambda state: True,
         "RadioTower": lambda state: state.raft_can_access_radio_tower(player), # All can_access functions have state as implicit parameter for function
-        "Vasagatan": lambda state: state.raft_can_complete_radio_tower(player) and state.raft_can_access_vasagatan(player),
-        "BalboaIsland": lambda state: state.raft_can_complete_vasagatan(player) and state.raft_can_access_balboa_island(player),
-        "CaravanIsland": lambda state: state.raft_can_complete_balboa_island(player) and state.raft_can_access_caravan_island(player),
-        "Tangaroa": lambda state: state.raft_can_complete_caravan_island(player) and state.raft_can_access_tangaroa(player),
-        "Varuna Point": lambda state: state.raft_can_complete_tangaroa(player) and state.raft_can_access_varuna_point(player),
-        "Temperance": lambda state: state.raft_can_complete_varuna_point(player) and state.raft_can_access_temperance(player),
+        "Vasagatan": lambda state: state.raft_can_access_vasagatan(player),
+        "BalboaIsland": lambda state: state.raft_can_access_balboa_island(player),
+        "CaravanIsland": lambda state: state.raft_can_access_caravan_island(player),
+        "Tangaroa": lambda state: state.raft_can_access_tangaroa(player),
+        "Varuna Point": lambda state: state.raft_can_access_varuna_point(player),
+        "Temperance": lambda state: state.raft_can_access_temperance(player),
         "Utopia": lambda state: state.raft_can_complete_temperance(player) and state.raft_can_access_utopia(player)
     }
     itemChecks = {
@@ -183,7 +196,7 @@ def set_rules(world, player):
         if region != "Menu":
             for exitRegion in world.get_region(region, player).exits:
                 set_rule(world.get_entrance(exitRegion.name, player), regionChecks[region])
-     
+
     # Location access rules
     for location in location_table:
         locFromWorld = world.get_location(location["name"], player)

worlds/raft/__init__.py

@@ -56,21 +56,21 @@ class RaftWorld(World):
         extraItemNamePool = []
         extras = len(location_table) - len(item_table) - 1 # Victory takes up 1 unaccounted-for slot
         if extras > 0:
-            if (self.world.use_resource_packs[self.player].value):
+            if (self.world.filler_item_types[self.player].value != 1): # Use resource packs
                 for packItem in resourcePackItems:
                     for i in range(minimumResourcePackAmount, maximumResourcePackAmount + 1):
                         extraItemNamePool.append(createResourcePackName(i, packItem))
 
-            if self.world.duplicate_items[self.player].value != 0:
+            if self.world.filler_item_types[self.player].value != 0: # Use duplicate items
                 dupeItemPool = item_table.copy()
                 # Remove frequencies if necessary
-                if self.world.island_frequency_locations[self.player].value != 3: # Not completely random locations
+                if self.world.island_frequency_locations[self.player].value != 5: # Not completely random locations
                     dupeItemPool = (itm for itm in dupeItemPool if "Frequency" not in itm["name"])
                 
                 # Remove progression or non-progression items if necessary
-                if (self.world.duplicate_items[self.player].value == 1): # Progression only
+                if (self.world.duplicate_items[self.player].value == 0): # Progression only
                     dupeItemPool = (itm for itm in dupeItemPool if itm["progression"] == True)
-                elif (self.world.duplicate_items[self.player].value == 2): # Non-progression only
+                elif (self.world.duplicate_items[self.player].value == 1): # Non-progression only
                     dupeItemPool = (itm for itm in dupeItemPool if itm["progression"] == False)
                 
                 dupeItemPool = list(dupeItemPool)
@@ -91,19 +91,15 @@ class RaftWorld(World):
 
     def create_regions(self):
         create_regions(self.world, self.player)
-
-    def fill_slot_data(self):
-        slot_data = {}
-        return slot_data
     
     def get_pre_fill_items(self):
-        if self.world.island_frequency_locations[self.player] in [0, 1]:
+        if self.world.island_frequency_locations[self.player] in [0, 1, 2, 3]:
             return [loc.item for loc in self.world.get_filled_locations()]
         return []
     
     def create_item_replaceAsNecessary(self, name: str) -> Item:
         isFrequency = "Frequency" in name
-        shouldUseProgressive = ((isFrequency and self.world.island_frequency_locations[self.player].value == 2)
+        shouldUseProgressive = ((isFrequency and self.world.island_frequency_locations[self.player].value == 4)
             or (not isFrequency and self.world.progressive_items[self.player].value))
         if shouldUseProgressive and name in progressive_table:
             name = progressive_table[name]
@@ -148,6 +144,40 @@ class RaftWorld(World):
             self.setLocationItemFromRegion("Tangaroa", "Varuna Point Frequency")
             self.setLocationItemFromRegion("Varuna Point", "Temperance Frequency")
             self.setLocationItemFromRegion("Temperance", "Utopia Frequency")
+        elif self.world.island_frequency_locations[self.player] in [2, 3]:
+            locationToFrequencyItemMap = {
+                "Vasagatan": "Vasagatan Frequency",
+                "BalboaIsland": "Balboa Island Frequency",
+                "CaravanIsland": "Caravan Island Frequency",
+                "Tangaroa": "Tangaroa Frequency",
+                "Varuna Point": "Varuna Point Frequency",
+                "Temperance": "Temperance Frequency",
+                "Utopia": "Utopia Frequency"
+            }
+            locationToVanillaFrequencyLocationMap = {
+                "RadioTower": "Radio Tower Frequency to Vasagatan",
+                "Vasagatan": "Vasagatan Frequency to Balboa",
+                "BalboaIsland": "Relay Station quest",
+                "CaravanIsland": "Caravan Island Frequency to Tangaroa",
+                "Tangaroa": "Tangaroa Frequency to Varuna Point",
+                "Varuna Point": "Varuna Point Frequency to Temperance",
+                "Temperance": "Temperance Frequency to Utopia"
+            }
+            # Utopia is never chosen until the end, otherwise these are chosen randomly
+            availableLocationList = ["Vasagatan", "BalboaIsland", "CaravanIsland", "Tangaroa", "Varuna Point", "Temperance", "Utopia"]
+            previousLocation = "RadioTower"
+            while (len(availableLocationList) > 0):
+                if (len(availableLocationList) > 1):
+                    currentLocation = availableLocationList[random.randint(0, len(availableLocationList) - 2)]
+                else:
+                    currentLocation = availableLocationList[0] # Utopia (only one left in list)
+                availableLocationList.remove(currentLocation)
+                if self.world.island_frequency_locations[self.player] == 2:
+                    self.setLocationItem(locationToVanillaFrequencyLocationMap[previousLocation], locationToFrequencyItemMap[currentLocation])
+                elif self.world.island_frequency_locations[self.player] == 3:
+                    self.setLocationItemFromRegion(previousLocation, locationToFrequencyItemMap[currentLocation])
+                previousLocation = currentLocation
+
         # Victory item
         self.world.get_location("Utopia Complete", self.player).place_locked_item(
             RaftItem("Victory", ItemClassification.progression, None, player=self.player))
@@ -166,7 +196,8 @@ class RaftWorld(World):
     def fill_slot_data(self):
         return {
             "IslandGenerationDistance": self.world.island_generation_distance[self.player].value,
-            "ExpensiveResearch": self.world.expensive_research[self.player].value
+            "ExpensiveResearch": bool(self.world.expensive_research[self.player].value),
+            "DeathLink": bool(self.world.death_link[self.player].value)
         }
 
 def create_region(world: MultiWorld, player: int, name: str, locations=None, exits=None):

worlds/raft/docs/en_Raft.md

@@ -22,7 +22,7 @@ Decoration Packages are unchanged.
 Researches and pickups remain visually unchanged, regardless of what the unlock is.
 
 ## When the player receives an item, what happens?
-A Raft notification will appear with the item information. The unlock will also appear in the chat. Unlocks that would normally give you the item (eg Machete) will NOT give it to you, but must instead be crafted.
+A Raft notification will appear with the item information. The unlock will also appear in the chat. Unlocks that would normally give you the item (eg Zipline) will NOT give it to you, but must instead be crafted.
 
 ## Are there any limitations compared to vanilla Raft?
 - Mods that add new researchable technologies, modify story islands, or give items like blueprints are likely incompatible with Raftipelago.

worlds/raft/docs/setup_en.md

@@ -4,23 +4,50 @@
 
 - [Raft](https://store.steampowered.com/app/648800/Raft/)
 - [Raft Mod Loader](https://www.raftmodding.com/loader) ("*RML*")
+- [ModUtils mod](https://www.raftmodding.com/mods/modutils)
 - [Raftipelago mod](https://www.raftmodding.com/mods/raftipelago)
 
 ## Installation Procedures
 
-1. Install Raft. The currently-supported Raft version is Version 1.0: The Final Chapter. If you plan on playing Raft mainly with Archipelago, it's recommended to disable Raft auto-updating through Steam, as there is no beta channel to get old builds.
+1. Install Raft. The currently-supported Raft version is Version 1.0: The Final Chapter. Any minor version (such as 1.08) should be compatible.
 
 2. Install RML.
 
-3. Install the Raftipelago mod from the Raft Modding website. You should open the auto-installation link on the webpage through RML. Alternatively, you can download the .rmod file and place it in the Mods folder manually.
+3. Install the Raftipelago and ModUtils mods from the Raft Modding website. You should open the auto-installation link on the webpage through RML. Alternatively, you can download the .rmod file and place it in the Mods folder manually.
 
-4. Open RML and click Play. If you've already installed it, the shortcut in the Start Menu is called "RMLLauncher.exe". Raft should start.
+4. Open RML and click Play. If you've already installed it, the executable that was used to install RML ("RMLLauncher.exe" unless renamed) should be used to run RML. Raft should start after clicking Play.
 
 5. Open the RML menu. This should open automatically when Raft first loads. If it does not, and you see RML information in the top center of the Raft main menu, press F9 to open it.
 
 6. Navigate to the "Mod manager" tab in the left-hand menu.
 
-7. Click on the plug icon for Raftipelago to load the mod.
+7. Click on the plug icon for ModUtils to load the mod. You can also click on the (i) next to the plug icon, then check the "Load this mod at startup" button. This will make the mod always load at startup.
+
+8. Click on the plug icon for Raftipelago to load the mod. While it's possible to also make this mod load at startup, it's recommended *not* to do so; if this mod loads before ModUtils, the mod will fail to load properly.
+
+## Joining a MultiWorld Game
+
+1. Ensure you're on the Main Menu with Raftipelago loaded.
+
+2. Open the Debug Console by pressing F10.
+
+3. Type */connect {serverAddress} {username} {password}* into the console and hit Enter.
+    - Example: */connect archipelago.gg:12345 SunnyBat*
+    - If there is no password, the password argument may be omitted (as is the case in the above example).
+    - serverAddress must not contain spaces.
+    - If your username or password contains spaces, surround that value with quotation marks ("). Adding quotation marks even when not necessary (eg "SunnyBat") is fine.
+    - If your username or password starts with a quotation mark, surround the value with an additional set of quotation marks (eg the value *"myP@s$w0rD* would be entered as *""myP@s$w0rD"*).
+
+4. Start a new game or load an existing one. It's recommended to avoid using an existing game that was not created with your current run of Raftipelago (either vanilla or a different Raftipelago run). It will work, but if anything is unlocked, it will be automatically registered with Archipelago once the world is loaded. This is irreversible.
+
+5. You can disconnect from an Archipelago server by typing */disconnect confirmDisconnect* into the console and hitting Enter.
+
+## Multiplayer Raft
+
+You're able to have multiple Raft players on a single Raftipelago world. This will work, with a few notes:
+- Only the player that creates/loads the world can connect to Archipelago (this is the "host" of the Raft world). Other players do not need to connect; everything will be routed through the the host.
+- Players other than the host will be labeled as a "Raft Player (Steam name)" when using ingame chat, which will be routed through Archipelago chat.
+- Ingame chat will only work when the host is connected to the Archipelago server.
 
 ## Installation Troubleshooting
 
@@ -45,38 +72,12 @@ If this happens, then RML is configured to only start a new instance of Raft, th
 You can either:
 - Close the existing instance of Raft then click Play
 - Check the box next to the "Disable Automatic Game Start" setting in the Settings menu then click Play.
-    
-## Joining a MultiWorld Game
-
-1. Ensure you're on the Main Menu with Raftipelago loaded.
-
-2. Open the Debug Console by pressing F10.
-
-3. Type */connect {serverAddress} {username} {password}* into the console and hit Enter.
-    - Example: */connect archipelago.gg:12345 SunnyBat*
-    - serverAddress must not contain spaces.
-    - If your username or password contains spaces, surround that value with quotation marks ("). Adding quotation marks even when not necessary (eg "SunnyBat") is fine.
-    - If your username or password starts with a quotation mark, surround the value with an additional set of quotation marks (eg the value *"myP@s$w0rD* would be entered as *""myP@s$w0rD"*).
-
-4. Start a new game or load an existing one.
-    - Raftipelago save games are marked as *incompatible* with vanilla Raft. This means when Raftipelago is not loaded, saves made with Raftipelago will show as corrupt/unselectable.
-    - Avoid using an existing game that was not created with your current run of Raftipelago (either vanilla or a different Raftipelago run). It will work, but if anything is unlocked, it will be automatically registered with Archipelago once the world is loaded. This is irreversible.
-
-5. You can disconnect from an Archipelago server by typing */disconnect confirmDisconnect* into the console and hitting Enter.
-
-## Multiplayer Raft
-
-You're able to have multiple Raft players on a single Raftipelago world. This will work, with a few notes:
-- Only the player that creates/loads the world can connect to Archipelago (this is the "host" of the Raft world). Other players do not need to connect; everything will be routed through the the host.
-- Resource Packs are only received by the host and any other players connected to the Raft world when the resource pack is received.
-- Players other than the host will be labeled as a "Raft Player (Steam name)" when using ingame chat, which will be routed through Archipelago chat.
-- Ingame chat will only work when the host is connected to the Archipelago server.
 
 ## Game Troubleshooting
 
 ### The "Load game" button is disabled for my world / my world is corrupt
 
-Be sure that you click the "Load game" button **after** you load Raftipelago. You can click the Load Game button again to reload all of the saves in your folder (there is no need to restart Raft if the mod loaded successfully).
+Be sure that you click the "Load game" button **after** you load Raftipelago. You can click the Load Game button again to refresh all of the saves in your folder (there is no need to restart Raft if the mod loaded successfully).
 
 ### I'm certain I'm doing things correctly, but the world is still not loadable
 

worlds/raft/regions.json

@@ -1,12 +1,12 @@
 {
-	"Raft": ["RadioTower", "ResearchTable"],
+	"Raft": ["ResearchTable", "RadioTower", "Vasagatan", "BalboaIsland", "CaravanIsland", "Tangaroa", "Varuna Point", "Temperance", "Utopia"],
 	"ResearchTable": [],
-	"RadioTower": ["Vasagatan"],
-	"Vasagatan": ["BalboaIsland"],
-	"BalboaIsland": ["CaravanIsland"],
-	"CaravanIsland": ["Tangaroa"],
-	"Tangaroa": ["Varuna Point"],
-	"Varuna Point": ["Temperance"],
-	"Temperance": ["Utopia"],
+	"RadioTower": [],
+	"Vasagatan": [],
+	"BalboaIsland": [],
+	"CaravanIsland": [],
+	"Tangaroa": [],
+	"Varuna Point": [],
+	"Temperance": [],
 	"Utopia": []
 }

worlds/ror2/Items.py

@@ -1,143 +1,154 @@
+from typing import Dict
 from BaseClasses import Item
-import typing
+from .Options import ItemWeights
+
 
 class RiskOfRainItem(Item):
     game: str = "Risk of Rain 2"
 
+
 # 37000 - 38000
-item_table = {
-    "Dio's Best Friend": 37001,
-    "Common Item": 37002,
-    "Uncommon Item": 37003,
-    "Legendary Item": 37004,
-    "Boss Item": 37005,
-    "Lunar Item": 37006,
-    "Equipment": 37007,
-    "Item Scrap, White": 37008,
-    "Item Scrap, Green": 37009,
-    "Item Scrap, Red": 37010,
-    "Item Scrap, Yellow": 37011,
-    "Victory": None,
-    "Beat Level One": None,
-    "Beat Level Two": None,
-    "Beat Level Three": None,
-    "Beat Level Four": None,
-    "Beat Level Five": None,
+item_table: Dict[str, int] = {
+    "Dio's Best Friend":    37001,
+    "Common Item":          37002,
+    "Uncommon Item":        37003,
+    "Legendary Item":       37004,
+    "Boss Item":            37005,
+    "Lunar Item":           37006,
+    "Equipment":            37007,
+    "Item Scrap, White":    37008,
+    "Item Scrap, Green":    37009,
+    "Item Scrap, Red":      37010,
+    "Item Scrap, Yellow":   37011
 }
 
-default_weights = {
-    "Item Scrap, Green": 16,
-    "Item Scrap, Red": 4,
-    "Item Scrap, Yellow": 1,
-    "Item Scrap, White": 32,
-    "Common Item": 64,
-    "Uncommon Item": 32,
-    "Legendary Item": 8,
-    "Boss Item": 4,
-    "Lunar Item": 16,
-    "Equipment": 32
+default_weights: Dict[str, int] = {
+    "Item Scrap, Green":    16,
+    "Item Scrap, Red":      4,
+    "Item Scrap, Yellow":   1,
+    "Item Scrap, White":    32,
+    "Common Item":          64,
+    "Uncommon Item":        32,
+    "Legendary Item":       8,
+    "Boss Item":            4,
+    "Lunar Item":           16,
+    "Equipment":            32
 }
 
-new_weights = {
-    "Item Scrap, Green": 15,
-    "Item Scrap, Red": 5,
-    "Item Scrap, Yellow": 1,
-    "Item Scrap, White": 30,
-    "Common Item": 75,
-    "Uncommon Item": 40,
-    "Legendary Item": 10,
-    "Boss Item": 5,
-    "Lunar Item": 10,
-    "Equipment": 20
+new_weights: Dict[str, int] = {
+    "Item Scrap, Green":    15,
+    "Item Scrap, Red":      5,
+    "Item Scrap, Yellow":   1,
+    "Item Scrap, White":    30,
+    "Common Item":          75,
+    "Uncommon Item":        40,
+    "Legendary Item":       10,
+    "Boss Item":            5,
+    "Lunar Item":           10,
+    "Equipment":            20
 }
 
-uncommon_weights = {
-    "Item Scrap, Green": 45,
-    "Item Scrap, Red": 5,
-    "Item Scrap, Yellow": 1,
-    "Item Scrap, White": 30,
-    "Common Item": 45,
-    "Uncommon Item": 100,
-    "Legendary Item": 10,
-    "Boss Item": 5,
-    "Lunar Item": 15,
-    "Equipment": 20
+uncommon_weights: Dict[str, int] = {
+    "Item Scrap, Green":    45,
+    "Item Scrap, Red":      5,
+    "Item Scrap, Yellow":   1,
+    "Item Scrap, White":    30,
+    "Common Item":          45,
+    "Uncommon Item":        100,
+    "Legendary Item":       10,
+    "Boss Item":            5,
+    "Lunar Item":           15,
+    "Equipment":            20
 }
 
-legendary_weights = {
-    "Item Scrap, Green": 15,
-    "Item Scrap, Red": 5,
-    "Item Scrap, Yellow": 1,
-    "Item Scrap, White": 30,
-    "Common Item": 50,
-    "Uncommon Item": 25,
-    "Legendary Item": 100,
-    "Boss Item": 5,
-    "Lunar Item": 15,
-    "Equipment": 20
+legendary_weights: Dict[str, int] = {
+    "Item Scrap, Green":    15,
+    "Item Scrap, Red":      5,
+    "Item Scrap, Yellow":   1,
+    "Item Scrap, White":    30,
+    "Common Item":          50,
+    "Uncommon Item":        25,
+    "Legendary Item":       100,
+    "Boss Item":            5,
+    "Lunar Item":           15,
+    "Equipment":            20
 }
 
-lunartic_weights = {
-    "Item Scrap, Green": 0,
-    "Item Scrap, Red": 0,
-    "Item Scrap, Yellow": 0,
-    "Item Scrap, White": 0,
-    "Common Item": 0,
-    "Uncommon Item": 0,
-    "Legendary Item": 0,
-    "Boss Item": 0,
-    "Lunar Item": 100,
-    "Equipment": 0
+lunartic_weights: Dict[str, int] = {
+    "Item Scrap, Green":    0,
+    "Item Scrap, Red":      0,
+    "Item Scrap, Yellow":   0,
+    "Item Scrap, White":    0,
+    "Common Item":          0,
+    "Uncommon Item":        0,
+    "Legendary Item":       0,
+    "Boss Item":            0,
+    "Lunar Item":           100,
+    "Equipment":            0
 }
 
-no_scraps_weights = {
-    "Item Scrap, Green": 0,
-    "Item Scrap, Red": 0,
-    "Item Scrap, Yellow": 0,
-    "Item Scrap, White": 0,
-    "Common Item": 100,
-    "Uncommon Item": 40,
-    "Legendary Item": 15,
-    "Boss Item": 5,
-    "Lunar Item": 10,
-    "Equipment": 25
+chaos_weights: Dict[str, int] = {
+    "Item Scrap, Green":    80,
+    "Item Scrap, Red":      45,
+    "Item Scrap, Yellow":   30,
+    "Item Scrap, White":    100,
+    "Common Item":          100,
+    "Uncommon Item":        70,
+    "Legendary Item":       30,
+    "Boss Item":            20,
+    "Lunar Item":           60,
+    "Equipment":            40
 }
 
-even_weights = {
-    "Item Scrap, Green": 1,
-    "Item Scrap, Red": 1,
-    "Item Scrap, Yellow": 1,
-    "Item Scrap, White": 1,
-    "Common Item": 1,
-    "Uncommon Item": 1,
-    "Legendary Item": 1,
-    "Boss Item": 1,
-    "Lunar Item": 1,
-    "Equipment": 1
+no_scraps_weights: Dict[str, int] = {
+    "Item Scrap, Green":    0,
+    "Item Scrap, Red":      0,
+    "Item Scrap, Yellow":   0,
+    "Item Scrap, White":    0,
+    "Common Item":          100,
+    "Uncommon Item":        40,
+    "Legendary Item":       15,
+    "Boss Item":            5,
+    "Lunar Item":           10,
+    "Equipment":            25
 }
 
-scraps_only = {
-    "Item Scrap, Green": 70,
-    "Item Scrap, White": 100,
-    "Item Scrap, Red": 30,
-    "Item Scrap, Yellow": 5,
-    "Common Item": 0,
-    "Uncommon Item": 0,
-    "Legendary Item": 0,
-    "Boss Item": 0,
-    "Lunar Item": 0,
-    "Equipment": 0
+even_weights: Dict[str, int] = {
+    "Item Scrap, Green":    1,
+    "Item Scrap, Red":      1,
+    "Item Scrap, Yellow":   1,
+    "Item Scrap, White":    1,
+    "Common Item":          1,
+    "Uncommon Item":        1,
+    "Legendary Item":       1,
+    "Boss Item":            1,
+    "Lunar Item":           1,
+    "Equipment":            1
 }
 
-item_pool_weights: typing.Dict[int, typing.Dict[str, int]] = {
-    0: default_weights,
-    1: new_weights,
-    2: uncommon_weights,
-    3: legendary_weights,
-    4: lunartic_weights,
-    6: no_scraps_weights,
-    7: even_weights,
-    8: scraps_only
+scraps_only: Dict[str, int] = {
+    "Item Scrap, Green":    70,
+    "Item Scrap, White":    100,
+    "Item Scrap, Red":      30,
+    "Item Scrap, Yellow":   5,
+    "Common Item":          0,
+    "Uncommon Item":        0,
+    "Legendary Item":       0,
+    "Boss Item":            0,
+    "Lunar Item":           0,
+    "Equipment":            0
 }
 
-lookup_id_to_name: typing.Dict[int, str] = {id: name for name, id in item_table.items() if id}
+item_pool_weights: Dict[int, Dict[str, int]] = {
+    ItemWeights.option_default:     default_weights,
+    ItemWeights.option_new:         new_weights,
+    ItemWeights.option_uncommon:    uncommon_weights,
+    ItemWeights.option_legendary:   legendary_weights,
+    ItemWeights.option_lunartic:    lunartic_weights,
+    ItemWeights.option_chaos:       chaos_weights,
+    ItemWeights.option_no_scraps:   no_scraps_weights,
+    ItemWeights.option_even:        even_weights,
+    ItemWeights.option_scraps_only: scraps_only
+}
+
+lookup_id_to_name: Dict[int, str] = {id: name for name, id in item_table.items()}

worlds/ror2/Locations.py

@@ -1,19 +1,13 @@
+from typing import Dict
 from BaseClasses import Location
-import typing
+from .Options import TotalLocations
+
 
 class RiskOfRainLocation(Location):
     game: str = "Risk of Rain 2"
 
-# 37000 - 38000
-base_location_table = {
-    "Victory": None,
 
-}
 # 37006 - 37506
-item_pickups = {
-    f"ItemPickup{i}": 37005+i for i in range(1, 501)
+item_pickups: Dict[str, int] = {
+    f"ItemPickup{i+1}": 37000+i for i in range(TotalLocations.range_end)
 }
-
-location_table = {**base_location_table, **item_pickups}
-
-lookup_id_to_name: typing.Dict[int, str] = {id: name for name, id in location_table.items()}

worlds/ror2/Options.py

@@ -1,4 +1,4 @@
-import typing
+from typing import Dict
 from Options import Option, DefaultOnToggle, Range, Choice
 
 
@@ -36,7 +36,8 @@ class AllowLunarItems(DefaultOnToggle):
 class StartWithRevive(DefaultOnToggle):
     """Start the game with a `Dio's Best Friend` item."""
     display_name = "Start with a Revive"
-    
+
+
 class FinalStageDeath(DefaultOnToggle):
     """Death on the final boss stage counts as a win."""
     display_name = "Final Stage Death is Win"
@@ -124,7 +125,7 @@ class Equipment(Range):
 
 class ItemPoolPresetToggle(DefaultOnToggle):
     """Will use the item weight presets when set to true, otherwise will use the custom set item pool weights."""
-    display_name = "Item Weight Presets"
+    display_name = "Use Item Weight Presets"
 
 
 class ItemWeights(Choice):
@@ -150,7 +151,7 @@ class ItemWeights(Choice):
 
 
 # define a dictionary for the weights of the generated item pool.
-ror2_weights: typing.Dict[str, type(Option)] = {
+ror2_weights: Dict[str, type(Option)] = {
     "green_scrap":          GreenScrap,
     "red_scrap":            RedScrap,
     "yellow_scrap":         YellowScrap,
@@ -163,7 +164,7 @@ ror2_weights: typing.Dict[str, type(Option)] = {
     "equipment":            Equipment
 }
 
-ror2_options: typing.Dict[str, type(Option)] = {
+ror2_options: Dict[str, type(Option)] = {
     "total_locations":      TotalLocations,
     "total_revivals":       TotalRevivals,
     "start_with_revive":    StartWithRevive,

worlds/ror2/Rules.py

@@ -2,29 +2,32 @@ from BaseClasses import MultiWorld
 from worlds.generic.Rules import set_rule, add_rule
 
 
-def set_rules(world: MultiWorld, player: int):
-    total_locations = world.total_locations[player]  # total locations for current player
+def set_rules(world: MultiWorld, player: int) -> None:
+    total_locations = world.total_locations[player].value  # total locations for current player
     event_location_step = 25  # set an event location at these locations for "spheres"
     divisions = total_locations // event_location_step
+    total_revivals = world.worlds[player].total_revivals  # pulling this info we calculated in generate_basic
 
     if divisions:
         for i in range(1, divisions):  # since divisions is the floor of total_locations / 25
             event_loc = world.get_location(f"Pickup{i * event_location_step}", player)
-            set_rule(event_loc, lambda state, i=i: state.can_reach(f"ItemPickup{i * event_location_step - 1}", "Location", player))
+            set_rule(event_loc,
+                     lambda state, i=i: state.can_reach(f"ItemPickup{i * event_location_step - 1}", "Location", player))
             for n in range(i * event_location_step, (i + 1) * event_location_step):  # we want to create a rule for each of the 25 locations per division
                 if n == i * event_location_step:
-                    set_rule(world.get_location(f"ItemPickup{n}", player), lambda state, event_item=event_loc.item.name: state.has(event_item, player))
+                    set_rule(world.get_location(f"ItemPickup{n}", player),
+                             lambda state, event_item=event_loc.item.name: state.has(event_item, player))
                 else:
                     set_rule(world.get_location(f"ItemPickup{n}", player),
-                             lambda state, n = n: state.can_reach(f"ItemPickup{n - 1}", 'Location', player))
+                             lambda state, n=n: state.can_reach(f"ItemPickup{n - 1}", "Location", player))
         for i in range(divisions * event_location_step, total_locations+1):
-            set_rule(world.get_location(f"ItemPickup{i}", player), lambda state, i=i: state.can_reach(f"ItemPickup{i - 1}", "Location", player))
-
+            set_rule(world.get_location(f"ItemPickup{i}", player),
+                     lambda state, i=i: state.can_reach(f"ItemPickup{i - 1}", "Location", player))
     set_rule(world.get_location("Victory", player),
              lambda state: state.can_reach(f"ItemPickup{total_locations}", "Location", player))
-    if world.total_revivals[player] or world.start_with_revive[player]:
-        total_revivals = world.total_revivals[player] * world.total_locations[player] // 100
+    if total_revivals or world.start_with_revive[player].value:
         add_rule(world.get_location("Victory", player),
-                 lambda state: state.has("Dio's Best Friend", player, total_revivals + world.start_with_revive[player].value))
+                 lambda state: state.has("Dio's Best Friend", player,
+                                         total_revivals + world.start_with_revive[player]))
 
     world.completion_condition[player] = lambda state: state.has("Victory", player)

worlds/ror2/__init__.py

@@ -1,10 +1,11 @@
 import string
+from typing import Dict, List
 from .Items import RiskOfRainItem, item_table, item_pool_weights
-from .Locations import location_table, RiskOfRainLocation, base_location_table
+from .Locations import RiskOfRainLocation, item_pickups
 from .Rules import set_rules
 
 from BaseClasses import Region, RegionType, Entrance, Item, ItemClassification, MultiWorld, Tutorial
-from .Options import ror2_options
+from .Options import ror2_options, ItemWeights
 from worlds.AutoWorld import World, WebWorld
 
 client_version = 1
@@ -32,34 +33,31 @@ class RiskOfRainWorld(World):
     topology_present = False
 
     item_name_to_id = item_table
-    location_name_to_id = location_table
+    location_name_to_id = item_pickups
 
-    data_version = 3
+    data_version = 4
     forced_auto_forfeit = True
     web = RiskOfWeb()
+    total_revivals: int
 
-    def generate_basic(self):
+    def generate_early(self) -> None:
+        # figure out how many revivals should exist in the pool
+        self.total_revivals = int(self.world.total_revivals[self.player].value / 100 *
+                                  self.world.total_locations[self.player].value)
+
+    def generate_basic(self) -> None:
         # shortcut for starting_inventory... The start_with_revive option lets you start with a Dio's Best Friend
         if self.world.start_with_revive[self.player].value:
             self.world.push_precollected(self.world.create_item("Dio's Best Friend", self.player))
 
         # if presets are enabled generate junk_pool from the selected preset
         pool_option = self.world.item_weights[self.player].value
-        if self.world.item_pool_presets[self.player].value:
+        junk_pool: Dict[str, int] = {}
+        if self.world.item_pool_presets[self.player]:
             # generate chaos weights if the preset is chosen
-            if pool_option == 5:
-                junk_pool = {
-                    "Item Scrap, Green": self.world.random.randint(0, 80),
-                    "Item Scrap, Red": self.world.random.randint(0, 45),
-                    "Item Scrap, Yellow": self.world.random.randint(0, 30),
-                    "Item Scrap, White": self.world.random.randint(0, 100),
-                    "Common Item": self.world.random.randint(0, 100),
-                    "Uncommon Item": self.world.random.randint(0, 70),
-                    "Legendary Item": self.world.random.randint(0, 30),
-                    "Boss Item": self.world.random.randint(0, 20),
-                    "Lunar Item": self.world.random.randint(0, 60),
-                    "Equipment": self.world.random.randint(0, 40)
-                }
+            if pool_option == ItemWeights.option_chaos:
+                for name, max_value in item_pool_weights[pool_option].items():
+                    junk_pool[name] = self.world.random.randint(0, max_value)
             else:
                 junk_pool = item_pool_weights[pool_option].copy()
         else:  # generate junk pool from user created presets
@@ -77,37 +75,43 @@ class RiskOfRainWorld(World):
             }
 
         # remove lunar items from the pool if they're disabled in the yaml unless lunartic is rolled
-        if not self.world.enable_lunar[self.player]:
-            if not pool_option == 4:
-                junk_pool.pop("Lunar Item")
+        if not (self.world.enable_lunar[self.player] or pool_option == ItemWeights.option_lunartic):
+            junk_pool.pop("Lunar Item")
 
         # Generate item pool
-        itempool = []
-
+        itempool: List = []
         # Add revive items for the player
-        itempool += ["Dio's Best Friend"] * int(self.world.total_revivals[self.player] / 100 * self.world.total_locations[self.player])
+        itempool += ["Dio's Best Friend"] * self.total_revivals
 
         # Fill remaining items with randomly generated junk
         itempool += self.world.random.choices(list(junk_pool.keys()), weights=list(junk_pool.values()),
-                                              k=self.world.total_locations[self.player] -
-                                                int(self.world.total_revivals[self.player] / 100 * self.world.total_locations[self.player]))
+                                              k=self.world.total_locations[self.player].value - self.total_revivals)
 
         # Convert itempool into real items
         itempool = list(map(lambda name: self.create_item(name), itempool))
 
         self.world.itempool += itempool
 
-    def set_rules(self):
+    def set_rules(self) -> None:
         set_rules(self.world, self.player)
 
-    def create_regions(self):
-        create_regions(self.world, self.player)
-        create_events(self.world, self.player, int(self.world.total_locations[self.player]))
+    def create_regions(self) -> None:
+        menu = create_region(self.world, self.player, "Menu")
+        petrichor = create_region(self.world, self.player, "Petrichor V",
+                                  [f"ItemPickup{i + 1}" for i in range(self.world.total_locations[self.player].value)])
+
+        connection = Entrance(self.player, "Lobby", menu)
+        menu.exits.append(connection)
+        connection.connect(petrichor)
+
+        self.world.regions += [menu, petrichor]
+
+        create_events(self.world, self.player)
 
     def fill_slot_data(self):
         return {
             "itemPickupStep": self.world.item_pickup_step[self.player].value,
-            "seed": "".join(self.world.slot_seeds[self.player].choice(string.digits) for i in range(16)),
+            "seed": "".join(self.world.slot_seeds[self.player].choice(string.digits) for _ in range(16)),
             "totalLocations": self.world.total_locations[self.player].value,
             "totalRevivals": self.world.total_revivals[self.player].value,
             "startWithDio": self.world.start_with_revive[self.player].value,
@@ -116,49 +120,39 @@ class RiskOfRainWorld(World):
 
     def create_item(self, name: str) -> Item:
         item_id = item_table[name]
-        item = RiskOfRainItem(name, ItemClassification.filler, item_id, self.player)
         if name == "Dio's Best Friend":
-            item.classification = ItemClassification.progression
+            classification = ItemClassification.progression
         elif name in {"Equipment", "Legendary Item"}:
-            item.classification = ItemClassification.useful
+            classification = ItemClassification.useful
+        else:
+            classification = ItemClassification.filler
+        item = RiskOfRainItem(name, classification, item_id, self.player)
         return item
 
 
-def create_events(world: MultiWorld, player: int, total_locations: int):
+def create_events(world: MultiWorld, player: int) -> None:
+    total_locations = world.total_locations[player].value
     num_of_events = total_locations // 25
     if total_locations / 25 == num_of_events:
         num_of_events -= 1
+    world_region = world.get_region("Petrichor V", player)
+
     for i in range(num_of_events):
-        event_loc = RiskOfRainLocation(player, f"Pickup{(i + 1) * 25}", None, world.get_region('Petrichor V', player))
+        event_loc = RiskOfRainLocation(player, f"Pickup{(i + 1) * 25}", None, world_region)
         event_loc.place_locked_item(RiskOfRainItem(f"Pickup{(i + 1) * 25}", ItemClassification.progression, None, player))
         event_loc.access_rule(lambda state, i=i: state.can_reach(f"ItemPickup{((i + 1) * 25) - 1}", player))
-        world.get_region('Petrichor V', player).locations.append(event_loc)
+        world_region.locations.append(event_loc)
+
+    victory_event = RiskOfRainLocation(player, "Victory", None, world_region)
+    victory_event.place_locked_item(RiskOfRainItem("Victory", ItemClassification.progression, None, player))
+    world_region.locations.append(victory_event)
 
 
-# generate locations based on player setting
-def create_regions(world, player: int):
-    world.regions += [
-        create_region(world, player, 'Menu', None, ['Lobby']),
-        create_region(world, player, 'Petrichor V',
-                      [location for location in base_location_table] +
-                      [f"ItemPickup{i}" for i in range(1, 1 + world.total_locations[player])])
-    ]
-
-    world.get_entrance("Lobby", player).connect(world.get_region("Petrichor V", player))
-    world.get_location("Victory", player).place_locked_item(RiskOfRainItem("Victory", ItemClassification.progression,
-                                                                           None, player))
-
-
-def create_region(world: MultiWorld, player: int, name: str, locations=None, exits=None):
-    ret = Region(name, RegionType.Generic, name, player)
-    ret.world = world
+def create_region(world: MultiWorld, player: int, name: str, locations: List[str] = None) -> Region:
+    ret = Region(name, RegionType.Generic, name, player, world)
     if locations:
         for location in locations:
-            loc_id = location_table[location]
+            loc_id = item_pickups[location]
             location = RiskOfRainLocation(player, location, loc_id, ret)
             ret.locations.append(location)
-    if exits:
-        for exit in exits:
-            ret.exits.append(Entrance(player, exit, ret))
-
     return ret

worlds/ror2/docs/setup_en.md

@@ -29,7 +29,7 @@ You can see the [basic multiworld setup guide](/tutorial/Archipelago/setup/en) h
 about why Archipelago uses YAML files and what they're for.
 
 ### Where do I get a YAML?
-You can use the [game settings page for Hollow Knight](/games/Hollow%20Knight/player-settings) here on the Archipelago 
+You can use the [game settings page](/games/Risk%20of%20Rain%202/player-settings) here on the Archipelago 
 website to generate a YAML using a graphical interface.
 
 

worlds/sa2b/__init__.py

@@ -46,7 +46,7 @@ def check_for_impossible_shuffle(shuffled_levels: typing.List[int], gate_0_range
 
 class SA2BWorld(World):
     """
-    Sonic Adventure 2 Battle is an action platforming game. Play as Sonic, Tails, Knuckles, Shadow, Rogue, and Eggman across 31 stages and prevent the destruction of the earth.
+    Sonic Adventure 2 Battle is an action platforming game. Play as Sonic, Tails, Knuckles, Shadow, Rouge, and Eggman across 31 stages and prevent the destruction of the earth.
     """
     game: str = "Sonic Adventure 2 Battle"
     option_definitions = sa2b_options

worlds/sc2wol/Items.py

@@ -1,5 +1,6 @@
 from BaseClasses import Item, ItemClassification
 import typing
+from .MissionTables import vanilla_mission_req_table
 
 
 class ItemData(typing.NamedTuple):
@@ -49,27 +50,27 @@ item_table = {
 
     "Projectile Accelerator (Bunker)": ItemData(200 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 0),
     "Neosteel Bunker (Bunker)": ItemData(201 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 1),
-    "Titanium Housing (Missile Turret)": ItemData(202 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 2),
+    "Titanium Housing (Missile Turret)": ItemData(202 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 2, classification=ItemClassification.filler),
     "Hellstorm Batteries (Missile Turret)": ItemData(203 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 3),
     "Advanced Construction (SCV)": ItemData(204 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 4),
     "Dual-Fusion Welders (SCV)": ItemData(205 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 5),
-    "Fire-Suppression System (Building)": ItemData(206 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 6),
+    "Fire-Suppression System (Building)": ItemData(206 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 6, classification=ItemClassification.filler),
     "Orbital Command (Building)": ItemData(207 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 7),
     "Stimpack (Marine)": ItemData(208 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 8),
-    "Combat Shield (Marine)": ItemData(209 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 9),
-    "Advanced Medic Facilities (Medic)": ItemData(210 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 10),
-    "Stabilizer Medpacks (Medic)": ItemData(211 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 11),
+    "Combat Shield (Marine)": ItemData(209 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 9, classification=ItemClassification.progression),
+    "Advanced Medic Facilities (Medic)": ItemData(210 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 10, classification=ItemClassification.progression),
+    "Stabilizer Medpacks (Medic)": ItemData(211 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 11, classification=ItemClassification.progression),
     "Incinerator Gauntlets (Firebat)": ItemData(212 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 12, classification=ItemClassification.filler),
     "Juggernaut Plating (Firebat)": ItemData(213 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 13),
     "Concussive Shells (Marauder)": ItemData(214 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 14),
     "Kinetic Foam (Marauder)": ItemData(215 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 15),
     "U-238 Rounds (Reaper)": ItemData(216 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 16),
-    "G-4 Clusterbomb (Reaper)": ItemData(217 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 17, classification=ItemClassification.filler),
+    "G-4 Clusterbomb (Reaper)": ItemData(217 + SC2WOL_ITEM_ID_OFFSET, "Armory 1", 17, classification=ItemClassification.progression),
 
     "Twin-Linked Flamethrower (Hellion)": ItemData(300 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 0, classification=ItemClassification.filler),
     "Thermite Filaments (Hellion)": ItemData(301 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 1),
-    "Cerberus Mine (Vulture)": ItemData(302 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 2),
-    "Replenishable Magazine (Vulture)": ItemData(303 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 3),
+    "Cerberus Mine (Vulture)": ItemData(302 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 2, classification=ItemClassification.filler),
+    "Replenishable Magazine (Vulture)": ItemData(303 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 3, classification=ItemClassification.filler),
     "Multi-Lock Weapons System (Goliath)": ItemData(304 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 4),
     "Ares-Class Targeting System (Goliath)": ItemData(305 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 5),
     "Tri-Lithium Power Cell (Diamondback)": ItemData(306 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 6, classification=ItemClassification.filler),
@@ -77,9 +78,9 @@ item_table = {
     "Maelstrom Rounds (Siege Tank)": ItemData(308 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 8),
     "Shaped Blast (Siege Tank)": ItemData(309 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 9),
     "Rapid Deployment Tube (Medivac)": ItemData(310 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 10, classification=ItemClassification.filler),
-    "Advanced Healing AI (Medivac)": ItemData(311 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 11),
+    "Advanced Healing AI (Medivac)": ItemData(311 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 11, classification=ItemClassification.filler),
     "Tomahawk Power Cells (Wraith)": ItemData(312 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 12, classification=ItemClassification.filler),
-    "Displacement Field (Wraith)": ItemData(313 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 13),
+    "Displacement Field (Wraith)": ItemData(313 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 13, classification=ItemClassification.filler),
     "Ripwave Missiles (Viking)": ItemData(314 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 14),
     "Phobos-Class Weapons System (Viking)": ItemData(315 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 15),
     "Cross-Spectrum Dampeners (Banshee)": ItemData(316 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 16, classification=ItemClassification.filler),
@@ -88,7 +89,7 @@ item_table = {
     "Defensive Matrix (Battlecruiser)": ItemData(319 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 19, classification=ItemClassification.filler),
     "Ocular Implants (Ghost)": ItemData(320 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 20),
     "Crius Suit (Ghost)": ItemData(321 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 21),
-    "Psionic Lash (Spectre)": ItemData(322 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 22),
+    "Psionic Lash (Spectre)": ItemData(322 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 22, classification=ItemClassification.progression),
     "Nyx-Class Cloaking Module (Spectre)": ItemData(323 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 23),
     "330mm Barrage Cannon (Thor)": ItemData(324 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 24, classification=ItemClassification.filler),
     "Immortality Protocol (Thor)": ItemData(325 + SC2WOL_ITEM_ID_OFFSET, "Armory 2", 25, classification=ItemClassification.filler),
@@ -97,12 +98,12 @@ item_table = {
     "Missile Turret": ItemData(401 + SC2WOL_ITEM_ID_OFFSET, "Building", 1, classification=ItemClassification.progression),
     "Sensor Tower": ItemData(402 + SC2WOL_ITEM_ID_OFFSET, "Building", 2),
 
-    "War Pigs": ItemData(500 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 0),
+    "War Pigs": ItemData(500 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 0, classification=ItemClassification.progression),
     "Devil Dogs": ItemData(501 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 1, classification=ItemClassification.filler),
     "Hammer Securities": ItemData(502 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 2),
-    "Spartan Company": ItemData(503 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 3),
+    "Spartan Company": ItemData(503 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 3, classification=ItemClassification.progression),
     "Siege Breakers": ItemData(504 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 4),
-    "Hel's Angel": ItemData(505 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 5),
+    "Hel's Angel": ItemData(505 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 5, classification=ItemClassification.progression),
     "Dusk Wings": ItemData(506 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 6),
     "Jackson's Revenge": ItemData(507 + SC2WOL_ITEM_ID_OFFSET, "Mercenary", 7),
 
@@ -153,12 +154,7 @@ basic_unit: typing.Tuple[str, ...] = (
 item_name_groups = {}
 for item, data in item_table.items():
     item_name_groups.setdefault(data.type, []).append(item)
-item_name_groups["Missions"] = ["Beat Liberation Day", "Beat The Outlaws", "Beat Zero Hour", "Beat Evacuation",
-                         "None Outbreak", "Beat Safe Haven", "Beat Haven's Fall", "Beat Smash and Grab", "Beat The Dig",
-                         "Beat The Moebius Factor", "Beat Supernova", "Beat Maw of the Void", "Beat Devil's Playground",
-                         "Beat Welcome to the Jungle", "Beat Breakout", "Beat Ghost of a Chance",
-                         "Beat The Great Train Robbery", "Beat Cutthroat", "Beat Engine of Destruction",
-                         "Beat Media Blitz", "Beat Piercing the Shroud"]
+item_name_groups["Missions"] = ["Beat " + mission_name for mission_name in vanilla_mission_req_table]
 
 filler_items: typing.Tuple[str, ...] = (
     '+15 Starting Minerals',
@@ -167,3 +163,17 @@ filler_items: typing.Tuple[str, ...] = (
 
 lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in get_full_item_list().items() if
                                             data.code}
+# Map type to expected int
+type_flaggroups: typing.Dict[str, int] = {
+    "Unit": 0,
+    "Upgrade": 1,
+    "Armory 1": 2,
+    "Armory 2": 3,
+    "Building": 4,
+    "Mercenary": 5,
+    "Laboratory": 6,
+    "Protoss": 7,
+    "Minerals": 8,
+    "Vespene": 9,
+    "Supply": 10,
+}

worlds/sc2wol/Locations.py

@@ -44,7 +44,7 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
         LocationData("Zero Hour", "Beat Zero Hour", None,
                      lambda state: state._sc2wol_has_common_unit(world, player)),
         LocationData("Evacuation", "Evacuation: Victory", SC2WOL_LOC_ID_OFFSET + 400,
-                     lambda state: state._sc2wol_has_mobile_anti_air(world, player)),
+                     lambda state: state._sc2wol_has_anti_air(world, player)),
         LocationData("Evacuation", "Evacuation: First Chysalis", SC2WOL_LOC_ID_OFFSET + 401),
         LocationData("Evacuation", "Evacuation: Second Chysalis", SC2WOL_LOC_ID_OFFSET + 402,
                      lambda state: state._sc2wol_has_common_unit(world, player)),
@@ -52,7 +52,7 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
                      lambda state: state._sc2wol_has_common_unit(world, player)),
         LocationData("Evacuation", "Beat Evacuation", None,
                      lambda state: state._sc2wol_has_common_unit(world, player) and
-                                   state._sc2wol_has_mobile_anti_air(world, player)),
+                                   state._sc2wol_has_competent_anti_air(world, player)),
         LocationData("Outbreak", "Outbreak: Victory", SC2WOL_LOC_ID_OFFSET + 500,
                      lambda state: state._sc2wol_has_common_unit(world, player) or state.has("Reaper", player)),
         LocationData("Outbreak", "Outbreak: Left Infestor", SC2WOL_LOC_ID_OFFSET + 501,
@@ -63,19 +63,37 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
                      lambda state: state._sc2wol_has_common_unit(world, player) or state.has("Reaper", player)),
         LocationData("Safe Haven", "Safe Haven: Victory", SC2WOL_LOC_ID_OFFSET + 600,
                      lambda state: state._sc2wol_has_common_unit(world, player) and
-                                   state._sc2wol_has_mobile_anti_air(world, player)),
+                                   state._sc2wol_has_competent_anti_air(world, player)),
+        LocationData("Safe Haven", "Safe Haven: North Nexus", SC2WOL_LOC_ID_OFFSET + 601,
+                     lambda state: state._sc2wol_has_common_unit(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player)),
+        LocationData("Safe Haven", "Safe Haven: East Nexus", SC2WOL_LOC_ID_OFFSET + 602,
+                     lambda state: state._sc2wol_has_common_unit(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player)),
+        LocationData("Safe Haven", "Safe Haven: South Nexus", SC2WOL_LOC_ID_OFFSET + 603,
+                     lambda state: state._sc2wol_has_common_unit(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player)),
         LocationData("Safe Haven", "Beat Safe Haven", None,
                      lambda state: state._sc2wol_has_common_unit(world, player) and
-                                   state._sc2wol_has_mobile_anti_air(world, player)),
+                                   state._sc2wol_has_competent_anti_air(world, player)),
         LocationData("Haven's Fall", "Haven's Fall: Victory", SC2WOL_LOC_ID_OFFSET + 700,
                      lambda state: state._sc2wol_has_common_unit(world, player) and
-                                   state._sc2wol_has_mobile_anti_air(world, player)),
+                                   state._sc2wol_has_competent_anti_air(world, player)),
+        LocationData("Haven's Fall", "Haven's Fall: North Hive", SC2WOL_LOC_ID_OFFSET + 701,
+                     lambda state: state._sc2wol_has_common_unit(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player)),
+        LocationData("Haven's Fall", "Haven's Fall: East Hive", SC2WOL_LOC_ID_OFFSET + 702,
+                     lambda state: state._sc2wol_has_common_unit(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player)),
+        LocationData("Haven's Fall", "Haven's Fall: South Hive", SC2WOL_LOC_ID_OFFSET + 703,
+                     lambda state: state._sc2wol_has_common_unit(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player)),
         LocationData("Haven's Fall", "Beat Haven's Fall", None,
                      lambda state: state._sc2wol_has_common_unit(world, player) and
-                                   state._sc2wol_has_mobile_anti_air(world, player)),
+                                   state._sc2wol_has_competent_anti_air(world, player)),
         LocationData("Smash and Grab", "Smash and Grab: Victory", SC2WOL_LOC_ID_OFFSET + 800,
                      lambda state: state._sc2wol_has_common_unit(world, player) and
-                                   state._sc2wol_has_mobile_anti_air(world, player)),
+                                   state._sc2wol_has_competent_anti_air(world, player)),
         LocationData("Smash and Grab", "Smash and Grab: First Relic", SC2WOL_LOC_ID_OFFSET + 801),
         LocationData("Smash and Grab", "Smash and Grab: Second Relic", SC2WOL_LOC_ID_OFFSET + 802),
         LocationData("Smash and Grab", "Smash and Grab: Third Relic", SC2WOL_LOC_ID_OFFSET + 803,
@@ -101,11 +119,7 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
                                    state._sc2wol_has_anti_air(world, player) and
                                    state._sc2wol_has_heavy_defense(world, player)),
         LocationData("The Moebius Factor", "The Moebius Factor: Victory", SC2WOL_LOC_ID_OFFSET + 1000,
-                     lambda state: state._sc2wol_has_air(world, player)),
-        LocationData("The Moebius Factor", "The Moebius Factor: 1st Data Core ", SC2WOL_LOC_ID_OFFSET + 1001,
-                     lambda state: True),
-        LocationData("The Moebius Factor", "The Moebius Factor: 2nd Data Core", SC2WOL_LOC_ID_OFFSET + 1002,
-                     lambda state: state._sc2wol_has_air(world, player)),
+                     lambda state: state._sc2wol_has_air(world, player) and state._sc2wol_has_anti_air(world, player)),
         LocationData("The Moebius Factor", "The Moebius Factor: South Rescue", SC2WOL_LOC_ID_OFFSET + 1003,
                      lambda state: state._sc2wol_able_to_rescue(world, player)),
         LocationData("The Moebius Factor", "The Moebius Factor: Wall Rescue", SC2WOL_LOC_ID_OFFSET + 1004,
@@ -121,35 +135,49 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
         LocationData("The Moebius Factor", "Beat The Moebius Factor", None,
                      lambda state: state._sc2wol_has_air(world, player)),
         LocationData("Supernova", "Supernova: Victory", SC2WOL_LOC_ID_OFFSET + 1100,
-                     lambda state: state._sc2wol_has_common_unit(world, player)),
+                     lambda state: state._sc2wol_beats_protoss_deathball(world, player)),
         LocationData("Supernova", "Supernova: West Relic", SC2WOL_LOC_ID_OFFSET + 1101),
-        LocationData("Supernova", "Supernova: North Relic", SC2WOL_LOC_ID_OFFSET + 1102,
-                     lambda state: state._sc2wol_has_common_unit(world, player)),
+        LocationData("Supernova", "Supernova: North Relic", SC2WOL_LOC_ID_OFFSET + 1102),
         LocationData("Supernova", "Supernova: South Relic", SC2WOL_LOC_ID_OFFSET + 1103,
-                     lambda state: state._sc2wol_has_common_unit(world, player)),
+                     lambda state: state._sc2wol_beats_protoss_deathball(world, player)),
         LocationData("Supernova", "Supernova: East Relic", SC2WOL_LOC_ID_OFFSET + 1104,
-                     lambda state: state._sc2wol_has_common_unit(world, player)),
+                     lambda state: state._sc2wol_beats_protoss_deathball(world, player)),
         LocationData("Supernova", "Beat Supernova", None,
-                     lambda state: state._sc2wol_has_common_unit(world, player)),
+                     lambda state: state._sc2wol_beats_protoss_deathball(world, player)),
         LocationData("Maw of the Void", "Maw of the Void: Victory", SC2WOL_LOC_ID_OFFSET + 1200,
-                     lambda state: state.has('Battlecruiser', player) or state.has('Science Vessel', player) and
-                                   state._sc2wol_has_air(world, player)),
+                     lambda state: state.has('Battlecruiser', player) or
+                                   state._sc2wol_has_air(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player) and
+                                   state.has('Science Vessel', player)),
         LocationData("Maw of the Void", "Maw of the Void: Landing Zone Cleared", SC2WOL_LOC_ID_OFFSET + 1201),
-        LocationData("Maw of the Void", "Maw of the Void: Expansion Prisoners", SC2WOL_LOC_ID_OFFSET + 1202),
+        LocationData("Maw of the Void", "Maw of the Void: Expansion Prisoners", SC2WOL_LOC_ID_OFFSET + 1202,
+                     lambda state: state.has('Battlecruiser', player) or
+                                   state._sc2wol_has_air(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player) and
+                                   state.has('Science Vessel', player)),
         LocationData("Maw of the Void", "Maw of the Void: South Close Prisoners", SC2WOL_LOC_ID_OFFSET + 1203,
-                     lambda state: state.has('Battlecruiser', player) or state.has('Science Vessel', player) and
-                                   state._sc2wol_has_air(world, player)),
+                     lambda state: state.has('Battlecruiser', player) or
+                                   state._sc2wol_has_air(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player) and
+                                   state.has('Science Vessel', player)),
         LocationData("Maw of the Void", "Maw of the Void: South Far Prisoners", SC2WOL_LOC_ID_OFFSET + 1204,
-                     lambda state: state.has('Battlecruiser', player) or state.has('Science Vessel', player) and
-                                   state._sc2wol_has_air(world, player)),
+                     lambda state: state.has('Battlecruiser', player) or
+                                   state._sc2wol_has_air(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player) and
+                                   state.has('Science Vessel', player)),
         LocationData("Maw of the Void", "Maw of the Void: North Prisoners", SC2WOL_LOC_ID_OFFSET + 1205,
-                     lambda state: state.has('Battlecruiser', player) or state.has('Science Vessel', player) and
-                                   state._sc2wol_has_air(world, player)),
+                     lambda state: state.has('Battlecruiser', player) or
+                                   state._sc2wol_has_air(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player) and
+                                   state.has('Science Vessel', player)),
         LocationData("Maw of the Void", "Beat Maw of the Void", None,
-                     lambda state: state.has('Battlecruiser', player) or state.has('Science Vessel', player) and
-                                   state._sc2wol_has_air(world, player)),
+                     lambda state: state.has('Battlecruiser', player) or
+                                   state._sc2wol_has_air(world, player) and
+                                   state._sc2wol_has_competent_anti_air(world, player) and
+                                   state.has('Science Vessel', player)),
         LocationData("Devil's Playground", "Devil's Playground: Victory", SC2WOL_LOC_ID_OFFSET + 1300,
-                     lambda state: state._sc2wol_has_common_unit(world, player) or state.has("Reaper", player)),
+                     lambda state: state._sc2wol_has_anti_air(world, player) and (
+                             state._sc2wol_has_common_unit(world, player) or state.has("Reaper", player))),
         LocationData("Devil's Playground", "Devil's Playground: Tosh's Miners", SC2WOL_LOC_ID_OFFSET + 1301),
         LocationData("Devil's Playground", "Devil's Playground: Brutalisk", SC2WOL_LOC_ID_OFFSET + 1302,
                      lambda state: state._sc2wol_has_common_unit(world, player) or state.has("Reaper", player)),
@@ -157,17 +185,17 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
                      lambda state: state._sc2wol_has_common_unit(world, player) or state.has("Reaper", player)),
         LocationData("Welcome to the Jungle", "Welcome to the Jungle: Victory", SC2WOL_LOC_ID_OFFSET + 1400,
                      lambda state: state._sc2wol_has_common_unit(world, player) and
-                                   state._sc2wol_has_mobile_anti_air(world, player)),
+                                   state._sc2wol_has_competent_anti_air(world, player)),
         LocationData("Welcome to the Jungle", "Welcome to the Jungle: Close Relic", SC2WOL_LOC_ID_OFFSET + 1401),
         LocationData("Welcome to the Jungle", "Welcome to the Jungle: West Relic", SC2WOL_LOC_ID_OFFSET + 1402,
                      lambda state: state._sc2wol_has_common_unit(world, player) and
-                                   state._sc2wol_has_mobile_anti_air(world, player)),
+                                   state._sc2wol_has_competent_anti_air(world, player)),
         LocationData("Welcome to the Jungle", "Welcome to the Jungle: North-East Relic", SC2WOL_LOC_ID_OFFSET + 1403,
                      lambda state: state._sc2wol_has_common_unit(world, player) and
-                                   state._sc2wol_has_mobile_anti_air(world, player)),
+                                   state._sc2wol_has_competent_anti_air(world, player)),
         LocationData("Welcome to the Jungle", "Beat Welcome to the Jungle", None,
                      lambda state: state._sc2wol_has_common_unit(world, player) and
-                                   state._sc2wol_has_mobile_anti_air(world, player)),
+                                   state._sc2wol_has_competent_anti_air(world, player)),
         LocationData("Breakout", "Breakout: Victory", SC2WOL_LOC_ID_OFFSET + 1500),
         LocationData("Breakout", "Breakout: Diamondback Prison", SC2WOL_LOC_ID_OFFSET + 1501),
         LocationData("Breakout", "Breakout: Siegetank Prison", SC2WOL_LOC_ID_OFFSET + 1502),
@@ -180,7 +208,8 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
         LocationData("Ghost of a Chance", "Ghost of a Chance: Third Island Spectres", SC2WOL_LOC_ID_OFFSET + 1605),
         LocationData("Ghost of a Chance", "Beat Ghost of a Chance", None),
         LocationData("The Great Train Robbery", "The Great Train Robbery: Victory", SC2WOL_LOC_ID_OFFSET + 1700,
-                     lambda state: state._sc2wol_has_train_killers(world, player)),
+                     lambda state: state._sc2wol_has_train_killers(world, player) and
+                                   state._sc2wol_has_anti_air(world, player)),
         LocationData("The Great Train Robbery", "The Great Train Robbery: North Defiler", SC2WOL_LOC_ID_OFFSET + 1701),
         LocationData("The Great Train Robbery", "The Great Train Robbery: Mid Defiler", SC2WOL_LOC_ID_OFFSET + 1702),
         LocationData("The Great Train Robbery", "The Great Train Robbery: South Defiler", SC2WOL_LOC_ID_OFFSET + 1703),
@@ -198,20 +227,20 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
         LocationData("Cutthroat", "Beat Cutthroat", None,
                      lambda state: state._sc2wol_has_common_unit(world, player)),
         LocationData("Engine of Destruction", "Engine of Destruction: Victory", SC2WOL_LOC_ID_OFFSET + 1900,
-                     lambda state: state._sc2wol_has_mobile_anti_air(world, player)),
+                     lambda state: state._sc2wol_has_competent_anti_air(world, player)),
         LocationData("Engine of Destruction", "Engine of Destruction: Odin", SC2WOL_LOC_ID_OFFSET + 1901),
         LocationData("Engine of Destruction", "Engine of Destruction: Loki", SC2WOL_LOC_ID_OFFSET + 1902,
-                     lambda state: state._sc2wol_has_mobile_anti_air(world, player) and
+                     lambda state: state._sc2wol_has_competent_anti_air(world, player) and
                                    state._sc2wol_has_common_unit(world, player) or state.has('Wraith', player)),
         LocationData("Engine of Destruction", "Engine of Destruction: Lab Devourer", SC2WOL_LOC_ID_OFFSET + 1903),
         LocationData("Engine of Destruction", "Engine of Destruction: North Devourer", SC2WOL_LOC_ID_OFFSET + 1904,
-                     lambda state: state._sc2wol_has_mobile_anti_air(world, player) and
+                     lambda state: state._sc2wol_has_competent_anti_air(world, player) and
                                    state._sc2wol_has_common_unit(world, player) or state.has('Wraith', player)),
         LocationData("Engine of Destruction", "Engine of Destruction: Southeast Devourer", SC2WOL_LOC_ID_OFFSET + 1905,
-                     lambda state: state._sc2wol_has_mobile_anti_air(world, player) and
+                     lambda state: state._sc2wol_has_competent_anti_air(world, player) and
                                    state._sc2wol_has_common_unit(world, player) or state.has('Wraith', player)),
         LocationData("Engine of Destruction", "Beat Engine of Destruction", None,
-                     lambda state: state._sc2wol_has_mobile_anti_air(world, player) and
+                     lambda state: state._sc2wol_has_competent_anti_air(world, player) and
                                    state._sc2wol_has_common_unit(world, player) or state.has('Wraith', player)),
         LocationData("Media Blitz", "Media Blitz: Victory", SC2WOL_LOC_ID_OFFSET + 2000,
                      lambda state: state._sc2wol_has_competent_comp(world, player)),
@@ -224,13 +253,19 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
         LocationData("Media Blitz", "Media Blitz: Science Facility", SC2WOL_LOC_ID_OFFSET + 2004),
         LocationData("Media Blitz", "Beat Media Blitz", None,
                      lambda state: state._sc2wol_has_competent_comp(world, player)),
-        LocationData("Piercing the Shroud", "Piercing the Shroud: Victory", SC2WOL_LOC_ID_OFFSET + 2100),
+        LocationData("Piercing the Shroud", "Piercing the Shroud: Victory", SC2WOL_LOC_ID_OFFSET + 2100,
+                     lambda state: state.has_any({'Combat Shield (Marine)', 'Stabilizer Medpacks (Medic)'}, player)),
         LocationData("Piercing the Shroud", "Piercing the Shroud: Holding Cell Relic", SC2WOL_LOC_ID_OFFSET + 2101),
-        LocationData("Piercing the Shroud", "Piercing the Shroud: Brutalisk Relic", SC2WOL_LOC_ID_OFFSET + 2102),
-        LocationData("Piercing the Shroud", "Piercing the Shroud: First Escape Relic", SC2WOL_LOC_ID_OFFSET + 2103),
-        LocationData("Piercing the Shroud", "Piercing the Shroud: Second Escape Relic", SC2WOL_LOC_ID_OFFSET + 2104),
-        LocationData("Piercing the Shroud", "Piercing the Shroud: Brutalisk ", SC2WOL_LOC_ID_OFFSET + 2105),
-        LocationData("Piercing the Shroud", "Beat Piercing the Shroud", None),
+        LocationData("Piercing the Shroud", "Piercing the Shroud: Brutalisk Relic", SC2WOL_LOC_ID_OFFSET + 2102,
+                     lambda state: state.has_any({'Combat Shield (Marine)', 'Stabilizer Medpacks (Medic)'}, player)),
+        LocationData("Piercing the Shroud", "Piercing the Shroud: First Escape Relic", SC2WOL_LOC_ID_OFFSET + 2103,
+                     lambda state: state.has_any({'Combat Shield (Marine)', 'Stabilizer Medpacks (Medic)'}, player)),
+        LocationData("Piercing the Shroud", "Piercing the Shroud: Second Escape Relic", SC2WOL_LOC_ID_OFFSET + 2104,
+                     lambda state: state.has_any({'Combat Shield (Marine)', 'Stabilizer Medpacks (Medic)'}, player)),
+        LocationData("Piercing the Shroud", "Piercing the Shroud: Brutalisk ", SC2WOL_LOC_ID_OFFSET + 2105,
+                     lambda state: state.has_any({'Combat Shield (Marine)', 'Stabilizer Medpacks (Medic)'}, player)),
+        LocationData("Piercing the Shroud", "Beat Piercing the Shroud", None,
+                     lambda state: state.has_any({'Combat Shield (Marine)', 'Stabilizer Medpacks (Medic)'}, player)),
         LocationData("Whispers of Doom", "Whispers of Doom: Victory", SC2WOL_LOC_ID_OFFSET + 2200),
         LocationData("Whispers of Doom", "Whispers of Doom: First Hatchery", SC2WOL_LOC_ID_OFFSET + 2201),
         LocationData("Whispers of Doom", "Whispers of Doom: Second Hatchery", SC2WOL_LOC_ID_OFFSET + 2202),
@@ -251,13 +286,12 @@ def get_locations(world: Optional[MultiWorld], player: Optional[int]) -> Tuple[L
                      lambda state: state._sc2wol_has_protoss_common_units(world, player)),
         LocationData("Echoes of the Future", "Beat Echoes of the Future", None,
                      lambda state: state._sc2wol_has_protoss_medium_units(world, player)),
-        LocationData("In Utter Darkness", "In Utter Darkness: Defeat", SC2WOL_LOC_ID_OFFSET + 2500,
-                     lambda state: state._sc2wol_has_protoss_medium_units(world, player)),
+        LocationData("In Utter Darkness", "In Utter Darkness: Defeat", SC2WOL_LOC_ID_OFFSET + 2500),
         LocationData("In Utter Darkness", "In Utter Darkness: Protoss Archive", SC2WOL_LOC_ID_OFFSET + 2501,
                      lambda state: state._sc2wol_has_protoss_medium_units(world, player)),
-        LocationData("In Utter Darkness", "In Utter Darkness: Kills", SC2WOL_LOC_ID_OFFSET + 2502),
-        LocationData("In Utter Darkness", "Beat In Utter Darkness", None,
-                     lambda state: state._sc2wol_has_protoss_medium_units(world, player)),
+        LocationData("In Utter Darkness", "In Utter Darkness: Kills", SC2WOL_LOC_ID_OFFSET + 2502,
+                     lambda state: state._sc2wol_has_protoss_common_units(world, player)),
+        LocationData("In Utter Darkness", "Beat In Utter Darkness", None),
         LocationData("Gates of Hell", "Gates of Hell: Victory", SC2WOL_LOC_ID_OFFSET + 2600,
                      lambda state: state._sc2wol_has_competent_comp(world, player)),
         LocationData("Gates of Hell", "Gates of Hell: Large Army", SC2WOL_LOC_ID_OFFSET + 2601,

worlds/sc2wol/LogicMixin.py

@@ -10,16 +10,17 @@ class SC2WoLLogic(LogicMixin):
         return self.has_any({'Marine', 'Marauder'}, player)
 
     def _sc2wol_has_air(self, world: MultiWorld, player: int) -> bool:
-        return self.has_any({'Viking', 'Wraith', 'Medivac', 'Banshee', 'Hercules'}, player)
+        return self.has_any({'Viking', 'Wraith', 'Banshee'}, player) or \
+               self.has_any({'Hercules', 'Medivac'}, player) and self._sc2wol_has_common_unit(world, player)
 
     def _sc2wol_has_air_anti_air(self, world: MultiWorld, player: int) -> bool:
         return self.has_any({'Viking', 'Wraith'}, player)
 
-    def _sc2wol_has_mobile_anti_air(self, world: MultiWorld, player: int) -> bool:
+    def _sc2wol_has_competent_anti_air(self, world: MultiWorld, player: int) -> bool:
         return self.has_any({'Marine', 'Goliath'}, player) or self._sc2wol_has_air_anti_air(world, player)
 
     def _sc2wol_has_anti_air(self, world: MultiWorld, player: int) -> bool:
-        return self.has('Missile Turret', player) or self._sc2wol_has_mobile_anti_air(world, player)
+        return self.has_any({'Missile Turret', 'Thor', 'War Pigs', 'Spartan Company', "Hel's Angel", 'Battlecruiser'}, player) or self._sc2wol_has_competent_anti_air(world, player)
 
     def _sc2wol_has_heavy_defense(self, world: MultiWorld, player: int) -> bool:
         return (self.has_any({'Siege Tank', 'Vulture'}, player) or
@@ -28,13 +29,15 @@ class SC2WoLLogic(LogicMixin):
 
     def _sc2wol_has_competent_comp(self, world: MultiWorld, player: int) -> bool:
         return (self.has('Marine', player) or self.has('Marauder', player) and
-                self._sc2wol_has_mobile_anti_air(world, player)) and self.has_any({'Medivac', 'Medic'}, player) or \
-               self.has('Thor', player) or self.has("Banshee", player) and self._sc2wol_has_mobile_anti_air(world, player) or \
-               self.has('Battlecruiser', player) and self._sc2wol_has_common_unit(world, player)
+                self._sc2wol_has_competent_anti_air(world, player)) and self.has_any({'Medivac', 'Medic'}, player) or \
+               self.has('Thor', player) or self.has("Banshee", player) and self._sc2wol_has_competent_anti_air(world, player) or \
+               self.has('Battlecruiser', player) and self._sc2wol_has_common_unit(world, player) or \
+               self.has('Siege Tank', player) and self._sc2wol_has_competent_anti_air(world, player)
 
     def _sc2wol_has_train_killers(self, world: MultiWorld, player: int) -> bool:
         return (self.has_any({'Siege Tank', 'Diamondback'}, player) or
-                self.has_all({'Reaper', "G-4 Clusterbomb"}, player) or self.has_all({'Spectre', 'Psionic Lash'}, player))
+                self.has_all({'Reaper', "G-4 Clusterbomb"}, player) or self.has_all({'Spectre', 'Psionic Lash'}, player)
+                or self.has('Marauders', player))
 
     def _sc2wol_able_to_rescue(self, world: MultiWorld, player: int) -> bool:
         return self.has_any({'Medivac', 'Hercules', 'Raven', 'Viking'}, player)
@@ -46,6 +49,10 @@ class SC2WoLLogic(LogicMixin):
         return self._sc2wol_has_protoss_common_units(world, player) and \
                self.has_any({'Stalker', 'Void Ray', 'Phoenix', 'Carrier'}, player)
 
+    def _sc2wol_beats_protoss_deathball(self, world: MultiWorld, player: int) -> bool:
+        return self.has_any({'Banshee', 'Battlecruiser'}, player) and self._sc2wol_has_competent_anti_air or \
+               self._sc2wol_has_competent_comp(world, player) and self._sc2wol_has_air_anti_air(world, player)
+
     def _sc2wol_cleared_missions(self, world: MultiWorld, player: int, mission_count: int) -> bool:
         return self.has_group("Missions", player, mission_count)
 

worlds/sc2wol/MissionTables.py

@@ -69,8 +69,8 @@ vanilla_mission_req_table = {
     "Zero Hour": MissionInfo(3, 4, [2], "Mar Sara", completion_critical=True),
     "Evacuation": MissionInfo(4, 4, [3], "Colonist"),
     "Outbreak": MissionInfo(5, 3, [4], "Colonist"),
-    "Safe Haven": MissionInfo(6, 1, [5], "Colonist", number=7),
-    "Haven's Fall": MissionInfo(7, 1, [5], "Colonist", number=7),
+    "Safe Haven": MissionInfo(6, 4, [5], "Colonist", number=7),
+    "Haven's Fall": MissionInfo(7, 4, [5], "Colonist", number=7),
     "Smash and Grab": MissionInfo(8, 5, [3], "Artifact", completion_critical=True),
     "The Dig": MissionInfo(9, 4, [8], "Artifact", number=8, completion_critical=True),
     "The Moebius Factor": MissionInfo(10, 9, [9], "Artifact", number=11, completion_critical=True),

worlds/sc2wol/Regions.py

@@ -200,7 +200,10 @@ def create_regions(world: MultiWorld, player: int, locations: Tuple[LocationData
                     connect(world, player, names, "Menu", missions[i])
                 else:
                     connect(world, player, names, missions[connection], missions[i],
-                            (lambda name: (lambda state: state.has(f"Beat {name}", player)))(missions[connection]))
+                            (lambda name, missions_req: (lambda state: state.has(f"Beat {name}", player) and
+                                                                       state._sc2wol_cleared_missions(world, player,
+                                                                                                      missions_req)))
+                            (missions[connection], vanilla_shuffle_order[i].number))
                     connections.append(connection + 1)
 
             mission_req_table.update({missions[i]: MissionInfo(

worlds/sc2wol/__init__.py

@@ -33,7 +33,7 @@ class SC2WoLWorld(World):
 
     game = "Starcraft 2 Wings of Liberty"
     web = Starcraft2WoLWebWorld()
-    data_version = 2
+    data_version = 3
 
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = {location.name: location.code for location in get_locations(None, None)}
@@ -43,6 +43,7 @@ class SC2WoLWorld(World):
     locked_locations: typing.List[str]
     location_cache: typing.List[Location]
     mission_req_table = {}
+    required_client_version = 0, 3, 5
 
     def __init__(self, world: MultiWorld, player: int):
         super(SC2WoLWorld, self).__init__(world, player)

worlds/sm/Items.py

@@ -1,14 +0,0 @@
-from worlds.sm.variaRandomizer.rando.Items import ItemManager
-
-items_start_id = 83000
-
-def gen_special_id():
-    special_id_value_start = 32
-    while True:
-        yield special_id_value_start
-        special_id_value_start += 1
-
-gen_run = gen_special_id()
-
-lookup_id_to_name = dict((items_start_id + (value.Id if value.Id != None else next(gen_run)), value.Name) for key, value in ItemManager.Items.items())
-lookup_name_to_id = {item_name: item_id for item_id, item_name in lookup_id_to_name.items()}

worlds/sm/Locations.py

@@ -1,14 +0,0 @@
-from worlds.sm.variaRandomizer.graph.location import locationsDict
-
-locations_start_id = 82000
-
-def gen_boss_id():
-    boss_id_value_start = 256
-    while True:
-        yield boss_id_value_start
-        boss_id_value_start += 1
-
-gen_run = gen_boss_id()
-
-lookup_id_to_name = dict((locations_start_id + (value.Id if value.Id != None else next(gen_run)), key) for key, value in locationsDict.items())
-lookup_name_to_id = {location_name: location_id for location_id, location_name in lookup_id_to_name.items()}

worlds/sm/__init__.py

@@ -11,8 +11,6 @@ from worlds.sm.variaRandomizer.graph.graph_utils import GraphUtils
 
 logger = logging.getLogger("Super Metroid")
 
-from .Locations import lookup_name_to_id as locations_lookup_name_to_id
-from .Items import lookup_name_to_id as items_lookup_name_to_id
 from .Regions import create_regions
 from .Rules import set_rules, add_entrance_rule
 from .Options import sm_options
@@ -68,6 +66,8 @@ class SMWeb(WebWorld):
         ["Farrak Kilhn"]
     )]
 
+locations_start_id = 82000
+items_start_id = 83000
 
 class SMWorld(World):
     """
@@ -78,12 +78,11 @@ class SMWorld(World):
 
     game: str = "Super Metroid"
     topology_present = True
-    data_version = 1
+    data_version = 2
     option_definitions = sm_options
-    item_names: Set[str] = frozenset(items_lookup_name_to_id)
-    location_names: Set[str] = frozenset(locations_lookup_name_to_id)
-    item_name_to_id = items_lookup_name_to_id
-    location_name_to_id = locations_lookup_name_to_id
+
+    item_name_to_id = {value.Name: items_start_id + value.Id for key, value in ItemManager.Items.items() if value.Id != None}
+    location_name_to_id = {key: locations_start_id + value.Id for key, value in locationsDict.items() if value.Id != None}
     web = SMWeb()
 
     remote_items: bool = False
@@ -701,8 +700,8 @@ class SMWorld(World):
                                                             dest.Name) for src, dest in self.variaRando.randoExec.areaGraph.InterAreaTransitions if src.Boss]))
 
 def create_locations(self, player: int):
-    for name, id in locations_lookup_name_to_id.items():
-        self.locations[name] = SMLocation(player, name, id)
+    for name in locationsDict:
+        self.locations[name] = SMLocation(player, name, self.location_name_to_id.get(name, None))
 
 
 def create_region(self, world: MultiWorld, player: int, name: str, locations=None, exits=None):

worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym

@@ -2,14 +2,14 @@
 ; generated by asar
 
 [labels]
-B8:8026 :neg_1_1
+B8:83C1 :neg_1_1
 85:B9B4 :neg_1_2
 85:B9E6 :neg_1_3
 B8:C81F :neg_1_4
 B8:C831 :neg_1_5
 B8:C843 :neg_1_6
-B8:800C :pos_1_0
-B8:81DE :pos_1_1
+B8:830C :pos_1_0
+B8:85D7 :pos_1_1
 84:FA6B :pos_1_2
 84:FA75 :pos_1_3
 B8:C862 :pos_1_4
@@ -20,7 +20,7 @@ B8:C87C :pos_1_6
 85:990F CLIPLEN_end
 85:990C CLIPLEN_no_multi
 85:FF1D CLIPSET
-B8:80EF COLLECTTANK
+B8:84E8 COLLECTTANK
 85:FF45 MISCFX
 84:8BF2 NORMAL
 85:FF4E SETFX
@@ -38,6 +38,11 @@ CE:FF00 config_multiworld
 CE:FF08 config_player_id
 CE:FF06 config_remote_items
 CE:FF02 config_sprite
+B8:8419 copy_config_to_sram
+B8:83FD copy_memory
+B8:8417 copy_memory_done
+B8:8409 copy_memory_even
+B8:840F copy_memory_loop
 84:F894 h_item
 84:F8AD i_chozo_item
 84:F8B4 i_hidden_item
@@ -46,11 +51,11 @@ B8:885C i_item_setup_shared
 B8:8878 i_item_setup_shared_all_items
 B8:8883 i_item_setup_shared_alwaysloaded
 84:FA79 i_live_pickup
-B8:817F i_live_pickup_multiworld
-B8:81C4 i_live_pickup_multiworld_end
-B8:819B i_live_pickup_multiworld_local_item_or_offworld
-B8:81B0 i_live_pickup_multiworld_own_item
-B8:81BC i_live_pickup_multiworld_own_item1
+B8:8578 i_live_pickup_multiworld
+B8:85BD i_live_pickup_multiworld_end
+B8:8594 i_live_pickup_multiworld_local_item_or_offworld
+B8:85A9 i_live_pickup_multiworld_own_item
+B8:85B5 i_live_pickup_multiworld_own_item1
 84:FA1E i_load_custom_graphics
 84:FA39 i_load_custom_graphics_all_items
 84:FA49 i_load_custom_graphics_alwaysloaded
@@ -85,22 +90,27 @@ B8:81BC i_live_pickup_multiworld_own_item1
 85:B9CA message_write_placeholders_loop
 85:B9DC message_write_placeholders_notfound
 85:B9DF message_write_placeholders_value_ok
-B8:8092 mw_display_item_sent
-B8:80FF mw_handle_queue
-B8:8178 mw_handle_queue_end
-B8:8101 mw_handle_queue_loop
-B8:8151 mw_handle_queue_new_remote_item
-B8:816D mw_handle_queue_next
-B8:8163 mw_handle_queue_perform_receive
-B8:81C8 mw_hook_main_game
-B8:8011 mw_init
-B8:8044 mw_init_end
-B8:8000 mw_init_memory
-B8:8083 mw_load_sram
-B8:80B0 mw_receive_item
-B8:80E8 mw_receive_item_end
-B8:8070 mw_save_sram
-B8:8049 mw_write_message
+B8:848B mw_display_item_sent
+B8:84F8 mw_handle_queue
+B8:8571 mw_handle_queue_end
+B8:84FA mw_handle_queue_loop
+B8:854A mw_handle_queue_new_remote_item
+B8:8566 mw_handle_queue_next
+B8:855C mw_handle_queue_perform_receive
+B8:85C1 mw_hook_main_game
+B8:8311 mw_init
+B8:8366 mw_init_continuereset
+B8:83EA mw_init_end
+B8:8300 mw_init_memory
+B8:833B mw_init_reset_sram
+B8:8351 mw_init_smstringdata
+B8:8474 mw_load_sram
+B8:8482 mw_load_sram_done
+B8:8485 mw_load_sram_setnewgame
+B8:84A9 mw_receive_item
+B8:84E1 mw_receive_item_end
+B8:8469 mw_save_sram
+B8:8442 mw_write_message
 84:F888 nonprog_item_eight_palette_indices
 89:9200 offworld_graphics_data_item
 89:9100 offworld_graphics_data_progression_item
@@ -125,7 +135,7 @@ B8:8049 mw_write_message
 84:F96E p_visible_item_end
 84:F95B p_visible_item_loop
 84:F967 p_visible_item_trigger
-B8:81DF patch_load_multiworld
+B8:85D8 patch_load_multiworld
 84:FA7E perform_item_pickup
 84:F886 plm_graphics_entry_offworld_item
 84:F87C plm_graphics_entry_offworld_progression_item
@@ -144,17 +154,19 @@ B8:C808 start_item_data_minor
 B8:C818 start_item_data_reserve
 B8:C856 update_graphic
 84:F890 v_item
+B8:83EF write_repeated_memory
+B8:83F4 write_repeated_memory_loop
 
 [source files]
-0000 e25029c5 main.asm
+0000 f30c3fdc main.asm
 0001 06780555 ../common/nofanfare.asm
-0002 e76d1f83 ../common/multiworld.asm
-0003 613d24e1 ../common/itemextras.asm
+0002 4f9a780e ../common/multiworld.asm
+0003 f7e9db95 ../common/itemextras.asm
 0004 d6616c0c ../common/items.asm
-0005 440b54fe ../common/startitem.asm
+0005 dbfcb38d ../common/startitem.asm
 
 [rom checksum]
-09b134c5
+b526d5c7
 
 [addr-to-line mapping]
 ff:ffff 0000:00000001
@@ -204,330 +216,423 @@ ff:ffff 0000:00000001
 84:8bf2 0001:00000152
 84:8bf6 0001:00000153
 84:8bf7 0001:00000153
-b8:8000 0002:00000019
-b8:8002 0002:0000001a
-b8:8006 0002:0000001b
-b8:8008 0002:0000001c
-b8:800c 0002:00000020
-b8:800e 0002:00000021
-b8:8010 0002:00000022
-b8:8011 0002:00000025
-b8:8012 0002:00000025
-b8:8013 0002:00000025
-b8:8014 0002:00000025
-b8:8015 0000:00000013
-b8:8017 0002:00000029
-b8:801b 0002:0000002a
-b8:801e 0002:0000002b
-b8:8020 0002:0000002d
-b8:8023 0002:0000002e
-b8:8026 0002:00000031
-b8:802a 0002:00000032
-b8:802e 0002:00000033
-b8:8032 0002:00000034
-b8:8036 0002:00000035
-b8:8037 0002:00000035
-b8:8038 0002:00000036
-b8:803b 0002:00000037
-b8:803d 0002:00000039
-b8:8040 0002:0000003a
-b8:8044 0002:0000003d
-b8:8045 0002:0000003d
-b8:8046 0002:0000003d
-b8:8047 0002:0000003d
-b8:8048 0002:0000003e
-b8:8049 0002:00000043
-b8:804a 0002:00000043
-b8:804b 0002:00000044
-b8:804c 0002:00000044
-b8:804d 0002:00000045
-b8:8051 0002:00000046
-b8:8054 0002:00000046
-b8:8055 0002:00000047
-b8:8056 0002:00000048
-b8:805a 0002:00000049
-b8:805b 0002:0000004a
-b8:805f 0002:0000004b
-b8:8060 0002:0000004c
-b8:8064 0002:0000004e
-b8:8068 0002:0000004f
-b8:8069 0002:00000050
-b8:806d 0002:00000051
-b8:806e 0002:00000051
-b8:806f 0002:00000052
-b8:8070 0002:00000055
-b8:8071 0002:00000055
-b8:8072 0000:00000013
-b8:8074 0002:00000057
-b8:8078 0002:00000058
-b8:807c 0002:00000059
-b8:807d 0002:00000059
-b8:807e 0002:0000005b
-b8:807f 0002:0000005c
-b8:8082 0002:0000005d
-b8:8083 0002:00000060
-b8:8084 0002:00000060
-b8:8085 0000:00000013
-b8:8087 0002:00000062
-b8:808b 0002:00000063
-b8:808f 0002:00000064
-b8:8090 0002:00000064
-b8:8091 0002:00000065
-b8:8092 0002:0000006a
-b8:8094 0002:0000006b
-b8:8096 0002:0000006e
-b8:8099 0002:0000006f
-b8:809b 0002:00000070
-b8:809e 0002:00000071
-b8:80a0 0002:00000072
-b8:80a3 0002:00000073
-b8:80a7 0002:00000074
-b8:80a9 0002:00000075
-b8:80ab 0002:00000076
-b8:80ad 0002:00000077
-b8:80af 0002:00000078
-b8:80b0 0002:0000007c
-b8:80b1 0002:0000007c
-b8:80b2 0002:0000007d
-b8:80b5 0002:0000007e
-b8:80b7 0002:0000007f
-b8:80ba 0002:00000080
-b8:80bc 0002:00000081
-b8:80bd 0002:00000082
-b8:80be 0002:00000084
-b8:80c1 0002:00000085
-b8:80c3 0002:00000086
-b8:80c6 0002:00000087
-b8:80c7 0002:00000088
-b8:80ca 0002:00000089
-b8:80cb 0002:00000089
-b8:80cc 0002:0000008a
-b8:80d0 0002:0000008b
-b8:80d1 0002:0000008c
-b8:80d4 0002:0000008d
-b8:80d8 0002:0000008e
-b8:80da 0002:00000090
-b8:80dd 0002:00000091
-b8:80df 0002:00000092
-b8:80e2 0002:00000093
-b8:80e4 0002:00000095
-b8:80e8 0002:00000097
-b8:80ea 0002:00000098
-b8:80ec 0002:00000099
-b8:80ed 0002:00000099
-b8:80ee 0002:0000009a
-b8:80ef 0002:000000a5
-b8:80f0 0002:000000a6
-b8:80f4 0002:000000a7
-b8:80f5 0002:000000a8
-b8:80f9 0002:000000a9
-b8:80fa 0002:000000ab
-b8:80fe 0002:000000ac
-b8:80ff 0002:000000de
-b8:8100 0002:000000de
-b8:8101 0002:000000e1
-b8:8105 0002:000000e2
-b8:8109 0002:000000e3
-b8:810b 0002:000000e5
-b8:810d 0002:000000e5
-b8:810e 0002:000000e8
-b8:8112 0002:000000e9
-b8:8114 0002:000000ea
-b8:8118 0002:000000eb
-b8:811a 0002:000000ec
-b8:811e 0002:000000ed
-b8:8121 0002:000000ee
-b8:8123 0002:000000ef
-b8:8125 0002:000000f0
-b8:8129 0002:000000f1
-b8:812b 0002:000000f2
-b8:812d 0002:000000f3
-b8:8130 0002:000000f4
-b8:8133 0002:000000f5
-b8:8135 0002:000000f6
-b8:813d 0002:000000fa
-b8:813e 0002:000000fb
-b8:813f 0002:000000fc
-b8:8143 0002:000000ff
-b8:8147 0002:00000100
-b8:814b 0002:00000101
-b8:814d 0002:00000103
-b8:814e 0002:00000104
-b8:814f 0002:00000105
-b8:8151 0002:0000010a
-b8:8152 0002:0000010b
-b8:8156 0002:0000010e
-b8:815a 0002:0000010f
-b8:815e 0002:00000110
-b8:8162 0002:00000111
-b8:8163 0002:00000115
-b8:8165 0002:00000116
-b8:8168 0002:00000117
-b8:816a 0002:00000118
-b8:816d 0002:0000011b
-b8:8171 0002:0000011c
-b8:8172 0002:0000011d
-b8:8176 0002:0000011f
-b8:8178 0002:00000122
-b8:817a 0002:00000123
-b8:817c 0002:00000124
-b8:817d 0002:00000124
-b8:817e 0002:00000125
-b8:817f 0002:00000129
-b8:8180 0002:00000129
-b8:8181 0002:00000129
-b8:8182 0002:0000012a
-b8:8186 0002:0000012b
-b8:8189 0002:0000012b
-b8:818a 0002:0000012d
-b8:818e 0002:0000012e
-b8:818f 0002:0000012f
-b8:8193 0002:00000130
-b8:8196 0002:00000131
-b8:8198 0002:00000133
-b8:819b 0002:00000136
-b8:819f 0002:00000137
-b8:81a3 0002:00000138
-b8:81a5 0002:0000013a
-b8:81a9 0002:0000013b
-b8:81aa 0002:0000013d
-b8:81ae 0002:0000013e
-b8:81b0 0002:00000141
-b8:81b4 0002:00000142
-b8:81b7 0002:00000143
-b8:81b9 0002:00000144
-b8:81bc 0002:00000147
-b8:81bd 0002:00000148
-b8:81be 0002:00000149
-b8:81c2 0002:0000014a
-b8:81c4 0002:0000014d
-b8:81c5 0002:0000014d
-b8:81c6 0002:0000014d
-b8:81c7 0002:0000014e
-b8:81c8 0002:00000152
-b8:81cc 0002:00000153
-b8:81d0 0002:00000154
-b8:81d2 0002:00000155
-b8:81d6 0002:00000156
-b8:81d9 0002:00000157
-b8:81db 0002:00000158
-b8:81de 0002:0000015a
-b8:81df 0002:0000015d
-b8:81e3 0002:0000015e
-b8:81e4 0002:0000015f
-b8:81e7 0002:00000160
-b8:81eb 0002:00000162
-b8:81ec 0002:00000163
-b8:81ed 0002:00000164
-b8:81ee 0002:00000165
-b8:81ef 0002:00000166
-8b:914a 0002:0000016b
-81:80f7 0002:0000016e
-81:8027 0002:00000171
-82:8bb3 0002:00000174
-85:b9a3 0002:0000020e
-85:b9a4 0002:0000020e
-85:b9a5 0002:00000211
-85:b9a7 0002:00000212
-85:b9ad 0002:00000212
-85:b9ae 0002:00000213
-85:b9b1 0002:00000214
-85:b9b2 0002:00000215
-85:b9b3 0002:00000215
-85:b9b4 0002:00000219
-85:b9b7 0002:0000021a
-85:b9bb 0002:0000021b
-85:b9bd 0002:0000021b
-85:b9bf 0002:0000021c
-85:b9c2 0002:0000021d
-85:b9c4 0002:0000021f
-85:b9c5 0002:00000220
-85:b9c7 0002:00000224
-85:b9ca 0002:00000226
-85:b9cd 0002:00000227
-85:b9cf 0002:00000228
-85:b9d1 0002:00000229
-85:b9d5 0002:0000022a
-85:b9d7 0002:0000022b
-85:b9d9 0002:0000022c
-85:b9da 0002:0000022d
-85:b9dc 0002:0000022f
-85:b9df 0002:00000231
-85:b9e2 0002:00000231
-85:b9e3 0002:00000232
-85:b9e6 0002:00000234
-85:b9ea 0002:00000235
-85:b9ed 0002:00000236
-85:b9ee 0002:00000237
-85:b9ef 0002:00000237
-85:b9f0 0002:00000238
-85:b9f4 0002:00000239
-85:b9f5 0002:0000023a
-85:b9f9 0002:0000023b
-85:b9fb 0002:0000023c
-85:b9fc 0002:0000023d
-85:b9fd 0002:0000023e
-85:ba00 0002:0000023f
-85:ba02 0002:00000240
-85:ba04 0002:00000243
-85:ba05 0002:00000243
-85:ba06 0002:00000244
-85:ba09 0002:00000245
-85:ba8a 0002:00000253
-85:ba8c 0002:00000254
-85:ba8f 0002:00000255
-85:ba92 0002:00000256
-85:ba95 0002:0000025e
-85:ba96 0002:0000025f
-85:ba98 0002:00000260
-85:ba9b 0002:00000261
-85:ba9d 0002:00000262
-85:ba9f 0002:00000263
-85:baa2 0002:00000264
-85:baa4 0002:00000265
-85:baa7 0002:00000266
-85:baa9 0002:00000269
-85:baaa 0002:0000026a
-85:baab 0002:0000026b
-85:baac 0002:0000026c
-85:baae 0002:0000026d
-85:baaf 0002:0000026e
-85:bab0 0002:0000026f
-85:bab1 0002:00000274
-85:bab4 0002:00000275
-85:bab5 0002:00000276
-85:bab8 0002:00000277
-85:bab9 0002:00000278
-85:baba 0002:00000279
-85:babb 0002:0000027a
-85:babc 0002:00000285
-85:babd 0002:00000286
-85:babf 0002:00000287
-85:bac2 0002:00000288
-85:bac4 0002:00000289
-85:bac7 0002:0000028a
-85:bac9 0002:0000028d
-85:baca 0002:0000028e
-85:bacb 0002:0000028f
-85:bacd 0002:00000290
-85:bace 0002:00000292
-85:bacf 0002:00000293
-85:bad1 0002:00000294
-85:bad4 0002:00000295
-85:bad6 0002:00000296
-85:bad9 0002:00000297
-85:badb 0002:00000298
-85:badc 0002:0000029a
-85:badd 0002:0000029b
-85:badf 0002:0000029c
-85:bae2 0002:0000029d
-85:bae4 0002:0000029e
-85:bae7 0002:0000029f
-85:bae9 0002:000002a0
-85:8246 0002:000002a5
-85:8249 0002:000002a6
-85:824b 0002:000002a7
-85:82f9 0002:000002ab
+b8:8300 0002:0000005a
+b8:8302 0002:0000005b
+b8:8306 0002:0000005c
+b8:8308 0002:0000005d
+b8:830c 0002:00000061
+b8:830e 0002:00000062
+b8:8310 0002:00000063
+b8:8311 0002:00000066
+b8:8312 0002:00000066
+b8:8313 0002:00000066
+b8:8314 0002:00000066
+b8:8315 0000:00000013
+b8:8317 0002:0000006a
+b8:831b 0002:0000006b
+b8:831e 0002:0000006c
+b8:8320 0002:0000006d
+b8:8324 0002:0000006e
+b8:8328 0002:0000006f
+b8:832a 0002:00000070
+b8:832e 0002:00000071
+b8:8332 0002:00000072
+b8:8334 0002:00000074
+b8:8338 0002:00000075
+b8:833b 0002:00000078
+b8:833c 0002:00000079
+b8:833f 0002:0000007a
+b8:8342 0002:0000007b
+b8:8345 0002:0000007c
+b8:8348 0002:0000007d
+b8:8349 0002:0000007e
+b8:834a 0002:0000007f
+b8:834e 0002:00000080
+b8:834f 0002:00000082
+b8:8366 0002:00000086
+b8:8368 0002:00000087
+b8:8369 0002:00000088
+b8:836a 0002:00000089
+b8:836c 0002:0000008a
+b8:836e 0002:0000008b
+b8:8370 0002:0000008c
+b8:8372 0002:0000008d
+b8:8375 0002:0000008e
+b8:8377 0002:0000008f
+b8:837a 0002:00000090
+b8:837d 0002:00000091
+b8:837f 0002:00000092
+b8:8383 0002:00000094
+b8:8385 0002:00000095
+b8:8387 0002:00000096
+b8:8389 0002:00000097
+b8:838b 0002:00000098
+b8:838d 0002:00000099
+b8:838f 0002:0000009a
+b8:8392 0002:0000009b
+b8:8394 0002:0000009c
+b8:8397 0002:0000009d
+b8:839a 0002:0000009e
+b8:839c 0002:0000009f
+b8:83a0 0002:000000a1
+b8:83a3 0002:000000a2
+b8:83a7 0002:000000a3
+b8:83ab 0002:000000a4
+b8:83af 0002:000000a5
+b8:83b3 0002:000000a6
+b8:83b7 0002:000000a8
+b8:83bb 0002:000000b0
+b8:83be 0002:000000b1
+b8:83c1 0002:000000b3
+b8:83c2 0002:000000b4
+b8:83c3 0002:000000b5
+b8:83c7 0002:000000b6
+b8:83cb 0002:000000b7
+b8:83cd 0002:000000c4
+b8:83d1 0002:000000c5
+b8:83d4 0002:000000c6
+b8:83d6 0002:000000c7
+b8:83da 0002:000000c8
+b8:83dd 0002:000000c9
+b8:83df 0002:000000ce
+b8:83e2 0002:000000cf
+b8:83e6 0002:000000d0
+b8:83ea 0002:000000d3
+b8:83eb 0002:000000d3
+b8:83ec 0002:000000d3
+b8:83ed 0002:000000d3
+b8:83ee 0002:000000d4
+b8:83ef 0002:000000db
+b8:83f0 0002:000000dc
+b8:83f1 0002:000000dd
+b8:83f2 0002:000000de
+b8:83f3 0002:000000df
+b8:83f4 0002:000000e1
+b8:83f7 0002:000000e2
+b8:83f8 0002:000000e3
+b8:83f9 0002:000000e4
+b8:83fa 0002:000000e5
+b8:83fc 0002:000000e7
+b8:83fd 0002:000000ee
+b8:83fe 0002:000000ef
+b8:83ff 0002:000000f0
+b8:8400 0002:000000f1
+b8:8402 0002:000000f3
+b8:8404 0002:000000f4
+b8:8405 0002:000000f5
+b8:8407 0002:000000f6
+b8:8409 0002:000000f8
+b8:840b 0002:000000f9
+b8:840c 0002:000000fa
+b8:840d 0002:000000fb
+b8:840f 0002:000000fd
+b8:8411 0002:000000fe
+b8:8413 0002:000000ff
+b8:8414 0002:00000100
+b8:8415 0002:00000101
+b8:8417 0002:00000103
+b8:8418 0002:00000104
+b8:8419 0002:00000108
+b8:841d 0002:00000109
+b8:8421 0002:0000010a
+b8:8425 0002:0000010b
+b8:8429 0002:0000010c
+b8:842d 0002:0000010d
+b8:8431 0002:0000010e
+b8:8435 0002:0000010f
+b8:8439 0002:00000110
+b8:843d 0002:00000111
+b8:8441 0002:00000112
+b8:8442 0002:00000118
+b8:8443 0002:00000118
+b8:8444 0002:00000119
+b8:8445 0002:00000119
+b8:8446 0002:0000011a
+b8:844a 0002:0000011b
+b8:844d 0002:0000011b
+b8:844e 0002:0000011c
+b8:844f 0002:0000011d
+b8:8453 0002:0000011e
+b8:8454 0002:0000011f
+b8:8458 0002:00000120
+b8:8459 0002:00000121
+b8:845d 0002:00000123
+b8:8461 0002:00000124
+b8:8462 0002:00000125
+b8:8466 0002:00000126
+b8:8467 0002:00000126
+b8:8468 0002:00000127
+b8:8469 0002:0000012c
+b8:846a 0002:0000012c
+b8:846b 0000:00000013
+b8:846d 0002:0000012f
+b8:846e 0002:0000012f
+b8:846f 0002:00000131
+b8:8470 0002:00000132
+b8:8473 0002:00000133
+b8:8474 0002:00000138
+b8:8475 0002:00000138
+b8:8476 0000:00000013
+b8:8478 0002:0000013a
+b8:847c 0002:0000013b
+b8:8480 0002:0000013c
+b8:8482 0002:0000013e
+b8:8483 0002:0000013e
+b8:8484 0002:0000013f
+b8:8485 0002:00000147
+b8:8489 0002:00000148
+b8:848b 0002:0000014e
+b8:848d 0002:0000014f
+b8:848f 0002:00000152
+b8:8492 0002:00000153
+b8:8494 0002:00000154
+b8:8497 0002:00000155
+b8:8499 0002:00000156
+b8:849c 0002:00000157
+b8:84a0 0002:00000158
+b8:84a2 0002:00000159
+b8:84a4 0002:0000015a
+b8:84a6 0002:0000015b
+b8:84a8 0002:0000015c
+b8:84a9 0002:00000160
+b8:84aa 0002:00000160
+b8:84ab 0002:00000161
+b8:84ae 0002:00000162
+b8:84b0 0002:00000163
+b8:84b3 0002:00000164
+b8:84b5 0002:00000165
+b8:84b6 0002:00000166
+b8:84b7 0002:00000168
+b8:84ba 0002:00000169
+b8:84bc 0002:0000016a
+b8:84bf 0002:0000016b
+b8:84c0 0002:0000016c
+b8:84c3 0002:0000016d
+b8:84c4 0002:0000016d
+b8:84c5 0002:0000016e
+b8:84c9 0002:0000016f
+b8:84ca 0002:00000170
+b8:84cd 0002:00000171
+b8:84d1 0002:00000172
+b8:84d3 0002:00000174
+b8:84d6 0002:00000175
+b8:84d8 0002:00000176
+b8:84db 0002:00000177
+b8:84dd 0002:00000179
+b8:84e1 0002:0000017b
+b8:84e3 0002:0000017c
+b8:84e5 0002:0000017d
+b8:84e6 0002:0000017d
+b8:84e7 0002:0000017e
+b8:84e8 0002:00000189
+b8:84e9 0002:0000018a
+b8:84ed 0002:0000018b
+b8:84ee 0002:0000018c
+b8:84f2 0002:0000018d
+b8:84f3 0002:0000018f
+b8:84f7 0002:00000190
+b8:84f8 0002:000001c2
+b8:84f9 0002:000001c2
+b8:84fa 0002:000001c5
+b8:84fe 0002:000001c6
+b8:8502 0002:000001c7
+b8:8504 0002:000001c9
+b8:8506 0002:000001c9
+b8:8507 0002:000001cc
+b8:850b 0002:000001cd
+b8:850d 0002:000001ce
+b8:8511 0002:000001cf
+b8:8513 0002:000001d0
+b8:8517 0002:000001d1
+b8:851a 0002:000001d2
+b8:851c 0002:000001d3
+b8:851e 0002:000001d4
+b8:8522 0002:000001d5
+b8:8524 0002:000001d6
+b8:8526 0002:000001d7
+b8:8529 0002:000001d8
+b8:852c 0002:000001d9
+b8:852e 0002:000001da
+b8:8536 0002:000001de
+b8:8537 0002:000001df
+b8:8538 0002:000001e0
+b8:853c 0002:000001e3
+b8:8540 0002:000001e4
+b8:8544 0002:000001e5
+b8:8546 0002:000001e7
+b8:8547 0002:000001e8
+b8:8548 0002:000001e9
+b8:854a 0002:000001ee
+b8:854b 0002:000001ef
+b8:854f 0002:000001f2
+b8:8553 0002:000001f3
+b8:8557 0002:000001f4
+b8:855b 0002:000001f5
+b8:855c 0002:000001f9
+b8:855e 0002:000001fa
+b8:8561 0002:000001fb
+b8:8563 0002:000001fc
+b8:8566 0002:000001ff
+b8:856a 0002:00000200
+b8:856b 0002:00000201
+b8:856f 0002:00000203
+b8:8571 0002:00000206
+b8:8573 0002:00000207
+b8:8575 0002:00000208
+b8:8576 0002:00000208
+b8:8577 0002:00000209
+b8:8578 0002:0000020d
+b8:8579 0002:0000020d
+b8:857a 0002:0000020d
+b8:857b 0002:0000020e
+b8:857f 0002:0000020f
+b8:8582 0002:0000020f
+b8:8583 0002:00000211
+b8:8587 0002:00000212
+b8:8588 0002:00000213
+b8:858c 0002:00000214
+b8:858f 0002:00000215
+b8:8591 0002:00000217
+b8:8594 0002:0000021a
+b8:8598 0002:0000021b
+b8:859c 0002:0000021c
+b8:859e 0002:0000021e
+b8:85a2 0002:0000021f
+b8:85a3 0002:00000221
+b8:85a7 0002:00000222
+b8:85a9 0002:00000225
+b8:85ad 0002:00000226
+b8:85b0 0002:00000227
+b8:85b2 0002:00000228
+b8:85b5 0002:0000022b
+b8:85b6 0002:0000022c
+b8:85b7 0002:0000022d
+b8:85bb 0002:0000022e
+b8:85bd 0002:00000231
+b8:85be 0002:00000231
+b8:85bf 0002:00000231
+b8:85c0 0002:00000232
+b8:85c1 0002:00000236
+b8:85c5 0002:00000237
+b8:85c9 0002:00000238
+b8:85cb 0002:00000239
+b8:85cf 0002:0000023a
+b8:85d2 0002:0000023b
+b8:85d4 0002:0000023c
+b8:85d7 0002:0000023e
+b8:85d8 0002:00000241
+b8:85dc 0002:00000243
+b8:85dd 0002:00000244
+b8:85de 0002:00000245
+b8:85df 0002:00000246
+b8:85e0 0002:00000247
+8b:914a 0002:0000024c
+81:80f7 0002:0000024f
+81:8027 0002:00000252
+82:8bb3 0002:00000255
+85:b9a3 0002:000002ef
+85:b9a4 0002:000002ef
+85:b9a5 0002:000002f2
+85:b9a7 0002:000002f3
+85:b9ad 0002:000002f3
+85:b9ae 0002:000002f4
+85:b9b1 0002:000002f5
+85:b9b2 0002:000002f6
+85:b9b3 0002:000002f6
+85:b9b4 0002:000002fa
+85:b9b7 0002:000002fb
+85:b9bb 0002:000002fc
+85:b9bd 0002:000002fc
+85:b9bf 0002:000002fd
+85:b9c2 0002:000002fe
+85:b9c4 0002:00000300
+85:b9c5 0002:00000301
+85:b9c7 0002:00000305
+85:b9ca 0002:00000307
+85:b9cd 0002:00000308
+85:b9cf 0002:00000309
+85:b9d1 0002:0000030a
+85:b9d5 0002:0000030b
+85:b9d7 0002:0000030c
+85:b9d9 0002:0000030d
+85:b9da 0002:0000030e
+85:b9dc 0002:00000310
+85:b9df 0002:00000312
+85:b9e2 0002:00000312
+85:b9e3 0002:00000313
+85:b9e6 0002:00000315
+85:b9ea 0002:00000316
+85:b9ed 0002:00000317
+85:b9ee 0002:00000318
+85:b9ef 0002:00000318
+85:b9f0 0002:00000319
+85:b9f4 0002:0000031a
+85:b9f5 0002:0000031b
+85:b9f9 0002:0000031c
+85:b9fb 0002:0000031d
+85:b9fc 0002:0000031e
+85:b9fd 0002:0000031f
+85:ba00 0002:00000320
+85:ba02 0002:00000321
+85:ba04 0002:00000324
+85:ba05 0002:00000324
+85:ba06 0002:00000325
+85:ba09 0002:00000326
+85:ba8a 0002:00000334
+85:ba8c 0002:00000335
+85:ba8f 0002:00000336
+85:ba92 0002:00000337
+85:ba95 0002:0000033f
+85:ba96 0002:00000340
+85:ba98 0002:00000341
+85:ba9b 0002:00000342
+85:ba9d 0002:00000343
+85:ba9f 0002:00000344
+85:baa2 0002:00000345
+85:baa4 0002:00000346
+85:baa7 0002:00000347
+85:baa9 0002:0000034a
+85:baaa 0002:0000034b
+85:baab 0002:0000034c
+85:baac 0002:0000034d
+85:baae 0002:0000034e
+85:baaf 0002:0000034f
+85:bab0 0002:00000350
+85:bab1 0002:00000355
+85:bab4 0002:00000356
+85:bab5 0002:00000357
+85:bab8 0002:00000358
+85:bab9 0002:00000359
+85:baba 0002:0000035a
+85:babb 0002:0000035b
+85:babc 0002:00000366
+85:babd 0002:00000367
+85:babf 0002:00000368
+85:bac2 0002:00000369
+85:bac4 0002:0000036a
+85:bac7 0002:0000036b
+85:bac9 0002:0000036e
+85:baca 0002:0000036f
+85:bacb 0002:00000370
+85:bacd 0002:00000371
+85:bace 0002:00000373
+85:bacf 0002:00000374
+85:bad1 0002:00000375
+85:bad4 0002:00000376
+85:bad6 0002:00000377
+85:bad9 0002:00000378
+85:badb 0002:00000379
+85:badc 0002:0000037b
+85:badd 0002:0000037c
+85:badf 0002:0000037d
+85:bae2 0002:0000037e
+85:bae4 0002:0000037f
+85:bae7 0002:00000380
+85:bae9 0002:00000381
+85:8246 0002:00000386
+85:8249 0002:00000387
+85:824b 0002:00000388
+85:82f9 0002:0000038c
 b8:885c 0003:00000045
 b8:885d 0003:00000045
 b8:885e 0003:00000046

worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json

@@ -4,7 +4,7 @@
     "CLIPLEN_end": "85:990F",
     "CLIPLEN_no_multi": "85:990C",
     "CLIPSET": "85:FF1D",
-    "COLLECTTANK": "B8:80EF",
+    "COLLECTTANK": "B8:84E8",
     "MISCFX": "85:FF45",
     "NORMAL": "84:8BF2",
     "SETFX": "85:FF4E",
@@ -22,6 +22,11 @@
     "config_player_id": "CE:FF08",
     "config_remote_items": "CE:FF06",
     "config_sprite": "CE:FF02",
+    "copy_config_to_sram": "B8:8419",
+    "copy_memory": "B8:83FD",
+    "copy_memory_done": "B8:8417",
+    "copy_memory_even": "B8:8409",
+    "copy_memory_loop": "B8:840F",
     "h_item": "84:F894",
     "i_chozo_item": "84:F8AD",
     "i_hidden_item": "84:F8B4",
@@ -30,11 +35,11 @@
     "i_item_setup_shared_all_items": "B8:8878",
     "i_item_setup_shared_alwaysloaded": "B8:8883",
     "i_live_pickup": "84:FA79",
-    "i_live_pickup_multiworld": "B8:817F",
-    "i_live_pickup_multiworld_end": "B8:81C4",
-    "i_live_pickup_multiworld_local_item_or_offworld": "B8:819B",
-    "i_live_pickup_multiworld_own_item": "B8:81B0",
-    "i_live_pickup_multiworld_own_item1": "B8:81BC",
+    "i_live_pickup_multiworld": "B8:8578",
+    "i_live_pickup_multiworld_end": "B8:85BD",
+    "i_live_pickup_multiworld_local_item_or_offworld": "B8:8594",
+    "i_live_pickup_multiworld_own_item": "B8:85A9",
+    "i_live_pickup_multiworld_own_item1": "B8:85B5",
     "i_load_custom_graphics": "84:FA1E",
     "i_load_custom_graphics_all_items": "84:FA39",
     "i_load_custom_graphics_alwaysloaded": "84:FA49",
@@ -69,22 +74,27 @@
     "message_write_placeholders_loop": "85:B9CA",
     "message_write_placeholders_notfound": "85:B9DC",
     "message_write_placeholders_value_ok": "85:B9DF",
-    "mw_display_item_sent": "B8:8092",
-    "mw_handle_queue": "B8:80FF",
-    "mw_handle_queue_end": "B8:8178",
-    "mw_handle_queue_loop": "B8:8101",
-    "mw_handle_queue_new_remote_item": "B8:8151",
-    "mw_handle_queue_next": "B8:816D",
-    "mw_handle_queue_perform_receive": "B8:8163",
-    "mw_hook_main_game": "B8:81C8",
-    "mw_init": "B8:8011",
-    "mw_init_end": "B8:8044",
-    "mw_init_memory": "B8:8000",
-    "mw_load_sram": "B8:8083",
-    "mw_receive_item": "B8:80B0",
-    "mw_receive_item_end": "B8:80E8",
-    "mw_save_sram": "B8:8070",
-    "mw_write_message": "B8:8049",
+    "mw_display_item_sent": "B8:848B",
+    "mw_handle_queue": "B8:84F8",
+    "mw_handle_queue_end": "B8:8571",
+    "mw_handle_queue_loop": "B8:84FA",
+    "mw_handle_queue_new_remote_item": "B8:854A",
+    "mw_handle_queue_next": "B8:8566",
+    "mw_handle_queue_perform_receive": "B8:855C",
+    "mw_hook_main_game": "B8:85C1",
+    "mw_init": "B8:8311",
+    "mw_init_continuereset": "B8:8366",
+    "mw_init_end": "B8:83EA",
+    "mw_init_memory": "B8:8300",
+    "mw_init_reset_sram": "B8:833B",
+    "mw_init_smstringdata": "B8:8351",
+    "mw_load_sram": "B8:8474",
+    "mw_load_sram_done": "B8:8482",
+    "mw_load_sram_setnewgame": "B8:8485",
+    "mw_receive_item": "B8:84A9",
+    "mw_receive_item_end": "B8:84E1",
+    "mw_save_sram": "B8:8469",
+    "mw_write_message": "B8:8442",
     "nonprog_item_eight_palette_indices": "84:F888",
     "offworld_graphics_data_item": "89:9200",
     "offworld_graphics_data_progression_item": "89:9100",
@@ -109,7 +119,7 @@
     "p_visible_item_end": "84:F96E",
     "p_visible_item_loop": "84:F95B",
     "p_visible_item_trigger": "84:F967",
-    "patch_load_multiworld": "B8:81DF",
+    "patch_load_multiworld": "B8:85D8",
     "perform_item_pickup": "84:FA7E",
     "plm_graphics_entry_offworld_item": "84:F886",
     "plm_graphics_entry_offworld_progression_item": "84:F87C",
@@ -128,14 +138,24 @@
     "start_item_data_reserve": "B8:C818",
     "update_graphic": "B8:C856",
     "v_item": "84:F890",
+    "write_repeated_memory": "B8:83EF",
+    "write_repeated_memory_loop": "B8:83F4",
     "ITEM_RAM": "7E:09A2",
     "SRAM_MW_ITEMS_RECV": "70:2000",
-    "SRAM_MW_ITEMS_RECV_RPTR": "70:2600",
-    "SRAM_MW_ITEMS_RECV_WPTR": "70:2602",
-    "SRAM_MW_ITEMS_RECV_SPTR": "70:2604",
-    "SRAM_MW_ITEMS_SENT_RPTR": "70:2680",
-    "SRAM_MW_ITEMS_SENT_WPTR": "70:2682",
+    "SRAM_MW_ITEMS_RECV_WCOUNT": "70:2602",
+    "ReceiveQueueCompletedCount_InRamThatGetsSavedToSaveSlot": "7e:d8ae",
+    "SRAM_MW_ITEMS_SENT_RCOUNT": "70:2680",
+    "SRAM_MW_ITEMS_SENT_WCOUNT": "70:2682",
     "SRAM_MW_ITEMS_SENT": "70:2700",
-    "SRAM_MW_INITIALIZED": "70:26fe",
+    "SRAM_MW_SM": "70:3000",
+    "SRAM_MW_ROMTITLE": "70:3015",
+    "SRAM_MW_SEEDINT": "70:3060",
+    "SRAM_MW_INITIALIZED": "70:3064",
+    "SRAM_MW_CONFIG_ENABLED": "70:3070",
+    "SRAM_MW_CONFIG_CUSTOM_SPRITE": "70:3072",
+    "SRAM_MW_CONFIG_DEATHLINK": "70:3074",
+    "SRAM_MW_CONFIG_REMOTE_ITEMS": "70:3076",
+    "SRAM_MW_CONFIG_PLAYER_ID": "70:3078",
+    "varia_seedint_location": "df:ff00",
     "CollectedItems": "7E:D86E"
 }

worlds/sm/variaRandomizer/graph/vanilla/graph_access.py

@@ -294,7 +294,18 @@ accessPoints = [
                                                     sm.canGetBackFromRidleyZone(),
                                                     sm.canPassWastelandDessgeegas(),
                                                     sm.canPassRedKiHunters())),
-        'RidleyRoomOut': Cache.ldeco(lambda sm: sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main']))
+        'RidleyRoomOut': Cache.ldeco(lambda sm: sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main'])),
+        'Wasteland': Cache.ldeco(lambda sm: sm.wand(sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main']),
+                                                    sm.canGetBackFromRidleyZone(),
+                                                    sm.canPassWastelandDessgeegas()))
+    }, internal=True),
+    AccessPoint('Wasteland', 'LowerNorfair', {
+        # no transition to firefleas to exlude pb of shame location when starting at firefleas top
+        'Ridley Zone': Cache.ldeco(lambda sm: sm.wand(sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main']),
+                                                      sm.traverse('WastelandLeft'),
+                                                      sm.canGetBackFromRidleyZone(),
+                                                      sm.canPassWastelandDessgeegas(),
+                                                      sm.canPassNinjaPirates()))
     }, internal=True),
     AccessPoint('Three Muskateers Room Left', 'LowerNorfair', {
         'Firefleas': Cache.ldeco(lambda sm: sm.wand(sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main']),

worlds/sm/variaRandomizer/graph/vanilla/graph_locations.py

@@ -797,10 +797,10 @@ locationsDict["Power Bomb (lower Norfair above fire flea room)"].Available = (
     lambda sm: SMBool(True)
 )
 locationsDict["Power Bomb (Power Bombs of shame)"].AccessFrom = {
-    'Ridley Zone': lambda sm: sm.canUsePowerBombs()
+    'Wasteland': lambda sm: sm.canUsePowerBombs()
 }
 locationsDict["Power Bomb (Power Bombs of shame)"].Available = (
-    lambda sm: sm.canHellRun(**Settings.hellRunsTable['LowerNorfair']['Main'])
+    lambda sm: SMBool(True)
 )
 locationsDict["Missile (lower Norfair near Wave Beam)"].AccessFrom = {
     'Firefleas': lambda sm: SMBool(True)

worlds/sm64ex/Locations.py

@@ -46,6 +46,9 @@ locCCM_table = {
     "CCM: Snowman's Lost His Head": 3626025,
     "CCM: Wall Kicks Will Work": 3626026,
     "CCM: Bob-omb Buddy": 3626203,
+    "CCM: 1Up Block Near Snowman": 3626215,
+    "CCM: 1Up Block Ice Pillar": 3626216,
+    "CCM: 1Up Block Secret Slide": 3626217
 }
 
 #Big Boo's Haunt
@@ -55,7 +58,8 @@ locBBH_table = {
     "BBH: Secret of the Haunted Books": 3626030,
     "BBH: Seek the 8 Red Coins": 3626031,
     "BBH: Big Boo's Balcony": 3626032,
-    "BBH: Eye to Eye in the Secret Room": 3626033
+    "BBH: Eye to Eye in the Secret Room": 3626033,
+    "BBH: 1Up Block Top of Mansion": 3626218
 }
 
 #Hazy Maze Cave
@@ -65,7 +69,9 @@ locHMC_table = {
     "HMC: Metal-Head Mario Can Move!": 3626037,
     "HMC: Navigating the Toxic Maze": 3626038,
     "HMC: A-Maze-Ing Emergency Exit": 3626039,
-    "HMC: Watch for Rolling Rocks": 3626040
+    "HMC: Watch for Rolling Rocks": 3626040,
+    "HMC: 1Up Block above Pit": 3626219,
+    "HMC: 1Up Block Past Rolling Rocks": 3626220,
 }
 
 #Lethal Lava Land
@@ -87,6 +93,9 @@ locSSL_table = {
     "SSL: Free Flying for 8 Red Coins": 3626053,
     "SSL: Pyramid Puzzle": 3626054,
     "SSL: Bob-omb Buddy": 3626207,
+    "SSL: 1Up Block Outside Pyramid": 3626221,
+    "SSL: 1Up Block Pyramid Left Path": 3626222,
+    "SSL: 1Up Block Pyramid Back": 3626223
 }
 
 #Dire, Dire Docks
@@ -108,6 +117,8 @@ locSL_table = {
     "SL: Shell Shreddin' for Red Coins": 3626067,
     "SL: Into the Igloo": 3626068,
     "SL: Bob-omb Buddy": 3626209,
+    "SL: 1Up Block Near Moneybags": 3626224,
+    "SL: 1Up Block inside Igloo": 3626225
 }
 
 #Wet-Dry World
@@ -119,6 +130,7 @@ locWDW_table = {
     "WDW: Go to Town for Red Coins": 3626074,
     "WDW: Quick Race Through Downtown!": 3626075,
     "WDW: Bob-omb Buddy": 3626210,
+    "WDW: 1Up Block in Downtown": 3626226
 }
 
 #Tall, Tall Mountain
@@ -130,6 +142,7 @@ locTTM_table = {
     "TTM: Breathtaking View from Bridge": 3626081,
     "TTM: Blast to the Lonely Mushroom": 3626082,
     "TTM: Bob-omb Buddy": 3626211,
+    "TTM: 1Up Block on Red Mushroom": 3626227
 }
 
 #Tiny-Huge Island
@@ -141,6 +154,9 @@ locTHI_table = {
     "THI: Wiggler's Red Coins": 3626088,
     "THI: Make Wiggler Squirm": 3626089,
     "THI: Bob-omb Buddy": 3626212,
+    "THI: 1Up Block THI Small near Start": 3626228,
+    "THI: 1Up Block THI Large near Start": 3626229,
+    "THI: 1Up Block Windy Area": 3626230
 }
 
 #Tick Tock Clock
@@ -150,7 +166,9 @@ locTTC_table = {
     "TTC: Get a Hand": 3626093,
     "TTC: Stomp on the Thwomp": 3626094,
     "TTC: Timed Jumps on Moving Bars": 3626095,
-    "TTC: Stop Time for Red Coins": 3626096
+    "TTC: Stop Time for Red Coins": 3626096,
+    "TTC: 1Up Block Midway Up": 3626231,
+    "TTC: 1Up Block at the Top": 3626232
 }
 
 #Rainbow Ride
@@ -162,6 +180,9 @@ locRR_table = {
     "RR: Tricky Triangles!": 3626102,
     "RR: Somewhere Over the Rainbow": 3626103,
     "RR: Bob-omb Buddy": 3626214,
+    "RR: 1Up Block Top of Red Coin Maze": 3626233,
+    "RR: 1Up Block Under Fly Guy": 3626234,
+    "RR: 1Up Block On House in the Sky": 3626235
 }
 
 loc100Coin_table = {
@@ -193,7 +214,9 @@ locSA_table = {
 
 locBitDW_table = {
     "Bowser in the Dark World Red Coins": 3626105,
-    "Bowser in the Dark World Key": 3626178
+    "Bowser in the Dark World Key": 3626178,
+    "Bowser in the Dark World 1Up Block on Tower": 3626236,
+    "Bowser in the Dark World 1Up Block near Goombas": 3626237
 }
 
 locTotWC_table = {
@@ -203,25 +226,31 @@ locTotWC_table = {
 
 locCotMC_table = {
     "Cavern of the Metal Cap Switch": 3626182,
-    "Cavern of the Metal Cap Red Coins": 3626133
+    "Cavern of the Metal Cap Red Coins": 3626133,
+    "Cavern of the Metal Cap 1Up Block": 3626241
 }
 
 locVCutM_table = {
     "Vanish Cap Under the Moat Switch": 3626183,
-    "Vanish Cap Under the Moat Red Coins": 3626147
+    "Vanish Cap Under the Moat Red Coins": 3626147,
+    "Vanish Cap Under the Moat 1Up Block": 3626242
 }
 
 locBitFS_table = {
     "Bowser in the Fire Sea Red Coins": 3626112,
-    "Bowser in the Fire Sea Key": 3626179
+    "Bowser in the Fire Sea Key": 3626179,
+    "Bowser in the Fire Sea 1Up Block Swaying Stairs": 3626238,
+    "Bowser in the Fire Sea 1Up Block Near Poles": 3626239
 }
 
 locWMotR_table = {
-    "Wing Mario Over the Rainbow": 3626154
+    "Wing Mario Over the Rainbow Red Coins": 3626154,
+    "Wing Mario Over the Rainbow 1Up Block": 3626243
 }
 
 locBitS_table = {
-    "Bowser in the Sky Red Coins": 3626119
+    "Bowser in the Sky Red Coins": 3626119,
+    "Bowser in the Sky 1Up Block": 3626240
 }
 
 #Secret Stars found inside the Castle
@@ -239,4 +268,4 @@ location_table = {**locBoB_table,**locWhomp_table,**locJRB_table,**locCCM_table,
                   **locWDW_table,**locTTM_table,**locTHI_table,**locTTC_table,**locRR_table, \
                   **loc100Coin_table,**locPSS_table,**locSA_table,**locBitDW_table,**locTotWC_table, \
                   **locCotMC_table, **locVCutM_table, **locBitFS_table, **locWMotR_table, **locBitS_table, \
-                  **locSS_table}
+                  **locSS_table}