Merge pull request #78 from ChrisAdderley/dev

Release 1.2.0

.mod_data.yml

@@ -11,13 +11,13 @@ dependencies:  # Configure dependencies
     version: 4.0.2
     location: s3
   B9PartSwitch:
-    version: 2.8.0
+    version: 2.8.1
     location: s3
   CommunityResourcePack:
     version: 1.0.0
     location: s3
   DynamicBatteryStorage:
-    tag: 2.0.0
+    tag: 2.0.2
     location: github
     repository: ChrisAdderley/DynamicBatteryStorage
 deploy:

GameData/CryoTanks/Localization/de-de.cfg

@@ -112,7 +112,7 @@ Localization
     #LOC_CryoTanks_ModuleCryoTank_Event_Disable = Kühlung deaktivieren
 
     #LOC_CryoTanks_ModuleCryoTank_Action_EnableAction = Kühlung aktivieren
-    #LOC_CryoTanks_ModuleCryoTank_Action_DisableAction - Kühlung deaktivieren
+    #LOC_CryoTanks_ModuleCryoTank_Action_DisableAction = Kühlung deaktivieren
     #LOC_CryoTanks_ModuleCryoTank_Action_ToggleAction = Kühlung ein/aus
 
   }

GameData/CryoTanks/Localization/en-us.cfg

@@ -20,6 +20,8 @@ Localization
     #LOC_CryoTanks_switcher_fuel_ox = Ox
     #LOC_CryoTanks_switcher_fuel_lf = LF
     #LOC_CryoTanks_switcher_fuel_lfox = LF/Ox
+    #LOC_CryoTanks_switcher_fuel_methane = LCH4
+    #LOC_CryoTanks_switcher_fuel_methalox = LCH4/Ox
 
     // PARTS
     #LOC_CryoTanks_hydrogen-10-1_title = H1000-1152 Hydrogen Tank
@@ -88,9 +90,9 @@ Localization
     // ModuleCryoTank
     #LOC_CryoTanks_ModuleCryoTank_ModuleName = Cryogenic Tank
     #LOC_CryoTanks_ModuleCryoTank_PartInfoUncooled =  Cryogenic fuels evaporate over time\n
-    #LOC_CryoTanks_ModuleCryoTank_PartInfoCooled =  Cryogenic fuels evaporate over time if uncooled<<1>>\n\n Cooling Cost: <<2>> Ec/s per 1000 units\n
-    #LOC_CryoTanks_ModuleCryoTank_PartInfoBoiloff = \n- <<1>>: -<<2>>%/hr
-    #LOC_CryoTanks_ModuleCryoTank_PartInfoBoiloffOutput = \n- <<1>>: +<<2>>%/hr
+    #LOC_CryoTanks_ModuleCryoTank_PartInfoCooled =  Cryogenic fuels evaporate over time if uncooled<<1>>\n\n <b>Cooling Cost:</b> <<2>> Ec/s per 1000 units\n
+    #LOC_CryoTanks_ModuleCryoTank_PartInfoBoiloff = \n- <color=#99ff00><b><<1>>:</b></color> -<<2>>%/hr
+    #LOC_CryoTanks_ModuleCryoTank_PartInfoBoiloffOutput = \n- <color=#99ff00><b><<1>>:</b></color> +<<2>>%/hr
 
 
     #LOC_CryoTanks_ModuleCryoTank_Field_BoiloffStatus = Boiloff
@@ -113,7 +115,7 @@ Localization
     #LOC_CryoTanks_ModuleCryoTank_Event_Disable = Disable Cooling
 
     #LOC_CryoTanks_ModuleCryoTank_Action_EnableAction = Enable Cooling
-    #LOC_CryoTanks_ModuleCryoTank_Action_DisableAction - Disable Cooling
+    #LOC_CryoTanks_ModuleCryoTank_Action_DisableAction = Disable Cooling
     #LOC_CryoTanks_ModuleCryoTank_Action_ToggleAction = Toggle Cooling
 
   }

GameData/CryoTanks/Localization/es-es.cfg

@@ -112,7 +112,7 @@ Localization
     #LOC_CryoTanks_ModuleCryoTank_Event_Disable = Desactivar Enfriamiento
 
     #LOC_CryoTanks_ModuleCryoTank_Action_EnableAction = Habilitar Enfriamiento
