Merge remote-tracking branch 'origin/main' into feature/hyper-enemies

# Conflicts:
#	src/dusk/imgui/ImGuiMenuGame.cpp
#	src/dusk/settings.cpp

include/dusk/settings.h

@@ -72,6 +72,7 @@ struct UserSettings {
         ConfigVar<bool> disableRupeeCutscenes;
         ConfigVar<bool> noSwordRecoil;
         ConfigVar<int> damageMultiplier;
+        ConfigVar<bool> hyperEnemies;
         ConfigVar<bool> noHeartDrops;
         ConfigVar<bool> instantDeath;
         ConfigVar<bool> fastClimbing;

src/dusk/imgui/ImGuiMenuGame.cpp

@@ -583,6 +583,7 @@ namespace dusk {
         getSettings().game.damageMultiplier.setValue(1);
         getSettings().game.instantDeath.setValue(false);
         getSettings().game.noHeartDrops.setValue(false);
+        getSettings().game.hyperEnemies.setValue(false);
 
         getSettings().game.infiniteHearts.setValue(false);
         getSettings().game.infiniteArrows.setValue(false);

src/dusk/settings.cpp

@@ -32,6 +32,7 @@ UserSettings g_userSettings = {
         .disableRupeeCutscenes {"game.disableRupeeCutscenes", false},
         .noSwordRecoil {"game.noSwordRecoil", false},
         .damageMultiplier {"game.damageMultiplier", 1},
+        .hyperEnemies {"game.hyperEnemies", false},
         .noHeartDrops {"game.noHeartDrops", false},
         .instantDeath {"game.instantDeath", false},
         .fastClimbing {"game.fastClimbing", false},
@@ -147,6 +148,7 @@ void registerSettings() {
     Register(g_userSettings.game.disableRupeeCutscenes);
     Register(g_userSettings.game.noSwordRecoil);
     Register(g_userSettings.game.damageMultiplier);
+    Register(g_userSettings.game.hyperEnemies);
     Register(g_userSettings.game.noHeartDrops);
     Register(g_userSettings.game.instantDeath);
     Register(g_userSettings.game.fastClimbing);

src/dusk/ui/settings.cpp

@@ -296,6 +296,8 @@ SettingsWindow::SettingsWindow() {
             "Any hit will instantly kill you.");
         addSpeedrunDisabledOption("No Heart Drops", getSettings().game.noHeartDrops,
             "Hearts will never drop from enemies, pots, and various other places.");
+        addOption("Hyper Enemies", getSettings().game.hyperEnemies,
+            "Enemies and Bosses are twice as fast.");
 
         leftPane.add_section("Quality of Life");
         addOption("Bigger Wallets", getSettings().game.biggerWallets,

src/f_op/f_op_actor.cpp

@@ -335,6 +335,13 @@ static int fopAc_Execute(void* i_this) {
             print_error_check_c error_check(actor, print_error_check_c::sEXECUTE);
             #endif
 
+            #if TARGET_PC
+            if (dusk::getSettings().game.hyperEnemies && actor->group == fopAc_ENEMY_e && !dComIfGp_event_runCheck())
+            {
+                fpcMtd_Execute((process_method_class*)actor->sub_method, actor);
+            }
+            #endif
+
             ret = fpcMtd_Execute((process_method_class*)actor->sub_method, actor);
 
             #if DEBUG