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: All infantry missiles will incur crushed death on GLA Terrorists #2369

Closed
wants to merge 1 commit into from
Closed
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
4 changes: 2 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -23204,15 +23204,15 @@ Object Boss_VehicleCombatBikeTerrorist
RequiredStatus = STATUS_RIDER5
DeathWeapon = CrushedBikeBomb
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Behavior = FireWeaponWhenDeadBehavior ModuleTag_NormalDeath
RequiredStatus = STATUS_RIDER5
DeathWeapon = Demo_CombatBikeDeathWeapon
StartsActive = Yes
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -TOPPLED
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -EXTRA_8 -TOPPLED
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14145,7 +14145,7 @@ Object Chem_GLAInfantryTerrorist
Behavior = FireWeaponWhenDeadBehavior ModuleTag_CrushedDeath
DeathWeapon = CrushedDynamitePack
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
ExemptStatus = MASKED
End

Expand Down Expand Up @@ -17909,7 +17909,7 @@ Object Chem_GLAVehicleCombatBike
RequiredStatus = STATUS_RIDER5
DeathWeapon = CrushedDynamitePack
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

Behavior = FireWeaponWhenDeadBehavior ModuleTag91
Expand Down Expand Up @@ -17944,7 +17944,7 @@ Object Chem_GLAVehicleCombatBike
RequiredStatus = STATUS_RIDER5
DeathWeapon = Demo_CombatBikeDeathWeapon
StartsActive = Yes
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -TOPPLED
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -EXTRA_8 -TOPPLED
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Expand Down
14 changes: 7 additions & 7 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
Original file line number Diff line number Diff line change
Expand Up @@ -14617,7 +14617,7 @@ Object Demo_GLAInfantryTerrorist
Behavior = FireWeaponWhenDeadBehavior ModuleTag_CrushedDeath
DeathWeapon = Demo_CrushedDynamitePack
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
ExemptStatus = MASKED
End

Expand Down Expand Up @@ -19200,7 +19200,7 @@ Object Demo_GLAVehicleCombatBike
RequiredStatus = STATUS_RIDER5
DeathWeapon = CrushedBikeBomb
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
ConflictsWith = Demo_Upgrade_SuicideBomb
End

Expand All @@ -19209,7 +19209,7 @@ Object Demo_GLAVehicleCombatBike
RequiredStatus = STATUS_RIDER5
DeathWeapon = Demo_CombatBikeDeathWeapon
StartsActive = Yes
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -TOPPLED
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -EXTRA_8 -TOPPLED
ConflictsWith = Demo_Upgrade_SuicideBomb
End

Expand All @@ -19229,7 +19229,7 @@ Object Demo_GLAVehicleCombatBike
StartsActive = No
TriggeredBy = Demo_Upgrade_SuicideBomb
RequiresAllTriggers = Yes
DeathTypes = ALL -SUICIDED -CRUSHED -SPLATTED -LASERED
DeathTypes = ALL -SUICIDED -CRUSHED -SPLATTED -LASERED -EXTRA_8
End

;Non-terrorist with suicide bomb upgrade (no fire)
Expand All @@ -19250,7 +19250,7 @@ Object Demo_GLAVehicleCombatBike
StartsActive = No
TriggeredBy = Demo_Upgrade_SuicideBomb
RequiresAllTriggers = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

;Terrorist with suicide bomb upgrade (fire)
Expand All @@ -19260,7 +19260,7 @@ Object Demo_GLAVehicleCombatBike
StartsActive = No
TriggeredBy = Demo_Upgrade_SuicideBomb
RequiresAllTriggers = Yes
DeathTypes = ALL -SUICIDED -CRUSHED -SPLATTED -LASERED
DeathTypes = ALL -SUICIDED -CRUSHED -SPLATTED -LASERED -EXTRA_8
End

;Terrorist with suicide bomb upgrade (no fire)
Expand All @@ -19281,7 +19281,7 @@ Object Demo_GLAVehicleCombatBike
StartsActive = No
TriggeredBy = Demo_Upgrade_SuicideBomb
RequiresAllTriggers = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

Geometry = BOX
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4199,7 +4199,7 @@ Object GC_Chem_GLAInfantryTerrorist
Behavior = FireWeaponWhenDeadBehavior ModuleTag_CrushedDeath
DeathWeapon = CrushedDynamitePack
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
ExemptStatus = MASKED
ConflictsWith = Chem_Upgrade_GLAAnthraxGamma
End
Expand All @@ -4216,7 +4216,7 @@ Object GC_Chem_GLAInfantryTerrorist
Behavior = FireWeaponWhenDeadBehavior ModuleTag_CrushedDeath_2
DeathWeapon = CrushedDynamitePack
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
ExemptStatus = MASKED
TriggeredBy = Chem_Upgrade_GLAAnthraxGamma
End
Expand Down
14 changes: 7 additions & 7 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Slth_GLAUnits.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2478,7 +2478,7 @@ Object GC_Slth_GLAInfantryTerrorist
Behavior = FireWeaponWhenDeadBehavior ModuleTag_CrushedDeath
DeathWeapon = CrushedDynamitePack
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
ExemptStatus = MASKED
End

