fixes for MFT/RF

ABZB · Aug 30, 2015 · f83a698 · f83a698
1 parent 2088178
commit f83a698
Showing 1 changed file with 24 additions and 10 deletions.
diff --git a/GameData/StarLionIndustries/Mk2_Extended_KSPI_Integration/mk2_KSPI_fuel_tanks.cfg b/GameData/StarLionIndustries/Mk2_Extended_KSPI_Integration/mk2_KSPI_fuel_tanks.cfg
@@ -59,7 +59,7 @@
 		chargeNeeded = 15.4
 	}
 }
-@PART[mk2*]:HAS[@author[SuicidalInsanity],@RESOURCE[Oxidizer]]NEEDS[Mk2Expansion,InterstellarFuelSwitch]:FIRST
+@PART[mk2*]:HAS[@author[SuicidalInsanity],@RESOURCE[Oxidizer]]:NEEDS[Mk2Expansion,InterstellarFuelSwitch]:FIRST
 {
 	@RESOURCE[LiquidFuel]
 	{
@@ -280,14 +280,18 @@
 
 @PART[*]:HAS[@MODULE[InterstellarFuelSwitch],#LFamount[*]]:NEEDS[!RealFuels]
 {
-	%RESOURCE[]
+	%ammoniaAmount = $/LFamount$
+	@ammoniaAmount *= 9
 	@MODULE[InterstellarFuelSwitch]
 	{
 		@resourceGui = Ammonia;Argon Gas;Carbon Dioxide (Cryo);CarbonMonoxide (Cryo);Deuterium (Cryo);Helium (Cryo);Helium-3 (Compressed Gas);Hexaborane;Hydrazine;Hydrogen (Cryo);Hydrogen Peroxide (Cryo);LiquidFuel;Methane (Cryo);Nitrogen (Cryo);Oxygen (Cryo);Tritium (Compressed Gas, Shielded);Water;Xenon Gas;Structural
 
 		@resourceNames = LqdAmmonia;ArgonGas;LqdCO2;LqdCO;LqdDeuterium;LqdHelium;LqdHe3;Hexaborane;Hydrazine;LqdHydrogen;HTP;LiquidFuel;LqdMethane;LqdNitrogen;LqdOxygen;LqdTritium;Water;XenonGas;Structural
 
-		@resourceAmounts = #$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../ArgonAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../LFamount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../RESOURCE[LqdAmmonia]/maxAmount$;$/../XenonAmount$;0
+		@resourceAmounts = #$/../ammoniaAmount$;$/../ArgonAmount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../LFamount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../ammoniaAmount$;$/../XenonAmount$;0
+	}
+	!MODULE[ModuleFuelTanks]:NEEDS[ModularFuelTanks|RealFuels]
+	{
 	}
 }
 
@@ -334,9 +338,6 @@
 		availableInEditor = true
 		showInfo = true
 	}
-	!LF = NULL
-	!Oxi = NULL
-	!XenonAmount = NULL
 }
 
 //fixes for various conflicts
@@ -350,16 +351,29 @@
 	!RESOURCE[*],*{}
 	!MODULE[InterstellarFuelSwitch]{}
 	!MODULE[FNModuleCryostat],*{}
+	!MODULE[ModuleFuelTanks]{}
 }
 
-@PART[*]:HAS[@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer],!RESOURCE[ElectricCharge],@MODULE[InterstellarFuelSwitch]]:NEEDS[InterstellarFuelSwitch,WarpPlugin|CommunityResourcePack]:FINAL
+@PART[*]:HAS[@MODULE[InterstellarFuelSwitch]]:NEEDS[InterstellarFuelSwitch]:FINAL
 {
 	!percentage = NULL
 	!percentsquared = NULL
 	!LFamount = NULL
 	!ArgonAmount = NULL
 	!XenonAmount = NULL
-	!MODULE[FSmeshSwitch]{}
-	!MODULE[FSfuelSwitch]{}
-	!MODULE[ModuleFuelTanks]{}
+	!ammoniaAmount = NULL
+	!LF = NULL
+	!Oxi = NULL
+	!XenonAmount = NULL
+	!MODULE[FSmeshSwitch],*
+	{
+	}
+
+	!MODULE[FSfuelSwitch],*
+	{
+	}
+
+	!MODULE[ModuleFuelTanks],*
+	{
+	}
 }