From 392d9e7b6aad95a6caae000449ef1726480fb420 Mon Sep 17 00:00:00 2001 From: maj00r Date: Fri, 4 Sep 2026 23:34:29 +0200 Subject: [PATCH] Give the consist state its own section, drop the maximum amount button The ready-to-go box was sitting under a heading about cargo. --- StarterNG/Domain/Cargo.cs | 6 ------ StarterNG/Views/Depot/VehicleDetails.cs | 7 +++---- StarterNG/startercfg/lang/cz.xml | 1 - StarterNG/startercfg/lang/en.xml | 1 - StarterNG/startercfg/lang/hu.xml | 1 - StarterNG/startercfg/lang/pl.xml | 1 - StarterNG/startercfg/lang/ru.xml | 1 - 7 files changed, 3 insertions(+), 15 deletions(-) diff --git a/StarterNG/Domain/Cargo.cs b/StarterNG/Domain/Cargo.cs index 0b2c76a..4584bc5 100644 --- a/StarterNG/Domain/Cargo.cs +++ b/StarterNG/Domain/Cargo.cs @@ -117,12 +117,6 @@ public sealed class Cargo } } - public void MaxAmounts(IReadOnlyList consist) - { - foreach (var c in consist.SelectMany(u => u.Cars)) - FillToMax(c); - } - public void RandomAmounts(IReadOnlyList consist) { foreach (var c in consist.SelectMany(u => u.Cars)) diff --git a/StarterNG/Views/Depot/VehicleDetails.cs b/StarterNG/Views/Depot/VehicleDetails.cs index 4527826..f621207 100644 --- a/StarterNG/Views/Depot/VehicleDetails.cs +++ b/StarterNG/Views/Depot/VehicleDetails.cs @@ -559,12 +559,10 @@ public sealed class VehicleDetails var tools = Stack( LoadToolButton(App.Loc["ConsistRandomType"], () => { _cargo.RandomTypes(_consist); _redraw(); }, secondary: true), - LoadToolButton(App.Loc["ConsistMaxAmount"], - () => { _cargo.MaxAmounts(_consist); _redraw(); }, secondary: true), LoadToolButton(App.Loc["ConsistRandomAmount"], () => { _cargo.RandomAmounts(_consist); _redraw(); }, secondary: true)); - var buttons = Stack(ReadyToGoRow(), tools); + var buttons = tools; var count = new TextBlock { @@ -574,7 +572,8 @@ public sealed class VehicleDetails VerticalAlignment = VerticalAlignment.Center }; - loadsPanel.Children.Add(Section(App.Loc["ConsistLoadTools"], buttons, count)); + loadsPanel.Children.Add(Section(App.Loc["Consist"], ReadyToGoRow(), count)); + loadsPanel.Children.Add(Section(App.Loc["ConsistLoadTools"], buttons)); } private Control ReadyToGoRow() diff --git a/StarterNG/startercfg/lang/cz.xml b/StarterNG/startercfg/lang/cz.xml index 9332368..5c95d84 100644 --- a/StarterNG/startercfg/lang/cz.xml +++ b/StarterNG/startercfg/lang/cz.xml @@ -223,7 +223,6 @@ Always ready Overridden by "Force the consist state on launch" in Settings. Náhodný druh - Maximální množství Náhodné množství Nastavit Délka diff --git a/StarterNG/startercfg/lang/en.xml b/StarterNG/startercfg/lang/en.xml index 2886e96..36f7335 100644 --- a/StarterNG/startercfg/lang/en.xml +++ b/StarterNG/startercfg/lang/en.xml @@ -223,7 +223,6 @@ Always ready Overridden by "Force the consist state on launch" in Settings. Random type - Maximum amount Random amount Set Length diff --git a/StarterNG/startercfg/lang/hu.xml b/StarterNG/startercfg/lang/hu.xml index d25ded6..b05ebd4 100644 --- a/StarterNG/startercfg/lang/hu.xml +++ b/StarterNG/startercfg/lang/hu.xml @@ -223,7 +223,6 @@ Always ready Overridden by "Force the consist state on launch" in Settings. Véletlen típus - Legnagyobb mennyiség Véletlen mennyiség Beállítás Hossz diff --git a/StarterNG/startercfg/lang/pl.xml b/StarterNG/startercfg/lang/pl.xml index 80405e7..77e280b 100644 --- a/StarterNG/startercfg/lang/pl.xml +++ b/StarterNG/startercfg/lang/pl.xml @@ -223,7 +223,6 @@ Zawsze gotowy Nadpisane opcją „Wymuś stan składu przy starcie” w Ustawieniach. Losowy rodzaj - Maksymalna ilość Losowa ilość Ustaw Długość diff --git a/StarterNG/startercfg/lang/ru.xml b/StarterNG/startercfg/lang/ru.xml index fbda204..9c4aed0 100644 --- a/StarterNG/startercfg/lang/ru.xml +++ b/StarterNG/startercfg/lang/ru.xml @@ -223,7 +223,6 @@ Always ready Overridden by "Force the consist state on launch" in Settings. Случайный тип - Максимальное количество Случайное количество Задать Длина