Update BaseClasses.py

This is how it already works for locations and it feels more correct to me to check in the place where the crash would happen.

Also update location error to be a bit more verbose

BaseClasses.py

@@ -194,9 +194,7 @@ class MultiWorld():
         self.player_types[new_id] = NetUtils.SlotType.group
         world_type = AutoWorld.AutoWorldRegister.world_types[game]
         self.worlds[new_id] = world_type.create_group(self, new_id, players)
-        self.worlds[new_id].collect_item = AutoWorld.World.collect_item.__get__(self.worlds[new_id])
-        self.worlds[new_id].collect = AutoWorld.World.collect.__get__(self.worlds[new_id])
-        self.worlds[new_id].remove = AutoWorld.World.remove.__get__(self.worlds[new_id])
+        self.worlds[new_id].collect_item = classmethod(AutoWorld.World.collect_item).__get__(self.worlds[new_id])
         self.player_name[new_id] = name
 
         new_group = self.groups[new_id] = Group(name=name, game=game, players=players,

CommonClient.py

@@ -45,21 +45,10 @@ def get_ssl_context():
 
 
 class ClientCommandProcessor(CommandProcessor):
-    """
-    The Command Processor will parse every method of the class that starts with "_cmd_" as a command to be called
-    when parsing user input, i.e. _cmd_exit will be called when the user sends the command "/exit".
-
-    The decorator @mark_raw can be imported from MultiServer and tells the parser to only split on the first
-    space after the command i.e. "/exit one two three" will be passed in as method("one two three") with mark_raw
-    and method("one", "two", "three") without.
-
-    In addition all docstrings for command methods will be displayed to the user on launch and when using "/help"
-    """
     def __init__(self, ctx: CommonContext):
         self.ctx = ctx
 
     def output(self, text: str):
-        """Helper function to abstract logging to the CommonClient UI"""
         logger.info(text)
 
     def _cmd_exit(self) -> bool:
@@ -175,14 +164,13 @@ class ClientCommandProcessor(CommandProcessor):
         async_start(self.ctx.send_msgs([{"cmd": "StatusUpdate", "status": state}]), name="send StatusUpdate")
 
     def default(self, raw: str):
-        """The default message parser to be used when parsing any messages that do not match a command"""
         raw = self.ctx.on_user_say(raw)
         if raw:
             async_start(self.ctx.send_msgs([{"cmd": "Say", "text": raw}]), name="send Say")
 
 
 class CommonContext:
-    # The following attributes are used to Connect and should be adjusted as needed in subclasses
+    # Should be adjusted as needed in subclasses
     tags: typing.Set[str] = {"AP"}
     game: typing.Optional[str] = None
     items_handling: typing.Optional[int] = None
@@ -441,10 +429,7 @@ class CommonContext:
                 self.auth = await self.console_input()
 
     async def send_connect(self, **kwargs: typing.Any) -> None:
-        """
-        Send a `Connect` packet to log in to the server,
-        additional keyword args can override any value in the connection packet
-        """
+        """ send `Connect` packet to log in to server """
         payload = {
             'cmd': 'Connect',
             'password': self.password, 'name': self.auth, 'version': Utils.version_tuple,
@@ -474,7 +459,6 @@ class CommonContext:
         return False
 
     def slot_concerns_self(self, slot) -> bool:
-        """Helper function to abstract player groups, should be used instead of checking slot == self.slot directly."""
         if slot == self.slot:
             return True
         if slot in self.slot_info:
@@ -482,7 +466,6 @@ class CommonContext:
         return False
 
     def is_echoed_chat(self, print_json_packet: dict) -> bool:
-        """Helper function for filtering out messages sent by self."""
         return print_json_packet.get("type", "") == "Chat" \
             and print_json_packet.get("team", None) == self.team \
             and print_json_packet.get("slot", None) == self.slot
@@ -514,14 +497,13 @@ class CommonContext:
         """Gets called before sending a Say to the server from the user.
         Returned text is sent, or sending is aborted if None is returned."""
         return text
-
+    
     def on_ui_command(self, text: str) -> None:
         """Gets called by kivy when the user executes a command starting with `/` or `!`.
         The command processor is still called; this is just intended for command echoing."""
         self.ui.print_json([{"text": text, "type": "color", "color": "orange"}])
 
     def update_permissions(self, permissions: typing.Dict[str, int]):
-        """Internal method to parse and save server permissions from RoomInfo"""
         for permission_name, permission_flag in permissions.items():
             try:
                 flag = Permission(permission_flag)
@@ -631,7 +613,6 @@ class CommonContext:
             logger.info(f"DeathLink: Received from {data['source']}")
 
     async def send_death(self, death_text: str = ""):
-        """Helper function to send a deathlink using death_text as the unique death cause string."""
         if self.server and self.server.socket:
             logger.info("DeathLink: Sending death to your friends...")
             self.last_death_link = time.time()
@@ -645,7 +626,6 @@ class CommonContext:
             }])
 
     async def update_death_link(self, death_link: bool):
