Fix Fluid Types (jo3bingham#21)

Rydan · web-flow · commit a67704f7255f · 2019-02-12T02:50:17.000+01:00
* Fix Fluid Types

* Re-add Colors

* Temporarily add Packet Data to Exception
diff --git a/Apps/Extract/Program.cs b/Apps/Extract/Program.cs
@@ -17,20 +17,6 @@ class Program
     {
         private const int MapSizeW = 10;
 
-        private static readonly byte[] _reverseFluidMap =
-        {
-            (byte)FluidColor.Transparent,
-            (byte)FluidType.Water,
-            (byte)FluidType.Mana,
-            (byte)FluidType.Beer,
-            (byte)FluidColor.Transparent,
-            (byte)FluidType.Blood,
-            (byte)FluidType.Slime,
-            (byte)FluidColor.Transparent,
-            (byte)FluidType.Lemonade,
-            (byte)FluidType.Milk
-        };
-
         private static readonly HashSet<ulong> _knownPositions = new HashSet<ulong>();
         private static readonly HashSet<uint> _knownMonsterIds = new HashSet<uint>();
         private static readonly HashSet<uint> _knownNpcIds = new HashSet<uint>();
@@ -721,9 +707,9 @@ static void ParseField((Field, Position) field)
                 {
                     _otbmFile.WriteByte(15);
                     byte subType = 0;
-                    if (item.Data >= 0 && item.Data < _reverseFluidMap.Length)
+                    if (Enum.IsDefined(typeof(FluidType), (int)item.Data))
                     {
-                        subType = _reverseFluidMap[item.Data];
+                        subType = (byte)item.Data;
                     }
                     WriteData(_otbmFile, new byte[] { subType });
                 }
diff --git a/TibiaAPI/Constants/Enums.cs b/TibiaAPI/Constants/Enums.cs
@@ -204,26 +204,24 @@ public enum MarketDetailField
 
     public enum FluidType
     {
-        None = FluidColor.Transparent,
-        Water = FluidColor.Blue,
-        Blood = FluidColor.Red,
-        Beer = FluidColor.Brown,
-        Slime = FluidColor.Green,
-        Lemonade = FluidColor.Yellow,
-        Milk = FluidColor.White,
-        Mana = FluidColor.Purple,
-        Life = FluidColor.Red + 8,
-        Oil = FluidColor.Brown + 8,
-        Urine = FluidColor.Yellow + 8,
-        CoconutMilk = FluidColor.White + 8,
-        Wine = FluidColor.Purple + 8,
-        Mud = FluidColor.Brown + 16,
-        FruitJuice = FluidColor.Yellow + 16,
-        Lava = FluidColor.Red + 24,
-        Rum = FluidColor.Brown + 24,
-        Swamp = FluidColor.Green + 24,
-        Tea = FluidColor.Brown + 32,
-        Mead = FluidColor.Brown + 40
+        None = 0,
+        Water = 1,
+        Wine = 2,
+        Beer = 3,
+        Mud = 4,
+        Blood = 5,
+        Slime = 6,
+        Oil = 7,
+        Urine = 8,
+        Milk = 9,
+        ManaFluid = 10,
+        LifeFluid = 11,
+        Lemonade = 12,
+        Rum = 13,
+        FruitJuice = 14,
+        CoconutMilk = 15,
+        Mead = 16,
+        Tea = 17
     }
 
     public enum MessageModeType
diff --git a/TibiaAPI/Network/NetworkMessage.cs b/TibiaAPI/Network/NetworkMessage.cs
@@ -1300,6 +1300,7 @@ public void PrepareToParse(uint[] xteaKey, ZStream zStream = null)
                 var ret = zStream.inflate(zlibConst.Z_SYNC_FLUSH);
                 if (ret != zlibConst.Z_OK)
                 {
+                    Console.WriteLine($"Data: {BitConverter.ToString(GetData()).Replace('-', ' ')}");
                     throw new Exception($"[NetworkMessage.PrepareToParse] zlib inflate failed: {ret}");
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -1300,6 +1300,7 @@ public void PrepareToParse(uint[] xteaKey, ZStream zStream = null)`
`1300`	`1300`	`var ret = zStream.inflate(zlibConst.Z_SYNC_FLUSH);`
`1301`	`1301`	`if (ret != zlibConst.Z_OK)`
`1302`	`1302`	`{`
	`1303`	`+ Console.WriteLine($"Data: {BitConverter.ToString(GetData()).Replace('-', ' ')}");`
`1303`	`1304`	`throw new Exception($"[NetworkMessage.PrepareToParse] zlib inflate failed: {ret}");`
`1304`	`1305`	`}`
`1305`	`1306`