Changeset 3240

Timestamp:

01/28/10 18:56:28 (6 weeks ago)

Author:

ghoulsblade

Message:

charlist skill display fixed for subserverid other than 0, StartTargetMode_ClientSide : no message sent to server, MacroCmd_PlayerDead,MacroCmd_MobileDead , MacroCmd_JobGetTargetClientSide, MacroCmd_StoreLastTarget , MacroCmd_SendStoredTarget , MacroCmd_GetStoredTarget_Serial , MacroCmd_GetStoredTarget_Pos , macropathfind bugfix return value

Location:

trunk/lua

Files:

• lib.cursor.lua (modified) (3 diffs)
• lib.macrolist.lua (modified) (3 diffs)
• lib.mainmenu.accountlist.lua (modified) (1 diff)
• lib.shardlist.lua (modified) (1 diff)
• net/net.cursor.lua (modified) (2 diffs)
• net/net.mobile.lua (modified) (1 diff)
• net/net.partysystem.lua (modified) (1 diff)

trunk/lua/lib.cursor.lua

@@ -101 +101 @@
 
 function CleanupTargetMode ()
+        gNextTargetClientSide = nil -- should be nil already after sendtarget (also used with 0 if cancelled)
     if (not gTargetModeActive) then return end
     gSmartLastSpellID = nil -- either cancelled or targetted.
@@ -106 +107 @@
     gTargetModeActive = false
     NotifyListener("Hook_TargetMode_End") -- always called, even if aborted by server
+end
+
+function StartTargetMode_ClientSide ()
+        gNextTargetClientSide = true
+        StartTargetMode()
 end
 
@@ -122 +128 @@
 -- client side cancel
 function CancelTargetMode ()
+        if (not IsTargetModeActive()) then return end
     GuiAddChatLine("Target Mode canceled")
     Send_Target_Cancel()

trunk/lua/lib.macrolist.lua

@@ -44 +44 @@
 function IsPlayerHidden() local mobile = GetPlayerMobile() return mobile and mobile.flag_hidden end
 
+function MacroCmd_PlayerDead     () return MacroCmd_MobileDead(GetPlayerMobile()) end
 function MacroCmd_PlayerPoisoned () return MacroCmd_MobilePoisoned(GetPlayerMobile()) end
 function MacroCmd_PlayerMortaled () return MacroCmd_MobileMortaled(GetPlayerMobile()) end
+function MacroCmd_MobileDead     (mobile) return mobile and (mobile.artid == 402 or mobile.artid == 403) end -- ghost form
+--~ function MacroCmd_MobileDead         (mobile) return mobile and GetMobileRelHP(mobile.serial) == 0 end
 function MacroCmd_MobilePoisoned (mobile) return mobile and IsMobilePoisoned(mobile) end
 function MacroCmd_MobileMortaled (mobile) return mobile and IsMobileMortaled(mobile) end
@@ -184 +187 @@
 
 
+function MacroCmd_StartTargetModeClientSide () StartTargetMode_ClientSide() end
+
+function MacroCmd_JobGetTargetClientSide ()
+        local jobid = job.running_id() assert(jobid)
+        local res
+        RegisterListener("Hook_TargetMode_Send",function (...) res = {...} job.wakeup(jobid) return true end)
+        MacroCmd_StartTargetModeClientSide()
+        job.wait(1000*3600*24)
+        if (not res) then return end
+        local bIsPos,flag,serial,x,y,z,model,bIsCancel = unpack(res)
+        if (bIsCancel) then return false end
+        return MacroCmd_StoreLastTarget()
+end
+
+function MacroCmd_StoreLastTarget () return CopyArray(gMacroLastTargetMemory) end
+function MacroCmd_SendStoredTarget (t) return CompleteTargetMode(t) end
+function MacroCmd_GetStoredTarget_Serial (t)
+        if (not t) then return end
+    if (t.hittype == kMousePickHitType_Mobile) then return t.mobile.serial end
+    if (t.hittype == kMousePickHitType_Dynamic) then return t.dynamic.serial end
+end
+function MacroCmd_GetStoredTarget_Pos (t)
+        if (not t) then return end
+    if (t.hittype == kMousePickHitType_Mobile) then return t.mobile.xloc,t.mobile.yloc,t.mobile.zloc end
+    if (t.hittype == kMousePickHitType_Dynamic) then return t.dynamic.xloc,t.dynamic.yloc,t.dynamic.zloc end
+    if (t.hittype == kMousePickHitType_Static) then return t.hit_xloc,t.hit_yloc,t.hit_zloc end
+    if (t.hittype == kMousePickHitType_Ground) then return t.x,t.y,t.z end
+    return t.hit_xloc,t.hit_yloc,t.hit_zloc
+end
+        
 function MacroCmd_PopupCommandByTag (serial,tag,timeout)
     local timeout_endt = Client_GetTicks() + (timeout or 1000)
@@ -1048 +1081 @@
         local bLog = not bNoLog
         if (bLog) then print("MacroCmd_PathFindTo : start",xloc,yloc,tolerance,timeout) end
-        if (GetUODistToPlayer(xloc,yloc) <= tolerance) then 
-                if (bLog) then print("MacroCmd_PathFindTo : already there") end
-                return true 
-        end
         local iJobWaitInterval = 50
         timeout = timeout or 0
         local endt = (timeout > 0) and (Client_GetTicks() + timeout)
         repeat -- repeat the pathfinding calc every few seconds in case dynamics show up
