Use normal monster skill cvar if TD starting skill cvar is 0

diff --git a/gamemodes.cfg b/gamemodes.cfg
index ca632739ffcf539436f1504fb53bcf3a6ca53601..1d66457552c20813793d80ae283a23b3ce6d5ba3 100644 (file)
--- a/gamemodes.cfg
+++ b/gamemodes.cfg
@@ -492,7 +492,7 @@ set g_td_monster_count_increment 5
 set g_td_buildphase_time 20
 set g_td_generator_dontend 0 "don't change maps when a generator is destroyed (only if there is more than 1 generator)"
 set g_td_pvp 0
-set g_td_monsters_skill_start 1
+set g_td_monsters_skill_start 1 "set to 0 to use g_monsters_skill instead"
 set g_td_monsters_skill_increment 0.1
 set g_td_monsters_spawnshield_time 2
 set g_td_max_waves 8

diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index be0655bb960d3298bae7ac8903d22e5aab06db91..706fd2a25ec5db04e162f084aeab7202fe141538 100644 (file)
--- a/qcsrc/server/mutators/gamemode_td.qc
+++ b/qcsrc/server/mutators/gamemode_td.qc
@@ -594,7 +594,7 @@ void wave_end(float starting)
        }
        
        if(starting)
-               monster_skill = autocvar_g_td_monsters_skill_start;
+               monster_skill = ((autocvar_g_td_monsters_skill_start) ? autocvar_g_td_monsters_skill_start : autocvar_g_monsters_skill);
        else
                wave_count += 1;