Merge pull request #2610 from 2dos/s4

Bug Fixes

Author: theballaam96

archipelago/Logic.py

@@ -657,6 +657,15 @@ def galleonGatesStayOpen(self) -> bool:
             MiscChangesSelected.remove_galleon_ship_timers,
         )
 
+    @lru_cache(maxsize=None)
+    def cabinBarrelMoved(self) -> bool:
+        """Determine whether the upper cabin rocketbarrel has been moved."""
+        return IsItemSelected(
+            self.settings.quality_of_life,
+            self.settings.misc_changes_selected,
+            MiscChangesSelected.move_spring_cabin_rocketbarrel,
+        )
+
     def canOpenLlamaTemple(self):
         """Determine whether the switches on the Llama Temple can be shot."""
         if not (self.checkBarrier(RemovedBarriersSelected.aztec_llama_switches) or Events.LlamaFreed in self.Events):

base-hack/Build/animation_modifier.py

@@ -0,0 +1,46 @@
+"""File responsible for modifying the animation code file."""
+
+import zlib
+from typing import BinaryIO
+from BuildClasses import ROMPointerFile
+from BuildEnums import TableNames
+from BuildLib import ROMName
+
+anim_file = "animation_code.bin"
+
+
+class AnimChange:
+    """Class to store information pertaining to an animation coding change."""
+
+    def __init__(self, animation: int, offset: int, value: int, value_size: int):
+        """Initialize with given parameters."""
+        self.animation = animation
+        self.offset = offset
+        self.value = value
+        self.value_size = value_size
+
+    def enact(self, fh: BinaryIO):
+        """Apply the animation change."""
+        fh.seek(self.animation * 4)
+        header = int.from_bytes(fh.read(4), "big")
+        fh.seek(header + self.offset)
+        fh.write((self.value).to_bytes(self.value_size, "big"))
+
+
+anim_changes = [
+    AnimChange(0x2C1, 0x26 + 3, 0xFF, 1),  # Increase kop volume to 255
+    AnimChange(0x2C1, 0x1C + 2, 15, 1),  # Double the chance of a kop making a noise
+]
+
+
+def modifyAnimationCode():
+    """Pull geo file from ROM and modify."""
+    with open(ROMName, "rb") as fh:
+        anim_code_file = ROMPointerFile(fh, TableNames.Unknown13, 0)
+        fh.seek(anim_code_file.start)
+        dec = zlib.decompress(fh.read(anim_code_file.size), 15 + 32)
+        with open(anim_file, "wb") as fg:
+            fg.write(dec)
+    with open(anim_file, "r+b") as fh:
+        for change in anim_changes:
+            change.enact(fh)

base-hack/Build/build.py

@@ -34,6 +34,7 @@
 from model_shrink import shrinkModel
 from port_krool_spawners import updateCutsceneScripts, updateSpawnerFiles, updatePathFiles
 from fixIceMaze import generateIceMaze
+from animation_modifier import modifyAnimationCode
 
 # Infrastructure for recomputing DK64 global pointer tables
 # from BuildNames import maps
@@ -54,6 +55,7 @@
 updateSpawnerFiles()
 updatePathFiles()
 BuildInstanceScripts()
+modifyAnimationCode()
 
 portal_images = []
 for x in range(2):
@@ -428,6 +430,7 @@
     File(name="Banana Medal", pointer_table_index=TableNames.ModelTwoGeometry, file_index=0x90, source_file="updated_medal.bin", do_not_delete_source=True),
     File(name="Mushroom Red (Mush Puzzle)", pointer_table_index=TableNames.ModelTwoGeometry, file_index=0x1BE, source_file="updated_mush_0x1BE.bin", do_not_delete_source=True),
     File(name="Ice Maze", pointer_table_index=TableNames.ModelTwoGeometry, file_index=522, source_file="assets/Gong/ice_maze.bin", do_not_delete_source=True),
