r5873 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: mand1nga
Date: 2009-02-13 15:38:16 -0500 (Fri, 13 Feb 2009)
New Revision: 5873

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/havocbot.qc
Log:
Bots: Removed bot_ai_facingwall_timeout as its not worth to have it. Some other minor fixes.


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-02-13 19:22:49 UTC (rev 5872)
+++ trunk/data/defaultNexuiz.cfg	2009-02-13 20:38:16 UTC (rev 5873)
@@ -360,8 +360,7 @@
 set bot_ai_weapon_combo 1	"Enable bots to do weapon combos"
 set bot_ai_weapon_combo_threshold 0.3	"Try to make a combo N seconds after the last attack"
 set bot_ai_friends_aware_pickup_radius "500"	"Bots will not pickup items if a team mate is this distance near the item"
-set bot_ai_facingwall_timeout 0.05	"Consider the bot to being stuck after N seconds facing and touching a wall"
-set bot_ai_ignoregoal_timeout 3	"Ignore goals leading the bots to stuck in front of a wall for N seconds"
+set bot_ai_ignoregoal_timeout 3	"Ignore goals making bots to get stuck in front of a wall for N seconds"
 // Better don't touch these, there are hard to tweak!
 set bot_ai_aimskill_order_mix_1st 0.01
 set bot_ai_aimskill_order_mix_2nd 0.1

Modified: trunk/data/qcsrc/server/havocbot.qc
===================================================================
--- trunk/data/qcsrc/server/havocbot.qc	2009-02-13 19:22:49 UTC (rev 5872)
+++ trunk/data/qcsrc/server/havocbot.qc	2009-02-13 20:38:16 UTC (rev 5873)
@@ -240,7 +240,7 @@
 				traceline(self.origin + self.view_ofs , dst_ahead, TRUE, world);
 
 				// Check head-banging against walls
-				if(vlen(self.origin + self.view_ofs - trace_endpos) < 1.5)
+				if(vlen(self.origin + self.view_ofs - trace_endpos) < 2)
 				{
 					if(self.facingwalltime && time > self.facingwalltime)
 					{
@@ -250,15 +250,14 @@
 					}
 					else
 					{
-						self.facingwalltime = time + cvar("bot_ai_facingwall_timeout");
+						self.facingwalltime = time + 0.05;
 					}
 				}
 				else
 				{
-					if(!self.ignoregoaltime)
-						self.facingwalltime = 0;
+					self.facingwalltime = 0;
 
-					if(time > self.ignoregoaltime)
+					if(self.ignoregoal != world && time > self.ignoregoaltime)
 					{
 						self.ignoregoal = world;
 						self.ignoregoaltime = 0;