-    #LOC_CryoTanks_ModuleCryoTank_Action_DisableAction - Desactivar Enfriamiento
+    #LOC_CryoTanks_ModuleCryoTank_Action_DisableAction = Desactivar Enfriamiento
     #LOC_CryoTanks_ModuleCryoTank_Action_ToggleAction = Alternar Enfriamiento
 
   }

GameData/CryoTanks/Localization/ru.cfg

@@ -7,11 +7,11 @@ Localization
   {
     // CONFIG
     // MANUFACTURERS
-	
+
     #LOC_CryoTanks_manufacturer_argylehydro_title = ОО "Гидропоника Аргайла"
 
     // SWITCHERS
-	
+
     #LOC_CryoTanks_switcher_tankappearance_title = Вид
     #LOC_CryoTanks_switcher_tankappearance_variant1 = Плёнка
     #LOC_CryoTanks_switcher_tankappearance_variant2 = Равногранный
@@ -27,7 +27,7 @@ Localization
     #LOC_CryoTanks_switcher_fuel_lfox = ЖТ/Ок
 
     // PARTS
-	
+
     #LOC_CryoTanks_hydrogen-10-1_title = H1000-1152 Водородный бак
     #LOC_CryoTanks_hydrogen-10-1_description = Самый большой водородный бак от Аргайл Гидропоникc. Он имеет по-настоящему ошеломляющий объем, однако довольно легкий для своего размера. Снабжён изоляцией и охлаждающими системами для исключения потерь криогенного топлива вроде жидкого водорода.
     #LOC_CryoTanks_hydrogen-10-1_tags = топливный бак окислитель ракетный водородный крио
@@ -80,7 +80,7 @@ Localization
     #LOC_CryoTanks_hydrogen-radial-375-1_tags = топливный бак окислитель ракетный водородный крио
 
     // Converters
-	
+
     #LOC_CryoTanks_isru_LH2_name = ЖH2
     #LOC_CryoTanks_isru_LH2_StartAction = Вкл. конвертер [ЖH2]
     #LOC_CryoTanks_isru_LH2_StopAction = Выкл. конвертер [ЖH2]
@@ -93,7 +93,7 @@ Localization
 
     // Plugin
     // ModuleCryoTank
-	
+
     #LOC_CryoTanks_ModuleCryoTank_ModuleName = Криогенный бак
     #LOC_CryoTanks_ModuleCryoTank_PartInfoUncooled = Криогенное топливо испаряется со временем\n
     #LOC_CryoTanks_ModuleCryoTank_PartInfoCooled =Криогенное топливо без охлаждения со временем испаряется\n\n Стоимость охлаждения: <<1>>ЭЭ/с на 1000\n

GameData/CryoTanks/Patches/CryoTanksFuelTankSwitcher.cfg

@@ -1,4 +1,6 @@
-// Adds switcher to tanks containing LF and Oxidizer
+// Adds resource switchers
+// ALL TANKS CONTAINING LF/OXIDIZER
+// Does not affect tanks containing engines, FSFuelSwitch, InterstellarFuelSwitch, WBIConvertibleStorage, WBIResourceSwitcher or ModularFuelTanks
 @PART[*]:HAS[@RESOURCE[LiquidFuel],@RESOURCE[Oxidizer],!MODULE[InterstellarFuelSwitch],!MODULE[ModuleEnginesFX],!MODULE[ModuleEngines],!MODULE[FSfuelSwitch],!MODULE[WBIConvertibleStorage],!MODULE[WBIResourceSwitcher]]:NEEDS[!ModularFuelTanks&!RealFuels]:FOR[zzz_CryoTanks]
 {
 	//Calculate total capacity by units of default resources
@@ -7,7 +9,7 @@
 
 	%totalCap = #$RESOURCE[LiquidFuel]/maxAmount$
 	@totalCap += #$RESOURCE[Oxidizer]/maxAmount$
-	
+
 	//Mass offset is used to ensure correct dry mass of tanks
 	%massOffset = #$totalCap$
 	@massOffset *= 0.000625 // standard dry mass per units of LF/OX
@@ -58,6 +60,22 @@
 			addedMass = #$../../massOffset$
 			addedCost = #$../../costOffset$
 		}
+    SUBTYPE:NEEDS[CryoTanksMethalox]
+		{
+			name = Methane
+			title = #LOC_CryoTanks_switcher_fuel_methane
+			tankType = LM
+			addedMass = #$../../massOffset$
+			addedCost = #$../../costOffset$
+		}
+    SUBTYPE:NEEDS[CryoTanksMethalox]
+		{
+			name = Methalox
+			title = #LOC_CryoTanks_switcher_fuel_methalox
+			tankType = LMOx
+			addedMass = #$../../massOffset$
+			addedCost = #$../../costOffset$
+		}
 		SUBTYPE
 		{
 			name = Oxidizer
@@ -87,16 +105,23 @@
 			// in % per hr
 			BoiloffRate = 0.05
 		}
+    BOILOFFCONFIG
+		{
+			FuelName = LqdMethane
+			// in % per hr
+			BoiloffRate = 0.005
+		}
 	}
 }
 
