Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

smooth out estimated time to depletion #113

Merged
merged 3 commits into from
May 13, 2019
Merged

smooth out estimated time to depletion #113

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cfa569
only calc ore/minute from last update if last update had non-0 change
wchristian May 12, 2019
99e3790
smooth out changes to ore/minute over time to deemphasize spikes
wchristian May 12, 2019
5c55dad
only show 3 decimals for ore per minute
wchristian May 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 14 additions & 5 deletions resmon.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,10 +621,19 @@ function resmon.finish_deposit_count(site)
site.iter_state = nil

if site.last_ore_check then
local delta_ticks = game.tick - site.last_ore_check
local delta_ore = site.update_amount - site.amount

site.ore_per_minute = math.floor(delta_ore * 3600 / delta_ticks)
local delta_ore_since_last_update = site.update_amount - site.amount
if delta_ore_since_last_update > 0 then -- only store the amount and tick from last update if it actually changed
site.last_modified_tick = site.last_ore_check --
site.last_modified_amount = site.amount --
end
if not site.last_modified_amount then -- make sure those two values have a default
site.last_modified_amount = site.amount --
site.last_modified_tick = site.last_ore_check --
end
local delta_ore_since_last_change = site.update_amount - site.last_modified_amount -- use final amount and tick to calculate
local delta_ticks = game.tick - site.last_modified_tick --
local new_ore_per_minute = math.floor(delta_ore_since_last_change * 3600 / delta_ticks) -- ease the per minute value over time
site.ore_per_minute = site.ore_per_minute + (0.1 * (new_ore_per_minute - site.ore_per_minute)) --
end

site.amount = site.update_amount
Expand Down Expand Up @@ -887,7 +896,7 @@ function resmon.print_single_site(site, player, sites_gui, player_data)
el.style.font_color = color

el = sites_gui.add{type="label", name="YARM_label_ore_per_minute_"..site.name,
caption={"YARM-ore-per-minute", site.ore_per_minute}}
caption={"YARM-ore-per-minute", string.format("%.3f", site.ore_per_minute)}}
el.style.font_color = color

el = sites_gui.add{type="label", name="YARM_label_etd_"..site.name,
Expand Down