Cleanup
This commit is contained in:
parent
5b987785b6
commit
4cbea9537e
|
@ -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 INTERNAL and Pokemon.isOpponent("zubat") then
|
if INTERNAL and STREAMING_MODE and Pokemon.isOpponent("zubat") then
|
||||||
Bridge.chat("NightBat")
|
Bridge.chat("NightBat")
|
||||||
end
|
end
|
||||||
Control.moonEncounters = Control.moonEncounters + 1
|
Control.moonEncounters = Control.moonEncounters + 1
|
||||||
|
@ -326,7 +326,7 @@ function Control.encounter(battleState)
|
||||||
for i,catch in ipairs(gottaCatchEm) do
|
for i,catch in ipairs(gottaCatchEm) do
|
||||||
if opponent == catch then
|
if opponent == catch then
|
||||||
if not Pokemon.inParty(catch) then
|
if not Pokemon.inParty(catch) then
|
||||||
Bridge.chat("accidentally killed "..Utils.capitalize(catch).." with a "..(isCritical and "critical" or "high damage range").." :(")
|
Bridge.chat("accidentally killed "..Utils.capitalize(catch).." with a "..(Control.criticaled and "critical" or "high damage range").." :(")
|
||||||
Control.killedCatch = true
|
Control.killedCatch = true
|
||||||
end
|
end
|
||||||
break
|
break
|
||||||
|
|
|
@ -1167,6 +1167,8 @@ strategyFunctions.procureBicycle = function()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- announceFourTurn
|
||||||
|
|
||||||
strategyFunctions.redbarCubone = function()
|
strategyFunctions.redbarCubone = function()
|
||||||
if Battle.isActive() then
|
if Battle.isActive() then
|
||||||
local forced
|
local forced
|
||||||
|
|
|
@ -46,6 +46,10 @@ Strategies.timeRequirements = {
|
||||||
return timeLimit
|
return timeLimit
|
||||||
end,
|
end,
|
||||||
|
|
||||||
|
trash = function()
|
||||||
|
return 55
|
||||||
|
end,
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
-- HELPERS
|
-- HELPERS
|
||||||
|
@ -302,7 +306,7 @@ strategyFunctions.centerMoon = function()
|
||||||
end
|
end
|
||||||
|
|
||||||
strategyFunctions.centerCerulean = function(data)
|
strategyFunctions.centerCerulean = function(data)
|
||||||
local ppRequired = 150
|
local ppRequired = 15
|
||||||
if data.first then
|
if data.first then
|
||||||
local currentMap = Memory.value("game", "map")
|
local currentMap = Memory.value("game", "map")
|
||||||
if currentMap == 3 then
|
if currentMap == 3 then
|
||||||
|
@ -317,7 +321,7 @@ strategyFunctions.centerCerulean = function(data)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
takeCenter(ppRequired, 3, 19, 17, 19)
|
return takeCenter(ppRequired, 3, 19, 17, 19)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- reportMtMoon
|
-- reportMtMoon
|
||||||
|
@ -464,6 +468,8 @@ strategyFunctions.trashcans = function()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- announceFourTurn
|
||||||
|
|
||||||
-- PROCESS
|
-- PROCESS
|
||||||
|
|
||||||
function Strategies.initGame(midGame)
|
function Strategies.initGame(midGame)
|
||||||
|
|
Loading…
Reference in New Issue