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

add hookshot aim assist to non-climbable hookshot polygons

Browse source
This commit is contained in:
Demur Rumed 2025-08-07 04:22:38 +00:00
commit 3a7437a760
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -677,12 +677,12 @@ void ActorAccessibility_InterpretCurrentScene(PlayState* play) {
if ((func_80041DB8(&play->colCtx, poly, BGCHECK_SCENE) == 8 || if ((func_80041DB8(&play->colCtx, poly, BGCHECK_SCENE) == 8 ||
func_80041DB8(&play->colCtx, poly, BGCHECK_SCENE) == 3)) { func_80041DB8(&play->colCtx, poly, BGCHECK_SCENE) == 3)) {
ActorAccessibility_PolyToVirtualActor(play, poly, VA_CLIMB, list); ActorAccessibility_PolyToVirtualActor(play, poly, VA_CLIMB, list);
} } else if (SurfaceType_GetSceneExitIndex(&play->colCtx, poly, BGCHECK_SCENE) != 0) {
if (func_80041EA4(&play->colCtx, poly, BGCHECK_SCENE) == 12) {
ActorAccessibility_PolyToVirtualActor(play, poly, VA_VOID, list);
}
if (SurfaceType_GetSceneExitIndex(&play->colCtx, poly, BGCHECK_SCENE) != 0) {
ActorAccessibility_PolyToVirtualActor(play, poly, VA_AREA_CHANGE, list); ActorAccessibility_PolyToVirtualActor(play, poly, VA_AREA_CHANGE, list);
} else if (func_80041EA4(&play->colCtx, poly, BGCHECK_SCENE) == 12) {
ActorAccessibility_PolyToVirtualActor(play, poly, VA_VOID, list);
} else if (SurfaceType_IsHookshotSurface(&play->colCtx, poly, BGCHECK_SCENE)) {
ActorAccessibility_PolyToVirtualActor(play, poly, VA_MARKER, list);
} }
} }
} }
@ -692,17 +692,22 @@ void ActorAccessibility_PolyToVirtualActor(PlayState* play, CollisionPoly* poly,
VirtualActorList* destination) { VirtualActorList* destination) {
Vec3f polyVerts[3]; Vec3f polyVerts[3];
CollisionPoly_GetVertices(poly, play->colCtx.colHeader->vtxList, polyVerts); CollisionPoly_GetVertices(poly, play->colCtx.colHeader->vtxList, polyVerts);
Vec3f where;
where.y = std::min(polyVerts[0].y, std::min(polyVerts[1].y, polyVerts[2].y));
f32 minX = std::min(polyVerts[0].x, std::min(polyVerts[1].x, polyVerts[2].x)); f32 minX = std::min(polyVerts[0].x, std::min(polyVerts[1].x, polyVerts[2].x));
f32 maxX = std::max(polyVerts[0].x, std::max(polyVerts[1].x, polyVerts[2].x)); f32 maxX = std::max(polyVerts[0].x, std::max(polyVerts[1].x, polyVerts[2].x));
f32 minZ = std::min(polyVerts[0].z, std::min(polyVerts[1].z, polyVerts[2].z)); f32 minZ = std::min(polyVerts[0].z, std::min(polyVerts[1].z, polyVerts[2].z));
f32 maxZ = std::max(polyVerts[0].z, std::max(polyVerts[1].z, polyVerts[2].z)); f32 maxZ = std::max(polyVerts[0].z, std::max(polyVerts[1].z, polyVerts[2].z));
where.x = maxX - ((maxX - minX) / 2); Vec3f where = {
where.z = maxZ - ((maxZ - minZ) / 2); .x = maxX - (maxX - minX) / 2,
.y = std::min(polyVerts[0].y, std::min(polyVerts[1].y, polyVerts[2].y)),
.z = maxZ - (maxZ - minZ) / 2,
};
AccessibleActor* actor = ActorAccessibility_AddVirtualActor(destination, va, where); AccessibleActor* actor = ActorAccessibility_AddVirtualActor(destination, va, where);
if (actor == NULL) if (actor == NULL)
return; return;
if (va == VA_MARKER) {
actor->policy.sound = 0;
}
if (va == VA_AREA_CHANGE) { if (va == VA_AREA_CHANGE) {
if (play->sceneNum != SCENE_GROTTOS && play->sceneNum != SCENE_FAIRYS_FOUNTAIN) { if (play->sceneNum != SCENE_GROTTOS && play->sceneNum != SCENE_FAIRYS_FOUNTAIN) {
u32 sceneIndex = SurfaceType_GetSceneExitIndex(&play->colCtx, poly, BGCHECK_SCENE); u32 sceneIndex = SurfaceType_GetSceneExitIndex(&play->colCtx, poly, BGCHECK_SCENE);
@ -710,6 +715,10 @@ void ActorAccessibility_PolyToVirtualActor(PlayState* play, CollisionPoly* poly,
actor->sceneIndex = gEntranceTable[nextEntranceIndex].scene; actor->sceneIndex = gEntranceTable[nextEntranceIndex].scene;
} }
} else if (SurfaceType_IsHookshotSurface(&play->colCtx, poly, BGCHECK_SCENE)) { } else if (SurfaceType_IsHookshotSurface(&play->colCtx, poly, BGCHECK_SCENE)) {
if (va == VA_MARKER) {
f32 maxY = std::max(polyVerts[0].y, std::max(polyVerts[1].y, polyVerts[2].y));
actor->pos.y = (actor->pos.y + maxY) / 2;
}
actor->policy.aimAssist.isProvider = AIM_HOOK; actor->policy.aimAssist.isProvider = AIM_HOOK;
} }
} }