+                if (GetUODistToPlayer(xloc,yloc) <= tolerance) then 
+                        if (bLog) then print("MacroCmd_PathFindTo : already there") end
+                        return true 
+                end
                 local t = Client_GetTicks()
                 local res = cPathFind2:CalcRouteFromPlayerToPos(xloc,yloc,tolerance,iJobWaitInterval,endt and (endt-t)) 

trunk/lua/lib.mainmenu.accountlist.lua

@@ -58 +58 @@
                 bHadFirstChar = true
                 
-                local chardata = SimpleXMLLoad(GetCharFilePath(user,char.id))
+                local chardata = SimpleXMLLoad(GetCharFilePath(user,char.id,0)) or SimpleXMLLoad(GetCharFilePath(user,char.id,1))
+                                print("MainMenu_AccountList_Start GetCharFilePath",user,char.id,chardata)
                 local charinfo = ""
                 if (chardata) then

trunk/lua/lib.shardlist.lua

@@ -5 +5 @@
 function GetShardListDirPath            () return GetConfigDirPath().."shards/" end
 function GetShardMemoryFilePath         () return GetConfigDirPath().."shardmemory.xml" end
-function GetCharFilePath                (loginname,charid) return GetConfigDirPath().."chars/"..table.concat({gLoginServerIP,gLoginServerPort,ShardListFileNamePartEncode(loginname or gLoginname),(giGameServerID or 0),(charid or gCharID or 0)},".")..".xml" end
+function GetCharFilePath                (loginname,charid,subserverid) return GetConfigDirPath().."chars/"..table.concat({gLoginServerIP,gLoginServerPort,ShardListFileNamePartEncode(loginname or gLoginname),(subserverid or giGameServerID or 0),(charid or gCharID or 0)},".")..".xml" end
 function GetShardConfigFilePath         (shardname) return GetShardListDirPath()..ShardListFileNamePartEncode(shardname)..".xml" end
 

trunk/lua/net/net.cursor.lua

@@ -52 +52 @@
 
 -- Send Targetcursor (0x6c)
-function Send_Target (bIsPos,flag,serial,x,y,z,model)
+function Send_Target (bIsPos,flag,serial,x,y,z,model,bIsCancel)
         print("Send_Target",bIsPos,hex(flag),hex(serial),x,y,z,hex(model))
         --printf("NET: Send_Target: %d 0x%02x 0x%08x %d %d %d 0x%04x\n",bIsPos and 1 or 0,flag,serial,x or 0,y or 0,z or 0,model or 0)
-        local out = GetSendFIFO()
-        out:PushNetUint8(kPacket_Target)
-        out:PushNetUint8(bIsPos and kTargetModeType_Pos or kTargetModeType_Object)
-        out:PushNetUint32(gTargetModeSerial)
-        out:PushNetUint8(flag)
-        out:PushNetUint32(serial)
-        out:PushNetUint16(x or 0)
-        out:PushNetUint16(y or 0)
-        out:PushNetUint16(z or 0)               -- out:PushInt16(z)
-        out:PushNetUint16(model or 0)   -- ArtID, ModelID (granny)
         
-        NotifyListener("Hook_TargetMode_Send",bIsPos,flag,serial,x,y,z,model) -- called on target and cancel-by-client, but not if aborted by server
-        out:SendPacket()
+        if (gNextTargetClientSide) then 
+                gNextTargetClientSide = nil
+        else
+                local out = GetSendFIFO()
+                out:PushNetUint8(kPacket_Target)
+                out:PushNetUint8(bIsPos and kTargetModeType_Pos or kTargetModeType_Object)
+                out:PushNetUint32(gTargetModeSerial)
+                out:PushNetUint8(flag)
+                out:PushNetUint32(serial)
+                out:PushNetUint16(x or 0)
+                out:PushNetUint16(y or 0)
+                out:PushNetUint16(z or 0)               -- out:PushInt16(z)
+                out:PushNetUint16(model or 0)   -- ArtID, ModelID (granny)
+                out:SendPacket()
+        end
+        
+        NotifyListener("Hook_TargetMode_Send",bIsPos,flag,serial,x,y,z,model,bIsCancel) -- called on target and cancel-by-client, but not if aborted by server
 end
 
@@ -73 +78 @@
 function Send_Target_Cancel () 
         NotifyListener("Hook_TargetMode_CancelByClient")
-        Send_Target(false,0,0x00000000,hex2num("0xFFFF"),hex2num("0xFFFF"),0,0)
+        Send_Target(false,0,0x00000000,0xFFFF,0xFFFF,0,0,true)
 end
 

trunk/lua/net/net.mobile.lua

@@ -183 +183 @@
         
         stats.mobstatversion    = MySave_PopNetUint8()
+        
+        print("stats.mobstatversion",hex(stats.mobstatversion))
         
         -- mobstatversion : http://docs.polserver.com/packets/index.php?Packet=0x11

trunk/lua/net/net.partysystem.lua

@@ -229 +229 @@
         print("PartyListDialog_StartInviteMode") 
         -- start targetting mode
-        StartTargetMode()
+        StartTargetMode_ClientSide()
         gPartyList_InviteNextTarget = true
 end