Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions Controller/INRULs/RULConfig.txt
Original file line number Diff line number Diff line change
Expand Up @@ -333,3 +333,11 @@ Source: AvenueAdvanced/WideRadiusCurves.rul
Source: AvenueAdvanced/Roundabouts.rul
Source: AvenueAdvanced/TurningLanes.rul
Source: AvenueAdvanced/Intersections.rul

########################################################

File: NetworkAddonMod_Advice.dat

TGI: 0xCA63E2A3 0x4A5E8EF6 0x2A504B00
Compressed: 1
Source: ../../lua/adv_nam_dll.lua
17 changes: 17 additions & 0 deletions ltext/buttons.pot
Original file line number Diff line number Diff line change
Expand Up @@ -1441,4 +1441,21 @@ msgstr ""

msgctxt "2026960B-EA5524EB-CBE09C9B"
msgid "RHW"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA0"
msgid "Traffic Planners Have Lost The Plot"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA1"
msgid ""
"<p>\n"
"Mayor! It seems our traffic engineers have been taking a wrong turn with the data they received, resulting in some peculiar roadways and puzzling intersections that resemble modern art rather than functional pathways—proof that when you feed the wrong info, even the best engineers can get off track:\n"
"</p><p>\n"
"They could not find the correct <u>NAM DLL</u> file in your Plugins.\n"
"</p><p>\n"
"Required NAM DLL version: <u>#nam_dll_version_expected#</u>\n"
"<br>\n"
"Installed NAM DLL version: <u>#nam_dll_version or 'not installed'#</u>\n"
"</p>"
msgstr ""
26 changes: 26 additions & 0 deletions ltext/de/buttons.po
Original file line number Diff line number Diff line change
Expand Up @@ -1487,3 +1487,29 @@ msgstr ""
msgctxt "2026960B-EA5524EB-CBE09C9B"
msgid "RHW"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA0"
msgid "Traffic Planners Have Lost The Plot"
msgstr "Verkehrsplaner haben keinen Plan"

msgctxt "2026960B-6A231EA4-2A504BA1"
msgid ""
"<p>\n"
"Mayor! It seems our traffic engineers have been taking a wrong turn with the data they received, resulting in some peculiar roadways and puzzling intersections that resemble modern art rather than functional pathways—proof that when you feed the wrong info, even the best engineers can get off track:\n"
"</p><p>\n"
"They could not find the correct <u>NAM DLL</u> file in your Plugins.\n"
"</p><p>\n"
"Required NAM DLL version: <u>#nam_dll_version_expected#</u>\n"
"<br>\n"
"Installed NAM DLL version: <u>#nam_dll_version or 'not installed'#</u>\n"
"</p>"
msgstr ""
"<p>\n"
"Hoppla! Es scheint, als hätten unsere Verkehrsingenieure den falschen Weg eingeschlagen. Die vorliegenden Daten zeigen bizarre Straßenmuster und verwirrende Kreuzungen, die eher wie moderne Kunstwerke aussehen statt funktionaler Wege – ein Beweis dafür, dass mit den falschen Infos selbst die besten Baumeister vom Pfad abkommen:\n"
"</p><p>\n"
"Ihr Plugins-Ordner enthält nicht die richtige <u>NAM-DLL</u>-Datei."
"</p><p>\n"
"Benötigte NAM-DLL-Version: <u>#nam_dll_version_expected#</u>\n"
"<br>\n"
"Installierte NAM-DLL-Version: <u>#nam_dll_version or 'nicht installiert'#</u>\n"
"</p>"
4 changes: 2 additions & 2 deletions ltext/de/puzzlepieces-RHW.po
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ msgctxt "2026960B-2A592FD1-5780000F"
msgid ""
"FLEXRamp Type A1\n"
"\n"
"Supports RHW-2 (L0-L2), RHW-3 (L0-L1), MIS (L0-L4), RHW-4 (L0-L4 and DDRHW-4), RHW-6S (L0 Only due to overhang), RHW-6C (L0-L2), RHW-8S (L0-L2), RHW-8C (L0-L2), RHW-10S (L0-L2), RHW-12S (L0-L2)"
"Supports RHW-2 (L0-L2), RHW-3 (L0-L2), MIS (L0-L4), RHW-4 (L0-L4 and DDRHW-4), RHW-6S (L0 Only due to overhang), RHW-6C (L0-L2), RHW-8S (L0-L2), RHW-8C (L0-L2), RHW-10S (L0-L2), RHW-12S (L0-L2)"
msgstr ""

