Skip to content

Commit

Permalink
Merge pull request #104 from ChrisAdderley/dev
Browse files Browse the repository at this point in the history
Release 1.5.3
  • Loading branch information
ChrisAdderley committed Oct 30, 2020
2 parents 0183292 + bc50b0a commit 6f652a6
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .mod_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ dependencies: # Configure dependencies
version: 2.17.0
location: s3
CommunityResourcePack:
version: 1.3.0
version: 1.4.1
location: s3
DynamicBatteryStorage:
tag: 2.1.7
tag: 2.1.10
location: github
repository: ChrisAdderley/DynamicBatteryStorage
deploy:
Expand Down
Binary file modified GameData/CryoTanks/Plugins/SimpleBoiloff.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion GameData/CryoTanks/Versioning/CryoTanks.version
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
"MAJOR":1,
"MINOR":5,
"PATCH":2,
"PATCH":3,
"BUILD":0
},
"KSP_VERSION":
Expand Down
11 changes: 8 additions & 3 deletions Source/ModuleSimpleBoiloff.cs
Original file line number Diff line number Diff line change
Expand Up @@ -386,9 +386,9 @@ public void DoCatchup()
double maxAmount = 0d;
vessel.GetConnectedResourceTotals(PartResourceLibrary.Instance.GetDefinition("ElectricCharge").id, out currentEC, out maxAmount);
// no consumption here anymore, since we know, that there won't be enough EC
if((currentEC - minResToLeave) < (finalCoolingCost * TimeWarp.fixedDeltaTime))
if(!CoolingEnabled || (CoolingEnabled && (currentEC - minResToLeave) < (finalCoolingCost * TimeWarp.fixedDeltaTime)))
{
double elapsedTime = part.vessel.missionTime - LastUpdateTime;
double elapsedTime = Planetarium.GetUniversalTime() - LastUpdateTime;
for (int i = 0; i < fuels.Count ; i++)
fuels[i].Boiloff(elapsedTime, 1.0);
}
Expand Down Expand Up @@ -511,7 +511,7 @@ protected void FixedUpdate()
}
if (part.vessel.missionTime > 0.0)
{
LastUpdateTime = part.vessel.missionTime;

}
}
if (HighLogic.LoadedSceneIsFlight && DebugMode)
Expand Down Expand Up @@ -579,6 +579,11 @@ public double SetBoiloffState(bool state)
}
return 0d;
}
public override void OnSave(ConfigNode node)
{
LastUpdateTime = Planetarium.GetUniversalTime();
base.OnSave(node);
}

public void ConsumeCharge()
{
Expand Down
Binary file modified Source/obj/Debug/SimpleBoiloff.dll
Binary file not shown.
6 changes: 6 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
v1.5.3
------
- Updated DynamicBatteryStorage to 2.1.10
- Updated CRP to 1.4.1
- Fixed a bug with resource catchup

v1.5.2
------
- Marked for KSP 1.10.x
Expand Down
6 changes: 3 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
=================
Cryo Tanks v1.5.2
Cryo Tanks v1.5.3
=================

A mod pack for Kerbal Space Program, specifically supporting my other mods Kerbal Atomics (https://github.com/ChrisAdderley/KerbalAtomics) and Cryogenic Engines (https://github.com/ChrisAdderley/CryoEngines), dealing with cryogenic fuels, their storage and their properties.
Expand All @@ -21,9 +21,9 @@ DEPENDENCIES

Required:
- B9PartSwitch (2.17.0)
- Community Resource Pack (1.3.0)
- Community Resource Pack (1.4.1)
- ModuleManager (4.1.4)
- DynamicBatteryStorage (2.1.7)
- DynamicBatteryStorage (2.1.10)

Optional
- Community Tech Tree (v2.2+)
Expand Down

0 comments on commit 6f652a6

Please sign in to comment.