diff --git a/language.version b/language.version index 831f5f115..51f80a309 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r40 \cu(Tue 19 Apr 19:52:23 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r40 \cu(2022-04-19 19:52:23)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r41 \cu(Wed 20 Apr 08:53:42 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r41 \cu(2022-04-20 08:53:42)\c-"; diff --git a/sndinfo.txt b/sndinfo.txt index 8c4bc43b4..a483d7fe1 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -61,34 +61,28 @@ voice/default/death2 sounds/voice/default/demodeath2.ogg voice/default/death3 sounds/voice/default/demodeath3.ogg voice/default/death4 sounds/voice/default/demodeath4.ogg voice/default/death5 sounds/voice/default/demodeath5.ogg +voice/default/death6 sounds/voice/default/demodeath6.ogg +voice/default/death7 sounds/voice/default/demodeath7.ogg +voice/default/death8 sounds/voice/default/demodeath8.ogg voice/default/grunt1 sounds/voice/default/demogrunt1.ogg voice/default/grunt2 sounds/voice/default/demogrunt2.ogg voice/default/grunt3 sounds/voice/default/demogrunt3.ogg voice/default/grunt4 sounds/voice/default/demogrunt4.ogg voice/default/grunt5 sounds/voice/default/demogrunt5.ogg -voice/default/grunt6 sounds/voice/default/demogrunt6.ogg voice/default/hipain1 sounds/voice/default/demohipain1.ogg voice/default/hipain2 sounds/voice/default/demohipain2.ogg voice/default/hipain3 sounds/voice/default/demohipain3.ogg -voice/default/hipain4 sounds/voice/default/demohipain4.ogg -voice/default/hipain5 sounds/voice/default/demohipain5.ogg voice/default/lopain1 sounds/voice/default/demolopain1.ogg voice/default/lopain2 sounds/voice/default/demolopain2.ogg -voice/default/lopain3 sounds/voice/default/demolopain3.ogg -voice/default/lopain4 sounds/voice/default/demolopain4.ogg -voice/default/lopain5 sounds/voice/default/demolopain5.ogg voice/default/pain1 sounds/voice/default/demopain1.ogg voice/default/pain2 sounds/voice/default/demopain2.ogg voice/default/pain3 sounds/voice/default/demopain3.ogg -voice/default/pain4 sounds/voice/default/demopain4.ogg -voice/default/pain5 sounds/voice/default/demopain5.ogg -voice/default/pain6 sounds/voice/default/demopain6.ogg -$random voice/default/grunt { voice/default/grunt1 voice/default/grunt2 voice/default/grunt3 voice/default/grunt4 voice/default/grunt5 voice/default/grunt6 } -$random voice/default/lopain { voice/default/lopain1 voice/default/lopain2 voice/default/lopain3 voice/default/lopain4 voice/default/lopain5 } -$random voice/default/pain { voice/default/pain1 voice/default/pain2 voice/default/pain3 voice/default/pain4 voice/default/pain5 } -$random voice/default/hipain { voice/default/hipain1 voice/default/hipain2 voice/default/hipain3 voice/default/hipain4 voice/default/hipain5 } -$random voice/default/death { voice/default/death1 voice/default/death2 voice/default/death3 voice/default/death4 voice/default/death5 } +$random voice/default/grunt { voice/default/grunt1 voice/default/grunt2 voice/default/grunt3 voice/default/grunt4 voice/default/grunt5 } +$random voice/default/lopain { voice/default/lopain1 voice/default/lopain2 } +$random voice/default/pain { voice/default/pain1 voice/default/pain2 voice/default/pain3 } +$random voice/default/hipain { voice/default/hipain1 voice/default/hipain2 voice/default/hipain3 voice/default/hipain2 voice/default/hipain1 } +$random voice/default/death { voice/default/death1 voice/default/death2 voice/default/death3 voice/default/death4 voice/default/death5 voice/default/death6 voice/default/death7 voice/default/death8 } voice/default/fightstart1 sounds/voice/default/va/demofightstart1.ogg voice/default/fightstart2 sounds/voice/default/va/demofightstart2.ogg diff --git a/sounds/voice/default/demodeath1.ogg b/sounds/voice/default/demodeath1.ogg index bc213cd59..1e2b6e8d2 100644 Binary files a/sounds/voice/default/demodeath1.ogg and b/sounds/voice/default/demodeath1.ogg differ diff --git a/sounds/voice/default/demodeath2.ogg b/sounds/voice/default/demodeath2.ogg index b212e9a79..c36decaa8 100644 Binary files a/sounds/voice/default/demodeath2.ogg and b/sounds/voice/default/demodeath2.ogg differ diff --git a/sounds/voice/default/demodeath3.ogg b/sounds/voice/default/demodeath3.ogg index 0e852002f..12f03abec 100644 Binary files a/sounds/voice/default/demodeath3.ogg and b/sounds/voice/default/demodeath3.ogg differ diff --git a/sounds/voice/default/demodeath4.ogg b/sounds/voice/default/demodeath4.ogg index 1c1a4f872..c3139167f 100644 Binary files a/sounds/voice/default/demodeath4.ogg and b/sounds/voice/default/demodeath4.ogg differ diff --git a/sounds/voice/default/demodeath5.ogg b/sounds/voice/default/demodeath5.ogg index 1e1a25b45..20663a4da 100644 Binary files a/sounds/voice/default/demodeath5.ogg and b/sounds/voice/default/demodeath5.ogg differ diff --git a/sounds/voice/default/demodeath6.ogg b/sounds/voice/default/demodeath6.ogg new file mode 100644 index 000000000..865d9b8b6 Binary files /dev/null and b/sounds/voice/default/demodeath6.ogg differ diff --git a/sounds/voice/default/demodeath7.ogg b/sounds/voice/default/demodeath7.ogg new file mode 100644 index 000000000..458eb4d0d Binary files /dev/null and b/sounds/voice/default/demodeath7.ogg differ diff --git a/sounds/voice/default/demodeath8.ogg b/sounds/voice/default/demodeath8.ogg new file mode 100644 index 000000000..99f60d4f1 Binary files /dev/null and b/sounds/voice/default/demodeath8.ogg differ diff --git a/sounds/voice/default/demogrunt1.ogg b/sounds/voice/default/demogrunt1.ogg index bd3d818df..cb410ac9b 100644 Binary files a/sounds/voice/default/demogrunt1.ogg and b/sounds/voice/default/demogrunt1.ogg differ diff --git a/sounds/voice/default/demogrunt2.ogg b/sounds/voice/default/demogrunt2.ogg index 2c9412e36..2e9bdd995 100644 Binary files a/sounds/voice/default/demogrunt2.ogg and b/sounds/voice/default/demogrunt2.ogg differ diff --git a/sounds/voice/default/demogrunt3.ogg b/sounds/voice/default/demogrunt3.ogg index 5e80c06af..622c56eb8 100644 Binary files a/sounds/voice/default/demogrunt3.ogg and b/sounds/voice/default/demogrunt3.ogg differ diff --git a/sounds/voice/default/demogrunt4.ogg b/sounds/voice/default/demogrunt4.ogg index 03de92028..7ec08e85d 100644 Binary files a/sounds/voice/default/demogrunt4.ogg and b/sounds/voice/default/demogrunt4.ogg differ diff --git a/sounds/voice/default/demogrunt5.ogg b/sounds/voice/default/demogrunt5.ogg index a6d53a1e9..bf01c4908 100644 Binary files a/sounds/voice/default/demogrunt5.ogg and b/sounds/voice/default/demogrunt5.ogg differ diff --git a/sounds/voice/default/demogrunt6.ogg b/sounds/voice/default/demogrunt6.ogg deleted file mode 100644 index 06503e5d2..000000000 Binary files a/sounds/voice/default/demogrunt6.ogg and /dev/null differ diff --git a/sounds/voice/default/demohipain1.ogg b/sounds/voice/default/demohipain1.ogg index 8488011d7..2beb143d4 100644 Binary files a/sounds/voice/default/demohipain1.ogg and b/sounds/voice/default/demohipain1.ogg differ diff --git a/sounds/voice/default/demohipain2.ogg b/sounds/voice/default/demohipain2.ogg index 1acdeef91..483df1fab 100644 Binary files a/sounds/voice/default/demohipain2.ogg and b/sounds/voice/default/demohipain2.ogg differ diff --git a/sounds/voice/default/demohipain3.ogg b/sounds/voice/default/demohipain3.ogg index 986ded96d..028d912d2 100644 Binary files a/sounds/voice/default/demohipain3.ogg and b/sounds/voice/default/demohipain3.ogg differ diff --git a/sounds/voice/default/demohipain4.ogg b/sounds/voice/default/demohipain4.ogg deleted file mode 100644 index f0f86f45e..000000000 Binary files a/sounds/voice/default/demohipain4.ogg and /dev/null differ diff --git a/sounds/voice/default/demohipain5.ogg b/sounds/voice/default/demohipain5.ogg deleted file mode 100644 index 89d165c08..000000000 Binary files a/sounds/voice/default/demohipain5.ogg and /dev/null differ diff --git a/sounds/voice/default/demolopain1.ogg b/sounds/voice/default/demolopain1.ogg index 2387fef3e..e69d30fbb 100644 Binary files a/sounds/voice/default/demolopain1.ogg and b/sounds/voice/default/demolopain1.ogg differ diff --git a/sounds/voice/default/demolopain2.ogg b/sounds/voice/default/demolopain2.ogg index 5c4cd0473..03bf86f27 100644 Binary files a/sounds/voice/default/demolopain2.ogg and b/sounds/voice/default/demolopain2.ogg differ diff --git a/sounds/voice/default/demolopain3.ogg b/sounds/voice/default/demolopain3.ogg deleted file mode 100644 index 060ed5466..000000000 Binary files a/sounds/voice/default/demolopain3.ogg and /dev/null differ diff --git a/sounds/voice/default/demolopain4.ogg b/sounds/voice/default/demolopain4.ogg deleted file mode 100644 index fdeb76303..000000000 Binary files a/sounds/voice/default/demolopain4.ogg and /dev/null differ diff --git a/sounds/voice/default/demolopain5.ogg b/sounds/voice/default/demolopain5.ogg deleted file mode 100644 index 46e7b5c00..000000000 Binary files a/sounds/voice/default/demolopain5.ogg and /dev/null differ diff --git a/sounds/voice/default/demopain1.ogg b/sounds/voice/default/demopain1.ogg index e7cc6f7da..1dc0163d3 100644 Binary files a/sounds/voice/default/demopain1.ogg and b/sounds/voice/default/demopain1.ogg differ diff --git a/sounds/voice/default/demopain2.ogg b/sounds/voice/default/demopain2.ogg index d5fcfa9b6..8a7b5fbf5 100644 Binary files a/sounds/voice/default/demopain2.ogg and b/sounds/voice/default/demopain2.ogg differ diff --git a/sounds/voice/default/demopain3.ogg b/sounds/voice/default/demopain3.ogg index 6dfc9a717..0c45500c6 100644 Binary files a/sounds/voice/default/demopain3.ogg and b/sounds/voice/default/demopain3.ogg differ diff --git a/sounds/voice/default/demopain4.ogg b/sounds/voice/default/demopain4.ogg deleted file mode 100644 index cb243b07a..000000000 Binary files a/sounds/voice/default/demopain4.ogg and /dev/null differ diff --git a/sounds/voice/default/demopain5.ogg b/sounds/voice/default/demopain5.ogg deleted file mode 100644 index 2173828ae..000000000 Binary files a/sounds/voice/default/demopain5.ogg and /dev/null differ diff --git a/sounds/voice/default/demopain6.ogg b/sounds/voice/default/demopain6.ogg deleted file mode 100644 index 554703a52..000000000 Binary files a/sounds/voice/default/demopain6.ogg and /dev/null differ diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index 417cc3267..4283eb699 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -864,8 +864,11 @@ Class Demolitionist : PlayerPawn } else if ( (failcounter > 2) && Random[DemoLines](0,1) && (gametic > failcooldown) && (swwm_mutevoice < 4) ) { + int loudlv = swwm_voiceamp; 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); + if ( loudlv > 1 ) A_StartSound(String.Format("voice/%s/usegrunt",myvoice.GetString()),CHAN_DEMOVOICEAUX,CHANF_OVERLAP); + if ( loudlv > 2 ) A_StartSound(String.Format("voice/%s/usegrunt",myvoice.GetString()),CHAN_DEMOVOICEAUX2,CHANF_OVERLAP); + if ( loudlv > 3 ) A_StartSound(String.Format("voice/%s/usegrunt",myvoice.GetString()),CHAN_DEMOVOICEAUX3,CHANF_OVERLAP); failcooldown = int(S_GetLength(String.Format("voice/%s/usegrunt",myvoice.GetString()))*GameTicRate); failcounter = max(2,failcounter-1); } @@ -1075,7 +1078,13 @@ Class Demolitionist : PlayerPawn if ( swwm_extraalert ) A_AlertMonsters(swwm_uncapalert?0:200); } if ( (lastvelz < -gruntspeed) && (swwm_mutevoice < 4) && (health > 0) ) + { + int loudlv = swwm_voiceamp; A_StartSound(String.Format("voice/%s/grunt",myvoice.GetString()),CHAN_DEMOVOICE,CHANF_OVERLAP); + if ( loudlv > 1 ) A_StartSound(String.Format("voice/%s/grunt",myvoice.GetString()),CHAN_DEMOVOICEAUX,CHANF_OVERLAP); + if ( loudlv > 2 ) A_StartSound(String.Format("voice/%s/grunt",myvoice.GetString()),CHAN_DEMOVOICEAUX2,CHANF_OVERLAP); + if ( loudlv > 3 ) A_StartSound(String.Format("voice/%s/grunt",myvoice.GetString()),CHAN_DEMOVOICEAUX3,CHANF_OVERLAP); + } if ( lastvelz < -1 ) A_Footstep(0,1,clamp(-lastvelz*0.05,0.0,1.0),true); // bounce off slopes @@ -2650,6 +2659,7 @@ Class Demolitionist : PlayerPawn if ( IsActorPlayingSound(CHAN_JETPACK,"demolitionist/jet") ) A_StartSound("demolitionist/jetstop",CHAN_JETPACK); if ( !myvoice ) myvoice = CVar.GetCVar('swwm_voicetype',player); + int loudlv = swwm_voiceamp; if ( lastdamage > 90 ) { if ( swwm_extraalert ) A_AlertMonsters(swwm_uncapalert?0:1200); @@ -2657,7 +2667,12 @@ Class Demolitionist : PlayerPawn A_StartSound("demolitionist/hipain",CHAN_VOICE); lastbump *= 1.04; if ( swwm_mutevoice < 4 ) + { A_StartSound(String.Format("voice/%s/hipain",myvoice.GetString()),CHAN_DEMOVOICE,CHANF_OVERLAP); + if ( loudlv > 1 ) A_StartSound(String.Format("voice/%s/hipain",myvoice.GetString()),CHAN_DEMOVOICEAUX,CHANF_OVERLAP); + if ( loudlv > 2 ) A_StartSound(String.Format("voice/%s/hipain",myvoice.GetString()),CHAN_DEMOVOICEAUX2,CHANF_OVERLAP); + if ( loudlv > 3 ) A_StartSound(String.Format("voice/%s/hipain",myvoice.GetString()),CHAN_DEMOVOICEAUX3,CHANF_OVERLAP); + } } else if ( lastdamage > 30 ) { @@ -2666,7 +2681,12 @@ Class Demolitionist : PlayerPawn A_StartSound("demolitionist/pain",CHAN_VOICE); lastbump *= 1.02; if ( swwm_mutevoice < 4 ) + { A_StartSound(String.Format("voice/%s/pain",myvoice.GetString()),CHAN_DEMOVOICE,CHANF_OVERLAP); + if ( loudlv > 1 ) A_StartSound(String.Format("voice/%s/pain",myvoice.GetString()),CHAN_DEMOVOICEAUX,CHANF_OVERLAP); + if ( loudlv > 2 ) A_StartSound(String.Format("voice/%s/pain",myvoice.GetString()),CHAN_DEMOVOICEAUX2,CHANF_OVERLAP); + if ( loudlv > 3 ) A_StartSound(String.Format("voice/%s/pain",myvoice.GetString()),CHAN_DEMOVOICEAUX3,CHANF_OVERLAP); + } } else if ( lastdamage > 0 ) { @@ -2675,7 +2695,12 @@ Class Demolitionist : PlayerPawn A_StartSound("demolitionist/lopain",CHAN_VOICE); lastbump *= 1.01; if ( swwm_mutevoice < 4 ) + { A_StartSound(String.Format("voice/%s/lopain",myvoice.GetString()),CHAN_DEMOVOICE,CHANF_OVERLAP); + if ( loudlv > 1 ) A_StartSound(String.Format("voice/%s/lopain",myvoice.GetString()),CHAN_DEMOVOICEAUX,CHANF_OVERLAP); + if ( loudlv > 2 ) A_StartSound(String.Format("voice/%s/lopain",myvoice.GetString()),CHAN_DEMOVOICEAUX2,CHANF_OVERLAP); + if ( loudlv > 3 ) A_StartSound(String.Format("voice/%s/lopain",myvoice.GetString()),CHAN_DEMOVOICEAUX3,CHANF_OVERLAP); + } } lastdamage = 0; } @@ -2688,6 +2713,7 @@ Class Demolitionist : PlayerPawn A_StopSound(CHAN_DEMOVOICEAUX2); A_StopSound(CHAN_DEMOVOICEAUX3); if ( !myvoice ) myvoice = CVar.GetCVar('swwm_voicetype',player); + int loudlv = swwm_voiceamp; Sound snd = "demolitionist/death"; if ( special1 < 10 ) snd = "demolitionist/wdeath"; @@ -2695,7 +2721,12 @@ Class Demolitionist : PlayerPawn snd = "demolitionist/xdeath"; A_StartSound(snd,CHAN_VOICE); if ( swwm_mutevoice < 4 ) + { A_StartSound(String.Format("voice/%s/death",myvoice.GetString()),CHAN_DEMOVOICE,CHANF_OVERLAP); + if ( loudlv > 1 ) A_StartSound(String.Format("voice/%s/death",myvoice.GetString()),CHAN_DEMOVOICEAUX,CHANF_OVERLAP); + if ( loudlv > 2 ) A_StartSound(String.Format("voice/%s/death",myvoice.GetString()),CHAN_DEMOVOICEAUX2,CHANF_OVERLAP); + if ( loudlv > 3 ) A_StartSound(String.Format("voice/%s/death",myvoice.GetString()),CHAN_DEMOVOICEAUX3,CHANF_OVERLAP); + } } override bool OnGiveSecret( bool printmsg, bool playsound ) {