Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change: Optimize China Nuke Missile blast delays: Hits max 880 ms earlier #880

Merged
merged 1 commit into from
Aug 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions Patch104pZH/GameFilesEdited/Data/INI/FXList.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3901,7 +3901,6 @@ FXList WeaponFX_CINEConvoyNuke
ParticleSystem
Name = NukeBlastWave
InitialDelay = 300 300 UNIFORM ;In milliseconds
;Offset = X:0.0 Y:0.0 Z:45.0
Offset = X:0.0 Y:0.0 Z:15.0
End

Expand Down Expand Up @@ -4801,13 +4800,13 @@ FXList FX_Nuke

ParticleSystem
Name = NukeRing
InitialDelay = 200 200 UNIFORM ; Patch104p @tweak from 0 0 UNIFORM to match new blast delays visually (red ring)
Offset = X:0.0 Y:0.0 Z:5.0
End

ParticleSystem
Name = NukeBlastWave
InitialDelay = 300 300 UNIFORM ;In milliseconds
;Offset = X:0.0 Y:0.0 Z:45.0
InitialDelay = 0 0 UNIFORM ; Patch104p @tweak from 300 300 UNIFORM to match new blast delays visually (white ring)
Offset = X:0.0 Y:0.0 Z:15.0
End

Expand Down Expand Up @@ -4874,13 +4873,13 @@ FXList FX_BaikonurNuke

ParticleSystem
Name = NukeBaikonurRing
InitialDelay = 200 200 UNIFORM ; Patch104p @tweak from 0 0 UNIFORM to match new blast delays visually (red ring)
Offset = X:0.0 Y:0.0 Z:5.0
End

ParticleSystem
Name = NukeBlastWave
InitialDelay = 300 300 UNIFORM ;In milliseconds
;Offset = X:0.0 Y:0.0 Z:45.0
InitialDelay = 0 0 UNIFORM ; Patch104p @tweak from 300 300 UNIFORM to match new blast delays visually (white ring)
Offset = X:0.0 Y:0.0 Z:15.0
End

Expand Down Expand Up @@ -8569,13 +8568,13 @@ FXList SupW_FX_Nuke

ParticleSystem
Name = NukeRing
InitialDelay = 200 200 UNIFORM ; Patch104p @tweak from 0 0 UNIFORM to match new blast delays visually (red ring)
Offset = X:0.0 Y:0.0 Z:5.0
End

ParticleSystem
Name = NukeBlastWave
InitialDelay = 300 300 UNIFORM ;In milliseconds
;Offset = X:0.0 Y:0.0 Z:45.0
InitialDelay = 0 0 UNIFORM ; Patch104p @tweak from 300 300 UNIFORM to match new blast delays visually (white ring)
Offset = X:0.0 Y:0.0 Z:15.0
End

Expand Down
19 changes: 10 additions & 9 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,15 @@ Object SupW_NeutronMissile

; Patch104p @balance 05/09/2021 Change Nuke Missiles such that they destroy GLA holes.
; Patch104p @balance 13/08/2022 Increase Nuke Missile damage by 20% and outer blast radii by 2%, 3.3%, 4%, 4.4%, 4.7%, 20%.
; Patch104p @tweak 13/08/2022 Reduce blast delays by around 400 ms with fixed 80 ms step size. First explosion triggers 880 ms earlier than original.

Behavior = NeutronMissileSlowDeathBehavior ModuleTag_06
DestructionDelay = 3501
ScorchMarkSize = 320
FXList = SupW_FX_Nuke

Blast1Enabled = Yes
Blast1Delay = 580 ;in milliseconds
Blast1Delay = 300 ;in milliseconds
Blast1ScorchDelay = 100 ;in milliseconds
Blast1InnerRadius = 60.0 ;objects inside this get the full damage
Blast1OuterRadius = 92.0 ;objects inside this get some of the full damage
Expand All @@ -339,7 +340,7 @@ Object SupW_NeutronMissile
Blast1PushForce = 10.0 ;higher #'s push more

Blast2Enabled = Yes
Blast2Delay = 660 ;in milliseconds
Blast2Delay = 380 ;in milliseconds
Blast2ScorchDelay = 180 ;in milliseconds
Blast2InnerRadius = 92.0 ;objects inside this get the full damage
Blast2OuterRadius = 124.0 ;objects inside this get some of the full damage
Expand All @@ -349,7 +350,7 @@ Object SupW_NeutronMissile
Blast2PushForce = 8.0 ;higher #'s push more

