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

fix aim assist

Browse source
This commit is contained in:
Demur Rumed 2025-06-26 04:31:37 +00:00
commit 04a216676a
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp
View file

@ -297,7 +297,7 @@ void ActorAccessibility_ConfigureSoundForActor(AccessibleActor* actor, int slot)
} }
void ActorAccessibility_PlaySoundForActor(AccessibleActor* actor, int slot, s16 sfxId) { void ActorAccessibility_PlaySoundForActor(AccessibleActor* actor, int slot, s16 sfxId) {
if (slot < 0 || slot > AAE_SLOTS_PER_HANDLE) if (slot < 0 || slot >= AAE_SLOTS_PER_HANDLE)
return; return;
ActorAccessibility_PlaySound(actor, slot, sfxId); ActorAccessibility_PlaySound(actor, slot, sfxId);
ActorAccessibility_ConfigureSoundForActor(actor, slot); ActorAccessibility_ConfigureSoundForActor(actor, slot);
@ -376,12 +376,12 @@ void ActorAccessibility_RunAccessibilityForActor(PlayState* play, AccessibleActo
if (actor->policy.aimAssist.isProvider) { if (actor->policy.aimAssist.isProvider) {
Player* player = GET_PLAYER(play); Player* player = GET_PLAYER(play);
if (player->stateFlags1 & PLAYER_STATE1_FIRST_PERSON && if ((player->stateFlags1 & PLAYER_STATE1_FIRST_PERSON) &&
(player->stateFlags1 & PLAYER_STATE1_USING_BOOMERANG || player->stateFlags1 & PLAYER_STATE1_ITEM_IN_HAND)) { (player->stateFlags1 & (PLAYER_STATE1_USING_BOOMERANG | PLAYER_STATE1_ITEM_IN_HAND))) {
auto aimAssistProps = ActorAccessibility_ProvideAimAssistForActor(actor); auto aimAssistProps = ActorAccessibility_ProvideAimAssistForActor(actor);
if (++actor->aimAssist.framesSinceAimAssist >= actor->aimAssist.frequency) { if (++actor->aimAssist.framesSinceAimAssist >= actor->aimAssist.frequency) {
actor->aimAssist.framesSinceAimAssist = 0; actor->aimAssist.framesSinceAimAssist = 0;
ActorAccessibility_PlaySound(actor, 7, actor->policy.aimAssist.sfx); ActorAccessibility_PlaySoundForActor(actor, 7, actor->policy.aimAssist.sfx);
} }
ActorAccessibility_SetSoundPitch(actor, 7, aimAssistProps.pitch); ActorAccessibility_SetSoundPitch(actor, 7, aimAssistProps.pitch);
ActorAccessibility_SetSoundVolume(actor, 7, aimAssistProps.volume); ActorAccessibility_SetSoundVolume(actor, 7, aimAssistProps.volume);
@ -692,25 +692,22 @@ AimAssistProps ActorAccessibility_ProvideAimAssistForActor(AccessibleActor* acto
Player* player = GET_PLAYER(actor->play); Player* player = GET_PLAYER(actor->play);
s32 angle = player->actor.focus.rot.x; s32 angle = player->actor.focus.rot.x;
angle = angle / -14000.0 * 16384; angle = angle / -14000.0 * 16384;
f32 slope = Math_SinS(angle) / Math_CosS(angle) * 1.0; f32 cos_angle = Math_CosS(angle);
f32 slope = cos_angle <= 0.01 ? 1.0f : std::max(Math_SinS(angle) / cos_angle, 1.0f);
s32 yIntercept = slope * actor->xzDistToPlayer + player->actor.focus.pos.y; s32 yIntercept = slope * actor->xzDistToPlayer + player->actor.focus.pos.y;
s32 yHeight = actor->pos.y + 25; s32 yHeight = actor->pos.y + 25;
if (slope < 1) {
slope = 1;
}
s32 correction = (1 - 1 / slope) * 100;
AimAssistProps aimAssistProps; AimAssistProps aimAssistProps;
if (yIntercept > yHeight + 25) { if (yIntercept > yHeight + 25) {
aimAssistProps.pitch = 1.5; aimAssistProps.pitch = 1.5;
} else if (yIntercept < yHeight - 25) { } else if (yIntercept < yHeight - 25) {
aimAssistProps.pitch = 0.5; aimAssistProps.pitch = 0.5;
} else {
aimAssistProps.pitch = 1.0;
} }
s32 yDiff = fabs(yIntercept - yHeight); s32 yDiff = fabs(yIntercept - yHeight);
if (yIntercept - yHeight > 0) { if (yIntercept - yHeight > 0) {
yDiff -= correction; s32 correction = (1 - 1 / slope) * 100;
if (yDiff < 0) { yDiff = std::max(yDiff - correction, 0);
yDiff = 0;
}
} }
if (yDiff > 300) { if (yDiff > 300) {
actor->aimAssist.frequency = 30; actor->aimAssist.frequency = 30;