Add feature for prewalk and lower option delays for better experience

mehah · Jan 14, 2025 · cde710e · cde710e
1 parent d1a9cec
commit cde710e
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 24 deletions.
diff --git a/modules/client_options/data_options.lua b/modules/client_options/data_options.lua
@@ -151,23 +151,23 @@ return {
         end
     },
     walkTurnDelay                     = {
-        value = 250,
+        value = 100,
         action = function(value, options, controller, panels, extraWidgets)
             panels.generalPanel:recursiveGetChildById('walkTurnDelay'):setText(string.format(
                 'Walk delay after turn: %sms',
                 value))
         end
     },
     walkTeleportDelay                 = {
-        value = 250,
+        value = 50,
         action = function(value, options, controller, panels, extraWidgets)
             panels.generalPanel:recursiveGetChildById('walkTeleportDelay'):setText(string.format(
                 'Walk delay after teleport: %sms',
                 value))
         end
     },
     walkStairsDelay                   = {
-        value = 250,
+        value = 50,
         action = function(value, options, controller, panels, extraWidgets)
             panels.generalPanel:recursiveGetChildById('walkStairsDelay'):setText(string.format(
                 'Walk delay after floor change: %sms',

diff --git a/modules/game_features/features.lua b/modules/game_features/features.lua
@@ -6,7 +6,8 @@ controller:registerEvents(g_game, {
         -- g_game.enableFeature(GameNegativeOffset)
         -- g_game.enableFeature(GameWingsAurasEffectsShader)
         -- g_game.enableFeature(GameAllowCustomBotScripts)
-
+
+        g_game.enableFeature(GameAllowPreWalk)
         g_game.enableFeature(GameFormatCreatureName)
 
         if version >= 750 then
@@ -226,7 +227,7 @@ controller:registerEvents(g_game, {
         end
 
         if version >= 1314 then
-            g_game.disableFeature(GameTournamentPackets)  
+            g_game.disableFeature(GameTournamentPackets)
             g_game.enableFeature(GameDynamicForgeVariables)
         end
 

diff --git a/modules/game_walk/walk.lua b/modules/game_walk/walk.lua
@@ -183,19 +183,21 @@ function walk(dir)
 
     nextWalkDir = nil
 
-    local toPos = Position.translatedToDirection(player:getPosition(), dir)
-    local toTile = g_map.getTile(toPos)
-    if toTile and toTile:isWalkable() then
-        if not player:isPreWalking() then
-            player:preWalk(dir)
-        end
-    else
-        -- check for stairs/elevation steps
-        if not canChangeFloorDown(toPos) and not canChangeFloorUp(toPos) then
-            return false
-        end
+    if g_game.getFeature(GameAllowPreWalk) then
+        local toPos = Position.translatedToDirection(player:getPosition(), dir)
+        local toTile = g_map.getTile(toPos)
+        if toTile and toTile:isWalkable() then
+            if not player:isPreWalking() then
+                player:preWalk(dir)
+            end
+        else
+            -- check for stairs/elevation steps
+            if not canChangeFloorDown(toPos) and not canChangeFloorUp(toPos) then
+                return false
+            end
 
-        player:lockWalk(200)
+            player:lockWalk(200)
+        end
     end
 
     g_game.walk(dir)
@@ -234,21 +236,31 @@ end
 
 function addWalkEvent(dir, delay)
     cancelWalkEvent()
-    walkEvent = scheduleEvent(function()
+
+    local function walkCallback()
         if g_keyboard.getModifiers() ~= KeyboardNoModifier then
             return
         end
 
         local direction = smartWalkDir or dir
         walk(direction)
-    end, delay or 10)
+    end
+
+    if delay and delay == 0 then
+        walkEvent = addEvent(walkCallback)
+        return
+    end
+
+    walkEvent = scheduleEvent(walkCallback, delay or 10)
 end
 
 function cancelWalkEvent()
     if walkEvent then
         removeEvent(walkEvent)
         walkEvent = nil
     end
+
+    nextWalkDir = nil
 end
 
 -- events
@@ -268,10 +280,12 @@ end
 
 function onWalkFinish(player)
     if nextWalkDir then
-        addWalkEvent(nextWalkDir)
+        if not g_game.getFeature(GameAllowPreWalk) then
+            walk(nextWalkDir)
+        else
+            addWalkEvent(nextWalkDir)
+        end
     end
-
-    nextWalkDir = nil
 end
 
 function onCancelWalk(player)

diff --git a/modules/gamelib/const.lua b/modules/gamelib/const.lua
@@ -83,8 +83,8 @@ DirectionString = {
     [SouthEast] = "South East",
     [SouthWest] = "South West",
     [NorthWest] = "North West"
-  }
-  
+}
+
 FightOffensive = 1
 FightBalanced = 2
 FightDefensive = 3
@@ -214,6 +214,7 @@ GameWingsAurasEffectsShader = 118
 GameForgeConvergence = 119
 GameAllowCustomBotScripts = 120
 GameColorizedLootValue = 121
+GameAllowPreWalk = 122
 
 TextColors = {
     red = '#f55e5e',    -- '#c83200'

diff --git a/src/client/const.h b/src/client/const.h
@@ -550,6 +550,7 @@ namespace Otc
         GameForgeConvergence = 119,
         GameAllowCustomBotScripts = 120,
         GameColorizedLootValue = 121,
+		GameAllowPreWalk = 122,
         LastGameFeature
     };