v 1.45

- Add handling for IFS and SMURFF. - Add KPBS ISRU to opt-ins
JadeOfMaar · May 7, 2023 · 1065b30 · 1065b30
1 parent e325ca6
commit 1065b30
Show file tree

Hide file tree

Showing 10 changed files with 157 additions and 25 deletions.
diff --git a/Extras/RationalResourcesSquad/RR_SquadTanks.cfg b/Extras/RationalResourcesSquad/RR_SquadTanks.cfg
@@ -1,20 +1,23 @@
 // Change all stock tanks to hold fuel, without CryoTanks.
 
-@PART[airplaneTail,airplaneTailB]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART[airplaneTail,airplaneTailB]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = LFO
+	refVolume = 200
 	MODULE
 	{
 		name = ModuleB9PartSwitch
 		moduleID = RRStockSwitch
 		switcherDescription = RR Fuel
 		switcherDescriptionPlural = RR Fuel Options
 		switchInFlight = True
-		baseVolume = 200
+		baseVolume = #$../refVolume$
 	}
 }
 
-@PART:HAS[#manufacturer[Jebediah*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Jebediah*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = LFO
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
 	!RESOURCE[LiquidFuel] {}
@@ -29,8 +32,9 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[Probodobodyne?Inc],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Probodobodyne?Inc],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = LFO
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
 	!RESOURCE[LiquidFuel] {}
@@ -45,8 +49,9 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[Rockomax?Conglomerate],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Rockomax?Conglomerate],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = LFO
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
 	!RESOURCE[LiquidFuel] {}
@@ -61,8 +66,9 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[Kerbodyne],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],@RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Kerbodyne],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],@RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = LFO
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
 	!RESOURCE[LiquidFuel] {}
@@ -77,8 +83,9 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[Kerbodyne],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Kerbodyne],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = LFO
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	!RESOURCE[LiquidFuel] {}
 	MODULE
@@ -91,8 +98,9 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[C7?Aerospace?Division],!MODULE[ModuleB9PartSwitch],@RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[C7?Aerospace?Division],!MODULE[ModuleB9PartSwitch],@RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = LFO
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
 	!RESOURCE[LiquidFuel] {}
@@ -109,8 +117,9 @@
 }
 
 // Parts that hold MonoPropellant only. CryoTanks ignores these.
-@PART:HAS[#manufacturer[C7?Aerospace?Division],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[C7?Aerospace?Division],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = LFO
 	refVolume = #$RESOURCE[MonoPropellant]/maxAmount$
 	!RESOURCE[MonoPropellant] {}
 	MODULE
@@ -123,8 +132,9 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[Jebediah*],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Jebediah*],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = Mono
 	refVolume = #$RESOURCE[MonoPropellant]/maxAmount$
 	!RESOURCE[MonoPropellant] {}
 	MODULE
@@ -137,8 +147,9 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[Stratus?Corporation],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Stratus?Corporation],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = Mono
 	refVolume = #$RESOURCE[MonoPropellant]/maxAmount$
 	!RESOURCE[MonoPropellant] {}
 	MODULE
@@ -151,8 +162,9 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[Kerbodyne],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Kerbodyne],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = Mono
 	refVolume = #$RESOURCE[MonoPropellant]/maxAmount$
 	!RESOURCE[MonoPropellant] {}
 	MODULE
@@ -168,8 +180,9 @@
 
 // Parts that hold LiquidFuel only. CryoTanks ignores these.
 
