Distributed power: recalculate locomotive groups after coupling and uncoupling

Author: Csantucci

Source/Orts.Simulation/MultiPlayer/Message.cs

@@ -1357,6 +1357,7 @@ public override void HandleMsg() //only client will get message, thus will set s
             train.InitializeBrakes();
             //train.InitializeSignals(false);//client do it won't have impact
             train.CheckFreight();
+            train.SetDPUnitIDs();
             bool canPlace = true;
             Train.TCSubpathRoute tempRoute = train.CalculateInitialTrainPosition(ref canPlace);
 
@@ -1567,6 +1568,7 @@ public override void HandleMsg() //only client will get message, thus will set s
                 train.CalculatePositionOfCars();
                 train.travelled = Travelled;
                 train.CheckFreight();
+                train.SetDPUnitIDs();
                 return;
             }
             train1.TrainType = Train.TRAINTYPE.REMOTE;
@@ -1601,6 +1603,7 @@ public override void HandleMsg() //only client will get message, thus will set s
             train1.InitializeBrakes();
             //train1.InitializeSignals(false);
             train1.CheckFreight();
+            train1.SetDPUnitIDs();
             bool canPlace = true;
             Train.TCSubpathRoute tempRoute = train1.CalculateInitialTrainPosition(ref canPlace);
 
@@ -2621,6 +2624,7 @@ public override void HandleMsg()
                         t.MUDirection = (Direction)mDirection1;
                         train.ControlMode = Train.TRAIN_CONTROL.EXPLORER;
                         train.CheckFreight();
+                        train.SetDPUnitIDs();
                         train.InitializeBrakes();
                         canPlace = true;
                         tempRoute = train.CalculateInitialTrainPosition(ref canPlace);
@@ -2671,6 +2675,7 @@ public override void HandleMsg()
                 train2.LeadLocomotive = null;
                 train2.LeadNextLocomotive();
                 train2.CheckFreight();
