Merge pull request #1267 from leggettc18/skullsanity-saveeditor-fix

Stops syncing GS Flags with GS Token Count with Skullsanity on
This commit is contained in:
briaguya 2022-08-21 10:37:46 -04:00 committed by GitHub
commit 196e2acd3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -911,9 +911,12 @@ void DrawFlagsTab() {
setMask <<= 1;
}
// If playing a Randomizer Save with Shuffle Skull Tokens on anything other than "Off" we don't want to keep
// GS Token Count updated, since Gold Skulltulas killed will not correlate to GS Tokens Collected.
if (!(gSaveContext.n64ddFlag && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_TOKENS))) {
static bool keepGsCountUpdated = true;
ImGui::Checkbox("Keep GS Count Updated", &keepGsCountUpdated);
InsertHelpHoverText("Automatically adjust the number of gold skulltula tokens acquired based on set flags");
InsertHelpHoverText("Automatically adjust the number of gold skulltula tokens acquired based on set flags.");
int32_t gsCount = 0;
if (keepGsCountUpdated) {
for (int32_t gsFlagIndex = 0; gsFlagIndex < 6; gsFlagIndex++) {
@ -921,6 +924,7 @@ void DrawFlagsTab() {
}
gSaveContext.inventory.gsTokens = gsCount;
}
}
});
if (ImGui::TreeNode("Event Check Inf Flags")) {