From 1890c6cc558ba0fdc6f4a58956345972eafc8185 Mon Sep 17 00:00:00 2001 From: Lightningbulb2 Date: Sun, 5 Jul 2026 18:51:47 -0400 Subject: [PATCH 1/4] fix acu teleport damage not aligning with blueprint --- lua/EffectUtilities.lua | 8 ++++---- units/UAL0001/UAL0001_unit.bp | 2 +- units/UEL0001/UEL0001_unit.bp | 2 +- units/URL0001/URL0001_unit.bp | 2 +- units/XSL0001/XSL0001_unit.bp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lua/EffectUtilities.lua b/lua/EffectUtilities.lua index cea1c5dd849..5d62eb284f5 100644 --- a/lua/EffectUtilities.lua +++ b/lua/EffectUtilities.lua @@ -1380,7 +1380,7 @@ function PlayTeleportInEffects(unit, effectsBag) local fn = function(unit) CreateLightParticle(unit, -1, unitArmy, 4, 10, 'glow_03', 'ramp_yellow_01') - DamageArea(unit, unit:GetPosition(), 9, 1, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 0.000000001, 'Force', true) unit.TeleportFx_IsInvisible = true unit:HideBone(0, true) @@ -1407,7 +1407,7 @@ function PlayTeleportInEffects(unit, effectsBag) end CreateLightParticle(unit.TeleportCybranSphere, -1, unitArmy, 4, 10, 'glow_02', 'ramp_white_01') - DamageArea(unit, unit:GetPosition(), 9, 1, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 0.000000001, 'Force', true) CreateDecal(unit:GetPosition(), decalOrient, 'Scorch_generic_002_albedo', '', 'Albedo', 7, 7, 200, 300, unitArmy) @@ -1444,7 +1444,7 @@ function PlayTeleportInEffects(unit, effectsBag) end CreateLightParticle(unit, -1, unitArmy, 4, 15, 'glow_05', 'ramp_jammer_01') - DamageArea(unit, unit:GetPosition(), 9, 1, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 0.000000001, 'Force', true) local decalOrient = UtilGetRandomFloat(0, mathTau) CreateDecal(unit:GetPosition(), decalOrient, 'crater01_albedo', '', 'Albedo', 4, 4, 200, 300, unitArmy) @@ -1472,7 +1472,7 @@ function PlayTeleportInEffects(unit, effectsBag) IEffectOffsetEmitter(CreateEmitterAtEntity(unit, unitArmy, effect), 0, offsetY, 0) end - DamageArea(unit, unit:GetPosition(), 9, 1, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 0.000000001, 'Force', true) CreateDecal(unit:GetPosition(), decalOrient, 'Scorch_generic_002_albedo', '', 'Albedo', 7, 7, 200, 300, unitArmy) CreateTeleSteamFX(unit) end diff --git a/units/UAL0001/UAL0001_unit.bp b/units/UAL0001/UAL0001_unit.bp index fcdb22407df..aa82ceedb30 100644 --- a/units/UAL0001/UAL0001_unit.bp +++ b/units/UAL0001/UAL0001_unit.bp @@ -1040,7 +1040,7 @@ UnitBlueprint{ WeaponCategory = "Death", }, { - Damage = 100, + Damage = 101, DamageFriendly = true, DamageRadius = 4, DamageType = "Normal", diff --git a/units/UEL0001/UEL0001_unit.bp b/units/UEL0001/UEL0001_unit.bp index de119eae81d..b337fa22b75 100644 --- a/units/UEL0001/UEL0001_unit.bp +++ b/units/UEL0001/UEL0001_unit.bp @@ -1099,7 +1099,7 @@ UnitBlueprint{ WeaponCategory = "Death", }, { - Damage = 100, + Damage = 101, DamageFriendly = true, DamageRadius = 4, DamageType = "Normal", diff --git a/units/URL0001/URL0001_unit.bp b/units/URL0001/URL0001_unit.bp index 40b2d837964..a8cf0913354 100644 --- a/units/URL0001/URL0001_unit.bp +++ b/units/URL0001/URL0001_unit.bp @@ -1071,7 +1071,7 @@ UnitBlueprint{ WeaponCategory = "Anti Navy", }, { - Damage = 100, + Damage = 101, DamageFriendly = true, DamageRadius = 4, DamageType = "Normal", diff --git a/units/XSL0001/XSL0001_unit.bp b/units/XSL0001/XSL0001_unit.bp index bd283ecc5d6..10651460b4a 100644 --- a/units/XSL0001/XSL0001_unit.bp +++ b/units/XSL0001/XSL0001_unit.bp @@ -1028,7 +1028,7 @@ UnitBlueprint{ WeaponUnpacks = true, }, { - Damage = 100, + Damage = 101, DamageFriendly = true, DamageRadius = 4, DamageType = "Normal", From dea8f3353a4d01fd42eaa7cc6d7c8eee28b044df Mon Sep 17 00:00:00 2001 From: Lightningbulb2 Date: Sun, 5 Jul 2026 19:03:29 -0400 Subject: [PATCH 2/4] make values not stupid small --- lua/EffectUtilities.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/EffectUtilities.lua b/lua/EffectUtilities.lua index 5d62eb284f5..1395593b3b0 100644 --- a/lua/EffectUtilities.lua +++ b/lua/EffectUtilities.lua @@ -1380,7 +1380,7 @@ function PlayTeleportInEffects(unit, effectsBag) local fn = function(unit) CreateLightParticle(unit, -1, unitArmy, 4, 10, 'glow_03', 'ramp_yellow_01') - DamageArea(unit, unit:GetPosition(), 9, 0.000000001, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 0.001, 'Force', true) unit.TeleportFx_IsInvisible = true unit:HideBone(0, true) @@ -1407,7 +1407,7 @@ function PlayTeleportInEffects(unit, effectsBag) end CreateLightParticle(unit.TeleportCybranSphere, -1, unitArmy, 4, 10, 'glow_02', 'ramp_white_01') - DamageArea(unit, unit:GetPosition(), 9, 0.000000001, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 0.001, 'Force', true) CreateDecal(unit:GetPosition(), decalOrient, 'Scorch_generic_002_albedo', '', 'Albedo', 7, 7, 200, 300, unitArmy) @@ -1444,7 +1444,7 @@ function PlayTeleportInEffects(unit, effectsBag) end CreateLightParticle(unit, -1, unitArmy, 4, 15, 'glow_05', 'ramp_jammer_01') - DamageArea(unit, unit:GetPosition(), 9, 0.000000001, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 0.001, 'Force', true) local decalOrient = UtilGetRandomFloat(0, mathTau) CreateDecal(unit:GetPosition(), decalOrient, 'crater01_albedo', '', 'Albedo', 4, 4, 200, 300, unitArmy) @@ -1472,7 +1472,7 @@ function PlayTeleportInEffects(unit, effectsBag) IEffectOffsetEmitter(CreateEmitterAtEntity(unit, unitArmy, effect), 0, offsetY, 0) end - DamageArea(unit, unit:GetPosition(), 9, 0.000000001, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 0.001, 'Force', true) CreateDecal(unit:GetPosition(), decalOrient, 'Scorch_generic_002_albedo', '', 'Albedo', 7, 7, 200, 300, unitArmy) CreateTeleSteamFX(unit) end From 733b32dc67d6a1188972c84aa977c18960d0b0b7 Mon Sep 17 00:00:00 2001 From: Lightningbulb2 Date: Wed, 8 Jul 2026 17:10:45 -0400 Subject: [PATCH 3/4] swap teleport damage to 'TreeForce' to prevent extra troop damage --- lua/EffectUtilities.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/EffectUtilities.lua b/lua/EffectUtilities.lua index 1395593b3b0..6d96b9be7bf 100644 --- a/lua/EffectUtilities.lua +++ b/lua/EffectUtilities.lua @@ -1380,7 +1380,7 @@ function PlayTeleportInEffects(unit, effectsBag) local fn = function(unit) CreateLightParticle(unit, -1, unitArmy, 4, 10, 'glow_03', 'ramp_yellow_01') - DamageArea(unit, unit:GetPosition(), 9, 0.001, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 1, 'TreeForce', true) unit.TeleportFx_IsInvisible = true unit:HideBone(0, true) @@ -1407,7 +1407,7 @@ function PlayTeleportInEffects(unit, effectsBag) end CreateLightParticle(unit.TeleportCybranSphere, -1, unitArmy, 4, 10, 'glow_02', 'ramp_white_01') - DamageArea(unit, unit:GetPosition(), 9, 0.001, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 1, 'TreeForce', true) CreateDecal(unit:GetPosition(), decalOrient, 'Scorch_generic_002_albedo', '', 'Albedo', 7, 7, 200, 300, unitArmy) @@ -1444,7 +1444,7 @@ function PlayTeleportInEffects(unit, effectsBag) end CreateLightParticle(unit, -1, unitArmy, 4, 15, 'glow_05', 'ramp_jammer_01') - DamageArea(unit, unit:GetPosition(), 9, 0.001, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 1, 'TreeForce', true) local decalOrient = UtilGetRandomFloat(0, mathTau) CreateDecal(unit:GetPosition(), decalOrient, 'crater01_albedo', '', 'Albedo', 4, 4, 200, 300, unitArmy) @@ -1472,7 +1472,7 @@ function PlayTeleportInEffects(unit, effectsBag) IEffectOffsetEmitter(CreateEmitterAtEntity(unit, unitArmy, effect), 0, offsetY, 0) end - DamageArea(unit, unit:GetPosition(), 9, 0.001, 'Force', true) + DamageArea(unit, unit:GetPosition(), 9, 1, 'TreeForce', true) CreateDecal(unit:GetPosition(), decalOrient, 'Scorch_generic_002_albedo', '', 'Albedo', 7, 7, 200, 300, unitArmy) CreateTeleSteamFX(unit) end From c822cd130bd5eaad1443ab41b376dc3a1ad4a543 Mon Sep 17 00:00:00 2001 From: Lightningbulb2 Date: Wed, 8 Jul 2026 17:15:24 -0400 Subject: [PATCH 4/4] revert +1 damage to commander teleport made out of spite xD --- units/UAL0001/UAL0001_unit.bp | 2 +- units/UEL0001/UEL0001_unit.bp | 2 +- units/URL0001/URL0001_unit.bp | 2 +- units/XSL0001/XSL0001_unit.bp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/units/UAL0001/UAL0001_unit.bp b/units/UAL0001/UAL0001_unit.bp index aa82ceedb30..fcdb22407df 100644 --- a/units/UAL0001/UAL0001_unit.bp +++ b/units/UAL0001/UAL0001_unit.bp @@ -1040,7 +1040,7 @@ UnitBlueprint{ WeaponCategory = "Death", }, { - Damage = 101, + Damage = 100, DamageFriendly = true, DamageRadius = 4, DamageType = "Normal", diff --git a/units/UEL0001/UEL0001_unit.bp b/units/UEL0001/UEL0001_unit.bp index b337fa22b75..de119eae81d 100644 --- a/units/UEL0001/UEL0001_unit.bp +++ b/units/UEL0001/UEL0001_unit.bp @@ -1099,7 +1099,7 @@ UnitBlueprint{ WeaponCategory = "Death", }, { - Damage = 101, + Damage = 100, DamageFriendly = true, DamageRadius = 4, DamageType = "Normal", diff --git a/units/URL0001/URL0001_unit.bp b/units/URL0001/URL0001_unit.bp index a8cf0913354..40b2d837964 100644 --- a/units/URL0001/URL0001_unit.bp +++ b/units/URL0001/URL0001_unit.bp @@ -1071,7 +1071,7 @@ UnitBlueprint{ WeaponCategory = "Anti Navy", }, { - Damage = 101, + Damage = 100, DamageFriendly = true, DamageRadius = 4, DamageType = "Normal", diff --git a/units/XSL0001/XSL0001_unit.bp b/units/XSL0001/XSL0001_unit.bp index 10651460b4a..bd283ecc5d6 100644 --- a/units/XSL0001/XSL0001_unit.bp +++ b/units/XSL0001/XSL0001_unit.bp @@ -1028,7 +1028,7 @@ UnitBlueprint{ WeaponUnpacks = true, }, { - Damage = 101, + Damage = 100, DamageFriendly = true, DamageRadius = 4, DamageType = "Normal",