Allow modded decor objects that require power (such as lamps) to have…

… positive decor even when turned off while Decor Reimagined is enabled. Also adds a missing call to PVersionCheck.
peterhaneve · Dec 1, 2021 · 4780f8d · 4780f8d
1 parent a60bd80
commit 4780f8d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/DecorReimagined/DecorReimagined.csproj b/DecorReimagined/DecorReimagined.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyTitle>Decor Reimagined</AssemblyTitle>
-    <FileVersion>4.2.0.0</FileVersion>
+    <FileVersion>4.3.0.0</FileVersion>
     <RootNamespace>ReimaginationTeam.DecorRework</RootNamespace>
     <Description>Reworks decor, making an attractive colony a better colony.</Description>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>

diff --git a/DecorReimagined/DecorReimaginedPatches.cs b/DecorReimagined/DecorReimaginedPatches.cs
@@ -19,6 +19,7 @@
 using Database;
 using HarmonyLib;
 using Klei.AI;
+using PeterHan.PLib.AVC;
 using PeterHan.PLib.Core;
 using PeterHan.PLib.Database;
 using PeterHan.PLib.Options;
@@ -96,6 +97,7 @@ public override void OnLoad(Harmony harmony) {
 			ImaginationLoader.Instance.Register(typeof(DecorReimaginedPatches));
 			new POptions().RegisterOptions(this, typeof(DecorReimaginedOptions));
 			new PPatchManager(harmony).RegisterPatchClass(typeof(DecorReimaginedPatches));
+			new PVersionCheck().Register(this, new SteamVersionChecker());
 			PatchParks();
 			PatchRecBuildings();
 		}

diff --git a/DecorReimagined/DecorSplatNew.cs b/DecorReimagined/DecorSplatNew.cs
@@ -117,18 +117,18 @@ private void AddDecor(int cell, float decor, Extents extents) {
 
 		protected override void OnCleanUp() {
 			RemoveDecor();
-			Unsubscribe((int)GameHashes.OperationalFlagChanged, OnOperationalFlagChanged);
+			Unsubscribe((int)GameHashes.FunctionalChanged, OnFunctionalChanged);
 			base.OnCleanUp();
 		}
 
-		private void OnOperationalFlagChanged(object argument) {
+		private void OnFunctionalChanged(object argument) {
 			if (gameObject != null)
 				RefreshDecor();
 		}
 
 		protected override void OnSpawn() {
 			base.OnSpawn();
-			Subscribe((int)GameHashes.OperationalFlagChanged, OnOperationalFlagChanged);
+			Subscribe((int)GameHashes.FunctionalChanged, OnFunctionalChanged);
 		}
 
 		/// <summary>
@@ -188,7 +188,7 @@ internal void RefreshDecor() {
 			var happiness = glumStatus?.attributes?.Get(DecorCellManager.Instance.
 				HappinessAttribute);
 			// Entombed/disabled = 0 decor, broken = use value in DecorTuning for broken
-			bool disabled = (operational != null && !operational.IsOperational) ||
+			bool disabled = (operational != null && !operational.IsFunctional) ||
 				(happiness != null && happiness.GetTotalValue() < 0.0f);
 			bool broken = breakStatus != null && breakStatus.IsBroken;
 			RefreshCells(broken, disabled);