msgctxt "2026960B-2A592FD1-5780001F"
Expand Down Expand Up @@ -590,7 +590,7 @@ msgctxt "2026960B-2A592FD1-5780100F"
msgid ""
"FLEXRamp Type B1\n"
"\n"
"Supports RHW-2 (L0-L2), RHW-3 (L0-L1), MIS (L0-L4), RHW-4 (L0-L4 and DDRHW-4), RHW-6S (L0-L4), RHW-6C (L0-L2), RHW-8S (L0-L2), RHW-8C (L0-L2), RHW-10S (L0-L2), RHW-12S (L0-L2)"
"Supports RHW-2 (L0-L2), RHW-3 (L0-L2), MIS (L0-L4), RHW-4 (L0-L4 and DDRHW-4), RHW-6S (L0-L4), RHW-6C (L0-L2), RHW-8S (L0-L2), RHW-8C (L0-L2), RHW-10S (L0-L2), RHW-12S (L0-L2)"
msgstr ""

msgctxt "2026960B-2A592FD1-5780200F"
Expand Down
17 changes: 17 additions & 0 deletions ltext/es/buttons.po
Original file line number Diff line number Diff line change
Expand Up @@ -1514,3 +1514,20 @@ msgstr ""
msgctxt "2026960B-EA5524EB-CBE09C9B"
msgid "RHW"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA0"
msgid "Traffic Planners Have Lost The Plot"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA1"
msgid ""
"<p>\n"
"Mayor! It seems our traffic engineers have been taking a wrong turn with the data they received, resulting in some peculiar roadways and puzzling intersections that resemble modern art rather than functional pathways—proof that when you feed the wrong info, even the best engineers can get off track:\n"
"</p><p>\n"
"They could not find the correct <u>NAM DLL</u> file in your Plugins.\n"
"</p><p>\n"
"Required NAM DLL version: <u>#nam_dll_version_expected#</u>\n"
"<br>\n"
"Installed NAM DLL version: <u>#nam_dll_version or 'not installed'#</u>\n"
"</p>"
msgstr ""
34 changes: 23 additions & 11 deletions ltext/fr/buttons.po
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ msgctxt "2026960B-123006AA-6A470460"
msgid ""
"For building FLEX Turn Lanes (FTLs)\n"
"\n"
"Button contains FLEX Turn Lane starters and FLEX intersections for various road networks"
"\n"
"Button contains FLEX Turn Lane starters and FLEX intersections for various road networks\n"
"Drag the listed network through the FLEX/Starter Piece to construct the turn lane."
msgstr ""
"Cet outil contient les Pièces-Initiales pour construire des voies médianes et intersections FLEX pour les diverses Routes.\n"
Expand Down Expand Up @@ -187,8 +186,7 @@ msgctxt "2026960B-123006AA-6A475000"
msgid ""
"For building RealHighway Starter Pieces\n"
"\n"
"Button contains Starter Pieces to build RHW networks of varying widths and heights, up to 12 lanes (RHW-12S) and for certain networks, up to 30 meters high (L4)"
"\n"
"Button contains Starter Pieces to build RHW networks of varying widths and heights, up to 12 lanes (RHW-12S) and for certain networks, up to 30 meters high (L4)\n"
"Drag the RealHighway (RHW-2) network tool through the Starter Piece to construct the desired override network."
msgstr ""
"L'outil contient les Pièces-Initiales pour construire des réseaux RHW de différentes largeurs et hauteurs, jusqu'à 12 voies (RHW-12S) et pour certains réseaux, jusqu'à 30 mètres de haut (L4).\n"
Expand Down Expand Up @@ -240,8 +238,7 @@ msgid ""
"\n"
"These items are DEPRECATED, and the use of the FLEX Neighbor Connections is recommended instead."
msgstr ""
"Cet outil contient les Pièces-Puzzles pour établir les connexions de voisinage pour les autoroutes (RHW)."
"\n"
"Cet outil contient les Pièces-Puzzles pour établir les connexions de voisinage pour les autoroutes (RHW).\n"
"Ces éléments sont OBSOLÈTES et il est recommandé d'utiliser les connecteurs de voisinage FLEX."

