Increase pokenade lifetime and add an option for infinite lifetime

diff --git a/mutators.cfg b/mutators.cfg
index 1f66279a32ecc85b96b729a6d8ea3f2f148bf5d6..4b79048677499c02e4af4a2ff9071b05702d72c7 100644 (file)
--- a/mutators.cfg
+++ b/mutators.cfg
@@ -218,7 +218,7 @@ set g_nades_heal_friend 1 "Multiplier of health given to team mates"
 set g_nades_heal_foe   -2 "Multiplier of health given to enemies"
 
 // Pokenade (7)
-set g_nades_pokenade_monster_lifetime 20 "How long pokenade monster will survive"
+set g_nades_pokenade_monster_lifetime 150 "How long pokenade monster will survive"
 set g_nades_pokenade_monster_type "zombie" "Monster to spawn"
 
 

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 94bd0523e1fe4b0a9b0b6077ce5f5f45b1120ec8..4ad97139ff1e67dfab33625c1055971649436876 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1321,7 +1321,7 @@ float autocvar_g_nades_heal_rate;
 float autocvar_g_nades_heal_friend;
 float autocvar_g_nades_heal_foe;
 string autocvar_g_nades_pokenade_monster_type;
-//float autocvar_g_nades_pokenade_monster_lifetime;
+float autocvar_g_nades_pokenade_monster_lifetime;
 float autocvar_g_campcheck_damage;
 float autocvar_g_campcheck_distance;
 float autocvar_g_campcheck_interval;

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index bd858796a8f23050187912d51b15aad8154fdc08..b8478503381588b3a2a3e918103d04b597ac203d 100644 (file)
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -343,7 +343,7 @@ void nade_translocate_boom()
 
        vector locout = self.origin + '0 0 1' * (1 - self.realowner.mins_z - 24);
        tracebox(locout, self.realowner.mins, self.realowner.maxs, locout, MOVE_NOMONSTERS, self.realowner);
-       locout = trace_endpos
+       locout = trace_endpos;
 
        makevectors(self.realowner.angles);
 
@@ -467,7 +467,8 @@ void nade_monster_boom()
 {
        entity e = spawnmonster(self.pokenade_type, 0, self.realowner, self.realowner, self.origin, FALSE, FALSE, 1);
        
-       //e.monster_lifetime = time + autocvar_g_nades_pokenade_monster_lifetime;
+       if(autocvar_g_nades_pokenade_monster_lifetime > 0)
+               e.monster_lifetime = time + autocvar_g_nades_pokenade_monster_lifetime;
        e.monster_skill = MONSTER_SKILL_INSANE;
 }