Merge pull request #451 from Sharpe49/fix-power-supply-restore

Fixed the wrong states of battery switch, master key and ETS switch after restoring from a save
https://bugs.launchpad.net/or/+bug/1940094

Author: cjakeman

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/BatterySwitch.cs

@@ -38,10 +38,10 @@ public enum ModeType
         // Variables
         readonly MSTSWagon Wagon;
         protected Timer Timer;
-        public bool CommandSwitch { get; protected set; } = true;
+        public bool CommandSwitch { get; protected set; } = false;
         public bool CommandButtonOn { get; protected set; } = false;
         public bool CommandButtonOff { get; protected set; } = false;
-        public bool On { get; protected set; } = true;
+        public bool On { get; protected set; } = false;
 
         public BatterySwitch(MSTSWagon wagon)
         {
@@ -91,17 +91,6 @@ public void Copy(BatterySwitch other)
 
         public virtual void Initialize()
         {
-            switch (Mode)
-            {
-                case ModeType.Switch:
-                    CommandSwitch = false;
-                    On = false;
-                    break;
-
-                case ModeType.PushButtons:
-                    On = false;
-                    break;
-            }
         }
 
         /// <summary>

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/ElectricTrainSupplySwitch.cs

@@ -35,8 +35,8 @@ public enum ModeType
 
         // Variables
         readonly MSTSLocomotive Locomotive;
-        public bool CommandSwitch { get; protected set; } = true;
-        public bool On { get; protected set; } = true;
+        public bool CommandSwitch { get; protected set; } = false;
+        public bool On { get; protected set; } = false;
 
         public ElectricTrainSupplySwitch(MSTSLocomotive locomotive)
         {
@@ -77,18 +77,6 @@ public void Copy(ElectricTrainSupplySwitch other)
 
         public virtual void Initialize()
         {
-            switch (Mode)
-            {
-                case ModeType.Unfitted:
-                    CommandSwitch = false;
-                    On = false;
-                    break;
-
-                case ModeType.Switch:
-                    CommandSwitch = false;
-                    On = false;
-                    break;
-            }
         }
 
         /// <summary>
@@ -126,6 +114,10 @@ public virtual void Update(float elapsedClockSeconds)
         {
             switch (Mode)
             {
+                case ModeType.Unfitted:
+                    On = false;
+                    break;
+
                 case ModeType.Automatic:
                     if (On)
                     {
@@ -150,8 +142,8 @@ public virtual void Update(float elapsedClockSeconds)
                     {
                         if (!CommandSwitch || !Locomotive.LocomotivePowerSupply.AuxiliaryPowerSupplyOn)
                         {
-                                On = false;
-                                Locomotive.SignalEvent(Event.ElectricTrainSupplyOff);
+                            On = false;
+                            Locomotive.SignalEvent(Event.ElectricTrainSupplyOff);
                         }
                     }
                     else

Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/MasterKey.cs

@@ -41,8 +41,8 @@ public enum ModeType
         // Variables
         readonly MSTSLocomotive Locomotive;
         protected Timer Timer;
-        public bool CommandSwitch { get; protected set; } = true;
-        public bool On { get; protected set; } = true;
+        public bool CommandSwitch { get; protected set; } = false;
+        public bool On { get; protected set; } = false;
         public bool OtherCabInUse {
             get
             {
@@ -105,20 +105,18 @@ public void Copy(MasterKey other)
 
         public virtual void Initialize()
         {
-            if (Mode == ModeType.Manual)
-            {
-                CommandSwitch = false;
-                On = false;
-            }
         }
 
         /// <summary>
         /// Initialization when simulation starts with moving train
         /// </summary>
         public virtual void InitializeMoving()
         {
-            CommandSwitch = true;
-            On = true;
+            if (Locomotive.IsLeadLocomotive())
+            {
+                CommandSwitch = true;
+                On = true;
+            }
         }
 
         public virtual void Save(BinaryWriter outf)