Merge pull request 'update10' (#30) from update10 into master

Reviewed-on: https://insultplayers.ru/git/dkanus/NicePack/pulls/30

sources/Perks/Commando/NiceDamTypeMedicDart.uc

@@ -1,4 +1,4 @@
-class NiceDamTypeMedicDart extends NiceDamageTypeVetCommando
+class NiceDamTypeMedicDart extends NiceDamageTypeVetDemolitions
     abstract;
 defaultproperties
 {

sources/Perks/Commando/NiceVetCommando.uc

@@ -35,6 +35,16 @@ static function float GetMagCapacityMod(KFPlayerReplicationInfo KFPRI, KFWeapon
        return class'NiceSkillCommandoLargerMags'.default.sizeBonus;
     return 1.0;
 }
+// Change the cost of particular ammo
+static function float GetAmmoCostScaling(KFPlayerReplicationInfo KFPRI, class<Pickup> Item)
+{
+    local class<NiceWeaponPickup> pickupClass;
+    pickupClass = class<NiceWeaponPickup>(Item);
+    if(IsPerkedPickup(pickupClass) && HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillCommandoLargerMags')) {
+       return class'NiceSkillCommandoLargerMags'.default.sizeBonus;
+    }
+    return 1.0;
+}
 static function float GetSyringeChargeRate(KFPlayerReplicationInfo KFPRI){
     return 1.5;
 }

sources/Perks/Demolitions/NiceVetDemolitions.uc

@@ -39,12 +39,13 @@ static function int AddDamage(KFPlayerReplicationInfo KFPRI, KFMonster Injured,
     perkDamage = float(InDamage);
     if(DmgType == class'NiceDamTypeDemoExplosion')
        return 1.6 * perkDamage;
-    if(IsPerkedPickup(pickupClass))
+    if(IsPerkedPickup(pickupClass) && class<NiceDamTypeDemoExplosion>(DmgType) != none)
        perkDamage *= 1.25;
     else if( pickupClass != none && pickupClass.default.weight <= class'NiceSkillDemoOffperk'.default.weightBound
        && HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillDemoOffperk') )
        perkDamage *= class'NiceSkillDemoOffperk'.default.damageBonus;
-    if( KFPRI != none && class<NiceDamTypeDemoBlunt>(DmgType) != none
+    if( KFPRI != none && class<NiceDamTypeDemoExplosion>(DmgType) == none
+       && IsPerkedPickup(pickupClass)
        && SomeoneHasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillDemoOnperk') )
        perkDamage *= class'NiceSkillDemoOnperk'.default.damageBonus;
     return perkDamage;

sources/Weapons/NiceFire.uc

@@ -38,6 +38,10 @@ var bool    projAffectedByScream;
 var bool    bShouldStick;
 var int resetTicks;
 var float niceNextFireTime;
+var float minimalSpreadScale;
+var float activeSpreadScale;
+var float spreadGainedPerShot;
+var float spreadLostPerSecond;
 struct FireModeContext{
     var bool            bHipfire;
     var NiceWeapon      sourceWeapon;
@@ -152,9 +156,15 @@ simulated function int GetBurstLength(){
    }
    return currentContext.burstLength;
 }
+
 simulated function ModeTick(float delta){
     local float headLevel;
     local NiceMonster currTarget;
+    if (spreadLostPerSecond > 0 && activeSpreadScale > minimalSpreadScale
+         && niceNextFireTime + fireRate <= Level.TimeSeconds) {
+      activeSpreadScale -= spreadLostPerSecond * delta;
+      activeSpreadScale = FMax(minimalSpreadScale, activeSpreadScale);
+    }
     if(currentContext.Instigator == none)
        currentContext.Instigator = NiceHumanPawn(Instigator);
     if(currentContext.sourceWeapon == none)
@@ -548,7 +558,7 @@ function DoFireEffect(){
     if(!Weapon.WeaponCentered() && !KFWeap.bAimingRifle)
        StartProj = StartProj + Weapon.Hand * Y * ProjSpawnOffset.Y + Z * ProjSpawnOffset.Z;
     other = Weapon.Trace(HitLocation, HitNormal, StartProj, StartTrace, false);
-    activeSpread = fireShots[currentShot].spread;
+    activeSpread = fireShots[currentShot].spread * activeSpreadScale;
     if(class'NiceVeterancyTypes'.static.hasSkill(nicePlayer, class'NiceSkillEnforcerBombard')){
        bPinpoint = true;
        activeSpread *= class'NiceSkillEnforcerBombard'.default.spreadMult;
@@ -607,6 +617,15 @@ function DoFireEffect(){
        else if(Instigator.Physics == PHYS_Falling && Instigator.PhysicsVolume.Gravity.Z > class'PhysicsVolume'.default.Gravity.Z)
            Instigator.AddVelocity((KickMomentum * LowGravKickMomentumScale) >> Instigator.GetViewRotation());
     }
+    if (activeSpreadScale < 1.0) {
+      if (KFWeap.bAimingRifle) {
+         activeSpreadScale += spreadGainedPerShot * 0.5;
+      }
+      else {
+         activeSpreadScale += spreadGainedPerShot;
+      }
+      activeSpreadScale = FMin(1.0, activeSpreadScale);
+    }
 }
 simulated function float TraceZed(out NiceMonster tracedZed, optional out Vector hitLoc, optional out Vector hitNorm,
     optional float hsMultiplier){
@@ -721,4 +740,8 @@ defaultproperties
    contBonusReset=True
    maxBonusContLenght=1
    AmmoPerFire=1
+   minimalSpreadScale=1
+   activeSpreadScale=1
+   spreadGainedPerShot=0
+   spreadLostPerSecond=0
 }

sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12Pickup.uc

@@ -3,7 +3,7 @@ defaultproperties
 {
     Weight=6.000000
     cost=750
-    AmmoCost=19
+    AmmoCost=25
     BuyClipSize=40
     PowerValue=55
     SpeedValue=80

sources/Weapons/Playable/AssaultRifles/AK47/NiceAK47Pickup.uc

@@ -3,7 +3,7 @@ defaultproperties
 {
     Weight=6.000000
     cost=750
-    AmmoCost=19
+    AmmoCost=26
     BuyClipSize=30
     PowerValue=40
     SpeedValue=80

sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Pickup.uc

@@ -3,7 +3,7 @@ defaultproperties
 {
     Weight=6.000000
     cost=750
-    AmmoCost=22
+    AmmoCost=19
     BuyClipSize=30
     PowerValue=40
     SpeedValue=85

sources/Weapons/Playable/Heavy/M41A/NiceM41APickup.uc

@@ -3,7 +3,7 @@ class NiceM41APickup extends NiceM41APrimaryPickup;
 defaultproperties
 {
     crossPerkIndecies(0)=6
-    AmmoCost=60
+    AmmoCost=12
     BuyClipSize=1
     SecondaryAmmoShortName="M41A Frag Grenades"
     PrimaryWeaponPickup=class'NiceM41APrimaryPickup'

sources/Weapons/Playable/SMG/Kriss/NiceDamTypeKrissM.uc

@@ -1,6 +1,7 @@
-class NiceDamTypeKrissM extends NiceDamageTypeVetCommando
+class NiceDamTypeKrissM extends NiceDamageTypeVetDemolitions
     abstract;
 defaultproperties
 {
+    HeadShotDamageMult=2.000000
     WeaponClass=class'NiceKrissMMedicGun'
 }

sources/Weapons/Playable/SMG/Kriss/NiceKrissMFire.uc

@@ -27,4 +27,8 @@ defaultproperties
     FlashEmitterClass=Class'ROEffects.MuzzleFlash1stMP'
     Spread=500.0
     SpreadStyle=SS_Random
+    minimalSpreadScale=0.0
+    activeSpreadScale=0.0
+    spreadGainedPerShot=0.125
+    spreadLostPerSecond=0.5
 }

sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc

@@ -17,7 +17,7 @@ defaultproperties
     AmmoItemName="45. ACP Ammo"
     AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
     EquipmentCategoryID=3
-    CorrespondingPerkIndex=3
+    CorrespondingPerkIndex=6
     InventoryType=class'NiceKrissMMedicGun'
     PickupMessage="You got the KRISS Vector Medic Gun"
     PickupSound=Sound'KF_KrissSND.Handling.KF_WEP_KRISS_Handling_Pickup'

sources/Weapons/Playable/SMG/M7A3/NiceDamTypeM7A3M.uc

@@ -1,4 +1,4 @@
-class NiceDamTypeM7A3M extends NiceDamageTypeVetCommando
+class NiceDamTypeM7A3M extends NiceDamageTypeVetDemolitions
     abstract;
 defaultproperties
 {

sources/Weapons/Playable/SMG/M7A3/NiceM7A3MAmmo.uc

@@ -3,8 +3,8 @@ defaultproperties
 {
     WeaponPickupClass=class'NiceM7A3MPickup'
     AmmoPickupAmount=30
-    MaxAmmo=180
+    MaxAmmo=160
-    InitialAmount=45
+    InitialAmount=40
     PickupClass=class'NiceM7A3MAmmoPickup'
     IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
     IconCoords=(X1=336,Y1=82,X2=382,Y2=125)

sources/Weapons/Playable/SMG/M7A3/NiceM7A3MAmmoPickup.uc

@@ -1,7 +1,7 @@
 class NiceM7A3MAmmoPickup extends NiceAmmoPickup;
 defaultproperties
 {
-    AmmoAmount=15
+    AmmoAmount=30
     InventoryType=class'NiceM7A3MAmmo'
     PickupMessage="Rounds 7.6x40mm"
     StaticMesh=StaticMesh'KillingFloorStatics.L85Ammo'

sources/Weapons/Playable/SMG/M7A3/NiceM7A3MFire.uc

@@ -34,4 +34,8 @@ defaultproperties
     aimerror=42.000000
     Spread=500.0
     SpreadStyle=SS_Random
+    minimalSpreadScale=0.0
+    activeSpreadScale=0.0
+    spreadGainedPerShot=0.25
+    spreadLostPerSecond=0.5
 }

sources/Weapons/Playable/SMG/M7A3/NiceM7A3MPickup.uc

@@ -3,7 +3,7 @@ defaultproperties
 {
     Weight=5.000000
     cost=1250
-    AmmoCost=33
+    AmmoCost=50
     BuyClipSize=30
     PowerValue=45
     SpeedValue=60
@@ -14,7 +14,7 @@ defaultproperties
     AmmoItemName="7.6x40mm Ammo"
     AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
     EquipmentCategoryID=3
-    CorrespondingPerkIndex=3
+    CorrespondingPerkIndex=6
     InventoryType=class'NiceM7A3MMedicGun'
     PickupMessage="You got the M7A3 Medic Gun"
     PickupSound=Sound'KF_M7A3Snd.M7A3_Pickup'

sources/Weapons/Playable/SMG/MP5M/NiceDamTypeMP5M.uc

@@ -1,4 +1,4 @@
-class NiceDamTypeMP5M extends NiceDamageTypeVetCommando
+class NiceDamTypeMP5M extends NiceDamageTypeVetDemolitions
     abstract;
 defaultproperties
 {

sources/Weapons/Playable/SMG/MP5M/NiceMP5MFire.uc

@@ -17,6 +17,10 @@ defaultproperties
     DamageMax=35
     Spread=500.0
     SpreadStyle=SS_Random
+    minimalSpreadScale=0.0
+    activeSpreadScale=0.0
+    spreadGainedPerShot=0.25
+    spreadLostPerSecond=1.0
     Momentum=5500.000000
     FireRate=0.075000
     AmmoClass=class'NiceMP5MAmmo'

sources/Weapons/Playable/SMG/MP5M/NiceMP5MPickup.uc

@@ -14,7 +14,7 @@ defaultproperties
     AmmoItemName="9x19mm Ammo"
     AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
     EquipmentCategoryID=3
-    CorrespondingPerkIndex=3
+    CorrespondingPerkIndex=6
     VariantClasses(0)=Class'KFMod.CamoMP5MPickup'
     InventoryType=class'NiceMP5MMedicGun'
     PickupMessage="You got the MP5M Medic Gun"

sources/Weapons/Playable/SMG/MP7M/NiceDamTypeMP7M.uc

@@ -1,4 +1,4 @@
-class NiceDamTypeMP7M extends NiceDamageTypeVetCommando
+class NiceDamTypeMP7M extends NiceDamageTypeVetDemolitions
     abstract;
 defaultproperties
 {

sources/Weapons/Playable/SMG/MP7M/NiceMP7MFire.uc

@@ -27,4 +27,8 @@ defaultproperties
     FlashEmitterClass=Class'ROEffects.MuzzleFlash1stMP'
     Spread=500.0
     SpreadStyle=SS_Random
+    minimalSpreadScale=0.0
+    activeSpreadScale=0.0
+    spreadGainedPerShot=0.1
+    spreadLostPerSecond=0.5
 }

sources/Weapons/Playable/SMG/MP7M/NiceMP7MPickup.uc

@@ -15,7 +15,7 @@ defaultproperties
     AmmoItemName="4.6x30mm Ammo"
     AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
     EquipmentCategoryID=3
-    CorrespondingPerkIndex=3
+    CorrespondingPerkIndex=6
     InventoryType=class'NiceMP7MMedicGun'
     PickupMessage="You got the MP7M Medic Gun"
     PickupSound=Sound'KF_MP7Snd.MP7_Pickup'

sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGun.uc

@@ -10,7 +10,7 @@ defaultproperties
     reloadMagStartFrame=0.278000
     reloadChargeStartFrame=-1.000000
     FirstPersonFlashlightOffset=(X=-20.000000,Y=-22.000000,Z=8.000000)
-    MagCapacity=28
+    MagCapacity=42
     ReloadRate=2.600000
     ReloadAnim="Reload"
     ReloadAnimRate=1.000000

sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGunAltFire.uc

@@ -3,6 +3,9 @@ defaultproperties
 {
     bCanFireIncomplete=True
     ProjectileSpeed=3500.000000
+    maxVerticalRecoilAngle=1250
+    maxHorizontalRecoilAngle=750
+    FireRate=0.600000
     DamageType=class'NiceDamTypeNailGunWeak'
     AmmoPerFire=7
     SpreadStyle=SS_Random

sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGunAmmo.uc

@@ -3,8 +3,8 @@ class NiceNailGunAmmo extends NiceAmmo;
 defaultproperties
 {
     WeaponPickupClass=class'NiceNailGunPickup'
-    AmmoPickupAmount=28
+    AmmoPickupAmount=42
-    MaxAmmo=168
+    MaxAmmo=336
     InitialAmount=84
     IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
     IconCoords=(X1=451,Y1=445,X2=510,Y2=500)

sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGunFire.uc

@@ -10,8 +10,8 @@ defaultproperties
     bShouldBounce=True
     bCausePain=True
     bulletClass=class'NiceNail'
-    maxVerticalRecoilAngle=1250
+    maxVerticalRecoilAngle=0
-    maxHorizontalRecoilAngle=750
+    maxHorizontalRecoilAngle=0
     bRandomPitchFireSound=True
     FireSoundRef="KF_NailShotgun.NailShotgun_Fire_Single_M"
     StereoFireSoundRef="KF_NailShotgun.NailShotgun_Fire_Single_S"
@@ -19,7 +19,7 @@ defaultproperties
     DamageType=class'NiceDamTypeNailGun'
     DamageMax=66
     FireAnimRate=1.250000
-    FireRate=0.400000
+    FireRate=0.300000
     AmmoClass=class'NiceNailGunAmmo'
     ShakeRotTime=3.000000
     ShakeOffsetTime=2.000000

sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGunPickup.uc

@@ -4,7 +4,7 @@ defaultproperties
     Weight=8.000000
     cost=250
     AmmoCost=17
-    BuyClipSize=28
+    BuyClipSize=42
     PowerValue=70
     SpeedValue=55
     RangeValue=25

sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceHuntingRiflePickup.uc

@@ -6,7 +6,7 @@ defaultproperties
 {
     Weight=6.000000
     cost=750
-    AmmoCost=34
+    AmmoCost=22
     BuyClipSize=5
     PowerValue=55
     SpeedValue=42

sources/Zeds/NiceMonster.uc

@@ -139,6 +139,25 @@ var float   lastHeatTick;
 //  resulting in a loss of potential damage
 var bool    bFrugalFuelUsage;
 
+//==============================================================================
+//==============================================================================
+//  >   Speed system
+//  Manages speed modifications from weapon attacks and other effects.
+//
+//  This variable stores with how much stopping power zed was affected.
+//  Is a value from 0.0 to 1.0 and `1 - stoppingEffect` acts as speed multiplier
+//  for the zed
+var float   stoppingEffect;
+//  (Absolute) Point in time at which recovery would start, updated when zeds
+//  receives another stopping effect from somewhere
+var float   stoppingRecoveryStartTime;
+//  How much stopping effect would be rcovred in a second
+var float   stoppingRecoveryRate;
+//  Maximum stopping effect this zed can tank
+var float   maxStoppingEffect;
+//  Minimal stopping threshold for the zed (supposed to be subtracted from
+//  incoming effects' strenght).
+var float   minStoppingThreshold;
 //==============================================================================
 //==============================================================================
 //  >   Miscellaneous variables
@@ -2216,7 +2235,11 @@ defaultproperties
     DamageToMonsterScale=5.000000
     RagdollLifeSpan=120.000000
     ControllerClass=class'NiceMonsterController'
-
+    stoppingEffect=0.0
+    stoppingRecoveryStartTime=2.0
+    stoppingRecoveryRate=0.5
+    maxStoppingEffect=0.5
+    minStoppingThreshold=0.0
     Begin Object Class=KarmaParamsSkel Name=KarmaParamsSkelN
         KConvulseSpacing=(Max=2.200000)
         KLinearDamping=0.150000