From adc0cdc079b6eb42852550fb24593110c8eca25c Mon Sep 17 00:00:00 2001 From: dlrk2 Date: Tue, 30 Jun 2020 23:04:06 -0400 Subject: [PATCH 1/4] ModularFuelTanks Compatibility Fixes Adds boiloff to MFT tanks, only allows LH2 and CH2 in Cryogenic tanks and changes the tank masses to comport with RF weights instead of the negative mass trick previously used. --- .../Patches/CryoTanksModularFuelTanks.cfg | 113 ++++++++---------- 1 file changed, 49 insertions(+), 64 deletions(-) diff --git a/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg index 1ea906d..bbf1d75 100644 --- a/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg +++ b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg @@ -1,90 +1,46 @@ // CryoEngine MFT (Modular Fuel Tanks) Configuration File // by funk 09/22/2015 -//------------------------------------------------------// - -// Adds LqdHydrogen to Default tank definition -@TANK_DEFINITION[Default]:NEEDS[ModularFuelTanks&!RealFuels]:FOR[CryoTanks] -{ - TANK - { - name = LqdHydrogen - amount = 0 - maxAmount = 0 - utilization = 10 - mass = -0.0003386364 - } -} - -// Adds LqdHydrogen to Fuselage tank definition -@TANK_DEFINITION[Fuselage]:NEEDS[ModularFuelTanks&!RealFuels]:FOR[CryoTanks] -{ - TANK - { - name = LqdHydrogen - amount = 0 - maxAmount = 0 - utilization = 10 - mass = -0.0003386364 - } -} - -// Adds LqdHydrogen to Structural tank definition -@TANK_DEFINITION[Structural]:NEEDS[ModularFuelTanks&!RealFuels]:FOR[CryoTanks] -{ - TANK - { - name = LqdHydrogen - amount = 0 - maxAmount = 0 - mass = -0.0000261364 - utilization = 10 - } -} - -// Adds LqdHydrogen to ServiceModule tank definition -@TANK_DEFINITION[ServiceModule]:NEEDS[ModularFuelTanks&!RealFuels]:FOR[CryoTanks] -{ - TANK - { - name = LqdHydrogen - amount = 0 - maxAmount = 0 - utilization = 10 - mass = -0.0003386364 - } -} //------------------------------------------------------// // Adds tank definition for CryoEngines TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] { name = Cryogenic - basemass = 0.000625 * volume // if basemass is already described in part cfg. through other MFT patches, MFT won't update to basemass defined in tank definitions. Applies to most spaceplane parts. + basemass = 0.0000016 * volume // if basemass is already described in part cfg. through other MFT patches, MFT won't update to basemass defined in tank definitions. Applies to most spaceplane parts. baseCost = 0.2 * volume // weird behaviour: -x * volume -> costs = default drycosts incl. recources; x = 0.2 -> drycosts = default drycosts * ~122% TANK { name = LqdHydrogen - amount = full - maxAmount = 60% - utilization = 10 - mass = -0.0003386364 + amount = 0.0 + maxAmount = 0.0 + utilization = 1 + mass = 0.0000016 } TANK { name = Oxidizer - amount = full - maxAmount = 40% + amount = 0.0 + maxAmount = 0.0 } TANK { name = Monopropellant - amount = 0 - maxAmount = 5% + amount = 0.0 + maxAmount = 0.0 } + TANK + { + name = LqdMethane + mass = 0.0000096 + amount = 0.0 + maxAmount = 0.0 + utilization = 1 + + } } //------------------------------------------------------// -// Adds tank type Cryogenic to all default and fuselage tanks +// Adds tank type Cryogenic to all default and fuselage tanks, and boiloff/cooling to all MFT tanks @PART[*]:HAS[@MODULE[ModuleFuelTanks]]:NEEDS[!RealFuels]:FOR[zzz_CryoTanks] { @MODULE[ModuleFuelTanks]:HAS[#type[Default]] @@ -98,6 +54,16 @@ TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] %typeAvailable = Fuselage typeAvailable = Cryogenic } + @MODULE[ModuleFuelTanks]:HAS[#type[Structural]] + { + %typeAvailable = Structural + typeAvailable = Cryogenic + } + @MODULE[ModuleFuelTanks]:HAS[#type[B9_Fuselage]] + { + %typeAvailable = B9_Fuselage + typeAvailable = Cryogenic + } MODULE { name = ModuleCryoTank @@ -109,7 +75,26 @@ TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] FuelName = LqdHydrogen // in % per hr BoiloffRate = 0.05 + CoolingCost = 0.09 + } + BOILOFFCONFIG + { + FuelName = LqdMethane + // in % per hr + BoiloffRate = 0.005 + CoolingCost = 0.045 } - } } +//Adds tank type Croygenic to B9 MFT tanks +@TANK_DEFINITION[B9_Fuselage]:NEEDS[B9_Aerospace&ModularFuelTanks&!RealFuels]:FOR[CryoTanks]:FINAL +{ + TANK + { + name = LqdHydrogen + amount = 0 + maxAmount = 0 + utilization = 1 + mass = 0.0000016 + } +} From 085569f62ec7434e6821d496f12331456e5a2aab Mon Sep 17 00:00:00 2001 From: dlrk2 Date: Thu, 2 Jul 2020 00:16:41 -0400 Subject: [PATCH 2/4] Typo fixed --- .../Patches/CryoTanksModularFuelTanks.cfg | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg index bbf1d75..3c6af73 100644 --- a/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg +++ b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg @@ -13,8 +13,8 @@ TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] name = LqdHydrogen amount = 0.0 maxAmount = 0.0 - utilization = 1 - mass = 0.0000016 + utilization = 10 + } TANK { @@ -27,14 +27,20 @@ TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] name = Monopropellant amount = 0.0 maxAmount = 0.0 + } + TANK + { + name = LiquidFuel + amount = 0.0 + maxAmount = 0.0 } TANK { name = LqdMethane - mass = 0.0000096 + mass = 0.0000080 amount = 0.0 maxAmount = 0.0 - utilization = 1 + utilization = 10 } } @@ -86,15 +92,4 @@ TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] } } } -//Adds tank type Croygenic to B9 MFT tanks -@TANK_DEFINITION[B9_Fuselage]:NEEDS[B9_Aerospace&ModularFuelTanks&!RealFuels]:FOR[CryoTanks]:FINAL -{ - TANK - { - name = LqdHydrogen - amount = 0 - maxAmount = 0 - utilization = 1 - mass = 0.0000016 - } -} + From b300cac1a55719c348a557f0dd9e378e68f18881 Mon Sep 17 00:00:00 2001 From: dlrk2 Date: Fri, 3 Jul 2020 18:34:48 -0400 Subject: [PATCH 3/4] Add files via upload --- GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg index 3c6af73..e787393 100644 --- a/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg +++ b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg @@ -13,7 +13,7 @@ TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] name = LqdHydrogen amount = 0.0 maxAmount = 0.0 - utilization = 10 + utilization = 7.5 } TANK @@ -40,7 +40,7 @@ TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels] mass = 0.0000080 amount = 0.0 maxAmount = 0.0 - utilization = 10 + utilization = 5 } } From 0ebd03db74245f4e2dc9c7896da689e11a6bef43 Mon Sep 17 00:00:00 2001 From: Chris Adderley Date: Sat, 1 Aug 2020 14:36:02 -0700 Subject: [PATCH 4/4] 1.10.0 updates --- .mod_data.yml | 6 +++--- GameData/CryoTanks/Versioning/CryoTanks.version | 6 +++--- changelog.txt | 8 ++++++++ readme.txt | 8 ++++---- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.mod_data.yml b/.mod_data.yml index 108d087..3c0a044 100644 --- a/.mod_data.yml +++ b/.mod_data.yml @@ -8,16 +8,16 @@ package: - changelog.txt dependencies: # Configure dependencies ModuleManager: - version: 4.1.3 + version: 4.1.4 location: s3 B9PartSwitch: - version: 2.16.0 + version: 2.17.0 location: s3 CommunityResourcePack: version: 1.3.0 location: s3 DynamicBatteryStorage: - tag: 2.1.6 + tag: 2.1.7 location: github repository: ChrisAdderley/DynamicBatteryStorage deploy: diff --git a/GameData/CryoTanks/Versioning/CryoTanks.version b/GameData/CryoTanks/Versioning/CryoTanks.version index c701b3f..e6ef279 100644 --- a/GameData/CryoTanks/Versioning/CryoTanks.version +++ b/GameData/CryoTanks/Versioning/CryoTanks.version @@ -6,13 +6,13 @@ { "MAJOR":1, "MINOR":5, - "PATCH":1, + "PATCH":2, "BUILD":0 }, "KSP_VERSION": { "MAJOR":1, - "MINOR":9, + "MINOR":10, "PATCH":1 }, "KSP_VERSION_MIN":{ @@ -22,7 +22,7 @@ }, "KSP_VERSION_MAX":{ "MAJOR":1, - "MINOR":9, + "MINOR":10, "PATCH":99 } } diff --git a/changelog.txt b/changelog.txt index f43e678..94a7c75 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,11 @@ +v1.5.2 +------ +- Marked for KSP 1.10.x +- Improved MFT compatibility (dlrk2) +- Updated DynamicBatteryStorage to 2.1.7 +- Updated ModuleManager to 4.1.4 +- Updated B9PartSwitch to 2.17.0 + v1.5.1 ------ - Fixed a testing flag being left on in 1.5.0 diff --git a/readme.txt b/readme.txt index 0e43059..da6a3e1 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ ================= -Cryo Tanks v1.5.1 +Cryo Tanks v1.5.2 ================= 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. @@ -20,10 +20,10 @@ DEPENDENCIES ============ Required: -- B9PartSwitch (2.16.0) +- B9PartSwitch (2.17.0) - Community Resource Pack (1.3.0) -- ModuleManager (4.1.3) -- DynamicBatteryStorage (2.1.6) +- ModuleManager (4.1.4) +- DynamicBatteryStorage (2.1.7) Optional - Community Tech Tree (v2.2+)