r6042 - in branches/nexuiz-2.0: . data/maps data/models/domination data/qcsrc/server data/textures/domination
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Mar 3 14:00:56 EST 2009
Author: div0
Date: 2009-03-03 14:00:56 -0500 (Tue, 03 Mar 2009)
New Revision: 6042
Added:
branches/nexuiz-2.0/data/models/domination/dom_axe.tga
branches/nexuiz-2.0/data/models/domination/dom_bolt.tga
Removed:
branches/nexuiz-2.0/data/textures/domination/dom_axe.tga
branches/nexuiz-2.0/data/textures/domination/dom_bolt.tga
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/maps/reslimed.waypoints
branches/nexuiz-2.0/data/qcsrc/server/bots.qc
branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc
Log:
r6037 | mand1nga | 2009-03-02 17:49:53 +0100 (Mon, 02 Mar 2009) | 1 line
Now bots can not see invisible players on minsta
r6038 | m0rfar | 2009-03-02 23:19:27 +0100 (Mon, 02 Mar 2009) | 1 line
fix my last fix
r6039 | mand1nga | 2009-03-03 03:35:47 +0100 (Tue, 03 Mar 2009) | 2 lines
Added waypoints to "unlock" two respawn points
(quite safe fixes)
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-03-03 18:23:03 UTC (rev 6041)
+++ branches/nexuiz-2.0/.patchsets 2009-03-03 19:00:56 UTC (rev 6042)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6035
+revisions_applied = 1-6035,6037-6039
Modified: branches/nexuiz-2.0/data/maps/reslimed.waypoints
===================================================================
--- branches/nexuiz-2.0/data/maps/reslimed.waypoints 2009-03-03 18:23:03 UTC (rev 6041)
+++ branches/nexuiz-2.0/data/maps/reslimed.waypoints 2009-03-03 19:00:56 UTC (rev 6042)
@@ -1,66 +1,72 @@
-'-559.0 20.7 160.1'
-'-559.0 20.7 160.1'
+'-242.4 1.6 352.1'
+'-242.4 1.6 352.1'
0
-'-814.9 -178.7 160.1'
-'-814.9 -178.7 160.1'
+'-265.2 578.2 352.1'
+'-265.2 578.2 352.1'
0
-'-1481.3 -338.1 160.1'
-'-1481.3 -338.1 160.1'
+'-627.7 666.7 352.1'
+'-627.7 666.7 352.1'
0
-'-1349.6 -924.1 -55.9'
-'-1349.6 -924.1 -55.9'
+'-624.8 210.8 -55.9'
+'-624.8 210.8 -55.9'
0
-'-1347.6 -1281.3 -55.9'
-'-1347.6 -1281.3 -55.9'
+'-631.8 509.5 -55.9'
+'-631.8 509.5 -55.9'
0
-'115.1 -942.8 64.1'
-'115.1 -942.8 64.1'
+'561.2 479.4 -55.9'
+'561.2 479.4 -55.9'
0
-' -5.2 -1100.2 160.1'
-' -5.2 -1100.2 160.1'
+'1356.0 539.8 88.1'
+'1356.0 539.8 88.1'
0
-'150.2 -22.0 352.1'
-'150.2 -22.0 352.1'
+'1562.1 474.6 88.1'
+'1562.1 474.6 88.1'
0
-'526.3 5.9 352.1'
-'526.3 5.9 352.1'
+'1511.0 185.7 88.1'
+'1511.0 185.7 88.1'
0
-'776.0 176.7 -71.9'
-'776.0 176.7 -71.9'
+'1516.7 -155.4 88.1'
+'1516.7 -155.4 88.1'
0
+'1320.5 -138.3 88.1'
+'1320.5 -138.3 88.1'
+0
'581.6 -143.2 -55.9'
'581.6 -143.2 -55.9'
0
-'1320.5 -138.3 88.1'
-'1320.5 -138.3 88.1'
+'776.0 176.7 -71.9'
+'776.0 176.7 -71.9'
0
-'1516.7 -155.4 88.1'
-'1516.7 -155.4 88.1'
+'526.3 5.9 352.1'
+'526.3 5.9 352.1'
0
-'1511.0 185.7 88.1'
-'1511.0 185.7 88.1'
+'150.2 -22.0 352.1'
+'150.2 -22.0 352.1'
0
-'1562.1 474.6 88.1'
-'1562.1 474.6 88.1'
+' -5.2 -1100.2 160.1'
+' -5.2 -1100.2 160.1'
0
-'1356.0 539.8 88.1'
-'1356.0 539.8 88.1'
+'115.1 -942.8 64.1'
+'115.1 -942.8 64.1'
0
-'561.2 479.4 -55.9'
-'561.2 479.4 -55.9'
+'-1347.6 -1281.3 -55.9'
+'-1347.6 -1281.3 -55.9'
0
-'-631.8 509.5 -55.9'
-'-631.8 509.5 -55.9'
+'-1349.6 -924.1 -55.9'
+'-1349.6 -924.1 -55.9'
0
-'-624.8 210.8 -55.9'
-'-624.8 210.8 -55.9'
+'-1481.3 -338.1 160.1'
+'-1481.3 -338.1 160.1'
0
-'-627.7 666.7 352.1'
-'-627.7 666.7 352.1'
+'-814.9 -178.7 160.1'
+'-814.9 -178.7 160.1'
0
-'-265.2 578.2 352.1'
-'-265.2 578.2 352.1'
+'-559.0 20.7 160.1'
+'-559.0 20.7 160.1'
0
-'-242.4 1.6 352.1'
-'-242.4 1.6 352.1'
+'-1014.7 -791.2 -55.9'
+'-1014.7 -791.2 -55.9'
0
+'-1159.6 -275.4 160.1'
+'-1159.6 -275.4 160.1'
+0
Copied: branches/nexuiz-2.0/data/models/domination/dom_axe.tga (from rev 6039, trunk/data/models/domination/dom_axe.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/models/domination/dom_bolt.tga (from rev 6039, trunk/data/models/domination/dom_bolt.tga)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/qcsrc/server/bots.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2009-03-03 18:23:03 UTC (rev 6041)
+++ branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2009-03-03 19:00:56 UTC (rev 6042)
@@ -1644,6 +1644,9 @@
return FALSE;
if (e.BUTTON_CHAT)
return FALSE;
+ if(g_minstagib)
+ if(e.items & IT_STRENGTH)
+ return FALSE;
return TRUE;
};
Modified: branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc 2009-03-03 18:23:03 UTC (rev 6041)
+++ branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc 2009-03-03 19:00:56 UTC (rev 6042)
@@ -250,12 +250,17 @@
FOR_EACH_PLAYER(head)
{
+ // TODO: Merge this logic with the bot_shouldattack function
if (self != head)
if (head.health > 0)
if ((noteam && (!bot_ignore_bots || clienttype(head) == CLIENTTYPE_REAL)) || head.team != self.team)
{
if (vlen(head.origin - org) > sradius)
continue;
+
+ if(g_minstagib)
+ if(head.items & IT_STRENGTH)
+ continue;
// rate only visible enemies
/*
Deleted: branches/nexuiz-2.0/data/textures/domination/dom_axe.tga
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/textures/domination/dom_bolt.tga
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list