TargetStrafe improvements

Author: bladekt

common/src/main/kotlin/com/lambda/module/modules/movement/Speed.kt

@@ -45,6 +45,7 @@ object Speed : Module(
     private val grimEntityBoost by setting("Entity Boost", 1.0, 0.0..2.0, 0.01) { mode == Mode.GRIM_STRAFE }
     private val grimCollideMultiplier by setting("Entity Collide Multiplier", 0.5, 0.0..1.0, 0.01)  { mode == Mode.GRIM_STRAFE && grimEntityBoost > 0.0}
     private val grimBoatBoost by setting("Boat Boost", 0.4, 0.0..1.0, 0.01) { mode == Mode.GRIM_STRAFE }
+    private val grimMaxSpeed by setting("Max Speed", 1.0, 0.2..1.0, 0.01)  { mode == Mode.GRIM_STRAFE }
 
     // NCP
     private val strict by setting("Strict", true) { mode == Mode.NCP_STRAFE }
@@ -141,6 +142,7 @@ object Speed : Module(
 
     private fun SafeContext.handleGrim() {
         if (!isInputting) return
+        if (player.moveDelta > grimMaxSpeed) return
 
         var boostAmount = 0.0
 

common/src/main/kotlin/com/lambda/module/modules/movement/TargetStrafe.kt

@@ -23,8 +23,8 @@ object TargetStrafe : Module(
     description = "Automatically strafes around entities",
     defaultTags = setOf(ModuleTag.MOVEMENT)
 ) {
-    private val range by setting("Range", 6.0, 2.0..10.0, 0.5)
-    private val targetDistance by setting("Target Distance", 1.0, 0.0..5.0, 0.5)
+    private val range by setting("Range", 6.0, 2.0..10.0, 0.1)
+    private val targetDistance by setting("Target Distance", 1.0, 0.0..5.0, 0.1)
     private val jitterCompensation by setting("Jitter Compensation", 0.0, 0.0..1.0, 0.1)
     private val stabilize by setting("Stabilize", StabilizationMode.NORMAL)
 
@@ -85,15 +85,18 @@ object TargetStrafe : Module(
                     else -> forwardDirection
                 }
 
-                val shouldStabilize = when (stabilize) {
+                // Premium code, do not touch it bites
+                var shouldStabilize = when (stabilize) {
                     StabilizationMode.NONE -> false
-                    StabilizationMode.WEAK -> player.age % 3 == 0
-                    StabilizationMode.NORMAL -> player.age % 2 == 0
-                    StabilizationMode.STRONG -> true
+                    StabilizationMode.WEAK -> player.age % 4 == 0   // 1/4
+                    StabilizationMode.NORMAL -> player.age % 2 == 0 // 2/4
+                    StabilizationMode.STRONG -> player.age % 4 != 0 // 3/4
                 }
 
+                shouldStabilize = shouldStabilize && distSq > (targetDistance + 0.5).pow(2)
+
                 var strafe = strafeDirection.toDouble()
-                if (shouldStabilize && distSq > (targetDistance + 0.5).pow(2)) strafe = 0.0
+                if (shouldStabilize) strafe = 0.0
 
                 event.input.mergeFrom(
                     buildMovementInput(