Merge pull request #60 from ChrisAdderley/dev

Release 1.0.0
post-kerbin-mining-corporation · Jul 26, 2019 · 427cea0 · 427cea0
2 parents 2738ff7 + a02848b
commit 427cea0
Show file tree

Hide file tree

Showing 96 changed files with 6,829 additions and 60 deletions.
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -11,21 +11,21 @@ dependencies:  # Configure dependencies
     version: 4.0.2
     location: s3
   B9PartSwitch:
-    version: 2.8.0
+    version: 2.8.1
     location: s3
   CommunityResourcePack:
     version: 1.0.0
     location: s3
   DynamicBatteryStorage:
-    tag: 2.0.1
+    tag: 2.0.2
     location: github
     repository: ChrisAdderley/DynamicBatteryStorage
   DeployableEngines:
-    tag: 1.0.1
+    tag: 1.1.0
     location: github
     repository: ChrisAdderley/DeployableEngines
   CryoTanks:
-    tag: 1.1.4
+    tag: 1.2.0
     location: github
     repository: ChrisAdderley/CryoTanks
 deploy:

diff --git a/CKAN/CryoEngines-Restock.netkan b/CKAN/CryoEngines-Restock.netkan
@@ -0,0 +1,27 @@
+{
+    "spec_version": "v1.4",
+    "identifier": "CryoEngines-Restock",
+    "$kref": "#/ckan/spacedock/709",
+    "$vref": "#/ckan/ksp-avc/GameData/CryoEngines/Versioning/CryoEngines.version",
+    "x_netkan_epoch": 1,
+    "name": "Cryogenic Engines - Restock",
+    "abstract": "Optional patch to convert some engines in Restock and ReStock+ to use cryogenic fuel, improving efficiency. Will affect savegames!",
+    "license": "MIT",
+    "resources": {
+      "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/106089-16x-cryogenic-engines-high-isp-chemical-rockets-january-21/",
+      "repository": "https://github.com/ChrisAdderley/CryoEngines"
+    },
+    "depends": [
+        { "name" : "CryoEngines" },
+        { "name" : "ReStock" }
+    ],
+    "conflicts": [
+        {"name": "CryoEngines-LFO" }
+    ],
+    "recommends": [
+        { "name": "ReStockPlus" }
+    ],
+    "install": [
+        { "find" : "CryoEnginesRestock", "install_to" : "GameData" }
+    ]
+}
diff --git a/Extras/CryoEnginesLFO/CryoEnginesLFO.cfg b/Extras/CryoEnginesLFO/CryoEnginesLFO.cfg
@@ -1,5 +1,233 @@
-// Sets cryoEngines to use lFO at 30 lower Isp
+// Sets all CryoEngines parts to use LFO instead of LH2O at 70s lower Isp
 