-        """Helper function to set Death Link connection tag on/off and update the connection if already connected."""
         old_tags = self.tags.copy()
         if death_link:
             self.tags.add("DeathLink")
@@ -655,7 +635,7 @@ class CommonContext:
             await self.send_msgs([{"cmd": "ConnectUpdate", "tags": self.tags}])
 
     def gui_error(self, title: str, text: typing.Union[Exception, str]) -> typing.Optional["kvui.MessageBox"]:
-        """Displays an error messagebox in the loaded Kivy UI. Override if using a different UI framework"""
+        """Displays an error messagebox"""
         if not self.ui:
             return None
         title = title or "Error"
@@ -1007,7 +987,6 @@ async def console_loop(ctx: CommonContext):
 
 
 def get_base_parser(description: typing.Optional[str] = None):
-    """Base argument parser to be reused for components subclassing off of CommonClient"""
     import argparse
     parser = argparse.ArgumentParser(description=description)
     parser.add_argument('--connect', default=None, help='Address of the multiworld host.')
@@ -1058,7 +1037,6 @@ def run_as_textclient(*args):
     parser.add_argument("url", nargs="?", help="Archipelago connection url")
     args = parser.parse_args(args)
 
-    # handle if text client is launched using the "archipelago://name:pass@host:port" url from webhost
     if args.url:
         url = urllib.parse.urlparse(args.url)
         if url.scheme == "archipelago":
@@ -1070,7 +1048,6 @@ def run_as_textclient(*args):
         else:
             parser.error(f"bad url, found {args.url}, expected url in form of archipelago://archipelago.gg:38281")
 
-    # use colorama to display colored text highlighting on windows
     colorama.init()
 
     asyncio.run(main(args))

Options.py

@@ -705,26 +705,10 @@ class Range(NumericOption):
                             f"random-range-high-<min>-<max>, or random-range-<min>-<max>.")
 
     @classmethod
-    def custom_range(cls, text: str) -> Range:
-        numeric_text: str = text[len("random-range-"):]
-        if numeric_text.startswith(("low", "middle", "high")):
-            numeric_text = numeric_text.split("-", 1)[1]
-        textsplit = numeric_text.split("-")
-        if len(textsplit) > 2:  # looks like there may be minus signs, which will now be empty string from the split
-            new_textsplit: typing.List[str] = []
-            next_negative: bool = False
-            for element in textsplit:
-                if not element:  # empty string -> next element gets a minus sign in front
-                    next_negative = True
-                elif next_negative:
-                    new_textsplit.append("-"+element)
-                    next_negative = False
-                else:
-                    new_textsplit.append(element)
-            textsplit = new_textsplit
-            del next_negative, new_textsplit
+    def custom_range(cls, text) -> Range:
+        textsplit = text.split("-")
         try:
-            random_range = [int(textsplit[0]), int(textsplit[1])]
+            random_range = [int(textsplit[len(textsplit) - 2]), int(textsplit[len(textsplit) - 1])]
         except ValueError:
             raise ValueError(f"Invalid random range {text} for option {cls.__name__}")
         random_range.sort()

worlds/AutoWorld.py

@@ -342,7 +342,7 @@ class World(metaclass=AutoWorldRegister):
 
     # overridable methods that get called by Main.py, sorted by execution order
     # can also be implemented as a classmethod and called "stage_<original_name>",
