Improve sounds

Knock Knock Wellspring
ori-community · May 31, 2024 · 3edb8cd · 3edb8cd
1 parent 5e37044
commit 3edb8cd
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 4 deletions.
diff --git a/projects/Core/enums/audio.h b/projects/Core/enums/audio.h
@@ -4,6 +4,7 @@
 enum class SoundEventID : uint32_t {
     // Randomizer
     LeagueSubmitted = 2697705149,
+    KnockKnockWellspring = 965810158,
 };
 
 NLOHMANN_JSON_SERIALIZE_ENUM(SoundEventID, {

diff --git a/projects/Randomizer/CMakeLists.txt b/projects/Randomizer/CMakeLists.txt
@@ -42,6 +42,7 @@ set(
         "features/difficulty.cpp"
         "features/keyboard_multibind.cpp"
         "features/keystone_door.cpp"
+        "features/knock_knock_wellspring.cpp"
         "features/map.cpp"
         "features/npcs/lupo_everywhere.cpp"
         "features/npcs/opher_everywhere.cpp"

diff --git a/projects/Randomizer/features/knock_knock_wellspring.cpp b/projects/Randomizer/features/knock_knock_wellspring.cpp
@@ -0,0 +1,32 @@
+
+
+#include <thread>
+#include <Core/api/audio.h>
+#include <Core/api/uber_states/uber_state_handlers.h>
+#include <Core/events/task.h>
+#include <Randomizer/tracking/game_tracker.h>
+
+namespace {
+    core::api::uber_states::UberState knock_knock_wellspring_enabled_state(UberStateGroup::RandoConfig, 102);
+
+    [[maybe_unused]]
+    auto uber_state_bus_handle = core::api::uber_states::single_notification_bus().register_handler(
+        core::api::uber_states::UberState(53632, 18181),
+        [](const core::api::uber_states::UberStateCallbackParams& params, auto) {
+            if (params.value > 0.5 && params.previous_value < 0.5 && knock_knock_wellspring_enabled_state.get<bool>()) {
+                const auto stats = randomizer::timing::get_save_file_game_stats();
+
+                if (stats.area_stats.contains(GameArea::Wellspring) && stats.area_stats.at(GameArea::Wellspring).in_game_time_spent > 0.f) {
+                    return;
+                }
+
+                using namespace std::chrono_literals;
+                core::api::audio::play_sound(SoundEventID::KnockKnockWellspring);
+
+                core::events::schedule_task_for_next_update([] {
+                    std::this_thread::sleep_for(2100ms);
+                });
+            }
+        }
+    );
+}
diff --git a/projects/Randomizer/tracking/game_tracker.cpp b/projects/Randomizer/tracking/game_tracker.cpp
@@ -4,7 +4,6 @@
 #include <Core/api/game/player.h>
 #include <Core/api/uber_states/uber_state_handlers.h>
 #include <Core/enums/world_events.h>
-#include <Core/events/async_update.h>
 #include <Core/ipc/ipc.h>
 #include <Core/save_meta/save_meta.h>
 #include <Modloader/app/methods/GameStateMachine.h>
@@ -15,11 +14,8 @@
 #include <Modloader/windows_api/console.h>
 #include <Randomizer/tracking/game_tracker.h>
 #include <Randomizer/randomizer.h>
-#include <Randomizer/stats/game_stats.h>
 
 #include <format>
-#include <atomic>
-#include <mutex>
 #include <unordered_set>
 
 using namespace app::classes;
@@ -331,4 +327,12 @@ namespace randomizer::timing {
     void force_set_game_finished(bool value) {
         game_finished = value;
     }
+
+    const SaveFileGameStats& get_save_file_game_stats() {
+        return *save_stats;
+    }
+
+    const CheckpointGameStats& get_checkpoint_game_stats() {
+        return *checkpoint_stats;
+    }
 } // namespace randomizer::timing
diff --git a/projects/Randomizer/tracking/game_tracker.h b/projects/Randomizer/tracking/game_tracker.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Core/enums/game_areas.h>
+#include <Randomizer/stats/game_stats.h>
 
 namespace randomizer::timing {
     extern bool disable_ability_tracking;
@@ -9,4 +10,6 @@ namespace randomizer::timing {
     void override_in_game_time(float in_game_time);
     float get_in_game_time();
     void force_set_game_finished(bool value);
+    const SaveFileGameStats& get_save_file_game_stats();
+    const CheckpointGameStats& get_checkpoint_game_stats();
 }
diff --git a/projects/Randomizer/uber_states/uber_state_initialization.cpp b/projects/Randomizer/uber_states/uber_state_initialization.cpp
@@ -383,6 +383,7 @@ namespace randomizer {
                 add_state<app::SerializedBooleanUberState>(UberStateGroup::RandoConfig, "disableWillowHeartCutscenes", 20, false),
                 add_state<app::SerializedBooleanUberState>(UberStateGroup::RandoConfig, "removeShriekEscapeSand", 100, false),
                 add_state<app::SerializedBooleanUberState>(UberStateGroup::RandoConfig, "removeFeedingGroundsToElevatorSand", 101, false),
+                add_state<app::SerializedBooleanUberState>(UberStateGroup::RandoConfig, "knockKnockWellspring", 102, false),
 
                 add_state<app::SerializedIntUberState>(UberStateGroup::RandoConfig, "forceNoAirDecelerationFlag", FORCE_AIR_NO_DECELERATION_ID, 0),