msgctxt "2026960B-123007BB-6A47508C"
Expand All @@ -265,8 +262,7 @@ msgid "RealHighway FLEX Neighbor Connector Pieces (FLEX-NC)"
msgstr "Connecteurs de Voisinage FLEX pour autoroute (FLEX-NC)"

msgctxt "2026960B-123006AA-6A475100"
msgid ""
"For building DEPRECATED RealHighway Ramp Interfaces. All of the functionality of the 47 pieces contained and many more are covered by the FLEXRamp system."
msgid "For building DEPRECATED RealHighway Ramp Interfaces. All of the functionality of the 47 pieces contained and many more are covered by the FLEXRamp system."
msgstr ""

msgctxt "2026960B-123007BB-6A475100"
Expand Down Expand Up @@ -819,8 +815,7 @@ msgid ""
msgstr ""
"L'outil propose des Pièces-Puzzles pour construire des passages souterrains de Routes, Sens-uniques, Avenues, Rues et Tram en voie partagée (T-RAM).\n"
"\n"
"NOTE : Construisez d'abord le réseau de surface, puis placez les pièces de tracés souterrains par dessus."
"\n"
"NOTE : Construisez d'abord le réseau de surface, puis placez les pièces de tracés souterrains par dessus.\n"
"Le nouveau système FLUPs basé sur le métro se trouve dans le menu Autoroutes."

msgctxt "2026960B-123007BB-6A477A00"
Expand Down Expand Up @@ -1591,4 +1586,21 @@ msgstr "El Train Control"

msgctxt "2026960B-EA5524EB-CBE09C9B"
msgid "RHW"
msgstr "RHW"
msgstr "RHW"

msgctxt "2026960B-6A231EA4-2A504BA0"
msgid "Traffic Planners Have Lost The Plot"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA1"
msgid ""
"<p>\n"
"Mayor! It seems our traffic engineers have been taking a wrong turn with the data they received, resulting in some peculiar roadways and puzzling intersections that resemble modern art rather than functional pathways—proof that when you feed the wrong info, even the best engineers can get off track:\n"
"</p><p>\n"
"They could not find the correct <u>NAM DLL</u> file in your Plugins.\n"
"</p><p>\n"
"Required NAM DLL version: <u>#nam_dll_version_expected#</u>\n"
"<br>\n"
"Installed NAM DLL version: <u>#nam_dll_version or 'not installed'#</u>\n"
"</p>"
msgstr ""
17 changes: 17 additions & 0 deletions ltext/it/buttons.po
Original file line number Diff line number Diff line change
Expand Up @@ -1624,3 +1624,20 @@ msgstr "Controllo dei Treni della Ferrovia Sopraelevata"
msgctxt "2026960B-EA5524EB-CBE09C9B"
msgid "RHW"
msgstr "RHW"

