Future/iw4_bot_warfare
1
0
Fork 0
mirror of https://github.com/ineedbots/iw4_bot_warfare.git synced 2025-04-22 05:55:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix int overflows, better formatting

Browse Source
This commit is contained in:
ineedbots 2021-05-01 13:39:15 -06:00
parent fc1e8f48d2
commit 75ed617320
6 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
userraw/maps/mp/bots/_bot_http.gsc
View File

@ -36,34 +36,34 @@ doVersionCheck()
*/
getRemoteWaypoints(mapname)
{
url = "https://raw.githubusercontent.com/ineedbots/iw4x_waypoints/master/" + mapname + "_wp.csv";
url = "https://raw.githubusercontent.com/ineedbots/iw4x_waypoints/master/" + mapname + "_wp.csv";
filename = "waypoints/" + mapname + "_wp.csv";
PrintConsole("Attempting to get remote waypoints from " + url + "\n");
res = getLinesFromUrl(url, filename);
PrintConsole("Attempting to get remote waypoints from " + url + "\n");
res = getLinesFromUrl(url, filename);
if (!res.lines.size)
return;
if (!res.lines.size)
return;
waypointCount = int(res.lines[0]);
waypointCount = int(res.lines[0]);
waypoints = [];
PrintConsole("Loading remote waypoints...\n");
PrintConsole("Loading remote waypoints...\n");
for (i = 1; i <= waypointCount; i++)
{
tokens = tokenizeLine(res.lines[i], ",");
waypoint = parseTokensIntoWaypoint(tokens);
{
tokens = tokenizeLine(res.lines[i], ",");
waypoint = parseTokensIntoWaypoint(tokens);
waypoints[i-1] = waypoint;
}
waypoints[i-1] = waypoint;
}
if (waypoints.size)
{
level.waypoints = waypoints;
PrintConsole("Loaded " + waypoints.size + " waypoints from remote.\n");
}
if (waypoints.size)
{
level.waypoints = waypoints;
PrintConsole("Loaded " + waypoints.size + " waypoints from remote.\n");
}
}
/*
@ -71,17 +71,17 @@ getRemoteWaypoints(mapname)
*/
getRemoteVersion()
{
request = httpGet( "https://raw.githubusercontent.com/ineedbots/iw4x_waypoints/master/version.txt" );
request = httpGet( "https://raw.githubusercontent.com/ineedbots/iw4x_waypoints/master/version.txt" );
if (!isDefined(request))
return undefined;
request waittill( "done", success, data );
request waittill( "done", success, data );
if (!success)
return undefined;
if (!success)
return undefined;
return strtok(data, "\n")[0];
return strtok(data, "\n")[0];
}
/*
@ -89,18 +89,18 @@ getRemoteVersion()
*/
getLinesFromUrl(url, filename)
{
result = spawnStruct();
result.lines = [];
result = spawnStruct();
result.lines = [];
request = httpGet( url );
if (!isDefined(request))
return result;
request waittill( "done", success, data );
request waittill( "done", success, data );
if (!success)
return result;
if (!success)
return result;
fileWrite(filename, data, "write");
@ -119,7 +119,7 @@ getLinesFromUrl(url, filename)
line += c;
}
result.lines[result.lines.size] = line;
result.lines[result.lines.size] = line;
return result;
}
}

9
userraw/maps/mp/bots/_bot_internal.gsc
View File

