update

jarlyyn · jarlyyn · commit 8e9433511d68 · 2021-07-25T02:05:01.000+08:00
diff --git a/script/config.ini b/script/config.ini
@@ -42,7 +42,7 @@ maxstep=15
 stepmaxstep=15
 --多步搜索的最大步数，0为不多步
 
-walkecho=false
+walkecho=true
 --是否回显命令
 
 mudsettings="set no_more;unset prompt;set auto_drinkout;set combatd self;set auto_regenerate;set wimpy 25;unset map_prompt"
diff --git a/script/mods/queue.lua b/script/mods/queue.lua
@@ -3,10 +3,9 @@ queue={
     tick=2100,
     timestamp=0,
     sent={},
-    sep={},
 }
 
-queue.exec=function(cmds)
+queue.exec=function(cmds,grouped)
     queue.append(cmds)
     queue.send()
 end
@@ -16,9 +15,13 @@ end
 queue.discard=function()
     queue.queue={}
 end
-queue.append=function(cmds)
-    for k,v in pairs(cmds) do
-        table.insert(queue.queue,v)
+queue.append=function(cmds,grouped)
+    if grouped then
+        table.insert(queue.queue,cmds)
+    else
+        for k,v in pairs(cmds) do
+            table.insert(queue.queue,{v})
+        end
     end
 end
 queue.sort=function(fisrt,second)
@@ -30,7 +33,7 @@ queue.full=function()
         table.insert(queue.sent,ts)
     end
 end
-queue.send=function()
+queue.clean=function()
     local ts=Milliseconds()
     table.sort(queue.sent,queue.sort)
     local newsent={}
@@ -40,14 +43,21 @@ queue.send=function()
         end
     end
     queue.sent=newsent
+end
+queue.send=function()
+    queue.clean()
     while #queue.queue~=0 and #queue.sent<queue.limit() do
-        local cmd=table.remove(queue.queue,1)
-        local ts=Milliseconds()
-        table.insert(queue.sent,ts)
-        SendNoEcho(cmd)
-        if queue.sep[cmd] then
+        local cmds=queue.queue[1]
+        if queue.limit()-#queue.sent<#cmds then
             queue.full()
-            return
+            return   
+        end
+        table.remove(queue.queue,1)
+        for k,v in pairs(cmds) do
+            local ts=Milliseconds()
+            table.insert(queue.sent,ts)
+            SendNoEcho(v)
+            if walkecho==true then Note(v) end
         end
     end
 end
diff --git a/script/mods/system.mod b/script/mods/system.mod
@@ -130,9 +130,7 @@ discon=function()
 end
 
 catch=function(trigrp,command)
-	trigrpon(trigrp)
-	run(command)
-	trigrpoff(trigrp)
+	run(trigrponcmd(trigrp)..";"..command..";"..trigrpoffcmd(trigrp),true)
 end
 busytestdelay=1
 busytestcmd="enchase bao"
@@ -162,13 +160,20 @@ system_trigrpoff=function(name, line, wildcards)
 end
 
 trigrpoff=function(str)
-	run("set no_more trigrpoff "..str)
+	run(trigrpoffcmd(str))
+end
+trigrpoffcmd=function(str)
+	return("set no_more trigrpoff "..str)
 end
 system_trigrpon=function(name, line, wildcards)
 		EnableTriggerGroup(wildcards[2],true)
 end
 trigrpon=function(str)
-	run("set no_more trigrpon "..str)
+	run(trigrponcmd(str))
+end
+
+trigrponcmd=function(str)
+	return "set no_more trigrpon "..str
 end
 
 system_isbusy=function(name, line, wildcards)
@@ -203,7 +208,7 @@ end
 
 _stop=false
 runre=rex.new("([^;*\\\\]+)")
-run=function(str)
+run=function(str,grouped)
 	ResetTimer("on_steptimeout")
 	if ((str=="")or(str==nil)) then return end
 	--SetSpeedWalkDelay(math.floor(1000/cmd_limit))
@@ -217,13 +222,11 @@ run=function(str)
 	for i, cmd in pairs (_cmds) do
 		if cmd=="#gift" then
 			if chatroom~=nil then
-				cmd="enter "..chatroom
+				_cmds[i]="enter "..chatroom
 			end
 		end
-		queue.exec({cmd})
-		--Queue(cmd,false)
-		if walkecho==true then Note(cmd) end
 	end
+	queue.exec(_cmds,grouped)
 end
 
 _nums={}