-// Adds switcher to parts by default containing ONLY LqdHydrogen such as CryoTanks ZBO tank parts
+// ALL TANKS CONTAINING ONLY LH2
+// Does not affect tanks containing engines, FSFuelSwitch, InterstellarFuelSwitch, WBIConvertibleStorage, WBIResourceSwitcher or ModularFuelTanks
 // Assuming all such tanks are Zero Boil off therefore lower cooling cost applies
 @PART[*]:HAS[@RESOURCE[LqdHydrogen],!RESOURCE[Oxidizer],!MODULE[InterstellarFuelSwitch],!MODULE[ModuleEnginesFX],!MODULE[ModuleEngines],!MODULE[FSfuelSwitch],!MODULE[WBIConvertibleStorage],!MODULE[WBIResourceSwitcher]]:NEEDS[!ModularFuelTanks&!RealFuels]:FOR[zzz_CryoTanks]
 {
 	//total capacity by units of default resources, since only one resource, can use directly to calculate tank volume
 	%LH2 = #$RESOURCE[LqdHydrogen]/maxAmount$
-	
+
 	//Mass offset is used to ensure correct dry mass of tanks
 	%massOffset = #$LH2$
 	@massOffset *= 0.00001417 // <- EDIT HERE (dry mass per unit LH2 capacity)
@@ -136,6 +161,22 @@
 			addedMass = #$../../massOffset$
 			addedCost = #$../../costOffset$
 		}
+    SUBTYPE:NEEDS[CryoTanksMethalox]
+		{
+			name = Methane
+			title = #LOC_CryoTanks_switcher_fuel_methane
+			tankType = LM
+			addedMass = #$../../massOffset$
+			addedCost = #$../../costOffset$
+		}
+    SUBTYPE:NEEDS[CryoTanksMethalox]
+		{
+			name = Methalox
+			title = #LOC_CryoTanks_switcher_fuel_methalox
+			tankType = LMOx
+			addedMass = #$../../massOffset$
+			addedCost = #$../../costOffset$
+		}
 		SUBTYPE
 		{
 			name = Oxidizer
@@ -159,12 +200,18 @@
 			// in % per hr
 			BoiloffRate = 0.05
 		}
-
+    BOILOFFCONFIG
+		{
+			FuelName = LqdMethane
+			// in % per hr
+			BoiloffRate = 0.005
+		}
 	}
 }
 
-//Adds switcher to parts containing BOTH LH2 and Oxidizer by default
-//Same cooling cost as standard LFO tanks
+// ALL TANKS CONTAINING LH2 and OX
+// These tanks will have a standard cooling cost
+// Does not affect tanks containing engines, FSFuelSwitch, InterstellarFuelSwitch, WBIConvertibleStorage, WBIResourceSwitcher or ModularFuelTanks
 @PART[*]:HAS[@RESOURCE[LqdHydrogen],@RESOURCE[Oxidizer],!MODULE[InterstellarFuelSwitch],!MODULE[ModuleEnginesFX],!MODULE[ModuleEngines],!MODULE[FSfuelSwitch],!MODULE[WBIConvertibleStorage],!MODULE[WBIResourceSwitcher]]:NEEDS[!ModularFuelTanks&!RealFuels]:FOR[zzz_CryoTanks]
 {
 	//Calculate total unit capacity
@@ -176,7 +223,7 @@
 
 	//Mass offset is used to ensure correct dry mass of tanks. Dry mass balanced against reDirect Hydrolox tanks.
 	%massOffset = #$LH2$
-	@massOffset *= 0.000056 // <- EDIT HERE 
+	@massOffset *= 0.000056 // <- EDIT HERE
 	@massOffset *= -1
 
 	//Take default resource quantities and multiply by resource units costs to calculate total cost of original resources
@@ -222,6 +269,22 @@
 			addedMass = #$../../massOffset$
 			addedCost = #$../../costOffset$
 		}
