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

Jump to bottom

Fix: Model issues with Scorpion tank #2212

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

Fix: Model issues with Scorpion tank #2212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1176062
blender
commy2 Aug 5, 2023
7449749
compress
commy2 Aug 5, 2023
6009708
fix turning threads on wreck
commy2 Aug 5, 2023
de995ea
2side
commy2 Aug 5, 2023
a87d110
2side 2
commy2 Aug 5, 2023
5b31d3d
muzzle flash and recoil
commy2 Aug 5, 2023
45d7b93
delete basic spheres
commy2 Aug 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added Patch104pZH/GameFilesEdited/Art/Models/HierarchyMesh/UVLiteTank.blend
View file
Open in desktop
Binary file not shown.
Binary file added Patch104pZH/GameFilesEdited/Art/Models/HierarchyMesh/UVLiteTank_D.blend
View file
Open in desktop
Binary file not shown.
Binary file added Patch104pZH/GameFilesEdited/Art/Models/HierarchyMesh/UVLiteTank_D1.blend
View file
Open in desktop
Binary file not shown.
33 changes: 29 additions & 4 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 @@ -16312,16 +16312,17 @@ Object Chem_GLATankScorpion

; ------------ Normal
; Patch104p @bugfix xezon 09/02/2023 Hide all muzzle flash meshes explicitly because otherwise they can show on death.
; Patch104p @bugfix commy2 05/08/2023 Fix muzzle flash of upgraded version. Also fix recoil animation.
DefaultConditionState
Model = UVLiteTank
Turret = Turret ; Logic twist bone is always this, both turrets are subobjects of it, as are both missile racks
; note, order-dependent: we must hide/show Missile AFTER we hide/show MissileRack!
ShowSubObject = Turret01
HideSubObject = MissleRack01 MissleRack02 TurretUP01 MuzzleFX01 MuzzleFX02; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle
WeaponRecoilBone = PRIMARY Barrel
WeaponMuzzleFlash = PRIMARY MuzzleFX
WeaponLaunchBone = PRIMARY Muzzle
WeaponFireFXBone = PRIMARY Muzzle01
WeaponRecoilBone = PRIMARY Barrel01
WeaponMuzzleFlash = PRIMARY MuzzleFX01
WeaponLaunchBone = PRIMARY Muzzle01
End

ConditionState = REALLYDAMAGED
Expand All @@ -16341,13 +16342,21 @@ Object Chem_GLATankScorpion
ConditionState = WEAPONSET_CRATEUPGRADE_ONE ; one or two crates is a turret switch
ShowSubObject = TurretUP01
HideSubObject = MissleRack01 MissleRack02 Turret01 ; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
End
AliasConditionState = WEAPONSET_CRATEUPGRADE_TWO

ConditionState = WEAPONSET_CRATEUPGRADE_ONE REALLYDAMAGED
Model = UVLiteTank_d
ShowSubObject = TurretUP01
HideSubObject = MissleRack01 MissleRack02 Turret01 ; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
End
AliasConditionState = WEAPONSET_CRATEUPGRADE_TWO REALLYDAMAGED

Expand Down Expand Up @@ -16398,6 +16407,10 @@ Object Chem_GLATankScorpion
ConditionState = WEAPONSET_PLAYER_UPGRADE WEAPONSET_CRATEUPGRADE_ONE
ShowSubObject = MissleRack01 TurretUP01
HideSubObject = MissleRack02 Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -16406,6 +16419,10 @@ Object Chem_GLATankScorpion
Model = UVLiteTank_d
ShowSubObject = MissleRack01 TurretUP01
HideSubObject = MissleRack02 Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -16428,6 +16445,10 @@ Object Chem_GLATankScorpion
ConditionState = WEAPONSET_PLAYER_UPGRADE WEAPONSET_CRATEUPGRADE_TWO
ShowSubObject = MissleRack01 MissleRack02 TurretUP01
HideSubObject = Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -16436,6 +16457,10 @@ Object Chem_GLATankScorpion
Model = UVLiteTank_d
ShowSubObject = MissleRack01 MissleRack02 TurretUP01
HideSubObject = Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand Down
33 changes: 29 additions & 4 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 @@ -17490,16 +17490,17 @@ Object Demo_GLATankScorpion

; ------------ Normal
; Patch104p @bugfix xezon 09/02/2023 Hide all muzzle flash meshes explicitly because otherwise they can show on death.
; Patch104p @bugfix commy2 05/08/2023 Fix muzzle flash of upgraded version. Also fix recoil animation.
DefaultConditionState
Model = UVLiteTank
Turret = Turret ; Logic twist bone is always this, both turrets are subobjects of it, as are both missile racks
; note, order-dependent: we must hide/show Missile AFTER we hide/show MissileRack!
ShowSubObject = Turret01
HideSubObject = MissleRack01 MissleRack02 TurretUP01 MuzzleFX01 MuzzleFX02; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle
WeaponRecoilBone = PRIMARY Barrel
WeaponMuzzleFlash = PRIMARY MuzzleFX
WeaponLaunchBone = PRIMARY Muzzle
WeaponFireFXBone = PRIMARY Muzzle01
WeaponRecoilBone = PRIMARY Barrel01
WeaponMuzzleFlash = PRIMARY MuzzleFX01
WeaponLaunchBone = PRIMARY Muzzle01
End

