diff --git a/main_shared/maps/mp/bots/_bot_http.gsc b/main_shared/maps/mp/bots/_bot_http.gsc index 789955c..f8bce39 100644 --- a/main_shared/maps/mp/bots/_bot_http.gsc +++ b/main_shared/maps/mp/bots/_bot_http.gsc @@ -12,34 +12,34 @@ */ getRemoteWaypoints(mapname) { - url = "https://raw.githubusercontent.com/ineedbots/t4m_waypoints/master/" + mapname + "_wp.csv"; + url = "https://raw.githubusercontent.com/ineedbots/t4m_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,12 +71,12 @@ doVersionCheck() */ getRemoteVersion() { - data = httpGet( "https://raw.githubusercontent.com/ineedbots/t4m_waypoints/master/version.txt" ); + data = httpGet( "https://raw.githubusercontent.com/ineedbots/t4m_waypoints/master/version.txt" ); if (!isDefined(data)) return undefined; - return strtok(data, "\n")[0]; + return strtok(data, "\n")[0]; } /* @@ -84,8 +84,8 @@ getRemoteVersion() */ getLinesFromUrl(url, filename) { - result = spawnStruct(); - result.lines = []; + result = spawnStruct(); + result.lines = []; data = HTTPGet(url); @@ -109,7 +109,7 @@ getLinesFromUrl(url, filename) line += c; } - result.lines[result.lines.size] = line; + result.lines[result.lines.size] = line; return result; } diff --git a/main_shared/maps/mp/bots/_bot_internal.gsc b/main_shared/maps/mp/bots/_bot_internal.gsc index 72d205c..95a45ff 100644 --- a/main_shared/maps/mp/bots/_bot_internal.gsc +++ b/main_shared/maps/mp/bots/_bot_internal.gsc @@ -789,7 +789,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); @@ -941,7 +941,7 @@ target() if(hasTarget && isDefined(bestTargets[self.bot.target.entity getEntityNumber()+""])) continue; - closest = 9999999999; + closest = 2147483647; toBeTarget = undefined; bestKeys = getArrayKeys(bestTargets); diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc index 2cc350c..fc3c118 100644 --- a/main_shared/maps/mp/bots/_bot_script.gsc +++ b/main_shared/maps/mp/bots/_bot_script.gsc @@ -1121,7 +1121,7 @@ nearAnyOfWaypoints(dist, waypoints) getNearestWaypointOfWaypoints(waypoints) { answer = undefined; - closestDist = 999999999999; + closestDist = 2147483647; for (i = 0; i < waypoints.size; i++) { waypoint = waypoints[i]; diff --git a/main_shared/maps/mp/bots/_bot_utility.gsc b/main_shared/maps/mp/bots/_bot_utility.gsc index 3d8e43d..abdd58f 100644 --- a/main_shared/maps/mp/bots/_bot_utility.gsc +++ b/main_shared/maps/mp/bots/_bot_utility.gsc @@ -826,9 +826,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); } /* @@ -971,25 +971,25 @@ float(num) */ tokenizeLine(line, tok) { - tokens = []; + tokens = []; - token = ""; - for (i = 0; i < line.size; i++) - { - c = line[i]; + token = ""; + for (i = 0; i < line.size; i++) + { + c = line[i]; - if (c == tok) - { - tokens[tokens.size] = token; - token = ""; - continue; - } + if (c == tok) + { + tokens[tokens.size] = token; + token = ""; + continue; + } - token += c; - } - tokens[tokens.size] = token; + token += c; + } + tokens[tokens.size] = token; - return tokens; + return tokens; } /* @@ -1029,7 +1029,7 @@ parseTokensIntoWaypoint(tokens) getWaypointLinesFromFile(filename) { result = spawnStruct(); - result.lines = []; + result.lines = []; waypointStr = fileRead(filename); @@ -1051,7 +1051,7 @@ getWaypointLinesFromFile(filename) line += c; } - result.lines[result.lines.size] = line; + result.lines[result.lines.size] = line; return result; } @@ -1076,10 +1076,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; @@ -1543,7 +1543,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); } /* @@ -1822,7 +1822,7 @@ ReverseHeapAStar(item, item2) GetNearestWaypointWithSight(pos) { candidate = undefined; - dist = 9999999999; + dist = 2147483647; for(i = 0; i < level.waypointCount; i++) {