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

Minor strategy updates

This commit is contained in:
Kyle Coburn 2015-04-09 20:45:37 -07:00
parent 559d564e77
commit 0b71332206
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ai/red/strategies.lua
View File

@ -250,7 +250,8 @@ strategyFunctions.tweetSurge = function()
if not Strategies.updates.misty and not Control.yolo then if not Strategies.updates.misty and not Control.yolo then
local elt = Utils.elapsedTime() local elt = Utils.elapsedTime()
local pbn = "" local pbn = ""
if not Strategies.overMinute("surge") then local pbPace = Strategies.getTimeRequirement("trash") + 1
if not Strategies.overMinute(pbPace) then
pbn = " (PB pace)" pbn = " (PB pace)"
end end
Strategies.tweetProgress("Got a run going, just beat Surge "..elt.." in"..pbn, "surge") Strategies.tweetProgress("Got a run going, just beat Surge "..elt.." in"..pbn, "surge")
@ -358,7 +359,7 @@ strategyFunctions.catchNidoran = function()
end end
end end
if gotExperience then if gotExperience then
stats.nidoran = {level4 = (Pokemon.info("nidoran", "level") == 4)} stats.nidoran = {level4=(Pokemon.info("nidoran", "level") == 4)}
return true return true
end end
noDSum = true noDSum = true
@ -429,11 +430,11 @@ strategyFunctions.grabForestPotion = function()
if Battle.handleWild() then if Battle.handleWild() then
local potionCount = Inventory.count("potion") local potionCount = Inventory.count("potion")
if Strategies.initialize() then if Strategies.initialize() then
status.tries = potionCount status.startPotions = potionCount
end end
if potionCount > 0 then if potionCount > 0 then
if status.tries and potionCount > status.tries then if status.startPotions and potionCount > status.startPotions then
status.tries = nil status.startPotions = nil
end end
if Pokemon.info("squirtle", "hp") <= 14 then if Pokemon.info("squirtle", "hp") <= 14 then
if Menu.pause() then if Menu.pause() then
@ -442,8 +443,10 @@ strategyFunctions.grabForestPotion = function()
elseif Menu.close() then elseif Menu.close() then
return true return true
end end
elseif not status.tries then elseif not status.startPotions then
return true if Menu.close() then
return true
end
elseif Menu.close() then elseif Menu.close() then
Player.interact("Up") Player.interact("Up")
end end
@ -832,7 +835,7 @@ strategyFunctions.redbarMankey = function()
Textbox.handle() Textbox.handle()
end end
if Strategies.initialize() then if Strategies.initialize() then
if Pokemon.info("nidoking", "level") < 23 or Inventory.count("potion") < 3 then -- RISK if Pokemon.info("nidoking", "level") < 23 or Inventory.count("potion") < 4 then -- RISK
return true return true
end end
Bridge.chat("is using Poison Sting to attempt to red-bar off Mankey") Bridge.chat("is using Poison Sting to attempt to red-bar off Mankey")
@ -1931,15 +1934,8 @@ end
strategyFunctions.viridianRival = function() strategyFunctions.viridianRival = function()
if Battle.isActive() then if Battle.isActive() then
if not status.canProgress then status.canProgress = true
if riskGiovanni or stats.nidoran.special < 45 or Pokemon.index(0, "speed") < 134 then if Strategies.prepare("x_accuracy", "x_special") then
status.xItem = "x_special"
else
print("Skip X Special strats!")
end
status.canProgress = true
end
if Strategies.prepare("x_accuracy", status.xItem) then
local forced local forced
if Pokemon.isOpponent("pidgeot") then if Pokemon.isOpponent("pidgeot") then
forced = "thunderbolt" forced = "thunderbolt"
@ -2303,13 +2299,8 @@ strategyFunctions.blue = function()
else else
if Strategies.prepare(firstItem, secondItem) then if Strategies.prepare(firstItem, secondItem) then
if Pokemon.isOpponent("alakazam") then if Pokemon.isOpponent("alakazam") then
if status.xItem == "x_speed" then if status.xItem == "x_special" then
forced = "earthquake" forced = "earthquake"
else
local ours, enemy = Combat.activePokemon()
if ours.speed <= enemy.speed then
forced = "earthquake"
end
end end
elseif Pokemon.isOpponent("rhydon") then elseif Pokemon.isOpponent("rhydon") then
if status.xItem == "x_special" then if status.xItem == "x_special" then