From 614d2fd8a66781407609c60facf983c71cdc9895 Mon Sep 17 00:00:00 2001 From: lili-ffxi <40600148+lili-ffxi@users.noreply.github.com> Date: Thu, 30 Apr 2020 17:02:01 +0100 Subject: [PATCH 1/7] Update checkparam.lua --- addons/checkparam/checkparam.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index 5b61cfa81..e195a74c2 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -356,8 +356,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 +368,4 @@ caps={ ['save tp']=500, ['fast cast']=80, ['reward']=50 -} \ No newline at end of file +} From 6136e8b3f3a2dff5c0ba04e3bf0fcf1b49df7811 Mon Sep 17 00:00:00 2001 From: lili-ffxi <40600148+lili-ffxi@users.noreply.github.com> Date: Thu, 30 Apr 2020 17:04:42 +0100 Subject: [PATCH 2/7] Update checkparam.lua --- addons/checkparam/checkparam.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index e195a74c2..b0c7ceb0a 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -221,7 +221,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', From ed205ee3ec1ac337ace3f1c7429cce269371fc1c Mon Sep 17 00:00:00 2001 From: lili-ffxi <40600148+lili-ffxi@users.noreply.github.com> Date: Thu, 30 Apr 2020 17:17:42 +0100 Subject: [PATCH 3/7] Update checkparam.lua --- addons/checkparam/checkparam.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index b0c7ceb0a..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 From a1ddd3d91277f156d1a81023d2b8643cb536a67a Mon Sep 17 00:00:00 2001 From: RubenatorX Date: Thu, 30 Apr 2020 12:23:48 -0600 Subject: [PATCH 4/7] Check Packet [0x0C9] -- corrected missing padding latest change to make the linkshell name the right data length failed to insert padding and resulted in incorrect parsing of job levels --- addons/libs/packets/fields.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/libs/packets/fields.lua b/addons/libs/packets/fields.lua index 414947519..f7426569a 100644 --- a/addons/libs/packets/fields.lua +++ b/addons/libs/packets/fields.lua @@ -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 From e79b6e6fc822ed1e654c648393f886365bfd1cde Mon Sep 17 00:00:00 2001 From: Lowclock Date: Sat, 9 May 2020 01:57:27 -0700 Subject: [PATCH 5/7] Correcting incoming 0x05A _unknown1 Whatever it is, it's not a constant 2 anymore. Appears to be job -1 for /jobemotes (presumably -1 because there is no None), but for other emotes it seems to vary somewhere between 0 and 2. Possibly race/model related? --- addons/libs/packets/fields.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/libs/packets/fields.lua b/addons/libs/packets/fields.lua index f7426569a..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 From c0a60d712868e0eded111913995caa97091a90a5 Mon Sep 17 00:00:00 2001 From: Tylas <61948311+Tylas11@users.noreply.github.com> Date: Sat, 9 May 2020 12:58:58 +0200 Subject: [PATCH 6/7] fixed images.hover --- addons/libs/images.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/libs/images.lua b/addons/libs/images.lua index e85d707b4..f36afa025 100644 --- a/addons/libs/images.lua +++ b/addons/libs/images.lua @@ -351,12 +351,12 @@ function images.hover(t, x, y) local pos_x, pos_y = t:pos() local off_x, off_y = t:get_extents() - -- print(pos_x, pos_y, off_x, off_y) + -- print(x, y, pos_x, pos_y, off_x, off_y) - 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 (pos_x <= x and x <= off_x + or pos_x >= x and x >= off_x) + and (pos_y <= y and y <= off_y + or pos_y >= y and y >= off_y) end function images.destroy(t) From 87eedcabe843946c1b6aa652e949c489c76cc385 Mon Sep 17 00:00:00 2001 From: Tylas <61948311+Tylas11@users.noreply.github.com> Date: Sat, 9 May 2020 13:59:39 +0200 Subject: [PATCH 7/7] renamed local variables in images.hover --- addons/libs/images.lua | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/libs/images.lua b/addons/libs/images.lua index f36afa025..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(x, y, 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 <= off_x - or pos_x >= x and x >= off_x) - and (pos_y <= y and y <= off_y - or pos_y >= y and 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)