set pilots default center in competition

BahamutoD · Feb 19, 2016 · f160241 · f160241
1 parent 0029467
commit f160241
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/BahaTurret/BDATargetManager.cs b/BahaTurret/BDATargetManager.cs
@@ -966,6 +966,8 @@ IEnumerator CompetitionModeRoutine(float distance)
 			aLeader.CommandFlyTo(aDestination);
 			bLeader.CommandFlyTo(bDestination);
 
+			Vector3 centerGPS = VectorUtils.WorldPositionToGeoCoords(center, FlightGlobals.currentMainBody);
+
 			//wait till everyone is in position
 			bool waiting = true;
 			while(waiting)
@@ -1039,6 +1041,8 @@ IEnumerator CompetitionModeRoutine(float distance)
 
 					//release command
 					p.ReleaseCommand();
+					p.defaultOrbitCoords = centerGPS;
+
 				}
 			}
 			competitionStatus = "Competition starting!  Good luck!";

diff --git a/BahaTurret/BDModulePilotAI.cs b/BahaTurret/BDModulePilotAI.cs
@@ -61,6 +61,7 @@ Transform velocityTransform
 
 		public MissileFire weaponManager;
 
+
 		[KSPField(isPersistant = true, guiActive = true, guiActiveEditor = true, guiName = "Default Alt."),
 		 UI_FloatRange(minValue = 500f, maxValue = 8500f, stepIncrement = 25f, scene = UI_Scene.All)]
 		public float defaultAltitude = 1500;
@@ -154,7 +155,7 @@ public float MaxLiftAcceleration
 		LineRenderer lr;
 		Vector3 flyingToPosition;
 
-		Vector3d defaultOrbitCoords;
+		public Vector3d defaultOrbitCoords;
 
 		//speed controller
 		BDAirspeedControl speedController;
@@ -943,7 +944,7 @@ void FlyToPosition(FlightCtrlState s, Vector3 targetPosition)
 
 			//roll
 			Vector3 currentRoll = -vesselTransform.forward;
-			float rollUp = (steerMode == SteerModes.Aiming ? 5f : 22f);
+			float rollUp = (steerMode == SteerModes.Aiming ? 5f : 10f);
 			if(steerMode == SteerModes.NormalFlight)
 			{
 				rollUp += (1 - finalMaxSteer) * 10f;
@@ -968,6 +969,8 @@ void FlyToPosition(FlightCtrlState s, Vector3 targetPosition)
 			//
 		}
 
+
+
 		void FlyExtend(FlightCtrlState s, Vector3 tPosition)
 		{
 			if(weaponManager)

diff --git a/BahaTurret/bin/Release/BahaTurret.dll b/BahaTurret/bin/Release/BahaTurret.dll
diff --git a/BahaTurret/obj/x86/Release/BahaTurret.dll b/BahaTurret/obj/x86/Release/BahaTurret.dll