Skip to content
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
053358c
Fixed bug with Simulation Accuracy setting completely ignored on load…
krzychu124 May 8, 2022
61fc8fc
TM:PE 11.6.5.2-hotfix-1
originalfoo May 8, 2022
d8bea20
Fix regression with version naming
krzychu124 May 9, 2022
e1b95c3
Locale key updates
originalfoo Apr 27, 2022
31cace3
fix typo
originalfoo Apr 27, 2022
51c976e
Remove unnecessary usings
originalfoo May 9, 2022
be4acaa
Localise `What's New?` panel titlebar
originalfoo May 9, 2022
ae8bbfc
Localisation files
originalfoo May 9, 2022
a1fdd75
Translations update
originalfoo May 21, 2022
965da90
Add Vietnamese, ensure compat with locale mod
originalfoo May 21, 2022
a069c4b
Fix pathfind stats locale key
originalfoo May 21, 2022
367ca2d
Version bump to 11.6.5.3
krzychu124 May 22, 2022
f72ad76
What's new changelog updated, release date not final
krzychu124 May 22, 2022
8feadbb
Api update (#1577)
kianzarrin May 29, 2022
fc8a838
updated Changelog.md, whats_new description
krzychu124 Jun 1, 2022
aec2fbe
NullRefException on exit to main menu - breaks options UI
krzychu124 Jun 2, 2022
80bbd4c
fixed missing scrollbar at Keybinds tab
krzychu124 Jun 2, 2022
cc255b9
corrected scope of DLS slider, blocked interactions with disabled UI …
krzychu124 Jun 2, 2022
c11b591
Fix InvalidOperationException (float <-> byte casting) - under certai…
krzychu124 Jun 2, 2022
b6c17ac
fix missing translation for group "Simulation"
krzychu124 Jun 2, 2022
c6042f2
Reused cached label, added one for dropdown. Fixed issue with setting…
krzychu124 Jun 2, 2022
51d0c94
Temporary fix for road sign selection in main menu - apply SpeedLimit…
krzychu124 Jun 2, 2022
31fdcc5
Changelog release date update
krzychu124 Jun 2, 2022
a310d63
Merge branch 'master' into release/11.6.5.3
krzychu124 Jun 2, 2022
dbe4c08
Add missing using (did not merge correctly in github)
krzychu124 Jun 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,28 @@ This changelog includes all versions and major variants of the mod going all the

> Date format: dd/mm/yyyy

#### TM:PE V11.6.5.3 STABLE, 01/06/2022

- [Meta] TM:PE 11.6.5.3 branch released as STABLE - huge thanks to our beta testers!
- [New] Vietnamese translation Locale key updates #1551 (DucAnhLam)
- [Updated] Api update: TrafficLights/JunctionRestrictions, Road sign theme, extended LaneEndTransitionGroup #1577 (kianzarrin)
- [Updated] Translations for multiple languages #1551 #1344
- [Fixed] Simulation Accuracy setting regression #1560 #1554 (krzychu124)
- [Fixed] Fix regression with version naming #1568 (krzychu124)

#### TM:PE V11.6.5.3 TEST, 01/06/2022

- [New] Vietnamese translation Locale key updates #1551 (DucAnhLam)
- [Updated] Api update: TrafficLights/JunctionRestrictions, Road sign theme, extended LaneEndTransitionGroup #1577 (kianzarrin)
- [Updated] Translations for multiple languages #1551 #1344
- [Fixed] Simulation Accuracy setting regression #1560 #1554 (krzychu124)
- [Fixed] Fix regression with version naming #1568 (krzychu124)

#### TM:PE V11.6.5.2-hotfix-1 TEST, 08/05/2022

- [Meta] TM:PE 11.6.5.2-hotfix-1
- [Fixed] Simulation Accuracy setting regression #1560 (krzychu124)

#### TM:PE V11.6.5.2 TEST, 27/04/2022

- [Meta] This release improves Lane Routing (UI, trams, trains, etc.), Parking AI (electric cars), and icon themes.
Expand Down
5 changes: 5 additions & 0 deletions TLM/TLM/Constants.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
namespace TrafficManager {
using TrafficManager.API.Manager;
using TrafficManager.API.Notifier;
using TrafficManager.API.UI;
using TrafficManager.U;
using TrafficManager.UI.Textures;

public static class Constants {
/// <summary>
Expand Down Expand Up @@ -35,6 +37,9 @@ public static float ByteToFloat(byte b) {

public static IManagerFactory ManagerFactory => Manager.Impl.ManagerFactory.Instance;

public static IUIFactory UIFactory => UI.UIFactory.Instance;

public static INotifier Notifier => TrafficManager.Notifier.Instance;

}
}
26 changes: 20 additions & 6 deletions TLM/TLM/Lifecycle/TMPELifecycle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ namespace TrafficManager.Lifecycle {
using System.Diagnostics.CodeAnalysis;
using TrafficManager.UI.Helpers;
using TrafficManager.API.Traffic.Enums;
using System.Text;

/// <summary>
/// Do not use Singleton<TMPELifecycle>.instance to prevent memory leak.
Expand Down Expand Up @@ -69,7 +70,18 @@ public static bool InGameOrEditor() =>
public bool MayPublishSegmentChanges()
=> InGameOrEditor() && !Instance.Deserializing;

public static AppMode? AppMode => SimulationManager.instance.m_ManagersWrapper.loading?.currentMode;
public static AppMode? AppMode {
get {
try {
return SimulationManager.instance.m_ManagersWrapper.loading?.currentMode;
}
catch {
// ignore, currentMode may throw NullReferenceException on return to main menu
}

return null;
}
}

// throws null ref if used from main menu
public static SimulationManager.UpdateMode UpdateMode => SimulationManager.instance.m_metaData.m_updateMode;
Expand Down Expand Up @@ -308,11 +320,11 @@ internal void Load() {

if (despawned != ExtVehicleType.None) {
Prompt.Info(
"TM:PE Pathfinder Updated",
$"Some vehicles ({despawned}) had broken paths due to a bug "
+ "in an earlier version of the pathfinder. We've despawned "
+ "them to prevent further issues. New vehicles will "
+ "automatically spawn to replace them.");
T("Popup.Title:TM:PE Pathfinder Updated"),
T("Popup.Message:Some vehicles had broken routes:") +
$"\n\n{despawned}\n\n" +
T("Popup.Message:We've despawned them to prevent further issues. " +
"New vehicles will automatically spawn to replace them."));
}
}

Expand All @@ -322,6 +334,8 @@ internal void Load() {
}
}

private static string T(string key) => Translation.Options.Get(key);

internal void Unload() {
try {
Options.Available = false;
Expand Down
14 changes: 14 additions & 0 deletions TLM/TLM/Manager/Impl/TrafficLightManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ public void RemoveAllExistingTrafficLights() {
}
}

public bool ToggleTrafficLight(ushort nodeId) => ToggleTrafficLight(nodeId, ref nodeId.ToNode());

public bool ToggleTrafficLight(ushort nodeId, ref NetNode node) {
return SetTrafficLight(nodeId, !HasTrafficLight(nodeId, ref node), ref node);
}
Expand All @@ -127,6 +129,16 @@ public bool ToggleTrafficLight(ushort nodeId, ref NetNode node, out ToggleTraffi
return SetTrafficLight(nodeId, !HasTrafficLight(nodeId, ref node), ref node, out reason);
}

bool ITrafficLightManager.CanToggleTrafficLight(ushort nodeId) {
ref NetNode netNode = ref nodeId.ToNode();
return netNode.IsValid() &&
CanToggleTrafficLight(
nodeId,
HasTrafficLight(nodeId, ref netNode),
ref netNode,
out _);
}

public bool CanToggleTrafficLight(ushort nodeId,
bool flag, // override?
ref NetNode node,
Expand Down Expand Up @@ -242,6 +254,8 @@ public bool CanEnableTrafficLight(ushort nodeId,
return ret;
}

public bool HasTrafficLight(ushort nodeId) => HasTrafficLight(nodeId, ref nodeId.ToNode());

public bool HasTrafficLight(ushort nodeId, ref NetNode node) {
return node.IsValid()
&& node.m_flags.IsFlagSet(NetNode.Flags.TrafficLights);
Expand Down
8 changes: 4 additions & 4 deletions TLM/TLM/Resources/Translations/AI_Car.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"","de","en","es","fr","hu","it","ja","ko","nl","pl","pt","ru","zh-tw","zh","en-gb","tr","uk","cz","sk","th","ro","oc","ar","id"
"Label:Driving to a parking spot","Fährt zum Parkplatz","Driving to a parking spot","Conduciendo a un puesto de estacionamiento","Se dirige vers un stationnement","Vezetés egy parkolóhelyre","Guidando verso un parcheggio","駐車場への運転","해당 주차공간으로 운전 중","Rijdt naar een parkeerplaats","Jedzie do miejsca parkingowego","Dirigindo para uma vaga de estacionamento","Движение к месту парковки","正在前往停車地點","正在开往到停车位中","Driving to a parking spot","Park yerine sürüyor","Їде паркуватися","Jízda na parkovací místo","Jazda na parkovacie miesto","กำลังขับไปที่ลานจอดรถ","","","ﻒﻗﺍﻮﻤﻟﺍ ﻥﺎﻜﻣ ﻰﻟﺇ ﺓﺩﺎﻴﻘﻟﺍ","Sedang menyetir ke tempat parkir"
"Label:Driving to another parking spot","Fährt zu einem anderen Parkplatz","Driving to another parking spot","Conduciendo a otro puesto de estacionamiento","Se dirige vers un autre stationnement","Vezetés egy másik parkolóhelyre","Guidando verso un altro parcheggio","別の駐車場への運転","다른 주차공간으로 운전 중","Rijdt naar een andere parkeerplaats","Jedzie do innego miejsca parkingowego","Dirigindo para outra vaga de estacionamento","Движение на другую парковку","開往另一處停車位中","正在开往到另一个停车位中","Driving to another parking spot","Başka bir park yerine sürüyor","Їде на інше місце паркування","Jízda na jiné parkovací místo","Jazda na iné parkovacie miesto","กำลังขับรถไปยังจุดจอดรถอื่น","","","ﻯﺮﺧﺍ ﻒﻗﺍﻮﻣ ﻰﻟﺇ ﺓﺩﺎﻴﻘﻟﺍ","Sedang menyetir ke tempat parkir lainnya"
"Label:Looking for a parking spot","Sucht einen Parkplatz","Looking for a parking spot","Buscando un puesto de estacionamiento","Cherche une place de stationnement","Parkolóhelyet keres","In cerca di un parcheggio","駐車場を探す","주차공간 찾는 중","Op zoek naar een parkeerplaats","Poszukuje miejsca parkingowego","Procurando uma vaga de estacionamento","Поиск места для парковки","尋找停車位中","寻找停车位中","Looking for a parking spot","Park yeri arıyor","Шукає де припаркуватися","Hledání místa pro parkování","Hľadanie parkovacieho miesta","กำลังหาลานจอดรถ","","","ﺕﺍﺭﺎﻴﺳ ﻒﻗﻮﻣ ﻥﺎﻜﻣ ﻦﻋ ﺚﺤﺑﺃ","Sedang mencari tempat parkir"
"","de","en","es","fr","hu","it","ja","ko","nl","pl","pt","ru","zh-tw","zh","en-gb","tr","uk","cz","sk","th","ro","oc","ar","id","vi"
"Label:Driving to a parking spot","Fährt zum Parkplatz","Driving to a parking spot","Conduciendo a un puesto de estacionamiento","Se dirige vers un stationnement","Vezetés egy parkolóhelyre","Guidando verso un parcheggio","駐車場への運転","해당 주차공간으로 운전 중","Rijdt naar een parkeerplaats","Jedzie do miejsca parkingowego","Dirigindo para uma vaga de estacionamento","Движение к месту парковки","正在前往停車地點","正在开往到停车位中","Driving to a parking spot","Park yerine sürüyor","Їде паркуватися","Jízda na parkovací místo","Jazda na parkovacie miesto","กำลังขับไปที่จุดจอดรถ","","","ﻒﻗﺍﻮﻤﻟﺍ ﻥﺎﻜﻣ ﻰﻟﺇ ﺓﺩﺎﻴﻘﻟﺍ","Sedang menyetir ke tempat parkir","Lái xe đến điểm đỗ"
"Label:Driving to another parking spot","Fährt zu einem anderen Parkplatz","Driving to another parking spot","Conduciendo a otro puesto de estacionamiento","Se dirige vers un autre stationnement","Vezetés egy másik parkolóhelyre","Guidando verso un altro parcheggio","別の駐車場への運転","다른 주차공간으로 운전 중","Rijdt naar een andere parkeerplaats","Jedzie do innego miejsca parkingowego","Dirigindo para outra vaga de estacionamento","Движение на другую парковку","開往另一處停車位中","正在开往到另一个停车位中","Driving to another parking spot","Başka bir park yerine sürüyor","Їде на інше місце паркування","Jízda na jiné parkovací místo","Jazda na iné parkovacie miesto","กำลังขับรถไปยังจุดจอดรถอื่น","","","ﻯﺮﺧﺍ ﻒﻗﺍﻮﻣ ﻰﻟﺇ ﺓﺩﺎﻴﻘﻟﺍ","Sedang menyetir ke tempat parkir lainnya","Lái xe đến điểm đỗ khác"
"Label:Looking for a parking spot","Sucht einen Parkplatz","Looking for a parking spot","Buscando un puesto de estacionamiento","Cherche une place de stationnement","Parkolóhelyet keres","In cerca di un parcheggio","駐車場を探す","주차공간 찾는 중","Op zoek naar een parkeerplaats","Poszukuje miejsca parkingowego","Procurando uma vaga de estacionamento","Поиск места для парковки","尋找停車位中","寻找停车位中","Looking for a parking spot","Park yeri arıyor","Шукає де припаркуватися","Hledání místa pro parkování","Hľadanie parkovacieho miesta","กำลังหาจุดจอดรถ","","","ﺕﺍﺭﺎﻴﺳ ﻒﻗﻮﻣ ﻥﺎﻜﻣ ﻦﻋ ﺚﺤﺑﺃ","Sedang mencari tempat parkir","Tìm kiếm điểm đỗ xe"
12 changes: 6 additions & 6 deletions TLM/TLM/Resources/Translations/AI_Citizen.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"","de","en","es","fr","hu","it","ja","ko","nl","pl","pt","ru","zh-tw","zh","en-gb","tr","uk","cz","sk","th","ro","oc","ar","id"
"Label:Entering vehicle","Steigt ins Auto ein","Entering vehicle","Vehículo entrante","Entre dans un véhicule","Beszáll a járműbe","Entrando nel veicolo","入庫","차량 탑승 중","Stapt in voertuig","Wsiada do samochodu","Entrando no veículo","Посадка в транспорт","上車中","上车中","Entering vehicle","Taşıta biniyor","Сідає у авто","Nastupuje do vozidla","Nastupuje do vozidla","กำลังขึ้นรถ","","","ﺓﺭﺎﻴﺴﻟﺍ ﺪﻌﺼﻳ","Sedang memasuki kendaraan"
"Label:Walking to car","Läuft zum Auto","Walking to car","Caminando al auto","Se dirige vers une voiture","Sétál az autóhoz","Camminando verso l'auto","車まで歩く","차 있던 곳으로 가는 중","Loopt naar auto","Idzie do samochodu","Caminhando para carro","Идёт к автомобилю","正在走向汽車","走向汽车中","Walking to car","Arabaya yürüyor","Йде до авто","Jde k autu","Kráča k autu","กำลังเดินไปที่รถ","","","ﺓﺭﺎﻴﺴﻟﺍ ﻲﻟﺍ ﻲﺸﻤﻳ","Sedang berjalan ke kendaraan"
"Label:Using public transport","Verwendet ÖPNV","Using public transport","Usando transporte público","Utilise les transports en commun","Tömegközlekedést használ","Utilizzando il trasporto pubblico","公共交通機関を利用する","대중교통 이용 중","Gebruikt het openbaar vervoer","Używa transportu publicznego","Usando transporte público","Использует общественный транспорт","正在使用大眾運輸工具","使用公共交通工具中","Using public transport","Toplu taşımayı kullanıyor","Користується міським транспортом","Používá hromadnou dopravu","Používa hromadnú dopravu","กำลังใช้ระบบขนส่งสาธารณะ","","","ﺔﻣﺎﻌﻟﺍ ﺕﻼﺻﺍﻮﻤﻟﺍ ﻡﺍﺪﺨﺘﺳﺍ","Sedang menggunakan transportasi umum"
"Label:Walking","Läuft","Walking","Caminando","Marche","Sétál","Camminando","歩く","걷는 중","Wandelt","Idzie","Caminhando","Идёт","走路中","走路中","Walking","Yürüyor","Йде пішки","Jde do","Kráča","กำลังเดิน","","","ﻲﺸﻤﻟﺍ","Sedang berjalan"
"Label:Thinking of a good parking spot","Erinnert sich an einen Parkplatz","Thinking of a good parking spot","Pensando en un buen puesto de estacionamiento","Réfléchit à un bon stationnement","Jó parkolóhelyre gondol","Pensando ad un buon parcheggio","好ましい駐車場を考える","주차하기에 좋은 장소를 생각 중","Aan het nadenken over een goede parkeerplaats","Myśli o odpowiednim miejscem parkingowym","Pensando em uma boa vaga de estacionamento","Думает о хорошем месте для парковки","正在尋找最佳停車位置","想找一个好停车位中","Thinking of a good parking spot","İyi bir park yeri düşünüyor","Міркує де припаркуватись","Hledání místa pro parkování","Hľadá dobré parkovacie miesto","คิดถึงจุดจอดรถดีๆ","","","ﺓﺭﺎﻴﺳ ﻒﻗﻮﻤﻟ ﺪﻴﺟ ﻥﺎﻜﻣ ﻲﻓ ﺮﻴﻜﻔﺘﻟﺍ","Sedang memikir tempat parkir yang bagus"
"","de","en","es","fr","hu","it","ja","ko","nl","pl","pt","ru","zh-tw","zh","en-gb","tr","uk","cz","sk","th","ro","oc","ar","id","vi"
"Label:Entering vehicle","Steigt ins Auto ein","Entering vehicle","Vehículo entrante","Entre dans un véhicule","Beszáll a járműbe","Entrando nel veicolo","入庫","차량 탑승 중","Stapt in voertuig","Wsiada do samochodu","Entrando no veículo","Посадка в транспорт","上車中","上车中","Entering vehicle","Taşıta biniyor","Сідає у авто","Nastupuje do vozidla","Nastupuje do vozidla","กำลังขึ้นรถ","Intră în vehicul","","ﺓﺭﺎﻴﺴﻟﺍ ﺪﻌﺼﻳ","Sedang memasuki kendaraan","Lên xe"
"Label:Walking to car","Läuft zum Auto","Walking to car","Caminando al auto","Se dirige vers une voiture","Sétál az autóhoz","Camminando verso l'auto","車まで歩く","차 있던 곳으로 가는 중","Loopt naar auto","Idzie do samochodu","Caminhando para carro","Идёт к автомобилю","正在走向汽車","走向汽车中","Walking to car","Arabaya yürüyor","Йде до авто","Jde k autu","Kráča k autu","กำลังเดินไปที่รถ","Merge până la mașină","","ﺓﺭﺎﻴﺴﻟﺍ ﻲﻟﺍ ﻲﺸﻤﻳ","Sedang berjalan ke kendaraan","Đi bộ đến xe"
"Label:Using public transport","Verwendet ÖPNV","Using public transport","Usando transporte público","Utilise les transports en commun","Tömegközlekedést használ","Utilizzando il trasporto pubblico","公共交通機関を利用する","대중교통 이용 중","Gebruikt het openbaar vervoer","Używa transportu publicznego","Usando transporte público","Использует общественный транспорт","正在使用大眾運輸工具","使用公共交通工具中","Using public transport","Toplu taşımayı kullanıyor","Користується міським транспортом","Používá hromadnou dopravu","Používa hromadnú dopravu","กำลังใช้ระบบขนส่งสาธารณะ","Utilizează transportului public","","ﺔﻣﺎﻌﻟﺍ ﺕﻼﺻﺍﻮﻤﻟﺍ ﻡﺍﺪﺨﺘﺳﺍ","Sedang menggunakan transportasi umum","Sử dụng phương tiện công cộng"
"Label:Walking","Läuft","Walking","Caminando","Marche","Sétál","Camminando","歩く","걷는 중","Wandelt","Idzie","Caminhando","Идёт","走路中","走路中","Walking","Yürüyor","Йде пішки","Jde do","Kráča","กำลังเดิน","Se plimbă","","ﻲﺸﻤﻟﺍ","Sedang berjalan","Đi bộ"
"Label:Thinking of a good parking spot","Erinnert sich an einen Parkplatz","Thinking of a good parking spot","Pensando en un buen puesto de estacionamiento","Réfléchit à un bon stationnement","Jó parkolóhelyre gondol","Pensando ad un buon parcheggio","好ましい駐車場を考える","주차하기에 좋은 장소를 생각 중","Aan het nadenken over een goede parkeerplaats","Myśli o odpowiednim miejscem parkingowym","Pensando em uma boa vaga de estacionamento","Думает о хорошем месте для парковки","正在尋找最佳停車位置","想找一个好停车位中","Thinking of a good parking spot","İyi bir park yeri düşünüyor","Міркує де припаркуватись","Hledání místa pro parkování","Hľadá dobré parkovacie miesto","คิดถึงจุดจอดรถดีๆ","Se gândește la un loc bun de parcare","","ﺓﺭﺎﻴﺳ ﻒﻗﻮﻤﻟ ﺪﻴﺟ ﻥﺎﻜﻣ ﻲﻓ ﺮﻴﻜﻔﺘﻟﺍ","Sedang memikir tempat parkir yang bagus","Nghĩ đến một điểm đỗ xe ưng ý"
Loading