Changeset 3237

Timestamp:

01/26/10 14:24:27 (7 months ago)

Author:

ghoulsblade

Message:

new macro tools : MacroCmd_QueuePickObject MacroCmd_QueueStringQueryResponse MacroCmd_RegisterTimeoutListener MacroCmd_PlayerPoisoned, utils for stringquery and objectpicker gump : old, seen on pol shard

Location:

trunk/lua

Files:

• lib.macrolist.lua (modified) (3 diffs)
• lib.objectpicker.lua (modified) (1 diff)
• net/net.objectpicker.lua (modified) (3 diffs)
• net/net.trade.lua (modified) (2 diffs)

trunk/lua/lib.macrolist.lua

@@ -44 +44 @@
 function IsPlayerHidden() local mobile = GetPlayerMobile() return mobile and mobile.flag_hidden end
 
+function MacroCmd_PlayerPoisoned () return MacroCmd_MobilePoisoned(GetPlayerMobile()) end
+function MacroCmd_PlayerMortaled () return MacroCmd_MobileMortaled(GetPlayerMobile()) end
 function MacroCmd_MobilePoisoned (mobile) return mobile and IsMobilePoisoned(mobile) end
 function MacroCmd_MobileMortaled (mobile) return mobile and IsMobileMortaled(mobile) end
@@ -513 +515 @@
 
 function MacroCmd_RiseText (r,g,b,text,serial)
+        text = tostring(text)
+        print("MacroCmd_RiseText",text)
     serial = serial or GetPlayerSerial()
     if (SpellBarRiseTextOnMob) then SpellBarRiseTextOnMob(serial,r,g,b,text) end
+        GuiAddChatLine(text,{r,g,b,1},"normal","script")
 end
 
@@ -821 +826 @@
                         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
+
+
+function MacroCmd_JobWaitAndPickObject (index,timeout_delay) 
+        assert(index) 
+        return MacroCmd_WaitForListener("Hook_ObjectPicker",function (data) data.SendPickedObject(index) return true end,timeout_delay or 500) 
+end
+
+function MacroCmd_JobWaitAndStringQueryResponse (response,timeout_delay)
+        assert(response) 
+        return MacroCmd_WaitForListener("Hook_StringQuery",function (data) data.SendText(response) return true end,timeout_delay or 500)
+end
+
+function MacroCmd_QueuePickObject                       (index,timeout_delay)           job.create(function () MacroCmd_JobWaitAndPickObject(index,timeout_delay) end) end
+function MacroCmd_QueueStringQueryResponse      (response,timeout_delay)        job.create(function () MacroCmd_JobWaitAndStringQueryResponse(response,timeout_delay) end) end
+
+function MacroCmd_RegisterTimeoutListener (listenername,fun,timeout_delay)
+        timeout_delay = timeout_delay or 1000
+        local timeout = gMyTicks+timeout_delay
+        RegisterListener(listenername,function (...) 
+                if (gMyTicks > timeout) then return true end
+                return fun(...)
+                end)
 end
 

trunk/lua/lib.objectpicker.lua

@@ -11 +11 @@
         local b = {}
         local c = {}
-        local rows = { {{type="Label",  text=question},},a,b,c }
+        local d = {}
+        local e = {}
+        local cancelrow = {}
+        local rows = { {{type="Label",  text=question},},a,b,c,d,e,cancelrow }
         
-        for k,entry in pairs(data.entrylist) do 
+        function data.SendPickedObject (index)
+                if (not data.dialog) then return end
+                local entry = data.entrylist[index] 
+                if (not entry) then print("ObjectPicker:SendPickedObject: entry not found",index) return end
+                Send_Picked_Object(data.dialogid,data.menuid,entry.index,entry.artid,entry.hue)
+                data.dialog:Destroy()
+                data.dialog = nil
+        end
+        --~ MacroCmd_QueueStringQueryResponse()
+        
+        for k,entry in ipairs(data.entrylist) do 
                 table.insert(a  ,MakeUOArtImageForDialog(entry.artid,entry.hue,64,64))
-                table.insert(b  ,{type="Label", text=entry.name})
-                table.insert(c  ,{type="Button",onMouseDown=function(widget) 
-                        Send_Picked_Object(data.dialogid,data.menuid,k,entry.artid,entry.hue)
-                        widget.dialog:Destroy() end,text="choose"})
+                table.insert(b  ,{type="Label", text=entry.name.." "})
+                table.insert(c  ,{type="Button",onMouseDown=function(widget) data.SendPickedObject(entry.index) end,text="choose"})
+                table.insert(d  ,{type="Button",onMouseDown=function(widget) data.SendPickedObject(entry.index) MacroCmd_QueueStringQueryResponse("10") end,text="10"})
+                table.insert(e  ,{type="Button",onMouseDown=function(widget) data.SendPickedObject(entry.index) MacroCmd_QueueStringQueryResponse("30") end,text="30"})
         end