Blast3Enabled = Yes
Blast3Delay = 720 ;in milliseconds
Blast3Delay = 460 ;in milliseconds
Blast3ScorchDelay = 260 ;in milliseconds
Blast3InnerRadius = 124.0 ;objects inside this get the full damage
Blast3OuterRadius = 156.0 ;objects inside this get some of the full damage
Expand All @@ -359,7 +360,7 @@ Object SupW_NeutronMissile
Blast3PushForce = 6.0 ;higher #'s push more

Blast4Enabled = Yes
Blast4Delay = 850 ;in milliseconds
Blast4Delay = 540 ;in milliseconds
Blast4ScorchDelay = 340 ;in milliseconds
Blast4InnerRadius = 156.0 ;objects inside this get the full damage
Blast4OuterRadius = 188.0 ;objects inside this get some of the full damage
Expand All @@ -369,7 +370,7 @@ Object SupW_NeutronMissile
Blast4PushForce = 6.0 ;higher #'s push more

Blast5Enabled = Yes
Blast5Delay = 1000 ;in milliseconds
Blast5Delay = 620 ;in milliseconds
Blast5ScorchDelay = 420 ;in milliseconds
Blast5InnerRadius = 188.0 ;objects inside this get the full damage
Blast5OuterRadius = 220.0 ;objects inside this get some of the full damage
Expand All @@ -379,7 +380,7 @@ Object SupW_NeutronMissile
Blast5PushForce = 6.0 ;higher #'s push more

Blast6Enabled = Yes
Blast6Delay = 1180 ;in milliseconds
Blast6Delay = 700 ;in milliseconds
Blast6ScorchDelay = 500 ;in milliseconds
Blast6InnerRadius = 220.0 ;objects inside this get the full damage
Blast6OuterRadius = 252.0 ;objects inside this get some of the full damage
Expand All @@ -388,17 +389,17 @@ Object SupW_NeutronMissile
Blast6ToppleSpeed = 0.35 ;higher #'s topple faster
Blast6PushForce = 4.0 ;higher #'s push more

Blast7Enabled = Yes
Blast7Enabled = No
Blast7Delay = 999999 ;in milliseconds, don't do the damage wave
Blast7ScorchDelay = 620 ;in milliseconds
Blast7OuterRadius = 210.0 ;objects inside this get some of the full damage

Blast8Enabled = Yes
Blast8Enabled = No
Blast8Delay = 999999 ;in milliseconds, don't do the damage wave
Blast8ScorchDelay = 700 ;in milliseconds
Blast8OuterRadius = 210.0 ;objects inside this get some of the full damage

Blast9Enabled = Yes
Blast9Enabled = No
Blast9Delay = 999999 ;in milliseconds, don't do the damage wave
Blast9ScorchDelay = 800 ;in milliseconds
Blast9OuterRadius = 210.0 ;objects inside this get some of the full damage
Expand Down
19 changes: 10 additions & 9 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/System.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2695,14 +2695,15 @@ Object BaikonurRocketDetonation

; Patch104p @balance 05/09/2021 Change Nuke Missiles such that they destroy GLA holes.
; Patch104p @balance 13/08/2022 Increase Nuke Missile damage by 20% and outer blast radii by 2%, 3.3%, 4%, 4.4%, 4.7%, 20%.
; Patch104p @tweak 13/08/2022 Reduce blast delays by around 400 ms with fixed 80 ms step size. First explosion triggers 880 ms earlier than original.

Behavior = NeutronMissileSlowDeathBehavior ModuleTag_08
DestructionDelay = 3501
ScorchMarkSize = 320
FXList = FX_BaikonurNuke

Blast1Enabled = Yes
Blast1Delay = 580 ;in milliseconds
Blast1Delay = 300 ;in milliseconds
Blast1ScorchDelay = 100 ;in milliseconds
Blast1InnerRadius = 60.0 ;objects inside this get the full damage
Blast1OuterRadius = 92.0 ;objects inside this get some of the full damage
Expand All @@ -2712,7 +2713,7 @@ Object BaikonurRocketDetonation
Blast1PushForce = 10.0 ;higher #'s push more