ConditionState = REALLYDAMAGED
Expand All @@ -17519,13 +17520,21 @@ Object Demo_GLATankScorpion
ConditionState = WEAPONSET_CRATEUPGRADE_ONE ; one or two crates is a turret switch
ShowSubObject = TurretUP01
HideSubObject = MissleRack01 MissleRack02 Turret01 ; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
End
AliasConditionState = WEAPONSET_CRATEUPGRADE_TWO

ConditionState = WEAPONSET_CRATEUPGRADE_ONE REALLYDAMAGED
Model = UVLiteTank_d
ShowSubObject = TurretUP01
HideSubObject = MissleRack01 MissleRack02 Turret01 ; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
End
AliasConditionState = WEAPONSET_CRATEUPGRADE_TWO REALLYDAMAGED

Expand Down Expand Up @@ -17576,6 +17585,10 @@ Object Demo_GLATankScorpion
ConditionState = WEAPONSET_PLAYER_UPGRADE WEAPONSET_CRATEUPGRADE_ONE
ShowSubObject = MissleRack01 TurretUP01
HideSubObject = MissleRack02 Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -17584,6 +17597,10 @@ Object Demo_GLATankScorpion
Model = UVLiteTank_d
ShowSubObject = MissleRack01 TurretUP01
HideSubObject = MissleRack02 Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -17606,6 +17623,10 @@ Object Demo_GLATankScorpion
ConditionState = WEAPONSET_PLAYER_UPGRADE WEAPONSET_CRATEUPGRADE_TWO
ShowSubObject = MissleRack01 MissleRack02 TurretUP01
HideSubObject = Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -17614,6 +17635,10 @@ Object Demo_GLATankScorpion
Model = UVLiteTank_d
ShowSubObject = MissleRack01 MissleRack02 TurretUP01
HideSubObject = Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand Down
9 changes: 5 additions & 4 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/GC_Chem_GLAUnits.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1733,16 +1733,17 @@ Object GC_Chem_GLATankScorpion
ProjectileBoneFeedbackEnabledSlots = SECONDARY ; WeaponLaunchBone will be shown/hidden, not just used for firing offset

; Patch104p @bugfix xezon 09/02/2023 Hide all muzzle flash meshes explicitly because otherwise they can show on death.
; Patch104p @bugfix commy2 05/08/2023 Fix muzzle flash and recoil animation.
DefaultConditionState
Model = UVLiteTank
Turret = Turret ; Logic twist bone is always this, both turrets are subobjects of it, as are both missile racks
; note, order-dependent: we must hide/show Missile AFTER we hide/show MissileRack!
ShowSubObject = TurretUP01
HideSubObject = MissleRack01 MissleRack02 Turret01 MuzzleFX01 MuzzleFX02; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle
WeaponRecoilBone = PRIMARY Barrel
WeaponMuzzleFlash = PRIMARY MuzzleFX
WeaponLaunchBone = PRIMARY Muzzle
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
End

ConditionState = REALLYDAMAGED
Expand Down
33 changes: 29 additions & 4 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 @@ -21,16 +21,17 @@ Object GLATankScorpion

; ------------ Normal
; Patch104p @bugfix xezon 09/02/2023 Hide all muzzle flash meshes explicitly because otherwise they can show on death.
; Patch104p @bugfix commy2 05/08/2023 Fix muzzle flash of upgraded version. Also fix recoil animation.
DefaultConditionState
Model = UVLiteTank
Turret = Turret ; Logic twist bone is always this, both turrets are subobjects of it, as are both missile racks
; note, order-dependent: we must hide/show Missile AFTER we hide/show MissileRack!
ShowSubObject = Turret01
HideSubObject = MissleRack01 MissleRack02 TurretUP01 MuzzleFX01 MuzzleFX02; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle
WeaponRecoilBone = PRIMARY Barrel
WeaponMuzzleFlash = PRIMARY MuzzleFX
WeaponLaunchBone = PRIMARY Muzzle
WeaponFireFXBone = PRIMARY Muzzle01
WeaponRecoilBone = PRIMARY Barrel01
WeaponMuzzleFlash = PRIMARY MuzzleFX01
WeaponLaunchBone = PRIMARY Muzzle01
End

ConditionState = REALLYDAMAGED
Expand All @@ -50,13 +51,21 @@ Object GLATankScorpion
ConditionState = WEAPONSET_CRATEUPGRADE_ONE ; one or two crates is a turret switch
ShowSubObject = TurretUP01
HideSubObject = MissleRack01 MissleRack02 Turret01 ; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
End
AliasConditionState = WEAPONSET_CRATEUPGRADE_TWO

