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

Update catch requirements for Yellow

This commit is contained in:
Kyle Coburn 2015-05-17 20:53:32 -07:00
parent 849c861260
commit 335f9ddd4e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ai/control.lua
View File

@ -58,7 +58,7 @@ local controlFunctions = {
end,
pp = function(data)
Combat.factorPP(data.on)
Combat.factorPP(data.on, data.range)
end,
thrash = function(data)
@ -167,12 +167,11 @@ local controlFunctions = {
-- YELLOW
catchNidoranYellow = function()
-- shouldCatch = {{name="nidoran",levels={6}}} --TODO DSum
shouldCatch = {{name="nidoran",levels={6}}, {name="pidgey",requireHit=true}}
shouldCatch = {{name="nidoran",levels={6}}, {name="pidgey",levels={3,5},requireHit=true}}
end,
catchCutterYellow = function()
shouldCatch = {{name="sandshrew"}, {name="paras",levels={9,10,11,12}}}
shouldCatch = {{name="sandshrew"}}
end,
}
@ -246,7 +245,7 @@ function Control.shouldCatch(partySize)
if not shouldCatch then
return false
end
if Data.yellow and not Inventory.contains("pokeball") then
if Data.yellow and Pokemon.inParty("pidgey", "spearow") and not Inventory.contains("pokeball") then
return false
end
if not partySize then