Update Strategies for display
This commit is contained in:
parent
46cefe03a9
commit
89249b64d8
|
@ -46,6 +46,10 @@ Strategies.timeRequirements = {
|
||||||
return timeLimit
|
return timeLimit
|
||||||
end,
|
end,
|
||||||
|
|
||||||
|
misty = function() --TWEET
|
||||||
|
return 43
|
||||||
|
end,
|
||||||
|
|
||||||
trash = function()
|
trash = function()
|
||||||
return 60
|
return 60
|
||||||
end,
|
end,
|
||||||
|
@ -209,7 +213,13 @@ local function takeCenter(pp, startMap, entranceX, entranceY, finishX)
|
||||||
local currentMap = Memory.value("game", "map")
|
local currentMap = Memory.value("game", "map")
|
||||||
local sufficientPP = Pokemon.pp(0, "horn_attack") > pp
|
local sufficientPP = Pokemon.pp(0, "horn_attack") > pp
|
||||||
if Strategies.initialize("reported") then
|
if Strategies.initialize("reported") then
|
||||||
print(Pokemon.pp(0, "horn_attack").." / "..pp.." horn attacks")
|
local centerAction
|
||||||
|
if sufficientPP then
|
||||||
|
centerAction = "Skipping"
|
||||||
|
else
|
||||||
|
centerAction = "Taking"
|
||||||
|
end
|
||||||
|
Bridge.chat(centerAction.." the Center with "..Pokemon.pp(0, "horn_attack").." of "..pp.." Horn Attacks")
|
||||||
end
|
end
|
||||||
if currentMap == startMap then
|
if currentMap == startMap then
|
||||||
if not sufficientPP then
|
if not sufficientPP then
|
||||||
|
@ -236,6 +246,9 @@ local function takeCenter(pp, startMap, entranceX, entranceY, finishX)
|
||||||
return depositPikachu()
|
return depositPikachu()
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
if Strategies.initialize("deposited") then
|
||||||
|
Bridge.caught("deposited")
|
||||||
|
end
|
||||||
if px ~= 3 then
|
if px ~= 3 then
|
||||||
if Menu.close() then
|
if Menu.close() then
|
||||||
px = 3
|
px = 3
|
||||||
|
@ -264,6 +277,11 @@ end
|
||||||
|
|
||||||
-- STRATEGIES
|
-- STRATEGIES
|
||||||
|
|
||||||
|
strategyFunctions.gotPikachu = function()
|
||||||
|
Bridge.caught("pikachu")
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
-- dodgePalletBoy
|
-- dodgePalletBoy
|
||||||
|
|
||||||
strategyFunctions.shopViridianPokeballs = function()
|
strategyFunctions.shopViridianPokeballs = function()
|
||||||
|
@ -276,11 +294,6 @@ strategyFunctions.catchNidoran = function()
|
||||||
if not Control.canCatch() then
|
if not Control.canCatch() then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
local pokeballs = Inventory.count("pokeball")
|
|
||||||
local caught = Memory.value("player", "party_size") > 1
|
|
||||||
if pokeballs < (caught and 1 or 2) then
|
|
||||||
return Strategies.reset("pokeballs", "Ran too low on PokeBalls", pokeballs)
|
|
||||||
end
|
|
||||||
if Battle.isActive() then
|
if Battle.isActive() then
|
||||||
status.path = nil
|
status.path = nil
|
||||||
local isNidoran = Pokemon.isOpponent("nidoran")
|
local isNidoran = Pokemon.isOpponent("nidoran")
|
||||||
|
@ -289,6 +302,13 @@ strategyFunctions.catchNidoran = function()
|
||||||
Bridge.pollForName()
|
Bridge.pollForName()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if Memory.value("battle", "menu") == 94 then
|
||||||
|
local pokeballs = Inventory.count("pokeball")
|
||||||
|
local caught = Memory.value("player", "party_size") > 1
|
||||||
|
if pokeballs < (caught and 1 or 2) then
|
||||||
|
return Strategies.reset("pokeballs", "Ran too low on PokeBalls", pokeballs)
|
||||||
|
end
|
||||||
|
end
|
||||||
if Memory.value("menu", "text_input") == 240 then
|
if Memory.value("menu", "text_input") == 240 then
|
||||||
Textbox.name()
|
Textbox.name()
|
||||||
elseif Menu.hasTextbox() then
|
elseif Menu.hasTextbox() then
|
||||||
|
@ -312,6 +332,9 @@ strategyFunctions.catchNidoran = function()
|
||||||
dy = 47
|
dy = 47
|
||||||
else
|
else
|
||||||
Bridge.caught("nidoran")
|
Bridge.caught("nidoran")
|
||||||
|
if INTERNAL then
|
||||||
|
p(Pokemon.getDVs("nidoran"))
|
||||||
|
end
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
Walk.step(dx, dy)
|
Walk.step(dx, dy)
|
||||||
|
@ -426,6 +449,9 @@ strategyFunctions.acquireCharmander = function()
|
||||||
end
|
end
|
||||||
local px, py = Player.position()
|
local px, py = Player.position()
|
||||||
if acquiredCharmander then
|
if acquiredCharmander then
|
||||||
|
if Strategies.initialize("aquired") then
|
||||||
|
Bridge.caught("charmander")
|
||||||
|
end
|
||||||
if py ~= 8 then
|
if py ~= 8 then
|
||||||
py = 8
|
py = 8
|
||||||
else
|
else
|
||||||
|
@ -447,9 +473,9 @@ end
|
||||||
-- jingleSkip
|
-- jingleSkip
|
||||||
|
|
||||||
strategyFunctions.shopVermilionMart = function()
|
strategyFunctions.shopVermilionMart = function()
|
||||||
if Strategies.initialize() then
|
-- if Strategies.initialize() then
|
||||||
Strategies.setYolo("vermilion")
|
-- Strategies.setYolo("vermilion")
|
||||||
end
|
-- end
|
||||||
local supers = Strategies.vaporeon and 7 or 8
|
local supers = Strategies.vaporeon and 7 or 8
|
||||||
return Shop.transaction {
|
return Shop.transaction {
|
||||||
sell = sellArray,
|
sell = sellArray,
|
||||||
|
@ -464,9 +490,9 @@ strategyFunctions.trashcans = function()
|
||||||
status.direction = 1
|
status.direction = 1
|
||||||
end
|
end
|
||||||
local trashPath = {
|
local trashPath = {
|
||||||
-- {next location, check, mid, pair, finish, end} {waypoints}
|
-- {next, loc, check, mid, pair, finish, end} {waypoints}
|
||||||
{nd=2, {1,12}, "Up", {3,12}, "Up", {3,12}}, {{4,12}},
|
{nd=2, {1,12}, "Up", {3,12}, "Up", {3,12}}, {{4,12}},
|
||||||
{nd=3, {4,11}, "Right", {4,6}, {1,6}, "Down", {1,6}},
|
{nd=4, {4,11}, "Right", {4,6}, {1,6}, "Down", {1,6}},
|
||||||
{nd=1, {4,9}, "Left", {4,7}, "Left", {4,7}},
|
{nd=1, {4,9}, "Left", {4,7}, "Left", {4,7}},
|
||||||
{nd=1, {4,7}, "Right", {4,6}, {1,6}, "Down", {1,6}}, {{4,6}},
|
{nd=1, {4,7}, "Right", {4,6}, {1,6}, "Down", {1,6}}, {{4,6}},
|
||||||
{nd=0, {1,6}, "Down", {3,6}, "Down", {3,6}}, {{4,6}}, {{4,8}},
|
{nd=0, {1,6}, "Down", {3,6}, "Down", {3,6}}, {{4,6}}, {{4,8}},
|
||||||
|
@ -705,8 +731,6 @@ end
|
||||||
|
|
||||||
-- cinnabarCarbos
|
-- cinnabarCarbos
|
||||||
|
|
||||||
-- waitToReceive
|
|
||||||
|
|
||||||
strategyFunctions.fightGiovanni = function()
|
strategyFunctions.fightGiovanni = function()
|
||||||
if Strategies.trainerBattle() then
|
if Strategies.trainerBattle() then
|
||||||
if Strategies.initialize() then
|
if Strategies.initialize() then
|
||||||
|
@ -933,29 +957,6 @@ end
|
||||||
function Strategies.initGame(midGame)
|
function Strategies.initGame(midGame)
|
||||||
if midGame then
|
if midGame then
|
||||||
-- Strategies.setYolo("", true)
|
-- Strategies.setYolo("", true)
|
||||||
if Pokemon.inParty("nidoking") then
|
|
||||||
local attDV, defDV, spdDV, sclDV = Pokemon.getDVs("nidoking")
|
|
||||||
p(attDV, defDV, spdDV, sclDV)
|
|
||||||
stats.nidoran = {
|
|
||||||
attack = 55,
|
|
||||||
defense = 45,
|
|
||||||
speed = 50,
|
|
||||||
special = 45,
|
|
||||||
level4 = true,
|
|
||||||
attackDV = attDV,
|
|
||||||
defenseDV = defDV,
|
|
||||||
speedDV = spdDV,
|
|
||||||
specialDV = sclDV,
|
|
||||||
}
|
|
||||||
else
|
|
||||||
stats.nidoran = {
|
|
||||||
attack = 16,
|
|
||||||
defense = 12,
|
|
||||||
speed = 15,
|
|
||||||
special = 13,
|
|
||||||
level4 = true,
|
|
||||||
}
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
Control.preferredPotion = "super"
|
Control.preferredPotion = "super"
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue