Cookoff - Fix wrong origin for 1 fire jet in fire ring (#10341)

Fix wrong origin for 1 fire jet in fire ring
acemod · Sep 27, 2024 · 225b9f3 · 225b9f3
1 parent 5726f8a
commit 225b9f3
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/addons/cookoff/functions/fnc_cookOffLocal.sqf b/addons/cookoff/functions/fnc_cookOffLocal.sqf
@@ -127,12 +127,13 @@ if (isServer) then {
 
     if (_ring) then {
         private _ringOrigin = (_vehicle selectionPosition _fireSelection) vectorAdd [-0.1 + random 0.2, -0.1 + random 0.2, -1];
+        private _dir = 20 * (_factor / 2);
 
         drop [
-            ["\A3\data_f\ParticleEffects\Universal\Universal",16,2,32],
+            ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
             "", "Billboard", 1, (0.1 + random 0.2) * _factor,
             _ringOrigin,
-            [0, 20 * (_factor / 2), 0],
+            [0, _dir, 0],
             0, 10, 7.9, 0.075,
             [1.25 * _factor, FLAME_SIZE * _factor],
             [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
@@ -142,7 +143,7 @@ if (isServer) then {
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
             "", "Billboard", 1, (0.1 + random 0.2) * _factor,
             _ringOrigin,
-            [0, -20 * (_factor / 2), 0],
+            [0, -_dir, 0],
             0, 10, 7.9, 0.075,
             [1.25 * _factor, FLAME_SIZE * _factor],
             [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
@@ -152,7 +153,7 @@ if (isServer) then {
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
             "", "Billboard", 1, (0.1 + random 0.2) * _factor,
             _ringOrigin,
-            [20 * (_factor / 2), 0, 0],
+            [_dir, 0, 0],
             0, 10, 7.9, 0.075,
             [1.25 * _factor, FLAME_SIZE * _factor],
             [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
@@ -161,15 +162,14 @@ if (isServer) then {
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
             "", "Billboard", 1, (0.1 + random 0.2) * _factor,
-            [-0.1 + random 0.2, -0.1 + random 0.2, -1],
-            [-20 * (_factor / 2), 0, 0],
+            _ringOrigin,
+            [-_dir, 0, 0],
             0, 10, 7.9, 0.075,
             [1.25 * _factor, FLAME_SIZE * _factor],
             [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
             [2 + random 1], 1, 0, "", "", _vehicle
         ];
 
-        private _dir = 20 * (_factor / 2);
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
             "", "Billboard", 1, (0.1 + random 0.2) * _factor,
@@ -181,21 +181,19 @@ if (isServer) then {
             [2 + random 1], 1, 0, "", "", _vehicle
         ];
 
-        _dir = -20 * (_factor / 2);
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
             "", "Billboard", 1, (0.1 + (random 0.2)) * _factor,
             _ringOrigin,
-            [_dir, _dir, 0],
+            [-_dir, -_dir, 0],
             0, 10, 7.9, 0.075,
             [1.25 * _factor, FLAME_SIZE * _factor],
             [[1, 1, 1, -2],[1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]],
             [2 + random 1], 1, 0, "", "", _vehicle
         ];
 
-        _dir = 20 * (_factor / 2);
         drop [
-            ["\A3\data_f\ParticleEffects\Universal\Universal",16,2,32],
+            ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
             "", "Billboard", 1, (0.1 + (random 0.2)) * _factor,
             _ringOrigin,
             [_dir, -_dir, 0],
@@ -205,7 +203,6 @@ if (isServer) then {
             [2 + random 1], 1, 0, "", "", _vehicle
         ];
 
-        _dir = 20 * (_factor / 2);
         drop [
             ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32],
             "", "Billboard", 1, (0.1 + random 0.2) * _factor,