Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 13 additions & 27 deletions game/neo/resource/ClientScheme.res
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
}

}
317 changes: 317 additions & 0 deletions game/neo/scripts/game_sounds_player.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,317 @@
"NeoPlayer.GhostPing"
{
"volume" "VOL_NORM"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it normal/expected that there is no "channel" field like the other entries? Is the default value expected?

"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"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given there is only one option here, would it make sense to remove the rndwave and just set wave directly?

"Player.FallGib"
{
    "channel"    "CHAN_ITEM"
    "volume"     "0.75"
    "pitch"      "90,110"
    "soundlevel" "SNDLVL_NORM"
    "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"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to sanity check, but should this be

"wave"  "common/wpn_denyselect.wav"

?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are imported verbatim from the OGNT scripts/game_sounds_player.txt - I don't know. I guess I can look into where this file is used.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it's arguably parity. Feel free to resolve this thread if we want to look into changes in a separate PR.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it's arguably parity. Feel free to resolve this thread if we want to look into changes in a separate PR.

I'm swamped currently but I'll try and make time to get this resolved some time next week. I think it's reasonable to follow up on before merging this to make sure we get this right in a single PR.

}

"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"
}
}
Loading
Loading