From 4e5b1aaf7eed746de1897f4bdba39df5c9a72b5d Mon Sep 17 00:00:00 2001 From: bgkillas Date: Sat, 9 Nov 2024 21:50:25 -0500 Subject: [PATCH] ignore notplayer from bosses attacks~ --- .../entities/animals/boss_alchemist/create_wand.lua | 12 +++++++----- quant.ew/data/entities/animals/boss_pit/wand.lua | 12 +++++++----- .../data/entities/animals/boss_pit/wand_rotate.lua | 12 +++++++----- .../data/entities/animals/boss_robot/spell_eater.lua | 12 +++++++----- quant.ew/data/entities/animals/boss_robot/state.lua | 12 +++++++----- .../entities/animals/boss_spirit/create_wand.lua | 12 +++++++----- 6 files changed, 42 insertions(+), 30 deletions(-) diff --git a/quant.ew/data/entities/animals/boss_alchemist/create_wand.lua b/quant.ew/data/entities/animals/boss_alchemist/create_wand.lua index fe4656ce..50b73320 100644 --- a/quant.ew/data/entities/animals/boss_alchemist/create_wand.lua +++ b/quant.ew/data/entities/animals/boss_alchemist/create_wand.lua @@ -21,11 +21,13 @@ local targets = EntityGetInRadiusWithTag( x, y, radius, "ew_peer" ) local closest local v for _, player in ipairs(targets) do - local px, py = EntityGetTransform(player) - local r = px * px + py * py - if closest == nil or r < closest then - closest = r - v = player + if not EntityHasTag(player, "ew_notplayer") then + local px, py = EntityGetTransform(player) + local r = px * px + py * py + if closest == nil or r < closest then + closest = r + v = player + end end end diff --git a/quant.ew/data/entities/animals/boss_pit/wand.lua b/quant.ew/data/entities/animals/boss_pit/wand.lua index 2bb7e95c..4610cec5 100644 --- a/quant.ew/data/entities/animals/boss_pit/wand.lua +++ b/quant.ew/data/entities/animals/boss_pit/wand.lua @@ -7,11 +7,13 @@ local p = EntityGetWithTag( "ew_peer" ) local closest local v for _, player in ipairs(p) do - local px, py = EntityGetTransform(player) - local r = px * px + py * py - if closest == nil or r < closest then - closest = r - v = player + if not EntityHasTag(player, "ew_notplayer") then + local px, py = EntityGetTransform(player) + local r = px * px + py * py + if closest == nil or r < closest then + closest = r + v = player + end end end local comps = EntityGetComponent( entity_id, "VariableStorageComponent" ) diff --git a/quant.ew/data/entities/animals/boss_pit/wand_rotate.lua b/quant.ew/data/entities/animals/boss_pit/wand_rotate.lua index c2510f1b..8745a291 100644 --- a/quant.ew/data/entities/animals/boss_pit/wand_rotate.lua +++ b/quant.ew/data/entities/animals/boss_pit/wand_rotate.lua @@ -8,11 +8,13 @@ local players = EntityGetWithTag("ew_peer") local closest local dir = 0 for _, player in ipairs(players) do - local px, py = EntityGetTransform(player) - local r = px * px + py * py - if closest == nil or r < closest then - closest = r - dir = math.atan2(py - y, px - x) + if not EntityHasTag(player, "ew_notplayer") then + local px, py = EntityGetTransform(player) + local r = px * px + py * py + if closest == nil or r < closest then + closest = r + dir = math.atan2(py - y, px - x) + end end end diff --git a/quant.ew/data/entities/animals/boss_robot/spell_eater.lua b/quant.ew/data/entities/animals/boss_robot/spell_eater.lua index 7b332791..a72dabff 100644 --- a/quant.ew/data/entities/animals/boss_robot/spell_eater.lua +++ b/quant.ew/data/entities/animals/boss_robot/spell_eater.lua @@ -13,11 +13,13 @@ local players = EntityGetWithTag("ew_peer") local closest local player_id for _, player in ipairs(players) do - local px, py = EntityGetTransform(player) - local r = px * px + py * py - if closest == nil or r < closest then - closest = r - player_id = player + if not EntityHasTag(player, "ew_notplayer") then + local px, py = EntityGetTransform(player) + local r = px * px + py * py + if closest == nil or r < closest then + closest = r + player_id = player + end end end diff --git a/quant.ew/data/entities/animals/boss_robot/state.lua b/quant.ew/data/entities/animals/boss_robot/state.lua index e9557c0f..5d921bc9 100644 --- a/quant.ew/data/entities/animals/boss_robot/state.lua +++ b/quant.ew/data/entities/animals/boss_robot/state.lua @@ -52,11 +52,13 @@ if ( varcomp ~= nil ) and ( eatercomp ~= nil ) then local closest local p for _, player in ipairs(players) do - local px, py = EntityGetTransform(player) - local r = px * px + py * py - if closest == nil or r < closest then - closest = r - p = player + if not EntityHasTag(player, "ew_notplayer") then + local px, py = EntityGetTransform(player) + local r = px * px + py * py + if closest == nil or r < closest then + closest = r + p = player + end end end diff --git a/quant.ew/data/entities/animals/boss_spirit/create_wand.lua b/quant.ew/data/entities/animals/boss_spirit/create_wand.lua index fe4656ce..50b73320 100644 --- a/quant.ew/data/entities/animals/boss_spirit/create_wand.lua +++ b/quant.ew/data/entities/animals/boss_spirit/create_wand.lua @@ -21,11 +21,13 @@ local targets = EntityGetInRadiusWithTag( x, y, radius, "ew_peer" ) local closest local v for _, player in ipairs(targets) do - local px, py = EntityGetTransform(player) - local r = px * px + py * py - if closest == nil or r < closest then - closest = r - v = player + if not EntityHasTag(player, "ew_notplayer") then + local px, py = EntityGetTransform(player) + local r = px * px + py * py + if closest == nil or r < closest then + closest = r + v = player + end end end