aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-29 12:16:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Changed store to use a single function

Browse Source
This commit is contained in:
Cooldude2606
2019-06-01 16:11:14 +01:00
parent 32723af8ac
commit 67933e67ba
8 changed files with 175 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/gui/player-list.lua
View File

@@ -23,11 +23,11 @@ Gui.on_click(zoom_to_map_name,function(event)
else
-- rmb will open settings
local player_name = event.player.name
local old_action_player_name = Store.get_child(action_player_store,player_name)
local old_action_player_name = Store.get(action_player_store,player_name)
if action_player_name == old_action_player_name then
Store.set_child(action_player_store,player_name) -- will close if already open
Store.clear(action_player_store,player_name) -- will close if already open
else
Store.set_child(action_player_store,player_name,action_player_name)
Store.set(action_player_store,player_name,action_player_name)
end
end
end)
@@ -47,11 +47,11 @@ end)
end)
:on_click(function(player,element)
local new_action_player_name = element.parent.name
local action_player_name = Store.get_child(action_player_store,player.name)
local action_player_name = Store.get(action_player_store,player.name)
if action_player_name == new_action_player_name then
Store.set_child(action_player_store,player.name) -- will close if already open
Store.clear(action_player_store,player.name) -- will close if already open
else
Store.set_child(action_player_store,player.name,element.parent.name)
Store.set(action_player_store,player.name,new_action_player_name)
end
end)
@@ -66,8 +66,8 @@ Gui.new_button()
style.width = 28
end)
:on_click(function(player,element)
Store.set_child(action_player_store,player.name,nil)
Store.set_child(action_name_store,player.name,nil)
Store.clear(action_player_store,player.name)
Store.clear(action_name_store,player.name)
end)
--- Button used to confirm a reason
@@ -85,8 +85,8 @@ end)
local action_name = Store.get_child(action_name_store,player.name)
local reason_callback = config[action_name].reason_callback
reason_callback(player,reason)
Store.set_child(action_player_store,player.name,nil)
Store.set_child(action_name_store,player.name,nil)
Store.clear(action_player_store,player.name)
Store.clear(action_name_store,player.name)
element.parent.entry.text = ''
end)
@@ -157,7 +157,7 @@ local function generate_container(player,element)
Gui.set_padding(reason_bar,-1,-1,3,3)
reason_bar.style.horizontally_stretchable = true
reason_bar.style.height = 35
local action_name = Store.get_child(action_name_store,player.name)
local action_name = Store.get(action_name_store,player.name)
reason_bar.visible = action_name ~= nil
-- text entry for the reason bar
@@ -180,7 +180,7 @@ end
--- Adds buttons and permission flows to the action bar
local function generate_action_bar(player,element)
close_action_bar(element)
local action_player = Store.get_child(action_player_store,player.name)
local action_player = Store.get(action_player_store,player.name)
for action_name,buttons in pairs(config) do
local permission_flow =
@@ -212,7 +212,7 @@ local player_list_name
local function update_action_bar(player)
local frame = Gui.classes.left_frames.get_frame(player_list_name,player)
local element = frame.container.action_bar
local action_player_name = Store.get_child(action_player_store,player.name)
local action_player_name = Store.get(action_player_store,player.name)
if not action_player_name then
element.visible = false
@@ -220,8 +220,8 @@ local function update_action_bar(player)
local action_player = Game.get_player_from_any(action_player_name)
if not action_player.connected then
element.visible = false
Store.set(action_player_store,player.name) -- clears store if player is offline
Store.set_child(action_name_store,player.name)
Store.clear(action_player_store,player.name) -- clears store if player is offline
Store.clear(action_name_store,player.name)
else
element.visible = true
for action_name,buttons in pairs(config) do
@@ -347,13 +347,13 @@ Store.register(action_name_store,function(value,category)
local frame = Gui.classes.left_frames.get_frame(player_list_name,player)
local element = frame.container.reason_bar
if value then
local action_player_name = Store.get_child(action_player_store,category)
local action_player_name = Store.get(action_player_store,category)
local action_player = Game.get_player_from_any(action_player_name)
if action_player.connected then
element.visible = true
else
Store.set_child(action_player_store,category) -- clears store if player is offline
Store.set_child(action_name_store,category)
Store.clear(action_player_store,category) -- clears store if player is offline
Store.clear(action_name_store,category)
end
else
element.visible = false

8
modules/gui/task-list.lua
View File

@@ -41,13 +41,13 @@ local function add_task(player,task_number)
editing={[player.name]=true}
}
Store.set_child(task_store,task_id,'New task')
Store.set(task_store,task_id,'New task')
end
--- Removes all refrences to a task
local function remove_task(task_id)
local force_name = task_details[task_id].force
Store.set_child(task_store,task_id)
Store.clear(task_store,task_id)
task_details[task_id] = nil
table.remove_element(force_tasks[force_name],task_id)
end
@@ -108,7 +108,7 @@ end)
details.editing[player.name] = nil
details.last_edit_player = player.name
details.last_edit_time = game.tick
Store.set_child(task_store,task_id,task)
Store.set(task_store,task_id,task)
end)
--- Used to cancel any changes you made to a task
@@ -175,7 +175,7 @@ end)
>> discard_task
]]
function generate_task(player,element,task_id)
local task = Store.get_child(task_store,task_id)
local task = Store.get(task_store,task_id)
local details = task_details[task_id]
local editing = details.editing[player.name]
local last_edit_player = details.last_edit_player