fixed death effect

TobyAdd · Oct 1, 2024 · 10953fe · 10953fe
1 parent 30b86f9
commit 10953fe
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/src/gui.cpp b/src/gui.cpp
@@ -308,6 +308,7 @@ void gui::RenderMain() {
                         else if (hck.name == "RGB Icons") { hacks::rgb_icons = hck.enabled; }
                         else if (hck.name == "Wave Trail Size") { hacks::wave_trail = hck.enabled; }
                         else if (hck.name == "Random Seed") { hacks::random_seed_enabled = hck.enabled; }
+                        else if (hck.name == "No Death Effect") { hacks::no_death_effect = hck.enabled; }
                         else if (hck.name == "Show Hitboxes") { 
                             hacks::show_hitboxes = hck.enabled;
                             auto pl = PlayLayer::get();
@@ -519,6 +520,7 @@ void gui::toggleKeybinds(int key) {
                 else if (hck.name == "RGB Icons") { hacks::rgb_icons = hck.enabled; }
                 else if (hck.name == "Wave Trail Size") { hacks::wave_trail = hck.enabled; }
                 else if (hck.name == "Random Seed") { hacks::random_seed_enabled = hck.enabled; }
+                else if (hck.name == "No Death Effect") { hacks::no_death_effect = hck.enabled; }
                 else if (hck.name == "Show Hitboxes") { 
                     hacks::show_hitboxes = hck.enabled;
                     auto pl = PlayLayer::get();

diff --git a/src/hacks.cpp b/src/hacks.cpp
@@ -63,6 +63,8 @@ bool hacks::reset_maket = false;
 
 bool hacks::disable_render = false;
 
+bool hacks::no_death_effect = false;
+
 std::vector<window> hacks::windows = {
     {"Core", 10, 10, 200, 200, 
         {
@@ -80,11 +82,7 @@ std::vector<window> hacks::windows = {
                     {"0f 85 ? ? ? ? ba ? ? ? ? ff 15 ? ? ? ? ba", "E9 F3 00"}
                 }
             },
-            {"No Death Effect", "Upon death, the cube will not emit an exploding effect",
-                {
-                    {"e8 ? ? ? ? 80 bf ? ? ? ? ? 74 ? 48 8b 9f ? ? ? ? 8b 83", "90 90 90 90 90"}
-                }
-            },
+            {"No Death Effect", "Upon death, the cube will not emit an exploding effect"},
             {"Safe Mode", "Disables progress on levels",
                 {
                     {"0f 85 ? ? ? ? 40 38 b7 ? ? ? ? 0f 85 ? ? ? ? 0f b6 97", "E9 B4 01 00 00 90"},
@@ -420,6 +418,7 @@ void hacks::init() {
                 else if (hck.name == "Wave Trail Size") { hacks::wave_trail = hck.enabled; }
                 else if (hck.name == "Show Hitboxes") { hacks::show_hitboxes = hck.enabled; }
                 else if (hck.name == "Random Seed") { hacks::random_seed_enabled = hck.enabled; }
+                else if (hck.name == "No Death Effect") { hacks::no_death_effect = hck.enabled; }
                 else {
                     for (auto& opc : hck.opcodes) {
                         std::string bytesStr = hck.enabled ? opc.on : opc.off;

diff --git a/src/hacks.hpp b/src/hacks.hpp
@@ -99,6 +99,8 @@ namespace hacks {
 
     extern bool disable_render;
 
+    extern bool no_death_effect;
+
     void update_framerate(float value);
 
     void save(const std::vector<window>& windows, const std::filesystem::path &filename);

diff --git a/src/hooks.cpp b/src/hooks.cpp
@@ -15,6 +15,7 @@
 #include <Geode/modify/LevelInfoLayer.hpp>
 #include <Geode/modify/EndLevelLayer.hpp>
 #include <Geode/modify/AchievementNotifier.hpp>
+#include <Geode/modify/PlayerObject.hpp>
 #include "speedhackAudio.hpp"
 #include "labels.hpp"
 #include "replayEngine.hpp"
@@ -662,6 +663,13 @@ class $modify(GameManager) {
     }
 };
 
+class $modify(PlayerObject) {
+    void playDeathEffect() {
+        if (hacks::no_death_effect) return;            
+        PlayerObject::playDeathEffect();
+    }
+};
+
 class $modify(GameStatsManager) {
     bool isItemUnlocked(UnlockType p0, int p1) {
         if (GameStatsManager::isItemUnlocked(p0, p1))