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

Experimental dozer supply truck scrap #1105

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Experimental dozer supply truck scrap #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d62da7
Fix: Helix With Bunker Cannot Be Ordered To Aim At Airborne Targets
commy2 Sep 19, 2021
681331e
Change: Make Helix Gatling Target Airborne Units
commy2 Oct 6, 2021
e9453cc
In Code Documentation
commy2 Oct 8, 2021
3c649b0
Set Range To 350
commy2 Oct 8, 2021
8bfc08c
Make Dozers And Supply Trucks Not Drop Scrap
commy2 Oct 25, 2021
6061830
Make Scaffolds Not Delete Scrap
commy2 Oct 25, 2021
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 @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not touch it :D

/~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
2 changes: 1 addition & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Crate.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ Object SalvageCrate
EditorSorting = MISC_MAN_MADE

; *** ENGINEERING Parameters ***
KindOf = PARACHUTABLE SELECTABLE ;Only Salvage crates are marked Selectable so the Mouse can interact with them and give Salvage voices. Being dead makes them not actually selectable
KindOf = PARACHUTABLE SELECTABLE INERT ;Only Salvage crates are marked Selectable so the Mouse can interact with them and give Salvage voices. Being dead makes them not actually selectable

Behavior = SalvageCrateCollide ModuleTag_02
ForbiddenKindOf = PROJECTILE
Expand Down
6 changes: 3 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/AirforceGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6634,9 +6634,9 @@ Object AirF_AmericaVehicleDozer
FX = FINAL FX_BattleMasterExplosionOneFinal
End

Behavior = CreateCrateDie ModuleTag_CratesChange
CrateData = SalvageCrateData
End
;Behavior = CreateCrateDie ModuleTag_CratesChange
; CrateData = SalvageCrateData
;End

Behavior = FlammableUpdate ModuleTag_21
AflameDuration = 5000 ; If I catch fire, I'll burn for this long...
Expand Down
6 changes: 3 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/AmericaVehicle.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1788,9 +1788,9 @@ Object AmericaVehicleDozer
FX = FINAL FX_BattleMasterExplosionOneFinal
End

Behavior = CreateCrateDie ModuleTag_CratesChange
CrateData = SalvageCrateData
End
;Behavior = CreateCrateDie ModuleTag_CratesChange
; CrateData = SalvageCrateData
;End

Behavior = FlammableUpdate ModuleTag_21
AflameDuration = 5000 ; If I catch fire, I'll burn for this long...
Expand Down
27 changes: 18 additions & 9 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 @@ -211,9 +211,9 @@ Object Boss_VehicleDozer
FX = FINAL FX_BattleMasterExplosionOneFinal
End

Behavior = CreateCrateDie ModuleTag_CratesChange
CrateData = SalvageCrateData
End
;Behavior = CreateCrateDie ModuleTag_CratesChange
; CrateData = SalvageCrateData
;End

Behavior = FlammableUpdate ModuleTag_21
AflameDuration = 5000 ; If I catch fire, I'll burn for this long...
Expand Down Expand Up @@ -14643,9 +14643,9 @@ Object Boss_VehicleSupplyTruck
DeathTypes = NONE +CRUSHED +SPLATTED
End

Behavior = CreateCrateDie ModuleTag_12
CrateData = SalvageCrateData
End
;Behavior = CreateCrateDie ModuleTag_12
; CrateData = SalvageCrateData
;End

Geometry = BOX
GeometryMajorRadius = 17.0
Expand Down Expand Up @@ -15430,12 +15430,14 @@ Object Boss_VehicleHelix
DamageFX = None
End

; Patch104p @bugfix commy2 13/09/2021 Fix Helix with Bunker unable to order passengers to attack airborne targets.
; Patch104p @bugfix commy2 08/10/2021 Add dummy weapon to allow Helix to target airborne units.

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 +15446,15 @@ 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
;----------------------------
Weapon = SECONDARY HelicopterUpgradedDummyWeapon
PreferredAgainst = SECONDARY AIRCRAFT
AutoChooseSources = SECONDARY FROM_PLAYER FROM_SCRIPT FROM_AI
End


