diff --git a/language.version b/language.version index 4d0410ade..49f05f428 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r360 \cu(Mon 22 Aug 17:39:10 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r360 \cu(2022-08-22 17:39:10)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r360 \cu(Mon 22 Aug 17:51:39 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r360 \cu(2022-08-22 17:51:39)\c-"; diff --git a/sndinfo.base b/sndinfo.base index aef6cc137..050ca6d1f 100644 --- a/sndinfo.base +++ b/sndinfo.base @@ -27,8 +27,8 @@ $limit title/explo 64 title/thump sounds/TitleThump.ogg $limit title/thump 16 -misc/secret sounds/menu/findsecret.ogg -misc/keytry sounds/menu/failuse.ogg +misc/secret sounds/CTF5.ogg +misc/keytry sounds/LOCKDOOR.ogg misc/w_pkup sounds/general/wpickup.ogg misc/w_pkup_vip sounds/general/wpickup_vip.ogg misc/p_pkup sounds/general/ppickup.ogg @@ -43,7 +43,7 @@ misc/armor_pkup sounds/general/spickup.ogg misc/health_pkup sounds/general/hpickup.ogg misc/spawn sounds/CORK.ogg misc/teleport sounds/general/teleport.ogg -misc/chat sounds/menu/chatsnd.ogg +misc/chat sounds/CHATBEEP.ogg misc/sundowner sounds/SUNDOWNER.ogg misc/emone sounds/EMONE.ogg misc/trombone sounds/SADTROMBONE.ogg @@ -59,6 +59,8 @@ misc/orbexplode sounds/ORBEXPLODE.ogg misc/omgfart sounds/omgfart.ogg misc/voice sounds/dlgvoice.ogg misc/frag sounds/GFRAG.ogg +misc/invchange sounds/INVSEL.ogg +misc/invuse sounds/INVUSE.ogg misc/gibber1 sounds/general/Gib1.ogg misc/gibber2 sounds/general/Gib2.ogg misc/gibber3 sounds/general/Gib3.ogg @@ -139,6 +141,7 @@ $pitchshift misc/p_pkup 0 $pitchshift misc/spawn 0 $pitchshift misc/teleport 0 $pitchshift misc/chat 0 +$pitchshift misc/invuse 0 $pitchshift menu/activate 0 $pitchshift menu/backup 0 $pitchshift menu/prompt 0 @@ -151,6 +154,8 @@ $pitchshift menu/clear 0 $pitchshift menu/advance 0 menu/demoopen sounds/menu/openkbase.ogg +menu/demosecret sounds/menu/findsecret.ogg +menu/demochat sounds/menu/chatsnd.ogg menu/demotab sounds/menu/menutab.ogg menu/demosel sounds/menu/menuset.ogg menu/demoscroll sounds/menu/menuscroll.ogg @@ -161,8 +166,6 @@ menu/fail sounds/menu/failuse.ogg menu/noinvuse sounds/menu/failinv.ogg menu/buyinv sounds/menu/buysnd.ogg -$alias misc/invchange menu/demosel -UseArtifact DSEMPTY StartupTick DSEMPTY world/watersplash sounds/terrain/DSSPLASH.ogg diff --git a/sounds/CHATBEEP.ogg b/sounds/CHATBEEP.ogg new file mode 100644 index 000000000..183c4052c Binary files /dev/null and b/sounds/CHATBEEP.ogg differ diff --git a/sounds/CTF5.ogg b/sounds/CTF5.ogg new file mode 100644 index 000000000..18b118b4b Binary files /dev/null and b/sounds/CTF5.ogg differ diff --git a/sounds/INVSEL.ogg b/sounds/INVSEL.ogg new file mode 100644 index 000000000..d69e0e72d Binary files /dev/null and b/sounds/INVSEL.ogg differ diff --git a/sounds/INVUSE.ogg b/sounds/INVUSE.ogg new file mode 100644 index 000000000..36ee4af6f Binary files /dev/null and b/sounds/INVUSE.ogg differ diff --git a/sounds/LOCKDOOR.ogg b/sounds/LOCKDOOR.ogg new file mode 100644 index 000000000..e0cee07b7 Binary files /dev/null and b/sounds/LOCKDOOR.ogg differ diff --git a/sounds/general/AreaName.ogg b/sounds/general/AreaName.ogg new file mode 100644 index 000000000..d3012bf09 Binary files /dev/null and b/sounds/general/AreaName.ogg differ diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc index af4c83c1f..f2385ae40 100644 --- a/zscript/hud/swwm_hudextra.zsc +++ b/zscript/hud/swwm_hudextra.zsc @@ -405,7 +405,7 @@ Class SWWMDirectMessage : HUDMessageBase { seqnum++; charcnt = 0; - if ( (seqnum > seqcnt) && !nextdirect ) S_StartSound("misc/chat",CHAN_VOICE,CHANF_UI,1.,0.); + if ( (seqnum > seqcnt) && !nextdirect ) S_StartSound("menu/demochat",CHAN_VOICE,CHANF_UI,1.,0.); else SetText(); return; } @@ -444,7 +444,7 @@ Class SWWMDirectMessage : HUDMessageBase if ( delay <= 0 ) { Console.Printf(StringTable.Localize("$SWWM_INCOMINGMSG"),chrfullname); - S_StartSound("misc/chat",CHAN_VOICE,CHANF_UI,1.,0.); + S_StartSound("menu/demochat",CHAN_VOICE,CHANF_UI,1.,0.); seqnum++; } return false; diff --git a/zscript/kbase/swwm_kbase.zsc b/zscript/kbase/swwm_kbase.zsc index a7b946d43..d06b71764 100644 --- a/zscript/kbase/swwm_kbase.zsc +++ b/zscript/kbase/swwm_kbase.zsc @@ -248,7 +248,7 @@ Class DemolitionistMenu : GenericMenu int secret = FindTabType('DemolitionistSecretTab'); if ( curtab != secret ) { - MenuSound("misc/secret"); + MenuSound("menu/demosecret"); tabs[curtab].OnDeselect(); curtab = secret; tabs[curtab].OnSelect();