Skip to content

Commit

Permalink
Fix: Helix With Bunker Cannot Be Ordered To Aim At Airborne Targets
Browse files Browse the repository at this point in the history
  • Loading branch information
@commy2
commy2 committed Aug 28, 2022
1 parent f31e8eb commit 5df2ff2
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Patch104pZH/Design/Tasks/commy2_tasks.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ https://github.com/commy2/zerohour/issues/206 [MAYBE] Combat Chi
https://github.com/commy2/zerohour/issues/205 [DONE] Listening Outpost Damaged Smoke Effect Sticks After Repair
https://github.com/commy2/zerohour/issues/204 [WONTFIX] Fire Base Cannot Order Passengers To Attack Airborne Targets
https://github.com/commy2/zerohour/issues/203 [MAYBE][NPROJECT] Overlord With Bunker Cannot Order Passengers To Attack Airborne Targets
https://github.com/commy2/zerohour/issues/202 [MAYBE][NPROJECT] Helix With Bunker Cannot Order Passengers To Attack Airborne Targets
https://github.com/commy2/zerohour/issues/202 [DONE][NPROJECT] Helix With Bunker Cannot Order Passengers To Attack Airborne Targets
https://github.com/commy2/zerohour/issues/201 [NOTRELEVANT][NPROJECT] Fire Bases Require A Power Plant Despite Not Requiring Power
https://github.com/commy2/zerohour/issues/200 [NOTRELEVANT][NPROJECT] Air Force General Gets Carpet Bomber At Rank 1
https://github.com/commy2/zerohour/issues/199 [IMPROVEMENT] Countermeasures Reduce AA Gun Damage By 37.5% Instead Of The Intended 25% (Adjust text or damage)
Expand Down
9 changes: 7 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/BossGeneral.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15430,12 +15430,13 @@ Object Boss_VehicleHelix
DamageFX = None
End

; Patch104p @bugfix commy2 13/09/2021 Fix Helix with Bunker unable to order passengers to attack airborne targets.

WeaponSet
Conditions = None
;----------------------------
Weapon = PRIMARY HelixMinigunWeapon
PreferredAgainst = PRIMARY INFANTRY
PreferredAgainst = PRIMARY INFANTRY VEHICLE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
;----------------------------
End
Expand All @@ -15444,9 +15445,12 @@ Object Boss_VehicleHelix
Conditions = PLAYER_UPGRADE
;----------------------------
Weapon = PRIMARY HelixMinigunWeapon
PreferredAgainst = PRIMARY INFANTRY
PreferredAgainst = PRIMARY INFANTRY VEHICLE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
;----------------------------
Weapon = SECONDARY HelicopterUpgradedDummyWeapon
PreferredAgainst = SECONDARY AIRCRAFT
AutoChooseSources = SECONDARY FROM_PLAYER FROM_SCRIPT FROM_AI
End


Expand Down Expand Up @@ -15597,6 +15601,7 @@ Object Boss_VehicleHelix
ExitDelay = 100
NumberOfExitPaths = 1
PassengersAllowedToFire = No ; the
ArmedRidersUpgradeMyWeaponSet = Yes ; Patch104p @bugfix commy2 13/09/2021 Enable anti air dummy weapon when passengers are loaded inside.
End


Expand Down
9 changes: 7 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaAir.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,13 @@ Object ChinaVehicleHelix
DamageFX = None
End

; Patch104p @bugfix commy2 13/09/2021 Fix Helix with Bunker unable to order passengers to attack airborne targets.

WeaponSet
Conditions = None
;----------------------------
Weapon = PRIMARY HelixMinigunWeapon
PreferredAgainst = PRIMARY INFANTRY
PreferredAgainst = PRIMARY INFANTRY VEHICLE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
;----------------------------
End
Expand All @@ -103,9 +104,12 @@ Object ChinaVehicleHelix
Conditions = PLAYER_UPGRADE
;----------------------------
Weapon = PRIMARY HelixMinigunWeapon
PreferredAgainst = PRIMARY INFANTRY
PreferredAgainst = PRIMARY INFANTRY VEHICLE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
;----------------------------
Weapon = SECONDARY HelicopterUpgradedDummyWeapon
PreferredAgainst = SECONDARY AIRCRAFT
AutoChooseSources = SECONDARY FROM_PLAYER FROM_SCRIPT FROM_AI
End


