Merge pull request #927 from SteelFill/lights_bugfix

SteelFill · web-flow · commit 4fd63a3270f3 · 2024-05-01T10:24:36.000-05:00
AI Train Power Supply/Lights Fix
diff --git a/Source/Orts.Simulation/Simulation/AIs/AI.cs b/Source/Orts.Simulation/Simulation/AIs/AI.cs
@@ -926,12 +926,14 @@ public AITrain CreateAITrainDetail(Service_Definition sd, Traffic_Service_Defini
                             mstsSteamLocomotive.TenderCoalMassKG = mstsSteamLocomotive.MaxTenderCoalMassKG * Simulator.Activity.Tr_Activity.Tr_Activity_Header.FuelCoal / 100.0f;
                         }
 
-                        if (train.InitialSpeed != 0)
-                            car.SignalEvent(PowerSupplyEvent.RaisePantograph, 1);
+                        if (train.InitialSpeed != 0 && car is MSTSLocomotive loco)
+                            loco.SetPower(true);
                     }
                     else
                     {
-                        car.SignalEvent(PowerSupplyEvent.RaisePantograph, 1);
+                        if (car is MSTSLocomotive loco)
+                            loco.SetPower(true);
+
                         car.CarID = "AI" + train.Number.ToString() + " - " + (train.Cars.Count - 1).ToString();
                     }
 
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSDieselLocomotive.cs
@@ -1392,7 +1392,7 @@ public override void SwitchToPlayerControl()
         public override void SwitchToAutopilotControl()
         {
             SetDirection(Direction.Forward);
-            if (!LocomotivePowerSupply.MainPowerSupplyOn)
+            if (!LocomotivePowerSupply.MainPowerSupplyOn || !LocomotivePowerSupply.BatteryOn || !LocomotivePowerSupply.MasterKey.On)
             {
                 LocomotivePowerSupply.HandleEvent(PowerSupplyEvent.QuickPowerOn);
             }

Original file line number	Diff line number	Diff line change
`@@ -926,12 +926,14 @@ public AITrain CreateAITrainDetail(Service_Definition sd, Traffic_Service_Defini`
`926`	`926`	`mstsSteamLocomotive.TenderCoalMassKG = mstsSteamLocomotive.MaxTenderCoalMassKG * Simulator.Activity.Tr_Activity.Tr_Activity_Header.FuelCoal / 100.0f;`
`927`	`927`	`}`
`928`	`928`
`929`		`- if (train.InitialSpeed != 0)`
`930`		`- car.SignalEvent(PowerSupplyEvent.RaisePantograph, 1);`
	`929`	`+ if (train.InitialSpeed != 0 && car is MSTSLocomotive loco)`
	`930`	`+ loco.SetPower(true);`
`931`	`931`	`}`
`932`	`932`	`else`
`933`	`933`	`{`
`934`		`- car.SignalEvent(PowerSupplyEvent.RaisePantograph, 1);`
	`934`	`+ if (car is MSTSLocomotive loco)`
	`935`	`+ loco.SetPower(true);`
	`936`	`+`
`935`	`937`	`car.CarID = "AI" + train.Number.ToString() + " - " + (train.Cars.Count - 1).ToString();`
`936`	`938`	`}`
`937`	`939`
Original file line number	Diff line number	Diff line change
`@@ -1392,7 +1392,7 @@ public override void SwitchToPlayerControl()`
`1392`	`1392`	`public override void SwitchToAutopilotControl()`
`1393`	`1393`	`{`
`1394`	`1394`	`SetDirection(Direction.Forward);`
`1395`		`- if (!LocomotivePowerSupply.MainPowerSupplyOn)`
	`1395`	`+ if (!LocomotivePowerSupply.MainPowerSupplyOn \|\| !LocomotivePowerSupply.BatteryOn \|\| !LocomotivePowerSupply.MasterKey.On)`
`1396`	`1396`	`{`
`1397`	`1397`	`LocomotivePowerSupply.HandleEvent(PowerSupplyEvent.QuickPowerOn);`
`1398`	`1398`	`}`