Add more description messages for special Strategies

This commit is contained in:
Kyle Coburn 2015-04-14 16:57:29 -07:00
parent 07d09f757e
commit 1b055549f0
2 changed files with 31 additions and 6 deletions

View File

@ -244,7 +244,9 @@ strategyFunctions.tweetAfterBrock = function()
end
strategyFunctions.tweetMisty = function()
if not Strategies.updates.brock and not Strategies.setYolo("misty") then
Strategies.setYolo("misty")
if not Strategies.updates.brock and not Control.yolo then
local timeLimit = Strategies.getTimeRequirement("misty")
if not Strategies.overMinute(timeLimit - 0.25) then
local pbn = ""
@ -753,6 +755,10 @@ strategyFunctions.rivalSandAttack = function(data)
sacrifice = Pokemon.getSacrifice("pidgey", "spearow", "oddish")
end
if Battle.sacrifice(sacrifice) then
if not status.sacrificed then
status.sacrificed = true
Bridge.chat("got Sand-Attacked... Swapping out "..sacrifice.." to restore our accuracy (let's hope for no more trolling)")
end
return false
end
end
@ -840,6 +846,10 @@ strategyFunctions.thrashGeodude = function()
end
end
if status.sacrificeSquirtle and Battle.sacrifice("squirtle") then
if not status.sacrificed then
status.sacrificed = true
Bridge.chat(" Thrash didn't finish the kill :( swapping to Squirtle for safety")
end
return false
end
end
@ -944,6 +954,10 @@ strategyFunctions.fightMisty = function()
end
status.swappedOut = false
if Battle.sacrifice("pidgey", "spearow", "squirtle", "paras") then
if not status.sacrificed then
status.sacrificed = true
Bridge.chat(" Thrash didn't finish the kill :( Swapping out to cure Confusion")
end
return false
end
end
@ -1790,7 +1804,12 @@ strategyFunctions.lorelei = function()
local forced
local opponentName = Battle.opponent()
if opponentName == "dewgong" then
if Battle.sacrifice("pidgey", "spearow", "squirtle", "paras", "oddish") then
local sacrifice = Pokemon.getSacrifice("pidgey", "spearow", "squirtle", "paras", "oddish")
if Battle.sacrifice(sacrifice) then
if not status.sacrificed then
status.sacrificed = true
Bridge.chat(" Swapping out "..Utils.capitalize(sacrifice).." to tank Aurora Beam into turn 2 Rest. Only a problem if it misses...")
end
return false
end
elseif opponentName == "jinx" then

View File

@ -533,10 +533,9 @@ Strategies.functions = {
end
return false
end
if Strategies.initialize() then
if not Inventory.contains(data.item) then
print("No "..data.item.." available!")
end
if not status.unavailable and data.item ~= "carbos" and not Inventory.contains(data.item) then
status.unavailable = true
print("No "..data.item.." available!")
end
return Strategies.useItem(data)
end
@ -1174,6 +1173,13 @@ Strategies.functions = {
end
end,
announceOddish = function()
if Pokemon.info("nidoking", "level") < 30 then
Bridge.chat("needs a good damage range to 1-shot this Oddish, which can Paralyze")
end
return true
end,
shopTM07 = function()
return Shop.transaction {
direction = "Up",