Few bug fixes for datastore

This commit is contained in:
Cooldude2606
2020-05-22 20:18:00 +01:00
parent d283acca3b
commit 537980cda4
5 changed files with 131 additions and 93 deletions

View File

@@ -8,40 +8,45 @@ require 'config.expcore.command_general_parse' --- @dep config.expcore.command_g
local PlayerData = Datastore.connect('PlayerData', true) -- saveToDisk
PlayerData:set_serializer(Datastore.name_serializer) -- use player name
--- Store and enum for the data collection policy
local DataCollectionPolicy = PlayerData:combine('DataCollectionPolicy')
local PolicyEnum = { 'All', 'Tracking', 'Settings', 'Required' }
for k,v in ipairs(PolicyEnum) do PolicyEnum[v] = k end
--- Store and enum for the data saving preference
local DataSavingPreference = PlayerData:combine('DataSavingPreference')
local PreferenceEnum = { 'All', 'Statistics', 'Settings', 'Required' }
for k,v in ipairs(PreferenceEnum) do PreferenceEnum[v] = k end
--- Sets your data collection policy
-- @command set-data-policy
Commands.new_command('set-data-policy', 'Allows you to set your data collection policy')
:add_param('option', false, 'string-options', PolicyEnum)
--- Sets your data saving preference
-- @command set-data-preference
Commands.new_command('set-data-preference', 'Allows you to set your data saving preference')
:add_param('option', false, 'string-options', PreferenceEnum)
:register(function(player, option)
DataCollectionPolicy:set(player, option)
return {'expcore-data.set-policy', option}
DataSavingPreference:set(player, option)
return {'expcore-data.set-preference', option}
end)
--- Gets your data collection policy
-- @command data-policy
Commands.new_command('data-policy', 'Shows you what your current data collection policy is')
--- Gets your data saving preference
-- @command data-preference
Commands.new_command('data-preference', 'Shows you what your current data saving preference is')
:register(function(player)
return {'expcore-data.get-policy', DataCollectionPolicy:get(player, 'All')}
return {'expcore-data.get-preference', DataSavingPreference:get(player, 'All')}
end)
--- Remove data that the player doesnt want to have stored
PlayerData:on_save(function(player_name, player_data)
local collectData = DataCollectionPolicy:get(player_name, 'All')
collectData = PolicyEnum[collectData]
if collectData == PolicyEnum.All then return player_data end
local dataPreference = DataSavingPreference:get(player_name, 'All')
dataPreference = PreferenceEnum[dataPreference]
if dataPreference == PreferenceEnum.All then return player_data end
local saved_player_data = { PlayerRequired = player_data.PlayerRequired, DataCollectionPolicy = PolicyEnum[collectData] }
if collectData <= PolicyEnum.Settings then saved_player_data.PlayerSettings = player_data.PlayerSettings end
if collectData <= PolicyEnum.Tracking then saved_player_data.PlayerTracking = player_data.PlayerTracking end
local saved_player_data = { PlayerRequired = player_data.PlayerRequired, DataSavingPreference = PreferenceEnum[dataPreference] }
if dataPreference <= PreferenceEnum.Settings then saved_player_data.PlayerSettings = player_data.PlayerSettings end
if dataPreference <= PreferenceEnum.Statistics then saved_player_data.PlayerStatistics = player_data.PlayerStatistics end
return saved_player_data
end)
--- Display your data preference when your data loads
DataSavingPreference:on_load(function(player_name, dataPreference)
game.players[player_name].print{'expcore-data.get-preference', dataPreference or 'All'}
end)
--- Load player data when they join
Event.add(defines.events.on_player_joined_game, function(event)
PlayerData:request(game.players[event.player_index])
@@ -55,9 +60,9 @@ end)
----- Module Return -----
return {
All = PlayerData, -- Root for all of a players data
Tracking = PlayerData:combine('PlayerTracking'), -- Common place for tracing stats
Statistics = PlayerData:combine('PlayerStatistics'), -- Common place for stats
Settings = PlayerData:combine('PlayerSettings'), -- Common place for settings
Required = PlayerData:combine('PlayerRequired'), -- Common place for required data
DataCollectionPolicy = DataCollectionPolicy, -- Stores what data groups will be saved
PolicyEnum = PolicyEnum -- Enum for the allowed options for the data collection policy
DataSavingPreference = DataSavingPreference, -- Stores what data groups will be saved
PreferenceEnum = PreferenceEnum -- Enum for the allowed options for data saving preference
}