Expand Down Expand Up @@ -254,6 +258,7 @@ Object ChinaVehicleHelix
ExitDelay = 100
NumberOfExitPaths = 1
PassengersAllowedToFire = No
ArmedRidersUpgradeMyWeaponSet = Yes ; Patch104p @bugfix commy2 13/09/2021 Enable anti air dummy weapon when passengers are loaded inside.
End


Expand Down
16 changes: 12 additions & 4 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/InfantryGeneral.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16039,12 +16039,13 @@ Object Infa_ChinaVehicleHelix
DamageFX = None
End

; Patch104p @bugfix commy2 13/09/2021 Fix Helix with Bunker unable to order passengers to attack airborne targets.

WeaponSet
Conditions = None
;----------------------------
Weapon = PRIMARY HelixMinigunWeapon
PreferredAgainst = PRIMARY INFANTRY
PreferredAgainst = PRIMARY INFANTRY VEHICLE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
;----------------------------
End
Expand All @@ -16053,9 +16054,12 @@ Object Infa_ChinaVehicleHelix
Conditions = PLAYER_UPGRADE
;----------------------------
Weapon = PRIMARY HelixMinigunWeapon
PreferredAgainst = PRIMARY INFANTRY
PreferredAgainst = PRIMARY INFANTRY VEHICLE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
;----------------------------
Weapon = SECONDARY HelicopterUpgradedDummyWeapon
PreferredAgainst = SECONDARY AIRCRAFT
AutoChooseSources = SECONDARY FROM_PLAYER FROM_SCRIPT FROM_AI
End


Expand Down Expand Up @@ -16167,13 +16171,13 @@ Object Infa_ChinaVehicleHelix
ExitDelay = 100
NumberOfExitPaths = 1
PassengersAllowedToFire = No
ArmedRidersUpgradeMyWeaponSet = Yes ; Patch104p @bugfix commy2 13/09/2021 Enable anti air dummy weapon when passengers are loaded inside.
End
;--------------------------

Behavior = WeaponSetUpgrade ModuleTag_30
TriggeredBy = Upgrade_ChinaBlackNapalm
End
;---------------------------
;--------------------------

Behavior = SpecialAbility ModuleTag_32
SpecialPowerTemplate = SpecialAbilityHelixNapalmBomb
Expand Down Expand Up @@ -16311,6 +16315,10 @@ Object Infa_ChinaHelixBattleBunker
PassengersAllowedToFire = Yes
End

Behavior = WeaponSetUpgrade ModuleTag_30
TriggeredBy = Upgrade_Infa_ChinaHelixBattleBunker
End

Behavior = DestroyDie ModuleTag_04
;nothing
End
Expand Down
9 changes: 7 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/NukeGeneral.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,12 +359,13 @@ Object Nuke_ChinaVehicleHelix
DamageFX = None
End

; Patch104p @bugfix commy2 13/09/2021 Fix Helix with Bunker unable to order passengers to attack airborne targets.

WeaponSet
Conditions = None
;----------------------------
Weapon = PRIMARY HelixMinigunWeapon
PreferredAgainst = PRIMARY INFANTRY
PreferredAgainst = PRIMARY INFANTRY VEHICLE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
;----------------------------
End
Expand All @@ -373,9 +374,12 @@ Object Nuke_ChinaVehicleHelix
Conditions = PLAYER_UPGRADE
;----------------------------
Weapon = PRIMARY HelixMinigunWeapon
PreferredAgainst = PRIMARY INFANTRY
PreferredAgainst = PRIMARY INFANTRY VEHICLE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
;----------------------------
Weapon = SECONDARY HelicopterUpgradedDummyWeapon
PreferredAgainst = SECONDARY AIRCRAFT
AutoChooseSources = SECONDARY FROM_PLAYER FROM_SCRIPT FROM_AI
End