Blast2Enabled = Yes
Blast2Delay = 660 ;in milliseconds
Blast2Delay = 380 ;in milliseconds
Blast2ScorchDelay = 180 ;in milliseconds
Blast2InnerRadius = 92.0 ;objects inside this get the full damage
Blast2OuterRadius = 124.0 ;objects inside this get some of the full damage
Expand All @@ -2722,7 +2723,7 @@ Object BaikonurRocketDetonation
Blast2PushForce = 8.0 ;higher #'s push more

Blast3Enabled = Yes
Blast3Delay = 720 ;in milliseconds
Blast3Delay = 460 ;in milliseconds
Blast3ScorchDelay = 260 ;in milliseconds
Blast3InnerRadius = 124.0 ;objects inside this get the full damage
Blast3OuterRadius = 156.0 ;objects inside this get some of the full damage
Expand All @@ -2732,7 +2733,7 @@ Object BaikonurRocketDetonation
Blast3PushForce = 6.0 ;higher #'s push more

Blast4Enabled = Yes
Blast4Delay = 850 ;in milliseconds
Blast4Delay = 540 ;in milliseconds
Blast4ScorchDelay = 340 ;in milliseconds
Blast4InnerRadius = 156.0 ;objects inside this get the full damage
Blast4OuterRadius = 188.0 ;objects inside this get some of the full damage
Expand All @@ -2742,7 +2743,7 @@ Object BaikonurRocketDetonation
Blast4PushForce = 6.0 ;higher #'s push more

Blast5Enabled = Yes
Blast5Delay = 1000 ;in milliseconds
Blast5Delay = 620 ;in milliseconds
Blast5ScorchDelay = 420 ;in milliseconds
Blast5InnerRadius = 188.0 ;objects inside this get the full damage
Blast5OuterRadius = 220.0 ;objects inside this get some of the full damage
Expand All @@ -2752,7 +2753,7 @@ Object BaikonurRocketDetonation
Blast5PushForce = 6.0 ;higher #'s push more

Blast6Enabled = Yes
Blast6Delay = 1180 ;in milliseconds
Blast6Delay = 700 ;in milliseconds
Blast6ScorchDelay = 500 ;in milliseconds
Blast6InnerRadius = 220.0 ;objects inside this get the full damage
Blast6OuterRadius = 252.0 ;objects inside this get some of the full damage
Expand All @@ -2761,17 +2762,17 @@ Object BaikonurRocketDetonation
Blast6ToppleSpeed = 0.35 ;higher #'s topple faster
Blast6PushForce = 4.0 ;higher #'s push more

Blast7Enabled = Yes
Blast7Enabled = No
Blast7Delay = 999999 ;in milliseconds, don't do the damage wave
Blast7ScorchDelay = 620 ;in milliseconds
Blast7OuterRadius = 210.0 ;objects inside this get some of the full damage

Blast8Enabled = Yes
Blast8Enabled = No
Blast8Delay = 999999 ;in milliseconds, don't do the damage wave
Blast8ScorchDelay = 700 ;in milliseconds
Blast8OuterRadius = 210.0 ;objects inside this get some of the full damage

Blast9Enabled = Yes
Blast9Enabled = No
Blast9Delay = 999999 ;in milliseconds, don't do the damage wave
Blast9ScorchDelay = 800 ;in milliseconds
Blast9OuterRadius = 210.0 ;objects inside this get some of the full damage
Expand Down
40 changes: 21 additions & 19 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/WeaponObjects.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1833,7 +1833,7 @@ Object DaisyCutterGas
End

;------------------------------------------------------------------------------
Object NeutronMissile
Object NeutronMissile ; This one is used by the China Nuke Missiles

; *** ART Parameters ***
Draw = W3DModelDraw ModuleTag_01
Expand Down Expand Up @@ -1908,14 +1908,15 @@ Object NeutronMissile

; Patch104p @balance 05/09/2021 Change Nuke Missiles such that they destroy GLA holes.
; Patch104p @balance 13/08/2022 Increase Nuke Missile damage by 20% and outer blast radii by 2%, 3.3%, 4%, 4.4%, 4.7%, 20%.
; Patch104p @tweak 13/08/2022 Reduce blast delays by around 400 ms with fixed 80 ms step size. First explosion triggers 880 ms earlier than original.

