diff --git a/ltext/it/buttons.po b/ltext/it/buttons.po index e55d9a23a..cb5650808 100644 --- a/ltext/it/buttons.po +++ b/ltext/it/buttons.po @@ -10,7 +10,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.3.1\n" +"X-Generator: Poedit 3.6\n" msgctxt "2026960B-2A3858E4-0000001A" msgid "RealHighway (RHW)" @@ -838,53 +838,20 @@ msgctxt "2026960B-123007BB-6A477900" msgid "Multi-Radius Curve (MRC) FLEX Pieces for Surface Networks" msgstr "Curva a più raggi (MRC) Pezzi FLEX per reti di superficie" -#, fuzzy -#| msgctxt "2026960B-123006AA-6A477A00" -#| msgid "" -#| "For creating semi-flexible underpasses for Road, One-Way Road, Avenue, Street, T-RAM, and Pedmalls\n" -#| "\n" -#| "DO NOT USE FOR UNDERGROUND RAIL\n" -#| "\n" -#| "Button contains several different Puzzle Pieces for various networks\n" -#| "\n" -#| "NOTE: First build the surface network, then plop these pieces on top\n" -#| "\n" -#| "The new Subway-based FLUPs system can be found under the Highways menu." msgctxt "2026960B-123006AA-6A477A00" msgid "" "Ramps for creating semi-flexible underpasses (FLUPs Puzzle Pieces) for Road, One-Way Road, Avenue, Street, Tram-Avenue, and pedestrians\n" "\n" "The new Subway-based FLUPs system can be found under the Highways menu." msgstr "" -"Per la creazione di sottopassi semi-flessibili per strade, strade a senso unico, viali, strade, T-RAM e pedonali.\n" +"Rampe per la creazione di sottopassaggi semiflessibili (FLUPs Puzzle Pieces) per strade, strade a senso unico, viali, vie, viali tranviari e pedoni\n" "\n" -"NON UTILIZZARE PER LA METROPOLITANA\n" -"\n" -"Il pulsante contiene diversi pezzi di puzzle per varie reti\n" -"\n" -"NOTA: prima costruite la rete di superficie, poi metteteci sopra questi pezzi.\n" -"\n" -"Il nuovo sistema di FLUP basato sulle metropolitane si trova nel menu Autostrade." +"Il nuovo sistema FLUPs basato su Subway è disponibile nel menu “Autostrade”." -#, fuzzy -#| msgctxt "2026960B-123007BB-6A477A00" -#| msgid "Flexible Underpasses (FLUPs)" msgctxt "2026960B-123007BB-6A477A00" msgid "Flexible Underpasses (FLUPs) Ramps" -msgstr "Sottopassi flessibili (FLUP)" +msgstr "Sottopassi flessibili (FLUP) Rampe" -#, fuzzy -#| msgctxt "2026960B-123006AA-6A477A00" -#| msgid "" -#| "For creating semi-flexible underpasses for Road, One-Way Road, Avenue, Street, T-RAM, and Pedmalls\n" -#| "\n" -#| "DO NOT USE FOR UNDERGROUND RAIL\n" -#| "\n" -#| "Button contains several different Puzzle Pieces for various networks\n" -#| "\n" -#| "NOTE: First build the surface network, then plop these pieces on top\n" -#| "\n" -#| "The new Subway-based FLUPs system can be found under the Highways menu." msgctxt "2026960B-123006AA-6A477A10" msgid "" "For creating semi-flexible underpasses (Puzzle Pieces)\n" @@ -898,35 +865,22 @@ msgid "" "\n" "The new Subway-based FLUPs system can be found under the Highways menu." msgstr "" -"Per la creazione di sottopassi semi-flessibili per strade, strade a senso unico, viali, strade, T-RAM e pedonali.\n" +"Per la creazione di sottopassaggi semiflessibili (Puzzle Pieces)\n" "\n" -"NON UTILIZZARE PER LA METROPOLITANA\n" +"Superficie: Strada\n" "\n" -"Il pulsante contiene diversi pezzi di puzzle per varie reti\n" +"Sottosuolo: funziona con Strada, Strada a senso unico, Viale, Via, Viale tranviario e pedoni\n" "\n" -"NOTA: prima costruite la rete di superficie, poi metteteci sopra questi pezzi.\n" +"NON UTILIZZARE PER LA METROPOLITANA\n" +"\n" +"NOTA: Costruire prima la rete di superficie, poi posizionare questi elementi sopra\n" "\n" -"Il nuovo sistema di FLUP basato sulle metropolitane si trova nel menu Autostrade." +"Il nuovo sistema FLUPs basato sulla metropolitana è disponibile nel menu Autostrade." -#, fuzzy -#| msgctxt "2026960B-123007BB-6A477A00" -#| msgid "Flexible Underpasses (FLUPs)" msgctxt "2026960B-123007BB-6A477A10" msgid "Flexible Underpasses (FLUPs) under Road" -msgstr "Sottopassi flessibili (FLUP)" +msgstr "Passaggi sotterranei flessibili (FLUP) sotto la strada" -#, fuzzy -#| msgctxt "2026960B-123006AA-6A477A00" -#| msgid "" -#| "For creating semi-flexible underpasses for Road, One-Way Road, Avenue, Street, T-RAM, and Pedmalls\n" -#| "\n" -#| "DO NOT USE FOR UNDERGROUND RAIL\n" -#| "\n" -#| "Button contains several different Puzzle Pieces for various networks\n" -#| "\n" -#| "NOTE: First build the surface network, then plop these pieces on top\n" -#| "\n" -#| "The new Subway-based FLUPs system can be found under the Highways menu." msgctxt "2026960B-123006AA-6A477A20" msgid "" "For creating semi-flexible underpasses (Puzzle Pieces)\n" @@ -940,35 +894,22 @@ msgid "" "\n" "The new Subway-based FLUPs system can be found under the Highways menu." msgstr "" -"Per la creazione di sottopassi semi-flessibili per strade, strade a senso unico, viali, strade, T-RAM e pedonali.\n" +"Per la creazione di sottopassaggi semiflessibili (Puzzle Pieces)\n" "\n" -"NON UTILIZZARE PER LA METROPOLITANA\n" +"Superficie: Binari\n" +"\n" +"Sottosuolo: funziona con Strada, Strada a senso unico, Viale, Via, Viale del tram e pedoni\n" "\n" -"Il pulsante contiene diversi pezzi di puzzle per varie reti\n" +"NON UTILIZZARE PER LA METROPOLITANA\n" "\n" -"NOTA: prima costruite la rete di superficie, poi metteteci sopra questi pezzi.\n" +"NOTA: Costruire prima la rete di superficie, poi posizionare questi elementi sopra\n" "\n" -"Il nuovo sistema di FLUP basato sulle metropolitane si trova nel menu Autostrade." +"Il nuovo sistema FLUPs basato sulla metropolitana è disponibile nel menu Autostrade." -#, fuzzy -#| msgctxt "2026960B-123007BB-6A477A00" -#| msgid "Flexible Underpasses (FLUPs)" msgctxt "2026960B-123007BB-6A477A20" msgid "Flexible Underpasses (FLUPs) under Rail" -msgstr "Sottopassi flessibili (FLUP)" +msgstr "Passaggi sotterranei flessibili (FLUP) sotto la ferrovia" -#, fuzzy -#| msgctxt "2026960B-123006AA-6A477A00" -#| msgid "" -#| "For creating semi-flexible underpasses for Road, One-Way Road, Avenue, Street, T-RAM, and Pedmalls\n" -#| "\n" -#| "DO NOT USE FOR UNDERGROUND RAIL\n" -#| "\n" -#| "Button contains several different Puzzle Pieces for various networks\n" -#| "\n" -#| "NOTE: First build the surface network, then plop these pieces on top\n" -#| "\n" -#| "The new Subway-based FLUPs system can be found under the Highways menu." msgctxt "2026960B-123006AA-6A477A30" msgid "" "Ramps for creating semi-flexible underpasses (Puzzle Pieces)\n" @@ -982,22 +923,21 @@ msgid "" "\n" "The new Subway-based FLUPs system can be found under the Highways menu." msgstr "" -"Per la creazione di sottopassi semi-flessibili per strade, strade a senso unico, viali, strade, T-RAM e pedonali.\n" +"Rampe per la creazione di sottopassaggi semiflessibili (Puzzle Pieces)\n" "\n" -"NON UTILIZZARE PER LA METROPOLITANA\n" +"Superficie: Strada, Strada a senso unico, Viale, Autostrada, Zone pedonali, Tram, Viale del tram, Personalizzata, Parchi\n" +"\n" +"Sottosuolo: funziona con Strada, Strada a senso unico, Viale, Strada, Viale del tram e pedoni\n" "\n" -"Il pulsante contiene diversi pezzi di puzzle per varie reti\n" +"NON UTILIZZARE PER LA METROPOLITANA\n" "\n" -"NOTA: prima costruite la rete di superficie, poi metteteci sopra questi pezzi.\n" +"NOTA: Costruire prima la rete di superficie, poi posizionare questi elementi sopra di essa\n" "\n" -"Il nuovo sistema di FLUP basato sulle metropolitane si trova nel menu Autostrade." +"Il nuovo sistema FLUPs basato sulla metropolitana è disponibile nel menu Autostrade." -#, fuzzy -#| msgctxt "2026960B-123007BB-6A477A00" -#| msgid "Flexible Underpasses (FLUPs)" msgctxt "2026960B-123007BB-6A477A30" msgid "Flexible Underpasses (FLUPs) under various surfaces" -msgstr "Sottopassi flessibili (FLUP)" +msgstr "Passaggi sotterranei flessibili (FLUP) sotto diverse superfici" msgctxt "2026960B-123006AA-6A477B00" msgid "" @@ -1762,7 +1702,7 @@ msgstr "RHW" msgctxt "2026960B-6A231EA4-2A504BA0" msgid "Traffic Planners Have Lost The Plot" -msgstr "" +msgstr "I responsabili della pianificazione del traffico hanno perso il filo" msgctxt "2026960B-6A231EA4-2A504BA1" msgid "" @@ -1776,3 +1716,12 @@ msgid "" "Installed NAM DLL version: #nam_dll_version or 'not installed'#\n" "

" msgstr "" +"

\n" +"Signor Sindaco! Sembra che i nostri ingegneri del traffico abbiano preso una strada sbagliata con i dati ricevuti, dando vita a strade bizzarre e incroci sconcertanti che assomigliano più ad opere d’arte moderna che a percorsi funzionali: la prova che, quando si inseriscono informazioni errate, anche i migliori ingegneri possono perdere la rotta:\n" +"

\n" +"Non è stato possibile trovare il file corretto NAM DLL nella cartella Plugins.\n" +"

\n" +"Versione della DLL NAM richiesta: #nam_dll_version_expected#\n" +"
\n" +"Versione della DLL NAM installata: #nam_dll_version o ‘non installata’#\n" +"

