Automatic merge of T1.6-rc8-48-ga5be129223 and 14 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 9b80fac: Automatic speed control
- Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module
- Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached
- Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing
- Pull request #1121 at 91d2d26: Manually Override Articulation
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1143 at 36d87c3: Status in Work Orders popup set too fast
- Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger
- Pull request #1155 at 40f8c34: fix for illegal characters in refeerence to Shape file
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1128 at 1d7643d: Particle Emitter Overhaul

Author: openrails-bot

Source/Orts.Simulation/Simulation/Activity.cs

@@ -1328,9 +1328,12 @@ override public Boolean Triggered(Activity activity)
                         consistTrain = matchesConsistNoOrder(ChangeWagonIdList);
                     if (consistTrain != null)
                     {
-                        if (atSiding(consistTrain.FrontTDBTraveller, consistTrain.RearTDBTraveller, this.SidingEnd1, this.SidingEnd2))
+                        if (consistTrain.TrainType == Train.TRAINTYPE.STATIC)
                         {
-                            triggered = true;
+                            if (atSiding(consistTrain.FrontTDBTraveller, consistTrain.RearTDBTraveller, this.SidingEnd1, this.SidingEnd2))
+                            {
+                                triggered = true;
+                            }
                         }
                     }
                     break;
@@ -1379,7 +1382,7 @@ private Train matchesConsist(List<string> wagonIdList)
         /// <summary>
         /// Finds the train that contains the wagons in the list. 
         /// Exact order is not required.
-        /// Some lists may only contain the first and last wagon.
+        /// Some lists may only contain the first and last wagon. Check that first and last wagon match with those two wagons in the activity list.
         /// </summary>
         /// <param name="wagonIdList"></param>
         /// <returns>train or null</returns>
@@ -1394,9 +1397,13 @@ private Train matchesConsistNoOrder(List<string> wagonIdList)
                 {
                         nWagonListCars++;
                     }
-                    if (nWagonListCars == trainItem.Cars.Count)
+                    if (nWagonListCars == wagonIdList.Count)
                     {
-                        return trainItem;
+                        if (((wagonIdList[0] == trainItem.Cars[0].CarID) && (wagonIdList[wagonIdList.Count - 1] == trainItem.Cars[trainItem.Cars.Count - 1].CarID)) || 
+                            ((wagonIdList[0] == trainItem.Cars[trainItem.Cars.Count - 1].CarID) && (wagonIdList[wagonIdList.Count - 1] == trainItem.Cars[0].CarID)))
+                        {
+                            return trainItem;
+                        }
                     }
                 }
                 }