Merge pull request #535 from krzychu124/320-remove-disable-traffic-lights

Function to Disable & Remove Traffic Lights

Author: krzychu124

TLM/TLM/Manager/Impl/OptionsManager.cs

@@ -193,6 +193,10 @@ public bool LoadData(byte[] data) {
                 OptionsVehicleRestrictionsTab.SetAllowFarTurnOnRed(data[40] == 1);
             }
 
+            if (data.Length >= 42) {
+                OptionsVehicleRestrictionsTab.SetAddTrafficLightsIfApplicable(data[41] == 1);
+            }
+
             return true;
         }
 
@@ -238,7 +242,8 @@ public byte[] SaveData(ref bool success) {
                 (byte)(Options.realisticPublicTransport ? 1 : 0),
                 (byte)(Options.turnOnRedEnabled ? 1 : 0),
                 (byte)(Options.allowNearTurnOnRed ? 1 : 0),
-                (byte)(Options.allowFarTurnOnRed ? 1 : 0)
+                (byte)(Options.allowFarTurnOnRed ? 1 : 0),
+                (byte)(Options.automaticallyAddTrafficLightsIfApplicable ? 1 : 0)
             };
         }
     }

TLM/TLM/Manager/Impl/TrafficLightManager.cs

@@ -108,6 +108,13 @@ public bool RemoveTrafficLight(ushort nodeId,
             return SetTrafficLight(nodeId, false, ref node, out reason);
         }
 
+        public void RemoveAllExistingTrafficLights() {
+            Array16<NetNode> nodes = NetManager.instance.m_nodes;
+            for (ushort i = 0; i < nodes.m_size; i++) {
+                RemoveTrafficLight(i, ref nodes.m_buffer[i]);
+            }
+        }
+
         public bool ToggleTrafficLight(ushort nodeId, ref NetNode node) {
             return SetTrafficLight(nodeId, !HasTrafficLight(nodeId, ref node), ref node);
         }

TLM/TLM/Patch/_RoadBaseAI/UpdateNodePatch.cs

@@ -0,0 +1,35 @@
+namespace TrafficManager.Patch._RoadBaseAI {
+    using ColossalFramework;
+    using Harmony;
+    using JetBrains.Annotations;
+    using Manager.Impl;
+    using State;
+
+    [HarmonyPatch(typeof(RoadBaseAI), "UpdateNode")]
+    [UsedImplicitly]
+    public class UpdateNodePatch {
+        [HarmonyPostfix]
+        [UsedImplicitly]
+        public static void Postfix(ushort nodeID, ref NetNode data) {
+
+            if (Options.automaticallyAddTrafficLightsIfApplicable)
+            {
+                return;
+            }
+
+            // test for not Flags.Junction is unnecessary because tested in IsTrafficLightToggleable
+            // but it's a simple and fast exit, while IsTrafficLightToggleable is quite complex
+            if(!data.m_flags.IsFlagSet(NetNode.Flags.Junction) || !TrafficLightManager.Instance.CanToggleTrafficLight(nodeID, false, ref data, out _))
+            {
+                return;
+            }
+
+            // UpdateNode is called for new nodes and changed nodes (-> existing AND new junctions)
+            // For new junctions this method is called BEFORE traffic lights are set (done in UpdateNodeFlags)
+            // Marking junction with CustomTrafficLights prevents the setting of traffic lights
+            // For existing junctions this has the additional benefit of not removing the lights when the junction changed
+
+            data.m_flags |= NetNode.Flags.CustomTrafficLights;
+        }
+    }
+}

TLM/TLM/Resources/Translations/Menu.csv

@@ -1,19 +1,19 @@
 "","de","en","es","fr","hu","it","ja","ko","nl","pl","pt","ru","zh-tw","zh","en-gb"
