From 2e7e967279579c2d0978dc20bae4994e28d94627 Mon Sep 17 00:00:00 2001 From: maj00r Date: Sun, 4 Oct 2026 18:57:58 +0200 Subject: [PATCH] Say only what a tail coupler does: end signals or none The simulator reads the last vehicle's coupler for one thing, whether to put up the end signals. It does not couple the train to anything behind it, as the tooltip and a comment claimed. --- StarterNG.Tests/CouplerLookTests.cs | 4 ++-- StarterNG/Domain/Consist.cs | 2 +- StarterNG/Views/Depot/CouplerLook.cs | 10 +++++----- StarterNG/startercfg/lang/cz.xml | 2 +- StarterNG/startercfg/lang/en.xml | 2 +- StarterNG/startercfg/lang/hu.xml | 2 +- StarterNG/startercfg/lang/pl.xml | 2 +- StarterNG/startercfg/lang/ru.xml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/StarterNG.Tests/CouplerLookTests.cs b/StarterNG.Tests/CouplerLookTests.cs index 6573914..5fd1c83 100644 --- a/StarterNG.Tests/CouplerLookTests.cs +++ b/StarterNG.Tests/CouplerLookTests.cs @@ -18,8 +18,8 @@ public class CouplerLookTests [Theory] [InlineData("0", CouplerState.EndSignals)] [InlineData("0.BP", CouplerState.EndSignals)] - [InlineData("3", CouplerState.CoupledBehind)] - [InlineData("-7", CouplerState.CoupledBehind)] + [InlineData("3", CouplerState.NoEndSignals)] + [InlineData("-7", CouplerState.NoEndSignals)] public void The_back_of_the_train_gets_end_signals_only_at_0(string code, CouplerState expected) => Assert.Equal(expected, CouplerLook.StateOf(Coupling.Parse(code), trailing: true)); } diff --git a/StarterNG/Domain/Consist.cs b/StarterNG/Domain/Consist.cs index 2faf0bd..ac374e9 100644 --- a/StarterNG/Domain/Consist.cs +++ b/StarterNG/Domain/Consist.cs @@ -638,7 +638,7 @@ public sealed class Consist : IReadOnlyList /// /// Clears the coupler at the back of the consist, unless it was set in the /// editor. The simulator hangs the end signals only on a last vehicle whose - /// coupler is 0 - anything else couples it to whatever stands behind - and every + /// coupler is 0 - the code does nothing else at the back of a train - and every /// new car comes with 3. Its parameters, the brake setting among them, stay. /// private void FreeTail() diff --git a/StarterNG/Views/Depot/CouplerLook.cs b/StarterNG/Views/Depot/CouplerLook.cs index 29919b4..5b733de 100644 --- a/StarterNG/Views/Depot/CouplerLook.cs +++ b/StarterNG/Views/Depot/CouplerLook.cs @@ -22,8 +22,8 @@ public enum CouplerState /// The back of the train at 0 - the simulator puts up the end signals. EndSignals, - /// The back of the train coupled to whatever stands behind it - no end signals. - CoupledBehind + /// The back of the train at anything but 0 - no end signals, and nothing else. + NoEndSignals } /// How a coupler is drawn on the consist strip, so its state reads at a glance. @@ -39,7 +39,7 @@ public static class CouplerLook { int flags = coupling.AbsFlags; if (trailing) - return flags == 0 ? CouplerState.EndSignals : CouplerState.CoupledBehind; + return flags == 0 ? CouplerState.EndSignals : CouplerState.NoEndSignals; if (flags == 0) return CouplerState.Free; if (coupling.Locked || (flags & Coupling.WorkshopLock) != 0) @@ -63,7 +63,7 @@ public static class CouplerLook CouplerState.MultipleUnit => Green, CouplerState.Permanent => Blue, CouplerState.EndSignals => Red, - CouplerState.CoupledBehind => Amber, + CouplerState.NoEndSignals => Amber, _ => null }; @@ -82,7 +82,7 @@ public static class CouplerLook { CouplerState.Free => App.Loc["CouplerFree"], CouplerState.EndSignals => App.Loc["CouplerEndSignals"], - CouplerState.CoupledBehind => string.Format(App.Loc["CouplerCoupledBehind"], connections), + CouplerState.NoEndSignals => App.Loc["CouplerNoEndSignals"], _ => string.Format(App.Loc["CouplerConnects"], connections) }; diff --git a/StarterNG/startercfg/lang/cz.xml b/StarterNG/startercfg/lang/cz.xml index 1c15353..20cbec1 100644 --- a/StarterNG/startercfg/lang/cz.xml +++ b/StarterNG/startercfg/lang/cz.xml @@ -290,7 +290,7 @@ Vozidla nejsou spojena. Spojeno: {0} Konec soupravy — simulátor vyvěsí koncovky. - Konec soupravy se spřáhne s tím, co stojí za ní ({0}) — bez koncovek. + Jiný kód než 0 na konci soupravy — simulátor nevyvěsí koncovky. Zablokováno — při posunu se nerozpojí. Klikněte pro změnu. Přidat diff --git a/StarterNG/startercfg/lang/en.xml b/StarterNG/startercfg/lang/en.xml index 68b997a..abca0bf 100644 --- a/StarterNG/startercfg/lang/en.xml +++ b/StarterNG/startercfg/lang/en.xml @@ -290,7 +290,7 @@ The vehicles are not coupled. Connected: {0} End of the train — the simulator puts up the end signals. - The end of the train couples to whatever stands behind it ({0}) — no end signals. + Anything but 0 at the back of the train — the simulator puts up no end signals. Locked — not uncoupled in shunting. Click to change. Add diff --git a/StarterNG/startercfg/lang/hu.xml b/StarterNG/startercfg/lang/hu.xml index 0cb254b..37de5f1 100644 --- a/StarterNG/startercfg/lang/hu.xml +++ b/StarterNG/startercfg/lang/hu.xml @@ -290,7 +290,7 @@ A járművek nincsenek összekapcsolva. Összekapcsolva: {0} A szerelvény vége — a szimulátor kiteszi a zárjelzőket. - A szerelvény vége összekapcsolódik a mögötte állóval ({0}) — zárjelzők nélkül. + A szerelvény végén 0-tól eltérő kód — a szimulátor nem teszi ki a zárjelzőket. Zárolva — tolatáskor nem bontható. Kattints a módosításhoz. Hozzáadás diff --git a/StarterNG/startercfg/lang/pl.xml b/StarterNG/startercfg/lang/pl.xml index 4e6a65d..4102825 100644 --- a/StarterNG/startercfg/lang/pl.xml +++ b/StarterNG/startercfg/lang/pl.xml @@ -290,7 +290,7 @@ Pojazdy nie są połączone. Połączone: {0} Koniec składu — symulator wystawi końcówki. - Koniec składu sprzęgnie się z tym, co stoi za nim ({0}) — bez końcówek. + Kod inny niż 0 na końcu składu — symulator nie wystawi końcówek. Zablokowany — nie rozprzęga się przy manewrach. Kliknij, aby zmienić. Dodaj diff --git a/StarterNG/startercfg/lang/ru.xml b/StarterNG/startercfg/lang/ru.xml index b0c32ee..fca9301 100644 --- a/StarterNG/startercfg/lang/ru.xml +++ b/StarterNG/startercfg/lang/ru.xml @@ -290,7 +290,7 @@ Вагоны не сцеплены. Соединено: {0} Хвост поезда — симулятор вывесит хвостовые сигналы. - Хвост поезда сцепится с тем, что стоит за ним ({0}) — без хвостовых сигналов. + Код, отличный от 0, в хвосте поезда — симулятор не вывесит хвостовые сигналы. Заблокирована — не расцепляется при маневрах. Нажмите, чтобы изменить. Добавить