mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2025-12-27 11:35:22 +09:00
Update all code styles
This commit is contained in:
Cooldude2606
@@ -17,312 +17,307 @@ research.time = {}
|
||||
research.res_queue_enable = false
|
||||
|
||||
local research_time_format = {
|
||||
hours=true,
|
||||
minutes=true,
|
||||
seconds=true,
|
||||
time=true,
|
||||
string=true
|
||||
hours = true,
|
||||
minutes = true,
|
||||
seconds = true,
|
||||
time = true,
|
||||
string = true,
|
||||
}
|
||||
|
||||
local empty_time = format_time(0, {
|
||||
hours=true,
|
||||
minutes=true,
|
||||
seconds=true,
|
||||
time=true,
|
||||
string=true,
|
||||
null=true
|
||||
hours = true,
|
||||
minutes = true,
|
||||
seconds = true,
|
||||
time = true,
|
||||
string = true,
|
||||
null = true,
|
||||
})
|
||||
|
||||
local font_color = {
|
||||
-- positive
|
||||
[1] = {r = 0.3, g = 1, b = 0.3},
|
||||
-- negative
|
||||
[2] = {r = 1, g = 0.3, b = 0.3}
|
||||
-- positive
|
||||
[1] = { r = 0.3, g = 1, b = 0.3 },
|
||||
-- negative
|
||||
[2] = { r = 1, g = 0.3, b = 0.3 },
|
||||
}
|
||||
|
||||
local res = {
|
||||
['lookup_name'] = {},
|
||||
['disp'] = {}
|
||||
["lookup_name"] = {},
|
||||
["disp"] = {},
|
||||
}
|
||||
|
||||
do
|
||||
local res_total = 0
|
||||
local i = 1
|
||||
local res_total = 0
|
||||
local i = 1
|
||||
|
||||
for k, v in pairs(config.milestone) do
|
||||
research.time[i] = 0
|
||||
res['lookup_name'][k] = i
|
||||
res_total = res_total + v * 60
|
||||
for k, v in pairs(config.milestone) do
|
||||
research.time[i] = 0
|
||||
res["lookup_name"][k] = i
|
||||
res_total = res_total + v * 60
|
||||
|
||||
res['disp'][i] = {
|
||||
raw_name = k,
|
||||
target = res_total,
|
||||
target_disp = format_time(res_total, research_time_format),
|
||||
}
|
||||
res["disp"][i] = {
|
||||
raw_name = k,
|
||||
target = res_total,
|
||||
target_disp = format_time(res_total, research_time_format),
|
||||
}
|
||||
|
||||
i = i + 1
|
||||
end
|
||||
i = i + 1
|
||||
end
|
||||
end
|
||||
|
||||
local function research_add_log()
|
||||
local result_data = {}
|
||||
local result_data = {}
|
||||
|
||||
for i=1, #research.time, 1 do
|
||||
result_data[res['disp'][i]['raw_name']] = research.time[i]
|
||||
end
|
||||
for i = 1, #research.time, 1 do
|
||||
result_data[res["disp"][i]["raw_name"]] = research.time[i]
|
||||
end
|
||||
|
||||
game.write_file(config.file_name, game.table_to_json(result_data) .. '\n', true, 0)
|
||||
game.write_file(config.file_name, game.table_to_json(result_data) .. "\n", true, 0)
|
||||
end
|
||||
|
||||
local function research_res_n(res_)
|
||||
local res_n = 1
|
||||
local res_n = 1
|
||||
|
||||
for k, _ in pairs(res_) do
|
||||
if research.time[k] == 0 then
|
||||
res_n = k - 1
|
||||
break
|
||||
end
|
||||
end
|
||||
for k, _ in pairs(res_) do
|
||||
if research.time[k] == 0 then
|
||||
res_n = k - 1
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if research.time[#res_] and research.time[#res_] > 0 then
|
||||
if res_n == 1 then
|
||||
res_n = #res_
|
||||
end
|
||||
end
|
||||
if research.time[#res_] and research.time[#res_] > 0 then
|
||||
if res_n == 1 then
|
||||
res_n = #res_
|
||||
end
|
||||
end
|
||||
|
||||
if res_n < 3 then
|
||||
res_n = 3
|
||||
if res_n < 3 then
|
||||
res_n = 3
|
||||
elseif res_n > (#research.time - 5) then
|
||||
res_n = #research.time - 5
|
||||
end
|
||||
|
||||
elseif res_n > (#research.time - 5) then
|
||||
res_n = #research.time - 5
|
||||
end
|
||||
|
||||
return res_n
|
||||
return res_n
|
||||
end
|
||||
|
||||
local function research_notification(event)
|
||||
if config.inf_res[event.research.name] then
|
||||
if event.research.name == 'mining-productivity-4' then
|
||||
if event.research.level == 5 then
|
||||
-- Add run result to log
|
||||
research_add_log()
|
||||
end
|
||||
if event.research.name == "mining-productivity-4" then
|
||||
if event.research.level == 5 then
|
||||
-- Add run result to log
|
||||
research_add_log()
|
||||
end
|
||||
|
||||
if config.bonus_inventory.enabled then
|
||||
if (event.research.level - 1) <= math.ceil(config.bonus_inventory.limit / config.bonus_inventory.rate) then
|
||||
event.research.force[config.bonus_inventory.name] = math.max((event.research.level - 1) * config.bonus_inventory.rate, config.bonus_inventory.limit)
|
||||
end
|
||||
end
|
||||
if config.bonus_inventory.enabled then
|
||||
if (event.research.level - 1) <= math.ceil(config.bonus_inventory.limit / config.bonus_inventory.rate) then
|
||||
event.research.force[config.bonus_inventory.name] = math.max((event.research.level - 1) * config.bonus_inventory.rate, config.bonus_inventory.limit)
|
||||
end
|
||||
end
|
||||
|
||||
if config.pollution_ageing_by_research then
|
||||
game.map_settings.pollution.ageing = math.min(10, event.research.level / 5)
|
||||
end
|
||||
|
||||
else
|
||||
if not (event.by_script) then
|
||||
game.print{'expcom-res.inf', format_time(game.tick, research_time_format), event.research.name, event.research.level - 1}
|
||||
end
|
||||
end
|
||||
|
||||
else
|
||||
if config.pollution_ageing_by_research then
|
||||
game.map_settings.pollution.ageing = math.min(10, event.research.level / 5)
|
||||
end
|
||||
else
|
||||
if not (event.by_script) then
|
||||
game.print{ "expcom-res.inf", format_time(game.tick, research_time_format), event.research.name, event.research.level - 1 }
|
||||
end
|
||||
end
|
||||
else
|
||||
if not (event.by_script) then
|
||||
game.print{'expcom-res.msg', format_time(game.tick, research_time_format), event.research.name}
|
||||
game.print{ "expcom-res.msg", format_time(game.tick, research_time_format), event.research.name }
|
||||
end
|
||||
|
||||
if config.bonus_inventory.enabled then
|
||||
if event.research.name == 'mining-productivity-1' or event.research.name == 'mining-productivity-2' or event.research.name == 'mining-productivity-3' then
|
||||
event.research.force[config.bonus_inventory.name] = event.research.level * config.bonus_inventory.rate
|
||||
end
|
||||
end
|
||||
if config.bonus_inventory.enabled then
|
||||
if event.research.name == "mining-productivity-1" or event.research.name == "mining-productivity-2" or event.research.name == "mining-productivity-3" then
|
||||
event.research.force[config.bonus_inventory.name] = event.research.level * config.bonus_inventory.rate
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function research_gui_update()
|
||||
local res_disp = {}
|
||||
local res_n = research_res_n(res['disp'])
|
||||
local res_disp = {}
|
||||
local res_n = research_res_n(res["disp"])
|
||||
|
||||
for i=1, 8, 1 do
|
||||
res_disp[i] = {
|
||||
['name'] = '',
|
||||
['target'] = '',
|
||||
['attempt'] = '',
|
||||
['difference'] = '',
|
||||
['difference_color'] = font_color[1]
|
||||
}
|
||||
for i = 1, 8, 1 do
|
||||
res_disp[i] = {
|
||||
["name"] = "",
|
||||
["target"] = "",
|
||||
["attempt"] = "",
|
||||
["difference"] = "",
|
||||
["difference_color"] = font_color[1],
|
||||
}
|
||||
|
||||
local res_i = res_n + i - 3
|
||||
local res_i = res_n + i - 3
|
||||
|
||||
if res['disp'][res_i] then
|
||||
res_disp[i]['name'] = {'expcom-res.res-name', res['disp'][res_i]['raw_name'], prototypes.technology[res['disp'][res_i]['raw_name']].localised_name}
|
||||
if res["disp"][res_i] then
|
||||
res_disp[i]["name"] = { "expcom-res.res-name", res["disp"][res_i]["raw_name"], prototypes.technology[res["disp"][res_i]["raw_name"]].localised_name }
|
||||
|
||||
if research.time[res_i] == 0 then
|
||||
res_disp[i]['target'] = res['disp'][res_i].target_disp
|
||||
res_disp[i]['attempt'] = empty_time
|
||||
res_disp[i]['difference'] = empty_time
|
||||
res_disp[i]['difference_color'] = font_color[1]
|
||||
if research.time[res_i] == 0 then
|
||||
res_disp[i]["target"] = res["disp"][res_i].target_disp
|
||||
res_disp[i]["attempt"] = empty_time
|
||||
res_disp[i]["difference"] = empty_time
|
||||
res_disp[i]["difference_color"] = font_color[1]
|
||||
else
|
||||
res_disp[i]["target"] = res["disp"][res_i].target_disp
|
||||
res_disp[i]["attempt"] = format_time(research.time[res_i], research_time_format)
|
||||
|
||||
else
|
||||
res_disp[i]['target'] = res['disp'][res_i].target_disp
|
||||
res_disp[i]['attempt'] = format_time(research.time[res_i], research_time_format)
|
||||
if research.time[res_i] < res["disp"][res_i].target then
|
||||
res_disp[i]["difference"] = "-" .. format_time(res["disp"][res_i].target - research.time[res_i], research_time_format)
|
||||
res_disp[i]["difference_color"] = font_color[1]
|
||||
else
|
||||
res_disp[i]["difference"] = format_time(research.time[res_i] - res["disp"][res_i].target, research_time_format)
|
||||
res_disp[i]["difference_color"] = font_color[2]
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if research.time[res_i] < res['disp'][res_i].target then
|
||||
res_disp[i]['difference'] = '-' .. format_time(res['disp'][res_i].target - research.time[res_i], research_time_format)
|
||||
res_disp[i]['difference_color'] = font_color[1]
|
||||
|
||||
else
|
||||
res_disp[i]['difference'] = format_time(research.time[res_i] - res['disp'][res_i].target, research_time_format)
|
||||
res_disp[i]['difference_color'] = font_color[2]
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return res_disp
|
||||
return res_disp
|
||||
end
|
||||
|
||||
--- Display label for the clock display
|
||||
-- @element research_gui_clock_display
|
||||
local research_gui_clock =
|
||||
Gui.element{
|
||||
type = 'label',
|
||||
name = Gui.unique_static_name,
|
||||
caption = empty_time,
|
||||
style = 'heading_2_label'
|
||||
}
|
||||
Gui.element{
|
||||
type = "label",
|
||||
name = Gui.unique_static_name,
|
||||
caption = empty_time,
|
||||
style = "heading_2_label",
|
||||
}
|
||||
|
||||
--- A vertical flow containing the clock
|
||||
-- @element research_clock_set
|
||||
local research_clock_set =
|
||||
Gui.element(function(_, parent, name)
|
||||
local research_set = parent.add{type='flow', direction='vertical', name=name}
|
||||
local disp = Gui.scroll_table(research_set, 390, 1, 'disp')
|
||||
Gui.element(function(_, parent, name)
|
||||
local research_set = parent.add{ type = "flow", direction = "vertical", name = name }
|
||||
local disp = Gui.scroll_table(research_set, 390, 1, "disp")
|
||||
|
||||
research_gui_clock(disp)
|
||||
research_gui_clock(disp)
|
||||
|
||||
return research_set
|
||||
end)
|
||||
return research_set
|
||||
end)
|
||||
|
||||
--- Display group
|
||||
-- @element research_data_group
|
||||
local research_data_group =
|
||||
Gui.element(function(_definition, parent, i)
|
||||
local name = parent.add{
|
||||
type = 'label',
|
||||
name = 'research_' .. i .. '_name',
|
||||
caption = '',
|
||||
style = 'heading_2_label'
|
||||
}
|
||||
name.style.width = 180
|
||||
name.style.horizontal_align = 'left'
|
||||
Gui.element(function(_definition, parent, i)
|
||||
local name = parent.add{
|
||||
type = "label",
|
||||
name = "research_" .. i .. "_name",
|
||||
caption = "",
|
||||
style = "heading_2_label",
|
||||
}
|
||||
name.style.width = 180
|
||||
name.style.horizontal_align = "left"
|
||||
|
||||
local target = parent.add{
|
||||
type = 'label',
|
||||
name = 'research_' .. i .. '_target',
|
||||
caption = '',
|
||||
style = 'heading_2_label'
|
||||
}
|
||||
target.style.width = 70
|
||||
target.style.horizontal_align = 'right'
|
||||
local target = parent.add{
|
||||
type = "label",
|
||||
name = "research_" .. i .. "_target",
|
||||
caption = "",
|
||||
style = "heading_2_label",
|
||||
}
|
||||
target.style.width = 70
|
||||
target.style.horizontal_align = "right"
|
||||
|
||||
local attempt = parent.add{
|
||||
type = 'label',
|
||||
name = 'research_' .. i .. '_attempt',
|
||||
caption = '',
|
||||
style = 'heading_2_label'
|
||||
}
|
||||
attempt.style.width = 70
|
||||
attempt.style.horizontal_align = 'right'
|
||||
local attempt = parent.add{
|
||||
type = "label",
|
||||
name = "research_" .. i .. "_attempt",
|
||||
caption = "",
|
||||
style = "heading_2_label",
|
||||
}
|
||||
attempt.style.width = 70
|
||||
attempt.style.horizontal_align = "right"
|
||||
|
||||
local difference = parent.add{
|
||||
type = 'label',
|
||||
name = 'research_' .. i .. '_difference',
|
||||
caption = '',
|
||||
style = 'heading_2_label'
|
||||
}
|
||||
difference.style.width = 70
|
||||
difference.style.horizontal_align = 'right'
|
||||
difference.style.font_color = font_color[1]
|
||||
end)
|
||||
local difference = parent.add{
|
||||
type = "label",
|
||||
name = "research_" .. i .. "_difference",
|
||||
caption = "",
|
||||
style = "heading_2_label",
|
||||
}
|
||||
difference.style.width = 70
|
||||
difference.style.horizontal_align = "right"
|
||||
difference.style.font_color = font_color[1]
|
||||
end)
|
||||
|
||||
--- A vertical flow containing the data
|
||||
-- @element research_data_set
|
||||
local research_data_set =
|
||||
Gui.element(function(_, parent, name)
|
||||
local research_set = parent.add{type='flow', direction='vertical', name=name}
|
||||
local disp = Gui.scroll_table(research_set, 390, 4, 'disp')
|
||||
local res_disp = research_gui_update()
|
||||
Gui.element(function(_, parent, name)
|
||||
local research_set = parent.add{ type = "flow", direction = "vertical", name = name }
|
||||
local disp = Gui.scroll_table(research_set, 390, 4, "disp")
|
||||
local res_disp = research_gui_update()
|
||||
|
||||
research_data_group(disp, 0)
|
||||
disp['research_0_name'].caption = {'expcom-res.name'}
|
||||
disp['research_0_target'].caption = {'expcom-res.target'}
|
||||
disp['research_0_attempt'].caption = {'expcom-res.attempt'}
|
||||
disp['research_0_difference'].caption = {'expcom-res.difference'}
|
||||
research_data_group(disp, 0)
|
||||
disp["research_0_name"].caption = { "expcom-res.name" }
|
||||
disp["research_0_target"].caption = { "expcom-res.target" }
|
||||
disp["research_0_attempt"].caption = { "expcom-res.attempt" }
|
||||
disp["research_0_difference"].caption = { "expcom-res.difference" }
|
||||
|
||||
for i=1, 8, 1 do
|
||||
research_data_group(disp, i)
|
||||
for i = 1, 8, 1 do
|
||||
research_data_group(disp, i)
|
||||
|
||||
local research_name_i = 'research_' .. i
|
||||
local research_name_i = "research_" .. i
|
||||
|
||||
disp[research_name_i .. '_name'].caption = res_disp[i]['name']
|
||||
disp[research_name_i .. '_target'].caption = res_disp[i]['target']
|
||||
disp[research_name_i .. '_attempt'].caption = res_disp[i]['attempt']
|
||||
disp[research_name_i .. '_difference'].caption = res_disp[i]['difference']
|
||||
disp[research_name_i .. '_difference'].style.font_color = res_disp[i]['difference_color']
|
||||
end
|
||||
disp[research_name_i .. "_name"].caption = res_disp[i]["name"]
|
||||
disp[research_name_i .. "_target"].caption = res_disp[i]["target"]
|
||||
disp[research_name_i .. "_attempt"].caption = res_disp[i]["attempt"]
|
||||
disp[research_name_i .. "_difference"].caption = res_disp[i]["difference"]
|
||||
disp[research_name_i .. "_difference"].style.font_color = res_disp[i]["difference_color"]
|
||||
end
|
||||
|
||||
return research_set
|
||||
end)
|
||||
return research_set
|
||||
end)
|
||||
|
||||
local research_container =
|
||||
Gui.element(function(definition, parent)
|
||||
local container = Gui.container(parent, definition.name, 390)
|
||||
Gui.element(function(definition, parent)
|
||||
local container = Gui.container(parent, definition.name, 390)
|
||||
|
||||
research_clock_set(container, 'research_st_1')
|
||||
research_data_set(container, 'research_st_2')
|
||||
research_clock_set(container, "research_st_1")
|
||||
research_data_set(container, "research_st_2")
|
||||
|
||||
return container.parent
|
||||
end)
|
||||
:static_name(Gui.unique_static_name)
|
||||
:add_to_left_flow()
|
||||
return container.parent
|
||||
end)
|
||||
:static_name(Gui.unique_static_name)
|
||||
:add_to_left_flow()
|
||||
|
||||
Gui.left_toolbar_button('item/space-science-pack', {'expcom-res.main-tooltip'}, research_container, function(player)
|
||||
return Roles.player_allowed(player, 'gui/research')
|
||||
Gui.left_toolbar_button("item/space-science-pack", { "expcom-res.main-tooltip" }, research_container, function(player)
|
||||
return Roles.player_allowed(player, "gui/research")
|
||||
end)
|
||||
|
||||
Event.add(defines.events.on_research_finished, function(event)
|
||||
research_notification(event)
|
||||
research_notification(event)
|
||||
|
||||
if res['lookup_name'][event.research.name] == nil then
|
||||
return
|
||||
end
|
||||
if res["lookup_name"][event.research.name] == nil then
|
||||
return
|
||||
end
|
||||
|
||||
local n_i = res['lookup_name'][event.research.name]
|
||||
research.time[n_i] = game.tick
|
||||
local n_i = res["lookup_name"][event.research.name]
|
||||
research.time[n_i] = game.tick
|
||||
|
||||
local res_disp = research_gui_update()
|
||||
local res_disp = research_gui_update()
|
||||
|
||||
for _, player in pairs(game.connected_players) do
|
||||
local frame = Gui.get_left_element(player, research_container)
|
||||
local disp = frame.container['research_st_2'].disp.table
|
||||
for _, player in pairs(game.connected_players) do
|
||||
local frame = Gui.get_left_element(player, research_container)
|
||||
local disp = frame.container["research_st_2"].disp.table
|
||||
|
||||
for i=1, 8, 1 do
|
||||
local research_name_i = 'research_' .. i
|
||||
for i = 1, 8, 1 do
|
||||
local research_name_i = "research_" .. i
|
||||
|
||||
disp[research_name_i .. '_name'].caption = res_disp[i]['name']
|
||||
disp[research_name_i .. '_target'].caption = res_disp[i]['target']
|
||||
disp[research_name_i .. '_attempt'].caption = res_disp[i]['attempt']
|
||||
disp[research_name_i .. '_difference'].caption = res_disp[i]['difference']
|
||||
disp[research_name_i .. '_difference'].style.font_color = res_disp[i]['difference_color']
|
||||
end
|
||||
end
|
||||
disp[research_name_i .. "_name"].caption = res_disp[i]["name"]
|
||||
disp[research_name_i .. "_target"].caption = res_disp[i]["target"]
|
||||
disp[research_name_i .. "_attempt"].caption = res_disp[i]["attempt"]
|
||||
disp[research_name_i .. "_difference"].caption = res_disp[i]["difference"]
|
||||
disp[research_name_i .. "_difference"].style.font_color = res_disp[i]["difference_color"]
|
||||
end
|
||||
end
|
||||
end)
|
||||
|
||||
Event.on_nth_tick(60, function()
|
||||
local current_time = format_time(game.tick, research_time_format)
|
||||
local current_time = format_time(game.tick, research_time_format)
|
||||
|
||||
for _, player in pairs(game.connected_players) do
|
||||
for _, player in pairs(game.connected_players) do
|
||||
local frame = Gui.get_left_element(player, research_container)
|
||||
local disp = frame.container['research_st_1'].disp.table
|
||||
disp[research_gui_clock.name].caption = current_time
|
||||
local disp = frame.container["research_st_1"].disp.table
|
||||
disp[research_gui_clock.name].caption = current_time
|
||||
end
|
||||
end)
|
||||
|
||||
Reference in New Issue
Block a user