Added handbrake control

Author: sweiland-openrails

Source/ORTS.Common/Input/UserCommand.cs

@@ -136,7 +136,7 @@ public enum UserCommand
         [GetString("Control Brake Quick Release")] [GetParticularString("SwitchPanel", "")] ControlBrakeQuickRelease,
         [GetString("Control Brake Overcharge")] [GetParticularString("SwitchPanel", "")] ControlBrakeOvercharge,
         [GetString("Control Initialize Brakes")] [GetParticularString("SwitchPanel", "")] ControlInitializeBrakes,
-        [GetString("Control Handbrake Full")] [GetParticularString("SwitchPanel", "")] ControlHandbrakeFull,
+        [GetString("Control Handbrake Full")] [GetParticularString("SwitchPanel", "Handbrake")] ControlHandbrakeFull,
         [GetString("Control Handbrake None")] [GetParticularString("SwitchPanel", "")] ControlHandbrakeNone,
         [GetString("Control Odometer Show/Hide")] [GetParticularString("SwitchPanel", "")] ControlOdoMeterShowHide,
         [GetString("Control Odometer Reset")] [GetParticularString("SwitchPanel", "")] ControlOdoMeterReset,

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelDefinition.cs

@@ -20,6 +20,7 @@
 using Orts.Simulation.RollingStocks;
 using ORTS.Common.Input;
 using ORTS.Common;
+using Orts.Simulation.Physics;
 
 namespace Orts.Viewer3D.WebServices.SwitchPanel
 {
@@ -101,6 +102,23 @@ public void init(UserCommand userCommand)
                     init2(ORTS.Common.Input.UserCommand.ControlForwards, ORTS.Common.Input.UserCommand.ControlBackwards);
                     break;
 
+                case ORTS.Common.Input.UserCommand.ControlHandbrakeFull:
+                    Train train = Viewer.PlayerLocomotive.Train;
+
+                    int handBrakeCount = 0;
+
+                    for (int i = 0; i < train.Cars.Count; i++)
+                    {
+                        if ((train.Cars[i] as MSTSWagon).HandBrakePresent)
+                            handBrakeCount++;
+                    }
+
+                    if (handBrakeCount > 0)
+                        init2(ORTS.Common.Input.UserCommand.ControlHandbrakeFull, ORTS.Common.Input.UserCommand.ControlHandbrakeNone);
+                    else
+                        init0(ORTS.Common.Input.UserCommand.ControlHandbrakeFull);
+                    break;
+
                 default:
                     init1(userCommand);
                     break;

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchOnPanelStatus.cs

@@ -366,6 +366,45 @@ private static void getStatusDieselEngine(UserCommand userCommand, ref SwitchOnP
             }
         }
 
+        private static void getStatusHandbrake(ref SwitchOnPanelStatus switchOnPanelStatus)
+        {
+            Train train = Viewer.PlayerLocomotive.Train;
+
+            int handBrakeCount = 0;
+            int handBrakeOn = 0;
+
+            for (int i = 0; i < train.Cars.Count; i++)
+            {
+                if ((train.Cars[i] as MSTSWagon).HandBrakePresent)
+                {
+                    handBrakeCount++;
+                    if ((train.Cars[i] as MSTSWagon).GetTrainHandbrakeStatus())
+                        handBrakeOn++;
+                }
+            }
+
+            switchOnPanelStatus.Color = "";
+            if ((handBrakeOn > 0) && (handBrakeCount != handBrakeOn))
+            {
+                switchOnPanelStatus.Status = Viewer.Catalog.GetString("On") + "/" + Viewer.Catalog.GetString("Off");
+                switchOnPanelStatus.Color = "orange";
+            } else
+            {
+                if (handBrakeOn > 0)
+                {
+                    switchOnPanelStatus.Status = Viewer.Catalog.GetString("Full");
+                    switchOnPanelStatus.Color = "orange";
+                }
+                else
+                {
+                    if (handBrakeCount > 0)
+                    {
+                        switchOnPanelStatus.Status = Viewer.Catalog.GetString("Off");
+                    }
+                }
+            }
+        }
+
         public static void getStatus(UserCommand userCommand, ref SwitchOnPanelStatus switchOnPanelStatus)
         {
             switchOnPanelStatus.Status = "";
@@ -428,6 +467,9 @@ public static void getStatus(UserCommand userCommand, ref SwitchOnPanelStatus sw
                 case UserCommand.ControlTractionCutOffRelayClosingOrder:
                     getStatusTractionCutOffRelay(ref switchOnPanelStatus);
                     break;
+                case UserCommand.ControlHandbrakeFull:
+                    getStatusHandbrake(ref switchOnPanelStatus);
+                    break;
             }
         }
 

Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchesOnPanel.cs

@@ -75,6 +75,7 @@ public void setDefinitions(SwitchOnPanel[,] SwitchesOnPanelArray)
                     SwitchesOnPanelArray[1, 3].initDefinition(UserCommand.ControlPantograph2);
                     SwitchesOnPanelArray[1, 4].initDefinition(UserCommand.ControlCircuitBreakerClosingOrder);
                     SwitchesOnPanelArray[1, 5].initDefinition(UserCommand.ControlHeadlightIncrease);
+                    SwitchesOnPanelArray[1, 6].initDefinition(UserCommand.ControlHandbrakeFull);
                     break;
 
                 case TrainCar.EngineTypes.Diesel:
@@ -94,6 +95,7 @@ public void setDefinitions(SwitchOnPanel[,] SwitchesOnPanelArray)
                     SwitchesOnPanelArray[1, 3].initDefinition(UserCommand.ControlDieselHelper);
                     SwitchesOnPanelArray[1, 4].initDefinition(UserCommand.ControlTractionCutOffRelayClosingOrder);
                     SwitchesOnPanelArray[1, 5].initDefinition(UserCommand.ControlHeadlightIncrease);
+                    SwitchesOnPanelArray[1, 6].initDefinition(UserCommand.ControlHandbrakeFull);
                     break;
 
                 case TrainCar.EngineTypes.Steam: