From 2704015eef0217eca57977d09e1589aa6dacbfda Mon Sep 17 00:00:00 2001
From: JaredWeakStrike <96694163+JaredWeakStrike@users.noreply.github.com>
Date: Thu, 18 Apr 2024 12:55:27 -0400
Subject: [PATCH] KH2: Docs updates and Excluded Locations Bugfix (#3150)
---
worlds/kh2/OpenKH.py | 2 ++
worlds/kh2/Options.py | 2 +-
worlds/kh2/__init__.py | 2 +-
worlds/kh2/docs/setup_en.md | 16 +++++++++-------
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/worlds/kh2/OpenKH.py b/worlds/kh2/OpenKH.py
index c30aeec6..17d7f84e 100644
--- a/worlds/kh2/OpenKH.py
+++ b/worlds/kh2/OpenKH.py
@@ -413,6 +413,8 @@ def patch_kh2(self, output_directory):
]
mod_dir = os.path.join(output_directory, mod_name + "_" + Utils.__version__)
+ self.mod_yml["title"] = f"Randomizer Seed {mod_name}"
+
openkhmod = {
"TrsrList.yml": yaml.dump(self.formattedTrsr, line_break="\n"),
"LvupList.yml": yaml.dump(self.formattedLvup, line_break="\n"),
diff --git a/worlds/kh2/Options.py b/worlds/kh2/Options.py
index b7caf743..ffe95d1d 100644
--- a/worlds/kh2/Options.py
+++ b/worlds/kh2/Options.py
@@ -306,7 +306,7 @@ class CorSkipToggle(Toggle):
Toggle does not negate fight logic but is an alternative.
- Final Chest is also can be put into logic with this skip.
+ Full Cor Skip is also affected by this Toggle.
"""
display_name = "CoR Skip Toggle."
default = False
diff --git a/worlds/kh2/__init__.py b/worlds/kh2/__init__.py
index 4125bcb2..15cfa11c 100644
--- a/worlds/kh2/__init__.py
+++ b/worlds/kh2/__init__.py
@@ -422,7 +422,7 @@ class KH2World(World):
keyblade_locations = [self.multiworld.get_location(location, self.player) for location in Keyblade_Slots.keys()]
state = self.multiworld.get_all_state(False)
keyblade_ability_pool_copy = self.keyblade_ability_pool.copy()
- fill_restrictive(self.multiworld, state, keyblade_locations, keyblade_ability_pool_copy, True, True)
+ fill_restrictive(self.multiworld, state, keyblade_locations, keyblade_ability_pool_copy, True, True, allow_excluded=True)
def starting_invo_verify(self):
"""
diff --git a/worlds/kh2/docs/setup_en.md b/worlds/kh2/docs/setup_en.md
index 70b3a24a..c6fdb020 100644
--- a/worlds/kh2/docs/setup_en.md
+++ b/worlds/kh2/docs/setup_en.md
@@ -13,9 +13,10 @@
- Needed for Archipelago
1. [`ArchipelagoKH2Client.exe`](https://github.com/ArchipelagoMW/Archipelago/releases)
- 2. `Install the mod from JaredWeakStrike/APCompanion using OpenKH Mod Manager`
- 3. `Install the mod from KH2FM-Mods-equations19/auto-save using OpenKH Mod Manager`
- 4. `AP Randomizer Seed`
+ 2. `Install the Archipelago Companion mod from JaredWeakStrike/APCompanion using OpenKH Mod Manager`
+ 3. `Install the Archipelago Quality Of Life mod from JaredWeakStrike/AP_QOL using OpenKH Mod Manager`
+ 4. `Install the mod from KH2FM-Mods-equations19/auto-save using OpenKH Mod Manager`
+ 5. `AP Randomizer Seed`