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

fix spectate in notplayer, dont give notplayer more blood or revive

Browse source
This commit is contained in:
bgkillas 2024-08-26 09:56:42 -04:00
parent 16bc21332e
commit e945433f77
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
quant.ew/files/system/local_health/local_health.lua
View file

@ -75,14 +75,16 @@ local function allow_notplayer_perk(perk_id)
GAMBLE = true, GAMBLE = true,
PERKS_LOTTERY = true, PERKS_LOTTERY = true,
MEGA_BEAM_STONE = true, MEGA_BEAM_STONE = true,
FOOD_CLOCK = true, -- TODO, should carry over satiation buff
TELEPORTITIS = true, -- TODO: teleports to 0,0
TELEPORTITIS_DODGE = true,
ALWAYS_CAST = true, ALWAYS_CAST = true,
EXTRA_SLOTS = true, EXTRA_SLOTS = true,
EXTRA_PERK = true, EXTRA_PERK = true,
FASTER_WANDS = true, FASTER_WANDS = true,
EXTRA_MANA = true, EXTRA_MANA = true,
GLOBAL_GORE = true,
RESPAWN = true,
FOOD_CLOCK = true, -- TODO, should carry over satiation buff
TELEPORTITIS = true, -- TODO: teleports to 0,0
TELEPORTITIS_DODGE = true,
} }
return not ignored_perks[perk_id] return not ignored_perks[perk_id]
end end

10
quant.ew/files/system/spectate/spectate.lua
View file

@ -13,20 +13,20 @@ local function set_camera_pos()
local i = 0 local i = 0
local cam_target local cam_target
for peer_id, potential_target in pairs(ctx.players) do for peer_id, potential_target in pairs(ctx.players) do
local entity = potential_target.entity
i = i + 1 i = i + 1
if i == camera_player or (i == -1 and peer_id == ctx.my_id) then if i == camera_player or (camera_player == -1 and peer_id == ctx.my_id) then
cam_target = entity cam_target = potential_target.entity
camera_player = i camera_player = i
break
end end
end end
if camera_player == 1000 then if camera_player == 1000 then
camera_player = i camera_player = i
set_camera_pos() set_camera_pos()
elseif i ~= 0 and i < camera_player then elseif cam_target == nil then
camera_player = 1 camera_player = 1
set_camera_pos() set_camera_pos()
elseif cam_target ~= nil then else
if cam_target == ctx.my_player.entity and not EntityHasTag(ctx.my_player.entity, "ew_notplayer") then if cam_target == ctx.my_player.entity and not EntityHasTag(ctx.my_player.entity, "ew_notplayer") then
GameSetCameraFree(false) GameSetCameraFree(false)
if camera_target == nil then if camera_target == nil then