diff --git a/CommonDataFramework/CommonDataFramework.csproj b/CommonDataFramework/CommonDataFramework.csproj index 5e9337e..28ae1f1 100644 --- a/CommonDataFramework/CommonDataFramework.csproj +++ b/CommonDataFramework/CommonDataFramework.csproj @@ -9,7 +9,7 @@ Properties CommonDataFramework CommonDataFramework - v4.8 + v4.8.1 512 preview diff --git a/CommonDataFramework/CommonDataFramework.nuspec b/CommonDataFramework/CommonDataFramework.nuspec index 121b8dc..9f4f33c 100644 --- a/CommonDataFramework/CommonDataFramework.nuspec +++ b/CommonDataFramework/CommonDataFramework.nuspec @@ -2,7 +2,7 @@ CommonDataFramework - 1.0.0.5 + 1.0.0.9 Policing Redefined Team MarcelWRLD false @@ -18,7 +18,7 @@ - + + \ No newline at end of file diff --git a/CommonDataFramework/Modules/Postals/PostalCodeController.cs b/CommonDataFramework/Modules/Postals/PostalCodeController.cs index 7a52681..1f664b7 100644 --- a/CommonDataFramework/Modules/Postals/PostalCodeController.cs +++ b/CommonDataFramework/Modules/Postals/PostalCodeController.cs @@ -72,8 +72,19 @@ internal static void SetActivePostalCodeSet(string name) internal static void Load() { + if (!Directory.Exists(PostalXmlPath)) + { + Game.DisplaySubtitle("~b~[CDF]~s~ Could ~r~not~s~ load any postal codes."); + return; + } + foreach (string filename in Directory.GetFiles(PostalXmlPath).Where(x => x.EndsWith(".xml"))) { + if (!File.Exists(filename)) { + LogWarn($"Postal code file {filename} does not exist."); + continue; + } + PostalCodeSet postalCodeSet = PostalCodeSet.FromXML(filename); if (postalCodeSet != null) { diff --git a/CommonDataFramework/Modules/VehicleDatabase/VehicleData.cs b/CommonDataFramework/Modules/VehicleDatabase/VehicleData.cs index d6e8482..ec964c7 100644 --- a/CommonDataFramework/Modules/VehicleDatabase/VehicleData.cs +++ b/CommonDataFramework/Modules/VehicleDatabase/VehicleData.cs @@ -209,9 +209,10 @@ internal VehicleData(Vehicle vehicle) PrimaryColorSpecific = NativeFunction.Natives.xB45085B721EFD38C(Holder, false); // GET_VEHICLE_MOD_COLOR_1_NAME SecondaryColorSpecific = NativeFunction.Natives.x4967A516ED23A5A1(Holder); // GET_VEHICLE_MOD_COLOR_2_NAME - var make = Game.GetLocalizedString(NativeFunction.Natives.xF7AF4F159FF99F97(Holder.Model.Hash)); // GET_MAKE_NAME_FROM_VEHICLE_MODEL + string make = Game.GetLocalizedString(NativeFunction.Natives.xF7AF4F159FF99F97(Holder.Model.Hash)); // GET_MAKE_NAME_FROM_VEHICLE_MODEL Make = make ?? "Unknown"; - var model = Game.GetLocalizedString(NativeFunction.Natives.xB215AAC32D25D019(Holder.Model.Hash)); // GET_DISPLAY_NAME_FROM_VEHICLE_MODEL + + string model = Game.GetLocalizedString(NativeFunction.Natives.xB215AAC32D25D019(Holder.Model.Hash)); // GET_DISPLAY_NAME_FROM_VEHICLE_MODEL Model = model ?? "Unknown"; VehicleDataController.Database.Add(vehicle, this); @@ -341,9 +342,10 @@ private static EVehicleOwnerType GetSuitableOwnerType(Vehicle vehicle) { EVehicleOwnerType.Driver when vehicle.Driver == null => EVehicleOwnerType.RandomPed, EVehicleOwnerType.FamilyMember when vehicle.Driver == null => EVehicleOwnerType.RandomPed, - EVehicleOwnerType.Passenger when vehicle.Passengers.Length == 0 => GetRandomOwnerType() == EVehicleOwnerType.Driver - ? EVehicleOwnerType.Driver - : EVehicleOwnerType.RandomPed, + EVehicleOwnerType.Passenger when vehicle.Passengers.Length == 0 => + vehicle.Driver != null + ? EVehicleOwnerType.Driver + : EVehicleOwnerType.RandomPed, _ => ownerType }; } @@ -400,11 +402,11 @@ internal static void ResetWeights() private static string GetColorName(Color color) { - var h = color.GetHue(); - var s = color.GetSaturation(); - var b = color.GetBrightness(); + float h = color.GetHue(); + float s = color.GetSaturation(); + float b = color.GetBrightness(); - foreach (var (condition, name) in Colors) + foreach ((Func condition, string name) in Colors) { if (condition(h, s, b)) return name; diff --git a/CommonDataFramework/Properties/AssemblyInfo.cs b/CommonDataFramework/Properties/AssemblyInfo.cs index 55738dd..9de4b23 100644 --- a/CommonDataFramework/Properties/AssemblyInfo.cs +++ b/CommonDataFramework/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("CommonDataFramework")] -[assembly: AssemblyCopyright("Copyright © 2024")] +[assembly: AssemblyCopyright("Copyright © 2026 Policing Redefined Team")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.8")] -[assembly: AssemblyFileVersion("1.0.0.8")] +[assembly: AssemblyVersion("1.0.0.10")] +[assembly: AssemblyFileVersion("1.0.0.10")]