Chaos v1

soh/soh/Enhancements/chaos-mode/ChaosWindow.h

@@ -0,0 +1,103 @@
+#ifndef CHAOSWINDOW_H
+#define CHAOSWINDOW_H
+
+#include "GuiWindow.h"
+#include "z64.h"
+#include <vector>
+#include "Fonts.h"
+
+extern void ChaosUpdateVotingInterval();
+
+typedef enum {
+    COLOR_WHITE,
+    COLOR_GRAY,
+    COLOR_DARK_GRAY,
+    COLOR_INDIGO,
+    COLOR_LIGHT_RED,
+    COLOR_RED,
+    COLOR_DARK_RED,
+    COLOR_LIGHT_GREEN,
+    COLOR_GREEN,
+    COLOR_DARK_GREEN,
+    COLOR_YELLOW,
+};
+
+typedef struct {
+    uint32_t colorName;
+    ImVec4 colorCode;
+} colorObject;
+
+typedef struct {
+    uint32_t eventId;
+    const char* eventName;
+    const char* eventVariable;
+    uint32_t eventTimer;
+    const char* eventDescription;
+} eventObject;
+
+typedef struct {
+    uint32_t votingOption;
+    uint32_t votingCount;
+} voteObject;
+
+typedef enum {
+    EVENT_ACTION_REMOVE,
+    EVENT_ACTION_ADD,
+};
+
+typedef struct {
+    uint32_t eventTimer;
+    const char* eventVariable;
+} eventTimerObject;
+
+typedef enum {
+    EVENT_INVISIBILITY,
+    EVENT_STORMY_WEATHER,
+    EVENT_FORCE_IRON_BOOTS,
+    EVENT_FORCE_HOVER_BOOTS,
+    EVENT_BOMBERMAN_MODE,
+    EVENT_FLOOR_IS_LAVA,
+    EVENT_FAKE_TELEPORT,
+    EVENT_REAL_TELEPORT,
+    EVENT_ACTOR_MAGNET,
+    EVENT_DEATH_SWITCH,
+    EVENT_KNUCKLE_RING,
+    EVENT_MIDO_SUCKS,
+    EVENT_THROWN_IN_THE_PAST,
+    EVENT_ERASURE,
+    EVENT_FALLING_CEILING,
+    EVENT_FORCE_STOP_HEARTS,
+    EVENT_SPIKE_TRAP,
+    EVENT_FLOATING_STUFF,
+    EVENT_DROP_RUPEES,
+    EVENT_FIRE_MAZE,
+    EVENT_CARDINALS_REVENGE,
+    EVENT_MAX_CHAOS,
+} ChaosEvents;
+
+typedef enum {
+    VOTE_OPTION_A,
+    VOTE_OPTION_B,
+    VOTE_OPTION_C,
+};
+
+typedef enum {
+    BUTTON_CLEFT = 1,
+    BUTTON_CDOWN,
+    BUTTON_CRIGHT,
+    BUTTON_DUP,
+    BUTTON_DDOWN,
+    BUTTON_DLEFT,
+    BUTTON_DRIGHT,
+};
+
+class ChaosWindow : public Ship::GuiWindow {
+  public:
+    using GuiWindow::GuiWindow;
+
+    void InitElement();
+    void DrawElement();
+    void UpdateElement() override{};
+};
+
+#endif // CHAOSWINDOW_H

soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp

@@ -640,4 +640,12 @@ namespace GameInteractionEffect {
     void SlipperyFloor::_Remove() {
         GameInteractor::State::SlipperyFloorActive = 0;
     }
+
+    // MARK: - ChaosVote
+    GameInteractionEffectQueryResult ChaosVote::CanBeApplied() {
+        return GameInteractionEffectQueryResult::Possible;
+    }
+    void ChaosVote::_Apply() {
+        GameInteractor::State::ChaosVotes[this->voterName] = this->vote;
+    }
 }

soh/soh/Enhancements/game-interactor/GameInteractionEffect.h

@@ -6,6 +6,8 @@
 #include <stdint.h>
 
 #ifdef __cplusplus
+#include <string>
+
 enum GameInteractionEffectQueryResult {
     Possible                = 0x00,
     TemporarilyNotPossible  = 0x01,
@@ -262,6 +264,15 @@ namespace GameInteractionEffect {
         void _Apply() override;
         void _Remove() override;
     };
+
+    class ChaosVote: public GameInteractionEffectBase, public ParameterizedGameInteractionEffect {
+        GameInteractionEffectQueryResult CanBeApplied() override;
+        void _Apply() override;
+
+        public:
+            std::string voterName;
+            int32_t vote;
+    };
 }
 
 #endif /* __cplusplus */

soh/soh/Enhancements/game-interactor/GameInteractor.h

