diff --git a/game/neo/resource/ClientScheme.res b/game/neo/resource/ClientScheme.res index 336ec0926..c3f9b7d57 100644 --- a/game/neo/resource/ClientScheme.res +++ b/game/neo/resource/ClientScheme.res @@ -1136,19 +1136,6 @@ Scheme "additive" "1" } } - - "HL2MPTypeDeath" - { - "1" - { - "name" "HL2MP" // csd.ttf - "tall" "32" - "weight" "0" - "additive" "1" - "antialias" "1" - "custom" "1" [$OSX] - } - } NHudText { "1" @@ -3192,20 +3179,19 @@ Scheme CustomFontFiles { "1" "resource/HALFLIFE2.ttf" - "2" "resource/HL2MP.ttf" - "3" "resource/HL2crosshairs.ttf" - "4" "resource/cs.ttf" - "5" "resource/csd.ttf" - "6" "resource/Cstrike.ttf" - "7" "resource/x-scale_.ttf" - "8" "resource/greenm03.ttf" - "9" "resource/zrnic___.ttf" - "10" "resource/AFL.ttf" - "11" "resource/nocr.ttf" - "12" "resource/neuropol2.ttf" - "13" "resource/neotokyo_press_n.ttf" - "14" "resource/killfeedicons.ttf" - "15" "resource/montserrat-regular.ttf" + "2" "resource/HL2crosshairs.ttf" + "3" "resource/cs.ttf" + "4" "resource/csd.ttf" + "5" "resource/Cstrike.ttf" + "6" "resource/x-scale_.ttf" + "7" "resource/greenm03.ttf" + "8" "resource/zrnic___.ttf" + "9" "resource/AFL.ttf" + "10" "resource/nocr.ttf" + "11" "resource/neuropol2.ttf" + "12" "resource/neotokyo_press_n.ttf" + "13" "resource/killfeedicons.ttf" + "14" "resource/montserrat-regular.ttf" } } diff --git a/game/neo/scripts/game_sounds_player.txt b/game/neo/scripts/game_sounds_player.txt new file mode 100644 index 000000000..978ef6ed9 --- /dev/null +++ b/game/neo/scripts/game_sounds_player.txt @@ -0,0 +1,317 @@ +"NeoPlayer.GhostPing" +{ + "volume" "VOL_NORM" + "soundlevel" "SNDLVL_75dB" + "wave" "^gameplay/ghost_ping.wav" +} + +"NeoPlayer.ThermOpticOn" +{ + "channel" "CHAN_ITEM" + "volume" "0.7" + "soundlevel" "SNDLVL_75dB" + + "wave" "^player/therm_on.wav" +} + +"NeoPlayer.ThermOpticOff" +{ + "channel" "CHAN_ITEM" + "volume" "0.7" + "soundlevel" "SNDLVL_75dB" + + "wave" "^player/therm_off.wav" +} + +"NeoPlayer.VisionOn" +{ + "channel" "CHAN_ITEM" + "volume" "VOL_NORM" + "soundlevel" "SNDLVL_75dB" + + "wave" "player/vision_on.wav" +} + + +"HL2Player.SprintNoPower" +{ + "channel" "CHAN_VOICE" + "volume" "0.8" + "soundlevel" "SNDLVL_60dB" + + "wave" "player/suit_denydevice.wav" +} + +"HL2Player.SprintStart" +{ + "channel" "CHAN_VOICE" + "volume" "0.9" + "soundlevel" "SNDLVL_60dB" + + "wave" "player/suit_sprint.wav" +} + +"HL2Player.FlashLightOn" +{ + "channel" "CHAN_WEAPON" + "volume" "0.8" + "soundlevel" "SNDLVL_75dB" + "pitch" "PITCH_NORM" + + "wave" "items/flashlight1.wav" +} + +"HL2Player.FlashLightOff" +{ + "channel" "CHAN_WEAPON" + "volume" "0.8" + "soundlevel" "SNDLVL_75dB" + "pitch" "PITCH_NORM" + + "wave" "items/flashlight1.wav" +} + +"HL2Player.PickupWeapon" +{ + "channel" "CHAN_ITEM" + "volume" "0.8" + "soundlevel" "SNDLVL_75dB" + + "wave" "items/ammo_pickup.wav" +} + +"HL2Player.TrainUse" +{ + "channel" "CHAN_ITEM" + "volume" "0.8" + "soundlevel" "SNDLVL_75dB" + + "wave" "plats/train_use1.wav" +} + +"HL2Player.Use" +{ + "channel" "CHAN_ITEM" + "volume" "0.4" + "soundlevel" "SNDLVL_75dB" + + "wave" "common/wpn_select.wav" +} + +"HL2Player.UseNPC" +{ + "channel" "CHAN_ITEM" + "volume" "0.4" + "soundlevel" "SNDLVL_75dB" + + "wave" "common/wpn_select.wav" +} + +"HL2Player.UseDeny" +{ + "channel" "CHAN_ITEM" + "volume" "0.4" + "soundlevel" "SNDLVL_75dB" + + "wave" "common/wpn_denyselect.wav" +} + +"HL2Player.BurnPain" +{ + "channel" "CHAN_VOICE" + "volume" "0.5" + "soundlevel" "SNDLVL_75dB" + + "rndwave" + { + "wave" "player/pl_burnpain1.wav" + "wave" "player/pl_burnpain2.wav" + "wave" "player/pl_burnpain3.wav" + } +} + + +// SHARED player sounds + +"Player.Death" +{ + "channel" "CHAN_VOICE" + "volume" "0.8" + "soundlevel" "SNDLVL_75dB" + + "rndwave" + { + "wave" "player/pl_pain5.wav" + "wave" "player/pl_pain6.wav" + "wave" "player/pl_pain7.wav" + } +} + +"Player.PlasmaDamage" +{ + "channel" "CHAN_BODY" + "volume" "0.5" + "soundlevel" "SNDLVL_75dB" + + "wave" "player/general/flesh_burn.wav" +} + +"Player.SonicDamage" +{ + "channel" "CHAN_BODY" + "volume" "0.7" + "soundlevel" "SNDLVL_75dB" + + "rndwave" + { + "wave" "player/pl_pain5.wav" + "wave" "player/pl_pain6.wav" + "wave" "player/pl_pain7.wav" + } +} + +"Player.DrownStart" +{ + "channel" "CHAN_VOICE" + "volume" "1.0" + "soundlevel" "SNDLVL_75dB" + "pitch" "90,110" + + "wave" "player/pl_drown1.wav" +} + +"Player.Swim" +{ + "channel" "CHAN_STATIC" + "volume" "0.5" + "pitch" "PITCH_NORM" + "soundlevel" "SNDLVL_NORM" + + "rndwave" + { + "wave" "player/footsteps/wade5.wav" + "wave" "player/footsteps/wade6.wav" + "wave" "player/footsteps/wade7.wav" + "wave" "player/footsteps/wade8.wav" + } +} + +"Player.FallDamage" +{ + "channel" "CHAN_AUTO" + "volume" "0.75" + "pitch" "90,110" + "soundlevel" "SNDLVL_NORM" + + "rndwave" + { + "wave" "player/pl_fallpain1.wav" + "wave" "player/pl_fallpain3.wav" + } +} + +"Player.FallGib" +{ + "channel" "CHAN_ITEM" + "volume" "0.75" + "pitch" "90,110" + "soundlevel" "SNDLVL_NORM" + + "rndwave" + { + "wave" "physics/body/body_medium_break2.wav" + } +} + +"Player.DrownContinue" +{ + "channel" "CHAN_VOICE" + "volume" "1.0" + "soundlevel" "SNDLVL_75dB" + "pitch" "90,110" + + "rndwave" + { + "wave" "player/pl_drown1.wav" + "wave" "player/pl_drown2.wav" + "wave" "player/pl_drown3.wav" + } +} + +"Player.Wade" +{ + "channel" "CHAN_BODY" + "volume" "0.25" + "soundlevel" "SNDLVL_75dB" + + "rndwave" + { + "wave" "player/footsteps/wade5.wav" + "wave" "player/footsteps/wade6.wav" + "wave" "player/footsteps/wade7.wav" + "wave" "player/footsteps/wade8.wav" + } +} + +"Player.AmbientUnderWater" +{ + "channel" "CHAN_STATIC" + "volume" "0.22" + "soundlevel" "SNDLVL_75dB" + + "wave" "ambient/water/underwater.wav" +} + +"Player.UseTrain" +{ + "channel" "CHAN_ITEM" + "volume" "0.8" + "soundlevel" "SNDLVL_75dB" + + "wave" "plats/train_use1.wav" +} + +"Player.UseDeny" +{ + "channel" "CHAN_ITEM" + "volume" "0.4" + "soundlevel" "SNDLVL_75dB" + + "wave" "common/wpn_select.wav" +} + +"Player.PickupWeapon" +{ + "channel" "CHAN_ITEM" + "volume" "0.8" + "soundlevel" "SNDLVL_75dB" + "pitch" "95,105" + "wave" "items/ammo_pickup.wav" +} + + +"Geiger.BeepLow" +{ + "channel" "CHAN_STATIC" + "soundlevel" "SNDLVL_NONE" + "pitch" "PITCH_NORM" + + "rndwave" + { + "wave" "player/geiger1.wav" + "wave" "player/geiger2.wav" + } +} + +"Geiger.BeepHigh" +{ + "channel" "CHAN_STATIC" + "soundlevel" "SNDLVL_NONE" + "pitch" "PITCH_NORM" + + "rndwave" + { + "wave" "player/geiger2.wav" + "wave" "player/geiger3.wav" + } +} diff --git a/game/neo/scripts/mod_textures.txt b/game/neo/scripts/mod_textures.txt index fb5334f8e..3479d785d 100644 --- a/game/neo/scripts/mod_textures.txt +++ b/game/neo/scripts/mod_textures.txt @@ -138,76 +138,6 @@ "width" "32" "height" "16" } - "death_357" - { - "font" "HL2MPTypeDeath" - "character" "." - } - "death_ar2" - { - "font" "HL2MPTypeDeath" - "character" "2" - } - "death_crossbow_bolt" - { - "font" "HL2MPTypeDeath" - "character" "1" - } - "death_smg1" - { - "font" "HL2MPTypeDeath" - "character" "/" - } - "death_shotgun" - { - "font" "HL2MPTypeDeath" - "character" "0" - } - "death_rpg_missile" - { - "font" "HL2MPTypeDeath" - "character" "3" - } - "death_grenade_frag" - { - "font" "HL2MPTypeDeath" - "character" "4" - } - "death_pistol" - { - "font" "HL2MPTypeDeath" - "character" "-" - } - "death_physics" - { - "font" "HL2MPTypeDeath" - "character" "9" - } - "death_combine_ball" - { - "font" "HL2MPTypeDeath" - "character" "8" - } - "death_smg1_grenade" - { - "font" "HL2MPTypeDeath" - "character" "7" - } - "death_stunstick" - { - "font" "HL2MPTypeDeath" - "character" "!" - } - "death_slam" - { - "font" "HL2MPTypeDeath" - "character" "*" - } - "death_crowbar" - { - "font" "HL2MPTypeDeath" - "character" "6" - } "voice_player" { "file" "voice/icntlk_sv" diff --git a/src/game/server/neo/neo_client.cpp b/src/game/server/neo/neo_client.cpp index d1e6b3b16..24d81fade 100644 --- a/src/game/server/neo/neo_client.cpp +++ b/src/game/server/neo/neo_client.cpp @@ -327,10 +327,6 @@ void Precache_NEO_Sounds( void ) CBaseEntity::PrecacheScriptSound("NeoPlayer.ThermOpticOn"); CBaseEntity::PrecacheScriptSound("NeoPlayer.ThermOpticOff"); CBaseEntity::PrecacheScriptSound("NeoPlayer.VisionOn"); - CBaseEntity::PrecacheScriptSound("Victory.Draw"); - CBaseEntity::PrecacheScriptSound("Victory.Jinrai"); - CBaseEntity::PrecacheScriptSound("Victory.NSF"); - } //----------------------------------------------------------------------------- diff --git a/src/game/server/neo/neo_player.cpp b/src/game/server/neo/neo_player.cpp index 3d6c42f6d..c73ac28e9 100644 --- a/src/game/server/neo/neo_player.cpp +++ b/src/game/server/neo/neo_player.cpp @@ -4007,7 +4007,7 @@ void CNEO_Player::SpawnJuggernautPostDeath() { EmitSound_t soundParams; soundParams.m_pSoundName = "HUD.GhostPickUp"; - soundParams.m_nChannel = CHAN_USER_BASE; + soundParams.m_nChannel = CHAN_GHOST_PICKUP; soundParams.m_bWarnOnDirectWaveReference = false; soundParams.m_bEmitCloseCaption = false; soundParams.m_SoundLevel = ATTN_TO_SNDLVL(ATTN_NONE); diff --git a/src/game/shared/neo/neo_gamerules.cpp b/src/game/shared/neo/neo_gamerules.cpp index 0ddbbb19a..abe3d98ed 100644 --- a/src/game/shared/neo/neo_gamerules.cpp +++ b/src/game/shared/neo/neo_gamerules.cpp @@ -1528,7 +1528,7 @@ void CNEORules::Think(void) EmitSound_t soundParams; soundParams.m_pSoundName = "HUD.GhostPickUp"; - soundParams.m_nChannel = CHAN_USER_BASE; + soundParams.m_nChannel = CHAN_GHOST_PICKUP; soundParams.m_bWarnOnDirectWaveReference = false; soundParams.m_bEmitCloseCaption = false; soundParams.m_SoundLevel = ATTN_TO_SNDLVL(ATTN_NONE); diff --git a/src/public/SoundParametersInternal.cpp b/src/public/SoundParametersInternal.cpp index e2c605fec..4469650f4 100644 --- a/src/public/SoundParametersInternal.cpp +++ b/src/public/SoundParametersInternal.cpp @@ -34,6 +34,14 @@ static SoundChannels g_pChannelNames[] = { CHAN_STREAM, "CHAN_STREAM" }, { CHAN_STATIC, "CHAN_STATIC" }, { CHAN_VOICE2, "CHAN_VOICE2" }, +#ifdef NEO + // Sadly we can't use these in soundscripts directly, + // because the lookup is baked to the closed-source + // soundemittersystem dll's version of this array... :-( + { CHAN_VOICE_BASE, "CHAN_VOICE_BASE" }, + { CHAN_USER_BASE, "CHAN_USER_BASE" }, + { CHAN_GHOST_PICKUP, "CHAN_GHOST_PICKUP" }, +#endif }; struct VolumeLevel