Decrease Bulbasaur reset time, describe running low on potions at Misty, standardize red-bar naming
This commit is contained in:
parent
84568fd43f
commit
f3c49d611f
|
@ -32,7 +32,7 @@ local yolo, deepRun, resetting, riskGiovanni, maxEtherSkip
|
||||||
local timeRequirements = {
|
local timeRequirements = {
|
||||||
|
|
||||||
bulbasaur = function()
|
bulbasaur = function()
|
||||||
return 2.25
|
return 2.2
|
||||||
end,
|
end,
|
||||||
|
|
||||||
nidoran = function()
|
nidoran = function()
|
||||||
|
@ -1567,7 +1567,7 @@ strategyFunctions = {
|
||||||
if pokemon.info("nidoking", "level") < 23 or inventory.count("potion") < 3 then -- RISK
|
if pokemon.info("nidoking", "level") < 23 or inventory.count("potion") < 3 then -- RISK
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
bridge.chat("Using Poison Sting to attempt to redbar off Mankey")
|
bridge.chat("Using Poison Sting to attempt to red-bar off Mankey")
|
||||||
end
|
end
|
||||||
if battle.isActive() then
|
if battle.isActive() then
|
||||||
canProgress = true
|
canProgress = true
|
||||||
|
@ -1577,7 +1577,7 @@ strategyFunctions = {
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
local scratchDmg = enemyMove.damage
|
local scratchDmg = enemyMove.damage
|
||||||
if curr_hp - red_hp > scratchDmg then
|
if curr_hp - scratchDmg >= red_hp then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1630,8 +1630,16 @@ strategyFunctions = {
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if initialize() then
|
if initialize() then
|
||||||
if healAmount < 60 then
|
local message
|
||||||
bridge.chat("Limiting heals to attempt to get closer to red-bar off Misty", inventory.count("potion"))
|
local potionCount = inventory.count("potion")
|
||||||
|
local needsToHeal = healAmount - pokemon.index(0, "hp")
|
||||||
|
if potionCount * 20 < needsToHeal then
|
||||||
|
message = "Ran too low on potions to heal enough before Misty"
|
||||||
|
elseif healAmount < 60 then
|
||||||
|
message = "Limiting heals to attempt to get closer to red-bar off Misty"
|
||||||
|
end
|
||||||
|
if message then
|
||||||
|
bridge.chat(message, potionCount)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return strategyFunctions.potion({hp=healAmount})
|
return strategyFunctions.potion({hp=healAmount})
|
||||||
|
@ -2765,7 +2773,7 @@ strategyFunctions = {
|
||||||
|
|
||||||
centerSkip = function()
|
centerSkip = function()
|
||||||
setYolo("e4center")
|
setYolo("e4center")
|
||||||
local message = "Skipping the Center and attempting to redbar "
|
local message = "Skipping the Center and attempting to red-bar "
|
||||||
if hasHealthFor("LoreleiDewgong") then
|
if hasHealthFor("LoreleiDewgong") then
|
||||||
message = message.."off Lorelei..."
|
message = message.."off Lorelei..."
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue