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.

Sign up for GitHub

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

Fix: Boss Destroyed American Buildings Spawn Wrong Ranger Type #388

Merged
merged 1 commit into from
Sep 21, 2021
Merged

Fix: Boss Destroyed American Buildings Spawn Wrong Ranger Type #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Patch104pZH/Design/Tasks/commy2_tasks.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ https://github.com/commy2/zerohour/issues/65 [DONE][NPROJECT] Laser Gene
https://github.com/commy2/zerohour/issues/64 [MAYBE][NPROJECT] Battle Drone Gains Double The Intended Bonus From Drone Armor
https://github.com/commy2/zerohour/issues/63 [MAYBE][NPROJECT] Paladins And Microwaves Gain Slightly Less Than Intended From Composite Armor
https://github.com/commy2/zerohour/issues/62 [MAYBE][NPROJECT] Crusader And Laser Tanks Receive Composite Armor Health Bonus Twice
https://github.com/commy2/zerohour/issues/61 [IMPROVEMENT][NPROJECT] Destroyed American Boss Buildings Spawn Wrong Ranger Type
https://github.com/commy2/zerohour/issues/61 [DONE][NPROJECT] Destroyed American Boss Buildings Spawn Wrong Ranger Type
https://github.com/commy2/zerohour/issues/60 [DONE][NPROJECT] Destroyed Particle Cannons Spawn Wrong Ranger Type
https://github.com/commy2/zerohour/issues/59 [IMPROVEMENT] Air Force General Name Misspelling
https://github.com/commy2/zerohour/issues/58 [IMPROVEMENT][NPROJECT] Some Combat Bikes Missing DoorOpenTime Entry
Expand Down
2 changes: 1 addition & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10723,7 +10723,7 @@ Object AirF_AmericaParticleCannonUplink
FX = INITIAL FX_ParticleUplinkDeathInitial
OCL = INITIAL OCL_SDILinkLasers
FX = FINAL FX_StructureMediumDeath
OCL = FINAL OCL_AirF_ParticleUplinkDeathFinal ; Patch104p @bugfix hanfield 26/08/2021 Added proper death OCL to spawn Airforce General Rangers.
OCL = FINAL AirF_OCL_ParticleUplinkDeathFinal ; Patch104p @bugfix hanfield 26/08/2021 Added proper death OCL to spawn Airforce General Rangers.
commy2 marked this conversation as resolved.
Show resolved Hide resolved
End

Behavior = InstantDeathBehavior ModuleTag_19
Expand Down
6 changes: 3 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2440,7 +2440,7 @@ Object Boss_PowerPlant
End
Behavior = CreateObjectDie ModuleTag_12
;**FIX**
CreationList = OCL_AmericanRangerDebris02
CreationList = Boss_OCL_AmericanRangerDebris02 ; @bugfix commy2 19/09/2021 Fix building spawning vanilla USA Rangers when destroyed.
ExemptStatus = UNDER_CONSTRUCTION
End
Behavior = FXListDie ModuleTag_13
Expand Down Expand Up @@ -3423,7 +3423,7 @@ Object Boss_ParticleCannonUplink
FX = INITIAL FX_ParticleUplinkDeathInitial
OCL = INITIAL OCL_SDILinkLasers
FX = FINAL FX_StructureMediumDeath
OCL = FINAL OCL_ParticleUplinkDeathFinal
OCL = FINAL Boss_OCL_ParticleUplinkDeathFinal
End

Behavior = InstantDeathBehavior ModuleTag_19
Expand Down Expand Up @@ -12373,7 +12373,7 @@ Object Boss_PatriotBattery
;nothing
End
Behavior = CreateObjectDie ModuleTag_09
CreationList = OCL_AmericanRangerDebris03
CreationList = Boss_OCL_AmericanRangerDebris03 ; @bugfix commy2 19/09/2021 Fix building spawning vanilla USA Rangers when destroyed.
ExemptStatus = UNDER_CONSTRUCTION
End
Behavior = FXListDie ModuleTag_10
Expand Down
6 changes: 3 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/LaserGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10432,7 +10432,7 @@ Object Lazr_AmericaParticleCannonUplink
FX = INITIAL FX_ParticleUplinkDeathInitial
OCL = INITIAL OCL_SDILinkLasers
FX = FINAL FX_StructureMediumDeath
OCL = FINAL OCL_Lazr_ParticleUplinkDeathFinal ; Patch104p @bugfix hanfield 26/08/2021 Added proper death OCL to spawn Laser General Rangers.
OCL = FINAL Lazr_OCL_ParticleUplinkDeathFinal ; Patch104p @bugfix hanfield 26/08/2021 Added proper death OCL to spawn Laser General Rangers.
End

Behavior = InstantDeathBehavior ModuleTag_19
Expand Down Expand Up @@ -18054,7 +18054,7 @@ Object Lazr_AmericaLaserCannonUplink
FX = INITIAL FX_ParticleUplinkDeathInitial
OCL = INITIAL OCL_SDILinkLasers
FX = FINAL FX_StructureMediumDeath
OCL = FINAL OCL_Lazr_ParticleUplinkDeathFinal ; Patch104p @bugfix hanfield 26/08/2021 Added proper death OCL to spawn Laser General Rangers.
OCL = FINAL Lazr_OCL_ParticleUplinkDeathFinal ; Patch104p @bugfix hanfield 26/08/2021 Added proper death OCL to spawn Laser General Rangers.
End

Behavior = InstantDeathBehavior ModuleTag_19
Expand Down Expand Up @@ -19006,7 +19006,7 @@ Object Lazr_AmericaLaserCannon
FX = INITIAL FX_ParticleUplinkDeathInitial
OCL = INITIAL OCL_SDILinkLasers
FX = FINAL FX_StructureMediumDeath
OCL = FINAL OCL_Lazr_ParticleUplinkDeathFinal ; Patch104p @bugfix hanfield 26/08/2021 Added proper death OCL to spawn Laser General Rangers.
OCL = FINAL Lazr_OCL_ParticleUplinkDeathFinal ; Patch104p @bugfix hanfield 26/08/2021 Added proper death OCL to spawn Laser General Rangers.
End

Behavior = InstantDeathBehavior ModuleTag_19
Expand Down
2 changes: 1 addition & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Object/SuperWeaponGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9834,7 +9834,7 @@ Object SupW_AmericaParticleCannonUplink
FX = INITIAL SupW_FX_ParticleUplinkDeathInitial
OCL = INITIAL SupW_OCL_SDILinkLasers
FX = FINAL FX_StructureMediumDeath
OCL = FINAL OCL_SupW_ParticleUplinkDeathFinal ; Patch104p @bugfix hanfield 26/08/2021 Added proper death OCL to spawn Superweapon General Rangers.
OCL = FINAL SupW_OCL_ParticleUplinkDeathFinal ; Patch104p @bugfix hanfield 26/08/2021 Added proper death OCL to spawn Superweapon General Rangers.
End

Behavior = InstantDeathBehavior ModuleTag_19
Expand Down
125 changes: 122 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/ObjectCreationList.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2327,7 +2327,7 @@ End
; Patch104p @bugfix hanfield 26/08/2021 Added death OCL for Airforce General Particle Cannon.

; ----------------------------------------------
ObjectCreationList OCL_AirF_ParticleUplinkDeathFinal
ObjectCreationList AirF_OCL_ParticleUplinkDeathFinal
; SlowDeath treats two listings as an OR, so this combines the two it was using. OCL_ABPowerPlantExplode & OCL_AmericanRangerDebris06
CreateObject
ObjectNames = AirF_AmericaInfantryRanger
Expand Down Expand Up @@ -2433,7 +2433,7 @@ End
; Patch104p @bugfix hanfield 26/08/2021 Added death OCL for Laser General Particle Cannon.

