Tribes2/T2-DXAI
1
0
Fork 0
mirror of https://github.com/Ragora/T2-DXAI.git synced 2026-01-19 18:14:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back to using the inbuilt AI Task system; fixed the monitor freq

Browse source
This commit is contained in:
Robert MacGregor 2015-06-24 21:21:50 -04:00
parent 8687513a42
commit a7f2fd1219
1 changed files with 33 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
scripts/DXAI_Objectives.cs
View file

@ -16,6 +16,7 @@ function AIVisualAcuity::initFromObjective(%task, %objective, %client)
function AIVisualAcuity::assume(%task, %client) function AIVisualAcuity::assume(%task, %client)
{ {
// Called when the bot starts the task // Called when the bot starts the task
%task.setMonitorFreq(32);
} }
function AIVisualAcuity::retire(%task, %client) function AIVisualAcuity::retire(%task, %client)
@ -28,21 +29,21 @@ function AIVisualAcuity::weight(%task, %client)
%task.setWeight(999); %task.setWeight(999);
} }
function AIConnection::visualAcuityUpdate(%this) function AIVisualAcuity::monitor(%task, %client)
{ {
// Called when the bot is performing the task // Called when the bot is performing the task
if (%this.enableVisualDebug) if (%client.enableVisualDebug)
{ {
if (!isObject(%this.originMarker)) if (!isObject(%client.originMarker))
{ {
%this.originMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %this.team; name = %this.namebase SPC " Origin"; }; %client.originMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %client.team; name = %client.namebase SPC " Origin"; };
%this.clockwiseMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %this.team; name = %this.namebase SPC " Clockwise"; }; %client.clockwiseMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %client.team; name = %client.namebase SPC " Clockwise"; };
%this.counterClockwiseMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %this.team; name = %this.namebase SPC " Counter Clockwise"; }; %client.counterClockwiseMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %client.team; name = %client.namebase SPC " Counter Clockwise"; };
%this.upperMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %this.team; name = %this.namebase SPC " Upper"; }; %client.upperMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %client.team; name = %client.namebase SPC " Upper"; };
%this.lowerMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %this.team; name = %this.namebase SPC " Lower"; }; %client.lowerMarker = new Waypoint(){ datablock = "WaypointMarker"; team = %client.team; name = %client.namebase SPC " Lower"; };
} }
%viewCone = %this.calculateViewCone(); %viewCone = %client.calculateViewCone();
%coneOrigin = getWords(%viewCone, 0, 2); %coneOrigin = getWords(%viewCone, 0, 2);
%viewConeClockwiseVector = getWords(%viewCone, 3, 5); %viewConeClockwiseVector = getWords(%viewCone, 3, 5);
%viewConeCounterClockwiseVector = getWords(%viewCone, 6, 8); %viewConeCounterClockwiseVector = getWords(%viewCone, 6, 8);
@ -51,28 +52,28 @@ function AIConnection::visualAcuityUpdate(%this)
%viewConeLowerVector = getWords(%viewCone, 12, 14); %viewConeLowerVector = getWords(%viewCone, 12, 14);
// Update all the markers // Update all the markers
%this.clockwiseMarker.setPosition(%viewConeClockwiseVector); %client.clockwiseMarker.setPosition(%viewConeClockwiseVector);
%this.counterClockwiseMarker.setPosition(%viewConeCounterClockwiseVector); %client.counterClockwiseMarker.setPosition(%viewConeCounterClockwiseVector);
%this.upperMarker.setPosition(%viewConeUpperVector); %client.upperMarker.setPosition(%viewConeUpperVector);
%this.lowerMarker.setPosition(%viewConeLowerVector); %client.lowerMarker.setPosition(%viewConeLowerVector);
%this.originMarker.setPosition(%coneOrigin); %client.originMarker.setPosition(%coneOrigin);
} }
else if (isObject(%this.originMarker)) else if (isObject(%client.originMarker))
{ {
%this.originMarker.delete(); %client.originMarker.delete();
%this.clockwiseMarker.delete(); %client.clockwiseMarker.delete();
%this.counterClockwiseMarker.delete(); %client.counterClockwiseMarker.delete();
%this.upperMarker.delete(); %client.upperMarker.delete();
%this.lowerMarker.delete(); %client.lowerMarker.delete();
} }
%result = %this.getObjectsInViewcone($TypeMasks::ProjectileObjectType | $TypeMasks::PlayerObjectType, %this.viewDistance, true); %result = %client.getObjectsInViewcone($TypeMasks::ProjectileObjectType | $TypeMasks::PlayerObjectType, %client.viewDistance, true);
// What can we see? // What can we see?
for (%i = 0; %i < %result.getCount(); %i++) for (%i = 0; %i < %result.getCount(); %i++)
{ {
%current = %result.getObject(%i); %current = %result.getObject(%i);
%this.awarenessTicks[%current]++; %client.awarenessTicks[%current]++;
if (%current.getType() & $TypeMasks::ProjectileObjectType) if (%current.getType() & $TypeMasks::ProjectileObjectType)
{ {
@ -80,7 +81,7 @@ function AIConnection::visualAcuityUpdate(%this)
// We pick a random notice time between 700ms and 1200 ms // 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 // Obviously this timer runs on a 32ms tick, but it should help provide a little unpredictability
%noticeTime = getRandom(700, 1200); %noticeTime = getRandom(700, 1200);
if (%this.awarenessTicks[%current] < (%noticeTime / 32)) if (%client.awarenessTicks[%current] < (%noticeTime / 32))
continue; continue;
%className = %current.getClassName(); %className = %current.getClassName();
@ -96,9 +97,9 @@ function AIConnection::visualAcuityUpdate(%this)
%hitObject = getWord(%raycast, 0); %hitObject = getWord(%raycast, 0);
// We're set for a direct hit on us! // We're set for a direct hit on us!
if (%hitObject == %this.player) if (%hitObject == %client.player)
{ {
%this.setDangerLocation(%current.getPosition(), 30); %client.setDangerLocation(%current.getPosition(), 30);
continue; continue;
} }
@ -108,11 +109,11 @@ function AIConnection::visualAcuityUpdate(%this)
// How close is the hit loc? // How close is the hit loc?
%hitLocation = getWords(%rayCast, 1, 3); %hitLocation = getWords(%rayCast, 1, 3);
%hitDistance = vectorDist(%this.player.getPosition(), %hitLocation); %hitDistance = vectorDist(%client.player.getPosition(), %hitLocation);
// Is it within the radius damage of this thing? // Is it within the radius damage of this thing?
if (%hitDistance <= %current.getDatablock().damageRadius) if (%hitDistance <= %current.getDatablock().damageRadius)
%this.setDangerLocation(%current.getPosition(), 30); %client.setDangerLocation(%current.getPosition(), 30);
} }
// A little bit harder to detect. // A little bit harder to detect.
else if (%className $= "GrenadeProjectile") else if (%className $= "GrenadeProjectile")
@ -124,41 +125,18 @@ function AIConnection::visualAcuityUpdate(%this)
else if (%current.getType() & $TypeMasks::PlayerObjectType) else if (%current.getType() & $TypeMasks::PlayerObjectType)
{ {
// ... if the moron is right there in our LOS then we probably should see them // ... if the moron is right there in our LOS then we probably should see them
%start = %this.player.getPosition(); %start = %client.player.getPosition();
%end = vectorAdd(%start, vectorScale(%this.player.getEyeVector(), %this.viewDistance)); %end = vectorAdd(%start, vectorScale(%client.player.getEyeVector(), %client.viewDistance));
%rayCast = containerRayCast(%start, %end, -1, %this.player); %rayCast = containerRayCast(%start, %end, -1, %client.player);
%hitObject = getWord(%raycast, 0); %hitObject = getWord(%raycast, 0);
echo(%hitObject); echo(%hitObject);
echo(%current); echo(%current);
if (%hitObject == %current) if (%hitObject == %current)
%this.stepEngage(%current); %client.stepEngage(%current);
} }
} }
%result.delete(); %result.delete();
} }
function AIConnection::enhancedLogicUpdate(%this)
{
cancel(%this.enhancedLogicHandle);
//if (!isObject(%this.))
if (!isObject(%this.player))
{
%this.enhancedLogicHandle = %this.schedule(32, "enhancedLogicUpdate");
return;
}
%this.visualAcuityUpdate();
%this.enhancedLogicHandle = %this.schedule(32, "enhancedLogicUpdate");
}
function AIVisualAcuity::monitor(%task, %client)
{
return;
}