]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Bot AI: workaround for untouchable race checkpoints that cause bot to get stuck ...
authorterencehill <piuntn@gmail.com>
Sun, 14 Jan 2018 17:01:32 +0000 (18:01 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 14 Jan 2018 17:01:32 +0000 (18:01 +0100)
qcsrc/server/mutators/mutator/gamemode_cts.qc
qcsrc/server/mutators/mutator/gamemode_race.qc

index ca892c52ff538c59f2205bf25d1090ed48ddf1bc..0bfdc02fa2380ceadd6fdde783eed9a6e08e24a9 100644 (file)
@@ -18,12 +18,25 @@ void havocbot_role_cts(entity this)
                this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
                navigation_goalrating_start(this);
 
+               bool raw_touch_check = true;
+               int cp = this.race_checkpoint;
+
+               LABEL(search_racecheckpoints)
                IL_EACH(g_racecheckpoints, true,
                {
-                       if(it.cnt == this.race_checkpoint)
-                               navigation_routerating(this, it, 1000000, 5000);
-                       else if(this.race_checkpoint == -1)
+                       if(it.cnt == cp || cp == -1)
+                       {
+                               // redirect bot to next goal if it touched the waypoint of an untouchable checkpoint
+                               // e.g. checkpoint in front of Stormkeep's warpzone
+                               // the same workaround is applied in Race game mode
+                               if (raw_touch_check && vdist(this.origin - it.nearestwaypoint.origin, <, 30))
+                               {
+                                       cp = race_NextCheckpoint(cp);
+                                       raw_touch_check = false;
+                                       goto search_racecheckpoints;
+                               }
                                navigation_routerating(this, it, 1000000, 5000);
+                       }
                });
 
                navigation_goalrating_end(this);
index 2f581d8c433af0c6b8047e71ab7571825eb7ceba..9c2d60f38e7889991b0500fd22d7dcff660d4d52 100644 (file)
@@ -19,14 +19,23 @@ void havocbot_role_race(entity this)
                this.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
                navigation_goalrating_start(this);
 
+               bool raw_touch_check = true;
+               int cp = this.race_checkpoint;
+
+               LABEL(search_racecheckpoints)
                IL_EACH(g_racecheckpoints, true,
                {
-                       if(it.cnt == this.race_checkpoint)
-                       {
-                               navigation_routerating(this, it, 1000000, 5000);
-                       }
-                       else if(this.race_checkpoint == -1)
+                       if(it.cnt == cp || cp == -1)
                        {
+                               // redirect bot to next goal if it touched the waypoint of an untouchable checkpoint
+                               // e.g. checkpoint in front of Stormkeep's warpzone
+                               // the same workaround is applied in CTS game mode
+                               if (raw_touch_check && vdist(this.origin - it.nearestwaypoint.origin, <, 30))
+                               {
+                                       cp = race_NextCheckpoint(cp);
+                                       raw_touch_check = false;
+                                       goto search_racecheckpoints;
+                               }
                                navigation_routerating(this, it, 1000000, 5000);
                        }
                });