diff --git a/Patch104pZH/Design/Changes/v1.0/1800_daisy_cutter_explosion_effects.yaml b/Patch104pZH/Design/Changes/v1.0/1800_daisy_cutter_explosion_effects.yaml new file mode 100644 index 0000000000..4ecbc6212e --- /dev/null +++ b/Patch104pZH/Design/Changes/v1.0/1800_daisy_cutter_explosion_effects.yaml @@ -0,0 +1,23 @@ +--- +date: 2023-04-06 + +title: Improves particle and sound effect sequence of USA Daisy Cutter explosion + +changes: + - fix: Removes the 250 ms delay baked into the USA Daisy Cutter explosion audio effect. + - fix: Adds smooth fade out to the USA Daisy Cutter explosion audio effect. + - fix: Syncs the ignition particles of the USA Daisy Cutter with the ignition sound. + - fix: Syncs the explosion effects of the USA Daisy Cutter with the explosion sound. + +labels: + - audio + - enhancement + - minor + - usa + - v1.0 + +links: + - https://github.com/TheSuperHackers/GeneralsGamePatch/pull/1800 + +authors: + - xezon diff --git a/Patch104pZH/GameFilesEdited/Data/INI/FXList.ini b/Patch104pZH/GameFilesEdited/Data/INI/FXList.ini index 22d70dc422..e2f2c0faaa 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/FXList.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/FXList.ini @@ -4437,11 +4437,7 @@ FXList FX_DaisyCutterIgnite End ParticleSystem Name = DaisyExplosionScatterIgnite2 - InitialDelay = 500 500 UNIFORM - End - ParticleSystem - Name = DaisyFlameShockwave - InitialDelay = 1000 1000 UNIFORM + InitialDelay = 120 120 UNIFORM ; Patch104p @fix From 500 500 to sync effect better with the upcoming explosion. End Sound Name = DaisyCutterIgnite @@ -4452,6 +4448,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 +4521,7 @@ End ; ---------------------------------------------------------------------------- ; MOAB gas ignition sequence ; ---------------------------------------------------------------------------- -FXList FX_MOABIgnite +FXList FX_MOABIgnite ; unused ParticleSystem Name = DaisyExplosionScatterIgnite1 End @@ -4542,7 +4541,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 index 8961a286bb..549e338c3e 100644 --- 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/ObjectCreationList.ini b/Patch104pZH/GameFilesEdited/Data/INI/ObjectCreationList.ini index bac2593627..0ad006f3d8 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/ObjectCreationList.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/ObjectCreationList.ini @@ -8533,7 +8533,7 @@ End ; The MOAB bomb blows up and releases these objects to continue ; the "weapon bomb" process ; ----------------------------------------------------------------------------- -ObjectCreationList OCL_MOABExplode +ObjectCreationList OCL_MOABExplode ; unused ; This daisy cutter gas is the actual object that does the damage CreateObject diff --git a/Patch104pZH/GameFilesEdited/Data/INI/ParticleSystem.ini b/Patch104pZH/GameFilesEdited/Data/INI/ParticleSystem.ini index 8c6205b728..07a5d2e6d7 100644 --- a/Patch104pZH/GameFilesEdited/Data/INI/ParticleSystem.ini +++ b/Patch104pZH/GameFilesEdited/Data/INI/ParticleSystem.ini @@ -42261,11 +42261,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