Updated 006

[Changed] - Dual pistols' spread was reduced by half (down to 250 from 500) - Commando no longer passively grants zed-time extensions - Commando's skill 'Perfect execution': zed-time granted by this skill can no longer be extended - Commando's skill 'Overclocking': now grants 4 additional zed-time extensions - Demolitionist's weapons: ammo cost doubled, max ammo reduced to about 2/3rds of previous values (except for harpoon that was unchanged, m32 that still has the same max ammo and L.A.W. that got its ammo halved and rocket cost raised fom 13 to 40) - Removed Hardcore level broadcasting bullshit
2021-12-01 04:10:42 +07:00 · 2021-12-01 04:10:42 +07:00 · 9bb40e03c8
commit 9bb40e03c8
parent d8689b9ca0
22 changed files with 43 additions and 83 deletions
--- a/sources/NiceGameType.uc
+++ b/sources/NiceGameType.uc
@ -202,12 +202,17 @@ function ScoreKill(Controller Killer, Controller Other)
 function DramaticEvent(float BaseZedTimePossibility, optional float DesiredZedTimeDuration){
    local bool bWasZedTime;
    bWasZedTime = bZEDTimeActive;
-    if (lessDramatic) {
-        ZedTimeSlomoScale = LesserZedTimeSlomoScale;
+    if (lessDramatic)
+    {
+        if (bZEDTimeActive) {
+            return;
+        }
+        else {
+            ZedTimeSlomoScale = LesserZedTimeSlomoScale;
+        }
    }
    Super.DramaticEvent(BaseZedTimePossibility, DesiredZedTimeDuration);
    ZedTimeSlomoScale = default.ZedTimeSlomoScale;
-    lessDramatic = false;
    // Call event
    if(!bWasZedTime && bZEDTimeActive)
       NicePackMutator.ZedTimeActivated();
@ -232,10 +237,11 @@ event Tick(float DeltaTime){
       if(CurrentZEDTimeDuration <= 0){
           if(bZEDTimeActive)
               NicePackMutator.ZedTimeDeactivated();
-           bZEDTimeActive = false;
-           bSpeedingBackUp = false;
-           SetGameSpeed(1.0);
-           ZedTimeExtensionsUsed = 0;
+            lessDramatic = false;
+            bZEDTimeActive = false;
+            bSpeedingBackUp = false;
+            SetGameSpeed(1.0);
+            ZedTimeExtensionsUsed = 0;
       }
    }
 }
--- a/sources/NicePack.uc
+++ b/sources/NicePack.uc
@ -38,7 +38,6 @@ var config int      bigZedMinHealth;            // If zed's base Health >= this
 var config int      mediumZedMinHealth;  

 var int     maxPlayersInGame;
-var bool    bAppliedPlayersMult;
   
 var bool bSpawnRateEnforced;    // Set to true after spawn rate was altered
 // 'Adrenaline junkie' zed-time extensions
@ -470,7 +469,6 @@ simulated function bool CheckReplacement(Actor Other, out byte bSuperRelevant){
    local NiceZombieBoss boss;
    local Controller cIt;
    local int currNumPlayers;
-    local float HLBonus;
    local NicePlayerController playerContr;
    local NiceRepInfoRemoteData remoteRI;
    local NiceReplicationInfo niceRI;
@ -510,22 +508,6 @@ simulated function bool CheckReplacement(Actor Other, out byte bSuperRelevant){
        if (bUseProgresiveCash) {
            niceMonster.ScoringValue = 0;
        }
-       // Add hardcore level
-       for(i = 0;i < ZedDatabase.Length;i ++){
-           HLBonus = 0.0;
-           if((ZedDatabase[i].MeanZedType == Other.class || ZedDatabase[i].ZedType == Other.class)
-               && !ZedDatabase[i].bAlreadySpawned){
-               HLBonus = ZedDatabase[i].HL;
-               ZedDatabase[i].bAlreadySpawned = true;
-           }
-           if(ZedDatabase[i].MeanZedType == Other.class && !ZedDatabase[i].bMeanAlreadySpawned){
-               HLBonus += ZedDatabase[i].MeanHLBonus;
-               ZedDatabase[i].bMeanAlreadySpawned = true;
-           }
-           HLBonus *= (Level.Game.GameDifficulty / 7.0);
-           if(HLBonus > 0.0)
-               GameRules.RaiseHardcoreLevel(HLBonus, niceMonster.MenuName);
-       }
    }
    // Replace zeds with a healthier ones.
    // Code taken from a scary ghost's SpecimenHPConfig
@ -680,7 +662,6 @@ simulated function Mutate(string MutateString, PlayerController kfPlayer){
       i ++;
    }
    nicePlayer = NicePlayerController(kfPlayer);
-    Log("UMBRA" @ command);
    if(command ~= "ECHO")
       kfPlayer.ClientMessage(Mid(MutateString, 5));
    else if(command ~= "ZED" && bAlwaysAllowSkillChange)
@ -814,13 +795,6 @@ function WaveStart(){
           }
       }
    }
