Add new type to CyclopediaMapData packet

jo3bingham · jo3bingham · commit 8ef8b7822f14 · 2018-12-21T11:34:59.000Z
diff --git a/TibiaAPI/Constants/Enums.cs b/TibiaAPI/Constants/Enums.cs
@@ -159,6 +159,7 @@ public enum CyclopediaMapDataType
         SetDiscoveryArea = 5,
         Passage = 6,
         SubAreaMonsters = 7,
+        Unknown = 8,
         Donations = 9,
         SetCurrentArea = 10
     }
diff --git a/TibiaAPI/Network/Communication.cs b/TibiaAPI/Network/Communication.cs
@@ -1907,7 +1907,8 @@ public void ParseClientMessage(Client client, NetworkMessage inMessage, NetworkM
                 // the structure of a new packet. Because of that, it's better to log as much data as
                 // possible and continue.
                 Console.WriteLine(ex.ToString());
-                Console.WriteLine($"Current packet: [{((byte)currentPacket).ToString("X2")}]{currentPacket}");
+                Console.WriteLine($"Current position: {inMessage.Position}");
+                Console.WriteLine($"Current packet: [{((byte)currentPacket).ToString("X2")}:{packetPosition}]{currentPacket}");
                 Console.WriteLine($"Last known packets: {string.Join(" ", packets.Select(p => "[" + ((byte)p.PacketType).ToString("X2") + ":" + p.Position + "]" + p.PacketType).ToArray())}");
                 Console.WriteLine($"Data: {BitConverter.ToString(inMessage.GetData()).Replace('-', ' ')}");
             }
@@ -3816,7 +3817,8 @@ public void ParseServerMessage(Client client, NetworkMessage inMessage, NetworkM
                 // the structure of a new packet. Because of that, it's better to log as much data as
                 // possible and continue.
                 Console.WriteLine(ex.ToString());
-                Console.WriteLine($"Current packet: [{((byte)currentPacket).ToString("X2")}]{currentPacket}");
+                Console.WriteLine($"Current position: {inMessage.Position}");
+                Console.WriteLine($"Current packet: [{((byte)currentPacket).ToString("X2")}:{packetPosition}]{currentPacket}");
                 Console.WriteLine($"Last known packets: {string.Join(" ", packets.Select(p => "[" + ((byte)p.PacketType).ToString("X2") + ":" + p.Position + "]" + p.PacketType).ToArray())}");
                 Console.WriteLine($"Data: {BitConverter.ToString(inMessage.GetData()).Replace('-', ' ')}");
             }
diff --git a/TibiaAPI/Network/ServerPackets/CyclopediaMapData.cs b/TibiaAPI/Network/ServerPackets/CyclopediaMapData.cs
@@ -87,6 +87,11 @@ public override bool ParseFromNetworkMessage(NetworkMessage message)
                     }
                 }
             }
+            else if (DataType == CyclopediaMapDataType.Unknown)
+            {
+                var raceId = message.ReadUInt16();
+                var unlocked = message.ReadBool(); //?
+            }
             else if (DataType == CyclopediaMapDataType.Donations)
             {
                 var minimumGoldDonation = message.ReadUInt64();

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ public enum CyclopediaMapDataType`
`159`	`159`	`SetDiscoveryArea = 5,`
`160`	`160`	`Passage = 6,`
`161`	`161`	`SubAreaMonsters = 7,`
	`162`	`+ Unknown = 8,`
`162`	`163`	`Donations = 9,`
`163`	`164`	`SetCurrentArea = 10`
`164`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,11 @@ public override bool ParseFromNetworkMessage(NetworkMessage message)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}`
	`90`	`+ else if (DataType == CyclopediaMapDataType.Unknown)`
	`91`	`+ {`
	`92`	`+ var raceId = message.ReadUInt16();`
	`93`	`+ var unlocked = message.ReadBool(); //?`
	`94`	`+ }`
`90`	`95`	`else if (DataType == CyclopediaMapDataType.Donations)`
`91`	`96`	`{`
`92`	`97`	`var minimumGoldDonation = message.ReadUInt64();`