From 3ab2559616a4e5d7677147daa3834704a3ff6323 Mon Sep 17 00:00:00 2001
From: Anton Tarasenko <dkanus@gmail.com>
Date: Fri, 14 Jan 2022 03:47:36 +0700
Subject: [PATCH] Update 007

[Changed]
- Weapon for sharpshooter SVD: max ammo reduced from 60 to 30, initialial ammo from 15 to 8, ammo cost raised from 42 to 100
- Weapon for demolitionist LAW: max ammo increased from 10 to 16, starting ammo increased from 1 to 4
- Enforcer's skill 'Multitasking': now holstered weapons reload 3 times slower than normal, instead of 5 times
[Technical]
- Added logging to help figure out issue with Enforcer's 'Multitasking' skill
---
 sources/GUI/NiceGUISettings.uc                    |  2 +-
 sources/NiceHumanPawn.uc                          | 15 +++++++++++++--
 .../Skills/NiceSkillEnforcerMultitasker.uc        | 10 ++++++----
 .../Playable/Explosives/LAW/NiceLAWAmmo.uc        |  4 ++--
 .../Playable/SniperWeapons/SVD/NiceSVDAmmo.uc     |  4 ++--
 .../Playable/SniperWeapons/SVD/NiceSVDPickup.uc   |  2 +-
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/sources/GUI/NiceGUISettings.uc b/sources/GUI/NiceGUISettings.uc
index bfae88c..87e7dc1 100644
--- a/sources/GUI/NiceGUISettings.uc
+++ b/sources/GUI/NiceGUISettings.uc
@@ -152,7 +152,7 @@ defaultproperties
         ComponentClassName="ScrnBalanceSrv.ScrnGUICheckBoxButton"
         OnCreateComponent=DispWeapProgress.InternalOnCreateComponent
         IniOption="@Internal"
-        Hint="Displays weapon progress rate, whoever it's defined by a skill that's using this functionality"
+        Hint="Displays weapon progress rate, however it's defined by a skill that's using this functionality"
         WinTop=0.200000
         WinLeft=0.012500
         WinWidth=0.278000
diff --git a/sources/NiceHumanPawn.uc b/sources/NiceHumanPawn.uc
index 281c706..91c9ea9 100644
--- a/sources/NiceHumanPawn.uc
+++ b/sources/NiceHumanPawn.uc
@@ -331,10 +331,16 @@ simulated function Tick(float deltaTime){
        niceMutator.ClearWeapProgress();
     if(!class'NiceVeterancyTypes'.static.hasSkill(NicePlayerController(Controller), class'NiceSkillEnforcerMultitasker'))
        return;
-    if(Role < ROLE_Authority  && nicePlayer != none && nicePlayer.bFlagDisplayWeaponProgress){
+    if (    Role < ROLE_Authority && nicePlayer != none
+        &&  nicePlayer.bFlagDisplayWeaponProgress)
+    {
        // Update weapon progress for this skill
-       if(niceMutator == none)
+       if(niceMutator == none) {
            return;
+       }
+        else {
+            Log("Failed to update holstered progress, because no mut! :(");
+        }
        for(Item = Inventory; Item != none; Item = Item.Inventory){
            niceWeap = NiceWeapon(Item);
            if(niceWeap != none && niceWeap != weapon && !niceWeap.IsMagazineFull()){
@@ -344,6 +350,11 @@ simulated function Tick(float deltaTime){
        }
        return;
     }
+    else if (Role < ROLE_Authority)
+    {
+        Log(    "Failed to update holstered progress, checked variables:"
+            @   nicePlayer @ nicePlayer.bFlagDisplayWeaponProgress);
+    }
     // Auto-reload holstered weapons
     holsteredReloadCountDown -= deltaTime;
     if(holsteredReloadCountDown <= 0.0){
diff --git a/sources/Perks/Enforcer/Skills/NiceSkillEnforcerMultitasker.uc b/sources/Perks/Enforcer/Skills/NiceSkillEnforcerMultitasker.uc
index e7103a4..073eefb 100644
--- a/sources/Perks/Enforcer/Skills/NiceSkillEnforcerMultitasker.uc
+++ b/sources/Perks/Enforcer/Skills/NiceSkillEnforcerMultitasker.uc
@@ -1,9 +1,11 @@
 class NiceSkillEnforcerMultitasker extends NiceSkill
     abstract;
+
 var float reloadSlowDown;
+
 defaultproperties
 {
-    reloadSlowDown=5.000000
-    SkillName="Multitasker"
-    SkillEffects="Reload holstered weapons at five times as much time."
-}
+    reloadSlowDown  = 3.0
+    SkillName       = "Multitasker"
+    SkillEffects    = "Reload holstered weapons, taking thrice as much time."
+}
\ No newline at end of file
diff --git a/sources/Weapons/Playable/Explosives/LAW/NiceLAWAmmo.uc b/sources/Weapons/Playable/Explosives/LAW/NiceLAWAmmo.uc
index 18fa305..567137e 100644
--- a/sources/Weapons/Playable/Explosives/LAW/NiceLAWAmmo.uc
+++ b/sources/Weapons/Playable/Explosives/LAW/NiceLAWAmmo.uc
@@ -3,8 +3,8 @@ class NiceLAWAmmo extends NiceAmmo;
 defaultproperties
 {
     AmmoPickupAmount=1
-    MaxAmmo=10
-    InitialAmount=1
+    MaxAmmo=16
+    InitialAmount=4
     IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
     IconCoords=(X1=458,Y1=34,X2=511,Y2=78)
     ItemName="L.A.W Rockets"
diff --git a/sources/Weapons/Playable/SniperWeapons/SVD/NiceSVDAmmo.uc b/sources/Weapons/Playable/SniperWeapons/SVD/NiceSVDAmmo.uc
index 802d442..156bb69 100644
--- a/sources/Weapons/Playable/SniperWeapons/SVD/NiceSVDAmmo.uc
+++ b/sources/Weapons/Playable/SniperWeapons/SVD/NiceSVDAmmo.uc
@@ -3,8 +3,8 @@ defaultproperties
 {
     WeaponPickupClass=Class'NicePack.NiceSVDPickup'
     AmmoPickupAmount=10
-    MaxAmmo=60
-    InitialAmount=15
+    MaxAmmo=30
+    InitialAmount=8
     IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
     IconCoords=(X1=338,Y1=40,X2=393,Y2=79)
     ItemName="7.62x54mm"
diff --git a/sources/Weapons/Playable/SniperWeapons/SVD/NiceSVDPickup.uc b/sources/Weapons/Playable/SniperWeapons/SVD/NiceSVDPickup.uc
index 2fa03da..6ec491c 100644
--- a/sources/Weapons/Playable/SniperWeapons/SVD/NiceSVDPickup.uc
+++ b/sources/Weapons/Playable/SniperWeapons/SVD/NiceSVDPickup.uc
@@ -5,7 +5,7 @@ defaultproperties
 {
     Weight=8.000000
     cost=1250
-    AmmoCost=42
+    AmmoCost=100
     BuyClipSize=10
     PowerValue=90
     SpeedValue=40