; ----------------------------------------------
ObjectCreationList OCL_Lazr_ParticleUplinkDeathFinal
ObjectCreationList Lazr_OCL_ParticleUplinkDeathFinal
; SlowDeath treats two listings as an OR, so this combines the two it was using. OCL_ABPowerPlantExplode & OCL_AmericanRangerDebris06
CreateObject
ObjectNames = Lazr_AmericaInfantryRanger
Expand Down Expand Up @@ -2539,7 +2539,7 @@ End
; Patch104p @bugfix hanfield 26/08/2021 Added death OCL for Superweapon General Particle Cannon.

; ----------------------------------------------
ObjectCreationList OCL_SupW_ParticleUplinkDeathFinal
ObjectCreationList SupW_OCL_ParticleUplinkDeathFinal
; SlowDeath treats two listings as an OR, so this combines the two it was using. OCL_ABPowerPlantExplode & OCL_AmericanRangerDebris06
CreateObject
ObjectNames = SupW_AmericaInfantryRanger
Expand Down Expand Up @@ -2642,6 +2642,112 @@ ObjectCreationList OCL_SupW_ParticleUplinkDeathFinal
End
End

; @bugfix commy2 19/09/2021 Used when Boss General Particle Cannon is destroyed.

; ----------------------------------------------
ObjectCreationList Boss_OCL_ParticleUplinkDeathFinal
; SlowDeath treats two listings as an OR, so this combines the two it was using. OCL_ABPowerPlantExplode & OCL_AmericanRangerDebris06
CreateObject
ObjectNames = Boss_InfantryRanger
IgnorePrimaryObstacle = Yes
Disposition = SEND_IT_OUT
DispositionIntensity = 4
Count = 6
RequiresLivePlayer = Yes
End

CreateDebris
ModelNames = ABPwrPlant_d01 ABPwrPlant_d02 ABPwrPlant_d03 ABPwrPlant_d04 ABPwrPlant_d05 ABPwrPlant_d06 ABPwrPlant_d07 ABPwrPlant_d08 ABPwrPlant_d09 ABPwrPlant_d10
Offset = X:15 Y:15 Z:5
Mass = 30.0
Count = 3
Disposition = SEND_IT_FLYING
DispositionIntensity = 3
End
CreateDebris
ModelNames = ABPwrPlant_d01 ABPwrPlant_d02 ABPwrPlant_d03 ABPwrPlant_d04 ABPwrPlant_d05 ABPwrPlant_d06 ABPwrPlant_d07 ABPwrPlant_d08 ABPwrPlant_d09 ABPwrPlant_d10
Offset = X:-15 Y:-15 Z:5
Mass = 30.0
Count = 3
Disposition = SEND_IT_FLYING
DispositionIntensity = 3
BounceSound = BuildingDebris
End
CreateDebris
ModelNames = ABPwrPlant_d01 ABPwrPlant_d02 ABPwrPlant_d03 ABPwrPlant_d04 ABPwrPlant_d05 ABPwrPlant_d06 ABPwrPlant_d07 ABPwrPlant_d08 ABPwrPlant_d09 ABPwrPlant_d10
Offset = X:-15 Y:15 Z:5
Mass = 30.0
Count = 3
Disposition = SEND_IT_FLYING
DispositionIntensity = 3
BounceSound = BuildingDebris
End
CreateDebris
ModelNames = ABPwrPlant_d01 ABPwrPlant_d02 ABPwrPlant_d03 ABPwrPlant_d04 ABPwrPlant_d05 ABPwrPlant_d06 ABPwrPlant_d07 ABPwrPlant_d08 ABPwrPlant_d09 ABPwrPlant_d10
Offset = X:15 Y:-15 Z:5
Mass = 30.0
Count = 3
Disposition = SEND_IT_FLYING
DispositionIntensity = 3
BounceSound = BuildingDebris
End
CreateDebris
ModelNames = ABPwrPlant_d01 ABPwrPlant_d02 ABPwrPlant_d03 ABPwrPlant_d04 ABPwrPlant_d05 ABPwrPlant_d06 ABPwrPlant_d07 ABPwrPlant_d08 ABPwrPlant_d09 ABPwrPlant_d10
Offset = X:15 Y:15 Z:15