Expand Down Expand Up @@ -15597,11 +15605,12 @@ 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


Behavior = WeaponSetUpgrade ModuleTag_30
TriggeredBy = Upgrade_ChinaBlackNapalm
TriggeredBy = Upgrade_ChinaHelixGattlingCannon
End


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

; Patch104p @bugfix commy2 13/09/2021 Fix Helix with Bunker unable to order passengers to attack airborne targets.
; Patch104p @bugfix commy2 08/10/2021 Add dummy weapon to allow Helix to target airborne units.

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 +105,15 @@ 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
;----------------------------
Weapon = SECONDARY HelicopterUpgradedDummyWeapon
PreferredAgainst = SECONDARY AIRCRAFT
AutoChooseSources = SECONDARY FROM_PLAYER FROM_SCRIPT FROM_AI
End


Expand Down Expand Up @@ -254,11 +262,12 @@ 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


Behavior = WeaponSetUpgrade ModuleTag_30
TriggeredBy = Upgrade_ChinaBlackNapalm
TriggeredBy = Upgrade_ChinaHelixGattlingCannon
End


Expand Down Expand Up @@ -317,6 +326,8 @@ End



; Patch104p @bugfix commy2 08/10/2021 Fix firing animation and turret rotation when firing at airborne targets.

;------------------------------------------------------------------------------
Object ChinaHelixGattlingCannon

Expand All @@ -336,6 +347,8 @@ Object ChinaHelixGattlingCannon
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY Muzzle
WeaponMuzzleFlash = PRIMARY MuzzleFX
WeaponFireFXBone = SECONDARY Muzzle
WeaponMuzzleFlash = SECONDARY MuzzleFX
End
ConditionState = CONTINUOUS_FIRE_SLOW
Model = NVHelix_G
Expand Down Expand Up @@ -364,6 +377,8 @@ Object ChinaHelixGattlingCannon
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY Muzzle
WeaponMuzzleFlash = PRIMARY MuzzleFX
WeaponFireFXBone = SECONDARY Muzzle
WeaponMuzzleFlash = SECONDARY MuzzleFX
ParticleSysBone = Smoke01 SmokeFactionMedium
ParticleSysBone = Smoke02 SmokeFactionMedium
ParticleSysBone = Smoke03 SmokeFactionMedium
Expand Down Expand Up @@ -403,9 +418,9 @@ Object ChinaHelixGattlingCannon
WeaponSet
Conditions = None
Weapon = PRIMARY GattlingBuildingGun
PreferredAgainst = PRIMARY INFANTRY
;Weapon = SECONDARY GattlingBuildingGunAir
;PreferredAgainst = SECONDARY BALLISTIC_MISSILE AIRCRAFT
;PreferredAgainst = PRIMARY INFANTRY
Weapon = SECONDARY HelixGattlingGunAir
PreferredAgainst = SECONDARY BALLISTIC_MISSILE AIRCRAFT
End

ArmorSet
Expand Down Expand Up @@ -440,7 +455,7 @@ Object ChinaHelixGattlingCannon

Behavior = AIUpdateInterface ModuleTag_03
Turret
ControlledWeaponSlots = PRIMARY
ControlledWeaponSlots = PRIMARY SECONDARY
TurretTurnRate = 60 // turn rate, in degrees per sec
TurretPitchRate = 60
AllowsPitch = Yes
Expand Down
12 changes: 6 additions & 6 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/ChinaVehicle.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2141,9 +2141,9 @@ Object ChinaVehicleSupplyTruck
DeathTypes = NONE +CRUSHED +SPLATTED
End

Behavior = CreateCrateDie ModuleTag_12
CrateData = SalvageCrateData
End
;Behavior = CreateCrateDie ModuleTag_12
; CrateData = SalvageCrateData
;End