-"Tooltip:Switch traffic lights","Ampeln setzen","Switch traffic lights","Agregar/Borrar semáforos","(Dés)activer les feux tricolores","Kapcsolja be a lámpákat","Attiva/Disattiva semaforo","信号の付け外し","신호등 추가/제거","Stoplichten omwisselen","Włącznik sygnalizacji","Interruptor de Semáforos","Включение/выключение светофора","增刪號誌燈","红绿灯增删","Switch traffic lights"
-"Tooltip:Add priority signs","Vorfahrtsschilder","Add priority signs","Agregar señales de tránsito","Ajouter des signes de priorité","Adjon hozzá prioritási jeleket","Aggiungi segnale stradale","優先関係標識の追加","교통 표지판 추가","Plaats voorrangsborden","Dodaj znaki pierwszeństwa","Placas de preferência","Знаки приоритета","增訂優先通行權","添加路口优先权","Add priority signs"
+"Tooltip:Switch traffic lights","Ampeln setzen","Switch traffic lights","Agregar/Borrar semáforos","(Dés)activer les feux tricolores","Kapcsolja be a lámpákat","Attiva/Disattiva semaforo","信号の付け外し","신호등 추가/제거","Stoplichten omwisselen","Włącznik sygnalizacji","Alternar semáforos","Включение/выключение светофора","增刪號誌燈","红绿灯增删","Switch traffic lights"
+"Tooltip:Add priority signs","Vorfahrtsschilder","Add priority signs","Agregar señales de tránsito","Ajouter des signes de priorité","Adjon hozzá prioritási jeleket","Aggiungi segnale stradale","優先関係標識の追加","교통 표지판 추가","Plaats voorrangsborden","Dodaj znaki pierwszeństwa","Adicionar placas de preferência","Знаки приоритета","增訂優先通行權","添加路口优先权","Add priority signs"
 "Tooltip:Manual traffic lights","Manuelle Ampeln","Manual traffic lights","Semáforos manuales","Feux tricolores manuels","Kézi közlekedési lámpák","Semaforo (manuale)","信号の手動切替","신호등 직접 통제","Handmatige stoplichten","Sygnalizacja Ręczna","Semáforo manual","Светофор вручную","手控號誌燈","手动控制红绿灯","Manual traffic lights"
 "Tooltip:Timed traffic lights","Zeitgesteuerte Ampeln","Timed traffic lights","Semáforos programados","Feux tricolores chronométrés","Időzített közlekedési lámpák","Semaforo (temporizzato)","時間設定付き信号","신호등 시간표 설정","Tijdgestuurde stoplichten","Sygnalizacja Czasowa","Semáforos cronometrados","Настраиваемый светофор","號誌燈時相設定","红绿灯定时设置","Timed traffic lights"
-"Tooltip:Change lane arrows","Richtungspfeile","Change lane arrows","Editar flechas de pistas","Changer les directions de voies","Változtasson a sáv nyilait","Modifica frecce di direzione","車線矢印の変更","도로 화살표 변경","Voorsorteerpijlen aanpassen","Zmień strzałki pasów","Alterar setas de pista","Стрелки поворота на полосах движения","改變車道遵行方向","变更车道方向","Change lane arrows"
+"Tooltip:Change lane arrows","Richtungspfeile","Change lane arrows","Editar flechas de pistas","Changer les directions de voies","Változtasson a sáv nyilait","Modifica frecce di direzione","車線矢印の変更","도로 화살표 변경","Voorsorteerpijlen aanpassen","Zmień strzałki pasów","Alterar setas da faixa","Стрелки поворота на полосах движения","改變車道遵行方向","变更车道方向","Change lane arrows"
 "Tooltip:Clear traffic","Verkehr löschen","Clear Traffic","Limpiar Tráfico","Nettoyer le trafic","Tiszta forgalom","Resetta traffico","移動中車両の除去","모든 교통차량 초기화","Wegen vrijmaken","Wyczyść ruch","Limpar tráfego","Очистить весь транспорт","消除所有車輛","清除所有车辆","Clear Traffic"
 "Dialog.Text:Clear traffic, confirmation","Verkehr löschen?","Are you sure you want to clear all traffic?","¿Limpiar Tráfico?","Nettoyer le trafic ?","Tiszta forgalom?","Resetta traffico?","移動中車両の除去","모든 교통차량 초기화","Wegen vrijmaken?","Wyczyść ruch?","Limpar tráfego?","Очистить весь транспорт?","消除所有車輛確認","清除所有车辆","Are you sure you want to clear all traffic?"
 "Tooltip:Speed limits","Geschwindigkeitsbeschränkungen","Speed limits","Límites de velocidad","Limitations de vitesse","Sebesség határok","Limiti di velocità","速度制限","속도 제한","Snelheidslimiet","Ograniczenia prędkości","Limite de Velocidade","Ограничения скорости","速限","道路限速设置","Speed limits"
 "Tooltip:Vehicle restrictions","Fahrzeugbeschränkungen","Vehicle restrictions","Restricción vehicular","Restrictions des véhicules","Jármű-korlátozások","Restrizioni veicoli","車両規制","차량 제한","Voertuigbeperkingen","Ograniczenia ruchu pojazdów","Restrições de veículos","Ограничения видов транспорта","車種限定","道路车种限制","Vehicle restrictions"
 "Tooltip:Parking restrictions","Parkverbote","Parking restrictions","Restricciones de los estacionamientos","Restrictions de stationnement","Parkolási korlátozások","Divieti di sosta","駐車規制","주차 제한","Parkeerbeperkingen","Ograniczenia parkingowe","Restrições de estacionamento","Ограничения парковки","停車限制","路边停车限制","Parking restrictions"
