From 63ce0da3ef451533357acdf8fd118647f579567c Mon Sep 17 00:00:00 2001 From: Enfield Date: Sat, 28 Sep 2024 19:26:20 +0100 Subject: [PATCH 1/9] initial commit asdsad --- DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc | 2 +- DarkestHourDev/Textures/DH_Weapon_tex.utx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc b/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc index f7c2a1e303..834f980748 100644 --- a/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc @@ -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.testscope4_Overlay' //to do: proper 3d scope texture DisplayFOV=88.0 IronSightDisplayFOV=45.0 IronSightDisplayFOVHigh=45.0 diff --git a/DarkestHourDev/Textures/DH_Weapon_tex.utx b/DarkestHourDev/Textures/DH_Weapon_tex.utx index dafbe4f573..06ae6474e1 100644 --- a/DarkestHourDev/Textures/DH_Weapon_tex.utx +++ b/DarkestHourDev/Textures/DH_Weapon_tex.utx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f1c55ca984ea275f3d4cc26e342df179386c9d6b03ea6eb76f22eebcaa92d51 -size 27448221 +oid sha256:40e77242ca83dc0c0aa2a4d8d6b4e64664c7a7e4452f681d0a71937302e7b4d1 +size 32777298 From 830948b3d201206ebea3eddba234ba4e3d20ff5e Mon Sep 17 00:00:00 2001 From: Enfield Date: Sun, 29 Sep 2024 23:06:07 +0100 Subject: [PATCH 2/9] incremental commit not much done --- DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc | 2 +- DarkestHourDev/Textures/DH_Weapon_tex.utx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc b/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc index 834f980748..4914b0307b 100644 --- a/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc @@ -22,7 +22,7 @@ defaultproperties bHasScope=true bIsSniper=true ScopeOverlay=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay' - //ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.testscope4_Overlay' //to do: proper 3d scope texture + ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.testscope4_Overlay' //to do: proper 3d scope texture DisplayFOV=88.0 IronSightDisplayFOV=45.0 IronSightDisplayFOVHigh=45.0 diff --git a/DarkestHourDev/Textures/DH_Weapon_tex.utx b/DarkestHourDev/Textures/DH_Weapon_tex.utx index 06ae6474e1..37d5613865 100644 --- a/DarkestHourDev/Textures/DH_Weapon_tex.utx +++ b/DarkestHourDev/Textures/DH_Weapon_tex.utx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:40e77242ca83dc0c0aa2a4d8d6b4e64664c7a7e4452f681d0a71937302e7b4d1 +oid sha256:3064e5213d436cea9c697354d8e55466d1a4b291e366e8f53e9f3559f7b3dd39 size 32777298 From 22693764ef62494ee24f1458fe5fb51ed6116798 Mon Sep 17 00:00:00 2001 From: Enfield Date: Mon, 30 Sep 2024 22:47:04 +0100 Subject: [PATCH 3/9] Incremental commit, fixed the K98 scope this time Figured out how to do the alpha on the scopes correctly, it should all fall in place now --- DarkestHourDev/Textures/DH_Weapon_tex.utx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DarkestHourDev/Textures/DH_Weapon_tex.utx b/DarkestHourDev/Textures/DH_Weapon_tex.utx index 37d5613865..2c008abdcc 100644 --- a/DarkestHourDev/Textures/DH_Weapon_tex.utx +++ b/DarkestHourDev/Textures/DH_Weapon_tex.utx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3064e5213d436cea9c697354d8e55466d1a4b291e366e8f53e9f3559f7b3dd39 +oid sha256:a71b7e7244d0090933c0f9451b406b5d149d1b5c9b99f26cbf72ae80413e1430 size 32777298 From d1e749e6a247658da4a8dd5a9ccfa784fc2a1528 Mon Sep 17 00:00:00 2001 From: Enfield Date: Mon, 30 Sep 2024 23:56:16 +0100 Subject: [PATCH 4/9] Disabling bUsesIronsightFOV This change is here to adress the certain "annoying" aspect of using scoped weapons, it is found that it is offputting to people if the FOV zooms in along with the weapon. as well as this, keeping the FOV the same both incorporates a realistic aspect, as well as gives the user of the scoped weapon a greater perhipheral vison for any dangerous elements. thank alti for this change frfr --- DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc b/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc index 4914b0307b..ec4b973267 100644 --- a/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc @@ -26,13 +26,14 @@ defaultproperties DisplayFOV=88.0 IronSightDisplayFOV=45.0 IronSightDisplayFOVHigh=45.0 - PlayerFOVZoom=15.0 + PlayerFOVZoom=15 ScopePortalFOV=7.1 //very hard to find information on ZF39's field of view, + it wasnt a single scope but rather a variety of similar scopes ScopePortalFOVHigh=7.1 //i managed to find that it was approximately ~6.5 degrees (varied between manufacturers) LensMaterialID=5 - PlayerIronsightFOV=60.0 - bUsesIronsightFOV=true + PlayerIronsightFOV=90 + bUsesIronsightFOV=false // turning this off disables the weird FOV zoom in that is usefull on the ironsights, not so much for scopes + // setting it to false gives a greater perhipheral vison for the user ScopeOverlaySize=0.43 From ee9509ce6c010015e3fb0ec3a56bee4bc40affde Mon Sep 17 00:00:00 2001 From: Enfield Date: Tue, 1 Oct 2024 14:52:24 +0100 Subject: [PATCH 5/9] Revert "Disabling bUsesIronsightFOV" This reverts commit d1e749e6a247658da4a8dd5a9ccfa784fc2a1528. --- DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc b/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc index ec4b973267..4914b0307b 100644 --- a/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc @@ -26,14 +26,13 @@ defaultproperties DisplayFOV=88.0 IronSightDisplayFOV=45.0 IronSightDisplayFOVHigh=45.0 - PlayerFOVZoom=15 + PlayerFOVZoom=15.0 ScopePortalFOV=7.1 //very hard to find information on ZF39's field of view, + it wasnt a single scope but rather a variety of similar scopes ScopePortalFOVHigh=7.1 //i managed to find that it was approximately ~6.5 degrees (varied between manufacturers) LensMaterialID=5 - PlayerIronsightFOV=90 - bUsesIronsightFOV=false // turning this off disables the weird FOV zoom in that is usefull on the ironsights, not so much for scopes - // setting it to false gives a greater perhipheral vison for the user + PlayerIronsightFOV=60.0 + bUsesIronsightFOV=true ScopeOverlaySize=0.43 From cb132c2a5c50897226a173c980a998ff17e9c389 Mon Sep 17 00:00:00 2001 From: Enfield Date: Tue, 1 Oct 2024 17:35:53 +0100 Subject: [PATCH 6/9] british and german scopes complete. removed added yaw from the scoped enfield -Re-textured british and german scopes -removed AddedYaw from the scoped enfield (was leftover from trying to fix it) --- DH_Weapons/Classes/DH_EnfieldNo4ScopedFire.uc | 1 - DH_Weapons/Classes/DH_EnfieldNo4ScopedWeapon.uc | 2 +- DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc | 2 +- DarkestHourDev/Textures/DH_Weapon_tex.utx | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/DH_Weapons/Classes/DH_EnfieldNo4ScopedFire.uc b/DH_Weapons/Classes/DH_EnfieldNo4ScopedFire.uc index c4f77936c3..2bc4b05c16 100644 --- a/DH_Weapons/Classes/DH_EnfieldNo4ScopedFire.uc +++ b/DH_Weapons/Classes/DH_EnfieldNo4ScopedFire.uc @@ -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' diff --git a/DH_Weapons/Classes/DH_EnfieldNo4ScopedWeapon.uc b/DH_Weapons/Classes/DH_EnfieldNo4ScopedWeapon.uc index e0eff173f8..aece410720 100644 --- a/DH_Weapons/Classes/DH_EnfieldNo4ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_EnfieldNo4ScopedWeapon.uc @@ -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 diff --git a/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc b/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc index 4914b0307b..56b6517c66 100644 --- a/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_Kar98ScopedWeapon.uc @@ -22,7 +22,7 @@ defaultproperties bHasScope=true bIsSniper=true ScopeOverlay=Texture'DH_Weapon_tex.Scopes.Ger_sniperscope_overlay' - ScriptedScopeTexture=Texture'DH_Weapon_tex.Scopes.testscope4_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 diff --git a/DarkestHourDev/Textures/DH_Weapon_tex.utx b/DarkestHourDev/Textures/DH_Weapon_tex.utx index 2c008abdcc..be485d7f75 100644 --- a/DarkestHourDev/Textures/DH_Weapon_tex.utx +++ b/DarkestHourDev/Textures/DH_Weapon_tex.utx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a71b7e7244d0090933c0f9451b406b5d149d1b5c9b99f26cbf72ae80413e1430 -size 32777298 +oid sha256:88680f1da8bc9c00a56ca387a631e5d7dc072b92b7feee508d10bc9bcbe5574c +size 36272607 From 92aa2edac9b5552fb3329d29a207f019876856d5 Mon Sep 17 00:00:00 2001 From: Enfield Date: Tue, 1 Oct 2024 18:55:32 +0100 Subject: [PATCH 7/9] textures complete all scope textures complete --- DarkestHourDev/Textures/DH_Weapon_tex.utx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DarkestHourDev/Textures/DH_Weapon_tex.utx b/DarkestHourDev/Textures/DH_Weapon_tex.utx index be485d7f75..11ec0bafc2 100644 --- a/DarkestHourDev/Textures/DH_Weapon_tex.utx +++ b/DarkestHourDev/Textures/DH_Weapon_tex.utx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88680f1da8bc9c00a56ca387a631e5d7dc072b92b7feee508d10bc9bcbe5574c -size 36272607 +oid sha256:113e9b8569d46de0d3ada8f399e11de4ea8afa6a1b741e05c5345e3ba770f50f +size 40816605 From 3e2b1c03c1d039e7b709af1c2e7577a20c72aa4a Mon Sep 17 00:00:00 2001 From: Enfield Date: Tue, 1 Oct 2024 19:28:57 +0100 Subject: [PATCH 8/9] scopes complete (for real this time) --- DarkestHourDev/Textures/DH_Weapon_tex.utx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DarkestHourDev/Textures/DH_Weapon_tex.utx b/DarkestHourDev/Textures/DH_Weapon_tex.utx index 11ec0bafc2..10283d41c1 100644 --- a/DarkestHourDev/Textures/DH_Weapon_tex.utx +++ b/DarkestHourDev/Textures/DH_Weapon_tex.utx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:113e9b8569d46de0d3ada8f399e11de4ea8afa6a1b741e05c5345e3ba770f50f -size 40816605 +oid sha256:860807ef0e037f2d2f1a6ed57e5332525bcd0df0ae3ac1387e702f286c525d1d +size 46409302 From 71ac11e2e468024a7346d0110131a6d81bea685c Mon Sep 17 00:00:00 2001 From: Enfield Date: Tue, 1 Oct 2024 20:21:58 +0100 Subject: [PATCH 9/9] Zeroed and completed the scope refactor -re-zeroed all scoped weapons -full implimentation of new scope textures -removed herobrine --- DH_Engine/Classes/DHWeaponRegistry.uc | 5 +++-- DH_Weapons/Classes/DH_FG42ScopedWeapon.uc | 1 + DH_Weapons/Classes/DH_G43ScopedFire.uc | 2 +- DH_Weapons/Classes/DH_G43ScopedWeapon.uc | 2 +- DH_Weapons/Classes/DH_Kar98ScopedZF41Weapon.uc | 2 +- DH_Weapons/Classes/DH_MN9130ScopedPEWeapon.uc | 2 +- DH_Weapons/Classes/DH_MN9130ScopedWeapon.uc | 2 +- DH_Weapons/Classes/DH_STG44ScopedFire.uc | 1 + DH_Weapons/Classes/DH_STG44ScopedWeapon.uc | 2 +- DH_Weapons/Classes/DH_SVT40ScopedFire.uc | 2 +- DH_Weapons/Classes/DH_SVT40ScopedWeapon.uc | 2 +- DH_Weapons/Classes/DH_Vz24ScopedWeapon.uc | 2 +- 12 files changed, 14 insertions(+), 11 deletions(-) diff --git a/DH_Engine/Classes/DHWeaponRegistry.uc b/DH_Engine/Classes/DHWeaponRegistry.uc index b247e14ebf..70d914372f 100644 --- a/DH_Engine/Classes/DHWeaponRegistry.uc +++ b/DH_Engine/Classes/DHWeaponRegistry.uc @@ -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")) @@ -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")) @@ -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")) } diff --git a/DH_Weapons/Classes/DH_FG42ScopedWeapon.uc b/DH_Weapons/Classes/DH_FG42ScopedWeapon.uc index 1498054e27..463b9832a8 100644 --- a/DH_Weapons/Classes/DH_FG42ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_FG42ScopedWeapon.uc @@ -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 diff --git a/DH_Weapons/Classes/DH_G43ScopedFire.uc b/DH_Weapons/Classes/DH_G43ScopedFire.uc index cd1c1a1cc2..62d5eda627 100644 --- a/DH_Weapons/Classes/DH_G43ScopedFire.uc +++ b/DH_Weapons/Classes/DH_G43ScopedFire.uc @@ -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" diff --git a/DH_Weapons/Classes/DH_G43ScopedWeapon.uc b/DH_Weapons/Classes/DH_G43ScopedWeapon.uc index 86ad738d4d..256e89ef44 100644 --- a/DH_Weapons/Classes/DH_G43ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_G43ScopedWeapon.uc @@ -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 diff --git a/DH_Weapons/Classes/DH_Kar98ScopedZF41Weapon.uc b/DH_Weapons/Classes/DH_Kar98ScopedZF41Weapon.uc index 04603422b7..58c2f82032 100644 --- a/DH_Weapons/Classes/DH_Kar98ScopedZF41Weapon.uc +++ b/DH_Weapons/Classes/DH_Kar98ScopedZF41Weapon.uc @@ -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 // diff --git a/DH_Weapons/Classes/DH_MN9130ScopedPEWeapon.uc b/DH_Weapons/Classes/DH_MN9130ScopedPEWeapon.uc index e325e8adc9..61b85ef20d 100644 --- a/DH_Weapons/Classes/DH_MN9130ScopedPEWeapon.uc +++ b/DH_Weapons/Classes/DH_MN9130ScopedPEWeapon.uc @@ -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 diff --git a/DH_Weapons/Classes/DH_MN9130ScopedWeapon.uc b/DH_Weapons/Classes/DH_MN9130ScopedWeapon.uc index 4ce416f3ba..c97b4437ae 100644 --- a/DH_Weapons/Classes/DH_MN9130ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_MN9130ScopedWeapon.uc @@ -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 diff --git a/DH_Weapons/Classes/DH_STG44ScopedFire.uc b/DH_Weapons/Classes/DH_STG44ScopedFire.uc index 9b805c95ca..cc7c9f7dfb 100644 --- a/DH_Weapons/Classes/DH_STG44ScopedFire.uc +++ b/DH_Weapons/Classes/DH_STG44ScopedFire.uc @@ -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 diff --git a/DH_Weapons/Classes/DH_STG44ScopedWeapon.uc b/DH_Weapons/Classes/DH_STG44ScopedWeapon.uc index 437f271dfa..7dd6647f69 100644 --- a/DH_Weapons/Classes/DH_STG44ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_STG44ScopedWeapon.uc @@ -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 diff --git a/DH_Weapons/Classes/DH_SVT40ScopedFire.uc b/DH_Weapons/Classes/DH_SVT40ScopedFire.uc index d61d72263b..1b707b703a 100644 --- a/DH_Weapons/Classes/DH_SVT40ScopedFire.uc +++ b/DH_Weapons/Classes/DH_SVT40ScopedFire.uc @@ -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" diff --git a/DH_Weapons/Classes/DH_SVT40ScopedWeapon.uc b/DH_Weapons/Classes/DH_SVT40ScopedWeapon.uc index beaf687e67..848e92f0cb 100644 --- a/DH_Weapons/Classes/DH_SVT40ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_SVT40ScopedWeapon.uc @@ -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 diff --git a/DH_Weapons/Classes/DH_Vz24ScopedWeapon.uc b/DH_Weapons/Classes/DH_Vz24ScopedWeapon.uc index 2753362900..e4c74003fa 100644 --- a/DH_Weapons/Classes/DH_Vz24ScopedWeapon.uc +++ b/DH_Weapons/Classes/DH_Vz24ScopedWeapon.uc @@ -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