AIEnhancedScoutLocation implementation; getRandomPosition; AIEnhancedDefendLocation

scripts/DXAI_Helpers.cs

@@ -155,6 +155,14 @@ function GameConnection::getObjectsInViewcone(%this, %typeMask, %distance, %perf
     return %result;
 }
 
+function getRandomPosition(%position, %distance)
+{
+    // First, we determine a random direction vector
+    %direction = vectorNormalize(getRandom(0, 10000) SPC getRandom(0, 10000) SPC getRandom(0, 10000));
+    // Return the scaled result
+    return vectorAdd(%position, vectorScale(%direction, getRandom(0, %distance)));
+}
+
 function vectorMultiply(%vec1, %vec2)
 {
     return (getWord(%vec1, 0) * getWord(%vec2, 0)) SPC 

scripts/DXAI_Main.cs

@@ -303,11 +303,8 @@ package DXAI_Hooks
     function DefaultGame::onAIRespawn(%game, %client)
     {
         // Make sure the bot has no objectives
-        %client.reset();
+       // %client.reset();
-        %client.defaultTasksAdded = true;
+      //  %client.defaultTasksAdded = true;
-        
-        // All bots have this task, see DXAI_Objectives.cs
-        %client.addTask("AIVisualAcuity");
         
         return 11595;
     }

scripts/DXAI_Objectives.cs

@@ -8,42 +8,37 @@
 // Human perception capabilities.
 // ---------------------------------------------------------------------
 
-function AIVisualAcuity::initFromObjective(%task, %objective, %client)
+function AIConnection::updateLegs(%this)
 {
-    // Called to initialize from an objective object
+    if (%this.isMoving && %this.getTaskID() != 0)
-}
-
-function AIVisualAcuity::assume(%task, %client)
-{
-    // Called when the bot starts the task
-    %task.setMonitorFreq(32);
-}
-
-function AIVisualAcuity::retire(%task, %client)
-{
-    // Called when the bot stops the task
-}
-
-function AIVisualAcuity::weight(%task, %client)
-{
-    %task.setWeight(999);
-}
-
-function AIVisualAcuity::monitor(%task, %client)
-{
- // Called when the bot is performing the task
-    if (%client.enableVisualDebug)
     {
-        if (!isObject(%client.originMarker))
+        %this.setPath(%this.moveLocation);
+        %this.stepMove(%this.moveLocation);
+        
+        if (%this.aimAtLocation)
+            %this.aimAt(%this.moveLocation);
+    }
+    else
+    {
+        %this.stop();
+        %this.clearStep();
+    }
+}
+
+function AIConnection::updateVisualAcuity(%this)
+{
+    if (%this.enableVisualDebug)
+    {
+        if (!isObject(%this.originMarker))
         {
-            %client.originMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %client.team; name = %client.namebase SPC " Origin"; };
+            %this.originMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %this.team; name = %this.namebase SPC " Origin"; };
-            %client.clockwiseMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %client.team; name = %client.namebase SPC " Clockwise"; };
+            %this.clockwiseMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %this.team; name = %this.namebase SPC " Clockwise"; };
-            %client.counterClockwiseMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %client.team; name = %client.namebase SPC " Counter Clockwise"; };
+            %this.counterClockwiseMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %this.team; name = %this.namebase SPC " Counter Clockwise"; };
-            %client.upperMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %client.team; name = %client.namebase SPC " Upper"; };
+            %this.upperMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %this.team; name = %this.namebase SPC " Upper"; };
-            %client.lowerMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %client.team; name = %client.namebase SPC " Lower"; };
+            %this.lowerMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %this.team; name = %this.namebase SPC " Lower"; };
         }
             
-        %viewCone = %client.calculateViewCone();
+        %viewCone = %this.calculateViewCone();
         %coneOrigin = getWords(%viewCone, 0, 2);
         %viewConeClockwiseVector = getWords(%viewCone, 3, 5);
         %viewConeCounterClockwiseVector = getWords(%viewCone, 6, 8);
@@ -52,28 +47,28 @@ function AIVisualAcuity::monitor(%task, %client)
         %viewConeLowerVector = getWords(%viewCone, 12, 14);
         
         // Update all the markers