-"Button:Remove this citizen","Diesen Cim entfernen","Remove this citizen","Remove this citizen","Retirer ce citoyen","Távolítsa el ezt a polgárt","Remove this citizen","この市民を削除する","해당 시민 삭제","Remove this citizen","Usuń tego mieszkańca","Remove this citizen","Удалить этого сима","移除此市民","移除此居民","Remove this citizen"
-"Button:Remove this vehicle","Dieses Fahrzeug entfernen","Remove this vehicle","Remove this vehicle","Retirer ce véhicule","Távolítsa el ezt a járművet","Rimuovi questo veicolo","この車両を削除する","해당 차량을 제거합니다","Remove this vehicle","Usuń ten pojazd","Remove this vehicle","Удалить этот транспорт","移除此車輛","移除此车辆","Remove this vehicle"
-"Tooltip:Toggle Main Menu","TM:PE-Hauptmenü umschalten","Toggle TM:PE Main Menu","","Bascule vers le Menu Principal de TM:PE","Toggle TM: PE Főmenü","","","","","Menu TM:PE","","Показать или скрыть меню TM:PE","調整主選單","TM:PE主菜单","Toggle TM:PE Main Menu"
-"Button:Switch view","Ansicht wechseln","Switch view","Cambiar vista","Changer de vue","Nézet váltása","Cambia vista","ビューを切り替える","보기 전환","Aanzicht wisselen","Zmień widok","Trocar visão","Переключение вида","切換檢視","切换视图","Switch view"
+"Button:Remove this citizen","Diesen Cim entfernen","Remove this citizen","Remove this citizen","Retirer ce citoyen","Távolítsa el ezt a polgárt","Remove this citizen","この市民を削除する","해당 시민 삭제","Remove this citizen","Usuń tego mieszkańca","Remover este cidadão","Удалить этого сима","移除此市民","移除此居民","Remove this citizen"
+"Button:Remove this vehicle","Dieses Fahrzeug entfernen","Remove this vehicle","Remove this vehicle","Retirer ce véhicule","Távolítsa el ezt a járművet","Rimuovi questo veicolo","この車両を削除する","해당 차량을 제거합니다","Remove this vehicle","Usuń ten pojazd","Remover este veículo","Удалить этот транспорт","移除此車輛","移除此车辆","Remove this vehicle"
+"Tooltip:Toggle Main Menu","TM:PE-Hauptmenü umschalten","Toggle TM:PE Main Menu","","Bascule vers le Menu Principal de TM:PE","Toggle TM: PE Főmenü","","メインメニューの切り替え","","","Menu TM:PE","Alternar Menu Principal","Показать или скрыть меню TM:PE","調整主選單","TM:PE主菜单","Toggle TM:PE Main Menu"
+"Button:Switch view","Ansicht wechseln","Switch view","Cambiar vista","Changer de vue","Nézet váltása","Cambia vista","ビューを切り替える","보기 전환","Aanzicht wisselen","Zmień widok","Alternar visão","Переключение вида","切換檢視","切换视图","Switch view"
 "Label:Outgoing demand","Ausgehende Nachfrage","Outgoing demand","Demanda saliente","Demande sortante","Kimenő kereslet","","出ていく需要","나가는 수요","Uitgaande vraag","Zapotrzebowanie - wychodzące","Demanda de saída","Исходящий спрос","出貨需求","出货需求","Outgoing demand"
 "Label:Incoming demand","Eingehende Nachfrage","Incoming demand","Demanda entrante","Demande entrante","Bejövő kereslet","","入っていく需要","들어오는 수요","Inkomende vraag","Zapotrzebowanie - przychodzące","Demanda de entrada","Входящий спрос","進貨需求","进货需求","Incoming demand"
-"Tooltip:Lane connector","Fahrspurverbinder","Lane connector","Conector de carriles","Connecteur de voies","Sávcsatlakozó","Connettore corsia","車線を接続","차선 연결","Rijstrookverbinder","Połącz pasy ruchu","Conector de pistas","Соединения полос движения","車道連接工具","车道连接工具","Lane connector"
+"Tooltip:Lane connector","Fahrspurverbinder","Lane connector","Conector de carriles","Connecteur de voies","Sávcsatlakozó","Connettore corsia","車線を接続","차선 연결","Rijstrookverbinder","Połącz pasy ruchu","Conector de faixas","Соединения полос движения","車道連接工具","车道连接工具","Lane connector"
 "Tooltip:Junction restrictions","Kreuzungsbeschränkungen","Junction restrictions","Restricciones del cruce","Restrictions des intersections","Csomópont korlátozások","Restrizioni incrocio","交差点の制限","교차로 규칙","Splitsingsbeperkingen","Ograniczenia na skrzyżowaniach","Restrições de junção","Ограничения на перекрёстках","交岔路口動線連接制定","路口管制","Junction restrictions"