Mass = 30.0
Count = 3
Disposition = SEND_IT_FLYING
DispositionIntensity = 3
BounceSound = BuildingDebris
End
CreateDebris
ModelNames = ABPwrPlant_d01 ABPwrPlant_d02 ABPwrPlant_d03 ABPwrPlant_d04 ABPwrPlant_d05 ABPwrPlant_d06 ABPwrPlant_d07 ABPwrPlant_d08 ABPwrPlant_d09 ABPwrPlant_d10
Offset = X:-15 Y:-15 Z:15
Mass = 30.0
Count = 3
Disposition = SEND_IT_FLYING
DispositionIntensity = 3
BounceSound = BuildingDebris
End
CreateDebris
ModelNames = ABPwrPlant_d01 ABPwrPlant_d02 ABPwrPlant_d03 ABPwrPlant_d04 ABPwrPlant_d05 ABPwrPlant_d06 ABPwrPlant_d07 ABPwrPlant_d08 ABPwrPlant_d09 ABPwrPlant_d10
Offset = X:-15 Y:15 Z:15
Mass = 30.0
Count = 3
Disposition = SEND_IT_FLYING
DispositionIntensity = 3
BounceSound = BuildingDebris
End
CreateDebris
ModelNames = ABPwrPlant_d01 ABPwrPlant_d02 ABPwrPlant_d03 ABPwrPlant_d04 ABPwrPlant_d05 ABPwrPlant_d06 ABPwrPlant_d07 ABPwrPlant_d08 ABPwrPlant_d09 ABPwrPlant_d10
Offset = X:15 Y:-15 Z:15
Mass = 30.0
Count = 3
Disposition = SEND_IT_FLYING
DispositionIntensity = 3
BounceSound = BuildingDebris
End
CreateDebris
ModelNames = ABPwrPlant_d11 ABPwrPlant_d12 ABPwrPlant_d13 ABPwrPlant_d14 ABPwrPlant_d15 ABPwrPlant_d16 ABPwrPlant_d17 ABPwrPlant_d18 ABPwrPlant_d19 ABPwrPlant_d20
Offset = X:0 Y:0 Z:25
Mass = 30.0
Count = 10
Disposition = SEND_IT_FLYING
DispositionIntensity = 3
BounceSound = BuildingDebris
End
CreateDebris
ModelNames = ABPwrPlant_d21 ABPwrPlant_d22 ABPwrPlant_d23 ABPwrPlant_d24 ABPwrPlant_d25 ABPwrPlant_d26 ABPwrPlant_d27 ABPwrPlant_d28 ABPwrPlant_d29 ABPwrPlant_d30
Offset = X:0 Y:0 Z:40
Mass = 30.0
Count = 5
Disposition = SEND_IT_FLYING
DispositionIntensity = 3
BounceSound = BuildingDebris
End
End

; ----------------------------------------------
ObjectCreationList OCL_GenericWallSegmentDebris
; @todo srj -- nothing for now.
Expand Down Expand Up @@ -8525,6 +8631,19 @@ ObjectCreationList AirF_OCL_AmericanRangerDebris02
End
End

; @bugfix commy2 19/09/2021 Used when Boss General Fusion Reactor is destroyed.

ObjectCreationList Boss_OCL_AmericanRangerDebris02
CreateObject
ObjectNames = Boss_InfantryRanger
IgnorePrimaryObstacle = Yes
Disposition = SEND_IT_OUT
DispositionIntensity = 4
Count = 2
RequiresLivePlayer = Yes
End
End

ObjectCreationList Lazr_OCL_AmericanRangerDebris03
CreateObject
ObjectNames = Lazr_AmericaInfantryRanger
Expand Down