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

fuck the performance, im syncing fish, also syncing rotation for all which prob only concerns fish <3, also syncing and enabling cordyceps

Browse source
This commit is contained in:
bgkillas 2024-10-15 17:55:56 -04:00
parent 77c4faeced
commit edda7cd5f9
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,13 +11,13 @@ local rpc = net.new_rpc_namespace()
local EnemyData = util.make_type({ local EnemyData = util.make_type({
u32 = {"enemy_id"}, u32 = {"enemy_id"},
f32 = {"x", "y", "vx", "vy"}, f32 = {"x", "y", "vx", "vy", "rot"},
}) })
-- Variant of EnemyData for when we don't have any motion (or no VelocityComponent). -- Variant of EnemyData for when we don't have any motion (or no VelocityComponent).
local EnemyDataNoMotion = util.make_type({ local EnemyDataNoMotion = util.make_type({
u32 = {"enemy_id"}, u32 = {"enemy_id"},
f32 = {"x", "y"} f32 = {"x", "y", "rot"}
}) })
local HpData = util.make_type({ local HpData = util.make_type({
@ -142,6 +142,8 @@ local function get_sync_entities(return_all)
table_extend(entities, EntityGetWithTag("ew_enemy_sync_extra")) table_extend(entities, EntityGetWithTag("ew_enemy_sync_extra"))
table_extend(entities, EntityGetWithTag("mimic_potion")) table_extend(entities, EntityGetWithTag("mimic_potion"))
table_extend(entities, EntityGetWithTag("plague_rat")) table_extend(entities, EntityGetWithTag("plague_rat"))
table_extend(entities, EntityGetWithTag("perk_fungus_tiny"))
table_extend(entities, EntityGetWithTag("helpless_animal"))
table_extend_filtered(entities, EntityGetWithTag("prop_physics"), function (ent) table_extend_filtered(entities, EntityGetWithTag("prop_physics"), function (ent)
return constants.phys_sync_allowed[EntityGetFilename(ent)] return constants.phys_sync_allowed[EntityGetFilename(ent)]
end) end)
@ -172,7 +174,7 @@ function enemy_sync.host_upload_entities()
local filename = EntityGetFilename(enemy_id) local filename = EntityGetFilename(enemy_id)
filename = constants.interned_filename_to_index[filename] or filename filename = constants.interned_filename_to_index[filename] or filename
local x, y = EntityGetTransform(enemy_id) local x, y, rot = EntityGetTransform(enemy_id)
local character_data = EntityGetFirstComponentIncludingDisabled(enemy_id, "VelocityComponent") local character_data = EntityGetFirstComponentIncludingDisabled(enemy_id, "VelocityComponent")
local vx, vy = 0, 0 local vx, vy = 0, 0
if character_data ~= nil then if character_data ~= nil then
@ -239,6 +241,7 @@ function enemy_sync.host_upload_entities()
enemy_id = enemy_id, enemy_id = enemy_id,
x = x, x = x,
y = y, y = y,
rot = rot,
} }
else else
en_data= EnemyData { en_data= EnemyData {
@ -247,6 +250,7 @@ function enemy_sync.host_upload_entities()
y = y, y = y,
vx = vx, vx = vx,
vy = vy, vy = vy,
rot = rot,
} }
end end
@ -379,6 +383,7 @@ local function sync_enemy(enemy_info_raw, force_no_cull)
local dont_cull = enemy_info_raw[9] local dont_cull = enemy_info_raw[9]
local remote_enemy_id = en_data.enemy_id local remote_enemy_id = en_data.enemy_id
local x, y = en_data.x, en_data.y local x, y = en_data.x, en_data.y
local rot = en_data.rot
if not force_no_cull and not dont_cull then if not force_no_cull and not dont_cull then
local my_x, my_y = EntityGetTransform(ctx.my_player.entity) local my_x, my_y = EntityGetTransform(ctx.my_player.entity)
if my_x == nil then if my_x == nil then
@ -457,7 +462,7 @@ local function sync_enemy(enemy_info_raw, force_no_cull)
if damage_component and damage_component ~= 0 then if damage_component and damage_component ~= 0 then
ComponentSetValue2(damage_component, "wait_for_kill_flag_on_death", true) ComponentSetValue2(damage_component, "wait_for_kill_flag_on_death", true)
end end
for _, name in ipairs({"AnimalAIComponent", "PhysicsAIComponent", "CameraBoundComponent"}) do for _, name in ipairs({"AnimalAIComponent", "PhysicsAIComponent", "CameraBoundComponent", "AdvancedFishAIComponent", "AIAttackComponent"}) do
local ai_component = EntityGetFirstComponentIncludingDisabled(enemy_id, name) local ai_component = EntityGetFirstComponentIncludingDisabled(enemy_id, name)
if ai_component ~= 0 then if ai_component ~= 0 then
EntityRemoveComponent(enemy_id, ai_component) EntityRemoveComponent(enemy_id, ai_component)
@ -522,7 +527,7 @@ local function sync_enemy(enemy_info_raw, force_no_cull)
if velocity_data ~= nil then if velocity_data ~= nil then
ComponentSetValue2(velocity_data, "mVelocity", vx, vy) ComponentSetValue2(velocity_data, "mVelocity", vx, vy)
end end
EntitySetTransform(enemy_id, x, y) EntitySetTransform(enemy_id, x, y, rot)
end end
local inv = EntityGetFirstComponentIncludingDisabled(enemy_id, "Inventory2Component") local inv = EntityGetFirstComponentIncludingDisabled(enemy_id, "Inventory2Component")

1
quant.ew/files/system/perk_patches/append/perks_common.lua
View file

@ -13,7 +13,6 @@ end
hide_perk("ABILITY_ACTIONS_MATERIALIZED") hide_perk("ABILITY_ACTIONS_MATERIALIZED")
hide_perk("TELEKINESIS") hide_perk("TELEKINESIS")
hide_perk("CORDYCEPS")
hide_perk("HOMUNCULUS") hide_perk("HOMUNCULUS")
hide_perk("REVENGE_EXPLOSION") hide_perk("REVENGE_EXPLOSION")
hide_perk("EXTRA_SHOP_ITEM") hide_perk("EXTRA_SHOP_ITEM")