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

Feature tankview refactor #1529

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Feature tankview refactor #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a0366e
Sherman 105 sight correction and cupola view zoom
Enfield-303 Nov 21, 2022
df12636
Removed arbitrary cupola view from the stug
Enfield-303 Nov 21, 2022
3585fb0
Updated FOV
Enfield-303 Nov 21, 2022
99584eb
Tank sight recalibration
Enfield-303 Nov 21, 2022
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: 2 additions & 0 deletions DH_Vehicles/Classes/DH_GreyhoundCannonPawn.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ defaultproperties
AmmoShellTexture=Texture'DH_InterfaceArt_tex.Tank_Hud.StuartShell'
AmmoShellReloadTexture=Texture'DH_InterfaceArt_tex.Tank_Hud.StuartShell_reload'
FireImpulse=(X=-30000.0)
OverlayCorrectionX=3
OverlayCorrectionY=18
}
2 changes: 2 additions & 0 deletions DH_Vehicles/Classes/DH_HellcatCannonPawn.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ defaultproperties
PoweredPitchSound=Sound'Vehicle_Weapons.Turret.manual_turret_elevate'
PoweredRotateAndPitchSound=Sound'Vehicle_Weapons.Turret.hydraul_turret_traverse'
FireImpulse=(X=-95000.0)
OverlayCorrectionX=2
OverlayCorrectionY=10
}
1 change: 1 addition & 0 deletions DH_Vehicles/Classes/DH_JacksonCannonPawn.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ defaultproperties
PoweredPitchSound=Sound'Vehicle_Weapons.Turret.manual_turret_elevate'
PoweredRotateAndPitchSound=Sound'Vehicle_Weapons.Turret.hydraul_turret_traverse'
FireImpulse=(X=-100000.0)
OverlayCorrectionY=10
}
2 changes: 2 additions & 0 deletions DH_Vehicles/Classes/DH_JacksonCannonPawn_Early.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ class DH_JacksonCannonPawn_Early extends DH_JacksonCannonPawn;
defaultproperties
{
GunClass=class'DH_Vehicles.DH_JacksonCannon_Early'
OverlayCorrectionX=-4
OverlayCorrectionY=10
}
2 changes: 2 additions & 0 deletions DH_Vehicles/Classes/DH_ShermanCannonPawn.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ defaultproperties
//Gunsight
GunsightOverlay=Texture'DH_VehicleOptics_tex.US.Sherman_sight_background'
GunsightSize=0.492 // 12.3 degrees visible FOV at 3x magnification (M70F sight)
OverlayCorrectionX=-6
OverlayCorrectionY=10

