Update potioning at Shorts Kid and Misty

This commit is contained in:
Kyle Coburn 2015-04-27 23:25:39 -07:00
parent 35e4941a8d
commit 35b1272e6c
3 changed files with 32 additions and 2 deletions

View File

@ -673,6 +673,11 @@ strategyFunctions.bugCatcher = function()
end
end
strategyFunctions.potionBeforeShorts = function()
local potionHP = Combat.healthFor("ShortsRattata") * 2
return strategyFunctions.potion({hp=potionHP})
end
strategyFunctions.shortsKid = function()
local fightingEkans = Pokemon.isOpponent("ekans")
if fightingEkans then
@ -953,7 +958,7 @@ strategyFunctions.potionBeforeMisty = function(data)
local isSpeedTie = stats.nidoran.speedDV == 11
local canSpeedTie = stats.nidoran.speedDV >= 11
if Control.yolo then
if canTwoHit and stats.nidoran.speedDV >= 13 then
if canTwoHit and stats.nidoran.speedDV >= 12 then
healAmount = 46
elseif canTwoHit or canSpeedTie then
healAmount = 66

View File

@ -1,5 +1,30 @@
local Opponents = {
ShortsRattata = {
type2 = "normal",
type1 = "normal",
def = 14,
id = 165,
spec = 12,
hp = 29,
speed = 22,
level = 11,
att = 19,
moves = {
{
name = "Quick-Attack",
accuracy = 100,
max_pp = 30,
power = 40,
id = 98,
special = false,
outspeed = true,
move_type = "normal",
}
}
},
RivalGyarados = {
type1 = "water",
type2 = "flying",

View File

@ -114,7 +114,7 @@ function Utils.canPotionWith(potion, forDamage, curr_hp, max_hp)
else
potion_hp = 20
end
return math.min(curr_hp + potion_hp, max_hp) >= forDamage - 1
return math.min(curr_hp + potion_hp, max_hp) > forDamage
end
function Utils.ingame()