Bot AI: improve ladder usage

diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index 488da59d47ace5d5ac92190b1d25e29c928912d8..75ddd15f5dabcb10bcdde3d132a28e9c1f4e7edb 100644 (file)
--- a/qcsrc/server/bot/default/navigation.qc
+++ b/qcsrc/server/bot/default/navigation.qc
@@ -50,6 +50,7 @@ bool tracewalk(entity e, vector start, vector m1, vector m2, vector end, float m
        float stepdist;
        float ignorehazards;
        float swimming;
        float stepdist;
        float ignorehazards;
        float swimming;

+       entity tw_ladder = NULL;

 
        if(autocvar_bot_debug_tracewalk)
        {
 
        if(autocvar_bot_debug_tracewalk)
        {


@@ -138,11 +139,11 @@ bool tracewalk(entity e, vector start, vector m1, vector m2, vector end, float m
                                org = trace_endpos - normalize(org - trace_endpos) * stepdist;
                                for (; org.z < end.z + e.maxs.z; org.z += stepdist)
                                {
                                org = trace_endpos - normalize(org - trace_endpos) * stepdist;
                                for (; org.z < end.z + e.maxs.z; org.z += stepdist)
                                {

-                                               if(autocvar_bot_debug_tracewalk)
-                                                       debugnode(e, org);
+                                       if(autocvar_bot_debug_tracewalk)
+                                               debugnode(e, org);

 
 

-                                       if(pointcontents(org) == CONTENT_EMPTY)
-                                                       break;
+                                       if(pointcontents(org) == CONTENT_EMPTY)
+                                               break;

                                }
 
                                if(pointcontents(org + '0 0 1') != CONTENT_EMPTY)
                                }
 
                                if(pointcontents(org + '0 0 1') != CONTENT_EMPTY)


@@ -201,6 +202,7 @@ bool tracewalk(entity e, vector start, vector m1, vector m2, vector end, float m
                                                }
                                                else if (trace_ent.classname == "func_ladder")
                                                {
                                                }
                                                else if (trace_ent.classname == "func_ladder")
                                                {

+                                                       tw_ladder = trace_ent;

                                                        vector ladder_bottom = trace_endpos - dir * m2.x;
                                                        vector ladder_top = ladder_bottom;
                                                        ladder_top.z = trace_ent.absmax.z + (-m1.z + 1);
                                                        vector ladder_bottom = trace_endpos - dir * m2.x;
                                                        vector ladder_top = ladder_bottom;
                                                        ladder_top.z = trace_ent.absmax.z + (-m1.z + 1);


@@ -255,6 +257,16 @@ bool tracewalk(entity e, vector start, vector m1, vector m2, vector end, float m
 
                        org = trace_endpos;
                }
 
                        org = trace_endpos;
                }

+
+               if(tw_ladder && org.z < tw_ladder.absmax.z)
+               {
+                       // stop tracewalk if destination height is lower than the top of the ladder
+                       // otherwise bot can't easily figure out climbing direction
+                       if(autocvar_bot_debug_tracewalk)
+                               debugnodestatus(org, DEBUG_NODE_FAIL);
+
+                       return false;
+               }

        }
 
        //print("tracewalk: ", vtos(start), " did not arrive at ", vtos(end), " but at ", vtos(org), "\n");
        }
 
        //print("tracewalk: ", vtos(start), " did not arrive at ", vtos(end), " but at ", vtos(org), "\n");