OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

combat taunt tweaks.

Browse source
This commit is contained in:
Mari the Deer 2020-04-28 23:42:47 +02:00
commit f39d2ae42e
7 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
language.def_voice
View file

@ -98,7 +98,7 @@ SWWM_SUBS_DEFAULT_FINDSECRET11 = "I did good work, didn't I?";
SWWM_SUBS_DEFAULT_FINDSECRET12 = "Wow, that's pretty lucky!";
SWWM_SUBS_DEFAULT_FINDSECRET13 = "Yeah, well, I am pretty awesome.";
// frag taunts
SWWM_SUBS_DEFAULT_NSCOREKILL = "27";
SWWM_SUBS_DEFAULT_NSCOREKILL = "26";
SWWM_SUBS_DEFAULT_SCOREKILL1 = "Good riddance.";
SWWM_SUBS_DEFAULT_SCOREKILL2 = "One down.";
SWWM_SUBS_DEFAULT_SCOREKILL3 = "Goodbye.";
@ -112,7 +112,7 @@ SWWM_SUBS_DEFAULT_SCOREKILL10 = "The pleasure was all mine.";
SWWM_SUBS_DEFAULT_SCOREKILL11 = "How about something a little more challenging next time?";
SWWM_SUBS_DEFAULT_SCOREKILL12 = "I'm glad that's over with.";
SWWM_SUBS_DEFAULT_SCOREKILL13 = "Well, it's over. That's that.";
SWWM_SUBS_DEFAULT_SCOREKILL14 = "Ugh. Just... go away.";
SWWM_SUBS_DEFAULT_SCOREKILL14 = "It's done.";
SWWM_SUBS_DEFAULT_SCOREKILL15 = "Get lost.";
SWWM_SUBS_DEFAULT_SCOREKILL16 = "Is that all?";
SWWM_SUBS_DEFAULT_SCOREKILL17 = "Is that the best you can do?";
@ -125,7 +125,6 @@ SWWM_SUBS_DEFAULT_SCOREKILL23 = "Out of my way.";
SWWM_SUBS_DEFAULT_SCOREKILL24 = "Get outta my way.";
SWWM_SUBS_DEFAULT_SCOREKILL25 = "Want some more?";
SWWM_SUBS_DEFAULT_SCOREKILL26 = "Done and done.";
SWWM_SUBS_DEFAULT_SCOREKILL27 = "It's done.";
// oopsies
SWWM_SUBS_DEFAULT_NFRIENDKILL = "4";
SWWM_SUBS_DEFAULT_FRIENDKILL1 = "Oh my god.";
@ -133,7 +132,7 @@ SWWM_SUBS_DEFAULT_FRIENDKILL2 = "My god. I'm so sorry.";
SWWM_SUBS_DEFAULT_FRIENDKILL3 = "Oh god...";
SWWM_SUBS_DEFAULT_FRIENDKILL4 = "Oh my god. Are you alright?";
// getting hurt by monsters
SWWM_SUBS_DEFAULT_NGETHIT = "18";
SWWM_SUBS_DEFAULT_NGETHIT = "19";
SWWM_SUBS_DEFAULT_GETHIT1 = "Whatever...";
SWWM_SUBS_DEFAULT_GETHIT2 = "*sigh*";
SWWM_SUBS_DEFAULT_GETHIT3 = "Hm hmm.";
@ -152,6 +151,7 @@ SWWM_SUBS_DEFAULT_GETHIT15 = "And now it's your turn.";
SWWM_SUBS_DEFAULT_GETHIT16 = "Time to shut you up for good.";
SWWM_SUBS_DEFAULT_GETHIT17 = "You're not leaving here in one piece.";
SWWM_SUBS_DEFAULT_GETHIT18 = "You're obviously upset...";
SWWM_SUBS_DEFAULT_GETHIT19 = "Ugh. Just... go away.";
// getting hurt by friendlies
SWWM_SUBS_DEFAULT_NFRIENDHIT = "7";
SWWM_SUBS_DEFAULT_FRIENDHIT1 = "Are you ticked off at me?";

4
language.es_voice
View file

@ -102,7 +102,7 @@ SWWM_SUBS_DEFAULT_SCOREKILL10 = "El placer ha sido mío.";
SWWM_SUBS_DEFAULT_SCOREKILL11 = "¿Que tal algo más desafiante la próxima vez?";
SWWM_SUBS_DEFAULT_SCOREKILL12 = "Me alegro de que se haya terminado.";
SWWM_SUBS_DEFAULT_SCOREKILL13 = "Bueno, se acabó. Ya está.";
SWWM_SUBS_DEFAULT_SCOREKILL14 = "Ugh. Déjame en paz.";
SWWM_SUBS_DEFAULT_SCOREKILL14 = "Hecho.";
SWWM_SUBS_DEFAULT_SCOREKILL15 = "Piérdete.";
SWWM_SUBS_DEFAULT_SCOREKILL16 = "¿Eso es todo?";
SWWM_SUBS_DEFAULT_SCOREKILL17 = "¿Eso es lo mejor que puedes hacer?";
@ -115,7 +115,6 @@ SWWM_SUBS_DEFAULT_SCOREKILL23 = "Fuera de mi camino.";
SWWM_SUBS_DEFAULT_SCOREKILL24 = "Quita de en medio.";
SWWM_SUBS_DEFAULT_SCOREKILL25 = "¿Quieres más?";
SWWM_SUBS_DEFAULT_SCOREKILL26 = "Hecho y hecho.";
SWWM_SUBS_DEFAULT_SCOREKILL27 = "Hecho.";
// oopsies
SWWM_SUBS_DEFAULT_NFRIENDKILL = "4";
SWWM_SUBS_DEFAULT_FRIENDKILL1 = "Oh dios mío.";
@ -140,6 +139,7 @@ SWWM_SUBS_DEFAULT_GETHIT15 = "Y ahora es tu turno.";
SWWM_SUBS_DEFAULT_GETHIT16 = "Hora de hacerte callar de una vez por todas.";
SWWM_SUBS_DEFAULT_GETHIT17 = "No vas a salir de aquí de una pieza.";
SWWM_SUBS_DEFAULT_GETHIT18 = "Parece que estás enfadado...";
SWWM_SUBS_DEFAULT_GETHIT19 = "Ugh. Déjame en paz.";
// getting hurt by friendlies
SWWM_SUBS_DEFAULT_FRIENDHIT1 = "¿Te has enfadado conmigo?";
SWWM_SUBS_DEFAULT_FRIENDHIT2 = "¿En serio?";

