nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Temporarily disable skull token flag setting

Browse Source
This commit is contained in:
aMannus
2025-07-04 11:49:45 +02:00
parent 50af166a84
commit 4aacc1bc0c
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View File

@@ -313,6 +313,7 @@ void RandomizerOnExternalCheckHandler(uint32_t randomizerCheck) {
break; break;
case SPOILER_CHK_RANDOMIZER_INF: case SPOILER_CHK_RANDOMIZER_INF:
Flags_SetRandomizerInf(static_cast<RandomizerInf>(flagID)); Flags_SetRandomizerInf(static_cast<RandomizerInf>(flagID));
break;
case SPOILER_CHK_EVENT_CHK_INF: case SPOILER_CHK_EVENT_CHK_INF:
Flags_SetEventChkInf(flagID); Flags_SetEventChkInf(flagID);
break; break;
@@ -323,11 +324,13 @@ void RandomizerOnExternalCheckHandler(uint32_t randomizerCheck) {
Flags_SetInfTable(flagID); Flags_SetInfTable(flagID);
break; break;
case SPOILER_CHK_GOLD_SKULLTULA: case SPOILER_CHK_GOLD_SKULLTULA:
SET_GS_FLAGS((flagID & 0x1F00) >> 8, flagID & 0xFF); randomizerQueuedChecks.push(rc);
// Below doesn't work, temporarily disabled until a solution is found
// SET_GS_FLAGS((flagID & 0x1F00) >> 8, flagID & 0xFF);
break; break;
case SPOILER_CHK_GRAVEDIGGER: // This enum is used nowhere in code, so i'll leave it as nothing for now case SPOILER_CHK_GRAVEDIGGER: // This enum is used nowhere in code, so i'll leave it as nothing for now
case SPOILER_CHK_NONE: case SPOILER_CHK_NONE:
// do Nothing // Do nothing
break; break;
} }
} }

5
soh/soh/Network/Archipelago/Archipelago.cpp
View File

@@ -218,8 +218,9 @@ bool ArchipelagoClient::StartClient() {
if (deathLink && data["data"]["source"] != apClient->get_slot()) { if (deathLink && data["data"]["source"] != apClient->get_slot()) {
if (GameInteractor::IsSaveLoaded()) { if (GameInteractor::IsSaveLoaded()) {
gSaveContext.health = 0; gSaveContext.health = 0;
Notification::Emit({ .prefix = data["data"]["source"], Notification::Emit(
.message = "died. Cause:", { .prefix = data["data"]["source"] + "died.",
.message = "Cause:",
.suffix = data["data"]["cause"] }); .suffix = data["data"]["cause"] });
std::string deathLinkMessage = std::string deathLinkMessage =
"[LOG] Received death link from " + std::string(data["data"]["source"]) + ". Cause: " + std::string(data["data"]["cause"]); "[LOG] Received death link from " + std::string(data["data"]["source"]) + ". Cause: " + std::string(data["data"]["cause"]);