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

Fixup remaining n64ddflag after IS_RANDO merge (#3240)

Browse Source
This commit is contained in:
Adam Bird 2023-09-29 16:28:16 -04:00 committed by GitHub
parent d63c9d1774
commit af19645a88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/debugger/debugSaveEditor.cpp
View File

@ -514,7 +514,7 @@ void DrawInfoTab() {
} }
UIWidgets::InsertHelpHoverText("Z-Targeting behavior"); UIWidgets::InsertHelpHoverText("Z-Targeting behavior");
if (gSaveContext.n64ddFlag && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT)) { if (IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT)) {
ImGui::InputScalar("Triforce Pieces", ImGuiDataType_U16, &gSaveContext.triforcePiecesCollected); ImGui::InputScalar("Triforce Pieces", ImGuiDataType_U16, &gSaveContext.triforcePiecesCollected);
UIWidgets::InsertHelpHoverText("Currently obtained Triforce Pieces. For Triforce Hunt."); UIWidgets::InsertHelpHoverText("Currently obtained Triforce Pieces. For Triforce Hunt.");
} }

2
soh/soh/Enhancements/mods.cpp
View File

@ -998,7 +998,7 @@ void RegisterRandomizerSheikSpawn() {
if (!gPlayState) return; if (!gPlayState) return;
bool canSheik = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIAL_COUNT) != RO_GANONS_TRIALS_SKIP && bool canSheik = (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIAL_COUNT) != RO_GANONS_TRIALS_SKIP &&
OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LIGHT_ARROWS_HINT)); OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_LIGHT_ARROWS_HINT));
if (!gSaveContext.n64ddFlag || !LINK_IS_ADULT || !canSheik) return; if (!IS_RANDO || !LINK_IS_ADULT || !canSheik) return;
switch (gPlayState->sceneNum) { switch (gPlayState->sceneNum) {
case SCENE_TEMPLE_OF_TIME: case SCENE_TEMPLE_OF_TIME:
if (gPlayState->roomCtx.curRoom.num == 1) { if (gPlayState->roomCtx.curRoom.num == 1) {

4
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View File

@ -497,7 +497,7 @@ void DrawItemCount(ItemTrackerItem item) {
ImGui::PushStyleColor(ImGuiCol_Text, maxColor); ImGui::PushStyleColor(ImGuiCol_Text, maxColor);
ImGui::Text("%s", maxString.c_str()); ImGui::Text("%s", maxString.c_str());
ImGui::PopStyleColor(); ImGui::PopStyleColor();
} else if (item.id == RG_TRIFORCE_PIECE && gSaveContext.n64ddFlag && } else if (item.id == RG_TRIFORCE_PIECE && IS_RANDO &&
OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT) && IsValidSaveFile()) { OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT) && IsValidSaveFile()) {
std::string currentString = ""; std::string currentString = "";
std::string requiredString = ""; std::string requiredString = "";
@ -606,7 +606,7 @@ void DrawItem(ItemTrackerItem item) {
break; break;
case RG_TRIFORCE_PIECE: case RG_TRIFORCE_PIECE:
actualItemId = item.id; actualItemId = item.id;
hasItem = gSaveContext.n64ddFlag && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT); hasItem = IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT);
itemName = "Triforce Piece"; itemName = "Triforce Piece";
break; break;
} }

2
soh/src/code/z_elf_message.c
View File