-@PART:HAS[#manufacturer[C7?Aerospace?Division],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[C7?Aerospace?Division],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = LFO
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	!RESOURCE[LiquidFuel] {}
 	MODULE
@@ -182,8 +195,9 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[WinterOwl*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[WinterOwl*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
+	refType:NEEDS[SMURFF] = LFO
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	!RESOURCE[LiquidFuel] {}
 	MODULE
@@ -200,7 +214,7 @@
 
 // Change module ID if part is tank + engine
 
-@PART:HAS[@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRStockSwitch]],@MODULE[ModuleEnginesFX]:HAS[@PROPELLANT[LiquidFuel]]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRStockSwitch]],@MODULE[ModuleEnginesFX]:HAS[@PROPELLANT[LiquidFuel]]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
 	@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRStockSwitch]]
 	{
@@ -211,7 +225,7 @@
 
 // Add primary tank types to stock parts
 
-@PART:HAS[@MODULE[ModuleB9PartSwitch]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[@MODULE[ModuleB9PartSwitch]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
 	@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRStockSwitch]]
 	{
@@ -271,7 +285,7 @@
 
 // LFBs
 
-@PART:HAS[@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRLFBSwitch]]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
+@PART:HAS[@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRLFBSwitch]]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts,!InterstellarFuelSwitch,!ModularFuelTanks,!RealFuels]:FOR[RationalResourcesSquad]
 {
 	@description ^= :$: <br><#4FBBFF>Engine can accept different fuels.</color>
 
@@ -528,4 +542,27 @@
 			}
 		}
 	}
