Merge pull request #30 from post-kerbin-mining-corporation/dev

Converter updates and fixes
post-kerbin-mining-corporation · Dec 9, 2020 · 6cd0c7e · 6cd0c7e
2 parents acbca37 + a9c4006
commit 6cd0c7e
Show file tree

Hide file tree

Showing 18 changed files with 139 additions and 196 deletions.
diff --git a/Extras/SystemHeatConverters/CryoTanks/SystemHeatCryoISRU-LCH4.cfg b/Extras/SystemHeatConverters/CryoTanks/SystemHeatCryoISRU-LCH4.cfg
@@ -27,11 +27,9 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 40
-    }
+
+    // Heat generation (kW)
+    systemPower = 40
 
     !ThermalEfficiency  {} 
     !TemperatureModifier {}
@@ -62,11 +60,9 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 40
-    }
+
+    // Heat generation (kW)
+    systemPower = 40
 
     !ThermalEfficiency  {} 
     !TemperatureModifier {}
@@ -103,11 +99,9 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 20
-    }
+
+    // Heat generation (kW)
+    systemPower = 20
 
     @UseSpecialistBonus = true
     @SpecialistEfficiencyFactor = 0.2
@@ -146,11 +140,9 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 20
-    }
+
+    // Heat generation (kW)
+    systemPower = 20
 
     @UseSpecialistBonus = true
     @SpecialistEfficiencyFactor = 0.2

diff --git a/Extras/SystemHeatConverters/CryoTanks/SystemHeatCryoISRU-LH2.cfg b/Extras/SystemHeatConverters/CryoTanks/SystemHeatCryoISRU-LH2.cfg
@@ -27,11 +27,9 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 40
-    }
+
+    // Heat generation (kW)
+    systemPower = 40
 
     !ThermalEfficiency  {} 
     !TemperatureModifier {}
@@ -62,11 +60,9 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 40
-    }
+
+    // Heat generation (kW)
+    systemPower = 40
 
     !ThermalEfficiency  {} 
     !TemperatureModifier {}
@@ -103,11 +99,9 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 20
-    }
+
+    // Heat generation (kW)
+    systemPower = 20
 
     @UseSpecialistBonus = true
     @SpecialistEfficiencyFactor = 0.2
@@ -146,12 +140,9 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 20
-    }
-
+
+    // Heat generation (kW)
+    systemPower = 20
     @UseSpecialistBonus = true
     @SpecialistEfficiencyFactor = 0.2
     @SpecialistBonusBase = 0.05

diff --git a/Extras/SystemHeatConverters/NearFutureElectrical/SystemHeatNuclearRecycler.cfg b/Extras/SystemHeatConverters/NearFutureElectrical/SystemHeatNuclearRecycler.cfg
@@ -37,11 +37,9 @@
         key = 700 1.0
         key = 850 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 175
-    }
+
+    // Heat generation (kW)
+    systemPower = 175
 
     !ThermalEfficiency  {} 
     !TemperatureModifier {}
@@ -70,19 +68,17 @@
         key = 700 1.0
         key = 850 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 75
-    }
+    // Heat generation (kW)
+    systemPower = 75
 
     !ThermalEfficiency  {} 
     !TemperatureModifier {}
 
     @GeneratesHeat = false
   }
+
   // Ore Processor
-  @MODULE[ModuleResourceConverter]:HAS[!OUTPUT_RESOURCE:HAS[#ResourceName[EnrichedUranium]],@INPUT_RESOURCE:HAS[#ResourceName[Ore]]]
+  @MODULE[ModuleResourceConverter]:HAS[@OUTPUT_RESOURCE:HAS[#ResourceName[EnrichedUranium]],@INPUT_RESOURCE:HAS[#ResourceName[Ore]]]
   {
     @name = ModuleSystemHeatConverter
     // must be unique
@@ -103,11 +99,9 @@
         key = 700 1.0
         key = 850 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 175
-    }
+
+    // Heat generation (kW)
+    systemPower = 175
 
     !ThermalEfficiency  {} 
     !TemperatureModifier {}

diff --git a/Extras/SystemHeatConverters/NearFuturePropulsion/SystemHeatLithiumISRU.cfg b/Extras/SystemHeatConverters/NearFuturePropulsion/SystemHeatLithiumISRU.cfg
@@ -1,7 +1,7 @@
 // Modifies stock ISRUs to use SystemHeat modules
 
 // ISRU
-@PART[ISRU]:FOR[z_SystemHeat]:AFTER[NearFuturePropulsion|FarFutureTechnologies]
+@PART[ISRU]:FOR[z_SystemHeat]:NEEDS[NearFuturePropulsion|FarFutureTechnologies]
 {
 
   // LF only converter
@@ -27,11 +27,8 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 80
-    }
+    // Heat generation (kW)
+    systemPower = 80
 
     !ThermalEfficiency  {} 
     !TemperatureModifier {}
@@ -41,7 +38,7 @@
 }
 
 // Mini ISRU
-@PART[MiniISRU]:FOR[z_SystemHeat]:AFTER[NearFuturePropulsion|FarFutureTechnologies]
+@PART[MiniISRU]:FOR[z_SystemHeat]:NEEDS[NearFuturePropulsion|FarFutureTechnologies]
 {
 
 
@@ -68,11 +65,8 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 40
-    }
+    // Heat generation (kW)
+    systemPower = 40
 
     @UseSpecialistBonus = true
     @SpecialistEfficiencyFactor = 0.2
@@ -91,7 +85,7 @@
 }
 
 // K&K Planetary ISRU from Nils277's Kerbal Planetary Base Systems
-@PART[KKAOSS_ISRU_g]:FOR[z_SystemHeat]:AFTER[NearFuturePropulsion|FarFutureTechnologies]
+@PART[KKAOSS_ISRU_g]:FOR[z_SystemHeat]:NEEDS[NearFuturePropulsion|FarFutureTechnologies]
 {
   
 
@@ -118,11 +112,8 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 30
-    }
+    // Heat generation (kW)
+    systemPower = 30
 
     @UseSpecialistBonus = true
     @SpecialistEfficiencyFactor = 0.2

diff --git a/Extras/SystemHeatConverters/PlanetaryBaseInc/ISRU.cfg b/Extras/SystemHeatConverters/PlanetaryBaseInc/ISRU.cfg
@@ -39,11 +39,8 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 40
-    }
+    // Heat generation (kW)
+    systemPower = 40
 
     !ThermalEfficiency  {} 
     !TemperatureModifier {}
@@ -73,11 +70,8 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 40
-    }
+    // Heat generation (kW)
+    systemPower = 40
 
     !ThermalEfficiency  {} 
     !TemperatureModifier {}
@@ -107,11 +101,8 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 40
-    }
+    // Heat generation (kW)
+    systemPower = 40
 
     !ThermalEfficiency  {} 
     !TemperatureModifier {}
@@ -141,11 +132,8 @@
         key = 1000 1.0
         key = 1300 0.0
     }
-    // Map system outlet temperature (K) to heat generation (kW)
-    systemPower
-    {
-        key = 0 40
-    }
+    // Heat generation (kW)
+    systemPower = 40