6
sndinfo.txt
View file

@ -154,7 +154,10 @@ voice/default/scorekill23 sounds/voice/default/scorekill23.ogg
voice/default/scorekill24 sounds/voice/default/scorekill24.ogg
voice/default/scorekill25 sounds/voice/default/scorekill25.ogg
voice/default/scorekill26 sounds/voice/default/scorekill26.ogg
voice/default/scorekill27 sounds/voice/default/scorekill27.ogg
voice/default/friendkill1 sounds/voice/default/friendkill1.ogg
voice/default/friendkill2 sounds/voice/default/friendkill2.ogg
voice/default/friendkill3 sounds/voice/default/friendkill3.ogg
voice/default/friendkill4 sounds/voice/default/friendkill4.ogg
voice/default/gethit1 sounds/voice/default/gethit1.ogg
voice/default/gethit2 sounds/voice/default/gethit2.ogg
voice/default/gethit3 sounds/voice/default/gethit3.ogg
@ -173,6 +176,7 @@ voice/default/gethit15 sounds/voice/default/gethit15.ogg
voice/default/gethit16 sounds/voice/default/gethit16.ogg
voice/default/gethit17 sounds/voice/default/gethit17.ogg
voice/default/gethit18 sounds/voice/default/gethit18.ogg
voice/default/gethit19 sounds/voice/default/gethit19.ogg
voice/default/friendhit1 sounds/voice/default/friendhit1.ogg
voice/default/friendhit2 sounds/voice/default/friendhit2.ogg
voice/default/friendhit3 sounds/voice/default/friendhit3.ogg

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

24
zscript/swwm_common.zsc
View file

@ -2086,7 +2086,7 @@ Class SWWMHandler : EventHandler
enteredcombat = true;
}
}
if ( enteredcombat && (!highesttic || (gametic > highesttic+100)) )
if ( enteredcombat && (!highesttic || (gametic > highesttic+700)) )
lastcombat = AddOneliner("fightstart",1,10);
}
@ -2173,17 +2173,22 @@ Class SWWMHandler : EventHandler
{
if ( (e.DamageSource.bISMONSTER || e.DamageSource.player) && (e.Thing == players[consoleplayer].mo) && (e.Thing.Health > 0) )
{
if ( !lastcombat || (gametic > lastcombat+20) )
lastcombat = AddOneliner(e.Thing.IsFriend(e.DamageSource)?"friendhit":"gethit",1,15);
if ( !lastcombat || (gametic > lastcombat+40) )
{
if ( (e.Thing.IsFriend(e.DamageSource) || SWWMUtility.IsCivilian(e.DamageSource)) )
lastcombat = AddOneliner("friendhit",1,10);
else if ( (!lastcombat || (gametic > lastcombat+100)) && !Random[DemoLines](0,(e.DamageSource.bBOSS||e.DamageSource.bBOSSDEATH)?2:4) ) lastcombat = AddOneliner("gethit",1,15);
}
highesttic = gametic;
}
if ( (e.DamageSource == players[consoleplayer].mo) && (e.Thing.bISMONSTER || e.Thing.player) )
// friendly fire lines only fire up if we didn't kill them right away (because then the teamkill line should take priority)
if ( (e.DamageSource == players[consoleplayer].mo) && (e.Thing.bISMONSTER || e.Thing.player) && (e.Thing.Health > 0) )
{
// make sure it's not a moth, because otherwise they won't shut up about accidentally hurting them (it happens a lot)
if ( (e.Thing.IsFriend(e.DamageSource) || SWWMUtility.IsCivilian(e.Thing)) && !(e.Thing is 'LampMoth') )
{
if ( !lastcombat || (gametic > lastcombat+20) )
lastcombat = AddOneliner("hitfriend",1,15);
if ( !lastcombat || (gametic > lastcombat+40) )
lastcombat = AddOneliner("hitfriend",1,10);
highesttic = gametic;
}
}
@ -2202,11 +2207,12 @@ Class SWWMHandler : EventHandler
if ( e.DamageSource == players[consoleplayer].mo )
{
highesttic = gametic;
if ( !lastcombat || (gametic > lastcombat+20) )
if ( !lastcombat || (gametic > lastcombat+40) )
{
if ( e.Thing.IsFriend(e.DamageSource) || SWWMUtility.IsCivilian(e.Thing) )
lastcombat = AddOneliner("friendkill",1,15);
else lastcombat = AddOneliner("scorekill",1,15);
lastcombat = AddOneliner("friendkill",1,5);
else if ( (!lastcombat || (gametic > lastcombat+100)) && !Random[DemoLines](0,(e.Thing.bBOSS||e.Thing.bBOSSDEATH)?2:5) )
lastcombat = AddOneliner("scorekill",1,15);
}
}
if ( !e.Thing.default.bCountKill ) // no credits