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

Tighten time constraints, adjust Tweeting after Misty

This commit is contained in:
Kyle Coburn 2015-04-05 13:07:05 -07:00
parent 1ae976498b
commit 4d9b46c13a
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ai/strategies.lua
View File

@ -55,7 +55,7 @@ local timeRequirements = {
end, end,
mankey = function() mankey = function()
local timeLimit = 33 local timeLimit = 32.5
if pokemon.inParty("paras") then if pokemon.inParty("paras") then
timeLimit = timeLimit + 0.75 timeLimit = timeLimit + 0.75
end end
@ -63,7 +63,7 @@ local timeRequirements = {
end, end,
goldeen = function() goldeen = function()
local timeLimit = 38 local timeLimit = 37.5
if pokemon.inParty("paras") then if pokemon.inParty("paras") then
timeLimit = timeLimit + 0.75 timeLimit = timeLimit + 0.75
end end
@ -71,7 +71,7 @@ local timeRequirements = {
end, end,
misty = function() misty = function()
local timeLimit = 40 local timeLimit = 39.5
if pokemon.inParty("paras") then if pokemon.inParty("paras") then
timeLimit = timeLimit + 0.75 timeLimit = timeLimit + 0.75
end end
@ -79,7 +79,7 @@ local timeRequirements = {
end, end,
vermilion = function() vermilion = function()
return 44.25 return 44
end, end,
trash = function() trash = function()
@ -100,16 +100,24 @@ local timeRequirements = {
return 70.5 return 70.5
end, end,
victory_road = function()
return 98.75 -- PB
end,
e4center = function() e4center = function()
return 102 return 102
end, end,
blue = function() blue = function()
return 108.2 return 108.5
end, end,
} }
local function getTimeRequirement(name)
return timeRequirements[name]()
end
-- RISK/RESET -- RISK/RESET
local function hardReset(message, extra, wait) local function hardReset(message, extra, wait)
@ -180,10 +188,6 @@ local function resetTime(timeLimit, reason, once)
end end
end end
local function getTimeRequirement(name)
return timeRequirements[name]()
end
local function setYolo(name) local function setYolo(name)
if not RESET_FOR_TIME then if not RESET_FOR_TIME then
return false return false
@ -513,16 +517,16 @@ strategyFunctions = {
end, end,
tweetMisty = function() tweetMisty = function()
local elt = utils.elapsedTime() if not setYolo("misty") then
if setYolo("misty") then local timeLimit = getTimeRequirement("misty")
print("Misty: "..elt) if not overMinute(timeLimit - 0.5) then
else local pbn = ""
local pbn = "" if not overMinute(timeLimit - 1) then
local pbTime = getTimeRequirement("misty") - 1.75 pbn = " (PB pace)"
if not overMinute(pbTime) then end
pbn = " (PB pace)" local elt = utils.elapsedTime()
bridge.tweet("Got a run going, just beat Misty "..elt.." in"..pbn.." http://www.twitch.tv/thepokebot")
end end
bridge.tweet("Got a run going, just beat Misty "..elt.." in"..pbn.." http://www.twitch.tv/thepokebot")
end end
return true return true
end, end,
@ -530,7 +534,7 @@ strategyFunctions = {
tweetVictoryRoad = function() tweetVictoryRoad = function()
local elt = utils.elapsedTime() local elt = utils.elapsedTime()
local pbn = "" local pbn = ""
if not overMinute(98) then -- TODO verify if not overMinute(getTimeRequirement("victory_road")) then
pbn = " (PB pace)" pbn = " (PB pace)"
end end
local elt = utils.elapsedTime() local elt = utils.elapsedTime()
@ -1797,7 +1801,7 @@ strategyFunctions = {
local px, py = player.position() local px, py = player.position()
if px == 4 and py == 6 then if px == 4 and py == 6 then
tries = tries + 1 tries = tries + 1
local timeLimit = getTimeRequirement("trash") + 1 local timeLimit = getTimeRequirement("trash") + 1.5
if resetTime(timeLimit, "complete Trashcans ("..tries.." tries)") then if resetTime(timeLimit, "complete Trashcans ("..tries.." tries)") then
return true return true
end end
@ -3026,7 +3030,7 @@ end
function strategies.init(midGame) function strategies.init(midGame)
if not STREAMING_MODE then if not STREAMING_MODE then
-- setYolo(0) -- setYolo("bulbasaur")
nidoAttack = 55 nidoAttack = 55
nidoSpeed = 50 nidoSpeed = 50
nidoSpecial = 45 nidoSpecial = 45