Merge pull request #161 from BobPalmer/DEVELOP

2017.01.04 release
UmbraSpaceIndustries · Jan 5, 2017 · 01385d6 · 01385d6
2 parents a8f68b1 + 27a85dc
commit 01385d6
Show file tree

Hide file tree

Showing 24 changed files with 181 additions and 73 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.8.8 - 2017.01.01
+-------------------
+Dependency Updates
+
 0.8.7 - (KSP 1.2.2)
 -------------------
 Updates for KSP 1.2.2

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.dll.mdb b/FOR_RELEASE/GameData/000_USITools/USITools.dll.mdb
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
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":8,
-         "PATCH":7,
+         "PATCH":8,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/Asteroid.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/Asteroid.cfg
@@ -26,14 +26,37 @@
 		lowRange = 50
 		highRange = 75
 	}
-
+	MODULE
+	{
+		name = ModuleAsteroidResource
+		resourceName = Silicates
+		presenceChance = 80
+		lowRange = 50
+		highRange = 75
+	}
+	MODULE
+	{
+		name = ModuleAsteroidResource
+		resourceName = Hydrates
+		presenceChance = 80
+		lowRange = 50
+		highRange = 75
+	}
 	MODULE
 	{
 		name = ModuleAsteroidResource
 		resourceName = Minerals
 		presenceChance = 25
 		lowRange = 1
 		highRange = 10
+	}	
+	MODULE
+	{
+		name = ModuleAsteroidResource
+		resourceName = Gypsum
+		presenceChance = 25
+		lowRange = 1
+		highRange = 10
 	}
 
 	MODULE
@@ -72,6 +95,23 @@
 		highRange = 10
 	}
 
+	MODULE
+	{
+		name = ModuleAsteroidResource
+		resourceName = ExoticMinerals
+		presenceChance = 80
+		lowRange = 1
+		highRange = 30
+	}
+	MODULE
+	{
+		name = ModuleAsteroidResource
+		resourceName = RareMetals
+		presenceChance = 80
+		lowRange = 1
+		highRange = 30
+	}
+
 	MODULE
 	{
 		name = ModuleAsteroidResource
@@ -89,5 +129,4 @@
 		presenceChance = 100
 		resourceName = Rock
 	}		
-
 }
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/AsteroidScannerSetup.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/AsteroidScannerSetup.cfg
@@ -1,65 +0,0 @@
-@PART[SurfaceScanner]
-{
-	MODULE
-	{
-		name = ModuleAnalysisResource
-		resourceName = Water
-		abundance = 0
-	}
-
-	MODULE
-	{
-		name = ModuleAnalysisResource
-		resourceName = MetallicOre
-		abundance = 0
-	}
-
-	MODULE
-	{
-		name = ModuleAnalysisResource
-		resourceName = Substrate
-		abundance = 0
-	}
-
-	MODULE
-	{
-		name = ModuleAnalysisResource
-		resourceName = Minerals
-		abundance = 0
-	}
-
-	MODULE
-	{
-		name = ModuleAnalysisResource
-		resourceName = Karbonite
-		abundance = 0
-	}
-
-	MODULE
-	{
-		name = ModuleAnalysisResource
-		resourceName = Karborundum
-		abundance = 0
-	}	
-
-	MODULE
-	{
-		name = ModuleAnalysisResource
-		resourceName = Uraninite
-		abundance = 0
-	}
-
-	MODULE
-	{
-		name = ModuleAnalysisResource
-		resourceName = XenonGas
-		abundance = 0
-	}
-
-	MODULE
-	{
-		name = ModuleAnalysisResource
-		resourceName = ArgonGas
-		abundance = 0
-	}
-}

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.6.5 - (2017.01.01)
+--------------------
+Updated asteroid and scanner settings
+
 0.6.4 - (KSP 1.2.2)
 -------------------
 Added Decaborane as a resource

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":6,
-         "PATCH":4,
+         "PATCH":5,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg
@@ -99,6 +99,7 @@ RESOURCE_DEFINITION
    volume = 1
 }
 