@@ -65,6 +65,7 @@ typedef enum {
     /*      */ GI_TP_DEST_REQUIEM = ENTR_DESERT_COLOSSUS_5,
     /*      */ GI_TP_DEST_NOCTURNE = ENTR_GRAVEYARD_7,
     /*      */ GI_TP_DEST_PRELUDE = ENTR_TEMPLE_OF_TIME_7,
+    /*      */ GI_TP_DEST_JAILCELL = ENTR_GERUDOS_FORTRESS_17,
 } GITeleportDestinations;
 
 #ifdef __cplusplus
@@ -139,6 +140,7 @@ class GameInteractor {
         static uint8_t SecondCollisionUpdate;
         static uint8_t TriforceHuntPieceGiven;
         static uint8_t TriforceHuntCreditsWarpActive;
+        static std::map<std::string, uint32_t> ChaosVotes;
 
         static void SetPacifistMode(bool active);
     };
@@ -212,6 +214,7 @@ class GameInteractor {
     DEFINE_HOOK(OnPlayerBonk, void());
     DEFINE_HOOK(OnPlayDestroy, void());
     DEFINE_HOOK(OnPlayDrawEnd, void());
+    DEFINE_HOOK(OnPlayerHealthChange, void(int16_t amount));
 
     DEFINE_HOOK(OnSaveFile, void(int32_t fileNum));
     DEFINE_HOOK(OnLoadFile, void(int32_t fileNum));

soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.cpp

@@ -90,6 +90,10 @@ void GameInteractor_ExecuteOnPlayDrawEnd() {
     GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayDrawEnd>();
 }
 
+void GameInteractor_ExecuteOnPlayerHealthChange(int16_t amount) {
+    GameInteractor::Instance->ExecuteHooks<GameInteractor::OnPlayerHealthChange>(amount);
+}
+
 // MARK: -  Save Files
 
 void GameInteractor_ExecuteOnSaveFile(int32_t fileNum) {

soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h

@@ -27,6 +27,7 @@ void GameInteractor_ExecuteOnOcarinaSongAction();
 void GameInteractor_ExecuteOnShopSlotChangeHooks(uint8_t cursorIndex, int16_t price);
 void GameInteractor_ExecuteOnPlayDestroy();
 void GameInteractor_ExecuteOnPlayDrawEnd();
+void GameInteractor_ExecuteOnPlayerHealthChange(int16_t amount);
 
 // MARK: -  Save Files
 void GameInteractor_ExecuteOnSaveFile(int32_t fileNum);

soh/soh/Enhancements/game-interactor/GameInteractor_Sail.cpp

@@ -330,6 +330,12 @@ GameInteractionEffectBase* GameInteractorSail::EffectFromJson(nlohmann::json pay
         return new GameInteractionEffect::PlayerInvincibility();
     } else if (name == "SlipperyFloor") {
         return new GameInteractionEffect::SlipperyFloor();
+    } else if (name == "ChaosVote") {
+        auto effect = new GameInteractionEffect::ChaosVote();
+        effect->vote = payload["parameters"][0].get<int32_t>();
+        effect->voterName = payload["parameters"][1].get<std::string>();
+
+        return effect;
     } else {
         SPDLOG_INFO("[GameInteractorSail] Unknown effect name: {}", name);
         return nullptr;

soh/soh/Enhancements/game-interactor/GameInteractor_State.cpp

@@ -22,6 +22,7 @@ uint8_t GameInteractor::State::SlipperyFloorActive = 0;
 uint8_t GameInteractor::State::SecondCollisionUpdate = 0;
 uint8_t GameInteractor::State::TriforceHuntPieceGiven = 0;
 uint8_t GameInteractor::State::TriforceHuntCreditsWarpActive = 0;
+std::map<std::string, uint32_t> GameInteractor::State::ChaosVotes = {};
 
 void GameInteractor::State::SetPacifistMode(bool active) {
     PacifistModeActive = active;

soh/soh/OTRGlobals.cpp

@@ -48,6 +48,8 @@
 #include "util.h"
 #include <boost_custom/container_hash/hash_32.hpp>
 
+#include "Enhancements/chaos-mode/ChaosWindow.h"
+
 #if not defined (__SWITCH__) && not defined(__WIIU__)
 #include "Extractor/Extract.h"
 #endif

soh/soh/SohGui.cpp

@@ -135,6 +135,8 @@ namespace SohGui {
     std::shared_ptr<AdvancedResolutionSettings::AdvancedResolutionSettingsWindow> mAdvancedResolutionSettingsWindow;
     std::shared_ptr<SohModalWindow> mModalWindow;
 
+    std::shared_ptr<ChaosWindow> mChaosWindow;
+
     void SetupGuiElements() {
         auto gui = Ship::Context::GetInstance()->GetWindow()->GetGui();
 
@@ -203,6 +205,9 @@ namespace SohGui {
         mModalWindow = std::make_shared<SohModalWindow>(CVAR_WINDOW("ModalWindow"), "Modal Window");
         gui->AddGuiWindow(mModalWindow);
         mModalWindow->Show();
+
+        mChaosWindow = std::make_shared<ChaosWindow>(CVAR_WINDOW("Chaos"), "Chaos Tracker");
+        gui->AddGuiWindow(mChaosWindow);
     }
 
     void Destroy() {
@@ -232,6 +237,8 @@ namespace SohGui {
         mSohMenuBar = nullptr;
         mInputViewer = nullptr;
         mInputViewerSettings = nullptr;
+
+        mChaosWindow = nullptr;
     }
 
     void RegisterPopup(std::string title, std::string message, std::string button1, std::string button2, std::function<void()> button1callback, std::function<void()> button2callback) {

soh/soh/SohGui.hpp

@@ -25,6 +25,8 @@
 #include "Enhancements/randomizer/randomizer_settings_window.h"
 #include "SohModals.h"
 
+#include "Enhancements/chaos-mode/ChaosWindow.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

soh/soh/SohMenuBar.cpp

@@ -37,6 +37,8 @@
 #include "Enhancements/randomizer/randomizer_settings_window.h"
 #include "Enhancements/resolution-editor/ResolutionEditor.h"
 
+#include "Enhancements/chaos-mode/ChaosWindow.h"
+
 extern bool isBetaQuestEnabled;
 
 extern "C" PlayState* gPlayState;
@@ -411,9 +413,10 @@ void DrawSettingsMenu() {
             #else
                 bool matchingRefreshRate =
                     CVarGetInteger(CVAR_SETTING("MatchRefreshRate"), 0) && Ship::Context::GetInstance()->GetWindow()->GetWindowBackend() != Ship::WindowBackend::FAST3D_DXGI_DX11;
-                UIWidgets::PaddedEnhancementSliderInt(
+                if (UIWidgets::PaddedEnhancementSliderInt(
                     (currentFps == 20) ? "Frame Rate: Original (20 fps)" : "Frame Rate: %d fps",
-                    "##FPSInterpolation", CVAR_SETTING("InterpolationFPS"), minFps, maxFps, "", 20, true, true, false, matchingRefreshRate);
+                    "##FPSInterpolation", CVAR_SETTING("InterpolationFPS"), minFps, maxFps, "", 20, true, true, false, matchingRefreshRate)) {
+                }
             #endif
                 if (Ship::Context::GetInstance()->GetWindow()->GetWindowBackend() == Ship::WindowBackend::FAST3D_DXGI_DX11) {
                     UIWidgets::Tooltip(
@@ -552,6 +555,8 @@ extern std::shared_ptr<AudioEditor> mAudioEditorWindow;
 extern std::shared_ptr<CosmeticsEditorWindow> mCosmeticsEditorWindow;
 extern std::shared_ptr<GameplayStatsWindow> mGameplayStatsWindow;
 
+extern std::shared_ptr<ChaosWindow> mChaosWindow;
+
 void DrawEnhancementsMenu() {
     if (ImGui::BeginMenu("Enhancements"))
     {
@@ -1419,6 +1424,14 @@ void DrawEnhancementsMenu() {
                 "- Each Heart Container or full Heart Piece reduces Links hearts by 1.\n"
                 "- Can be enabled retroactively after a File has already started.");
 
+            if (mChaosWindow) {
+                if (ImGui::Button(
+                        GetWindowButtonText("Chaos Tracker", CVarGetInteger(CVAR_WINDOW("Chaos"), 0)).c_str(),
+                        ImVec2(-1.0f, 0.0f))) {
+                    mChaosWindow->ToggleVisibility();
+                }
+            }
+
             ImGui::EndMenu();
         }
 

soh/src/code/z_parameter.c

@@ -3154,6 +3154,7 @@ s32 Health_ChangeBy(PlayState* play, s16 healthChange) {
     if (healthChange < 0) {
         gSaveContext.sohStats.count[COUNT_DAMAGE_TAKEN] += -healthChange;
     }
+    GameInteractor_ExecuteOnPlayerHealthChange(healthChange);
 
     // If one-hit ko mode is on, any damage kills you and you cannot gain health.
     if (GameInteractor_OneHitKOActive()) {

soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c

@@ -336,7 +336,7 @@ void func_808805C0(BgHakaTrap* this, PlayState* play) {
         }
 
         if (this->timer == 20) {
-            Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_GUILLOTINE_UP);
+                Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_GUILLOTINE_UP);
         }
     }
 
@@ -413,10 +413,14 @@ void func_808808F4(BgHakaTrap* this, PlayState* play) {
     }
 
     if (this->timer == 0) {
-        this->timer = 30;
-        this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y;
-        this->dyna.actor.velocity.y = 0.5f;
-        this->actionFunc = func_808806BC;
+        if (CVarGetInteger(CVAR_ENHANCEMENT("EnableChaosMode"), 0) == 1) {
+            Actor_Kill(this);
+        } else {
+            this->timer = 30;
+            this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y;
+            this->dyna.actor.velocity.y = 0.5f;
+            this->actionFunc = func_808806BC;
+        }
     }
 }