+                train2.SetDPUnitIDs();
 
                 //train2 may contain myself, and no other players, thus will make myself controlling this train
                 /*if (train2.Cars.Contains(MPManager.Simulator.PlayerLocomotive))
@@ -2693,6 +2698,7 @@ public override void HandleMsg()
                 train2.MUDirection = (Direction)mDirection2;
                 train2.ControlMode = Train.TRAIN_CONTROL.EXPLORER;
                 train2.CheckFreight();
+                train2.SetDPUnitIDs();
                 train2.InitializeBrakes();
                 canPlace = true;
                 tempRoute = train2.CalculateInitialTrainPosition(ref canPlace);
@@ -2967,6 +2973,7 @@ public override void HandleMsg()
             train.MUDirection = (Direction)mDirection;
             train.RearTDBTraveller = new Traveller(MPManager.Simulator.TSectionDat, MPManager.Simulator.TDB.TrackDB.TrackNodes, TileX, TileZ, X, Z, direction == 0 ? Traveller.TravellerDirection.Forward : Traveller.TravellerDirection.Backward);
             train.CheckFreight();
+            train.SetDPUnitIDs();
             train.CalculatePositionOfCars();
             train.LeadLocomotive = null; train2.LeadLocomotive = null;
             if (Lead != -1 && Lead < train.Cars.Count) train.LeadLocomotive = train.Cars[Lead];

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

@@ -4434,6 +4434,7 @@ public void CoupleAI(Train attachTrain, bool thisTrainFront, bool attachTrainFro
                 attachTrain.PresentPosition[1].SetTCPosition(tn.TCCrossReference, offset, direction);
                 // set various items
                 attachTrain.CheckFreight();
+                attachTrain.SetDPUnitIDs();
                 attachTrain.activityClearingDistanceM = attachTrain.Cars.Count < standardTrainMinCarNo ? shortClearingDistanceM : standardClearingDistanceM;
                 attachCar.SignalEvent(Event.Couple);
 
@@ -4549,6 +4550,7 @@ public void CoupleAIToStatic(Train attachTrain, bool thisTrainFront, bool attach
             PresentPosition[1].SetTCPosition(tn.TCCrossReference, offset, direction);
             // set various items
             CheckFreight();
+            SetDPUnitIDs();
             activityClearingDistanceM = Cars.Count < standardTrainMinCarNo ? shortClearingDistanceM : standardClearingDistanceM;
             attachCar.SignalEvent(Event.Couple);
 
@@ -4789,8 +4791,10 @@ public void TerminateCoupling(Train attachTrain, bool thisTrainFront, bool attac
             attachTrain.PresentPosition[1].SetTCPosition(tn.TCCrossReference, offset, direction);
             // set various items
             CheckFreight();
+            SetDPUnitIDs();
             activityClearingDistanceM = Cars.Count < standardTrainMinCarNo ? shortClearingDistanceM : standardClearingDistanceM;
             attachTrain.CheckFreight();
+            attachTrain.SetDPUnitIDs();
             attachTrain.activityClearingDistanceM = attachTrain.Cars.Count < standardTrainMinCarNo ? shortClearingDistanceM : standardClearingDistanceM;
             // anticipate reversal point and remove active action
             TCRoute.ReversalInfo[TCRoute.activeSubpath].ReverseReversalOffset = Math.Max(PresentPosition[0].TCOffset - 10f, 0.3f);

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

@@ -11206,6 +11206,7 @@ public void UpdateTrackActionsCoupling(bool couple_to_front)
             // check if new train is freight or not
 
             CheckFreight();
+            SetDPUnitIDs();
 
             // clear all track occupation actions
 
@@ -13525,6 +13526,7 @@ public void CreatePathlessPlayerTrain()
             TrainType = Train.TRAINTYPE.PLAYER;
             IsPathless = true;
             CheckFreight();
+            SetDPUnitIDs();
             ToggleToManualMode();
             InitializeBrakes();
             InitializeSpeeds();

Source/Orts.Simulation/Simulation/Simulator.cs

@@ -1359,6 +1359,7 @@ private void InitializeStaticConsists()
                     train.InitializeBrakes();
                     train.CheckFreight();
                     train.ReverseFormation(false); // When using autopilot mode this is needed for correct working of train switching
+                    train.SetDPUnitIDs();
                     bool validPosition = train.PostInit();
                     if (validPosition)
                         Trains.Add(train);
@@ -1691,7 +1692,9 @@ public void UncoupleBehind(TrainCar car, bool keepFront)
 
 
             train.CheckFreight();
+            train.SetDPUnitIDs();
             train2.CheckFreight();
+            train2.SetDPUnitIDs();
 
             train.Update(0);   // stop the wheels from moving etc
             train2.Update(0);  // stop the wheels from moving etc
@@ -1838,6 +1841,7 @@ private void StartSwitchPlayerTrain()
 
 
                     selectedAsPlayer.CheckFreight();
+                    selectedAsPlayer.SetDPUnitIDs(true);
 
                     selectedAsPlayer.Update(0);  // stop the wheels from moving etc
                     TrainSwitcher.PickedTrainFromList = selectedAsPlayer;
@@ -1869,6 +1873,7 @@ private void StartSwitchPlayerTrain()
                         playerTrain.SpeedMpS = 0;
                         foreach (TrainCar car in playerTrain.Cars) car.SpeedMpS = 0;
                         playerTrain.CheckFreight();
+                        playerTrain.SetDPUnitIDs();
                         playerTrain.InitializeBrakes();
                     }
                 }

Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs

@@ -2404,6 +2404,7 @@ public bool BuildConsist(List<consistInfo> consistSets, string trainsetDirectory
 
                 // set train details
                 TTTrain.CheckFreight();
+                TTTrain.SetDPUnitIDs();
                 TTTrain.SpeedSettings.routeSpeedMpS = (float)simulator.TRK.Tr_RouteFile.SpeedLimit;
 
                 if (!confMaxSpeed.HasValue || confMaxSpeed.Value <= 0f)

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

@@ -11665,6 +11665,7 @@ public void TTCouple(TTTrain attachTrain, bool thisTrainFront, bool attachTrainF
 
             // set various items
             attachTrain.CheckFreight();
+            attachTrain.SetDPUnitIDs();
             attachCar.SignalEvent(Event.Couple);
             attachTrain.ProcessSpeedSettings();
 
@@ -12046,6 +12047,7 @@ public int TTUncoupleBehind(TTTrain newTrain, bool reverseTrain, int leadLocomot
 
             // check freight for both trains
             CheckFreight();
+            SetDPUnitIDs();
             newTrain.CheckFreight();
 
             // check speed values for both trains