V3 : Anchor + Add All New Option For Randomizer And More

soh/assets/objects/object_custom_equip/object_custom_equip.h

@@ -113,6 +113,44 @@ static const ALIGN_ASSET(2) char gCustomAdultFPSHandDL[] = dgCustomAdultFPSHandD
 #define dgCustomChildFPSHandDL "__OTR__objects/object_custom_equip/gCustomChildFPSHandDL"
 static const ALIGN_ASSET(2) char gCustomChildFPSHandDL[] = dgCustomChildFPSHandDL;
 
+// Custom Bottle Content Display Lists
+#define dgCustomBottleDL "__OTR__objects/object_custom_equip/gCustomBottleDL"
+static const ALIGN_ASSET(2) char gCustomBottleDL[] = dgCustomBottleDL;
 
+#define dgCustomBottleRedPotionDL "__OTR__objects/object_custom_equip/gCustomBottleRedPotionDL"
+static const ALIGN_ASSET(2) char gCustomBottleRedPotionDL[] = dgCustomBottleRedPotionDL;
+
+#define dgCustomBottleGreenPotionDL "__OTR__objects/object_custom_equip/gCustomBottleGreenPotionDL"
+static const ALIGN_ASSET(2) char gCustomBottleGreenPotionDL[] = dgCustomBottleGreenPotionDL;
+
+#define dgCustomBottleBluePotionDL "__OTR__objects/object_custom_equip/gCustomBottleBluePotionDL"
+static const ALIGN_ASSET(2) char gCustomBottleBluePotionDL[] = dgCustomBottleBluePotionDL;
+
+#define dgCustomBottleFairyDL "__OTR__objects/object_custom_equip/gCustomBottleFairyDL"
+static const ALIGN_ASSET(2) char gCustomBottleFairyDL[] = dgCustomBottleFairyDL;
+
+#define dgCustomBottleFishDL "__OTR__objects/object_custom_equip/gCustomBottleFishDL"
+static const ALIGN_ASSET(2) char gCustomBottleFishDL[] = dgCustomBottleFishDL;
+
+#define dgCustomBottleMilkDL "__OTR__objects/object_custom_equip/gCustomBottleMilkDL"
+static const ALIGN_ASSET(2) char gCustomBottleMilkDL[] = dgCustomBottleMilkDL;
+
+#define dgCustomBottleMilkHalfDL "__OTR__objects/object_custom_equip/gCustomBottleMilkHalfDL"
+static const ALIGN_ASSET(2) char gCustomBottleMilkHalfDL[] = dgCustomBottleMilkHalfDL;
+
+#define dgCustomBottleLetterDL "__OTR__objects/object_custom_equip/gCustomBottleLetterDL"
+static const ALIGN_ASSET(2) char gCustomBottleLetterDL[] = dgCustomBottleLetterDL;
+
+#define dgCustomBottleBlueFireDL "__OTR__objects/object_custom_equip/gCustomBottleBlueFireDL"
+static const ALIGN_ASSET(2) char gCustomBottleBlueFireDL[] = dgCustomBottleBlueFireDL;
+
+#define dgCustomBottleBugDL "__OTR__objects/object_custom_equip/gCustomBottleBugDL"
+static const ALIGN_ASSET(2) char gCustomBottleBugDL[] = dgCustomBottleBugDL;
+
+#define dgCustomBottleBigPoeDL "__OTR__objects/object_custom_equip/gCustomBottleBigPoeDL"
+static const ALIGN_ASSET(2) char gCustomBottleBigPoeDL[] = dgCustomBottleBigPoeDL;
+
+#define dgCustomBottlePoeDL "__OTR__objects/object_custom_equip/gCustomBottlePoeDL"
+static const ALIGN_ASSET(2) char gCustomBottlePoeDL[] = dgCustomBottlePoeDL;
 
 #endif // OBJECTS_OBJECT_CUSTOM_EQUIP_H

soh/soh/Enhancements/Cheats/NoLikeLikeItemSteal.cpp

