Merge branch '1.10.0'

Author: VictorPhilipp

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "TLM/OptionsFramework"]
+	path = TLM/OptionsFramework
+	url = ../OptionsFramework.git

README.md

@@ -4,6 +4,44 @@ A work-in-progress modification for **Cities: Skylines** to add additional traff
 User manual: http://www.viathinksoft.de/tmpe
 
 # Changelog      
+1.10.0, 07/30/2017
+- New feature: Dynamic Lane Selection
+- New feature: Adaptive step switching
+- New feature: Individual vehicles may be removed from the game 
+- New option: Vehicle restrictions aggression
+- New option: Vehicles follow priority rules at junctions with timed traffic lights
+- Improved path-finding performance
+- Improved performance traffic measurement engine performance 
+- Improved vehicle state tracking
+- Reorganized global configuration file (sorry, your main menu and main button positions are reset)
+- The option "Road condition has a bigger impact on vehicle speed" is only shown if the Snowfall DLC is owned
+- The flow/wait calculation mode to be used is now configurable via the global configuration file
+- Added path-find statistics label
+- Added confirmation dialog for "Clear Traffic" button
+- Currently active timed traffic light step is remembered
+- Trains do not wait for each other anymore near timed traffic lights
+- It is now possible to connect train station tracks and outside connections with the lane connector
+- Disabling the Parking AI triggers graceful clean up procedure
+- Relocated some options
+- Workaround for a base game issue that causes trams to get stuck
+- Trains do not longer stop in front of green timed traffic lights
+- Vehicles use queue skipping to prioritize path-finding runs that are caused by road modifications
+- Adding a vehicle separate light to a timed traffic lights applies the main light configuration
+- Parking AI: Vehicles can now find parking spaces at the opposite road side
+- Parking AI: Included an improved fallback logic for some edge cases
+- Parking AI: Citizens should now be more successful in returning their cars back home  
+- Parking AI: Tuned parking radius parameters 
+- Parking AI: If the limit for parked vehicles is reached and parking fails due to it, no alternative parking space is queried
+- Vehicle AI: Busses prefer lanes with correct lane arrow over incorrect ones
+- Bugfix: Using the bulldozer tool might lead to inconsistent road geometry information
+- Bugfix: Citizens that fail to approach their parked car fly towards their target building 
+- Bugfix: Parking AI: Path-finding fails if cars are parked too far away from a road
+- Bugfix: Parking AI: Citizens approaching a car start to float away
+- Bugfix: "Heavy vehicles prefer outer lanes on highways" does not work
+- Bugfix: The lane connector does not allow connecting all available lane end points at train stations and on bidirectional one-lane train tracks
+- Bugfix: Vehicles may get stuck in several situations
+- Upgrading to a road with bus lanes now copies an already existing traffic light state to the new traffic light 
+
 1.9.6, 05/28/2017
 - Updated Simplified Chinese translation
 - Bugfix: Vehicles cannot perform u-turns at junctions with only one outgoing segment (thanks to @Sunbird for reporting this issue)

TLM/TLM/Traffic/ArrowDirection.cs renamed to TLM/CSUtil.Commons/ArrowDirection.cs

