mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-19 07:36:02 +01:00
feat: separate engine start switches for the vehicles in multiple (eu07/maszyna#80)
In vehicles like the ST43, the SP32 or the SN61 every engine of a train in
multiple has its own start and stop buttons in the cab. Until now the cab's
line breaker / engine start switch (main_sw, main_on_bt, main_off_bt) always
started and stopped the engines of all the vehicles under its control.
- .fiz, Engine: JointEngineStart=Yes|No (default Yes, as before). With No
the cab's main_* work the cab's own vehicle only, and an engine stopping on
its own (stalled, out of fuel) stops only its own vehicle instead of every
engine in the train.
- .mmd: mainb_sw, mainb_on_bt, mainb_off_bt work the second vehicle with an
engine under the cab's control, mainc_sw, mainc_on_bt, mainc_off_bt the
third one. They count along the control cable from the cab's vehicle,
behind the cab first. Like main_*, the start switch has to be held for the
vehicle's IniCDelay with the vehicle ready (MainSwitchCheck); an impulse
switch of an electric locomotive with series motors closes on release.
- New commands, added at the end of the command list: linebreakertoggleb,
linebreakeropenb, linebreakercloseb, linebreakertogglec, linebreakeropenc,
linebreakerclosec. No default keys.
- The logic is in vehicle/enginestart.{h,cpp} (core library), tested in
tests/unit/test_engine_start.cpp.
Nothing changes for existing vehicles: the new key and the new cab controls
are optional, and without them the code does what it did before.
Game data (SVN, not changed here, to be done separately; the code works
without it): for the SN61 (dynamic/pkp/sn61_v2), whose cab models already
have the buttons start02/stop02/start03/stop03,
- sn61.fiz, sn61-86.fiz, sn61_v1.fiz and the other SN61 .fiz: add
JointEngineStart=No to the Engine: line;
- sn61.mmd.inc (and the other SN61 includes): after main_on_bt add
mainb_off_bt: { stop02 mov -0.005 0 0.1 ... }
mainb_on_bt: { start02 mov -0.005 0 0.1 ... }
mainc_off_bt: { stop03 mov -0.005 0 0.1 ... }
mainc_on_bt: { start03 mov -0.005 0 0.1 ... }
with the sounds of main_off_bt / main_on_bt.
The tooltips "line breaker B" / "line breaker C" are new strings for lang/*.po.
This commit is contained in:
@@ -225,6 +225,10 @@ std::string locale::label_cab_control(std::string const &Label)
|
||||
{ "coolingfans_sw:", STRN("cooling fans") },
|
||||
{ "main_off_bt:", STRN("line breaker") },
|
||||
{ "main_on_bt:", STRN("line breaker") },
|
||||
{ "mainb_off_bt:", STRN("line breaker B") },
|
||||
{ "mainb_on_bt:", STRN("line breaker B") },
|
||||
{ "mainc_off_bt:", STRN("line breaker C") },
|
||||
{ "mainc_on_bt:", STRN("line breaker C") },
|
||||
{ "security_reset_bt:", STRN("alerter") },
|
||||
{ "shp_reset_bt:", STRN("shp") },
|
||||
{ "releaser_bt:", STRN("independent brake releaser") },
|
||||
@@ -270,6 +274,8 @@ std::string locale::label_cab_control(std::string const &Label)
|
||||
{ "converterlocal_sw:", STRN("local converter") },
|
||||
{ "converteroff_sw:", STRN("converter") },
|
||||
{ "main_sw:", STRN("line breaker") },
|
||||
{ "mainb_sw:", STRN("line breaker B") },
|
||||
{ "mainc_sw:", STRN("line breaker C") },
|
||||
{ "radio_sw:", STRN("radio") },
|
||||
{ "radiochannel_sw:", STRN("radio channel") },
|
||||
{ "radiochannelprev_sw:", STRN("radio channel") },
|
||||
|
||||
Reference in New Issue
Block a user