Compare commits

...

2 Commits

12 changed files with 29 additions and 11 deletions

7
Assembly.version Normal file
View File

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

View File

@@ -1,5 +1,6 @@
<Project> <Project>
<Import Project="Paths.user" Condition="Exists('Paths.user')" /> <Import Project="Paths.user" Condition="Exists('Paths.user')" />
<Import Project="Assembly.version" Condition="Exists('Assembly.version')" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net48</TargetFramework> <TargetFramework>net48</TargetFramework>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>

View File

@@ -13,7 +13,7 @@
<PropertyGroup Condition="'$(AssemblyVersion)' == '' OR '$(MajorVersion)' != '' OR '$(MinorVersion)' != ''"> <PropertyGroup Condition="'$(AssemblyVersion)' == '' OR '$(MajorVersion)' != '' OR '$(MinorVersion)' != ''">
<MajorVersion Condition="'$(MajorVersion)' == ''">1</MajorVersion> <MajorVersion Condition="'$(MajorVersion)' == ''">1</MajorVersion>
<MinorVersion Condition="'$(MinorVersion)' == ''">1</MinorVersion> <MinorVersion Condition="'$(MinorVersion)' == ''">1</MinorVersion>
<PatchVersion Condition="'$(PatchVersion)' == ''">0</PatchVersion> <PatchVersion Condition="'$(PatchVersion)' == ''">1</PatchVersion>
<AssemblyVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</AssemblyVersion> <AssemblyVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</AssemblyVersion>
<FileVersion>$(AssemblyVersion)</FileVersion> <FileVersion>$(AssemblyVersion)</FileVersion>
<ProductVersion>$(AssemblyVersion)</ProductVersion> <ProductVersion>$(AssemblyVersion)</ProductVersion>
@@ -39,7 +39,7 @@
<!-- Folder we'll put the published zips into --> <!-- Folder we'll put the published zips into -->
<PublishPath>../bin</PublishPath> <PublishPath>../bin</PublishPath>
<ZipName>$(PublishPath)/$(AssemblyName)_$(AssemblyVersion).zip</ZipName> <ZipName>$(PublishPath)/$(AssemblyName)_$(AssemblyVersion)_Experimental.zip</ZipName>
</PropertyGroup> </PropertyGroup>
<!-- Assure the output path exists --> <!-- Assure the output path exists -->

6
Paths.user.example Normal file
View File

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

View File

@@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{452A23A6-81C8-49C6-A7EE-95FD9377F896}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{452A23A6-81C8-49C6-A7EE-95FD9377F896}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore .gitignore = .gitignore
Assembly.version = Assembly.version
Directory.Build.props = Directory.Build.props Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets Directory.Build.targets = Directory.Build.targets
Paths.user = Paths.user Paths.user = Paths.user

View File

@@ -1,6 +1,6 @@
using Game.State; using Game.State;
using Helpers; using Helpers;
using Model.OpsNew; using Model.Ops;
using Network; using Network;
using RMROC451.TweaksAndThings.Extensions; using RMROC451.TweaksAndThings.Extensions;
using System.Linq; using System.Linq;

View File

@@ -6,9 +6,12 @@
"requires": [ "requires": [
{ {
"id": "railloader", "id": "railloader",
"notBefore": "1.8.1" "notBefore": "1.9.6.8"
}, },
"Zamu.StrangeCustoms" {
"id": "Zamu.StrangeCustoms",
"notBefore": "1.10.24358.413"
}
], ],
"assemblies": [ "RMROC451.TweaksAndThings" ], "assemblies": [ "RMROC451.TweaksAndThings" ],
"mixintos": { "mixintos": {

View File

@@ -3,7 +3,7 @@ using Game.State;
using Helpers; using Helpers;
using Model; using Model;
using Model.Definition.Data; using Model.Definition.Data;
using Model.OpsNew; using Model.Ops;
using Serilog; using Serilog;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;

View File

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

View File

@@ -1,7 +1,7 @@
using HarmonyLib; using HarmonyLib;
using Model; using Model;
using Model.Definition.Data; using Model.Definition.Data;
using Model.OpsNew; using Model.Ops;
using Railloader; using Railloader;
using RMROC451.TweaksAndThings.Extensions; using RMROC451.TweaksAndThings.Extensions;
using Serilog; using Serilog;

View File

@@ -4,7 +4,7 @@ using HarmonyLib;
using Model; using Model;
using Model.Definition.Data; using Model.Definition.Data;
using Model.Ops.Definition; using Model.Ops.Definition;
using Model.OpsNew; using Model.Ops;
using Network; using Network;
using Railloader; using Railloader;
using RMROC451.TweaksAndThings.Extensions; using RMROC451.TweaksAndThings.Extensions;

View File

@@ -1,6 +1,6 @@
using HarmonyLib; using HarmonyLib;
using Model; using Model;
using Model.OpsNew; using Model.Ops;
using Railloader; using Railloader;
using RMROC451.TweaksAndThings.Extensions; using RMROC451.TweaksAndThings.Extensions;
using System.Collections.Generic; using System.Collections.Generic;