@ -155,7 +155,7 @@ u16 ElfMessage_GetSariaText(PlayState* play) {
if (!LINK_IS_ADULT) { if (!LINK_IS_ADULT) {
if (Actor_FindNearby(play, &player->actor, ACTOR_EN_SA, 4, 800.0f) == NULL) { if (Actor_FindNearby(play, &player->actor, ACTOR_EN_SA, 4, 800.0f) == NULL) {
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SARIA_HINT)) { if (IS_RANDO && Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
return 0x161; return 0x161;
} }
msgs = sChildSariaMsgs; msgs = sChildSariaMsgs;

3
soh/src/code/z_play.c
View File

@ -2319,7 +2319,8 @@ void Play_PerformSave(PlayState* play) {
Save_SaveFile(); Save_SaveFile();
} }
uint8_t triforceHuntCompleted = uint8_t triforceHuntCompleted =
gSaveContext.n64ddFlag && gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) && IS_RANDO &&
gSaveContext.triforcePiecesCollected == Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT_PIECES_REQUIRED) &&
Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT); Randomizer_GetSettingValue(RSK_TRIFORCE_HUNT);
if (CVarGetInteger("gAutosave", AUTOSAVE_OFF) != AUTOSAVE_OFF || triforceHuntCompleted) { if (CVarGetInteger("gAutosave", AUTOSAVE_OFF) != AUTOSAVE_OFF || triforceHuntCompleted) {
Overlay_DisplayText(3.0f, "Game Saved"); Overlay_DisplayText(3.0f, "Game Saved");

4
soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c
View File

@ -338,8 +338,8 @@ void func_80A2FA50(EnGb* this, PlayState* play) {
Rupees_ChangeBy(50); Rupees_ChangeBy(50);
HIGH_SCORE(HS_POE_POINTS) += 100; HIGH_SCORE(HS_POE_POINTS) += 100;
if ( if (
(!gSaveContext.n64ddFlag && HIGH_SCORE(HS_POE_POINTS) != 1000) || (!IS_RANDO && HIGH_SCORE(HS_POE_POINTS) != 1000) ||
(gSaveContext.n64ddFlag && (HIGH_SCORE(HS_POE_POINTS) != 1000 || Flags_GetRandomizerInf(RAND_INF_10_BIG_POES))) (IS_RANDO && (HIGH_SCORE(HS_POE_POINTS) != 1000 || Flags_GetRandomizerInf(RAND_INF_10_BIG_POES)))
) { ) {
if (HIGH_SCORE(HS_POE_POINTS) > 1100) { if (HIGH_SCORE(HS_POE_POINTS) > 1100) {
HIGH_SCORE(HS_POE_POINTS) = 1100; HIGH_SCORE(HS_POE_POINTS) = 1100;

2
soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
View File

@ -146,7 +146,7 @@ u16 func_80AF55E0(PlayState* play, Actor* thisx) {
if (reaction != 0) { if (reaction != 0) {
return reaction; return reaction;
} }
if (gSaveContext.n64ddFlag && Randomizer_GetSettingValue(RSK_SARIA_HINT)) { if (IS_RANDO && Randomizer_GetSettingValue(RSK_SARIA_HINT)) {
return 0x10AD; return 0x10AD;
} }
if (CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) { if (CHECK_QUEST_ITEM(QUEST_SONG_SARIA)) {

6
soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
View File

@ -425,7 +425,7 @@ void EnXc_RandoStand(EnXc* this, PlayState* play) {
this->action = SHEIK_ACTION_BLOCK_PEDESTAL; this->action = SHEIK_ACTION_BLOCK_PEDESTAL;
this->drawMode = SHEIK_DRAW_DEFAULT; this->drawMode = SHEIK_DRAW_DEFAULT;
this->unk_30C = 1; this->unk_30C = 1;
if (!gSaveContext.n64ddFlag) { if (!IS_RANDO) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }
} }
@ -2240,13 +2240,13 @@ void EnXc_SetupDialogueAction(EnXc* this, PlayState* play) {
this->action = SHEIK_ACTION_IN_DIALOGUE; this->action = SHEIK_ACTION_IN_DIALOGUE;
} else { } else {
this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY; this->actor.flags |= ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY;
if (gSaveContext.n64ddFlag && gPlayState->sceneNum == SCENE_TEMPLE_OF_TIME) { if (IS_RANDO && gPlayState->sceneNum == SCENE_TEMPLE_OF_TIME) {
if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER)) { if (!CHECK_DUNGEON_ITEM(DUNGEON_KEY_BOSS, SCENE_GANONS_TOWER)) {
this->actor.textId = TEXT_SHEIK_NEED_HOOK; this->actor.textId = TEXT_SHEIK_NEED_HOOK;
} else { } else {
this->actor.textId = TEXT_SHEIK_HAVE_HOOK; this->actor.textId = TEXT_SHEIK_HAVE_HOOK;
} }
} else if (gSaveContext.n64ddFlag && gPlayState->sceneNum == SCENE_INSIDE_GANONS_CASTLE) { } else if (IS_RANDO && gPlayState->sceneNum == SCENE_INSIDE_GANONS_CASTLE) {
if (CHECK_OWNED_EQUIP(EQUIP_SWORD, 1) && INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT && if (CHECK_OWNED_EQUIP(EQUIP_SWORD, 1) && INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT &&
CUR_CAPACITY(UPG_QUIVER) >= 30 && gSaveContext.isMagicAcquired) { CUR_CAPACITY(UPG_QUIVER) >= 30 && gSaveContext.isMagicAcquired) {
this->actor.textId = TEXT_SHEIK_HAVE_HOOK; this->actor.textId = TEXT_SHEIK_HAVE_HOOK;

8
soh/src/overlays/actors/ovl_Fishing/z_fishing.c
View File

@ -5045,8 +5045,8 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
if (sLinkAge == 1) { if (sLinkAge == 1) {
if ( if (
(!gSaveContext.n64ddFlag && !(HIGH_SCORE(HS_FISHING) & 0x400)) || (!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & 0x400)) ||
(gSaveContext.n64ddFlag && !Flags_GetRandomizerInf(RAND_INF_CHILD_FISHING)) (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_CHILD_FISHING))
) { ) {
if (D_80B7E078 >= Fishing_GetMinimumRequiredScore()) { if (D_80B7E078 >= Fishing_GetMinimumRequiredScore()) {
HIGH_SCORE(HS_FISHING) |= 0x400; HIGH_SCORE(HS_FISHING) |= 0x400;
@ -5062,8 +5062,8 @@ void Fishing_HandleOwnerDialog(Fishing* this, PlayState* play) {
} }
} else { } else {
if ( if (
(!gSaveContext.n64ddFlag && !(HIGH_SCORE(HS_FISHING) & 0x800)) || (!IS_RANDO && !(HIGH_SCORE(HS_FISHING) & 0x800)) ||
(gSaveContext.n64ddFlag && !Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING)) (IS_RANDO && !Flags_GetRandomizerInf(RAND_INF_ADULT_FISHING))
) { ) {
if (D_80B7E078 >= Fishing_GetMinimumRequiredScore()) { if (D_80B7E078 >= Fishing_GetMinimumRequiredScore()) {
HIGH_SCORE(HS_FISHING) |= 0x800; HIGH_SCORE(HS_FISHING) |= 0x800;