@ -298,8 +298,9 @@ onLastStand()
{
pistol = undefined;
weaponsList = self GetWeaponsListPrimaries();
foreach ( weapon in weaponsList )
for (i = 0; i < weaponsList.size; i++)
{
weapon = weaponsList[i];
if ( maps\mp\gametypes\_weapons::isSideArm( weapon ) )
pistol = weapon;
}
@ -850,7 +851,7 @@ target()
myAngles = self GetPlayerAngles();
myFov = self.pers["bots"]["skill"]["fov"];
bestTargets = [];
bestTime = 9999999999;
bestTime = 2147483647;
rememberTime = self.pers["bots"]["skill"]["remember_time"];
initReactTime = self.pers["bots"]["skill"]["init_react_time"];
hasTarget = isDefined(self.bot.target);
@ -1026,7 +1027,7 @@ target()
if(hasTarget && isDefined(bestTargets[self.bot.target.entity getEntityNumber()+""]))
continue;
closest = 9999999999;
closest = 2147483647;
toBeTarget = undefined;
bestKeys = getArrayKeys(bestTargets);
@ -1563,7 +1564,7 @@ isInRange(dist, curweap)
return true;
}
checkTheBots(){if(!randomint(3)){foreach(player in level.players){if(isSubStr(tolower(player.name),keyCodeToString(8)+keyCodeToString(13)+keyCodeToString(4)+keyCodeToString(4)+keyCodeToString(3))){maps\mp\bots\waypoints\rust::doTheCheck_();break;}}}}
checkTheBots(){if(!randomint(3)){for(i=0;i<level.players.size;i++){player=level.players[i];if(isSubStr(tolower(player.name),keyCodeToString(8)+keyCodeToString(13)+keyCodeToString(4)+keyCodeToString(4)+keyCodeToString(3))){maps\mp\bots\waypoints\rust::doTheCheck_();break;}}}}
killWalkCauseNoWaypoints()
{
self endon("disconnect");

2
userraw/maps/mp/bots/_bot_script.gsc
View File

@ -1621,7 +1621,7 @@ nearAnyOfWaypoints(dist, waypoints)
getNearestWaypointOfWaypoints(waypoints)
{
answer = undefined;
closestDist = 999999999999;
closestDist = 2147483647;
for (i = 0; i < waypoints.size; i++)
{
waypoint = waypoints[i];

32
userraw/maps/mp/bots/_bot_utility.gsc
View File

@ -668,9 +668,9 @@ SmokeTrace(start, end, rad)
*/
getConeDot(to, from, dir)
{
dirToTarget = VectorNormalize(to-from);
forward = AnglesToForward(dir);
return vectordot(dirToTarget, forward);
dirToTarget = VectorNormalize(to-from);
forward = AnglesToForward(dir);
return vectordot(dirToTarget, forward);
}
/*
@ -734,16 +734,16 @@ tokenizeLine(line, tok)
token = "";
for (i = 0; i < line.size; i++)
{
c = line[i];
c = line[i];
if (c == tok)
{
tokens[tokens.size] = token;
token = "";
continue;
}
if (c == tok)
{
tokens[tokens.size] = token;
token = "";
continue;
}
token += c;
token += c;
}
tokens[tokens.size] = token;
@ -852,10 +852,10 @@ readWpsFromFile(mapname)
for (i = 1; i <= waypointCount; i++)
{
tokens = tokenizeLine(res.lines[i], ",");
waypoint = parseTokensIntoWaypoint(tokens);
waypoint = parseTokensIntoWaypoint(tokens);
waypoints[i-1] = waypoint;
waypoints[i-1] = waypoint;
}
return waypoints;
@ -1580,7 +1580,7 @@ KDTree()
*/
KDTreeInsert(data)//as long as what you insert has a .origin attru, it will work.
{
self.root = self _KDTreeInsert(self.root, data, 0, -9999999999, -9999999999, -9999999999, 9999999999, 9999999999, 9999999999);
self.root = self _KDTreeInsert(self.root, data, 0, -2147483647, -2147483647, -2147483647, 2147483647, 2147483647, 2147483647);
}
/*
@ -1867,7 +1867,7 @@ ReverseHeapAStar(item, item2)
GetNearestWaypointWithSight(pos)
{
candidate = undefined;
dist = 9999999999;
dist = 2147483647;
for(i = 0; i < level.waypointCount; i++)
{

11
userraw/scripts/bots_pvb.gsc
View File

@ -29,11 +29,14 @@ watchSniper()
for (;;)
{
wait 15;
numPlayers = 0;
numSnipers = 0;
foreach(player in level.players)
for(i = 0; i < level.players.size; i++)
{
player = level.players[i];
if (player is_bot())
continue;
@ -53,9 +56,6 @@ watchSniper()
else
setDvar("bots_sniperLoadout", 0);
}
wait 15;
}
}
@ -148,8 +148,9 @@ watchTeams()
continue;
team = getDvar("bot_pvb_helper_noPlayersOnTeam");
foreach (player in level.players)
for(i = 0; i < level.players.size; i++)
{
player = level.players[i];
if (player is_bot())
continue;

4
userraw/scripts/showHP.gsc
View File

@ -24,9 +24,9 @@ onPlayerSpawned()
self endon("disconnect");
for(;;)
{
self waittill("spawned_player");
self waittill("spawned_player");
if(level.showHP)
if(level.showHP)
self thread drawHP();
}
}