Refactoring of multi position controller

Author: cesarBLG

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -486,6 +486,7 @@ public MSTSLocomotive(Simulator simulator, string wagPath)
             TrainBrakeController = new ScriptedBrakeController(this);
             EngineBrakeController = new ScriptedBrakeController(this);
             BrakemanBrakeController = new ScriptedBrakeController(this);
+            MultiPositionControllers = new List<MultiPositionController>();
             ThrottleController = new MSTSNotchController();
             DynamicBrakeController = new MSTSNotchController();
             TrainControlSystem = new ScriptedTrainControlSystem(this);
@@ -1221,8 +1222,7 @@ public override void Copy(MSTSWagon copy)
             WaterScoopWidthM = locoCopy.WaterScoopWidthM;
             MoveParamsToAxle();
             CruiseControl = locoCopy.CruiseControl?.Clone(this);
-            if (locoCopy.MultiPositionControllers != null)
-                MultiPositionControllers = locoCopy.CloneMPC(this);
+            MultiPositionControllers = locoCopy.CloneMPC(this);
         }
 
         /// <summary>
@@ -1423,6 +1423,10 @@ public override void Initialize()
             LocomotivePowerSupply?.Initialize();
             TrainControlSystem.Initialize();
             CruiseControl?.Initialize();
+            foreach (MultiPositionController mpc in MultiPositionControllers)
+            {
+                mpc.Initialize();
+            }
 
             if (MaxSteamHeatPressurePSI == 0)       // Check to see if steam heating is fitted to locomotive
             {
@@ -1708,10 +1712,6 @@ public void SetUpMPC(STFReader stf)
         {
             var multiPositionController = new MultiPositionController(this);
             multiPositionController.Parse(stf);
-            if (MultiPositionControllers == null)
-            {
-                MultiPositionControllers = new List<MultiPositionController>();
-            }
             MultiPositionControllers.Add(multiPositionController);
         }
 
@@ -1905,10 +1905,9 @@ public override void Update(float elapsedClockSeconds)
             // TODO  this is a wild simplification for electric and diesel electric
             UpdateTractiveForce(elapsedClockSeconds, ThrottlePercent / 100f, AbsSpeedMpS, AbsWheelSpeedMpS);
 
-            if (MultiPositionControllers != null)
+            foreach (MultiPositionController mpc in MultiPositionControllers)
             {
-                foreach (MultiPositionController mpc in MultiPositionControllers)
-                    mpc.Update(elapsedClockSeconds);
+                mpc.Update(elapsedClockSeconds);
             }
 
             ApplyDirectionToTractiveForce();
@@ -3377,20 +3376,15 @@ public void StartThrottleIncrease()
                 }
                 CruiseControl.SkipThrottleDisplay = false;
             }
-            if (MultiPositionControllers != null)
+            var mpc = MultiPositionControllers.Where(x => x.controllerBinding == ControllerBinding.Throttle).FirstOrDefault();
+            if (mpc != null)
             {
-                foreach (MultiPositionController mpc in MultiPositionControllers)
+                if (!mpc.StateChanged)
                 {
-                    if (mpc.controllerBinding == MultiPositionController.ControllerBinding.Throttle)
-                    {
-                        if (!mpc.StateChanged)
-                        {
-                            mpc.StateChanged = true;
-                            mpc.DoMovement(MultiPositionController.Movement.Forward);
-                        }
-                        return;
-                    }
+                    mpc.StateChanged = true;
+                    mpc.DoMovement(MultiPositionController.Movement.Forward);
                 }
+                return;
             }
             if (CruiseControl != null && (CombinedControlType == CombinedControl.None || CruiseControl.UseThrottleInCombinedControl))
             {
@@ -3436,20 +3430,15 @@ public void StartThrottleIncrease()
 
         public void StopThrottleIncrease()
         {
-            if (MultiPositionControllers != null)
+            var mpc = MultiPositionControllers.Where(x => x.controllerBinding == ControllerBinding.Throttle).FirstOrDefault();
+            if (mpc != null)
             {
-                foreach (MultiPositionController mpc in MultiPositionControllers)
+                if (mpc.StateChanged)
                 {
-                    if (mpc.controllerBinding == MultiPositionController.ControllerBinding.Throttle)
-                    {
-                        if (mpc.StateChanged)
-                        {
-                            mpc.StateChanged = false;
-                            mpc.DoMovement(MultiPositionController.Movement.Neutral);
-                        }
-                        return;
-                    }
+                    mpc.StateChanged = false;
+                    mpc.DoMovement(MultiPositionController.Movement.Neutral);
                 }
+                return;
             }
             if (CruiseControl != null)
             {
@@ -3517,20 +3506,15 @@ public void StartThrottleDecrease()
                 }
                 CruiseControl.SkipThrottleDisplay = false;
             }
-            if (MultiPositionControllers != null)
+            var mpc = MultiPositionControllers.Where(x => x.controllerBinding == ControllerBinding.Throttle).FirstOrDefault();
+            if (mpc != null)
             {
-                foreach (MultiPositionController mpc in MultiPositionControllers)
+                if (!mpc.StateChanged)
                 {
-                    if (mpc.controllerBinding == MultiPositionController.ControllerBinding.Throttle)
-                    {
-                        if (!mpc.StateChanged)
-                        {
-                            mpc.StateChanged = true;
-                            mpc.DoMovement(MultiPositionController.Movement.Aft);
-                        }
-                        return;
-                    }
+                    mpc.StateChanged = true;
+                     mpc.DoMovement(MultiPositionController.Movement.Aft);
                 }
+                return;
             }
             if (CruiseControl != null && (CombinedControlType == CombinedControl.None || CruiseControl.UseThrottleInCombinedControl))
             {
@@ -3564,20 +3548,15 @@ public void StartThrottleDecrease()
 
         public void StopThrottleDecrease()
         {
-            if (MultiPositionControllers != null)
+            var mpc = MultiPositionControllers.Where(x => x.controllerBinding == ControllerBinding.Throttle).FirstOrDefault();
+            if (mpc != null)
             {
-                foreach (MultiPositionController mpc in MultiPositionControllers)
+                if (mpc.StateChanged)
                 {
-                    if (mpc.controllerBinding == MultiPositionController.ControllerBinding.Throttle)
-                    {
-                        if (mpc.StateChanged)
-                        {
-                            mpc.StateChanged = false;
-                            mpc.DoMovement(MultiPositionController.Movement.Neutral);
-                        }
-                        return;
-                    }
+                    mpc.StateChanged = false;
+                    mpc.DoMovement(MultiPositionController.Movement.Neutral);
                 }
+                return;
             }
             if (CruiseControl != null)
             {
@@ -5865,12 +5844,8 @@ public virtual float GetDataOf(CabViewControl cvc)
                 case CABViewControlTypes.ORTS_MULTI_POSITION_CONTROLLER:
                     if (MultiPositionControllers != null)
                     {
-                        foreach (var mpc in MultiPositionControllers)
-                            if (mpc.ControllerId == cvc.ControlId)
-                            {
-                                data = mpc.GetDataOf(cvc);
-                                break;
-                            }
+                        var mpc = MultiPositionControllers.Where(x => x.ControllerId == cvc.ControlId).FirstOrDefault();
+                        if (mpc != null) data = mpc.GetDataOf(cvc);
                     }
                     break;