mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-23 00:29:19 +02:00
build 200124. scenario parameters control sliders, material reload support, material opacity driven translucent geometry alpha test, command keyboard mapping tooltip hints, camshaft logic tweak, motor connector logic tweak, ai power use logic tweak, ai pantograph control logic tweak, converter sound pitch fix. additional cab control localization
This commit is contained in:
tmj-fstate
@@ -170,13 +170,13 @@ enum class range_t {
|
||||
};
|
||||
// possible settings of enable/disable input pair; exclusive
|
||||
enum class operation_t {
|
||||
enable_on = 1,
|
||||
enable_off = -1,
|
||||
disable_on = 2,
|
||||
disable_off = -2,
|
||||
none = 0,
|
||||
enable,
|
||||
disable,
|
||||
enable_on,
|
||||
enable_off,
|
||||
disable_on,
|
||||
disable_off,
|
||||
};
|
||||
// start method for devices; exclusive
|
||||
enum class start_t {
|
||||
@@ -1380,6 +1380,7 @@ public:
|
||||
bool Mains = false; /*polozenie glownego wylacznika*/
|
||||
double MainsInitTime{ 0.0 }; // config, initialization time (in seconds) of the main circuit after it receives power, before it can be closed
|
||||
double MainsInitTimeCountdown{ 0.0 }; // current state of main circuit initialization, remaining time (in seconds) until it's ready
|
||||
bool LineBreakerClosesAtNoPowerPosOnly{ false };
|
||||
int MainCtrlPos = 0; /*polozenie glownego nastawnika*/
|
||||
int ScndCtrlPos = 0; /*polozenie dodatkowego nastawnika*/
|
||||
int LightsPos = 0; /*polozenie przelacznika wielopozycyjnego swiatel*/
|
||||
|
||||
@@ -3193,6 +3193,7 @@ void TMoverParameters::MainSwitch_( bool const State ) {
|
||||
&& ( true == NoVoltRelay )
|
||||
&& ( true == OvervoltageRelay )
|
||||
&& ( LastSwitchingTime > CtrlDelay )
|
||||
&& ( HasCamshaft ? IsMainCtrlActualNoPowerPos() : ( LineBreakerClosesAtNoPowerPosOnly ? IsMainCtrlNoPowerPos() : true ) )
|
||||
&& ( false == TestFlag( DamageFlag, dtrain_out ) )
|
||||
&& ( false == TestFlag( EngDmgFlag, 1 ) ) ) ) {
|
||||
|
||||
@@ -5086,8 +5087,12 @@ double TMoverParameters::TractionForce( double dt ) {
|
||||
|
||||
case TEngineType::DieselElectric: {
|
||||
// TODO: move this to the auto relay check when the electric engine code paths are unified
|
||||
StLinFlag = MotorConnectorsCheck();
|
||||
StLinFlag &= IsMainCtrlNoPowerPos();
|
||||
StLinFlag &= MotorConnectorsCheck();
|
||||
StLinFlag |= (
|
||||
( MainCtrlActualPos == 0 )
|
||||
&& ( TrainType != dt_EZT ?
|
||||
MainCtrlPowerPos() == 1 :
|
||||
MainCtrlPowerPos() > 0 ) );
|
||||
|
||||
break;
|
||||
}
|
||||
@@ -6145,12 +6150,14 @@ bool TMoverParameters::AutoRelayCheck(void)
|
||||
bool OK = false; // b:int;
|
||||
bool ARC = false;
|
||||
|
||||
auto const motorconnectors { MotorConnectorsCheck() };
|
||||
auto const motorconnectorsoff { false == MotorConnectorsCheck() };
|
||||
|
||||
// Ra 2014-06: dla SN61 nie działa prawidłowo
|
||||
// yBARC - rozlaczenie stycznikow liniowych
|
||||
if( ( false == motorconnectors )
|
||||
|| ( HasCamshaft ? IsMainCtrlActualNoPowerPos() : IsMainCtrlNoPowerPos() ) ) {
|
||||
if( ( motorconnectorsoff )
|
||||
|| ( HasCamshaft ?
|
||||
IsMainCtrlActualNoPowerPos() :
|
||||
IsMainCtrlNoPowerPos() ) ) {
|
||||
StLinFlag = false;
|
||||
OK = false;
|
||||
if( false == DynamicBrakeFlag ) {
|
||||
@@ -6329,7 +6336,12 @@ bool TMoverParameters::AutoRelayCheck(void)
|
||||
{
|
||||
OK = false;
|
||||
// ybARC - zalaczenie stycznikow liniowych
|
||||
if( true == motorconnectors ) {
|
||||
if( ( false == motorconnectorsoff )
|
||||
&& ( MainCtrlActualPos == 0 )
|
||||
&& ( ( TrainType == dt_EZT || HasCamshaft ) ?
|
||||
MainCtrlPowerPos() > 0 :
|
||||
MainCtrlPowerPos() == 1 ) ) {
|
||||
|
||||
DelayCtrlFlag = true;
|
||||
if( LastRelayTime >= InitialCtrlDelay ) {
|
||||
StLinFlag = true;
|
||||
@@ -6339,14 +6351,15 @@ bool TMoverParameters::AutoRelayCheck(void)
|
||||
OK = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
else {
|
||||
DelayCtrlFlag = false;
|
||||
}
|
||||
|
||||
if( ( false == StLinFlag )
|
||||
&& ( ( MainCtrlActualPos > 0 )
|
||||
|| ( ScndCtrlActualPos > 0 ) ) ) {
|
||||
|
||||
if( CoupledCtrl ) {
|
||||
if( CoupledCtrl || HasCamshaft ) {
|
||||
|
||||
if( TrainType == dt_EZT ) {
|
||||
// EN57 wal jednokierunkowy calosciowy
|
||||
@@ -6380,7 +6393,8 @@ bool TMoverParameters::AutoRelayCheck(void)
|
||||
else {
|
||||
// wal kulakowy dwukierunkowy
|
||||
if( LastRelayTime > CtrlDownDelay ) {
|
||||
if( ScndCtrlActualPos > 0 ) {
|
||||
if( ( CoupledCtrl )
|
||||
&& ( ScndCtrlActualPos > 0 ) ) {
|
||||
--ScndCtrlActualPos;
|
||||
SetFlag( SoundFlag, sound::shuntfield );
|
||||
}
|
||||
@@ -6421,16 +6435,7 @@ bool TMoverParameters::MotorConnectorsCheck() {
|
||||
|| ( true == StLinSwitchOff )
|
||||
|| ( DirActive == 0 ) };
|
||||
|
||||
if( connectorsoff ) { return false; }
|
||||
|
||||
auto const connectorson {
|
||||
( true == StLinFlag )
|
||||
|| ( ( MainCtrlActualPos == 0 )
|
||||
&& ( ( TrainType != dt_EZT ?
|
||||
MainCtrlPowerPos() == 1 :
|
||||
MainCtrlPowerPos() > 0 ) ) ) };
|
||||
|
||||
return connectorson;
|
||||
return ( false == connectorsoff );
|
||||
}
|
||||
|
||||
bool TMoverParameters::OperatePantographsValve( operation_t const State, range_t const Notify ) {
|
||||
@@ -6439,8 +6444,15 @@ bool TMoverParameters::OperatePantographsValve( operation_t const State, range_t
|
||||
|
||||
auto &valve { PantsValve };
|
||||
|
||||
valve.is_enabled = ( State == operation_t::enable );
|
||||
valve.is_disabled = ( State == operation_t::disable );
|
||||
switch( State ) {
|
||||
case operation_t::none: { valve.is_enabled = false; valve.is_disabled = false; break; }
|
||||
case operation_t::enable: { valve.is_enabled = true; valve.is_disabled = false; break; }
|
||||
case operation_t::disable: { valve.is_enabled = false; valve.is_disabled = true; break; }
|
||||
case operation_t::enable_on: { valve.is_enabled = true; break; }
|
||||
case operation_t::enable_off: { valve.is_enabled = false; break; }
|
||||
case operation_t::disable_on: { valve.is_disabled = true; break; }
|
||||
case operation_t::disable_off: { valve.is_disabled = false; break; }
|
||||
}
|
||||
|
||||
if( Notify != range_t::local ) {
|
||||
SendCtrlToNext(
|
||||
@@ -6458,9 +6470,16 @@ bool TMoverParameters::OperatePantographsValve( operation_t const State, range_t
|
||||
bool TMoverParameters::OperatePantographValve( end const End, operation_t const State, range_t const Notify ) {
|
||||
|
||||
auto &valve { Pantographs[ End ].valve };
|
||||
|
||||
valve.is_enabled = ( State == operation_t::enable );
|
||||
valve.is_disabled = ( State == operation_t::disable );
|
||||
|
||||
switch( State ) {
|
||||
case operation_t::none: { valve.is_enabled = false; valve.is_disabled = false; break; }
|
||||
case operation_t::enable: { valve.is_enabled = true; valve.is_disabled = false; break; }
|
||||
case operation_t::disable: { valve.is_enabled = false; valve.is_disabled = true; break; }
|
||||
case operation_t::enable_on: { valve.is_enabled = true; break; }
|
||||
case operation_t::enable_off: { valve.is_enabled = false; break; }
|
||||
case operation_t::disable_on: { valve.is_disabled = true; break; }
|
||||
case operation_t::disable_off: { valve.is_disabled = false; break; }
|
||||
}
|
||||
|
||||
if( Notify != range_t::local ) {
|
||||
SendCtrlToNext(
|
||||
|
||||
Reference in New Issue
Block a user