Merge pull request #219 from BobPalmer/DEVELOP

10/23/16 Release
UmbraSpaceIndustries · Oct 23, 2016 · 60cbd62 · 60cbd62
2 parents 0ea49bb + c607fdc
commit 60cbd62
Show file tree

Hide file tree

Showing 20 changed files with 97 additions and 113 deletions.
diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,8 @@
+0.8.3 - 2016.10.22
+------------------
+Fixed a bug causing NRE spam with toolbar (thanks Kerbas-ad-astra!)
+Added swap costs to the part info for swappable parts.
+
 0.8.2 - 2016.10.16
 ------------------
 Made the nuclear pulse engine atmospheric nerf optional

diff --git a/FOR_RELEASE/GameData/000_USITools/Logistics.cfg b/FOR_RELEASE/GameData/000_USITools/Logistics.cfg
@@ -4,4 +4,16 @@ LOGISTICS_SETTINGS
 	LogisticsTime = 5
 	WarehouseTime = 10
 	MaintenanceRange = 150
+}
+
+RESOURCE_DEFINITION  //Hidden resource used to manage mass
+{
+    name = Construction
+    density = 0.001
+    unitCost = 0
+    flowMode = NO_FLOW
+    transfer = NONE
+    isTweakable = false
+    isVisible = false
+    volume = 1
 }
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":2,
+         "PATCH":3,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,8 @@
+0.6.2 - 2016.10.15
+------------------
+Various KSPI resource updates
+Silicate resource distribution added
+
 0.6.1 - 2016.10.15
 ------------------
 Resorted KSPI resources alphabeticly, added abbreviation and Added LqdArgon, LqdFluorine, LqdNitrogen15, LqdOxygen18

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":1,
+         "PATCH":2,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg
@@ -1021,7 +1021,7 @@ RESOURCE_DEFINITION
 {
 	abbreviation = UF4
    	name = UF4
-   	density = 0.005
+   	density = 0.00670
    	flowMode = ALL_VESSEL
    	transfer = NONE
    	isTweakable = true
@@ -1075,7 +1075,7 @@ RESOURCE_DEFINITION
 {
 	abbreviation = ThF4
 	name = ThF4
-	density = 0.0042
+	density = 0.0063
 	flowMode = ALL_VESSEL
 	transfer = NONE
 	isTweakable = true
@@ -1103,12 +1103,12 @@ RESOURCE_DEFINITION
 {
 	abbreviation = UN
 	name = UraniumNitride
-	density = 0.0113
+	density = 0.0143
 	flowMode = STAGE_PRIORITY_FLOW
 	transfer = PUMP
 	isTweakable = true
     	isVisible = true
-	unitCost = 3718
+	unitCost = 158
 	volume = 1
     	ksparpicon = TriggerTech/KSPAlternateResourcePanel/Icons/UraniumNitride
 }

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Antimatter b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Antimatter
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Silicates.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/ResourceConfigs/Silicates.cfg
@@ -0,0 +1,47 @@
+//
+//	Community Resource Pack
+//	Resource: Silicates
+//
+//Resource types:  
+//	0 = Crustal			(Stuff you dig up)
+//	1 = Oceanic			(Stuff in the oceans)
+//	2 = Atmospheric		(Stuff in the air, varies with pressure)
+//	3 = Interplanetary	(Stuff you find between planets)
+//
+//Express all numbers as percentages 0.0-100.0, not 0.0-1.0!
+//
+
+GLOBAL_RESOURCE
+{
+	ResourceName = Silicates
+	ResourceType = 0
+
+	Distribution
+	{
+		PresenceChance = 60
+		MinAbundance = .001
+		MaxAbundance = 10
+		Variance = 10
+		Dispersal = 3
+	}
+}
+
+BIOME_RESOURCE
+{
+	ResourceName = Silicates
+	ResourceType = 0
+	PlanetName = Mun
+	BiomeName = Northern Basin
+
+	Distribution
+	{
+		PresenceChance = 100
+		MinAbundance = 1
+		MaxAbundance = 20
+		Variance = 10
+		Dispersal = 3
+	}
+}
+
+
+
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.3.3 - 2016.10.22
+------------------
+Dependency Updates
+
 0.3.2 - 2016.10.16
 ------------------
 Added Mulch to the supply pack

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/CHANGELOG.txt
@@ -1,3 +1,7 @@
+0.8.2 - 2016.10.22
+------------------
+Dependency Updates
+
 0.8.1 - 2016.10.16
 ------------------
 Dependency Updates

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/Karbonite.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Karbonite/Karbonite.version
@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":8,
-         "PATCH":1,
+         "PATCH":2,
          "BUILD":0
      },
      "KSP_VERSION":{

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_04.cfg
@@ -85,5 +85,8 @@ bulkheadProfiles = size4,srf
 	{
 		name = USI_ModuleRecycleBin
 	}
-
+	MODULE
+	{
+		name = ModuleWeightDistributableCargo
+	}
 }
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125.cfg
@@ -31,6 +31,8 @@ PART
 	manufacturer = Umbra Space Industries
 	description = A compact nuclear reactor for interplanetary operations, spacecraft, stations, and surface bases.
 
+	tags = USI Nuke base utility station colony coloni power electr distrib nuc reactor core thermal heat converter repair resource EnrichedUranium DepletedFuel XenonGas ElectricCharge e/c 
+
 	// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 	attachRules = 1,1,1,1,0
 

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_250.cfg
@@ -32,6 +32,8 @@ PART
 	manufacturer = Umbra Space Industries
 	description = A compact nuclear reactor for interplanetary operations, spacecraft, stations, and surface bases.
 
+	tags = USI Nuke base utility station colony coloni power electr distrib nuc reactor core thermal heat converter repair resource EnrichedUranium DepletedFuel XenonGas ElectricCharge e/c 
+
 	// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 	attachRules = 1,1,1,1,0
 

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_375.cfg
@@ -31,6 +31,8 @@ PART
 	manufacturer = Umbra Space Industries
 	description = A compact nuclear reactor for interplanetary operations, spacecraft, stations, and surface bases.
 
+	tags = USI Nuke base utility station colony coloni power electr distrib nuc reactor core thermal heat converter repair resource EnrichedUranium DepletedFuel XenonGas ElectricCharge e/c 
+
 	// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 	attachRules = 1,1,1,1,0
 

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_625.cfg
@@ -31,6 +31,8 @@ PART
 	manufacturer = Umbra Space Industries
 	description = A compact nuclear reactor for interplanetary operations, spacecraft, stations, and surface bases.
 
+	tags = USI Nuke base utility station colony coloni power electr distrib nuc reactor core thermal heat converter repair resource EnrichedUranium DepletedFuel XenonGas ElectricCharge e/c 
+
 	// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
 	attachRules = 1,1,1,1,0
 

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":2,
+         "PATCH":3,
          "BUILD":0
      },
      "KSP_VERSION":{
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,5 +85,8 @@ bulkheadProfiles = size4,srf @@
     	{
     		name = USI_ModuleRecycleBin
     	}
+    	MODULE
+    	{
+    		name = ModuleWeightDistributableCargo
+    	}
     }