From 0ee6e2e0ca464ace53e4eab0f251c87c9f4fa900 Mon Sep 17 00:00:00 2001 From: Anton Tarasenko Date: Fri, 16 Jul 2021 16:00:48 +0700 Subject: [PATCH] Add changed for updates 001 and 002 --- .../Perks/Sharpshooter/NiceVetSharpshooter.uc | 37 +++++++++++------ .../Skills/NiceSkillSharpshooterControl.uc | 21 ++++++++++ .../Skills/NiceSkillSharpshooterDamage.uc | 8 ++++ .../Skills/NiceSkillSharpshooterHardWork.uc | 18 --------- .../Skills/NiceSkillSharpshooterTalent.uc | 8 ---- .../BaseWeaponClasses/NiceScopedWeapon.uc | 24 +++++------ sources/Weapons/NiceScopedWeapon.uc | 22 +++++----- sources/Weapons/NiceWeapon.uc | 12 +++--- .../HuntingRifle/NiceDamTypeHuntingRifle.uc | 5 ++- .../M99/NiceDamTypeM99SniperRifle.uc | 1 + .../SniperWeapons/Mauler/NiceDamTypeMauler.uc | 1 + .../SniperWeapons/Mauler/NiceMaulerFire.uc | 4 +- .../SniperWeapons/SVD/NiceDamTypeSVD.uc | 1 + .../SniperWeapons/SVD/NiceDamTypeSVDS.uc | 1 + .../SniperWeapons/VSSD/NiceDamTypeVSSDT.uc | 2 +- .../Winchester/NiceDamTypeWinchester.uc | 40 +++++++++---------- 16 files changed, 112 insertions(+), 93 deletions(-) create mode 100644 sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterControl.uc create mode 100644 sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterDamage.uc delete mode 100644 sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterHardWork.uc delete mode 100644 sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterTalent.uc diff --git a/sources/Perks/Sharpshooter/NiceVetSharpshooter.uc b/sources/Perks/Sharpshooter/NiceVetSharpshooter.uc index 3337e10..d2295c8 100644 --- a/sources/Perks/Sharpshooter/NiceVetSharpshooter.uc +++ b/sources/Perks/Sharpshooter/NiceVetSharpshooter.uc @@ -26,13 +26,24 @@ static function float GetNiceHeadShotDamMulti(KFPlayerReplicationInfo KFPRI, Nic nicePawn = NiceHumanPawn(nicePlayer.pawn); //if(IsPerkedPickup(pickupClass)){ ret += 0.25; - if(nicePawn != none && class'NiceVetSharpshooter'.static.hasSkill(nicePlayer, class'NiceSkillSharpshooterTalent')){ + if(nicePawn != none && class'NiceVetSharpshooter'.static.hasSkill(nicePlayer, class'NiceSkillSharpshooterDamage')){ calibratedTalentBonus = 0.1f * Min(nicePawn.calibrationScore, 3); ret *= (1.0 + calibratedTalentBonus); } //} return ret; } +static function int AddStunScore(KFPlayerReplicationInfo KFPRI, KFMonster Injured, KFPawn DamageTaker, int inStunScore, class DmgType) +{ + local NicePlayerController nicePlayer; + if (KFPRI != none) { + nicePlayer = NicePlayerController(KFPRI.Owner); + } + if(nicePlayer != none && class'NiceVetSharpshooter'.static.HasSkill(nicePlayer, class'NiceSkillSharpshooterControl')) { + return int(float(inStunScore) * class'NiceSkillSharpshooterControl'.default.stunMultiplier); + } + return inStunScore; +} static function float GetReloadSpeedModifierStatic(KFPlayerReplicationInfo KFPRI, class Other){ local float reloadMult; //local float reloadScale; @@ -46,15 +57,15 @@ static function float GetReloadSpeedModifierStatic(KFPlayerReplicationInfo KFPRI reloadMult = 1.0; if(nicePlayer != none) nicePawn = NiceHumanPawn(nicePlayer.pawn); - if(nicePlayer != none && nicePawn != none && class'NiceVetSharpshooter'.static.hasSkill(nicePlayer, class'NiceSkillSharpshooterHardWork')){ + if(nicePlayer != none && nicePawn != none && class'NiceVetSharpshooter'.static.hasSkill(nicePlayer, class'NiceSkillSharpshooterControl')){ //reloadScale = VSize(nicePlayer.pawn.velocity) / nicePlayer.pawn.groundSpeed; //reloadScale = 1.0 - reloadScale; if(nicePawn.calibrationScore >= 3) - calibratedReloadBonus = class'NiceSkillSharpshooterHardWork'.default.reloadBonus; + calibratedReloadBonus = class'NiceSkillSharpshooterControl'.default.reloadBonus; else if(nicePawn.calibrationScore == 2) - calibratedReloadBonus = 0.5f * class'NiceSkillSharpshooterHardWork'.default.reloadBonus; + calibratedReloadBonus = 0.5f * class'NiceSkillSharpshooterControl'.default.reloadBonus; else - calibratedReloadBonus = 0.25f * class'NiceSkillSharpshooterHardWork'.default.reloadBonus; + calibratedReloadBonus = 0.25f * class'NiceSkillSharpshooterControl'.default.reloadBonus; reloadMult *= 1.0 + calibratedReloadBonus; } if( nicePlayer != none && nicePlayer.abilityManager != none @@ -73,13 +84,13 @@ static function float GetFireSpeedModStatic(KFPlayerReplicationInfo KFPRI, class fireRateMult = 1.0; if(nicePlayer != none) nicePawn = NiceHumanPawn(nicePlayer.pawn); - if(nicePawn != none && class'NiceVetSharpshooter'.static.hasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillSharpshooterHardWork')){ + if(nicePawn != none && class'NiceVetSharpshooter'.static.hasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillSharpshooterControl')){ if(nicePawn.calibrationScore >= 3) - calibratedFireSpeedBonus = class'NiceSkillSharpshooterHardWork'.default.fireRateBonus; + calibratedFireSpeedBonus = class'NiceSkillSharpshooterControl'.default.fireRateBonus; else if(nicePawn.calibrationScore == 2) - calibratedFireSpeedBonus = (2.0f/3.0f) * class'NiceSkillSharpshooterHardWork'.default.fireRateBonus; + calibratedFireSpeedBonus = (2.0f/3.0f) * class'NiceSkillSharpshooterControl'.default.fireRateBonus; else - calibratedFireSpeedBonus = (1.0f/3.0f) * class'NiceSkillSharpshooterHardWork'.default.fireRateBonus; + calibratedFireSpeedBonus = (1.0f/3.0f) * class'NiceSkillSharpshooterControl'.default.fireRateBonus; fireRateMult *= 1.0f + calibratedFireSpeedBonus; } if( nicePlayer != none && nicePlayer.abilityManager != none @@ -93,8 +104,8 @@ static function float ModifyRecoilSpread(KFPlayerReplicationInfo KFPRI, WeaponFi if(KFPRI != none) nicePlayer = NicePlayerController(KFPRI.Owner); Recoil = 1.0; - if(HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillSharpshooterHardWork')) - Recoil = class'NiceSkillSharpshooterHardWork'.default.recoilMult; + if(HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillSharpshooterControl')) + Recoil = class'NiceSkillSharpshooterControl'.default.recoilMult; if( nicePlayer != none && nicePlayer.abilityManager != none && nicePlayer.abilityManager.IsAbilityActive(class'NiceSkillSharpshooterGunslingerA'.default.abilityID)) Recoil = 0; @@ -131,12 +142,12 @@ defaultproperties { bNewTypePerk=True SkillGroupA(0)=Class'NicePack.NiceSkillSharpshooterKillConfirmed' - SkillGroupA(1)=Class'NicePack.NiceSkillSharpshooterTalent' + SkillGroupA(1)=Class'NicePack.NiceSkillSharpshooterDamage' SkillGroupA(2)=Class'NicePack.NiceSkillSharpshooterDieAlready' SkillGroupA(3)=Class'NicePack.NiceSkillSharpshooterReaperA' SkillGroupA(4)=Class'NicePack.NiceSkillSharpshooterZEDAdrenaline' SkillGroupB(0)=Class'NicePack.NiceSkillSharpshooterSurgical' - SkillGroupB(1)=Class'NicePack.NiceSkillSharpshooterHardWork' + SkillGroupB(1)=Class'NicePack.NiceSkillSharpshooterControl' SkillGroupB(2)=Class'NicePack.NiceSkillSharpshooterArdour' SkillGroupB(3)=Class'NicePack.NiceSkillSharpshooterGunslingerA' SkillGroupB(4)=Class'NicePack.NiceSkillSharpshooterZEDHundredGauntlets' diff --git a/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterControl.uc b/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterControl.uc new file mode 100644 index 0000000..ecace15 --- /dev/null +++ b/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterControl.uc @@ -0,0 +1,21 @@ +class NiceSkillSharpshooterControl extends NiceSkill + abstract; + +var float zoomBonus; +var float zoomSpeedBonus; +var float reloadBonus; +var float fireRateBonus; +var float recoilMult; +var float stunMultiplier; + +defaultproperties +{ + zoomBonus=1.0//0.750000 + zoomSpeedBonus=1.0//0.500000 + ReloadBonus=0.2500000 + fireRateBonus=0.1500000 + recoilMult=0.500000 + stunMultiplier=2.0 + SkillName="Control" + SkillEffects="Twice as much stun power, reload up to 25% faster, shoot up to 15% faster and recoil only for half as much." +} diff --git a/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterDamage.uc b/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterDamage.uc new file mode 100644 index 0000000..1bd7baf --- /dev/null +++ b/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterDamage.uc @@ -0,0 +1,8 @@ +class NiceSkillSharpshooterDamage extends NiceSkill + abstract; + +defaultproperties +{ + SkillName="Damage" + SkillEffects="You gain additional up to 30% headshot damage bonus." +} \ No newline at end of file diff --git a/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterHardWork.uc b/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterHardWork.uc deleted file mode 100644 index 3a8a447..0000000 --- a/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterHardWork.uc +++ /dev/null @@ -1,18 +0,0 @@ -class NiceSkillSharpshooterHardWork extends NiceSkill - abstract; -var float zoomBonus; -var float zoomSpeedBonus; -var float reloadBonus; -var float fireRateBonus; -var float recoilMult; - -defaultproperties -{ - zoomBonus=0.750000 - zoomSpeedBonus=0.500000 - ReloadBonus=0.500000 - fireRateBonus=0.300000 - recoilMult=0.500000 - SkillName="Hard work" - SkillEffects="Reload up to 50% faster, shoot up to 30% faster and recoil only for half as much. Additionally, you can switch to/from iron sights twice as fast and zoom 25% further while crouched." -} diff --git a/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterTalent.uc b/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterTalent.uc deleted file mode 100644 index cd03f8c..0000000 --- a/sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterTalent.uc +++ /dev/null @@ -1,8 +0,0 @@ -class NiceSkillSharpshooterTalent extends NiceSkill - abstract; - -defaultproperties -{ - SkillName="Talent" - SkillEffects="You gain additional up to 30% headshot damage bonus." -} diff --git a/sources/Weapons/BaseWeaponClasses/NiceScopedWeapon.uc b/sources/Weapons/BaseWeaponClasses/NiceScopedWeapon.uc index 8be936a..b5c5e03 100644 --- a/sources/Weapons/BaseWeaponClasses/NiceScopedWeapon.uc +++ b/sources/Weapons/BaseWeaponClasses/NiceScopedWeapon.uc @@ -186,13 +186,13 @@ simulated function ZoomIn(bool bAnimateTransition) scopePortalFOVHigh = default.scopePortalFOVHigh; scopePortalFOV = default.scopePortalFOV; PlayerIronSightFOV = default.PlayerIronSightFOV; - if(instigator != none && instigator.bIsCrouched && class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterHardWork')){ - default.ZoomTime *= class'NiceSkillSharpshooterHardWork'.default.zoomSpeedBonus; + if(instigator != none && instigator.bIsCrouched && class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterControl')){ + default.ZoomTime *= class'NiceSkillSharpshooterControl'.default.zoomSpeedBonus; if(instigator != none && instigator.bIsCrouched){ - PlayerIronSightFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - scopePortalFOVHigh *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - scopePortalFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - PlayerIronSightFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; + PlayerIronSightFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + scopePortalFOVHigh *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + scopePortalFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + PlayerIronSightFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; } } super(BaseKFWeapon).ZoomIn(bAnimateTransition); @@ -213,12 +213,12 @@ simulated function ZoomOut(bool bAnimateTransition) scopePortalFOVHigh = default.scopePortalFOVHigh; scopePortalFOV = default.scopePortalFOV; PlayerIronSightFOV = default.PlayerIronSightFOV; - if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterHardWork')){ - default.ZoomTime *= class'NiceSkillSharpshooterHardWork'.default.zoomSpeedBonus; - PlayerIronSightFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - scopePortalFOVHigh *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - scopePortalFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - PlayerIronSightFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; + if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterControl')){ + default.ZoomTime *= class'NiceSkillSharpshooterControl'.default.zoomSpeedBonus; + PlayerIronSightFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + scopePortalFOVHigh *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + scopePortalFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + PlayerIronSightFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; } super.ZoomOut(bAnimateTransition); bAimingRifle = False; diff --git a/sources/Weapons/NiceScopedWeapon.uc b/sources/Weapons/NiceScopedWeapon.uc index 29c4aa3..9cc382e 100644 --- a/sources/Weapons/NiceScopedWeapon.uc +++ b/sources/Weapons/NiceScopedWeapon.uc @@ -187,12 +187,12 @@ simulated function ZoomIn(bool bAnimateTransition) scopePortalFOV = default.scopePortalFOV; PlayerIronSightFOV = default.PlayerIronSightFOV; if(instigator != none && instigator.bIsCrouched && class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterHardWork')){ - default.ZoomTime *= class'NiceSkillSharpshooterHardWork'.default.zoomSpeedBonus; + default.ZoomTime *= class'NiceSkillSharpshooterControl'.default.zoomSpeedBonus; if(instigator != none && instigator.bIsCrouched){ - PlayerIronSightFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - scopePortalFOVHigh *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - scopePortalFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - PlayerIronSightFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; + PlayerIronSightFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + scopePortalFOVHigh *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + scopePortalFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + PlayerIronSightFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; } } super(BaseKFWeapon).ZoomIn(bAnimateTransition); @@ -213,12 +213,12 @@ simulated function ZoomOut(bool bAnimateTransition) scopePortalFOVHigh = default.scopePortalFOVHigh; scopePortalFOV = default.scopePortalFOV; PlayerIronSightFOV = default.PlayerIronSightFOV; - if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterHardWork')){ - default.ZoomTime *= class'NiceSkillSharpshooterHardWork'.default.zoomSpeedBonus; - PlayerIronSightFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - scopePortalFOVHigh *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - scopePortalFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; - PlayerIronSightFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; + if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterControl')){ + default.ZoomTime *= class'NiceSkillSharpshooterControl'.default.zoomSpeedBonus; + PlayerIronSightFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + scopePortalFOVHigh *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + scopePortalFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; + PlayerIronSightFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; } super.ZoomOut(bAnimateTransition); bAimingRifle = False; diff --git a/sources/Weapons/NiceWeapon.uc b/sources/Weapons/NiceWeapon.uc index cc67065..609c211 100644 --- a/sources/Weapons/NiceWeapon.uc +++ b/sources/Weapons/NiceWeapon.uc @@ -1550,19 +1550,19 @@ simulated function RenderOverlays(Canvas Canvas){ simulated function ZoomIn(bool bAnimateTransition){ default.ZoomTime = default.recordedZoomTime; PlayerIronSightFOV = default.PlayerIronSightFOV; - if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterHardWork')){ - default.ZoomTime *= class'NiceSkillSharpshooterHardWork'.default.zoomSpeedBonus; + if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterControl')){ + default.ZoomTime *= class'NiceSkillSharpshooterControl'.default.zoomSpeedBonus; if(instigator != none && instigator.bIsCrouched) - PlayerIronSightFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; + PlayerIronSightFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; } super.ZoomIn(bAnimateTransition); } simulated function ZoomOut(bool bAnimateTransition){ default.ZoomTime = default.recordedZoomTime; PlayerIronSightFOV = default.PlayerIronSightFOV; - if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterHardWork')){ - default.ZoomTime *= class'NiceSkillSharpshooterHardWork'.default.zoomSpeedBonus; - PlayerIronSightFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus; + if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterControl')){ + default.ZoomTime *= class'NiceSkillSharpshooterControl'.default.zoomSpeedBonus; + PlayerIronSightFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus; } super.ZoomOut(bAnimateTransition); } diff --git a/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceDamTypeHuntingRifle.uc b/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceDamTypeHuntingRifle.uc index cc8b8f0..9a5f1af 100644 --- a/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceDamTypeHuntingRifle.uc +++ b/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceDamTypeHuntingRifle.uc @@ -1,8 +1,9 @@ class NiceDamTypeHuntingRifle extends NiceDamageTypeVetSharpshooter abstract; + defaultproperties { - stunMultiplier=1.500000 + stunMultiplier=0.75 MaxPenetrations=5 BigZedPenDmgReduction=0.750000 MediumZedPenDmgReduction=1.000000 @@ -22,4 +23,4 @@ defaultproperties KDeathVel=115.000000 KDeathUpKick=5.000000 VehicleDamageScaling=0.700000 -} +} \ No newline at end of file diff --git a/sources/Weapons/Playable/SniperWeapons/M99/NiceDamTypeM99SniperRifle.uc b/sources/Weapons/Playable/SniperWeapons/M99/NiceDamTypeM99SniperRifle.uc index 00e1ecc..344465e 100644 --- a/sources/Weapons/Playable/SniperWeapons/M99/NiceDamTypeM99SniperRifle.uc +++ b/sources/Weapons/Playable/SniperWeapons/M99/NiceDamTypeM99SniperRifle.uc @@ -14,6 +14,7 @@ defaultproperties { //prReqMultiplier=0.600000 //prReqPrecise=0.600000 + stunMultiplier=0.5 MaxPenetrations=-1 BigZedPenDmgReduction=0.750000 MediumZedPenDmgReduction=1.000000 diff --git a/sources/Weapons/Playable/SniperWeapons/Mauler/NiceDamTypeMauler.uc b/sources/Weapons/Playable/SniperWeapons/Mauler/NiceDamTypeMauler.uc index ce830ad..2213c39 100644 --- a/sources/Weapons/Playable/SniperWeapons/Mauler/NiceDamTypeMauler.uc +++ b/sources/Weapons/Playable/SniperWeapons/Mauler/NiceDamTypeMauler.uc @@ -7,6 +7,7 @@ static function ScoredNiceHeadshot(KFSteamStatsAndAchievements KFStatsAndAchieve } defaultproperties { + stunMultiplier=0.5 HeadShotDamageMult=5.0 bSniperWeapon=True WeaponClass=Class'NicePack.NiceMaulerRifle' diff --git a/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerFire.uc b/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerFire.uc index 7cc73a0..b90de01 100644 --- a/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerFire.uc +++ b/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerFire.uc @@ -12,8 +12,8 @@ defaultproperties StereoFireSoundRef="KF_SP_LongmusketSnd.KFO_Sniper_Fire_S" NoAmmoSoundRef="KF_M14EBRSnd.M14EBR_DryFire" DamageType=Class'NicePack.NiceDamTypeMauler' - DamageMin=121 - DamageMax=121 + DamageMin=115 + DamageMax=115//121 Momentum=13000.000000 bWaitForRelease=True TransientSoundVolume=1.800000 diff --git a/sources/Weapons/Playable/SniperWeapons/SVD/NiceDamTypeSVD.uc b/sources/Weapons/Playable/SniperWeapons/SVD/NiceDamTypeSVD.uc index d1cbf11..354fa89 100644 --- a/sources/Weapons/Playable/SniperWeapons/SVD/NiceDamTypeSVD.uc +++ b/sources/Weapons/Playable/SniperWeapons/SVD/NiceDamTypeSVD.uc @@ -3,6 +3,7 @@ defaultproperties { //prReqMultiplier=0.400000 //prReqPrecise=0.400000 + stunMultiplier=0.5 MaxPenetrations=3 BigZedPenDmgReduction=0.750000 MediumZedPenDmgReduction=0.900000 diff --git a/sources/Weapons/Playable/SniperWeapons/SVD/NiceDamTypeSVDS.uc b/sources/Weapons/Playable/SniperWeapons/SVD/NiceDamTypeSVDS.uc index 28a920b..708ed93 100644 --- a/sources/Weapons/Playable/SniperWeapons/SVD/NiceDamTypeSVDS.uc +++ b/sources/Weapons/Playable/SniperWeapons/SVD/NiceDamTypeSVDS.uc @@ -1,6 +1,7 @@ class NiceDamTypeSVDS extends NiceDamageTypeVetSharpshooter; defaultproperties { + stunMultiplier=0.5 MaxPenetrations=1 BigZedPenDmgReduction=0.750000 MediumZedPenDmgReduction=0.900000 diff --git a/sources/Weapons/Playable/SniperWeapons/VSSD/NiceDamTypeVSSDT.uc b/sources/Weapons/Playable/SniperWeapons/VSSD/NiceDamTypeVSSDT.uc index b9481e3..0b2fdab 100644 --- a/sources/Weapons/Playable/SniperWeapons/VSSD/NiceDamTypeVSSDT.uc +++ b/sources/Weapons/Playable/SniperWeapons/VSSD/NiceDamTypeVSSDT.uc @@ -1,7 +1,7 @@ class NiceDamTypeVSSDT extends NiceDamageTypeVetSharpshooter; defaultproperties { - stunMultiplier=0.500000 + stunMultiplier=0.25 HeadShotDamageMult=1.490000 bSniperWeapon=True WeaponClass=Class'NicePack.NiceVSSDT' diff --git a/sources/Weapons/Playable/SniperWeapons/Winchester/NiceDamTypeWinchester.uc b/sources/Weapons/Playable/SniperWeapons/Winchester/NiceDamTypeWinchester.uc index ceca3c1..7749e91 100644 --- a/sources/Weapons/Playable/SniperWeapons/Winchester/NiceDamTypeWinchester.uc +++ b/sources/Weapons/Playable/SniperWeapons/Winchester/NiceDamTypeWinchester.uc @@ -3,23 +3,23 @@ class NiceDamTypeWinchester extends NiceDamageTypeVetSharpshooter defaultproperties { - stunMultiplier=1.500000 - flinchMultiplier=0.8 - bIsProjectile=True - HeadShotDamageMult=2.500000 - bSniperWeapon=True - WeaponClass=Class'NicePack.NiceWinchester' - DeathString="%k killed %o (Winchester)." - FemaleSuicide="%o shot herself in the foot." - MaleSuicide="%o shot himself in the foot." - bRagdollBullet=True - bBulletHit=True - PawnDamageEmitter=Class'ROEffects.ROBloodPuff' - LowGoreDamageEmitter=Class'ROEffects.ROBloodPuffNoGore' - LowDetailEmitter=Class'ROEffects.ROBloodPuffSmall' - FlashFog=(X=600.000000) - KDamageImpulse=2250.000000 - KDeathVel=115.000000 - KDeathUpKick=5.000000 - VehicleDamageScaling=0.700000 -} + stunMultiplier=0.75 + flinchMultiplier=0.8 + bIsProjectile=True + HeadShotDamageMult=2.500000 + bSniperWeapon=True + WeaponClass=Class'NicePack.NiceWinchester' + DeathString="%k killed %o (Winchester)." + FemaleSuicide="%o shot herself in the foot." + MaleSuicide="%o shot himself in the foot." + bRagdollBullet=True + bBulletHit=True + PawnDamageEmitter=Class'ROEffects.ROBloodPuff' + LowGoreDamageEmitter=Class'ROEffects.ROBloodPuffNoGore' + LowDetailEmitter=Class'ROEffects.ROBloodPuffSmall' + FlashFog=(X=600.000000) + KDamageImpulse=2250.000000 + KDeathVel=115.000000 + KDeathUpKick=5.000000 + VehicleDamageScaling=0.700000 +} \ No newline at end of file