Party hunt analyzer missing bytes

marcosvf132 · marcosvf132 · commit 16da8d06d848 · 2022-03-21T22:39:46.000-03:00
diff --git a/TibiaAPI/Constants/Enums.cs b/TibiaAPI/Constants/Enums.cs
@@ -328,7 +328,14 @@ public enum TeamFinderType
 		Hunt = 2,
 		Quest = 3
 	}
-	
+
+	public enum PartyAnalyzerType
+	{
+		Reset = 0,
+		PriceType = 1,
+		PriceValue = 2
+	}
+
 	public enum CharacterInfoPage
 	{
 		Basic = 0,
diff --git a/TibiaAPI/Network/ClientPackets/PartyHuntAnalyser.cs b/TibiaAPI/Network/ClientPackets/PartyHuntAnalyser.cs
@@ -1,9 +1,16 @@
 ﻿using OXGaming.TibiaAPI.Constants;
+using System;
+using System.Collections.Generic;
 
 namespace OXGaming.TibiaAPI.Network.ClientPackets
 {
     public class PartyHuntAnalyser : ClientPacket
     {
+        public byte Type { get; set; }
+
+        public List<(ushort ItemId, ulong Price)> ItemsData { get; } =
+            new List<(ushort ItemId, ulong Price)>();
+
         public PartyHuntAnalyser(Client client)
         {
             Client = client;
@@ -12,13 +19,31 @@ public PartyHuntAnalyser(Client client)
 
         public override void ParseFromNetworkMessage(NetworkMessage message)
         {
-            // TODO
+            Type = message.ReadByte();
+            if ((PartyAnalyzerType)Type == PartyAnalyzerType.PriceValue) {
+                ItemsData.Capacity = message.ReadUInt16();
+                for (var i = 0; i < ItemsData.Capacity; ++i)
+                {
+                    var itemId = message.ReadUInt16();
+                    var price = message.ReadUInt64();
+                    ItemsData.Add((itemId, price));
+                }
+            }
         }
 
         public override void AppendToNetworkMessage(NetworkMessage message)
         {
-            // TODO
-            // message.Write((byte)ClientPacketType.PartyHuntAnalyser);
+            message.Write((byte)ClientPacketType.PartyHuntAnalyser);
+            if ((PartyAnalyzerType)Type == PartyAnalyzerType.PriceValue) {
+                var count = Math.Min(byte.MaxValue, ItemsData.Count);
+                message.Write((byte)count);
+                for (var i = 0; i < count; ++i) 
+                {
+                    var (ItemId, Price) = ItemsData[i];
+                    message.Write(ItemId);
+                    message.Write(Price);
+                }
+            }
         }
     }
 }
diff --git a/TibiaAPI/Network/ServerPackets/PartyHuntAnalyser.cs b/TibiaAPI/Network/ServerPackets/PartyHuntAnalyser.cs
@@ -28,8 +28,7 @@ public PartyHuntAnalyser(Client client)
         public override void ParseFromNetworkMessage(NetworkMessage message)
         {
             SessionMinutes = message.ReadUInt32();
-            LeaderId = message.ReadUInt32(); // This is a player ID, but it may not be the leader.
-            // TODO
+            LeaderId = message.ReadUInt32();
             UnknownByte1 = message.ReadByte();
             MemberInfo.Capacity = message.ReadByte();
             for (var i = 0; i < MemberInfo.Capacity; ++i)
@@ -59,7 +58,6 @@ public override void ParseFromNetworkMessage(NetworkMessage message)
 
         public override void AppendToNetworkMessage(NetworkMessage message)
         {
-            // TODO
             message.Write((byte)ServerPacketType.PartyHuntAnalyser);
             message.Write(SessionMinutes);
             message.Write(LeaderId);

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,16 @@`
`1`	`1`	`using OXGaming.TibiaAPI.Constants;`
	`2`	`+using System;`
	`3`	`+using System.Collections.Generic;`
`2`	`4`
`3`	`5`	`namespace OXGaming.TibiaAPI.Network.ClientPackets`
`4`	`6`	`{`
`5`	`7`	`public class PartyHuntAnalyser : ClientPacket`
`6`	`8`	`{`
	`9`	`+ public byte Type { get; set; }`
	`10`	`+`
	`11`	`+ public List<(ushort ItemId, ulong Price)> ItemsData { get; } =`
	`12`	`+ new List<(ushort ItemId, ulong Price)>();`
	`13`	`+`
`7`	`14`	`public PartyHuntAnalyser(Client client)`
`8`	`15`	`{`
`9`	`16`	`Client = client;`
`@@ -12,13 +19,31 @@ public PartyHuntAnalyser(Client client)`
`12`	`19`
`13`	`20`	`public override void ParseFromNetworkMessage(NetworkMessage message)`
`14`	`21`	`{`
`15`		`- // TODO`
	`22`	`+ Type = message.ReadByte();`
	`23`	`+ if ((PartyAnalyzerType)Type == PartyAnalyzerType.PriceValue) {`
	`24`	`+ ItemsData.Capacity = message.ReadUInt16();`
	`25`	`+ for (var i = 0; i < ItemsData.Capacity; ++i)`
	`26`	`+ {`
	`27`	`+ var itemId = message.ReadUInt16();`
	`28`	`+ var price = message.ReadUInt64();`
	`29`	`+ ItemsData.Add((itemId, price));`
	`30`	`+ }`
	`31`	`+ }`
`16`	`32`	`}`
`17`	`33`
`18`	`34`	`public override void AppendToNetworkMessage(NetworkMessage message)`
`19`	`35`	`{`
`20`		`- // TODO`
`21`		`- // message.Write((byte)ClientPacketType.PartyHuntAnalyser);`
	`36`	`+ message.Write((byte)ClientPacketType.PartyHuntAnalyser);`
	`37`	`+ if ((PartyAnalyzerType)Type == PartyAnalyzerType.PriceValue) {`
	`38`	`+ var count = Math.Min(byte.MaxValue, ItemsData.Count);`
	`39`	`+ message.Write((byte)count);`
	`40`	`+ for (var i = 0; i < count; ++i)`
	`41`	`+ {`
	`42`	`+ var (ItemId, Price) = ItemsData[i];`
	`43`	`+ message.Write(ItemId);`
	`44`	`+ message.Write(Price);`
	`45`	`+ }`
	`46`	`+ }`
`22`	`47`	`}`
`23`	`48`	`}`
`24`	`49`	`}`