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

Merge 27cb1b5420 into 237dcfec74

Browse source
This commit is contained in:
Philip Dubé 2025-07-03 21:38:45 +02:00 • committed by GitHub
commit e660d59bac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 67 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,5 @@
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h"
#include <cassert>
#include <File.h>
#include <Json.h>
@ -11,6 +10,8 @@
#include "soh/OTRGlobals.h"
#include "message_data_static.h"
#include "overlays/gamestates/ovl_file_choose/file_choose.h"
#include "overlays/actors/ovl_En_Elf/z_en_elf.h"
#include "soh/ActorDB.h"
#include "soh/Enhancements/boss-rush/BossRush.h"
#include "soh/Enhancements/FileSelectEnhancements.h"
#include "soh/resource/type/SohResourceType.h"
@ -174,6 +175,71 @@ void RegisterOnInterfaceUpdateHook() {
if (!GameInteractor::IsSaveLoaded(true))
return;
if (CHECK_BTN_ALL(gPlayState->state.input->press.button, BTN_CUSTOM_MODIFIER1)) {
Player* player = GET_PLAYER(gPlayState);
if (player != NULL) {
u16 angle = (u16)player->actor.world.rot.y;
const char* ttsAnnounce = (angle > 0xf000 || angle < 0x1000) ? "south"
: angle < 0x3000 ? "southeast"
: angle < 0x5000 ? "east"
: angle < 0x7000 ? "northeast"
: angle < 0x9000 ? "north"
: angle < 0xB000 ? "northwest"
: angle < 0xD000 ? "west"
: "southwest";
SpeechSynthesizer::Instance->Speak(ttsAnnounce, "en-US");
}
}
if (CHECK_BTN_ALL(gPlayState->state.input->press.button, BTN_CUSTOM_MODIFIER2)) {
int minDist = 1000000;
Actor* readOut = NULL;
Player* player = GET_PLAYER(gPlayState);
if (player != NULL) {
if (player->focusActor != NULL) {
readOut = player->focusActor;
} else {
for (int i = 0; i < ACTORCAT_MAX; i++) {
if (i == ACTORCAT_PLAYER)
continue;
for (Actor* actor = gPlayState->actorCtx.actorLists[i].head; actor != NULL;
actor = actor->next) {
if ((actor->id == ACTOR_EN_ELF && actor->params == FAIRY_NAVI) ||
actor->id == ACTOR_SHOT_SUN)
continue;
if (actor->xzDistToPlayer < 40 && (player->stateFlags1 & PLAYER_STATE1_IN_WATER) &&
player->currentBoots != PLAYER_BOOTS_IRON &&
actor->world.pos.z < player->actor.world.pos.z) {
if (actor->id == ACTOR_EN_ITEM00) {
SpeechSynthesizer::Instance->Speak("item below", "en-US");
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;
if ((reverseYaw < 0x2000 || reverseYaw > 0xE000) && actor->xyzDistToPlayerSq < minDist) {
readOut = actor;
minDist = actor->xyzDistToPlayerSq;
}
}
}
}
if (readOut != NULL) {
auto entry = ActorDB::Instance->RetrieveEntry(readOut->id);
if (entry.name.empty()) {
char ttsAnnounceBuf[8];
int annouceBuf = snprintf(ttsAnnounceBuf, sizeof(ttsAnnounceBuf), "%d", readOut->id);
SpeechSynthesizer::Instance->Speak(ttsAnnounceBuf, "en-US");
} else {
SpeechSynthesizer::Instance->Speak(entry.name.c_str(), "en-US");
}
}
}
}
spoke:
static int16_t lostHealth = 0;
static int16_t prevHealth = 0;

2
soh/soh/OTRGlobals.cpp
View file

@ -1458,13 +1458,11 @@ extern "C" void Graph_StartFrame() {
break;
}
#if defined(_WIN32) || defined(__APPLE__)
case KbScancode::LUS_KB_F9: {
// Toggle TTS
CVarSetInteger(CVAR_SETTING("A11yTTS"), !CVarGetInteger(CVAR_SETTING("A11yTTS"), 0));
break;
}
#endif
case KbScancode::LUS_KB_TAB: {
CVarSetInteger(CVAR_SETTING("AltAssets"), !CVarGetInteger(CVAR_SETTING("AltAssets"), 0));
break;