diff --git a/userraw/maps/mp/bots/_bot_http.gsc b/userraw/maps/mp/bots/_bot_http.gsc index d8be40d..98ab970 100644 --- a/userraw/maps/mp/bots/_bot_http.gsc +++ b/userraw/maps/mp/bots/_bot_http.gsc @@ -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; -} \ No newline at end of file +} diff --git a/userraw/maps/mp/bots/_bot_internal.gsc b/userraw/maps/mp/bots/_bot_internal.gsc index 670933b..128fd0e 100644 --- a/userraw/maps/mp/bots/_bot_internal.gsc +++ b/userraw/maps/mp/bots/_bot_internal.gsc @@ -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