Merge pull request #49 from BobPalmer/DEVELOP

Develop
UmbraSpaceIndustries · Mar 30, 2016 · 2a37fdf · 2a37fdf
2 parents 318dece + d6eeb65
commit 2a37fdf
Show file tree

Hide file tree

Showing 39 changed files with 296 additions and 136 deletions.
diff --git a/DynamicTanks/DynamicTanks/DynamicTanks.csproj b/DynamicTanks/DynamicTanks/DynamicTanks.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\..\KSP_DEV\GameData\000_USITools\</OutputPath>
+    <OutputPath>..\..\..\..\KSP_DEV\GameData\UmbraSpaceIndustries\ART\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -35,6 +35,10 @@
       <HintPath>..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="KSPUtil">
+      <HintPath>..\..\..\..\KSP_DEV\KSP_Data\Managed\KSPUtil.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -45,6 +49,10 @@
       <HintPath>..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="USI_CrewTank.cs" />

diff --git a/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt b/FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt
@@ -1,3 +1,9 @@
+0.7.0 - 2016.03.29
+------------------
+Compatibility with KSP 1.1
+Moved out DynamicTanks DLL to ART
+Info text / GUI text for Power Distributors, Couplers, and Warehouses (thanks bennord!)
+
 0.6.3 - 2016.03.02
 ------------------
 Logistics pulls are now restricted to warehouses

diff --git a/FOR_RELEASE/GameData/000_USITools/DynamicTanks.dll b/FOR_RELEASE/GameData/000_USITools/DynamicTanks.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.version b/FOR_RELEASE/GameData/000_USITools/USITools.version
@@ -9,14 +9,14 @@
      },
      "VERSION":{
          "MAJOR":0,
-         "MINOR":6,
-         "PATCH":3,
+         "MINOR":7,
+         "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -25,7 +25,7 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      }
  } 
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt b/FOR_RELEASE/GameData/CommunityResourcePack/CHANGELOG.txt
@@ -1,3 +1,8 @@
+0.5.0 - 2016.03.29
+------------------
+Compatibility with KSP 1.1
+Lowered cost of Supplies, Mulch and Fertilizer
+
 0.4.9 - 2016.02.01
 ------------------
 Added Hydrates as a resource and also to the resource map (represents regolith with captive water)

diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version b/FOR_RELEASE/GameData/CommunityResourcePack/CRP.version
@@ -9,14 +9,14 @@
      },
      "VERSION":{
          "MAJOR":0,
-         "MINOR":4,
-         "PATCH":9,
+         "MINOR":5,
+         "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
@@ -25,7 +25,7 @@
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      }
  } 
diff --git a/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg b/FOR_RELEASE/GameData/CommunityResourcePack/CommonResources.cfg
@@ -119,7 +119,7 @@ RESOURCE_DEFINITION
    density = 0.001
    flowMode = ALL_VESSEL
    transfer = PUMP
-   unitCost = 15
+   unitCost = 2.5
    isTweakable = true
 }
 
@@ -129,7 +129,7 @@ RESOURCE_DEFINITION
    density = 0.001
    flowMode = ALL_VESSEL
    transfer = PUMP
-   unitCost = 5
+   unitCost = 2
    isTweakable = true
 }
 
@@ -139,7 +139,7 @@ RESOURCE_DEFINITION
    density = 0.001
    flowMode = ALL_VESSEL
    transfer = PUMP
-   unitCost = 2.5
+   unitCost = 0
    isTweakable = true
 }
 

