Update data tracking
This commit is contained in:
parent
28293d25ea
commit
9d2e14e744
|
@ -327,6 +327,7 @@ function Control.encounter(battleState)
|
||||||
encounters = encounters + 1
|
encounters = encounters + 1
|
||||||
Paint.wildEncounters(encounters)
|
Paint.wildEncounters(encounters)
|
||||||
Bridge.encounter()
|
Bridge.encounter()
|
||||||
|
Data.increment("encounters")
|
||||||
if encountersSection then
|
if encountersSection then
|
||||||
Data.increment(encountersSection)
|
Data.increment(encountersSection)
|
||||||
|
|
||||||
|
|
|
@ -304,14 +304,19 @@ end
|
||||||
strategyFunctions.fightBulbasaur = function()
|
strategyFunctions.fightBulbasaur = function()
|
||||||
if status.tries < 9000 and Pokemon.index(0, "level") == 6 then
|
if status.tries < 9000 and Pokemon.index(0, "level") == 6 then
|
||||||
if status.tries > 200 then
|
if status.tries > 200 then
|
||||||
stats.squirtle = {
|
local attDV, defDV, spdDV, sclDV = Pokemon.getDVs("squirtle")
|
||||||
|
stats.starter = {
|
||||||
attack = Pokemon.index(0, "attack"),
|
attack = Pokemon.index(0, "attack"),
|
||||||
defense = Pokemon.index(0, "defense"),
|
defense = Pokemon.index(0, "defense"),
|
||||||
speed = Pokemon.index(0, "speed"),
|
speed = Pokemon.index(0, "speed"),
|
||||||
special = Pokemon.index(0, "special"),
|
special = Pokemon.index(0, "special"),
|
||||||
|
attackDV = attDV,
|
||||||
|
defenseDV = defDV,
|
||||||
|
speedDV = spdDV,
|
||||||
|
specialDV = sclDV,
|
||||||
}
|
}
|
||||||
if stats.squirtle.attack < 11 and stats.squirtle.special < 12 then
|
if stats.starter.attack < 11 and stats.starter.special < 12 then
|
||||||
return Strategies.reset("stats", "Bad Squirtle - "..stats.squirtle.attack.." attack, "..stats.squirtle.special.." special")
|
return Strategies.reset("stats", "Bad Squirtle - "..stats.starter.attack.." attack, "..stats.starter.special.." special")
|
||||||
end
|
end
|
||||||
status.tries = 9001
|
status.tries = 9001
|
||||||
else
|
else
|
||||||
|
@ -2028,7 +2033,7 @@ end
|
||||||
function Strategies.initGame(midGame)
|
function Strategies.initGame(midGame)
|
||||||
if midGame then
|
if midGame then
|
||||||
Strategies.setYolo("bulbasaur", true)
|
Strategies.setYolo("bulbasaur", true)
|
||||||
stats.squirtle = {
|
stats.starter = {
|
||||||
attack = 11,
|
attack = 11,
|
||||||
defense = 11,
|
defense = 11,
|
||||||
speed = 11,
|
speed = 11,
|
||||||
|
|
|
@ -49,7 +49,7 @@ function Strategies.hardReset(reason, message, extra, wait)
|
||||||
end
|
end
|
||||||
|
|
||||||
local map, px, py = Memory.value("game", "map"), Player.position()
|
local map, px, py = Memory.value("game", "map"), Player.position()
|
||||||
Data.reset(reason, Control.areaName, map, px, py)
|
Data.reset(reason, Control.areaName, map, px, py, stats)
|
||||||
|
|
||||||
Bridge.chat(message, false, extra)
|
Bridge.chat(message, false, extra)
|
||||||
if wait and INTERNAL and not STREAMING_MODE then
|
if wait and INTERNAL and not STREAMING_MODE then
|
||||||
|
|
|
@ -42,7 +42,7 @@ end
|
||||||
|
|
||||||
-- REPORT
|
-- REPORT
|
||||||
|
|
||||||
function Data.reset(reason, areaName, map, px, py)
|
function Data.reset(reason, areaName, map, px, py, stats)
|
||||||
if STREAMING_MODE then
|
if STREAMING_MODE then
|
||||||
local report = Data.run
|
local report = Data.run
|
||||||
report.cutter = require("storage.pokemon").inParty("paras", "oddish", "sandshrew", "charmander")
|
report.cutter = require("storage.pokemon").inParty("paras", "oddish", "sandshrew", "charmander")
|
||||||
|
@ -53,9 +53,24 @@ function Data.reset(reason, areaName, map, px, py)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
report.version = Data.versionNumber
|
local ns = stats.nidoran
|
||||||
report.gameName = Data.gameName
|
if ns then
|
||||||
|
report.nido_attack = ns.attackDV
|
||||||
|
report.nido_defense = ns.defenseDV
|
||||||
|
report.nido_speed = ns.speedDV
|
||||||
|
report.nido_special = ns.specialDV
|
||||||
|
report.nido_level = ns.level4 and 4 or 3
|
||||||
|
end
|
||||||
|
local ss = stats.starter
|
||||||
|
if ss then
|
||||||
|
report.starter_attack = ss.attackDV
|
||||||
|
report.starter_defense = ss.defenseDV
|
||||||
|
report.starter_speed = ss.speedDV
|
||||||
|
report.starter_special = ss.specialDV
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
report.version = Data.versionNumber
|
||||||
report.reset_area = areaName
|
report.reset_area = areaName
|
||||||
report.reset_map = map
|
report.reset_map = map
|
||||||
report.reset_x = px
|
report.reset_x = px
|
||||||
|
|
Loading…
Reference in New Issue