Merge pull request #101 from ChrisAdderley/dev

Release 1.10 update
post-kerbin-mining-corporation · Aug 1, 2020 · 0183292 · 0183292
2 parents 0aea9b6 + 39c2c91
commit 0183292
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 74 deletions.
diff --git 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/Patches/CryoTanksModularFuelTanks.cfg b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg
@@ -1,90 +1,52 @@
 // 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 = 7.5
+		
     }
     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 = LiquidFuel
+        amount = 0.0
+        maxAmount = 0.0
+    }
+	TANK
+	{
+		name = LqdMethane
+		mass = 0.0000080
+		amount = 0.0
+		maxAmount = 0.0
+		utilization = 5
+		
+	}
 }
 
 //------------------------------------------------------//
-// 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 +60,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 +81,15 @@ 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
 		}
-
 	}
 }
+
diff --git 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
@@ -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
@@ -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+)