From 7d84f6927837bcc5e414fe94019d39184b32d739 Mon Sep 17 00:00:00 2001 From: dtw Date: Fri, 13 Mar 2020 13:00:02 +0000 Subject: [PATCH 1/9] Change color of recommended action Just to make it stand out more in the log. --- addons/boxdestroyer/boxdestroyer.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/boxdestroyer/boxdestroyer.lua b/addons/boxdestroyer/boxdestroyer.lua index a75e02556..0d0f7dbda 100644 --- a/addons/boxdestroyer/boxdestroyer.lua +++ b/addons/boxdestroyer/boxdestroyer.lua @@ -67,6 +67,10 @@ observed_default = { thief_tools = {[1022] = true} +-- color codes for ease of use +txt = {} +txt[36] = string.char(31,36) -- yellow + -- global variables box = {} @@ -285,9 +289,9 @@ function display(id, chances) windower.add_to_chat(207, 'best guess: %d (%d%%)':format(box[id][math.ceil(#box[id] / 2)], 1 / remaining * 100)) local clue_value,guess_value = calculate_odds(id,chances) if clue_value > guess_value and remaining ~= 1 then - windower.add_to_chat(207, 'boxdestroyer recommends examining the chest') + windower.add_to_chat(207, 'boxdestroyer recommends'..txt[36]..' examining the chest') else - windower.add_to_chat(207, 'boxdestroyer recommends guessing %d':format(box[id][math.ceil(#box[id] / 2)])) + windower.add_to_chat(207, 'boxdestroyer recommends guessing'..txt[36]..' %d':format(box[id][math.ceil(#box[id] / 2)])) end end From e6b880d3d6fcaf2f9eaf0063cdd447c4471eb1cd Mon Sep 17 00:00:00 2001 From: dtw Date: Fri, 13 Mar 2020 13:01:00 +0000 Subject: [PATCH 2/9] Capitalize chat msgs Because OCD --- addons/boxdestroyer/boxdestroyer.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/boxdestroyer/boxdestroyer.lua b/addons/boxdestroyer/boxdestroyer.lua index 0d0f7dbda..3c5802cd2 100644 --- a/addons/boxdestroyer/boxdestroyer.lua +++ b/addons/boxdestroyer/boxdestroyer.lua @@ -261,9 +261,9 @@ end function display(id, chances) if #box[id] == 90 then - windower.add_to_chat(207, 'possible combinations: 10~99') + windower.add_to_chat(207, 'Possible combinations: 10~99') else - windower.add_to_chat(207, 'possible combinations: ' .. table.concat(box[id], ' ')) + windower.add_to_chat(207, 'Possible combinations: ' .. table.concat(box[id], ' ')) end local remaining = math.floor(#box[id] / math.pow(2, (chances - 1))) if remaining == 0 then @@ -277,13 +277,13 @@ function display(id, chances) local printed = false for _,v in pairs(box[id]) do if math.floor(v/10) == v%10 then - windower.add_to_chat(207, 'best guess: %d (%d%%)':format(v, 1 / remaining * 100)) + windower.add_to_chat(207, 'Best guess: %d (%d%%)':format(v, 1 / remaining * 100)) printed = true break end end if not printed then - windower.add_to_chat(207, 'best guess: %d (%d%%)':format(box[id][math.ceil(#box[id] / 2)], 1 / remaining * 100)) + windower.add_to_chat(207, 'Best guess: %d (%d%%)':format(box[id][math.ceil(#box[id] / 2)], 1 / remaining * 100)) end else windower.add_to_chat(207, 'best guess: %d (%d%%)':format(box[id][math.ceil(#box[id] / 2)], 1 / remaining * 100)) From 91251f0d498bcbf129441cadc951c1967b4051a2 Mon Sep 17 00:00:00 2001 From: dtw Date: Fri, 13 Mar 2020 14:44:52 +0000 Subject: [PATCH 3/9] Add suggested amends --- addons/boxdestroyer/boxdestroyer.lua | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/addons/boxdestroyer/boxdestroyer.lua b/addons/boxdestroyer/boxdestroyer.lua index 3c5802cd2..33e68064a 100644 --- a/addons/boxdestroyer/boxdestroyer.lua +++ b/addons/boxdestroyer/boxdestroyer.lua @@ -36,11 +36,20 @@ _addon.author = 'Seth VanHeulen (Acacia@Odin)' require('pack') require('tables') +require('chat') -- load message constants require('messages') +-- config + +config = require('config') +defaults = { + HighlightResult: false, + HighlightColor: 36, +} + -- global constants default = { @@ -67,10 +76,6 @@ observed_default = { thief_tools = {[1022] = true} --- color codes for ease of use -txt = {} -txt[36] = string.char(31,36) -- yellow - -- global variables box = {} @@ -288,11 +293,9 @@ function display(id, chances) else windower.add_to_chat(207, 'best guess: %d (%d%%)':format(box[id][math.ceil(#box[id] / 2)], 1 / remaining * 100)) local clue_value,guess_value = calculate_odds(id,chances) - if clue_value > guess_value and remaining ~= 1 then - windower.add_to_chat(207, 'boxdestroyer recommends'..txt[36]..' examining the chest') - else - windower.add_to_chat(207, 'boxdestroyer recommends guessing'..txt[36]..' %d':format(box[id][math.ceil(#box[id] / 2)])) - end + local result = clue_value > guess_value and remaining ~= 1 and 'examining the chest' or 'guessing ' .. '%d':format(box[id][math.ceil(#box[id] / 2)]) + local formatted_result = settings.HighlightResult and result:color(settings.HighlightColor) or result + windower.add_to_chat(207, 'boxdestroyer recommends ' .. formatted_result .. '.') end end From 572053b72f634975bdbd70efce5deeef1814c799 Mon Sep 17 00:00:00 2001 From: Dean James Date: Sun, 15 Mar 2020 23:06:18 +0000 Subject: [PATCH 4/9] EmpyPopTracker 2.2.2. Fixed issue where text bg colour would not reset. Added default bg colours to settings. --- addons/EmpyPopTracker/EmpyPopTracker.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/EmpyPopTracker/EmpyPopTracker.lua b/addons/EmpyPopTracker/EmpyPopTracker.lua index 797226ddb..f2803e6d6 100644 --- a/addons/EmpyPopTracker/EmpyPopTracker.lua +++ b/addons/EmpyPopTracker/EmpyPopTracker.lua @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. _addon.name = 'Empy Pop Tracker' _addon.author = 'Dean James (Xurion of Bismarck)' _addon.commands = { 'ept', 'empypoptracker' } -_addon.version = '2.2.1' +_addon.version = '2.2.2' config = require('config') res = require('resources') @@ -70,6 +70,10 @@ defaults.colors.pool = {} defaults.colors.pool.red = 255 defaults.colors.pool.green = 170 defaults.colors.pool.blue = 0 +defaults.colors.bg = {} +defaults.colors.bg.red = 0 +defaults.colors.bg.green = 0 +defaults.colors.bg.blue = 0 defaults.colors.bgall = {} defaults.colors.bgall.red = 0 defaults.colors.bgall.green = 75 @@ -286,7 +290,7 @@ EmpyPopTracker.update = function() if generated_info.has_all_pops then EmpyPopTracker.text:bg_color(EmpyPopTracker.settings.colors.bgall.red, EmpyPopTracker.settings.colors.bgall.green, EmpyPopTracker.settings.colors.bgall.blue) else - EmpyPopTracker.text:bg_color(EmpyPopTracker.settings.text.red, EmpyPopTracker.settings.text.green, EmpyPopTracker.settings.text.blue) + EmpyPopTracker.text:bg_color(EmpyPopTracker.settings.colors.bg.red, EmpyPopTracker.settings.colors.bg.green, EmpyPopTracker.settings.colors.bg.blue) end if EmpyPopTracker.settings.visible then EmpyPopTracker.text:visible(true) From 56641863cce9dc038ef99d2dd25a950027a6e5cc Mon Sep 17 00:00:00 2001 From: Lowclock Date: Mon, 23 Mar 2020 14:51:58 -0700 Subject: [PATCH 5/9] Update fields.lua --- addons/libs/packets/fields.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/libs/packets/fields.lua b/addons/libs/packets/fields.lua index 626fc3755..a48ce7e2e 100644 --- a/addons/libs/packets/fields.lua +++ b/addons/libs/packets/fields.lua @@ -2865,7 +2865,7 @@ fields.incoming[0x061] = L{ {ctype='unsigned char', label='Main Hand iLevel'}, -- 56 {ctype='unsigned char', label='_unknown5'}, -- 57 Always 00 for me {ctype='bit[5]', label='Unity ID'}, -- 58 0=None, 1=Pieuje, 2=Ayame, 3=Invincible Shield, 4=Apururu, 5=Maat, 6=Aldo, 7=Jakoh Wahcondalo, 8=Naja Salaheem, 9=Flavira - {ctype='bit[5]', label='_unknown5'}, -- 58 Danger, 00ing caused my client to crash + {ctype='bit[5]', label='Unity Rank'}, -- 58 Danger, 00ing caused my client to crash {ctype='bit[16]', label='Unity Points'}, -- 59 {ctype='bit[6]', label='_unknown6'}, -- 5A No obvious function {ctype='unsigned int', label='_junk1'}, -- 5B @@ -2917,8 +2917,8 @@ func.incoming[0x063][0x03] = L{ {ctype='unsigned short', label='_unknown2'}, -- 0E 00 00 {ctype='unsigned short', label='_unknown3'}, -- 10 76 00 {ctype='unsigned short', label='Infamy'}, -- 12 - {ctype='unsigned int', label='_unknown2'}, -- 14 00s - {ctype='unsigned int', label='_unknown3'}, -- 18 00s + {ctype='unsigned int', label='_unknown4'}, -- 14 00s + {ctype='unsigned int', label='_unknown5'}, -- 18 00s {ctype='data[64]', label='Instinct Bitfield 1'}, -- 1C See below -- Bitpacked 2-bit values. 0 = no instincts from that species, 1 == first instinct, 2 == first and second instinct, 3 == first, second, and third instinct. {ctype='data[128]', label='Monster Level Char field'}, -- 5C Mapped onto the item ID for these creatures. (00 doesn't exist, 01 is rabbit, 02 is behemoth, etc.) From e404b828a75ff0e6b80f3b5f894535587219102a Mon Sep 17 00:00:00 2001 From: Lowclock Date: Mon, 23 Mar 2020 14:54:39 -0700 Subject: [PATCH 6/9] Update fields.lua --- 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 a48ce7e2e..d0528e413 100644 --- a/addons/libs/packets/fields.lua +++ b/addons/libs/packets/fields.lua @@ -2865,7 +2865,7 @@ fields.incoming[0x061] = L{ {ctype='unsigned char', label='Main Hand iLevel'}, -- 56 {ctype='unsigned char', label='_unknown5'}, -- 57 Always 00 for me {ctype='bit[5]', label='Unity ID'}, -- 58 0=None, 1=Pieuje, 2=Ayame, 3=Invincible Shield, 4=Apururu, 5=Maat, 6=Aldo, 7=Jakoh Wahcondalo, 8=Naja Salaheem, 9=Flavira - {ctype='bit[5]', label='Unity Rank'}, -- 58 Danger, 00ing caused my client to crash + {ctype='bit[5]', label='Unity Rank'}, -- 58 Danger, 00ing caused my client to crash {ctype='bit[16]', label='Unity Points'}, -- 59 {ctype='bit[6]', label='_unknown6'}, -- 5A No obvious function {ctype='unsigned int', label='_junk1'}, -- 5B From fe8cc725c0b2e059710d6ea44087ea599c381317 Mon Sep 17 00:00:00 2001 From: Lowclock Date: Mon, 23 Mar 2020 21:41:41 -0700 Subject: [PATCH 7/9] Corrected labels. Corrected incoming 0x065 labels for Animation and Rotation. --- addons/libs/packets/fields.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/libs/packets/fields.lua b/addons/libs/packets/fields.lua index d0528e413..0d91a2167 100644 --- a/addons/libs/packets/fields.lua +++ b/addons/libs/packets/fields.lua @@ -2960,8 +2960,8 @@ fields.incoming[0x065] = L{ {ctype='float', label='Y'}, -- 0C {ctype='unsigned int', label='ID', fn=id}, -- 10 {ctype='unsigned short', label='Index', fn=index}, -- 14 - {ctype='unsigned char', label='_unknown1'}, -- 16 1 observed. May indicate repositoning type. - {ctype='unsigned char', label='_unknown2'}, -- 17 Unknown, but matches the same byte of a matching spawn packet + {ctype='unsigned char', label='Animation'}, -- 16 + {ctype='unsigned char', label='Rotation'}, -- 17 {ctype='data[6]', label='_unknown3'}, -- 18 All zeros observed. } From 90ade5c7fbba0c5bda8185a5de5eea56b42f1319 Mon Sep 17 00:00:00 2001 From: Chiaia Date: Thu, 26 Mar 2020 11:07:08 -0400 Subject: [PATCH 8/9] Tidying up a bit --- addons/GearSwap/flow.lua | 6 +++++- addons/GearSwap/triggers.lua | 9 +++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/addons/GearSwap/flow.lua b/addons/GearSwap/flow.lua index c65e9941f..1c136861e 100644 --- a/addons/GearSwap/flow.lua +++ b/addons/GearSwap/flow.lua @@ -254,7 +254,11 @@ function equip_sets_exit(swap_type,ts,val1) -- Item use packet handling here if bit.band(val1.target.spawn_type, 2) == 2 and find_inventory_item(val1.id) then -- 0x36 packet - command_registry[ts].proposed_packet = assemble_menu_item_packet(val1.target.id,val1.target.index,val1.id) + if val1.target.distance <= 6 then + command_registry[ts].proposed_packet = assemble_menu_item_packet(val1.target.id,val1.target.index,val1.id) + else + windower.add_to_chat(67, "Target out of range.") + end elseif find_usable_item(val1.id) then -- 0x37 packet command_registry[ts].proposed_packet = assemble_use_item_packet(val1.target.id,val1.target.index,val1.id) diff --git a/addons/GearSwap/triggers.lua b/addons/GearSwap/triggers.lua index 47f2015ee..6c863061e 100644 --- a/addons/GearSwap/triggers.lua +++ b/addons/GearSwap/triggers.lua @@ -135,9 +135,14 @@ windower.register_event('outgoing text',function(original,modified,blocked,ffxi, if spell.prefix == '/item' then -- Item use packet handling here - if bit.band(spell.target.spawn_type, 2) == 2 and find_inventory_item(spell.id) then + if bit.band(spell.target.spawn_type, 2) == 2 and find_inventory_item(spell.id) and then --0x36 packet - command_registry[ts].proposed_packet = assemble_menu_item_packet(spell.target.id,spell.target.index,spell.id) + if spell.target.distance <= 6 then + command_registry[ts].proposed_packet = assemble_menu_item_packet(spell.target.id,spell.target.index,spell.id) + else + windower.add_to_chat(67, "Target out of range.") + return true + end elseif find_usable_item(spell.id) then --0x37 packet command_registry[ts].proposed_packet = assemble_use_item_packet(spell.target.id,spell.target.index,spell.id) From e8d86c27b3b07b203042b208656e29354f550d32 Mon Sep 17 00:00:00 2001 From: Chiaia Date: Thu, 26 Mar 2020 11:11:43 -0400 Subject: [PATCH 9/9] Update triggers.lua --- addons/GearSwap/triggers.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/GearSwap/triggers.lua b/addons/GearSwap/triggers.lua index 6c863061e..be7f21353 100644 --- a/addons/GearSwap/triggers.lua +++ b/addons/GearSwap/triggers.lua @@ -135,7 +135,7 @@ windower.register_event('outgoing text',function(original,modified,blocked,ffxi, if spell.prefix == '/item' then -- Item use packet handling here - if bit.band(spell.target.spawn_type, 2) == 2 and find_inventory_item(spell.id) and then + if bit.band(spell.target.spawn_type, 2) == 2 and find_inventory_item(spell.id) then --0x36 packet if spell.target.distance <= 6 then command_registry[ts].proposed_packet = assemble_menu_item_packet(spell.target.id,spell.target.index,spell.id)