mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-21 23:01:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Restoration, hover fishing condition + XZ speed (#7031)

Browse Source
This commit is contained in:
djevangelia
2026-08-06 21:08:23 +02:00
committed by GitHub
parent f5244973bd
commit a089fa60ba
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_player_actor/z_player.c
+8 -5
View File
@@ -6598,17 +6598,20 @@ s32 func_8083C6B8(PlayState* play, Player* this) {
rodCheckPos.y += 50.0f;
if (CVarGetInteger(CVAR_ENHANCEMENT("HoverFishing"), 0)
? 0
: !(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) || (this->actor.world.pos.z > 1300.0f) ||
BgCheck_SphVsFirstPoly(&play->colCtx, &rodCheckPos, 20.0f)) {
if (GameInteractor_Should(VB_NOT_CAST_FISHING,
(!(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) ||
(this->actor.world.pos.z > 1300.0f) ||
BgCheck_SphVsFirstPoly(&play->colCtx, &rodCheckPos, 20.0f)),
&rodCheckPos)) {
Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
return 0;
}
Player_SetupAction(play, this, Player_Action_80850C68, 0);
this->unk_860 = 1;
Player_ZeroSpeedXZ(this);
if (GameInteractor_Should(VB_FISHING_ZERO_XZ, true)) {
Player_ZeroSpeedXZ(this);
}
Player_AnimPlayOnce(play, this, &gPlayerAnim_link_fishing_throw);
return 1;
} else {