Merge pull request #278 from BobPalmer/DEVELOP

KSP 1.11 Updates
UmbraSpaceIndustries · Dec 21, 2020 · 88971cc · 88971cc
2 parents b472b50 + be09a86
commit 88971cc
Show file tree

Hide file tree

Showing 32 changed files with 141 additions and 65 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg b/FOR_RELEASE/GameData/000_USITools/AddConsumers.cfg
@@ -5,3 +5,11 @@
 		name = ModuleLogisticsConsumer
 	}
 }
+
+@PART[landingLeg*,miniLandingLeg]:HAS[!MODULE[USI_InertialDampener]]
+{
+	MODULE
+	{
+		name = USI_InertialDampener
+	}
+}
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,11 @@
+1.4.0 - 2020.12.20
+------------------
+KSP 1.11 Compatibility
+
+1.3.0 - 2019.10.28
+------------------
+KSP 1.8.x Compatibility
+
 1.2.0 - 2019.08.04
 ------------------
 KSP 1.7.x Compatibility

diff --git a/FOR_RELEASE/GameData/000_USITools/Converters.cfg b/FOR_RELEASE/GameData/000_USITools/Converters.cfg
@@ -0,0 +1,8 @@
+// Prevent USI_Converter and USI_Harvester modules from automatically shutting down
+@PART[*]:HAS[@MODULE[USI_Converter]]
+{
+	@MODULE[USI_Converter]
+	{
+		%AutoShutdown = false
+	}
+}
diff --git a/FOR_RELEASE/GameData/000_USITools/Logistics.cfg b/FOR_RELEASE/GameData/000_USITools/Logistics.cfg
@@ -18,7 +18,31 @@ RESOURCE_DEFINITION  //Hidden resource used to manage mass
     volume = 1
 }
 
-@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[Machinery|EnrichedUranium|DepletedFuel|Recyclables]]:FOR[USITools]
+@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[Machinery]]:FOR[USITools]
+{
+    MODULE
+    {
+        name = USI_ModuleFieldRepair
+    }
+}
+
+@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[EnrichedUranium]]:FOR[USITools]
+{
+    MODULE
+    {
+        name = USI_ModuleFieldRepair
+    }
+}
+
+@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[DepletedFuel]]:FOR[USITools]
+{
+    MODULE
+    {
+        name = USI_ModuleFieldRepair
+    }
+}
+
+@PART[*]:HAS[!MODULE[USI_ModuleFieldRepair],@RESOURCE[Recyclables]]:FOR[USITools]
 {
     MODULE
     {

diff --git a/FOR_RELEASE/GameData/000_USITools/MiniAVC.dll b/FOR_RELEASE/GameData/000_USITools/MiniAVC.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.dll b/FOR_RELEASE/GameData/000_USITools/USITools.dll
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.pdb b/FOR_RELEASE/GameData/000_USITools/USITools.pdb
diff --git a/FOR_RELEASE/GameData/000_USITools/USITools.version b/FOR_RELEASE/GameData/000_USITools/USITools.version
@@ -9,23 +9,23 @@
      },
      "VERSION":{
          "MAJOR":1,
-         "MINOR":2,
+         "MINOR":4,
          "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":7,
-         "PATCH":3
+         "MINOR":11,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":6,
+         "MINOR":8,
          "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":8,
-         "PATCH":9
+         "MINOR":11,
+         "PATCH":99
      }
  } 
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,11 @@
+1.4.2 - 2020.12.20
+------------------
+KSP 1.11 Compatibility
+
+1.3.0 - 2019.10.28
+------------------
+KSP 1.8.x Compatibility
+
 1.2.0 - 2019.08.04
 ------------------
 KSP 1.7.x Compatibility

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
@@ -9,14 +9,14 @@
      },
      "VERSION":{
          "MAJOR":1,
-         "MINOR":2,
-         "PATCH":0,
+         "MINOR":4,
+         "PATCH":2,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":7,
-         "PATCH":3
+         "MINOR":8,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -25,7 +25,7 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":8,
-         "PATCH":9
-     }
+         "MINOR":99,
+         "PATCH":99
+     }	 
  } 
diff --git a/FOR_RELEASE/GameData/Firespitter/CHANGELOG.txt b/FOR_RELEASE/GameData/Firespitter/CHANGELOG.txt
@@ -0,0 +1,5 @@
+0.7.17 - 2020.12.20
+------------------
+KSP 1.11 Compatibility
+Converted Biplane cockpit into a crewed command seat
+Moved legacy biplane parts to the legacy parts folder - nab these if you need them.
diff --git a/FOR_RELEASE/GameData/Firespitter/Firespitter.version b/FOR_RELEASE/GameData/Firespitter/Firespitter.version
@@ -3,22 +3,22 @@
   "URL": "https://raw.githubusercontent.com/snjo/Firespitter/master/For%20release/Firespitter/Firespitter.version",
   "VERSION": {
     "MAJOR": 7,
-    "MINOR": 13,
+    "MINOR": 17,
     "PATCH": 0
   },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":7,
