From: Mario <mario.mario@y7mail.com>
Date: Sun, 24 Feb 2013 18:45:36 +0000 (+1100)
Subject: Add support for custom monster target range
X-Git-Tag: xonotic-v0.8.0~241^2^2~509
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=66c661d8980c4c3238c28bd8ddc3be2bf2a257fc;p=xonotic%2Fxonotic-data.pk3dir.git

Add support for custom monster target range
---

diff --git a/monsters.cfg b/monsters.cfg
index 71944123a..bf0563148 100644
--- a/monsters.cfg
+++ b/monsters.cfg
@@ -13,6 +13,7 @@ set g_monsters_typefrag 1
 set g_monsters_healthbars 1 "Show health bars above monsters"
 set g_monsters_giants_only 0
 set g_monsters_nogiants 1
+set g_monsters_target_range 2000
 set g_monsters_respawn 1 "Enable monster respawning"
 set g_monsters_respawn_delay 20 "Monsters respawn in this amount of seconds"
 set g_monsters_score_kill 1 "Get this many points for killing a naturally spawned monster"
diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index 25d0567a1..ff8d5b66e 100644
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -1304,6 +1304,7 @@ float autocvar_g_monsters;
 float autocvar_g_monsters_max;
 float autocvar_g_monsters_max_perplayer;
 float autocvar_g_monsters_giants_only;
+float autocvar_g_monsters_target_range;
 float autocvar_g_monsters_typefrag;
 float autocvar_g_monsters_owners;
 float autocvar_g_monsters_miniboss_chance;
diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 33a1e1efa..baeb3016b 100644
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -69,7 +69,7 @@ float monster_isvalidtarget (entity targ, entity ent, float neutral)
 		
 	traceline(ent.origin, targ.origin, FALSE, ent);
 	
-	if(vlen(targ.origin - ent.origin) >= 2000)
+	if(vlen(targ.origin - ent.origin) >= ent.target_range)
 		return FALSE; // enemy is too far away
 
 	if(trace_ent != targ)
@@ -757,6 +757,9 @@ float monster_initialize(string  net_name,
 	self.pos1				= self.origin;
 	self.pos2				= self.angles;
 	
+	if not(self.target_range)
+		self.target_range = autocvar_g_monsters_target_range;
+	
 	if not(self.respawntime)
 		self.respawntime = autocvar_g_monsters_respawn_delay;