Skip to content

1.0.0.10 patch #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AstroBurgers wants to merge 8 commits into
base: main
Choose a base branch
from
Open

1.0.0.10 patch #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c836845
Update version to 1.0.0.6 and add file existence check in PostalCodeC…
AstroBurgers Jun 8, 2026
15b2927
bump assembly version
AstroBurgers Jun 8, 2026
53b10ad
change assembly version to 1.0.0.9
AstroBurgers Jun 8, 2026
2b06048
assembly info might be the death of me
AstroBurgers Jun 8, 2026
b7050f6
Add README.md to nuspec files for documentation
AstroBurgers Jun 8, 2026
fb0db19
Fix README.md path in nuspec and add directory check in PostalCodeCon…
AstroBurgers Jun 8, 2026
738d860
bump assembly version to 1.0.0.10
AstroBurgers Jun 8, 2026
2704c3d
update VehicleData.cs
AstroBurgers Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CommonDataFramework/CommonDataFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CommonDataFramework</RootNamespace>
<AssemblyName>CommonDataFramework</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<LangVersion>preview</LangVersion>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions CommonDataFramework/CommonDataFramework.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>CommonDataFramework</id>
<version>1.0.0.5</version>
<version>1.0.0.9</version>
<authors>Policing Redefined Team</authors>
<owners>MarcelWRLD</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -18,7 +18,7 @@
</metadata>
<files>
<file src="bin\Release\CommonDataFramework.dll" target="lib\net48\" />
<file src="bin\Release\CommonDataFramework.xml" target="lib\net48\" /> <!-- optional: XML
docs -->
<file src="bin\Release\CommonDataFramework.xml" target="lib\net48\" /> <!-- optional: XML docs -->
<file src="..\README.md" target="docs\" />
</files>
</package>
11 changes: 11 additions & 0 deletions CommonDataFramework/Modules/Postals/PostalCodeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
20 changes: 11 additions & 9 deletions CommonDataFramework/Modules/VehicleDatabase/VehicleData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,10 @@ internal VehicleData(Vehicle vehicle)
PrimaryColorSpecific = NativeFunction.Natives.xB45085B721EFD38C<string>(Holder, false); // GET_VEHICLE_MOD_COLOR_1_NAME
SecondaryColorSpecific = NativeFunction.Natives.x4967A516ED23A5A1<string>(Holder); // GET_VEHICLE_MOD_COLOR_2_NAME

var make = Game.GetLocalizedString(NativeFunction.Natives.xF7AF4F159FF99F97<string>(Holder.Model.Hash)); // GET_MAKE_NAME_FROM_VEHICLE_MODEL
string make = Game.GetLocalizedString(NativeFunction.Natives.xF7AF4F159FF99F97<string>(Holder.Model.Hash)); // GET_MAKE_NAME_FROM_VEHICLE_MODEL
Make = make ?? "Unknown";
var model = Game.GetLocalizedString(NativeFunction.Natives.xB215AAC32D25D019<string>(Holder.Model.Hash)); // GET_DISPLAY_NAME_FROM_VEHICLE_MODEL

string model = Game.GetLocalizedString(NativeFunction.Natives.xB215AAC32D25D019<string>(Holder.Model.Hash)); // GET_DISPLAY_NAME_FROM_VEHICLE_MODEL
Model = model ?? "Unknown";

VehicleDataController.Database.Add(vehicle, this);
Expand Down Expand Up @@ -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
};
}
Expand Down Expand Up @@ -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<float, float, float, bool> condition, string name) in Colors)
{
if (condition(h, s, b))
return name;
Expand Down
6 changes: 3 additions & 3 deletions CommonDataFramework/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]

Expand All @@ -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")]