3
0
Fork 0

Update to SVN revision 1182

- Neuer Luftbremse Sound für D - F79
- neuer Lüftersound für den Fahrerstand im F90
- kleine Scriptanpassungen
main
tommy 2024-04-01 17:27:47 +00:00 committed by SVN Bot
parent d4ecceaf82
commit 77b2038647
35 changed files with 77 additions and 12 deletions

View File

@ -1929,7 +1929,7 @@ soundscript
ambient 0
attachment "a.train_brake_lever"
nostartdelay 1
priority 10
priority 1000
trigger "luftbremse"
volume 1.0
@ -1938,6 +1938,51 @@ soundscript
0 "sound/luftbr.wav"
}
}
luefter_an
{
repeat-delay 0.1,0.1
distance 2,3
attachment "a.main"
nostartdelay 1
priority 1000
trigger "luefter_an"
volume 0.75
sound
{
0 "sound/luefter_an.wav"
}
}
luefter
{
repeat-delay 0,0
distance 2,3
attachment "a.main"
nostartdelay 1
priority 1000
trigger "luefter"
volume 0.75
sound
{
0 "sound/luefter.wav"
}
}
luefter_aus
{
repeat-delay 0.1,0.1
distance 2,3
attachment "a.main"
nostartdelay 1
priority 1000
trigger "luefter_aus"
volume 0.75
sound
{
0 "sound/luefter_aus.wav"
}
}
}
kuid-table

View File

@ -32,6 +32,7 @@ class F84Cabin isclass UBahnCabinDF
bool OldMelde = false;
bool OldLight = false;
int OldMoving = 0; //1: wenig, 2: normal, 3: ruckt wie sau!
bool LuefterRunning = false;
thread void Scheibenwischer( void )
{
@ -53,6 +54,23 @@ class F84Cabin isclass UBahnCabinDF
isScheibenwischer = false;
}
thread void Luefter( void )
{
UBahnTriebwagen MyUBahnWagen = cast<UBahnTriebwagen>loco;
LuefterRunning = true;
PlaySoundScriptEvent("luefter_an");
Sleep(15.732);
while( MyUBahnWagen.luefter )
{
PlaySoundScriptEvent("luefter");
Sleep(0.1);
}
StopSoundScriptEvent("luefter");
PlaySoundScriptEvent("luefter_aus");
LuefterRunning = false;
}
//################################################################################
//################################################################################
//
@ -210,6 +228,8 @@ class F84Cabin isclass UBahnCabinDF
// Sounds:
//################################################################################
if( MyUBahnWagen.luefter and !LuefterRunning )
Luefter();
//################################################################################
// Fehler:

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
1181
1182

View File

@ -154,7 +154,7 @@ class UBahnTriebwagen_Typ_F84 isclass UBahnTriebwagenStd
soundstufe = soundstufe + 1;
if ((soundstufe == 1) and (MyAbsVelocityKMH() < 10.0))
{
if ((stufe > 2) and (MyAbsVelocityKMH() < 1.0) and ((GetMyTrain().GetVehicles()[GetMyTrain().GetVehicles().size()-1] == me) or isFirstOrLast and LZBAutomatik))
if ((stufe > 2) and (MyAbsVelocityKMH() < 1.0) and ((GetMyTrain().GetVehicles()[GetMyTrain().GetVehicles().size()-1] == me) or isFirstOrLast and IsExternalView()))
World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Alt_F8487/Anfahren.wav", 1000.0, 20.0, 200.0, me, "a.doors");
Sleep( Math.Rand(0.0f, 0.4f) );

View File

@ -154,7 +154,7 @@ class UBahnTriebwagen_Typ_F87 isclass UBahnTriebwagenStd
soundstufe = soundstufe + 1;
if ((soundstufe == 1) and (MyAbsVelocityKMH() < 10.0))
{
if ((stufe > 2) and (MyAbsVelocityKMH() < 1.0) and ((GetMyTrain().GetVehicles()[GetMyTrain().GetVehicles().size()-1] == me) or isFirstOrLast and LZBAutomatik))
if ((stufe > 2) and (MyAbsVelocityKMH() < 1.0) and ((GetMyTrain().GetVehicles()[GetMyTrain().GetVehicles().size()-1] == me) or isFirstOrLast and IsExternalView()))
World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Alt_F8487/Anfahren.wav", 1000.0, 20.0, 200.0, me, "a.doors");
Sleep( Math.Rand(0.0f, 0.4f) );

View File

@ -56,22 +56,22 @@ class UBahnTriebwagen_Typ_F9X isclass UBahnTriebwagenStd
{
if( !soundluefter )
{
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_ein.wav", 1.0, 10.0, 60.0, me, "a.doors")-1.0f);
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_ein.wav", 1.0, 6.0 + (BoolToInt(IsExternalView()) * 4), 6.5 + (BoolToInt(IsExternalView()) * 53.5), me, "a.doors")-1.0f);
soundluefter = true;
}
else
{
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_run.wav", 1.0, 10.0, 60.0, me, "a.doors")-1.0f);
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_run.wav", 1.0, 6.0 + (BoolToInt(IsExternalView()) * 4), 6.5 + (BoolToInt(IsExternalView()) * 53.5), me, "a.doors")-1.0f);
}
}
else if( soundluefter )
{
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_aus.wav", 1.0, 10.0, 60.0, me, "a.doors")-1.0f);
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_aus.wav", 1.0, 6.0 + (BoolToInt(IsExternalView()) * 4), 6.5 + (BoolToInt(IsExternalView()) * 53.5), me, "a.doors")-1.0f);
soundluefter = false;
}
else
{
Sleep( 3.0f );
Sleep( soundintervall*2 );
}
}
else
@ -80,22 +80,22 @@ class UBahnTriebwagen_Typ_F9X isclass UBahnTriebwagenStd
{
if( !soundluefter )
{
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_ein2.wav", 1.0, 10.0, 60.0, me, "a.doors")-1.0f);
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_ein2.wav", 1.0, 6.0 + (BoolToInt(IsExternalView()) * 4), 6.5 + (BoolToInt(IsExternalView()) * 53.5), me, "a.doors")-1.0f);
soundluefter = true;
}
else
{
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_run2.wav", 1.0, 10.0, 60.0, me, "a.doors")-1.0f);
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_run2.wav", 1.0, 6.0 + (BoolToInt(IsExternalView()) * 4), 6.5 + (BoolToInt(IsExternalView()) * 53.5), me, "a.doors")-1.0f);
}
}
else if( soundluefter )
{
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_aus2.wav", 1.0, 10.0, 60.0, me, "a.doors")-1.0f);
Sleep(World.PlaySound( GetAsset().FindAsset ("sound_engine"), "sound/Luefter_aus2.wav", 1.0, 6.0 + (BoolToInt(IsExternalView()) * 4), 6.5 + (BoolToInt(IsExternalView()) * 53.5), me, "a.doors")-1.0f);
soundluefter = false;
}
else
{
Sleep( 3.0f );
Sleep( soundintervall*2 );
}
}
}