Expand Down Expand Up @@ -5356,15 +5356,15 @@ Object GC_Slth_GLAVehicleCombatBike
RequiredStatus = STATUS_RIDER5
DeathWeapon = CrushedBikeBomb
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Behavior = FireWeaponWhenDeadBehavior ModuleTag_NormalDeath
RequiredStatus = STATUS_RIDER5
DeathWeapon = Demo_CombatBikeDeathWeapon
StartsActive = Yes
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -TOPPLED
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -EXTRA_8 -TOPPLED
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Expand Down Expand Up @@ -6297,15 +6297,15 @@ Object GC_Slth_GLAVehicleCombatBikeRocket
RequiredStatus = STATUS_RIDER5
DeathWeapon = CrushedBikeBomb
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Behavior = FireWeaponWhenDeadBehavior ModuleTag_NormalDeath
RequiredStatus = STATUS_RIDER5
DeathWeapon = Demo_CombatBikeDeathWeapon
StartsActive = Yes
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -TOPPLED
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -EXTRA_8 -TOPPLED
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Expand Down Expand Up @@ -7238,15 +7238,15 @@ Object GC_Slth_GLAVehicleCombatBikeTerrorist
RequiredStatus = STATUS_RIDER5
DeathWeapon = CrushedBikeBomb
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Behavior = FireWeaponWhenDeadBehavior ModuleTag_NormalDeath
RequiredStatus = STATUS_RIDER5
DeathWeapon = Demo_CombatBikeDeathWeapon
StartsActive = Yes
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -TOPPLED
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -EXTRA_8 -TOPPLED
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Expand Down
8 changes: 4 additions & 4 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/GLACINEUnit.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,7 @@ Object CINE_GLAVehicleCombatBike
RequiredStatus = STATUS_RIDER5
DeathWeapon = SuicideBikeBomb ; Retain 1.04 damage for Cinematics
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

Behavior = StealthUpdate ModuleTag_19
Expand Down Expand Up @@ -5655,7 +5655,7 @@ Object CINE_GLAInfantryTerrorist

; --- begin Death modules ---
Behavior = SlowDeathBehavior ModuleTag_Death01
DeathTypes = ALL -CRUSHED -SPLATTED -SUICIDED -EXPLODED -BURNED -LASERED -POISONED -POISONED_BETA -POISONED_GAMMA
DeathTypes = ALL -CRUSHED -SPLATTED -SUICIDED -EXPLODED -BURNED -LASERED -EXTRA_8 -POISONED -POISONED_BETA -POISONED_GAMMA
SinkDelay = 3000
SinkRate = 0.5 ; in Dist/Sec
DestructionDelay = 8000
Expand Down Expand Up @@ -5702,7 +5702,7 @@ Object CINE_GLAInfantryTerrorist
Behavior = FireWeaponWhenDeadBehavior ModuleTag_CrushedDeath
DeathWeapon = SuicideBikeBomb ; Retain 1.04 damage for Cinematics
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

; --- end Death modules ---
Expand Down Expand Up @@ -7605,7 +7605,7 @@ Object CINE_CheeringTerrorist
Behavior = FireWeaponWhenDeadBehavior ModuleTag_CrushedDeath
DeathWeapon = SuicideBikeBomb ; Retain 1.04 damage for Cinematics
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End
; --- end Death modules ---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ Object GLAInfantryTerrorist
Behavior = FireWeaponWhenDeadBehavior ModuleTag_CrushedDeath
DeathWeapon = CrushedDynamitePack
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
ExemptStatus = MASKED
End

Expand Down
12 changes: 6 additions & 6 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/GLAVehicle.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1457,15 +1457,15 @@ Object GLAVehicleCombatBike
RequiredStatus = STATUS_RIDER5
DeathWeapon = CrushedBikeBomb
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Behavior = FireWeaponWhenDeadBehavior ModuleTag_NormalDeath
RequiredStatus = STATUS_RIDER5
DeathWeapon = Demo_CombatBikeDeathWeapon
StartsActive = Yes
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -TOPPLED
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -EXTRA_8 -TOPPLED
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Expand Down Expand Up @@ -2409,15 +2409,15 @@ Object GLAVehicleCombatBikeRocket
RequiredStatus = STATUS_RIDER5
DeathWeapon = CrushedBikeBomb
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Behavior = FireWeaponWhenDeadBehavior ModuleTag_NormalDeath
RequiredStatus = STATUS_RIDER5
DeathWeapon = Demo_CombatBikeDeathWeapon
StartsActive = Yes
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -TOPPLED
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -EXTRA_8 -TOPPLED
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Expand Down Expand Up @@ -3349,15 +3349,15 @@ Object GLAVehicleCombatBikeTerrorist
RequiredStatus = STATUS_RIDER5
DeathWeapon = CrushedBikeBomb
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Behavior = FireWeaponWhenDeadBehavior ModuleTag_NormalDeath
RequiredStatus = STATUS_RIDER5
DeathWeapon = Demo_CombatBikeDeathWeapon
StartsActive = Yes
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -TOPPLED
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -EXTRA_8 -TOPPLED
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15160,7 +15160,7 @@ Object Slth_GLAInfantryTerrorist
Behavior = FireWeaponWhenDeadBehavior ModuleTag_CrushedDeath
DeathWeapon = CrushedDynamitePack
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
ExemptStatus = MASKED
End
; --- end Death modules ---
Expand Down Expand Up @@ -19428,15 +19428,15 @@ Object Slth_GLAVehicleCombatBike
RequiredStatus = STATUS_RIDER5
DeathWeapon = CrushedBikeBomb
StartsActive = Yes
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED
DeathTypes = NONE +CRUSHED +SPLATTED +LASERED +EXTRA_8
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Behavior = FireWeaponWhenDeadBehavior ModuleTag_NormalDeath
RequiredStatus = STATUS_RIDER5
DeathWeapon = Demo_CombatBikeDeathWeapon
StartsActive = Yes
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -TOPPLED
DeathTypes = ALL -SUICIDED -BURNED -EXPLODED -CRUSHED -SPLATTED -LASERED -EXTRA_8 -TOPPLED
End

; Patch104p @feature Fires dummy weapon to spawn some effects in the absence of a real death weapon.
Expand Down
Loading