Update AutoWorld.py

Core: The Item Links fix to end them all
This puts the bandaid that was holding Item Links together for years back on. It's a bad solution But it's what we had previously, and the change away from this is what broke them So in the interest of 0.5.1 releasing this century, maybe we should just go with this.
2026-03-16 12:33:46 -07:00 · 2024-10-26 05:41:53 +02:00 · 2024-10-26 05:38:00 +02:00 · 2024-10-25 08:51:53 +02:00 · 2024-10-23 02:30:31 +02:00 · 2024-10-23 01:26:04 +02:00
9 changed files with 1099 additions and 1089 deletions
--- a/Utils.py
+++ b/Utils.py
@@ -423,7 +423,7 @@ class RestrictedUnpickler(pickle.Unpickler):
        if module == "NetUtils" and name in {"NetworkItem", "ClientStatus", "Hint", "SlotType", "NetworkSlot"}:
            return getattr(self.net_utils_module, name)
        # Options and Plando are unpickled by WebHost -> Generate
-        if module == "worlds.generic" and name in {"PlandoItem", "PlandoConnection"}:
+        if module == "worlds.generic" and name == "PlandoItem":
            if not self.generic_properties_module:
                self.generic_properties_module = importlib.import_module("worlds.generic")
            return getattr(self.generic_properties_module, name)
@@ -434,7 +434,7 @@ class RestrictedUnpickler(pickle.Unpickler):
            else:
                mod = importlib.import_module(module)
            obj = getattr(mod, name)
-            if issubclass(obj, self.options_module.Option):
+            if issubclass(obj, (self.options_module.Option, self.options_module.PlandoConnection)):
                return obj
        # Forbid everything else.
        raise pickle.UnpicklingError(f"global '{module}.{name}' is forbidden")
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,6 @@ import platform
 import shutil
 import sys
 import sysconfig
-import typing
 import warnings
 import zipfile
 import urllib.request
@@ -14,14 +13,14 @@ import json
 import threading
 import subprocess

-from collections.abc import Iterable
 from hashlib import sha3_512
 from pathlib import Path
+from typing import Dict, Iterable, List, Optional, Sequence, Set, Tuple, Union


 # This is a bit jank. We need cx-Freeze to be able to run anything from this script, so install it
+requirement = 'cx-Freeze==7.2.0'
 try:
-    requirement = 'cx-Freeze==7.2.0'
    import pkg_resources
    try:
        pkg_resources.require(requirement)
@@ -30,7 +29,7 @@ try:
        install_cx_freeze = True
 except ImportError:
    install_cx_freeze = True
-    pkg_resources = None  # type: ignore [assignment]
+    pkg_resources = None  # type: ignore[assignment]

 if install_cx_freeze:
    # check if pip is available
@@ -61,7 +60,7 @@ from Cython.Build import cythonize


 # On  Python < 3.10 LogicMixin is not currently supported.
-non_apworlds: set = {
+non_apworlds: Set[str] = {
    "A Link to the Past",
    "Adventure",
    "ArchipIDLE",
@@ -84,7 +83,7 @@ non_apworlds: set = {
 if sys.version_info < (3,10):
    non_apworlds.add("Hollow Knight")

-def download_SNI():
+def download_SNI() -> None:
    print("Updating SNI")
    machine_to_go = {
        "x86_64": "amd64",
@@ -114,8 +113,8 @@ def download_SNI():
    if source_url and source_url.endswith(".zip"):
        with urllib.request.urlopen(source_url) as download:
            with zipfile.ZipFile(io.BytesIO(download.read()), "r") as zf:
-                for member in zf.infolist():
-                    zf.extract(member, path="SNI")
+                for zf_member in zf.infolist():
+                    zf.extract(zf_member, path="SNI")
        print(f"Downloaded SNI from {source_url}")

    elif source_url and (source_url.endswith(".tar.xz") or source_url.endswith(".tar.gz")):
@@ -129,11 +128,13 @@ def download_SNI():
                        raise ValueError(f"Unexpected file '{member.name}' in {source_url}")
                    elif member.isdir() and not sni_dir:
                        sni_dir = member.name
-                    elif member.isfile() and not sni_dir or not member.name.startswith(sni_dir):
+                    elif member.isfile() and not sni_dir or sni_dir and not member.name.startswith(sni_dir):
                        raise ValueError(f"Expected folder before '{member.name}' in {source_url}")
                    elif member.isfile() and sni_dir:
                        tf.extract(member)
            # sadly SNI is in its own folder on non-windows, so we need to rename
+            if not sni_dir:
+                raise ValueError("Did not find SNI in archive")
            shutil.rmtree("SNI", True)
            os.rename(sni_dir, "SNI")
        print(f"Downloaded SNI from {source_url}")
@@ -145,7 +146,7 @@ def download_SNI():
        print(f"No SNI found for system spec {platform_name} {machine_name}")


-signtool: typing.Optional[str]
+signtool: Optional[str]
 if os.path.exists("X:/pw.txt"):
    print("Using signtool")
    with open("X:/pw.txt", encoding="utf-8-sig") as f:
@@ -197,13 +198,13 @@ extra_data = ["LICENSE", "data", "EnemizerCLI", "SNI"]
 extra_libs = ["libssl.so", "libcrypto.so"] if is_linux else []


-def remove_sprites_from_folder(folder):
+def remove_sprites_from_folder(folder: Path) -> None:
    for file in os.listdir(folder):
        if file != ".gitignore":
            os.remove(folder / file)


-def _threaded_hash(filepath):
+def _threaded_hash(filepath: Union[str, Path]) -> str:
    hasher = sha3_512()
    hasher.update(open(filepath, "rb").read())
    return base64.b85encode(hasher.digest()).decode()
@@ -217,11 +218,11 @@ class BuildCommand(setuptools.command.build.build):
    yes: bool
    last_yes: bool = False  # used by sub commands of build

-    def initialize_options(self):
+    def initialize_options(self) -> None:
        super().initialize_options()
        type(self).last_yes = self.yes = False

-    def finalize_options(self):
+    def finalize_options(self) -> None:
        super().finalize_options()
        type(self).last_yes = self.yes

@@ -233,27 +234,27 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
        ('extra-data=', None, 'Additional files to add.'),
    ]
    yes: bool
-    extra_data: Iterable  # [any] not available in 3.8
-    extra_libs: Iterable  # work around broken include_files
+    extra_data: Iterable[str]
+    extra_libs: Iterable[str]  # work around broken include_files

    buildfolder: Path
    libfolder: Path
    library: Path
    buildtime: datetime.datetime

-    def initialize_options(self):
+    def initialize_options(self) -> None:
        super().initialize_options()
        self.yes = BuildCommand.last_yes
        self.extra_data = []
        self.extra_libs = []

-    def finalize_options(self):
+    def finalize_options(self) -> None:
        super().finalize_options()
        self.buildfolder = self.build_exe
        self.libfolder = Path(self.buildfolder, "lib")
        self.library = Path(self.libfolder, "library.zip")

-    def installfile(self, path, subpath=None, keep_content: bool = False):
+    def installfile(self, path: Path, subpath: Optional[Union[str, Path]] = None, keep_content: bool = False) -> None:
        folder = self.buildfolder
        if subpath:
            folder /= subpath
@@ -268,7 +269,7 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
        else:
            print('Warning,', path, 'not found')

-    def create_manifest(self, create_hashes=False):
+    def create_manifest(self, create_hashes: bool = False) -> None:
        # Since the setup is now split into components and the manifest is not,
        # it makes most sense to just remove the hashes for now. Not aware of anyone using them.
        hashes = {}
@@ -290,7 +291,7 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
        json.dump(manifest, open(manifestpath, "wt"), indent=4)
        print("Created Manifest")

-    def run(self):
+    def run(self) -> None:
        # start downloading sni asap
        sni_thread = threading.Thread(target=download_SNI, name="SNI Downloader")
        sni_thread.start()
@@ -341,7 +342,7 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):

        # post build steps
        if is_windows:  # kivy_deps is win32 only, linux picks them up automatically
-            from kivy_deps import sdl2, glew
+            from kivy_deps import sdl2, glew  # type: ignore
            for folder in sdl2.dep_bins + glew.dep_bins:
                shutil.copytree(folder, self.libfolder, dirs_exist_ok=True)
                print(f"copying {folder} -> {self.libfolder}")
@@ -362,7 +363,7 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
            self.installfile(Path(data))

        # kivi data files
-        import kivy
+        import kivy  # type: ignore[import-untyped]
        shutil.copytree(os.path.join(os.path.dirname(kivy.__file__), "data"),
                        self.buildfolder / "data",
                        dirs_exist_ok=True)
@@ -372,7 +373,7 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
        from worlds.AutoWorld import AutoWorldRegister
        assert not non_apworlds - set(AutoWorldRegister.world_types), \
            f"Unknown world {non_apworlds - set(AutoWorldRegister.world_types)} designated for .apworld"
-        folders_to_remove: typing.List[str] = []
+        folders_to_remove: List[str] = []
        disabled_worlds_folder = "worlds_disabled"
        for entry in os.listdir(disabled_worlds_folder):
            if os.path.isdir(os.path.join(disabled_worlds_folder, entry)):
@@ -393,7 +394,7 @@ class BuildExeCommand(cx_Freeze.command.build_exe.build_exe):
                shutil.rmtree(world_directory)
        shutil.copyfile("meta.yaml", self.buildfolder / "Players" / "Templates" / "meta.yaml")
        try:
-            from maseya import z3pr
+            from maseya import z3pr  # type: ignore[import-untyped]
        except ImportError:
            print("Maseya Palette Shuffle not found, skipping data files.")
        else:
@@ -444,16 +445,16 @@ class AppImageCommand(setuptools.Command):
        ("app-exec=", None, "The application to run inside the image."),
        ("yes", "y", 'Answer "yes" to all questions.'),
    ]
-    build_folder: typing.Optional[Path]
-    dist_file: typing.Optional[Path]
-    app_dir: typing.Optional[Path]
+    build_folder: Optional[Path]
+    dist_file: Optional[Path]
+    app_dir: Optional[Path]
    app_name: str
-    app_exec: typing.Optional[Path]
-    app_icon: typing.Optional[Path]  # source file
+    app_exec: Optional[Path]
+    app_icon: Optional[Path]  # source file
    app_id: str  # lower case name, used for icon and .desktop
    yes: bool

-    def write_desktop(self):
+    def write_desktop(self) -> None:
        assert self.app_dir, "Invalid app_dir"
        desktop_filename = self.app_dir / f"{self.app_id}.desktop"
        with open(desktop_filename, 'w', encoding="utf-8") as f:
@@ -468,7 +469,7 @@ class AppImageCommand(setuptools.Command):
            )))
        desktop_filename.chmod(0o755)

