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

further improvements to entrance sounds

Browse source
This commit is contained in:
Ryanoberlein 2023-11-29 01:45:10 -05:00
commit 90f963f897
1 changed files with 55 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -284,10 +284,11 @@ void accessible_maruta(AccessibleActor* actor) {
void accessible_area_change(AccessibleActor* actor) { void accessible_area_change(AccessibleActor* actor) {
Player* player = GET_PLAYER(actor->play); Player* player = GET_PLAYER(actor->play);
actor->policy.distance = 2000; actor->policy.distance = 1500;
actor->policy.ydist = 2000; actor->policy.ydist = 2000;
if (actor->yDistToPlayer > 500.0 && actor->sceneIndex != 96 && actor->play->sceneNum !=81) { if (actor->yDistToPlayer > 500.0 && actor->sceneIndex != 96 && actor->play->sceneNum != 81 &&
actor->play->sceneNum != 82) {
return; return;
} }
/*switch (actor->sceneIndex) { /*switch (actor->sceneIndex) {
@ -299,10 +300,11 @@ void accessible_area_change(AccessibleActor* actor) {
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_FANTOM_WARP_L, false); ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_FANTOM_WARP_L, false);
}*/ }*/
//hyrule field attenuation
if (actor->xzDistToPlayer > 700 && actor->play->sceneNum==81) { if (actor->play->sceneNum == 81) {
actor->policy.distance = actor->xzDistToPlayer*1.2; if (actor->xzDistToPlayer > 700) {
if (actor->xzDistToPlayer>8000) { actor->policy.distance = actor->xzDistToPlayer * 1.2;
if (actor->xzDistToPlayer > 8000) {
return; return;
} }
} else { } else {
@ -311,7 +313,41 @@ void accessible_area_change(AccessibleActor* actor) {
return; return;
} }
} }
}
//kakariko village attenuation
if (actor->play->sceneNum == 82) {
if (actor->sceneIndex == 83 || actor->sceneIndex == 81 || actor->sceneIndex == 96) {
actor->policy.runsAlways == true;
actor->policy.ydist = 5000;
if (actor->xzDistToPlayer > 700) {
if (actor->sceneIndex == 81) {
actor->policy.distance = actor->xyzDistToPlayer * 1.4;
} else {
actor->policy.distance = actor->xyzDistToPlayer * 1.2;
}
if (actor->xzDistToPlayer > 8000) {
return;
}
} else {
actor->policy.distance = 1500;
if (actor->xzDistToPlayer > 1500) {
return;
}
}
} else if (actor->sceneIndex == 8) {
if (!(((gSaveContext.eventChkInf[6]) >> (7)) & 1))
return;
}
else {
actor->policy.ydist = 500;
actor->policy.distance = 1000;
if (actor->xzDistToPlayer > 1000) {
return;
}
}
}
if (actor->play->sceneNum == 91 || actor->play->sceneNum == 69 || actor->play->sceneNum == 70) { if (actor->play->sceneNum == 91 || actor->play->sceneNum == 69 || actor->play->sceneNum == 70) {
actor->policy.distance = 1000; actor->policy.distance = 1000;
if (actor->xzDistToPlayer > 1000) { if (actor->xzDistToPlayer > 1000) {
@ -321,7 +357,9 @@ void accessible_area_change(AccessibleActor* actor) {
/* if (actor->play->sceneNum <= 11) { /* if (actor->play->sceneNum <= 11) {
actor->policy.distance = 500; actor->policy.distance = 500;
}*/ }*/
if (actor->xzDistToPlayer > 1500) {
return;
}
if (actor->sceneIndex == 85 || actor->sceneIndex == 91) { if (actor->sceneIndex == 85 || actor->sceneIndex == 91) {
if (actor->play->sceneNum == 91 && gSaveContext.entranceIndex != 1504 && gSaveContext.entranceIndex != 1246) { if (actor->play->sceneNum == 91 && gSaveContext.entranceIndex != 1504 && gSaveContext.entranceIndex != 1246) {
return; return;
@ -360,6 +398,8 @@ void accessible_area_change(AccessibleActor* actor) {
} }
//ToT sound //ToT sound
} else if (actor->sceneIndex == 69 || actor->sceneIndex == 70) {
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EN_MUSI_SINK, false);
} else if (actor->sceneIndex == 82) { } else if (actor->sceneIndex == 82) {
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_CHICKEN_CRY_M, false); ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_CHICKEN_CRY_M, false);
//kakariko sound //kakariko sound
@ -503,7 +543,8 @@ void accessible_en_dogs(AccessibleActor* actor) {
if (actor->frameCount % 30 != 0) { if (actor->frameCount % 30 != 0) {
return; return;
} }
if (actor->actor->params == 608 || actor->actor->params == 336 || actor->actor->params == 3088 || if (actor->actor->params == 608 || actor->actor->params == 336 || actor->actor->params == 304 ||
actor->actor->params == 3088 ||
actor->actor->params == 2576 || actor->actor->params <0) { actor->actor->params == 2576 || actor->actor->params <0) {
ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_SMALL_DOG_BARK, false); ActorAccessibility_PlaySoundForActor(actor, 0, NA_SE_EV_SMALL_DOG_BARK, false);
@ -793,6 +834,9 @@ void accessible_audio_compass(AccessibleActor* actor) {
policy.pitch = 1.1; policy.pitch = 1.1;
ActorAccessibility_AddSupportedActor(ACTOR_OBJ_SWITCH, policy); ActorAccessibility_AddSupportedActor(ACTOR_OBJ_SWITCH, policy);
ActorAccessibility_InitPolicy(&policy, "Ocarina Spots", NULL, NA_SE_EV_DIAMOND_SWITCH); ActorAccessibility_InitPolicy(&policy, "Ocarina Spots", NULL, NA_SE_EV_DIAMOND_SWITCH);
policy.n = 30;
policy.distance = 800;
policy.pitch = 1.1;
ActorAccessibility_AddSupportedActor(ACTOR_EN_OKARINA_TAG, policy); ActorAccessibility_AddSupportedActor(ACTOR_EN_OKARINA_TAG, policy);
ActorAccessibility_InitPolicy(&policy, "Pushable Block", accessible_test, 0); ActorAccessibility_InitPolicy(&policy, "Pushable Block", accessible_test, 0);
policy.n = 30; policy.n = 30;
@ -819,6 +863,7 @@ void accessible_audio_compass(AccessibleActor* actor) {
ActorAccessibility_AddSupportedActor(ACTOR_BG_YDAN_MARUTA, policy); ActorAccessibility_AddSupportedActor(ACTOR_BG_YDAN_MARUTA, policy);
ActorAccessibility_InitPolicy(&policy, "bombable wall", NULL, NA_SE_EN_OCTAROCK_ROCK); ActorAccessibility_InitPolicy(&policy, "bombable wall", NULL, NA_SE_EN_OCTAROCK_ROCK);
ActorAccessibility_AddSupportedActor(ACTOR_BG_BREAKWALL, policy); ActorAccessibility_AddSupportedActor(ACTOR_BG_BREAKWALL, policy);
ActorAccessibility_AddSupportedActor(ACTOR_BG_BOMBWALL, policy);
ActorAccessibility_InitPolicy(&policy, "231 dekus", accessible_231_dekus, 0); ActorAccessibility_InitPolicy(&policy, "231 dekus", accessible_231_dekus, 0);
policy.distance = 2000; policy.distance = 2000;
policy.n = 50; policy.n = 50;
@ -837,7 +882,7 @@ void accessible_audio_compass(AccessibleActor* actor) {
policy.distance = 5000; policy.distance = 5000;
policy.ydist = 2000; policy.ydist = 2000;
ActorAccessibility_AddSupportedActor(ACTOR_BOSS_GOMA, policy); ActorAccessibility_AddSupportedActor(ACTOR_BOSS_GOMA, policy);
ActorAccessibility_InitPolicy(&policy, "bombflowers", NULL, NA_SE_IT_BOMB_EXPLOSION); ActorAccessibility_InitPolicy(&policy, "bombflowers", NULL, NA_SE_EV_BOMB_BOUND);
ActorAccessibility_AddSupportedActor(ACTOR_EN_BOMBF, policy); ActorAccessibility_AddSupportedActor(ACTOR_EN_BOMBF, policy);
ActorAccessibility_InitPolicy(&policy, "door of time", accessible_door_of_time, 0); ActorAccessibility_InitPolicy(&policy, "door of time", accessible_door_of_time, 0);