+    File(name="Animation Code", pointer_table_index=TableNames.Unknown13, file_index=0, source_file="animation_code.bin", do_not_delete_source=True),
 ]
 
 cutscene_scripts = buildScripts()

base-hack/src/fixes/guardCatch.c

@@ -27,7 +27,9 @@ typedef struct guard_paad {
     /* 0x00E */ short z_something;
     /* 0x010 */ char unk_10[0x1A-0x10];
     /* 0x01A */ short unk_1A;
-    /* 0x01C */ char unk_1C[0x47-0x1C];
+    /* 0x01C */ char unk_1C[0x44-0x1C];
+    /* 0x044 */ short kop_idle_guarantee;
+    /* 0x046 */ char unk_46;
     /* 0x047 */ char played_uhoh;
 } guard_paad;
 
@@ -224,4 +226,19 @@ void newGuardCode(void) {
             }
         }
     }
+}
+
+void setKopIdleGuarantee(actorData *actor, int spd) {
+    guard_paad *paad = actor->paad;
+    paad->kop_idle_guarantee = 30 * 3; // 3s
+    setActorSpeed(actor, spd);
+}
+
+int giveKopIdleGuarantee(void) {
+    guard_paad *paad = CurrentActorPointer_0->paad;
+    if (paad->kop_idle_guarantee > 0) {
+        paad->kop_idle_guarantee--;
+        return 0; // Always return false
+    }
+    return getRNGLower31();
 }

randomizer/CompileHints.py

@@ -20,7 +20,7 @@
 from randomizer.Enums.Settings import (
     ClimbingStatus,
     ProgressiveHintItem,
-    HelmSetting,
+    ActivateAllBananaports,
     LogicType,
     MicrohintsEnabled,
     MoveRando,
@@ -725,9 +725,13 @@ def compileHints(spoiler: Spoiler) -> bool:
     }
     # Your training in Gorilla Gone, Monkeyport, Climbing and Vines are always pointless hints if Key 8 is in Helm, so let's not
     if spoiler.settings.key_8_helm and Locations.HelmKey in spoiler.woth_paths.keys():
-        useless_moves = [Items.Vines]
+        useless_moves = []
+        if spoiler.settings.activate_all_bananaports != ActivateAllBananaports.isles_inc_helm_lobby:
+            useless_moves.append(Items.Vines)
         if not spoiler.settings.switchsanity:
-            useless_moves.extend([Items.Monkeyport, Items.GorillaGone])
+            useless_moves.append(Items.Monkeyport)
+        if not spoiler.settings.switchsanity and spoiler.settings.activate_all_bananaports != ActivateAllBananaports.isles_inc_helm_lobby:
+            useless_moves.append(Items.GorillaGone)
         useless_locations[Items.HideoutHelmKey] = [
             loc for loc in spoiler.woth_paths[Locations.HelmKey] if (loc in TrainingBarrelLocations or loc in PreGivenLocations) and spoiler.LocationList[loc].item in useless_moves
         ]

randomizer/Enums/Settings.jsonc

