Skip to content
Merged
Changes from all commits
Commits
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
32 changes: 15 additions & 17 deletions addons/GearSwap/flow.lua
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,14 @@ function equip_sets_exit(swap_type, ts, val1)

if command_registry[ts].new_target then
val1.target = command_registry[ts].new_target -- Switch target, if it is requested.

if val1.prefix == '/item' then
if val1.target.type ~= 'NONE' and bit.band(val1.target.spawn_type, 2) == 2 then
val1.action_type = 'Trade'
else
val1.action_type = 'Item'
end
end
end

if st_targs[val1.target.raw] then
Expand All @@ -224,10 +232,10 @@ function equip_sets_exit(swap_type, ts, val1)
end

-- Compose a proposed packet for the given action (this should be possible after pretarget)
if val1.target.id and val1.target.index then
if filter_precast(val1) then
if val1.prefix == '/item' then
-- Item use packet handling here
if bit.band(val1.target.spawn_type, 2) == 2 and find_inventory_item(val1.id) then
if val1.action_type == 'Trade' and find_inventory_item(val1.id) then
-- 0x36 packet
if val1.target.distance <= 6 then
command_registry[ts].proposed_packet = assemble_menu_item_packet(val1.target.id, val1.target.index, val1.id)
Expand All @@ -238,22 +246,12 @@ function equip_sets_exit(swap_type, ts, val1)
-- 0x37 packet
command_registry[ts].proposed_packet = assemble_use_item_packet(val1.target.id, val1.target.index, val1.id)
end
if not command_registry[ts].proposed_packet then
command_registry:delete_entry(ts)
end
elseif outgoing_action_category_table[unify_prefix[val1.prefix]] then
if filter_precast(val1) then
command_registry[ts].proposed_packet = assemble_action_packet(val1.target.id, val1.target.index, outgoing_action_category_table[unify_prefix[val1.prefix]], val1.id, command_registry[ts].target_arrow)
if not command_registry[ts].proposed_packet then
command_registry:delete_entry(ts)

msg.debugging('Unable to create a packet for this command because the target is still invalid after pretarget (' .. storedcommand .. ' ' .. val1.target.raw .. ')')
storedcommand = nil
return storedcommand .. ' ' .. val1.target.raw
end
end
else
msg.debugging('Hark, what weird prefix through yonder window breaks? ' .. tostring(val1.prefix))
command_registry[ts].proposed_packet = assemble_action_packet(val1.target.id, val1.target.index, outgoing_action_category_table[unify_prefix[val1.prefix]], val1.id, command_registry[ts].target_arrow)
end

if not command_registry[ts].proposed_packet then
command_registry:delete_entry(ts)
end
end

Expand Down