Merge branch 'dev' into s4

Author: theballaam96

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = False
-current_version = 4.11.30
+current_version = 4.11.32
 
 [bumpversion:file:version.py]
 search = version = "{current_version}"

__init__.py

@@ -141,7 +141,8 @@ def copy_dependencies(zip_path, file):
     from randomizer.Enums.Levels import Levels
     from randomizer.Enums.Maps import Maps
     from randomizer.Enums.Locations import Locations as DK64RLocations
-    from randomizer.Enums.Settings import WinConditionComplex
+    from randomizer.Enums.Settings import WinConditionComplex, SwitchsanityLevel
+    from randomizer.Enums.Switches import Switches
     from randomizer.Lists import Item as DK64RItem
     from worlds.LauncherComponents import Component, components, Type, icon_paths
     import randomizer.ShuffleExits as ShuffleExits
@@ -282,6 +283,7 @@ def generate_early(self):
             settings_dict["medal_requirement"] = self.options.medal_requirement.value
             settings_dict["rareware_gb_fairies"] = self.options.rareware_gb_fairies.value
             settings_dict["krool_key_count"] = self.options.krool_key_count.value
+            settings_dict["switchsanity"] = self.options.switchsanity.value
             settings_dict["starting_keys_list_selected"] = []
             for item in self.options.start_inventory:
                 if item == "Key 1":
@@ -593,6 +595,7 @@ def fill_slot_data(self) -> dict:
                 "HelmOrder": ", ".join([str(room) for room in self.logic_holder.settings.helm_order]),
                 "OpenLobbies": self.logic_holder.settings.open_lobbies,
                 "KroolInBossPool": self.logic_holder.settings.krool_in_boss_pool,
+                "SwitchSanity": {switch.name: {"kong": data.kong.name, "type": data.switch_type.name} for switch, data in self.logic_holder.settings.switchsanity_data.items()},
             }
 
         def write_spoiler(self, spoiler_handle: typing.TextIO):
@@ -623,6 +626,13 @@ def write_spoiler(self, spoiler_handle: typing.TextIO):
             spoiler_handle.write("\n")
             spoiler_handle.write("Removed Barriers: " + ", ".join([barrier.name for barrier in self.logic_holder.settings.remove_barriers_selected]))
             spoiler_handle.write("\n")
+            if self.logic_holder.settings.switchsanity != SwitchsanityLevel.off:
+                spoiler_handle.write("Switchsanity Settings: \n")
+                for switch, data in self.logic_holder.settings.switchsanity_data.items():
+                    if self.logic_holder.settings.switchsanity == SwitchsanityLevel.helm_access:
+                        if switch not in (Switches.IslesHelmLobbyGone, Switches.IslesMonkeyport):
+                            continue
+                    spoiler_handle.write(f"  - {switch.name}: {data.kong.name} with {data.switch_type.name}\n")
             spoiler_handle.write("Generated Time: " + time.strftime("%d-%m-%Y %H:%M:%S", time.gmtime()) + " GMT")
             spoiler_handle.write("\n")
             spoiler_handle.write("Randomizer Version: " + self.logic_holder.settings.version)

ap_version.py

@@ -1,3 +1,3 @@
 """Holds the version for Archipelago."""
 
-version = "1.0.26"
+version = "1.0.27"

archipelago/Options.py

@@ -183,7 +183,24 @@ class KeysRequiredToBeatKrool(Range):
     display_name = "Keys Required to Beat Krool"
     range_start = 0
     range_end = 8
-    default = 3
+    default = 8
+
+
+class SwitchSanity(Choice):
+    """Determines if the pads leading to helm are randomized.
+
+    Options:
+    off: Switchsanity is Off
+    helm_access: Monkeyport pad and Gorilla Gone Pad are randomized
+    all: Most switches across the game are randomized.
+    """
+
+    display_name = "Switchsanity"
+
+    option_off = 0
+    option_helm_access = 1
+    option_all = 2
+    default = 0
 
 
 @dataclass
@@ -201,6 +218,7 @@ class DK64Options(PerGameCommonOptions):
     medal_requirement: JetpacRequirement
     rareware_gb_fairies: RarewareGBRequirement
     open_lobbies: OpenLobbies
+    switchsanity: SwitchSanity
     climbing_shuffle: ClimbingShuffle
     starting_kong_count: StartingKongCount
     starting_move_count: StartingMoveCount

static/presets/weights/weights_files.json

@@ -1215,7 +1215,9 @@
       "fast_pause_transitions": 1,
       "cannon_game_better_control": 1,
       "better_fairy_camera": 1,
-      "remove_enemy_cabin_timer": 1
+      "remove_enemy_cabin_timer": 1,
+      "remove_galleon_ship_timers": 1,
+      "japes_bridge_permanently_extended": 1
     },
     "move_rando": {
       "on": 0.3,
@@ -1702,7 +1704,9 @@
       "fast_pause_transitions": 0.9,
       "cannon_game_better_control": 0.5,
       "better_fairy_camera": 0.5,
-      "remove_enemy_cabin_timer": 0.5
+      "remove_enemy_cabin_timer": 0.5,
+      "remove_galleon_ship_timers": 0.9,
+      "japes_bridge_permanently_extended": 0.5
     },
     "move_rando": {
       "on": 0.3,

version.py

@@ -1,3 +1,3 @@
 """Holds the version for DK64 Rando."""
 
-version = "4.11.30"
+version = "4.11.32"