Add changed for updates 001 and 002

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<NiceWeaponDamageType> 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<KFWeapon> 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'))
+    if(HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillSharpshooterControl'))
-       Recoil = class'NiceSkillSharpshooterHardWork'.default.recoilMult;
+       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'

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."
+}

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."
+}

sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterHardWork.uc

@@ -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."
-}

sources/Perks/Sharpshooter/Skills/NiceSkillSharpshooterTalent.uc

@@ -1,8 +0,0 @@
-class NiceSkillSharpshooterTalent extends NiceSkill
-    abstract;
-
-defaultproperties
-{
-     SkillName="Talent"
-     SkillEffects="You gain additional up to 30% headshot damage bonus."
-}

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')){
+    if(instigator != none && instigator.bIsCrouched && class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterControl')){
-       default.ZoomTime    *= class'NiceSkillSharpshooterHardWork'.default.zoomSpeedBonus;
+       default.ZoomTime    *= class'NiceSkillSharpshooterControl'.default.zoomSpeedBonus;
        if(instigator != none && instigator.bIsCrouched){
-           PlayerIronSightFOV  *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+           PlayerIronSightFOV  *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-           scopePortalFOVHigh  *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+           scopePortalFOVHigh  *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-           scopePortalFOV      *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+           scopePortalFOV      *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-           PlayerIronSightFOV  *= class'NiceSkillSharpshooterHardWork'.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')){
+    if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterControl')){
-       default.ZoomTime    *= class'NiceSkillSharpshooterHardWork'.default.zoomSpeedBonus;
+       default.ZoomTime    *= class'NiceSkillSharpshooterControl'.default.zoomSpeedBonus;
-       PlayerIronSightFOV  *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+       PlayerIronSightFOV  *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-       scopePortalFOVHigh  *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+       scopePortalFOVHigh  *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-       scopePortalFOV      *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+       scopePortalFOV      *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-       PlayerIronSightFOV  *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+       PlayerIronSightFOV  *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
     }
     super.ZoomOut(bAnimateTransition);
     bAimingRifle = False;

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;
+           PlayerIronSightFOV  *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-           scopePortalFOVHigh  *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+           scopePortalFOVHigh  *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-           scopePortalFOV      *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+           scopePortalFOV      *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-           PlayerIronSightFOV  *= class'NiceSkillSharpshooterHardWork'.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')){
+    if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterControl')){
-       default.ZoomTime    *= class'NiceSkillSharpshooterHardWork'.default.zoomSpeedBonus;
+       default.ZoomTime    *= class'NiceSkillSharpshooterControl'.default.zoomSpeedBonus;
-       PlayerIronSightFOV  *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+       PlayerIronSightFOV  *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-       scopePortalFOVHigh  *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+       scopePortalFOVHigh  *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-       scopePortalFOV      *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+       scopePortalFOV      *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
-       PlayerIronSightFOV  *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+       PlayerIronSightFOV  *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
     }
     super.ZoomOut(bAnimateTransition);
     bAimingRifle = False;

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')){
+    if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterControl')){
-       default.ZoomTime *= class'NiceSkillSharpshooterHardWork'.default.zoomSpeedBonus;
+       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')){
+    if(class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Instigator.Controller), class'NiceSkillSharpshooterControl')){
-       default.ZoomTime *= class'NiceSkillSharpshooterHardWork'.default.zoomSpeedBonus;
+       default.ZoomTime *= class'NiceSkillSharpshooterControl'.default.zoomSpeedBonus;
-       PlayerIronSightFOV *= class'NiceSkillSharpshooterHardWork'.default.zoomBonus;
+       PlayerIronSightFOV *= class'NiceSkillSharpshooterControl'.default.zoomBonus;
     }
     super.ZoomOut(bAnimateTransition);
 }

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
-}
+}

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

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'

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
+    DamageMin=115
-    DamageMax=121
+    DamageMax=115//121
     Momentum=13000.000000
     bWaitForRelease=True
     TransientSoundVolume=1.800000

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

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

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'

sources/Weapons/Playable/SniperWeapons/Winchester/NiceDamTypeWinchester.uc

@@ -3,23 +3,23 @@ class NiceDamTypeWinchester extends NiceDamageTypeVetSharpshooter
 
 defaultproperties
 {
-     stunMultiplier=1.500000
+    stunMultiplier=0.75
-     flinchMultiplier=0.8
+    flinchMultiplier=0.8
-     bIsProjectile=True
+    bIsProjectile=True
-     HeadShotDamageMult=2.500000
+    HeadShotDamageMult=2.500000
-     bSniperWeapon=True
+    bSniperWeapon=True
-     WeaponClass=Class'NicePack.NiceWinchester'
+    WeaponClass=Class'NicePack.NiceWinchester'
-     DeathString="%k killed %o (Winchester)."
+    DeathString="%k killed %o (Winchester)."
-     FemaleSuicide="%o shot herself in the foot."
+    FemaleSuicide="%o shot herself in the foot."
-     MaleSuicide="%o shot himself in the foot."
+    MaleSuicide="%o shot himself in the foot."
-     bRagdollBullet=True
+    bRagdollBullet=True
-     bBulletHit=True
+    bBulletHit=True
-     PawnDamageEmitter=Class'ROEffects.ROBloodPuff'
+    PawnDamageEmitter=Class'ROEffects.ROBloodPuff'
-     LowGoreDamageEmitter=Class'ROEffects.ROBloodPuffNoGore'
+    LowGoreDamageEmitter=Class'ROEffects.ROBloodPuffNoGore'
-     LowDetailEmitter=Class'ROEffects.ROBloodPuffSmall'
+    LowDetailEmitter=Class'ROEffects.ROBloodPuffSmall'
-     FlashFog=(X=600.000000)
+    FlashFog=(X=600.000000)
-     KDamageImpulse=2250.000000
+    KDamageImpulse=2250.000000
-     KDeathVel=115.000000
+    KDeathVel=115.000000
-     KDeathUpKick=5.000000
+    KDeathUpKick=5.000000
-     VehicleDamageScaling=0.700000
+    VehicleDamageScaling=0.700000
-}
+}