Report Mt. Moon results

This commit is contained in:
Kyle Coburn 2015-04-29 14:15:10 -07:00
parent 55ff0f85c4
commit 2c43a255f8
3 changed files with 8 additions and 2 deletions

View File

@ -261,7 +261,6 @@ local strategyFunctions = Strategies.functions
-- General -- General
strategyFunctions.tweetAfterBrock = function() strategyFunctions.tweetAfterBrock = function()
Bridge.moonGuesses(true)
if stats.nidoran.rating < 2 then if stats.nidoran.rating < 2 then
if not Strategies.overMinute("shorts") then if not Strategies.overMinute("shorts") then
Strategies.tweetProgress("On pace after Brock with a great Nidoran", "brock") Strategies.tweetProgress("On pace after Brock with a great Nidoran", "brock")

View File

@ -1104,6 +1104,7 @@ Strategies.functions = {
catchFlierBackup = function() catchFlierBackup = function()
if Strategies.initialize() then if Strategies.initialize() then
Bridge.moonGuesses(true)
Control.canDie(true) Control.canDie(true)
end end
if not Control.canCatch() then if not Control.canCatch() then
@ -1203,7 +1204,8 @@ Strategies.functions = {
local conjunction = "but" local conjunction = "but"
local goodEncounters = moonEncounters < 10 local goodEncounters = moonEncounters < 10
local catchDescription local catchDescription
if Pokemon.inParty(catchPokemon) then local caughtCutter = Pokemon.inParty(catchPokemon)
if caughtCutter then
catchDescription = catchPokemon catchDescription = catchPokemon
if goodEncounters then if goodEncounters then
conjunction = "and" conjunction = "and"
@ -1218,6 +1220,7 @@ Strategies.functions = {
end end
Bridge.caught(catchDescription) Bridge.caught(catchDescription)
Bridge.chat(moonEncounters.." Moon encounters, "..conjunction.." "..parasStatus) Bridge.chat(moonEncounters.." Moon encounters, "..conjunction.." "..parasStatus)
Bridge.moonResults(moonEncounters, caughtCutter)
end end
Strategies.resetTime("mt_moon", "complete Mt. Moon") Strategies.resetTime("mt_moon", "complete Mt. Moon")

View File

@ -147,6 +147,10 @@ function Bridge.moonGuesses(enabled)
send("moon,"..(enabled and "on" or "off")) send("moon,"..(enabled and "on" or "off"))
end end
function Bridge.moonResults(encounters, paras)
send("moonresults,"..encounters..","..(paras and "paras" or "none"))
end
function Bridge.reset() function Bridge.reset()
send("reset") send("reset")
timeStopped = false timeStopped = false