Merge pull request UmbraSpaceIndustries#38 from BobPalmer/DEVELOP

2017.01.15 Release

FOR_RELEASE/GameData/000_USITools/CHANGELOG.txt

@@ -1,3 +1,12 @@
+0.8.10 - 2017.01.15
+-------------------
+Performance Updates
+Fixed a bug that caused animations to auto-deploy
+
+0.8.9 - 2017.01.01
+-------------------
+Fixed bug w/swappable converter multi-bays
+
 0.8.8 - 2017.01.01
 -------------------
 Dependency Updates

FOR_RELEASE/GameData/000_USITools/TraitsAndEffects.cfg

@@ -0,0 +1,37 @@
+@EXPERIENCE_TRAIT[Pilot] {
+	EFFECT {
+		name = RepBoost
+	}
+	EFFECT
+	{
+		name = LogisticsSkill
+	}	
+	EFFECT
+	{
+		name = ExplorerSkill
+	}	
+}
+
+@EXPERIENCE_TRAIT[Engineer] {
+	EFFECT {
+		name = FundsBoost
+	}
+	EFFECT {
+		name = GeologySkill
+	}
+}
+
+@EXPERIENCE_TRAIT[Scientist] {
+	EFFECT {
+		name = ScienceBoost
+	}
+	EFFECT {
+		name = BotanySkill
+	}	
+	EFFECT {
+		name = AgronomySkill
+	}	
+	EFFECT {
+		name = MedicalSkill
+	}	
+}

FOR_RELEASE/GameData/000_USITools/USITools.version

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

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/CHANGELOG.txt

@@ -1,3 +1,7 @@
+0.1.10 - 2017.01.15
+-------------------
+Construction ports now default to snap being OFF to avoid confusion
+
 0.1.9 - 2017.01.01
 -------------------
 Dependency Updates

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Konstruction.version

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

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Parts/ConstructionPort0/dockingPortJr.cfg

@@ -15,7 +15,7 @@ PART
 	manufacturer = USI - Construction Division
 	subcategory = 0
 	title = Clamp-O-Tron Construction Port Jr.
-	description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and will snap to 90 degree angles.
+	description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and can angle snap.
 	attachRules = 1,0,1,0,0
 	mass = 0.02
 	dragModelType = default
@@ -43,5 +43,6 @@ PART
 	MODULE
 	{
 		name = ModuleWeldablePort
+		portSnap = false
 	}	
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Parts/ConstructionPort1/dockingPort.cfg

@@ -15,7 +15,7 @@ PART
 	manufacturer = USI - Construction Division
 	subcategory = 0
 	title = Clamp-O-Tron Construction Port
-	description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and will snap to 90 degree angles.
+	description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and can angle snap.
 	attachRules = 1,0,1,0,0
 	mass = 0.05
 	dragModelType = default
@@ -42,5 +42,6 @@ PART
 	MODULE
 	{
 		name = ModuleWeldablePort
+		portSnap = false
 	}	
 }

FOR_RELEASE/GameData/UmbraSpaceIndustries/Konstruction/Parts/ConstructionPort2/dockingPortSr.cfg

@@ -14,7 +14,7 @@ PART
 	manufacturer = USI - Construction Division
 	subcategory = 0
 	title = Clamp-O-Tron Construction Port Sr.
-	description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and will snap to 90 degree angles.
+	description = Variants of the popular Clamp-O-Tron Docking Ports that can be compressed for construction, and can angle snap.
 	attachRules = 1,0,1,0,0
 	mass = 0.2
 	dragModelType = default
@@ -42,5 +42,6 @@ PART
 	MODULE
 	{
 		name = ModuleWeldablePort
+		portSnap = false
 	}	
 }

Source/Konstruction/Konstruction/ModuleWeldablePort.cs

@@ -133,6 +133,42 @@ private void MergeParts(bool compress, bool fixRotation)
             PerformWeld(wData, compress, fixRotation);
         }
 
+        private bool ResetRootPart()
+        {
+            if (vessel.parts.Count < 4)
+            {
+                ScreenMessages.PostScreenMessage("The vessel must have at least four parts to perform welding!");
+                return false;
+            }
+
+            var potParts = new List<Part>();
+
+            var count = part.children.Count;
+            for (int i = 0; i < count; ++i)
+            {
+                potParts.Add(part.children[i]);
+                potParts.AddRange(part.children[i].children);
+            }
+
+            //Now roll through the potParts and find our match.  This covers
+            //both children and grandchildren... so we had better be able to find a part!
+
+            var pCount = potParts.Count;
+            for (int i = 0; i < pCount; ++i)
+            {
+                var c = potParts[i];
+                //Can't be another weldable port...
+                if (c.FindModuleImplementing<ModuleWeldablePort>() != null)
+                    continue;
+
+                //Winner!  This is our new root
+                c.SetHierarchyRoot(vessel.rootPart);
+                return true;
+            }
+            //No luck...
+            return false;
+        }
+
         private bool IsWeldablePort(Part p)
         {
             if (p == null)

Source/Konstruction/Konstruction/obj/Debug/Konstruction.csproj.FileListAbsolute.txt

@@ -11,4 +11,3 @@ E:\Dropbox\KSP_KSPTV\GameData\UmbraSpaceIndustries\Konstruction\Konstruction.pdb
 E:\Dropbox\USI-GIT\Konstruction\Source\Konstruction\Konstruction\obj\Debug\Konstruction.csprojResolveAssemblyReference.cache
 E:\Dropbox\USI-GIT\Konstruction\Source\Konstruction\Konstruction\obj\Debug\Konstruction.dll
 E:\Dropbox\USI-GIT\Konstruction\Source\Konstruction\Konstruction\obj\Debug\Konstruction.pdb
-D:\Dropbox\USI-GIT\Konstruction\Source\Konstruction\Konstruction\obj\Debug\Konstruction.csprojResolveAssemblyReference.cache