mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-13 11:42:19 -05:00
Code Issues Projects Releases Wiki Activity

Limit retries of the randomiser quest menu seed generation (#4564)

Browse Source
This commit is contained in:
Pepper0ni 2024-11-22 23:22:39 +00:00 committed by GitHub
parent 9c99a1e515
commit 5520c185bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View File

@ -1008,6 +1008,7 @@ void DrawSeedHashSprites(FileChooseContext* this) {
} }
u8 generating; u8 generating;
int retries = 0;
bool fileSelectSpoilerFileLoaded = false; bool fileSelectSpoilerFileLoaded = false;
void FileChoose_UpdateRandomizer() { void FileChoose_UpdateRandomizer() {
@ -1018,6 +1019,7 @@ void FileChoose_UpdateRandomizer() {
} else if (CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0) == 0 && generating) { } else if (CVarGetInteger(CVAR_GENERAL("RandoGenerating"), 0) == 0 && generating) {
if (Randomizer_IsSeedGenerated()) { if (Randomizer_IsSeedGenerated()) {
Audio_PlayFanfare(NA_BGM_HORSE_GOAL); Audio_PlayFanfare(NA_BGM_HORSE_GOAL);
retries = 0;
} else { } else {
Sfx_PlaySfxCentered(NA_SE_SY_OCARINA_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_OCARINA_ERROR);
} }
@ -1340,6 +1342,7 @@ void FileChoose_GenerateRandoSeed(GameState* thisx) {
Audio_PlayFanfare(NA_BGM_HORSE_GOAL); Audio_PlayFanfare(NA_BGM_HORSE_GOAL);
func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1); func_800F5E18(SEQ_PLAYER_BGM_MAIN, NA_BGM_FILE_SELECT, 0, 7, 1);
generating = 0; generating = 0;
retries = 0;
Randomizer_SetSpoilerLoaded(true); Randomizer_SetSpoilerLoaded(true);
static u8 emptyName[] = { 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E }; static u8 emptyName[] = { 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E, 0x3E };
static u8 linkName[] = { 0x15, 0x2C, 0x31, 0x2E, 0x3E, 0x3E, 0x3E, 0x3E }; static u8 linkName[] = { 0x15, 0x2C, 0x31, 0x2E, 0x3E, 0x3E, 0x3E, 0x3E };
@ -1361,7 +1364,13 @@ void FileChoose_GenerateRandoSeed(GameState* thisx) {
return; return;
} }
if (!generating) { if (!generating) {
if (retries >= 5 || (retries >= 1 && Randomizer_IsSpoilerLoaded())){
this->configMode = CM_QUEST_MENU;
retries = 0;
} else {
Randomizer_GenerateSeed(); Randomizer_GenerateSeed();
retries++;
}
} }
} }