@@ -0,0 +1,17 @@
+#include <libultraship/bridge.h>
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "macros.h"
+}
+
+static constexpr int32_t CVAR_NOLIKELIKEITEMSTEAL_DEFAULT = 0;
+#define CVAR_NOLIKELIKEITEMSTEAL_NAME CVAR_CHEAT("NoLikeLikeItemSteal")
+#define CVAR_NOLIKELIKEITEMSTEAL_VALUE CVarGetInteger(CVAR_NOLIKELIKEITEMSTEAL_NAME, CVAR_NOLIKELIKEITEMSTEAL_DEFAULT)
+
+void RegisterNoLikeLikeItemSteal() {
+    COND_VB_SHOULD(VB_LIKE_LIKE_STEAL_EQUIPMENT, CVAR_NOLIKELIKEITEMSTEAL_VALUE, { *should = false; });
+}
+
+static RegisterShipInitFunc initFunc(RegisterNoLikeLikeItemSteal, { CVAR_NOLIKELIKEITEMSTEAL_NAME });

soh/soh/Enhancements/DropThrowOnlyActors.cpp

@@ -0,0 +1,66 @@
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+extern PlayState* gPlayState;
+}
+
+static int sDropThrowOnlyLastValue = -1;
+
+static void AllowThrowOnlyDrop(Actor* actor, int cvarValue) {
+    if (actor == nullptr) {
+        return;
+    }
+
+    switch (actor->id) {
+        case ACTOR_EN_ISHI:
+        case ACTOR_EN_KUSA:
+        case ACTOR_EN_NIW:
+        case ACTOR_OBJ_TSUBO:
+            break;
+        default:
+            return;
+    }
+
+    if (cvarValue) {
+        actor->flags &= ~ACTOR_FLAG_THROW_ONLY;
+    } else {
+        actor->flags |= ACTOR_FLAG_THROW_ONLY;
+    }
+}
+
+static void OnThrowOnlyActorInit(void* actorPtr) {
+    if (gPlayState == nullptr || actorPtr == nullptr) {
+        return;
+    }
+
+    // Use current cvar state for newly spawned actors too
+    const int currentValue = CVarGetInteger(CVAR_ENHANCEMENT("DropThrowOnlyObjects"), 0);
+    AllowThrowOnlyDrop((Actor*)actorPtr, currentValue);
+}
+
+static void DropThrowOnlyCVarWatcher() {
+    if (gPlayState == nullptr) {
+        return;
+    }
+
+    const int currentValue = CVarGetInteger(CVAR_ENHANCEMENT("DropThrowOnlyObjects"), 0);
+
+    sDropThrowOnlyLastValue = currentValue;
+
+    for (int category = 0; category < ACTORCAT_MAX; category++) {
+        for (Actor* actor = gPlayState->actorCtx.actorLists[category].head; actor != nullptr; actor = actor->next) {
+            AllowThrowOnlyDrop(actor, currentValue);
+        }
+    }
+}
+
+void RegisterAllowThrowOnlyDrop() {
+    // Always enabled so newly spawned actors match the current cvar state.
+    COND_HOOK(OnActorInit, true, OnThrowOnlyActorInit);
+
+    COND_HOOK(OnGameFrameUpdate, CVarGetInteger(CVAR_ENHANCEMENT("DropThrowOnlyObjects"), 0) != sDropThrowOnlyLastValue,
+              DropThrowOnlyCVarWatcher);
+}
+
+static RegisterShipInitFunc initFunc(RegisterAllowThrowOnlyDrop, { CVAR_ENHANCEMENT("DropThrowOnlyObjects") });

soh/soh/Enhancements/ExtraTraps.cpp

@@ -197,4 +197,4 @@ void RegisterExtraTraps() {
     });
 }
 
-static RegisterShipInitFunc initFunc(RegisterExtraTraps, { CVAR_EXTRA_TRAPS_NAME });
+static RegisterShipInitFunc initFunc(RegisterExtraTraps, { CVAR_EXTRA_TRAPS_NAME });