Behavior = NeutronMissileSlowDeathBehavior ModuleTag_06
DestructionDelay = 3501
ScorchMarkSize = 320
FXList = FX_Nuke

Blast1Enabled = Yes
Blast1Delay = 580 ;in milliseconds
Blast1Delay = 300 ;in milliseconds
Blast1ScorchDelay = 100 ;in milliseconds
Blast1InnerRadius = 60.0 ;objects inside this get the full damage
Blast1OuterRadius = 92.0 ;objects inside this get some of the full damage
Expand All @@ -1925,7 +1926,7 @@ Object NeutronMissile
Blast1PushForce = 10.0 ;higher #'s push more

Blast2Enabled = Yes
Blast2Delay = 660 ;in milliseconds
Blast2Delay = 380 ;in milliseconds
Blast2ScorchDelay = 180 ;in milliseconds
Blast2InnerRadius = 92.0 ;objects inside this get the full damage
Blast2OuterRadius = 124.0 ;objects inside this get some of the full damage
Expand All @@ -1935,7 +1936,7 @@ Object NeutronMissile
Blast2PushForce = 8.0 ;higher #'s push more

Blast3Enabled = Yes
Blast3Delay = 720 ;in milliseconds
Blast3Delay = 460 ;in milliseconds
Blast3ScorchDelay = 260 ;in milliseconds
Blast3InnerRadius = 124.0 ;objects inside this get the full damage
Blast3OuterRadius = 156.0 ;objects inside this get some of the full damage
Expand All @@ -1945,7 +1946,7 @@ Object NeutronMissile
Blast3PushForce = 6.0 ;higher #'s push more

Blast4Enabled = Yes
Blast4Delay = 850 ;in milliseconds
Blast4Delay = 540 ;in milliseconds
Blast4ScorchDelay = 340 ;in milliseconds
Blast4InnerRadius = 156.0 ;objects inside this get the full damage
Blast4OuterRadius = 188.0 ;objects inside this get some of the full damage
Expand All @@ -1955,7 +1956,7 @@ Object NeutronMissile
Blast4PushForce = 6.0 ;higher #'s push more

Blast5Enabled = Yes
Blast5Delay = 1000 ;in milliseconds
Blast5Delay = 620 ;in milliseconds
Blast5ScorchDelay = 420 ;in milliseconds
Blast5InnerRadius = 188.0 ;objects inside this get the full damage
Blast5OuterRadius = 220.0 ;objects inside this get some of the full damage
Expand All @@ -1965,7 +1966,7 @@ Object NeutronMissile
Blast5PushForce = 6.0 ;higher #'s push more

Blast6Enabled = Yes
Blast6Delay = 1180 ;in milliseconds
Blast6Delay = 700 ;in milliseconds
Blast6ScorchDelay = 500 ;in milliseconds
Blast6InnerRadius = 220.0 ;objects inside this get the full damage
Blast6OuterRadius = 252.0 ;objects inside this get some of the full damage
Expand All @@ -1974,17 +1975,17 @@ Object NeutronMissile
Blast6ToppleSpeed = 0.35 ;higher #'s topple faster
Blast6PushForce = 4.0 ;higher #'s push more

Blast7Enabled = Yes
Blast7Enabled = No
Blast7Delay = 999999 ;in milliseconds, don't do the damage wave
Blast7ScorchDelay = 620 ;in milliseconds
Blast7OuterRadius = 210.0 ;objects inside this get some of the full damage

Blast8Enabled = Yes
Blast8Enabled = No
Blast8Delay = 999999 ;in milliseconds, don't do the damage wave
Blast8ScorchDelay = 700 ;in milliseconds
Blast8OuterRadius = 210.0 ;objects inside this get some of the full damage

Blast9Enabled = Yes
Blast9Enabled = No
Blast9Delay = 999999 ;in milliseconds, don't do the damage wave
Blast9ScorchDelay = 800 ;in milliseconds
Blast9OuterRadius = 210.0 ;objects inside this get some of the full damage
Expand Down Expand Up @@ -2033,14 +2034,15 @@ Object CargoTruckNuke

