Cleanup
This commit is contained in:
parent
831d9d6844
commit
e4fc109896
|
@ -179,12 +179,6 @@ function Control.canDie(enabled)
|
||||||
canDie = enabled
|
canDie = enabled
|
||||||
end
|
end
|
||||||
|
|
||||||
local function isNewFight()
|
|
||||||
if Memory.double("battle", "opponent_hp") == Memory.double("battle", "opponent_max_hp") then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function Control.shouldFight()
|
function Control.shouldFight()
|
||||||
if not shouldFight then
|
if not shouldFight then
|
||||||
return false
|
return false
|
||||||
|
|
|
@ -30,11 +30,11 @@ Strategies.vaporeon = false
|
||||||
Strategies.timeRequirements = {
|
Strategies.timeRequirements = {
|
||||||
|
|
||||||
nidoran = function()
|
nidoran = function()
|
||||||
return 10
|
return 15
|
||||||
end,
|
end,
|
||||||
|
|
||||||
mt_moon = function()
|
mt_moon = function()
|
||||||
local timeLimit = 30
|
local timeLimit = 35
|
||||||
if stats.nidoran.attack > 15 and stats.nidoran.speed > 14 then
|
if stats.nidoran.attack > 15 and stats.nidoran.speed > 14 then
|
||||||
timeLimit = timeLimit + 0.25
|
timeLimit = timeLimit + 0.25
|
||||||
end
|
end
|
||||||
|
@ -45,19 +45,19 @@ Strategies.timeRequirements = {
|
||||||
end,
|
end,
|
||||||
|
|
||||||
trash = function()
|
trash = function()
|
||||||
return 55
|
return 60
|
||||||
end,
|
end,
|
||||||
|
|
||||||
safari_carbos = function()
|
safari_carbos = function()
|
||||||
return 80
|
return 90
|
||||||
end,
|
end,
|
||||||
|
|
||||||
victory_road = function() --PB
|
victory_road = function() --PB
|
||||||
return 105
|
return 110
|
||||||
end,
|
end,
|
||||||
|
|
||||||
champion = function() --PB
|
champion = function() --PB
|
||||||
return 120
|
return 125
|
||||||
end,
|
end,
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -620,7 +620,8 @@ end
|
||||||
strategyFunctions.shopBuffs = function()
|
strategyFunctions.shopBuffs = function()
|
||||||
local xAccs = Strategies.vaporeon and 11 or 10
|
local xAccs = Strategies.vaporeon and 11 or 10
|
||||||
local xSpeeds = Strategies.vaporeon and 6 or 7
|
local xSpeeds = Strategies.vaporeon and 6 or 7
|
||||||
return Shop.transaction{
|
|
||||||
|
return Shop.transaction {
|
||||||
direction = "Right",
|
direction = "Right",
|
||||||
sell = {{name="nugget"}},
|
sell = {{name="nugget"}},
|
||||||
buy = {{name="x_accuracy", index=0, amount=xAccs}, {name="x_attack", index=3, amount=3}, {name="x_speed", index=5, amount=xSpeeds}, {name="x_special", index=6, amount=5}},
|
buy = {{name="x_accuracy", index=0, amount=xAccs}, {name="x_attack", index=3, amount=3}, {name="x_speed", index=5, amount=xSpeeds}, {name="x_special", index=6, amount=5}},
|
||||||
|
@ -879,7 +880,7 @@ strategyFunctions.centerSkip = function()
|
||||||
end
|
end
|
||||||
|
|
||||||
strategyFunctions.shopE4 = function()
|
strategyFunctions.shopE4 = function()
|
||||||
return Shop.transaction{
|
return Shop.transaction {
|
||||||
buy = {{name="full_restore", index=2, amount=3}}
|
buy = {{name="full_restore", index=2, amount=3}}
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
@ -71,7 +71,7 @@ function Bridge.chat(message, extra, newLine)
|
||||||
else
|
else
|
||||||
p(message, newLine)
|
p(message, newLine)
|
||||||
end
|
end
|
||||||
return send("msg", "/me "..message)
|
return send("msg", message)
|
||||||
end
|
end
|
||||||
|
|
||||||
function Bridge.time(message)
|
function Bridge.time(message)
|
||||||
|
|
Loading…
Reference in New Issue