mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-16 15:30:41 +09:00
Cleanup, sync more player properties
This commit is contained in:
1 parent
37052e1f68
commit
4027a4f310
5 files changed
+35
-35
No files matched your search
@@ -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})`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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",
|
||||
}
|
||||
@@ -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()
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
|
||||
@@ -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] = {}
|
||||
|
||||
Reference in new issue
Block a user