Automatic merge of T1.5.1-1088-g264349b1ce and 21 pull requests

- Pull request #891 at 9a1d6b2: Auto save
- Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value
- Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #882 at 8f695a4: Blueprint/train car operations UI window
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #922 at a3bc9e7: Autopilot for timetable mode
- Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes
- Pull request #962 at 46d0472: Fix pantographs on unpowered cars
- Pull request #970 at 6fa5eed: feat: Remove unnecessary Windows.Forms usage
- Pull request #973 at c35be87: fix: Using singular target framework to allow for different platforms across different projects
- Pull request #974 at 5faea6f: Bug fix for https://bugs.launchpad.net/or/+bug/2076034 Doors remain open in AI trains
- Pull request #900 at c27f32d: DMI updates
- Pull request #903 at 9dabe97: Downloading route content (Github, zip)
- Pull request #799 at dfc715e: Consolidated wind simulation
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #885 at 067662e: feat: Add notifications to Menu
- Pull request #946 at 91a03af: Advanced track sounds
- Pull request #952 at 8347095: Investigation - Pulsing graphics
- Pull request #954 at f837ffd: Multiple Track Profiles & Superelevation Improvements
- Pull request #968 at a88cb26: Initial build of adding track section identifier for rack railway

Author: openrails-bot

Source/Orts.Simulation/Common/Events.cs

@@ -27,10 +27,6 @@ public interface EventHandler
     public enum Event
     {
         None,
-        AITrainApproachingStation,
-        AITrainHelperLoco,
-        AITrainLeadLoco,
-        AITrainLeavingStation,
         BatterySwitchOff,
         BatterySwitchOn,
         BatterySwitchCommandOff,
@@ -127,8 +123,6 @@ public enum Event
         PermissionDenied,
         PermissionGranted,
         PermissionToDepart,
-        PlayerTrainHelperLoco,
-        PlayerTrainLeadLoco,
         PowerKeyOff,
         PowerKeyOn,
         ReverserChange,
@@ -567,14 +561,6 @@ public static Event From(Source source, int eventID)
                         case 321: return Event.BoosterCylinderCocksOpen;
                         case 322: return Event.BoosterCylinderCocksClose;
 
-                        // AI train related events
-                        case 330: return Event.AITrainLeadLoco;
-                        case 331: return Event.AITrainHelperLoco;
-                        case 332: return Event.PlayerTrainLeadLoco;
-                        case 333: return Event.PlayerTrainHelperLoco;
-                        case 334: return Event.AITrainApproachingStation;
-                        case 335: return Event.AITrainLeavingStation;
-						
                         default: return 0;
                     }
                 case Source.MSTSCrossing:

Source/Orts.Simulation/Simulation/AIs/AITrain.cs

@@ -72,10 +72,9 @@ public class AITrain : Train
         public Service_Definition ServiceDefinition = null; // train's service definition in .act file
         public bool UncondAttach = false;                   // if false it states that train will unconditionally attach to a train on its path
 
-        public float doorOpenDelay = -1f;
-        public float doorCloseAdvance = -1f;
+        public float DoorOpenTimer = -1f;
+        public float DoorCloseTimer = -1f;
         public AILevelCrossingHornPattern LevelCrossingHornPattern { get; set; }
-        public bool ApproachTriggerSet = false;         // station approach trigger for AI trains has been set
 
         public float PathLength;
 
@@ -245,10 +244,9 @@ public AITrain(Simulator simulator, BinaryReader inf, AI airef)
             Efficiency = inf.ReadSingle();
             MaxVelocityA = inf.ReadSingle();
             UncondAttach = inf.ReadBoolean();
