Skip to content

Commit ca49e52

Browse files
Merge pull request #113 from post-kerbin-mining-corporation/dev
Minor hotfix
2 parents 0e13bc2 + 48aa303 commit ca49e52

6 files changed

Lines changed: 41 additions & 22 deletions

File tree

0 Bytes
Binary file not shown.

GameData/SystemHeat/Versioning/SystemHeat.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{
77
"MAJOR":0,
88
"MINOR":7,
9-
"PATCH":0,
9+
"PATCH":1,
1010
"BUILD":0
1111
},
1212
"KSP_VERSION":

SystemHeat/SystemHeat/Modules/BoiloffFuel.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,19 @@ public void Boiloff(double seconds, double scale)
141141
if (fuelPresent)
142142
{
143143
double toBoil = resource.amount * (1.0 - Math.Pow(1.0 - boiloffRateSeconds, seconds)) * scale;
144-
145-
double boilResult = part.RequestResource(resource.info.id, toBoil, ResourceFlowMode.NO_FLOW);
144+
double boilResult;
145+
/// If you're reading this, stop now
146+
if (!resource.flowState)
147+
{
148+
/// This handles if the flow has been disabled in the UI. we gotta ignore it, in the best way possible
149+
resource.flowState = true;
150+
boilResult = part.RequestResource(resource.info.id, toBoil, ResourceFlowMode.NO_FLOW);
151+
resource.flowState = false;
152+
}
153+
else
154+
{
155+
boilResult = part.RequestResource(resource.info.id, toBoil, ResourceFlowMode.NO_FLOW);
156+
}
146157

147158
/// Generate outputs
148159
if (outputs.Count > 0)

SystemHeat/SystemHeat/UI/ToolbarUI/ToolbarIconTag.cs

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,29 @@ public class ToolbarIconTag
1919
public ToolbarIconTag() { }
2020
public void Position(ApplicationLauncherButton button)
2121
{
22-
alertToolbarBackgroundRect.SetParent(button.toggleButton.transform, false);
23-
alertToolbarBackgroundRect.anchorMin = Vector2.zero;
24-
alertToolbarBackgroundRect.anchorMax = Vector3.one;
25-
alertToolbarBackgroundRect.pivot = Vector2.zero;
26-
alertToolbarBackgroundRect.offsetMin = new Vector2(22, 20);
27-
alertToolbarBackgroundRect.offsetMax = new Vector2(0, 0);
22+
if (button != null)
23+
{
24+
alertToolbarBackgroundRect.SetParent(button.toggleButton.transform, false);
25+
alertToolbarBackgroundRect.anchorMin = Vector2.zero;
26+
alertToolbarBackgroundRect.anchorMax = Vector3.one;
27+
alertToolbarBackgroundRect.pivot = Vector2.zero;
28+
alertToolbarBackgroundRect.offsetMin = new Vector2(22, 20);
29+
alertToolbarBackgroundRect.offsetMax = new Vector2(0, 0);
2830

29-
alertToolbarGlowRect.SetParent(alertToolbarBackgroundRect.transform, false);
30-
alertToolbarGlowRect.anchorMin = Vector2.zero;
31-
alertToolbarGlowRect.anchorMax = Vector3.one;
32-
alertToolbarGlowRect.pivot = Vector2.one * 0.5f;
33-
alertToolbarGlowRect.offsetMin = new Vector2(-5, -5);
34-
alertToolbarGlowRect.offsetMax = new Vector2(5, 5);
31+
alertToolbarGlowRect.SetParent(alertToolbarBackgroundRect.transform, false);
32+
alertToolbarGlowRect.anchorMin = Vector2.zero;
33+
alertToolbarGlowRect.anchorMax = Vector3.one;
34+
alertToolbarGlowRect.pivot = Vector2.one * 0.5f;
35+
alertToolbarGlowRect.offsetMin = new Vector2(-5, -5);
36+
alertToolbarGlowRect.offsetMax = new Vector2(5, 5);
3537

36-
alertToolbarRect.SetParent(alertToolbarBackgroundRect.transform, false);
37-
alertToolbarRect.anchorMin = Vector2.zero;
38-
alertToolbarRect.anchorMax = Vector3.one;
39-
alertToolbarRect.pivot = Vector2.zero;
40-
alertToolbarRect.offsetMin = new Vector2(0, 0);
41-
alertToolbarRect.offsetMax = new Vector2(0, 0);
38+
alertToolbarRect.SetParent(alertToolbarBackgroundRect.transform, false);
39+
alertToolbarRect.anchorMin = Vector2.zero;
40+
alertToolbarRect.anchorMax = Vector3.one;
41+
alertToolbarRect.pivot = Vector2.zero;
42+
alertToolbarRect.offsetMin = new Vector2(0, 0);
43+
alertToolbarRect.offsetMax = new Vector2(0, 0);
44+
}
4245
}
4346
public void Initialize()
4447
{

changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
v0.7.1
2+
------
3+
- Fix a null reference exception when loading a vessel with no SystemHeat parts
4+
- Fixed an issue where a player could disable a tank in the UI, thus disabling boiloff
5+
16
v0.7.0
27
------
38
- Updated ModuleManager to 4.2.3

readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
================
2-
SystemHeat 0.7.0
2+
SystemHeat 0.7.1
33
================
44

55
A mod for Kerbal Space Program, intended to provide a better experience for heat management, particularly geared towards resource extraction, high energy engines, and nuclear reactors.

0 commit comments

Comments
 (0)