Fix #244: fix conflicts in autopassthrough system when RO is installed

FirstPersonKSP · Jun 29, 2023 · 289a49a · 289a49a
1 parent 9c70e56
commit 289a49a
Showing 1 changed file with 29 additions and 4 deletions.
diff --git a/GameData/FreeIva/Patches/AutoPassThrough.cfg b/GameData/FreeIva/Patches/AutoPassThrough.cfg
@@ -120,8 +120,8 @@ B9_TANK_TYPE
 	FreeIva_AutoPassThrough_StructuralVariant = true
 }
 
-// step 3: if there is no fuel switch moduleID, add one
-@PART:HAS[#FreeIva_AutoPassThrough[true]&~FreeIva_AutoPassThrough_FuelSwitchID]:FOR[zzz_FreeIva]
+// step 3: if there is no fuel switch moduleID, add one (as long as there's at least one RESOURCE - RO will remove resources from certain parts)
+@PART:HAS[#FreeIva_AutoPassThrough[true]&~FreeIva_AutoPassThrough_FuelSwitchID&@RESOURCE]:FOR[zzz_FreeIva]
 {
 	FreeIva_AutoPassThrough_FuelSwitchID = FreeIva_fuelSwitch
 	FreeIva_AutoPassThrough_TankTypes = true
@@ -133,6 +133,31 @@ B9_TANK_TYPE
 	}
 }
 
+// step 3.1: if the part doesn't have resources, just set it up directly for passthrough
+// with passthrough...
+@PART:HAS[#FreeIva_AutoPassThrough[true]&~FreeIva_AutoPassThrough_FuelSwitchID&!RESOURCE&~FreeIva_AutoPassThrough_InternalName]:FOR[zzz_FreeIva]
+{
+	MODULE
+	{
+		name = ModuleFreeIva
+		passThroughNodeA = top
+		passThroughNodeB = bottom
+	}
+}
+// ...or with a named internal
+@PART:HAS[#FreeIva_AutoPassThrough[true]&~FreeIva_AutoPassThrough_FuelSwitchID&!RESOURCE&#FreeIva_AutoPassThrough_InternalName]:FOR[zzz_FreeIva]
+{
+	MODULE
+	{
+		name = ModuleFreeIva
+	}
+
+	%INTERNAL
+	{
+		%name = #$/FreeIva_AutoPassThrough_InternalName$
+	}
+}
+
 // step 3.5: calculate the volume and fuel types for the tanks we added
 // LFO
 @PART:HAS[#FreeIva_AutoPassThrough_TankTypes[true]&@RESOURCE[LiquidFuel]&@RESOURCE[Oxidizer]]:FOR[zzz_FreeIva]
@@ -261,7 +286,7 @@ B9_TANK_TYPE
 
 
 // step 4.A: add the b9ps module for freeiva - but not if there is a structural variant available
-@PART:HAS[#FreeIva_AutoPassThrough[true]&~FreeIva_AutoPassThrough_StructuralVariant[true]]:FOR[zzz_FreeIva]
+@PART:HAS[#FreeIva_AutoPassThrough[true]&~FreeIva_AutoPassThrough_StructuralVariant[true]&!MODULE[ModuleFreeIva]]:FOR[zzz_FreeIva]
 {
 	%FreeIva_AutoPassThrough_VolumePercent = #$/FreeIva_AutoPassThrough_VolumeScalar$
 	@FreeIva_AutoPassThrough_VolumePercent *= -100 // volumeScalar is negative
@@ -306,7 +331,7 @@ B9_TANK_TYPE
 }
 
 // step 4.B: add the FreeIva module for the structural variant case
-@PART:HAS[#FreeIva_AutoPassThrough[true]&#FreeIva_AutoPassThrough_StructuralVariant[true]]:FOR[zzz_FreeIva]
+@PART:HAS[#FreeIva_AutoPassThrough[true]&#FreeIva_AutoPassThrough_StructuralVariant[true]&!MODULE[ModuleFreeIva]]:FOR[zzz_FreeIva]
 {
 	MODULE
 	{