xevion/RimWorld-Hydroponics-Expanded
1
0
Fork 0
mirror of https://github.com/Xevion/RimWorld-Hydroponics-Expanded.git synced 2025-12-07 16:08:24 -06:00
Code Issues Packages Projects Releases 5 Wiki Activity

Prevent growth overflow, add .Between(min, max) extension methods to simplify time/temp checks

Browse Source
This commit is contained in:
Xevion
2023-07-16 01:36:46 -05:00
parent 06957a26d9
commit 96267e251c
3 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/HydroponicsExpanded/Buildings/Building_DenseHydroponicsBasin.cs
View File

@@ -88,20 +88,27 @@ namespace HydroponicsExpanded {
// Despite the name, this is just a power check. We don't want to grow the plants if there is no power.
if (!base.CanAcceptSowNow()) return;
// Temperature & time of day check.
float temperature = Position.GetTemperature(Map);
if (!(temperature > 10f) || !(temperature < 42f) ||
!(GenLocalDate.DayPercent(this) > 0.25f) || !(GenLocalDate.DayPercent(this) < 0.8f)) return;
// The first plant in the container is the 'tracked' plant.
var growthTrackingPlant = _innerContainer[0] as Plant;
// This set/type check is for preventing NPE warnings. The previous .Count check implicitly makes this impossible, but the compiler doesn't know that.
if (!(_innerContainer[0] is Plant growthTrackingPlant)) {
Log.Message(
$"Unexpected thing in BuildingDenseHydroponicsBasin.innerContainer ({_innerContainer.GetType()})");
return;
}
// ReSharper disable once PossibleNullReferenceException
float growthAmount = 1f / (60_000f * growthTrackingPlant.def.plant.growDays) * 250f;
growthTrackingPlant.Growth += def.fertility * growthAmount;
_highestGrowth = growthTrackingPlant.Growth;
// Temperature & time of day check.
float temperature = Position.GetTemperature(Map);
if (temperature.Between(10f, 42f) && GenLocalDate.DayPercent(this).Between(0.25f, 0.8f)) {
float growthAmount = 1f / (60_000f * growthTrackingPlant.def.plant.growDays) * 250f;
// Debug gizmo can set growth to 100%, thus Math.min check here.
growthTrackingPlant.Growth = Math.Min(1f, def.fertility * growthAmount);
_highestGrowth = growthTrackingPlant.Growth;
}
// When growth is complete, move to the harvesting stage.
// This is ran even if growing is not available as debug gizmo can push growth to 'mature' stage outside normal growing times.
if (growthTrackingPlant.LifeStage == PlantLifeStage.Mature)
Stage = HydroponicsStage.Harvest;
}