From 088f76ca80dfc965870a161fb9707e78cdfe2099 Mon Sep 17 00:00:00 2001 From: ChrisAdderley Date: Sun, 20 Jul 2025 10:10:56 -0700 Subject: [PATCH 1/2] Prepare 2.3.7 --- .../DynamicBatteryStorage/DynamicBatteryStorageSettings.cfg | 2 +- .../Versioning/DynamicBatteryStorage.version | 2 +- changelog.txt | 4 ++++ readme.txt | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/GameData/DynamicBatteryStorage/DynamicBatteryStorageSettings.cfg b/GameData/DynamicBatteryStorage/DynamicBatteryStorageSettings.cfg index 0cf0465..522361a 100644 --- a/GameData/DynamicBatteryStorage/DynamicBatteryStorageSettings.cfg +++ b/GameData/DynamicBatteryStorage/DynamicBatteryStorageSettings.cfg @@ -946,7 +946,7 @@ DYNAMICBATTERYSTORAGE // Field to poll in editor editorFieldName = CurrentElectricalGeneration // Field to poll in flight - flightFieldName = MaximumElectricalGeneration + flightFieldName = MaxElectricalGeneration // Multiply the output by these if you need to. Convention is that a consumer is negative. editorValueScalar = 1.0 flightValueScalar = 1.0 diff --git a/GameData/DynamicBatteryStorage/Versioning/DynamicBatteryStorage.version b/GameData/DynamicBatteryStorage/Versioning/DynamicBatteryStorage.version index 51f91b4..085a382 100644 --- a/GameData/DynamicBatteryStorage/Versioning/DynamicBatteryStorage.version +++ b/GameData/DynamicBatteryStorage/Versioning/DynamicBatteryStorage.version @@ -6,7 +6,7 @@ { "MAJOR":2, "MINOR":3, - "PATCH":6, + "PATCH":7, "BUILD":0 }, "KSP_VERSION": diff --git a/changelog.txt b/changelog.txt index c46ca3a..d48f911 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +v2.3.7 +------ +- Fixed a config issue that stopped fission reactors being measured in flight + v2.3.6 ------ - Changed how fission reactors are measured in-flight so they don't result in miscalculation of vessel generation (requires latest SH version) diff --git a/readme.txt b/readme.txt index 18df0e6..967f99b 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ ============================== -Dynamic Battery Storage v2.3.6 +Dynamic Battery Storage v2.3.7 ============================== A small utility mod for Kerbal Space Program, intended to support my other projects. Effectively required by Near Future Electrical, CryoEngines, KerballAtomics and CryoTanks. From 5d5fba5642f08e8036cc494debca33e8337619fd Mon Sep 17 00:00:00 2001 From: ChrisAdderley Date: Mon, 21 Jul 2025 07:37:17 -0700 Subject: [PATCH 2/2] Improvements and fixes --- .../Plugins/DynamicBatteryStorage.dll | Bin 97792 -> 98304 bytes .../UI/SystemsMonitorUI.cs | 4 +- .../UI/ToolbarAdvanced.cs | 43 +++++++++++++++++- .../DynamicBatteryStorage/UI/ToolbarPower.cs | 10 +++- .../UI/ToolbarSituation.cs | 2 +- changelog.txt | 5 ++ 6 files changed, 57 insertions(+), 7 deletions(-) diff --git a/GameData/DynamicBatteryStorage/Plugins/DynamicBatteryStorage.dll b/GameData/DynamicBatteryStorage/Plugins/DynamicBatteryStorage.dll index 6b81b778576e047cd44a4bdd0b9ef2374812bc99..52c5160031c725a79a7df0652ffd448f7b9eb95b 100644 GIT binary patch delta 24914 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 Ql0EyFbE)`IRHgg 0) + { + batteryText.text = String.Format("{0:F0} / {1:F0} ({2:F1}%)", EC, maxEC, EC / maxEC * 100d); + } + else + { + batteryText.text = "-"; + } if (EC <= 0.001) { batteryText.color = colorBadText; diff --git a/Source/DynamicBatteryStorage/UI/ToolbarSituation.cs b/Source/DynamicBatteryStorage/UI/ToolbarSituation.cs index 070b638..98d5c79 100644 --- a/Source/DynamicBatteryStorage/UI/ToolbarSituation.cs +++ b/Source/DynamicBatteryStorage/UI/ToolbarSituation.cs @@ -298,7 +298,7 @@ protected double CalculateOcclusionTime(CelestialBody body, double bodyOrbitHeig { if (bodyOrbitHeight == 0d) { - return body.rotationPeriod; + return body.rotationPeriod /2d; } else diff --git a/changelog.txt b/changelog.txt index d48f911..c1999ff 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,11 @@ v2.3.7 ------ - Fixed a config issue that stopped fission reactors being measured in flight +- Added input locking to the advanced generation/consumption text fields +- Added input validation to the advanced generation/consumption text fields +- Fixed NaN displayed when vessel maximum power is 0 +- Fixed missing divide by two in dark time calculation at the surface of bodies +- SM window will now disable itself when Kerbalism is enabled as well as the rest of the mod v2.3.6 ------