mirror of
https://github.com/ComfyFactory/ComfyFactorio.git
synced 2025-03-17 20:58:13 +02:00
corpse_util got replaced
This commit is contained in:
parent
c6c259ad18
commit
491d0b89a4
@ -7,7 +7,6 @@ server_commands = require 'utils.server'
|
||||
require "utils.server_commands"
|
||||
require "utils.utils"
|
||||
require "utils.table"
|
||||
--require "utils.corpse_util" --disable for hunger games
|
||||
require "utils.color_data"
|
||||
require "utils.session_data"
|
||||
require "chatbot"
|
||||
|
@ -1,110 +0,0 @@
|
||||
local Event = require 'utils.event'
|
||||
local Global = require 'utils.global'
|
||||
local Task = require 'utils.task'
|
||||
local Game = require 'utils.game'
|
||||
local Token = require 'utils.token'
|
||||
|
||||
local player_corpses = {}
|
||||
|
||||
Global.register(
|
||||
player_corpses,
|
||||
function(tbl)
|
||||
player_corpses = tbl
|
||||
end
|
||||
)
|
||||
|
||||
local function player_died(event)
|
||||
local player_index = event.player_index
|
||||
local player = Game.get_player_by_index(player_index)
|
||||
|
||||
if not player or not player.valid then
|
||||
return
|
||||
end
|
||||
|
||||
local pos = player.position
|
||||
local entities =
|
||||
player.surface.find_entities_filtered {
|
||||
area = {{pos.x - 0.5, pos.y - 0.5}, {pos.x + 0.5, pos.y + 0.5}},
|
||||
name = 'character-corpse'
|
||||
}
|
||||
|
||||
local tick = game.tick
|
||||
local entity
|
||||
for _, e in ipairs(entities) do
|
||||
if e.character_corpse_player_index == event.player_index and e.character_corpse_tick_of_death == tick then
|
||||
entity = e
|
||||
break
|
||||
end
|
||||
end
|
||||
|
||||
if not entity or not entity.valid then
|
||||
return
|
||||
end
|
||||
|
||||
local text = player.name .. "'s corpse"
|
||||
local position = entity.position
|
||||
local tag =
|
||||
player.force.add_chart_tag(
|
||||
player.surface,
|
||||
{icon = {type = 'item', name = 'power-armor-mk2'}, position = position, text = text}
|
||||
)
|
||||
|
||||
if not tag then
|
||||
return
|
||||
end
|
||||
|
||||
player_corpses[player_index * 0x100000000 + tick] = tag
|
||||
end
|
||||
|
||||
local function remove_tag(player_index, tick)
|
||||
local index = player_index * 0x100000000 + tick
|
||||
|
||||
local tag = player_corpses[index]
|
||||
player_corpses[index] = nil
|
||||
|
||||
if not tag or not tag.valid then
|
||||
return
|
||||
end
|
||||
|
||||
tag.destroy()
|
||||
end
|
||||
|
||||
local function corpse_expired(event)
|
||||
local entity = event.corpse
|
||||
|
||||
if entity and entity.valid then
|
||||
remove_tag(entity.character_corpse_player_index, entity.character_corpse_tick_of_death)
|
||||
end
|
||||
end
|
||||
|
||||
local corpse_util_mined_entity =
|
||||
Token.register(
|
||||
function(data)
|
||||
if not data.entity.valid then
|
||||
remove_tag(data.player_index, data.tick)
|
||||
end
|
||||
end
|
||||
)
|
||||
|
||||
local function mined_entity(event)
|
||||
local entity = event.entity
|
||||
|
||||
if not entity or not entity.valid or entity.name ~= 'character-corpse' then
|
||||
return
|
||||
end
|
||||
-- The corpse may be mined but not removed (if player doesn't have inventory space)
|
||||
-- so we wait one tick to see if the corpse is gone.
|
||||
Task.set_timeout_in_ticks(
|
||||
1,
|
||||
corpse_util_mined_entity,
|
||||
{
|
||||
entity = entity,
|
||||
player_index = entity.character_corpse_player_index,
|
||||
tick = entity.character_corpse_tick_of_death
|
||||
}
|
||||
)
|
||||
end
|
||||
|
||||
Event.add(defines.events.on_player_died, player_died)
|
||||
Event.add(defines.events.on_character_corpse_expired, corpse_expired)
|
||||
Event.add(defines.events.on_pre_player_mined_item, mined_entity)
|
Loading…
x
Reference in New Issue
Block a user