V2.4.6

Added reset if 10 mins over next split.
Clean up

Author: jonese1234

ai/red/strategies.lua

@@ -83,12 +83,16 @@ Strategies.timeRequirements = {
 		return timeLimit
 	end,
 
+	route3 = function()
+		return 19 + timeSaveFor("spearow")
+	end,
+
 	mt_moon = function() --RESET
 		if BEAST_MODE then
 			return 24.75
 		end
 
-		local timeLimit = 25.25 + timeSaveFor("paras")
+		local timeLimit = 25.50 + timeSaveFor("paras")
 		if Pokemon.info("nidoking", "level") >= 18 then
 			timeLimit = timeLimit + 0.33
 		elseif Pokemon.getExp() > 3730 then
@@ -566,7 +570,7 @@ strategyFunctions.shopPewterMart = function()
 	local pokeballs = Inventory.count("pokeball")
 	if stats.nidoran.rating == nil then
 		p("Game failed to read memory")
-		Strategies.reset("Memory", "Game messed up reading memory")
+		Strategies.reset("Memory", "Oops, forgot to switch to nidoran, now not right level!")
 	end
 	if pokeballs < (Pokemon.inParty("spearow") and 2 or 3) then
 		pokeballs = pokeballs + 1

ai/strategies.lua

@@ -66,7 +66,7 @@ function Strategies.hardReset(reason, message, extra, wait)
 	local seed = Data.run.seed
 	local newmessage = message.." | "..seed
 
-	local f,  err = io.open("C:/Users/rjrhy/Desktop/Pokebot/Github work/PokeBotBad/wiki/red/runs.txt", "a")
+	local f,  err = io.open(RUNS_FILE, "a")
 	if f==nil then
 		print("Couldn't open file: "..err)
 	else
@@ -1078,7 +1078,7 @@ Strategies.functions = {
 	end,
 
 	speedchange = function(data)
-		p(data.extra..", speed changed too "..data.speed.."%")
+		p(data.extra..", speed changed to "..data.speed.."%")
 		client.speedmode(data.speed)
 		return true
 	end,

main.lua

@@ -6,13 +6,15 @@ BEAST_MODE = false -- WARNING: Do not engage. Will yolo everything, and reset at
 INITIAL_SPEED = 750
 AFTER_BROCK_SPEED = 350
 
+RUNS_FILE = "C:/Users/rjrhy/Desktop/Pokebot/Github work/PokeBotBad/wiki/red/runs.txt" -- Use / insted of \ otherwise it will not work
+
 local CUSTOM_SEED  = nil -- Set to a known seed to replay it, or leave nil for random runs
 local NIDORAN_NAME = "A" -- Set this to the single character to name Nidoran (note, to replay a seed, it MUST match!)
 local PAINT_ON     = true -- Display contextual information while the bot runs
 
 -- START CODE (hard hats on)
 
-VERSION = "2.4.5"
+VERSION = "2.4.6"
 
 local Data = require "data.data"
 
@@ -49,6 +51,7 @@ function resetAll()
 	Walk.reset()
 	Paint.reset()
 	Bridge.reset()
+	Utils.reset()
 	oldSeconds = 0
 	running = false
 	client.speedmode(INITIAL_SPEED)
@@ -70,6 +73,7 @@ end
 p("Welcome to PokeBot "..Utils.capitalize(Data.gameName).." v"..VERSION, true)
 
 Control.init()
+Utils.init()
 STREAMING_MODE = true
 
 if CUSTOM_SEED then
@@ -123,6 +127,7 @@ local function generateNextInput(currentMap)
 		end
 	else
 		Bridge.time()
+		Utils.splitCheck()
 		local battleState = Memory.value("game", "battle")
 		Control.encounter(battleState)
 

util/bridge.lua

@@ -158,6 +158,7 @@ function Bridge.split(finished)
 		timeStopped = true
 	end
 	send("split")
+	Utils.splitUpdate()
 end
 
 function Bridge.pausegametime()

util/utils.lua

@@ -1,8 +1,12 @@
 local Utils = {}
 
 local Memory = require "util.memory"
+local Strategies
+local Data = require "data.data"
 
 local EMP = 1
+local splitCheck = 0
+local splitNum = 1
 
 -- GLOBAL
 
@@ -25,6 +29,15 @@ end
 
 -- GENERAL
 
+function Utils.reset()
+	splitCheck = 0
+	splitNum = 1
+end
+
+function Utils.splitUpdate()
+	splitNum = splitNum + 1
+end
+
 function Utils.dist(x1, y1, x2, y2)
 	return math.sqrt(math.pow(x2 - x1, 2) + math.pow(y2 - y1, 2))
 end
@@ -174,4 +187,28 @@ function Utils.elapsedTime()
 	return hours..":"..clockSegment(mins)..":"..clockSegment(secs)
 end
 
+function Utils.timeToSplit(splitName)
+	local currTime = Utils.igt()
+	local splitTime = Strategies.getTimeRequirement(splitName) * 60
+	local diff = currTime - splitTime
+	return diff
+end
+
+function Utils.splitCheck()
+	local order = { "bulbasaur", "nidoran", "brock", "route3", "mt_moon", "mankey", "misty", "trash", "safari_carbos", "safari_carbos" , "safari_carbos", "victory_road", "victory_road", "victory_road", "victory_road", "victory_road", "e4center", "blue", "blue", "blue", "champion" }
+	if splitCheck == 600 then
+		local timediff = Utils.timeToSplit(order[splitNum])
+		if timediff >= 600 then
+			Strategies.reboot()
+		end
+		splitCheck = 0
+	else
+		splitCheck = splitCheck + 1
+	end
+end
+
+function Utils.init()
+	Strategies = require("ai."..Data.gameName..".strategies")
+end
+
 return Utils

wiki/red/runs.txt

@@ -7,3 +7,21 @@ Reset at Brock's Gym | 0:10:32 |  Died. | 1468423103
 Reset at Nidoran grass | 0:07:07 |  Ran too low on Pokeballs. | 1468423180
 Reset at Brock's Gym | 0:11:11 |  Critical'd. | 1468423235
 Reset at Pallet Rival | 0:02:14 |  Took too long to beat Bulbasaur. | 1468423322
+Reset at Pallet Rival | 0:01:15 |  Took too long to beat Bulbasaur. | 1469134181
+Reset at Pallet Rival | 0:01:15 |  Took too long to beat Bulbasaur. | 1469134198
+Reset at Pallet Rival | 0:01:15 |  Took too long to beat Bulbasaur. | 1469134214
+Reset at Pallet Rival | 0:01:16 |  Took too long to beat Bulbasaur. | 1469134627
+Reset at Pallet Rival | 0:01:15 |  Took too long to beat Bulbasaur. | 1469135585
+Reset at Pallet Town | 0:03:22 |  Too many encounters. | 1469135697
+Reset at Pallet Rival | 0:02:05 |  Bad Squirtle - 10 attack, 11 special. | 1469135732
+Reset at Nidoran grass | 0:06:34 |  Took too long to catch Nidoran. | 1469135756
+Reset at Brock's Gym | 0:11:10 |  Bad Nidoran - unrunnable speed, unrunnable special. | 1469135816
+Reset at Pallet Town | 0:04:00 |  Too many encounters. | 1469135919
+Reset at Brock's Gym | 0:10:55 |  Bad Nidoran - unrunnable speed. | 1469135958
+Reset at Pallet Rival | 0:01:41 |  Growled to death. | 1469136910
+Reset at Pallet Rival | 0:02:14 |  Took too long to beat Bulbasaur. | 1469136956
+Reset at Pallet Rival | 0:02:11 |  Bad Squirtle - 10 attack, 11 special. | 1469137310
+Reset at Nidoran grass | 0:06:21 |  Too many encounters. | 1469137477
+Reset at Pallet Rival | 0:02:14 |  Took too long to beat Bulbasaur. | 1469137536
+Reset at Pallet Rival | 0:02:14 |  Took too long to beat Bulbasaur. | 1469137561
+Reset at Nidoran grass | 0:06:31 |  Death by Rattata. | 1469137586