From 679beee4f3533fd4d24498b0fa35ee2112260ac5 Mon Sep 17 00:00:00 2001 From: aMannus Date: Tue, 28 Mar 2023 10:32:17 +0200 Subject: [PATCH] Random hookshot/longshot length --- soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index e2318dd9a..6c90aabb4 100644 --- a/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -84,8 +84,15 @@ void ArmsHook_Destroy(Actor* thisx, PlayState* play) { void ArmsHook_Wait(ArmsHook* this, PlayState* play) { if (this->actor.parent == NULL) { Player* player = GET_PLAYER(play); + s32 length; + if (player->heldItemAction == PLAYER_IA_HOOKSHOT) { + length = Rand_ZeroOne() * 2 * 13; + } else { + length = Rand_ZeroOne() * 2 * 26; + } + // get correct timer length for hookshot or longshot - s32 length = ((player->heldItemAction == PLAYER_IA_HOOKSHOT) ? 13 : 26) * CVarGetFloat("gCheatHookshotReachMultiplier", 1.0f); + //s32 length = ((player->heldItemAction == PLAYER_IA_HOOKSHOT) ? 13 : 26) * CVarGetFloat("gCheatHookshotReachMultiplier", 1.0f); ArmsHook_SetupAction(this, ArmsHook_Shoot); func_8002D9A4(&this->actor, 20.0f);