Update catch requirements for Yellow
This commit is contained in:
parent
849c861260
commit
335f9ddd4e
|
@ -58,7 +58,7 @@ local controlFunctions = {
|
||||||
end,
|
end,
|
||||||
|
|
||||||
pp = function(data)
|
pp = function(data)
|
||||||
Combat.factorPP(data.on)
|
Combat.factorPP(data.on, data.range)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
thrash = function(data)
|
thrash = function(data)
|
||||||
|
@ -167,12 +167,11 @@ local controlFunctions = {
|
||||||
-- YELLOW
|
-- YELLOW
|
||||||
|
|
||||||
catchNidoranYellow = function()
|
catchNidoranYellow = function()
|
||||||
-- shouldCatch = {{name="nidoran",levels={6}}} --TODO DSum
|
shouldCatch = {{name="nidoran",levels={6}}, {name="pidgey",levels={3,5},requireHit=true}}
|
||||||
shouldCatch = {{name="nidoran",levels={6}}, {name="pidgey",requireHit=true}}
|
|
||||||
end,
|
end,
|
||||||
|
|
||||||
catchCutterYellow = function()
|
catchCutterYellow = function()
|
||||||
shouldCatch = {{name="sandshrew"}, {name="paras",levels={9,10,11,12}}}
|
shouldCatch = {{name="sandshrew"}}
|
||||||
end,
|
end,
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -246,7 +245,7 @@ function Control.shouldCatch(partySize)
|
||||||
if not shouldCatch then
|
if not shouldCatch then
|
||||||
return false
|
return false
|
||||||
end
|
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
|
return false
|
||||||
end
|
end
|
||||||
if not partySize then
|
if not partySize then
|
||||||
|
|
Loading…
Reference in New Issue