" diff --git a/ltext/it/puzzlepieces-NWM.po b/ltext/it/puzzlepieces-NWM.po index 8abae2fd8..e8b259bb2 100644 --- a/ltext/it/puzzlepieces-NWM.po +++ b/ltext/it/puzzlepieces-NWM.po @@ -1,6 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" +"POT-Creation-Date: \n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8,6 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.6\n" msgctxt "2026960B-2A592FD1-51300000" msgid "TLA-3 S-Curve" @@ -593,67 +595,89 @@ msgctxt "2026960B-2A592FD1-51621005" msgid "" "One Way Road (Real Expressway) OWR-3 Flex Ramp (A2 Orthogonal) Overrides for OWR 3 come out the applicable end.\n" "\n" -msgstr "Strada a senso unico (Superstrada Reale) OWR-3 Rampa flessibile (A2 ortogonale) Le sovrascritte per OWR 3 vengono applicate alla fine." +msgstr "" +"Strada a senso unico (Superstrada Reale) OWR-3 Rampa flessibile (A2 ortogonale) Le sovrascritte per OWR 3 vengono applicate alla fine.\n" +"\n" msgctxt "2026960B-2A592FD1-51625005" msgid "" "One Way Road (Real Expressway) OWR-3 Flex Ramp (B2 Orthogonal) Overrides for OWR 3 come out the applicable end.\n" "\n" -msgstr "Strada a senso unico (Superstrada Reale) OWR-3 Rampa flessibile (B2 ortogonale) Le sovrascritte per la OWR 3 escono dalla parte applicabile." +msgstr "" +"Strada a senso unico (Superstrada Reale) OWR-3 Rampa flessibile (B2 ortogonale) Le sovrascritte per la OWR 3 escono dalla parte applicabile.\n" +"\n" msgctxt "2026960B-2A592FD1-51626005" msgid "" "One Way Road (Real Expressway) OWR-2 Flex Ramp (D1 Orthogonal) Overrides for OWR 1 come out the applicable ends.\n" "\n" -msgstr "Strada a senso unico (Superstrada Reale) OWR-2 Rampa flessibile (D1 ortogonale) Le sovrascritte per OWR 1 escono dalle estremità applicabili." +msgstr "" +"Strada a senso unico (Superstrada Reale) OWR-2 Rampa flessibile (D1 ortogonale) Le sovrascritte per OWR 1 escono dalle estremità applicabili.\n" +"\n" msgctxt "2026960B-2A592FD1-51627005" msgid "" "One Way Road (Real Expressway) OWR-2 Flex Ramp (E1 Orthogonal) Overrides for OWR 1 come out the applicable ends.\n" "\n" -msgstr "Strada a senso unico (Superstrada Reale) OWR-2 Flex Ramp (E1 Orthogonal) Le sovrascritte per OWR 1 escono dalle estremità applicabili." +msgstr "" +"Strada a senso unico (Superstrada Reale) OWR-2 Flex Ramp (E1 Orthogonal) Le sovrascritte per OWR 1 escono dalle estremità applicabili.\n" +"\n" msgctxt "2026960B-2A592FD1-5162800F" msgid "" "One Way Road (Real Expressway) OWR-2 Flex Ramp (B1 Diagonal) Overrides for OWR 1 come out the applicable end.\n" "\n" -msgstr "Strada a senso unico (Superstrada Reale) OWR-2 Flex Ramp (B1 Diagonal) Le sovrascritte per la OWR 1 escono dalla parte applicabile." +msgstr "" +"Strada a senso unico (Superstrada Reale) OWR-2 Flex Ramp (B1 Diagonal) Le sovrascritte per la OWR 1 escono dalla parte applicabile.\n" +"\n" msgctxt "2026960B-2A592FD1-51628085" msgid "" "One Way Road (Real Expressway) OWR-3 Flex Ramp (D1 Orthogonal) Overrides for OWR (3) and OWR (1) come out the applicable ends.\n" "\n" -msgstr "Strada a senso unico (Superstrada Reale) OWR-3 Flex Ramp (D1 Orthogonal) Le sovrascritte per OWR (3) e OWR (1) escono dalle estremità applicabili." +msgstr "" +"Strada a senso unico (Superstrada Reale) OWR-3 Flex Ramp (D1 Orthogonal) Le sovrascritte per OWR (3) e OWR (1) escono dalle estremità applicabili.\n" +"\n" msgctxt "2026960B-2A592FD1-51629005" msgid "" "One Way Road (Real Expressway) OWR-3 Flex Ramp (D2 Orthogonal) Overrides for OWR (3) and OWR (1) come out the applicable ends.\n" "\n" -msgstr "Strada a senso unico (Superstrada Reale) OWR-3 Flex Ramp (D2 Orthogonal) Le sovrascritte per OWR (3) e OWR (1) escono dalle estremità applicabili." +msgstr "" +"Strada a senso unico (Superstrada Reale) OWR-3 Flex Ramp (D2 Orthogonal) Le sovrascritte per OWR (3) e OWR (1) escono dalle estremità applicabili.\n" +"\n" msgctxt "2026960B-2A592FD1-5162A00F" msgid "" "One Way Road (Real Expressway) OWR-2 Flex Ramp (A1 Diagonal) Overrides for OWR 1 come out the applicable end.\n" "\n" -msgstr "Strada a senso unico (Superstrada Reale) OWR-2 Flex Ramp (A1 Diagonal) Le sovrascritte per la OWR 1 escono dalla parte applicabile." +msgstr "" +"Strada a senso unico (Superstrada Reale) OWR-2 Flex Ramp (A1 Diagonal) Le sovrascritte per la OWR 1 escono dalla parte applicabile.\n" +"\n" msgctxt "2026960B-2A592FD1-5162A80F" msgid "" "One Way Road (Real Expressway) OWR-2 Flex Ramp (B1 Diagonal Curved) Overrides for OWR 1 come out the applicable end.\n" "\n" -msgstr "Strada a senso unico (Superstrada Reale) OWR-2 Flex Ramp (B1 Diagonal Curved) Le sovrascritte per OWR 1 escono dalla parte applicabile." +msgstr "" +"Strada a senso unico (Superstrada Reale) OWR-2 Flex Ramp (B1 Diagonal Curved) Le sovrascritte per OWR 1 escono dalla parte applicabile.\n" +"\n" msgctxt "2026960B-2A592FD1-5162C005" msgid "" "One Way Road (Real Expressway) OWR-3 Flex Ramp (E2 Orthogonal) Overrides for OWR (3) and OWR (1) come out the applicable ends.\n" "\n" -msgstr "Strada a senso unico (Superstrada Reale) OWR-3 Flex Ramp (E2 Orthogonal) Le sovrascritte per OWR (3) e OWR (1) escono dalle estremità applicabili." +msgstr "" +"Strada a senso unico (Superstrada Reale) OWR-3 Flex Ramp (E2 Orthogonal) Le sovrascritte per OWR (3) e OWR (1) escono dalle estremità applicabili.\n" +"\n" msgctxt "2026960B-2A592FD1-5162E00F" msgid "" "One Way Road (Real Expressway) OWR-2 Flex Ramp (E1 Diagonal) Overrides for OWR 1 come out the applicable end.\n" "\n" -msgstr "Strada a senso unico (Superstrada Reale) OWR-2 Flex Ramp (E1 Diagonal) Le sovrascritte per la OWR 1 escono dalla parte applicabile." +msgstr "" +"Strada a senso unico (Superstrada Reale) OWR-2 Flex Ramp (E1 Diagonal) Le sovrascritte per la OWR 1 escono dalla parte applicabile.\n" +"\n" msgctxt "2026960B-2A592FD1-5163D005" msgid "" @@ -744,7 +768,8 @@ msgid "" msgstr "" "Curva a raggio multiplo (R3) Curva flessibile a 45 gradi per TLA-5\n" "\n" -"Questo pezzo flessibile può essere sovrascritto a RD-6 Rete NWM" +"Questo pezzo flessibile può essere sovrascritto a RD-6 Rete NWM\n" +"\n" msgctxt "2026960B-2A592FD1-51984005" msgid "" @@ -755,7 +780,8 @@ msgid "" msgstr "" "Curva a raggio multiplo (R4) Curva flessibile a 45 gradi per TLA-5\n" "\n" -"Questo pezzo flessibile può essere sovrascritto a RD-6 Rete NWM" +"Questo pezzo flessibile può essere sovrascritto a RD-6 Rete NWM\n" +"\n" msgctxt "2026960B-2A592FD1-51985005" msgid "" @@ -766,7 +792,8 @@ msgid "" msgstr "" "Curva a raggio multiplo (R5) Curva flessibile a 45 gradi per TLA-5\n" "\n" -"Questo pezzo flessibile può essere sovrascritto a RD-6 Rete NWM" +"Questo pezzo flessibile può essere sovrascritto a RD-6 Rete NWM\n" +"\n" msgctxt "2026960B-2A592FD1-519B3005" msgid "" @@ -782,10 +809,14 @@ msgctxt "2026960B-2A592FD1-519B4005" msgid "" "Multi Radius Curve (R4) Flex Curve 45 Degrees for Road-4 [RD4]\n" "\n" -msgstr "Curva a raggio multiplo (R4) Curva flessibile a 45 gradi per Strada-4 [RD4]" +msgstr "" +"Curva a raggio multiplo (R4) Curva flessibile a 45 gradi per Strada-4 [RD4]\n" +"\n" msgctxt "2026960B-2A592FD1-519B5005" msgid "" "Multi Radius Curve (R5) Flex Curve 45 Degrees for Road-4 [RD4]\n" "\n" -msgstr "Curva a raggio multiplo (R5) Curva flessibile a 45 gradi per Strada-4 [RD4]" +msgstr "" +"Curva a raggio multiplo (R5) Curva flessibile a 45 gradi per Strada-4 [RD4]\n" +"\n" diff --git a/ltext/it/puzzlepieces-lightrail.po b/ltext/it/puzzlepieces-lightrail.po index 6ba3553f8..52a86e9cc 100644 --- a/ltext/it/puzzlepieces-lightrail.po +++ b/ltext/it/puzzlepieces-lightrail.po @@ -1,6 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" +"POT-Creation-Date: \n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8,6 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.6\n" msgctxt "2026960B-2A592FD1-580C0FF0" msgid "Ground Light Rail Loop Puzzle Piece" @@ -131,7 +133,7 @@ msgstr "Pezzo del puzzle sulla svolta a sinistra della metropolitana leggera " msgctxt "2026960B-2A592FD1-580D3700" msgid "Ground Light Rail Diagonal Puzzle Piece" -msgstr "Pezzo di puzzle diagonale della metropolitana leggera terrestre " +msgstr "Pezzo di puzzle diagonale della metropolitana leggera terrestre" msgctxt "2026960B-2A592FD1-580D3706" msgid "" @@ -157,13 +159,17 @@ msgctxt "2026960B-2A592FD1-580D4000" msgid "" "Ground Light Rail Y Junction Puzzle Piece\n" "\n" -msgstr "Pezzo del puzzle della ferrovia leggera terrestre Y" +msgstr "" +"Pezzo del puzzle della ferrovia leggera terrestre Y\n" +"\n" msgctxt "2026960B-2A592FD1-580D5000" msgid "" "Ground Light Rail W Junction Puzzle Piece\n" "\n" -msgstr "Pezzo di puzzle della ferrovia leggera terrestre W giunzione" +msgstr "" +"Pezzo di puzzle della ferrovia leggera terrestre W giunzione\n" +"\n" msgctxt "2026960B-2A592FD1-580D6700" msgid "Ground Light Rail Right Junction Puzzle Piece" @@ -231,8 +237,7 @@ msgid "" "First plop a Tram Station (with road connection), then plop this puzzle piece. Save, exit and re-enter the city to activate the station paths" msgstr "" "Anello di ferrovia leggera a terra con vuoto\n" -"\n" -"Prima inserite una stazione del tram (con collegamento stradale), poi inserite questo pezzo di puzzle. Salvate, uscite e rientrate in città per attivare i percorsi della stazione." +"Prima inserite una stazione del tram (con collegamento stradale), poi inserite questo pezzo di puzzle. Salvate, uscite e rientrate in città per attivare i percorsi della stazione" msgctxt "2026960B-2A592FD1-580E2300" msgid "" @@ -240,8 +245,7 @@ msgid "" "First plop a Tram Station (with road connection), then plop this puzzle piece. Save, exit and re-enter the city to activate the station paths" msgstr "" "Ferrovia leggera terrestre dritta e ad anello - con spazio vuoto\n" -"\n" -"Prima inserite una stazione del tram (con collegamento stradale), poi inserite questo pezzo di puzzle. Salvate, uscite e rientrate in città per attivare i percorsi della stazione." +"Prima inserite una stazione del tram (con collegamento stradale), poi inserite questo pezzo di puzzle. Salvate, uscite e rientrate in città per attivare i percorsi della stazione" msgctxt "2026960B-2A592FD1-580E9700" msgid "Ground Light Rail Multi-Switch" @@ -753,7 +757,7 @@ msgstr "Pezzo di puzzle della Ferrovia Sopraelevata Elevata su Strada" msgctxt "2026960B-2A592FD1-58450400" msgid "High Elevated Rail over Road Puzzle Piece" -msgstr "Pezzo di puzzle della Ferrovia Sopraelevata Elevata sopra la Strada " +msgstr "Pezzo di puzzle della Ferrovia Sopraelevata Elevata sopra la Strada" msgctxt "2026960B-2A592FD1-58450500" msgid "High Elevated Rail over OneWayRoad Puzzle Piece" @@ -817,7 +821,7 @@ msgstr "Tram in strada - pezzo diritto" msgctxt "2026960B-2A592FD1-58480001" msgid "Bridge connector for Tram-in-Road - Handle with care - may crash the game when selected and cursor touches a tram station" -msgstr "Connettore a ponte per il Tram su strada - Da maneggiare con cautela: potrebbe bloccarsi quando il gioco viene selezionato e il cursore tocca una stazione del tram." +msgstr "Connettore a ponte per il Tram su strada - Da maneggiare con cautela: potrebbe bloccarsi quando il gioco viene selezionato e il cursore tocca una stazione del tram" msgctxt "2026960B-2A592FD1-58481000" msgid "Tram-in-Road - transition crossing to Tram-in-Avenue" @@ -1069,7 +1073,7 @@ msgstr "Tram su strada - pezzo diritto" msgctxt "2026960B-2A592FD1-58486C01" msgid "Bridge connector for Tram-on-Road - Handle with care - may crash the game when selected and cursor touches a tram station" -msgstr "Connettore del ponte per il Tram su strada - Maneggiare con cautela: potrebbe bloccarsi quando il gioco viene selezionato e il cursore tocca una stazione del tram." +msgstr "Connettore del ponte per il Tram su strada - Maneggiare con cautela: potrebbe bloccarsi quando il gioco viene selezionato e il cursore tocca una stazione del tram" msgctxt "2026960B-2A592FD1-58486D00" msgid "Tram-on-Road junction with single-sided Road" @@ -1121,7 +1125,7 @@ msgstr "Tram su strada - Intersezione stradale" msgctxt "2026960B-2A592FD1-58487900" msgid "Tram-on-Road - two sided Street intersection" -msgstr "tram su strada - intersezione stradale su due lati" +msgstr "Tram su strada - intersezione stradale su due lati" msgctxt "2026960B-2A592FD1-58487A00" msgid "Tram-in-Road transition to Tram" @@ -1387,7 +1391,7 @@ msgstr "Tram su Via - diritto" msgctxt "2026960B-2A592FD1-584E0001" msgid "Bridge connector for Tram-on-Street - Handle with care - may crash the game when selected and cursor touches a tram station" -msgstr "Connettore a ponte per Tram su Via - Maneggiare con cautela: potrebbe bloccarsi quando il gioco viene selezionato e il cursore tocca una stazione del tram." +msgstr "Connettore a ponte per Tram su Via - Maneggiare con cautela: potrebbe bloccarsi quando il gioco viene selezionato e il cursore tocca una stazione del tram" msgctxt "2026960B-2A592FD1-584E0100" msgid "Tram-on-Street - curve" @@ -1431,7 +1435,7 @@ msgstr "Tram su via - suddivisione in tram rettilineo e attraversamento delle st msgctxt "2026960B-2A592FD1-584E0B00" msgid "Tram-on-Street - street end with straight tram" -msgstr "tram su via - estremità della strada con tram diritto" +msgstr "Tram su via - estremità della strada con tram diritto" msgctxt "2026960B-2A592FD1-584E0C00" msgid "Tram-on-Street - straight to diagonal" diff --git a/ltext/it/puzzlepieces-monorail.po b/ltext/it/puzzlepieces-monorail.po index 2881a6f70..b04e07353 100644 --- a/ltext/it/puzzlepieces-monorail.po +++ b/ltext/it/puzzlepieces-monorail.po @@ -1,6 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" +"POT-Creation-Date: \n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8,6 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.6\n" msgctxt "2026960B-2A592FD1-5D1E5000" msgid "High Monorail Ramp Puzzle Piece" @@ -343,7 +345,9 @@ msgctxt "2026960B-2A592FD1-5D550005" msgid "" "(R6) Curve for the RealRailway.\n" "\n" -msgstr "(R6) Curva per la Ferrovia Reale." +msgstr "" +"(R6) Curva per la Ferrovia Reale.\n" +"\n" msgctxt "2026960B-2A592FD1-5D552005" msgid "" @@ -423,27 +427,27 @@ msgstr "[9 x 1] Curva Assimetrica DTR (=)" msgctxt "2026960B-2A592FD1-5DA4003F" msgid "(3) Tile Hybrid Rail Orthogonal Piece." -msgstr "(3) Pezzo ortogonale della Ferrovia Ibrida" +msgstr "(3) Pezzo ortogonale della Ferrovia Ibrida." msgctxt "2026960B-2A592FD1-5DA4005F" msgid "(5) Tile Hybrid Rail Orthogonal Piece." -msgstr "(5) Pezzo ortogonale della Ferrovia Ibrida" +msgstr "(5) Pezzo ortogonale della Ferrovia Ibrida." msgctxt "2026960B-2A592FD1-5DA4007F" msgid "(7) Tile Hybrid Rail Orthogonal Piece." -msgstr "(7) Pezzo ortogonale della Ferrovia Ibrida" +msgstr "(7) Pezzo ortogonale della Ferrovia Ibrida." msgctxt "2026960B-2A592FD1-5DA4009F" msgid "(9) Tile Hybrid Rail Orthogonal Piece." -msgstr "(9) Pezzo ortogonale della Ferrovia Ibrida" +msgstr "(9) Pezzo ortogonale della Ferrovia Ibrida." msgctxt "2026960B-2A592FD1-5DA4014F" msgid "(4) Tile Hybrid Rail Diagonal Piece." -msgstr "(4) Pezzo ortogonale della Ferrovia Ibrida" +msgstr "(4) Pezzo ortogonale della Ferrovia Ibrida." msgctxt "2026960B-2A592FD1-5DA4016F" msgid "(6) Tile Hybrid Rail Diagonal Piece." -msgstr "(6) Pezzo ortogonale della Ferrovia Ibrida" +msgstr "(6) Pezzo ortogonale della Ferrovia Ibrida." msgctxt "2026960B-2A592FD1-5DA4055F" msgid "[4 x 5] Tile (45) Degree Curve. (Radius #1) Alternative." @@ -459,11 +463,11 @@ msgstr "(5) Pezzo Ortogonale Ferrovia Ibrida. (Base Ferrovia Reale)" msgctxt "2026960B-2A592FD1-5DA5008F" msgid "[6 x 3] Tile (45) Degree Curve. (Radius #2) Alternative" -msgstr "[6 x 3] Curva di 45 gradi. (Raggio #2) Alternativa." +msgstr "[6 x 3] Curva di 45 gradi. (Raggio #2) Alternativa" msgctxt "2026960B-2A592FD1-5DA5109F" msgid "[4 x 7] Tile (45) Degree Curve. (Radius #3) Alternative" -msgstr "[4 x 7] Curva di 45 gradi. (Raggio #3) Alternativa." +msgstr "[4 x 7] Curva di 45 gradi. (Raggio #3) Alternativa" msgctxt "2026960B-2A592FD1-5DA520CF" msgid "[4 x 8] Tile (45) Degree Curve. (Radius #4)" @@ -498,7 +502,7 @@ msgstr "[4 x 5] Scambio Ferroviario di 45 Gradi (Raggio #1)." msgctxt "2026960B-2A592FD1-5DA6908F" msgid "[6 x 3] Tile (45) Degree Orthogonal Switch. (Radius #2) " -msgstr "[6 x 3] Scambio Ferroviario di 45 Gradi (Raggio #2)." +msgstr "[6 x 3] Scambio Ferroviario di 45 Gradi (Raggio #2) " msgctxt "2026960B-2A592FD1-5DA69C8F" msgid "[6 x 3] Tile (45) Degree Compund Switch. CB1 R2" @@ -549,11 +553,12 @@ msgstr "" "\n" "Dritto [ | ]\n" "\n" -"Diagonale[ / ]-[ \\ ]" +"Diagonale[ / ]-[ \\ ]\n" +"\n" msgctxt "2026960B-2A592FD1-5DAC106F" msgid "[5 x 2] Hybrid Railway Overpass S Piece" -msgstr "[5 x 2] Pezzo Cavalcavia ferroviario Ibrido S " +msgstr "[5 x 2] Pezzo Cavalcavia ferroviario Ibrido S" msgctxt "2026960B-2A592FD1-5DACE09F" msgid "(L1=[7.5 m])-Hybrid Rail FLEX Height Orthogonal." @@ -577,7 +582,7 @@ msgstr "Pezzo D1 simmetrico (-<=)" msgctxt "2026960B-2A592FD1-5DB0B4FF" msgid "D2 Turnout for Hybrid Rail." -msgstr "Scambio Ferroviario D2 per Ferrovia Ibrida" +msgstr "Scambio Ferroviario D2 per Ferrovia Ibrida." msgctxt "2026960B-2A592FD1-5DC40009" msgid "" diff --git a/ltext/it/puzzlepieces-rail.po b/ltext/it/puzzlepieces-rail.po index ccffdaba0..bd3bc8d43 100644 --- a/ltext/it/puzzlepieces-rail.po +++ b/ltext/it/puzzlepieces-rail.po @@ -9,7 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 3.4\n" +"X-Generator: Poedit 3.6\n" msgctxt "2026960B-2A592FD1-53131000" msgid "Curve - 45 degree rail curve (3x7)" @@ -853,11 +853,6 @@ msgstr "" "\n" "Ruotare per altri incroci e per la superficie trasparente" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E61000" -#| msgid "" -#| "Straight underground route under transparent surface\n" -#| "Rotate for green surface" msgctxt "2026960B-2A592FD1-53E61800" msgid "" "Straight underground route under custom surface #1\n" @@ -868,11 +863,6 @@ msgstr "" "\n" "Ruotare per la superficie verde" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E61000" -#| msgid "" -#| "Straight underground route under transparent surface\n" -#| "Rotate for green surface" msgctxt "2026960B-2A592FD1-53E61900" msgid "" "Straight underground route under custom surface #2\n" @@ -883,11 +873,6 @@ msgstr "" "\n" "Ruotare per la superficie verde" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E61000" -#| msgid "" -#| "Straight underground route under transparent surface\n" -#| "Rotate for green surface" msgctxt "2026960B-2A592FD1-53E61A00" msgid "" "Straight underground route under custom surface #3\n" @@ -898,11 +883,6 @@ msgstr "" "\n" "Ruotare per la superficie verde" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E61000" -#| msgid "" -#| "Straight underground route under transparent surface\n" -#| "Rotate for green surface" msgctxt "2026960B-2A592FD1-53E61B00" msgid "" "Straight underground route under custom surface #4\n" @@ -913,11 +893,6 @@ msgstr "" "\n" "Ruotare per la superficie verde" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E61000" -#| msgid "" -#| "Straight underground route under transparent surface\n" -#| "Rotate for green surface" msgctxt "2026960B-2A592FD1-53E61C00" msgid "" "Straight underground route under custom surface #5\n" @@ -928,13 +903,6 @@ msgstr "" "\n" "Ruotare per la superficie verde" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E61D00" -#| msgid "" -#| "Straight underground route under custom surface #6\n" -#| "Check http://sc4devotion.com/forums/\n" -#| "for NAM - Customize FLUPs thread\n" -#| "Rotate for other custom surfaces" msgctxt "2026960B-2A592FD1-53E61D00" msgid "" "Straight underground route under custom surface #6\n" @@ -1021,11 +989,6 @@ msgstr "" "\n" "Ruotare per altri pedmall" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E62800" -#| msgid "" -#| "Underground 4way junction under Pedmall\n" -#| "Rotate for other junctions and for rail surface" msgctxt "2026960B-2A592FD1-53E62800" msgid "" "Underground 4way junction under Pedmall\n" @@ -1035,11 +998,6 @@ msgstr "" "\n" "Ruotare per altri nodi e per la superficie ferroviaria" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E62900" -#| msgid "" -#| "Underground T junction under Pedmall\n" -#| "Rotate for other junctions and for rail surface" msgctxt "2026960B-2A592FD1-53E62900" msgid "" "Underground T junction under Pedmall\n" @@ -1049,11 +1007,6 @@ msgstr "" "\n" "Ruotare per altri nodi e per la superficie ferroviaria" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E63000" -#| msgid "" -#| "Ramp for underground Avenue\n" -#| "Rotate for other ramps" msgctxt "2026960B-2A592FD1-53E63000" msgid "Ramp for underground Avenue" msgstr "" @@ -1061,11 +1014,6 @@ msgstr "" "\n" "Ruotare per altre rampe" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E63400" -#| msgid "" -#| "Exit Ramp for underground Onewayroad\n" -#| "Rotate for other ramps" msgctxt "2026960B-2A592FD1-53E63400" msgid "Exit Ramp for underground Onewayroad" msgstr "" @@ -1073,11 +1021,6 @@ msgstr "" "\n" "Ruotare per altre rampe" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E63500" -#| msgid "" -#| "Entrance Ramp for underground Onewayroad\n" -#| "Rotate for other ramps" msgctxt "2026960B-2A592FD1-53E63500" msgid "Entrance Ramp for underground Onewayroad" msgstr "" @@ -1085,11 +1028,6 @@ msgstr "" "\n" "Ruotare per altre rampe" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E63600" -#| msgid "" -#| "Pedestrian stairs to underpass\n" -#| "Rotate for other ramps" msgctxt "2026960B-2A592FD1-53E63600" msgid "Pedestrian stairs to underpass" msgstr "" @@ -1109,11 +1047,6 @@ msgstr "" "\n" "Costruire in pianura!" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E63800" -#| msgid "" -#| "Street ramp connecting to underground road\n" -#| "Rotate for other ramps" msgctxt "2026960B-2A592FD1-53E63800" msgid "Street ramp connecting to underground road" msgstr "" @@ -1121,12 +1054,6 @@ msgstr "" "\n" "Ruotare per altre rampe" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E63900" -#| msgid "" -#| "Street tunnel connecting to underground road\n" -#| "Rotate for other ramps\n" -#| "Build on flank of a 10m high hill!" msgctxt "2026960B-2A592FD1-53E63900" msgid "" "Street tunnel connecting to underground road\n" @@ -1138,11 +1065,6 @@ msgstr "" "\n" "Costruire sul fianco di una collina alta 10 metri!" -#, fuzzy -#| msgctxt "2026960B-2A592FD1-53E63E00" -#| msgid "" -#| "Ramp for underground Road\n" -#| "Rotate for other ramps" msgctxt "2026960B-2A592FD1-53E63E00" msgid "Ramp for underground Road" msgstr "" diff --git a/ltext/it/puzzlepieces-viaducts.po b/ltext/it/puzzlepieces-viaducts.po index e5364b4bb..e7a0140c0 100644 --- a/ltext/it/puzzlepieces-viaducts.po +++ b/ltext/it/puzzlepieces-viaducts.po @@ -1,6 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" +"POT-Creation-Date: \n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -8,6 +9,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.6\n" msgctxt "2026960B-2A592FD1-5C000000" msgid "" @@ -181,12 +183,6 @@ msgstr "" "\n" "Trascinare la rete STRADA fino alla transizione su entrambe le estremità da utilizzare." -#, fuzzy -#| msgctxt "2026960B-2A592FD1-5C060000" -#| msgid "" -#| "1-Level FLEX On-Slope Transition (works for L0-L1 or L1-L2)\n" -#| "\n" -#| "Drag the ROAD network up to the transition on both ends to use." msgctxt "2026960B-2A592FD1-5C07000F" msgid "" "1-Level One-Way Road FLEX On-Slope Transition (works for L0-L1 or L1-L2)\n" @@ -197,12 +193,6 @@ msgstr "" "\n" "Trascinare la rete STRADA fino alla transizione su entrambe le estremità da utilizzare." -#, fuzzy -#| msgctxt "2026960B-2A592FD1-5C070300" -#| msgid "" -#| "2-Level FLEX One-Way Road Ramp-Style Height Transition (works for L0-L2)\n" -#| "\n" -#| "Drag the ONE-WAY ROAD network THROUGH the transition to use." msgctxt "2026960B-2A592FD1-5C07010F" msgid "" "2-Level One-Way Road FLEX On-Slope Transition (works for L0-L2)\n" @@ -273,12 +263,6 @@ msgstr "" "\n" "Trascinare la rete STRADA A SENSO UNICO ATTRAVERSO la transizione da utilizzare." -#, fuzzy -#| msgctxt "2026960B-2A592FD1-5C060000" -#| msgid "" -#| "1-Level FLEX On-Slope Transition (works for L0-L1 or L1-L2)\n" -#| "\n" -#| "Drag the ROAD network up to the transition on both ends to use." msgctxt "2026960B-2A592FD1-5C08000F" msgid "" "1-Level Avenue FLEX On-Slope Transition (works for L0-L1 or L1-L2)\n" @@ -289,12 +273,6 @@ msgstr "" "\n" "Trascinare la rete STRADA fino alla transizione su entrambe le estremità da utilizzare." -#, fuzzy -#| msgctxt "2026960B-2A592FD1-5C080300" -#| msgid "" -#| "2-Level FLEX Avenue Ramp-Style Height Transition (works for L0-L2)\n" -#| "\n" -#| "Drag the Avenue network into the transition on both ends to use." msgctxt "2026960B-2A592FD1-5C08010F" msgid "" "2-Level Avenue FLEX On-Slope Transition (works for L0-L2)\n" @@ -520,7 +498,8 @@ msgstr "" "\n" "Ibrido (Ferrovia) L0\n" "\n" -"Autostrada Maxis L0" +"Autostrada Maxis L0\n" +"\n" msgctxt "2026960B-2A592FD1-5C360005" msgid "" @@ -563,7 +542,8 @@ msgstr "" "\n" "Autostrada Maxis L0\n" "\n" -"Autostrada reale (RHW) L0 Reti" +"Autostrada reale (RHW) L0 Reti\n" +"\n" msgctxt "2026960B-2A592FD1-5C410200" msgid "" diff --git a/src/scripts/RUL2_IID_structure_noRHW.xml b/src/scripts/RUL2_IID_structure_noRHW.xml deleted file mode 100644 index 42d3eaf16..000000000 --- a/src/scripts/RUL2_IID_structure_noRHW.xml +++ /dev/null @@ -1,348 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/scripts/build-installer-jar.sh b/src/scripts/build-installer-jar.sh new file mode 100755 index 000000000..279e652e0 --- /dev/null +++ b/src/scripts/build-installer-jar.sh @@ -0,0 +1,120 @@ +#!/bin/bash +# Builds a release-ready jar installer, taking as input: +# --version (preferably no spaces) +# --data (path to dat files) +# --sidebar (installer sidebar image file) +# --splash (installer splash image file) +# --output (optional output folder, defaults to `target/installer`) +# +# Example: +# ./src/scripts/build-installer-jar.sh --version 50.rc1 --data "installation" --sidebar "sidebar.png" --splash "splash.jpg" + +set -e + +if [ ! -e "Controller" ] +then + echo "Error: Call this script from the root directory of the Network-Addon-Mod repository." + exit 2 +fi + +# Initialize variables +version="" +data_dir="" +sidebar_image="" +splash_image="" +license_file="src/scripts/installer-resources/license.txt" +settings_file="src/scripts/installer-resources/settings.txt" +output_dir="" + +# Function to display usage +usage() { + echo "Usage: $(basename "$0") --version --data --sidebar --splash [--output ]" + exit 2 +} + +# Parse arguments +while [[ $# -gt 0 ]]; do + case "$1" in + --version|--data|--sidebar|--splash|--output) + option_name="$1" + shift + if [[ -z "$1" ]]; then + echo "Error: $1 requires a value" + usage + fi + case "$option_name" in + --version) version="$1" ;; + --data) data_dir="$1" ;; + --sidebar) sidebar_image="$1" ;; + --splash) splash_image="$1" ;; + --output) output_dir="$1" ;; + esac + shift + ;; + *) + echo "Unknown argument: $1" + usage + ;; + esac +done + +# Check for missing mandatory arguments +if [[ -z "$version" || -z "$data_dir" || -z "$sidebar_image" || -z "$splash_image" ]]; then + echo "Error: Missing required arguments." + usage +fi + +if [[ "$sidebar_image" != *.png || "$splash_image" != *.jpg ]] +then + echo "Error: sidebar image should be png, splash image jpg: $sidebar_image, $splash_image" + exit 2 +fi + +check_exists() { + if [ ! -e "$1" ] + then + echo "Error: file/directory does not exist: $1" + exit 2 + fi +} + +# Check existence of files +for f in "$data_dir" "$sidebar_image" "$splash_image" "$license_file" "$settings_file" +do + check_exists "$f" +done + +if [[ -z "$output_dir" ]]; then + output_dir="target/installer" +fi + +INSTALLER_URL="https://github.com/NAMTeam/nam-installer/releases/download/47.0.4/NAM-installer-version47.0.4.jar" +INSTALLER_ARCHIVE="target/NAM-installer-version47.0.4.jar" + +if [ ! -e "$INSTALLER_ARCHIVE" ] +then + # download installer if it does not yet exist + curl -L --output "$INSTALLER_ARCHIVE" "$INSTALLER_URL" +fi +echo "a447a06a759dccf13bbb6fce2657317a326035419dab74029e395a11a99cc8b6 $INSTALLER_ARCHIVE" | sha256sum --check + +TEMP="target/installer/temp" +rm -rf "$TEMP" +mkdir -p "$TEMP" +unzip -q -d "$TEMP/jar" "$INSTALLER_ARCHIVE" +rm -rf "$TEMP/jar/installation" + +cp "$splash_image" "$TEMP/jar/splash.jpg" +cp "$sidebar_image" "$TEMP/jar/sidebar.png" +sed "s/__NAMVERSION__/$version/g" "$license_file" > "$TEMP/jar/license.txt" +sed "s/__NAMVERSION__/$version/g" "$settings_file" > "$TEMP/jar/settings.txt" + +mkdir -p "$output_dir" +out_jar="$output_dir/NetworkAddonMod_Setup_Version$version.jar" +jar cfm "$out_jar" "$TEMP/jar/META-INF/MANIFEST.MF" -C "$TEMP/jar" . +# add dat files to jar (without copying them into the TEMP folder as intermediate step) +ln -s "$(realpath "$data_dir")" "$TEMP/installation" +jar uf "$out_jar" -C "$TEMP" "installation" + +rm -rf "$TEMP" +echo "Jar installer has been created: $out_jar" diff --git a/src/scripts/compile-release-controllers.sh b/src/scripts/compile-release-controllers.sh index 50bb67ed9..2a70cf541 100755 --- a/src/scripts/compile-release-controllers.sh +++ b/src/scripts/compile-release-controllers.sh @@ -13,9 +13,8 @@ # ./src/scripts/compile-release-controllers.sh # # The compiled controllers are located at `./target/controllers/`. -# The selections for Full/Low-RAM variants are taken from these files: +# The controller-compiler selections are taken from this file: # src/scripts/RUL2_IID_structure_full.xml -# src/scripts/RUL2_IID_structure_noRHW.xml set -e if [ ! -e "Controller" ] @@ -42,13 +41,12 @@ unzip -d "$TEMP" "$COMPILER_ARCHIVE" VERSION="$1" DRIVESIDE='XHD' -VARIANT='' DATESTRING="$(date --utc)" ltext() { if [ ! -z "$VERSION" ] then # If an argument was passed to the script, the version is non-empty. - printf "NAM Version $VERSION $DRIVESIDE $VARIANT compiled on $DATESTRING" + printf "NAM Version $VERSION $DRIVESIDE compiled on $DATESTRING" else # Otherwise pass the empty string to the compiler. printf "" @@ -57,27 +55,13 @@ ltext() { # RHD 4GB Full -VARIANT='(4GB Full)' DRIVESIDE='RHD' cp "src/scripts/RUL2_IID_structure_full.xml" "$TEMP/resources/xml/RUL2_IID_structure.xml" -(cd "$TEMP" && java -jar NAMControllerCompiler.jar "$PROJECT_ROOT/Controller" '../@0=0 NAM Controller_RHD_4GB_Full' 1 "$(ltext)") +(cd "$TEMP" && java -jar NAMControllerCompiler.jar "$PROJECT_ROOT/Controller" '../@0=0 NAM Controller_RHD' 1 "$(ltext)") # LHD 4GB Full -VARIANT='(4GB Full)' DRIVESIDE='LHD' cp "src/scripts/RUL2_IID_structure_full.xml" "$TEMP/resources/xml/RUL2_IID_structure.xml" -(cd "$TEMP" && java -jar NAMControllerCompiler.jar "$PROJECT_ROOT/Controller" '../@1-0 NAM Controller_LHD_4GB_Full' 0 "$(ltext)") - -# RHD no-RHW -VARIANT='(Low-RAM no-RHW)' -DRIVESIDE='RHD' -cp "src/scripts/RUL2_IID_structure_noRHW.xml" "$TEMP/resources/xml/RUL2_IID_structure.xml" -(cd "$TEMP" && java -jar NAMControllerCompiler.jar "$PROJECT_ROOT/Controller" '../@2-0 NAM Controller_RHD_LowRAM_NoRHW' 1 "$(ltext)") - -# LHD no-RHW -VARIANT='(Low-RAM no-RHW)' -DRIVESIDE='LHD' -cp "src/scripts/RUL2_IID_structure_noRHW.xml" "$TEMP/resources/xml/RUL2_IID_structure.xml" -(cd "$TEMP" && java -jar NAMControllerCompiler.jar "$PROJECT_ROOT/Controller" '../@3-0 NAM Controller_LHD_LowRAM_NoRHW' 0 "$(ltext)") +(cd "$TEMP" && java -jar NAMControllerCompiler.jar "$PROJECT_ROOT/Controller" '../@1-0 NAM Controller_LHD' 0 "$(ltext)") rm -rf "$TEMP" diff --git a/src/scripts/compile-release-inruls.sh b/src/scripts/compile-release-inruls.sh index ac381af51..25b63dd66 100755 --- a/src/scripts/compile-release-inruls.sh +++ b/src/scripts/compile-release-inruls.sh @@ -33,22 +33,12 @@ unzip -d "$TEMP" "$BUILDRULS_ARCHIVE" (cd "$TEMP/BuildRULs_01" && java -jar BuildRULs.jar -f "$PROJECT_ROOT/Controller/INRULs/" "$PROJECT_ROOT/Controller/INRULs/") # RHD 4GB Full -DESTDIR="target/controllers/@0=0 NAM Controller_RHD_4GB_Full/" +DESTDIR="target/controllers/@0=0 NAM Controller_RHD/" mkdir -p "$DESTDIR" cp -p "$PROJECT_ROOT/Controller/INRULs/NetworkAddonMod_IndividualNetworkRULs_RHD.dat" "$DESTDIR" # LHD 4GB Full -DESTDIR="target/controllers/@1-0 NAM Controller_LHD_4GB_Full/" -mkdir -p "$DESTDIR" -cp -p "$PROJECT_ROOT/Controller/INRULs/NetworkAddonMod_IndividualNetworkRULs_LHD.dat" "$DESTDIR" - -# RHD no-RHW -DESTDIR="target/controllers/@2-0 NAM Controller_RHD_LowRAM_NoRHW/" -mkdir -p "$DESTDIR" -cp -p "$PROJECT_ROOT/Controller/INRULs/NetworkAddonMod_IndividualNetworkRULs_RHD.dat" "$DESTDIR" - -# LHD no-RHW -DESTDIR="target/controllers/@3-0 NAM Controller_LHD_LowRAM_NoRHW/" +DESTDIR="target/controllers/@1-0 NAM Controller_LHD/" mkdir -p "$DESTDIR" cp -p "$PROJECT_ROOT/Controller/INRULs/NetworkAddonMod_IndividualNetworkRULs_LHD.dat" "$DESTDIR" diff --git a/src/scripts/installer-resources/license.txt b/src/scripts/installer-resources/license.txt new file mode 100644 index 000000000..d956af294 --- /dev/null +++ b/src/scripts/installer-resources/license.txt @@ -0,0 +1,38 @@ +Welcome to the ${appname} installer application! + +Please read the following carefully, then select "I agree with these conditions" to continue. + +--------------------------------------------------------------------------------------------- + +Network Addon Mod is compatible with the following versions of SimCity 4.exe: + + 1.1.641 + +The following versions are unsupported: + + 1.1.640, 1.1.638, 1.1.613, 1.1.610, and all macOS versions + +See the read-first-nam-__NAMVERSION__.html document for more details. + +--------------------------------------------------------------------------------------------- + +Please observe the following instructions when installing or upgrading the NAM: + +- Manually copy the NAM.dll into the root of your Plugins folder. + +- If installing for the first time, be sure to apply the 4GB Patch to SimCity 4.exe (recommended, but optional). + +- If upgrading, remove the previous installation in its entirety before running the installer. + + Previous versions are not removed automatically and may conflict with this version. + +--------------------------------------------------------------------------------------------- + +Users download, install, and run this software completely and solely at their own risk. +Maxis, Electronic Arts, the creators, and its individual contributors are not responsible for +any errors, crashes, problems, or any other issue that you may have if you have downloaded and +applied this software to your game. The use of this software, the information within, and the +Network Addon Mod is conditional upon the acceptance of this disclaimer and all that is within +this software. + +--------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/src/scripts/installer-resources/read-first-nam.html b/src/scripts/installer-resources/read-first-nam.html new file mode 100644 index 000000000..9eb452792 --- /dev/null +++ b/src/scripts/installer-resources/read-first-nam.html @@ -0,0 +1,713 @@ + + + + + + Network Addon Mod (NAM) Version __NAMVERSION__ by the NAM Team + + + + +
+
+ + readmebanner + + + + + + + + + + + + + + + + + + + + + + + + + Network Addon Mod - DOCUMENTATION + +
+ +

Network Addon Mod (NAM) Version __NAMVERSION__ by the NAM Team

+ +
+

Before you run off in excitement to install the new NAM version, please make sure to read this document first, + to ensure the best Network Addon Mod experience.

+
+ +

Compatibility and Installation

+
+ +

Before attempting to run the NAM installer, ensure that you have extracted the contents of the .zip download into a folder.

+

Attempting to run the installer (or the 4GB Patch) while the files are still in the .zip will cause the installation to fail.

+ +

The minimum requirements for running the Network Addon Mod are as follows:

+
    +
  • A compatible retail copy of SimCity 4 Deluxe Digital Edition +
      +
    • Windows/Linux (via WINE/Proton): Any digital retail edition, i.e. Version 1.1.641, is compatible (the EA App/Origin Retail Edition is compatible since June 2023).
    • +
    • macOS versions of SimCity 4 are incompatible: Starting with NAM 50, support for any editions of the Aspyr port for macOS is discontinued (Note to Mac Users), as they are incompatible with the DLL features. The last macOS-compatible NAM version was NAM 49.
    • +
    • The now-rare disc copies of SimCity 4 are incompatible. Starting with NAM 50, support for the Windows disc copies of SimCity (Version 1.1.638 or older) is discontinued, as they are incompatible with the DLL features.
    • +
    +
  • +
  • Java Runtime Environment (JRE), in order to run the installer – a version for 64-bit Windows is included in the download (OpenJDK25U-jre_x64_windows_hotspot_25.0.4_7.msi). +
      +
    • If you are not on 64-bit Windows and need Java, Adoptium's open-source edition is recommended, though JRE and JDK can also be acquired in proprietary/commercial (but free to download) form from Oracle at https://www.java.com.
    • +
    • The Java Development Kit, or JDK, will also work, but contains extra files not needed unless you are a Java developer.
    • +
    +
  • +
  • A system with the following specs +
      +
    • Any system with a 64-bit operating system, at least 4GB RAM, and 1.0 GB available disk space. Windows 10 or later is recommended.
    • +
    • The Microsoft Visual C++ 2022+ x86 Redistributable must be installed. Current versions of Windows 10 and 11 have this pre-installed already.
    • +
    +
  • +
  • Additional prerequisite on Windows/Linux (optional, but recommmended): 4GB Patch by NTCore (included in download, and also + available at NTCore). + +
  • +
+ +

To install the Network Addon Mod:

+
    +
  1. Install the Java Runtime Environment (JRE) (if already installed, skip to Step 2).
  2. +
  3. Remove any existing NAM installations, if present (simply deleting the "a_Network Addon Mod Lite" and/or "Network Addon Mod" folder from the Documents\SimCity 4\Plugins directory is the easiest way).
  4. +
  5. Run NetworkAddonMod_Setup_Version__NAMVERSION__.jar, which is the installer. Note: This is now the recommended installation procedure for all operating systems.
  6. +
  7. Follow the installer's instructions, clicking on each tab on the top bar in order. +
      +
    1. Agree to the mod's terms on the initial "welcome" tab to proceed with the installation.
    2. +
    3. Select the options you would like to install under the "files" tab.
    4. +
    5. Select the install location under the "location" tab. Unless you have set up an alternate location for your Plugins folder, this should be correct without needing to change it.
    6. +
    7. Finally, move to the "install" tab. Click the "Start installation" button to begin the installation process.
    8. +
    9. Close the installer, using the "X" button in the upper right corner of the window.
    10. +
    +
  8. +
  9. Additional step: Installing the DLL: +
      +
    • Manually copy the "NAM.dll" file into the top-level directory of your Plugins folder.
    • +
    • Do not place it inside the "Network Addon Mod" sub-folder. Instead, place it directly into the "Documents\SimCity 4\Plugins" folder.
    • +
    • Make sure older NAM.dll files have been removed from both Plugins folders (the one under Documents and the one in the game's installation location). The choice of Plugins folder does not matter, as long as the DLL is only placed in one of them.
    • +
    +
  10. +
  11. Additional step: 4GB Patch (recommended, but optional): Ensure your copy of the game has had the 4GB Patch applied to it. +
      +
    • To determine whether the 4GB Patch has already been applied, check the "NAM.log" file that is created by the DLL at every launch of the game (“The 4GB patch is installed” or “…not installed”). +
    • Open the enclosed "4gb_patch.exe" file in the NAM download (or download it from NTCore). A window will appear showing the file system. Navigate over to + your game's installation location, and select "SimCity 4.exe". This will depend on where you purchased your copy of the game. The default locations for + common digital versions and the disc version are as follows: +
        +
      • Steam: C:\Program Files (x86)\Steam\steamapps\common\SimCity 4 Deluxe\Apps
      • +
      • GOG: C:\GOG Games\SimCity 4 Deluxe Edition\Apps
      • +
      • EA App: C:\Program Files\EA Games\SimCity 4 Deluxe Edition\Apps
      • +
      • Original Disc Copy: C:\Program Files (x86)\Maxis\SimCity 4 Deluxe\Apps
      • +
      +
    • +
    • Upon completion, a message will pop up indicating whether or not the patch successfully applied.
    • +
    • Note that attempting to run the 4GB Patch file while still inside the download .zip may cause it to fail.
    • +
    • It is also possible to launch the 4GB Patch from a command line. Simply drop the 4gb_patch.exe file into the same folder as your game's executable, and from the command line, type 4gb_patch.exe SimCity 4.exe.
    • +
    • See this segment of Haljackey's NAM installation video for a demonstration of the process (while this video was filed with NAM 46, the process of installing the 4GB Patch has not changed).
    • +
    +
  12. +
  13. Load the game and enjoy the NAM! +
      +
    • Note that if you've never run the NAM before, and you've picked a fuller installation option, the initial load of the game, and of the first city tile you open may be longer--often quite noticeably. This will shorten with + subsequent loads of other cities, or, if you exit and re-enter the game, subsequent re-entries will be quicker. Installing the new Version 2.0 of Null 45's Startup Performance Optimization DLL for SimCity 4 + has been shown to make a dramatic difference in reducing load times.
    • +
    • If you do not see any icons in game, this most likely means your installation ended up in the wrong location. + Reinstall, making sure the files go into your Documents\SimCity 4\Plugins folder.
    • +
    • If you have duplicate icons, this is an indication that you have multiple versions (or at least, portions of multiple versions) of the NAM installed simultaneously. We recommend removing all NAM files (both new and old) from + the Plugins folder, and once again attempting an install of NAM __NAMVERSION__.
    • +
    • If an advisor message pops up, claiming that the NAM.dll is missing, then either you forgot to copy the DLL into the top-level directory of the Plugins folder, or your game edition is incompatible with the DLL, or you may need to install the Microsoft Visual C++ 2022+ x86 Redistributable (see specs above).
    • +
    +
  14. +
+ +

Alternatively, an easy way to install the NAM is using the sc4pac Mod Manager.

+ +

For further details on the NAM and its features, visit our new website at https://www.sc4nam.com.

+
+ + +

New Features for NAM __NAMVERSION__

+
+

This release is the first to rely on the NAM DLL. As such, this release is incompatible with the macOS editions of the game, and only compatible with the digital Windows edition.

+

DLL Features:

+
    +
  • + Added a custom RUL2 engine: This is a substantial new feature of the DLL which +
      +
    • makes override networks much more stable
    • +
    • allows for tighter footprints (e.g. crossings of override networks that previously had to be placed one tile apart may now be placed directly adjacent to each other)
    • +
    • reduces the size of the NAM codebase by almost 90% and by more than 10 million lines, making it easier to maintain and reducing the chance of bugs. A lot of work has gone into this by the entire team, and it is why, starting with NAM 50, the NAM cannot be used without the DLL anymore.
    • +
    • improves performance: The initial city load time is reduced by a huge amount, as a result of the controller size reduction.
    • +
    • The 4GB patch is not strictly required anymore as a consequence, as well.
    • +
    • As the full NAM Controller is now less than 60 MB, the Low-RAM/No-RHW option has been removed.
    • +
    +
  • +
  • Streets can now be dragged diagonally.
  • +
  • Auto-connect of the Street and RHW networks has been disabled.
  • +
  • Added a fix for the Eternal Commuter Loop bug: Neighbor-to-neighbor routes that connect the city to the North and the city to the West are blocked by the path finder, so loops cannot form anymore. All other connections, such as South-to-North or East-to-West, are still allowed.
  • +
  • Keyboard shortcuts have been added for all missing networks: Monorail (CTRL+Y), One-Way Road (Shift+E), Ground Highway (Alt+E) and RHW (Control+E).
  • +
  • Tunnels can now be built using the Street network.
  • +
  • + Added slope-tolerance improvements for various network elements: +
      +
    • 45 degree curves of single-tile networks are slope-conforming now.
    • +
    • All starter pieces and many FLEX pieces are slope-tolerant now.
    • +
    • The FLEX On-slope pieces have been improved: +
        +
      • Their footprint has been minimized.
      • +
      • The sinkhole bug associated with them is fixed.
      • +
      • Networks can be dragged through the On-slope transition piece.
      • +
      +
    • +
    +
  • +
  • The invisible cursor tile has been removed from all FLEX pieces. The handle does not interfere with any lots or networks anymore.
  • +
  • The ferry clearance height of bridges has been reduced from 30 to 20 meters.
  • +
  • Added an option to disable each individual DLL patch for debugging purposes, by installing the optional NAM.ini file.
  • +
  • Added an option to allow RCI zones to acess RHW networks (disabled by default).
  • +
+

Street Network and SAM Improvements:

+
    +
  • The Diagonal Street Helper Pieces have been removed, as diagonal streets are now draggable.
  • +
  • Load order issue between MHO and diagonal streets has been fixed.
  • +
  • added new intersections of diagonal street with road corners
  • +
  • The SAM code has received a complete overhaul, with the native diagonal Streets in mind. Some SAM textures have been added or improved.
  • +
  • minor fixes for RRW × SAM crosslinks
  • +
  • SAM × Road diverter instability has been fixed.
  • +
  • added SAM × Avenue O×O Long T intersections as well as several SAM × Road/OWR diagonal intersections
  • +
  • Several missing or buggy SAM paths have been fixed.
  • +
+

Real Highway Improvements:

+
    +
  • Diagonal RHW-2 network transitions have been fixed.
  • +
  • The D1 FLEX-ramp has been improved to make it work even when placed parallel to each other.
  • +
  • A pathing issue with DDRHW-4 to Dual RHW-4 FLEX Transition has been fixed.
  • +
  • some improvements for HRW × RHW crosslinks
  • +
+

Real Railway Improvements:

+
    +
  • RRW-style textures for some pre-RRW/legacy configurations have been added.
  • +
  • A few missing legacy paths for RRW WRC pieces have been restored.
  • +
  • The diagonal bridges (DBE) have been made compatible with RRW.
  • +
  • Some issues with diagonal STR RULs have been resolved.
  • +
  • The slope mods of RRW and MHO have been removed. Install the NAM Tunnel + And Slope Mod instead. (In the past, these slope mods were included to + configure the tunnel portals of these NAM networks. This has now been + implemented universally using Exemplar Patching (for RRW, MHO and Street + tunnels), which works with all slope mods as long as the Resource + Loading Hooks DLL is present.)
  • +
+

Other Various Improvements:

+
    +
  • All sinkhole bugs have been fixed.
  • +
  • Road Roundabout code has been revised for better stability.
  • +
  • UI fixes for transit stations
  • +
  • The FLUPs tab loop has been split into multiple shorter tab loops in preparation for submenus.
  • +
  • A load order issue between MHO and DBE files has been resolved.
  • +
  • EU textures for OWR × AVE-6/TLA-7 have been fixed.
  • +
  • a few texturing improvements for Street × Road/OWR and for Avenue curbs
  • +
  • various fixes to base content, including Avenue × Avenue O×D intersections, and directionality on diagonal OWR intersections
  • +
  • The GLR-4 models have been updated to make them independent from the GLR-3 style.
  • +
  • small fixes for paths and models of GLR Tram-in-Road
  • +
  • Auto-place functionality of legacy FAR puzzle pieces has been disabled to avoid conflicts with TE lots.
  • +
  • A mirroring issue with the stop sign has been fixed.
  • +
  • An issue with the light cone prop of pedmalls has been fixed.
  • +
  • The T21s for Classic Pedmalls have been updated.
  • +
+
+ + +

Various Important Notes

+
+

The NAM.dll is REQUIRED since NAM Version 50. If your system or game does not support the use of DLLs, consider using NAM Lite, which does not depend on the DLL, or switch to an older legacy release.

+

Users wishing to simply use the NAM's Traffic Simulator improvements should install the NAM Lite package, which offers easy setup of various minimal options. The previously included Traffic Simulator Configuration Tool (TSCT) has been discontinued.

+

The NAM uses a Java-based installer, designed by daeley, which is cross-platform (meaning Linux support without WINE). As such, the Java Runtime Environment (JRE) is + REQUIRED to run the NAM installer. + A Windows 64-bit copy of OpenJDK 25 is included in the download (OpenJDK25U-jre_x64_windows_hotspot_25.0.4_7.msi). Other open source distributions of Java can be downloaded from Adoptium.

+

Users who fundamentally object to installing Java (or are unable to for other reasons) can perform a manual install, with patience. Details can be found in the Manual Installation section.

+

With the new installer, the old NAM installation is no longer removed automatically, so users should manually remove any "a_Network Addon Mod Lite", "Network Addon Mod" and/or "z___NAM" folders as well as "NAM.dll" and/or "NAM.ini" files from their Plugins directory. + It is recommended that you back those files and folders up in a location that is not in your Plugins folder. Presently, all files are now installed to + the "Network Addon Mod" directory, or in the case of a NAM Lite install, the "a_Network Addon Mod Lite" directory.

+

The RealRailway (RRW) standard for Rail is now the default and only option, unless using NAM Lite. + Also note that a number of cosmetic-oriented NAM plugins, such as the El-Rail Alternate Implementation, the Bullet Train Mod, and some advanced texture options (largely deprecated) have been removed from the installer since NAM 37. + The Alternate El-Rail and BTM will be made available separately at a later date. Please note that, much like Maxis Rail, these Plugins are effectively in "Legacy" status, and may not be actively + maintained or supported by the NAM Team going forward, though you may choose to retrieve them from a past NAM installation's "z___NAM" folder. Both the original Maxis Highways (MHW) and the "Maxis Highway Override/Project Symphony" (MHO) remain available.

+

The Station Locator, Updater, and Reconstruction Project (SLURP) is also no longer handled by the new installer. There is ongoing internal discussion about reimplementing SLURP. Users wishing to retain SLURPed stations should retrieve them from the "z___NAM\Mass Transit Lots\Station Overrides" folder in their existing NAM installation, where + they will be found in the "Mass Transit Lots" subfolder. Note that users running the 64-bit version of SimCity 4 on macOS may wish to refrain from retrieving SLURP stations, as there + have been some encoding issues with stations that cause that version of the game to CTD.

+
+ +

Note About sc4pac

+
+

You can use the sc4pac Mod Manager to install the NAM. Simply, install the package nam:network-addon-mod (and the optional content listed there) with sc4pac, instead of running the NAM installer. + This makes it easy to install, update and uninstall the NAM. + The mod manager guides you through all the important installation options and even remembers your choices. + Some non-default legacy options are not included, however.

+

Before installing the NAM through sc4pac for the first time, make sure to fully uninstall the NAM first by removing all NAM files from previous manual installations.

+
+ +
Notice to Users Who Purchased a Digital Copy from the EA.com/the EA App/Origin, or Play Via EA Play/Xbox Game Pass
+
+

In June 2023, EA patched all copies of SimCity 4 Deluxe available through their own direct digital storefronts (EA.com and the EA App) and services (EA Play) to Version 1.1.641, bringing them up to the same standard as the digital retail copies from Steam. + As such, the EA App and EA Play versions of SimCity 4 Deluxe are now compatible with the Network Addon Mod.

+ +

NAM developer Tarkus has more details on this change at his blog, + SimTarkus.

+
+ + +

Note to Mac Users

+
+

+ The Aspyr macOS versions of the game are unable to load DLL plugin files. + As the NAM DLL brings important and major benefits for gameplay and maintainability of the NAM, support for the macOS versions of the game has been discontinued, as of NAM 50. +

+

For further details, see + The Future of SC4 Modding: The Matter of Digital vs. Disc, and Windows vs. macOS in the DLL Era.

+

The following options are available to Mac-users:

+ +
+ +

Upgrading from a Previous Version

+
+

If you are upgrading from a previous version of the NAM, MANUALLY MOVE YOUR OLD NAM INSTALLATION OUT FROM YOUR PLUGINS FOLDER, INTO A SAFE LOCATION (note that this has changed from previous + NAM releases). The current version of the NAM installer cannot detect your previous installation options + by reading the existing folder structure. It is recommended that you check your existing installation, to determine which features you presently have installed.

+

Generally speaking, the NAM Team makes every effort to ensure that new versions at least retain some form of "legacy support", such that cities built with any previous NAM version will + continue to function well with the latest version.

+

If you have consolidated your NAM files using a tool such as SC4DatPacker or JDatPacker, please read here.

+
+ +

Regarding "DatPacking" and File Consolidation Post-Installation

+
+

Programs to consolidate folders worth of SimCity 4 .DAT files, such as SC4DatPacker (Windows) and JDatPacker (cross-platform), are popular options known to improve game performance, given SimCity 4's preference + to read a smaller number of larger files, instead of a larger number of small files--a fact determined by the BSC Team's "Miramba Experiment" of 2006. The use of "DatPacking" programs on one's NAM installation, + however, is a controversial topic. The NAM Team's general advice is for Windows users to avoid DatPacking (unless one is extremely careful, + while for Mac users, the use of JDatPacker is essentially required.

+ +

In general, if one plans to DatPack one's NAM installation, they should also save the pre-DatPacked NAM folder in a safe place, outside the Plugins folder beforehand. The reason for this is to avoid potential conflicts and issues, + such as the "dual icon bug" and Controller file conflicts between new and old installations, as well as to make it such that one knows which options they have installed + when upgrading to a new version, or re-installing the same version with different options.

+ +

The February 2025 release of Version 2.0 of Null 45's Startup Performance Optimization DLL for SimCity 4 provides a new + option to dramatically speed up load times on Windows (and Linux) installations of the game, to the point at which the benefits of DatPacking become largely superfluous.

+
+ + +

A Note About Drive Side (RHD vs. LHD)

+
+

While the NAM Installer, as noted above, has a series of checkboxes in Custom Installation relating to drive side, it is worth re-iterating that these boxes only change the compatibility + files installed with the NAM, and do NOT change drive side. If you have an installation with Right-Hand Driving (RHD, vehicles driving on the right side of roads--this concept + is NOT the same as the side one sits on when driving a vehicle) and wish to switch to Left-Hand Driving (LHD, vehicles driving on the left side of roads), this generally needs + to be done either by adjusting the game's locale files, and then either editing the game's Windows registry entries, or by modifying the game's shortcut.

+

The new NAM Installer cannot determine default drive side of your installation, so make note of which side vehicles drive on in your game prior to installation. + If you have changed your drive side by modifying the game's shortcut, instead of editing the Windows registry, then this would be the one and only case when changing the box checked here + would be needed. +

+ +

A Note About the "4GB Patch"

+
+ +

Due to changes in computer systems, and continued expansions of the NAM's main Controller file, in 2013, it was determined that many newer systems, particularly those with more than 4GB of RAM, + and running 64-bit versions of Windows, need additional accommodation. To that end, the NAM includes a "4GB Patch", also known as a "Large Address Aware (LAA) Patch", which allows the game to access the + full 4GB of RAM that a 32-bit application can read, instead of the default 2GB. The NAM's patch was designed by NTCore, and built into the NAM with permission. The original patch can be found at ntcore.com.

+

The only thing this patch does is to switch the Large Address Aware switch, an accessible switch present in all Windows executables, from "off" to "on" for the game's executable. Patches like this + are common in game modding communities, including those associated with The Elder Scrolls series (i.e. Skyrim), and Fallout, and can be used to enhance any 32-bit application's performance on systems with 64-bit operating + systems and a suitable amount of RAM.

+ +

Note that the 4GB Patch is NOT required for users on macOS, as that version of the game is 64-bit and can access more RAM than the Windows version (even with the 4GB Patch!) by default. + +

The default directory for where SimCity 4.exe may be located depends on how and where you purchased your copy of the game.

+
    +
  • GOG.com: C:\GOG Games\SimCity 4 Deluxe Edition\Apps
  • +
  • Steam: C:\Program Files (x86)\Steam\steamapps\common\SimCity 4 Deluxe\Apps
  • +
  • EA App: C:\Program Files\EA Games\SimCity 4 Deluxe Edition\Apps
  • +
  • Original Disc Copy: C:\Program Files (x86)\Maxis\SimCity 4 Deluxe\Apps
  • +
+
+ +

Uninstalling the NAM

+
+

To uninstall the files, simply bulldoze every NAM item from this download in your cities and remove the files from the Plugins folder afterwards, which will be contained in + Plugins\Network Addon Mod and Plugins\NAM.dll by default.

+
+ +

Changing Options After Initial Installation

+
+

The NAM is a very expansive mod, with a substantial number of features, which may initially prove overwhelming to those not well-versed in its workings. The NAM Team anticipates + that users, particularly those new to the NAM, may want to change the feature set they have installed, as they learn more about the mod's contents and capabilities.

+

To that end, we encourage users to keep the installer for the current version handy after initial installation. If you plan to change your particular set of options, you will need to + remove your current installation. Moving it out of Plugins to a safe location is recommended, in case you want to keep your existing settings as a backup.

+
+ +

Manual Installation - Advanced

+
+

Users who are unable or unwilling to install Java can perform a manual installation of the NAM, something + which the new file architecture introduced in 2020 makes far more possible than the previous "Monolithic" releases.

+

This method requires a file decompression tool capable of opening .jar files, such as 7-zip (Windows) + or Keka (macOS). To begin, open NetworkAddonMod_Setup_Version__NAMVERSION__.jar using your file decompression tool.

+

The NAM's contents are located in the "installation" subfolder. The current installer uses a series of character flags at the start of directory names, in order + to instruct the installer how to order the options, whether they're mandatory or optional, etc.

+

Numbers preceded by the at sign ("@"), i.e. "@1", "@2", etc., are merely being ordered with this flag.

+

Any directory with the caret ("^") in front of the name (or behind a "@" ordering flag) is mandatory.

+

Any directory with the exclamation mark ("!") in front of the name (or behind a "@" ordering flag) is not installed by default.

+

Any options where the equal sign ("=") and the dash ("-") are present are mutually exclusive--only one should be installed + (the "=" option is the default).

+

The "@1^Core" directory is required. All other folders have options within them. At least one of the folders starting with "0 NAM Controller" must be installed. With "4 Automata Controller#", + and "9 Traffic Simulator#", simply select one of the options inside and discard the + rest, as these are straight up mutually exclusive one another. Within "8 Texture and Drive Side Support", keep "z_Common Files", then select either "-EU" (for EU textures) or "=US" (for US textures), and within "-EU" or "=US", get rid of the "_RightSide" or "_LeftSide" (whichever does not coincide with the side the vehicles in your game drive), and decide if you want any (or none) of the other subfolder options (i.e. Cul-De-Sacs).

+

The Automata Controller basically affects the display of the visual traffic in-game--Standard is going to be the lightest, while Radical is going to be the heaviest, Persistent makes the automata visuals last longer, and the 24-Hour modifiers handle whether the display is constant, or follows the data for the 24-Hour clock in-game.

+

The Texture and Drive Side Support includes four options, depending on whether you want to use US/North American textures or Euro/International Textures, and the drive side of your game (RHD or LHD, which should match your selection for the NAM Controller).

+

With the Traffic Simulator, these are ordered by the "@1" and the like in order of lowest capacity option to highest. Medium is the default.

+

With 5 DataView Options#, there's two subfolders. Both are just straight up options, with nothing mutually exclusive. You can probably just leave this one as is, unless you really don't like the Data View changes.

+

With 6 Miscellaneous, the two mutually exclusive options to watch out for are Extended Station Queries (there's four options in there--very subtle differences between them), and Maxis Transit Lots\Airport Capacity Adjustment#, which has three options (Default, Medium, and Large). And the Hole Diggers and Raisers are very much recommended--they have lots of use outside regular NAM usage, too.

+

With 3 Additional Transit Stations, this depends on if you want more transit stations beyond the game's default, and what the NAM adds by default for certain additional override networks. There should be no harm in either adding this one in whole, or leaving it out altogether, and if there's certain added stations you like/don't like, you can go in and customize this later.

+

2 Additional Network Features is by far the biggest area of the installer. This contains all the actual network feature addons in the mod. Most networks/network groups will have a "Base Features" folder, which really ought to be mandatory, as it contains a lot of the NAM's basic additions to each network, along with any Wide Radius/Multi Radius Curves and Fractional Angles, as well as Roundabout options for the various road-type networks.

+

The main "mutually exclusive" option to look out for here is with the Maxis Highways (there's two options--@1=Default Style, which keeps the Maxis Highways' default look and adds the NAM's additions for it, or @2-Maxis Highway Override (RHW-Style), which completely reskins the Maxis Highways, removes access to the default interchanges, and replaces them with RHW-style modular interchange functionality and a few new ploppable interchanges. Using the RealHighway (RHW) option is pretty much mandatory if you're going this route).

+

The other ones to watch out for are in Water Transport, where the Canal Addon Mod (CAN-AM) has two mutually-exclusive styles (@1=Callagrafx Style and @2-SimGoober Style), and there's also quite a few "non-default" options in Roads, One-Way Roads, and Avenues.

+

Those three non-default options are !Legacy Auto Avenue Turn Lanes (these are the old auto-turn lanes that appear on Avenue x Avenue intersections--largely considered "deprecated" now, as they can interfere with some newer functionality), !Legacy Semi-Auto Road Turn Lanes (the "semi-auto" replacement for the old auto-turn lanes on Road x Road intersections, which now appear by clicking over Road x Road + and T-intersections with the One-Way Road tool, also somewhat "deprecated" now), and !One-Way Road Arrow Plugins. These Arrow Plugins are mostly just a matter of taste, and, despite the folder naming, actually supposed to be mutually exclusive. "Elimination" gets rid of the arrows entirely, "Reduction" hides some of them (and actually impacts the base functionality of the OWR network to some degree), while "Single Arrows" replaces the default double arrows with just a single arrow (which looks nicer on the NWM networks).

+

The rest of 2 Additional Network Features is pretty self-explanatory, though micromanagement of these options is not recommended, since it is possible to produce a broken installation this way. RealRailway is the only/default option for Rail now, it's best to go all or nothing on RealHighways (RHW) and the Road, One-Way Road, and Avenue folder's "Additional Widths and Turn Lanes" option (which contains the Network Widening Mod and FLEX Turn Lanes). And if something says "Legacy" but it's not prefixed with "!", it's probably safest to install it, as it pertains to being able to keep certain older, deprecated content working, if you've built it with previous versions.

+
+ +

Distribution and Old Versions

+
+

The NAM Team only provides support and allows distribution of the most recent NAM version. With the exception of older non-English language versions (which + are supported by their respective sites, not the NAM Team) and the macOS legacy version, no technical support will be provided to users of prior versions of the NAM, nor will any past versions of the NAM + be made available for download, by request or otherwise. The team does not keep an official archive of past releases, and does not have the resources + to answer questions regarding them. Each release includes improvements across the board to features new and old, is designed to be as compatible with cities + built with previous versions as is humanly possible, and is also intended to improve the end user experience. Old releases are inherently inferior, and not "simpler" + or "easier" to use.

+ +

Users wanting a smaller feature set, due to technical limitations, or unfamiliarity with the NAM's vast options, should instead seek to + install NAM Lite, or fewer options in the current NAM.

+ +

Users wishing to hold onto old versions should back them up in their personal archives. Note again that no technical support will be provided for this, + nor may any user or site redistribute any old versions.

+
+ + +

Network Addon Mod - Credits

+ +
+

The following named members of Simtropolis, the SC4Evermore Discord, and the former SC4 Devotion and SimCityPlaza have, for whatever particular reason, been specifically included here for their special contributions during the NAM's history. Very special thanks goes towards them in the making, supplying, &/or supporting of this mod &/or its contents possible in one way shape or another:

+

The NAM Team and Associates (Active Members as of NAM __NAMVERSION__)

+
    +
  • Abigail
  • +
  • b22rian
  • +
  • CaptCity
  • +
  • CasperVg
  • +
  • Clarence
  • +
  • DebussyMan
  • +
  • dragonsteincole
  • +
  • Durfsurn
  • +
  • eggman121
  • +
  • Eric Blair
  • +
  • EstGuy/Cheese
  • +
  • Flann
  • +
  • Girafe
  • +
  • Haljackey
  • +
  • hugues aroux
  • +
  • IDS2
  • +
  • Indiana Joe
  • +
  • KaenOkami/Amaterasu
  • +
  • Kel9509
  • +
  • Kitsune
  • +
  • Lucario Boricua
  • +
  • matias93
  • +
  • McDuell
  • +
  • memo
  • +
  • metarvo
  • +
  • mgb204
  • +
  • MushyMushy
  • +
  • Naomi57
  • +
  • noahclem
  • +
  • nos.17
  • +
  • null45
  • +
  • Ramona Brie
  • +
  • ReLynx/RemRinka
  • +
  • rivit
  • +
  • Ryan B.
  • +
  • saus tartar
  • +
  • Shadow Assassin
  • +
  • Simizen
  • +
  • smf_16
  • +
  • Tarkus
  • +
  • Tyberius06
  • +
  • Ulisse Wolf
  • +
+

NAM Founders

+
    +
  • Redlotus
  • +
  • the7trumpets
  • +
  • Tropod
  • +
+

NAM Logo

+
    +
  • MadSim (original design)
  • +
  • Ramona Brie (updated design)
  • +
+

Tool Programmers

+
    +
  • cjmarshall
  • +
  • CorinaMarie
  • +
  • DarkMatter
  • +
  • daeley
  • +
  • fafalone
  • +
  • Flann
  • +
  • GoaSkin
  • +
  • Ilive
  • +
  • jondor
  • +
  • memo
  • +
  • null45
  • +
  • rivit
  • +
  • simrolle
  • +
  • Stefan79
  • +
  • Tropod
  • +
  • wouanagaine
  • +
+

NAM Installer

+
    +
  • Andreas Roth
  • +
  • daeley
  • +
  • frimi2
  • +
  • Tarkus
  • +
  • wouanagaine
  • +
  • z
  • +
+

NAM Controller Compiler

+
    +
  • memo
  • +
+

NAM Partner Program Members

+
    +
  • FoxieHikari
  • +
  • robmtl (Rob's Red Hot Spot)
  • +
  • saus tartar
  • +
+

Contributors & Testers

+
    +
  • 3ddz
  • +
  • Alidonkey
  • +
  • Andreas Roth
  • +
  • andreharv
  • +
  • Andy80586
  • +
  • AngryMozart
  • +
  • Anthracite
  • +
  • APSMS
  • +
  • ardecila
  • +
  • ArkenbergeJoe
  • +
  • BigSlark
  • +
  • Bipin
  • +
  • bladeberkman
  • +
  • blahdy
  • +
  • Blue Lightning
  • +
  • brenda_xne
  • +
  • buddybud
  • +
  • choco
  • +
  • Chrisim
  • +
  • Chrno
  • +
  • Ciuu96
  • +
  • Colyn
  • +
  • compdude787
  • +
  • CorinaMarie
  • +
  • CryinG.FreeM4n
  • +
  • daeley
  • +
  • deathtopumpkins
  • +
  • DebussyMan
  • +
  • DuskTrooper
  • +
  • dedgren
  • +
  • Dexter
  • +
  • Diggis
  • +
  • DJPTiger
  • +
  • Dragonshardz
  • +
  • Droric
  • +
  • ebina
  • +
  • elgoalio_29
  • +
  • Filasimo
  • +
  • frimi2
  • +
  • fukuda
  • +
  • Ganaram Inukshuk
  • +
  • Generalcamo
  • +
  • gizmo28
  • +
  • Glenni
  • +
  • GoaSkin
  • +
  • Ill Tonkso
  • +
  • isii94
  • +
  • J-dub
  • +
  • jdenm8
  • +
  • jeronij
  • +
  • Jiwoahn
  • +
  • jmvl
  • +
  • joelyboy911
  • +
  • Jonathan
  • +
  • jondor
  • +
  • jplumbley
  • +
  • Junspud
  • +
  • Karybdis
  • +
  • kes5219
  • +
  • Khiyana
  • +
  • manchou
  • +
  • MandelSoft
  • +
  • Mero90
  • +
  • michi_cc
  • +
  • MIncroabl
  • +
  • moonlinght
  • +
  • morifari
  • +
  • mott
  • +
  • mtg
  • +
  • Murakumon
  • +
  • Nardo69
  • +
  • nooneatall
  • +
  • north country dude
  • +
  • Olasz
  • +
  • paulvmontfort
  • +
  • pierreh
  • +
  • plunderer
  • +
  • praiodan
  • +
  • qurlix
  • +
  • rickmastfan67
  • +
  • riiga
  • +
  • Ripptide
  • +
  • RogerRon91
  • +
  • royal
  • +
  • Sabretooth78
  • +
  • samerton
  • +
  • Schleicher68
  • +
  • SDA
  • +
  • Seaman
  • +
  • SimCitySquare
  • +
  • Simmer2
  • +
  • sithlrd98
  • +
  • smoncrie
  • +
  • Spocky
  • +
  • squidi
  • +
  • Stefan79
  • +
  • superhands
  • +
  • swamp_ig
  • +
  • Swamper77
  • +
  • Swordmaster
  • +
  • Teirusu
  • +
  • The_Great_Chozo
  • +
  • TheCouncill0r/dicko6
  • +
  • TheMurderousCricket
  • +
  • Thorvin
  • +
  • threestooges
  • +
  • titanicbuff
  • +
  • toja
  • +
  • Tropod
  • +
  • vester
  • +
  • vil
  • +
  • vortext
  • +
  • woodb3kmaster
  • +
  • wouanagaine
  • +
  • xannepan
  • +
  • xxdita
  • +
  • Xyloxadoria
  • +
  • z
  • +
+ +
Special Thanks
+ +

Webmaster & administration staff at Simtropolis, SC4Evermore, ModDB, and the former SC4 Devotion and SimCityPlaza.

+

All (other) members of original Simtropolis Modd Squad, especially the Modd Squad founders.

+

And possibly others who may not have been mentioned. If your name has been forgotten or you're not on the list, then drop us a line, + as it has been difficult to keep track of anyone/everyone that may of helped somewhere along the lines.

+

And to the community itself, we would also like to thank you for your support, making mods such as this possible too. We're + still at it after almost 20 years thanks to you!

+

And last but not least, a thanks for the Maxis individuals too, for the [paid] work that they did and released 23 years ago. Here's to 23 more. ;-)

+ + +
+
+ + diff --git a/src/scripts/installer-resources/settings.txt b/src/scripts/installer-resources/settings.txt new file mode 100644 index 000000000..d386ab79e --- /dev/null +++ b/src/scripts/installer-resources/settings.txt @@ -0,0 +1,113 @@ + +# this is the configuration file for the installer. +# DO NOT change the name of this file, the installer needs this to be 'settings.txt' + +# ------------------------------------------------ # +# general settings +# ------------------------------------------------ # + +# - 'version' and 'appname' are not essential, but are defined here as a example to show how you can +# reference other defined symbols in strings and description files (such as licence.txt) +# you may also define your own symbols to be used this way for convenience +# - 'apptitle' will show on application frame (if 'decorate' is TRUE) and windows taskbar +# - default installation folder is MY_DOCUMENTS/Simcity 4/Plugins/${defaultfolder} +# - 'width' and 'height' do NOT include sidebar (if sidebar is longer than 'height', sidebar height is used) +# - set 'decorate' to TRUE/FALSE to show/hide default application frame +# - 'splash_ms' is the time the splash message is showing, in milliseconds. If there is no "splash.jpg" file, +# this property is ignored. The filename "splash.jpg" is hardcoded so it can be loaded while this file is being compiled. + +version = __NAMVERSION__ +appname = Network Addon Mod ${version} +apptitle = ${appname} Installer +defaultfolder = Network Addon Mod +width = 640 +height = 640 +decorate = TRUE +splash_ms = 1500 + +# show/hide the file selection screen +showFiles = TRUE + +# - if 'on_finish.open' is a valid file, closing the installer after successfully installing will open this file +# - if 'on_finish.run' is a valid file, closing the installer after successfully installing will run this file +# paths given here should be relative to the installation directory + +on_finish.open = start.html +# on_finish.run = program.exe + +# ------------------------------------------------ # +# GUI/language settings +# ------------------------------------------------ # + +frame.close = Close +frame.minimize = Minimize + +welcome.title = welcome +welcome.i_agree = I Agree with these conditions +welcome.next = Click tabs to continue + +files.title = files +files.treeborder = Select files to install +files.infoborder = Additional information +files.divider.pos = 400 +files.divider.fixed = FALSE + +location.title = location +location.border = Please select location to install files +location.button = Browse + +install.title = install +install.button = Start installation + +setup.title = setup + +cleanitol.title = cleanup +cleanitol.start = Start scan +cleanitol.stop = Cancel scan +cleanitol.done = Scan finished! +cleanitol.delete = delete +cleanitol.delete.popup = files(s) successfully deleted +cleanitol.backup = backup +cleanitol.backup.popup = files(s) successfully moved to +cleanitol.found = outdated file(s) found +cleanitol.msg = Please delete or backup these files to avoid conflicts with newly installed files +cleanitol.error = An error occurred trying to move or delete the following file(s), please remove these manually + +depends.title = depends +depends.start = ${cleanitol.start} +depends.stop = ${cleanitol.stop} +depends.done = ${cleanitol.done} +depends.tooltip = Double-click to open download site +depends.label = Scan for dependencies (GREEN = dependency found) + +# ------------------------------------------------ # +# color settings +# ------------------------------------------------ # +# format: Red,Green,Blue + +black = 0,0,0 +white = 255,255,255 + +default.light = 225,166,26 +default.dark = 233,99,32 +tabs.title = ${default.dark} +tabs.line.default = ${default.dark} +tabs.line.select = ${white} +textfield.text = 46,94,141 +textfield.back = 218,231,243 +buttons.text = ${black} + +# ------------------------------------------------ # +# auxiliary files +# ------------------------------------------------ # + +license = license +license.exts = txt,htm,html +sidebar = sidebar +sidebar.exts = png,jpg,gif,bmp +cleanitol = cleanup.txt +depends = depends.txt + + + +