From 3fc2671d6dcdfec524bdbb35572f3a4a5935969d Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Wed, 24 Apr 2024 23:06:36 -0700 Subject: [PATCH 1/3] Fix Czar beam end/start point effects being swapped --- lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua b/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua index a49fddb1ff..474f108f10 100644 --- a/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua +++ b/lua/sim/collisionBeams/QuantumBeamGeneratorCollisionBeam.lua @@ -10,9 +10,9 @@ QuantumBeamGeneratorCollisionBeam = Class(SCCollisionBeam) { TerrainImpactType = 'LargeBeam02', TerrainImpactScale = 1, + FxBeamStartPoint = EffectTemplate.AQuantumBeamGeneratorMuzzleFlash01, FxBeam = EffectTemplate.AQuantumBeamGeneratorBeam, - FxBeamEndPoint = EffectTemplate.AQuantumBeamGeneratorMuzzleFlash01, - FxBeamStartPoint = EffectTemplate.AQuantumBeamGeneratorHit01, + FxBeamEndPoint = EffectTemplate.AQuantumBeamGeneratorHit01, SplatTexture = 'czar_mark01_albedo', ScorchSplatDropTime = 0.5, From 116bb7fd505d992bc4f4c8856956ebfd11367646 Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Wed, 24 Apr 2024 23:33:21 -0700 Subject: [PATCH 2/3] Fix swapped end/startpoint fx for novax beam --- lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua b/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua index 344dce2117..9a5d8cd548 100644 --- a/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua +++ b/lua/sim/collisionBeams/OrbitalDeathLaserCollisionBeam.lua @@ -10,9 +10,9 @@ OrbitalDeathLaserCollisionBeam = Class(SCCollisionBeam) { TerrainImpactType = 'LargeBeam02', TerrainImpactScale = 1, + FxBeamStartPoint = EffectTemplate.TOrbitalDeathLaserMuzzleFlash01, FxBeam = EffectTemplate.TOrbitalDeathLaserBeam, - FxBeamEndPoint = EffectTemplate.TOrbitalDeathLaserMuzzleFlash01, - FxBeamStartPoint = EffectTemplate.TOrbitalDeathLaserHit01, + FxBeamEndPoint = EffectTemplate.TOrbitalDeathLaserHit01, SplatTexture = 'czar_mark01_albedo', ScorchSplatDropTime = 0.5, From 5b699ec12920dd6a054568e09c0f085ca46a6311 Mon Sep 17 00:00:00 2001 From: lL1l1 <82986251+lL1l1@users.noreply.github.com> Date: Wed, 24 Apr 2024 23:36:02 -0700 Subject: [PATCH 3/3] Update 3810.md --- changelog/3810.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/3810.md b/changelog/3810.md index 81a4a17d7c..693a2e08d3 100644 --- a/changelog/3810.md +++ b/changelog/3810.md @@ -100,7 +100,7 @@ - (#5668, #6066) Rework Seraphim weapon modules -- (#6065) Refactor collision beam modules +- (#6065, #6116) Refactor collision beam modules - (#6067) Fix a performance issue related to AIs and their transport logic