github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-25 07:35:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Random hookshot/longshot length

Browse source
This commit is contained in:
aMannus 2023-03-28 10:32:17 +02:00
commit 679beee4f3
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View file

@ -84,8 +84,15 @@ void ArmsHook_Destroy(Actor* thisx, PlayState* play) {
void ArmsHook_Wait(ArmsHook* this, PlayState* play) { void ArmsHook_Wait(ArmsHook* this, PlayState* play) {
if (this->actor.parent == NULL) { if (this->actor.parent == NULL) {
Player* player = GET_PLAYER(play); 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 // 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); ArmsHook_SetupAction(this, ArmsHook_Shoot);
func_8002D9A4(&this->actor, 20.0f); func_8002D9A4(&this->actor, 20.0f);