Fix: Improve timing of Daisy Cutter ignition and explosion particles

TheSuperHackers · Apr 10, 2023 · 77f5c10 · 77f5c10
1 parent 35250a5
commit 77f5c10
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/Patch104pZH/GameFilesEdited/Data/INI/FXList.ini b/Patch104pZH/GameFilesEdited/Data/INI/FXList.ini
@@ -4434,14 +4434,11 @@ End
 FXList FX_DaisyCutterIgnite
   ParticleSystem
     Name         = DaisyExplosionScatterIgnite1
+    InitialDelay = 50 50 UNIFORM ; Patch104p @tweak Adds small delay.
   End
   ParticleSystem
     Name         = DaisyExplosionScatterIgnite2
-    InitialDelay = 500 500 UNIFORM
-  End
-  ParticleSystem
-    Name         = DaisyFlameShockwave
-    InitialDelay = 1000 1000 UNIFORM
+    InitialDelay = 170 170 UNIFORM ; Patch104p @fix From 500 500 to sync effect better with the upcoming explosion.
   End
   Sound
     Name = DaisyCutterIgnite
@@ -4452,6 +4449,9 @@ End
 ; DaisyCutter final explosion wave
 ; ----------------------------------------------------------------------------
 FXList FX_DaisyCutterFinalExplosion
+  ParticleSystem ; Patch104p @tweak Moves this effect here from FX_DaisyCutterIgnite.
+    Name = DaisyFlameShockwave
+  End
   Sound
     Name = ExplosionDaisyCutter
   End
@@ -4522,7 +4522,7 @@ End
 ; ----------------------------------------------------------------------------
 ; MOAB gas ignition sequence
 ; ----------------------------------------------------------------------------
-FXList FX_MOABIgnite
+FXList FX_MOABIgnite ; unused
   ParticleSystem
     Name         = DaisyExplosionScatterIgnite1
   End
@@ -4542,7 +4542,7 @@ End
 ; ----------------------------------------------------------------------------
 ; MOAB final explosion wave
 ; ----------------------------------------------------------------------------
-FXList FX_MOABFinalExplosion
+FXList FX_MOABFinalExplosion ; unused
   Sound
     Name = ExplosionDaisyCutter
   End

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/WeaponObjects.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/WeaponObjects.ini
@@ -87,7 +87,7 @@ Object MOAB
 End
 
 ;------------------------------------------------------------------------------
-Object MOABGas
+Object MOABGas ; unused
 
   ; *** ART Parameters ***
 ;  Draw = W3DModelDraw

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/ParticleSystem.ini b/Patch104pZH/GameFilesEdited/Data/INI/ParticleSystem.ini
@@ -42203,11 +42203,11 @@ ParticleSystem DaisyExplosionScatterIgnite1
   Alpha6 = 0.00 0.00 0
   Alpha7 = 0.00 0.00 0
   Alpha8 = 0.00 0.00 0
-  Color1 = R:0 G:0 B:0 0
-  Color2 = R:0 G:0 B:0 12
-  Color3 = R:211 G:248 B:67 14
-  Color4 = R:255 G:218 B:106 17
-  Color5 = R:0 G:0 B:0 26
+  Color1 = R:0 G:0 B:0 0 ; Patch104p @tweak From 12 to show the ignition much earlier.
+  Color2 = R:211 G:248 B:67 5 ; Patch104p @tweak From 14 to fade in sooner.
+  Color3 = R:255 G:218 B:106 17
+  Color4 = R:0 G:0 B:0 26
+  Color5 = R:0 G:0 B:0 0
   Color6 = R:0 G:0 B:0 0
   Color7 = R:0 G:0 B:0 0
   Color8 = R:0 G:0 B:0 0
@@ -44110,7 +44110,7 @@ ParticleSystem DaisyFlameShockwave
   VelOutward = 20.00 20.00
   VelOutwardOther = 0.00 0.00
   VolumeType = CYLINDER
-  VolCylinderRadius = 20.00
+  VolCylinderRadius = 50.00 ; Patch104p @tweak from 20.00 to begin the fire ring at a more reasonable diameter.
   VolCylinderLength = 0.00
   IsHollow = Yes
   IsGroundAligned = No