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

Check for encounters, update Moon exp, and require a hit for catching Pidgey

This commit is contained in:
Kyle Coburn 2015-05-11 00:04:44 -07:00
parent e512aa8a8f
commit 05b4c88e08
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ai/control.lua
View File

@ -47,7 +47,7 @@ local controlFunctions = {
end, end,
encounters = function(data) encounters = function(data)
if RESET_FOR_TIME and not Data.yellow then if RESET_FOR_TIME then
local limit = data.limit local limit = data.limit
if limit and BEAST_MODE then if limit and BEAST_MODE then
limit = limit - math.ceil(limit * 0.3) limit = limit - math.ceil(limit * 0.3)
@ -104,7 +104,11 @@ local controlFunctions = {
end, end,
moon1Exp = function() moon1Exp = function()
if Control.getMoonExp then if Data.yellow then
shouldFight = {{name="geodude"}, {name="clefairy",levels={12,13}}}
oneHits = true
minExp = 2700
elseif Control.getMoonExp then
minExp = 2704 minExp = 2704
shouldFight = {{name="zubat",levels={9,10,11,12},exp=7.67}} shouldFight = {{name="zubat",levels={9,10,11,12},exp=7.67}}
oneHits = true oneHits = true
@ -112,7 +116,9 @@ local controlFunctions = {
end, end,
moon2Exp = function() moon2Exp = function()
if Control.getMoonExp and Strategies.stats.nidoran then if Data.yellow then
minExp = 3450
elseif Control.getMoonExp and Strategies.stats.nidoran then
minExp = 3011 minExp = 3011
local withinOne = withinOneKill(minExp) local withinOne = withinOneKill(minExp)
if withinOne or Strategies.stats.nidoran.level4 then if withinOne or Strategies.stats.nidoran.level4 then
@ -123,7 +129,9 @@ local controlFunctions = {
end, end,
moon3Exp = function() moon3Exp = function()
if Control.getMoonExp and Strategies.stats.nidoran then if Data.yellow then
minExp = 4200
elseif Control.getMoonExp and Strategies.stats.nidoran then
minExp = 3798 minExp = 3798
local withinOne = withinOneKill(minExp) local withinOne = withinOneKill(minExp)
if withinOne or Strategies.stats.nidoran.level4 then if withinOne or Strategies.stats.nidoran.level4 then
@ -163,12 +171,6 @@ local controlFunctions = {
shouldCatch = {{name="nidoran",levels={6}}, {name="pidgey",requireHit=true}} shouldCatch = {{name="nidoran",levels={6}}, {name="pidgey",requireHit=true}}
end, end,
moonExpYellow = function()
minExp = 2704 --TODO
shouldFight = {{name="geodude"}, {name="clefairy",levels={12,13}}}
oneHits = true
end,
catchCutterYellow = function() catchCutterYellow = function()
shouldCatch = {{name="sandshrew"}, {name="paras",levels={9,10,11,12}}} shouldCatch = {{name="sandshrew"}, {name="paras",levels={9,10,11,12}}}
end, end,
@ -275,7 +277,7 @@ function Control.shouldCatch(partySize)
if penultimate then if penultimate then
require("action.battle").fight(penultimate.midx) require("action.battle").fight(penultimate.midx)
else else
if overHP and poke.requireHit then if poke.requireHit and not Battle.opponentDamaged() then
return false return false
end end
Inventory.use("pokeball", nil, true) Inventory.use("pokeball", nil, true)