Merge pull request #962 from cesarBLG/pantograph-fix

Fix pantographs on unpowered cars

Author: cesarBLG

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

@@ -95,6 +95,7 @@ public virtual void HandleEvent(PowerSupplyEvent evt, int id)
         public virtual void HandleEventFromLeadLocomotive(PowerSupplyEvent evt)
         {
             // By default, send the event to every component
+            SignalEventToPantographs(evt);
             SignalEventToBatterySwitch(evt);
         }
 

Source/Orts.Simulation/Simulation/RollingStocks/MSTSWagon.cs

@@ -1177,6 +1177,7 @@ public override void Initialize()
             }
             FreightAnimations?.Load(FreightAnimations.LoadDataList, true);
             InitializeLoadPhysics();
+            if (!(this is MSTSLocomotive) && Simulator.Settings.ElectricHotStart) Pantographs.HandleEvent(PowerSupplyEvent.RaisePantograph, 1);
         }
 
         public override void InitializeMoving()

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

@@ -332,11 +332,11 @@ protected virtual void AssignScriptFunctions()
             AbstractScript.SignalEventToTcsWithMessage = (evt, message) => Locomotive.TrainControlSystem.HandleEvent(evt, message);
             AbstractScript.SignalEventToOtherLocomotives = (evt) =>
             {
-                if (Locomotive == Simulator.PlayerLocomotive)
+                if (Locomotive == Train.LeadLocomotive)
                 {
                     foreach (MSTSLocomotive locomotive in Locomotive.Train.Cars.OfType<MSTSLocomotive>())
                     {
-                        if (locomotive != Locomotive && locomotive != Locomotive.Train.LeadLocomotive && locomotive.RemoteControlGroup != -1)
+                        if (locomotive != Locomotive && locomotive.RemoteControlGroup != -1)
                         {
                             locomotive.LocomotivePowerSupply.HandleEventFromLeadLocomotive(evt);
                         }
@@ -345,11 +345,11 @@ protected virtual void AssignScriptFunctions()
             };
             AbstractScript.SignalEventToOtherLocomotivesWithId = (evt, id) =>
             {
-                if (Locomotive == Simulator.PlayerLocomotive)
+                if (Locomotive == Train.LeadLocomotive)
                 {
                     foreach (MSTSLocomotive locomotive in Locomotive.Train.Cars.OfType<MSTSLocomotive>())
                     {
-                        if (locomotive != Locomotive && locomotive != Locomotive.Train.LeadLocomotive && locomotive.RemoteControlGroup != -1)
+                        if (locomotive != Locomotive && locomotive.RemoteControlGroup != -1)
                         {
                             locomotive.LocomotivePowerSupply.HandleEventFromLeadLocomotive(evt, id);
                         }
@@ -358,26 +358,40 @@ protected virtual void AssignScriptFunctions()
             };
             AbstractScript.SignalEventToOtherTrainVehicles = (evt) =>
             {
-                if (Locomotive == Simulator.PlayerLocomotive)
+                if (Locomotive == Train.LeadLocomotive)
                 {
                     foreach (TrainCar car in Locomotive.Train.Cars)
                     {
-                        if (car != Locomotive && car != Locomotive.Train.LeadLocomotive && car.RemoteControlGroup != -1)
+                        if (car != Locomotive && car.RemoteControlGroup != -1)
                         {
-                            car.PowerSupply?.HandleEventFromLeadLocomotive(evt);
+                            if (car.PowerSupply != null)
+                            {
+                                car.PowerSupply.HandleEventFromLeadLocomotive(evt);
+                            }
+                            else if (car is MSTSWagon wagon)
+                            {
+                                wagon.Pantographs.HandleEvent(evt);
+                            }
                         }
                     }
                 }
             };
             AbstractScript.SignalEventToOtherTrainVehiclesWithId = (evt, id) =>
             {
-                if (Locomotive == Simulator.PlayerLocomotive)
+                if (Locomotive == Train.LeadLocomotive)
                 {
                     foreach (TrainCar car in Locomotive.Train.Cars)
                     {
-                        if (car != Locomotive && car != Locomotive.Train.LeadLocomotive && car.RemoteControlGroup != -1)
+                        if (car != Locomotive && car.RemoteControlGroup != -1)
                         {
-                            car.PowerSupply?.HandleEventFromLeadLocomotive(evt, id);
+                            if (car.PowerSupply != null)
+                            {
+                                car.PowerSupply.HandleEventFromLeadLocomotive(evt, id);
+                            }
+                            else if (car is MSTSWagon wagon)
+                            {
+                                wagon.Pantographs.HandleEvent(evt, id);
+                            }
                         }
                     }
                 }
@@ -388,7 +402,7 @@ protected virtual void AssignScriptFunctions()
 
                 foreach (MSTSDieselLocomotive locomotive in Train.Cars.OfType<MSTSDieselLocomotive>().Where((MSTSLocomotive locomotive) => { return locomotive.RemoteControlGroup != -1; }))
                 {
-                    if (locomotive == Simulator.PlayerLocomotive)
+                    if (locomotive == Train.LeadLocomotive)
                     {
                         // Engine number 1 or above are helper engines
                         for (int i = 1; i < locomotive.DieselEngines.Count; i++)