Update time constraints
This commit is contained in:
parent
5a8fcdcd1a
commit
390f3a8b88
|
@ -51,16 +51,12 @@ end
|
||||||
|
|
||||||
Strategies.timeRequirements = {
|
Strategies.timeRequirements = {
|
||||||
|
|
||||||
bulbasaur = function()
|
bulbasaur = function() --RESET
|
||||||
return 2.25
|
return 2.25
|
||||||
end,
|
end,
|
||||||
|
|
||||||
nidoran = function() --RESET
|
nidoran = function() --RESET
|
||||||
local timeLimit = 6.33
|
return 6.4 + timeSaveFor("spearow")
|
||||||
if Pokemon.inParty("spearow") then
|
|
||||||
timeLimit = timeLimit + 0.6
|
|
||||||
end
|
|
||||||
return timeLimit
|
|
||||||
end,
|
end,
|
||||||
|
|
||||||
old_man = function()
|
old_man = function()
|
||||||
|
@ -68,79 +64,65 @@ Strategies.timeRequirements = {
|
||||||
end,
|
end,
|
||||||
|
|
||||||
brock = function()
|
brock = function()
|
||||||
local timeLimit = 11
|
return 11 + timeSaveFor("spearow")
|
||||||
if Pokemon.inParty("spearow") then
|
|
||||||
timeLimit = timeLimit + 0.5
|
|
||||||
end
|
|
||||||
return timeLimit
|
|
||||||
end,
|
end,
|
||||||
|
|
||||||
shorts = function()
|
shorts = function() --TWEET
|
||||||
local timeLimit = 14
|
local timeLimit = 13.75 + timeSaveFor("spearow")
|
||||||
timeLimit = timeLimit + (3 - stats.nidoran.rating) * 0.2
|
timeLimit = timeLimit + (3 - stats.nidoran.rating) * 0.2
|
||||||
if Pokemon.inParty("spearow") then
|
|
||||||
timeLimit = timeLimit + 0.5
|
|
||||||
end
|
|
||||||
return timeLimit
|
return timeLimit
|
||||||
end,
|
end,
|
||||||
|
|
||||||
mt_moon = function()
|
mt_moon = function() --RESET
|
||||||
local timeLimit = 26.75
|
local timeLimit = 26 + timeSaveFor("paras")
|
||||||
if stats.nidoran.attack > 15 and stats.nidoran.speed > 14 then
|
if Pokemon.info("nidoking", "level") >= 18 then
|
||||||
timeLimit = timeLimit + 0.33
|
timeLimit = timeLimit + 0.33
|
||||||
|
elseif Pokemon.getExp() > 3730 then
|
||||||
|
timeLimit = timeLimit + 0.15
|
||||||
end
|
end
|
||||||
if Pokemon.inParty("paras") then
|
if stats.nidoran.attack > 15 then
|
||||||
timeLimit = timeLimit + 0.75
|
timeLimit = timeLimit + 0.25
|
||||||
|
end
|
||||||
|
if stats.nidoran.speed > 14 then
|
||||||
|
timeLimit = timeLimit + 0.25
|
||||||
end
|
end
|
||||||
return timeLimit
|
return timeLimit
|
||||||
end,
|
end,
|
||||||
|
|
||||||
mankey = function()
|
mankey = function()
|
||||||
local timeLimit = 32.5
|
return 31.25 + timeSaveFor("paras")
|
||||||
if Pokemon.inParty("paras") then
|
|
||||||
timeLimit = timeLimit + 0.75
|
|
||||||
end
|
|
||||||
return timeLimit
|
|
||||||
end,
|
end,
|
||||||
|
|
||||||
goldeen = function()
|
goldeen = function()
|
||||||
local timeLimit = 37 + timeForStats()
|
return 36.5 + timeForStats() + timeSaveFor("paras")
|
||||||
if Pokemon.inParty("paras") then
|
|
||||||
timeLimit = timeLimit + 0.75
|
|
||||||
end
|
|
||||||
return timeLimit
|
|
||||||
end,
|
end,
|
||||||
|
|
||||||
misty = function()
|
misty = function() --PB
|
||||||
local timeLimit = 39 + timeForStats()
|
return 38 + timeForStats() + timeSaveFor("paras")
|
||||||
if Pokemon.inParty("paras") then
|
|
||||||
timeLimit = timeLimit + 0.75
|
|
||||||
end
|
|
||||||
return timeLimit
|
|
||||||
end,
|
end,
|
||||||
|
|
||||||
vermilion = function()
|
vermilion = function()
|
||||||
return 43.5 + timeForStats()
|
return 42.5 + timeForStats()
|
||||||
end,
|
end,
|
||||||
|
|
||||||
trash = function()
|
trash = function() --RESET
|
||||||
return 47 + timeForStats()
|
return 46.75 + timeForStats()
|
||||||
end,
|
end,
|
||||||
|
|
||||||
safari_carbos = function()
|
safari_carbos = function()
|
||||||
return 70 + timeForStats()
|
return 68.5 + timeForStats()
|
||||||
end,
|
end,
|
||||||
|
|
||||||
victory_road = function()
|
victory_road = function() --PB
|
||||||
return 98.75 -- PB
|
return 97.9
|
||||||
end,
|
end,
|
||||||
|
|
||||||
e4center = function()
|
e4center = function()
|
||||||
return 102
|
return 101.25
|
||||||
end,
|
end,
|
||||||
|
|
||||||
blue = function()
|
blue = function()
|
||||||
return 108.5
|
return 107.5
|
||||||
end,
|
end,
|
||||||
|
|
||||||
champion = function() --PB
|
champion = function() --PB
|
||||||
|
@ -276,7 +258,7 @@ strategyFunctions.tweetMisty = function()
|
||||||
|
|
||||||
if not Strategies.updates.brock and not Control.yolo then
|
if not Strategies.updates.brock and not Control.yolo then
|
||||||
local timeLimit = Strategies.getTimeRequirement("misty")
|
local timeLimit = Strategies.getTimeRequirement("misty")
|
||||||
if not Strategies.overMinute(timeLimit - 0.25) then
|
if not Strategies.overMinute(timeLimit) then
|
||||||
local pbn = ""
|
local pbn = ""
|
||||||
if not Strategies.overMinute(timeLimit - 1) then
|
if not Strategies.overMinute(timeLimit - 1) then
|
||||||
pbn = " (PB pace)"
|
pbn = " (PB pace)"
|
||||||
|
@ -293,7 +275,7 @@ strategyFunctions.tweetSurge = function()
|
||||||
|
|
||||||
if not Strategies.updates.misty then
|
if not Strategies.updates.misty then
|
||||||
local timeLimit = Strategies.getTimeRequirement("trash")
|
local timeLimit = Strategies.getTimeRequirement("trash")
|
||||||
if not Strategies.overMinute(timeLimit + 0.75) then
|
if not Strategies.overMinute(timeLimit + 1) then
|
||||||
local elt = Utils.elapsedTime()
|
local elt = Utils.elapsedTime()
|
||||||
local pbn = ""
|
local pbn = ""
|
||||||
|
|
||||||
|
@ -397,7 +379,7 @@ strategyFunctions.catchNidoran = function()
|
||||||
local resetLimit = Strategies.getTimeRequirement("nidoran")
|
local resetLimit = Strategies.getTimeRequirement("nidoran")
|
||||||
local catchTarget
|
local catchTarget
|
||||||
if catchableNidoran or opponent == "spearow" then
|
if catchableNidoran or opponent == "spearow" then
|
||||||
resetLimit = resetLimit + 0.33
|
resetLimit = resetLimit + 0.25
|
||||||
catchTarget = Utils.capitalize(opponent)
|
catchTarget = Utils.capitalize(opponent)
|
||||||
else
|
else
|
||||||
resetLimit = resetLimit - 0.15
|
resetLimit = resetLimit - 0.15
|
||||||
|
|
Loading…
Reference in New Issue