Configurable time limit

Classes/KFGG.uc

@@ -11,8 +11,7 @@ class KFGG extends KFGameType
     config(KFGunGameGarbage);
 
 var int WarmupTime; // How long to do a pre match warmup before starting the round
-var bool bDidWarmup, bDoingWarmup;
-var int WarmupCountDown;
+var bool bDidWarmup;
 
 var private transient KFGGGameReplicationInfo GG_GRI;
 var private transient array<string> WeaponList;
@@ -77,6 +76,10 @@ event InitGame(string Options, out string Error) {
     local KFLevelRules KFLRit;
     local ShopVolume SH;
     local ZombieVolume ZZ;
+    local KFGGSettings Settings;
+
+    Settings = new(outer) class'KFGGSettings';
+    TimeLimit = Settings.TimeLimit;
 
     MaxLives = 0;
     super(DeathMatch).InitGame(Options, Error);
@@ -455,7 +458,7 @@ function Killed(Controller Killer, Controller Killed, Pawn KilledPawn, class<Dam
             }
         }
 
-        if (!bDoingWarmup && KFGGPRI(Killer.PlayerReplicationInfo).WeaponLevel >= WeaponList.Length) {
+        if (!GG_GRI.bDoingWarmup && KFGGPRI(Killer.PlayerReplicationInfo).WeaponLevel >= WeaponList.Length) {
             MusicPlaying = true;
             CalmMusicPlaying = false;
 
@@ -779,7 +782,7 @@ auto State PendingMatch {
     function beginstate() {
         bWaitingToStartMatch = true;
         StartupStage = 0;
-        WarmupCountDown = WarmupTime;
+        GG_GRI.WarmupCountDown = WarmupTime;
         // if (IsA('xLastManStandingGame') )
         //     NetWait = Max(NetWait,10);
     }
@@ -851,17 +854,17 @@ state MatchInProgress {
         GameReplicationInfo.ElapsedTime = ElapsedTime;
 
         if (!bDidWarmup && WarmupTime > 0) {
-            WarmupCountDown--;
+            GG_GRI.WarmupCountDown--;
 
-            if (WarmupCountDown <= (default.CountDown - 1) && WarmupCountDown > 0) {
-                StartupStage = 5 - WarmupCountDown;
+            if (GG_GRI.WarmupCountDown <= (default.CountDown - 1) && GG_GRI.WarmupCountDown > 0) {
+                StartupStage = 5 - GG_GRI.WarmupCountDown;
                 PlayStartupMessage();
             }
 
-            if (WarmupCountDown <= 0) {
+            if (GG_GRI.WarmupCountDown <= 0) {
                 ResetBeforeMatchStart();
                 bDidWarmup = true;
-                bDoingWarmup = false;
+                GG_GRI.bDoingWarmup = false;
                 StartMatch();
 
                 for (C = Level.ControllerList; C != none; C = C.nextController) {
@@ -881,7 +884,7 @@ state MatchInProgress {
                 StartupStage = 6;
 
             } else {
-                bDoingWarmup = true;
+                GG_GRI.bDoingWarmup = true;
             }
         } else {
             bDidWarmup = true;

Classes/KFGGGameReplicationInfo.uc

@@ -3,11 +3,13 @@ class KFGGGameReplicationInfo extends KFGameReplicationInfo;
 const MAXWEAPONS=100;           // 100 is more than enough for all vanilla weapons + custom gg ones
 var byte MaxWeaponLevel;        // The maximum weapon level before someone wins the match
 var int WarmupTime;             // How long to do a pre match warmup before starting the round
+var int WarmupCountDown;
+var bool bDoingWarmup;
 var string weapons[MAXWEAPONS];
 
 replication {
     reliable if (Role == ROLE_Authority)
-        MaxWeaponLevel, WarmupTime, weapons;
+        MaxWeaponLevel, WarmupTime, weapons, WarmupCountDown, bDoingWarmup;
 }
 
 // load all required stuff from `KFGGSettings`

Classes/KFGGScoreBoard.uc

@@ -9,22 +9,30 @@ var localized string WeaponLevelString;
 function DrawTitle(Canvas Canvas, float HeaderOffsetY, float PlayerAreaY, float PlayerBoxSizeY) {
     local string TitleString, ScoreInfoString, RestartString;
     local float TitleXL, ScoreInfoXL, YL, TitleY, TitleYL;
+    local KFGGGameReplicationInfo GG_GRI;
 
+    GG_GRI = KFGGGameReplicationInfo(GRI);
     TitleString = GameTypeTitleString @
         "|" @
         MaxWeaponLevelString $
         ":" @
-        KFGGGameReplicationInfo(GRI).MaxWeaponLevel @
+        GG_GRI.MaxWeaponLevel @
         "|" @
         Level.Title;
 
     Canvas.Font = class'ROHud'.static.GetSmallMenuFont(Canvas);
     Canvas.StrLen(TitleString, TitleXL, TitleYL);
 
-    if (GRI.TimeLimit != 0) {
-        ScoreInfoString = TimeLimit $ FormatTime(GRI.RemainingTime);
-    } else {
-        ScoreInfoString = FooterText @ FormatTime(GRI.ElapsedTime);
+    if(GG_GRI != none && GG_GRI.bDoingWarmup){
+        ScoreInfoString = "WARMUP:" $ FormatTime(GG_GRI.WarmupTime - GRI.ElapsedTime);
+    }
+    else
+    {
+        if (GRI.TimeLimit != 0) {
+            ScoreInfoString = TimeLimit $ FormatTime(GRI.RemainingTime);
+        } else {
+            ScoreInfoString = FooterText @ FormatTime(GRI.ElapsedTime);
+        }
     }
 
     Canvas.DrawColor = HUDClass.default.RedColor;

Classes/KFGGSettings.uc

@@ -4,6 +4,7 @@ class KFGGSettings extends Object
 const INI="KFGunGameSettings";
 
 var config int WarmupTime;              // How long to do a pre match warmup before starting the round
+var config int TimeLimit;               // How long should the match be
 var config string WeaponListName;       // what weapon list to use
 var transient array<string> Weapons;    // weapons!
 
@@ -44,5 +45,6 @@ simulated function array<string> GetAllWeaponLists() {
 defaultproperties {
     // defaults in case someone forgets about config
     WarmupTime=30
+    TimeLimit=15
     WeaponListName="Default"
 }

Configs/KFGunGameSettings.ini

@@ -2,6 +2,8 @@
 ;= Home repo: https://github.com/InsultingPros/KFGunGame
 ;= how long to do a pre match warmup before starting the round
 WarmupTime=25
+;= how many minutes should the game last (does not include warmup)
+TimeLimit=15
 ;= what weapon list to use
 WeaponListName=Default