TLM/TLM/Resources/Translations/ModConflicts.csv

@@ -1,6 +1,6 @@
 "","de","en","es","fr","hu","it","ja","ko","nl","pl","pt","ru","zh-tw","zh","en-gb"
 "Button:Delete mod","Löschen","Delete","Borrar","Suppr.","Töröl","Elimina","削除","삭제","Verwijderen","Skasuj","Apagar","Удалить","刪除模組","删除","Delete"
-"Button:Unsubscribe mod","Abmelden","Unsubscribe","Desuscribir","Désabonner","Leiratkozás","","","","Afmeld","Odsubskrybuj","","Отписаться","取消訂閱模組","取消订阅","Unsubscribe"
-"Window.Title:Detected incompatible mods","detected incompatible mods","detected incompatible mods","detected incompatible mods","a détecté des mods incompatibles","nem kompatibilis modokat észlelt","detected incompatible mods","detected incompatible mods","와 비호환되는 모드 감지","detected incompatible mods","wykrył niekompatybilne mody","detected incompatible mods","обнаружил несовместимые моды","偵測不相容的模組","检测到的不兼容MOD","detected incompatible mods"
-"Checkbox:Scan for known incompatible mods on startup","Scan for known incompatible mods on startup","Scan for known incompatible mods on startup","Scan for known incompatible mods on startup","Rechercher les mods incompatibles au lancement","Keressen induláskor az ismert, nem kompatibilis modokat","Scan for known incompatible mods on startup","Scan for known incompatible mods on startup","게임 실행시 비호환되는 모드 스캔","Scan for known incompatible mods on startup","Uruchamiaj sprawdzanie przy starcie gry","Scan for known incompatible mods on startup","Сканирование известных несовместимых модов при запуске","在遊戲開始時偵測已知的不相容模組","启动时检测是否存在已知不兼容MOD","Scan for known incompatible mods on startup"
-"Checkbox:Ignore disabled mods","","Ignore disabled mods","","Ignorer les mods désactivés","Figyeljen a letiltott modokra","","","비활성화된 모드 무시하기","Negeer uitgeschakelde mods","Ignoruj wyłączone mody","","Игнорировать отключённые моды","忽略已停用的模組","忽略未启用MOD","Ignore disabled mods"
+"Button:Unsubscribe mod","Abmelden","Unsubscribe","Desuscribir","Désabonner","Leiratkozás","","登録解除","","Afmeld","Odsubskrybuj","Desinscrever do mod","Отписаться","取消訂閱模組","取消订阅","Unsubscribe"
+"Window.Title:Detected incompatible mods","detected incompatible mods","detected incompatible mods","detected incompatible mods","a détecté des mods incompatibles","nem kompatibilis modokat észlelt","detected incompatible mods","detected incompatible mods","와 비호환되는 모드 감지","detected incompatible mods","wykrył niekompatybilne mody","Mods incompatíveis detectados","обнаружил несовместимые моды","偵測不相容的模組","检测到的不兼容MOD","detected incompatible mods"
+"Checkbox:Scan for known incompatible mods on startup","Scan for known incompatible mods on startup","Scan for known incompatible mods on startup","Scan for known incompatible mods on startup","Rechercher les mods incompatibles au lancement","Keressen induláskor az ismert, nem kompatibilis modokat","Scan for known incompatible mods on startup","Scan for known incompatible mods on startup","게임 실행시 비호환되는 모드 스캔","Scan for known incompatible mods on startup","Uruchamiaj sprawdzanie przy starcie gry","Procurar por mods incompatíveis conhecidos ao iniciar","Сканирование известных несовместимых модов при запуске","在遊戲開始時偵測已知的不相容模組","启动时检测是否存在已知不兼容MOD","Scan for known incompatible mods on startup"
+"Checkbox:Ignore disabled mods","Deaktivierte Mods ignorieren","Ignore disabled mods","","Ignorer les mods désactivés","Figyeljen a letiltott modokra","","無効なMODを無視する","비활성화된 모드 무시하기","Negeer uitgeschakelde mods","Ignoruj wyłączone mody","Ignorar mods desabilitados","Игнорировать отключённые моды","忽略已停用的模組","忽略未启用MOD","Ignore disabled mods"