-    def write_launcher(self, default_exe: Path):
+    def write_launcher(self, default_exe: Path) -> None:
        assert self.app_dir, "Invalid app_dir"
        launcher_filename = self.app_dir / "AppRun"
        with open(launcher_filename, 'w', encoding="utf-8") as f:
@@ -491,7 +492,7 @@ $APPDIR/$exe "$@"
 """)
        launcher_filename.chmod(0o755)

-    def install_icon(self, src: Path, name: typing.Optional[str] = None, symlink: typing.Optional[Path] = None):
+    def install_icon(self, src: Path, name: Optional[str] = None, symlink: Optional[Path] = None) -> None:
        assert self.app_dir, "Invalid app_dir"
        try:
            from PIL import Image
@@ -513,7 +514,8 @@ $APPDIR/$exe "$@"
        if symlink:
            symlink.symlink_to(dest_file.relative_to(symlink.parent))

-    def initialize_options(self):
+    def initialize_options(self) -> None:
+        assert self.distribution.metadata.name
        self.build_folder = None
        self.app_dir = None
        self.app_name = self.distribution.metadata.name
@@ -527,17 +529,22 @@ $APPDIR/$exe "$@"
        ))
        self.yes = False

-    def finalize_options(self):
+    def finalize_options(self) -> None:
+        assert self.build_folder
        if not self.app_dir:
            self.app_dir = self.build_folder.parent / "AppDir"
        self.app_id = self.app_name.lower()

-    def run(self):
+    def run(self) -> None:
+        assert self.build_folder and self.dist_file, "Command not properly set up"
+        assert (
+            self.app_icon and self.app_id and self.app_dir and self.app_exec and self.app_name
+        ), "AppImageCommand not properly set up"
        self.dist_file.parent.mkdir(parents=True, exist_ok=True)
        if self.app_dir.is_dir():
            shutil.rmtree(self.app_dir)
        self.app_dir.mkdir(parents=True)
-        opt_dir = self.app_dir / "opt" / self.distribution.metadata.name
+        opt_dir = self.app_dir / "opt" / self.app_name
        shutil.copytree(self.build_folder, opt_dir)
        root_icon = self.app_dir / f'{self.app_id}{self.app_icon.suffix}'
        self.install_icon(self.app_icon, self.app_id, symlink=root_icon)
@@ -548,7 +555,7 @@ $APPDIR/$exe "$@"
        subprocess.call(f'ARCH={build_arch} ./appimagetool -n "{self.app_dir}" "{self.dist_file}"', shell=True)


-def find_libs(*args: str) -> typing.Sequence[typing.Tuple[str, str]]:
+def find_libs(*args: str) -> Sequence[Tuple[str, str]]:
    """Try to find system libraries to be included."""
    if not args:
        return []
@@ -556,7 +563,7 @@ def find_libs(*args: str) -> typing.Sequence[typing.Tuple[str, str]]:
    arch = build_arch.replace('_', '-')
    libc = 'libc6'  # we currently don't support musl

-    def parse(line):
+    def parse(line: str) -> Tuple[Tuple[str, str, str], str]:
        lib, path = line.strip().split(' => ')
        lib, typ = lib.split(' ', 1)
        for test_arch in ('x86-64', 'i386', 'aarch64'):
@@ -577,26 +584,29 @@ def find_libs(*args: str) -> typing.Sequence[typing.Tuple[str, str]]:
        ldconfig = shutil.which("ldconfig")
        assert ldconfig, "Make sure ldconfig is in PATH"
        data = subprocess.run([ldconfig, "-p"], capture_output=True, text=True).stdout.split("\n")[1:]
-        find_libs.cache = {  # type: ignore [attr-defined]
+        find_libs.cache = {  # type: ignore[attr-defined]
            k: v for k, v in (parse(line) for line in data if "=>" in line)
        }

-    def find_lib(lib, arch, libc):
-        for k, v in find_libs.cache.items():
+    def find_lib(lib: str, arch: str, libc: str) -> Optional[str]:
+        cache: Dict[Tuple[str, str, str], str] = getattr(find_libs, "cache")
+        for k, v in cache.items():
            if k == (lib, arch, libc):
                return v
-        for k, v, in find_libs.cache.items():
+        for k, v, in cache.items():
            if k[0].startswith(lib) and k[1] == arch and k[2] == libc:
                return v
        return None

-    res = []
+    res: List[Tuple[str, str]] = []
    for arg in args:
        # try exact match, empty libc, empty arch, empty arch and libc
        file = find_lib(arg, arch, libc)
        file = file or find_lib(arg, arch, '')
        file = file or find_lib(arg, '', libc)
        file = file or find_lib(arg, '', '')
+        if not file:
+            raise ValueError(f"Could not find lib {arg}")
        # resolve symlinks
        for n in range(0, 5):
            res.append((file, os.path.join('lib', os.path.basename(file))))
--- a/worlds/AutoWorld.py
+++ b/worlds/AutoWorld.py
@@ -10,7 +10,7 @@ from dataclasses import make_dataclass
 from typing import (Any, Callable, ClassVar, Dict, FrozenSet, List, Mapping, Optional, Set, TextIO, Tuple,
                    TYPE_CHECKING, Type, Union)

-from Options import item_and_loc_options, OptionGroup, PerGameCommonOptions
+from Options import item_and_loc_options, ItemsAccessibility, OptionGroup, PerGameCommonOptions
 from BaseClasses import CollectionState

 if TYPE_CHECKING:
@@ -480,6 +480,7 @@ class World(metaclass=AutoWorldRegister):
        group = cls(multiworld, new_player_id)
        group.options = cls.options_dataclass(**{option_key: option.from_any(option.default)
                                                 for option_key, option in cls.options_dataclass.type_hints.items()})
+        group.options.accessibility = ItemsAccessibility(ItemsAccessibility.option_items)

        return group

--- a/worlds/hk/Options.py
+++ b/worlds/hk/Options.py
@@ -77,7 +77,7 @@ option_docstrings = {
    "RandomizeLoreTablets": "Randomize Lore items into the itempool, one per Lore Tablet, and place randomized item "
                            "grants on the tablets themselves.\n    You must still read the tablet to get the item.",
    "PreciseMovement": "Places skips into logic which require extremely precise player movement, possibly without "
-                       "movement skills such as\n    dash or hook.",
+                       "movement skills such as\n    dash or claw.",
    "ProficientCombat": "Places skips into logic which require proficient combat, possibly with limited items.",
    "BackgroundObjectPogos": "Places skips into logic for locations which are reachable via pogoing off of "
                             "background objects.",
--- a/worlds/tunic/init.py
+++ b/worlds/tunic/init.py
@@ -274,6 +274,12 @@ class TunicWorld(World):
                if items_to_create[page] > 0:
                    tunic_items.append(self.create_item(page, ItemClassification.useful))
                    items_to_create[page] = 0
+        # if ice grapple logic is on, probably really want icebolt
+        elif self.options.ice_grappling:
+            page = "Pages 52-53 (Icebolt)"
+            if items_to_create[page] > 0:
+                tunic_items.append(self.create_item(page, ItemClassification.progression | ItemClassification.useful))
+                items_to_create[page] = 0

        if self.options.maskless:
            tunic_items.append(self.create_item("Scavenger Mask", ItemClassification.useful))
--- a/worlds/tunic/items.py
+++ b/worlds/tunic/items.py
@@ -1,10 +1,10 @@
 from itertools import groupby
 from typing import Dict, List, Set, NamedTuple
-from BaseClasses import ItemClassification
+from BaseClasses import ItemClassification as IC


 class TunicItemData(NamedTuple):
-    classification: ItemClassification
+    classification: IC
    quantity_in_item_pool: int
    item_id_offset: int
    item_group: str = ""
@@ -13,157 +13,157 @@ class TunicItemData(NamedTuple):
 item_base_id = 509342400

 item_table: Dict[str, TunicItemData] = {
-    "Firecracker x2": TunicItemData(ItemClassification.filler, 3, 0, "Bombs"),
-    "Firecracker x3": TunicItemData(ItemClassification.filler, 3, 1, "Bombs"),
-    "Firecracker x4": TunicItemData(ItemClassification.filler, 3, 2, "Bombs"),
-    "Firecracker x5": TunicItemData(ItemClassification.filler, 1, 3, "Bombs"),
-    "Firecracker x6": TunicItemData(ItemClassification.filler, 2, 4, "Bombs"),
-    "Fire Bomb x2": TunicItemData(ItemClassification.filler, 2, 5, "Bombs"),
-    "Fire Bomb x3": TunicItemData(ItemClassification.filler, 1, 6, "Bombs"),
-    "Ice Bomb x2": TunicItemData(ItemClassification.filler, 2, 7, "Bombs"),
-    "Ice Bomb x3": TunicItemData(ItemClassification.filler, 2, 8, "Bombs"),
-    "Ice Bomb x5": TunicItemData(ItemClassification.filler, 1, 9, "Bombs"),
-    "Lure": TunicItemData(ItemClassification.filler, 4, 10, "Consumables"),
-    "Lure x2": TunicItemData(ItemClassification.filler, 1, 11, "Consumables"),
-    "Pepper x2": TunicItemData(ItemClassification.filler, 4, 12, "Consumables"),
-    "Ivy x3": TunicItemData(ItemClassification.filler, 2, 13, "Consumables"),
-    "Effigy": TunicItemData(ItemClassification.useful, 12, 14, "Money"),
-    "HP Berry": TunicItemData(ItemClassification.filler, 2, 15, "Consumables"),
-    "HP Berry x2": TunicItemData(ItemClassification.filler, 4, 16, "Consumables"),
-    "HP Berry x3": TunicItemData(ItemClassification.filler, 2, 17, "Consumables"),
-    "MP Berry": TunicItemData(ItemClassification.filler, 4, 18, "Consumables"),
-    "MP Berry x2": TunicItemData(ItemClassification.filler, 2, 19, "Consumables"),
-    "MP Berry x3": TunicItemData(ItemClassification.filler, 7, 20, "Consumables"),
-    "Fairy": TunicItemData(ItemClassification.progression, 20, 21),
-    "Stick": TunicItemData(ItemClassification.progression, 1, 22, "Weapons"),
-    "Sword": TunicItemData(ItemClassification.progression, 3, 23, "Weapons"),
-    "Sword Upgrade": TunicItemData(ItemClassification.progression, 4, 24, "Weapons"),
-    "Magic Wand": TunicItemData(ItemClassification.progression, 1, 25, "Weapons"),
-    "Magic Dagger": TunicItemData(ItemClassification.progression, 1, 26),
-    "Magic Orb": TunicItemData(ItemClassification.progression, 1, 27),
-    "Hero's Laurels": TunicItemData(ItemClassification.progression, 1, 28),
-    "Lantern": TunicItemData(ItemClassification.progression, 1, 29),
-    "Gun": TunicItemData(ItemClassification.progression, 1, 30, "Weapons"),
-    "Shield": TunicItemData(ItemClassification.useful, 1, 31),
-    "Dath Stone": TunicItemData(ItemClassification.useful, 1, 32),
-    "Hourglass": TunicItemData(ItemClassification.useful, 1, 33),
-    "Old House Key": TunicItemData(ItemClassification.progression, 1, 34, "Keys"),
-    "Key": TunicItemData(ItemClassification.progression, 2, 35, "Keys"),
-    "Fortress Vault Key": TunicItemData(ItemClassification.progression, 1, 36, "Keys"),
-    "Flask Shard": TunicItemData(ItemClassification.useful, 12, 37),
-    "Potion Flask": TunicItemData(ItemClassification.useful, 5, 38, "Flask"),
-    "Golden Coin": TunicItemData(ItemClassification.progression, 17, 39),
-    "Card Slot": TunicItemData(ItemClassification.useful, 4, 40),
-    "Red Questagon": TunicItemData(ItemClassification.progression_skip_balancing, 1, 41, "Hexagons"),
-    "Green Questagon": TunicItemData(ItemClassification.progression_skip_balancing, 1, 42, "Hexagons"),
-    "Blue Questagon": TunicItemData(ItemClassification.progression_skip_balancing, 1, 43, "Hexagons"),
-    "Gold Questagon": TunicItemData(ItemClassification.progression_skip_balancing, 0, 44, "Hexagons"),
-    "ATT Offering": TunicItemData(ItemClassification.useful, 4, 45, "Offerings"),
-    "DEF Offering": TunicItemData(ItemClassification.useful, 4, 46, "Offerings"),
-    "Potion Offering": TunicItemData(ItemClassification.useful, 3, 47, "Offerings"),
-    "HP Offering": TunicItemData(ItemClassification.useful, 6, 48, "Offerings"),
-    "MP Offering": TunicItemData(ItemClassification.useful, 3, 49, "Offerings"),
-    "SP Offering": TunicItemData(ItemClassification.useful, 2, 50, "Offerings"),
-    "Hero Relic - ATT": TunicItemData(ItemClassification.progression_skip_balancing, 1, 51, "Hero Relics"),
-    "Hero Relic - DEF": TunicItemData(ItemClassification.progression_skip_balancing, 1, 52, "Hero Relics"),
-    "Hero Relic - HP": TunicItemData(ItemClassification.progression_skip_balancing, 1, 53, "Hero Relics"),
-    "Hero Relic - MP": TunicItemData(ItemClassification.progression_skip_balancing, 1, 54, "Hero Relics"),
-    "Hero Relic - POTION": TunicItemData(ItemClassification.progression_skip_balancing, 1, 55, "Hero Relics"),
-    "Hero Relic - SP": TunicItemData(ItemClassification.progression_skip_balancing, 1, 56, "Hero Relics"),
-    "Orange Peril Ring": TunicItemData(ItemClassification.useful, 1, 57, "Cards"),
-    "Tincture": TunicItemData(ItemClassification.useful, 1, 58, "Cards"),
-    "Scavenger Mask": TunicItemData(ItemClassification.progression, 1, 59, "Cards"),
-    "Cyan Peril Ring": TunicItemData(ItemClassification.useful, 1, 60, "Cards"),
-    "Bracer": TunicItemData(ItemClassification.useful, 1, 61, "Cards"),
-    "Dagger Strap": TunicItemData(ItemClassification.useful, 1, 62, "Cards"),
-    "Inverted Ash": TunicItemData(ItemClassification.useful, 1, 63, "Cards"),
-    "Lucky Cup": TunicItemData(ItemClassification.useful, 1, 64, "Cards"),
-    "Magic Echo": TunicItemData(ItemClassification.useful, 1, 65, "Cards"),
-    "Anklet": TunicItemData(ItemClassification.useful, 1, 66, "Cards"),
-    "Muffling Bell": TunicItemData(ItemClassification.useful, 1, 67, "Cards"),
-    "Glass Cannon": TunicItemData(ItemClassification.useful, 1, 68, "Cards"),
-    "Perfume": TunicItemData(ItemClassification.useful, 1, 69, "Cards"),
-    "Louder Echo": TunicItemData(ItemClassification.useful, 1, 70, "Cards"),
-    "Aura's Gem": TunicItemData(ItemClassification.useful, 1, 71, "Cards"),
-    "Bone Card": TunicItemData(ItemClassification.useful, 1, 72, "Cards"),
-    "Mr Mayor": TunicItemData(ItemClassification.useful, 1, 73, "Golden Treasures"),
-    "Secret Legend": TunicItemData(ItemClassification.useful, 1, 74, "Golden Treasures"),
-    "Sacred Geometry": TunicItemData(ItemClassification.useful, 1, 75, "Golden Treasures"),
-    "Vintage": TunicItemData(ItemClassification.useful, 1, 76, "Golden Treasures"),
-    "Just Some Pals": TunicItemData(ItemClassification.useful, 1, 77, "Golden Treasures"),
-    "Regal Weasel": TunicItemData(ItemClassification.useful, 1, 78, "Golden Treasures"),
-    "Spring Falls": TunicItemData(ItemClassification.useful, 1, 79, "Golden Treasures"),
-    "Power Up": TunicItemData(ItemClassification.useful, 1, 80, "Golden Treasures"),
-    "Back To Work": TunicItemData(ItemClassification.useful, 1, 81, "Golden Treasures"),
-    "Phonomath": TunicItemData(ItemClassification.useful, 1, 82, "Golden Treasures"),
-    "Dusty": TunicItemData(ItemClassification.useful, 1, 83, "Golden Treasures"),
-    "Forever Friend": TunicItemData(ItemClassification.useful, 1, 84, "Golden Treasures"),
-    "Fool Trap": TunicItemData(ItemClassification.trap, 0, 85),
-    "Money x1": TunicItemData(ItemClassification.filler, 3, 86, "Money"),
-    "Money x10": TunicItemData(ItemClassification.filler, 1, 87, "Money"),
-    "Money x15": TunicItemData(ItemClassification.filler, 10, 88, "Money"),
-    "Money x16": TunicItemData(ItemClassification.filler, 1, 89, "Money"),
-    "Money x20": TunicItemData(ItemClassification.filler, 17, 90, "Money"),
-    "Money x25": TunicItemData(ItemClassification.filler, 14, 91, "Money"),
-    "Money x30": TunicItemData(ItemClassification.filler, 4, 92, "Money"),
-    "Money x32": TunicItemData(ItemClassification.filler, 4, 93, "Money"),
-    "Money x40": TunicItemData(ItemClassification.filler, 3, 94, "Money"),
-    "Money x48": TunicItemData(ItemClassification.filler, 1, 95, "Money"),
-    "Money x50": TunicItemData(ItemClassification.filler, 7, 96, "Money"),
-    "Money x64": TunicItemData(ItemClassification.filler, 1, 97, "Money"),
-    "Money x100": TunicItemData(ItemClassification.filler, 5, 98, "Money"),
-    "Money x128": TunicItemData(ItemClassification.useful, 3, 99, "Money"),
-    "Money x200": TunicItemData(ItemClassification.useful, 1, 100, "Money"),
-    "Money x255": TunicItemData(ItemClassification.useful, 1, 101, "Money"),
-    "Pages 0-1": TunicItemData(ItemClassification.useful, 1, 102, "Pages"),
-    "Pages 2-3": TunicItemData(ItemClassification.useful, 1, 103, "Pages"),
-    "Pages 4-5": TunicItemData(ItemClassification.useful, 1, 104, "Pages"),
-    "Pages 6-7": TunicItemData(ItemClassification.useful, 1, 105, "Pages"),
-    "Pages 8-9": TunicItemData(ItemClassification.useful, 1, 106, "Pages"),
-    "Pages 10-11": TunicItemData(ItemClassification.useful, 1, 107, "Pages"),
-    "Pages 12-13": TunicItemData(ItemClassification.useful, 1, 108, "Pages"),
-    "Pages 14-15": TunicItemData(ItemClassification.useful, 1, 109, "Pages"),
-    "Pages 16-17": TunicItemData(ItemClassification.useful, 1, 110, "Pages"),
-    "Pages 18-19": TunicItemData(ItemClassification.useful, 1, 111, "Pages"),
-    "Pages 20-21": TunicItemData(ItemClassification.useful, 1, 112, "Pages"),
-    "Pages 22-23": TunicItemData(ItemClassification.useful, 1, 113, "Pages"),
-    "Pages 24-25 (Prayer)": TunicItemData(ItemClassification.progression, 1, 114, "Pages"),
-    "Pages 26-27": TunicItemData(ItemClassification.useful, 1, 115, "Pages"),
-    "Pages 28-29": TunicItemData(ItemClassification.useful, 1, 116, "Pages"),
-    "Pages 30-31": TunicItemData(ItemClassification.useful, 1, 117, "Pages"),
-    "Pages 32-33": TunicItemData(ItemClassification.useful, 1, 118, "Pages"),
-    "Pages 34-35": TunicItemData(ItemClassification.useful, 1, 119, "Pages"),
-    "Pages 36-37": TunicItemData(ItemClassification.useful, 1, 120, "Pages"),
-    "Pages 38-39": TunicItemData(ItemClassification.useful, 1, 121, "Pages"),
-    "Pages 40-41": TunicItemData(ItemClassification.useful, 1, 122, "Pages"),
-    "Pages 42-43 (Holy Cross)": TunicItemData(ItemClassification.progression, 1, 123, "Pages"),
-    "Pages 44-45": TunicItemData(ItemClassification.useful, 1, 124, "Pages"),
-    "Pages 46-47": TunicItemData(ItemClassification.useful, 1, 125, "Pages"),
-    "Pages 48-49": TunicItemData(ItemClassification.useful, 1, 126, "Pages"),
-    "Pages 50-51": TunicItemData(ItemClassification.useful, 1, 127, "Pages"),
-    "Pages 52-53 (Icebolt)": TunicItemData(ItemClassification.progression, 1, 128, "Pages"),
-    "Pages 54-55": TunicItemData(ItemClassification.useful, 1, 129, "Pages"),
-    "Ladders near Weathervane": TunicItemData(ItemClassification.progression, 0, 130, "Ladders"),
-    "Ladders near Overworld Checkpoint": TunicItemData(ItemClassification.progression, 0, 131, "Ladders"),
-    "Ladders near Patrol Cave": TunicItemData(ItemClassification.progression, 0, 132, "Ladders"),
-    "Ladder near Temple Rafters": TunicItemData(ItemClassification.progression, 0, 133, "Ladders"),
-    "Ladders near Dark Tomb": TunicItemData(ItemClassification.progression, 0, 134, "Ladders"),
-    "Ladder to Quarry": TunicItemData(ItemClassification.progression, 0, 135, "Ladders"),
-    "Ladders to West Bell": TunicItemData(ItemClassification.progression, 0, 136, "Ladders"),
-    "Ladders in Overworld Town": TunicItemData(ItemClassification.progression, 0, 137, "Ladders"),
-    "Ladder to Ruined Atoll": TunicItemData(ItemClassification.progression, 0, 138, "Ladders"),
-    "Ladder to Swamp": TunicItemData(ItemClassification.progression, 0, 139, "Ladders"),
-    "Ladders in Well": TunicItemData(ItemClassification.progression, 0, 140, "Ladders"),
-    "Ladder in Dark Tomb": TunicItemData(ItemClassification.progression, 0, 141, "Ladders"),
-    "Ladder to East Forest": TunicItemData(ItemClassification.progression, 0, 142, "Ladders"),
-    "Ladders to Lower Forest": TunicItemData(ItemClassification.progression, 0, 143, "Ladders"),
-    "Ladder to Beneath the Vault": TunicItemData(ItemClassification.progression, 0, 144, "Ladders"),
-    "Ladders in Hourglass Cave": TunicItemData(ItemClassification.progression, 0, 145, "Ladders"),
-    "Ladders in South Atoll": TunicItemData(ItemClassification.progression, 0, 146, "Ladders"),
-    "Ladders to Frog's Domain": TunicItemData(ItemClassification.progression, 0, 147, "Ladders"),
-    "Ladders in Library": TunicItemData(ItemClassification.progression, 0, 148, "Ladders"),
-    "Ladders in Lower Quarry": TunicItemData(ItemClassification.progression, 0, 149, "Ladders"),
-    "Ladders in Swamp": TunicItemData(ItemClassification.progression, 0, 150, "Ladders"),
+    "Firecracker x2": TunicItemData(IC.filler, 3, 0, "Bombs"),
+    "Firecracker x3": TunicItemData(IC.filler, 3, 1, "Bombs"),
+    "Firecracker x4": TunicItemData(IC.filler, 3, 2, "Bombs"),
+    "Firecracker x5": TunicItemData(IC.filler, 1, 3, "Bombs"),
+    "Firecracker x6": TunicItemData(IC.filler, 2, 4, "Bombs"),
+    "Fire Bomb x2": TunicItemData(IC.filler, 2, 5, "Bombs"),
+    "Fire Bomb x3": TunicItemData(IC.filler, 1, 6, "Bombs"),
+    "Ice Bomb x2": TunicItemData(IC.filler, 2, 7, "Bombs"),
+    "Ice Bomb x3": TunicItemData(IC.filler, 2, 8, "Bombs"),
+    "Ice Bomb x5": TunicItemData(IC.filler, 1, 9, "Bombs"),
+    "Lure": TunicItemData(IC.filler, 4, 10, "Consumables"),
+    "Lure x2": TunicItemData(IC.filler, 1, 11, "Consumables"),
+    "Pepper x2": TunicItemData(IC.filler, 4, 12, "Consumables"),
+    "Ivy x3": TunicItemData(IC.filler, 2, 13, "Consumables"),
+    "Effigy": TunicItemData(IC.useful, 12, 14, "Money"),
+    "HP Berry": TunicItemData(IC.filler, 2, 15, "Consumables"),
+    "HP Berry x2": TunicItemData(IC.filler, 4, 16, "Consumables"),
+    "HP Berry x3": TunicItemData(IC.filler, 2, 17, "Consumables"),
+    "MP Berry": TunicItemData(IC.filler, 4, 18, "Consumables"),
+    "MP Berry x2": TunicItemData(IC.filler, 2, 19, "Consumables"),
+    "MP Berry x3": TunicItemData(IC.filler, 7, 20, "Consumables"),
+    "Fairy": TunicItemData(IC.progression, 20, 21),
+    "Stick": TunicItemData(IC.progression | IC.useful, 1, 22, "Weapons"),
+    "Sword": TunicItemData(IC.progression | IC.useful, 3, 23, "Weapons"),
+    "Sword Upgrade": TunicItemData(IC.progression | IC.useful, 4, 24, "Weapons"),
+    "Magic Wand": TunicItemData(IC.progression | IC.useful, 1, 25, "Weapons"),
+    "Magic Dagger": TunicItemData(IC.progression | IC.useful, 1, 26),
+    "Magic Orb": TunicItemData(IC.progression | IC.useful, 1, 27),
+    "Hero's Laurels": TunicItemData(IC.progression | IC.useful, 1, 28),
+    "Lantern": TunicItemData(IC.progression, 1, 29),
+    "Gun": TunicItemData(IC.progression | IC.useful, 1, 30, "Weapons"),
+    "Shield": TunicItemData(IC.useful, 1, 31),
+    "Dath Stone": TunicItemData(IC.useful, 1, 32),
+    "Hourglass": TunicItemData(IC.useful, 1, 33),
+    "Old House Key": TunicItemData(IC.progression, 1, 34, "Keys"),
+    "Key": TunicItemData(IC.progression, 2, 35, "Keys"),
+    "Fortress Vault Key": TunicItemData(IC.progression, 1, 36, "Keys"),
+    "Flask Shard": TunicItemData(IC.useful, 12, 37),
+    "Potion Flask": TunicItemData(IC.useful, 5, 38, "Flask"),
+    "Golden Coin": TunicItemData(IC.progression, 17, 39),
+    "Card Slot": TunicItemData(IC.useful, 4, 40),
+    "Red Questagon": TunicItemData(IC.progression_skip_balancing, 1, 41, "Hexagons"),
+    "Green Questagon": TunicItemData(IC.progression_skip_balancing, 1, 42, "Hexagons"),
+    "Blue Questagon": TunicItemData(IC.progression_skip_balancing, 1, 43, "Hexagons"),
+    "Gold Questagon": TunicItemData(IC.progression_skip_balancing, 0, 44, "Hexagons"),
+    "ATT Offering": TunicItemData(IC.useful, 4, 45, "Offerings"),
+    "DEF Offering": TunicItemData(IC.useful, 4, 46, "Offerings"),
+    "Potion Offering": TunicItemData(IC.useful, 3, 47, "Offerings"),
+    "HP Offering": TunicItemData(IC.useful, 6, 48, "Offerings"),
+    "MP Offering": TunicItemData(IC.useful, 3, 49, "Offerings"),
+    "SP Offering": TunicItemData(IC.useful, 2, 50, "Offerings"),
+    "Hero Relic - ATT": TunicItemData(IC.progression_skip_balancing, 1, 51, "Hero Relics"),
+    "Hero Relic - DEF": TunicItemData(IC.progression_skip_balancing, 1, 52, "Hero Relics"),
+    "Hero Relic - HP": TunicItemData(IC.progression_skip_balancing, 1, 53, "Hero Relics"),
+    "Hero Relic - MP": TunicItemData(IC.progression_skip_balancing, 1, 54, "Hero Relics"),
+    "Hero Relic - POTION": TunicItemData(IC.progression_skip_balancing, 1, 55, "Hero Relics"),
+    "Hero Relic - SP": TunicItemData(IC.progression_skip_balancing, 1, 56, "Hero Relics"),
+    "Orange Peril Ring": TunicItemData(IC.useful, 1, 57, "Cards"),
+    "Tincture": TunicItemData(IC.useful, 1, 58, "Cards"),
+    "Scavenger Mask": TunicItemData(IC.progression, 1, 59, "Cards"),
+    "Cyan Peril Ring": TunicItemData(IC.useful, 1, 60, "Cards"),
+    "Bracer": TunicItemData(IC.useful, 1, 61, "Cards"),
+    "Dagger Strap": TunicItemData(IC.useful, 1, 62, "Cards"),
+    "Inverted Ash": TunicItemData(IC.useful, 1, 63, "Cards"),
+    "Lucky Cup": TunicItemData(IC.useful, 1, 64, "Cards"),
+    "Magic Echo": TunicItemData(IC.useful, 1, 65, "Cards"),
+    "Anklet": TunicItemData(IC.useful, 1, 66, "Cards"),
+    "Muffling Bell": TunicItemData(IC.useful, 1, 67, "Cards"),
+    "Glass Cannon": TunicItemData(IC.useful, 1, 68, "Cards"),
+    "Perfume": TunicItemData(IC.useful, 1, 69, "Cards"),
+    "Louder Echo": TunicItemData(IC.useful, 1, 70, "Cards"),
+    "Aura's Gem": TunicItemData(IC.useful, 1, 71, "Cards"),
+    "Bone Card": TunicItemData(IC.useful, 1, 72, "Cards"),
+    "Mr Mayor": TunicItemData(IC.useful, 1, 73, "Golden Treasures"),
+    "Secret Legend": TunicItemData(IC.useful, 1, 74, "Golden Treasures"),
+    "Sacred Geometry": TunicItemData(IC.useful, 1, 75, "Golden Treasures"),
+    "Vintage": TunicItemData(IC.useful, 1, 76, "Golden Treasures"),
+    "Just Some Pals": TunicItemData(IC.useful, 1, 77, "Golden Treasures"),
+    "Regal Weasel": TunicItemData(IC.useful, 1, 78, "Golden Treasures"),
+    "Spring Falls": TunicItemData(IC.useful, 1, 79, "Golden Treasures"),
+    "Power Up": TunicItemData(IC.useful, 1, 80, "Golden Treasures"),
+    "Back To Work": TunicItemData(IC.useful, 1, 81, "Golden Treasures"),
+    "Phonomath": TunicItemData(IC.useful, 1, 82, "Golden Treasures"),
+    "Dusty": TunicItemData(IC.useful, 1, 83, "Golden Treasures"),
+    "Forever Friend": TunicItemData(IC.useful, 1, 84, "Golden Treasures"),
+    "Fool Trap": TunicItemData(IC.trap, 0, 85),
+    "Money x1": TunicItemData(IC.filler, 3, 86, "Money"),
+    "Money x10": TunicItemData(IC.filler, 1, 87, "Money"),
+    "Money x15": TunicItemData(IC.filler, 10, 88, "Money"),
+    "Money x16": TunicItemData(IC.filler, 1, 89, "Money"),
+    "Money x20": TunicItemData(IC.filler, 17, 90, "Money"),
+    "Money x25": TunicItemData(IC.filler, 14, 91, "Money"),
+    "Money x30": TunicItemData(IC.filler, 4, 92, "Money"),
+    "Money x32": TunicItemData(IC.filler, 4, 93, "Money"),
+    "Money x40": TunicItemData(IC.filler, 3, 94, "Money"),
+    "Money x48": TunicItemData(IC.filler, 1, 95, "Money"),
+    "Money x50": TunicItemData(IC.filler, 7, 96, "Money"),
+    "Money x64": TunicItemData(IC.filler, 1, 97, "Money"),
+    "Money x100": TunicItemData(IC.filler, 5, 98, "Money"),
+    "Money x128": TunicItemData(IC.useful, 3, 99, "Money"),
+    "Money x200": TunicItemData(IC.useful, 1, 100, "Money"),
+    "Money x255": TunicItemData(IC.useful, 1, 101, "Money"),
+    "Pages 0-1": TunicItemData(IC.useful, 1, 102, "Pages"),
+    "Pages 2-3": TunicItemData(IC.useful, 1, 103, "Pages"),
+    "Pages 4-5": TunicItemData(IC.useful, 1, 104, "Pages"),
+    "Pages 6-7": TunicItemData(IC.useful, 1, 105, "Pages"),
+    "Pages 8-9": TunicItemData(IC.useful, 1, 106, "Pages"),
+    "Pages 10-11": TunicItemData(IC.useful, 1, 107, "Pages"),
+    "Pages 12-13": TunicItemData(IC.useful, 1, 108, "Pages"),
+    "Pages 14-15": TunicItemData(IC.useful, 1, 109, "Pages"),
+    "Pages 16-17": TunicItemData(IC.useful, 1, 110, "Pages"),
+    "Pages 18-19": TunicItemData(IC.useful, 1, 111, "Pages"),
+    "Pages 20-21": TunicItemData(IC.useful, 1, 112, "Pages"),
+    "Pages 22-23": TunicItemData(IC.useful, 1, 113, "Pages"),
+    "Pages 24-25 (Prayer)": TunicItemData(IC.progression | IC.useful, 1, 114, "Pages"),
+    "Pages 26-27": TunicItemData(IC.useful, 1, 115, "Pages"),
+    "Pages 28-29": TunicItemData(IC.useful, 1, 116, "Pages"),
+    "Pages 30-31": TunicItemData(IC.useful, 1, 117, "Pages"),
+    "Pages 32-33": TunicItemData(IC.useful, 1, 118, "Pages"),
+    "Pages 34-35": TunicItemData(IC.useful, 1, 119, "Pages"),
+    "Pages 36-37": TunicItemData(IC.useful, 1, 120, "Pages"),
+    "Pages 38-39": TunicItemData(IC.useful, 1, 121, "Pages"),
+    "Pages 40-41": TunicItemData(IC.useful, 1, 122, "Pages"),
+    "Pages 42-43 (Holy Cross)": TunicItemData(IC.progression | IC.useful, 1, 123, "Pages"),
+    "Pages 44-45": TunicItemData(IC.useful, 1, 124, "Pages"),
+    "Pages 46-47": TunicItemData(IC.useful, 1, 125, "Pages"),
+    "Pages 48-49": TunicItemData(IC.useful, 1, 126, "Pages"),
+    "Pages 50-51": TunicItemData(IC.useful, 1, 127, "Pages"),
+    "Pages 52-53 (Icebolt)": TunicItemData(IC.progression, 1, 128, "Pages"),
+    "Pages 54-55": TunicItemData(IC.useful, 1, 129, "Pages"),
+    "Ladders near Weathervane": TunicItemData(IC.progression, 0, 130, "Ladders"),
+    "Ladders near Overworld Checkpoint": TunicItemData(IC.progression, 0, 131, "Ladders"),
+    "Ladders near Patrol Cave": TunicItemData(IC.progression, 0, 132, "Ladders"),
+    "Ladder near Temple Rafters": TunicItemData(IC.progression, 0, 133, "Ladders"),
+    "Ladders near Dark Tomb": TunicItemData(IC.progression, 0, 134, "Ladders"),
+    "Ladder to Quarry": TunicItemData(IC.progression, 0, 135, "Ladders"),
+    "Ladders to West Bell": TunicItemData(IC.progression, 0, 136, "Ladders"),
+    "Ladders in Overworld Town": TunicItemData(IC.progression, 0, 137, "Ladders"),
+    "Ladder to Ruined Atoll": TunicItemData(IC.progression, 0, 138, "Ladders"),
+    "Ladder to Swamp": TunicItemData(IC.progression, 0, 139, "Ladders"),
+    "Ladders in Well": TunicItemData(IC.progression, 0, 140, "Ladders"),
+    "Ladder in Dark Tomb": TunicItemData(IC.progression, 0, 141, "Ladders"),
+    "Ladder to East Forest": TunicItemData(IC.progression, 0, 142, "Ladders"),
+    "Ladders to Lower Forest": TunicItemData(IC.progression, 0, 143, "Ladders"),
+    "Ladder to Beneath the Vault": TunicItemData(IC.progression, 0, 144, "Ladders"),
+    "Ladders in Hourglass Cave": TunicItemData(IC.progression, 0, 145, "Ladders"),
+    "Ladders in South Atoll": TunicItemData(IC.progression, 0, 146, "Ladders"),
+    "Ladders to Frog's Domain": TunicItemData(IC.progression, 0, 147, "Ladders"),
+    "Ladders in Library": TunicItemData(IC.progression, 0, 148, "Ladders"),
+    "Ladders in Lower Quarry": TunicItemData(IC.progression, 0, 149, "Ladders"),
+    "Ladders in Swamp": TunicItemData(IC.progression, 0, 150, "Ladders"),
 }

 # items to be replaced by fool traps
@@ -208,7 +208,7 @@ slot_data_item_names = [

 item_name_to_id: Dict[str, int] = {name: item_base_id + data.item_id_offset for name, data in item_table.items()}

-filler_items: List[str] = [name for name, data in item_table.items() if data.classification == ItemClassification.filler]
+filler_items: List[str] = [name for name, data in item_table.items() if data.classification == IC.filler]


 def get_item_group(item_name: str) -> str:
--- a/worlds/yachtdice/Rules.py
+++ b/worlds/yachtdice/Rules.py
@@ -101,14 +101,15 @@ def dice_simulation_strings(categories, num_dice, num_rolls, fixed_mult, step_mu
        return yachtdice_cache[player][tup]

    # sort categories because for the step multiplier, you will want low-scoring categories first
-    categories.sort(key=lambda category: category.mean_score(num_dice, num_rolls))
+    # to avoid errors with order changing when obtaining rolls, we order assuming 4 rolls
+    categories.sort(key=lambda category: category.mean_score(num_dice, 4))

    # function to add two discrete distribution.
    # defaultdict is a dict where you don't need to check if an id is present, you can just use += (lot faster)
    def add_distributions(dist1, dist2):
        combined_dist = defaultdict(float)
-        for val1, prob1 in dist1.items():
-            for val2, prob2 in dist2.items():
+        for val2, prob2 in dist2.items():
+            for val1, prob1 in dist1.items():
                combined_dist[val1 + val2] += prob1 * prob2
        return dict(combined_dist)

--- a/worlds/yachtdice/YachtWeights.py
+++ b/worlds/yachtdice/YachtWeights.py
--- a/worlds/yachtdice/init.py
+++ b/worlds/yachtdice/init.py
@@ -56,7 +56,7 @@ class YachtDiceWorld(World):

    item_name_groups = item_groups

-    ap_world_version = "2.1.3"
+    ap_world_version = "2.1.4"

    def _get_yachtdice_data(self):
        return {
@@ -468,7 +468,7 @@ class YachtDiceWorld(World):
        menu.exits.append(connection)
        connection.connect(board)
        self.multiworld.regions += [menu, board]
-        
+
    def get_filler_item_name(self) -> str:
        return "Good RNG"
Author	SHA1	Message	Date
NewSoupVi	1357e32afe	Update AutoWorld.py	2024-10-26 05:41:53 +02:00
NewSoupVi	511bb212ed	Core: The Item Links fix to end them all This puts the bandaid that was holding Item Links together for years back on. It's a bad solution But it's what we had previously, and the change away from this is what broke them So in the interest of 0.5.1 releasing this century, maybe we should just go with this.	2024-10-26 05:38:00 +02:00
black-sliver	77ee6d73bc	Setup: more typing (#4089 )	2024-10-25 08:51:53 +02:00
Scipio Wright	33daebef57	TUNIC: Add prog + useful to some items #4066	2024-10-23 02:30:31 +02:00
Nocallia	05ec14e23c	HK: Replace "Hook" in PreciseMovement description to "Claw" (#4078 )	2024-10-23 01:26:04 +02:00
Silvris	049a8780b5	Core: fix pickling plando connections (#4054 ) * shift plando pickle hack * Update Utils.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> --------- Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>	2024-10-22 21:08:25 +02:00
Spineraks	703e3393a6	Yacht Dice: Fix logic (again) so that score doesn't drop when receiving item (#4044 ) * Add the yacht dice (from other git) world to the yacht dice fork * Update .gitignore * Removed zillion because it doesn't work * Update .gitignore * added zillion again... * Now you can have 0 extra fragments * Added alt categories, also options * Added item categories * Extra categories are now working! 🐶 * changed options and added exceptions * Testing if I change the generate.py * Revert "Testing if I change the generate.py" This reverts commit `7c2b3df617`. * ignore gitignore * Delete .gitignore * Update .gitignore * Update .gitignore * Update logic, added multiplicative categories * Changed difficulties * Update offline mode so that it works again * Adjusted difficulty * New version of the apworld, with 1000 as final score, always Will still need to check difficulty and weights of adding items. Website is not ready yet, so this version is not usable yet :) * Changed yaml and small bug fixes Fix when goal and max are same Options: changed chance to weight * no changes, just whitespaces * changed how logic works Now you put an array of mults and the cpu gets a couple of tries * Changed logic, tweaked a bit too * Preparation for 2.0 * logic tweak * Logic for alt categories properly now * Update setup_en.md * Update en_YachtDice.md * Improve performance of add_distributions * Formatting style * restore gitignore to APMW * Tweaked generation parameters and methods * Version 2.0.3 manual input option max score in logic always 2.0.3 faster gen * Comments and editing * Renamed setup guide * Improved create_items code * init of locations: remove self.event line * Moved setting early items to generate_early * Add my name to CODEOWNERS * Added Yacht Dice to the readme in list of games * Improve performance of Yacht Dice * newline * Improve typing * This is actually just slower lol * Update worlds/yachtdice/Items.py Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> * Update Options.py * Styling * finished text whichstory option * removed roll and rollfragments; not used * import; worlds not world :) * Option groups! * ruff styling, fix * ruff format styling! * styling and capitalization of options * small comment * Cleaned up the "state_is_a_list" a little bit * RUFF 🐶 * Changed filling the itempool for efficiency Now, we start with 17 extra items in the item pool, it's quite likely you need at least 17 items (~80%?). And then afterwards, we delete items if we overshoot the target of 1000, and add items if we haven't reached an achievable score of 1000 yet. Also, no need to recompute the entire logic when adding points. * 🐶 * Removed plando "fix" * Changed indent of score multiplier * faster location function * Comments to docstrings * fixed making location closest to goal_score be goal_score * options format * iterate keys and values of a dict together * small optimization ListState * faster collection of categories * return arguments instead of making a list (will 🐶 later) * Instead of turning it into a tuple, you can just make a tuple literal * remove .keys() * change .random and used enumerate * some readability improvements * Remove location "0", we don't use that one * Remove lookup_id_to_name entirely I for sure don't use it, and as far as I know it's not one of the mandatory functions for AP, these are item_name_to_id and location_name_to_id. * .append instead of += for single items, percentile function changed Also an extra comment for location ids. * remove ) too many * Removed sorted from category list * Hash categories (which makes it slower :( ) Maybe I messed up or misunderstood... I'll revert this right away since it is 2x slower, probably because of sorted instead of sort? * Revert "Hash categories (which makes it slower :( )" This reverts commit `34f2c1aed8`. * temporary push: 40% faster generation test Small changes in logic make the generation 40% faster. I'll have to think about how big the changes are. I suspect they are rather limited. If this is the way to go, I'll remove the temp file and redo the YachtWeights file, I'll remove the functions there and just put the new weights here. * Add Points item category * Reverse changes of bad idea :) * ruff 🐶 * Use numpy and pmf function to speed up gen Numpy has a built-in way to sum probability mass functions (pmf). This shaves of 60% of the generation time :D * Revert "Use numpy and pmf function to speed up gen" This reverts commit `9290191cb3`. * Step inbetween to change the weights * Changed the weights to make it faster 135 -> 81 seconds on 100 random yamls * Adjusted max_dist, split dice_simulation function * Removed nonlocal and pass arguments instead * Change "weight-lists" to Dict[str, float] * Removed the return from ini_locations. Also added explanations to cat_weights * Choice options; dont'use .value (will ruff later) * Only put important options in slotdata * 🐶 * Add Dict import * Split the cache per player, limit size to 400. * 🐶 * added , because of style * Update apworld version to 2.0.6 2.0.5 is the apworld I released on github to be tested I never separately released 2.0.4. * Multiple smaller code improvements - changed names in YachtWeights so we don't need to translate them in Rules anymore - we now remember which categories are present in the game, and also put this in slotdata. This we do because only one of two categories is present in a game. If for some reason both are present (plando/getitem/startinventory), we now know which category to ignore - * 🐶 ruff * Mostly minimize_extra_items improvements - Change logic, generation is now even faster (0.6s per default yaml). - Made the option 'minimize_extra_items' do a lot more, hopefully this makes the impact of Yacht Dice a little bit less, if you want that. Here's what is also does now: - you start with 2 dice and 2 rolls - there will be less locations/items at the start of you game * ruff 🐶 * Removed printing options * Reworded some option descriptions * Yacht Dice: setup: change release-link to latest On the installation page, link to the latest release, instead of the page with all releases * Several fixes and changes -change apworld version -Removed the extra roll (this was not intended) -change extra_points_added to a mutable list to that it actually does something -removed variables multipliers_added and items_added -Rules, don't order by quantity, just by mean_score -Changed the weights in general to make it faster * 🐶 * Revert setup to what it was (latest, without S) * remove temp weights file, shouldn't be here * Made sure that there is not too many step score multipliers. Too many step score multipliers lead to gen fails too, probably because you need many categories for them to actually help a lot. So it's hard to use them at the start of the game. * add filler item name * Textual fixes and changes * Remove Victory item and use event instead. * Revert "Remove Victory item and use event instead." This reverts commit `c2f7d674d3`. * Revert "Textual fixes and changes" This reverts commit `e9432f9245`. * Remove Victory item and make it an event instead * Yacht Dice logic fix, no decreasing score when obtain item take 2 * Logic fix: Revert max_tries and mults, change ordering * Remove spaces :^) * Updated weights that are stochastically ordered by dice/roll In the trimming of the weights, sometimes it having 4 rolls would be better than having 5 rolls. I did a check that this does not happen for any dice increment or roll increment * Swap for-loops to increase performance This method is faster if the first for-loop contains fewer items. Since the function is called with, typically, `dist2` having less items, let's loop over `dist2` first. This makes the entire program 10% faster. * Remove options with 0 chance from list --------- Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>	2024-10-22 21:07:44 +02:00