From a61dce17d64a28fd545954e9a5802c52689a33df Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sat, 10 Mar 2012 20:47:17 +0100 Subject: [PATCH] onslaught fixes: fix timelimit -1, and make campaign test run have a fast expiring generator --- qcsrc/server/g_world.qc | 6 +++--- qcsrc/server/mode_onslaught.qc | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 86f2b25bf..f8697ddcf 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -2140,9 +2140,6 @@ void CheckRules_World() leadlimit = 0; // no leadlimit for now } - if(g_onslaught) - timelimit = 0; // ONS has its own overtime rule - if(timelimit > 0) { timelimit += game_starttime; @@ -2154,6 +2151,9 @@ void CheckRules_World() return; } + if(g_onslaught) + timelimit = 0; // ONS has its own overtime rule + float wantovertime; wantovertime = 0; diff --git a/qcsrc/server/mode_onslaught.qc b/qcsrc/server/mode_onslaught.qc index f6e3de4cd..2e0443c8c 100644 --- a/qcsrc/server/mode_onslaught.qc +++ b/qcsrc/server/mode_onslaught.qc @@ -400,7 +400,10 @@ void onslaught_generator_think() d = d + 1; e = e.chain; } - d = d * self.max_health / 300; + if(autocvar_g_campaign && autocvar__campaign_testrun) + d = d * self.max_health; + else + d = d * self.max_health / max(30, 60 * autocvar_timelimit_suddendeath); Damage(self, self, self, d, DEATH_HURTTRIGGER, self.origin, '0 0 0'); } else if (overtime_msg_time) -- 2.39.2