Cleanup
This commit is contained in:
parent
335a4740a2
commit
82a5dbc065
|
@ -205,7 +205,7 @@ function Control.canCatch(partySize)
|
||||||
local pokeballs = Inventory.count("pokeball")
|
local pokeballs = Inventory.count("pokeball")
|
||||||
local minimumCount = (yellow and 3 or 4) - partySize
|
local minimumCount = (yellow and 3 or 4) - partySize
|
||||||
if pokeballs < minimumCount then
|
if pokeballs < minimumCount then
|
||||||
if yellow and Pokemon.inParty("nidoran") and Pokemon.inParty("pidgey", "spearow") then
|
if yellow and Pokemon.inParty("nidoran", "nidorino", "nidoking") and Pokemon.inParty("pidgey", "spearow") then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
Strategies.reset("Not enough PokeBalls", pokeballs)
|
Strategies.reset("Not enough PokeBalls", pokeballs)
|
||||||
|
@ -313,7 +313,7 @@ function Control.encounter(battleState)
|
||||||
Paint.wildEncounters(encounters)
|
Paint.wildEncounters(encounters)
|
||||||
Bridge.encounter()
|
Bridge.encounter()
|
||||||
if Control.moonEncounters then
|
if Control.moonEncounters then
|
||||||
if Pokemon.isOpponent("zubat") then
|
if INTERNAL and Pokemon.isOpponent("zubat") then
|
||||||
Bridge.chat("NightBat")
|
Bridge.chat("NightBat")
|
||||||
end
|
end
|
||||||
Control.moonEncounters = Control.moonEncounters + 1
|
Control.moonEncounters = Control.moonEncounters + 1
|
||||||
|
|
|
@ -315,7 +315,7 @@ strategyFunctions.fightBulbasaur = function()
|
||||||
status.tries = status.tries + 1
|
status.tries = status.tries + 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if Battle.isActive() and Memory.double("battle", "opponent_hp") > 0 and Strategies.resetTime("bulbasaur", "kill Bulbasaur") then
|
if Battle.isActive() and Memory.double("battle", "opponent_hp") > 0 and Strategies.resetTime("bulbasaur", "beat Bulbasaur") then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
return Strategies.buffTo("tail_whip", 6)
|
return Strategies.buffTo("tail_whip", 6)
|
||||||
|
@ -382,7 +382,7 @@ strategyFunctions.catchNidoran = function()
|
||||||
|
|
||||||
local resetMessage
|
local resetMessage
|
||||||
if hasNidoran then
|
if hasNidoran then
|
||||||
resetMessage = "get an experience kill before Brock"
|
resetMessage = "get an encounter for experience before Brock"
|
||||||
else
|
else
|
||||||
resetMessage = "find a suitable Nidoran"
|
resetMessage = "find a suitable Nidoran"
|
||||||
end
|
end
|
||||||
|
@ -934,8 +934,12 @@ strategyFunctions.fightMisty = function()
|
||||||
end
|
end
|
||||||
local forced
|
local forced
|
||||||
if not status.swappedOut and Combat.isConfused() then
|
if not status.swappedOut and Combat.isConfused() then
|
||||||
|
if status.swappedOut == nil and Control.yolo then
|
||||||
|
status.swappedOut = true
|
||||||
|
return false
|
||||||
|
end
|
||||||
status.swappedOut = false
|
status.swappedOut = false
|
||||||
if Battle.sacrifice("pidgey", "spearow", "paras", "squirtle") then
|
if Battle.sacrifice("pidgey", "spearow", "squirtle", "paras") then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1526,7 +1530,7 @@ strategyFunctions.silphRival = function()
|
||||||
if Strategies.initialize() then
|
if Strategies.initialize() then
|
||||||
status.gyaradosDamage = Combat.healthFor("RivalGyarados")
|
status.gyaradosDamage = Combat.healthFor("RivalGyarados")
|
||||||
if Control.yolo then
|
if Control.yolo then
|
||||||
Bridge.chat("is attempting to red-bar off Gyarados. Get ready to spaghetti!")
|
Bridge.chat("is attempting to red-bar off Silph Rival. Get ready to spaghetti!")
|
||||||
end
|
end
|
||||||
status.canProgress = true
|
status.canProgress = true
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue