Skip to content

Dev > Live merge #1877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
z16 merged 11 commits into from
May 9, 2020
Merged

Dev > Live merge #1877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
614d2fd
Update checkparam.lua
lili-ffxi Apr 30, 2020
6136e8b
Update checkparam.lua
lili-ffxi Apr 30, 2020
ed205ee
Update checkparam.lua
lili-ffxi Apr 30, 2020
3aafa3e
Merge pull request #1872 from lili-ffxi/dev
z16 Apr 30, 2020
a1ddd3d
Check Packet [0x0C9] -- corrected missing padding
RubenatorX Apr 30, 2020
70b4668
Merge pull request #1873 from RubenatorX/patch-4
z16 Apr 30, 2020
e79b6e6
Correcting incoming 0x05A _unknown1
Lowclock May 9, 2020
487cd91
Merge pull request #1875 from Lowclock/patch-1
z16 May 9, 2020
c0a60d7
fixed images.hover
Tylas11 May 9, 2020
87eedca
renamed local variables in images.hover
Tylas11 May 9, 2020
2932a1d
Merge pull request #1876 from Tylas11/dev
z16 May 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions addons/checkparam/checkparam.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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,
Expand All @@ -367,4 +369,4 @@ caps={
['save tp']=500,
['fast cast']=80,
['reward']=50
}
}
14 changes: 6 additions & 8 deletions addons/libs/images.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion addons/libs/packets/fields.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down