-}
+}
+
+@PART:HAS[@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRLFBSwitch]]]:FOR[RationalResourcesSquad]
+{
+	!lossMass = nope
+	!lossCost = nope
+	!cryoMaxTemp = nope
+
+	!thrustLFO = nope
+	!IspVacLFO = nope
+	!IspASLLFO = nope
+
+	!thrustLH2O = nope
+	!IspVacLH2O = nope
+	!IspASLLH2O = nope
+
+	!thrustLCO = nope
+	!IspVacLCO = nope
+	!IspASLLCO = nope
+
+	!thrustLCH4O = nope
+	!IspVacLCH4O = nope
+	!IspASLLCH4O = nope
+)
diff --git a/Extras/RationalResourcesSquad/RR_SquadTanks_SMURFF.cfg b/Extras/RationalResourcesSquad/RR_SquadTanks_SMURFF.cfg
@@ -0,0 +1,37 @@
+@PART:HAS[#refType[LFO],@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRStockSwitch]]]:NEEDS[SMURFF]:AFTER[RationalResourcesSquad]
+{
+	%reservedmass:NEEDS[SMURFF] = 0
+	%initialmass:NEEDS[SMURFF] = #$mass$
+	%MODULE[ModuleSMURFF]{}
+
+	%resourcemass = #$refVolume$
+	@resourcemass *= #$@RESOURCE_DEFINITION[LiquidFuel]/density$ //In case the density changes -- it shouldn't, but why tempt fate?
+	%resourcemass2 = #$resourcemass$
+
+	@resourcemass *= #$@SMURFFCONFIG/lfomassfactor$
+	@mass -= #$resourcemass$
+
+	@resourcemass2 *= #$@SMURFFCONFIG/lforeservefactor$
+	@reservedmass += #$resourcemass2$
+	-resourcemass = delete
+	-resourcemass2 = delete
+}
+
+@PART:HAS[#refType[Mono],@MODULE[ModuleB9PartSwitch]:HAS[#moduleID[RRStockSwitch]]]:NEEDS[SMURFF]:AFTER[RationalResourcesSquad]
+{
+	%reservedmass:NEEDS[SMURFF] = 0
+	%initialmass:NEEDS[SMURFF] = #$mass$
+	%MODULE[ModuleSMURFF]{}
+
+	%resourcemass = #$refVolume$
+	@resourcemass *= #$@RESOURCE_DEFINITION[MonoPropellant]/density$ //In case the density changes -- it shouldn't, but why tempt fate?
+	%resourcemass2 = #$resourcemass$
+
+	@resourcemass *= #$@SMURFFCONFIG/monomassfactor$
+	@mass -= #$resourcemass$
+
+	@resourcemass2 *= #$@SMURFFCONFIG/monoreservefactor$
+	@reservedmass += #$resourcemass2$
+	-resourcemass = delete
+	-resourcemass2 = delete
+}
diff --git a/GameData/RationalResources/Version/Changelog.md b/GameData/RationalResources/Version/Changelog.md
@@ -1,5 +1,9 @@
 # Rational Resources
 
+## 1.45
+* Added KPBS ISRU support by @ CoriW on the forum.
+* Added detection for InterstellarFuelSwitch (do nothing) and SMURFF (required compatibility) to `RationalResourcesSquad`.
+
 ## 1.44
 * Added compatibility (excluding template adaptation) for The Gold Standard.
 * Balance pass in `RationalResourcesNuclearFamily`. Lower Isp propellants are ensured greater thrust and oxidating agent NTRs have greater baseline thrust due to default lower Isp.

diff --git a/GameData/RationalResources/Version/KerbalChangelog.cfg b/GameData/RationalResources/Version/KerbalChangelog.cfg
@@ -6,19 +6,29 @@ KERBALCHANGELOG //Required to have this name
 	author = JadeOfMaar
 	website = forum.kerbalspaceprogram.com/index.php?/topic/184875-*/
 
+	VERSION
+	{
+		version = 1.45
+		CHANGE
+		{
+			type = Add
+			change = Added KPBS ISRU support by @ CoriW on the forum.
+			change = Added detection for InterstellarFuelSwitch (do nothing) and SMURFF (required compatibility) to </b>RationalResourcesSquad</b>.
+		}
+	}
 	VERSION
 	{
 		version = 1.44
 		CHANGE
 		{
 			type = Add
 			change = Added compatibility (excluding template adaptation) for The Gold Standard.
-			change = Tagged all engines except the open cycle one in Kerbal Atomics for `RationalResourcesNuclearFamily`.
+			change = Tagged all engines except the open cycle one in Kerbal Atomics for </b>RationalResourcesNuclearFamily</b>.
 		}
 		CHANGE
 		{
 			type = Change
-			change = Balance pass in `RationalResourcesNuclearFamily`. Lower Isp propellants are ensured greater thrust and oxidating agent NTRs have greater baseline thrust due to default lower Isp.
+			change = Balance pass in </b>RationalResourcesNuclearFamily</b>. Lower Isp propellants are ensured greater thrust and oxidating agent NTRs have greater baseline thrust due to default lower Isp.
 			change = Changed (most if not all) exo resources to liquid form and exo scoop modules to suit.
 			change = Rewrote and divided RR Omniconverter recipes between basic, CRP and Classic Stock.
 		}

diff --git a/GameData/RationalResources/Version/RationalResources.version b/GameData/RationalResources/Version/RationalResources.version
@@ -14,7 +14,7 @@
 	"VERSION":
 	{
 		"MAJOR":1,
-		"MINOR":44,
+		"MINOR":45,
 		"PATCH":0,
 		"BUILD":0
 	},

diff --git a/GameData/RationalResourcesCompanion/00_ConvertOTrons_Opt-in.cfg b/GameData/RationalResourcesCompanion/00_ConvertOTrons_Opt-in.cfg
@@ -90,4 +90,12 @@
 	RRPower = 0.0138
 	RRSlots = 2
 	isStock = True
+}
+
+// Planetary Base Inc
+@PART[KKAOSS_ISRU_g]:NEEDS[PlanetaryBaseInc]
+{
+	RRConverter = Set
+	RRPower = 1
+	RRSlots = 1
 }
diff --git a/GameData/RationalResourcesCompanion/00_DrillOMatics_Opt-in.cfg b/GameData/RationalResourcesCompanion/00_DrillOMatics_Opt-in.cfg
@@ -22,6 +22,13 @@
 
 // VentralDrill
 @PART[VentralISRUDrill]:NEEDS[VentralDrill]:AFTER[RationalResources]
+{
+	RRHarvester = Set
+	RRSlots = 1
+}
+
+// Planetary Base Inc
+@PART[KKAOSS_drill|KKAOSS_MetalOreDrill|KKAOSS_DirtDrill|KKAOSS_LS_drill_water]:NEEDS[PlanetaryBaseInc]
 {
 	RRHarvester = Set
 	RRSlots = 1

diff --git a/GameData/RationalResourcesCompanion/00_FuelCells_Opt-in.cfg b/GameData/RationalResourcesCompanion/00_FuelCells_Opt-in.cfg
@@ -36,4 +36,13 @@
 	RRFuelCell = Set
 	RRPower = 6.7
 	OreBurner = True
+}
+
+// Planetary Base Inc
+@PART[KKAOSS_Fuelcell_Tank]:NEEDS[PlanetaryBaseInc]
+{
+	!MODULE[ModuleKPBSConverter] {}
+	RRFuelCell = Set
+	RRPower = 1
+	OreBurner = True
 }
diff --git a/GameData/RationalResourcesCompanion/OmniconvertersBasic.cfg b/GameData/RationalResourcesCompanion/OmniconvertersBasic.cfg
@@ -79,7 +79,7 @@ OMNICONVERTER:NEEDS[WildBlueTools]
 {
 	templateTags = rrfp;lab
 	TechRequired = experimentalElectrics
-	description = ElectroPlasma has so much energy density that it has measurable mass. Extract energy from it by converting it to thermal energy and passing this through a Stirling generator. (2% efficiency.)
+	description = ElectroPlasma has so much energy density that it has measurable mass. Extract energy from it by converting it to thermal energy and passing this through a compact Brayton cycle generator. (2% efficiency.)
 	ConverterName = RR Power EPS Transformer
 	StartActionName = Start EPS Transformer
 	StopActionName = Stop EPS Transformer
@@ -103,9 +103,9 @@ OMNICONVERTER:NEEDS[WildBlueTools]
 
 OMNICONVERTER:NEEDS[WildBlueTools,CommunityTechTree]
 {
-	templateTags = rrfp;lab
+	templateTags = rrfp
 	TechRequired = experimentalElectricalSystems
-	description = ElectroPlasma has so much energy density that it has measurable mass. Extract energy from it by converting it to thermal energy and passing this through a compact Brayton cycle generator. (10% efficiency)
+	description = ElectroPlasma has so much energy density that it has measurable mass. Extract energy from it by converting it to thermal energy and passing this through an improved, compact Brayton cycle generator. (10% efficiency)
 	ConverterName = RR Power EPS Transformer II
 	StartActionName = Start EPS Transformer II
 	StopActionName = Stop EPS Transformer II
@@ -129,7 +129,7 @@ OMNICONVERTER:NEEDS[WildBlueTools,CommunityTechTree]
 
 OMNICONVERTER:NEEDS[WildBlueTools,CommunityResourcePack]
 {
-	templateTags = rrfp;lab
+	templateTags = rrfp
 	TechRequired = exoticElectricalSystems
 	description = ElectroPlasma has so much energy density that it has measurable mass. Extract energy from it by passing it through a superconducting magnet assembly and drawing away the electron stream. (50% efficiency)
 	ConverterName = RR Power EPS Transformer III

diff --git a/GameData/RationalResourcesCompanion/SMURFF.cfg b/GameData/RationalResourcesCompanion/SMURFF.cfg
@@ -0,0 +1,20 @@
+@PART:HAS[#RROreTank[isSet],~SMURFFExclude[*rue]]:NEEDS[SMURFF]:AFTER[RationalResourcesCompanion]
+{
+	%reservedmass = 0
+	%initialmass = #$mass$
+	refType = Ore
+
+	%resourcemass = #$refVolume$
+	@resourcemass *= #$@RESOURCE_DEFINITION[Ore]/density$ //In case the density changes -- it shouldn't, but why tempt fate?
+	%resourcemass2 = #$resourcemass$
+
+	@resourcemass *= #$@SMURFFCONFIG/oremassfactor$
+	@mass -= #$resourcemass$
+
+	@resourcemass2 *= #$@SMURFFCONFIG/orereservefactor$
+	@reservedmass += #$resourcemass2$
+	-resourcemass = delete
+	-resourcemass2 = delete
+
+	%MODULE[ModuleSMURFF]{}
+}