mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2026-11-18 06:43:13 +09:00
Merge pull request #486 from bbassie/feature/convert-configs
Convert the remaining scenario configs into features
This commit is contained in:
1 parent
b4ee485b13
commit
757a36fc03
44 files changed
+2137
-2033
No files matched your search
@@ -5,7 +5,7 @@ Adds a config menu for setting autofill of placed entities
|
||||
local Feature = require("modules/exp_scenario/features")
|
||||
local Gui = require("modules/exp_gui")
|
||||
local Roles = require("modules/exp_roles")
|
||||
local config = require("modules.exp_legacy.config.gui.autofill")
|
||||
local config = require("modules/exp_scenario/config/autofill")
|
||||
|
||||
local feature = Feature.register("autofill")
|
||||
local FlyingText = require("modules/exp_util/flying_text")
|
||||
|
||||
@@ -9,17 +9,29 @@ local Roles = require("modules/exp_roles")
|
||||
local Selection = require("modules/exp_util/selection")
|
||||
local SelectArea = Selection.connect("ModuleArea")
|
||||
|
||||
local config = require("modules/exp_legacy/config/module")
|
||||
local Feature = require("modules/exp_scenario/features")
|
||||
local machine_sets = require("modules/exp_scenario/config/module_inserter_machines")
|
||||
|
||||
local feature, config = Feature.register("module_inserter", {
|
||||
copy_paste_module = true, -- copying a machine also copies its modules
|
||||
copy_paste_rotation = false, -- copying a machine also copies its rotation
|
||||
})
|
||||
|
||||
local module_slots_per_row = 4
|
||||
local module_slot_max = 8
|
||||
|
||||
--- The machines of the active mod sets
|
||||
local machines = {}
|
||||
|
||||
--- @class ExpGui_ModuleInserter.elements
|
||||
local Elements = {}
|
||||
|
||||
--- Load all the valid machines from the config file
|
||||
local machine_names = {}
|
||||
for mod_name, machine_set in pairs(config.machine_sets) do
|
||||
for mod_name, machine_set in pairs(machine_sets) do
|
||||
if script.active_mods[mod_name] then
|
||||
for machine_name, v in pairs(machine_set) do
|
||||
config.machines[machine_name] = v
|
||||
machines[machine_name] = v
|
||||
table.insert(machine_names, machine_name)
|
||||
end
|
||||
end
|
||||
@@ -137,7 +149,7 @@ Elements.module_selector = Gui.define("module_inserter/module_selector")
|
||||
Elements.module_table = Gui.define("module_inserter/module_table")
|
||||
:draw(function(def, parent)
|
||||
--- @cast def ExpGui_ModuleInserter.elements.module_table
|
||||
local slots_per_row = config.module_slots_per_row + 1
|
||||
local slots_per_row = module_slots_per_row + 1
|
||||
return Gui.elements.scroll_table(parent, 280, slots_per_row)
|
||||
end)
|
||||
:element_data{} --[[@as any]]
|
||||
@@ -163,12 +175,12 @@ function Elements.module_table.add_row(module_table)
|
||||
}
|
||||
|
||||
-- Add the module selectors and row separators
|
||||
local slots_per_row = config.module_slots_per_row + 1
|
||||
for i = 1, config.module_slot_max do
|
||||
local slots_per_row = module_slots_per_row + 1
|
||||
for i = 1, module_slot_max do
|
||||
if i % slots_per_row == 0 then
|
||||
row_separators[#row_separators + 1] = module_table.add{ type = "flow", visible = false }
|
||||
end
|
||||
module_selectors[i] = Elements.module_selector(module_table, i <= config.module_slots_per_row)
|
||||
module_selectors[i] = Elements.module_selector(module_table, i <= module_slots_per_row)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -199,7 +211,7 @@ function Elements.module_table.reset_row(module_table, machine_selector)
|
||||
separator.visible = false
|
||||
end
|
||||
for i, selector in pairs(row.module_selectors) do
|
||||
selector.visible = i <= config.module_slots_per_row
|
||||
selector.visible = i <= module_slots_per_row
|
||||
selector.enabled = false
|
||||
selector.elem_value = nil
|
||||
end
|
||||
@@ -214,16 +226,16 @@ function Elements.module_table.refresh_row(module_table, machine_selector, machi
|
||||
local row = assert(rows[machine_selector.index])
|
||||
|
||||
local active_module_count = assert(prototypes.entity[machine_name].module_inventory_size)
|
||||
local visible_row_count = math.ceil(active_module_count / config.module_slots_per_row)
|
||||
local visible_module_count = visible_row_count * config.module_slots_per_row
|
||||
local module_elem_value = { name = config.machines[machine_name].module }
|
||||
local visible_row_count = math.ceil(active_module_count / module_slots_per_row)
|
||||
local visible_module_count = visible_row_count * module_slots_per_row
|
||||
local module_elem_value = { name = machines[machine_name].module }
|
||||
|
||||
for i, separator in pairs(row.row_separators) do
|
||||
separator.visible = i < visible_row_count
|
||||
end
|
||||
for i, selector in pairs(row.module_selectors) do
|
||||
if i <= active_module_count then
|
||||
if config.machines[machine_name].prod then
|
||||
if machines[machine_name].prod then
|
||||
selector.elem_filters = elem_filter.with_prod
|
||||
else
|
||||
selector.elem_filters = elem_filter.no_prod
|
||||
@@ -259,7 +271,7 @@ Gui.toolbar.create_button{
|
||||
sprite = "item/productivity-module-3",
|
||||
tooltip = { "exp-gui_module-inserter.tooltip-main" },
|
||||
visible = function(player, element)
|
||||
return Roles.player_has_permission(player, "exp_scenario.gui.module")
|
||||
return feature:is_enabled() and Roles.player_has_permission(player, "exp_scenario.gui.module")
|
||||
end
|
||||
}
|
||||
|
||||
@@ -499,7 +511,7 @@ end
|
||||
|
||||
local e = defines.events
|
||||
|
||||
return {
|
||||
return feature:guard{
|
||||
elements = Elements,
|
||||
events = {
|
||||
[e.on_entity_settings_pasted] = on_entity_settings_pasted,
|
||||
|
||||
@@ -4,7 +4,18 @@ Adds a gui that allows players to apply various bonuses
|
||||
|
||||
local Gui = require("modules/exp_gui")
|
||||
local Roles = require("modules/exp_roles")
|
||||
local config = require("modules/exp_legacy/config/bonus")
|
||||
local Feature = require("modules/exp_scenario/features")
|
||||
|
||||
local feature, config = Feature.register("player_bonus", {
|
||||
points = { -- how many points a player can spend on bonuses
|
||||
base = 174, -- the points of the points role, the standard value of each bonus adds up to this
|
||||
increase_percentage_per_role_level = 0.03, -- extra points as a fraction of the base for each role above the points role
|
||||
role_id = Feature.optional("number"), -- the role the base points apply to, without one every player gets the base
|
||||
},
|
||||
})
|
||||
|
||||
--- Ticks between applications of the periodic bonuses
|
||||
local periodic_bonus_rate = 300
|
||||
local Vlayer = require("modules/exp_scenario/control/vlayer")
|
||||
local format_number = require("util").format_number
|
||||
|
||||
@@ -19,11 +30,12 @@ local Elements = {}
|
||||
--- @field is_percentage boolean
|
||||
--- @field is_special boolean
|
||||
--- @field value_step number
|
||||
--- @field combined_bonus string[]? Bonuses applied together with this one
|
||||
--- @field _cost_scale number
|
||||
|
||||
--- For perf calculate the division of scale against cost ahead of time
|
||||
--- @type table<string, ExpGui_PlayerBonus.bonus_data>
|
||||
local player_bonus = config.player_bonus
|
||||
--- @type ExpGui_PlayerBonus.bonus_data[]
|
||||
local player_bonus = require("modules/exp_scenario/config/player_bonus")
|
||||
|
||||
for _, bonus_data in pairs(player_bonus) do
|
||||
bonus_data._cost_scale = bonus_data.cost / bonus_data.scale
|
||||
@@ -71,8 +83,8 @@ do local _points_limit = {} --- @type table<number, number>
|
||||
local roles = Roles.get_roles()
|
||||
local positions = {}
|
||||
for index, role in ipairs(roles) do positions[role.id] = index end
|
||||
local role = assert(Roles.get_role_by_name(config.points.role_name), "Bonus points role does not exist")
|
||||
local role_diff = positions[role.id] - positions[Roles.get_player_highest_role(player).id]
|
||||
local role = config.points.role_id and Roles.get_role(config.points.role_id)
|
||||
local role_diff = role and positions[role.id] - positions[Roles.get_player_highest_role(player).id] or 0
|
||||
local points_limit = math.floor(config.points.base * (1 + config.points.increase_percentage_per_role_level * role_diff))
|
||||
_points_limit[player.index] = points_limit
|
||||
return points_limit
|
||||
@@ -375,7 +387,7 @@ Elements.container = Gui.define("player_bonus/container")
|
||||
Elements.reset_button.link_apply_button(elements.reset_button, elements.apply_button)
|
||||
Elements.apply_button.link_reset_button(elements.apply_button, elements.reset_button)
|
||||
|
||||
for _, bonus_data in pairs(config.player_bonus) do
|
||||
for _, bonus_data in pairs(player_bonus) do
|
||||
--- @cast bonus_data ExpGui_PlayerBonus.bonus_data
|
||||
Elements.bonus_table.add_row(bonus_table, bonus_data, elements)
|
||||
end
|
||||
@@ -409,7 +421,7 @@ function Elements.container.clear_player_bonus(player)
|
||||
if not player.character then
|
||||
return
|
||||
end
|
||||
for _, bonus_data in pairs(config.player_bonus) do
|
||||
for _, bonus_data in pairs(player_bonus) do
|
||||
if not bonus_data.is_special then
|
||||
player[bonus_data.name] = 0
|
||||
if bonus_data.combined_bonus then
|
||||
@@ -429,7 +441,7 @@ function Elements.container.apply_player_bonus(player)
|
||||
end
|
||||
|
||||
local player_data = Elements.container.data[player]
|
||||
for _, bonus_data in pairs(config.player_bonus) do
|
||||
for _, bonus_data in pairs(player_bonus) do
|
||||
if not bonus_data.is_special then
|
||||
local value = player_data[bonus_data.name] or 0
|
||||
player[bonus_data.name] = value
|
||||
@@ -462,27 +474,45 @@ Gui.toolbar.create_button{
|
||||
sprite = "item/exoskeleton-equipment",
|
||||
tooltip = { "exp-gui_player-bonus.tooltip-main" },
|
||||
visible = function(player, element)
|
||||
return Roles.player_has_permission(player, "exp_scenario.gui.bonus")
|
||||
return feature:is_enabled() and Roles.player_has_permission(player, "exp_scenario.gui.bonus")
|
||||
end
|
||||
}
|
||||
|
||||
--- Recalculate and apply the bonus for a player
|
||||
--- Recalculate the limit of a player, their bonus is removed when it is exceeded
|
||||
--- @param player LuaPlayer
|
||||
--- @return boolean # False when the bonus was removed
|
||||
local function refresh_points_limit(player)
|
||||
Elements.bonus_used._clear_points_limit_cache(player)
|
||||
local bonus_cost = Elements.container.calculate_cost(player)
|
||||
local within_limit = Elements.bonus_used.refresh_player(player, bonus_cost)
|
||||
if not within_limit or not Roles.player_has_permission(player, "exp_scenario.gui.bonus") then
|
||||
Elements.container.clear_player_bonus(player)
|
||||
return false
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
local function recalculate_bonus(event)
|
||||
local player = Gui.get_player(event)
|
||||
if event.name == Roles.events.on_player_roles_changed then
|
||||
-- If the player's roles changed then we will need to recalculate their limit
|
||||
Elements.bonus_used._clear_points_limit_cache(player)
|
||||
local bonus_cost = Elements.container.calculate_cost(player)
|
||||
local within_limit = Elements.bonus_used.refresh_player(player, bonus_cost)
|
||||
if not within_limit or not Roles.player_has_permission(player, "exp_scenario.gui.bonus") then
|
||||
Elements.container.clear_player_bonus(player)
|
||||
return
|
||||
end
|
||||
if event.name == Roles.events.on_player_roles_changed and not refresh_points_limit(player) then
|
||||
return
|
||||
end
|
||||
|
||||
Elements.container.apply_player_bonus(player)
|
||||
end
|
||||
|
||||
--- The points of every player change with the points settings
|
||||
--- @param event EventData.ExpScenario.on_config_updated
|
||||
local function on_config_updated(event)
|
||||
if event.feature_name ~= feature.name then return end
|
||||
for _, player in pairs(game.connected_players) do
|
||||
if refresh_points_limit(player) then
|
||||
Elements.container.apply_player_bonus(player)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--- Apply periodic bonus to a player
|
||||
--- @param player LuaPlayer
|
||||
local function apply_personal_battery_recharge(player)
|
||||
@@ -501,7 +531,7 @@ local function apply_personal_battery_recharge(player)
|
||||
return -- No grid or already full
|
||||
end
|
||||
|
||||
local recharge_amount = Elements.container.get_player_bonus(player, "personal_battery_recharge") * 100000 * config.periodic_bonus_rate / 6
|
||||
local recharge_amount = Elements.container.get_player_bonus(player, "personal_battery_recharge") * 100000 * periodic_bonus_rate / 6
|
||||
|
||||
for _, equipment in pairs(grid.equipment) do
|
||||
if equipment.energy < equipment.max_energy then
|
||||
@@ -524,13 +554,14 @@ end
|
||||
|
||||
local e = defines.events
|
||||
|
||||
return {
|
||||
return feature:guard{
|
||||
elements = Elements,
|
||||
events = {
|
||||
[e.on_player_respawned] = recalculate_bonus,
|
||||
[Roles.events.on_player_roles_changed] = recalculate_bonus,
|
||||
[Feature.events.on_config_updated] = on_config_updated,
|
||||
},
|
||||
on_nth_tick = {
|
||||
[config.periodic_bonus_rate] = apply_periodic_bonus_online,
|
||||
[periodic_bonus_rate] = apply_periodic_bonus_online,
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,7 @@ Adds a player list to show names and play time; also includes action buttons whi
|
||||
local ExpUtil = require("modules/exp_util")
|
||||
local Gui = require("modules/exp_gui")
|
||||
local Roles = require("modules/exp_roles")
|
||||
local config = require("modules/exp_legacy/config/gui/player_list_actions")
|
||||
local actions = require("modules/exp_scenario/gui/player_list_actions")
|
||||
|
||||
--- @class ExpGui_PlayerList.elements
|
||||
local Elements = {}
|
||||
@@ -100,7 +100,7 @@ Elements.reason_confirm = Gui.define("player_list/reason_confirm")
|
||||
}
|
||||
:on_click(function(_, player, element)
|
||||
local action_name = Elements.container.get_selected_action(player)
|
||||
local button_data = action_name and config.buttons[action_name]
|
||||
local button_data = action_name and actions.buttons[action_name]
|
||||
if button_data and button_data.reason_callback then
|
||||
local reason = assert(element.parent).entry.text --[[@as string?]]
|
||||
if reason == nil or not reason:find("%S") then reason = "no reason given" end
|
||||
@@ -330,7 +330,7 @@ Elements.action_bar = Gui.define("player_list/action_bar")
|
||||
action_bar.visible = false
|
||||
|
||||
Elements.close_action_bar(action_bar)
|
||||
for action_name, button_data in pairs(config.buttons) do
|
||||
for action_name, button_data in pairs(actions.buttons) do
|
||||
local permission_flow = action_bar.add{ type = "flow", name = action_name }
|
||||
permission_flow.visible = false
|
||||
for _, button in ipairs(button_data) do
|
||||
@@ -356,7 +356,7 @@ function Elements.action_bar.refresh(action_bar, player, selected_player)
|
||||
end
|
||||
|
||||
action_bar.visible = true
|
||||
for action_name, buttons in pairs(config.buttons) do
|
||||
for action_name, buttons in pairs(actions.buttons) do
|
||||
local flow = action_bar[action_name]
|
||||
if buttons.auth and not buttons.auth(player, selected_player) then
|
||||
flow.visible = false
|
||||
@@ -483,7 +483,7 @@ local function select_action(player, selected_action)
|
||||
Elements.container.set_selected_action(player, selected_action)
|
||||
Elements.player_table.refresh_player(player)
|
||||
end
|
||||
config.set_accessors(Elements.container.get_selected_player, select_action)
|
||||
actions.set_accessors(Elements.container.get_selected_player, select_action)
|
||||
|
||||
--- Add the element to the left flow with a toolbar button
|
||||
Gui.add_left_element(Elements.container, true)
|
||||
|
||||
@@ -0,0 +1,166 @@
|
||||
--[[-- Gui - Player List Actions
|
||||
The action buttons shown on the player list, each with its auth function and optional reason callback.
|
||||
The key of each button is the permission name used by the role system.
|
||||
]]
|
||||
|
||||
local ExpUtil = require("modules/exp_util")
|
||||
local Gui = require("modules/exp_gui")
|
||||
local Roles = require("modules/exp_roles")
|
||||
local Reports = require("modules/exp_reports")
|
||||
local Jail = require("modules/exp_scenario/control/jail")
|
||||
local Colors = require("modules/exp_util/include/color")
|
||||
local format_player_name = ExpUtil.format_player_name_locale
|
||||
|
||||
--- Accessors injected by the gui so the actions can read the selected player and set the selected action
|
||||
local get_selected_player --- @type fun(player: LuaPlayer): LuaPlayer
|
||||
local set_selected_action --- @type fun(player: LuaPlayer, action: string?)
|
||||
local function set_accessors(player_getter, action_setter)
|
||||
get_selected_player, set_selected_action = player_getter, action_setter
|
||||
end
|
||||
|
||||
-- gets the action player and a coloured name for the action to be used on
|
||||
local function get_action_player(player)
|
||||
local selected_player = get_selected_player(player) --[[@as LuaPlayer]]
|
||||
local selected_player_color = format_player_name(selected_player)
|
||||
return selected_player, selected_player_color
|
||||
end
|
||||
|
||||
-- teleports one player to another
|
||||
local function teleport(from_player, to_player)
|
||||
local surface = to_player.physical_surface
|
||||
local position = surface.find_non_colliding_position("character", to_player.physical_position, 32, 1)
|
||||
if not position then return false end -- return false if no new position
|
||||
if from_player.driving then from_player.driving = false end -- kicks a player out a vehicle if in one
|
||||
from_player.teleport(position, surface)
|
||||
return true
|
||||
end
|
||||
|
||||
local function new_button(sprite, tooltip)
|
||||
return Gui.define(tooltip[1])
|
||||
:draw{
|
||||
type = "sprite-button",
|
||||
style = "tool_button",
|
||||
sprite = sprite,
|
||||
tooltip = tooltip,
|
||||
}
|
||||
:style{
|
||||
padding = -1,
|
||||
height = 28,
|
||||
width = 28,
|
||||
}
|
||||
end
|
||||
|
||||
--- Teleports the user to the action player
|
||||
-- @element goto_player
|
||||
local goto_player = new_button("utility/export", { "exp-gui_player-list.goto-player" })
|
||||
:on_click(function(def, player, element)
|
||||
local selected_player = get_action_player(player)
|
||||
if not player.character or not selected_player.character then
|
||||
player.print({ "exp-commands-parse.player-alive" }, Colors.orange_red)
|
||||
else
|
||||
teleport(player, selected_player)
|
||||
end
|
||||
end)
|
||||
|
||||
--- Teleports the action player to the user
|
||||
-- @element bring_player
|
||||
local bring_player = new_button("utility/import", { "exp-gui_player-list.bring-player" })
|
||||
:on_click(function(def, player, element)
|
||||
local selected_player = get_action_player(player)
|
||||
if not player.character or not selected_player.character then
|
||||
player.print({ "exp-commands-parse.player-alive" }, Colors.orange_red)
|
||||
else
|
||||
teleport(selected_player, player)
|
||||
end
|
||||
end)
|
||||
|
||||
--- Reports the action player, requires a reason to be given
|
||||
-- @element report_player
|
||||
local report_player = new_button("utility/spawn_flag", { "exp-gui_player-list.report-player" })
|
||||
:on_click(function(def, player, element)
|
||||
set_selected_action(player, "exp_scenario.command.create_report")
|
||||
end)
|
||||
|
||||
local function report_player_callback(player, reason)
|
||||
local selected_player = get_action_player(player)
|
||||
Reports.create_report(player, selected_player, reason)
|
||||
end
|
||||
|
||||
--- Jails the action player, requires a reason
|
||||
-- @element jail_player
|
||||
local jail_player = new_button("utility/multiplayer_waiting_icon", { "exp-gui_player-list.jail-player" })
|
||||
:on_click(function(def, player, element)
|
||||
local selected_player, selected_player_color = get_action_player(player)
|
||||
if Jail.is_jailed(selected_player) then
|
||||
player.print({ "exp-commands_jail.already-jailed", selected_player_color }, Colors.orange_red)
|
||||
else
|
||||
set_selected_action(player, "exp_scenario.command.jail")
|
||||
end
|
||||
end)
|
||||
|
||||
local function jail_player_callback(player, reason)
|
||||
local selected_player, selected_player_color = get_action_player(player)
|
||||
local by_player_name_color = format_player_name(player)
|
||||
game.print{ "exp-commands_jail.jailed", selected_player_color, by_player_name_color, reason }
|
||||
Jail.jail_player(selected_player, player.name, reason)
|
||||
end
|
||||
|
||||
--- Kicks the action player, requires a reason
|
||||
-- @element kick_player
|
||||
local kick_player = new_button("utility/warning_icon", { "exp-gui_player-list.kick-player" })
|
||||
:on_click(function(def, player, element)
|
||||
set_selected_action(player, "exp_scenario.gui.player_list.kick")
|
||||
end)
|
||||
|
||||
local function kick_player_callback(player, reason)
|
||||
local selected_player = get_action_player(player)
|
||||
game.kick_player(selected_player, reason)
|
||||
end
|
||||
|
||||
--- Bans the action player, requires a reason
|
||||
-- @element ban_player
|
||||
local ban_player = new_button("utility/danger_icon", { "exp-gui_player-list.ban-player" })
|
||||
:on_click(function(def, player, element)
|
||||
set_selected_action(player, "exp_scenario.gui.player_list.ban")
|
||||
end)
|
||||
|
||||
local function ban_player_callback(player, reason)
|
||||
local selected_player = get_action_player(player)
|
||||
game.ban_player(selected_player, reason)
|
||||
end
|
||||
|
||||
return {
|
||||
set_accessors = set_accessors,
|
||||
buttons = {
|
||||
["exp_scenario.command.teleport"] = {
|
||||
auth = function(player, selected_player)
|
||||
return player.name ~= selected_player.name
|
||||
end, -- cant teleport to your self
|
||||
goto_player,
|
||||
bring_player,
|
||||
},
|
||||
["exp_scenario.command.create_report"] = {
|
||||
auth = function(player, selected_player)
|
||||
if player == selected_player then return false end
|
||||
return not Roles.player_has_permission(selected_player, "exp_scenario.bypass.reports")
|
||||
end, -- can report any player that isn't immune
|
||||
reason_callback = report_player_callback,
|
||||
report_player,
|
||||
},
|
||||
["exp_scenario.command.jail"] = {
|
||||
auth = Roles.player_outranks,
|
||||
reason_callback = jail_player_callback,
|
||||
jail_player,
|
||||
},
|
||||
["exp_scenario.gui.player_list.kick"] = {
|
||||
auth = Roles.player_outranks,
|
||||
reason_callback = kick_player_callback,
|
||||
kick_player,
|
||||
},
|
||||
["exp_scenario.gui.player_list.ban"] = {
|
||||
auth = Roles.player_outranks,
|
||||
reason_callback = ban_player_callback,
|
||||
ban_player,
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -5,7 +5,12 @@ Adds a gui for tracking research milestones
|
||||
local ExpUtil = require("modules/exp_util")
|
||||
local Gui = require("modules/exp_gui")
|
||||
local Roles = require("modules/exp_roles")
|
||||
local config = require("modules/exp_legacy/config/research")
|
||||
local Feature = require("modules/exp_scenario/features")
|
||||
local research_data = require("modules/exp_scenario/config/research_data")
|
||||
|
||||
local feature, config = Feature.register("research_milestones", {
|
||||
log_file = "log/research.log", -- where the milestone times are written
|
||||
})
|
||||
|
||||
local table_to_json = helpers.table_to_json
|
||||
local write_file = helpers.write_file
|
||||
@@ -34,18 +39,10 @@ local research_targets = {
|
||||
length = 0,
|
||||
}
|
||||
|
||||
--- Select the mod set to be used for milestones
|
||||
for _, mod_name in ipairs(config.mod_set_lookup) do
|
||||
if script.active_mods[mod_name] then
|
||||
config.mod_set = mod_name
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
do --- Calculate the research targets
|
||||
local research_index = 1
|
||||
local total_time = 0
|
||||
for name, time in pairs(config.milestone[config.mod_set]) do
|
||||
for name, time in pairs(research_data.milestone[research_data.mod_set]) do
|
||||
if prototypes.technology[name] and (not prototypes.technology[name].hidden) then
|
||||
research_targets.index_lookup[name] = research_index
|
||||
total_time = total_time + time * 60
|
||||
@@ -328,7 +325,7 @@ function Elements.container.append_log_line(force)
|
||||
result_data[name] = force_data[research_index]
|
||||
end
|
||||
|
||||
write_file(config.file.name, table_to_json(result_data) .. "\n", true, 0)
|
||||
write_file(config.log_file, table_to_json(result_data) .. "\n", true, 0)
|
||||
end
|
||||
|
||||
--- Add the element to the left flow with a toolbar button
|
||||
@@ -339,7 +336,7 @@ Gui.toolbar.create_button{
|
||||
sprite = "item/space-science-pack",
|
||||
tooltip = { "exp-gui_research-milestones.tooltip-main" },
|
||||
visible = function(player, element)
|
||||
return Roles.player_has_permission(player, "exp_scenario.gui.research")
|
||||
return feature:is_enabled() and Roles.player_has_permission(player, "exp_scenario.gui.research")
|
||||
end
|
||||
}
|
||||
|
||||
@@ -350,8 +347,8 @@ local function on_research_finished(event)
|
||||
local force = event.research.force
|
||||
|
||||
-- Check if the log should be updated and print a message to chat
|
||||
if config.inf_res[config.mod_set][research_name] then
|
||||
local log_requirement = config.file.final_res[config.mod_set]
|
||||
if research_data.inf_res[research_data.mod_set][research_name] then
|
||||
local log_requirement = research_data.final_res[research_data.mod_set]
|
||||
if research_name == log_requirement.name and research_level == log_requirement.level + 1 then
|
||||
Elements.container.append_log_line(force)
|
||||
end
|
||||
@@ -394,7 +391,7 @@ end
|
||||
|
||||
local e = defines.events
|
||||
|
||||
return {
|
||||
return feature:guard{
|
||||
elements = Elements,
|
||||
events = {
|
||||
[e.on_research_finished] = on_research_finished,
|
||||
|
||||
@@ -5,7 +5,25 @@ Adds a rocket information gui which shows general stats, milestones and build pr
|
||||
local ExpUtil = require("modules/exp_util")
|
||||
local Gui = require("modules/exp_gui")
|
||||
local Roles = require("modules/exp_roles")
|
||||
local config = require("modules/exp_legacy/config/gui/rockets")
|
||||
local Feature = require("modules/exp_scenario/features")
|
||||
|
||||
local feature, config = Feature.register("rocket_info", {
|
||||
show_stats = true, -- the stats section
|
||||
show_first_rocket = true, -- when the first rocket was launched
|
||||
show_last_rocket = true, -- when the last rocket was launched
|
||||
show_fastest_rocket = true, -- the time taken for the fastest rocket
|
||||
show_total_rockets = true, -- the total number of rockets launched
|
||||
show_game_avg = true, -- the average across the entire map time
|
||||
show_milestones = true, -- the milestones section
|
||||
show_progress = true, -- the build progress section
|
||||
allow_zoom_to_map = true, -- the zoom to map button
|
||||
})
|
||||
|
||||
--- Each number is one statistic, 5 means the average time taken for the last 5 rockets
|
||||
local rolling_avg = { 5, 10, 25 }
|
||||
|
||||
--- Each number is one statistic, 5 means the time that the 5th rocket was launched
|
||||
local milestones = { 1, 2, 5, 10, 20, 50, 100, 200, 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500, 5000 }
|
||||
|
||||
--- @class ExpGui_RocketInfo.elements
|
||||
local Elements = {}
|
||||
@@ -26,7 +44,7 @@ local font_color = {
|
||||
|
||||
-- The largest rolling average is used to know when an old launch time can be discarded
|
||||
local largest_rolling_avg = 0
|
||||
for _, avg_over in pairs(config.stats.rolling_avg) do
|
||||
for _, avg_over in pairs(rolling_avg) do
|
||||
if avg_over > largest_rolling_avg then
|
||||
largest_rolling_avg = avg_over
|
||||
end
|
||||
@@ -110,7 +128,7 @@ Elements.position_label = Gui.define("rocket_info/position_label")
|
||||
)
|
||||
:on_click(function(def, player, element)
|
||||
--- @cast def ExpGui_RocketInfo.elements.position_label
|
||||
if not config.progress.allow_zoom_to_map then return end
|
||||
if not config.allow_zoom_to_map then return end
|
||||
local entity = def.data[element]
|
||||
if not entity or not entity.valid then return end
|
||||
player.set_controller{ type = defines.controllers.remote, position = entity.position, surface = entity.surface }
|
||||
@@ -142,34 +160,34 @@ function Elements.stats_table.calculate_row_data(force)
|
||||
local force_rockets = force.rockets_launched
|
||||
local rows = {}
|
||||
|
||||
if config.stats.show_first_rocket then
|
||||
if config.show_first_rocket then
|
||||
local value = stats.first_launch or 0
|
||||
rows[#rows + 1] = { key = "first-launch", name = "first-launch", value = time_formats.caption_hours(value), tooltip = time_formats.tooltip_hours(value) }
|
||||
end
|
||||
|
||||
if config.stats.show_last_rocket then
|
||||
if config.show_last_rocket then
|
||||
local value = stats.last_launch or 0
|
||||
rows[#rows + 1] = { key = "last-launch", name = "last-launch", value = time_formats.caption_hours(value), tooltip = time_formats.tooltip_hours(value) }
|
||||
end
|
||||
|
||||
if config.stats.show_fastest_rocket then
|
||||
if config.show_fastest_rocket then
|
||||
local value = stats.fastest_launch or 0
|
||||
rows[#rows + 1] = { key = "fastest-launch", name = "fastest-launch", value = time_formats.caption_hours(value), tooltip = time_formats.tooltip_hours(value) }
|
||||
end
|
||||
|
||||
if config.stats.show_total_rockets then
|
||||
if config.show_total_rockets then
|
||||
local total_rockets = get_game_rocket_count()
|
||||
if total_rockets == 0 then total_rockets = 1 end
|
||||
local percentage = math.floor(force_rockets / total_rockets * 1000) / 10
|
||||
rows[#rows + 1] = { key = "total-rockets", name = "total-rockets", value = tostring(force_rockets), tooltip = { "exp-gui_rocket-info.value-tooltip-total-rockets", percentage } }
|
||||
end
|
||||
|
||||
if config.stats.show_game_avg then
|
||||
if config.show_game_avg then
|
||||
local avg = force_rockets > 0 and math.floor(game.tick / force_rockets) or 0
|
||||
rows[#rows + 1] = { key = "avg-launch", name = "avg-launch", value = time_formats.caption(avg), tooltip = time_formats.tooltip(avg) }
|
||||
end
|
||||
|
||||
for _, avg_over in pairs(config.stats.rolling_avg) do
|
||||
for _, avg_over in pairs(rolling_avg) do
|
||||
local avg = get_rolling_average(force, avg_over)
|
||||
rows[#rows + 1] = { key = "avg-launch-n-" .. avg_over, name = "avg-launch-n", subname = avg_over, value = time_formats.caption(avg), tooltip = time_formats.tooltip(avg) }
|
||||
end
|
||||
@@ -258,7 +276,7 @@ function Elements.milestones_table.calculate_row_data(force)
|
||||
local force_rockets = force.rockets_launched
|
||||
local rows = {}
|
||||
|
||||
for _, milestone in ipairs(config.milestones) do
|
||||
for _, milestone in ipairs(milestones) do
|
||||
-- The milestones config mixes the show_milestones flag with the milestone numbers
|
||||
if type(milestone) == "number" then
|
||||
if milestone <= force_rockets then
|
||||
@@ -421,7 +439,7 @@ end
|
||||
--- @param row_data ExpGui_RocketInfo.elements.progress_table.row_data
|
||||
function Elements.progress_table.add_row(progress_table, row_data)
|
||||
local rows = Elements.progress_table.data[progress_table].rows
|
||||
local zoom_tooltip = config.progress.allow_zoom_to_map and { "exp-gui_rocket-info.progress-label-tooltip" } or nil
|
||||
local zoom_tooltip = config.allow_zoom_to_map and { "exp-gui_rocket-info.progress-label-tooltip" } or nil
|
||||
|
||||
local x = Elements.position_label(progress_table, { caption = row_data.x, tooltip = zoom_tooltip, entity = row_data.entity })
|
||||
local y = Elements.position_label(progress_table, { caption = row_data.y, tooltip = zoom_tooltip, entity = row_data.entity })
|
||||
@@ -544,17 +562,17 @@ Elements.container = Gui.define("rocket_info/container")
|
||||
local force = player.force --[[@as LuaForce]]
|
||||
local force_data = def._get_force_data(force)
|
||||
|
||||
if config.stats.show_stats then
|
||||
if config.show_stats then
|
||||
local row_data = Elements.stats_table.calculate_row_data(force)
|
||||
Elements.stats_table.refresh(def.add_section(container, "stats", Elements.stats_table), row_data)
|
||||
end
|
||||
|
||||
if config.milestones.show_milestones then
|
||||
if config.show_milestones then
|
||||
local row_data = Elements.milestones_table.calculate_row_data(force)
|
||||
Elements.milestones_table.refresh(def.add_section(container, "milestones", Elements.milestones_table), row_data)
|
||||
end
|
||||
|
||||
if config.progress.show_progress then
|
||||
if config.show_progress then
|
||||
local row_data = Elements.progress_table.calculate_row_data_all(force_data.silos)
|
||||
Elements.progress_table.refresh(def.add_section(container, "progress", Elements.progress_table), row_data)
|
||||
end
|
||||
@@ -651,7 +669,7 @@ Gui.toolbar.create_button{
|
||||
sprite = "item/rocket-silo",
|
||||
tooltip = { "exp-gui_rocket-info.tooltip-main" },
|
||||
visible = function(player, element)
|
||||
return Roles.player_has_permission(player, "exp_scenario.gui.rocket_info")
|
||||
return feature:is_enabled() and Roles.player_has_permission(player, "exp_scenario.gui.rocket_info")
|
||||
end
|
||||
}
|
||||
|
||||
@@ -678,7 +696,7 @@ local function on_cargo_pod_finished_ascending(event)
|
||||
|
||||
-- Discard the launch time that is no longer needed by any rolling average unless it is a milestone
|
||||
local remove_rocket = rockets_launched - largest_rolling_avg
|
||||
if remove_rocket > 0 and not table.array_contains(config.milestones, remove_rocket) then
|
||||
if remove_rocket > 0 and not table.array_contains(milestones, remove_rocket) then
|
||||
times[remove_rocket] = nil
|
||||
end
|
||||
|
||||
@@ -721,7 +739,7 @@ end
|
||||
|
||||
local e = defines.events
|
||||
|
||||
return {
|
||||
return feature:guard{
|
||||
elements = Elements,
|
||||
events = {
|
||||
[e.on_cargo_pod_finished_ascending] = on_cargo_pod_finished_ascending,
|
||||
|
||||
@@ -6,7 +6,28 @@ local ExpUtil = require("modules/exp_util")
|
||||
local Gui = require("modules/exp_gui")
|
||||
local Colors = require("modules/exp_util/include/color")
|
||||
local Roles = require("modules/exp_roles")
|
||||
local config = require("modules/exp_legacy/config/gui/science")
|
||||
local Feature = require("modules/exp_scenario/features")
|
||||
|
||||
local feature, config = Feature.register("science_production", {
|
||||
show_eta = true, -- the eta for research completion
|
||||
color_flux = 0.1, -- the fluctuation allowed in production before the icon changes color
|
||||
})
|
||||
|
||||
--- The science packs shown, those not in the game are removed below
|
||||
local science_packs = {
|
||||
"automation-science-pack",
|
||||
"logistic-science-pack",
|
||||
"military-science-pack",
|
||||
"chemical-science-pack",
|
||||
"production-science-pack",
|
||||
"utility-science-pack",
|
||||
"space-science-pack",
|
||||
"metallurgic-science-pack",
|
||||
"agricultural-science-pack",
|
||||
"electromagnetic-science-pack",
|
||||
"cryogenic-science-pack",
|
||||
"promethium-science-pack",
|
||||
}
|
||||
local _format_number = require("util").format_number
|
||||
|
||||
local clock_time_format = ExpUtil.format_time_factory_locale{ format = "clock", hours = true, minutes = true, seconds = true }
|
||||
@@ -16,9 +37,9 @@ local clock_time_format_nil = { "exp-gui_science-production.caption-eta-time", c
|
||||
local long_time_format_nil = long_time_format(nil)
|
||||
|
||||
--- Remove invalid science packs, this can result from a certain mod not being loaded
|
||||
for i = #config, 1, -1 do
|
||||
if not prototypes.item[config[i]] then
|
||||
table.remove(config, i)
|
||||
for i = #science_packs, 1, -1 do
|
||||
if not prototypes.item[science_packs[i]] then
|
||||
table.remove(science_packs, i)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -337,7 +358,7 @@ do local _row_data = {} --- @type table<string, table<number, ExpGui_ScienceProd
|
||||
if next(force.connected_players) then
|
||||
local row_data = _row_data[force.name] or {}
|
||||
_row_data[force.name] = row_data
|
||||
for i, science_pack in ipairs(config) do
|
||||
for i, science_pack in ipairs(science_packs) do
|
||||
--- @cast science_pack any
|
||||
row_data[i] = Elements.science_table.calculate_row_data(force, science_pack, row_data[i])
|
||||
end
|
||||
@@ -448,7 +469,7 @@ Elements.container = Gui.define("science_production/container")
|
||||
|
||||
local force = Gui.get_player(parent).force --[[@as LuaForce]]
|
||||
local science_table = Elements.science_table(container)
|
||||
for _, science_pack in ipairs(config) do
|
||||
for _, science_pack in ipairs(science_packs) do
|
||||
--- @cast science_pack any
|
||||
local row_data = Elements.science_table.calculate_row_data(force, science_pack)
|
||||
Elements.science_table.add_row(science_table, row_data)
|
||||
@@ -522,7 +543,7 @@ do local _production_data = {} --- @type table<string, { [string]: ExpGui_Scienc
|
||||
end
|
||||
|
||||
-- Calculate the production data for each science pack
|
||||
for _, science_pack in ipairs(config) do
|
||||
for _, science_pack in ipairs(science_packs) do
|
||||
--- @cast science_pack any
|
||||
local made, used = 0, 0
|
||||
for _, stats in pairs(production_stats) do
|
||||
@@ -571,7 +592,7 @@ Gui.toolbar.create_button{
|
||||
sprite = "entity/lab",
|
||||
tooltip = { "exp-gui_science-production.tooltip-main" },
|
||||
visible = function(player, element)
|
||||
return Roles.player_has_permission(player, "exp_scenario.gui.science_info")
|
||||
return feature:is_enabled() and Roles.player_has_permission(player, "exp_scenario.gui.science_info")
|
||||
end
|
||||
}
|
||||
|
||||
@@ -583,7 +604,7 @@ local function update_gui()
|
||||
Elements.no_production_label.refresh_online()
|
||||
end
|
||||
|
||||
return {
|
||||
return feature:guard{
|
||||
elements = Elements,
|
||||
on_nth_tick = {
|
||||
[60] = update_gui,
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -5,8 +5,8 @@ Shows what the virtual layer holds and lets players build and remove its interfa
|
||||
local Gui = require("modules/exp_gui")
|
||||
local Roles = require("modules/exp_roles")
|
||||
local Colors = require("modules/exp_util/include/color")
|
||||
local config = require("modules.exp_legacy.config.vlayer")
|
||||
local Vlayer = require("modules/exp_scenario/control/vlayer")
|
||||
local feature, config = Vlayer.feature, Vlayer.config
|
||||
local format_number = require("util").format_number
|
||||
|
||||
local Selection = require("modules/exp_util/selection")
|
||||
@@ -444,7 +444,7 @@ Gui.toolbar.create_button{
|
||||
sprite = "entity/solar-panel",
|
||||
tooltip = { "exp-gui_vlayer.tooltip-main" },
|
||||
visible = function(player, element)
|
||||
return Roles.player_has_permission(player, "exp_scenario.gui.vlayer")
|
||||
return feature:is_enabled() and Roles.player_has_permission(player, "exp_scenario.gui.vlayer")
|
||||
end
|
||||
}
|
||||
|
||||
@@ -520,12 +520,12 @@ local function refresh_player_permissions(event)
|
||||
Elements.controls.refresh_permissions(Gui.get_player(event))
|
||||
end
|
||||
|
||||
return {
|
||||
return feature:guard{
|
||||
elements = Elements,
|
||||
events = {
|
||||
[Roles.events.on_player_roles_changed] = refresh_player_permissions,
|
||||
},
|
||||
on_nth_tick = {
|
||||
[config.update_tick_gui] = Elements.stats_table.refresh_online,
|
||||
[60] = Elements.stats_table.refresh_online,
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,7 @@ Adds a list of warp points which players can travel between, add, and edit
|
||||
local Gui = require("modules/exp_gui")
|
||||
local Roles = require("modules/exp_roles")
|
||||
local Colors = require("modules/exp_util/include/color")
|
||||
local config = require("modules.exp_legacy.config.gui.warps")
|
||||
local Feature = require("modules/exp_scenario/features")
|
||||
|
||||
local ExpUtil = require("modules/exp_util")
|
||||
local format_time = ExpUtil.format_time_factory_locale{ format = "short", hours = true, minutes = true }
|
||||
@@ -31,18 +31,61 @@ local status_icons = {
|
||||
different = "[img=utility/warning_white]",
|
||||
}
|
||||
|
||||
local update_interval = floor(60 / config.update_smoothing)
|
||||
local cooldown_ticks = config.cooldown_duration * 60
|
||||
local proximity_radius_sq = config.standard_proximity_radius ^ 2
|
||||
local spawn_radius_sq = config.spawn_proximity_radius ^ 2
|
||||
local minimum_distance_sq = config.minimum_distance ^ 2
|
||||
local feature, config = Feature.register("warp_list", {
|
||||
minimum_distance = 100, -- the minimum distance that is allowed between warps on the same force
|
||||
cooldown_duration = 60, -- the duration of the warp cooldown in seconds
|
||||
standard_proximity_radius = 4, -- the minimum distance a player is allowed to be to a warp in order to use it
|
||||
spawn_proximity_radius = 20, -- the minimum distance a player is allowed to be from their spawn point to use warps
|
||||
user_can_edit_own_warps = false, -- the player who made a warp can edit it without the edit permission
|
||||
})
|
||||
|
||||
--- Ticks between updates of the cooldown timers
|
||||
local update_interval = 6
|
||||
|
||||
--- The default icon of new warps
|
||||
local default_icon = { type = "item", name = "discharge-defense-equipment" }
|
||||
|
||||
--- The entities which are created for warp areas { name, x, y }
|
||||
local area_entities = {
|
||||
{ "small-lamp", -4, -2 }, { "small-lamp", -2, -4 }, { "medium-electric-pole", -3, -3 }, -- Top left corner
|
||||
{ "small-lamp", 3, -2 }, { "small-lamp", 1, -4 }, { "medium-electric-pole", 2, -3 }, -- Top right corner
|
||||
{ "small-lamp", 3, 1 }, { "small-lamp", 1, 3 }, { "medium-electric-pole", 2, 2 }, -- Bottom right corner
|
||||
{ "small-lamp", -4, 1 }, { "small-lamp", -2, 3 }, { "medium-electric-pole", -3, 2 }, -- Bottom left corner
|
||||
|
||||
}
|
||||
|
||||
--- The tiles which are created for warp areas { name, x, y }
|
||||
local area_tiles = {
|
||||
{ "black-refined-concrete", -4, -2 }, { "black-refined-concrete", -4, -1 }, { "black-refined-concrete", -4, 0 }, { "black-refined-concrete", -4, 1 },
|
||||
{ "black-refined-concrete", -3, -3 }, { "purple-refined-concrete", -3, -2 }, { "purple-refined-concrete", -3, -1 }, { "purple-refined-concrete", -3, 0 },
|
||||
{ "purple-refined-concrete", -3, 1 }, { "black-refined-concrete", -3, 2 }, { "black-refined-concrete", -2, -4 }, { "purple-refined-concrete", -2, -3 },
|
||||
{ "purple-refined-concrete", -2, -2 }, { "purple-refined-concrete", -2, -1 }, { "purple-refined-concrete", -2, 0 }, { "purple-refined-concrete", -2, 1 },
|
||||
{ "purple-refined-concrete", -2, 2 }, { "black-refined-concrete", -2, 3 }, { "black-refined-concrete", -1, -4 }, { "purple-refined-concrete", -1, -3 },
|
||||
{ "purple-refined-concrete", -1, -2 }, { "purple-refined-concrete", -1, -1 }, { "purple-refined-concrete", -1, 0 }, { "purple-refined-concrete", -1, 1 },
|
||||
{ "purple-refined-concrete", -1, 2 }, { "black-refined-concrete", -1, 3 }, { "black-refined-concrete", 0, -4 }, { "purple-refined-concrete", 0, -3 },
|
||||
{ "purple-refined-concrete", 0, -2 }, { "purple-refined-concrete", 0, -1 }, { "purple-refined-concrete", 0, 0 }, { "purple-refined-concrete", 0, 1 },
|
||||
{ "purple-refined-concrete", 0, 2 }, { "black-refined-concrete", 0, 3 }, { "black-refined-concrete", 1, -4 }, { "purple-refined-concrete", 1, -3 },
|
||||
{ "purple-refined-concrete", 1, -2 }, { "purple-refined-concrete", 1, -1 }, { "purple-refined-concrete", 1, 0 }, { "purple-refined-concrete", 1, 1 },
|
||||
{ "purple-refined-concrete", 1, 2 }, { "black-refined-concrete", 1, 3 }, { "black-refined-concrete", 2, -3 }, { "purple-refined-concrete", 2, -2 },
|
||||
{ "purple-refined-concrete", 2, -1 }, { "purple-refined-concrete", 2, 0 }, { "purple-refined-concrete", 2, 1 }, { "black-refined-concrete", 2, 2 },
|
||||
{ "black-refined-concrete", 3, -2 }, { "black-refined-concrete", 3, -1 }, { "black-refined-concrete", 3, 0 }, { "black-refined-concrete", 3, 1 },
|
||||
|
||||
}
|
||||
|
||||
--- Names of the entities which make up a warp area, used to find them when the area is removed
|
||||
local area_entity_names = {} --- @type string[]
|
||||
for _, entity in ipairs(config.entities) do
|
||||
for _, entity in ipairs(area_entities) do
|
||||
area_entity_names[#area_entity_names + 1] = entity[1]
|
||||
end
|
||||
|
||||
--- The role permission each action needs
|
||||
local permissions = {
|
||||
bypass_warp_cooldown = "exp_scenario.gui.warp_list.bypass_cooldown",
|
||||
bypass_warp_proximity = "exp_scenario.gui.warp_list.bypass_proximity",
|
||||
allow_add_warp = "exp_scenario.gui.warp_list.add",
|
||||
allow_edit_warp = "exp_scenario.gui.warp_list.edit",
|
||||
}
|
||||
|
||||
--- @class ExpGui_WarpList.Warp
|
||||
--- @field id number
|
||||
--- @field force LuaForce
|
||||
@@ -63,21 +106,11 @@ end
|
||||
--- @field on_cooldown boolean
|
||||
--- @field bypass_proximity boolean
|
||||
|
||||
--- Check a permission from the config, which says who an action applies to
|
||||
--- @param player LuaPlayer
|
||||
--- @param action "bypass_warp_cooldown" | "bypass_warp_proximity" | "allow_add_warp" | "allow_edit_warp"
|
||||
--- @return boolean
|
||||
local function has_config_permission(player, action)
|
||||
local setting = config[action]
|
||||
if setting == "all" then
|
||||
return true
|
||||
elseif setting == "admin" then
|
||||
return player.admin
|
||||
elseif setting == "exp_roles" then
|
||||
return Roles.player_has_permission(player, config["exp_roles_" .. action])
|
||||
end
|
||||
|
||||
return false
|
||||
return Roles.player_has_permission(player, permissions[action])
|
||||
end
|
||||
|
||||
--- Check if a player can edit a warp, the spawn warp can never be edited
|
||||
@@ -694,7 +727,7 @@ Elements.cooldown_bar = Gui.define("warp_list/cooldown_bar")
|
||||
--- @param cooldown number
|
||||
function Elements.cooldown_bar.refresh(cooldown_bar, cooldown)
|
||||
if cooldown > 0 then
|
||||
cooldown_bar.value = 1 - cooldown / cooldown_ticks
|
||||
cooldown_bar.value = 1 - cooldown / (config.cooldown_duration * 60)
|
||||
cooldown_bar.tooltip = { "exp-gui_warp-list.tooltip-cooldown", ceil(cooldown / 60) }
|
||||
else
|
||||
cooldown_bar.value = 1
|
||||
@@ -877,12 +910,12 @@ function Elements.container._make_area(warp)
|
||||
warp.old_tile = surface.get_tile(position.x, position.y).name
|
||||
|
||||
local tiles = {}
|
||||
for index, tile in ipairs(config.tiles) do
|
||||
for index, tile in ipairs(area_tiles) do
|
||||
tiles[index] = { name = tile[1], position = { x = tile[2] + position.x, y = tile[3] + position.y } }
|
||||
end
|
||||
surface.set_tiles(tiles)
|
||||
|
||||
for _, entity_config in ipairs(config.entities) do
|
||||
for _, entity_config in ipairs(area_entities) do
|
||||
local entity = assert(surface.create_entity{
|
||||
name = entity_config[1],
|
||||
position = { x = entity_config[2] + position.x, y = entity_config[3] + position.y },
|
||||
@@ -908,7 +941,7 @@ function Elements.container._remove_area(warp)
|
||||
local surface = warp.surface
|
||||
local position = warp.position
|
||||
local tiles = {}
|
||||
for index, tile in ipairs(config.tiles) do
|
||||
for index, tile in ipairs(area_tiles) do
|
||||
tiles[index] = { name = old_tile, position = { x = tile[2] + position.x, y = tile[3] + position.y } }
|
||||
end
|
||||
surface.set_tiles(tiles)
|
||||
@@ -947,7 +980,7 @@ function Elements.container.add_warp(force, surface, position, player, name)
|
||||
id = id,
|
||||
force = force,
|
||||
name = name or "New warp",
|
||||
icon = { type = config.default_icon.type, name = config.default_icon.name },
|
||||
icon = { type = default_icon.type, name = default_icon.name },
|
||||
surface = surface,
|
||||
position = { x = floor(position.x), y = floor(position.y) },
|
||||
last_user = player,
|
||||
@@ -1054,8 +1087,8 @@ function Elements.container.teleport_player(player, warp)
|
||||
|
||||
local player_data = Elements.container._get_player_data(player)
|
||||
if not has_config_permission(player, "bypass_warp_cooldown") then
|
||||
player_data.cooldown = cooldown_ticks
|
||||
Elements.cooldown_bar.refresh_player(player, cooldown_ticks)
|
||||
player_data.cooldown = config.cooldown_duration * 60
|
||||
Elements.cooldown_bar.refresh_player(player, player_data.cooldown)
|
||||
end
|
||||
player_data.in_range = warp
|
||||
Elements.warp_table.refresh_status_player(player)
|
||||
@@ -1109,7 +1142,7 @@ function Elements.container._update_proximity(player, player_data)
|
||||
end
|
||||
|
||||
local in_range = nil --- @type ExpGui_WarpList.Warp?
|
||||
if closest and closest_distance < (closest == force_data.spawn and spawn_radius_sq or proximity_radius_sq) then
|
||||
if closest and closest_distance < (closest == force_data.spawn and config.spawn_proximity_radius or config.standard_proximity_radius) ^ 2 then
|
||||
in_range = closest
|
||||
end
|
||||
if in_range ~= player_data.in_range then
|
||||
@@ -1121,7 +1154,7 @@ function Elements.container._update_proximity(player, player_data)
|
||||
end
|
||||
|
||||
local blocking = nil --- @type ExpGui_WarpList.Warp?
|
||||
if closest and closest_distance <= minimum_distance_sq then
|
||||
if closest and closest_distance <= config.minimum_distance ^ 2 then
|
||||
blocking = closest
|
||||
end
|
||||
if blocking ~= player_data.blocking then
|
||||
@@ -1135,10 +1168,10 @@ Gui.add_left_element(Elements.container, false)
|
||||
Gui.toolbar.create_button{
|
||||
name = "toggle_warp_list",
|
||||
left_element = Elements.container,
|
||||
sprite = config.default_icon.type .. "/" .. config.default_icon.name,
|
||||
sprite = default_icon.type .. "/" .. default_icon.name,
|
||||
tooltip = { "exp-gui_warp-list.tooltip-main" },
|
||||
visible = function(player, element)
|
||||
return Roles.player_has_permission(player, "exp_scenario.gui.warp_list")
|
||||
return feature:is_enabled() and Roles.player_has_permission(player, "exp_scenario.gui.warp_list")
|
||||
end
|
||||
}:on_click(function(def, player)
|
||||
-- A list the player opened themselves stays open when they leave a warp
|
||||
@@ -1202,7 +1235,7 @@ end
|
||||
|
||||
local e = defines.events
|
||||
|
||||
return {
|
||||
return feature:guard{
|
||||
elements = Elements,
|
||||
events = {
|
||||
[e.on_player_created] = on_player_created,
|
||||
|
||||
Reference in new issue
Block a user