soh/soh/Enhancements/Presets/Presets.cpp

@@ -250,18 +250,25 @@ void SavePreset(std::string& presetName) {
     }
     presets[presetName].presetValues["presetName"] = presetName;
     presets[presetName].presetValues["fileType"] = FILE_TYPE_PRESET;
-    std::ofstream file(
-        fmt::format("{}/{}.json", Ship::Context::GetInstance()->LocateFileAcrossAppDirs("presets"), presetName));
+    std::ofstream file(FormatPresetPath(presetName));
     file << presets[presetName].presetValues.dump(4);
     file.close();
     LoadPresets();
 }
 
-static std::string newPresetName;
+void DeletePreset(std::string& presetName) {
+    std::string presetPath = FormatPresetPath(presetName);
+    if (fs::exists(presetPath)) {
+        fs::remove(presetPath);
+    }
+    presets.erase(presetName);
+}
+
+static std::string newPresetName, oldPresetName;
 static bool saveSection[PRESET_SECTION_MAX];
 
-void DrawNewPresetPopup() {
-    bool nameExists = presets.contains(newPresetName);
+void DrawEditPresetPopup() {
+    bool nameExists = presets.contains(newPresetName) && newPresetName != oldPresetName;
     UIWidgets::InputString("Preset Name", &newPresetName,
                            UIWidgets::InputOptions()
                                .Color(THEME_COLOR)
@@ -270,7 +277,7 @@ void DrawNewPresetPopup() {
                                .LabelPosition(UIWidgets::LabelPositions::Near)
                                .ErrorText("Preset name already exists")
                                .HasError(nameExists));
-    nameExists = presets.contains(newPresetName);
+    nameExists = presets.contains(newPresetName) && newPresetName != oldPresetName;
     bool noneSelected = true;
     for (int i = PRESET_SECTION_SETTINGS; i < PRESET_SECTION_MAX; i++) {
         if (saveSection[i]) {
@@ -348,10 +355,15 @@ void DrawNewPresetPopup() {
         presets[newPresetName].fileName = newPresetName;
         std::fill_n(presets[newPresetName].apply, PRESET_SECTION_MAX, true);
         SavePreset(newPresetName);
+        if (newPresetName != oldPresetName) {
+            DeletePreset(oldPresetName);
+        }
         newPresetName = "";
+        oldPresetName = "";
         ImGui::CloseCurrentPopup();
     }
     if (UIWidgets::Button("Cancel", UIWidgets::ButtonOptions().Padding({ 6.0f, 6.0f }).Color(THEME_COLOR))) {
+        oldPresetName = "";
         ImGui::CloseCurrentPopup();
     }
     ImGui::EndPopup();
@@ -364,25 +376,32 @@ void PresetsCustomWidget(WidgetInfo& info) {
                                                 .disabledTooltip = "Disabled because of race lockout" } })
                                             .Size(UIWidgets::Sizes::Inline)
                                             .Color(THEME_COLOR))) {
-        ImGui::OpenPopup("newPreset");
+        oldPresetName = "";
+        newPresetName = "";
+        std::fill_n(saveSection, PRESET_SECTION_MAX, true);
+        ImGui::OpenPopup("editPreset");
+    } else if (oldPresetName != "") {
+        ImGui::OpenPopup("editPreset");
     }
-    if (ImGui::BeginPopup("newPreset", ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize |
-                                           ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoScrollbar |
-                                           ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoTitleBar)) {
-        DrawNewPresetPopup();
+    if (ImGui::BeginPopup("editPreset", ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize |
+                                            ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoScrollbar |
+                                            ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoTitleBar)) {
+        DrawEditPresetPopup();
     }
     ImGui::SameLine();
     UIWidgets::CVarCheckbox("Hide built-in presets", CVAR_GENERAL("HideBuiltInPresets"),
                             UIWidgets::CheckboxOptions().Color(THEME_COLOR));
     bool hideBuiltIn = CVarGetInteger(CVAR_GENERAL("HideBuiltInPresets"), 0);
     UIWidgets::PushStyleTabs(THEME_COLOR);
-    if (ImGui::BeginTable("PresetWidgetTable", PRESET_SECTION_MAX + 3)) {
+    if (ImGui::BeginTable("PresetWidgetTable", PRESET_SECTION_MAX + 4)) {
         ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, 400);
         for (int i = PRESET_SECTION_SETTINGS; i < PRESET_SECTION_MAX; i++) {
             ImGui::TableSetupColumn(blockInfo[i].names[0].c_str());
         }
         ImGui::TableSetupColumn("Apply", ImGuiTableColumnFlags_WidthFixed,
                                 ImGui::CalcTextSize("Apply").x + ImGui::GetStyle().FramePadding.x * 2);
+        ImGui::TableSetupColumn("Edit", ImGuiTableColumnFlags_WidthFixed,
+                                ImGui::CalcTextSize("Edit").x + ImGui::GetStyle().FramePadding.x * 2);
         ImGui::TableSetupColumn("Delete", ImGuiTableColumnFlags_WidthFixed,
                                 ImGui::CalcTextSize("Delete").x + ImGui::GetStyle().FramePadding.x * 2);
         BlankButton();
@@ -431,13 +450,17 @@ void PresetsCustomWidget(WidgetInfo& info) {
             ImGui::TableNextColumn();
             UIWidgets::PushStyleButton(THEME_COLOR);
             if (!info.isBuiltIn) {
+                if (UIWidgets::Button(("Edit##" + name).c_str(), UIWidgets::ButtonOptions().Padding({ 6.0f, 6.0f }))) {
+                    std::copy(info.apply, info.apply + PRESET_SECTION_MAX, saveSection);
+                    newPresetName = name;
+                    oldPresetName = name;
+                }
+                UIWidgets::PopStyleButton();
+                ImGui::TableNextColumn();
+                UIWidgets::PushStyleButton(THEME_COLOR);
                 if (UIWidgets::Button(("Delete##" + name).c_str(),
                                       UIWidgets::ButtonOptions().Padding({ 6.0f, 6.0f }))) {
-                    auto path = FormatPresetPath(info.fileName);
-                    if (fs::exists(path)) {
-                        fs::remove(path);
-                    }
-                    presets.erase(name);
+                    DeletePreset(info.fileName);
                     UIWidgets::PopStyleButton();
                     break;
                 }

soh/soh/Enhancements/QoL/ResetNaviTimer.cpp

@@ -14,4 +14,4 @@ static void RegisterResetNaviTimer() {
     COND_HOOK(OnSceneInit, CVAR_RESET_NAVI_VALUE, [](int32_t) { gSaveContext.naviTimer = 0; });
 }
 
-static RegisterShipInitFunc initFunc(RegisterResetNaviTimer, { CVAR_RESET_NAVI_NAME });
+static RegisterShipInitFunc initFunc(RegisterResetNaviTimer, { CVAR_RESET_NAVI_NAME });

soh/soh/Enhancements/audio/DisableNaviCallAudio.cpp

@@ -0,0 +1,13 @@
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+static constexpr int32_t CVAR_DISABLENAVICALLAUDIO_DEFAULT = 0;
+#define CVAR_DISABLENAVICALLAUDIO_NAME CVAR_AUDIO("DisableNaviCallAudio")
+#define CVAR_DISABLENAVICALLAUDIO_VALUE \
+    CVarGetInteger(CVAR_DISABLENAVICALLAUDIO_NAME, CVAR_DISABLENAVICALLAUDIO_DEFAULT)
+
+void RegisterDisableNaviCallAudio() {
+    COND_VB_SHOULD(VB_PLAY_NAVI_CALL_SOUND, CVAR_DISABLENAVICALLAUDIO_VALUE, { *should = false; });
+}
+
+static RegisterShipInitFunc initFunc(RegisterDisableNaviCallAudio, { CVAR_DISABLENAVICALLAUDIO_NAME });

soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp

@@ -1889,6 +1889,10 @@ void DrawSillyTab() {
 
     UIWidgets::Separator(true, true, 2.0f, 2.0f);
 
+    UIWidgets::CVarCheckbox(
+        "Invisible Navi", CVAR_COSMETIC("InvisibleNavi"),
+        UIWidgets::CheckboxOptions().Color(THEME_COLOR).Tooltip("Makes Navi invisible and disables her sounds."));
+
     UIWidgets::CVarCheckbox("Let It Snow", CVAR_GENERAL("LetItSnow"),
                             UIWidgets::CheckboxOptions()
                                 .Color(THEME_COLOR)

soh/soh/Enhancements/cosmetics/InvisibleNavi.cpp

@@ -0,0 +1,63 @@
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "src/overlays/actors/ovl_En_Elf/z_en_elf.h"
+}
+
+static constexpr int32_t CVAR_INVISIBLENAVI_DEFAULT = 0;
+#define CVAR_INVISIBLENAVI_NAME CVAR_COSMETIC("InvisibleNavi")
+#define CVAR_INVISIBLENAVI_VALUE CVarGetInteger(CVAR_INVISIBLENAVI_NAME, CVAR_INVISIBLENAVI_DEFAULT)
+
+void RegisterInvisibleNavi() {
+    COND_VB_SHOULD(VB_FAIRY_DRAW, CVAR_INVISIBLENAVI_VALUE, {
+        EnElf* enElf = va_arg(args, EnElf*);
+        if (enElf->actor.params == FAIRY_NAVI) {
+            *should = false;
+        }
+    });
+
+    COND_VB_SHOULD(VB_FAIRY_SPAWN_SPARKLES, CVAR_INVISIBLENAVI_VALUE, {
+        EnElf* enElf = va_arg(args, EnElf*);
+        if (enElf->actor.params == FAIRY_NAVI) {
+            *should = false;
+        }
+    });
+
+    COND_VB_SHOULD(VB_FAIRY_PLAY_C_UP_TALK_SOUND, CVAR_INVISIBLENAVI_VALUE, {
+        EnElf* enElf = va_arg(args, EnElf*);
+        if (enElf->actor.params == FAIRY_NAVI) {
+            *should = false;
+        }
+    });
+
+    COND_VB_SHOULD(VB_FAIRY_PLAY_DASH_SOUND, CVAR_INVISIBLENAVI_VALUE, {
+        EnElf* enElf = va_arg(args, EnElf*);
+        if (enElf->actor.params == FAIRY_NAVI) {
+            *should = false;
+        }
+    });
+
+    COND_VB_SHOULD(VB_FAIRY_PLAY_VANISH_SOUND, CVAR_INVISIBLENAVI_VALUE, {
+        EnElf* enElf = va_arg(args, EnElf*);
+        if (enElf->actor.params == FAIRY_NAVI) {
+            *should = false;
+        }
+    });
+
+    COND_VB_SHOULD(VB_FAIRY_UPDATE_LIGHTS, CVAR_INVISIBLENAVI_VALUE, {
+        EnElf* enElf = va_arg(args, EnElf*);
+        if (enElf->actor.params == FAIRY_NAVI) {
+            // Force Navi's light radius to zero.
+            Lights_PointGlowSetInfo(&enElf->lightInfoGlow, enElf->actor.world.pos.x, enElf->actor.world.pos.y,
+                                    enElf->actor.world.pos.z, 255, 255, 255, 0);
+            *should = false;
+        }
+    });
+
+    COND_VB_SHOULD(VB_PLAY_NAVI_CALL_SOUND, CVAR_INVISIBLENAVI_VALUE, { *should = false; });
+
+    COND_VB_SHOULD(VB_PLAY_INTRO_NAVI_SOUNDS, CVAR_INVISIBLENAVI_VALUE, { *should = false; });
+}
+
+static RegisterShipInitFunc initFunc(RegisterInvisibleNavi, { CVAR_INVISIBLENAVI_NAME });