Merge branch 'dev' of https://github.com/post-kerbin-mining-corporati…

…on/CryoTanks into dev

# Conflicts:
#	changelog.txt

GameData/CryoTanks/Patches/CryoTanksISRU_patch.cfg

@@ -1,6 +1,8 @@
 //=====================================================================================
 // adds LH2, LH2Ox, LCH4, LCH4Ox Converters to parts, that are in CryoTanksISRU_Opt-In
-// an invariant mass was used to calculate the values
+// Converts appropriately into the resources conserving mass for each fuel type, e.g.
+// 1 ore (10 kg/u) -> 2 LF (5 kg/u)
+// 1 ore (10 kg/u) -> 141 LH2 (0.07085 kg/u)
 //=====================================================================================
 
 // ---------------------------------------------------------------------------
@@ -210,24 +212,19 @@
 
 	@MODULE[ModuleResourceConverter]:HAS[#Tag[CryoTanks_Hydrogen]],*
 	{
-		@INPUT_RESOURCE:HAS[@ResourceName[ElectricCharge]]
+		@INPUT_RESOURCE:HAS[#ResourceName[ElectricCharge]]
 		{
-			@Ratio *= #$/CryoTanks_EC_Hydrogen$
+			@Ratio *= #$../../CryoTanks_EC_Hydrogen$
 		}
 	}
 
 	@MODULE[ModuleResourceConverter]:HAS[#Tag[CryoTanks_Methane]],*
 	{
-		@INPUT_RESOURCE:HAS[@ResourceName[ElectricCharge]]
+		@INPUT_RESOURCE:HAS[#ResourceName[ElectricCharge]]
 		{
-			@Ratio *= #$/CryoTanks_EC_Methane$
+			@Ratio *= #$../../CryoTanks_EC_Methane$
 		}
 	}
-
-	-CryoTanks_Converter = none
-	-CryoTanks_EC_Hydrogen = none
-	-CryoTanks_EC_Methane = none
-
 }
 
 
@@ -237,12 +234,21 @@
 	{
 		@INPUT_RESOURCE:HAS[~ResourceName[ElectricCharge]],*
 		{
-			@Ratio *= #$/CryoTanks_Power$
+			@Ratio *= #$../../CryoTanks_Power$
 		}
 		@OUTPUT_RESOURCE,*
 		{
-			@Ratio *= #$/CryoTanks_Power$
+			@Ratio *= #$../../CryoTanks_Power$
 		}
 	}
+}
+
+
+@PART:HAS[#CryoTanks_Converter[Set]]:FOR[CryoTanks]
+{
+	-CryoTanks_Converter = none
 	-CryoTanks_Power = none
-}
+	-CryoTanks_EC_Hydrogen = none
+	-CryoTanks_EC_Methane = none
+}
+