+
+@PART[cryoengine-stromboli-1]
+{
+	@MODULE[ModuleEnginesFX]
+    {
+
+		!atmosphereCurve {}
+		atmosphereCurve
+		{
+			key = 0 300
+			key = 1 255
+			key = 4 200
+		}
+
+		@PROPELLANT[LqdHydrogen]
+		{
+			@name = LiquidFuel
+			@ratio = 0.9
+		}
+		@PROPELLANT[Oxidizer]
+		{
+			@ratio = 1.1
+		}
+
+	}
+}
+
+@PART[cryoengine-vesuvius-1]
+{
+	@MODULE[ModuleEnginesFX]
+    {
+
+		!atmosphereCurve {}
+		atmosphereCurve
+		{
+			key = 0 355
+			key = 1 305
+			key = 4 200
+		}
+
+		@PROPELLANT[LqdHydrogen]
+		{
+			@name = LiquidFuel
+			@ratio = 0.9
+		}
+		@PROPELLANT[Oxidizer]
+		{
+			@ratio = 1.1
+		}
+
+	}
+}
+@PART[cryoengine-hecate-1]
+{
+	@MODULE[ModuleEnginesFX]
+    {
+
+		!atmosphereCurve {}
+		atmosphereCurve
+		{
+			key = 0 395
+			key = 1 60
+			key = 4 0.001
+		}
+		@PROPELLANT[LqdHydrogen]
+		{
+			@name = LiquidFuel
+			@ratio = 0.9
+		}
+		@PROPELLANT[Oxidizer]
+		{
+			@ratio = 1.1
+		}
+	}
+}
+
+@PART[cryoengine-erebus-1]
+{
+	@MODULE[ModuleEnginesFX]
+    {
+
+		!atmosphereCurve {}
+		atmosphereCurve
+		{
+			key = 0 340
+			key = 1 300
+			key = 4 200
+		}
+
+		@PROPELLANT[LqdHydrogen]
+		{
+			@name = LiquidFuel
+			@ratio = 0.9
+		}
+		@PROPELLANT[Oxidizer]
+		{
+			@ratio = 1.1
+		}
+
+	}
+}
+@PART[cryoengine-pavonis-1]
+{
+	@MODULE[ModuleEnginesFX]
+    {
+
+		!atmosphereCurve {}
+		atmosphereCurve
+		{
+			key = 0 398
+			key = 1 70
+			key = 4 0.001
+		}
+		@PROPELLANT[LqdHydrogen]
+		{
+			@name = LiquidFuel
+			@ratio = 0.9
+		}
+		@PROPELLANT[Oxidizer]
+		{
+			@ratio = 1.1
+		}
+	}
+}
+
+@PART[cryoengine-fuji-1]
+{
+	@MODULE[ModuleEnginesFX]
+    {
+
+		!atmosphereCurve {}
+		atmosphereCurve
+		{
+			key = 0 452
+			key = 1 298
+			key = 4 200
+		}
+
+		@PROPELLANT[LqdHydrogen]
+		{
+			@name = LiquidFuel
+			@ratio = 0.9
+		}
+		@PROPELLANT[Oxidizer]
+		{
+			@ratio = 1.1
+		}
+
+	}
+}
+@PART[cryoengine-ulysses-1]
+{
+	@MODULE[ModuleEnginesFX]
+    {
+
+		!atmosphereCurve {}
+		atmosphereCurve
+		{
+			key = 0 388
+			key = 1 220
+			key = 4 0.001
+		}
+		@PROPELLANT[LqdHydrogen]
+		{
+			@name = LiquidFuel
+			@ratio = 0.9
+		}
+		@PROPELLANT[Oxidizer]
+		{
+			@ratio = 1.1
+		}
+	}
+}
+
+
+@PART[cryoengine-etna-1]
+{
+	@MODULE[ModuleEnginesFX]
+    {
+
+		!atmosphereCurve {}
+		atmosphereCurve
+		{
+			key = 0 340
+			key = 1 295
+			key = 4 200
+		}
+
+		@PROPELLANT[LqdHydrogen]
+		{
+			@name = LiquidFuel
+			@ratio = 0.9
+		}
+		@PROPELLANT[Oxidizer]
+		{
+			@ratio = 1.1
+		}
+
+	}
+}
+@PART[cryoengine-tharsis-1]
+{
+	@MODULE[ModuleEnginesFX]
+    {
+
+		!atmosphereCurve {}
+		atmosphereCurve
+		{
+			key = 0 398
+			key = 1 70
+			key = 4 0.001
+		}
+		@PROPELLANT[LqdHydrogen]
+		{
+			@name = LiquidFuel
+			@ratio = 0.9
+		}
+		@PROPELLANT[Oxidizer]
+		{
+			@ratio = 1.1
+		}
+	}
+}
+
+
+
+
+// Old (pre-0.7.0 parts)
 @PART[cryoengine-125-1]
 {
 	@MODULE[ModuleEnginesFX]