From 506d30ceb194d906a4edf91b6ce6a8bcd876a398 Mon Sep 17 00:00:00 2001 From: Kayte Date: Sat, 20 Dec 2025 20:00:11 -0500 Subject: [PATCH 1/3] Fixing packet fields bugs --- addons/libs/packets/fields.lua | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/addons/libs/packets/fields.lua b/addons/libs/packets/fields.lua index bd571c896..b8af60faf 100644 --- a/addons/libs/packets/fields.lua +++ b/addons/libs/packets/fields.lua @@ -670,11 +670,10 @@ fields.outgoing[0x05A] = L{ -- Dialogue options fields.outgoing[0x05B] = L{ {ctype='unsigned int', label='Target', fn=id}, -- 04 - {ctype='unsigned short', label='Option Index'}, -- 08 - {ctype='unsigned short', label='_unknown1'}, -- 0A + {ctype='unsigned int', label='Option Index'}, -- 08 {ctype='unsigned short', label='Target Index', fn=index}, -- 0C - {ctype='bool', label='Automated Message'}, -- 0E 1 if the response packet is automatically generated, 0 if it was selected by you - {ctype='unsigned char', label='_unknown2'}, -- 0F + {ctype='bool', label='Automated Message'}, -- 0E 1 if continuing the current menu, 0 if ending + {ctype='unsigned char', label='_padding'}, -- 0F Upper bits of a Mode short including the previous bool {ctype='unsigned short', label='Zone', fn=zone}, -- 10 {ctype='unsigned short', label='Menu ID'}, -- 12 } @@ -685,11 +684,11 @@ fields.outgoing[0x05C] = L{ {ctype='float', label='Z'}, -- 08 {ctype='float', label='Y'}, -- 0C {ctype='unsigned int', label='Target ID', fn=id}, -- 10 NPC that you are requesting a warp from - {ctype='unsigned int', label='_unknown1'}, -- 14 01 00 00 00 observed + {ctype='unsigned int', label='Option Index'}, -- 14 {ctype='unsigned short', label='Zone'}, -- 18 {ctype='unsigned short', label='Menu ID'}, -- 1A {ctype='unsigned short', label='Target Index', fn=index}, -- 1C - {ctype='unsigned char', label='_unknown2', const=1}, -- 1E + {ctype='unsigned char', label='Mode', const=1}, -- 1E {ctype='unsigned char', label='Rotation'}, -- 1F } @@ -2030,7 +2029,7 @@ fields.incoming[0x033] = L{ {ctype='char[16]', label='_dupeNPC Name1'}, -- 20 {ctype='char[16]', label='_dupeNPC Name2'}, -- 30 {ctype='char[16]', label='_dupeNPC Name3'}, -- 40 - {ctype='char[32]', label='Menu Parameters'}, -- 50 The way this information is interpreted varies by menu. + {ctype='data[32]', label='Menu Parameters'}, -- 50 The way this information is interpreted varies by menu. } -- NPC Interaction Type 2 @@ -3437,7 +3436,7 @@ fields.incoming[0x0AC] = L{ } fields.incoming[0x0AE] = L{ - {ctype='data[7]', label='Mounts'}, -- 04 + {ctype='data[7]', label='Mounts'}, -- 04 } -- Moblin Maze Mongers information @@ -3457,6 +3456,14 @@ fields.incoming[0x0B5] = L{ {ctype='unsigned int', label='_unknown2'}, -- 1C } +-- Reservation Response +packets.raw_fields.incoming[0x0BF] = L{ + {ctype='unsigned short', label='_unknown1'}, -- 04 + {ctype='unsigned short', label='Result'}, -- 06 Success is 4, other values are failures + {ctype='unsigned int', label='_unknown2'}, -- 08 + {ctype='unsigned int', label='NPC Index'}, -- 0C +} + -- Alliance status update fields.incoming[0x0C8] = L{ {ctype='unsigned char', label='_unknown1'}, -- 04 From 832462e229161a2cb04c098d60c5e75a90ca32a5 Mon Sep 17 00:00:00 2001 From: Kayte Date: Sat, 20 Dec 2025 20:17:55 -0500 Subject: [PATCH 2/3] Fixed typo on incoming 0x0BF addition --- 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 b8af60faf..63e591617 100644 --- a/addons/libs/packets/fields.lua +++ b/addons/libs/packets/fields.lua @@ -3457,7 +3457,7 @@ fields.incoming[0x0B5] = L{ } -- Reservation Response -packets.raw_fields.incoming[0x0BF] = L{ +fields.incoming[0x0BF] = L{ {ctype='unsigned short', label='_unknown1'}, -- 04 {ctype='unsigned short', label='Result'}, -- 06 Success is 4, other values are failures {ctype='unsigned int', label='_unknown2'}, -- 08 From 70845f6570752f53651cbd83c7a32fe530a2cc9f Mon Sep 17 00:00:00 2001 From: Kayte Date: Mon, 22 Dec 2025 20:05:56 -0500 Subject: [PATCH 3/3] Updating label naming and adding alias --- addons/libs/packets/fields.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/libs/packets/fields.lua b/addons/libs/packets/fields.lua index 63e591617..eff69dd0d 100644 --- a/addons/libs/packets/fields.lua +++ b/addons/libs/packets/fields.lua @@ -672,8 +672,9 @@ fields.outgoing[0x05B] = L{ {ctype='unsigned int', label='Target', fn=id}, -- 04 {ctype='unsigned int', label='Option Index'}, -- 08 {ctype='unsigned short', label='Target Index', fn=index}, -- 0C - {ctype='bool', label='Automated Message'}, -- 0E 1 if continuing the current menu, 0 if ending - {ctype='unsigned char', label='_padding'}, -- 0F Upper bits of a Mode short including the previous bool + {ctype='bool', label='Continue', -- 0E Determines which mode the menu uses + alias='Automated Message'}, + {ctype='unsigned char', label='_padding' const=0}, -- 0F {ctype='unsigned short', label='Zone', fn=zone}, -- 10 {ctype='unsigned short', label='Menu ID'}, -- 12 } @@ -688,7 +689,7 @@ fields.outgoing[0x05C] = L{ {ctype='unsigned short', label='Zone'}, -- 18 {ctype='unsigned short', label='Menu ID'}, -- 1A {ctype='unsigned short', label='Target Index', fn=index}, -- 1C - {ctype='unsigned char', label='Mode', const=1}, -- 1E + {ctype='bool', label='Continue', const=true}, -- 1E Always set for warp requests {ctype='unsigned char', label='Rotation'}, -- 1F } @@ -3436,7 +3437,7 @@ fields.incoming[0x0AC] = L{ } fields.incoming[0x0AE] = L{ - {ctype='data[7]', label='Mounts'}, -- 04 + {ctype='data[7]', label='Mounts'}, -- 04 } -- Moblin Maze Mongers information