Added CurrentNotch and IntermediateValue to support mouse control with scripted brake controller

Author: Sharpe49

Source/Orts.Simulation/Common/Scripting/BrakeController.cs

@@ -141,6 +141,21 @@ public float MainReservoirPressureBar()
         /// </summary>
         public float CurrentValue() => Host.CurrentValue;
 
+        /// <summary>
+        /// Intermediate value of the brake controller
+        /// </summary>
+        public float IntermediateValue
+        {
+            get
+            {
+                return Host.IntermediateValue;
+            }
+            set
+            {
+                Host.IntermediateValue = value;
+            }
+        }
+
         /// <summary>
         /// Minimum value of the brake controller
         /// </summary>
@@ -171,6 +186,21 @@ public float MainReservoirPressureBar()
         /// </summary>
         public float CruiseControlBrakeDemand() => Locomotive.CruiseControl != null ? Locomotive.CruiseControl.TrainBrakePercent/100 : 0;
 
+        /// <summary>
+        /// Current notch of the brake controller
+        /// </summary>
+        public int CurrentNotch
+        {
+            get
+            {
+                return Host.CurrentNotch;
+            }
+            set
+            {
+                Host.CurrentNotch = value;
+            }
+        }
+
         /// <summary>
         /// Sets the current value of the brake controller lever
         /// </summary>

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/BrakeController.cs

@@ -155,12 +155,12 @@ public bool OverchargeButtonPressed
         /// <summary>
         /// Needed for proper mouse operation in the cabview
         /// </summary>
-        public float IntermediateValue { get { return Script is MSTSBrakeController ? (Script as MSTSBrakeController).NotchController.IntermediateValue : CurrentValue; } }
+        public float IntermediateValue { get; set; }
 
         /// <summary>
         /// Knowing actual notch and its change is needed for proper repeatability of mouse and RailDriver operation
         /// </summary>
-        public int CurrentNotch { get { return Script is MSTSBrakeController ? (Script as MSTSBrakeController).NotchController.CurrentNotch : 0; } set { } }
+        public int CurrentNotch { get; set; }
 
         public ControllerState TrainBrakeControllerState
         {

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/Controllers/MSTSBrakeController.cs

@@ -15,9 +15,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
-using ORTS.Scripting.Api;
 using System;
-using System.Diagnostics;
+using ORTS.Scripting.Api;
 
 namespace Orts.Simulation.RollingStocks.SubSystems.Controllers
 {
@@ -61,13 +60,16 @@ public override void InitializeMoving()
             NotchController.SetValue(0);
             if (NotchController.NotchCount() > 0) NotchController.CurrentNotch = 0;
             else NotchController.CurrentNotch = -1;
+            CurrentNotch = NotchController.CurrentNotch;
         }
 
         public override float Update(float elapsedSeconds)
         {
             float value = NotchController.Update(elapsedSeconds);
             SetCurrentValue(value);
+            IntermediateValue = NotchController.IntermediateValue;
             SetUpdateValue(NotchController.UpdateValue);
+            CurrentNotch = NotchController.CurrentNotch;
             return value;
         }