-        %client.clockwiseMarker.setPosition(%viewConeClockwiseVector);
+        %this.clockwiseMarker.setPosition(%viewConeClockwiseVector);
-        %client.counterClockwiseMarker.setPosition(%viewConeCounterClockwiseVector);
+        %this.counterClockwiseMarker.setPosition(%viewConeCounterClockwiseVector);
-        %client.upperMarker.setPosition(%viewConeUpperVector);
+        %this.upperMarker.setPosition(%viewConeUpperVector);
-        %client.lowerMarker.setPosition(%viewConeLowerVector);
+        %this.lowerMarker.setPosition(%viewConeLowerVector);
-        %client.originMarker.setPosition(%coneOrigin);
+        %this.originMarker.setPosition(%coneOrigin);
     }
-    else if (isObject(%client.originMarker))
+    else if (isObject(%this.originMarker))
     {
-        %client.originMarker.delete();
+        %this.originMarker.delete();
-        %client.clockwiseMarker.delete();
+        %this.clockwiseMarker.delete();
-        %client.counterClockwiseMarker.delete();
+        %this.counterClockwiseMarker.delete();
-        %client.upperMarker.delete();
+        %this.upperMarker.delete();
-        %client.lowerMarker.delete();
+        %this.lowerMarker.delete();
     }
     
-    %result = %client.getObjectsInViewcone($TypeMasks::ProjectileObjectType | $TypeMasks::PlayerObjectType, %client.viewDistance, true);
+    %result = %this.getObjectsInViewcone($TypeMasks::ProjectileObjectType | $TypeMasks::PlayerObjectType, %this.viewDistance, true);
     
     // What can we see?
     for (%i = 0; %i < %result.getCount(); %i++)
     {
         %current = %result.getObject(%i);
-        %client.awarenessTicks[%current]++;
+        %this.awarenessTicks[%current]++;
         
         if (%current.getType() & $TypeMasks::ProjectileObjectType)
         {   
@@ -81,7 +76,7 @@ function AIVisualAcuity::monitor(%task, %client)
             // We pick a random notice time between 700ms and 1200 ms
             // Obviously this timer runs on a 32ms tick, but it should help provide a little unpredictability
             %noticeTime = getRandom(700, 1200);
-            if (%client.awarenessTicks[%current] < (%noticeTime / 32))
+            if (%this.awarenessTicks[%current] < (%noticeTime / 32))
                 continue;
             
             %className = %current.getClassName();
@@ -97,9 +92,9 @@ function AIVisualAcuity::monitor(%task, %client)
                 %hitObject = getWord(%raycast, 0);
                                 
                 // We're set for a direct hit on us!
-                if (%hitObject == %client.player)
+                if (%hitObject == %this.player)
                 {
-                    %client.setDangerLocation(%current.getPosition(), 30);
+                    %this.setDangerLocation(%current.getPosition(), 30);
                     continue;
                 }
                 
@@ -109,11 +104,11 @@ function AIVisualAcuity::monitor(%task, %client)
                 
                 // How close is the hit loc?
                 %hitLocation = getWords(%rayCast, 1, 3);
-                %hitDistance = vectorDist(%client.player.getPosition(), %hitLocation);
+                %hitDistance = vectorDist(%this.player.getPosition(), %hitLocation);
                 
                 // Is it within the radius damage of this thing?
                 if (%hitDistance <= %current.getDatablock().damageRadius)
-                    %client.setDangerLocation(%current.getPosition(), 30);
+                    %this.setDangerLocation(%current.getPosition(), 30);
             }
             // A little bit harder to detect.
             else if (%className $= "GrenadeProjectile")
@@ -124,19 +119,177 @@ function AIVisualAcuity::monitor(%task, %client)
         // See a player?
         else if (%current.getType() & $TypeMasks::PlayerObjectType)
         {
-            // ... if the moron is right there in our LOS then we probably should see them
+            %this.clientDetected(%current);
-            %start = %client.player.getPosition();
+            %this.clientDetected(%current.client);
-            %end = vectorAdd(%start, vectorScale(%client.player.getEyeVector(), %client.viewDistance));
             
-            %rayCast = containerRayCast(%start, %end, -1, %client.player);     
+            // ... if the moron is right there in our LOS then we probably should see them
+            %start = %this.player.getPosition();
+            %end = vectorAdd(%start, vectorScale(%this.player.getEyeVector(), %this.viewDistance));
+            
+            %rayCast = containerRayCast(%start, %end, -1, %this.player);     
             %hitObject = getWord(%raycast, 0);
             
-            echo(%hitObject);
+          //  echo(%hitObject);
-            echo(%current);
+           // echo(%current);
             if (%hitObject == %current)
-                %client.stepEngage(%current);
+            {
+                %this.clientDetected(%current);
+                %this.stepEngage(%current);
+            }
         }
     }
     
     %result.delete();
 }
