OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Original death/pain/grunt voices.

Browse source
This commit is contained in:
Mari the Deer 2022-04-20 08:53:42 +02:00
commit bb65acc28e
33 changed files with 42 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -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-";

22
sndinfo.txt
View file

@ -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

BIN
sounds/voice/default/demodeath1.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demodeath2.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demodeath3.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demodeath4.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demodeath5.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demodeath6.ogg Normal file
View file

Binary file not shown.

BIN
sounds/voice/default/demodeath7.ogg Normal file
View file

Binary file not shown.

BIN
sounds/voice/default/demodeath8.ogg Normal file
View file

Binary file not shown.

BIN
sounds/voice/default/demogrunt1.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demogrunt2.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demogrunt3.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demogrunt4.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demogrunt5.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demogrunt6.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demohipain1.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demohipain2.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demohipain3.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demohipain4.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demohipain5.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demolopain1.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demolopain2.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demolopain3.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demolopain4.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demolopain5.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demopain1.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demopain2.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demopain3.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demopain4.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demopain5.ogg
View file

Binary file not shown.

BIN
sounds/voice/default/demopain6.ogg
View file

Binary file not shown.

33
zscript/swwm_player.zsc
View file

@ -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 )
{