+    SUBTYPE:NEEDS[CryoTanksMethalox]
+		{
+			name = Methane
+			title = #LOC_CryoTanks_switcher_fuel_methane
+			tankType = LM
+			addedMass = #$../../massOffset$
+			addedCost = #$../../costOffset$
+		}
+    SUBTYPE:NEEDS[CryoTanksMethalox]
+		{
+			name = Methalox
+			title = #LOC_CryoTanks_switcher_fuel_methalox
+			tankType = LMOx
+			addedMass = #$../../massOffset$
+			addedCost = #$../../costOffset$
+		}
 		SUBTYPE
 		{
 			name = Oxidizer
@@ -231,6 +294,7 @@
 			addedCost = #$../../costOffset$
 		}
 
+
 	}
 
 	MODULE
@@ -245,6 +309,12 @@
 			// in % per hr
 			BoiloffRate = 0.05
 		}
+    BOILOFFCONFIG
+		{
+			FuelName = LqdMethane
+			// in % per hr
+			BoiloffRate = 0.005
+		}
 
 	}
 

GameData/CryoTanks/Patches/CryoTanksFuelTankTypes.cfg

@@ -95,3 +95,30 @@ B9_TANK_TYPE
 		unitsPerVolume = 0.55
 	}
 }
+B9_TANK_TYPE
+{
+	name = LM
+	tankMass = 0.000266006
+	tankCost = 0.12
+	RESOURCE
+	{
+		name = LqdMethane
+		unitsPerVolume = 5
+	}
+}
+B9_TANK_TYPE
+{
+	name = LMOx
+	tankMass = 0.000355755
+	tankCost = 0.00
+	RESOURCE
+	{
+		name = LqdMethane
+		unitsPerVolume = 1.875
+	}
+	RESOURCE
+	{
+		name = Oxidizer
+		unitsPerVolume = 0.625
+	}
+}

GameData/CryoTanks/Versioning/CryoTanks.version

@@ -5,15 +5,15 @@
     "VERSION":
     {
         "MAJOR":1,
-        "MINOR":1,
-        "PATCH":4,
+        "MINOR":2,
+        "PATCH":0,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
         "MINOR":7,
-        "PATCH":0
+        "PATCH":3
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,

changelog.txt

@@ -1,3 +1,21 @@
+v1.2.0
+------
+- Updated B9PartSwitch to 2.8.1
+- Updated DynamicBatteryStorage to 2.0.2
+  - Added support for GenericFieldDataHandler - a simple plug and play handler for other mods to use
+  - Fixed FissionFlowRadiator adding heat to the simulation instead of removing it
+  - Fixed two instances of null reference exceptions when switching vessels/scenes
+- Fixed a localization typo
+- Tuned VAB UI part tooltip fields for boiloff module
+- Reworked textures of foil tanks to match Restock and Near Future Construction
+- Normalized grey to be similar to all my other mods
+- Recompressed all textures with better compression algorithm
+- Added optional simplistic draft Liquid Methane support
+  - Slightly cryogenic (1/10th the boiloff rate of Liquid Hydrogen)
+  - Similar mass ratio to Liquid Fuel (9)
+  - Higher cost ratio compared to Liquid Fuel (0.12 vs 0.1)
+  - Enabled by declaring any MM patch with :FOR[CryoTanksMethalox] or including a folder in GameData called CryoTanksMethalox
+
 v1.1.4
 ------
 - Updated B9PartSwitch to 2.8.0

readme.txt

@@ -1,5 +1,5 @@
 =================
-Cryo Tanks v1.1.4
+Cryo Tanks v1.2.0
 =================
 
 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.8.0)
+- B9PartSwitch (2.8.1)
 - Community Resource Pack (1.0.0)
 - ModuleManager (4.0.2)
-- DynamicBatteryStorage (2.0.0)
+- DynamicBatteryStorage (2.0.2)
 
 Optional
 - Community Tech Tree (v2.2+)