games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-03-11 14:49:24 +02:00
Code Issues Releases Activity

minor fixes

Browse Source
This commit is contained in:
Gerkiz 2020-10-24 16:07:37 +02:00
parent bef4bfea55
commit d12d7a7770
4 changed files with 238 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
control.lua
View File

@ -13,7 +13,6 @@ require 'utils.datastore.color_data'
require 'utils.datastore.session_data'
require 'utils.datastore.jail_data'
require 'utils.datastore.quickbar_data'
require 'utils.datastore.logistics_data'
require 'utils.datastore.message_on_join_data'
require 'utils.datastore.player_tag_data'
require 'chatbot'

4
utils/datastore/color_data.lua
View File

@ -53,6 +53,8 @@ function Public.fetch(key)
end
end
local fetcher = Public.fetch
Event.add(
defines.events.on_player_joined_game,
function(event)
@ -61,7 +63,7 @@ Event.add(
return
end
Public.fetch(player.name)
fetcher(player.name)
end
)

133
utils/datastore/logistics_data.lua
View File

@ -1,133 +0,0 @@
local Token = require 'utils.token'
local Color = require 'utils.color_presets'
local Server = require 'utils.server'
local Event = require 'utils.event'
local logistics_dataset = 'logistics'
local logistics_dataset_modded = 'logistics_modded'
local set_data = Server.set_data
local try_get_data = Server.try_get_data
local Public = {}
local function is_game_modded()
local i = 0
for k, _ in pairs(game.active_mods) do
i = i + 1
if i > 1 then
return true
end
end
return false
end
local fetch =
Token.register(
function(data)
local key = data.key
local value = data.value
local player = game.players[key]
if not player or not player.valid then
return
end
if value then
for i, item_name in pairs(value) do
if item_name ~= nil and item_name ~= '' then
player.set_personal_logistic_slot(i, item_name)
end
end
end
end
)
--- Tries to get data from the webpanel and applies the value to the player.
-- @param data_set player token
function Public.fetch(key)
local secs = Server.get_current_time()
local dataset = logistics_dataset
if not secs then
local player = game.players[key]
if not player or not player.valid then
return
end
return
else
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = logistics_dataset_modded
end
try_get_data(dataset, key, fetch)
end
end
commands.add_command(
'save-logistics',
'Save your personal logistics preset so it´s always the same.',
function()
local player = game.player
if not player or not player.valid then
return
end
local secs = Server.get_current_time()
if not secs then
return
end
local dataset = logistics_dataset
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = logistics_dataset_modded
end
local slots = {}
for i = 1, 100 do
local slot = player.get_personal_logistic_slot(i)
if slot ~= nil then
slots[i] = slot.name
end
end
if next(slots) then
set_data(dataset, player.name, slots)
player.print('Your personal logistics has been saved.', Color.success)
end
end
)
commands.add_command(
'remove-logistics',
'Removes your personal logistics preset from the datastore.',
function()
local player = game.player
if not player or not player.valid then
return
end
local dataset = logistics_dataset
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = logistics_dataset_modded
end
set_data(dataset, player.name, nil)
player.print('Your personal logistics has been removed.', Color.success)
end
)
Event.add(
defines.events.on_player_joined_game,
function(event)
local player = game.get_player(event.player_index)
if not player or not player.valid then
return
end
Public.fetch(player.name)
end
)
return Public

296
utils/datastore/quickbar_data.lua
View File

@ -2,12 +2,26 @@ local Token = require 'utils.token'
local Color = require 'utils.color_presets'
local Server = require 'utils.server'
local Event = require 'utils.event'
local Global = require 'utils.global'
local quickbar_dataset = 'quickbar'
local quickbar_dataset_modded = 'quickbar_modded'
local logistics_dataset = 'logistics'
local logistics_dataset_modded = 'logistics_modded'
local set_data = Server.set_data
local try_get_data = Server.try_get_data
local this = {
logistics = {}
}
Global.register(
this,
function(t)
this = t
end
)
local Public = {}
local function is_game_modded()
@ -21,7 +35,19 @@ local function is_game_modded()
return false
end
local fetch =
local function apply_stash(player)
local stash = this.logistics[player.index]
if stash then
for i, slot in pairs(stash) do
if slot and slot.name then
player.set_personal_logistic_slot(i, {name = slot.name, min = slot.min, max = slot.max})
end
end
this.logistics[player.index] = nil
end
end
local fetch_quickbar =
Token.register(
function(data)
local key = data.key
@ -31,9 +57,36 @@ local fetch =
return
end
if value then
for i, item_name in pairs(value) do
if item_name ~= nil and item_name ~= '' then
player.set_quick_bar_slot(i, item_name)
for i, slot in pairs(value) do
if slot and slot ~= '' then
player.set_quick_bar_slot(i, slot)
end
end
end
end
)
local fetch_logistics =
Token.register(
function(data)
local key = data.key
local value = data.value
local player = game.players[key]
if not player or not player.valid then
return
end
local tech = player.force.technologies['logistic-robotics'].researched
if value then
for i, slot in pairs(value) do
if slot and slot.name then
if tech then
player.set_personal_logistic_slot(i, {name = slot.name, min = slot.min, max = slot.max})
else
if not this.logistics[player.index] then
this.logistics[player.index] = {}
end
this.logistics[player.index][i] = {name = slot.name, min = slot.min, max = slot.max}
end
end
end
end
@ -41,29 +94,169 @@ local fetch =
)
--- Tries to get data from the webpanel and applies the value to the player.
-- @param data_set player token
function Public.fetch(key)
local secs = Server.get_current_time()
-- @param LuaPlayer
function Public.fetch_quickbar(player)
local dataset = quickbar_dataset
if not secs then
local player = game.players[key]
if not player or not player.valid then
return
end
return
else
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = quickbar_dataset_modded
end
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = quickbar_dataset_modded
end
try_get_data(dataset, key, fetch)
try_get_data(dataset, player.name, fetch_quickbar)
end
--- Tries to get data from the webpanel and applies the value to the player.
-- @param LuaPlayer
function Public.fetch_logistics(player)
local dataset = logistics_dataset
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = logistics_dataset_modded
end
try_get_data(dataset, player.name, fetch_logistics)
end
--- Saves the players quickbar table to the webpanel.
-- @param LuaPlayer
function Public.save_quickbar(player)
local dataset = quickbar_dataset
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = quickbar_dataset_modded
end
local slots = {}
for i = 1, 100 do
local slot = player.get_quick_bar_slot(i)
if slot ~= nil then
slots[i] = slot.name
end
end
if next(slots) then
set_data(dataset, player.name, slots)
player.print('Your quickbar has been saved.', Color.success)
end
end
--- Saves the players personal logistics table to the webpanel.
-- @param LuaPlayer
function Public.save_logistics(player)
local dataset = logistics_dataset
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = logistics_dataset_modded
end
local slots = {}
for i = 1, 49 do
local slot = player.get_personal_logistic_slot(i)
if slot and slot.name then
slots[i] = {name = slot.name, min = slot.min, max = slot.max}
end
end
if next(slots) then
set_data(dataset, player.name, slots)
player.print('Your personal logistics has been saved.', Color.success)
end
end
--- Removes the quickbar key from the webpanel.
-- @param LuaPlayer
function Public.remove_quickbar(player)
local dataset = quickbar_dataset
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = quickbar_dataset_modded
end
set_data(dataset, player.name, nil)
player.print('Your quickbar has been removed.', Color.success)
end
--- Removes the logistics key from the webpanel.
-- @param LuaPlayer
function Public.remove_logistics(player)
local dataset = logistics_dataset
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = logistics_dataset_modded
end
set_data(dataset, player.name, nil)
player.print('Your personal logistics has been removed.', Color.success)
end
local fetch_quickbar_on_join = Public.fetch_quickbar
local fetch_logistics_on_join = Public.fetch_logistics
local save_quickbar = Public.save_quickbar
local save_logistics = Public.save_logistics
local remove_quickbar = Public.remove_quickbar
local remove_logistics = Public.remove_logistics
commands.add_command(
'save-quickbar',
'Save your quickbar preset so it´s always the same.',
'Save your personal quickbar preset so it´s always the same.',
function()
local player = game.player
if not player or not player.valid then
return
end
local secs = Server.get_current_time()
if not secs then
return
end
save_quickbar(player)
end
)
commands.add_command(
'save-logistics',
'Save your personal logistics preset so it´s always the same.',
function()
local player = game.player
if not player or not player.valid then
return
end
local secs = Server.get_current_time()
if not secs then
return
end
local success, _ = pcall(save_logistics, player)
if not success then
player.print('An error occured while trying to save your logistics slots.', Color.warning)
end
end
)
commands.add_command(
'remove-quickbar',
'Removes your personal quickbar preset from the datastore.',
function()
local player = game.player
if not player or not player.valid then
return
end
local secs = Server.get_current_time()
if not secs then
return
end
remove_quickbar(player)
end
)
commands.add_command(
'remove-logistics',
'Removes your personal logistics preset from the datastore.',
function()
local player = game.player
if not player or not player.valid then
@ -75,46 +268,7 @@ commands.add_command(
return
end
local dataset = quickbar_dataset
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = quickbar_dataset_modded
end
local slots = {}
for i = 1, 100 do
local slot = player.get_quick_bar_slot(i)
if slot ~= nil then
slots[i] = slot.name
end
end
if next(slots) then
set_data(dataset, player.name, slots)
player.print('Your quickbar has been saved.', Color.success)
end
end
)
commands.add_command(
'remove-quickbar',
'Removes your quickbar preset from the datastore.',
function()
local player = game.player
if not player or not player.valid then
return
end
local dataset = quickbar_dataset
local game_has_mods = is_game_modded()
if game_has_mods then
dataset = quickbar_dataset_modded
end
set_data(dataset, player.name, nil)
player.print('Your quickbar has been removed.', Color.success)
remove_logistics(player)
end
)
@ -126,7 +280,27 @@ Event.add(
return
end
Public.fetch(player.name)
local secs = Server.get_current_time()
if not secs then
return
end
fetch_quickbar_on_join(player)
fetch_logistics_on_join(player)
end
)
Event.add(
defines.events.on_research_finished,
function(event)
local research = event.research
if research.name == 'logistic-robotics' then
local players = game.connected_players
for i = 1, #players do
local player = players[i]
apply_stash(player)
end
end
end
)