bouletmarc
/
PokeBot
mirror of https://github.com/bouletmarc/PokeBot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup

This commit is contained in:
Kyle Coburn 2015-05-28 00:58:55 -07:00
parent 7cea85ef2a
commit 247237f0db
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ai/strategies.lua
View File

@ -1431,12 +1431,14 @@ Strategies.functions = {
local caughtCutter = Pokemon.inParty("paras", "sandshrew")
local catchDescription
local exclamation = "."
if caughtCutter then
catchDescription = caughtCutter
if goodEncounters then
conjunction = "and"
end
cutterStatus = "we caught a "..Utils.capitalize(caughtCutter).."!"
cutterStatus = "we caught a "..Utils.capitalize(caughtCutter)
exclamation = "!"
else
local catchPokemon = Data.yellow and "sandshrew" or "paras"
catchDescription = "no_"..catchPokemon
@ -1447,11 +1449,12 @@ Strategies.functions = {
if Data.yellow then
cutterStatus = cutterStatus.."cutter"
else
cutterStatus = cutterStatus..Utils.capitalize(catchPokemon).." :("
cutterStatus = cutterStatus..Utils.capitalize(catchPokemon)
exclamation = " :("
end
end
Bridge.caught(catchDescription)
Bridge.chat(moonEncounters.." Moon encounters, "..conjunction.." "..cutterStatus)
Bridge.chat(moonEncounters.." Moon encounters, "..conjunction.." "..cutterStatus..exclamation)
Bridge.moonResults(moonEncounters, caughtCutter)
end
@ -1715,7 +1718,7 @@ Strategies.functions = {
" *yawn*",
" :z",
" I think that ship broke the ocean.",
" Ah, lovely weather in Vermilion City this time of year, isn't it?",
" Ahh, lovely weather in Vermilion City this time of year, isn't it?",
" As a devout practicing member of the Church of Going Fast, I find the depiction of this unskippable cutscene offensive, frankly.",
" Anyone else feel cheated we didn't actually get to ride to some far off land in that boat?",
" So let me get this straight, the ship hadn't even left port yet, and the captain was already seasick? DansGame" --amanazi

9
ai/yellow/strategies.lua
View File

@ -949,7 +949,7 @@ strategyFunctions.silphRival = function()
if Combat.hp() <= 20 and not Strategies.isPrepared("x_speed") then
if Inventory.contains("super_potion") then
if Strategies.initialize("heals") then
local message = ""
local message
if Strategies.yolo then
message = "is risking Sonicboom/Confusion to save time."
else
@ -1044,7 +1044,7 @@ strategyFunctions.momHeal = function()
end
Bridge.chat("is "..message)
end
needsHeal = status.momHeal and Pokemon.pp(0, "earthquake") < 10
local needsHeal = status.momHeal and Pokemon.pp(0, "earthquake") < 10
local currentMap = Memory.value("game", "map")
local px, py = Player.position()
@ -1385,7 +1385,7 @@ strategyFunctions.prepareForBlue = function()
elseif Strategies.hasHealthFor("GarySandslash", 0, true) then
message = "has enough health to tank Sandslash... Let's go!"
healSkip = true
elseif Strategies.canHealFor("GarySandslash", true, true) or Strategies.hasSupersFor("GarySandslash") then
elseif Inventory.contains("full_restore") or Strategies.canHealFor("GarySandslash", true, true) or Strategies.hasSupersFor("GarySandslash") then
message = "is healing for Sandslash..."
else
message = "is unable to heal for Sandslash... Looks like we're going to have to freeze!"
@ -1498,7 +1498,8 @@ end
function Strategies.initGame(midGame)
if midGame then
Strategies.setYolo("nidoran", true)
-- Strategies.setYolo("nidoran", true)
-- Strategies.vaporeon = true
end
Control.preferredPotion = "super"
end