From d60382f8c9caf735717daccc9a3ca9be0084e4b5 Mon Sep 17 00:00:00 2001 From: Xylemon Date: Mon, 17 Jul 2023 16:47:31 -0700 Subject: [PATCH] - Finish removal of sh_scialert - Small change to default.cfg - First try at sh_scirand --- src/server/monster_scientist.qc | 10 +++++++--- zpak001.pk3dir/default.cfg | 5 +---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/server/monster_scientist.qc b/src/server/monster_scientist.qc index 1bbdee2..ee7e8b2 100644 --- a/src/server/monster_scientist.qc +++ b/src/server/monster_scientist.qc @@ -442,9 +442,8 @@ monster_scientist::Respawn(void) if (g_chosen_mode == SHMODE_INVASION) m_iAlliance = MAL_ALIEN; - /* scientists are always afraid in standard hunting - * and scialert mode */ - if (autocvar_sh_scialert || g_chosen_mode == SHMODE_STANDARD || g_chosen_mode == SHMODE_MADNESS || g_chosen_mode == SHMODE_INVASION) { + /* scientists are always afraid in these modes */ + if (g_chosen_mode == SHMODE_STANDARD || g_chosen_mode == SHMODE_MADNESS || g_chosen_mode == SHMODE_INVASION) { m_iFlags |= MONSTER_FEAR; } @@ -519,7 +518,12 @@ monster_scientist::Spawned(void) m_talkUnfollow = "!SC_WAIT"; m_talkFollow = "!SC_OK"; m_talkStopFollow = "!SC_STOP"; + + if (cvar("sh_scirand") == 1) { m_iBody = -1; + } else { + m_iBody = ""; + } model = "models/scientist.mdl"; base_mins = [-16,-16,0]; diff --git a/zpak001.pk3dir/default.cfg b/zpak001.pk3dir/default.cfg index f79a35f..e6b0d25 100644 --- a/zpak001.pk3dir/default.cfg +++ b/zpak001.pk3dir/default.cfg @@ -54,7 +54,4 @@ alias mp_fraglimit fraglimit // video settings seta gl_overbright 0 seta gl_ldr 1 -seta r_lightmap_format rgb8 - -// keep compat with old cvar -alias sv_gamemode "sh_realistic $*" // sets the gamemode for Scientist Hunt; 0 - Standard Hunting, 1 - Stealth Hunting, 2 - Traditional Slaughter, 3 - Live in Fear, 4 - Madness, +seta r_lightmap_format rgb8 \ No newline at end of file