-         "PATCH":3
+         "MINOR":11,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":6,
+         "MINOR":8,
          "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":8,
-         "PATCH":9
+         "MINOR":11,
+         "PATCH":99
      }
 }
diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll
diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb
diff --git a/FOR_RELEASE/GameData/Firespitter/textures/particle.dds b/FOR_RELEASE/GameData/Firespitter/textures/particle.dds
diff --git a/FOR_RELEASE/GameData/Firespitter/textures/propwash.dds b/FOR_RELEASE/GameData/Firespitter/textures/propwash.dds
diff --git a/FOR_RELEASE/GameData/ModuleManager.4.0.2.dll b/FOR_RELEASE/GameData/ModuleManager.4.0.2.dll
diff --git a/FOR_RELEASE/GameData/ModuleManager.4.1.4.dll b/FOR_RELEASE/GameData/ModuleManager.4.1.4.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
@@ -1,3 +1,11 @@
+1.4.0 - 2020.12.20
+------------------
+KSP 1.11 Compatibility
+
+1.3.0 - 2019.10.28
+------------------
+KSP 1.8.x Compatibility
+
 1.2.0 - 2019.08.04
 ------------------
 KSP 1.7.x Compatibility

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/CHANGELOG.txt
@@ -1,3 +1,11 @@
+1.4.0 - 2020.12.20
+------------------
+KSP 1.11 Compatibility
+
+1.3.0 - 2019.10.28
+------------------
+KSP 1.8.x Compatibility
+
 1.2.0 - 2019.08.04
 ------------------
 KSP 1.7.x Compatibility

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/Karbonite.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/Karbonite.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/Karbonite.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/Karbonite.version
@@ -9,23 +9,23 @@
      },
      "VERSION":{
          "MAJOR":1,
-         "MINOR":2,
+         "MINOR":4,
          "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":7,
-         "PATCH":3
+         "MINOR":11,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":6,
+         "MINOR":8,
          "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":8,
-         "PATCH":9
+         "MINOR":11,
+         "PATCH":99
      }
  } 
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainers_CTT.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainers_CTT.cfg
@@ -176,3 +176,8 @@
 {
     @TechRequired = storageTech
 }
+
+@PART[StowPakSup]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = logistics
+}
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Localization/en-us.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Localization/en-us.cfg
@@ -46,7 +46,7 @@ Localization
 
 		// Inline cluster of rounded containers
 		#LOC_USI_C3_LqdTrussTank_title = Kontainer Tank - Quad-Round (1.8m x 7.5m)
-		#LOC_USI_C3_LqdTrussTank_description = Shipping container for transporting various goods;
+		#LOC_USI_C3_LqdTrussTank_description = Shipping container for transporting various goods.
 
 		// Stow-Pak containers
 		#LOC_USI_MountableLqdTank_title = SK-62L Supply Tank
@@ -57,8 +57,8 @@ Localization
 		#LOC_USI_RadialLqdTank_description = When you just need a small amount of supplies.
 		#LOC_USI_RadialSupPack_title = MK-V Supply Redi-Pak
 		#LOC_USI_RadialSupPack_description = When you just need a small amount of supplies.
-		#LOC_USI_StowPakSup_title = Supply Stow-Pak
-		#LOC_USI_StowPakSup_description = When you just need a miniscule amount of supplies.
+		#LOC_USI_StowPakSup_title = Kontainer Stow-Pak
+		#LOC_USI_StowPakSup_description = A radial stowage pack for transporting various goods.
 
 		// Rounded containers (All use the same description)
 		#LOC_USI_C3_RTank_00_title = Kontainer Tank - Round (00.313m)

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableLqdTank.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableLqdTank.cfg
@@ -15,16 +15,16 @@ PART:NEEDS[KIS]
 	node_stack_bottom = 0.0, -0.2477, 0.0, 0.0, -1.0, 0.0, 0
 
 	TechRequired = advConstruction
-	entryCost = 4160
+	entryCost = 2288
 
-	cost = 1400
+	cost = 198
 	category = none
 	subcategory = 0
 	title = #LOC_USI_MountableLqdTank_title
 	manufacturer = USI - Logistics Division
 	description = #LOC_USI_MountableLqdTank_description
 	attachRules = 1,0,0,1,1
-	mass = 0.125
+	mass = 0.06875
 	dragModelType = default
 	maximum_drag = 0.2
 	minimum_drag = 0.2
@@ -54,10 +54,10 @@ PART:NEEDS[KIS]
 	{
 		name = FSfuelSwitch
 		resourceNames = LiquidFuel,Oxidizer;Water;Chemicals;Mulch;LqdHydrogen;LiquidFuel;MonoPropellant
-		resourceAmounts = 90,110;1000;1000;1000;1500;200;200
+		resourceAmounts = 49.5,60.5;550;550;550;825;110;110
 		initialResourceAmounts = 0,0;0;0;0;0;0;0
-		tankCost = 91.8;0.8;16000;0;55.125;160;240
-		basePartMass = 0.125
+		tankCost = 50.49;0.44;8800;0;30.31875;88;132
+		basePartMass = 0.06875
 		tankMass = 0;0;0;0;0;0;0
 		hasGUI = false
 	}
