games/RedMew
games/RedMew
1
0
Fork 0
mirror of https://github.com/Refactorio/RedMew.git synced 2025-03-03 14:53:01 +02:00
Code Issues Releases Activity

moved format_time to utils

Browse Source
This commit is contained in:
Maik Wild 2018-08-13 17:03:37 +02:00
parent b7a83be250
commit 0f0df92cd0
2 changed files with 134 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
player_list.lua
View File

@ -3,6 +3,7 @@ local Global = require 'utils.global'
local Gui = require 'utils.gui'
local UserGroups = require 'user_groups'
local PlayerStats = require 'player_stats'
local Utils = require 'utils.utils'
local poke_messages = require 'resources.poke_messages'
local player_sprites = require 'resources.player_sprites'
@ -75,36 +76,6 @@ local function lighten_color(color)
color.a = 1
end
local minutes_to_ticks = 60 * 60
local hours_to_ticks = 60 * 60 * 60
local ticks_to_minutes = 1 / minutes_to_ticks
local ticks_to_hours = 1 / hours_to_ticks
local function format_time(ticks)
local result = {}
local hours = math.floor(ticks * ticks_to_hours)
if hours > 0 then
ticks = ticks - hours * hours_to_ticks
table.insert(result, hours)
if hours == 1 then
table.insert(result, 'hour')
else
table.insert(result, 'hours')
end
end
local minutes = math.floor(ticks * ticks_to_minutes)
table.insert(result, minutes)
if minutes == 1 then
table.insert(result, 'minute')
else
table.insert(result, 'minutes')
end
return table.concat(result, ' ')
end
local function format_distance(tiles)
return math.round(tiles * 0.001, 1) .. ' km'
end
@ -224,7 +195,7 @@ local column_builders = {
return label
end,
draw_cell = function(parent, cell_data)
local text = format_time(cell_data)
local text = Utils.format_time(cell_data)
local label = parent.add {type = 'label', name = time_cell_name, caption = text}
local label_style = label.style
@ -660,6 +631,7 @@ end
Gui.on_click(
poke_cell_name,
function(event)
game.print(serpent.dump(event.element.parent.type))
local element = event.element
local button_data = Gui.get_data(element)
local poke_player = button_data.player

83
utils/utils.lua
View File

@ -90,58 +90,6 @@ Module.find_entities_by_last_user =
return entities
end
local Gui = require("utils.gui")
local alert_frame_name = Gui.uid_name()
local alert_close_button_name = Gui.uid_name()
function Module.alert(player, lines)
if type(lines) == string then
lines = {lines}
end
local center = player.gui.center
local alert_frame = center[alert_frame_name]
if alert_frame and alert_frame.valid then
Gui.remove_data_recursivly(alert_frame)
alert_frame.destroy()
end
alert_frame =
center.add {
type = 'frame',
name = alert_frame_name,
direction = 'vertical',
caption = 'Alert'
}
alert_frame.style.maximal_width = 500
player.opened = alert_frame
for _,line in pairs(lines) do
local frame = alert_frame.add {
type = 'label',
caption = line
}
frame.style.single_line = false
end
alert_frame.add {type = 'button', name = alert_close_button_name, caption = 'Close'}
end
Gui.on_custom_close(
alert_frame_name,
function(event)
Gui.remove_data_recursivly(event.element)
event.element.destroy()
end
)
Gui.on_click(
alert_close_button_name,
function(event)
Gui.remove_data_recursivly(event.element)
event.element.parent.destroy()
end
)
Module.ternary = function(c, t, f)
if c then
return t
@ -149,4 +97,35 @@ Module.ternary = function(c, t, f)
return f
end
end
local minutes_to_ticks = 60 * 60
local hours_to_ticks = 60 * 60 * 60
local ticks_to_minutes = 1 / minutes_to_ticks
local ticks_to_hours = 1 / hours_to_ticks
Module.format_time = function(ticks)
local result = {}
local hours = math.floor(ticks * ticks_to_hours)
if hours > 0 then
ticks = ticks - hours * hours_to_ticks
table.insert(result, hours)
if hours == 1 then
table.insert(result, 'hour')
else
table.insert(result, 'hours')
end
end
local minutes = math.floor(ticks * ticks_to_minutes)
table.insert(result, minutes)
if minutes == 1 then
table.insert(result, 'minute')
else
table.insert(result, 'minutes')
end
return table.concat(result, ' ')
end
return Module