diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index 5b61cfa81..7f31a57d0 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -156,6 +156,7 @@ function split_text(id,text,arg) elseif key == "damage taken" then tbl['physical damage taken'] = tonumber(value)+(tbl['physical damage taken'] or 0) tbl['magic damage taken'] = tonumber(value)+(tbl['magic damage taken'] or 0) + tbl['breath damage taken'] = tonumber(value)+(tbl['breath damage taken'] or 0) else tbl[key] = tonumber(value)+(tbl[key] or 0) end @@ -221,7 +222,7 @@ integrate = { ['enhancing magic duration'] = 'enhancing magic effect duration', ['eva'] = 'evasion', ['indicolure spell duration'] = 'indicolure effect duration', - ['indi eff dur'] = 'indicolure effect duration', + ['indi eff dur'] = 'indicolure effect duration', ['mag eva'] = 'magic evasion', ['magic atk bonus'] = 'magic attack bonus', ['magatkbns'] = 'magic attack bonus', @@ -356,8 +357,9 @@ caps={ ['cure potency']=50, ['potency of cure effects received']=30, ['quick cast']=10, - ['physical damage taken']=-25, - ['magic damage taken']=-25, + ['physical damage taken']=-50, + ['magic damage taken']=-50, + ['breath damage taken']=-50, ['pet: physical damage taken']=-87.5, ['pet: magic damage taken']=-87.5, ['pet: haste']=25, @@ -367,4 +369,4 @@ caps={ ['save tp']=500, ['fast cast']=80, ['reward']=50 -} \ No newline at end of file +} diff --git a/addons/libs/images.lua b/addons/libs/images.lua index e85d707b4..b54021025 100644 --- a/addons/libs/images.lua +++ b/addons/libs/images.lua @@ -348,15 +348,13 @@ function images.hover(t, x, y) return false end - local pos_x, pos_y = t:pos() - local off_x, off_y = t:get_extents() - - -- print(pos_x, pos_y, off_x, off_y) + local start_pos_x, start_pos_y = t:pos() + local end_pos_x, end_pos_y = t:get_extents() - return (pos_x <= x and x <= pos_x + off_x - or pos_x >= x and x >= pos_x + off_x) - and (pos_y <= y and y <= pos_y + off_y - or pos_y >= y and y >= pos_y + off_y) + return (start_pos_x <= x and x <= end_pos_x + or start_pos_x >= x and x >= end_pos_x) + and (start_pos_y <= y and y <= end_pos_y + or start_pos_y >= y and y >= end_pos_y) end function images.destroy(t) diff --git a/addons/libs/packets/fields.lua b/addons/libs/packets/fields.lua index 414947519..97f4b6ae1 100644 --- a/addons/libs/packets/fields.lua +++ b/addons/libs/packets/fields.lua @@ -2714,7 +2714,7 @@ fields.incoming[0x05A] = L{ {ctype='unsigned short', label='Player Index', fn=index}, -- 0C {ctype='unsigned short', label='Target Index', fn=index}, -- 0E {ctype='unsigned short', label='Emote', fn=emote}, -- 10 - {ctype='unsigned short', label='_unknown1', const=2}, -- 12 + {ctype='unsigned short', label='_unknown1'}, -- 12 {ctype='unsigned short', label='_unknown2'}, -- 14 {ctype='unsigned char', label='Type'}, -- 16 2 for motion, 0 otherwise {ctype='unsigned char', label='_unknown3'}, -- 17 @@ -3281,6 +3281,7 @@ func.incoming[0x0C9][0x01] = L{ {ctype='unsigned char', label='Main Job', fn=job}, -- 12 {ctype='unsigned char', label='Sub Job', fn=job}, -- 13 {ctype='data[15]', label='Linkshell', enc=ls_enc}, -- 14 6-bit packed + {ctype='unsigned char', label='_padding1'}, -- 23 {ctype='unsigned char', label='Main Job Level'}, -- 24 {ctype='unsigned char', label='Sub Job Level'}, -- 25 {ctype='data[42]', label='_unknown5'}, -- 26 At least the first two bytes and the last twelve bytes are junk, possibly more