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

Fixed up Quad Cannon draw code #340

Closed
wants to merge 1 commit into from
Closed

Fixed up Quad Cannon draw code #340

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
25 changes: 22 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/ChemicalGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16607,11 +16607,14 @@ Object Chem_GLAVehicleQuadCannon
;UpgradeCameo4 = XXX
;UpgradeCameo5 = XXX

; Patch 1.04p @bugfix GeneralCamo 13/09/2021 - Fixed animations, set dust trail to the correct particle, and corrected salvage level 1 to properly use damaged model
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please use Patch104p as opposed to Patch 1.04p in your comments so it is consistent with the keyword of all other comments we added.

Draw = W3DTankTruckDraw ModuleTag_01
OkToChangeModelColor = Yes

ConditionState = NONE
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -16626,6 +16629,8 @@ Object Chem_GLAVehicleQuadCannon

ConditionState = REALLYDAMAGED
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -16640,6 +16645,8 @@ Object Chem_GLAVehicleQuadCannon

ConditionState = RUBBLE
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -16654,6 +16661,8 @@ Object Chem_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_ONE
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -16667,7 +16676,9 @@ Object Chem_GLAVehicleQuadCannon
End

ConditionState = WEAPONSET_CRATEUPGRADE_ONE REALLYDAMAGED
Model = UVQuadCann
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -16681,7 +16692,9 @@ Object Chem_GLAVehicleQuadCannon
End

ConditionState = WEAPONSET_CRATEUPGRADE_ONE RUBBLE
Model = UVQuadCann
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -16696,6 +16709,8 @@ Object Chem_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -16710,6 +16725,8 @@ Object Chem_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO REALLYDAMAGED
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -16724,6 +16741,8 @@ Object Chem_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO RUBBLE
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -16742,7 +16761,7 @@ Object Chem_GLAVehicleQuadCannon
TreadDriveSpeedFraction = 0.3 ; fraction of locomotor speed below which treads stop moving.
TreadPivotSpeedFraction = 0.6 ; fraction of locomotor speed below which we allow pivoting.

Dust = RocketBuggyDust
Dust = QuadCannonDust
DirtSpray = RocketBuggyDirtSpray

; These parameters are only used if the model has a separate suspension,
Expand Down
25 changes: 22 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/DemoGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17834,11 +17834,14 @@ Object Demo_GLAVehicleQuadCannon
;UpgradeCameo4 = XXX
;UpgradeCameo5 = XXX

; Patch 1.04p @bugfix GeneralCamo 13/09/2021 - Fixed animations, set dust trail to the correct particle, and corrected salvage level 1 to properly use damaged model
Draw = W3DTankTruckDraw ModuleTag_01
OkToChangeModelColor = Yes

ConditionState = NONE
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -17853,6 +17856,8 @@ Object Demo_GLAVehicleQuadCannon

ConditionState = REALLYDAMAGED
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -17867,6 +17872,8 @@ Object Demo_GLAVehicleQuadCannon

ConditionState = RUBBLE
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -17881,6 +17888,8 @@ Object Demo_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_ONE
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -17894,7 +17903,9 @@ Object Demo_GLAVehicleQuadCannon
End

ConditionState = WEAPONSET_CRATEUPGRADE_ONE REALLYDAMAGED
Model = UVQuadCann
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -17908,7 +17919,9 @@ Object Demo_GLAVehicleQuadCannon
End

ConditionState = WEAPONSET_CRATEUPGRADE_ONE RUBBLE
Model = UVQuadCann
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -17923,6 +17936,8 @@ Object Demo_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -17937,6 +17952,8 @@ Object Demo_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO REALLYDAMAGED
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -17951,6 +17968,8 @@ Object Demo_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO RUBBLE
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -17969,7 +17988,7 @@ Object Demo_GLAVehicleQuadCannon
TreadDriveSpeedFraction = 0.3 ; fraction of locomotor speed below which treads stop moving.
TreadPivotSpeedFraction = 0.6 ; fraction of locomotor speed below which we allow pivoting.

Dust = RocketBuggyDust
Dust = QuadCannonDust
DirtSpray = RocketBuggyDirtSpray

; These parameters are only used if the model has a separate suspension,
Expand Down
25 changes: 22 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/GLAVehicle.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3054,11 +3054,14 @@ Object GLAVehicleQuadCannon
;UpgradeCameo4 = XXX
;UpgradeCameo5 = XXX