Expand Down Expand Up @@ -527,6 +531,7 @@ Object Nuke_ChinaVehicleHelix
ExitDelay = 100
NumberOfExitPaths = 1
PassengersAllowedToFire = No ; the
ArmedRidersUpgradeMyWeaponSet = Yes ; Patch104p @bugfix commy2 13/09/2021 Enable anti air dummy weapon when passengers are loaded inside.
End


Expand Down
9 changes: 7 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/TankGeneral.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,13 @@ Object Tank_ChinaVehicleHelix
DamageFX = None
End

; Patch104p @bugfix commy2 13/09/2021 Fix Helix with Bunker unable to order passengers to attack airborne targets.

WeaponSet
Conditions = None
;----------------------------
Weapon = PRIMARY HelixMinigunWeapon
PreferredAgainst = PRIMARY INFANTRY
PreferredAgainst = PRIMARY INFANTRY VEHICLE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
;----------------------------
End
Expand All @@ -103,9 +104,12 @@ Object Tank_ChinaVehicleHelix
Conditions = PLAYER_UPGRADE
;----------------------------
Weapon = PRIMARY HelixMinigunWeapon
PreferredAgainst = PRIMARY INFANTRY
PreferredAgainst = PRIMARY INFANTRY VEHICLE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
;----------------------------
Weapon = SECONDARY HelicopterUpgradedDummyWeapon
PreferredAgainst = SECONDARY AIRCRAFT
AutoChooseSources = SECONDARY FROM_PLAYER FROM_SCRIPT FROM_AI
End


Expand Down Expand Up @@ -256,6 +260,7 @@ Object Tank_ChinaVehicleHelix
ExitDelay = 100
NumberOfExitPaths = 1
PassengersAllowedToFire = No ; the
ArmedRidersUpgradeMyWeaponSet = Yes ; Patch104p @bugfix commy2 13/09/2021 Enable anti air dummy weapon when passengers are loaded inside.
End


Expand Down
22 changes: 22 additions & 0 deletions Patch104pZH/GameFilesEdited/Data/INI/Weapon.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6444,6 +6444,7 @@ Weapon Infa_MiniGunnerGunAir
WeaponBonus = CONTINUOUS_FIRE_MEAN RATE_OF_FIRE 200% ; When the object achieves this state, this weapon gets double the rate of fire
WeaponBonus = CONTINUOUS_FIRE_FAST RATE_OF_FIRE 300% ; This is not cumulative, so with Delay of 40, and values of 2 and 4 for these bonuses, you shoot at (40, 20, 10)
WeaponBonus = PLAYER_UPGRADE DAMAGE 125% ; ChainGun upgrade
WeaponBonus = GARRISONED RANGE 77% ; Patch104p @bugfix commy2 14/09/2021 Remove GARRISONED range bonus from Minigunner vs airborne targets.
AntiAirborneVehicle = Yes
AntiAirborneInfantry = Yes
AntiGround = No
Expand Down Expand Up @@ -6766,6 +6767,27 @@ Weapon ListeningOutpostUpgradedDummyWeapon
AntiAirborneVehicle = Yes
End

; Patch104p @bugfix commy2 13/09/2021 Add weapon used by Helix with Bunker to order passengers to attack airborne targets.

;------------------------------------------------------------------------------
Weapon HelicopterUpgradedDummyWeapon
PrimaryDamage = 0.1
PrimaryDamageRadius = 0.0 ; 0 primary radius means "hits only intended victim"
AttackRange = 150.0
DamageType = SMALL_ARMS
DeathType = NORMAL
WeaponSpeed = 999999.0 ; dist/sec (huge value == effectively instant)
ProjectileObject = DummyWeaponProjectile
RadiusDamageAffects = ALLIES ENEMIES NEUTRALS
DelayBetweenShots = 1000 ; time between shots, msec
ClipSize = 0 ; how many shots in a Clip (0 == infinite)
ClipReloadTime = 0 ; how long to reload a Clip, msec
AcceptableAimDelta = 180 ; I'm not really shooting, my buddies are. So no need to turn
AntiAirborneVehicle = Yes
AntiAirborneInfantry = No
AntiGround = No
End

;------------------------------------------------------------------------------
Weapon BattleBusPassengerDummyWeapon
PrimaryDamage = 0.001
Expand Down

0 comments on commit 5df2ff2

Please sign in to comment.