Fix jump pad destination waypoint position in a more reliable way

It gets rid of 2 "Waypoint stuck" warnings (with developer 1) on Implosion on map start
due to the particular geometry at the waypoint destination that neither move_out_of_solid
nor nudgeoutofsolid_OrFallback are able to fix

diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc
index 2edbc6236aa0635a3a5ca4331a8fe8bdabdda9f1..18cd9ccca588c37f4a4ecb9d12427a18f5c150f0 100644 (file)
--- a/qcsrc/common/mapobjects/trigger/jumppads.qc
+++ b/qcsrc/common/mapobjects/trigger/jumppads.qc
@@ -682,6 +682,7 @@ bool trigger_push_test(entity this, entity item)
                        {
                                if (!(boxesoverlap(this.absmin, this.absmax + eZ * 50, best_target + PL_MIN_CONST, best_target + PL_MAX_CONST)))
                                {
+                                       e.velocity = best_vel;
                                        float velxy = vlen(vec2(best_vel));
                                        float cost = vlen(vec2(t.origin - best_org)) / velxy;
                                        if(velxy < autocvar_sv_maxspeed)

diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc
index 22a825528afb4378ed8240ab1d3988c1b0d7f338..0b297e6ed362216de400c904c52a635d00d67c8a 100644 (file)
--- a/qcsrc/server/bot/default/waypoints.qc
+++ b/qcsrc/server/bot/default/waypoints.qc
@@ -466,6 +466,9 @@ entity waypoint_spawn(vector m1, vector m2, float f)
                        setsize(w, PL_CROUCH_MIN_CONST - '1 1 0', PL_CROUCH_MAX_CONST + '1 1 0');
                else
                        setsize(w, PL_MIN_CONST - '1 1 0', PL_MAX_CONST + '1 1 0');
+               // Test if the waypoint is next to an obstacle or wall and if so move it 1qu away.
+               // It avoids bad linkage from other waypoints due to collision_extendtraceboxlength 1 that makes
+               // tracewalk think the bot would be stuck in solid if it got to the exact tracewalk destination
                if(!move_out_of_solid(w))
                {
                        if(!(f & WAYPOINTFLAG_GENERATED))
@@ -479,7 +482,7 @@ entity waypoint_spawn(vector m1, vector m2, float f)
                                if(autocvar_developer > 0)
                                {
                                        LOG_INFO("A generated waypoint is stuck in solid at ", vtos(w.origin));
-                                       backtrace("Waypoint stuck");
+                                       backtrace("Waypoint stuck\n");
                                }
                        }
                }
@@ -2063,7 +2066,22 @@ void waypoint_spawnforteleporter_wz(entity e, entity tracetest_ent)
 
 void waypoint_spawnforteleporter(entity e, vector destination, float timetaken, entity tracetest_ent)
 {
+       vector dest_save = destination;
        destination = waypoint_fixorigin(destination, tracetest_ent);
+
+       if (tracetest_ent.velocity.x != 0 || tracetest_ent.velocity.y != 0)
+       {
+               // Test if the destination waypoint is next to an obstacle or wall and if so move it back 1qu.
+               // It avoids bad linkage from other waypoints.
+               // This method is more reliable than waypoint_spawn's one using move_out_of_solid
+               vector dest_test = destination + '0 0 1'; // z offset prevents trace_startsolid on bumpy terrain
+               tracebox(dest_test, PL_MIN_CONST - '1 1 0', PL_MAX_CONST + '1 1 0', dest_test, MOVE_NOMONSTERS, tracetest_ent);
+               if (trace_startsolid)
+               {
+                       destination = dest_save;
+                       destination = waypoint_fixorigin(destination - normalize(vec2(tracetest_ent.velocity)), tracetest_ent);
+               }
+       }
        waypoint_spawnforteleporter_boxes(e, WAYPOINTFLAG_TELEPORT, e.absmin - PL_MAX_CONST, e.absmax - PL_MIN_CONST, destination, destination, timetaken);
 }