-    # in that case the MultiWorld object is passed as the first argument, and it gets called once for the entire multiworld.
+    # in that case the MultiWorld object is passed as an argument, and it gets called once for the entire multiworld.
     # An example of this can be found in alttp as stage_pre_fill
 
     @classmethod

worlds/_bizhawk/__init__.py

@@ -223,8 +223,8 @@ async def set_message_interval(ctx: BizHawkContext, value: float) -> None:
         raise SyncError(f"Expected response of type SET_MESSAGE_INTERVAL_RESPONSE but got {res['type']}")
 
 
-async def guarded_read(ctx: BizHawkContext, read_list: typing.Sequence[typing.Tuple[int, int, str]],
-                       guard_list: typing.Sequence[typing.Tuple[int, typing.Sequence[int], str]]) -> typing.Optional[typing.List[bytes]]:
+async def guarded_read(ctx: BizHawkContext, read_list: typing.List[typing.Tuple[int, int, str]],
+                       guard_list: typing.List[typing.Tuple[int, typing.Iterable[int], str]]) -> typing.Optional[typing.List[bytes]]:
     """Reads an array of bytes at 1 or more addresses if and only if every byte in guard_list matches its expected
     value.
 
@@ -266,7 +266,7 @@ async def guarded_read(ctx: BizHawkContext, read_list: typing.Sequence[typing.Tu
     return ret
 
 
-async def read(ctx: BizHawkContext, read_list: typing.Sequence[typing.Tuple[int, int, str]]) -> typing.List[bytes]:
+async def read(ctx: BizHawkContext, read_list: typing.List[typing.Tuple[int, int, str]]) -> typing.List[bytes]:
     """Reads data at 1 or more addresses.
 
     Items in `read_list` should be organized `(address, size, domain)` where
