diff --git a/ai/red/strategies.lua b/ai/red/strategies.lua index 817a88c..6052a58 100644 --- a/ai/red/strategies.lua +++ b/ai/red/strategies.lua @@ -41,6 +41,10 @@ Strategies.timeRequirements = { return timeLimit end, + brock = function() + return 11 + end, + mt_moon = function() local timeLimit = 27 if nidoAttack > 15 and nidoSpeed > 14 then @@ -190,7 +194,7 @@ strategyFunctions.tweetMisty = function() pbn = " (PB pace)" end local elt = Utils.elapsedTime() - Bridge.tweet("Got a run going, just beat Misty "..elt.." in"..pbn.." http://www.twitch.tv/thepokebot") + Strategies.tweetProgress("Got a run going, just beat Misty "..elt.." in"..pbn) end end return true @@ -203,7 +207,7 @@ strategyFunctions.tweetVictoryRoad = function() pbn = " (PB pace)" end local elt = Utils.elapsedTime() - Bridge.tweet("Entering Victory Road at "..elt..pbn.." on our way to the Elite Four http://www.twitch.tv/thepokebot") + Strategies.tweetProgress("Entering Victory Road at "..elt..pbn.." on our way to the Elite Four") return true end @@ -2346,7 +2350,7 @@ strategyFunctions.champion = function() return Strategies.hardReset("Beat the game in "..status.canProgress.." !") end if status.tries == 0 then - Bridge.tweet("Beat Pokemon Red in "..status.canProgress.."!") + Strategies.tweetProgress("Beat Pokemon Red in "..status.canProgress.."!", true) if Strategies.seed then print("v"..VERSION..": "..Utils.frames().." frames, with seed "..Strategies.seed) print("Please save this seed number to share, if you would like proof of your run!") diff --git a/ai/strategies.lua b/ai/strategies.lua index 68411f4..4bfd4f6 100644 --- a/ai/strategies.lua +++ b/ai/strategies.lua @@ -53,19 +53,22 @@ end function Strategies.reset(reason, extra, wait) local time = Utils.elapsedTime() - local resetString = "Reset" + local resetMessage = "Reset" if time then - resetString = resetString.." after "..time + resetMessage = resetMessage.." after "..time end - resetString = " "..resetString.." at "..Control.areaName + resetMessage = " "..resetMessage.." at "..Control.areaName local separator if Strategies.deepRun and not Control.yolo then separator = " BibleThump" else separator = ":" end - resetString = resetString..separator.." "..reason - return Strategies.hardReset(resetString, extra, wait) + resetMessage = resetMessage..separator.." "..reason + if status.tweeted then + Strategies.tweetProgress(resetMessage, true) + end + return Strategies.hardReset(resetMessage, extra, wait) end function Strategies.death(extra) @@ -118,6 +121,14 @@ end -- HELPERS +function Strategies.tweetProgress(message, finished) + if not finished then + status.tweeted = true + message = message.." http://www.twitch.tv/thepokebot" + end + Bridge.tweet(message) +end + function Strategies.initialize() if not status.initialized then status.initialized = true