mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-16 06:25:08 -05:00
Code Issues Projects Releases Wiki Activity

fix: correctly parse custom nocturne warp text (#2116)

Browse Source 
This was causing an issue where hints were not being properly parsed,
because ParseHintLocationsFile was erroring out when trying to read
from a part of the json that didn't exist. Since that method is using
pokemon exception handling, it was failing silently.

This just makes it so the key in the spoiler log matches the key we're trying
to read (and brings it in line with the rest of the warp text names)

Co-authored-by: briaguya <briaguya>
This commit is contained in:
briaguya 2022-12-08 10:44:30 -05:00 committed by GitHub
parent fa4ffb5913
commit 4a35b9e798
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
View File

@ -638,7 +638,7 @@ static void WriteHints(int language) {
jsonData["warpBoleroText"] = GetWarpBoleroText().GetEnglish(); jsonData["warpBoleroText"] = GetWarpBoleroText().GetEnglish();
jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetEnglish(); jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetEnglish();
jsonData["warpRequiemText"] = GetWarpRequiemText().GetEnglish(); jsonData["warpRequiemText"] = GetWarpRequiemText().GetEnglish();
jsonData["warpNocturne"] = GetWarpNocturneText().GetEnglish(); jsonData["warpNocturneText"] = GetWarpNocturneText().GetEnglish();
jsonData["warpPreludeText"] = GetWarpPreludeText().GetEnglish(); jsonData["warpPreludeText"] = GetWarpPreludeText().GetEnglish();
jsonData["childAltarText"] = GetChildAltarText().GetEnglish(); jsonData["childAltarText"] = GetChildAltarText().GetEnglish();
jsonData["adultAltarText"] = GetAdultAltarText().GetEnglish(); jsonData["adultAltarText"] = GetAdultAltarText().GetEnglish();
@ -650,7 +650,7 @@ static void WriteHints(int language) {
jsonData["warpBoleroText"] = GetWarpBoleroText().GetFrench(); jsonData["warpBoleroText"] = GetWarpBoleroText().GetFrench();
jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetFrench(); jsonData["warpSerenadeText"] = GetWarpSerenadeText().GetFrench();
jsonData["warpRequiemText"] = GetWarpRequiemText().GetFrench(); jsonData["warpRequiemText"] = GetWarpRequiemText().GetFrench();
jsonData["warpNocturne"] = GetWarpNocturneText().GetFrench(); jsonData["warpNocturneText"] = GetWarpNocturneText().GetFrench();
jsonData["warpPreludeText"] = GetWarpPreludeText().GetFrench(); jsonData["warpPreludeText"] = GetWarpPreludeText().GetFrench();
jsonData["childAltarText"] = GetChildAltarText().GetFrench(); jsonData["childAltarText"] = GetChildAltarText().GetFrench();
jsonData["adultAltarText"] = GetAdultAltarText().GetFrench(); jsonData["adultAltarText"] = GetAdultAltarText().GetFrench();