From 94713b24e713581340914c107d9dd93413872ce9 Mon Sep 17 00:00:00 2001 From: clyf Date: Sun, 12 May 2024 12:29:33 -0400 Subject: [PATCH] Fix Miasma shield penetration (#6163) Co-authored-by: Josh --- .../projectiles/aeon/AMiasmaProjectile.lua | 3 +++ .../AIFMiasmaShell01/AIFMiasmaShell01_proj.bp | 1 - .../AIFMiasmaShell01_script.lua | 27 +------------------ 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/lua/sim/projectiles/aeon/AMiasmaProjectile.lua b/lua/sim/projectiles/aeon/AMiasmaProjectile.lua index d9b880ed6b..2100393ebd 100644 --- a/lua/sim/projectiles/aeon/AMiasmaProjectile.lua +++ b/lua/sim/projectiles/aeon/AMiasmaProjectile.lua @@ -28,4 +28,7 @@ local EmitterProjectile = import("/lua/sim/defaultprojectiles.lua").EmitterProje AMiasmaProjectile = ClassProjectile(EmitterProjectile) { FxTrails = EffectTemplate.AMiasmaMunition01, FxImpactNone = EffectTemplate.AMiasma01, + FxImpactLand = EffectTemplate.AMiasmaField01, + FxImpactUnit = EffectTemplate.AMiasmaField01, + FxImpactProp = EffectTemplate.AMiasmaField01, } diff --git a/projectiles/AIFMiasmaShell01/AIFMiasmaShell01_proj.bp b/projectiles/AIFMiasmaShell01/AIFMiasmaShell01_proj.bp index a141c8c382..6d5ec6d66f 100644 --- a/projectiles/AIFMiasmaShell01/AIFMiasmaShell01_proj.bp +++ b/projectiles/AIFMiasmaShell01/AIFMiasmaShell01_proj.bp @@ -46,7 +46,6 @@ ProjectileBlueprint { }, Physics = { DestroyOnWater = true, - DetonateBelowHeight = 2, LeadTarget = false, StayUpright = false, VelocityAlign = false, diff --git a/projectiles/AIFMiasmaShell01/AIFMiasmaShell01_script.lua b/projectiles/AIFMiasmaShell01/AIFMiasmaShell01_script.lua index 1f2ede1188..76abfd2fee 100644 --- a/projectiles/AIFMiasmaShell01/AIFMiasmaShell01_script.lua +++ b/projectiles/AIFMiasmaShell01/AIFMiasmaShell01_script.lua @@ -3,30 +3,5 @@ local utilities = import("/lua/utilities.lua") --- Aeon T2 Artillery Projectile : uab2303 ---@class AIFMiasmaShell01 : AMiasmaProjectile -AIFMiasmaShell01 = ClassProjectile(AMiasmaProjectile) { - - ---@param self AIFMiasmaShell01 - ---@param targetType string - ---@param targetEntity Prop|Unit - OnImpact = function(self, targetType, targetEntity) - local bp = self.Blueprint.Audio - local snd = bp['Impact'.. targetType] - - if snd then - self:PlaySound(snd) - -- Generic Impact Sound - elseif bp.Impact then - self:PlaySound(bp.Impact) - end - - self:CreateImpactEffects( self.Army, self.FxImpactNone, self.FxNoneHitScale ) - local x,y,z = self:GetVelocity() - local speed = utilities.GetVectorLength(Vector(x*10,y*10,z*10)) - - -- One initial projectile following same directional path as the original - self:CreateChildProjectile('/projectiles/AIFMiasmaShell02/AIFMiasmaShell02_proj.bp') - :SetVelocity(x,y,z):SetVelocity(speed).DamageData = self.DamageData - self:Destroy() - end, -} +AIFMiasmaShell01 = ClassProjectile(AMiasmaProjectile) {} TypeClass = AIFMiasmaShell01 \ No newline at end of file