Fix: Saboteur Body Disappears From Destroyed Combat Bike (#171)

TheSuperHackers · Sep 3, 2021 · e6f45f7 · e6f45f7
1 parent ba6ca91
commit e6f45f7
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/Patch104pZH/Design/Tasks/commy2_tasks.txt b/Patch104pZH/Design/Tasks/commy2_tasks.txt
@@ -158,7 +158,7 @@ https://github.com/commy2/zerohour/issues/60  [DONE][NPROJECT]        Destroyed
 https://github.com/commy2/zerohour/issues/59  [IMPROVEMENT]           Air Force General Name Misspelling
 https://github.com/commy2/zerohour/issues/58  [IMPROVEMENT]           Some Combat Bikes Missing DoorOpenTime Entry
 https://github.com/commy2/zerohour/issues/57  [IMPROVEMENT]           Broken Combat Bike Animations
-https://github.com/commy2/zerohour/issues/56  [IMPROVEMENT]           Saboteur Body Disappears From Destroyed Combat Bike
+https://github.com/commy2/zerohour/issues/56  [DONE]                  Saboteur Body Disappears From Destroyed Combat Bike
 https://github.com/commy2/zerohour/issues/55  [DONE]                  Vanilla GLA Combat Bike Has Duplicated Death Scream
 https://github.com/commy2/zerohour/issues/54  [IMPROVEMENT]           Vanilla GLA Hijacker And Saboteur Can Ride Toxin Generals Combat Bike
 https://github.com/commy2/zerohour/issues/53  [MAYBE]                 Veteran Quad Cannons Deal Less Damage When Scrapped

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini b/Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
@@ -17791,6 +17791,17 @@ Object Demo_GLAVehicleCombatBike
     OCL = FINAL OCL_CombatBikeAirDeathStart
   End
 
+  ; Patch104p @bugfix commy2 03/09/2021 Fix missing death type for this rider slot.
+
+  Behavior = SlowDeathBehavior DeathTag_11
+    RequiredStatus = STATUS_RIDER7
+    DeathTypes = ALL -CRUSHED -SPLATTED -TOPPLED
+    DestructionDelay = 0
+    FX = INITIAL FX_DEMOBuggyNewDeathExplosion
+    OCL = INITIAL OCL_SaboteurFlyingOffBikeDeathStart
+    OCL = FINAL OCL_CombatBikeAirDeathStart
+  End
+
   Behavior = AutoHealBehavior ModuleTag_08
     HealingAmount = 2
     HealingDelay = 1000 ; msec

diff --git a/Patch104pZH/GameFilesEdited/Data/INI/ObjectCreationList.ini b/Patch104pZH/GameFilesEdited/Data/INI/ObjectCreationList.ini
@@ -3587,6 +3587,36 @@ ObjectCreationList OCL_HijackerFlyingOffBikeDeathStart
   End
 End
 
+; Patch104p @bugfix commy2 03/09/2021 Added missing effect for Saboteur ejected from destroyed Combat Bike.
+
+; ----------------------------------------------------------------------------
+ObjectCreationList OCL_SaboteurFlyingOffBikeDeathStart
+  ApplyRandomForce
+    MinForceMagnitude = 60
+    MaxForceMagnitude = 100
+    MinForcePitch = 70
+    MaxForcePitch = 90
+    SpinRate = 120
+  End
+  CreateDebris
+    ModelNames = UISabotr_SKN
+    AnimationSet = UIWRKR_SKL.UIWRKR_ADTE1 UIWRKR_SKL.UIWRKR_ADTE2 UIWRKR_SKL.UIWRKR_ADTE3
+    FXFinal = FX_TechnicalGunnerHitsGround
+    OkToChangeModelColor = Yes
+    IgnorePrimaryObstacle = Yes
+    Mass = 5.0
+    Disposition = RANDOM_FORCE INHERIT_VELOCITY
+    OrientInForceDirection = Yes
+    ExtraBounciness = -1.0 ; we don't want this guy to bounce at all.
+    ; no, we don't want less friction; it makes the guy look like he is sliding on ice. (srj)
+    ;ExtraFriction = -3  ; reduce his ground friction a bit  (friction/sec)
+    MinForceMagnitude = 12
+    MaxForceMagnitude = 15
+    MinForcePitch = 70
+    MaxForcePitch = 80
+  End
+End
+
 
 ; ----------------------------------------------------------------------------
 ; GLA Terrorist Suicide-bomber Death (the high version)