msgctxt "2026960B-6A231EA4-2A504BA0"
msgid "Traffic Planners Have Lost The Plot"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA1"
msgid ""
"<p>\n"
"Mayor! It seems our traffic engineers have been taking a wrong turn with the data they received, resulting in some peculiar roadways and puzzling intersections that resemble modern art rather than functional pathways—proof that when you feed the wrong info, even the best engineers can get off track:\n"
"</p><p>\n"
"They could not find the correct <u>NAM DLL</u> file in your Plugins.\n"
"</p><p>\n"
"Required NAM DLL version: <u>#nam_dll_version_expected#</u>\n"
"<br>\n"
"Installed NAM DLL version: <u>#nam_dll_version or 'not installed'#</u>\n"
"</p>"
msgstr ""
17 changes: 17 additions & 0 deletions ltext/ja/buttons.po
Original file line number Diff line number Diff line change
Expand Up @@ -1441,3 +1441,20 @@ msgstr ""
msgctxt "2026960B-EA5524EB-CBE09C9B"
msgid "RHW"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA0"
msgid "Traffic Planners Have Lost The Plot"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA1"
msgid ""
"<p>\n"
"Mayor! It seems our traffic engineers have been taking a wrong turn with the data they received, resulting in some peculiar roadways and puzzling intersections that resemble modern art rather than functional pathways—proof that when you feed the wrong info, even the best engineers can get off track:\n"
"</p><p>\n"
"They could not find the correct <u>NAM DLL</u> file in your Plugins.\n"
"</p><p>\n"
"Required NAM DLL version: <u>#nam_dll_version_expected#</u>\n"
"<br>\n"
"Installed NAM DLL version: <u>#nam_dll_version or 'not installed'#</u>\n"
"</p>"
msgstr ""
17 changes: 17 additions & 0 deletions ltext/ko/buttons.po
Original file line number Diff line number Diff line change
Expand Up @@ -1840,3 +1840,20 @@ msgstr "El Train Control"
msgctxt "2026960B-EA5524EB-CBE09C9B"
msgid "RHW"
msgstr "RHW"

msgctxt "2026960B-6A231EA4-2A504BA0"
msgid "Traffic Planners Have Lost The Plot"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA1"
msgid ""
"<p>\n"
"Mayor! It seems our traffic engineers have been taking a wrong turn with the data they received, resulting in some peculiar roadways and puzzling intersections that resemble modern art rather than functional pathways—proof that when you feed the wrong info, even the best engineers can get off track:\n"
"</p><p>\n"
"They could not find the correct <u>NAM DLL</u> file in your Plugins.\n"
"</p><p>\n"
"Required NAM DLL version: <u>#nam_dll_version_expected#</u>\n"
"<br>\n"
"Installed NAM DLL version: <u>#nam_dll_version or 'not installed'#</u>\n"
"</p>"
msgstr ""
17 changes: 17 additions & 0 deletions ltext/nl/buttons.po
Original file line number Diff line number Diff line change
Expand Up @@ -1449,3 +1449,20 @@ msgstr ""
msgctxt "2026960B-EA5524EB-CBE09C9B"
msgid "RHW"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA0"
msgid "Traffic Planners Have Lost The Plot"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA1"
msgid ""
"<p>\n"
"Mayor! It seems our traffic engineers have been taking a wrong turn with the data they received, resulting in some peculiar roadways and puzzling intersections that resemble modern art rather than functional pathways—proof that when you feed the wrong info, even the best engineers can get off track:\n"
"</p><p>\n"
"They could not find the correct <u>NAM DLL</u> file in your Plugins.\n"
"</p><p>\n"
"Required NAM DLL version: <u>#nam_dll_version_expected#</u>\n"
"<br>\n"
"Installed NAM DLL version: <u>#nam_dll_version or 'not installed'#</u>\n"
"</p>"
msgstr ""
17 changes: 17 additions & 0 deletions ltext/pt/buttons.po
Original file line number Diff line number Diff line change
Expand Up @@ -1441,3 +1441,20 @@ msgstr ""
msgctxt "2026960B-EA5524EB-CBE09C9B"
msgid "RHW"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA0"
msgid "Traffic Planners Have Lost The Plot"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA1"
msgid ""
"<p>\n"
"Mayor! It seems our traffic engineers have been taking a wrong turn with the data they received, resulting in some peculiar roadways and puzzling intersections that resemble modern art rather than functional pathways—proof that when you feed the wrong info, even the best engineers can get off track:\n"
"</p><p>\n"
"They could not find the correct <u>NAM DLL</u> file in your Plugins.\n"
"</p><p>\n"
"Required NAM DLL version: <u>#nam_dll_version_expected#</u>\n"
"<br>\n"
"Installed NAM DLL version: <u>#nam_dll_version or 'not installed'#</u>\n"
"</p>"
msgstr ""
17 changes: 17 additions & 0 deletions ltext/sv/buttons.po
Original file line number Diff line number Diff line change
Expand Up @@ -1441,3 +1441,20 @@ msgstr ""
msgctxt "2026960B-EA5524EB-CBE09C9B"
msgid "RHW"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA0"
msgid "Traffic Planners Have Lost The Plot"
msgstr ""

