diff --git a/src/Core/Utils.cs b/src/Core/Utils.cs index b97739f..aaac55e 100644 --- a/src/Core/Utils.cs +++ b/src/Core/Utils.cs @@ -9,8 +9,7 @@ namespace sodoffmmo.Core; internal static class Utils { public static bool VariablesValid(Client client) { if (client.PlayerData.Fp != "" && (client.PlayerData.Mbf & 8) == 8 - && (client.PlayerData.GeometryType == PetGeometryType.Default && client.PlayerData.PetAge < PetAge.Adult - || client.PlayerData.GeometryType == PetGeometryType.NightLight && client.PlayerData.PetAge < PetAge.Teen + && (client.PlayerData.GeometryType == PetGeometryType.Default && client.PlayerData.PetAge < PetAge.Teen || client.PlayerData.GeometryType == PetGeometryType.Terror && client.PlayerData.PetAge < PetAge.Titan)) { NetworkObject obj = new NetworkObject(); obj.Add("dr", (byte)1); diff --git a/src/Data/PlayerData.cs b/src/Data/PlayerData.cs index 96d61f5..6097264 100644 --- a/src/Data/PlayerData.cs +++ b/src/Data/PlayerData.cs @@ -43,12 +43,9 @@ public class PlayerData { } GeometryType = PetGeometryType.Default; PetAge = PetAge.Adult; - if (keyValPairs.TryGetValue("G", out string geometry)) { - if (geometry.ToLower().Contains("nightlight")) - GeometryType = PetGeometryType.NightLight; - else if (geometry.ToLower().Contains("terribleterror")) + if (keyValPairs.TryGetValue("G", out string geometry)) + if (geometry.ToLower().Contains("terribleterror")) GeometryType = PetGeometryType.Terror; - } if (keyValPairs.TryGetValue("A", out string age)) { switch (age) { case "E": PetAge = PetAge.EggInHand; break; @@ -102,7 +99,6 @@ public class PlayerData { public enum PetGeometryType { Default, - NightLight, Terror } public enum PetAge {