@@ -278,8 +278,8 @@ async def read(ctx: BizHawkContext, read_list: typing.Sequence[typing.Tuple[int,
     return await guarded_read(ctx, read_list, [])
 
 
-async def guarded_write(ctx: BizHawkContext, write_list: typing.Sequence[typing.Tuple[int, typing.Sequence[int], str]],
-                        guard_list: typing.Sequence[typing.Tuple[int, typing.Sequence[int], str]]) -> bool:
+async def guarded_write(ctx: BizHawkContext, write_list: typing.List[typing.Tuple[int, typing.Iterable[int], str]],
+                        guard_list: typing.List[typing.Tuple[int, typing.Iterable[int], str]]) -> bool:
     """Writes data to 1 or more addresses if and only if every byte in guard_list matches its expected value.
 
     Items in `write_list` should be organized `(address, value, domain)` where
@@ -316,7 +316,7 @@ async def guarded_write(ctx: BizHawkContext, write_list: typing.Sequence[typing.
     return True
 
 
-async def write(ctx: BizHawkContext, write_list: typing.Sequence[typing.Tuple[int, typing.Sequence[int], str]]) -> None:
+async def write(ctx: BizHawkContext, write_list: typing.List[typing.Tuple[int, typing.Iterable[int], str]]) -> None:
     """Writes data to 1 or more addresses.
 
     Items in write_list should be organized `(address, value, domain)` where

worlds/bumpstik/__init__.py

@@ -125,6 +125,6 @@ class BumpStikWorld(World):
             lambda state: state.has("Hazard Bumper", self.player, 25)
             
         self.multiworld.completion_condition[self.player] = \
-            lambda state: state.has_all_counts({"Booster Bumper": 5, "Treasure Bumper": 32, "Hazard Bumper": 25}, \
-                self.player)
+            lambda state: state.has("Booster Bumper", self.player, 5) and \
+            state.has("Treasure Bumper", self.player, 32)
 

worlds/dark_souls_3/docs/setup_en.md

@@ -3,7 +3,7 @@
 ## Required Software
 
 - [Dark Souls III](https://store.steampowered.com/app/374320/DARK_SOULS_III/)
-- [Dark Souls III AP Client](https://github.com/nex3/Dark-Souls-III-Archipelago-client/releases/latest)
+- [Dark Souls III AP Client](https://github.com/Marechal-L/Dark-Souls-III-Archipelago-client/releases)
 
 ## Optional Software
 
@@ -11,9 +11,8 @@
 
 ## Setting Up
 
-First, download the client from the link above (`DS3.Archipelago.*.zip`). It doesn't need to go
-into any particular directory; it'll automatically locate _Dark Souls III_ in your Steam
-installation folder.
+First, download the client from the link above. It doesn't need to go into any particular directory;
+it'll automatically locate _Dark Souls III_ in your Steam installation folder.
 
 Version 3.0.0 of the randomizer _only_ supports the latest version of _Dark Souls III_, 1.15.2. This
 is the latest version, so you don't need to do any downpatching! However, if you've already
@@ -36,9 +35,8 @@ randomized item and (optionally) enemy locations. You only need to do this once
 
 To run _Dark Souls III_ in Archipelago mode:
 
-1. Start Steam. **Do not run in offline mode.** Running Steam in offline mode will make certain
-   scripted invaders fail to spawn. Instead, change the game itself to offline mode on the menu
-   screen.
+1. Start Steam. **Do not run in offline mode.** The mod will make sure you don't connect to the
+   DS3 servers, and running Steam in offline mode will make certain scripted invaders fail to spawn.
 
 2. Run `launchmod_darksouls3.bat`. This will start _Dark Souls III_ as well as a command prompt that
    you can use to interact with the Archipelago server.
@@ -54,21 +52,4 @@ To run _Dark Souls III_ in Archipelago mode:
 ### Where do I get a config file?
 
 The [Player Options](/games/Dark%20Souls%20III/player-options) page on the website allows you to
-configure your personal options and export them into a config file. The [AP client archive] also
-includes an options template.
-
-[AP client archive]: https://github.com/nex3/Dark-Souls-III-Archipelago-client/releases/latest
-
-### Does this work with Proton?
-
-The *Dark Souls III* Archipelago randomizer supports running on Linux under Proton. There are a few
-things to keep in mind:
-
-* Because `DS3Randomizer.exe` relies on the .NET runtime, you'll need to install
-  the [.NET Runtime] under **plain [WINE]**, then run `DS3Randomizer.exe` under
-  plain WINE as well. It won't work as a Proton app!
-
-* To run the game itself, just run `launchmod_darksouls3.bat` under Proton.
-
-[.NET Runtime]: https://dotnet.microsoft.com/en-us/download/dotnet/8.0
-[WINE]: https://www.winehq.org/
+configure your personal options and export them into a config file.

worlds/generic/docs/plando_en.md

@@ -22,9 +22,9 @@ enabled (opt-in).
 * You can add the necessary plando modules for your settings to the `requires` section of your YAML. Doing so will throw an error if the options that you need to generate properly are not enabled to ensure you will get the results you desire. Only enter in the plando modules that you are using here but it should look like:
 
 ```yaml
-requires: 
-  version: current.version.number
-  plando: bosses, items, texts, connections
+  requires: 
+    version: current.version.number
+    plando: bosses, items, texts, connections
 ``` 
 
 ## Item Plando
@@ -74,77 +74,77 @@ A list of all available items and locations can be found in the [website's datap
 ### Examples
 
 ```yaml
-  plando_items:
-    # example block 1 - Timespinner
-    - item:
-        Empire Orb: 1
-        Radiant Orb: 1
-      location: Starter Chest 1
-      from_pool: true
-      world: true
-      percentage: 50
-  
-    # example block 2 - Ocarina of Time
-    - items:
-        Kokiri Sword: 1
-        Biggoron Sword: 1
-        Bow: 1
-        Magic Meter: 1
-        Progressive Strength Upgrade: 3
-        Progressive Hookshot: 2
-      locations:
-        - Deku Tree Slingshot Chest
-        - Dodongos Cavern Bomb Bag Chest
-        - Jabu Jabus Belly Boomerang Chest
-        - Bottom of the Well Lens of Truth Chest
-        - Forest Temple Bow Chest
-        - Fire Temple Megaton Hammer Chest
-        - Water Temple Longshot Chest
-        - Shadow Temple Hover Boots Chest
-        - Spirit Temple Silver Gauntlets Chest
-      world: false
-  
-    # example block 3 - Slay the Spire
-    - items:
-        Boss Relic: 3
-      locations:
-        - Boss Relic 1
-        - Boss Relic 2
-        - Boss Relic 3
-  
-    # example block 4 - Factorio
-    - items:
-        progressive-electric-energy-distribution: 2
-        electric-energy-accumulators: 1
-        progressive-turret: 2
-      locations:
-        - military
-        - gun-turret
-        - logistic-science-pack
-        - steel-processing
-      percentage: 80
-      force: true
-  
-  # example block 5 - Secret of Evermore
-    - items:
-        Levitate: 1
-        Revealer: 1
-        Energize: 1
-      locations:
-        - Master Sword Pedestal
-        - Boss Relic 1
-      world: true
-      count: 2
-  
-  # example block 6 - A Link to the Past
-    - items:
-        Progressive Sword: 4
-      world:
-        - BobsSlaytheSpire
-        - BobsRogueLegacy
-      count:
-        min: 1
-        max: 4
+plando_items:
+  # example block 1 - Timespinner
+  - item:
+      Empire Orb: 1
+      Radiant Orb: 1
+    location: Starter Chest 1
+    from_pool: true
+    world: true
+    percentage: 50
+
+  # example block 2 - Ocarina of Time
+  - items:
+      Kokiri Sword: 1
+      Biggoron Sword: 1
+      Bow: 1
+      Magic Meter: 1
+      Progressive Strength Upgrade: 3
+      Progressive Hookshot: 2
+    locations:
+      - Deku Tree Slingshot Chest
+      - Dodongos Cavern Bomb Bag Chest
+      - Jabu Jabus Belly Boomerang Chest
+      - Bottom of the Well Lens of Truth Chest
+      - Forest Temple Bow Chest
+      - Fire Temple Megaton Hammer Chest
+      - Water Temple Longshot Chest
+      - Shadow Temple Hover Boots Chest
+      - Spirit Temple Silver Gauntlets Chest
+    world: false
+
+  # example block 3 - Slay the Spire
+  - items:
+      Boss Relic: 3
+    locations:
+      - Boss Relic 1
+      - Boss Relic 2
+      - Boss Relic 3
+
+  # example block 4 - Factorio
+  - items:
+      progressive-electric-energy-distribution: 2
+      electric-energy-accumulators: 1
+      progressive-turret: 2
+    locations:
+      - military
+      - gun-turret
+      - logistic-science-pack
+      - steel-processing
+    percentage: 80
+    force: true
+
+# example block 5 - Secret of Evermore
+  - items:
+      Levitate: 1
+      Revealer: 1
+      Energize: 1
+    locations:
+      - Master Sword Pedestal
+      - Boss Relic 1
+    world: true
+    count: 2
+
+# example block 6 - A Link to the Past
+  - items:
+      Progressive Sword: 4
+    world:
+      - BobsSlaytheSpire
+      - BobsRogueLegacy
+    count:
+      min: 1
+      max: 4
 ```
 1. This block has a 50% chance to occur, and if it does, it will place either the Empire Orb or Radiant Orb on another
 player's Starter Chest 1 and removes the chosen item from the item pool.
@@ -221,25 +221,25 @@ its [plando guide](/tutorial/A%20Link%20to%20the%20Past/plando/en#connections).
 ### Examples
 
 ```yaml
-  plando_connections:
-    # example block 1 - A Link to the Past
-    - entrance: Cave Shop (Lake Hylia)
-      exit: Cave 45
-      direction: entrance
-    - entrance: Cave 45
-      exit: Cave Shop (Lake Hylia)
-      direction: entrance
-    - entrance: Agahnims Tower
-      exit: Old Man Cave Exit (West)
-      direction: exit
-  
-    # example block 2 - Minecraft
-    - entrance: Overworld Structure 1
-      exit: Nether Fortress
-      direction: both
-    - entrance: Overworld Structure 2
-      exit: Village
-      direction: both
+plando_connections:
+  # example block 1 - A Link to the Past
+  - entrance: Cave Shop (Lake Hylia)
+    exit: Cave 45
+    direction: entrance
+  - entrance: Cave 45
+    exit: Cave Shop (Lake Hylia)
+    direction: entrance
+  - entrance: Agahnims Tower
+    exit: Old Man Cave Exit (West)
+    direction: exit
+
+  # example block 2 - Minecraft
+  - entrance: Overworld Structure 1
+    exit: Nether Fortress
+    direction: both
+  - entrance: Overworld Structure 2
+    exit: Village
+    direction: both
 ```
 
 1. These connections are decoupled, so going into the Lake Hylia Cave Shop will take you to the inside of Cave 45, and

worlds/hk/__init__.py

@@ -534,16 +534,26 @@ class HKWorld(World):
         for option_name in hollow_knight_options:
             option = getattr(self.options, option_name)
             try:
-                # exclude more complex types - we only care about int, bool, enum for player options; the client
-                # can get them back to the necessary type.
                 optionvalue = int(option.value)
-                options[option_name] = optionvalue
             except TypeError:
-                pass
+                pass  # C# side is currently typed as dict[str, int], drop what doesn't fit
+            else:
+                options[option_name] = optionvalue
 
         # 32 bit int
         slot_data["seed"] = self.random.randint(-2147483647, 2147483646)
 
+        # Backwards compatibility for shop cost data (HKAP < 0.1.0)
+        if not self.options.CostSanity:
+            for shop, terms in shop_cost_types.items():
+                unit = cost_terms[next(iter(terms))].option
+                if unit == "Geo":
+                    continue
+                slot_data[f"{unit}_costs"] = {
+                    loc.name: next(iter(loc.costs.values()))
+                    for loc in self.created_multi_locations[shop]
+                }
+
         # HKAP 0.1.0 and later cost data.
         location_costs = {}
         for region in self.multiworld.get_regions(self.player):
@@ -556,7 +566,7 @@ class HKWorld(World):
 
         slot_data["grub_count"] = self.grub_count
 
-        slot_data["is_race"] = self.settings.disable_spoilers or self.multiworld.is_race
+        slot_data["is_race"] = int(self.settings.disable_spoilers or self.multiworld.is_race)
 
         return slot_data
 

worlds/messenger/docs/en_The Messenger.md

@@ -39,9 +39,7 @@ You can find items wherever items can be picked up in the original game. This in
 
 When you attempt to hint for items in Archipelago you can use either the name for the specific item, or the name of a
 group of items. Hinting for a group will choose a random item from the group that you do not currently have and hint
-for it.
-
-The groups you can use for The Messenger are:
+for it. The groups you can use for The Messenger are:
 * Notes - This covers the music notes
 * Keys - An alternative name for the music notes
 * Crest - The Sun and Moon Crests
@@ -52,26 +50,26 @@ The groups you can use for The Messenger are:
 
 * The player can return to the Tower of Time HQ at any point by selecting the button from the options menu
     * This can cause issues if used at specific times. If used in any of these known problematic areas, immediately
-      quit to title and reload the save. The currently known areas include:
+quit to title and reload the save. The currently known areas include:
         * During Boss fights
         * After Courage Note collection (Corrupted Future chase)
 * After reaching ninja village a teleport option is added to the menu to reach it quickly
 * Toggle Windmill Shuriken button is added to option menu once the item is received
 * The mod option menu will also have a hint item button, as well as a release and collect button that are all placed
-  when the player fulfills the necessary conditions.
+when the player fulfills the necessary conditions.
 * After running the game with the mod, a config file (APConfig.toml) will be generated in your game folder that can be
-  used to modify certain settings such as text size and color. This can also be used to specify a player name that can't
-  be entered in game.
+used to modify certain settings such as text size and color. This can also be used to specify a player name that can't
+be entered in game.
 
 ## Known issues
 * Ruxxtin Coffin cutscene will sometimes not play correctly, but will still reward the item
 * If you receive the Magic Firefly while in Quillshroom Marsh, The De-curse Queen cutscene will not play. You can exit
-  to Searing Crags and re-enter to get it to play correctly.
+to Searing Crags and re-enter to get it to play correctly.
 * Teleporting back to HQ, then returning to the same level you just left through a Portal can cause Ninja to run left
-  and enter a different portal than the one entered by the player or lead to other incorrect inputs, causing a soft lock
+and enter a different portal than the one entered by the player or lead to other incorrect inputs, causing a soft lock
 * Text entry menus don't accept controller input
 * In power seal hunt mode, the chest must be opened by entering the shop from a level. Teleporting to HQ and opening the
-  chest will not work.
+chest will not work.
 
 ## What do I do if I have a problem?
 

worlds/messenger/docs/setup_en.md

@@ -41,27 +41,14 @@ These steps can also be followed to launch the game and check for mod updates af
 
 ## Joining a MultiWorld Game
 
-### Automatic Connection on archipelago.gg
-
-1. Go to the room page of the MultiWorld you are going to join.
-2. Click on your slot name on the left side.
-3. Click the "The Messenger" button in the prompt.
-4. Follow the remaining prompts. This process will check that you have the mod installed and will also check for updates
-   before launching The Messenger. If you are using the Steam version of The Messenger you may also get a prompt from
-   Steam asking if the game should be launched with arguments. These arguments are the URI which the mod uses to
-   connect.
-5. Start a new save. You will already be connected in The Messenger and do not need to go through the menus.
-
-### Manual Connection
-
 1. Launch the game
 2. Navigate to `Options > Archipelago Options`
 3. Enter connection info using the relevant option buttons
    * **The game is limited to alphanumerical characters, `.`, and `-`.**
    * This defaults to `archipelago.gg` and does not need to be manually changed if connecting to a game hosted on the
-     website.
+website.
    * If using a name that cannot be entered in the in game menus, there is a config file (APConfig.toml) in the game
-     directory. When using this, all connection information must be entered in the file. 
+directory. When using this, all connection information must be entered in the file. 
 4. Select the `Connect to Archipelago` button
 5. Navigate to save file selection
 6. Start a new game

worlds/sc2/Items.py

@@ -1274,16 +1274,16 @@ item_table = {
                  description="Defensive structure. Slows the attack and movement speeds of all nearby Zerg units."),
     ItemNames.STRUCTURE_ARMOR:
         ItemData(620 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 9, SC2Race.TERRAN,
-                 description="Increases armor of all Terran structures by 2.", origin={"ext"}),
+                 description="Increases armor of all Terran structures by 2."),
     ItemNames.HI_SEC_AUTO_TRACKING:
         ItemData(621 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 10, SC2Race.TERRAN,
-                 description="Increases attack range of all Terran structures by 1.", origin={"ext"}),
+                 description="Increases attack range of all Terran structures by 1."),
     ItemNames.ADVANCED_OPTICS:
         ItemData(622 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 11, SC2Race.TERRAN,
-                 description="Increases attack range of all Terran mechanical units by 1.", origin={"ext"}),
+                 description="Increases attack range of all Terran mechanical units by 1."),
     ItemNames.ROGUE_FORCES:
         ItemData(623 + SC2WOL_ITEM_ID_OFFSET, "Laboratory", 12, SC2Race.TERRAN,
-                 description="Mercenary calldowns are no longer limited by charges.", origin={"ext"}),
+                 description="Mercenary calldowns are no longer limited by charges."),
 
     ItemNames.ZEALOT:
         ItemData(700 + SC2WOL_ITEM_ID_OFFSET, "Unit", 0, SC2Race.PROTOSS,
@@ -2369,8 +2369,7 @@ progressive_if_ext = {
     ItemNames.BATTLECRUISER_PROGRESSIVE_MISSILE_PODS,
     ItemNames.THOR_PROGRESSIVE_IMMORTALITY_PROTOCOL,
     ItemNames.PROGRESSIVE_FIRE_SUPPRESSION_SYSTEM,
-    ItemNames.DIAMONDBACK_PROGRESSIVE_TRI_LITHIUM_POWER_CELL,
-    ItemNames.PROGRESSIVE_ORBITAL_COMMAND
+    ItemNames.DIAMONDBACK_PROGRESSIVE_TRI_LITHIUM_POWER_CELL
 }
 
 kerrigan_actives: typing.List[typing.Set[str]] = [

worlds/sm64ex/docs/setup_en.md

@@ -77,6 +77,9 @@ Should your name or password have spaces, enclose it in quotes: `"YourPassword"`
 Should the connection fail (for example when using the wrong name or IP/Port combination) the game will inform you of that.
 Additionally, any time the game is not connected (for example when the connection is unstable) it will attempt to reconnect and display a status text.
 
+**Important:** You must start a new file for every new seed you play. Using `⭐x0` files is **not** sufficient.
+Failing to use a new file may make some locations unavailable. However, this can be fixed without losing any progress by exiting and starting a new file.
+
 ### Playing offline
 
 To play offline, first generate a seed on the game's options page.
@@ -126,6 +129,18 @@ To use this batch file,  double-click it. A window will open. Type the five-digi
 Once you provide those two bits of information, the game will open. 
 - If the game only says `Connecting`, try again. Double-check the port number and slot name; even a single typo will cause your connection to fail.
 
+### Addendum - Deleting old saves
+
+Loading an old Mario save alongside a new seed is a bad idea, as it can cause locked doors and castle secret stars to already be unlocked / obtained. You should avoid opening a save that says "Stars x 0" as opposed to one that simply says "New".
+
+You can manually delete these old saves in-game before starting a new game, but that can be tedious. With a small edit to the batch files, you can delete these old saves automatically. Just add the line `del %AppData%\sm64ex\*.bin` to the batch file, above the `start` command. For example, here is `offline.bat` with the additional line:
+
+`del %AppData%\sm64ex\*.bin`
+
+`start sm64.us.f3dex2e.exe --sm64ap_file %1`
+
+This extra line deletes any previous save data before opening the game. Don't worry about lost stars or checks - the AP server (or in the case of offline, the `.save` file) keeps track of your star count, unlocked keys/caps/cannons, and which locations have already been checked, so you won't have to redo them. At worst you'll have to rewatch the door unlocking animations, and catch the rabbit Mips twice for his first star again if you haven't yet collected the second one.
+
 ## Installation Troubleshooting
 
 Start the game from the command line to view helpful messages regarding SM64EX.
@@ -151,9 +166,8 @@ The Japanese Version should have no problem displaying these.
 
 ### Toad does not have an item for me.
 
-This happens on older builds when you load an existing file that had already received an item from that toad.
+This happens when you load an existing file that had already received an item from that toad.
 To resolve this, exit and start from a `NEW` file. The server will automatically restore your progress.
-Alternatively, updating your build will prevent this issue in the future.
 
 ### What happens if I lose connection?
 

worlds/stardew_valley/data/items.csv

@@ -819,7 +819,6 @@ id,name,classification,groups,mod_name
 5289,Prismatic Shard,filler,"RESOURCE_PACK",
 5290,Stardrop Tea,filler,"RESOURCE_PACK",
 5291,Resource Pack: 2 Artifact Trove,filler,"RESOURCE_PACK",
-5292,Resource Pack: 20 Cinder Shard,filler,"GINGER_ISLAND,RESOURCE_PACK",
 10001,Luck Level,progression,SKILL_LEVEL_UP,Luck Skill
 10002,Magic Level,progression,SKILL_LEVEL_UP,Magic
 10003,Socializing Level,progression,SKILL_LEVEL_UP,Socializing Skill

worlds/timespinner/Locations.py

@@ -207,7 +207,7 @@ def get_location_datas(player: Optional[int], options: Optional[TimespinnerOptio
             LocationData('Library', 'Library: Terminal 2 (Lachiem)',  1337156, lambda state: state.has('Tablet', player)),
             LocationData('Library', 'Library: Terminal 1 (Windaria)',  1337157, lambda state: state.has('Tablet', player)),
             # 1337158 Is lost in time
-            LocationData('Library', 'Library: Terminal 3 (Emperor Nuvius)',  1337159, lambda state: state.has('Tablet', player)),
+            LocationData('Library', 'Library: Terminal 3 (Emporer Nuvius)',  1337159, lambda state: state.has('Tablet', player)),
             LocationData('Library', 'Library: V terminal 1 (War of the Sisters)',  1337160, lambda state: state.has_all({'Tablet', 'Library Keycard V'}, player)),
             LocationData('Library', 'Library: V terminal 2 (Lake Desolation Map)',  1337161, lambda state: state.has_all({'Tablet', 'Library Keycard V'}, player)),
             LocationData('Library', 'Library: V terminal 3 (Vilete)',  1337162, lambda state: state.has_all({'Tablet', 'Library Keycard V'}, player)),