fn/scihunt
fn/scihunt
3
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

monster_scientist: Make use of the new NSMonster APIs

Browse source
This commit is contained in:
Marco Cawthorne 2022-07-25 09:16:52 -07:00
parent 18bd1303b6
commit fefc95108f
Signed by: eukara
GPG key ID: CE2032F0A2882A22
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/server/monster_scientist.qc
View file

@ -208,7 +208,8 @@ monster_scientist::TalkPanic(void)
void void
monster_scientist::Pain(void) monster_scientist::Pain(void)
{ {
if (style == MONSTER_DEAD) /* don't bother if we're fully dead */
if (IsAlive() == false)
return; return;
if (autocvar_sh_sciattack) if (autocvar_sh_sciattack)
@ -216,17 +217,13 @@ monster_scientist::Pain(void)
StartleAllies(); StartleAllies();
if (m_flAnimTime > time) { if (InAnimation() == true)
return; return;
}
if (random() < 0.25f) { if (random() < 0.25f)
return; return;
}
if (style != MONSTER_DEAD)
Sound_Speak(this, "monster_scientist.pain");
Sound_Speak(this, "monster_scientist.pain");
frame = SCIA_FLINCH + floor(random(0, 6)); frame = SCIA_FLINCH + floor(random(0, 6));
m_flAnimTime = time + 0.25f; m_flAnimTime = time + 0.25f;
m_iFlags |= MONSTER_FEAR; m_iFlags |= MONSTER_FEAR;
@ -240,7 +237,7 @@ monster_scientist::Death(void)
StartleAllies(); StartleAllies();
if (style != MONSTER_DEAD) { if (IsAlive() == false) {
if (g_dmg_eAttacker.flags & FL_CLIENT) if (g_dmg_eAttacker.flags & FL_CLIENT)
rules.ScientistKill((player)g_dmg_eAttacker, (entity)this); rules.ScientistKill((player)g_dmg_eAttacker, (entity)this);