//HUD
DestroyedGunsightOverlay=Texture'DH_VehicleOpticsDestroyed_tex.Allied.Sherman_sight_destroyed'
Expand Down
1 change: 1 addition & 0 deletions DH_Vehicles/Classes/DH_ShermanCannonPawnA_76mm.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ defaultproperties
PoweredPitchSound=Sound'Vehicle_Weapons.Turret.manual_turret_elevate'
PoweredRotateAndPitchSound=Sound'DH_AlliedVehicleSounds.Sherman.ShermanTurretTraverse'
FireImpulse=(X=-95000.0)
OverlayCorrectionY=10
}
2 changes: 2 additions & 0 deletions DH_Vehicles/Classes/DH_ShermanCannonPawnB_76mm.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ defaultproperties
{
GunClass=class'DH_Vehicles.DH_ShermanCannonB_76mm'
FireImpulse=(X=-80000.0)
OverlayCorrectionX=-6
OverlayCorrectionY=10
}
12 changes: 7 additions & 5 deletions DH_Vehicles/Classes/DH_ShermanCannonPawn_M4A3105_Howitzer.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@ class DH_ShermanCannonPawn_M4A3105_Howitzer extends DHAmericanCannonPawn;
defaultproperties
{
GunClass=class'DH_Vehicles.DH_ShermanCannon_M4A3105_Howitzer'
DriverPositions(0)=(ViewLocation=(X=25.0,Y=18.0,Z=2.0),ViewFOV=28.33,PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.shermanM4A3105_turret_int',TransitionUpAnim="Periscope_in",ViewPitchUpLimit=4551,ViewPitchDownLimit=63715,ViewPositiveYawLimit=19000,ViewNegativeYawLimit=-20000,bDrawOverlays=true)
DriverPositions(1)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.shermanM4A3105_turret_int',TransitionUpAnim="periscope_out",ViewPitchUpLimit=1,ViewPitchDownLimit=65535,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536,bDrawOverlays=true)
DriverPositions(2)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.shermanM4A3105_turret_int',TransitionUpAnim="com_open",TransitionDownAnim="Periscope_in",ViewPitchUpLimit=1,ViewPitchDownLimit=65535,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536)
DriverPositions(3)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.shermanM4A3105_turret_int',TransitionDownAnim="com_close",DriverTransitionAnim="stand_idlehip_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=65535,ViewPositiveYawLimit=10000,ViewNegativeYawLimit=-10000,bExposed=true)
DriverPositions(4)=(ViewFOV=12.0,PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.shermanM4A3105_turret_int',DriverTransitionAnim="stand_idleiron_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=62500,ViewPositiveYawLimit=10000,ViewNegativeYawLimit=-10000,bDrawOverlays=true,bExposed=true)
DriverPositions(0)=(ViewLocation=(X=25.0,Y=18.0,Z=2.0),ViewFOV=28.33,PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.shermanM4A3105_turret_int',TransitionUpAnim="Periscope_in",ViewPitchUpLimit=4551,ViewPitchDownLimit=63715,ViewPositiveYawLimit=19000,ViewNegativeYawLimit=-20000,bDrawOverlays=true) //Gunsight
DriverPositions(1)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.shermanM4A3105_turret_int',TransitionUpAnim="periscope_out",ViewPitchUpLimit=1,ViewPitchDownLimit=65535,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536,bDrawOverlays=true) //vision block/periscope
DriverPositions(2)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.shermanM4A3105_turret_int',TransitionUpAnim="com_open",TransitionDownAnim="Periscope_in",ViewPitchUpLimit=1,ViewPitchDownLimit=65535,ViewPositiveYawLimit=65536,ViewFOV=50,ViewNegativeYawLimit=-65536) //cupola, buttoned up
DriverPositions(3)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.shermanM4A3105_turret_int',TransitionDownAnim="com_close",DriverTransitionAnim="stand_idlehip_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=65535,ViewPositiveYawLimit=10000,ViewNegativeYawLimit=-10000,bExposed=true) //cupola, exposed
DriverPositions(4)=(ViewFOV=12.0,PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.shermanM4A3105_turret_int',DriverTransitionAnim="stand_idleiron_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=62500,ViewPositiveYawLimit=10000,ViewNegativeYawLimit=-10000,bDrawOverlays=true,bExposed=true)//cupola, exposed, binocs
PeriscopePositionIndex=1
BinocPositionIndex=4
UnbuttonedPositionIndex=3
DrivePos=(X=3.0,Y=2.5,Z=4.5)
DriveAnim="stand_idlehip_binoc"
bManualTraverseOnly=true
OverlayCorrectionX=-7
OverlayCorrectionY=-15
GunsightOverlay=Texture'DH_VehicleOptics_tex.US.sherman105_sight_background'
GunsightSize=0.435 // 12.3 degrees visible FOV at 3x magnification (M72D sight) // TODO: find M72 sight properties
DestroyedGunsightOverlay=Texture'DH_VehicleOpticsDestroyed_tex.Allied.Sherman_sight_destroyed'
Expand Down
12 changes: 7 additions & 5 deletions DH_Vehicles/Classes/DH_ShermanCannonPawn_M4A3E2_Jumbo.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ class DH_ShermanCannonPawn_M4A3E2_Jumbo extends DHAmericanCannonPawn;
defaultproperties
{
GunClass=class'DH_Vehicles.DH_ShermanCannon_M4A3E2_Jumbo'
DriverPositions(0)=(ViewLocation=(X=24.0,Y=18.0,Z=2.0),ViewFOV=17.0,PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.ShermanM4A3E2_turret_int',ViewPitchUpLimit=4551,ViewPitchDownLimit=63715,ViewPositiveYawLimit=19000,ViewNegativeYawLimit=-20000,bDrawOverlays=true)
DriverPositions(1)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.ShermanM4A3E2_turret_int',TransitionUpAnim="Periscope_in",ViewPitchUpLimit=1,ViewPitchDownLimit=65535,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536,bDrawOverlays=true)
DriverPositions(2)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.ShermanM4A3E2_turret_int',TransitionUpAnim="com_open",TransitionDownAnim="periscope_out",ViewPitchUpLimit=10000,ViewPitchDownLimit=65535,ViewPositiveYawLimit=10000,ViewNegativeYawLimit=-10000)
DriverPositions(3)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.ShermanM4A3E2_turret_int',TransitionDownAnim="com_close",DriverTransitionAnim="stand_idlehip_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=62500,ViewPositiveYawLimit=10000,ViewNegativeYawLimit=-10000,bExposed=true)
DriverPositions(4)=(ViewFOV=12.0,PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.ShermanM4A3E2_turret_int',DriverTransitionAnim="stand_idleiron_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=62500,ViewPositiveYawLimit=10000,ViewNegativeYawLimit=-10000,bDrawOverlays=true,bExposed=true)
DriverPositions(0)=(ViewLocation=(X=24.0,Y=18.0,Z=2.0),ViewFOV=17.0,PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.ShermanM4A3E2_turret_int',ViewPitchUpLimit=4551,ViewPitchDownLimit=63715,ViewPositiveYawLimit=19000,ViewNegativeYawLimit=-20000,bDrawOverlays=true) //gunsight
DriverPositions(1)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.ShermanM4A3E2_turret_int',TransitionUpAnim="Periscope_in",ViewPitchUpLimit=1,ViewPitchDownLimit=65535,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536,bDrawOverlays=true)//vison block/periscope
DriverPositions(2)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.ShermanM4A3E2_turret_int',TransitionUpAnim="com_open",TransitionDownAnim="periscope_out",ViewPitchUpLimit=10000,ViewPitchDownLimit=65535,ViewPositiveYawLimit=10000,ViewFOV=50,ViewNegativeYawLimit=-10000)//cupola, buttoned up
DriverPositions(3)=(PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.ShermanM4A3E2_turret_int',TransitionDownAnim="com_close",DriverTransitionAnim="stand_idlehip_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=62500,ViewPositiveYawLimit=10000,ViewNegativeYawLimit=-10000,bExposed=true)//cupola, exposed
DriverPositions(4)=(ViewFOV=12.0,PositionMesh=SkeletalMesh'DH_ShermanM4A3_anm.ShermanM4A3E2_turret_int',DriverTransitionAnim="stand_idleiron_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=62500,ViewPositiveYawLimit=10000,ViewNegativeYawLimit=-10000,bDrawOverlays=true,bExposed=true)//cupola, exposed, binocs
PeriscopePositionIndex=1
UnbuttonedPositionIndex=3
BinocPositionIndex=4
Expand All @@ -26,4 +26,6 @@ defaultproperties
PoweredRotateSound=Sound'DH_AlliedVehicleSounds.Sherman.ShermanTurretTraverse'
PoweredPitchSound=Sound'Vehicle_Weapons.Turret.manual_turret_elevate'
PoweredRotateAndPitchSound=Sound'DH_AlliedVehicleSounds.Sherman.ShermanTurretTraverse'
OverlayCorrectionX=-3
OverlayCorrectionY=10
}
1 change: 1 addition & 0 deletions DH_Vehicles/Classes/DH_ShermanFireFlyCannonPawn.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ defaultproperties
PoweredPitchSound=Sound'Vehicle_Weapons.Turret.manual_turret_elevate'
PoweredRotateAndPitchSound=Sound'DH_AlliedVehicleSounds.Sherman.ShermanTurretTraverse'
FireImpulse=(X=-100000.0)
OverlayCorrectionX=-3
}
1 change: 1 addition & 0 deletions DH_Vehicles/Classes/DH_StuartCannonPawn.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@ defaultproperties
PoweredPitchSound=Sound'Vehicle_Weapons.Turret.manual_turret_elevate'
PoweredRotateAndPitchSound=Sound'DH_AlliedVehicleSounds.Sherman.ShermanTurretTraverse'
FireImpulse=(X=-30000.0)
OverlayCorrectionY=20
}
13 changes: 7 additions & 6 deletions DH_Vehicles/Classes/DH_Stug3GCannonPawn.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ class DH_Stug3GCannonPawn extends DHAssaultGunCannonPawn;
defaultproperties
{
GunClass=class'DH_Vehicles.DH_Stug3GCannon'
DriverPositions(0)=(ViewLocation=(Y=-32.0,Z=30.0),ViewFOV=17.0,PositionMesh=SkeletalMesh'DH_Stug3G_anm.Stug3g_turret_int',ViewPitchUpLimit=3641,ViewPitchDownLimit=64444,ViewPositiveYawLimit=2000,ViewNegativeYawLimit=-2000,bDrawOverlays=true)
DriverPositions(1)=(ViewLocation=(Z=16.0),ViewFOV=11.25,PositionMesh=SkeletalMesh'DH_Stug3G_anm.Stug3g_turret_int',ViewPitchUpLimit=500,ViewPitchDownLimit=62940,ViewPositiveYawLimit=12000,ViewNegativeYawLimit=-12000,bDrawOverlays=true)
DriverPositions(2)=(ViewLocation=(Z=-0.25),ViewFOV=45.0,PositionMesh=SkeletalMesh'DH_Stug3G_anm.Stug3g_turret_int',ViewPitchUpLimit=10000,ViewPitchDownLimit=64500,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536)
DriverPositions(3)=(ViewLocation=(Z=0.8),ViewFOV=45.0,PositionMesh=SkeletalMesh'DH_Stug3G_anm.Stug3g_turret_int',TransitionUpAnim="com_open",DriverTransitionAnim="stand_idlehip_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=64500,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536)
DriverPositions(4)=(PositionMesh=SkeletalMesh'DH_Stug3G_anm.Stug3g_turret_int',TransitionDownAnim="com_close",DriverTransitionAnim="VStug3_com_open",ViewPitchUpLimit=10000,ViewPitchDownLimit=64500,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536,bExposed=true)
DriverPositions(5)=(ViewFOV=12.0,PositionMesh=SkeletalMesh'DH_Stug3G_anm.Stug3g_turret_int',DriverTransitionAnim="stand_idleiron_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=60000,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536,bDrawOverlays=true,bExposed=true)
DriverPositions(0)=(ViewLocation=(Y=-32.0,Z=30.0),ViewFOV=17.0,PositionMesh=SkeletalMesh'DH_Stug3G_anm.Stug3g_turret_int',ViewPitchUpLimit=3641,ViewPitchDownLimit=64444,ViewPositiveYawLimit=2000,ViewNegativeYawLimit=-2000,bDrawOverlays=true) //gunsight
DriverPositions(1)=(ViewLocation=(Z=16.0),ViewFOV=11.25,PositionMesh=SkeletalMesh'DH_Stug3G_anm.Stug3g_turret_int',ViewPitchUpLimit=500,ViewPitchDownLimit=62940,ViewPositiveYawLimit=12000,ViewNegativeYawLimit=-12000,bDrawOverlays=true) //periscope
DriverPositions(2)=(ViewLocation=(Z=0.0),ViewFOV=50.0,PositionMesh=SkeletalMesh'DH_Stug3G_anm.Stug3g_turret_int',TransitionUpAnim="com_open",DriverTransitionAnim="stand_idlehip_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=64500,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536)//cupola, buttoned up
DriverPositions(3)=(PositionMesh=SkeletalMesh'DH_Stug3G_anm.Stug3g_turret_int',TransitionDownAnim="com_close",DriverTransitionAnim="VStug3_com_open",ViewPitchUpLimit=10000,ViewPitchDownLimit=64500,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536,bExposed=true) //cupola, exposed
DriverPositions(4)=(ViewFOV=12.0,PositionMesh=SkeletalMesh'DH_Stug3G_anm.Stug3g_turret_int',DriverTransitionAnim="stand_idleiron_binoc",ViewPitchUpLimit=10000,ViewPitchDownLimit=60000,ViewPositiveYawLimit=65536,ViewNegativeYawLimit=-65536,bDrawOverlays=true,bExposed=true) //cupola, exposed, binocs
PeriscopePositionIndex=1
UnbuttonedPositionIndex=4
BinocPositionIndex=5
Expand All @@ -24,4 +23,6 @@ defaultproperties
GunsightSize=0.471 // 8 degrees visible FOV at 5x magnification (Sfl.ZF1a sight)
AmmoShellTexture=Texture'InterfaceArt_tex.Tank_Hud.panzer4F2shell'
AmmoShellReloadTexture=Texture'InterfaceArt_tex.Tank_Hud.panzer4F2shell_reload'
OverlayCorrectionX=10

}
2 changes: 2 additions & 0 deletions DH_Vehicles/Classes/DH_WolverineCannonPawn.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ defaultproperties
GunsightOverlay=Texture'DH_VehicleOptics_tex.US.Wolverine_sight_background'
GunsightSize=0.492 // 12.3 degrees visible FOV at 3x magnification (M70G sight)
DestroyedGunsightOverlay=Texture'DH_VehicleOpticsDestroyed_tex.Allied.Wolverine_sight_destroyed'
OverlayCorrectionX=1
OverlayCorrectionY=23

//HUD
AmmoShellTexture=Texture'DH_InterfaceArt_tex.Tank_Hud.WolverineShell'
Expand Down
2 changes: 2 additions & 0 deletions DH_Vehicles/Classes/DH_WolverineCannonPawn_Early.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ class DH_WolverineCannonPawn_Early extends DH_WolverineCannonPawn;
defaultproperties
{
GunClass=class'DH_Vehicles.DH_WolverineCannon_Early'
OverlayCorrectionX=3
OverlayCorrectionY=23
}