Future/iw3_bot_warfare
1
0
Fork 0
mirror of https://github.com/ineedbots/iw3_bot_warfare.git synced 2025-04-22 10:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Your Name 2020-09-07 14:22:34 -06:00
parent f6751b983b
commit b94d247135
3 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main_shared/maps/mp/bots/_bot.gsc
View File

@ -63,8 +63,10 @@ init()
level.bots_minSprintDistance = 315; level.bots_minSprintDistance = 315;
level.bots_minSprintDistance *= level.bots_minSprintDistance; level.bots_minSprintDistance *= level.bots_minSprintDistance;
level.bots_minGrenadeDistance = 375; level.bots_minGrenadeDistance = 256;
level.bots_minGrenadeDistance *= level.bots_minGrenadeDistance; level.bots_minGrenadeDistance *= level.bots_minGrenadeDistance;
level.bots_maxGrenadeDistance = 1024;
level.bots_maxGrenadeDistance *= level.bots_maxGrenadeDistance;
level.bots_maxKnifeDistance = 80; level.bots_maxKnifeDistance = 80;
level.bots_maxKnifeDistance *= level.bots_maxKnifeDistance; level.bots_maxKnifeDistance *= level.bots_maxKnifeDistance;
level.bots_goalDistance = 27.5; level.bots_goalDistance = 27.5;

23
main_shared/maps/mp/bots/_bot_internal.gsc
View File

@ -809,6 +809,7 @@ aim()
continue; continue;
aimspeed = self.pers["bots"]["skill"]["aim_time"]; aimspeed = self.pers["bots"]["skill"]["aim_time"];
eyePos = self getEyePos();
if(self IsStunned() || self isArtShocked()) if(self IsStunned() || self isArtShocked())
aimspeed = 1; aimspeed = 1;
@ -827,7 +828,6 @@ aim()
offset = self.bot.target.offset; offset = self.bot.target.offset;
dist = self.bot.target.dist; dist = self.bot.target.dist;
curweap = self getCurrentWeapon(); curweap = self getCurrentWeapon();
eyePos = self getEyePos();
angles = self GetPlayerAngles(); angles = self GetPlayerAngles();
rand = self.bot.target.rand; rand = self.bot.target.rand;
no_trace_ads_time = self.pers["bots"]["skill"]["no_trace_ads_time"]; no_trace_ads_time = self.pers["bots"]["skill"]["no_trace_ads_time"];
@ -850,7 +850,7 @@ aim()
if(!self.bot.isfraggingafter && !self.bot.issmokingafter) if(!self.bot.isfraggingafter && !self.bot.issmokingafter)
{ {
nade = self getValidGrenade(); nade = self getValidGrenade();
if(isDefined(nade) && rand <= self.pers["bots"]["behavior"]["nade"] && bulletTracePassed(myEye, myEye + (0, 0, 75), false, self) && bulletTracePassed(last_pos, last_pos + (0, 0, 100), false, target)) // level.bots_minGrenadeDistance if(isDefined(nade) && rand <= self.pers["bots"]["behavior"]["nade"] && bulletTracePassed(myEye, myEye + (0, 0, 75), false, self) && bulletTracePassed(last_pos, last_pos + (0, 0, 100), false, target) && dist > level.bots_minGrenadeDistance && dist < level.bots_maxGrenadeDistance)
{ {
if(nade == "frag_grenade_mp") if(nade == "frag_grenade_mp")
self thread frag(2.5); self thread frag(2.5);
@ -922,7 +922,17 @@ aim()
} }
} }
if (!isDefined(self.bot.script_aimpos)) if (self.bot.next_wp != -1 && isDefined(level.waypoints[self.bot.next_wp].angles) && false)
{
forwardPos = anglesToForward(level.waypoints[self.bot.next_wp].angles) * 1024;
self botLookAt(eyePos + forwardPos, aimspeed);
}
else if (isDefined(self.bot.script_aimpos))
{
self botLookAt(self.bot.script_aimpos, aimspeed);
}
else
{ {
lookat = undefined; lookat = undefined;
if(self.bot.second_next_wp != -1 && !self.bot.issprinting) if(self.bot.second_next_wp != -1 && !self.bot.issprinting)
@ -933,10 +943,6 @@ aim()
if(isDefined(lookat)) if(isDefined(lookat))
self botLookAt(lookat + (0, 0, self getEyeHeight()), aimspeed); self botLookAt(lookat + (0, 0, self getEyeHeight()), aimspeed);
} }
else
{
self botLookAt(self.bot.script_aimpos, aimspeed);
}
} }
} }
@ -1290,6 +1296,8 @@ doWalk(goal, dist, isScriptGoal)
self thread watchOnGoal(goal, distsq); self thread watchOnGoal(goal, distsq);
current = self initAStar(goal); current = self initAStar(goal);
//if (current >= 0 && DistanceSquared(self.origin, level.waypoints[self.bot.astar[current]].origin) < DistanceSquared(self.origin, goal))
//{
while(current >= 0) while(current >= 0)
{ {
self.bot.next_wp = self.bot.astar[current]; self.bot.next_wp = self.bot.astar[current];
@ -1303,6 +1311,7 @@ doWalk(goal, dist, isScriptGoal)
current = self removeAStar(); current = self removeAStar();
} }
//}
self.bot.next_wp = -1; self.bot.next_wp = -1;
self.bot.second_next_wp = -1; self.bot.second_next_wp = -1;

9
main_shared/maps/mp/bots/_bot_utility.gsc
View File

@ -116,7 +116,12 @@ SetAttacker(att)
*/ */
HasScriptGoal() HasScriptGoal()
{ {
return (isDefined(self.bot.script_goal)); return (isDefined(self GetScriptGoal()));
}
GetScriptGoal()
{
return self.bot.script_goal;
} }
/* /*
@ -124,6 +129,8 @@ HasScriptGoal()
*/ */
SetScriptGoal(goal, dist) SetScriptGoal(goal, dist)
{ {
if (!isDefined(dist))
dist = 16;
self.bot.script_goal = goal; self.bot.script_goal = goal;
self.bot.script_goal_dist = dist; self.bot.script_goal_dist = dist;
waittillframeend; waittillframeend;