[nexuiz-commits] r7381 - in branches/nexuiz-2.0: . data data/maps data/models/teamfx data/qcsrc/menu data/qcsrc/server data/sound/cdtracks
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Aug 7 06:46:58 EDT 2009
Author: div0
Date: 2009-08-07 06:46:57 -0400 (Fri, 07 Aug 2009)
New Revision: 7381
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/maps/tutorial.mapinfo
branches/nexuiz-2.0/data/models/teamfx/shockwave.md3
branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qh
branches/nexuiz-2.0/data/qcsrc/menu/menu.qc
branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc
branches/nexuiz-2.0/data/sound/cdtracks/northern-lights.ogg
branches/nexuiz-2.0/data/sound/cdtracks/thunder.ogg
Log:
r7371 | morphed | 2009-08-06 11:05:24 -0400 (Thu, 06 Aug 2009) | 1 line
rotated ctf capture shockwave
r7372 | div0 | 2009-08-06 15:20:29 -0400 (Thu, 06 Aug 2009) | 2 lines
if developer is set, list all game dirs using the newly added DP extension
r7373 | div0 | 2009-08-06 15:25:40 -0400 (Thu, 06 Aug 2009) | 2 lines
give the magic numbers names
r7374 | div0 | 2009-08-07 02:08:21 -0400 (Fri, 07 Aug 2009) | 6 lines
keyhunt:
1. route to key carrier, not to key
2. adjust ratings
This appears to fix the bot AI on aneurysm.
r7375 | div0 | 2009-08-07 03:32:57 -0400 (Fri, 07 Aug 2009) | 2 lines
vorbisgain tutorial
r7376 | div0 | 2009-08-07 03:36:14 -0400 (Fri, 07 Aug 2009) | 2 lines
add northern-lights to the track list
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-08-07 09:34:09 UTC (rev 7380)
+++ branches/nexuiz-2.0/.patchsets 2009-08-07 10:46:57 UTC (rev 7381)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7369
+revisions_applied = 1-7376
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-08-07 09:34:09 UTC (rev 7380)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-08-07 10:46:57 UTC (rev 7381)
@@ -1388,7 +1388,7 @@
set sv_foginterval 0
// Audio track names (for old-style "cd loop NUMBER" usage)
-set g_cdtracks_remaplist "digital-pursuit breakdown-easy brainsukker chaos-fog infight neuronal-diving subcities thru-the-mirror calling-bogus beast-of-insanity thunder brokenlight brokenlight stairs sixtyfour_ desert3 ninesix sixtyfour_revisited" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"
+set g_cdtracks_remaplist "digital-pursuit breakdown-easy brainsukker chaos-fog infight neuronal-diving subcities thru-the-mirror calling-bogus beast-of-insanity thunder brokenlight brokenlight stairs sixtyfour_ desert3 ninesix sixtyfour_revisited northern-lights" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"
set g_cdtracks_dontusebydefault "digital-pursuit thunder brokenlight" "list used by mapinfo system to automatically assign cdtracks - must be a subset of g_cdtracks_remaplist"
cd remap $g_cdtracks_remaplist
set sv_intermission_cdtrack ""
Modified: branches/nexuiz-2.0/data/maps/tutorial.mapinfo
===================================================================
--- branches/nexuiz-2.0/data/maps/tutorial.mapinfo 2009-08-07 09:34:09 UTC (rev 7380)
+++ branches/nexuiz-2.0/data/maps/tutorial.mapinfo 2009-08-07 10:46:57 UTC (rev 7381)
@@ -1,7 +1,7 @@
title Tutorial
description Nexuiz Tutorial
author Map by FruitieX, tutor voice by -z-
-cdtrack northern-lights.ogg
+cdtrack 19
type dm 1 0
hidden
settemp_for_type all bot_config_file maps/tutorial_bot.txt
Modified: branches/nexuiz-2.0/data/models/teamfx/shockwave.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qh 2009-08-07 09:34:09 UTC (rev 7380)
+++ branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qh 2009-08-07 10:46:57 UTC (rev 7381)
@@ -343,3 +343,7 @@
float(string s) tokenize_console = #514;
float(float i) argv_start_index = #515;
float(float i) argv_end_index = #516;
+
+string(float, float) getgamedirinfo = #626;
+#define GETGAMEDIRINFO_NAME 0
+#define GETGAMEDIRINFO_DESCRIPTION 1
Modified: branches/nexuiz-2.0/data/qcsrc/menu/menu.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/menu.qc 2009-08-07 09:34:09 UTC (rev 7380)
+++ branches/nexuiz-2.0/data/qcsrc/menu/menu.qc 2009-08-07 10:46:57 UTC (rev 7381)
@@ -22,6 +22,20 @@
{
dprint_load();
check_unacceptable_compiler_bugs();
+
+ // list all game dirs (TEST)
+ if(cvar("developer"))
+ {
+ float i;
+ string s;
+ for(i = 0; ; ++i)
+ {
+ s = getgamedirinfo(i, GETGAMEDIRINFO_NAME);
+ if not(s)
+ break;
+ print(s, ": ", getgamedirinfo(i, GETGAMEDIRINFO_DESCRIPTION));
+ }
+ }
}
void UpdateConWidthHeight()
Modified: branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc 2009-08-07 09:34:09 UTC (rev 7380)
+++ branches/nexuiz-2.0/data/qcsrc/server/havocbot_roles.qc 2009-08-07 10:46:57 UTC (rev 7381)
@@ -333,12 +333,14 @@
}
}
if(!head.owner)
- navigation_routerating(head, ratingscale_dropped, 100000);
+ navigation_routerating(head, ratingscale_dropped * BOT_PICKUP_RATING_HIGH, 100000);
else if(head.team == self.team)
- navigation_routerating(head, ratingscale_team, 100000);
+ navigation_routerating(head.owner, ratingscale_team * BOT_PICKUP_RATING_HIGH, 100000);
else
- navigation_routerating(head, ratingscale_enemy, 100000);
+ navigation_routerating(head.owner, ratingscale_enemy * BOT_PICKUP_RATING_HIGH, 100000);
}
+
+ havocbot_goalrating_items(1, self.origin, 10000);
};
void() havocbot_role_kh_carrier;
@@ -350,7 +352,7 @@
if(self.deadflag != DEAD_NO)
return;
- if (!(self.items & IT_KEY1))
+ if (!(self.kh_next))
{
dprint("changing role to freelancer\n");
self.havocbot_role = havocbot_role_kh_freelancer;
@@ -364,11 +366,10 @@
navigation_goalrating_start();
if(kh_Key_AllOwnedByWhichTeam() == self.team)
- havocbot_goalrating_kh(100000, 1, 1); // bring home
+ havocbot_goalrating_kh(10, 0.1, 0.1); // bring home
else
- havocbot_goalrating_kh(40000, 40000, 1000); // play defensively
+ havocbot_goalrating_kh(4, 4, 1); // play defensively
- havocbot_goalrating_items(10000, self.origin, 10000);
navigation_goalrating_end();
}
}
@@ -378,7 +379,7 @@
if(self.deadflag != DEAD_NO)
return;
- if (self.items & IT_KEY1)
+ if (self.kh_next)
{
dprint("changing role to carrier\n");
self.havocbot_role = havocbot_role_kh_carrier;
@@ -404,13 +405,12 @@
key_owner_team = kh_Key_AllOwnedByWhichTeam();
if(key_owner_team == self.team)
- havocbot_goalrating_kh(100000, 1, 1); // defend key carriers
+ havocbot_goalrating_kh(10, 0.1, 0.1); // defend key carriers
else if(key_owner_team == -1)
- havocbot_goalrating_kh(40000, 10000, 1); // play defensively
+ havocbot_goalrating_kh(4, 1, 0.1); // play defensively
else
- havocbot_goalrating_kh(1, 1, 100000); // ATTACK ANYWAY
+ havocbot_goalrating_kh(0.1, 0.1, 10); // ATTACK ANYWAY
- havocbot_goalrating_items(10000, self.origin, 10000);
navigation_goalrating_end();
}
};
@@ -420,7 +420,7 @@
if(self.deadflag != DEAD_NO)
return;
- if (self.items & IT_KEY1)
+ if (self.kh_next)
{
dprint("changing role to carrier\n");
self.havocbot_role = havocbot_role_kh_carrier;
@@ -447,13 +447,12 @@
key_owner_team = kh_Key_AllOwnedByWhichTeam();
if(key_owner_team == self.team)
- havocbot_goalrating_kh(100000, 1, 1); // defend anyway
+ havocbot_goalrating_kh(10, 0.1, 0.1); // defend anyway
else if(key_owner_team == -1)
- havocbot_goalrating_kh(1, 10000, 40000); // play offensively
+ havocbot_goalrating_kh(0.1, 1, 4); // play offensively
else
- havocbot_goalrating_kh(1, 1, 100000); // ATTACK! EMERGENCY!
+ havocbot_goalrating_kh(0.1, 0.1, 10); // ATTACK! EMERGENCY!
- havocbot_goalrating_items(10000, self.origin, 10000);
navigation_goalrating_end();
}
};
@@ -463,7 +462,7 @@
if(self.deadflag != DEAD_NO)
return;
- if (self.items & IT_KEY1)
+ if (self.kh_next)
{
dprint("changing role to carrier\n");
self.havocbot_role = havocbot_role_kh_carrier;
@@ -498,13 +497,12 @@
key_owner_team = kh_Key_AllOwnedByWhichTeam();
if(key_owner_team == self.team)
- havocbot_goalrating_kh(100000, 1, 1); // defend anyway
+ havocbot_goalrating_kh(10, 0.1, 0.1); // defend anyway
else if(key_owner_team == -1)
- havocbot_goalrating_kh(10000, 40000, 10000); // prefer dropped keys
+ havocbot_goalrating_kh(1, 10, 4); // prefer dropped keys
else
- havocbot_goalrating_kh(1, 1, 100000); // ATTACK ANYWAY
+ havocbot_goalrating_kh(0.1, 0.1, 10); // ATTACK ANYWAY
- havocbot_goalrating_items(10000, self.origin, 10000);
navigation_goalrating_end();
}
};
Modified: branches/nexuiz-2.0/data/sound/cdtracks/northern-lights.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/cdtracks/thunder.ogg
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list