+
+function AIConnection::enhancedLogicLoop(%this)
+{
+    cancel(%this.enhancedLogicHandle);
+    
+    if (isObject(%this.player))
+    {
+        %this.updateVisualAcuity();
+        %this.updateLegs();
+    }
+    
+    %this.enhancedLogicHandle = %this.schedule(32, "enhancedLogicLoop");
+}
+
+//-------------------------------------------------------------
+function AIEnhancedDefendLocation::initFromObjective(%task, %objective, %client)
+{
+    // Called to initialize from an objective object
+}
+
+function AIEnhancedDefendLocation::assume(%task, %client)
+{
+    // Called when the bot starts the task
+    %task.setMonitorFreq(1);
+}
+
+function AIEnhancedDefendLocation::retire(%task, %client)
+{
+    // Called when the bot stops the task
+}
+
+function AIEnhancedDefendLocation::weight(%task, %client)
+{
+    %task.setWeight(1000);
+}
+
+function AIEnhancedDefendLocation::monitor(%task, %client)
+{   
+   // echo(%task.getMonitorFreq());
+    if (%client.getPathDistance(%client.defendLocation) <= 40)
+    {
+        // Pick a random time to move to a nearby location
+        if (%client.defendTime == -1)
+        {
+            %client.nextDefendRotation = getRandom(5000, 10000);
+            %client.isMoving = false;
+        }
+        
+        // If we're near our random point, just don't move
+        if (%client.getPathDistance(%client.moveLocation) <= 10)
+            %client.isMoving = false;
+            
+        %client.defendTime += 32;
+        if (%client.defendTime >= %client.nextDefendRotation)
+        {
+            %client.defendTime = 0;
+            %client.nextDefendRotation = getRandom(5000, 10000);
+            
+            // TODO: Replace with something that detects interiors as well
+            %randomPosition = getRandomPosition(%client.defendLocation, 40);
+            %randomPosition = getWords(%randomPosition, 0, 1) SPC getTerrainHeight(%randomPosition);
+                        
+            %client.moveLocation = %randomPosition;
+            %client.isMoving = true;
+        }
+    }
+    else
+    {
+        %client.defendTime = -1;
+        %client.moveLocation = %client.defendLocation;
+        %client.isMoving = true;
+    }
+}
+
+//-------------------------------------------------------------
+function AIEnhancedScoutLocation::initFromObjective(%task, %objective, %client)
+{
+    // Called to initialize from an objective object
+}
+
+function AIEnhancedScoutLocation::assume(%task, %client)
+{
+    // Called when the bot starts the task
+    %task.setMonitorFreq(1);
+    
+    %client.currentNode = -1;
+}
+
+function AIEnhancedScoutLocation::retire(%task, %client)
+{
+    // Called when the bot stops the task
+}
+
+function AIEnhancedScoutLocation::weight(%task, %client)
+{
+    %task.setWeight(1000);
+}
+
+function AIEnhancedScoutLocation::monitor(%task, %client)
+{   
+    // We can't really work without a NavGraph
+    if (!isObject(NavGraph))
+        return;
+    
+    // We just received the task, so find a node within distance of our scout location
+    if (%client.currentNode == -1)
+    {
+        %client.currentNode = NavGraph.randNode(%client.scoutLocation, %client.scoutDistance, true, true);
+        
+        if (%client.currentNode != -1)
+        {
+            %client.moveLocation = NavGraph.nodeLoc(%client.currentNode);
+            %client.isMoving = true;
+        }
+    }
+    // We're moving, or are near enough to our target
+    else
+    {
+        // Don't move if we're close enough to our next node
+        if (%client.getPathDistance(%client.moveLocation) <= 40)
+        {
+            %client.isMoving = false;
+            %client.nextScoutRotation = getRandom(5000, 10000);
+            %client.scoutTime += 32;
+        }
+        else
+        {
+            %client.isMoving = true;
+            %client.scoutTime += 0;
+        }
+        
+        // Wait a little bit at each node
+        if (%client.scoutTime >= %client.nextScoutRotation)
+        {
+            %client.scoutTime = 0;
+            %client.nextScoutRotation = getRandom(5000, 10000);
+
+            // Pick a new node
+            %client.currentNode = NavGraph.randNode(%client.scoutLocation, %client.scoutDistance, true, true);
+            
+            // Ensure that we found a node.
+            if (%client.currentNode != -1)
+            {
+                %client.moveLocation = NavGraph.nodeLoc(%client.currentNode);
+                %client.isMoving = true;
+            }
+        }
+    }
+    
+}
+
+//-------------------------------------------------------------