adjusting CarIdsInRect -> CarIdsInRadius

Assembly.version

@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <MajorVersion>1</MajorVersion>
+    <MinorVersion>2</MinorVersion>
+    <PatchVersion>2</PatchVersion>
+  </PropertyGroup>
+</Project>

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>

Directory.Build.targets

@@ -13,7 +13,7 @@
   <PropertyGroup Condition="'$(AssemblyVersion)' == '' OR '$(MajorVersion)' != '' OR '$(MinorVersion)' != ''">
     <MajorVersion Condition="'$(MajorVersion)' == ''">1</MajorVersion>
     <MinorVersion Condition="'$(MinorVersion)' == ''">1</MinorVersion>
-    <PatchVersion Condition="'$(PatchVersion)' == ''">0</PatchVersion>
+    <PatchVersion Condition="'$(PatchVersion)' == ''">1</PatchVersion>
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</AssemblyVersion>
     <FileVersion>$(AssemblyVersion)</FileVersion>
     <ProductVersion>$(AssemblyVersion)</ProductVersion>
@@ -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 -->

Paths.user.example

@@ -0,0 +1,6 @@
+<Project>
+  <PropertyGroup>
+    <!-- Directory that the game (Railroader.exe) is in -->
+    <GameDir></GameDir>
+  </PropertyGroup>
+</Project>

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

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;

TweaksAndThings/Definition.json

@@ -5,10 +5,17 @@
   "version": "$(AssemblyVersion)",
   "requires": [
     {
-      "id": "railloader",
-      "notBefore": "1.8.1"
+      "id": "railroader",
+      "notBefore": "2024.6"
     },
-    "Zamu.StrangeCustoms"
+    {
+      "id": "railloader",
+      "notBefore": "1.9.6.14"
+    },
+    {
+      "id": "Zamu.StrangeCustoms",
+      "notBefore": "1.10.25017.313"
+    }
   ],
   "assemblies": [ "RMROC451.TweaksAndThings" ],
   "mixintos": {

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;
@@ -109,8 +109,7 @@ public static class Car_Extensions
     {
         Vector3 position = car.GetMotionSnapshot().Position;
         Vector3 center = WorldTransformer.WorldToGame(position);
-        Rect rect = new Rect(new Vector2(center.x - 30f, center.z - 30f), Vector2.one * 30f * 2f);
-        var cars = tc.CarIdsInRect(rect);
+        var cars = tc.CarIdsInRadius(center, 60f);
         Log.Information($"{nameof(HuntingForCabeeseNearCar)} => {cars.Count()}");
         List<(string carId, float distance)> source =
             cars

TweaksAndThings/Patches/CarInspector_PopulateCarPanel_Patch.cs

@@ -44,10 +44,10 @@ internal class CarInspector_PopulateCarPanel_Patch
         bool buttonsHaveCost = tweaksAndThings.EndGearHelpersRequirePayment();
 
         var consist = __instance._car.EnumerateCoupled();
-        builder = AddCarConsistRebuildObservers(builder, consist);
 
         builder.HStack(delegate (UIPanelBuilder hstack)
         {
+            hstack = AddCarConsistRebuildObservers(hstack, consist);
             var buttonName = $"{(consist.Any(c => c.HandbrakeApplied()) ? "Release " : "Set ")} {TextSprites.HandbrakeWheel}";
             hstack.AddButtonCompact(buttonName, delegate
             {
@@ -122,7 +122,7 @@ internal class CarInspector_PopulateCarPanel_Patch
                 {
                     try
                     {
-                        builder.RebuildOnInterval(.01f);
+                        builder.Rebuild();
                         if (car.TagCallout != null) tagController.UpdateTags(CameraSelector.shared._currentCamera.GroundPosition, true);
                         if (ContextMenu.IsShown && ContextMenu.Shared.centerLabel.text == car.DisplayName) CarPickable.HandleShowContextMenu(car);
                     }

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;

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;

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;