Changeset 3234

Timestamp:

01/24/10 01:19:20 (7 months ago)

Author:

ghoulsblade

Message:

two new macro helpers : MacroCmd_WaitForListener MacroCmd_WaitForText , fixed text entry gump for old pol crafting system, IsTargetModeActive check in CompleteTargetMode to avoid illegal messages if used directly by scripts, new shard config gAutoSelectServerIndex for shards with multiple subservers

Location:

trunk/lua

Files:

• lib.cursor.lua (modified) (1 diff)
• lib.macrolist.lua (modified) (1 diff)
• lib.mainmenu.lua (modified) (1 diff)
• net/net.login.lua (modified) (2 diffs)
• net/net.objectpicker.lua (modified) (2 diffs)

trunk/lua/lib.cursor.lua

@@ -141 +141 @@
 
 function CompleteTargetMode (hitobject,maxrange) -- maxrange=nil
+        if (not IsTargetModeActive()) then return end
     if (not hitobject) then
         MainMousePick()

trunk/lua/lib.macrolist.lua

@@ -815 +815 @@
 end
 
--- waits until a given text appears, list = {text=returnvalue, text=returnvalue, ...}
+-- call from a job! (see job.create)
+-- returns key(from textlist),plaintext,textdata      or nil if timeout
+function MacroCmd_WaitForText (textlist,timeout_delay) 
+        return MacroCmd_WaitForListener("Hook_Text",function (name,plaintext,serial,data)  
+                        for k,text in pairs(textlist) do if (string.find(plaintext,text)) then return k,plaintext,data end end 
+                end,timeout_delay or 9000) 
+end
+
+-- call from a job! (see job.create)
+-- pauses the current job until a listener with listenername is notified and fun returns true for the listener, or until a timeout
+-- returns the complete resultset from fun, or nil if timeout
+function MacroCmd_WaitForListener (listenername,fun,timeout_delay)
+        timeout_delay = timeout_delay or 9000
+        local timeout = gMyTicks+timeout_delay
+        local jobid = job.running_id() assert(jobid)
+        local done = false
+        local res
+        RegisterListener(listenername,function (...) 
+                if (done or gMyTicks > timeout) then return true end
+                res = {fun(...)}
+                if (res[1]) then done = true job.wakeup(jobid) return true end
+                end)
+        job.wait(timeout_delay)
+        done = true
+        if (res) then return unpack(res) end
+end
+
+
+-- waits until a given text appears, list = {text=returnvalue, text=returnvalue, ...} .... see also MacroCmd_WaitForText (might be better/faster)
 function MacroJournal_WaitForText   (list,timeout)
     if not list then return end

trunk/lua/lib.mainmenu.lua

@@ -181 +181 @@
         return
     end
+        
+        if (gAutoSelectServerIndex) then MainMenu_SendServer(gAutoSelectServerIndex) return end
     
     -- show serverlist

trunk/lua/net/net.login.lua

@@ -29 +29 @@
 
         serverlist.servers = {}
+        serverlist.servers_by_index = {}
         gSubServerNamesByID = {}
         for i = 0,serverlist.iServerNumber - 1 do
@@ -38 +39 @@
                 server.ip = input:PopNetUint32()
                 serverlist.servers[i] = server
+                serverlist.servers_by_index[server.index] = server
                 gSubServerNamesByID[server.index] = server.name
                 

trunk/lua/net/net.objectpicker.lua

@@ -76 +76 @@
 
 -- response to 0xAB
+
 function Send_String_Query_Response (id,mytype,myidx,response) -- 0xAC
         local responselen = string.len(response)
         local out = GetSendFIFO()
+        
         out:PushNetUint8(kPacket_String_Response)
-        out:PushNetUint16(responselen+3+1+1+4+2+1)
+        out:PushNetUint16(responselen+1 +3 +1+1 +4+2+1)
         out:PushNetUint32(id)
         out:PushNetUint8(mytype)
         out:PushNetUint8(myidx)
+        out:PushNetUint8(1) -- unknown
         out:PushNetUint8(0) -- unknown
-        out:PushNetUint8(0) -- unknown
-        out:PushNetUint8(0) -- unknown
+        out:PushNetUint8(responselen+1) -- unknown
         out:PushFilledString(response,responselen)
+        out:PushNetUint8(0) -- zero term
+                                 
+--~ 0000   AC 00 0E 01 40 05 18 00  00 01 00 02 32 00         ....@.......2.       
+           --~ c] [len] [----id---] ty  id u1 u2 u3 [text]
+         
+       --~ ac 00 0f 01 40 05 18 00  00 00 00 00 01 31 00      |....@........1.|
+           
+        print("###############################")
+        print("rawstr:#"..response.."# len="..responselen)
+        print(FIFOHexDump(out))
+        print("###############################")
+        
         out:SendPacket()
+        print("Send_String_Query_Response",hex(id),hex(mytype),hex(myidx))
         -- doesn't seemt to work yet =(
 end
@@ -116 +131 @@
         
         data.datalenleft = size-1-2-4-1-1-2-data.textlen-1-1-4-1
+        if (data.datalenleft > 0) then data.text2head = input:PopNetUint8() data.datalenleft = data.datalenleft - 1 end
         data.text2              = (data.datalenleft > 0) and input:PopFilledString(data.datalenleft) or ""
         HandleStringQuery(data)