fix: use key after smo session

also turn off cli progress bar for action, and force normal mode in coop
maybe there could be other coop modes in future? 👀

Author: ThisAMJ

.github/workflows/CI.yml

@@ -28,7 +28,7 @@ jobs:
           wget https://github.com/craftablescience/VPKEdit/releases/download/v4.4.2/VPKEdit-Linux-Standalone-CLI-gcc-Release.zip
           unzip VPKEdit-Linux-Standalone-CLI-gcc-Release.zip
           chmod +x ./vpkeditcli
-          ./vpkeditcli -s -v 1 pak01_dir
+          ./vpkeditcli -s -v 1 --no-progress pak01_dir
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v4

scripts/vscripts/modes/smo.nut

@@ -545,10 +545,6 @@ smo.move.setup <- function() {
   smo.move.speedmod <- Entities.CreateByClassname("player_speedmod");
   ppmod.keyval(smo.move.speedmod, "SpawnFlags", 0);
 
-  // Horrible way of doing this. Will replace as soon as I can.
-  SendToConsole("alias +use \"script smo.move.use()\"");
-  SendToConsole("alias -use \"script smo.move.unuse()\"");
-
   // SLA softlock prevention
   SendToConsole("-jump");
   smo.move.speed(175);

scripts/vscripts/speedrunmod_coop.nut

@@ -49,6 +49,10 @@ if ( !bShouldRun )
     return; // Not a native coop map.
 }
 
+if (smsm.GetMode() != 0) {
+    smsm.SetMode(0);
+}
+
 //-----------------------------------------------------------------------------
 // Purpose: Speed up checkpoints and ending transitions based on map type.
 //-----------------------------------------------------------------------------

smsm/src/Modules/Engine.cpp

@@ -8,6 +8,23 @@
 
 #include "SMSM.hpp"
 
+REDECL(Engine::startuse_callback);
+REDECL(Engine::enduse_callback);
+
+DETOUR_COMMAND(Engine::startuse) {
+    if (smsm.GetMode() == 6) { // SMO
+        engine->Cbuf_AddText(0, "script smo.move.use()", 0);
+    } else {
+        Engine::startuse_callback(args);
+    }
+}
+
+DETOUR_COMMAND(Engine::enduse) {
+    if (smsm.GetMode() == 6) { // SMO
+        engine->Cbuf_AddText(0, "script smo.move.unuse()", 0);
+    }
+    Engine::enduse_callback(args);
+}
 
 Engine::Engine()
     : Module()
@@ -54,6 +71,9 @@ bool Engine::Init()
         this->PrecacheModel = this->engineTool->Original<_PrecacheModel>(Offsets::PrecacheModel);
     }
 
+    Command::Hook("+use", Engine::startuse_callback_hook, Engine::startuse_callback);
+    Command::Hook("-use", Engine::enduse_callback_hook, Engine::enduse_callback);
+
     return this->hasLoaded = this->engineClient
         && this->engineTool
         && this->hoststate
@@ -75,6 +95,9 @@ void Engine::Shutdown()
     if (this->engineClient) Interface::Delete(this->engineClient);
     if (this->engineTrace) Interface::Delete(this->engineTrace);
     if (this->engineTool) Interface::Delete(this->engineTool);
+    
+    Command::Unhook("+use", Engine::startuse_callback);
+    Command::Unhook("-use", Engine::enduse_callback);
 }
 
 Engine* engine;

smsm/src/Modules/Engine.hpp

@@ -33,11 +33,13 @@ class Engine : public Module {
 
     void* s_CommandBuffer = nullptr;
 
+    DECL_DETOUR_COMMAND(startuse);
+    DECL_DETOUR_COMMAND(enduse);
+
     Engine();
     bool Init() override;
     void Shutdown() override;
     const char* Name() override { return MODULE("engine"); }
 };
 
 extern Engine* engine;
-