Merge branch 'master' into terencehill/bot_ai

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / onslaught / sv_onslaught.qc

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
index fd050df0a0f541cc0137303fe86ad15ab26ba60b..7258a190ea77730cd2482ba388340c1fe4787b7e 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
@@ -1293,29 +1293,24 @@ void havocbot_goalrating_ons_offenseitems(entity this, float ratingscale, vector
 
 void havocbot_role_ons_setrole(entity this, int role)
 {
 
 void havocbot_role_ons_setrole(entity this, int role)
 {

-       LOG_DEBUG(this.netname," switched to ");

        switch(role)
        {
                case HAVOCBOT_ONS_ROLE_DEFENSE:
        switch(role)
        {
                case HAVOCBOT_ONS_ROLE_DEFENSE:

-                       LOG_DEBUG("defense");
+                       LOG_DEBUG(this.netname, " switched to defense");

                        this.havocbot_role = havocbot_role_ons_defense;
                        this.havocbot_role = havocbot_role_ons_defense;

-                       this.havocbot_role_flags = HAVOCBOT_ONS_ROLE_DEFENSE;

                        this.havocbot_role_timeout = 0;
                        break;
                case HAVOCBOT_ONS_ROLE_ASSISTANT:
                        this.havocbot_role_timeout = 0;
                        break;
                case HAVOCBOT_ONS_ROLE_ASSISTANT:

-                       LOG_DEBUG("assistant");
+                       LOG_DEBUG(this.netname, " switched to assistant");

                        this.havocbot_role = havocbot_role_ons_assistant;
                        this.havocbot_role = havocbot_role_ons_assistant;

-                       this.havocbot_role_flags = HAVOCBOT_ONS_ROLE_ASSISTANT;

                        this.havocbot_role_timeout = 0;
                        break;
                case HAVOCBOT_ONS_ROLE_OFFENSE:
                        this.havocbot_role_timeout = 0;
                        break;
                case HAVOCBOT_ONS_ROLE_OFFENSE:

-                       LOG_DEBUG("offense");
+                       LOG_DEBUG(this.netname, " switched to offense");

                        this.havocbot_role = havocbot_role_ons_offense;
                        this.havocbot_role = havocbot_role_ons_offense;

-                       this.havocbot_role_flags = HAVOCBOT_ONS_ROLE_OFFENSE;

                        this.havocbot_role_timeout = 0;
                        break;
        }
                        this.havocbot_role_timeout = 0;
                        break;
        }

-       LOG_DEBUG("");

 }
 
 void havocbot_goalrating_ons_controlpoints_attack(entity this, float ratingscale)
 }
 
 void havocbot_goalrating_ons_controlpoints_attack(entity this, float ratingscale)


@@ -1340,9 +1335,9 @@ void havocbot_goalrating_ons_controlpoints_attack(entity this, float ratingscale
 
                // Count team mates interested in this control point
                // (easier and cleaner than keeping counters per cp and teams)
 
                // Count team mates interested in this control point
                // (easier and cleaner than keeping counters per cp and teams)

-               FOREACH_CLIENT(IS_PLAYER(it), {
+               FOREACH_CLIENT(it != this && IS_PLAYER(it), {

                        if(SAME_TEAM(it, this))
                        if(SAME_TEAM(it, this))

-                       if(it.havocbot_role_flags & HAVOCBOT_ONS_ROLE_OFFENSE)
+                       if(it.havocbot_role == havocbot_role_ons_offense)

                        if(it.havocbot_ons_target == cp2)
                                ++c;
                });
                        if(it.havocbot_ons_target == cp2)
                                ++c;
                });


@@ -1353,7 +1348,7 @@ void havocbot_goalrating_ons_controlpoints_attack(entity this, float ratingscale
        }
 
        // We'll consider only the best case
        }
 
        // We'll consider only the best case

-       bestvalue = 99999999999;
+       bestvalue = FLOAT_MAX;

        cp = NULL;
        for(cp1 = ons_worldcplist; cp1; cp1 = cp1.ons_worldcpnext)
        {
        cp = NULL;
        for(cp1 = ons_worldcplist; cp1; cp1 = cp1.ons_worldcpnext)
        {


@@ -1379,23 +1374,21 @@ void havocbot_goalrating_ons_controlpoints_attack(entity this, float ratingscale
                // Rate waypoints near it
                found = false;
                best = NULL;
                // Rate waypoints near it
                found = false;
                best = NULL;

-               bestvalue = 99999999999;
-               for(radius=0; radius<1000 && !found; radius+=500)
+               bestvalue = FLOAT_MAX;
+               for (radius = 500; radius <= 1000 && !found; radius += 500)

                {
                {

-                       for(wp=findradius(cp.origin,radius); wp; wp=wp.chain)
+                       IL_EACH(g_waypoints, vdist(cp.origin - it.origin, <, radius),

                        {
                        {

-                               if(!(wp.wpflags & WAYPOINTFLAG_GENERATED))
-                               if(wp.classname=="waypoint")
-                               if(checkpvs(wp.origin,cp))
+                               if (!(it.wpflags & WAYPOINTFLAG_GENERATED) && checkpvs(it.origin, cp))

                                {
                                        found = true;
                                {
                                        found = true;

-                                       if(wp.cnt<bestvalue)
+                                       if (it.cnt < bestvalue)

                                        {
                                        {

-                                               best = wp;
-                                               bestvalue = wp.cnt;
+                                               best = it;
+                                               bestvalue = it.cnt;

                                        }
                                }
                                        }
                                }

-                       }
+                       });

                }
 
                if(best)
                }
 
                if(best)


@@ -1418,22 +1411,7 @@ void havocbot_goalrating_ons_controlpoints_attack(entity this, float ratingscale
        {
                // Should be touched
                LOG_DEBUG(this.netname, " found a touchable controlpoint at ", vtos(cp.origin));
        {
                // Should be touched
                LOG_DEBUG(this.netname, " found a touchable controlpoint at ", vtos(cp.origin));

-               found = false;
-
-               // Look for auto generated waypoint
-               if (!bot_waypoints_for_items)
-               for (wp = findradius(cp.origin,100); wp; wp = wp.chain)
-               {
-                       if(wp.classname=="waypoint")
-                       {
-                               navigation_routerating(this, wp, ratingscale, 10000);
-                               found = true;
-                       }
-               }
-
-               // Nothing found, rate the controlpoint itself
-               if (!found)
-                       navigation_routerating(this, cp, ratingscale, 10000);
+               navigation_routerating(this, cp, ratingscale, 10000);

        }
 }
 
        }
 }
 


@@ -1441,7 +1419,7 @@ bool havocbot_goalrating_ons_generator_attack(entity this, float ratingscale)
 {
        entity g, wp, bestwp;
        bool found;
 {
        entity g, wp, bestwp;
        bool found;

-       int best;
+       int bestvalue;

 
        for(g = ons_worldgeneratorlist; g; g = g.ons_worldgeneratornext)
        {
 
        for(g = ons_worldgeneratorlist; g; g = g.ons_worldgeneratornext)
        {


@@ -1452,21 +1430,20 @@ bool havocbot_goalrating_ons_generator_attack(entity this, float ratingscale)
                // Rate waypoints near it
                found = false;
                bestwp = NULL;
                // Rate waypoints near it
                found = false;
                bestwp = NULL;

-               best = 99999999999;
+               bestvalue = FLOAT_MAX;

 
 

-               for(wp=findradius(g.origin,400); wp; wp=wp.chain)
+               IL_EACH(g_waypoints, vdist(g.origin - it.origin, <, 400),

                {
                {

-                       if(wp.classname=="waypoint")
-                       if(checkpvs(wp.origin,g))
+                       if (checkpvs(it.origin, g))

                        {
                                found = true;
                        {
                                found = true;

-                               if(wp.cnt<best)
+                               if (it.cnt < bestvalue)

                                {
                                {

-                                       bestwp = wp;
-                                       best = wp.cnt;
+                                       bestwp = it;
+                                       bestvalue = it.cnt;

                                }
                        }
                                }
                        }

-               }
+               });

 
                if(bestwp)
                {
 
                if(bestwp)
                {


@@ -1518,7 +1495,7 @@ void havocbot_role_ons_offense(entity this)
        if (navigation_goalrating_timeout(this))
        {
                navigation_goalrating_start(this);
        if (navigation_goalrating_timeout(this))
        {
                navigation_goalrating_start(this);

-               havocbot_goalrating_enemyplayers(this, 20000, this.origin, 650);
+               havocbot_goalrating_enemyplayers(this, 10000, this.origin, 650);

                if(!havocbot_goalrating_ons_generator_attack(this, 20000))
                        havocbot_goalrating_ons_controlpoints_attack(this, 20000);
                havocbot_goalrating_ons_offenseitems(this, 10000, this.origin, 10000);
                if(!havocbot_goalrating_ons_generator_attack(this, 20000))
                        havocbot_goalrating_ons_controlpoints_attack(this, 20000);
                havocbot_goalrating_ons_offenseitems(this, 10000, this.origin, 10000);