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

Renamed "OnRandomizerGeneration" to "OnGenerationCompletion.

Browse source 
Renamed "GameInteractor_ExecuteOnRandomizerGeneration" to "GameInteractor_ExecuteOnGenerationCompletion"
Moved "GameInteractor_ExecuteOnGenerationCompletion" from "GenerateRandomizer" to the end of "GenerateRandomizerImgui".
This commit is contained in:
Glought 2025-06-14 09:29:57 -07:00
commit 6176e70adf
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
soh/soh/Enhancements/audio/AudioEditor.cpp
View file

@ -459,8 +459,8 @@ void AudioEditorRegisterOnSceneInitHook() {
});
}
void AudioEditorRegisterOnRandomizerGenerationHook() {
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnRandomizerGeneration>([]() {
void AudioEditorRegisterOnGenerationCompletionHook() {
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGenerationCompletion>([]() {
if (CVarGetInteger(CVAR_AUDIO("RandomizeAllOnRandoGen"), 0)) {
AudioEditor_RandomizeAll();
}
@ -469,7 +469,7 @@ void AudioEditorRegisterOnRandomizerGenerationHook() {
void AudioEditor::InitElement() {
AudioEditorRegisterOnSceneInitHook();
AudioEditorRegisterOnRandomizerGenerationHook();
AudioEditorRegisterOnGenerationCompletionHook();
}
void AudioEditor::DrawElement() {

6
soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
View file

@ -2585,8 +2585,8 @@ void Cosmetics_RegisterOnSceneInitHook() {
});
}
void CosmeticsEditorRegisterOnRandomizerGenerationHook() {
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnRandomizerGeneration>([]() {
void CosmeticsEditorRegisterOnGenerationCompletionHook() {
GameInteractor::Instance->RegisterGameHook<GameInteractor::OnGenerationCompletion>([]() {
if (CVarGetInteger(CVAR_COSMETIC("RandomizeAllOnRandoGen"), 0)) {
CosmeticsEditor_RandomizeAll();
}
@ -2612,7 +2612,7 @@ void CosmeticsEditorWindow::InitElement() {
RegisterOnLoadGameHook();
RegisterOnGameFrameUpdateHook();
Cosmetics_RegisterOnSceneInitHook();
CosmeticsEditorRegisterOnRandomizerGenerationHook();
CosmeticsEditorRegisterOnGenerationCompletionHook();
}
void CosmeticsEditor_RandomizeAll() {

2
soh/soh/Enhancements/game-interactor/GameInteractor_HookTable.h
View file

@ -62,7 +62,7 @@ DEFINE_HOOK(OnUpdateFileLanguageSelection, (uint8_t optionIndex));
DEFINE_HOOK(OnUpdateFileQuestSelection, (uint8_t questIndex));
DEFINE_HOOK(OnUpdateFileBossRushOptionSelection, (uint8_t optionIndex, uint8_t optionValue));
DEFINE_HOOK(OnUpdateFileNameSelection, (int16_t charCode));
DEFINE_HOOK(OnRandomizerGeneration, ());
DEFINE_HOOK(OnGenerationCompletion, ());
DEFINE_HOOK(OnSetGameLanguage, ());
DEFINE_HOOK(OnFileDropped, (std::string filePath));

4
soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp
View file

@ -274,8 +274,8 @@ void GameInteractor_ExecuteOnUpdateFileNameSelection(int16_t charCode) {
GameInteractor::Instance->ExecuteHooks<GameInteractor::OnUpdateFileNameSelection>(charCode);
}
void GameInteractor_ExecuteOnRandomizerGeneration() {
GameInteractor::Instance->ExecuteHooks<GameInteractor::OnRandomizerGeneration>();
void GameInteractor_ExecuteOnGenerationCompletion() {
GameInteractor::Instance->ExecuteHooks<GameInteractor::OnGenerationCompletion>();
}
// MARK: - Game

2
soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
View file

@ -69,7 +69,7 @@ void GameInteractor_ExecuteOnUpdateFileLanguageSelection(uint8_t optionIndex);
void GameInteractor_ExecuteOnUpdateFileQuestSelection(uint8_t questIndex);
void GameInteractor_ExecuteOnUpdateFileBossRushOptionSelection(uint8_t optionIndex, uint8_t optionValue);
void GameInteractor_ExecuteOnUpdateFileNameSelection(int16_t charCode);
void GameInteractor_ExecuteOnRandomizerGeneration();
void GameInteractor_ExecuteOnGenerationCompletion();
// MARK: - Game
void GameInteractor_ExecuteOnSetGameLanguage();

4
soh/soh/Enhancements/randomizer/randomizer.cpp
View file

@ -3602,6 +3602,8 @@ void GenerateRandomizerImgui(std::string seed = "") {
Ship::Context::GetInstance()->GetWindow()->GetGui()->SaveConsoleVariablesNextFrame();
generated = 1;
GameInteractor_ExecuteOnGenerationCompletion();
}
bool GenerateRandomizer(std::string seed /*= ""*/) {
@ -3612,8 +3614,6 @@ bool GenerateRandomizer(std::string seed /*= ""*/) {
if (CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0) == 0) {
randoThread = std::thread(&GenerateRandomizerImgui, seed);
GameInteractor_ExecuteOnRandomizerGeneration();
return true;
}
return false;