Merge pull request #76 from BobPalmer/DEVELOP

Develop

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

@@ -1,6 +1,19 @@
-0.8.12 - 2017.02.04
+0.8.16 - 2017.02.24
+-------------------
+Mechanics can now perform EVA maintenance
+Fixed an issue where resources were being double-consumed when converters were swapped
+
+0.8.15 - 2017.02.08
 ------------------
-Dependency Updates
+Fixed more nullref spam
+
+0.8.13 - 2017.02.04
+------------------
+Fixed some nullref spam in Animations related to logistics
+
+0.8.13 - 2017.02.04
+------------------
+Fixed an issue with the new warehouse toggles
 
 0.8.11 - 2017.01.16
 -------------------

FOR_RELEASE/GameData/000_USITools/TraitsAndEffects.cfg

@@ -19,6 +19,10 @@
 	EFFECT {
 		name = GeologySkill
 	}
+	EFFECT
+	{
+		name = ConstructionSkill
+	}	
 }
 
 @EXPERIENCE_TRAIT[Scientist] {

FOR_RELEASE/GameData/000_USITools/USITools.version

@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":8,
-         "PATCH":12,
+         "PATCH":16,
          "BUILD":0
      },
      "KSP_VERSION":{

FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt

@@ -1,3 +1,8 @@
+0.3.9 - 2017.02.24
+------------------
+Added larger nuclear waste and fuel containers
+Added a new 1.25 flat nuclear reactor with built in battery storage, and an output slightly above the 0.625m reactor
+
 0.3.8 - 2017.02.04
 ------------------
 Dependency Updates

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/DepletedFuelTank_Lg.cfg

@@ -0,0 +1,71 @@
+PART
+{
+// --- general parameters ---
+name = C3_DepletedFuelTank_Lg
+module = Part
+author = RoverDude
+
+// --- asset parameters ---
+
+rescaleFactor = 1
+MODEL
+{
+	model = UmbraSpaceIndustries/Kontainers/Assets/DepletedFuelTank
+	scale = 2,2,2
+}
+
+
+// --- node definitions ---
+// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
+node_attach = 0,0,0.65,0,0,-1,1
+
+breakingForce = 1024
+breakingTorque = 1024
+
+
+// --- editor parameters ---
+TechRequired = heavierRocketry
+entryCost = 7600
+cost = 30400
+category = none
+subcategory = -1
+title = Nuclear Waste Container (Large)
+manufacturer = USI - Logistics Division
+description = A large specialized container for holding nuclear waste
+
+// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
+attachRules = 0,1,0,0,0
+
+
+
+// --- standard part parameters ---
+mass = 0.8
+dragModelType = default
+maximum_drag = 0.20
+minimum_drag = 0.15
+angularDrag = 2
+crashTolerance = 45
+maxTemp = 2000
+bulkheadProfiles = srf
+
+	MODULE
+	{
+		name = USI_ModuleResourceWarehouse
+	}
+	MODULE
+	{
+		name = USI_ModuleRecycleBin
+	}
+
+	RESOURCE
+	{
+		name = DepletedFuel
+		amount = 0
+		maxAmount = 2400
+	}
+	MODULE
+	{
+		name = ModuleWeightDistributableCargo
+	}	
+
+}

FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/NukeFuelTank_Lg.cfg

@@ -0,0 +1,71 @@
+PART
+{
+// --- general parameters ---
+name = C3_NukeFuelTank_Lg
+module = Part
+author = RoverDude
+
+// --- asset parameters ---
+
+rescaleFactor = 1
+MODEL
+{
+	model = UmbraSpaceIndustries/Kontainers/Assets/NukeFuelTank
+	scale = 2,2,2
+}
+
+
+// --- node definitions ---
+// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
+node_attach = 0,0,0.65,0,0,-1,1
+
+breakingForce = 1024
+breakingTorque = 1024
+
+
+// --- editor parameters ---
+TechRequired = heavierRocketry
+entryCost = 7600
+cost = 2156000
+category = none
+subcategory = -1
+title = Nuclear Fuel Container  (Large)
+manufacturer = USI - Logistics Division
+description = A large specialized container for holding nuclear fuel
+
+// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
+attachRules = 0,1,0,0,0
+
+
+
+// --- standard part parameters ---
+mass = 0.8
+dragModelType = default
+maximum_drag = 0.20
+minimum_drag = 0.15
+angularDrag = 2
+crashTolerance = 8
+maxTemp = 2000
+bulkheadProfiles = srf
+
+	MODULE
+	{
+		name = USI_ModuleResourceWarehouse
+	}
+	MODULE
+	{
+		name = USI_ModuleRecycleBin
+	}
+
+
+	RESOURCE
+	{
+		name = EnrichedUranium
+		amount = 0
+		maxAmount = 2400
+	}
+	MODULE
+	{
+		name = ModuleWeightDistributableCargo
+	}	
+}

FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/Parts/Nuke_125_S.cfg

@@ -0,0 +1,146 @@
+PART
+{
+	// --- general parameters ---
+	name = USI_Nuke_125_S
+	module = Part
+	author = RoverDude
+
+	// --- asset parameters ---
+	scale = 1
+	rescaleFactor = 1
+	MODEL
+	{
+		model = UmbraSpaceIndustries/ReactorPack/Assets/Nuke_125_S
+	}
+
+	// --- node definitions ---
+	// definition format is Position X, Position Y, Position Z, Up X, Up Y, Up Z
+	node_attach = 0.0,0.0,0.625,0,0,-1,1
+	node_stack_bottom = 0.0, -0.45, 0.0, 0.0, -1.0, 0.0, 1
+	node_stack_top = 0.0, 0.45, 0.0, 0.0, 1.0, 0.0, 1
+	breakingForce = 12690
+	breakingTorque = 12690
+
+	// --- editor parameters ---
+	TechRequired = advScienceTech
+	entryCost = 3795
+	cost = 37950
+	category = Electrical
+	subcategory = 0
+	title = Nuclear Reactor (1.25m Short)
+	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
+
+	// --- standard part parameters ---
+	mass = 0.8
+	dragModelType = default
+	maximum_drag = 0.20
+	minimum_drag = 0.15
+	angularDrag = 2
+	crashTolerance = 12
+	maxTemp = 3400
+	MODULE
+	{
+		name = ModuleOverheatDisplay
+	}
+	MODULE
+	{
+		name = ModuleResourceConverter
+		ConverterName = Reactor
+		StartActionName = Start Reactor
+		StopActionName = Stop Reactor
+		 FillAmount = 0.95		
+		INPUT_RESOURCE
+		{
+			ResourceName = EnrichedUranium
+			Ratio = 0.00000016
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = DepletedFuel
+			Ratio = 0.000000107
+			DumpExcess = true		
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = XenonGas
+			Ratio = 0.000000053
+			DumpExcess = true		
+		}
+		OUTPUT_RESOURCE
+		{
+			ResourceName = ElectricCharge
+			Ratio = 40
+			DumpExcess = false		
+		}
+		AutoShutdown = true
+		TemperatureModifier
+		{
+			key = 0 1000000
+			key = 750 100000
+			key = 1000 10000
+			key = 1250 5000	
+			key = 2000 100	
+			key = 4000 0
+		}				
+		GeneratesHeat = true
+		DefaultShutoffTemp = .8
+		ThermalEfficiency 
+		{
+			key = 0 0 0 0
+			key = 500 0.1 0 0
+			key = 1000 1.0 0 0
+			key = 1250 0.1 0 0
+			key = 3000 0 0 0 
+		}			
+	}	
+
+	RESOURCE
+	{
+	 name = EnrichedUranium
+	 amount = 3
+	 maxAmount = 3
+	}
+	RESOURCE
+	{
+	 name = DepletedFuel
+	 amount = 0
+	 maxAmount = 3
+	}
+	RESOURCE
+	{
+	 name = ElectricCharge
+	 amount = 500
+	 maxAmount = 500
+	}
+	MODULE
+	{
+		name = USI_ModuleFieldRepair
+	}
+
+	MODULE
+	{
+		name = ModuleCoreHeat
+		CoreTempGoal = 1000					//Internal temp goal - we don't transfer till we hit this point
+		CoreToPartRatio = 0.1				//Scale back cooling if the part is this % of core temp
+		CoreTempGoalAdjustment = 0			//Dynamic goal adjustment
+		CoreEnergyMultiplier = 0.1			//What percentage of our core energy do we transfer to the part
+		HeatRadiantMultiplier = 0.05		//If the core is hotter, how much heat radiates?
+		CoolingRadiantMultiplier = 0		//If the core is colder, how much radiates?
+		HeatTransferMultiplier = 0			//If the part is hotter, how much heat transfers in?
+		CoolantTransferMultiplier = 0.01	//If the part is colder, how much of our energy can we transfer?
+		radiatorCoolingFactor = 1			//How much energy we pull from core with an active radiator?  >= 1
+		radiatorHeatingFactor = 0.01		//How much energy we push to the active radiator
+		MaxCalculationWarp = 1000			//Based on how dramatic the changes are, this is the max rate of change
+		CoreShutdownTemp = 4000				//At what core temperature do we shut down all generators on this part?
+		MaxCoolant = 250					//Maximum amount of radiator capacity we can consume - 50 = 1 small
+	}	
+}
+
+
+

FOR_RELEASE/GameData/UmbraSpaceIndustries/ReactorPack/ReactorPack_CTT.cfg

@@ -10,6 +10,11 @@
     @TechRequired = largeNuclearPower
 }
 
+@PART[USI_Nuke_125_S]:NEEDS[CommunityTechTree]
+{
+    @TechRequired = nuclearPower
+}
+
 @PART[USI_Nuke_250]:NEEDS[CommunityTechTree]
 {
     @TechRequired = advNuclearPower

FOR_RELEASE/GameData/UmbraSpaceIndustries/USICore.version

@@ -10,7 +10,7 @@
      "VERSION":{
          "MAJOR":0,
          "MINOR":3,
-         "PATCH":8,
+         "PATCH":9,
          "BUILD":0
      },
      "KSP_VERSION":{