diff --git a/language.def_voice b/language.def_voice index 74c4feaa5..86178a317 100644 --- a/language.def_voice +++ b/language.def_voice @@ -271,7 +271,7 @@ SWWM_SUBS_DEFAULT_KORAXMASTERS9 = "Urgh... Please just shut the fuck up."; /// Extra lines that wouldn't be possible without original voice acting // per-weapon lines (alternative) SWWM_SUBS_DEFAULT_GETDEEPIMPACT = "I'll huff and I'll puff... and I'll blow your house in."; -SWWM_SUBS_DEFAULT_GETPUSHERWEAPON = "Someone wants their cavities removed?"; +SWWM_SUBS_DEFAULT_GETPUSHERWEAPON = "Anyone wants their cavities removed?"; SWWM_SUBS_DEFAULT_GETEXPLODIUMGUN1 = "Ah, my trusty old friend."; SWWM_SUBS_DEFAULT_GETEXPLODIUMGUN2 = "Twice the knee-exploding power."; SWWM_SUBS_DEFAULT_GETSPREADGUN = "Look at this pocket shotty."; diff --git a/language.version b/language.version index 90b313224..fda4bbb68 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r12 \cu(Thu 7 Oct 19:50:34 CEST 2021)\c-"; -SWWM_SHORTVER="\cw1.2pre r12 \cu(2021-10-07 19:50:34)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r13 \cu(Sat 9 Oct 21:31:40 CEST 2021)\c-"; +SWWM_SHORTVER="\cw1.2pre r13 \cu(2021-10-09 21:31:40)\c-"; diff --git a/sndinfo.txt b/sndinfo.txt index d8100f506..77c3215db 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -350,6 +350,11 @@ voice/default/usefail6 sounds/voice/default/va/demousefail6.ogg voice/default/usefail7 sounds/voice/default/va/demousefail7.ogg voice/default/usefail8 sounds/voice/default/va/demousefail8.ogg voice/default/usefail9 sounds/voice/default/va/demousefail9.ogg +voice/default/usegrunt1 sounds/voice/default/va/demousegrunt1.ogg +voice/default/usegrunt2 sounds/voice/default/va/demousegrunt2.ogg +voice/default/usegrunt3 sounds/voice/default/va/demousegrunt3.ogg +voice/default/usegrunt4 sounds/voice/default/va/demousegrunt4.ogg +$random voice/default/usegrunt { voice/default/usegrunt1 voice/default/usegrunt2 voice/default/usegrunt3 voice/default/usegrunt4 } voice/default/cubeget sounds/voice/default/va/democubeget.ogg voice/default/akariget sounds/voice/default/va/demoakariget.ogg voice/default/signalsget sounds/voice/default/va/demosignalsget.ogg diff --git a/sounds/voice/default/va/demoakariget.ogg b/sounds/voice/default/va/demoakariget.ogg new file mode 100644 index 000000000..5caea2405 Binary files /dev/null and b/sounds/voice/default/va/demoakariget.ogg differ diff --git a/sounds/voice/default/va/demobreadget.ogg b/sounds/voice/default/va/demobreadget.ogg new file mode 100644 index 000000000..eefe9ee4e Binary files /dev/null and b/sounds/voice/default/va/demobreadget.ogg differ diff --git a/sounds/voice/default/va/democubeget.ogg b/sounds/voice/default/va/democubeget.ogg new file mode 100644 index 000000000..c5e4dfd87 Binary files /dev/null and b/sounds/voice/default/va/democubeget.ogg differ diff --git a/sounds/voice/default/va/demodemoget.ogg b/sounds/voice/default/va/demodemoget.ogg new file mode 100644 index 000000000..f01c355f2 Binary files /dev/null and b/sounds/voice/default/va/demodemoget.ogg differ diff --git a/sounds/voice/default/va/demofrispyget.ogg b/sounds/voice/default/va/demofrispyget.ogg new file mode 100644 index 000000000..9073d9384 Binary files /dev/null and b/sounds/voice/default/va/demofrispyget.ogg differ diff --git a/sounds/voice/default/va/demogetblackfireigniter.ogg b/sounds/voice/default/va/demogetblackfireigniter.ogg new file mode 100644 index 000000000..23ebe70e5 Binary files /dev/null and b/sounds/voice/default/va/demogetblackfireigniter.ogg differ diff --git a/sounds/voice/default/va/demogetcandygun.ogg b/sounds/voice/default/va/demogetcandygun.ogg new file mode 100644 index 000000000..dadf0341e Binary files /dev/null and b/sounds/voice/default/va/demogetcandygun.ogg differ diff --git a/sounds/voice/default/va/demogetdeepimpact.ogg b/sounds/voice/default/va/demogetdeepimpact.ogg new file mode 100644 index 000000000..bd880144e Binary files /dev/null and b/sounds/voice/default/va/demogetdeepimpact.ogg differ diff --git a/sounds/voice/default/va/demogetempcarbine.ogg b/sounds/voice/default/va/demogetempcarbine.ogg new file mode 100644 index 000000000..86ff76bb7 Binary files /dev/null and b/sounds/voice/default/va/demogetempcarbine.ogg differ diff --git a/sounds/voice/default/va/demogeteviscerator.ogg b/sounds/voice/default/va/demogeteviscerator.ogg new file mode 100644 index 000000000..58a8d86d0 Binary files /dev/null and b/sounds/voice/default/va/demogeteviscerator.ogg differ diff --git a/sounds/voice/default/va/demogetexplodiumgun1.ogg b/sounds/voice/default/va/demogetexplodiumgun1.ogg new file mode 100644 index 000000000..79e7f818c Binary files /dev/null and b/sounds/voice/default/va/demogetexplodiumgun1.ogg differ diff --git a/sounds/voice/default/va/demogetexplodiumgun2.ogg b/sounds/voice/default/va/demogetexplodiumgun2.ogg new file mode 100644 index 000000000..aea4fc89a Binary files /dev/null and b/sounds/voice/default/va/demogetexplodiumgun2.ogg differ diff --git a/sounds/voice/default/va/demogetgrandlance.ogg b/sounds/voice/default/va/demogetgrandlance.ogg new file mode 100644 index 000000000..b8b6abea8 Binary files /dev/null and b/sounds/voice/default/va/demogetgrandlance.ogg differ diff --git a/sounds/voice/default/va/demogetheavymahsheengun.ogg b/sounds/voice/default/va/demogetheavymahsheengun.ogg new file mode 100644 index 000000000..53ef96d9c Binary files /dev/null and b/sounds/voice/default/va/demogetheavymahsheengun.ogg differ diff --git a/sounds/voice/default/va/demogethellblazer.ogg b/sounds/voice/default/va/demogethellblazer.ogg new file mode 100644 index 000000000..1d51d4e98 Binary files /dev/null and b/sounds/voice/default/va/demogethellblazer.ogg differ diff --git a/sounds/voice/default/va/demogetitamexhammer.ogg b/sounds/voice/default/va/demogetitamexhammer.ogg new file mode 100644 index 000000000..237ed4d09 Binary files /dev/null and b/sounds/voice/default/va/demogetitamexhammer.ogg differ diff --git a/sounds/voice/default/va/demogetmortalrifle.ogg b/sounds/voice/default/va/demogetmortalrifle.ogg new file mode 100644 index 000000000..45d14acea Binary files /dev/null and b/sounds/voice/default/va/demogetmortalrifle.ogg differ diff --git a/sounds/voice/default/va/demogetnewsparkster.ogg b/sounds/voice/default/va/demogetnewsparkster.ogg new file mode 100644 index 000000000..b091b823c Binary files /dev/null and b/sounds/voice/default/va/demogetnewsparkster.ogg differ diff --git a/sounds/voice/default/va/demogetplasmablast1.ogg b/sounds/voice/default/va/demogetplasmablast1.ogg new file mode 100644 index 000000000..d4cc0c068 Binary files /dev/null and b/sounds/voice/default/va/demogetplasmablast1.ogg differ diff --git a/sounds/voice/default/va/demogetplasmablast2.ogg b/sounds/voice/default/va/demogetplasmablast2.ogg new file mode 100644 index 000000000..10e99c2fe Binary files /dev/null and b/sounds/voice/default/va/demogetplasmablast2.ogg differ diff --git a/sounds/voice/default/va/demogetpuntzerbeta.ogg b/sounds/voice/default/va/demogetpuntzerbeta.ogg new file mode 100644 index 000000000..85687916c Binary files /dev/null and b/sounds/voice/default/va/demogetpuntzerbeta.ogg differ diff --git a/sounds/voice/default/va/demogetpuntzergamma.ogg b/sounds/voice/default/va/demogetpuntzergamma.ogg new file mode 100644 index 000000000..982e5af98 Binary files /dev/null and b/sounds/voice/default/va/demogetpuntzergamma.ogg differ diff --git a/sounds/voice/default/va/demogetpusherweapon.ogg b/sounds/voice/default/va/demogetpusherweapon.ogg new file mode 100644 index 000000000..703be65c5 Binary files /dev/null and b/sounds/voice/default/va/demogetpusherweapon.ogg differ diff --git a/sounds/voice/default/va/demogetquadravol.ogg b/sounds/voice/default/va/demogetquadravol.ogg new file mode 100644 index 000000000..bb79d8e75 Binary files /dev/null and b/sounds/voice/default/va/demogetquadravol.ogg differ diff --git a/sounds/voice/default/va/demogetrafankos.ogg b/sounds/voice/default/va/demogetrafankos.ogg new file mode 100644 index 000000000..2250944c3 Binary files /dev/null and b/sounds/voice/default/va/demogetrafankos.ogg differ diff --git a/sounds/voice/default/va/demogetraykhom.ogg b/sounds/voice/default/va/demogetraykhom.ogg new file mode 100644 index 000000000..1c627b283 Binary files /dev/null and b/sounds/voice/default/va/demogetraykhom.ogg differ diff --git a/sounds/voice/default/va/demogetsilverbullet.ogg b/sounds/voice/default/va/demogetsilverbullet.ogg new file mode 100644 index 000000000..6e1bf8349 Binary files /dev/null and b/sounds/voice/default/va/demogetsilverbullet.ogg differ diff --git a/sounds/voice/default/va/demogetsparkster.ogg b/sounds/voice/default/va/demogetsparkster.ogg new file mode 100644 index 000000000..4aeb91438 Binary files /dev/null and b/sounds/voice/default/va/demogetsparkster.ogg differ diff --git a/sounds/voice/default/va/demogetspreadgun.ogg b/sounds/voice/default/va/demogetspreadgun.ogg new file mode 100644 index 000000000..61ee5458f Binary files /dev/null and b/sounds/voice/default/va/demogetspreadgun.ogg differ diff --git a/sounds/voice/default/va/demogetwallbuster.ogg b/sounds/voice/default/va/demogetwallbuster.ogg new file mode 100644 index 000000000..106d55ad5 Binary files /dev/null and b/sounds/voice/default/va/demogetwallbuster.ogg differ diff --git a/sounds/voice/default/va/demogetwhiteglove.ogg b/sounds/voice/default/va/demogetwhiteglove.ogg new file mode 100644 index 000000000..ab700c407 Binary files /dev/null and b/sounds/voice/default/va/demogetwhiteglove.ogg differ diff --git a/sounds/voice/default/va/demogetynykron.ogg b/sounds/voice/default/va/demogetynykron.ogg new file mode 100644 index 000000000..27ec15032 Binary files /dev/null and b/sounds/voice/default/va/demogetynykron.ogg differ diff --git a/sounds/voice/default/va/demokeyget1.ogg b/sounds/voice/default/va/demokeyget1.ogg new file mode 100644 index 000000000..e7438f04f Binary files /dev/null and b/sounds/voice/default/va/demokeyget1.ogg differ diff --git a/sounds/voice/default/va/demokeyget2.ogg b/sounds/voice/default/va/demokeyget2.ogg new file mode 100644 index 000000000..8d2b0e030 Binary files /dev/null and b/sounds/voice/default/va/demokeyget2.ogg differ diff --git a/sounds/voice/default/va/demokeyget3.ogg b/sounds/voice/default/va/demokeyget3.ogg new file mode 100644 index 000000000..caa7b5662 Binary files /dev/null and b/sounds/voice/default/va/demokeyget3.ogg differ diff --git a/sounds/voice/default/va/demokeyget4.ogg b/sounds/voice/default/va/demokeyget4.ogg new file mode 100644 index 000000000..4a9fe49bb Binary files /dev/null and b/sounds/voice/default/va/demokeyget4.ogg differ diff --git a/sounds/voice/default/va/demokeyget5.ogg b/sounds/voice/default/va/demokeyget5.ogg new file mode 100644 index 000000000..02dbb879e Binary files /dev/null and b/sounds/voice/default/va/demokeyget5.ogg differ diff --git a/sounds/voice/default/va/demokiringet.ogg b/sounds/voice/default/va/demokiringet.ogg new file mode 100644 index 000000000..cda6ea811 Binary files /dev/null and b/sounds/voice/default/va/demokiringet.ogg differ diff --git a/sounds/voice/default/va/demomangaget.ogg b/sounds/voice/default/va/demomangaget.ogg new file mode 100644 index 000000000..a743172ac Binary files /dev/null and b/sounds/voice/default/va/demomangaget.ogg differ diff --git a/sounds/voice/default/va/demomothget.ogg b/sounds/voice/default/va/demomothget.ogg new file mode 100644 index 000000000..8bbe90b90 Binary files /dev/null and b/sounds/voice/default/va/demomothget.ogg differ diff --git a/sounds/voice/default/va/demonutatcoget.ogg b/sounds/voice/default/va/demonutatcoget.ogg new file mode 100644 index 000000000..64f04fc90 Binary files /dev/null and b/sounds/voice/default/va/demonutatcoget.ogg differ diff --git a/sounds/voice/default/va/demopeachget.ogg b/sounds/voice/default/va/demopeachget.ogg new file mode 100644 index 000000000..249b455fd Binary files /dev/null and b/sounds/voice/default/va/demopeachget.ogg differ diff --git a/sounds/voice/default/va/demosayaget.ogg b/sounds/voice/default/va/demosayaget.ogg new file mode 100644 index 000000000..b15ec667f Binary files /dev/null and b/sounds/voice/default/va/demosayaget.ogg differ diff --git a/sounds/voice/default/va/demosignalsget.ogg b/sounds/voice/default/va/demosignalsget.ogg new file mode 100644 index 000000000..d6dc118b2 Binary files /dev/null and b/sounds/voice/default/va/demosignalsget.ogg differ diff --git a/sounds/voice/default/va/demousefail1.ogg b/sounds/voice/default/va/demousefail1.ogg new file mode 100644 index 000000000..5ee33dd96 Binary files /dev/null and b/sounds/voice/default/va/demousefail1.ogg differ diff --git a/sounds/voice/default/va/demousefail2.ogg b/sounds/voice/default/va/demousefail2.ogg new file mode 100644 index 000000000..7ac2795f5 Binary files /dev/null and b/sounds/voice/default/va/demousefail2.ogg differ diff --git a/sounds/voice/default/va/demousefail3.ogg b/sounds/voice/default/va/demousefail3.ogg new file mode 100644 index 000000000..59fd7b0d8 Binary files /dev/null and b/sounds/voice/default/va/demousefail3.ogg differ diff --git a/sounds/voice/default/va/demousefail4.ogg b/sounds/voice/default/va/demousefail4.ogg new file mode 100644 index 000000000..344bfc91d Binary files /dev/null and b/sounds/voice/default/va/demousefail4.ogg differ diff --git a/sounds/voice/default/va/demousefail5.ogg b/sounds/voice/default/va/demousefail5.ogg new file mode 100644 index 000000000..2948828eb Binary files /dev/null and b/sounds/voice/default/va/demousefail5.ogg differ diff --git a/sounds/voice/default/va/demousefail6.ogg b/sounds/voice/default/va/demousefail6.ogg new file mode 100644 index 000000000..978a60687 Binary files /dev/null and b/sounds/voice/default/va/demousefail6.ogg differ diff --git a/sounds/voice/default/va/demousefail7.ogg b/sounds/voice/default/va/demousefail7.ogg new file mode 100644 index 000000000..34513fb5e Binary files /dev/null and b/sounds/voice/default/va/demousefail7.ogg differ diff --git a/sounds/voice/default/va/demousefail8.ogg b/sounds/voice/default/va/demousefail8.ogg new file mode 100644 index 000000000..e9970811c Binary files /dev/null and b/sounds/voice/default/va/demousefail8.ogg differ diff --git a/sounds/voice/default/va/demousefail9.ogg b/sounds/voice/default/va/demousefail9.ogg new file mode 100644 index 000000000..b05619ce5 Binary files /dev/null and b/sounds/voice/default/va/demousefail9.ogg differ diff --git a/sounds/voice/default/va/demousegrunt1.ogg b/sounds/voice/default/va/demousegrunt1.ogg new file mode 100644 index 000000000..f47cd7f07 Binary files /dev/null and b/sounds/voice/default/va/demousegrunt1.ogg differ diff --git a/sounds/voice/default/va/demousegrunt2.ogg b/sounds/voice/default/va/demousegrunt2.ogg new file mode 100644 index 000000000..60da75558 Binary files /dev/null and b/sounds/voice/default/va/demousegrunt2.ogg differ diff --git a/sounds/voice/default/va/demousegrunt3.ogg b/sounds/voice/default/va/demousegrunt3.ogg new file mode 100644 index 000000000..a7df7df48 Binary files /dev/null and b/sounds/voice/default/va/demousegrunt3.ogg differ diff --git a/sounds/voice/default/va/demousegrunt4.ogg b/sounds/voice/default/va/demousegrunt4.ogg new file mode 100644 index 000000000..4a22971a5 Binary files /dev/null and b/sounds/voice/default/va/demousegrunt4.ogg differ diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index e6e0766de..b60fe2eae 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -882,6 +882,13 @@ Class Demolitionist : PlayerPawn failcooldown = SWWMHandler.AddOneliner("usefail",2,20); failcounter = max(4,failcounter-10); } + else if ( (failcounter > 2) && Random[DemoLines](0,1) && (gametic > failcooldown) && (swwm_mutevoice < 4) ) + { + A_StartSound(String.Format("voice/%s/usegrunt",myvoice.GetString()),CHAN_DEMOVOICE,CHANF_OVERLAP); + A_StartSound(String.Format("voice/%s/usegrunt",myvoice.GetString()),CHAN_DEMOVOICEAUX,CHANF_OVERLAP); + failcooldown = int(S_GetLength(String.Format("voice/%s/usegrunt",myvoice.GetString()))*GameTicRate); + failcounter = max(2,failcounter-1); + } } else if ( gametic > lastuse+50 ) failcounter = 0; oldlagangle = lagangle;