Geometry = BOX
GeometryMajorRadius = 17.0
Expand Down Expand Up @@ -2309,9 +2309,9 @@ Object ChinaVehicleDozer
FX = FINAL FX_BattleMasterExplosionOneFinal
End

Behavior = CreateCrateDie ModuleTag_09
CrateData = SalvageCrateData
End
;Behavior = CreateCrateDie ModuleTag_09
; CrateData = SalvageCrateData
;End

Behavior = FlammableUpdate ModuleTag_21
AflameDuration = 5000 ; If I catch fire, I'll burn for this long...
Expand Down
6 changes: 3 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/CivilianUnit.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11006,9 +11006,9 @@ Object ToxicSupplyTruck
DeathTypes = NONE +CRUSHED +SPLATTED
End

Behavior = CreateCrateDie ModuleTag_11
CrateData = SalvageCrateData
End
;Behavior = CreateCrateDie ModuleTag_11
; CrateData = SalvageCrateData
;End

Geometry = BOX
GeometryMajorRadius = 17.0
Expand Down
34 changes: 23 additions & 11 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/InfantryGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2740,9 +2740,9 @@ Object Infa_ChinaVehicleSupplyTruck
DeathTypes = NONE +CRUSHED +SPLATTED
End

Behavior = CreateCrateDie ModuleTag_12
CrateData = SalvageCrateData
End
;Behavior = CreateCrateDie ModuleTag_12
; CrateData = SalvageCrateData
;End

Geometry = BOX
GeometryMajorRadius = 17.0
Expand Down Expand Up @@ -2908,9 +2908,9 @@ Object Infa_ChinaVehicleDozer
FX = FINAL FX_BattleMasterExplosionOneFinal
End

Behavior = CreateCrateDie ModuleTag_09
CrateData = SalvageCrateData
End
;Behavior = CreateCrateDie ModuleTag_09
; CrateData = SalvageCrateData
;End

Behavior = FlammableUpdate ModuleTag_21
AflameDuration = 5000 ; If I catch fire, I'll burn for this long...
Expand Down Expand Up @@ -16002,12 +16002,14 @@ Object Infa_ChinaVehicleHelix
DamageFX = None
End

; Patch104p @bugfix commy2 13/09/2021 Fix Helix with Bunker unable to order passengers to attack airborne targets.
; Patch104p @bugfix commy2 08/10/2021 Add dummy weapon to allow Helix to target airborne units.

WeaponSet
Conditions = None
;----------------------------
Weapon = PRIMARY HelixMinigunWeapon
PreferredAgainst = PRIMARY INFANTRY
PreferredAgainst = PRIMARY INFANTRY VEHICLE
AutoChooseSources = PRIMARY FROM_PLAYER FROM_SCRIPT FROM_AI
;----------------------------
End
Expand All @@ -16016,9 +16018,15 @@ 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
;----------------------------
Weapon = SECONDARY HelicopterUpgradedDummyWeapon
PreferredAgainst = SECONDARY AIRCRAFT
AutoChooseSources = SECONDARY FROM_PLAYER FROM_SCRIPT FROM_AI
End


Expand Down Expand Up @@ -16130,13 +16138,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
TriggeredBy = Upgrade_ChinaHelixGattlingCannon
End
;---------------------------
;--------------------------

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

Behavior = WeaponSetUpgrade ModuleTag_30
TriggeredBy = Upgrade_Infa_ChinaHelixBattleBunker
End

Behavior = DestroyDie ModuleTag_04
;nothing
End
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 @@ -6093,9 +6093,9 @@ Object Lazr_AmericaVehicleDozer
FX = FINAL FX_BattleMasterExplosionOneFinal
End

Behavior = CreateCrateDie ModuleTag_CratesChange
CrateData = SalvageCrateData
End
;Behavior = CreateCrateDie ModuleTag_CratesChange
; CrateData = SalvageCrateData
;End

Behavior = FlammableUpdate ModuleTag_21
AflameDuration = 5000 ; If I catch fire, I'll burn for this long...
Expand Down
Loading