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

also detect underwater switch

Browse source
This commit is contained in:
Demur Rumed 2025-04-18 21:22:59 +00:00
commit 27cb1b5420
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
soh/soh/Enhancements/tts/tts.cpp
View file

@ -209,11 +209,16 @@ void RegisterOnInterfaceUpdateHook() {
if ((actor->id == ACTOR_EN_ELF && actor->params == FAIRY_NAVI) || if ((actor->id == ACTOR_EN_ELF && actor->params == FAIRY_NAVI) ||
actor->id == ACTOR_SHOT_SUN) actor->id == ACTOR_SHOT_SUN)
continue; continue;
if (actor->id == ACTOR_EN_ITEM00 && (player->stateFlags1 & PLAYER_STATE1_IN_WATER) && if (actor->xzDistToPlayer < 40 && (player->stateFlags1 & PLAYER_STATE1_IN_WATER) &&
player->currentBoots != PLAYER_BOOTS_IRON && actor->xzDistToPlayer < 40 && player->currentBoots != PLAYER_BOOTS_IRON &&
actor->world.pos.z < player->actor.world.pos.z) { actor->world.pos.z < player->actor.world.pos.z) {
if (actor->id == ACTOR_EN_ITEM00) {
SpeechSynthesizer::Instance->Speak("item below", "en-US"); SpeechSynthesizer::Instance->Speak("item below", "en-US");
goto spoke; goto spoke;
} else if (actor->id == ACTOR_OBJ_SWITCH) {
SpeechSynthesizer::Instance->Speak("switch below", "en-US");
goto spoke;
}
} }
u16 reverseYaw = (actor->yawTowardsPlayer + 0x8000) - player->actor.world.rot.y; u16 reverseYaw = (actor->yawTowardsPlayer + 0x8000) - player->actor.world.rot.y;
if ((reverseYaw < 0x2000 || reverseYaw > 0xE000) && actor->xyzDistToPlayerSq < minDist) { if ((reverseYaw < 0x2000 || reverseYaw > 0xE000) && actor->xyzDistToPlayerSq < minDist) {