#263: Removed time-varying driving DLS

Author: VictorPhilipp

TLM/TLM/Manager/Impl/OptionsManager.cs

@@ -130,7 +130,7 @@ public bool LoadData(byte[] data) {
 			}
 
 			if (data.Length >= 28) {
-				Options.setRealisticSpeeds(data[27] == (byte)1);
+				Options.setIndividualDrivingStyle(data[27] == (byte)1);
 			}
 
 			if (data.Length >= 29) {
@@ -189,6 +189,10 @@ public bool LoadData(byte[] data) {
 				Options.setAllowFarTurnOnRed(data[40] == (byte)1);
 			}
 
+			if (data.Length >= 42) {
+				Options.setAllowFarTurnOnRed(data[41] == (byte)1);
+			}
+
 			return true;
 		}
 
@@ -221,7 +225,7 @@ public byte[] SaveData(ref bool success) {
 						(byte)(Options.junctionRestrictionsEnabled ? 1 : 0),
 						(byte)(Options.prohibitPocketCars ? 1 : 0),
 						(byte)(Options.preferOuterLane ? 1 : 0),
-						(byte)(Options.realisticSpeeds ? 1 : 0),
+						(byte)(Options.individualDrivingStyle ? 1 : 0),
 						(byte)(Options.evacBussesMayIgnoreRules ? 1 : 0),
 						(byte)(Options.instantEffects ? 1 : 0),
 						(byte)(Options.parkingRestrictionsEnabled ? 1 : 0),

TLM/TLM/Manager/Impl/VehicleBehaviorManager.cs

@@ -694,18 +694,11 @@ public uint GetStaticVehicleRand(ushort vehicleId) {
 		}
 
 		public uint GetTimedVehicleRand(ushort vehicleId) {
-			uint intv = VehicleState.MAX_TIMED_RAND / 2u;
-			uint range = intv * (uint)(vehicleId % (100u / intv)); // is one of [0, 50]
-			uint step = VehicleStateManager.Instance.VehicleStates[vehicleId].timedRand;
-			if (step >= intv) {
-				step = VehicleState.MAX_TIMED_RAND - step;
-			}
-
-			return range + step;
+			return (uint)(vehicleId % 2) * 50u + VehicleStateManager.Instance.VehicleStates[vehicleId].timedRand;
 		}
 
 		public float ApplyRealisticSpeeds(float speed, ushort vehicleId, ref VehicleState state, VehicleInfo vehicleInfo) {
-			if (Options.realisticSpeeds) {
+			if (Options.individualDrivingStyle) {
 				float vehicleRand = 0.01f * (float)GetTimedVehicleRand(vehicleId);
 				if (vehicleInfo.m_isLargeVehicle) {
 					speed *= 0.75f + vehicleRand * 0.25f; // a little variance, 0.75 .. 1
@@ -751,6 +744,9 @@ public int FindBestLane(ushort vehicleId, ref Vehicle vehicleData, ref VehicleSt
 					Log._Debug($"VehicleBehaviorManager.FindBestLane({vehicleId}): currentLaneId={currentLaneId}, currentPathPos=[seg={currentPathPos.m_segment}, lane={currentPathPos.m_lane}, off={currentPathPos.m_offset}] next1PathPos=[seg={next1PathPos.m_segment}, lane={next1PathPos.m_lane}, off={next1PathPos.m_offset}] next2PathPos=[seg={next2PathPos.m_segment}, lane={next2PathPos.m_lane}, off={next2PathPos.m_offset}] next3PathPos=[seg={next3PathPos.m_segment}, lane={next3PathPos.m_lane}, off={next3PathPos.m_offset}] next4PathPos=[seg={next4PathPos.m_segment}, lane={next4PathPos.m_lane}, off={next4PathPos.m_offset}]");
 				}
 #endif
+				if (!vehicleState.dlsReady) {
+					vehicleState.UpdateDynamicLaneSelectionParameters();
+				}
 
 				if (vehicleState.lastAltLaneSelSegmentId == currentPathPos.m_segment) {
 #if DEBUG

TLM/TLM/Resources/lang.txt

@@ -150,7 +150,7 @@ Reset_global_configuration Reset global configuration
 General General
 Gameplay Gameplay
 Overlays Overlays
-Realistic_speeds Realistic speeds
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules Evacuation buses may ignore traffic rules
 Evacuation_busses_may_only_be_used_to_reach_a_shelter Evacuation buses may only be used to reach a shelter
 Vehicle_behavior Vehicle behavior

TLM/TLM/Resources/lang_de.txt

@@ -150,7 +150,7 @@ Reset_global_configuration Globale Konfiguration zurücksetzen
 General Allgemein
 Gameplay Gameplay
 Overlays Overlays
-Realistic_speeds Realistische Geschwindigkeiten
+Individual_driving_styles Individuelle Fahrstile
 Evacuation_busses_may_ignore_traffic_rules Evakuierungsbusse dürfen Verkehrsregeln missachten
 Evacuation_busses_may_only_be_used_to_reach_a_shelter Evakuierungsbusse dienen nur zum Erreichen einer Notunterkunft
 Vehicle_behavior Fahrzeugverhalten

TLM/TLM/Resources/lang_es.txt

@@ -150,7 +150,7 @@ Reset_global_configuration Restablecer configuración global
 General General
 Gameplay Jugabilidad
 Overlays Capas de información
-Realistic_speeds Velocidades realistas
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules Los buses de evacuación pueden ignorar reglas de tránsito
 Evacuation_busses_may_only_be_used_to_reach_a_shelter Los buses de evacuación sólo pueden usarse para llegar a un refugio
 Vehicle_behavior Comportamiento vehícular

TLM/TLM/Resources/lang_fr.txt

@@ -150,7 +150,7 @@ Reset_global_configuration Réinitialiser la config. globale
 General Général
 Gameplay Gameplay
 Overlays Interface
-Realistic_speeds Vitesses réalistes
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules Les bus d'évacuation peuvent ignorer les règles de trafic
 Evacuation_busses_may_only_be_used_to_reach_a_shelter Les bus d'évacuation ne peuvent être utilisés que pour atteindre un abri
 Vehicle_behavior Comportement des véhicules

TLM/TLM/Resources/lang_it.txt

@@ -150,7 +150,7 @@ Reset_global_configuration Resetta configurazione globale
 General Generale
 Gameplay Gameplay
 Overlays Overlays
-Realistic_speeds Velocità realistica dei veicoli
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules I bus di evacuazione possono ignorare le regole stradali
 Evacuation_busses_may_only_be_used_to_reach_a_shelter I bus di evacuazione possono essere usati solo per raggiungere un rifugio
 Vehicle_behavior Comportamente del veicolo

TLM/TLM/Resources/lang_ja.txt

@@ -150,7 +150,7 @@ Reset_global_configuration グローバル設定をリセット
 General 全般
 Gameplay ゲームプレイ
 Overlays オーバーレイ
-Realistic_speeds 現実的なスピード
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules 避難バスは交通規則を無視するであろう
 Evacuation_busses_may_only_be_used_to_reach_a_shelter 避難バスは避難所へのアクセスにのみ使用できます
 Vehicle_behavior 車両の挙動

TLM/TLM/Resources/lang_ko.txt

@@ -150,7 +150,7 @@ Reset_global_configuration 글로벌(global) 설정 초기화
 General 기본
 Gameplay 게임플레이
 Overlays 화면표시
-Realistic_speeds 현실적인 속도
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules 대피 버스는 교통규칙을 무시합니다
 Evacuation_busses_may_only_be_used_to_reach_a_shelter 대피 버스는 대피소 도착을 위한 용도로만 사용할 수 있습니다
 Vehicle_behavior 차량 제한

TLM/TLM/Resources/lang_nl.txt

@@ -151,7 +151,7 @@ Reset_global_configuration Reset algemene configuratie
 General Algemeen
 Gameplay Spelverloop
 Overlays Transparanten
-Realistic_speeds Realistische snelheden
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules Evacuatiebussen mogen verkeersregels overtreden
 Evacuation_busses_may_only_be_used_to_reach_a_shelter Evacuatiebussen mogen enkel gebruikt worden om schuilkelders te bereiken
 Vehicle_behavior Vortuiggedrag

TLM/TLM/Resources/lang_pl.txt

@@ -150,7 +150,7 @@ Reset_global_configuration Zresetuj ustawienia globalne
 General Ogólne
 Gameplay Rozgrywka
 Overlays Nakładki
-Realistic_speeds Realistyczne prędkości
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules Autobusy ewakuacyjne mogą ignorować przepisy
 Evacuation_busses_may_only_be_used_to_reach_a_shelter Autobusy ewakuacyjne mogą przewozić tylko do schroniena
 Vehicle_behavior Zachowanie pojazdu

TLM/TLM/Resources/lang_pt.txt

@@ -150,7 +150,7 @@ Reset_global_configuration Resetar configuração global
 General Geral
 Gameplay Gameplay
 Overlays Sobreposições
-Realistic_speeds Velocidades realistas
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules Os ônibus de evacuação podem ignorar as regras de trânsito
 Evacuation_busses_may_only_be_used_to_reach_a_shelter Os ônibus de evacuação só podem ser usados para alcançar um abrigo
 Vehicle_behavior Comportamento do veículo

TLM/TLM/Resources/lang_ru.txt

@@ -150,7 +150,7 @@ Reset_global_configuration Сбросить общую конфигурацию
 General Общее
 Gameplay Геймплей
 Overlays Оверлеи
-Realistic_speeds Реалистичные скорости
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules Автобусы эвакуации игнорируют правила движения
 Evacuation_busses_may_only_be_used_to_reach_a_shelter Эвакуационные автобусы, только чтобы добраться до аварийного убежища
 Vehicle_behavior Поведение транспорта

TLM/TLM/Resources/lang_template.txt

@@ -150,7 +150,7 @@ Reset_global_configuration
 General
 Gameplay
 Overlays
-Realistic_speeds
+Individual_driving_styles
 Evacuation_busses_may_ignore_traffic_rules
 Evacuation_busses_may_only_be_used_to_reach_a_shelter
 Vehicle_behavior

TLM/TLM/Resources/lang_zh-tw.txt

@@ -150,7 +150,7 @@ Reset_global_configuration 重置所有設定
 General 普通
 Gameplay 遊戲
 Overlays 重疊
-Realistic_speeds 現實速度
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules 緊急疏散公車可忽略交通規則
 Evacuation_busses_may_only_be_used_to_reach_a_shelter 緊急疏散公車僅可用於到達避難所
 Vehicle_behavior 車輛行為

TLM/TLM/Resources/lang_zh.txt

@@ -150,7 +150,7 @@ Reset_global_configuration 重置所有设定
 General 常规
 Gameplay 游戏
 Overlays 覆盖
-Realistic_speeds 真实车速
+Individual_driving_styles Individual driving styles
 Evacuation_busses_may_ignore_traffic_rules 应急疏散巴士可忽略交通规则
 Evacuation_busses_may_only_be_used_to_reach_a_shelter 应急疏散巴士仅可用于到达避难所
 Vehicle_behavior 车辆行为

TLM/TLM/State/ConfigData/DynamicLaneSelection.cs

@@ -47,6 +47,12 @@ public class DynamicLaneSelection {
 
 		// ---
 
+		/*
+		 * max. reserved space:
+		 *   low = egoistic
+		 *   high = altruistic
+		 */
+
 		/// <summary>
 		/// Minimum maximum allowed reserved space on previous vehicle lane (for regular drivers)
 		/// </summary>
@@ -67,6 +73,12 @@ public class DynamicLaneSelection {
 		/// </summary>
 		public float MaxMaxRecklessReservedSpace = 50f;
 
+		/*
+		 * lane speed randomization interval:
+		 *    low = altruistic (driver sees the true lane speed)
+		 *    high = egoistic (driver imagines to be in the slowest queue, http://www.bbc.com/future/story/20130827-why-other-queues-move-faster)
+		 */
+
 		/// <summary>
 		/// Minimum lane speed randomization interval
 		/// </summary>
@@ -77,6 +89,12 @@ public class DynamicLaneSelection {
 		/// </summary>
 		public float MaxLaneSpeedRandInterval = 25f;
 
+		/* 
+		 * max. considered lane changes:
+		 *    low = altruistic
+		 *    high = egoistic
+		 */
+
 		/// <summary>
 		/// Maximum number of considered lane changes
 		/// </summary>
@@ -87,16 +105,28 @@ public class DynamicLaneSelection {
 		/// </summary>
 		public int MaxMaxOptLaneChanges = 3;
 
+		/* 
+		 * max. allowed speed difference for unsafe lane changes
+		 *    low = altruistic
+		 *    high = egoistic
+		 */
+
 		/// <summary>
-		/// Minimum maximum allowed speed difference for safe lane changes (in game units)
+		/// Minimum maximum allowed speed difference for unsafe lane changes (in game units)
 		/// </summary>
 		public float MinMaxUnsafeSpeedDiff = 0.1f;
 
 		/// <summary>
-		/// Maximum maximum allowed speed difference for safe lane changes (in game units)
+		/// Maximum maximum allowed speed difference for unsafe lane changes (in game units)
 		/// </summary>
 		public float MaxMaxUnsafeSpeedDiff = 1f;
 
+		/* 
+		 * min. required speed improvement for safe lane changes
+		 *    low = egoistic
+		 *    high = altruistic
+		 */
+
 		/// <summary>
 		/// Minimum minimum required speed improvement for safe lane changes (in km/h)
 		/// </summary>
@@ -107,6 +137,12 @@ public class DynamicLaneSelection {
 		/// </summary>
 		public float MaxMinSafeSpeedImprovement = 30f;
 
+		/* 
+		 * min. required traffic flow improvement for safe lane changes
+		 *    low = egoistic
+		 *    high = altruistic
+		 */
+
 		/// <summary>
 		/// Minimum minimum required traffic flow improvement for safe lane changes (in %)
 		/// </summary>

TLM/TLM/State/ConfigData/Gameplay.cs

@@ -6,8 +6,8 @@
 namespace TrafficManager.State.ConfigData {
 	public class Gameplay {
 		/// <summary>
-		/// Modulo value for vehicle behavior randomization
+		/// Modulo value for time-varying vehicle behavior randomization
 		/// </summary>
-		public uint VehicleStepRand = 20;
+		public uint VehicleTimedRandModulo = 10;
 	}
 }

TLM/TLM/State/Options.cs

@@ -31,7 +31,7 @@ public class Options : MonoBehaviour {
 		private static UICheckBox showCompatibilityCheckErrorToggle = null;
 		private static UICheckBox scanForKnownIncompatibleModsToggle = null;
 		private static UICheckBox ignoreDisabledModsToggle = null;
-		private static UICheckBox realisticSpeedsToggle = null;
+		private static UICheckBox individualDrivingStyleToggle = null;
 		private static UIDropDown recklessDriversDropdown = null;
 		private static UICheckBox relaxedBussesToggle = null;
 		private static UICheckBox allRelaxedToggle = null;
@@ -95,7 +95,7 @@ public class Options : MonoBehaviour {
 		public static bool instantEffects = true;
 		public static int simAccuracy = 0;
 		//public static int laneChangingRandomization = 2;
-		public static bool realisticSpeeds = true;
+		public static bool individualDrivingStyle = true;
 		public static int recklessDrivers = 3;
 		public static bool relaxedBusses = false;
 		public static bool allRelaxed = false;
@@ -259,7 +259,8 @@ public static void makeSettings(UIHelperBase helper) {
 
 			recklessDriversDropdown = vehBehaviorGroup.AddDropdown(Translation.GetString("Reckless_driving") + ":", new string[] { Translation.GetString("Path_Of_Evil_(10_%)"), Translation.GetString("Rush_Hour_(5_%)"), Translation.GetString("Minor_Complaints_(2_%)"), Translation.GetString("Holy_City_(0_%)") }, recklessDrivers, onRecklessDriversChanged) as UIDropDown;
 			recklessDriversDropdown.width = 300;
-			realisticSpeedsToggle = vehBehaviorGroup.AddCheckbox(Translation.GetString("Realistic_speeds"), realisticSpeeds, onRealisticSpeedsChanged) as UICheckBox;
+			individualDrivingStyleToggle = vehBehaviorGroup.AddCheckbox(Translation.GetString("Individual_driving_styles"), individualDrivingStyle, onIndividualDrivingStyleChanged) as UICheckBox;
+
 			if (SteamHelper.IsDLCOwned(SteamHelper.DLC.SnowFallDLC)) {
 				strongerRoadConditionEffectsToggle = vehBehaviorGroup.AddCheckbox(Translation.GetString("Road_condition_has_a_bigger_impact_on_vehicle_speed"), strongerRoadConditionEffects, onStrongerRoadConditionEffectsChanged) as UICheckBox;
 			}
@@ -1005,12 +1006,12 @@ private static void onRealisticPublicTransportChanged(bool newValue) {
 			realisticPublicTransport = newValue;
 		}
 
-		private static void onRealisticSpeedsChanged(bool value) {
+		private static void onIndividualDrivingStyleChanged(bool value) {
 			if (!checkGameLoaded())
 				return;
 
-			Log._Debug($"realisticSpeeds changed to {value}");
-			realisticSpeeds = value;
+			Log._Debug($"individualDrivingStyle changed to {value}");
+			setIndividualDrivingStyle(value);
 		}
 
 		private static void onDisableDespawningChanged(bool value) {
@@ -1277,10 +1278,12 @@ public static void setRealisticPublicTransport(bool newValue) {
 				realisticPublicTransportToggle.isChecked = newValue;
 		}
 
-		public static void setRealisticSpeeds(bool newValue) {
-			realisticSpeeds = newValue;
-			if (realisticSpeedsToggle != null)
-				realisticSpeedsToggle.isChecked = newValue;
+		public static void setIndividualDrivingStyle(bool newValue) {
+			individualDrivingStyle = newValue;
+
+			if (individualDrivingStyleToggle != null) {
+				individualDrivingStyleToggle.isChecked = newValue;
+			}
 		}
 
 		public static void setDisableDespawning(bool value) {
@@ -1556,5 +1559,13 @@ internal static int getRecklessDriverModulo() {
 			}
 			return 10000;
 		}
+
+		/// <summary>
+		/// Determines whether Dynamic Lane Selection (DLS) is enabled.
+		/// </summary>
+		/// <returns></returns>
+		public static bool IsDynamicLaneSelectionActive() {
+			return advancedAI && altLaneSelectionRatio > 0;
+		}
 	}
 }