diff --git a/plugins/inventory_sync/instance.js b/plugins/inventory_sync/instance.js index e3a40c5d..450eba69 100644 --- a/plugins/inventory_sync/instance.js +++ b/plugins/inventory_sync/instance.js @@ -47,7 +47,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin { for (let i = 0; i < chunks.length; i++) { // this.logger.verbose(`Sending chunk ${i+1} of ${chunks.length}`) await this.sendRcon(`/sc inventory_sync.download_inventory('${response.player_name}',` + - `'${libLuaTools.escapeString(chunks[i])}', ${i + 1}, ${chunks.length})`, true); + `'${libLuaTools.escapeString(chunks[i])}', ${i + 1}, ${chunks.length})`); } } } diff --git a/plugins/inventory_sync/module/define_player_stat_keys.lua b/plugins/inventory_sync/module/define_player_stat_keys.lua new file mode 100644 index 00000000..026c5a88 --- /dev/null +++ b/plugins/inventory_sync/module/define_player_stat_keys.lua @@ -0,0 +1,23 @@ +return { + "character_crafting_speed_modifier", + "character_mining_speed_modifier", + "character_additional_mining_categories", + "character_running_speed_modifier", + "character_build_distance_bonus", + "character_item_drop_distance_bonus", + "character_reach_distance_bonus", + "character_resource_reach_distance_bonus", + "character_item_pickup_distance_bonus", + "character_loot_pickup_distance_bonus", + "character_inventory_slots_bonus", + "character_trash_slot_count_bonus", + "character_maximum_following_robot_count_bonus", + "character_health_bonus", + "character_personal_logistic_requests_enabled", + "build_distance", + "drop_item_distance", + "reach_distance", + "item_pickup_distance", + "loot_pickup_distance", + "resource_reach_distance", +} diff --git a/plugins/inventory_sync/module/download_inventory.lua b/plugins/inventory_sync/module/download_inventory.lua index 09bfc31f..310126b8 100644 --- a/plugins/inventory_sync/module/download_inventory.lua +++ b/plugins/inventory_sync/module/download_inventory.lua @@ -3,6 +3,7 @@ local serialize = require("modules/clusterio/serialize") local load_crafting_queue = require("modules/inventory_sync/load_crafting_queue") local inventories = require("modules/inventory_sync/define_player_inventories") local ensure_character = require("modules/inventory_sync/ensure_character") +local player_stat_keys = require("modules/inventory_sync/define_player_stat_keys") function download_inventory(player_name, data, number, total) local player = game.get_player(player_name) @@ -74,21 +75,10 @@ function download_inventory(player_name, data, number, total) player.color = serialized_player.color player.chat_color = serialized_player.chat_color - character.character_crafting_speed_modifier = serialized_player.character_crafting_speed_modifier - character.character_mining_speed_modifier = serialized_player.character_mining_speed_modifier - character.character_additional_mining_categories = serialized_player.character_additional_mining_categories - character.character_running_speed_modifier = serialized_player.character_running_speed_modifier - character.character_build_distance_bonus = serialized_player.character_build_distance_bonus - character.character_item_drop_distance_bonus = serialized_player.character_item_drop_distance_bonus - character.character_reach_distance_bonus = serialized_player.character_reach_distance_bonus - character.character_resource_reach_distance_bonus = serialized_player.character_resource_reach_distance_bonus - character.character_item_pickup_distance_bonus = serialized_player.character_item_pickup_distance_bonus - character.character_loot_pickup_distance_bonus = serialized_player.character_loot_pickup_distance_bonus - character.character_inventory_slots_bonus = serialized_player.character_inventory_slots_bonus - character.character_trash_slot_count_bonus = serialized_player.character_trash_slot_count_bonus - character.character_maximum_following_robot_count_bonus = serialized_player.character_maximum_following_robot_count_bonus - character.character_health_bonus = serialized_player.character_health_bonus - character.character_personal_logistic_requests_enabled = serialized_player.character_personal_logistic_requests_enabled + -- Player stats + for _,v in pairs(player_stat_keys) do + character[v] = serialized_player[v] + end if serialized_player.flashlight then player.enable_flashlight() diff --git a/plugins/inventory_sync/module/ensure_character.lua b/plugins/inventory_sync/module/ensure_character.lua index 50ea74b6..464fbe11 100644 --- a/plugins/inventory_sync/module/ensure_character.lua +++ b/plugins/inventory_sync/module/ensure_character.lua @@ -1,8 +1,5 @@ local function ensure_character(player) if player.character == nil then - log("Character define:") - log(player.controller_type) - log(serpent.block(defines.controllers)) player.set_controller { type = defines.controllers.god, } diff --git a/plugins/inventory_sync/module/upload_inventory.lua b/plugins/inventory_sync/module/upload_inventory.lua index c0deb814..60476ac9 100644 --- a/plugins/inventory_sync/module/upload_inventory.lua +++ b/plugins/inventory_sync/module/upload_inventory.lua @@ -3,6 +3,7 @@ local serialize = require("modules/clusterio/serialize") local inventories = require("modules/inventory_sync/define_player_inventories") local save_crafts = require("modules/inventory_sync/save_crafts") local ensure_character = require("modules/inventory_sync/ensure_character") +local player_stat_keys = require("modules/inventory_sync/define_player_stat_keys") function upload_inventory(playerIndex) local player = game.get_player(playerIndex) @@ -21,25 +22,14 @@ function upload_inventory(playerIndex) personal_logistic_slots = {}, force = player.force.name, cheat_mode = player.cheat_mode, - character_crafting_speed_modifier = player.character_crafting_speed_modifier, - character_mining_speed_modifier = player.character_mining_speed_modifier, - character_additional_mining_categories = player.character_additional_mining_categories, - character_running_speed_modifier = player.character_running_speed_modifier, - character_build_distance_bonus = player.character_build_distance_bonus, - character_item_drop_distance_bonus = player.character_item_drop_distance_bonus, - character_reach_distance_bonus = player.character_reach_distance_bonus, - character_resource_reach_distance_bonus = player.character_resource_reach_distance_bonus, - character_item_pickup_distance_bonus = player.character_item_pickup_distance_bonus, - character_loot_pickup_distance_bonus = player.character_loot_pickup_distance_bonus, - character_inventory_slots_bonus = player.character_inventory_slots_bonus, - character_trash_slot_count_bonus = player.character_trash_slot_count_bonus, - character_maximum_following_robot_count_bonus = player.character_maximum_following_robot_count_bonus, - character_health_bonus = player.character_health_bonus, - character_personal_logistic_requests_enabled = player.character_personal_logistic_requests_enabled, - flashlight = player.is_flashlight_enabled(), } + -- Transfer player stats + for _,v in pairs(player_stat_keys) do + serialized_player[v] = player[v] + end + -- Serialize hotbar for i = 1, 100 do serialized_player.hotbar[i] = {}