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 scope refactor #1729

Closed
wants to merge 9 commits into from
Closed

Feature scope refactor #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
63ce0da
initial commit
Enfield-303 Sep 28, 2024
830948b
incremental commit
Enfield-303 Sep 29, 2024
2269376
Incremental commit, fixed the K98 scope this time
Enfield-303 Sep 30, 2024
d1e749e
Disabling bUsesIronsightFOV
Enfield-303 Sep 30, 2024
ee9509c
Revert "Disabling bUsesIronsightFOV"
Enfield-303 Oct 1, 2024
cb132c2
british and german scopes complete. removed added yaw from the scoped…
Enfield-303 Oct 1, 2024
92aa2ed
textures complete
Enfield-303 Oct 1, 2024
3e2b1c0
scopes complete (for real this time)
Enfield-303 Oct 1, 2024
71ac11e
Zeroed and completed the scope refactor
Enfield-303 Oct 1, 2024
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
5 changes: 3 additions & 2 deletions DH_Engine/Classes/DHWeaponRegistry.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ defaultproperties
Records(8)=(ClassName="DH_Weapons.DH_DP27Weapon",WeaponNames=("dp27"))
Records(9)=(ClassName="DH_Weapons.DH_EnfieldNo2Weapon",WeaponNames=("enfield2", "webley"))
Records(10)=(ClassName="DH_Weapons.DH_EnfieldNo4Weapon",WeaponNames=("enfield", "enfield4"))
Records(11)=(ClassName="DH_Weapons.DH_EnfieldNo4ScopedWeapon",WeaponNames=("enfieldscoped", "enfield4scoped"))
Records(11)=(ClassName="DH_Weapons.DH_EnfieldNo4ScopedWeapon",WeaponNames=("enfieldscoped", "enfield4scoped", "no4scoped", "no4T"))
Records(12)=(ClassName="DH_Weapons.DH_F1GrenadeWeapon",WeaponNames=("f1"))
Records(13)=(ClassName="DH_Weapons.DH_FG42Weapon",WeaponNames=("fg42"))
Records(14)=(ClassName="DH_Weapons.DH_G41Weapon",WeaponNames=("g41"))
Expand All @@ -78,7 +78,7 @@ defaultproperties
Records(18)=(ClassName="DH_Weapons.DH_GreaseGunWeapon",WeaponNames=("greasegun"))
Records(19)=(ClassName="DH_Weapons.DH_Kar98Weapon",WeaponNames=("k98", "kar98"))
Records(20)=(ClassName="DH_Weapons.DH_Kar98NoCoverWeapon",WeaponNames=("k98nohood"))
Records(21)=(ClassName="DH_Weapons.DH_Kar98ScopedWeapon",WeaponNames=("k98scoped", "kar98scoped"))
Records(21)=(ClassName="DH_Weapons.DH_Kar98ScopedWeapon",WeaponNames=("k98scoped", "kar98scoped","scopedk98"))
Records(22)=(ClassName="DH_Weapons.DH_KorovinWeapon",WeaponNames=("korovin"))
Records(23)=(ClassName="DH_Weapons.DH_Kz8cmGrW42Weapon",bShouldExcludeFromGiveAll=true,WeaponNames=("grw42"))
Records(24)=(ClassName="DH_Weapons.DH_M1928_20rndWeapon",WeaponNames=("m1928-20"))
Expand Down Expand Up @@ -170,5 +170,6 @@ defaultproperties
Records(110)=(ClasSName="DH_Weapons.DH_MKB42HWeapon",WeaponNames=("mkb42","mkb42h"))
Records(111)=(ClassName="DH_Weapons.DH_FG42ScopedWeapon",WeaponNames=("fg42scoped", "zfg42"))
Records(112)=(ClassName="DH_Weapons.DH_WitchEnder666Weapon",WeaponNames=("WitchEnder", "satansbane"))
Records(113)=(ClassName="DH_Weapons.DH_MN9130ScopedWeapon",WeaponNames=("mosinscoped","scopedmosinpu","scopedmosinlate"))

}
1 change: 0 additions & 1 deletion DH_Weapons/Classes/DH_EnfieldNo4ScopedFire.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ defaultproperties
AmmoClass=class'DH_Weapons.DH_EnfieldNo4ScopedAmmo'
Spread=20.0
AddedPitch=10
AddedYaw=9
PctRestDeployRecoil=0.25
FireSounds(0)=SoundGroup'DH_WeaponSounds.EnfieldNo4.EnfieldRifle_Fire01'
FireSounds(1)=SoundGroup'DH_WeaponSounds.EnfieldNo4.EnfieldRifle_Fire02'
Expand Down
2 changes: 1 addition & 1 deletion DH_Weapons/Classes/DH_EnfieldNo4ScopedWeapon.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defaultproperties
bPlusOneLoading=true

ScopeOverlay=Texture'DH_Weapon_tex.Scopes.EnfieldNo4_Scope_Overlay'
ScriptedScopeTexture=Texture'DH_EnfieldNo4_tex.EnfieldNo4.EnfieldNo4_Scope_3D'
ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.EnfieldNo4_Scope_overlay'