msgctxt "2026960B-6A231EA4-2A504BA1"
msgid ""
"<p>\n"
"Mayor! It seems our traffic engineers have been taking a wrong turn with the data they received, resulting in some peculiar roadways and puzzling intersections that resemble modern art rather than functional pathways—proof that when you feed the wrong info, even the best engineers can get off track:\n"
"</p><p>\n"
"They could not find the correct <u>NAM DLL</u> file in your Plugins.\n"
"</p><p>\n"
"Required NAM DLL version: <u>#nam_dll_version_expected#</u>\n"
"<br>\n"
"Installed NAM DLL version: <u>#nam_dll_version or 'not installed'#</u>\n"
"</p>"
msgstr ""
39 changes: 39 additions & 0 deletions lua/adv_nam_dll.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
--#-package:2A504B00# -- package signature
----------------------------------------------------------------------
-- This file defines advisor messages related to the NAM DLL.

-- Note that this Lua file is not intended for distribution with the DLL itself, but for distribution with the NAM DBPF files to ensure compatibility between NAM and DLL.
nam_dll_version_expected = "1.1.0" -- needs to be updated whenever a new DLL version is released

-- (When this script is first executed, the `nam_dll_version` is still `nil`, but it gets defined before the trigger conditions are evaluated.)
function is_nam_dll_correct()
local version = rawget(globals(), "nam_dll_version")
return version ~= nil and version == nam_dll_version_expected
end

------------ Advice record ----
a = create_advice_transportation('2a504ba0')
a.trigger = "not is_nam_dll_correct()"
a.title = [[text@2a504ba0 Traffic Planners Have Lost The Plot]]
a.message = [[text@2a504ba1 They could not find the correct NAM DLL file in your Plugins. Required NAM DLL version: #nam_dll_version_expected#, Installed NAM DLL version: #nam_dll_version or 'not installed'#]]
a.once = 0 -- must be 0, since 1 means once per city (saving after closing the message would prevent message from ever appearing again, even after restarting the game or upgrading to a newer DLL version – unless the GUID is changed for every new DLL version)
a.persist = 1 -- irrelevant as trigger is not random (after game is restarted with correct DLL, the trigger seems to be evaluated anyway, so message disappears)
a.frequency = 90 -- days
a.timeout = tuning_constants.ADVICE_TIMEOUT_SHORT
a.no_timeout = 1 -- message stays active in background after closing popup, so the popup doesn't reappear every few months
a.priority = tuning_constants.ADVICE_PRIORITY_URGENT
a.mood = advice_moods.BAD_JOB

------------ Advice record ----
-- for debugging only
-- a = create_advice_transportation('2a504b90')
-- a.trigger = "is_nam_dll_correct()"
-- a.title = [[Debug: Traffic Planners On The Right Track]]
-- a.message = [[The correct version of the NAM DLL is installed: #nam_dll_version or 'not installed'#]]
-- a.once = 0
-- a.persist = 1
-- a.frequency = 90
-- a.timeout = tuning_constants.ADVICE_TIMEOUT_SHORT
-- a.no_timeout = 1
-- a.priority = tuning_constants.ADVICE_PRIORITY_URGENT
-- a.mood = advice_moods.GREAT_JOB
3 changes: 3 additions & 0 deletions lua/adv_nam_dll.lua.TGI
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CA63E2A3
4A5E8EF6
2A504B00
3 changes: 3 additions & 0 deletions src/scripts/compile-release-inruls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,7 @@ cp -p "$PROJECT_ROOT/Controller/INRULs/NetworkAddonMod_IndividualNetworkRULs_LHD
# Avenue turning lanes
cp -p "$PROJECT_ROOT/Controller/INRULs/NetworkAddonMod_TurningLanes_Avenues_Plugin_INRULs.dat" "target/controllers/"

# advisor messages
cp -p "$PROJECT_ROOT/Controller/INRULs/NetworkAddonMod_Advice.dat" "target/controllers/"

rm -rf "$TEMP"