Invert angle cock warnings for end cars

cesarBLG · cesarBLG · commit f46d5f27f12f · 2025-09-12T16:10:11.000+02:00
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsViewerWindow.cs
@@ -1189,6 +1189,7 @@ public ToggleBatterySwitch(int x, int y, int size, Viewer viewer, int carPositio
                     if (wagon.PowerSupply.BatterySwitch.Mode == BatterySwitch.ModeType.AlwaysOn)
                     {
                         Texture = BattAlwaysOn32;
+                        TrainCarViewer.BatterySwitchOn = wagon.PowerSupply.BatterySwitch.On;
                     }
                     else
                     {
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainCarOperationsWindow.cs
@@ -1091,6 +1091,7 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
             Viewer = viewer;
             TrainCarViewer = Viewer.TrainCarOperationsViewerWindow;
             var CurrentCar = Viewer.PlayerTrain.Cars[carPosition];
+            var First = car == viewer.PlayerTrain.Cars.First();
 
             if (CurrentCar.BrakeSystem is VacuumSinglePipe)
             {
@@ -1109,7 +1110,7 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
             var trainCarOperations = Viewer.TrainCarOperationsWindow;
             if (!trainCarOperations.WarningCarPosition[carPosition])
             {
-                trainCarOperations.updateWarningCarPosition(carPosition, Texture, FrontAngleCockClosed);
+                trainCarOperations.updateWarningCarPosition(carPosition, Texture, First ? FrontAngleCockOpened : FrontAngleCockClosed);
                 trainCarOperations.updateWarningCarPosition(carPosition, Texture, FrontAngleCockPartial);
             }
         }
@@ -1122,6 +1123,7 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
         {
             Viewer = viewer;
             var CurrentCar = Viewer.PlayerTrain.Cars[carPosition];
+            var Last = car == viewer.PlayerTrain.Cars.Last();
 
             if (CurrentCar.BrakeSystem is VacuumSinglePipe)
             {
@@ -1140,7 +1142,7 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,
             var trainCarOperations = Viewer.TrainCarOperationsWindow;
             if (!trainCarOperations.WarningCarPosition[carPosition])
             {
-                trainCarOperations.updateWarningCarPosition(carPosition, Texture, RearAngleCockClosed);
+                trainCarOperations.updateWarningCarPosition(carPosition, Texture, Last ? RearAngleCockOpened: RearAngleCockClosed);
                 trainCarOperations.updateWarningCarPosition(carPosition, Texture, RearAngleCockPartial);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1189,6 +1189,7 @@ public ToggleBatterySwitch(int x, int y, int size, Viewer viewer, int carPositio`
`1189`	`1189`	`if (wagon.PowerSupply.BatterySwitch.Mode == BatterySwitch.ModeType.AlwaysOn)`
`1190`	`1190`	`{`
`1191`	`1191`	`Texture = BattAlwaysOn32;`
	`1192`	`+ TrainCarViewer.BatterySwitchOn = wagon.PowerSupply.BatterySwitch.On;`
`1192`	`1193`	`}`
`1193`	`1194`	`else`
`1194`	`1195`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1091,6 +1091,7 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`1091`	`1091`	`Viewer = viewer;`
`1092`	`1092`	`TrainCarViewer = Viewer.TrainCarOperationsViewerWindow;`
`1093`	`1093`	`var CurrentCar = Viewer.PlayerTrain.Cars[carPosition];`
	`1094`	`+ var First = car == viewer.PlayerTrain.Cars.First();`
`1094`	`1095`
`1095`	`1096`	`if (CurrentCar.BrakeSystem is VacuumSinglePipe)`
`1096`	`1097`	`{`
`@@ -1109,7 +1110,7 @@ public buttonFrontAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`1109`	`1110`	`var trainCarOperations = Viewer.TrainCarOperationsWindow;`
`1110`	`1111`	`if (!trainCarOperations.WarningCarPosition[carPosition])`
`1111`	`1112`	`{`
`1112`		`- trainCarOperations.updateWarningCarPosition(carPosition, Texture, FrontAngleCockClosed);`
	`1113`	`+ trainCarOperations.updateWarningCarPosition(carPosition, Texture, First ? FrontAngleCockOpened : FrontAngleCockClosed);`
`1113`	`1114`	`trainCarOperations.updateWarningCarPosition(carPosition, Texture, FrontAngleCockPartial);`
`1114`	`1115`	`}`
`1115`	`1116`	`}`
`@@ -1122,6 +1123,7 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`1122`	`1123`	`{`
`1123`	`1124`	`Viewer = viewer;`
`1124`	`1125`	`var CurrentCar = Viewer.PlayerTrain.Cars[carPosition];`
	`1126`	`+ var Last = car == viewer.PlayerTrain.Cars.Last();`
`1125`	`1127`
`1126`	`1128`	`if (CurrentCar.BrakeSystem is VacuumSinglePipe)`
`1127`	`1129`	`{`
`@@ -1140,7 +1142,7 @@ public buttonRearAngleCock(int x, int y, int size, Viewer viewer, TrainCar car,`
`1140`	`1142`	`var trainCarOperations = Viewer.TrainCarOperationsWindow;`
`1141`	`1143`	`if (!trainCarOperations.WarningCarPosition[carPosition])`
`1142`	`1144`	`{`
`1143`		`- trainCarOperations.updateWarningCarPosition(carPosition, Texture, RearAngleCockClosed);`
	`1145`	`+ trainCarOperations.updateWarningCarPosition(carPosition, Texture, Last ? RearAngleCockOpened: RearAngleCockClosed);`
`1144`	`1146`	`trainCarOperations.updateWarningCarPosition(carPosition, Texture, RearAngleCockPartial);`
`1145`	`1147`	`}`
`1146`	`1148`	`}`