@@ -9,7 +9,8 @@
   "ActivateAllBananaports": {
     "off": 0,
     "all": 1,
-    "isles": 2
+    "isles": 2,
+    "isles_inc_helm_lobby": 3
   },
 
   /*
@@ -601,7 +602,8 @@
     "better_fairy_camera": 26,
     "remove_enemy_cabin_timer": 27,
     "remove_galleon_ship_timers": 28,
-    "japes_bridge_permanently_extended": 29
+    "japes_bridge_permanently_extended": 29,
+    "move_spring_cabin_rocketbarrel": 30
   },
 
   /*

randomizer/Lists/EnemyTypes.py

@@ -519,6 +519,7 @@ def canBypass(self) -> bool:
         minigame_enabled=False,
         interaction=InteractionMethods(kill_melee=False, can_bypass=False),  # Can be meleed with distraction mechanic, but we'll ignore that for now
         default_size=50,
+        max_speed=100,
     ),
     Enemies.Bug: EnemyData(
         name="Bug",

randomizer/Lists/Multiselectors.py

@@ -130,6 +130,7 @@ def __init__(self, name: str, shift: int, tooltip: str = "") -> None:
         2,
         "The spiral bridge around Japes Mountain will be permanently extended as soon as you shoot the peanut switch.",
     ),
+    MultiselectorItem("Move Spring Cabin Rocketbarrel", -1, "Moves the rocketbarrel in the Spring 5-Door Cabin to prevent being able to enter it earlier than intended."),
 ]
 RemovedBarrierItems = [
     MultiselectorItem(

randomizer/Logic.py

@@ -271,13 +271,21 @@ def Reset(self):
                 Maps.CreepyCastle,
                 Maps.CastleCrypt,
                 Maps.Isles,
+                # Maps.HideoutHelmLobby,  # Not in BananaportVanilla
             ]
         elif self.settings.activate_all_bananaports == ActivateAllBananaports.isles:
             activated_warp_maps = [Maps.Isles]
+        elif self.settings.activate_all_bananaports == ActivateAllBananaports.isles_inc_helm_lobby:
+            activated_warp_maps = [
+                Maps.Isles,
+                # Maps.HideoutHelmLobby,  # Not in BananaportVanilla
+            ]
         if any(activated_warp_maps):
             for warp_data in BananaportVanilla.values():
                 if warp_data.map_id in activated_warp_maps:
                     self.Events.append(warp_data.event)
+        if self.settings.activate_all_bananaports in (ActivateAllBananaports.all, ActivateAllBananaports.isles_inc_helm_lobby):
+            self.Events.extend([Events.HelmLobbyW1aTagged, Events.HelmLobbyW1bTagged])
 
         # Colored banana and coin arrays
         # Colored bananas as 9 arrays of 5 (8 levels for 5 kongs, Helm is level index 7, so skip this)
@@ -515,6 +523,15 @@ def galleonGatesStayOpen(self) -> bool:
             MiscChangesSelected.remove_galleon_ship_timers,
         )
 
+    @lru_cache(maxsize=None)
+    def cabinBarrelMoved(self) -> bool:
+        """Determine whether the upper cabin rocketbarrel has been moved."""
+        return IsItemSelected(
+            self.settings.quality_of_life,
+            self.settings.misc_changes_selected,
+            MiscChangesSelected.move_spring_cabin_rocketbarrel,
+        )
+
     def canOpenLlamaTemple(self):
         """Determine whether the switches on the Llama Temple can be shot."""
         if not (self.checkBarrier(RemovedBarriersSelected.aztec_llama_switches) or Events.LlamaFreed in self.Events):

randomizer/LogicFiles/CrystalCaves.py

@@ -244,7 +244,7 @@
 
     Regions.DiddyUpperCabin: Region("Diddy Upper Cabin", HintRegion.Cabins, Levels.CrystalCaves, False, None, [
         LocationLogic(Locations.CavesDiddy5DoorCabinUpper, lambda l: (l.guitar or l.oranges) and (l.spring or l.CanMoontail()) and l.jetpack and l.isdiddy),
-        LocationLogic(Locations.CavesBananaFairyCabin, lambda l: l.camera and (l.guitar or l.oranges) and (l.spring or l.CanMoontail()) and l.jetpack and l.isdiddy),
+        LocationLogic(Locations.CavesBananaFairyCabin, lambda l: l.camera and (l.guitar or l.oranges) and (l.spring or (l.CanMoontail() and not l.cabinBarrelMoved())) and l.jetpack and l.isdiddy),
         # LocationLogic(Locations.Caves5DCDiddyUpperEnemy_Enemy0, lambda l: True),
         # LocationLogic(Locations.Caves5DCDiddyUpperEnemy_Enemy1, lambda l: True),
     ], [], [