Changeset 3210

Timestamp:

01/13/10 21:20:57 (8 months ago)

Author:

ghoulsblade

Message:

fixed targetting multi-floor etc, for example when placing furniture

Location:

trunk

Files:

• lua/lib.2d.mousepick.lua (modified) (3 diffs)
• lua/lib.cursor.lua (modified) (2 diffs)
• lua/net/net.cursor.lua (modified) (2 diffs)
• plugins/loot.lua (modified) (1 diff)

trunk/lua/lib.2d.mousepick.lua

@@ -86 +86 @@
                 gMousePickFoundHit.hit_yloc = sprite.yloc or item.yloc
                 gMousePickFoundHit.hit_zloc = sprite.zloc or item.zloc
+                gMousePickFoundHit.hit_artid = sprite.artid or item.artid
                 --~ print("RayPickDynamics",GetStaticTileTypeName(sprite.data.artid)) 
         end
@@ -145 +146 @@
                 end
                 if (o.hittype == kMousePickHitType_Dynamic      ) then 
+                        hitinfo = hitinfo..sprintf("packetid=0x%02x,",data.packetid or 0) 
+                        hitinfo = hitinfo..sprintf("itemclass=0x%02x,",data.itemclass or 0) 
+                        hitinfo = hitinfo..sprintf("amount2=0x%02x,",data.amount2 or 0) 
+                        hitinfo = hitinfo..sprintf("artid_base=0x%04x,",data.artid_base or 0) 
                         hitinfo = hitinfo..sprintf("amount=0x%02x,",data.amount or 0) 
                 end
@@ -150 +155 @@
                 if (o.hittype == kMousePickHitType_Static                       ) then hitinfo = hitinfo.."static" end
                 if (o.hittype == kMousePickHitType_Terrain                      ) then hitinfo = hitinfo.."terrain" end
-                if (o.hittype == kMousePickHitType_Dynamic                      ) then hitinfo = hitinfo.."dynamic" end
+                if (o.hittype == kMousePickHitType_Dynamic                      ) then  
+                        if (gTileTypeLoader) then
+                                local t = GetStaticTileType(data.artid)
+                                if (t and t.msName) then hitinfo = hitinfo..t.msName.."," end
+                                if (t and t.miFlags) then hitinfo = hitinfo.."tflag="..hex(t.miFlags).."," end
+                        end
+                        hitinfo = hitinfo.."oflag="..hex(data.flag or 0)..","
+                        hitinfo = hitinfo.."dynamic"
+                end
                 if (o.hittype == kMousePickHitType_Mobile                       ) then hitinfo = hitinfo.."mobile" end
                 if (o.hittype == kMousePickHitType_ContainerItem        ) then hitinfo = hitinfo.."containeritem" end

trunk/lua/lib.cursor.lua

@@ -171 +171 @@
     if (hitobject.hittype == kMousePickHitType_Dynamic) then
         bSendPos = false
-        Send_Target_Dynamic(hitobject.dynamic)
+                local item = hitobject.dynamic
+                if (item and ItemIsMulti(item)) then 
+                        Send_Target_MultiPart(  hitobject.hit_xloc or item.xloc,
+                                                                        hitobject.hit_yloc or item.yloc,
+                                                                        hitobject.hit_zloc or item.zloc,item,hitobject.hit_artid)
+                else 
+                        Send_Target_Dynamic(item)
+                end
     end
 
@@ -184 +191 @@
         bSendPos = false 
         local x,y,z = GetMouseHitTileCoords()
-        Send_Target_Static(hitobject.hit_xloc or x,hitobject.hit_yloc or y,hitobject.hit_zloc or z,hitobject.entity,hitobject.hit_artid)
+                Send_Target_Static(hitobject.hit_xloc or x,hitobject.hit_yloc or y,hitobject.hit_zloc or z,hitobject.entity,hitobject.hit_artid)
     end
     

trunk/lua/net/net.cursor.lua

@@ -53 +53 @@
 -- Send Targetcursor (0x6c)
 function Send_Target (bIsPos,flag,serial,x,y,z,model)
+        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()
@@ -106 +107 @@
         Send_Target_Item(dynamic) -- compatible fieldnames 
 end
+
+function Send_Target_MultiPart(x,y,z,item,hit_artid)
+        Send_Target(true,0,0,x or 0,y or 0,z or 0,hit_artid or item.artid or 0) 
+end

trunk/plugins/loot.lua

@@ -201 +201 @@
         if (artid == 0xe9d) then return false end -- music instruments
         if (artid == 0xe9c) then return false end -- music instruments
-        --~ if (artid == 0x1bfb and item.amount >= 30) then return true end -- bolts
-        --~ if (artid == 0x0f3f and item.amount >= 30) then return true end -- arrows
+        if (artid == 0x1bfb and item.amount >= 30) then return true end -- bolts
+        if (artid == 0x0f3f and item.amount >= 30) then return true end -- arrows
         if (1 == 2) then -- jewels
                 if (artid == 0xf21) then return true end -- star saphire