@@ -2,12 +2,12 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TrafficManager.Traffic {
+namespace CSUtil.Commons {
 	public enum ArrowDirection {
-		None,
-		Left,
-		Forward,
-		Right,
-		Turn
+		None = 0,
+		Left = 1,
+		Forward = 2,
+		Right = 3,
+		Turn = 4
 	}
 }

TLM/CSUtil.Commons/ArrowDirectionUtil.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace CSUtil.Commons {
+	public class ArrowDirectionUtil {
+		public static ArrowDirection InvertLeftRight(ArrowDirection dir) {
+			if (dir == ArrowDirection.Left)
+				dir = ArrowDirection.Right;
+			else if (dir == ArrowDirection.Right)
+				dir = ArrowDirection.Left;
+			return dir;
+		}
+
+		/// <summary>
+		/// Calculates the direction of <paramref name="toRelDir"/> in relation to ArrowDirection.TURN.
+		/// </summary>
+		/// <param name="fromDir">source direction</param>
+		/// <param name="toRelDir">target direction, relative to <paramref name="fromDir"/></param>
+		/// <returns></returns>
+		public static ArrowDirection MakeAbsolute(ArrowDirection fromDir, ArrowDirection toRelDir) {
+			if (fromDir == ArrowDirection.None) {
+				// invalid direction
+				return ArrowDirection.None;
+			}
+
+			if (toRelDir == ArrowDirection.None) {
+				// invalid direction
+				return ArrowDirection.None;
+			}
+
+			if (fromDir == ArrowDirection.Turn) {
+				// toRelDir is already relative to TURN
+				return toRelDir;
+			}
+
+			if (toRelDir == ArrowDirection.Turn) {
+				// toRelDir is fromDir
+				return fromDir;
+			}
+
+			int fromDirBase0 = (int)fromDir - 1;
+			int toRelDirBase1 = (int)toRelDir;
+			/*
+			 * Direction | Base 0 | Base 1
+			 * ==========+========+=======
+			 * Left      | 0      | 1
+			 * Forward   | 1      | 2
+			 * Right     | 2      | 3
+			 * 
+			 *
+			 * Direction 1 | Direction 2 | Dir. 1 B0 | Dir. 2 B1 | Sum | (Sum + 1) % 4 | Desired dir.
+			 * ============+=============+===========+===========+=====|===============+=============
+			 * Left        | Left        | 0         | 1         | 1   | 2             | (Forward, 2)
+			 * Left        | Forward     | 0         | 2         | 2   | 3             | (Right, 3)
+			 * Left        | Right       | 0         | 3         | 3   | 0             | (Turn, 4)
+			 * Forward     | Left        | 1         | 1         | 2   | 3             | (Right, 3)
+			 * Forward     | Forward     | 1         | 2         | 3   | 0             | (Turn, 4)
+			 * Forward     | Right       | 1         | 3         | 4   | 1             | (Left, 1)
+			 * Right       | Left        | 2         | 1         | 3   | 0             | (Turn, 4)
+			 * Right       | Forward     | 2         | 2         | 4   | 1             | (Left, 1)
+			 * Right       | Right       | 2         | 3         | 5   | 2             | (Forward, 2)
+			 */
+
+			int ret = (fromDirBase0 + toRelDirBase1 + 1) % 4;
+			if (ret == 0) {
+				ret = 4;
+			}
+			return (ArrowDirection)ret;
+		}
+	}
+}

TLM/CSUtil.Commons/CSUtil.Commons.csproj

@@ -42,6 +42,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ArrowDirection.cs" />
+    <Compile Include="ArrowDirectionUtil.cs" />
     <Compile Include="EnumUtil.cs" />
     <Compile Include="Log.cs" />
     <Compile Include="LogicUtil.cs" />

TLM/OptionsFramework

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using TrafficManager.Manager;
 
 namespace TrafficManager {
 	public static class Constants {
@@ -15,5 +16,11 @@ public static IServiceFactory ServiceFactory {
 #endif
 			}
 		}
+
+		public static IManagerFactory ManagerFactory {
+			get {
+				return Manager.Impl.ManagerFactory.Instance;
+			}
+		}
 	}
 }

TLM/TLM/Constants.cs

@@ -5,7 +5,9 @@
 using TrafficManager.Custom.PathFinding;
 using TrafficManager.Geometry;
 using TrafficManager.Manager;
+using TrafficManager.Manager.Impl;
 using TrafficManager.Traffic;