; Patch 1.04p @bugfix GeneralCamo 13/09/2021 - Fixed animations, set dust trail to the correct particle, and corrected salvage level 1 to properly use damaged model
Draw = W3DTankTruckDraw ModuleTag_01
OkToChangeModelColor = Yes

ConditionState = NONE
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -3073,6 +3076,8 @@ Object GLAVehicleQuadCannon

ConditionState = REALLYDAMAGED
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -3087,6 +3092,8 @@ Object GLAVehicleQuadCannon

ConditionState = RUBBLE
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -3101,6 +3108,8 @@ Object GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_ONE
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -3114,7 +3123,9 @@ Object GLAVehicleQuadCannon
End

ConditionState = WEAPONSET_CRATEUPGRADE_ONE REALLYDAMAGED
Model = UVQuadCann
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -3128,7 +3139,9 @@ Object GLAVehicleQuadCannon
End

ConditionState = WEAPONSET_CRATEUPGRADE_ONE RUBBLE
Model = UVQuadCann
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -3143,6 +3156,8 @@ Object GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -3157,6 +3172,8 @@ Object GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO REALLYDAMAGED
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -3171,6 +3188,8 @@ Object GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO RUBBLE
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -3189,7 +3208,7 @@ Object GLAVehicleQuadCannon
TreadDriveSpeedFraction = 0.3 ; fraction of locomotor speed below which treads stop moving.
TreadPivotSpeedFraction = 0.6 ; fraction of locomotor speed below which we allow pivoting.

Dust = RocketBuggyDust
Dust = QuadCannonDust
DirtSpray = RocketBuggyDirtSpray

; These parameters are only used if the model has a separate suspension,
Expand Down
25 changes: 22 additions & 3 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/StealthGeneral.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18019,11 +18019,14 @@ Object Slth_GLAVehicleQuadCannon
;UpgradeCameo4 = XXX
;UpgradeCameo5 = XXX

; Patch 1.04p @bugfix GeneralCamo 13/09/2021 - Fixed animations, set dust trail to the correct particle, and corrected salvage level 1 to properly use damaged model
Draw = W3DTankTruckDraw ModuleTag_01
OkToChangeModelColor = Yes

ConditionState = NONE
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -18038,6 +18041,8 @@ Object Slth_GLAVehicleQuadCannon

ConditionState = REALLYDAMAGED
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -18052,6 +18057,8 @@ Object Slth_GLAVehicleQuadCannon

ConditionState = RUBBLE
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRET
TurretPitch = TURRETEL
WeaponFireFXBone = PRIMARY BarrelMS
Expand All @@ -18066,6 +18073,8 @@ Object Slth_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_ONE
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -18079,7 +18088,9 @@ Object Slth_GLAVehicleQuadCannon
End

ConditionState = WEAPONSET_CRATEUPGRADE_ONE REALLYDAMAGED
Model = UVQuadCann
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -18093,7 +18104,9 @@ Object Slth_GLAVehicleQuadCannon
End

ConditionState = WEAPONSET_CRATEUPGRADE_ONE RUBBLE
Model = UVQuadCann
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP01
TurretPitch = TURRETEL01
WeaponFireFXBone = PRIMARY BarrelUp01MS
Expand All @@ -18108,6 +18121,8 @@ Object Slth_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO
Model = UVQuadCann
Animation = UVQuadCann.UVQuadCann
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -18122,6 +18137,8 @@ Object Slth_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO REALLYDAMAGED
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -18136,6 +18153,8 @@ Object Slth_GLAVehicleQuadCannon

ConditionState = WEAPONSET_CRATEUPGRADE_TWO RUBBLE
Model = UVQuadCann_D
Animation = UVQuadCann_D.UVQuadCann_D
AnimationMode = LOOP
Turret = TURRETUP02
TurretPitch = TURRETEL02
WeaponFireFXBone = PRIMARY BarrelUp02MS
Expand All @@ -18154,7 +18173,7 @@ Object Slth_GLAVehicleQuadCannon
TreadDriveSpeedFraction = 0.3 ; fraction of locomotor speed below which treads stop moving.
TreadPivotSpeedFraction = 0.6 ; fraction of locomotor speed below which we allow pivoting.

Dust = RocketBuggyDust
Dust = QuadCannonDust
DirtSpray = RocketBuggyDirtSpray

; These parameters are only used if the model has a separate suspension,
Expand Down