Stowage/noita_entangled_worlds
2
0
Fork 0
mirror of https://github.com/IntQuant/noita_entangled_worlds.git synced 2025-10-19 07:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

use less data for enemy wand sync

Browse source
This commit is contained in:
bgkillas 2024-08-29 07:29:48 -04:00
parent 8c4188e46d
commit c941a7e126
2 changed files with 55 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

43
quant.ew/files/system/enemy_sync.lua
View file

@ -39,6 +39,8 @@ local PhysDataNoMotion = util.make_type({
u8 = {"r"}
})
local wands = {}
local enemy_sync = {}
local dead_entities = {}
@ -235,16 +237,22 @@ function enemy_sync.host_upload_entities()
}
end
local wand
local has_wand = false
local inv = EntityGetFirstComponentIncludingDisabled(enemy_id, "Inventory2Component")
if inv ~= nil then
local item = ComponentGetValue2(inv, "mActualActiveItem")
if item ~= nil and EntityGetIsAlive(item) then
wand = inventory_helper.serialize_single_item(item)
if wands[enemy_id] == nil then
wands[enemy_id] = inventory_helper.serialize_single_item(item)
end
has_wand = true
end
end
if not has_wand and wands[enemy_id] ~= nil then
table.remove(wands, enemy_id)
end
table.insert(enemy_data_list, {filename, en_data, not_ephemerial, phys_info, phys_info_2, wand})
table.insert(enemy_data_list, {filename, en_data, not_ephemerial, phys_info, phys_info_2, has_wand})
::continue::
end
@ -376,10 +384,25 @@ function rpc.handle_death_data(death_data)
end
EntityKill(enemy_id)
end
if wands[remote_id] ~= nil then
table.remove(wands, remote_id)
end
::continue::
end
end
function rpc.send_wand(peer_id, remote_enemy_id, wand)
if ctx.my_id == peer_id and wand ~= nil then
wands[remote_enemy_id] = wand
end
end
function rpc.request_wand(peer_id, remote_enemy_id)
if ctx.my_id == ctx.host_id then
rpc.send_wand(peer_id, remote_enemy_id, wands[remote_enemy_id])
end
end
function rpc.handle_enemy_data(enemy_data)
for _, enemy_info_raw in ipairs(enemy_data) do
local filename = enemy_info_raw[1]
@ -399,7 +422,7 @@ function rpc.handle_enemy_data(enemy_data)
local not_ephemerial = enemy_info_raw[3]
local phys_infos = enemy_info_raw[4]
local phys_infos_2 = enemy_info_raw[5]
local wand_data = enemy_info_raw[6]
local has_wand = enemy_info_raw[6]
local has_died = filename == nil
local frame = GameGetFrameNum()
@ -501,8 +524,9 @@ function rpc.handle_enemy_data(enemy_data)
if inv ~= nil then
item = ComponentGetValue2(inv, "mActualActiveItem")
end
if wand_data ~= nil and item == nil then
local wand = inventory_helper.deserialize_single_item(wand_data)
if has_wand and item == nil then
if wands[remote_enemy_id] ~= nil then
local wand = inventory_helper.deserialize_single_item(wands[remote_enemy_id])
EntityAddTag(wand, "ew_client_item")
local found = false
for _, child in pairs(EntityGetAllChildren(enemy_id)) do
@ -522,13 +546,18 @@ function rpc.handle_enemy_data(enemy_data)
EntitySetComponentsWithTagEnabled(wand, "enabled_in_hand", true)
EntitySetComponentsWithTagEnabled(wand, "enabled_in_inventory", false)
np.SetActiveHeldEntity(enemy_id, wand, false, false)
else
rpc.request_wand(ctx.my_id, remote_enemy_id)
end
end
if not has_wand and wands[remote_enemy_id] ~= nil then
table.remove(wands, remote_enemy_id)
end
::continue::
end
end
function rpc.handle_enemy_health(enemy_health_data)
for _, en_data in ipairs(enemy_health_data) do
local remote_enemy_id = en_data.enemy_id

4
quant.ew/files/system/player/unmodified_base.xml
View file

@ -589,10 +589,10 @@
in_world="1">
</BossHealthBarComponent>
<Entity name="chunk_loader">
<!-- <Entity name="chunk_loader">
<Base file="mods/quant.ew/files/resource/entities/chunk_loader.xml">
</Base>
</Entity>
</Entity>-->
<Entity name="cursor">
<SpriteComponent