From 13250057dc6c1c975ac21bdf93d58b1ee4b9a7b6 Mon Sep 17 00:00:00 2001 From: Xevion Date: Wed, 8 May 2024 23:24:08 -0500 Subject: [PATCH 1/5] minor: fix assembly metadata spacing --- Source/HydroponicsExpanded/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/HydroponicsExpanded/Properties/AssemblyInfo.cs b/Source/HydroponicsExpanded/Properties/AssemblyInfo.cs index 3f0d8b5..fcd851b 100644 --- a/Source/HydroponicsExpanded/Properties/AssemblyInfo.cs +++ b/Source/HydroponicsExpanded/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("HydroponicsExpanded")] -[assembly: AssemblyCopyright("Copyright © 2023")] +[assembly: AssemblyCopyright("Copyright © 2023")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] From 26565b05dc86da8c0c3073a21a3a2ea070b8f78e Mon Sep 17 00:00:00 2001 From: Xevion Date: Wed, 8 May 2024 23:26:41 -0500 Subject: [PATCH 2/5] minor: remove commented unused code --- .../Buildings/Building_DenseHydroponicsBasin.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs b/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs index e8e23e1..8e74d02 100644 --- a/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs +++ b/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs @@ -130,8 +130,6 @@ namespace HydroponicsExpanded { } private void HarvestTick() { - // var plantsLeft = _innerContainer.Count; - // var potentialCellCount = this.OccupiedRect().Area; // Try to place every plant in the container in any cell. foreach (Thing nextInnerThing in _innerContainer) { From f80d87dc6d554eb27fddfb48d32b8b063dcb6e94 Mon Sep 17 00:00:00 2001 From: Xevion Date: Wed, 8 May 2024 23:27:42 -0500 Subject: [PATCH 3/5] feat: resting indicator in inspect string, common IsResting func --- Languages/English/Keyed/HighDensityHydro.xml | 1 + .../Buildings/Building_DenseHydroponicsBasin.cs | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Languages/English/Keyed/HighDensityHydro.xml b/Languages/English/Keyed/HighDensityHydro.xml index 7cc4073..1e2f22d 100644 --- a/Languages/English/Keyed/HighDensityHydro.xml +++ b/Languages/English/Keyed/HighDensityHydro.xml @@ -6,4 +6,5 @@ Waiting for all plants to be harvested. Occupied Plant Bays Growth + resting \ No newline at end of file diff --git a/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs b/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs index 8e74d02..6e90b96 100644 --- a/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs +++ b/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs @@ -114,8 +114,7 @@ namespace HydroponicsExpanded { } // Temperature & time of day check. - float temperature = Position.GetTemperature(Map); - if (temperature.Between(10f, 42f) && GenLocalDate.DayPercent(this).Between(0.25f, 0.8f)) { + if (IsResting()) { float growthAmount = 1f / (60_000f * growthTrackingPlant.def.plant.growDays) * 250f; // Debug gizmo can set growth to 100%, thus Math.min check here. @@ -129,8 +128,16 @@ namespace HydroponicsExpanded { Stage = HydroponicsStage.Harvest; } - private void HarvestTick() { + /// + /// Determines whether the hydroponics basin is in a resting state. + /// + /// true if the hydroponics basin is in a resting state; otherwise, false. + private bool IsResting() { + float temperature = Position.GetTemperature(Map); + return temperature.Between(10f, 42f) && GenLocalDate.DayPercent(this).Between(0.25f, 0.8f); + } + private void HarvestTick() { // Try to place every plant in the container in any cell. foreach (Thing nextInnerThing in _innerContainer) { var nextPlant = (Plant)nextInnerThing; @@ -289,6 +296,10 @@ namespace HydroponicsExpanded { if (_innerContainer.Count > 0) { inspectString += "\n"; inspectString += "HydroponicsExpanded.Growth".Translate() + $": {_highestGrowth * 100f:#0}%"; + + if (IsResting()) { + inspectString += " (" + "HydroponicsExpanded.Resting".Translate() + ")"; + } } return inspectString; From 9b13326fb7c20bd35548b61abbb6a95fb48ca63d Mon Sep 17 00:00:00 2001 From: Xevion Date: Wed, 8 May 2024 23:31:37 -0500 Subject: [PATCH 4/5] fix: IsResting inverted --- .../Buildings/Building_DenseHydroponicsBasin.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs b/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs index 6e90b96..e18d2e4 100644 --- a/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs +++ b/Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs @@ -114,7 +114,7 @@ namespace HydroponicsExpanded { } // Temperature & time of day check. - if (IsResting()) { + if (IsResting() == false) { float growthAmount = 1f / (60_000f * growthTrackingPlant.def.plant.growDays) * 250f; // Debug gizmo can set growth to 100%, thus Math.min check here. @@ -134,7 +134,7 @@ namespace HydroponicsExpanded { /// true if the hydroponics basin is in a resting state; otherwise, false. private bool IsResting() { float temperature = Position.GetTemperature(Map); - return temperature.Between(10f, 42f) && GenLocalDate.DayPercent(this).Between(0.25f, 0.8f); + return !(temperature.Between(10f, 42f) && GenLocalDate.DayPercent(this).Between(0.25f, 0.8f)); } private void HarvestTick() { From 55b6feee4b59b35571573ad48ac003b12ab5dde3 Mon Sep 17 00:00:00 2001 From: Xevion Date: Wed, 8 May 2024 23:36:12 -0500 Subject: [PATCH 5/5] minor: update mod version to 0.2.3 --- About/About.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/About/About.xml b/About/About.xml index 0945b3d..38fb067 100644 --- a/About/About.xml +++ b/About/About.xml @@ -7,6 +7,6 @@
  • 1.5
    •  - 0.2.2 + 0.2.3 https://github.com/Xevion/RimWorld-Hydroponics-Expanded \ No newline at end of file