[nexuiz-commits] r7897 - in trunk/data/qcsrc/server: . bot

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-25 12:31:20 -0400 (Fri, 25 Sep 2009)
New Revision: 7897

Modified:
   trunk/data/qcsrc/server/bot/navigation.qc
   trunk/data/qcsrc/server/t_items.qc
Log:
fix yet another retarded bot bug that prevents them from solving the maze: they don't care for health when "stacked" above 100h. How stupid.


Modified: trunk/data/qcsrc/server/bot/navigation.qc
===================================================================
--- trunk/data/qcsrc/server/bot/navigation.qc	2009-09-25 16:19:08 UTC (rev 7896)
+++ trunk/data/qcsrc/server/bot/navigation.qc	2009-09-25 16:31:20 UTC (rev 7897)
@@ -620,6 +620,8 @@
 	if (!e)
 		return;
 
+	//print("routerating ", etos(e), " = ", ftos(f), " - ", ftos(rangebias), "\n");
+
 	// Evaluate path using jetpack
 	if(g_jetpack)
 	if(self.items & IT_JETPACK)
@@ -767,6 +769,7 @@
 	self.navigation_hasgoals = TRUE;
 
 	// put the entity on the goal stack
+	//print("routetogoal ", etos(e), "\n");
 	navigation_pushroute(e);
 
 	if(g_jetpack)

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2009-09-25 16:19:08 UTC (rev 7896)
+++ trunk/data/qcsrc/server/t_items.qc	2009-09-25 16:31:20 UTC (rev 7897)
@@ -667,11 +667,11 @@
 	if (player.ammo_cells < g_pickup_cells_max)
 		c = c + max(0, 1 - player.ammo_cells / g_pickup_cells_max);
 	if (item.armorvalue)
-	if (player.armorvalue < item.max_armorvalue*0.5)
-		c = c + max(0, 1 - player.armorvalue / (item.max_armorvalue*0.5));
+	if (player.armorvalue < item.max_armorvalue)
+		c = c + max(0, 1 - player.armorvalue / item.max_armorvalue);
 	if (item.health)
-	if (player.health < item.max_health*0.5)
-		c = c + max(0, 1 - player.health / (item.max_health*0.5));
+	if (player.health < item.max_health)
+		c = c + max(0, 1 - player.health / item.max_health);
 
 	return item.bot_pickupbasevalue * c;
 };