+        table.insert(cancelrow  ,{type="Button",onMouseDown=function(widget) Send_Picked_Object_Cancel() widget.dialog:Destroy() end,text="cancel"})
         
-        local dialog = guimaker.MakeTableDlg(rows,100,10,true,true,gGuiDefaultStyleSet,"window")
+        data.dialog = guimaker.MakeTableDlg(rows,100,10,true,true,gGuiDefaultStyleSet,"window")
+        NotifyListener("Hook_ObjectPicker",data)
 end
 
 function HandleStringQuery (data)
         print("HandleStringQuery",data.id,data.parentid,data.buttonid)
+        function data.SendText (txt)
+                if (not data.dialog) then return end
+                txt = tostring(txt)
+                print("HandleStringQuery res=",txt)
+                Send_String_Query_Response(data.id,data.parentid,data.buttonid,txt)
+                data.dialog:Destroy()
+                data.dialog = nil
+        end
         local rows = {
                 { {data.text} },
                 { {type="EditText",controlname="entry",w=200,h=24,text=data.text2} },
-                { {"OK",function (widget) 
-                                local txt = widget.dialog.controls["entry"]:GetText() or ""
-                                print("HandleStringQuery",txt)
-                                Send_String_Query_Response(data.id,data.parentid,data.buttonid,txt)
-                                widget.dialog:Destroy()
-                        end} },
+                { {"OK",function (widget) data.SendText(widget.dialog.controls["entry"]:GetText() or "") end},
+                  {"1",function () data.SendText("1") end} ,
+                  {"5",function () data.SendText("5") end} ,
+                  {"10",function () data.SendText("10") end} ,
+                  {"30",function () data.SendText("30") end} ,
+                  },
                 }
-        local dialog = guimaker.MakeTableDlg(rows,100,100,false,true,gGuiDefaultStyleSet,"window")
+        data.dialog = guimaker.MakeTableDlg(rows,100,100,false,true,gGuiDefaultStyleSet,"window")
+        NotifyListener("Hook_StringQuery",data)
 end

trunk/lua/net/net.objectpicker.lua

@@ -14 +14 @@
         out:PushNetUint16(hue)
         out:SendPacket()
-end
+end    
+function Send_Picked_Object_Cancel () Send_Picked_Object(0,0,0,0,0) end -- 0x7D
+
+
 
 --[[
@@ -48 +51 @@
         local sizeleft = size - 1 - 2 - 4 - 2 - 1 - data.questionlen
         data.entrynum           = input:PopNetUint8()
+        sizeleft = sizeleft - 1
         print("kPacket_Object_Picker",SmartDump(data))
         data.entrylist = {}
@@ -53 +57 @@
                 if (sizeleft <= 0) then break end
                 local entry = {}
+                entry.index             = i
                 entry.artid             = input:PopNetUint16() -- (e.ItemID & 0x3FFF)
                 entry.hue               = 0

trunk/lua/net/net.trade.lua

@@ -112 +112 @@
                 end
 
-                if (false) then -- debug
+                if (1 == 1) then -- debug
                         for k,item in pairs(GetContainerContentList(playerBackpackContainer)) do 
-                                printf("item serial=0x%08x artid=0x%04x in backpack\n",item.serial,item.artid)
+                                print("item backpack",hex(item.serial),hex(item.artid))
                         end
                         for k,item in pairs(GetMobileEquipmentList(playerMobile)) do 
-                                printf("item serial=0x%08x artid=0x%04x equipped\n",item.serial,item.artid)
+                                print("item equipped",hex(item.serial),hex(item.artid))
                         end
                 end
@@ -135 +135 @@
                         good.item               = GetObjectBySerial(good.itemserial)
                         --- old : see also get obj with good.itemserial from playerBackpackContainer
+                        
+                        print("kPacket_Shop_Sell",hex(good.itemserial,8),hex(good.itemartid),hex(good.item.artid),good.price,good.name)
 
                         if (good.item) then -- item is not always available, especially if its in the backpack, and that has not been opened yet
                                 if (good.itemartid ~= good.item.artid)  then
-                                        printf("FATAL : kPacket_Shop_Sell : artid mismatch 0x%04x != 0x%04x\n",good.itemartid,good.item.artid)
-                                        print("FATAL ! kPacket_Shop_Sell -> forced Crash")
-                                        NetCrash()
+                                        print("warning : kPacket_Shop_Sell : artid mismatch "..hex(good.itemartid).." != "..good.item.artid,good.name,"amt:",good.itemamount,good.item.amount)
+                                        --~ print("FATAL ! kPacket_Shop_Sell -> forced Crash")
+                                        --~ NetCrash()
                                 end
                                 if (good.itemamount ~= good.item.amount) then