ScopeOverlaySize=0.54 // size of the scope overlay (1.0 means full screen width, 0.5 means half screen width, etc)
OverlayCorrectionX=-1.5
Expand Down
1 change: 1 addition & 0 deletions DH_Weapons/Classes/DH_FG42ScopedWeapon.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ defaultproperties
// Scope
bHasScope=true
ScopeOverlay=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay'
ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay'
ScopeOverlaySize=0.32
IronSightDisplayFOV=47.0
IronSightDisplayFOVHigh=47.0
Expand Down
2 changes: 1 addition & 1 deletion DH_Weapons/Classes/DH_G43ScopedFire.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class DH_G43ScopedFire extends DH_G43Fire;
defaultproperties
{
Spread=40.0
AddedPitch=5
AddedPitch=16

ProjectileClass=class'DH_Weapons.DH_G43ScopedBullet'
FireIronAnim="Scope_Shoot"
Expand Down
2 changes: 1 addition & 1 deletion DH_Weapons/Classes/DH_G43ScopedWeapon.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defaultproperties

bHasScope=true
ScopeOverlay=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay'
//ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay' //to do: proper 3d scope texture
ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay' //to do: proper 3d scope texture

DisplayFOV=83.0
IronSightDisplayFOV=45.5
Expand Down
2 changes: 1 addition & 1 deletion DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ defaultproperties
bHasScope=true
bIsSniper=true
ScopeOverlay=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay'
//ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay' //to do: proper 3d scope texture
ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay' //to do: proper 3d scope texture
DisplayFOV=88.0
IronSightDisplayFOV=45.0
IronSightDisplayFOVHigh=45.0
Expand Down
2 changes: 1 addition & 1 deletion DH_Weapons/Classes/DH_Kar98ScopedZF41Weapon.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ defaultproperties
bIsSniper=true
bForceModelScope=true
ScopeOverlay=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay'
//ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay' //to do: proper 3d scope texture
ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.Ger_ZF41sniperscoped_overlay' //to do: proper 3d scope texture

IronSightDisplayFOV=40.0
IronSightDisplayFOVHigh=40.0 //
Expand Down
2 changes: 1 addition & 1 deletion DH_Weapons/Classes/DH_MN9130ScopedPEWeapon.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defaultproperties
bHasScope=true
bIsSniper=true
ScopeOverlay=Texture'DH_Weapon_tex.Scopes.USSR_PU_Scope_Overlay'
//ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.USSR_PU_Scope_Overlay' //to do: proper 3d scope texture
ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.USSR_PU_Scope_Overlay' //to do: proper 3d scope texture

ScopeOverlaySize=0.366 // size of the scope overlay (1.0 means full screen width, 0.5 means half screen width, etc)
DisplayFOV=82.0
Expand Down
2 changes: 1 addition & 1 deletion DH_Weapons/Classes/DH_MN9130ScopedWeapon.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defaultproperties
bHasScope=true
bIsSniper=true
ScopeOverlay=Texture'DH_Weapon_tex.Scopes.USSR_PU_Scope_Overlay'
//ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.USSR_PU_Scope_Overlay' //to do: proper 3d scope texture
ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.USSR_PU_Scope_Overlay' //to do: proper 3d scope texture

ScopeOverlaySize=0.266 // size of the scope overlay (1.0 means full screen width, 0.5 means half screen width, etc)
DisplayFOV=82.0
Expand Down
1 change: 1 addition & 0 deletions DH_Weapons/Classes/DH_STG44ScopedFire.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ defaultproperties
FAProjSpawnOffset=(X=-28.0)
FireRate=0.135 // ~491rpm (value had to be found experimentally due to an engine bug)

AddedPitch=20.0
Spread=60.0

// Recoil
Expand Down
2 changes: 1 addition & 1 deletion DH_Weapons/Classes/DH_STG44ScopedWeapon.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defaultproperties

bHasScope=true
ScopeOverlay=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay'
//ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay' //to do: proper 3d scope texture
ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay' //to do: proper 3d scope texture
bIsSniper=true
FreeAimRotationSpeed=6.0
BobModifyFactor=0.85
Expand Down
2 changes: 1 addition & 1 deletion DH_Weapons/Classes/DH_SVT40ScopedFire.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class DH_SVT40ScopedFire extends DH_SVT40Fire;
defaultproperties
{
Spread=45.0
AddedPitch=10
AddedPitch=10.0
FireIronAnim="Scope_shoot"
ProjectileClass=class'DH_Weapons.DH_SVT40ScopedBullet'
FireLastAnim="shoot_last"
Expand Down
2 changes: 1 addition & 1 deletion DH_Weapons/Classes/DH_SVT40ScopedWeapon.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ defaultproperties

bHasScope=true
ScopeOverlay=Texture'DH_Weapon_tex.Scopes.USSR_PU_Scope_Overlay'
//ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.USSR_PU_Scope_Overlay' //to do: proper 3d scope texture
ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.USSR_PU_Scope_Overlay' //to do: proper 3d scope texture

IronSightDisplayFOV=48.2
IronSightDisplayFOVHigh=48.2
Expand Down
2 changes: 1 addition & 1 deletion DH_Weapons/Classes/DH_Vz24ScopedWeapon.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ defaultproperties
bHasScope=true
bIsSniper=true
ScopeOverlay=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay'
//ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay' //to do: proper 3d scope texture
ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay' //to do: proper 3d scope texture
DisplayFOV=88.0
IronSightDisplayFOV=38.0
IronSightDisplayFOVHigh=38.0
Expand Down
4 changes: 2 additions & 2 deletions DarkestHourDev/Textures/DH_Weapon_tex.utx
View file
Open in desktop
Git LFS file not shown
Loading