@@ -80,15 +80,12 @@ PART:NEEDS[KIS]
 	MODULE
 	{
 		name = ModuleKISItemEvaTweaker
-		volumeOverride = 1100
-		editorItemsCategory = false
 		carriable = true
 		equipMode = part
 		equipSlot = jetpack
-		equipMeshName = jetpack_base01
-		equipBoneName = bn_jetpack01
-		equipPos = (0,0.21,-0.3)
-		equipDir = (280,0,0)
+		equipBoneName = aliasJetpack
+		equipPos = 0.0, 0.21, -0.3
+		equipDir = 280, 0, 0
 		runSpeed = 0.8
 	}
 }

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableSupPak.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/MountableSupPak.cfg
@@ -15,16 +15,16 @@ PART:NEEDS[KIS]
 	node_stack_bottom = 0.0, -0.2477, 0.0, 0.0, -1.0, 0.0, 0
 
 	TechRequired = advConstruction
-	entryCost = 4160
+	entryCost = 2288
 
-	cost = 1400
+	cost = 770
 	category = none
 	subcategory = 0
 	title = #LOC_USI_MountableSupPack_title
 	manufacturer = USI - Logistics Division
 	description = #LOC_USI_MountableSupPack_description
 	attachRules = 1,0,0,1,1
-	mass = 0.125
+	mass = 0.06875
 	dragModelType = default
 	maximum_drag = 0.2
 	minimum_drag = 0.2
@@ -54,10 +54,10 @@ PART:NEEDS[KIS]
 	{
 		name = FSfuelSwitch
 		resourceNames = MetallicOre;Uraninite;Substrate;Minerals;Karbonite;ExoticMinerals,RareMetals;MaterialKits;Metals;Polymers;Supplies,Mulch;Ore;Machinery;Recyclables;SpecializedParts;Fertilizer;Hydrates;Gypsum;Dirt;Silicates;Silicon;RefinedExotics;ColonySupplies;Organics;Rock;MaterialKits,SpecializedParts
-		resourceAmounts = 1000;1000;1000;1000;1000;500,500;1000;1000;1000;960,40;200;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;1000;850,170
+		resourceAmounts = 550;550;550;550;550;275,275;550;550;550;528,22;110;550;550;550;550;550;550;550;550;550;550;550;550;550;467.5,93.5
 		initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0;0,0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0,0
-		tankCost = 1760;700;300;800;320;150000;2000;14240;8000;2400;4;15800;7000;32000;2000;500;10;300;10;20;250000;15000;500;0.01;7140
-		basePartMass = 0.125
+		tankCost = 968;385;165;440;176;82500;1100;7832;4400;1320;2.2;8690;3850;17600;1100;275;5.5;165;5.5;11;137500;8250;275;0.0055;3927
+		basePartMass = 0.06875
 		tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
 		hasGUI = false
 	}
@@ -80,15 +80,12 @@ PART:NEEDS[KIS]
 	MODULE:NEEDS[KIS]
 	{
 		name = ModuleKISItemEvaTweaker
-		volumeOverride = 1100
-		editorItemsCategory = false
 		carriable = true
 		equipMode = part
 		equipSlot = jetpack
-		equipMeshName = jetpack_base01
-		equipBoneName = bn_jetpack01
-		equipPos = (0,0.21,-0.3)
-		equipDir = (280,0,0)
+		equipBoneName = aliasJetpack
+		equipPos = 0.0, 0.21, -0.3
+		equipDir = 280, 0, 0
 		runSpeed = 0.8
 	}
 }

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/StowPakSup.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/StowPakSup.cfg
@@ -17,9 +17,9 @@ PART
 	breakingForce = 2072
 	breakingTorque = 2072
 
-	TechRequired = advConstruction
+	TechRequired = heavierRocketry
 	entryCost = 7600
-	cost = 3800
+	cost = 95
 	category = none
 	subcategory = 0
 	title = #LOC_USI_StowPakSup_title
@@ -28,7 +28,7 @@ PART
 
 	attachRules = 1,1,1,1,0
 
-	mass = 0.1
+	mass = 0.05625
 	dragModelType = default
 	maximum_drag = 0.20
 	minimum_drag = 0.15
@@ -84,7 +84,7 @@ PART
 		resourceAmounts = 250;250;250;250;250;125,125;250;250;250;240,10;50;250;250;250;250;250;250;250;250;250;250;250;250;250;212,42
 		initialResourceAmounts = 0;0;0;0;0;0,0;0;0;0;0,0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0,0
 		tankCost = 440;175;75;200;80;37500;500;3560;2000;600;1;3950;1750;8000;500;125;10;300;2.5;5;62500;3750;125;0.01;1785
-		basePartMass = 0.1
+		basePartMass = 0.05625
 		tankMass = 0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0
 		hasGUI = false
 	}