ConditionState = WEAPONSET_CRATEUPGRADE_ONE REALLYDAMAGED
Model = UVLiteTank_d
ShowSubObject = TurretUP01
HideSubObject = MissleRack01 MissleRack02 Turret01 ; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
End
AliasConditionState = WEAPONSET_CRATEUPGRADE_TWO REALLYDAMAGED

Expand Down Expand Up @@ -107,6 +116,10 @@ Object GLATankScorpion
ConditionState = WEAPONSET_PLAYER_UPGRADE WEAPONSET_CRATEUPGRADE_ONE
ShowSubObject = MissleRack01 TurretUP01
HideSubObject = MissleRack02 Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -115,6 +128,10 @@ Object GLATankScorpion
Model = UVLiteTank_d
ShowSubObject = MissleRack01 TurretUP01
HideSubObject = MissleRack02 Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -137,6 +154,10 @@ Object GLATankScorpion
ConditionState = WEAPONSET_PLAYER_UPGRADE WEAPONSET_CRATEUPGRADE_TWO
ShowSubObject = MissleRack01 MissleRack02 TurretUP01
HideSubObject = Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -145,6 +166,10 @@ Object GLATankScorpion
Model = UVLiteTank_d
ShowSubObject = MissleRack01 MissleRack02 TurretUP01
HideSubObject = Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand Down
33 changes: 29 additions & 4 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 @@ -17828,16 +17828,17 @@ Object Slth_GLATankScorpion

; ------------ Normal
; Patch104p @bugfix xezon 09/02/2023 Hide all muzzle flash meshes explicitly because otherwise they can show on death.
; Patch104p @bugfix commy2 05/08/2023 Fix muzzle flash of upgraded version. Also fix recoil animation.
DefaultConditionState
Model = UVLiteTank
Turret = Turret ; Logic twist bone is always this, both turrets are subobjects of it, as are both missile racks
; note, order-dependent: we must hide/show Missile AFTER we hide/show MissileRack!
ShowSubObject = Turret01
HideSubObject = MissleRack01 MissleRack02 TurretUP01 MuzzleFX01 MuzzleFX02; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle
WeaponRecoilBone = PRIMARY Barrel
WeaponMuzzleFlash = PRIMARY MuzzleFX
WeaponLaunchBone = PRIMARY Muzzle
WeaponFireFXBone = PRIMARY Muzzle01
WeaponRecoilBone = PRIMARY Barrel01
WeaponMuzzleFlash = PRIMARY MuzzleFX01
WeaponLaunchBone = PRIMARY Muzzle01
End

ConditionState = REALLYDAMAGED
Expand All @@ -17857,13 +17858,21 @@ Object Slth_GLATankScorpion
ConditionState = WEAPONSET_CRATEUPGRADE_ONE ; one or two crates is a turret switch
ShowSubObject = TurretUP01
HideSubObject = MissleRack01 MissleRack02 Turret01 ; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
End
AliasConditionState = WEAPONSET_CRATEUPGRADE_TWO

ConditionState = WEAPONSET_CRATEUPGRADE_ONE REALLYDAMAGED
Model = UVLiteTank_d
ShowSubObject = TurretUP01
HideSubObject = MissleRack01 MissleRack02 Turret01 ; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
End
AliasConditionState = WEAPONSET_CRATEUPGRADE_TWO REALLYDAMAGED

Expand Down Expand Up @@ -17914,6 +17923,10 @@ Object Slth_GLATankScorpion
ConditionState = WEAPONSET_PLAYER_UPGRADE WEAPONSET_CRATEUPGRADE_ONE
ShowSubObject = MissleRack01 TurretUP01
HideSubObject = MissleRack02 Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -17922,6 +17935,10 @@ Object Slth_GLATankScorpion
Model = UVLiteTank_d
ShowSubObject = MissleRack01 TurretUP01
HideSubObject = MissleRack02 Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -17944,6 +17961,10 @@ Object Slth_GLATankScorpion
ConditionState = WEAPONSET_PLAYER_UPGRADE WEAPONSET_CRATEUPGRADE_TWO
ShowSubObject = MissleRack01 MissleRack02 TurretUP01
HideSubObject = Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand All @@ -17952,6 +17973,10 @@ Object Slth_GLATankScorpion
Model = UVLiteTank_d
ShowSubObject = MissleRack01 MissleRack02 TurretUP01
HideSubObject = Turret01; MissileRack misspelled in the Art
WeaponFireFXBone = PRIMARY Muzzle02
WeaponRecoilBone = PRIMARY Barrel02
WeaponMuzzleFlash = PRIMARY MuzzleFX02
WeaponLaunchBone = PRIMARY Muzzle02
WeaponFireFXBone = SECONDARY WeaponA
WeaponLaunchBone = SECONDARY WeaponA
End
Expand Down