From: Mario <mario.mario@y7mail.com>
Date: Tue, 23 Apr 2013 12:21:10 +0000 (+1000)
Subject: Add a cvar to control monster loot lifetime
X-Git-Tag: xonotic-v0.8.0~241^2^2~291
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=705a13df18fb52a14bfca9a94f1b23bfa4e60e21;p=xonotic%2Fxonotic-data.pk3dir.git

Add a cvar to control monster loot lifetime
---

diff --git a/monsters.cfg b/monsters.cfg
index 41585805c..d506ee151 100644
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -5,6 +5,7 @@ set g_monsters_skill 1 "Monster skill (affecting some of their attributes). 1 -
 set g_monsters_miniboss_chance 5
 set g_monsters_miniboss_healthboost 100
 set g_monsters_forcedrop 0 "Force all monsters to drop this item on death. Use g_monsters_drop_* cvars to change forced drop item"
+set g_monsters_drop_time 10 "Amount of time before monster's dropped loot disappears"
 set g_monsters_drop_type armor "Type of item to drop when forced. Possible values are: health, armor, ammo"
 set g_monsters_drop_size medium "Size of the item monsters drop. Possible health/amor values are: small, medium, large. Possible ammo values are: shells, bullets, cells, rockets"
 set g_monsters_owners 1 "Monsters will not attack their owners in team matches if set to 1"
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 5237ebe9b..d7c8d1144 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1257,6 +1257,7 @@ float autocvar_g_monsters_owners;
 float autocvar_g_monsters_miniboss_chance;
 float autocvar_g_monsters_miniboss_healthboost;
 float autocvar_g_monsters_forcedrop;
+float autocvar_g_monsters_drop_time;
 string autocvar_g_monsters_drop_type;
 string autocvar_g_monsters_drop_size;
 float autocvar_g_monsters_teams;
diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 905fc8aac..b0e1f0023 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -14,13 +14,11 @@ void monster_item_spawn()
 {
 	self.monster_delayedattack();
 	
-	self.think = SUB_Remove;
-	self.nextthink = time + 5;
 	self.gravity = 1;
 	self.velocity = randomvec() * 175 + '0 0 325';
 	self.touch = M_Item_Touch;
 	
-	SUB_SetFade(self, time + 5, 1);
+	SUB_SetFade(self, time + autocvar_g_monsters_drop_time, 1);
 }
 
 void Monster_DropItem (string itype, string itemsize)
diff --git a/qcsrc/server/mutators/gamemode_towerdefense.qc b/qcsrc/server/mutators/gamemode_towerdefense.qc
index 4d4506f77..6c4b81151 100644
--- a/qcsrc/server/mutators/gamemode_towerdefense.qc
+++ b/qcsrc/server/mutators/gamemode_towerdefense.qc
@@ -887,7 +887,7 @@ MUTATOR_HOOKFUNCTION(td_MonsterDies)
 		self = oldself;
 		return FALSE;
 	}
-	SUB_SetFade(self, time + 5, 1);
+	SUB_SetFade(self, time + autocvar_g_monsters_drop_time, 1);
 	
 	self = oldself;