fixed shield collision for piercing

ChronoVortex · Jun 29, 2023 · 49c3bbe · 49c3bbe
1 parent b4451ae
commit 49c3bbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/data/vertex_module/tags/particleEmitters.lua b/data/vertex_module/tags/particleEmitters.lua
@@ -79,8 +79,12 @@ local function logic()
     script.on_internal_event(Defines.InternalEvents.PROJECTILE_COLLISION, function(thisProjectile, otherProjectile, damage, response)
         emitter_explosion(thisProjectile)
     end)
-    script.on_internal_event(Defines.InternalEvents.SHIELD_COLLISION, function(ship, projectile, damage, response)
-        emitter_explosion(projectile)
+    script.on_internal_event(Defines.InternalEvents.SHIELD_COLLISION_PRE, function(ship, projectile, damage, response)
+        local shieldPower = nil
+        pcall(function() shieldPower = ship.shieldSystem.shields.power end)
+        if not shieldPower or shieldPower.super.first > 0 or shieldPower.first > damage.iShieldPiercing then
+            emitter_explosion(projectile)
+        end
     end)
     script.on_internal_event(Defines.InternalEvents.DAMAGE_AREA_HIT, function(ship, projectile, damage, response)
         emitter_explosion(projectile)

diff --git a/mod-appendix/metadata.xml b/mod-appendix/metadata.xml
@@ -2,7 +2,7 @@
     <title><![CDATA[ Vertex Tags and Utility Functions ]]></title>
     <threadUrl><![CDATA[ https://github.com/ChronoVortex/FTL-HS-Vertex ]]></threadUrl>
     <author><![CDATA[ Vertaalfout, Chrono Vortex ]]></author>
-    <version><![CDATA[ 3.1 ]]></version>
+    <version><![CDATA[ 3.2 ]]></version>
     <description>
 <![CDATA[
 This mod has no content, instead adding new tags and LUA utility functions for other mods to build off of.