From 7ebd14db2adf4cd933eb859462b20b9481e01c40 Mon Sep 17 00:00:00 2001
From: RMROC451 <rmroc451@gmail.com>
Date: Tue, 24 Dec 2024 22:11:22 -0600
Subject: [PATCH] adjusting railroader usage of namespace Model.OpsNew ->
 Model.Ops and some adjustments to the version files.

---
 Assembly.version                                           | 7 +++++++
 Directory.Build.props                                      | 1 +
 Directory.Build.targets                                    | 2 +-
 Paths.user.example                                         | 6 ++++++
 TweaksAndThings.sln                                        | 1 +
 TweaksAndThings/Commands/CrewUpdateCommand.cs              | 2 +-
 TweaksAndThings/Definition.json                            | 7 +++++--
 TweaksAndThings/Extensions/Car_Extensions.cs               | 2 +-
 TweaksAndThings/Patches/EngineRosterRow_Refresh_Patch.cs   | 2 +-
 .../OpsController_AnnounceCoalescedPayments_Patch.cs       | 2 +-
 TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs   | 2 +-
 11 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 Assembly.version
 create mode 100644 Paths.user.example

diff --git a/Assembly.version b/Assembly.version
new file mode 100644
index 0000000..889103d
--- /dev/null
+++ b/Assembly.version
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <MajorVersion>1</MajorVersion>
+    <MinorVersion>2</MinorVersion>
+    <PatchVersion>1</PatchVersion>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Directory.Build.props b/Directory.Build.props
index fe5e246..1d15827 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project>
   <Import Project="Paths.user" Condition="Exists('Paths.user')" />
+  <Import Project="Assembly.version" Condition="Exists('Assembly.version')" />
   <PropertyGroup>
     <TargetFramework>net48</TargetFramework>
     <LangVersion>latest</LangVersion>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 920a7a7..c6e889f 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -39,7 +39,7 @@
 
       <!-- Folder we'll put the published zips into -->
       <PublishPath>../bin</PublishPath>
-      <ZipName>$(PublishPath)/$(AssemblyName)_$(AssemblyVersion).zip</ZipName>
+      <ZipName>$(PublishPath)/$(AssemblyName)_$(AssemblyVersion)_Experimental.zip</ZipName>
     </PropertyGroup>
 
     <!-- Assure the output path exists -->
diff --git a/Paths.user.example b/Paths.user.example
new file mode 100644
index 0000000..f5786ad
--- /dev/null
+++ b/Paths.user.example
@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <!-- Directory that the game (Railroader.exe) is in -->
+    <GameDir></GameDir>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/TweaksAndThings.sln b/TweaksAndThings.sln
index da34e15..b4b596c 100644
--- a/TweaksAndThings.sln
+++ b/TweaksAndThings.sln
@@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{452A23A6-81C8-49C6-A7EE-95FD9377F896}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
+		Assembly.version = Assembly.version
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Paths.user = Paths.user
diff --git a/TweaksAndThings/Commands/CrewUpdateCommand.cs b/TweaksAndThings/Commands/CrewUpdateCommand.cs
index d204df2..b24bd0b 100644
--- a/TweaksAndThings/Commands/CrewUpdateCommand.cs
+++ b/TweaksAndThings/Commands/CrewUpdateCommand.cs
@@ -1,6 +1,6 @@
 using Game.State;
 using Helpers;
-using Model.OpsNew;
+using Model.Ops;
 using Network;
 using RMROC451.TweaksAndThings.Extensions;
 using System.Linq;
diff --git a/TweaksAndThings/Definition.json b/TweaksAndThings/Definition.json
index 5d66ba7..a633033 100644
--- a/TweaksAndThings/Definition.json
+++ b/TweaksAndThings/Definition.json
@@ -6,9 +6,12 @@
   "requires": [
     {
       "id": "railloader",
-      "notBefore": "1.8.1"
+      "notBefore": "1.9.6.8"
     },
-    "Zamu.StrangeCustoms"
+    {
+      "id": "Zamu.StrangeCustoms",
+      "notBefore": "1.10.24358.413"
+    }
   ],
   "assemblies": [ "RMROC451.TweaksAndThings" ],
   "mixintos": {
diff --git a/TweaksAndThings/Extensions/Car_Extensions.cs b/TweaksAndThings/Extensions/Car_Extensions.cs
index 5e70ad7..009bc87 100644
--- a/TweaksAndThings/Extensions/Car_Extensions.cs
+++ b/TweaksAndThings/Extensions/Car_Extensions.cs
@@ -3,7 +3,7 @@ using Game.State;
 using Helpers;
 using Model;
 using Model.Definition.Data;
-using Model.OpsNew;
+using Model.Ops;
 using Serilog;
 using System;
 using System.Collections.Generic;
diff --git a/TweaksAndThings/Patches/EngineRosterRow_Refresh_Patch.cs b/TweaksAndThings/Patches/EngineRosterRow_Refresh_Patch.cs
index 4b14fb2..7eacd0b 100644
--- a/TweaksAndThings/Patches/EngineRosterRow_Refresh_Patch.cs
+++ b/TweaksAndThings/Patches/EngineRosterRow_Refresh_Patch.cs
@@ -1,7 +1,7 @@
 using HarmonyLib;
 using Model;
 using Model.Definition.Data;
-using Model.OpsNew;
+using Model.Ops;
 using Railloader;
 using RMROC451.TweaksAndThings.Extensions;
 using Serilog;
diff --git a/TweaksAndThings/Patches/OpsController_AnnounceCoalescedPayments_Patch.cs b/TweaksAndThings/Patches/OpsController_AnnounceCoalescedPayments_Patch.cs
index 19a22cc..1784d61 100644
--- a/TweaksAndThings/Patches/OpsController_AnnounceCoalescedPayments_Patch.cs
+++ b/TweaksAndThings/Patches/OpsController_AnnounceCoalescedPayments_Patch.cs
@@ -4,7 +4,7 @@ using HarmonyLib;
 using Model;
 using Model.Definition.Data;
 using Model.Ops.Definition;
-using Model.OpsNew;
+using Model.Ops;
 using Network;
 using Railloader;
 using RMROC451.TweaksAndThings.Extensions;
diff --git a/TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs b/TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs
index 5fda423..09d4e40 100644
--- a/TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs
+++ b/TweaksAndThings/Patches/TagController_UpdateTag_Patch.cs
@@ -1,6 +1,6 @@
 using HarmonyLib;
 using Model;
-using Model.OpsNew;
+using Model.Ops;
 using Railloader;
 using RMROC451.TweaksAndThings.Extensions;
 using System.Collections.Generic;