-            doorCloseAdvance = inf.ReadSingle();
-            doorOpenDelay = inf.ReadSingle();
-			ApproachTriggerSet = inf.ReadBoolean();
-            if (!Simulator.TimetableMode && doorOpenDelay <= 0 && doorCloseAdvance > 0 && Simulator.OpenDoorsInAITrains &&
+            DoorCloseTimer = inf.ReadSingle();
+            DoorOpenTimer = inf.ReadSingle();
+            if (!Simulator.TimetableMode && DoorOpenTimer <= 0 && DoorCloseTimer > 0 && Simulator.OpenDoorsInAITrains &&
                 MovementState == AI_MOVEMENT_STATE.STATION_STOP && StationStops.Count > 0)
             {
                 StationStop thisStation = StationStops[0];
@@ -339,9 +337,8 @@ public override void Save(BinaryWriter outf)
             outf.Write(Efficiency);
             outf.Write(MaxVelocityA);
             outf.Write(UncondAttach);
-            outf.Write(doorCloseAdvance);
-            outf.Write(doorOpenDelay);
-            outf.Write(ApproachTriggerSet);
+            outf.Write(DoorCloseTimer);
+            outf.Write(DoorOpenTimer);
             if (LevelCrossingHornPattern != null)
             {
                 outf.Write(0);
@@ -1303,7 +1300,6 @@ public virtual void SetNextStationAction(bool fromAutopilotSwitch = false)
                         AIActionItem newAction = new AIActionItem(null, AIActionItem.AI_ACTION_TYPE.STATION_STOP);
                         newAction.SetParam(distancesM[1], 0.0f, distancesM[0], DistanceTravelledM);
                         requiredActions.InsertAction(newAction);
-                        ApproachTriggerSet = false;
 
 #if DEBUG_REPORTS
                 if (StationStops[0].ActualStopType == StationStop.STOPTYPE.STATION_STOP)
@@ -1855,13 +1851,12 @@ public virtual void UpdateStationState(float elapsedClockSeconds, int presentTim
                     thisStation.ActualArrival = presentTime;
                     var stopTime = thisStation.CalculateDepartTime(presentTime, this);
                     actualdepart = thisStation.ActualDepart;
-                    doorOpenDelay = 4.0f;
-                    doorCloseAdvance = stopTime - 10.0f;
-                    if (PreUpdate) doorCloseAdvance -= 10;
-                    if (doorCloseAdvance - 6 < doorOpenDelay)
+                    DoorOpenTimer = PreUpdate ? 0 : 4;
+                    DoorCloseTimer = PreUpdate ? stopTime - 20 : stopTime - 10.0f;
+                    if (DoorCloseTimer - 6 < DoorOpenTimer)
                     {
-                        doorOpenDelay = 0;
-                        doorCloseAdvance = stopTime - 3;
+                        DoorOpenTimer = 0;
+                        DoorCloseTimer = Math.Max (stopTime - 3, 0);
                     }
 
 #if DEBUG_REPORTS
@@ -1891,10 +1886,10 @@ public virtual void UpdateStationState(float elapsedClockSeconds, int presentTim
                     if (!IsFreight && Simulator.OpenDoorsInAITrains)
                     {
                         var frontIsFront = thisStation.PlatformReference == thisStation.PlatformItem.PlatformFrontUiD;
-                        if (doorOpenDelay > 0)
+                        if (DoorOpenTimer >= 0)
                         {
-                            doorOpenDelay -= elapsedClockSeconds;
-                            if (doorOpenDelay < 0)
+                            DoorOpenTimer -= elapsedClockSeconds;
+                            if (DoorOpenTimer < 0)
                             {
                                 if (thisStation.PlatformItem.PlatformSide[0])
                                 {
@@ -1908,19 +1903,19 @@ public virtual void UpdateStationState(float elapsedClockSeconds, int presentTim
                                 }
                             }
                         }
-                        if (doorCloseAdvance > 0)
+                        if (DoorCloseTimer >= 0)
                         {
-                            doorCloseAdvance -= elapsedClockSeconds;
-                            if (doorCloseAdvance < 0)
+                            DoorCloseTimer -= elapsedClockSeconds;
+                            if (DoorCloseTimer < 0)
                             {
                                 if (thisStation.PlatformItem.PlatformSide[0])
                                 {
-                                    // Open left doors
+                                    // Close left doors
                                     SetDoors(frontIsFront ? DoorSide.Right : DoorSide.Left, false);
                                 }
                                 if (thisStation.PlatformItem.PlatformSide[1])
                                 {
-                                    // Open right doors
+                                    // Close right doors
                                     SetDoors(frontIsFront ? DoorSide.Left : DoorSide.Right, false);
                                 }
                             }
@@ -2064,7 +2059,6 @@ public virtual void UpdateStationState(float elapsedClockSeconds, int presentTim
 
                 Delay = TimeSpan.FromSeconds((presentTime - thisStation.DepartTime) % (24 * 3600));
             }
-            if (Cars[0] is MSTSLocomotive) Cars[0].SignalEvent(Event.AITrainLeavingStation);
 
 #if DEBUG_REPORTS
             DateTime baseDTd = new DateTime();
@@ -2626,13 +2620,6 @@ public virtual void UpdateBrakingState(float elapsedClockSeconds, int presentTim
                 }
             }
 
-            if (nextActionInfo != null && nextActionInfo.NextAction == AIActionItem.AI_ACTION_TYPE.STATION_STOP &&
-                distanceToGoM < 150 + StationStops[0].PlatformItem.Length && !ApproachTriggerSet)
-            {
-                if (Cars[0] is MSTSLocomotive) Cars[0].SignalEvent(Event.AITrainApproachingStation);
-                ApproachTriggerSet = true;
-            }
-
             if (nextActionInfo != null && nextActionInfo.NextAction == AIActionItem.AI_ACTION_TYPE.STATION_STOP)
                 creepDistanceM = 0.0f;
             if (nextActionInfo == null && requiredSpeedMpS == 0)
@@ -4380,7 +4367,6 @@ public void CoupleAI(Train attachTrain, bool thisTrainFront, bool attachTrainFro
                     AI.AITrains.Add(this);
                     AI.aiListChanged = true;
                 }
-                else if (attachTrain is AITrain) RedefineAITriggers(attachTrain as AITrain);
                 if (!UncondAttach)
                 {
                     RemoveTrain();
@@ -4489,7 +4475,6 @@ public void CoupleAIToStatic(Train attachTrain, bool thisTrainFront, bool attach
             AddTrackSections();
             ResetActions(true);
             physicsUpdate(0);
-            RedefineAITriggers(this);
         }
 
         //================================================================================================//
@@ -4731,8 +4716,7 @@ public void TerminateCoupling(Train attachTrain, bool thisTrainFront, bool attac
             // Move WP, if any, just under the loco;
             AuxActionsContain.MoveAuxActionAfterReversal(this);
             ResetActions(true);
-            RedefineAITriggers(this);
-            if (attachTrain is AITrain) RedefineAITriggers(attachTrain as AITrain);
+
             physicsUpdate(0);// Stop the wheels from moving etc
 
         }
@@ -6594,27 +6578,6 @@ public void RestartWaitingTrain(RestartWaitingTrain restartWaitingTrain)
             }
         }
 
-        //================================================================================================//
-        /// <summary>
-        /// Redefine sound triggers for AI trains
-        /// </summary>
-        public void RedefineAITriggers(AITrain train)
-        {
-            var leadFound = false;
-            foreach (var car in train.Cars)
-            {
-                if (car is MSTSLocomotive)
-                {
-                    if (!leadFound)
-                    {
-                        car.SignalEvent(Event.AITrainLeadLoco);
-                        leadFound = true;
-                    }
-                    else car.SignalEvent(Event.AITrainHelperLoco);
-                }
-            }
-        }
-
     }
 
 

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -1538,8 +1538,6 @@ public void ReverseCars()
             // Update flipped state of each car.
             for (var i = 0; i < Cars.Count; i++)
                 Cars[i].Flipped = !Cars[i].Flipped;
-            // if AI train redefine first loco for sound
-            if (TrainType == TRAINTYPE.AI) (this as AITrain).RedefineAITriggers(this as AITrain);
         }
 
         /// <summary>

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -748,20 +748,14 @@ public void SetWagonCommandReceivers(MSTSWagon wag)
         public TrainCar SetPlayerLocomotive(Train playerTrain)
         {
             TrainCar PlayerLocomotive = null;
-            var leadFound = false;
             foreach (TrainCar car in playerTrain.Cars)
                 if (car.IsDriveable)  // first loco is the one the player drives
                 {
-                    if (!leadFound)
-                    {
                     PlayerLocomotive = car;
                     playerTrain.LeadLocomotive = car;
                     playerTrain.InitializeBrakes();
                     PlayerLocomotive.LocalThrottlePercent = playerTrain.AITrainThrottlePercent;
-                        PlayerLocomotive.SignalEvent(Event.PlayerTrainLeadLoco);
-                        leadFound = true;
-                    }
-                    else car.SignalEvent(Event.PlayerTrainHelperLoco);
+                    break;
                 }
             if (PlayerLocomotive == null)
                 throw new InvalidDataException("Can't find player locomotive in activity");
@@ -981,7 +975,6 @@ private void FinishCoupling(Train drivenTrain, Train train, bool couple_to_front
                     }
                     drivenTrain.Cars.Clear();
                     AI.TrainsToRemoveFromAI.Add((AITrain)train);
-                    PlayerLocomotive.SignalEvent(Event.PlayerTrainHelperLoco);
                     PlayerLocomotive = SetPlayerLocomotive(train);
                     (train as AITrain).SwitchToPlayerControl();
                     OnPlayerLocomotiveChanged();
@@ -1096,7 +1089,6 @@ public void CheckForCoupling(Train drivenTrain, float elapsedClockSeconds)
                             {
                                 drivenTrain.Cars.Add(car);
                                 car.Train = drivenTrain;
-                                if (car is MSTSLocomotive) car.SignalEvent(Event.PlayerTrainHelperLoco);
                             }
                             FinishRearCoupling(drivenTrain, train, true);
                             return;
@@ -1127,7 +1119,6 @@ public void CheckForCoupling(Train drivenTrain, float elapsedClockSeconds)
                                 drivenTrain.Cars.Add(car);
                                 car.Train = drivenTrain;
                                 car.Flipped = !car.Flipped;
-                                if (car is MSTSLocomotive) car.SignalEvent(Event.PlayerTrainHelperLoco);
                             }
                             FinishRearCoupling(drivenTrain, train, false);
                             return;
@@ -1192,7 +1183,6 @@ public void CheckForCoupling(Train drivenTrain, float elapsedClockSeconds)
                                     TrainCar car = train.Cars[i];
                                     drivenTrain.Cars.Insert(i, car);
                                     car.Train = drivenTrain;
-                                    if (car is MSTSLocomotive) car.SignalEvent(Event.PlayerTrainHelperLoco);
                                 }
                                 if (drivenTrain.LeadLocomotiveIndex >= 0) drivenTrain.LeadLocomotiveIndex += train.Cars.Count;
                                 FinishFrontCoupling(drivenTrain, train, lead, true);
@@ -1226,7 +1216,6 @@ public void CheckForCoupling(Train drivenTrain, float elapsedClockSeconds)
                                 drivenTrain.Cars.Insert(0, car);
                                 car.Train = drivenTrain;
                                 car.Flipped = !car.Flipped;
-                                if (car is MSTSLocomotive) car.SignalEvent(Event.PlayerTrainHelperLoco);
                             }
                             if (drivenTrain.LeadLocomotiveIndex >= 0) drivenTrain.LeadLocomotiveIndex += train.Cars.Count;
                             FinishFrontCoupling(drivenTrain, train, lead, false);
@@ -1829,19 +1818,6 @@ public void UncoupleBehind(TrainCar car, bool keepFront)
                 train2.TrainType = Train.TRAINTYPE.AI;
                 train.IncorporatedTrainNo = -1;
                 train2.MUDirection = Direction.Forward;
-                var leadFound = false;
-                foreach (var trainCar in train2.Cars)
-                {
-                    if (trainCar is MSTSLocomotive)
-                    {
-                        if (!leadFound)
-                        {
-                            trainCar.SignalEvent(Event.AITrainLeadLoco);
-                            leadFound = true;
-                        }
-                    }
-                    else trainCar.SignalEvent(Event.AITrainHelperLoco);
-                }
             }
             else train2.TrainType = Train.TRAINTYPE.STATIC;
             train2.LeadLocomotive = null;

Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs

@@ -583,9 +583,8 @@ public override void Save(BinaryWriter outf)
             outf.Write(Efficiency);
             outf.Write(MaxVelocityA);
             outf.Write(UncondAttach);
-            outf.Write(doorCloseAdvance);
-            outf.Write(doorOpenDelay);
-            outf.Write(ApproachTriggerSet);
+            outf.Write(DoorCloseTimer);
+            outf.Write(DoorOpenTimer);
             // Dummy for level crossing horn pattern
             outf.Write(-1);
 

Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs

@@ -1426,14 +1426,6 @@ protected void LoadCarSound(string wagonFolderSlash, string filename)
             try
             {
                 Viewer.SoundProcess.AddSoundSource(this, new SoundSource(Viewer, MSTSWagon, smsFilePath));
-                if (MSTSWagon is MSTSLocomotive && MSTSWagon.Train != null && MSTSWagon.Train.TrainType == Simulation.Physics.Train.TRAINTYPE.AI)
-                {
-                    if (MSTSWagon.CarID == MSTSWagon.Train.Cars[0].CarID)
-                    // Lead loco, enable AI train trigger
-                        MSTSWagon.SignalEvent(Orts.Common.Event.AITrainLeadLoco);
-                    // AI train helper loco
-                    else MSTSWagon.SignalEvent(Orts.Common.Event.AITrainHelperLoco);
-                }
             }
             catch (Exception error)
             {