1.8.2 signoff

JadeOfMaar · Jul 27, 2020 · 2a8fb41 · 2a8fb41
1 parent 91379ba
commit 2a8fb41
Show file tree

Hide file tree

Showing 6 changed files with 536 additions and 17 deletions.
diff --git a/Extras/RR_TankswitchForSquad.cfg b/Extras/RR_TankswitchForSquad.cfg
@@ -1,5 +1,5 @@
 // Change all stock tanks to hold fuel, without CryoTanks.
-@PART[airplaneTail,airplaneTailB]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+@PART[airplaneTail,airplaneTailB]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
 {
 	MODULE
 	{
@@ -11,7 +11,7 @@
 	}
 }
 
-@PART:HAS[#manufacturer[Jebediah*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Jebediah*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
 {
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
@@ -26,7 +26,7 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[Probodobodyne*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Probodobodyne*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
 {
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
@@ -41,7 +41,7 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[Rockomax*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Rockomax?Conglomerate],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
 {
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
@@ -56,7 +56,7 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[Kerbodyne*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Kerbodyne],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
 {
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
@@ -71,7 +71,24 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[C7?Aero*],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[C7?Aerospace?Division],!MODULE[ModuleB9PartSwitch],@RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+{
+	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
+	@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
+	!RESOURCE[LiquidFuel] {}
+	!RESOURCE[Oxidizer] {}
+	MODULE
+	{
+		name = ModuleB9PartSwitch
+		moduleID = RRStockSwitch
+		switcherDescription = RR Fuel
+		switchInFlight = True
+		baseVolume = #$../refVolume$
+	}
+}
+
+// Parts that hold MonoPropellant only. CryoTanks ignores these.
+@PART:HAS[#manufacturer[C7?Aerospace?Division],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
 {
 	refVolume = #$RESOURCE[MonoPropellant]/maxAmount$
 	!RESOURCE[MonoPropellant] {}
@@ -84,10 +101,36 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[C7?Aero*],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer],!MODULE[ModuleB9PartSwitch]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[Jebediah*],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
 {
-	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
-	!RESOURCE[LiquidFuel] {}
+	refVolume = #$RESOURCE[MonoPropellant]/maxAmount$
+	!RESOURCE[MonoPropellant] {}
+	MODULE
+	{
+		name = ModuleB9PartSwitch
+		moduleID = RRStockSwitch
+		switcherDescription = RR Fuel
+		switchInFlight = True
+		baseVolume = #$../refVolume$
+	}
+}
+@PART:HAS[#manufacturer[Stratus?Corporation],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+{
+	refVolume = #$RESOURCE[MonoPropellant]/maxAmount$
+	!RESOURCE[MonoPropellant] {}
+	MODULE
+	{
+		name = ModuleB9PartSwitch
+		moduleID = RRStockSwitch
+		switcherDescription = RR Fuel
+		switchInFlight = True
+		baseVolume = #$../refVolume$
+	}
+}
+@PART:HAS[#manufacturer[Kerbodyne],!MODULE[ModuleB9PartSwitch],@RESOURCE[MonoPropellant]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+{
+	refVolume = #$RESOURCE[MonoPropellant]/maxAmount$
+	!RESOURCE[MonoPropellant] {}
 	MODULE
 	{
 		name = ModuleB9PartSwitch
@@ -97,12 +140,13 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[C7?Aero*],@RESOURCE[LiquidFuel],@RESOURCE[Oxidizer],!MODULE[ModuleB9PartSwitch]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+
+
+// 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]:FOR[RationalResourcesSquad]
 {
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
-	@refVolume += #$RESOURCE[Oxidizer]/maxAmount$
 	!RESOURCE[LiquidFuel] {}
-	!RESOURCE[Oxidizer] {}
 	MODULE
 	{
 		name = ModuleB9PartSwitch
@@ -112,7 +156,7 @@
 		baseVolume = #$../refVolume$
 	}
 }
-@PART:HAS[#manufacturer[WinterOwl*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
+@PART:HAS[#manufacturer[WinterOwl*],!MODULE[ModuleB9PartSwitch],@RESOURCE[LiquidFuel],!RESOURCE[Oxidizer]]:NEEDS[B9PartSwitch,RationalResources,!CryoTanks,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
 {
 	refVolume = #$RESOURCE[LiquidFuel]/maxAmount$
 	!RESOURCE[LiquidFuel] {}
@@ -126,6 +170,7 @@
 	}
 }
 
+
 // Add primary tank types to stock parts.
 @PART:HAS[@MODULE[ModuleB9PartSwitch]]:NEEDS[B9PartSwitch,RationalResources,!ConfigurableContainers/Parts]:FOR[RationalResourcesSquad]
 {

diff --git a/GameData/RationalResources/CCK/Categories.cfg b/GameData/RationalResources/CCK/Categories.cfg
@@ -21,7 +21,7 @@
 {
 	@tags ^= :$: cck-rr:
 }
-@PART:HAS[#manufacturer[Kenron]]:NEEDS[RationalResourcesParts]
+@PART:HAS[#manufacturer[Kenron]]:AFTER[RationalResourcesParts]
 {
 	@tags ^= :$: cck-rr:
 }

diff --git a/GameData/RationalResources/Version/Changelog.md b/GameData/RationalResources/Version/Changelog.md
@@ -1,5 +1,10 @@
 # Rational Resources
 
+## 1.8.2
+* Fixed a small issue with CCK config.
+* Fixed some issues with stock tanks patch. (Didn't catch LF-only and Mono-only tanks when CryoTanks installed; Was not providing Methane and Methalox in some places it should.)
+* Updated patch to not provide MonoPropellant to CryoTanks.
+
 ## 1.8.1
 * Fixed some Kerbalism issues that sprung up.
 

diff --git a/GameData/RationalResources/Version/RationalResources.version b/GameData/RationalResources/Version/RationalResources.version
@@ -15,7 +15,7 @@
 	{
 		"MAJOR":1,
 		"MINOR":8,
-		"PATCH":1,
+		"PATCH":2,
 		"BUILD":0
 	},
 	"KSP_VERSION":