+
 RESOURCE_DEFINITION
 {
    name = Dirt
@@ -525,6 +526,18 @@ RESOURCE_DEFINITION
 	volume = 1
 }
 
+RESOURCE_DEFINITION
+{
+   name = ResourceLode
+   density = 0.005
+   flowMode = ALL_VESSEL
+   transfer = NONE
+   unitCost = 250
+   isTweakable = true
+   isVisible = true
+   volume = 1
+}
+
 RESOURCE_DEFINITION
 {
 	name = DepletedUranium // Depleted fuel to preserve mass when burned, can be recycled

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/SurfaceScanner.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/SurfaceScanner.cfg
@@ -0,0 +1,101 @@
+@PART[SurfaceScanner]
+{
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = Dirt
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = ExoticMinerals
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = Gypsum
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = Hydrates
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = Karbonite
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = MetallicOre
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = Minerals
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = RareMetals
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = Silicates
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = Substrate
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = Uraninite
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+	MODULE
+	{
+		name = ModuleResourceScanner
+		ScannerType = 0
+		ResourceName = Water
+		MaxAbundanceAltitude = 1000
+		RequiresUnlock = false
+	}
+
+
+}
diff --git a/FOR_RELEASE/GameData/Firespitter/Firespitter.version b/FOR_RELEASE/GameData/Firespitter/Firespitter.version
@@ -4,7 +4,7 @@
   "VERSION": {
     "MAJOR": 7,
     "MINOR": 5,
-    "PATCH": 0
+    "PATCH": 1
   },
  "KSP_VERSION":{
 	 "MAJOR":1,

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.dll.mdb b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll.mdb
diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.pdb
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.3.4 - 2017.01.01
+-------------------
+All USI reactors now include a fill-cap of 95% to leave some headroom for solar panels.
+
 0.3.5 - (KSP 1.2.2)
 -------------------
 Updates for KSP 1.2.2

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.6.5 - 2017.01.01
+-------------------
+Dependency Updates
+
 0.6.4 - (KSP 1.2.2)
 -------------------
 Updates for KSP 1.2.2

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/FTT.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/FTT.version
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":6,
-         "PATCH":4,
+         "PATCH":5,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Pod_375_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/FTT/Parts/FTT_Pod_375_01.cfg
@@ -190,7 +190,7 @@ MODULE
 		INPUT_RESOURCE
 		{
 			ResourceName = ElectricCharge
-			Ratio = 5.25
+			Ratio = 0.525
 		}
 	}		
 }

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg
@@ -54,6 +54,7 @@ PART
 		ConverterName = Reactor
 		StartActionName = Start Reactor
 		StopActionName = Stop Reactor
+		 FillAmount = 0.95		
 		INPUT_RESOURCE
 		{
 			ResourceName = EnrichedUranium

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg
@@ -55,6 +55,7 @@ PART
 		ConverterName = Reactor
 		StartActionName = Start Reactor
 		StopActionName = Stop Reactor
+		 FillAmount = 0.95		
 		INPUT_RESOURCE
 		{
 			ResourceName = EnrichedUranium

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg
@@ -54,6 +54,7 @@ PART
 		ConverterName = Reactor
 		StartActionName = Start Reactor
 		StopActionName = Stop Reactor
+		 FillAmount = 0.95		
 		INPUT_RESOURCE
 		{
 			ResourceName = EnrichedUranium

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg
@@ -56,6 +56,7 @@ PART
 		ConverterName = Reactor
 		StartActionName = Start Reactor
 		StopActionName = Stop Reactor
+		 FillAmount = 0.95		
 		INPUT_RESOURCE
 		{
 			ResourceName = EnrichedUranium

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":3,
-         "PATCH":5,
+         "PATCH":6,
          "BUILD":0
      },
      "KSP_VERSION":{