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

forest basement cues

Browse source
This commit is contained in:
Demur Rumed 2025-07-02 06:22:23 +00:00
commit 79f55456d3
2 changed files with 29 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

28
soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp
View file

@ -641,6 +641,12 @@ void ActorAccessibility_InitActors() {
policy.n = 1; policy.n = 1;
policy.ydist = 50; policy.ydist = 50;
ActorAccessibility_AddSupportedActor(ACTOR_BG_BDAN_OBJECTS, policy); ActorAccessibility_AddSupportedActor(ACTOR_BG_BDAN_OBJECTS, policy);
ActorAccessibility_InitPolicy(&policy, "Forest Basement Gate", NA_SE_EV_METALGATE_OPEN);
policy.ydist = 1;
policy.distance = 200;
policy.volume = 0.5;
policy.pitch = 1.2;
ActorAccessibility_AddSupportedActor(ACTOR_BG_MORI_HASHIRA4, policy);
ActorAccessibility_InitPolicy(&policy, "Ocarina Spots", NA_SE_EV_DIAMOND_SWITCH); ActorAccessibility_InitPolicy(&policy, "Ocarina Spots", NA_SE_EV_DIAMOND_SWITCH);
policy.n = 30; policy.n = 30;
policy.distance = 800; policy.distance = 800;
@ -1142,6 +1148,28 @@ void ActorAccessibility_InitActors() {
temp = ActorAccessibility_AddVirtualActor(list, VA_MARKER, { 2960, -410, -2000 }); temp = ActorAccessibility_AddVirtualActor(list, VA_MARKER, { 2960, -410, -2000 });
temp->policy.distance = 500; temp->policy.distance = 500;
auto forest_basement = [](AccessibleActor* actor) {
Actor* walls = Actor_Find(&actor->play->actorCtx, ACTOR_BG_MORI_KAITENKABE, ACTORCAT_BG);
if (walls != nullptr) {
actor->pos.x = walls->world.pos.x + Math_CosS(-walls->world.rot.y) * (actor->policy.sound == 0 ? -300.0f : 300.0f);
actor->pos.z = walls->world.pos.z + Math_SinS(-walls->world.rot.y) * (actor->policy.sound == 0 ? -300.0f : 300.0f);
if ((actor->frameCount & 31) == 0) {
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_TRAP_BOUND);
}
}
};
list = ActorAccessibility_GetVirtualActorList(SCENE_FOREST_TEMPLE, 17);
temp = ActorAccessibility_AddVirtualActor(list, VA_MARKER, { 119, -779, -1566 });
temp->policy.callback = forest_basement;
temp->policy.sound = 0;
temp->policy.distance = 333;
temp->policy.n = 1;
temp = ActorAccessibility_AddVirtualActor(list, VA_MARKER, { 119, -779, -1566 });
temp->policy.callback = forest_basement;
temp->policy.sound = 1;
temp->policy.distance = 333;
temp->policy.n = 1;
auto forest_twisted_hallway = [](AccessibleActor* actor) { auto forest_twisted_hallway = [](AccessibleActor* actor) {
Actor* twisted = Actor_Find(&actor->play->actorCtx, ACTOR_BG_MORI_HINERI, ACTORCAT_BG); Actor* twisted = Actor_Find(&actor->play->actorCtx, ACTOR_BG_MORI_HINERI, ACTORCAT_BG);
if (twisted != nullptr) { if (twisted != nullptr) {

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

@ -564,6 +564,7 @@ void ActorAccessibility_GeneralHelper(PlayState* play) {
1, 1, &bgId)) { 1, 1, &bgId)) {
if (SurfaceType_IsHookshotSurface(&play->colCtx, colPoly, bgId)) { if (SurfaceType_IsHookshotSurface(&play->colCtx, colPoly, bgId)) {
ActorAccessibility_PlaySound(nullptr, 2, NA_SE_IT_HOOKSHOT_STICK_OBJ); ActorAccessibility_PlaySound(nullptr, 2, NA_SE_IT_HOOKSHOT_STICK_OBJ);
ActorAccessibility_SetSoundVolume(nullptr, 2, 0.5f);
} }
} }
} }