diff --git a/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll b/FOR_RELEASE/GameData/Firespitter/Plugins/Firespitter.dll
diff --git a/FOR_RELEASE/GameData/ModuleManager.2.6.18.dll b/FOR_RELEASE/GameData/ModuleManager.2.6.18.dll
diff --git a/FOR_RELEASE/GameData/ModuleManager.dll b/FOR_RELEASE/GameData/ModuleManager.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ART/ART.version b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ART/ART.version
@@ -9,23 +9,23 @@
      },
      "VERSION":{
          "MAJOR":0,
-         "MINOR":7,
-         "PATCH":2,
+         "MINOR":8,
+         "PATCH":0,
          "BUILD":0
      },
      "KSP_VERSION":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      },
      "KSP_VERSION_MIN":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      },
      "KSP_VERSION_MAX":{
          "MAJOR":1,
-         "MINOR":0,
-         "PATCH":5
+         "MINOR":1,
+         "PATCH":0
      }
  } 
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ART/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ART/CHANGELOG.txt
@@ -1,3 +1,8 @@
+0.8.0 - 2016.03.29
+------------
+Compatibility with KSP 1.1
+Bundled DynamicTanks
+
 0.7.2 - 2016.03.02
 ------------------
 Updated dependencies

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/ART/DynamicTanks.dll b/FOR_RELEASE/GameData/UmbraSpaceIndustries/ART/DynamicTanks.dll
diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt b/FOR_RELEASE/GameData/UmbraSpaceIndustries/CHANGELOG.txt
@@ -1,3 +1,9 @@
+0.2.0 - 2016.03.29
+-----------
+Compatibility with KSP 1.1
+Updated NFE configs (thanks Businfu!)
+Fixed 0.625m reactor to not produce too much depleted fuel
+
 0.1.8 - 2016.03.02
 ------------------
 Dependency Updates

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_01.cfg
@@ -30,8 +30,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 490
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer (01.25m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_02.cfg
@@ -30,8 +30,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 8000
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer (02.5m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_03.cfg
@@ -30,8 +30,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 25740
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer (03.75m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_04.cfg
@@ -30,8 +30,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 63360
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer (05.0m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_01.cfg
@@ -30,8 +30,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 3800
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = KIS Kontainer (01.25m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_02.cfg
@@ -30,8 +30,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 3800
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = KIS Kontainer (02.5m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_03.cfg
@@ -30,8 +30,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 3800
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = KIS Kontainer (03.75m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_04.cfg
@@ -30,8 +30,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 3800
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = KIS Kontainer (05.0m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_M.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Kontainer_KIS_M.cfg
@@ -28,8 +28,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 3800
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = KIS Kontainer (Stow-Pak)
 manufacturer = USI - Freight Division
 description = A radial stowage pack for KIS parts

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialLqdTank.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialLqdTank.cfg
@@ -18,8 +18,8 @@ PART
 	entryCost = 5200
 
 	cost = 450
-	category = none
-	subcategory = -1
+	category = Utility
+	subcategory = 0
 	title = MK-V Saddle Tank
 	manufacturer = USI - Freight Division
 	description = When you just need a small amount of supplies.

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialSupPak.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RadialSupPak.cfg
@@ -18,8 +18,8 @@ PART
 	entryCost = 5200
 
 	cost = 1750
-	category = none
-	subcategory = -1
+	category = Utility
+	subcategory = 0
 	title = MK-V Supply Redi-Pak
 	manufacturer = USI - Freight Division
 	description = When you just need a small amount of supplies.

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_00.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_00.cfg
@@ -31,8 +31,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 95
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer Tank - Round (00.313m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_01.cfg
@@ -29,8 +29,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 405
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer Tank - Round (01.8m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_02.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_02.cfg
@@ -31,8 +31,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 2640
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer Tank - Round (03.75m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_03.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_03.cfg
@@ -31,8 +31,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 8875
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer Tank - Round (05.6m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_04.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_04.cfg
@@ -31,8 +31,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 20400
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer Tank - Round (07.5m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_06.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_06.cfg
@@ -31,8 +31,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 66600
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer Tank - Round (11m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_08.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/RndTank_08.cfg
@@ -31,8 +31,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 159750
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer Tank - Round (15m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods

diff --git a/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_01.cfg b/FOR_RELEASE/GameData/UmbraSpaceIndustries/Kontainers/Tank_01.cfg
@@ -29,8 +29,8 @@ breakingTorque = 2072
 TechRequired = heavierRocketry
 entryCost = 7600
 cost = 345
-category = none
-subcategory = -1
+category = Utility
+subcategory = 0
 title = Kontainer Tank (01.25m)
 manufacturer = USI - Freight Division
 description = Shipping container for transporting various goods