update to v3.2

ferram4 · Jun 30, 2016 · 360ac60 · 360ac60
1 parent 0028e5f
commit 360ac60
Show file tree

Hide file tree

Showing 18 changed files with 47 additions and 29 deletions.
diff --git a/GameData/KerbalJointReinforcement/KerbalJointReinforcement.version b/GameData/KerbalJointReinforcement/KerbalJointReinforcement.version
@@ -8,8 +8,8 @@
   },
   "VERSION" : {
     "MAJOR" : 3,
-    "MINOR" : 1,
-    "PATCH" : 7
+    "MINOR" : 2,
+    "PATCH" : 0
   },
   "KSP_VERSION_MIN" : {
     "MAJOR" : 1,
@@ -19,7 +19,7 @@
   "KSP_VERSION_MAX" : {
     "MAJOR" : 1,
     "MINOR" : 1,
-    "PATCH" : 2
+    "PATCH" : 3
   }
 }
 
diff --git a/GameData/KerbalJointReinforcement/Plugin/KerbalJointReinforcement.dll b/GameData/KerbalJointReinforcement/Plugin/KerbalJointReinforcement.dll
diff --git a/KerbalJointReinforcement/KerbalJointReinforcement.v12.suo b/KerbalJointReinforcement/KerbalJointReinforcement.v12.suo
diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/KJRDecouplerReinforcementModule.cs b/KerbalJointReinforcement/KerbalJointReinforcement/KJRDecouplerReinforcementModule.cs
@@ -1,5 +1,5 @@
 /*
-Kerbal Joint Reinforcement, v3.1.7
+Kerbal Joint Reinforcement, v3.2.0
 Copyright 2015, Michael Ferrara, aka Ferram4
 
     This file is part of Kerbal Joint Reinforcement.

diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/KJRJointUtils.cs b/KerbalJointReinforcement/KerbalJointReinforcement/KJRJointUtils.cs
@@ -1,5 +1,5 @@
 /*
-Kerbal Joint Reinforcement, v3.1.7
+Kerbal Joint Reinforcement, v3.2.0
 Copyright 2015, Michael Ferrara, aka Ferram4
 
     This file is part of Kerbal Joint Reinforcement.

diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/KJRLaunchClampReinforcementModule.cs b/KerbalJointReinforcement/KerbalJointReinforcement/KJRLaunchClampReinforcementModule.cs
@@ -1,5 +1,5 @@
 /*
-Kerbal Joint Reinforcement, v3.1.7
+Kerbal Joint Reinforcement, v3.2.0
 Copyright 2015, Michael Ferrara, aka Ferram4
 
     This file is part of Kerbal Joint Reinforcement.

diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/KJRManager.cs b/KerbalJointReinforcement/KerbalJointReinforcement/KJRManager.cs
@@ -1,5 +1,5 @@
 /*
-Kerbal Joint Reinforcement, v3.1.7
+Kerbal Joint Reinforcement, v3.2.0
 Copyright 2015, Michael Ferrara, aka Ferram4
 
     This file is part of Kerbal Joint Reinforcement.
@@ -36,7 +36,6 @@ public class KJRManager : MonoBehaviour
 
         FloatCurve physicsEasingCurve = new FloatCurve();
         int numTicksForEasing = 70;
-        int debugJointCount = 0;
 
         public void Awake()
         {
@@ -59,7 +58,7 @@ public void Start()
 
             physicsEasingCurve.Add(numTicksForEasing, 1);
             physicsEasingCurve.Add(0, 0);
-            
+
         }
 
         public void OnDestroy()
@@ -231,11 +230,10 @@ public void FixedUpdate()
         {
             if (FlightGlobals.ready && FlightGlobals.Vessels != null)
             {
-                List<Vessel> removeVessels = new List<Vessel>();
-                List<Vessel> tmpList = new List<Vessel>(vesselOffRailsTick.Keys);
-                foreach(Vessel v in tmpList)
+                for(int i = 0; i < updatedVessels.Count; ++i)
                 {
-                    if (v == null)
+                    Vessel v = updatedVessels[i];
+                    if (v == null || !vesselOffRailsTick.ContainsKey(v))
                         continue;
 
                     int tick = vesselOffRailsTick[v];
@@ -320,7 +318,7 @@ public void FixedUpdate()
                                 p.attachJoint.SetUnbreakable(false);
                         }
 
-                        removeVessels.Add(v);
+                        vesselOffRailsTick.Remove(v);
                         if (InputLockManager.GetControlLock("KJRLoadLock") == ControlTypes.ALL_SHIP_CONTROLS)
                             InputLockManager.RemoveControlLock("KJRLoadLock");
                     }
@@ -333,13 +331,11 @@ public void FixedUpdate()
                                 p.attachJoint.SetUnbreakable(false);
                         }
 
-                        removeVessels.Add(v);
+                        vesselOffRailsTick.Remove(v);
                         if (InputLockManager.GetControlLock("KJRLoadLock") == ControlTypes.ALL_SHIP_CONTROLS)
                             InputLockManager.RemoveControlLock("KJRLoadLock");
                     }
                 }
-                foreach (Vessel v in removeVessels)
-                    vesselOffRailsTick.Remove(v);
             }
         }
 
@@ -554,8 +550,8 @@ private void UpdatePartJoint(Part p)
                 }
 
 
-                float breakForce = p.breakingForce * KJRJointUtils.breakForceMultiplier;
-                float breakTorque = p.breakingTorque * KJRJointUtils.breakTorqueMultiplier;
+                float breakForce = Math.Min(p.breakingForce, connectedPart.breakingForce) * KJRJointUtils.breakForceMultiplier;
+                float breakTorque = Math.Min(p.breakingTorque, connectedPart.breakingTorque) * KJRJointUtils.breakTorqueMultiplier;
                 Vector3 anchor = j.anchor;
                 Vector3 connectedAnchor = j.connectedAnchor;
                 Vector3 axis = j.axis;
@@ -668,11 +664,10 @@ private void UpdatePartJoint(Part p)
 
                 breakForce = Mathf.Max(KJRJointUtils.breakStrengthPerArea * area, breakForce);
                 breakTorque = Mathf.Max(KJRJointUtils.breakTorquePerMOI * momentOfInertia, breakTorque);
-
 
                 JointDrive angDrive = j.angularXDrive;
                 angDrive.positionSpring = Mathf.Max(momentOfInertia * KJRJointUtils.angularDriveSpring, angDrive.positionSpring);
-                angDrive.positionDamper = Mathf.Max(momentOfInertia * KJRJointUtils.angularDriveDamper, angDrive.positionDamper);
+                angDrive.positionDamper = Mathf.Max(momentOfInertia * KJRJointUtils.angularDriveDamper * 0.1f, angDrive.positionDamper);
                 angDrive.maximumForce = breakTorque;
                 /*float moi_avg = p.rb.inertiaTensor.magnitude;
 
@@ -690,7 +685,6 @@ private void UpdatePartJoint(Part p)
                 linDrive.maximumForce = breakForce;
                 j.xDrive = j.yDrive = j.zDrive = linDrive;
 
-
                 SoftJointLimit lim = new SoftJointLimit();
                 lim.limit = 0;
                 lim.bounciness = 0;
@@ -772,7 +766,7 @@ private void UpdatePartJoint(Part p)
                         }
                         else
                             massRatioBelowThreshold = true;
-                    } while (!massRatioBelowThreshold && numPartsFurther < 5);
+                    } while (!massRatioBelowThreshold);// && numPartsFurther < 5);
 
                     if (connectedRb != null && !multiJointManager.CheckMultiJointBetweenParts(p, newConnectedPart))
                     {

diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/KJRMultiJointManager.cs b/KerbalJointReinforcement/KerbalJointReinforcement/KJRMultiJointManager.cs
@@ -1,5 +1,5 @@
 /*
-Kerbal Joint Reinforcement, v3.1.7
+Kerbal Joint Reinforcement, v3.2.0
 Copyright 2015, Michael Ferrara, aka Ferram4
 
     This file is part of Kerbal Joint Reinforcement.

diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/KerbalJointReinforcement.csproj b/KerbalJointReinforcement/KerbalJointReinforcement/KerbalJointReinforcement.csproj
@@ -35,21 +35,21 @@
   <ItemGroup>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Games\KSP 1.1\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\..\..\..\..\Games\KSP 1.1.3\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="KSPUtil, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Games\KSP 1.1\KSP_x64_Data\Managed\KSPUtil.dll</HintPath>
+      <HintPath>..\..\..\..\..\Games\KSP 1.1.3\KSP_x64_Data\Managed\KSPUtil.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Games\KSP 1.1\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
+      <HintPath>..\..\..\..\..\Games\KSP 1.1.3\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Games\KSP 1.1\KSP_x64_Data\Managed\UnityEngine.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\Games\KSP 1.1.3\KSP_x64_Data\Managed\UnityEngine.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/...rcement/KerbalJointReinforcement/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/...rcement/KerbalJointReinforcement/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/...t/KerbalJointReinforcement/obj/Debug/KerbalJointReinforcement.csproj.FileListAbsolute.txt b/...t/KerbalJointReinforcement/obj/Debug/KerbalJointReinforcement.csproj.FileListAbsolute.txt
@@ -9,3 +9,22 @@ C:\Users\ferram4\Documents\Visual Studio 2010\Projects\jointfix\jointfix\bin\Deb
 C:\Users\ferram4\Documents\Visual Studio 2010\Projects\jointfix\jointfix\obj\Debug\ResolveAssemblyReference.cache
 C:\Users\ferram4\Documents\Visual Studio 2010\Projects\jointfix\jointfix\obj\Debug\KerbalJointReinforcement.dll
 C:\Users\ferram4\Documents\Visual Studio 2010\Projects\jointfix\jointfix\obj\Debug\KerbalJointReinforcement.pdb
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\KerbalJointReinforcement.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\KerbalJointReinforcement.pdb
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\Assembly-CSharp.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\KSPUtil.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\UnityEngine.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\UnityEngine.UI.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\Assembly-CSharp-firstpass.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\SaveUpgradePipeline.Core.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\TrackIRUnity.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\KSPAssets.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\System.Xml.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\Mono.Cecil.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\Vectrosity.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\TDx.TDxInput.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\Mono.Security.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\bin\Debug\UnityEngine.xml
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\obj\Debug\KerbalJointReinforcement.csprojResolveAssemblyReference.cache
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\obj\Debug\KerbalJointReinforcement.dll
+C:\Users\ferram4\Kerbal-Joint-Reinforcement\KerbalJointReinforcement\KerbalJointReinforcement\obj\Debug\KerbalJointReinforcement.pdb
diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/obj/Debug/KerbalJointReinforcement.dll b/KerbalJointReinforcement/KerbalJointReinforcement/obj/Debug/KerbalJointReinforcement.dll
diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/obj/Debug/KerbalJointReinforcement.pdb b/KerbalJointReinforcement/KerbalJointReinforcement/obj/Debug/KerbalJointReinforcement.pdb
diff --git a/...ement/KerbalJointReinforcement/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/...ement/KerbalJointReinforcement/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/...ntReinforcement/obj/Release/KerbalJointReinforcement.csprojResolveAssemblyReference.cache b/...ntReinforcement/obj/Release/KerbalJointReinforcement.csprojResolveAssemblyReference.cache
diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/obj/Release/KerbalJointReinforcement.dll b/KerbalJointReinforcement/KerbalJointReinforcement/obj/Release/KerbalJointReinforcement.dll
diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/obj/Release/KerbalJointReinforcement.pdb b/KerbalJointReinforcement/KerbalJointReinforcement/obj/Release/KerbalJointReinforcement.pdb
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Kerbal Joint Reinforcement, v3.1.7
+Kerbal Joint Reinforcement, v3.2.0
 ==========================
 
 Physics stabilizer plugin for Kerbal Space Program
@@ -119,6 +119,11 @@ These types are currently not used, but removing the a in front of them will cau
 ***********************
 ****** CHANGELOG ******
 ***********************
+v3.2.0
+	Features  
+	--Recompile to ensure KSP 1.1.3 compatibility  
+	--Change multi-part-joint system to stabilize space stations and similar vehicles with very large masses connected by very flexy parts  
+
 v3.1.7  
 	Features  
 	--Recompile to ensure KSP 1.1.2 compatibility, especially within CompatibilityChecker utility