- functtion matchesConsistNoOrder now returns train when train contains the wagons of the activity drop off wagonlist

- Some actvity lists may only contain the first and last wagon. Check that first and last wagon match with those two wagons in the activity list.
- check if drop off train is a STATIC one

Author: sweiland-openrails

Source/Orts.Simulation/Simulation/Activity.cs

@@ -1327,9 +1327,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;
@@ -1378,7 +1381,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>
@@ -1393,9 +1396,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;
+                        }
                     }
                 }
             }