; Patch104p @balance 05/09/2021 Change Nuke Missiles such that they destroy GLA holes.
; Patch104p @balance 13/08/2022 Increase Nuke Missile damage by 20% and outer blast radii by 2%, 3.3%, 4%, 4.4%, 4.7%, 20%.
; Patch104p @tweak 13/08/2022 Reduce blast delays by around 400 ms with fixed 80 ms step size. First explosion triggers 880 ms earlier than original.

Behavior = NeutronMissileSlowDeathBehavior ModuleTag_03
DestructionDelay = 3501
ScorchMarkSize = 320
FXList = FX_Nuke

Blast1Enabled = Yes
Blast1Delay = 580 ;in milliseconds
Blast1Delay = 300 ;in milliseconds
Blast1ScorchDelay = 100 ;in milliseconds
Blast1InnerRadius = 60.0 ;objects inside this get the full damage
Blast1OuterRadius = 92.0 ;objects inside this get some of the full damage
Expand All @@ -2050,7 +2052,7 @@ Object CargoTruckNuke
Blast1PushForce = 10.0 ;higher #'s push more

Blast2Enabled = Yes
Blast2Delay = 660 ;in milliseconds
Blast2Delay = 380 ;in milliseconds
Blast2ScorchDelay = 180 ;in milliseconds
Blast2InnerRadius = 92.0 ;objects inside this get the full damage
Blast2OuterRadius = 124.0 ;objects inside this get some of the full damage
Expand All @@ -2060,7 +2062,7 @@ Object CargoTruckNuke
Blast2PushForce = 8.0 ;higher #'s push more

Blast3Enabled = Yes
Blast3Delay = 720 ;in milliseconds
Blast3Delay = 460 ;in milliseconds
Blast3ScorchDelay = 260 ;in milliseconds
Blast3InnerRadius = 124.0 ;objects inside this get the full damage
Blast3OuterRadius = 156.0 ;objects inside this get some of the full damage
Expand All @@ -2070,7 +2072,7 @@ Object CargoTruckNuke
Blast3PushForce = 6.0 ;higher #'s push more

Blast4Enabled = Yes
Blast4Delay = 850 ;in milliseconds
Blast4Delay = 540 ;in milliseconds
Blast4ScorchDelay = 340 ;in milliseconds
Blast4InnerRadius = 156.0 ;objects inside this get the full damage
Blast4OuterRadius = 188.0 ;objects inside this get some of the full damage
Expand All @@ -2080,7 +2082,7 @@ Object CargoTruckNuke
Blast4PushForce = 6.0 ;higher #'s push more

Blast5Enabled = Yes
Blast5Delay = 1000 ;in milliseconds
Blast5Delay = 620 ;in milliseconds
Blast5ScorchDelay = 420 ;in milliseconds
Blast5InnerRadius = 188.0 ;objects inside this get the full damage
Blast5OuterRadius = 220.0 ;objects inside this get some of the full damage
Expand All @@ -2090,7 +2092,7 @@ Object CargoTruckNuke
Blast5PushForce = 6.0 ;higher #'s push more

Blast6Enabled = Yes
Blast6Delay = 1180 ;in milliseconds
Blast6Delay = 700 ;in milliseconds
Blast6ScorchDelay = 500 ;in milliseconds
Blast6InnerRadius = 220.0 ;objects inside this get the full damage
Blast6OuterRadius = 252.0 ;objects inside this get some of the full damage
Expand All @@ -2099,17 +2101,17 @@ Object CargoTruckNuke
Blast6ToppleSpeed = 0.35 ;higher #'s topple faster
Blast6PushForce = 4.0 ;higher #'s push more

Blast7Enabled = Yes
Blast7Enabled = No
Blast7Delay = 999999 ;in milliseconds, don't do the damage wave
Blast7ScorchDelay = 620 ;in milliseconds
Blast7OuterRadius = 210.0 ;objects inside this get some of the full damage

Blast8Enabled = Yes
Blast8Enabled = No
Blast8Delay = 999999 ;in milliseconds, don't do the damage wave
Blast8ScorchDelay = 700 ;in milliseconds
Blast8OuterRadius = 210.0 ;objects inside this get some of the full damage

Blast9Enabled = Yes
Blast9Enabled = No
Blast9Delay = 999999 ;in milliseconds, don't do the damage wave
Blast9ScorchDelay = 800 ;in milliseconds
Blast9OuterRadius = 210.0 ;objects inside this get some of the full damage
Expand Down