-    if(KFGameType(Level.Game).WaveNum == KFGameType(Level.Game).FinalWave && !bAppliedPlayersMult){
-       bAppliedPlayersMult = true;
-       if(maxPlayersInGame == 1)
-           GameRules.RaiseHardcoreLevel(ScrnMut.GameRules.HardcoreLevelFloat, "solo game");
-       else if(maxPlayersInGame == 2)
-           GameRules.RaiseHardcoreLevel(0.5 * ScrnMut.GameRules.HardcoreLevelFloat, "low player count");
-    }
 }
 // Called when trader time begins
 simulated function TraderStart(){
--- a/sources/NiceRules.uc
+++ b/sources/NiceRules.uc
@ -115,28 +115,6 @@ function int NetDamage(int OriginalDamage, int Damage, pawn injured, pawn instig
 function bool NoFF(Pawn injured, float FF){
    return (FF == 0.0 || (Vehicle(injured) != none && Vehicle(injured).bNoFriendlyFire));
 }
-function RaiseHardcoreLevel(float inc, string reason){
-    local string s;
-    local Controller P;
-    local NicePlayerController nicePlayer;
-    
-    if(ScrnRules.HardcoreLevelFloat < ScrnRules.HardcoreLevel)
-       ScrnRules.HardcoreLevelFloat = ScrnRules.HardcoreLevel;
-    ScrnRules.HardcoreLevelFloat += inc;
-    ScrnRules.HardcoreLevel = int(ScrnRules.HardcoreLevelFloat + 0.01);
-    ScrnRules.Mut.HardcoreLevel = clamp(ScrnRules.HardcoreLevel, 0, 255); 
-    ScrnRules.Mut.NetUpdateTime = Level.TimeSeconds - 1;
-    
-    s = ScrnRules.msgHardcore;
-    ReplaceText(s, "%a", String(ScrnRules.HardcoreLevel));
-    ReplaceText(s, "%i", String(inc));
-    ReplaceText(s, "%r", reason);
-    for(P = Level.ControllerList; P != none; P = P.nextController){
-       nicePlayer = NicePlayerController(P);
-       if(nicePlayer != none && nicePlayer.bFlagShowHLMessages)
-           nicePlayer.ClientMessage(s);
-    }
-}
 function bool PreventDeath(Pawn Killed, Controller Killer, class<DamageType> damageType, vector HitLocation){
    local NiceHumanPawn nicePawn;
    local NicePlayerController nicePlayer;
--- a/sources/Perks/Commando/NiceVetCommando.uc
+++ b/sources/Perks/Commando/NiceVetCommando.uc
@ -68,9 +68,9 @@ static function float ModifyRecoilSpread(KFPlayerReplicationInfo KFPRI, WeaponFi
    return Recoil;
 }
 static function int ZedTimeExtensions(KFPlayerReplicationInfo KFPRI){
-    /*if(HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillCommandoTactitian'))
-       return class'NiceSkillCommandoTactitian'.default.bonusExt + 3;*/
-    return 4;
+    if(HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillCommandoOverclocking'))
+       return class'NiceSkillCommandoOverclocking'.default.bonusExt;
+    return 0;
 }
 static function string GetCustomLevelInfo(byte Level){
    return default.CustomLevelInfo;
--- a/sources/Perks/Commando/Skills/NiceSkillCommandoOverclocking.uc
+++ b/sources/Perks/Commando/Skills/NiceSkillCommandoOverclocking.uc
@ -1,9 +1,11 @@
 class NiceSkillCommandoOverclocking extends NiceSkill
    abstract;
 var float fireSpeedMult;
+var int bonusExt;
 defaultproperties
 {
+    bonusExt=4
    fireSpeedMult=1.300000
    SkillName="Overclocking"
-    SkillEffects="+30% fire speed with perked weapons. Don't ask, it just works."
+    SkillEffects="+30% fire speed with perked weapons and 4 zedtime extensions. Don't ask, it just works."
 }
--- a/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLAmmo.uc
+++ b/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLAmmo.uc
@ -1,9 +1,9 @@
 class NiceCLGLAmmo extends NiceAmmo;
 defaultproperties
 {
-    AmmoPickupAmount=4
-    MaxAmmo=30
-    InitialAmount=6
+    AmmoPickupAmount=2
+    MaxAmmo=20
+    InitialAmount=5
    PickupClass=Class'NicePack.NiceCLGLAmmoPickup'
    IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
    IconCoords=(X1=4,Y1=350,X2=110,Y2=395)
--- a/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLAmmoPickup.uc
+++ b/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLAmmoPickup.uc
@ -1,7 +1,7 @@
 class NiceCLGLAmmoPickup extends NiceAmmoPickup;
 defaultproperties
 {
-    AmmoAmount=4
+    AmmoAmount=2
    InventoryType=Class'NicePack.NiceCLGLAmmo'
    PickupMessage="CLGL Grenades"
    StaticMesh=StaticMesh'KillingFloorStatics.FragPickup'
--- a/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLPickup.uc
+++ b/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLPickup.uc
@ -3,7 +3,7 @@ defaultproperties
 {
    Weight=6.000000
    cost=500
-    AmmoCost=16
+    AmmoCost=32
    BuyClipSize=4
    PowerValue=85
    SpeedValue=65
--- a/sources/Weapons/Playable/Explosives/LAW/NiceLAWAmmo.uc
+++ b/sources/Weapons/Playable/Explosives/LAW/NiceLAWAmmo.uc
@ -2,9 +2,9 @@ class NiceLAWAmmo extends NiceAmmo;
 #EXEC OBJ LOAD FILE=KillingFloorHUD.utx
 defaultproperties
 {
-    AmmoPickupAmount=2
-    MaxAmmo=20
-    InitialAmount=5
+    AmmoPickupAmount=1
+    MaxAmmo=10
+    InitialAmount=1
    IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
    IconCoords=(X1=458,Y1=34,X2=511,Y2=78)
    ItemName="L.A.W Rockets"
--- a/sources/Weapons/Playable/Explosives/LAW/NiceLAWAmmoPickup.uc
+++ b/sources/Weapons/Playable/Explosives/LAW/NiceLAWAmmoPickup.uc
@ -1,7 +1,7 @@
 class NiceLAWAmmoPickup extends NiceAmmoPickup;
 defaultproperties
 {
-    AmmoAmount=2
+    AmmoAmount=1
    InventoryType=Class'NicePack.NiceLAWAmmo'
    PickupMessage="HEAT Rockets"
    StaticMesh=StaticMesh'KillingFloorStatics.LAWAmmo'
--- a/sources/Weapons/Playable/Explosives/LAW/NiceLAWPickup.uc
+++ b/sources/Weapons/Playable/Explosives/LAW/NiceLAWPickup.uc
@ -4,7 +4,7 @@ defaultproperties
 {
    Weight=9.000000
    cost=1250
-    AmmoCost=13
+    AmmoCost=40
    BuyClipSize=1
    PowerValue=100
    SpeedValue=20
--- a/sources/Weapons/Playable/Explosives/M32/NiceM32Ammo.uc
+++ b/sources/Weapons/Playable/Explosives/M32/NiceM32Ammo.uc
@ -3,8 +3,8 @@ defaultproperties
 {
    WeaponPickupClass=Class'NicePack.NiceM32Pickup'
    AmmoPickupAmount=6
-    MaxAmmo=36
-    InitialAmount=9
+    MaxAmmo=32
+    InitialAmount=6
    PickupClass=Class'NicePack.NiceM32AmmoPickup'
    IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
    IconCoords=(X1=4,Y1=350,X2=110,Y2=395)
--- a/sources/Weapons/Playable/Explosives/M32/NiceM32Pickup.uc
+++ b/sources/Weapons/Playable/Explosives/M32/NiceM32Pickup.uc
@ -2,7 +2,7 @@ class NiceM32Pickup extends NiceWeaponPickup;
 defaultproperties
 {
    Weight=7.000000
-    AmmoCost=33
+    AmmoCost=66
    cost=1000
    BuyClipSize=6
    PowerValue=85
--- a/sources/Weapons/Playable/Explosives/M79/NiceM79Ammo.uc
+++ b/sources/Weapons/Playable/Explosives/M79/NiceM79Ammo.uc
@ -2,9 +2,9 @@ class NiceM79Ammo extends NiceAmmo;
 defaultproperties
 {
    WeaponPickupClass=Class'NicePack.NiceM79Pickup'
-    AmmoPickupAmount=3
-    MaxAmmo=24
-    InitialAmount=6
+    AmmoPickupAmount=2
+    MaxAmmo=16
+    InitialAmount=4
    PickupClass=Class'NicePack.NiceM79AmmoPickup'
    IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
    IconCoords=(X1=4,Y1=350,X2=110,Y2=395)
--- a/sources/Weapons/Playable/Explosives/M79/NiceM79AmmoPickup.uc
+++ b/sources/Weapons/Playable/Explosives/M79/NiceM79AmmoPickup.uc
@ -1,7 +1,7 @@
 class NiceM79AmmoPickup extends NiceAmmoPickup;
 defaultproperties
 {
-    AmmoAmount=3
+    AmmoAmount=2
    InventoryType=Class'NicePack.NiceM79Ammo'
    PickupMessage="M79 Incendiary Grenades"
    StaticMesh=StaticMesh'KillingFloorStatics.FragPickup'
--- a/sources/Weapons/Playable/Explosives/M79/NiceM79Pickup.uc
+++ b/sources/Weapons/Playable/Explosives/M79/NiceM79Pickup.uc
@ -4,7 +4,7 @@ defaultproperties
    crossPerkIndecies(0)=10
    Weight=4.000000
    cost=250
-    AmmoCost=4
+    AmmoCost=8
    BuyClipSize=1
    PowerValue=85
    SpeedValue=5
--- a/sources/Weapons/Playable/Explosives/PipeBombs/NicePipeBombPickup.uc
+++ b/sources/Weapons/Playable/Explosives/PipeBombs/NicePipeBombPickup.uc
@ -2,7 +2,7 @@ class NicePipeBombPickup extends ScrnPipeBombPickup;
 defaultproperties
 {
    cost=50
-    AmmoCost=50
+    AmmoCost=100
    ItemName="Pipe Bomb NW"
    ItemShortName="Pipe Bomb NW"
    AmmoItemName="Pipe Bomb NW"
--- a/sources/Weapons/Playable/Pistols/9mmPlus/NiceDual9mmPlusFire.uc
+++ b/sources/Weapons/Playable/Pistols/9mmPlus/NiceDual9mmPlusFire.uc
@ -10,7 +10,7 @@ defaultproperties
    DamageType=Class'NicePack.NiceDamType9mmPlus'
    Momentum=10000.000000
    FireRate=0.167
-    Spread=500.0
+    Spread=250.0
    SpreadStyle=SS_Random
    bWaitForRelease=Flash2Emitter
    AmmoClass=Class'NicePack.NiceDual9mmPlusAmmo'
--- a/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeagleFire.uc
+++ b/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeagleFire.uc
@ -13,7 +13,7 @@ defaultproperties
    DamageMax=120
    Momentum=20000.000000
    FireRate=0.34
-    Spread=500.0
+    Spread=250.0
    SpreadStyle=SS_Random
    AmmoClass=Class'NicePack.NiceDualDeagleAmmo'
    ShakeRotMag=(Z=400.000000)
--- a/sources/Weapons/Playable/Pistols/Glock/NiceDualGlockFire.uc
+++ b/sources/Weapons/Playable/Pistols/Glock/NiceDualGlockFire.uc
@ -12,7 +12,7 @@ defaultproperties
    Momentum=18000.000000
    bWaitForRelease=False
    FireRate=0.117
-    Spread=500.0
+    Spread=250.0
    SpreadStyle=SS_Random
    AmmoClass=Class'NicePack.NiceDualGlockAmmo'
    ShakeRotMag=(Z=290.000000)
--- a/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Fire.uc
+++ b/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Fire.uc
@ -17,7 +17,7 @@ defaultproperties
    FireAnimRate
    FireAnimRate=1.5
    FireRate=0.2
-    Spread=500.0
+    Spread=250.0
    SpreadStyle=SS_Random
    AmmoClass=Class'NicePack.NiceDualMK23Ammo'
    ShakeRotMag=(Z=290.000000)
--- a/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumFire.uc
+++ b/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumFire.uc
@ -11,7 +11,7 @@ defaultproperties
    DamageType=Class'NicePack.NiceDamTypeMagnumPistol'
    DamageMin=82
    DamageMax=82
-    Spread=500.0
+    Spread=250.0
    SpreadStyle=SS_Random
    Momentum=15000.000000
    bWaitForRelease=False