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

Unify potion before Misty and favor before Goldeen, fix Mt. Moon split log message label

This commit is contained in:
Kyle Coburn 2015-04-10 11:29:23 -07:00
parent 0fd1258ca1
commit 9b5ee67566
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ai/red/strategies.lua
View File

@ -907,29 +907,31 @@ strategyFunctions.lassEther = function()
return strategyFunctions.interact({dir="Up"})
end
strategyFunctions.potionBeforeGoldeen = function()
strategyFunctions.potionBeforeMisty = function(data)
if Strategies.initialize() then
if Strategies.setYolo("goldeen") or Pokemon.index(0, "hp") > 7 then
return true
if data.goldeen then
Strategies.setYolo("goldeen")
local curr_hp, red_hp = Combat.hp(), Combat.redHP()
if Control.yolo or curr_hp < red_hp + 6 then
if Pokemon.index(0, "hp") > 7 then
return true
end
end
end
end
return Strategies.functions.potion({hp=64, chain=true})
end
strategyFunctions.potionBeforeMisty = function()
local healAmount = 70
local hasEnoughAttack = stats.nidoran.attack >= (yolo and 53 or 54)
local healAmount = data.goldeen and 65 or 70
local canTwoHit = stats.nidoran.attackDV >= (Control.yolo and 6 or 8)
local canSpeedTie = stats.nidoran.speedDV >= 11
if Control.yolo then
if hasEnoughAttack and hasEnoughSpeed then
if canTwoHit and stats.nidoran.speedDV >= 13 then
healAmount = 45
elseif hasEnoughAttack or canSpeedTie then
elseif canTwoHit or canSpeedTie then
healAmount = 65
end
else
if hasEnoughAttack and stats.nidoran.speedDV >= 13 then
if canTwoHit and stats.nidoran.speedDV >= 13 then
healAmount = 45
elseif hasEnoughAttack and canSpeedTie then
elseif canTwoHit and canSpeedTie then
healAmount = 65
end
end
@ -946,7 +948,7 @@ strategyFunctions.potionBeforeMisty = function()
Bridge.chat(message, potionCount)
end
end
return Strategies.functions.potion({hp=healAmount})
return Strategies.functions.potion({hp=healAmount, chain=data.chain})
end
strategyFunctions.fightMisty = function()

6
data/red/paths.lua
View File

@ -74,12 +74,12 @@ local Paths = {
-- PP up
{68, {3,7}, {3,3}, {s="confirm",dir="Up"}, {3,8}},
-- Enter Mt. Moon
{15, {11,6}, {c="a",a="Mt. Moon"}, {18,6}, {s="split"}, {18,5}},
{15, {11,6}, {18,6}, {s="split"}, {18,5}},
-- 4: ROUTE 3
-- Mt. Moon F1
{59, {14,35}, {c="startMtMoon"}, {c="catchParas"}, {14,22}, {21,22}, {21,15}, {24,15}, {24,27}, {25,27}, {25,31}, {s="interact",dir="Left"}, {25,32}, {33,32}, {33,31}, {34,31}, {s="interact",dir="Right"}, {35,31}, {35,23}, {s="interact",dir="Right"}, {35,7}, {30,7}, {s="evolveNidorino"}, {c="moon1Exp"}, {28,7}, {16,7}, {16,17}, {2,17}, {2,3}, {s="interact",dir="Up"}, {5,3}, {5,5}},
{59, {14,35}, {c="a",a="Mt. Moon"}, {c="startMtMoon"}, {c="catchParas"}, {14,22}, {21,22}, {21,15}, {24,15}, {24,27}, {25,27}, {25,31}, {s="interact",dir="Left"}, {25,32}, {33,32}, {33,31}, {34,31}, {s="interact",dir="Right"}, {35,31}, {35,23}, {s="interact",dir="Right"}, {35,7}, {30,7}, {s="evolveNidorino"}, {c="moon1Exp"}, {28,7}, {16,7}, {16,17}, {2,17}, {2,3}, {s="interact",dir="Up"}, {5,3}, {5,5}},
-- Mt. Moon B2
{60, {5,5}, {5,17}, {21,17}},
-- Mt. Moon B3
@ -114,7 +114,7 @@ local Paths = {
-- To Bill's
{36, {0,8}, {9,8}, {9,6}, {9,6}, {8,6}, {8,5}, {s="interact",dir="Up"}, {s="thrashGeodude"}, {10,5}, {s="hikerElixer"}, {10,4}, {13,4}, {13,6}, {15,6}, {15,4}, {17,4}, {17,7}, {18,7}, {s="interact",dir="Down"}, {20,7}, {20,8}, {22,8}, {22,6}, {35,6}, {35,4}, {36,4}, {s="interact",dir="Right"}, {36,5}, {38,5}, {38,4}, {s="lassEther"}, {45,4}, {45,3}},
-- Save Bill
{88, {2,7}, {2,5}, {5,5}, {s="confirm",dir="Right"}, {1,5}, {s="interact",dir="Up"}, {4,5}, {s="interact",dir="Up"}, {s="waitToTalk"}, {s="potionBeforeGoldeen"}, {s="item",item="escape_rope"}},
{88, {2,7}, {2,5}, {5,5}, {s="confirm",dir="Right"}, {1,5}, {s="interact",dir="Up"}, {4,5}, {s="interact",dir="Up"}, {s="waitToTalk"}, {s="potionBeforeMisty",goldeen=true,chain=true}, {s="item",item="escape_rope"}},
-- To Misty
{3, {19,18}, {19,20}, {30,20}, {30,19}},
-- Misty