+using TrafficManager.Traffic.Data;
 using UnityEngine;
 
 namespace TrafficManager.Custom.AI {
@@ -15,8 +17,7 @@ public bool CustomStartPathFind(ushort vehicleID, ref Vehicle vehicleData, Vecto
 			//Log._Debug($"CustomAmbulanceAI.CustomStartPathFind called for vehicle {vehicleID}");
 #endif
 
-			ExtVehicleType vehicleType = (vehicleData.m_flags & Vehicle.Flags.Emergency2) != 0 ? ExtVehicleType.Emergency : ExtVehicleType.Service;
-			VehicleStateManager.Instance._GetVehicleState(vehicleID).VehicleType = vehicleType;
+			ExtVehicleType vehicleType = VehicleStateManager.Instance.OnStartPathFind(vehicleID, ref vehicleData, (vehicleData.m_flags & Vehicle.Flags.Emergency2) != 0 ? ExtVehicleType.Emergency : ExtVehicleType.Service);
 
 			VehicleInfo info = this.m_info;
 			bool allowUnderground = (vehicleData.m_flags & (Vehicle.Flags.Underground | Vehicle.Flags.Transition)) != 0;
@@ -38,13 +39,8 @@ public bool CustomStartPathFind(ushort vehicleID, ref Vehicle vehicleData, Vecto
 				}
 				uint path;
 				// NON-STOCK CODE START
-				if (CustomPathManager._instance.CreatePath(vehicleType, vehicleID, ExtCitizenInstance.ExtPathType.None, out path, ref Singleton<SimulationManager>.instance.m_randomizer, Singleton<SimulationManager>.instance.m_currentBuildIndex, startPosA, startPosB, endPosA, endPosB, NetInfo.LaneType.Vehicle | NetInfo.LaneType.TransportVehicle, info.m_vehicleType, 20000f, this.IsHeavyVehicle(), this.IgnoreBlocked(vehicleID, ref vehicleData), false, false)) {
+				if (CustomPathManager._instance.CreatePath(vehicleType, vehicleID, ExtCitizenInstance.ExtPathType.None, out path, ref Singleton<SimulationManager>.instance.m_randomizer, Singleton<SimulationManager>.instance.m_currentBuildIndex, startPosA, startPosB, endPosA, endPosB, NetInfo.LaneType.Vehicle | NetInfo.LaneType.TransportVehicle, info.m_vehicleType, 20000f, this.IsHeavyVehicle(), this.IgnoreBlocked(vehicleID, ref vehicleData), false, (vehicleData.m_flags & Vehicle.Flags.Spawned) != 0)) {
 				// NON-STOCK CODE END
-#if USEPATHWAITCOUNTER
-					VehicleState state = VehicleStateManager.Instance._GetVehicleState(vehicleID);
-					state.PathWaitCounter = 0;
-#endif
-
 					if (vehicleData.m_path != 0u) {
 						Singleton<PathManager>.instance.ReleasePath(vehicleData.m_path);
 					}

TLM/TLM/Custom/AI/CustomAmbulanceAI.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Text;
 using TrafficManager.Manager;
+using TrafficManager.Manager.Impl;
 using TrafficManager.State;
 using TrafficManager.Traffic;
 using TrafficManager.UI;
@@ -16,7 +17,7 @@ public Color CustomGetColor(ushort buildingID, ref Building data, InfoManager.In
 			// NON-STOCK CODE START
 			if (Options.prohibitPocketCars) {
 				Color? color;
-				if (AdvancedParkingManager.Instance.GetBuildingInfoViewColor(buildingID, ref data, infoMode, out color)) {
+				if (AdvancedParkingManager.Instance.GetBuildingInfoViewColor(buildingID, ref data, ref ExtBuildingManager.Instance.ExtBuildings[buildingID], infoMode, out color)) {
 					return (Color)color;
 				}
 			}

TLM/TLM/Custom/AI/CustomBuildingAI.cs

@@ -6,6 +6,7 @@
 using TrafficManager.Geometry;
 using TrafficManager.Manager;
 using TrafficManager.Traffic;
+using TrafficManager.Traffic.Data;
 using UnityEngine;
 
 namespace TrafficManager.Custom.AI {
@@ -36,11 +37,7 @@ public bool CustomStartPathFind(ushort vehicleID, ref Vehicle vehicleData, Vecto
 				uint path;
 				// NON-STOCK CODE START
 				if (CustomPathManager._instance.CreatePath(
-					ExtVehicleType.Bus, vehicleID, ExtCitizenInstance.ExtPathType.None, out path, ref Singleton<SimulationManager>.instance.m_randomizer, Singleton<SimulationManager>.instance.m_currentBuildIndex, startPosA, startPosB, endPosA, endPosB, NetInfo.LaneType.Vehicle | NetInfo.LaneType.TransportVehicle, info.m_vehicleType, 20000f, this.IsHeavyVehicle(), this.IgnoreBlocked(vehicleID, ref vehicleData), true, false)) {
-#if USEPATHWAITCOUNTER
-					VehicleState state = VehicleStateManager.Instance._GetVehicleState(vehicleID);
-					state.PathWaitCounter = 0;
-#endif
+					ExtVehicleType.Bus, vehicleID, ExtCitizenInstance.ExtPathType.None, out path, ref Singleton<SimulationManager>.instance.m_randomizer, Singleton<SimulationManager>.instance.m_currentBuildIndex, startPosA, startPosB, endPosA, endPosB, NetInfo.LaneType.Vehicle | NetInfo.LaneType.TransportVehicle, info.m_vehicleType, 20000f, this.IsHeavyVehicle(), this.IgnoreBlocked(vehicleID, ref vehicleData), true, true)) {
 					// NON-STOCK CODE END
 
 					if (vehicleData.m_path != 0u) {