bouletmarc
/
PokeBot
mirror of https://github.com/bouletmarc/PokeBot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unify tweeting requirements

This commit is contained in:
Kyle Coburn 2015-05-23 00:29:49 -07:00
parent a4e0963c6a
commit 9764eefb44
2 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ai/red/strategies.lua
View File

@ -253,35 +253,6 @@ end
local strategyFunctions = Strategies.functions
-- General
strategyFunctions.tweetAfterBrock = function()
if stats.nidoran.rating < 2 then
if not Strategies.overMinute("shorts") then
Strategies.tweetProgress("On pace after Brock with a great Nidoran in", "brock")
end
end
return true
end
strategyFunctions.tweetSurge = function()
Control.preferredPotion = "super"
if not Strategies.updates.misty then
local timeLimit = Strategies.getTimeRequirement("trash")
if not Strategies.overMinute(timeLimit + 1) then
local elt = Utils.elapsedTime()
local pbn = ""
if not Strategies.overMinute(timeLimit + 0.25) then
pbn = " (PB pace)"
end
Strategies.tweetProgress("Got a run going, just beat Surge "..elt.." in"..pbn, "surge")
end
end
return true
end
-- tweetVictoryRoad
-- Route

41
ai/strategies.lua
View File

@ -601,30 +601,49 @@ end
Strategies.functions = {
tweetBrock = function()
local statRequirement, timeRequirement
if Data.yellow then
statRequirement = stats.nidoran.attack == 16 or stats.nidoran.speed == 15
timeRequirement = "brock"
else
statRequirement = stats.nidoran.rating < 2
timeRequirement = "shorts"
end
if statRequirement and not Strategies.overMinute(timeRequirement) then
Strategies.tweetProgress("On pace after Brock with a great Nidoran in", "brock")
end
return true
end,
tweetMisty = function()
Strategies.setYolo("misty")
if not Strategies.updates.brock and not Control.yolo and (not Combat.inRedBar() or Inventory.contains("potion")) then
local timeLimit = Strategies.getTimeRequirement("misty")
if not Strategies.overMinute(timeLimit) then
local pbn = ""
if not Strategies.overMinute(timeLimit - 1) then
pbn = " (PB pace)"
end
local elt = Utils.elapsedTime()
local elt, pbn = Strategies.paceMessage(timeLimit - 1)
Strategies.tweetProgress("Got a run going, just beat Misty "..elt.." in"..pbn, "misty")
end
end
return true
end,
tweetVictoryRoad = function()
local elt = Utils.elapsedTime()
local pbn = ""
if not Strategies.overMinute("victory_road") then
pbn = " (PB pace)"
tweetSurge = function()
Control.preferredPotion = "super"
if not Strategies.updates.misty then
local timeLimit = Strategies.getTimeRequirement("trash")
if not Strategies.overMinute(timeLimit + (not Data.yellow and 1.0 or 0.5)) then
local elt, pbn = Strategies.paceMessage(timeLimit + (not Data.yellow and 0.25 or 0))
Strategies.tweetProgress("Got a run going, just beat Surge "..elt.." in"..pbn, "surge")
end
end
local elt = Utils.elapsedTime()
return true
end,
tweetVictoryRoad = function()
local elt, pbn = Strategies.paceMessage("victory_road")
Strategies.tweetProgress("Entering Victory Road at "..elt..pbn.." on our way to the Elite Four in", "victory")
return true
end,