From c536198a5296fb099b3608b1378856492c1b067e Mon Sep 17 00:00:00 2001 From: Anton Tarasenko Date: Fri, 11 Jun 2021 21:10:09 +0700 Subject: [PATCH] Patch [Version 0.3.4 "Private balance round #3"] --- sources/NiceGameType.uc | 134 +++++++++++++++++- sources/NicePack.uc | 111 ++++++--------- sources/Perks/Commando/NiceVetCommando.uc | 29 +++- .../Skills/NiceSkillCommandoExplosivePower.uc | 4 +- .../Skills/NiceSkillCommandoOverclocking.uc | 9 ++ .../Skills/NiceSkillCommandoQuickerMags.uc | 9 ++ sources/Perks/NiceVeterancyTypes.uc | 3 + .../Skills/NiceSkillSpecialtyGunslinger.uc | 13 ++ .../Skills/NiceSkillSpecialtySharpshooter.uc | 11 ++ .../BaseWeaponClasses/Pistols/NiceDualies.uc | 17 +++ .../BaseWeaponClasses/Pistols/NiceSingle.uc | 2 +- sources/Weapons/NiceFire.uc | 8 +- sources/Weapons/NiceWeapon.uc | 9 +- .../AK12/NiceAK12AssaultRifle.uc | 2 +- .../AssaultRifles/AK12/NiceAK12Fire.uc | 5 +- .../AssaultRifles/AK12/NiceAK12Pickup.uc | 3 +- .../AssaultRifles/AK47/NiceAK47Pickup.uc | 2 +- .../Bullpup/NiceBullpupPickup.uc | 1 + .../FNFAL/NiceFNFAL_ACOG_Pickup.uc | 2 +- .../AssaultRifles/L85A2/NiceL85A2Pickup.uc | 2 +- .../Playable/AssaultRifles/M4/NiceM4Pickup.uc | 2 +- .../M4M203/NiceM4M203NadeAmmo.uc | 6 +- .../AssaultRifles/M4M203/NiceM4M203Pickup.uc | 2 +- .../AssaultRifles/MKb42/NiceMKb42Pickup.uc | 2 +- .../AssaultRifles/SCAR/NiceSCARMK17Pickup.uc | 2 +- .../ChinaLakeGrenadeLauncher/NiceCLGLAmmo.uc | 4 +- .../NiceCLGLAmmoPickup.uc | 2 +- .../NiceCLGLPickup.uc | 2 +- .../Playable/Explosives/LAW/NiceLAWPickup.uc | 2 +- .../Playable/Explosives/M32/NiceM32Pickup.uc | 2 +- .../Playable/Explosives/M79/NiceM79Pickup.uc | 4 +- .../PipeBombs/NicePipeBombPickup.uc | 4 +- .../SealSqueal/NiceSealSquealPickup.uc | 2 +- .../Playable/Heavy/M249/NiceM249Pickup.uc | 2 +- .../Playable/Heavy/RPK47/NiceRPK47Pickup.uc | 2 +- .../Heavy/SA80LSW/NiceSA80LSWPickup.uc | 2 +- .../Playable/Heavy/XMV/NiceXMV850Pickup.uc | 2 +- .../Pistols/9mmPlus/Nice9mmPlusPickup.uc | 3 +- .../Pistols/9mmPlus/NiceDual9mmPlusPickup.uc | 3 +- .../Pistols/Contender/NiceContenderPickup.uc | 2 +- .../Pistols/Deagle/NiceDeaglePickup.uc | 2 +- .../Pistols/Deagle/NiceDualDeaglePickup.uc | 4 +- .../Pistols/Glock/NiceDualGlockPickup.uc | 5 +- .../Playable/Pistols/Glock/NiceGlockPickup.uc | 3 +- .../Playable/Pistols/MK32/NiceDualMK23Fire.uc | 5 +- .../Pistols/MK32/NiceDualMK23Pickup.uc | 4 +- .../Pistols/MK32/NiceDualMK23Pistol.uc | 1 + .../Playable/Pistols/MK32/NiceMK23Fire.uc | 5 +- .../Playable/Pistols/MK32/NiceMK23Pickup.uc | 2 +- .../Playable/Pistols/MK32/NiceMK23Pistol.uc | 1 + .../Pistols/Magnum/NiceDamTypeMagnumPistol.uc | 4 +- .../Playable/Pistols/Magnum/NiceDualMagnum.uc | 2 +- .../Pistols/Magnum/NiceDualMagnumPickup.uc | 6 +- .../Playable/Pistols/Magnum/NiceMagnumFire.uc | 5 +- .../Pistols/Magnum/NiceMagnumPickup.uc | 4 +- .../Pistols/Magnum/NiceMagnumPistol.uc | 2 +- .../Playable/SMG/Kriss/NiceKrissMPickup.uc | 2 +- .../Playable/SMG/M7A3/NiceM7A3MPickup.uc | 2 +- .../Playable/SMG/MP5M/NiceMP5MPickup.uc | 2 +- .../Playable/SMG/MP7M/NiceMP7MPickup.uc | 2 +- .../Playable/Shotguns/AA12/NiceAA12Pickup.uc | 2 +- .../Shotguns/Benelli/NiceBenelliPickup.uc | 1 + .../Shotguns/Boomstick/NiceBoomStickPickup.uc | 3 +- .../Shotguns/Nailgun/NiceNailGunPickup.uc | 2 +- .../Shotguns/PumpShotgun/NiceShotgunPickup.uc | 2 +- .../Playable/Shotguns/Spas/NiceSpasPickup.uc | 2 +- .../HuntingRifle/NiceDamTypeHuntingRifle.uc | 2 +- .../HuntingRifle/NiceHuntingRiflePickup.uc | 2 +- .../SniperWeapons/M14EBR/NiceM14EBRPickup.uc | 2 +- .../SniperWeapons/M99/NiceM99Pickup.uc | 2 +- .../SniperWeapons/Mauler/NiceDamTypeMauler.uc | 2 +- .../SniperWeapons/Mauler/NiceMaulerPickup.uc | 2 +- .../SniperWeapons/SVD/NiceSVDPickup.uc | 2 +- .../SniperWeapons/VSSD/NiceVSSDTPickup.uc | 2 +- .../Winchester/NiceWinchesterPickup.uc | 3 +- sources/Zeds/Nice/NiceZombieJason.uc | 8 +- 76 files changed, 376 insertions(+), 154 deletions(-) create mode 100644 sources/Perks/Commando/Skills/NiceSkillCommandoOverclocking.uc create mode 100644 sources/Perks/Commando/Skills/NiceSkillCommandoQuickerMags.uc create mode 100644 sources/Perks/Sharpshooter/Skills/NiceSkillSpecialtyGunslinger.uc create mode 100644 sources/Perks/Sharpshooter/Skills/NiceSkillSpecialtySharpshooter.uc diff --git a/sources/NiceGameType.uc b/sources/NiceGameType.uc index 18cd564..548fda2 100644 --- a/sources/NiceGameType.uc +++ b/sources/NiceGameType.uc @@ -44,8 +44,10 @@ State MatchInProgress{ WaveNum = InitialWave; InvasionGameReplicationInfo(GameReplicationInfo).WaveNumber = WaveNum; - if(NicePackMutator.bInitialTrader) + if(NicePackMutator.bInitialTrader) { WaveCountDown = NicePackMutator.initialTraderTime + 5; + NicePackMutator.TraderStart(); + } else WaveCountDown = 10; @@ -67,6 +69,136 @@ State MatchInProgress{ NicePackMutator.WaveStart(); } } + +function ScoreKill(Controller Killer, Controller Other) +{ + local PlayerReplicationInfo OtherPRI; + local float KillScore; + local Controller C; + + OtherPRI = Other.PlayerReplicationInfo; + if ( OtherPRI != None ) + { + OtherPRI.NumLives++; + OtherPRI.Score -= (OtherPRI.Score * (GameDifficulty * 0.05)); // you Lose 35% of your current cash on Hell on Earth, 15% on normal. + OtherPRI.Team.Score -= (OtherPRI.Score * (GameDifficulty * 0.05)); + + if (OtherPRI.Score < 0 ) + OtherPRI.Score = 0; + if (OtherPRI.Team.Score < 0 ) + OtherPRI.Team.Score = 0; + + OtherPRI.Team.NetUpdateTime = Level.TimeSeconds - 1; + OtherPRI.bOutOfLives = true; + if( Killer!=None && Killer.PlayerReplicationInfo!=None && Killer.bIsPlayer ) + BroadcastLocalizedMessage(class'KFInvasionMessage',1,OtherPRI,Killer.PlayerReplicationInfo); + else if( Killer==None || Monster(Killer.Pawn)==None ) + BroadcastLocalizedMessage(class'KFInvasionMessage',1,OtherPRI); + else BroadcastLocalizedMessage(class'KFInvasionMessage',1,OtherPRI,,Killer.Pawn.Class); + CheckScore(None); + } + + if ( GameRulesModifiers != None ) + GameRulesModifiers.ScoreKill(Killer, Other); + + if ( MonsterController(Killer) != None ) + return; + + if( (killer == Other) || (killer == None) ) + { + if ( Other.PlayerReplicationInfo != None ) + { + Other.PlayerReplicationInfo.Score -= 1; + Other.PlayerReplicationInfo.NetUpdateTime = Level.TimeSeconds - 1; + ScoreEvent(Other.PlayerReplicationInfo,-1,"self_frag"); + } + } + + if ( Killer==None || !Killer.bIsPlayer || (Killer==Other) ) + return; + + if ( Other.bIsPlayer ) + { + Killer.PlayerReplicationInfo.Score -= 5; + Killer.PlayerReplicationInfo.Team.Score -= 2; + Killer.PlayerReplicationInfo.NetUpdateTime = Level.TimeSeconds - 1; + Killer.PlayerReplicationInfo.Team.NetUpdateTime = Level.TimeSeconds - 1; + ScoreEvent(Killer.PlayerReplicationInfo, -5, "team_frag"); + return; + } + if ( LastKilledMonsterClass == None ) + KillScore = 1; + else if(Killer.PlayerReplicationInfo !=none) + { + KillScore = LastKilledMonsterClass.Default.ScoringValue; + + // Scale killscore by difficulty + if ( GameDifficulty >= 5.0 ) // Suicidal and Hell on Earth + { + KillScore *= 0.65; + } + else if ( GameDifficulty >= 4.0 ) // Hard + { + KillScore *= 0.85; + } + else if ( GameDifficulty >= 2.0 ) // Normal + { + KillScore *= 1.0; + } + else //if ( GameDifficulty == 1.0 ) // Beginner + { + KillScore *= 2.0; + } + + // Increase score in a short game, so the player can afford to buy cool stuff by the end + if( KFGameLength == GL_Short ) + { + KillScore *= 1.75; + } + + KillScore = Max(1,int(KillScore)); + if (NicePackMutator.bUseProgresiveCash) { + KillScore = 0; + } + Killer.PlayerReplicationInfo.Kills++; + + ScoreKillAssists(KillScore, Other, Killer); + + Killer.PlayerReplicationInfo.Team.Score += KillScore; + Killer.PlayerReplicationInfo.NetUpdateTime = Level.TimeSeconds - 1; + Killer.PlayerReplicationInfo.Team.NetUpdateTime = Level.TimeSeconds - 1; + TeamScoreEvent(Killer.PlayerReplicationInfo.Team.TeamIndex, 1, "tdm_frag"); + } + + if (Killer.PlayerReplicationInfo !=none && Killer.PlayerReplicationInfo.Score < 0) + Killer.PlayerReplicationInfo.Score = 0; + + + /* Begin Marco's Kill Messages */ + + if( Class'HUDKillingFloor'.Default.MessageHealthLimit<=Other.Pawn.Default.Health || + Class'HUDKillingFloor'.Default.MessageMassLimit<=Other.Pawn.Default.Mass ) + { + for( C=Level.ControllerList; C!=None; C=C.nextController ) + { + if( C.bIsPlayer && xPlayer(C)!=None ) + { + xPlayer(C).ReceiveLocalizedMessage(Class'KillsMessage',1,Killer.PlayerReplicationInfo,,Other.Pawn.Class); + } + } + } + else + { + if( xPlayer(Killer)!=None ) + { + xPlayer(Killer).ReceiveLocalizedMessage(Class'KillsMessage',,,,Other.Pawn.Class); + } + } + + /* End Marco's Kill Messages */ + +} + function DramaticEvent(float BaseZedTimePossibility, optional float DesiredZedTimeDuration){ local bool bWasZedTime; bWasZedTime = bZEDTimeActive; diff --git a/sources/NicePack.uc b/sources/NicePack.uc index e573ad4..7e0f29e 100644 --- a/sources/NicePack.uc +++ b/sources/NicePack.uc @@ -10,9 +10,9 @@ var config bool bInitialTrader; // Use initial trader system? var config bool bStillDuringInitTrader; // Force players to stand still during initial trader var config int initialTraderTime; // How much time should be allowed for initial trade? // Progressive dosh config -var config bool bUseProgresiveCash; // Use progressive dosh system? -var config int startupCashBeg, startupCashNormal, startupCashHard, startupCashSui, startupCashHOE; // Cash given to player for joining for the first time on current map -var config int waveCashBeg, waveCashNormal, waveCashHard, waveCashSui, waveCashHOE; // Cash that should be given to players for each wave they've skipped +var config bool bUseProgresiveCash; // Use progressive dosh system? +var config array waveCash; +var config float lateMultiplier; // Experience-conversion controlling variables var config bool bConvertExp; // Should we even convert old exp into a new one? var config float vetFieldMedicExpCost; // Amount of exp per HP healed @@ -504,6 +504,9 @@ simulated function bool CheckReplacement(Actor Other, out byte bSuperRelevant){ } niceMonster = NiceMonster(Other); if(niceMonster != none){ + if (bUseProgresiveCash) { + niceMonster.ScoringValue = 0; + } // Add hardcore level for(i = 0;i < ZedDatabase.Length;i ++){ HLBonus = 0.0; @@ -608,30 +611,35 @@ simulated function AddWeapProgress(class weapClass, float progress, simulated function ClearWeapProgress(){ niceWeapProgressSet.Length = 0; } +// Returns cash per wave based on current difficulty +// Returns cash per wave based on current difficulty +function int GetWaveCash(int lastCashWave, int nextWave){ + local int i; + local int accumulatedDosh; + for (i = lastCashWave; i < nextWave; i += 1) { + accumulatedDosh += waveCash[i]; + } + if (lastCashWave + 1 < nextWave) { + accumulatedDosh *= lateMultiplier; + } + return accumulatedDosh; +} // Gives out appropriate (for the wave he entered) amount of dosh to the player function GiveProgressiveDosh(NicePlayerController nicePlayer){ - local int wavesPassed; - local PlayerRecord record; - local class niceVet; + local int nextWave; + local PlayerRecord record; // Too early to give dosh if(!ScrnGT.IsInState('MatchInProgress')) return; // Real spectators shouldn't be affected - if(!nicePlayer.PlayerReplicationInfo.bOnlySpectator){ - record = FindPlayerRecord(nicePlayer.steamID64); - if(record.lastCashWave == -1){ - nicePlayer.PlayerReplicationInfo.Score += GetStartupCash(); - record.lastCashWave = 0; - niceVet = class'NiceVeterancyTypes'.static.GetVeterancy(nicePlayer.PlayerReplicationInfo); - if(niceVet != none && niceVet.default.bNewTypePerk) - nicePlayer.PlayerReplicationInfo.Score += 100; - } - wavesPassed = ScrnGT.WaveNum; // At a trader (and that's the only time this function should be called) 'WaveNum' is already a number of the next wave, so no need for '+1' here - if(wavesPassed > record.lastCashWave) - nicePlayer.PlayerReplicationInfo.Score += (wavesPassed - record.lastCashWave) * GetWaveCash(); - record.lastCashWave = wavesPassed; - UpdatePlayerRecord(record); - } + if(nicePlayer == none) return; + if(nicePlayer.PlayerReplicationInfo.bIsSpectator) return; + if(nicePlayer.PlayerReplicationInfo.bOnlySpectator) return; + record = FindPlayerRecord(nicePlayer.steamID64); + nextWave = ScrnGT.WaveNum + 1; + nicePlayer.PlayerReplicationInfo.Score += GetWaveCash(record.lastCashWave, nextWave); + record.lastCashWave = nextWave; + UpdatePlayerRecord(record); } simulated function Mutate(string MutateString, PlayerController kfPlayer){ local int i, readLenght; @@ -669,6 +677,7 @@ 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) @@ -786,7 +795,6 @@ function MatchBegan(){ // Called when new wave begins function WaveStart(){ local Controller P; - local PlayerRecord record; local NiceHumanPawn nicePawn; local NicePlayerController nicePlayer; bIsPreGame = false; @@ -794,12 +802,6 @@ function WaveStart(){ for(P = Level.ControllerList; P != none; P = P.nextController){ nicePlayer = NicePlayerController(P); if(nicePlayer != none){ - // Update records - if(!nicePlayer.PlayerReplicationInfo.bIsSpectator && !nicePlayer.PlayerReplicationInfo.bOnlySpectator){ - record = FindPlayerRecord(nicePlayer.steamID64); - record.lastCashWave = ScrnGT.WaveNum + 1; - UpdatePlayerRecord(record); - } // Give out armor nicePawn = NiceHumanPawn(nicePlayer.Pawn); if(nicePawn != none && nicePawn.Health > 0){ @@ -817,7 +819,7 @@ function WaveStart(){ GameRules.RaiseHardcoreLevel(0.5 * ScrnMut.GameRules.HardcoreLevelFloat, "low player count"); } } -// Called when trader time begins (not the initial one) +// Called when trader time begins simulated function TraderStart(){ local Controller P; local NiceHumanPawn nicePawn; @@ -829,6 +831,9 @@ simulated function TraderStart(){ nicePlayer.TryActivatePendingSkills(); nicePlayer.ClientSaveConfig(); nicePawn = NiceHumanPawn(nicePlayer.Pawn); + if (bUseProgresiveCash) { + GiveProgressiveDosh(nicePlayer); + } } } } @@ -848,33 +853,6 @@ simulated function ZedTimeDeactivated(){ Player.bJunkieExtFailed = false; } } -// Utility functions -// Returns startup cash based on current difficulty -function int GetStartupCash(){ - if(Level.Game.GameDifficulty < 2.0) - return startupCashBeg; - else if(Level.Game.GameDifficulty < 4.0) - return startupCashNormal; - else if(Level.Game.GameDifficulty < 5.0) - return startupCashHard; - else if(Level.Game.GameDifficulty < 7.0) - return startupCashSui; - else - return startupCashHOE; -} -// Returns cash per wave based on current difficulty -function int GetWaveCash(){ - if(Level.Game.GameDifficulty < 2.0) - return waveCashBeg; - else if(Level.Game.GameDifficulty < 4.0) - return waveCashNormal; - else if(Level.Game.GameDifficulty < 5.0) - return waveCashHard; - else if(Level.Game.GameDifficulty < 7.0) - return waveCashSui; - else - return waveCashHOE; -} // Returns player record, corresponding to the given steam id function PlayerRecord FindPlayerRecord(string steamID){ local int i; @@ -884,7 +862,7 @@ function PlayerRecord FindPlayerRecord(string steamID){ return PlayerDatabase[i]; newRecord.steamID = steamID; newRecord.bHasSpawned = false; - newRecord.lastCashWave = -1; + newRecord.lastCashWave = 0; newRecord.kills = 0; newRecord.assists = 0; newRecord.deaths = 0; @@ -1089,16 +1067,15 @@ defaultproperties bInitialTrader=True initialTraderTime=10 bUseProgresiveCash=True - startupCashBeg=500 - startupCashNormal=500 - startupCashHard=500 - startupCashSui=400 - startupCashHOE=400 - waveCashBeg=350 - waveCashNormal=300 - waveCashHard=200 - waveCashSui=150 - waveCashHOE=150 + waveCash(0)=1000 + waveCash(1)=900 + waveCash(2)=800 + waveCash(3)=650 + waveCash(4)=600 + waveCash(5)=450 + waveCash(6)=350 + waveCash(7)=250 + lateMultiplier=0.5 bConvertExp=True vetFieldMedicExpCost=2.000000 vetFieldMedicDmgExpCost=0.025000 diff --git a/sources/Perks/Commando/NiceVetCommando.uc b/sources/Perks/Commando/NiceVetCommando.uc index de3c944..654572d 100644 --- a/sources/Perks/Commando/NiceVetCommando.uc +++ b/sources/Perks/Commando/NiceVetCommando.uc @@ -44,6 +44,29 @@ static function float GetMovementSpeedModifier(KFPlayerReplicationInfo KFPRI, KF static function float GetReloadSpeedModifierStatic(KFPlayerReplicationInfo KFPRI, class Other){ return 1.3; } +static function float GetFireSpeedModStatic(KFPlayerReplicationInfo KFPRI, class other){ + local float fireSpeed; + local NicePlayerController nicePlayer; + local class pickupClass; + pickupClass = GetPickupFromWeapon(other); + if(KFPRI.Owner == none) + return 1.0; + if(IsPerkedPickup(pickupClass) && HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillCommandoOverclocking')) + fireSpeed = class'NiceSkillHeavyOverclocking'.default.fireSpeedMult; + else + fireSpeed = 1.0; + nicePlayer = NicePlayerController(KFPRI.Owner); + return fireSpeed; +} +static function float ModifyRecoilSpread(KFPlayerReplicationInfo KFPRI, WeaponFire other, out float Recoil){ + local class pickupClass; + pickupClass = GetPickupFromWeaponFire(other); + if(IsPerkedPickup(pickupClass) && HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillCommandoOverclocking')) + Recoil = class'NiceSkillCommandoOverclocking'.default.fireSpeedMult; + else + Recoil = 1.0; + return Recoil; +} static function int ZedTimeExtensions(KFPlayerReplicationInfo KFPRI){ /*if(HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillCommandoTactitian')) return class'NiceSkillCommandoTactitian'.default.bonusExt + 3;*/ @@ -60,9 +83,9 @@ defaultproperties SkillGroupA(2)=Class'NicePack.NiceSkillCommandoPerfectExecution' //SkillGroupA(3)=Class'NicePack.' SkillGroupA(4)=Class'NicePack.NiceSkillCommandoZEDProfessional' - SkillGroupB(0)=Class'NicePack.NiceSkillCommandoAdrenalineShot' - SkillGroupB(1)=Class'NicePack.NiceSkillCommandoRegeneration' - SkillGroupB(2)=Class'NicePack.NiceSkillCommandoTranquilizer' + SkillGroupB(0)=Class'NicePack.NiceSkillCommandoRegeneration' + SkillGroupB(1)=Class'NicePack.NiceSkillCommandoQuickermags' + SkillGroupB(2)=Class'NicePack.NiceSkillCommandoOverclocking' //SkillGroupB(3)=Class'NicePack.' SkillGroupB(4)=Class'NicePack.NiceSkillCommandoZEDHeavenCanceller' progressArray0(0)=100 diff --git a/sources/Perks/Commando/Skills/NiceSkillCommandoExplosivePower.uc b/sources/Perks/Commando/Skills/NiceSkillCommandoExplosivePower.uc index 6a1373d..3806516 100644 --- a/sources/Perks/Commando/Skills/NiceSkillCommandoExplosivePower.uc +++ b/sources/Perks/Commando/Skills/NiceSkillCommandoExplosivePower.uc @@ -3,7 +3,7 @@ class NiceSkillCommandoExplosivePower extends NiceSkill var float dmgMod; defaultproperties { - dmgMod=1.200000 + dmgMod=1.000000 SkillName="Explosive power" - SkillEffects="Burst fire deals 20% more damage and has reduced delay between shots." + SkillEffects="Burst fire shots one more bullet." } diff --git a/sources/Perks/Commando/Skills/NiceSkillCommandoOverclocking.uc b/sources/Perks/Commando/Skills/NiceSkillCommandoOverclocking.uc new file mode 100644 index 0000000..f44c1c0 --- /dev/null +++ b/sources/Perks/Commando/Skills/NiceSkillCommandoOverclocking.uc @@ -0,0 +1,9 @@ +class NiceSkillCommandoOverclocking extends NiceSkill + abstract; +var float fireSpeedMult; +defaultproperties +{ + fireSpeedMult=1.300000 + SkillName="Overclocking" + SkillEffects="+30% fire speed with perked weapons. Don't ask, it just works." +} diff --git a/sources/Perks/Commando/Skills/NiceSkillCommandoQuickerMags.uc b/sources/Perks/Commando/Skills/NiceSkillCommandoQuickerMags.uc new file mode 100644 index 0000000..94a8d87 --- /dev/null +++ b/sources/Perks/Commando/Skills/NiceSkillCommandoQuickerMags.uc @@ -0,0 +1,9 @@ +class NiceSkillCommandoQuickerMags extends NiceSkill + abstract; +var float speedBonus; +defaultproperties +{ + speedBonus=2.000000 + SkillName="Quicker mags" + SkillEffects="Active reload speed is twice as fast." +} diff --git a/sources/Perks/NiceVeterancyTypes.uc b/sources/Perks/NiceVeterancyTypes.uc index 2ec2e51..d5ce02b 100644 --- a/sources/Perks/NiceVeterancyTypes.uc +++ b/sources/Perks/NiceVeterancyTypes.uc @@ -4,8 +4,11 @@ class NiceVeterancyTypes extends ScrnVeterancyTypes // Temporarily needed variable to distinguish between new and old type perks var bool bNewTypePerk; // Skills +var bool isDualPerk; var class SkillGroupA[5]; var class SkillGroupB[5]; +var class AltSkillGroupA[4]; +var class AltSkillGroupB[4]; // Checks if player is can use given skill static function bool CanUseSkill(NicePlayerController nicePlayer, class skill){ local int i; diff --git a/sources/Perks/Sharpshooter/Skills/NiceSkillSpecialtyGunslinger.uc b/sources/Perks/Sharpshooter/Skills/NiceSkillSpecialtyGunslinger.uc new file mode 100644 index 0000000..fbfe4aa --- /dev/null +++ b/sources/Perks/Sharpshooter/Skills/NiceSkillSpecialtyGunslinger.uc @@ -0,0 +1,13 @@ +class NiceSkillSpecialtyGunslinger extends NiceSkill + abstract; + +var float reloadMultiplier; +var float movementMultiplier; + +defaultproperties +{ + reloadMultiplier = 1.25 + movementMultiplier = 1.15; + SkillName="Gunslinger" + SkillEffects="Specialization in handling your guns comes with 25% faster reload and 15% faster movement." +} \ No newline at end of file diff --git a/sources/Perks/Sharpshooter/Skills/NiceSkillSpecialtySharpshooter.uc b/sources/Perks/Sharpshooter/Skills/NiceSkillSpecialtySharpshooter.uc new file mode 100644 index 0000000..4f92ddc --- /dev/null +++ b/sources/Perks/Sharpshooter/Skills/NiceSkillSpecialtySharpshooter.uc @@ -0,0 +1,11 @@ +class NiceSkillSpecialtySharpshooter extends NiceSkill + abstract; + +var float hsMultiplier; + +defaultproperties +{ + hsMultiplier = 1.25; + SkillName="Sharpshooter" + SkillEffects="Specialization in making calculated, precision shots comes with 25% more headshot damage." +} diff --git a/sources/Weapons/BaseWeaponClasses/Pistols/NiceDualies.uc b/sources/Weapons/BaseWeaponClasses/Pistols/NiceDualies.uc index 72f1b24..345282e 100644 --- a/sources/Weapons/BaseWeaponClasses/Pistols/NiceDualies.uc +++ b/sources/Weapons/BaseWeaponClasses/Pistols/NiceDualies.uc @@ -1,4 +1,5 @@ class NiceDualies extends NiceWeapon; +var bool startedWithFullPistol; var class SingleClass; var name altFlashBoneName; var name altTPAnim; @@ -45,6 +46,22 @@ simulated function SetupDualReloadEvents(){ record.eventFrame = rightInsert; relEvents[relEvents.Length] = record; } +exec simulated function ClientReloadMeNow(){ + startedWithFullPistol = false; + if ( MagAmmoRemLeftClient >= GetSingleMagCapacity() + || MagAmmoRemRightClient >= GetSingleMagCapacity()) { + startedWithFullPistol = true; + } + super.ClientReloadMeNow(); +} +simulated function float GetCurrentReloadMult(){ + local float normalMultiplier; + normalMultiplier = super.GetCurrentReloadMult(); + if (startedWithFullPistol) { + return normalMultiplier * 2; + } + return normalMultiplier; +} // Don't use that one for dualies simulated function AddReloadedAmmo(){} // Use this one diff --git a/sources/Weapons/BaseWeaponClasses/Pistols/NiceSingle.uc b/sources/Weapons/BaseWeaponClasses/Pistols/NiceSingle.uc index 6dda784..b5a5a06 100644 --- a/sources/Weapons/BaseWeaponClasses/Pistols/NiceSingle.uc +++ b/sources/Weapons/BaseWeaponClasses/Pistols/NiceSingle.uc @@ -50,7 +50,7 @@ function ServerSwitchToOtherSingle(){ MagAmmoRemaining = otherMagazine; otherMagazine = swap; ClientSetMagSize(MagAmmoRemaining, bRoundInChamber); - //nicePawn.ClientChangeWeapon(self); + nicePawn.ClientChangeWeapon(self); } function ServerSwitchToDual(){ local int m; diff --git a/sources/Weapons/NiceFire.uc b/sources/Weapons/NiceFire.uc index 93223d5..ef39bb6 100644 --- a/sources/Weapons/NiceFire.uc +++ b/sources/Weapons/NiceFire.uc @@ -144,7 +144,13 @@ simulated function PostBeginPlay(){ super.PostBeginPlay(); } simulated function int GetBurstLength(){ - return currentContext.burstLength; + local NicePlayerController nicePlayer; + if(Instigator != none) + nicePlayer = NicePlayerController(Instigator.Controller); + if(nicePlayer != none && class'NiceVeterancyTypes'.static.hasSkill(nicePlayer, class'NiceSkillCommandoExplosivePower')) { + return currentContext.burstLength + 1; + } + return currentContext.burstLength; } simulated function ModeTick(float delta){ local float headLevel; diff --git a/sources/Weapons/NiceWeapon.uc b/sources/Weapons/NiceWeapon.uc index 9cad557..cc67065 100644 --- a/sources/Weapons/NiceWeapon.uc +++ b/sources/Weapons/NiceWeapon.uc @@ -1122,6 +1122,7 @@ exec function ReloadMeNow(){ } simulated function float GetCurrentReloadMult(){ local float ReloadMulti; + local float actualActiveSpeedUp; local float timeDilationSpeedup; local NiceHumanPawn nicePawn; local NicePlayerController nicePlayer; @@ -1137,12 +1138,16 @@ simulated function float GetCurrentReloadMult(){ if(bGiveObsessiveBonus) ReloadMulti *= class'NiceSkillSupportObsessive'.default.reloadBonus; // Active reload speedup + actualActiveSpeedUp = activeSpeedup; + if (nicePlayer != none && niceVet.static.hasSkill(nicePlayer, class'NiceSkillCommandoQuickerMags')) { + actualActiveSpeedUp *= 2; + } if(activeReloadState == ACTR_SUCCESS) - ReloadMulti *= activeSpeedup; + ReloadMulti *= actualActiveSpeedUp; else if(activeReloadState == ACTR_FAIL) ReloadMulti *= activeSlowdown; else if(bCanActiveReload && reloadType == RTYPE_SINGLE && subReloadStage == 0) - ReloadMulti *= activeSpeedup; + ReloadMulti *= actualActiveSpeedUp; if(nicePlayer != none && niceVet.static.hasSkill(nicePlayer, class'NiceSkillCommandoZEDProfessional')) { timeDilationSpeedup = (1.1 / Level.TimeDilation); } diff --git a/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12AssaultRifle.uc b/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12AssaultRifle.uc index a360886..8a4de63 100644 --- a/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12AssaultRifle.uc +++ b/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12AssaultRifle.uc @@ -9,7 +9,7 @@ defaultproperties reloadMagStartFrame=0.363000 reloadChargeStartFrame=0.726000 MagazineBone="Bone_Magazine" - MagCapacity=30 + MagCapacity=40 ReloadRate=3.000000 ReloadAnim="Reload" ReloadAnimRate=1.000000 diff --git a/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12Fire.uc b/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12Fire.uc index b6d0dca..6665ef3 100644 --- a/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12Fire.uc +++ b/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12Fire.uc @@ -1,12 +1,13 @@ class NiceAK12Fire extends NiceFire; defaultproperties { + MaxBurstLength=4 zedTimeFireSpeedUp=1.500000 ProjectileSpeed=44000.000000 FireAimedAnim="Fire_Iron" RecoilRate=0.040000 - maxVerticalRecoilAngle=240 - maxHorizontalRecoilAngle=120 + maxVerticalRecoilAngle=160 + maxHorizontalRecoilAngle=80 ShellEjectClass=Class'ScrnWeaponPack.KFShellEjectAK12AR' ShellEjectBoneName="Shell_eject" bAccuracyBonusForSemiAuto=True diff --git a/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12Pickup.uc b/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12Pickup.uc index 30cb2f7..ca1fd4b 100644 --- a/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12Pickup.uc +++ b/sources/Weapons/Playable/AssaultRifles/AK12/NiceAK12Pickup.uc @@ -3,7 +3,8 @@ defaultproperties { Weight=6.000000 cost=750 - BuyClipSize=30 + AmmoCost=19 + BuyClipSize=40 PowerValue=55 SpeedValue=80 RangeValue=30 diff --git a/sources/Weapons/Playable/AssaultRifles/AK47/NiceAK47Pickup.uc b/sources/Weapons/Playable/AssaultRifles/AK47/NiceAK47Pickup.uc index 4756adc..3b678d3 100644 --- a/sources/Weapons/Playable/AssaultRifles/AK47/NiceAK47Pickup.uc +++ b/sources/Weapons/Playable/AssaultRifles/AK47/NiceAK47Pickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=6.000000 cost=750 - AmmoCost=30 + AmmoCost=19 BuyClipSize=30 PowerValue=40 SpeedValue=80 diff --git a/sources/Weapons/Playable/AssaultRifles/Bullpup/NiceBullpupPickup.uc b/sources/Weapons/Playable/AssaultRifles/Bullpup/NiceBullpupPickup.uc index 455cdb3..f42a0ed 100644 --- a/sources/Weapons/Playable/AssaultRifles/Bullpup/NiceBullpupPickup.uc +++ b/sources/Weapons/Playable/AssaultRifles/Bullpup/NiceBullpupPickup.uc @@ -4,6 +4,7 @@ defaultproperties bBackupWeapon=True Weight=5.000000 cost=200 + AmmoCost=6 BuyClipSize=30 PowerValue=24 SpeedValue=90 diff --git a/sources/Weapons/Playable/AssaultRifles/FNFAL/NiceFNFAL_ACOG_Pickup.uc b/sources/Weapons/Playable/AssaultRifles/FNFAL/NiceFNFAL_ACOG_Pickup.uc index 4dbe2e1..38638d4 100644 --- a/sources/Weapons/Playable/AssaultRifles/FNFAL/NiceFNFAL_ACOG_Pickup.uc +++ b/sources/Weapons/Playable/AssaultRifles/FNFAL/NiceFNFAL_ACOG_Pickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=8.000000 cost=1250 - AmmoCost=40 + AmmoCost=28 BuyClipSize=20 PowerValue=45 SpeedValue=90 diff --git a/sources/Weapons/Playable/AssaultRifles/L85A2/NiceL85A2Pickup.uc b/sources/Weapons/Playable/AssaultRifles/L85A2/NiceL85A2Pickup.uc index 674a22d..8f838d8 100644 --- a/sources/Weapons/Playable/AssaultRifles/L85A2/NiceL85A2Pickup.uc +++ b/sources/Weapons/Playable/AssaultRifles/L85A2/NiceL85A2Pickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=5.000000 cost=250 - AmmoCost=10 + AmmoCost=7 BuyClipSize=15 PowerValue=45 SpeedValue=60 diff --git a/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Pickup.uc b/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Pickup.uc index 8c41ffd..43b66dc 100644 --- a/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Pickup.uc +++ b/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Pickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=5.000000 cost=500 - AmmoCost=20 + AmmoCost=16 BuyClipSize=30 PowerValue=30 SpeedValue=90 diff --git a/sources/Weapons/Playable/AssaultRifles/M4M203/NiceM4M203NadeAmmo.uc b/sources/Weapons/Playable/AssaultRifles/M4M203/NiceM4M203NadeAmmo.uc index dba19f4..31358a4 100644 --- a/sources/Weapons/Playable/AssaultRifles/M4M203/NiceM4M203NadeAmmo.uc +++ b/sources/Weapons/Playable/AssaultRifles/M4M203/NiceM4M203NadeAmmo.uc @@ -2,9 +2,9 @@ class NiceM4M203NadeAmmo extends NiceAmmo; defaultproperties { WeaponPickupClass=Class'NicePack.NiceM4M203Pickup' - AmmoPickupAmount=2 - MaxAmmo=12 - InitialAmount=3 + AmmoPickupAmount=1 + MaxAmmo=15 + InitialAmount=4 PickupClass=Class'NicePack.NiceM4M203AmmoPickup' IconMaterial=Texture'KillingFloorHUD.Generic.HUD' IconCoords=(X1=4,Y1=350,X2=110,Y2=395) diff --git a/sources/Weapons/Playable/AssaultRifles/M4M203/NiceM4M203Pickup.uc b/sources/Weapons/Playable/AssaultRifles/M4M203/NiceM4M203Pickup.uc index d3f4345..5484082 100644 --- a/sources/Weapons/Playable/AssaultRifles/M4M203/NiceM4M203Pickup.uc +++ b/sources/Weapons/Playable/AssaultRifles/M4M203/NiceM4M203Pickup.uc @@ -4,7 +4,7 @@ defaultproperties crossPerkIndecies(0)=3 Weight=6.000000 cost=750 - AmmoCost=40 + AmmoCost=4 BuyClipSize=1 PowerValue=30 SpeedValue=90 diff --git a/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Pickup.uc b/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Pickup.uc index f9c505f..2427986 100644 --- a/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Pickup.uc +++ b/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Pickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=6.000000 cost=750 - AmmoCost=30 + AmmoCost=22 BuyClipSize=30 PowerValue=40 SpeedValue=85 diff --git a/sources/Weapons/Playable/AssaultRifles/SCAR/NiceSCARMK17Pickup.uc b/sources/Weapons/Playable/AssaultRifles/SCAR/NiceSCARMK17Pickup.uc index 9a446a1..2d90a6d 100644 --- a/sources/Weapons/Playable/AssaultRifles/SCAR/NiceSCARMK17Pickup.uc +++ b/sources/Weapons/Playable/AssaultRifles/SCAR/NiceSCARMK17Pickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=8.000000 cost=1250 - AmmoCost=40 + AmmoCost=28 BuyClipSize=20 PowerValue=45 SpeedValue=85 diff --git a/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLAmmo.uc b/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLAmmo.uc index 40b4418..3a5f72f 100644 --- a/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLAmmo.uc +++ b/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLAmmo.uc @@ -2,8 +2,8 @@ class NiceCLGLAmmo extends NiceAmmo; defaultproperties { AmmoPickupAmount=4 - MaxAmmo=36 - InitialAmount=9 + MaxAmmo=30 + InitialAmount=6 PickupClass=Class'NicePack.NiceCLGLAmmoPickup' IconMaterial=Texture'KillingFloorHUD.Generic.HUD' IconCoords=(X1=4,Y1=350,X2=110,Y2=395) diff --git a/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLAmmoPickup.uc b/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLAmmoPickup.uc index 82a0d2d..be2aa3b 100644 --- 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=6 + AmmoAmount=4 InventoryType=Class'NicePack.NiceCLGLAmmo' PickupMessage="CLGL Grenades" StaticMesh=StaticMesh'KillingFloorStatics.FragPickup' diff --git a/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLPickup.uc b/sources/Weapons/Playable/Explosives/ChinaLakeGrenadeLauncher/NiceCLGLPickup.uc index 7bffd62..a2178d6 100644 --- 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=28 + AmmoCost=16 BuyClipSize=4 PowerValue=85 SpeedValue=65 diff --git a/sources/Weapons/Playable/Explosives/LAW/NiceLAWPickup.uc b/sources/Weapons/Playable/Explosives/LAW/NiceLAWPickup.uc index b57207b..e1a160c 100644 --- 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=30 + AmmoCost=13 BuyClipSize=1 PowerValue=100 SpeedValue=20 diff --git a/sources/Weapons/Playable/Explosives/M32/NiceM32Pickup.uc b/sources/Weapons/Playable/Explosives/M32/NiceM32Pickup.uc index 8aefd29..0f2f87f 100644 --- 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=60 + AmmoCost=33 cost=1000 BuyClipSize=6 PowerValue=85 diff --git a/sources/Weapons/Playable/Explosives/M79/NiceM79Pickup.uc b/sources/Weapons/Playable/Explosives/M79/NiceM79Pickup.uc index 856f63f..91c05f5 100644 --- a/sources/Weapons/Playable/Explosives/M79/NiceM79Pickup.uc +++ b/sources/Weapons/Playable/Explosives/M79/NiceM79Pickup.uc @@ -4,8 +4,8 @@ defaultproperties crossPerkIndecies(0)=10 Weight=4.000000 cost=250 - AmmoCost=10 - BuyClipSize=3 + AmmoCost=4 + BuyClipSize=1 PowerValue=85 SpeedValue=5 RangeValue=75 diff --git a/sources/Weapons/Playable/Explosives/PipeBombs/NicePipeBombPickup.uc b/sources/Weapons/Playable/Explosives/PipeBombs/NicePipeBombPickup.uc index 3f116fa..688db95 100644 --- a/sources/Weapons/Playable/Explosives/PipeBombs/NicePipeBombPickup.uc +++ b/sources/Weapons/Playable/Explosives/PipeBombs/NicePipeBombPickup.uc @@ -1,8 +1,8 @@ class NicePipeBombPickup extends ScrnPipeBombPickup; defaultproperties { - cost=100 - AmmoCost=100 + cost=50 + AmmoCost=50 ItemName="Pipe Bomb NW" ItemShortName="Pipe Bomb NW" AmmoItemName="Pipe Bomb NW" diff --git a/sources/Weapons/Playable/Explosives/SealSqueal/NiceSealSquealPickup.uc b/sources/Weapons/Playable/Explosives/SealSqueal/NiceSealSquealPickup.uc index 70b915e..14acbbb 100644 --- a/sources/Weapons/Playable/Explosives/SealSqueal/NiceSealSquealPickup.uc +++ b/sources/Weapons/Playable/Explosives/SealSqueal/NiceSealSquealPickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=6.000000 cost=750 - AmmoCost=30 + AmmoCost=22 BuyClipSize=3 PowerValue=90 SpeedValue=35 diff --git a/sources/Weapons/Playable/Heavy/M249/NiceM249Pickup.uc b/sources/Weapons/Playable/Heavy/M249/NiceM249Pickup.uc index 13af3b5..38bc833 100644 --- a/sources/Weapons/Playable/Heavy/M249/NiceM249Pickup.uc +++ b/sources/Weapons/Playable/Heavy/M249/NiceM249Pickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=7.000000 cost=1250 - AmmoCost=250 + AmmoCost=125 BuyClipSize=80 PowerValue=62 SpeedValue=92 diff --git a/sources/Weapons/Playable/Heavy/RPK47/NiceRPK47Pickup.uc b/sources/Weapons/Playable/Heavy/RPK47/NiceRPK47Pickup.uc index 7f87a3e..16b0b00 100644 --- a/sources/Weapons/Playable/Heavy/RPK47/NiceRPK47Pickup.uc +++ b/sources/Weapons/Playable/Heavy/RPK47/NiceRPK47Pickup.uc @@ -4,7 +4,7 @@ defaultproperties { cost=250 Weight=8.000000 - AmmoCost=45 + AmmoCost=12 BuyClipSize=30 PowerValue=49 SpeedValue=86 diff --git a/sources/Weapons/Playable/Heavy/SA80LSW/NiceSA80LSWPickup.uc b/sources/Weapons/Playable/Heavy/SA80LSW/NiceSA80LSWPickup.uc index 2f57ce6..1f2cbe0 100644 --- a/sources/Weapons/Playable/Heavy/SA80LSW/NiceSA80LSWPickup.uc +++ b/sources/Weapons/Playable/Heavy/SA80LSW/NiceSA80LSWPickup.uc @@ -3,7 +3,7 @@ defaultproperties { cost=200 Weight=5.000000 - AmmoCost=30 + AmmoCost=5 BuyClipSize=30 PowerValue=41 SpeedValue=60 diff --git a/sources/Weapons/Playable/Heavy/XMV/NiceXMV850Pickup.uc b/sources/Weapons/Playable/Heavy/XMV/NiceXMV850Pickup.uc index c3616f5..cac0c80 100644 --- a/sources/Weapons/Playable/Heavy/XMV/NiceXMV850Pickup.uc +++ b/sources/Weapons/Playable/Heavy/XMV/NiceXMV850Pickup.uc @@ -8,7 +8,7 @@ defaultproperties { Weight=7.000000 cost=1000 - AmmoCost=100 + AmmoCost=33 BuyClipSize=80 PowerValue=40 SpeedValue=100 diff --git a/sources/Weapons/Playable/Pistols/9mmPlus/Nice9mmPlusPickup.uc b/sources/Weapons/Playable/Pistols/9mmPlus/Nice9mmPlusPickup.uc index 609d6c0..839bfed 100644 --- a/sources/Weapons/Playable/Pistols/9mmPlus/Nice9mmPlusPickup.uc +++ b/sources/Weapons/Playable/Pistols/9mmPlus/Nice9mmPlusPickup.uc @@ -3,7 +3,8 @@ defaultproperties { bBackupWeapon=True cost=100 - AmmoCost=8 + AmmoCost=5 + BuyClipSize=15 Description="A 9mm handgun, with a functional laser sight and flashlight. The barrel has been replaced with one that can chamber hotter ammunition loads, meaning faster bullets, meaning more damage!" ItemName="Beretta" ItemShortName="9mm" diff --git a/sources/Weapons/Playable/Pistols/9mmPlus/NiceDual9mmPlusPickup.uc b/sources/Weapons/Playable/Pistols/9mmPlus/NiceDual9mmPlusPickup.uc index 2e86650..2e893e8 100644 --- a/sources/Weapons/Playable/Pistols/9mmPlus/NiceDual9mmPlusPickup.uc +++ b/sources/Weapons/Playable/Pistols/9mmPlus/NiceDual9mmPlusPickup.uc @@ -3,7 +3,8 @@ defaultproperties { bBackupWeapon=True cost=200 - AmmoCost=16 + BuyClipSize=30 + AmmoCost=10 Description="A pair of custom 9mm handguns. These have been improved with a laser sight and more powerful ammunition" ItemName="Dual Berettas" ItemShortName="Dual Berettas" diff --git a/sources/Weapons/Playable/Pistols/Contender/NiceContenderPickup.uc b/sources/Weapons/Playable/Pistols/Contender/NiceContenderPickup.uc index 1a6205b..720f862 100644 --- a/sources/Weapons/Playable/Pistols/Contender/NiceContenderPickup.uc +++ b/sources/Weapons/Playable/Pistols/Contender/NiceContenderPickup.uc @@ -2,7 +2,7 @@ class NiceContenderPickup extends NiceWeaponPickup; defaultproperties { Weight=3.000000 - AmmoCost=8 + AmmoCost=5 cost=1000 BuyClipSize=1 PowerValue=60 diff --git a/sources/Weapons/Playable/Pistols/Deagle/NiceDeaglePickup.uc b/sources/Weapons/Playable/Pistols/Deagle/NiceDeaglePickup.uc index 0d9606d..04c775e 100644 --- a/sources/Weapons/Playable/Pistols/Deagle/NiceDeaglePickup.uc +++ b/sources/Weapons/Playable/Pistols/Deagle/NiceDeaglePickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=2.000000 cost=250 - AmmoCost=11 + AmmoCost=14 BuyClipSize=8 PowerValue=65 SpeedValue=35 diff --git a/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeaglePickup.uc b/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeaglePickup.uc index bb2f35b..6eeffdc 100644 --- a/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeaglePickup.uc +++ b/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeaglePickup.uc @@ -3,8 +3,8 @@ defaultproperties { Weight=4.000000 cost=500 - AmmoCost=22 - BuyClipSize=8 + AmmoCost=28 + BuyClipSize=16 PowerValue=85 SpeedValue=35 RangeValue=60 diff --git a/sources/Weapons/Playable/Pistols/Glock/NiceDualGlockPickup.uc b/sources/Weapons/Playable/Pistols/Glock/NiceDualGlockPickup.uc index 6935979..f75ec7f 100644 --- a/sources/Weapons/Playable/Pistols/Glock/NiceDualGlockPickup.uc +++ b/sources/Weapons/Playable/Pistols/Glock/NiceDualGlockPickup.uc @@ -3,8 +3,9 @@ defaultproperties { bBackupWeapon=True Weight=4.000000 - cost=250 - BuyClipSize=12 + cost=200 + AmmoCost=6 + BuyClipSize=24 PowerValue=70 SpeedValue=45 RangeValue=60 diff --git a/sources/Weapons/Playable/Pistols/Glock/NiceGlockPickup.uc b/sources/Weapons/Playable/Pistols/Glock/NiceGlockPickup.uc index 0a0e914..1599c32 100644 --- a/sources/Weapons/Playable/Pistols/Glock/NiceGlockPickup.uc +++ b/sources/Weapons/Playable/Pistols/Glock/NiceGlockPickup.uc @@ -3,7 +3,8 @@ defaultproperties { bBackupWeapon=True Weight=2.000000 - cost=125 + cost=100 + AmmoCost=3 BuyClipSize=12 PowerValue=50 SpeedValue=45 diff --git a/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Fire.uc b/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Fire.uc index 05c5ac9..8be202d 100644 --- a/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Fire.uc +++ b/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Fire.uc @@ -9,10 +9,11 @@ defaultproperties StereoFireSoundRef="KF_MK23Snd.MK23_Fire_S" NoAmmoSoundRef="KF_HandcannonSnd.50AE_DryFire" DamageType=Class'NicePack.NiceDamTypeMK23Pistol' - DamageMin=55 - DamageMax=55 + DamageMin=42 + DamageMax=42 Momentum=18000.000000 NoAmmoSound=None + bWaitForRelease=False FireRate=0.175000 AmmoClass=Class'NicePack.NiceDualMK23Ammo' ShakeRotMag=(Z=290.000000) diff --git a/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Pickup.uc b/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Pickup.uc index 375bfd2..11faa42 100644 --- a/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Pickup.uc +++ b/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Pickup.uc @@ -3,8 +3,8 @@ defaultproperties { Weight=4.000000 cost=500 - AmmoCost=32 - BuyClipSize=12 + AmmoCost=20 + BuyClipSize=24 PowerValue=70 SpeedValue=45 RangeValue=60 diff --git a/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Pistol.uc b/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Pistol.uc index cb9dc39..348586c 100644 --- a/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Pistol.uc +++ b/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Pistol.uc @@ -26,6 +26,7 @@ defaultproperties LaserAttachmentBone="Tip_Right" altLaserAttachmentBone="Tip_Left" MagCapacity=24 + ReloadAnimRate=1.2 ReloadRate=4.466700 Weight=4.000000 StandardDisplayFOV=60.000000 diff --git a/sources/Weapons/Playable/Pistols/MK32/NiceMK23Fire.uc b/sources/Weapons/Playable/Pistols/MK32/NiceMK23Fire.uc index 7365159..ddf2c6f 100644 --- a/sources/Weapons/Playable/Pistols/MK32/NiceMK23Fire.uc +++ b/sources/Weapons/Playable/Pistols/MK32/NiceMK23Fire.uc @@ -8,12 +8,13 @@ defaultproperties StereoFireSoundRef="KF_MK23Snd.MK23_Fire_S" NoAmmoSoundRef="KF_HandcannonSnd.50AE_DryFire" DamageType=Class'NicePack.NiceDamTypeMK23Pistol' - DamageMin=55 - DamageMax=55 + DamageMin=42 + DamageMax=42 Momentum=18000.000000 FireLoopAnim= FireEndAnim= FireRate=0.350000 + bWaitForRelease=False AmmoClass=Class'NicePack.NiceMK23Ammo' ShakeRotMag=(Z=290.000000) ShakeRotRate=(X=10080.000000,Y=10080.000000) diff --git a/sources/Weapons/Playable/Pistols/MK32/NiceMK23Pickup.uc b/sources/Weapons/Playable/Pistols/MK32/NiceMK23Pickup.uc index 0caf1c5..4601662 100644 --- a/sources/Weapons/Playable/Pistols/MK32/NiceMK23Pickup.uc +++ b/sources/Weapons/Playable/Pistols/MK32/NiceMK23Pickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=2.000000 cost=250 - AmmoCost=16 + AmmoCost=10 BuyClipSize=12 PowerValue=50 SpeedValue=45 diff --git a/sources/Weapons/Playable/Pistols/MK32/NiceMK23Pistol.uc b/sources/Weapons/Playable/Pistols/MK32/NiceMK23Pistol.uc index e67bf8e..01e288a 100644 --- a/sources/Weapons/Playable/Pistols/MK32/NiceMK23Pistol.uc +++ b/sources/Weapons/Playable/Pistols/MK32/NiceMK23Pistol.uc @@ -30,6 +30,7 @@ defaultproperties reloadMagStartFrame=0.286000 reloadChargeStartFrame=-1.000000 MagCapacity=12 + ReloadAnimRate=1.2 ReloadRate=2.600000 Weight=2.000000 StandardDisplayFOV=60.000000 diff --git a/sources/Weapons/Playable/Pistols/Magnum/NiceDamTypeMagnumPistol.uc b/sources/Weapons/Playable/Pistols/Magnum/NiceDamTypeMagnumPistol.uc index eb90ac6..f8c8144 100644 --- a/sources/Weapons/Playable/Pistols/Magnum/NiceDamTypeMagnumPistol.uc +++ b/sources/Weapons/Playable/Pistols/Magnum/NiceDamTypeMagnumPistol.uc @@ -1,8 +1,8 @@ class NiceDamTypeMagnumPistol extends NiceDamageTypeVetSharpshooter; defaultproperties { - flinchMultiplier=2.5 - stunMultiplier=6.0 + flinchMultiplier=2 + stunMultiplier=3.75 MaxPenetrations=2 PenDmgReduction=0.990000 HeadShotDamageMult=1.35 diff --git a/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnum.uc b/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnum.uc index 5f940a3..5a24f23 100644 --- a/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnum.uc +++ b/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnum.uc @@ -7,7 +7,7 @@ defaultproperties leftInsert=0.800000 rightInsert=0.375000 MagCapacity=12 - Weight=2.000000 + Weight=4.000000 ReloadRate=2.23125 ReloadAnimRate=1.5 WeaponReloadAnim="Reload_DualRevolver" diff --git a/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumPickup.uc b/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumPickup.uc index 7701cf1..a8b251b 100644 --- a/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumPickup.uc +++ b/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumPickup.uc @@ -1,10 +1,10 @@ class NiceDualMagnumPickup extends NiceDualiesPickup; defaultproperties { - Weight=2.000000 + Weight=4.000000 cost=250 - AmmoCost=16 - BuyClipSize=6 + AmmoCost=10 + BuyClipSize=12 PowerValue=80 SpeedValue=50 RangeValue=65 diff --git a/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumFire.uc b/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumFire.uc index aca4c22..4473ec2 100644 --- a/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumFire.uc +++ b/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumFire.uc @@ -9,9 +9,10 @@ defaultproperties StereoFireSoundRef="KF_RevolverSnd.Revolver_Fire_S" NoAmmoSoundRef="KF_HandcannonSnd.50AE_DryFire" DamageType=Class'NicePack.NiceDamTypeMagnumPistol' - DamageMin=61 - DamageMax=61 + DamageMin=82 + DamageMax=82 Momentum=15000.000000 + bWaitForRelease=False bPawnRapidFireAnim=False FireLoopAnim= FireEndAnim= diff --git a/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPickup.uc b/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPickup.uc index 7c8c4c7..4c85272 100644 --- a/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPickup.uc +++ b/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPickup.uc @@ -1,9 +1,9 @@ class NiceMagnumPickup extends NiceSinglePickup; defaultproperties { - Weight=1.000000 + Weight=2.000000 cost=125 - AmmoCost=8 + AmmoCost=5 BuyClipSize=6 PowerValue=60 SpeedValue=40 diff --git a/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPistol.uc b/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPistol.uc index 15ccb34..c58ae50 100644 --- a/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPistol.uc +++ b/sources/Weapons/Playable/Pistols/Magnum/NiceMagnumPistol.uc @@ -11,7 +11,7 @@ defaultproperties ReloadRate=1.2625 ReloadAnimRate=1.5 WeaponReloadAnim="Reload_Revolver" - Weight=1.000000 + Weight=2.000000 StandardDisplayFOV=60.000000 TraderInfoTexture=Texture'KillingFloor2HUD.Trader_Weapon_Icons.Trader_Revolver' bIsTier2Weapon=True diff --git a/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc b/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc index ff30c13..834390b 100644 --- a/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc +++ b/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=4.000000 cost=750 - AmmoCost=50 + AmmoCost=22 BuyClipSize=33 PowerValue=50 SpeedValue=90 diff --git a/sources/Weapons/Playable/SMG/M7A3/NiceM7A3MPickup.uc b/sources/Weapons/Playable/SMG/M7A3/NiceM7A3MPickup.uc index 5643aeb..cdadf6b 100644 --- a/sources/Weapons/Playable/SMG/M7A3/NiceM7A3MPickup.uc +++ b/sources/Weapons/Playable/SMG/M7A3/NiceM7A3MPickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=5.000000 cost=1250 - AmmoCost=50 + AmmoCost=33 BuyClipSize=30 PowerValue=45 SpeedValue=60 diff --git a/sources/Weapons/Playable/SMG/MP5M/NiceMP5MPickup.uc b/sources/Weapons/Playable/SMG/MP5M/NiceMP5MPickup.uc index 475ea06..222b639 100644 --- a/sources/Weapons/Playable/SMG/MP5M/NiceMP5MPickup.uc +++ b/sources/Weapons/Playable/SMG/MP5M/NiceMP5MPickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=4.000000 cost=250 - AmmoCost=20 + AmmoCost=10 BuyClipSize=30 PowerValue=30 SpeedValue=85 diff --git a/sources/Weapons/Playable/SMG/MP7M/NiceMP7MPickup.uc b/sources/Weapons/Playable/SMG/MP7M/NiceMP7MPickup.uc index 22a4e86..e9144a9 100644 --- a/sources/Weapons/Playable/SMG/MP7M/NiceMP7MPickup.uc +++ b/sources/Weapons/Playable/SMG/MP7M/NiceMP7MPickup.uc @@ -4,7 +4,7 @@ defaultproperties bBackupWeapon=True Weight=3.000000 cost=200 - AmmoCost=20 + AmmoCost=10 BuyClipSize=40 PowerValue=22 SpeedValue=95 diff --git a/sources/Weapons/Playable/Shotguns/AA12/NiceAA12Pickup.uc b/sources/Weapons/Playable/Shotguns/AA12/NiceAA12Pickup.uc index c5f2dfe..c7e829c 100644 --- a/sources/Weapons/Playable/Shotguns/AA12/NiceAA12Pickup.uc +++ b/sources/Weapons/Playable/Shotguns/AA12/NiceAA12Pickup.uc @@ -2,7 +2,7 @@ class NiceAA12Pickup extends NiceWeaponPickup; defaultproperties { cost=1250 - AmmoCost=80 + AmmoCost=50 BuyClipSize=20 PowerValue=85 SpeedValue=65 diff --git a/sources/Weapons/Playable/Shotguns/Benelli/NiceBenelliPickup.uc b/sources/Weapons/Playable/Shotguns/Benelli/NiceBenelliPickup.uc index ee088b6..c65fa22 100644 --- a/sources/Weapons/Playable/Shotguns/Benelli/NiceBenelliPickup.uc +++ b/sources/Weapons/Playable/Shotguns/Benelli/NiceBenelliPickup.uc @@ -3,6 +3,7 @@ defaultproperties { Weight=8.000000 cost=500 + AmmoCost=13 BuyClipSize=6 PowerValue=70 SpeedValue=60 diff --git a/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickPickup.uc b/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickPickup.uc index 6ad9841..e88dc3d 100644 --- a/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickPickup.uc +++ b/sources/Weapons/Playable/Shotguns/Boomstick/NiceBoomStickPickup.uc @@ -2,7 +2,8 @@ class NiceBoomStickPickup extends NiceWeaponPickup; var int SingleShotCount; defaultproperties { - cost=500 + cost=750 + AmmoCost=5 BuyClipSize=2 PowerValue=90 SpeedValue=30 diff --git a/sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGunPickup.uc b/sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGunPickup.uc index 2ffeba2..1793a58 100644 --- a/sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGunPickup.uc +++ b/sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGunPickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=8.000000 cost=250 - AmmoCost=20 + AmmoCost=17 BuyClipSize=28 PowerValue=70 SpeedValue=55 diff --git a/sources/Weapons/Playable/Shotguns/PumpShotgun/NiceShotgunPickup.uc b/sources/Weapons/Playable/Shotguns/PumpShotgun/NiceShotgunPickup.uc index 789f69a..7c0bc4e 100644 --- a/sources/Weapons/Playable/Shotguns/PumpShotgun/NiceShotgunPickup.uc +++ b/sources/Weapons/Playable/Shotguns/PumpShotgun/NiceShotgunPickup.uc @@ -5,7 +5,7 @@ defaultproperties bBackupWeapon=True Weight=6.000000 cost=200 - AmmoCost=15 + AmmoCost=12 BuyClipSize=8 PowerValue=70 SpeedValue=40 diff --git a/sources/Weapons/Playable/Shotguns/Spas/NiceSpasPickup.uc b/sources/Weapons/Playable/Shotguns/Spas/NiceSpasPickup.uc index 8e4f17e..bef2df6 100644 --- a/sources/Weapons/Playable/Shotguns/Spas/NiceSpasPickup.uc +++ b/sources/Weapons/Playable/Shotguns/Spas/NiceSpasPickup.uc @@ -2,7 +2,7 @@ class NiceSpasPickup extends NiceWeaponPickup; defaultproperties { - cost=750 + cost=500 Weight=8.000000 BuyClipSize=10 PowerValue=55 diff --git a/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceDamTypeHuntingRifle.uc b/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceDamTypeHuntingRifle.uc index 0586c8c..cc8b8f0 100644 --- a/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceDamTypeHuntingRifle.uc +++ b/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceDamTypeHuntingRifle.uc @@ -6,7 +6,7 @@ defaultproperties MaxPenetrations=5 BigZedPenDmgReduction=0.750000 MediumZedPenDmgReduction=1.000000 - HeadShotDamageMult=1.900000 + HeadShotDamageMult=2.6 bSniperWeapon=True WeaponClass=Class'NicePack.NiceHuntingRifle' DeathString="%k killed %o (Hunting Rifle)." diff --git a/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceHuntingRiflePickup.uc b/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceHuntingRiflePickup.uc index fcea1b1..810d788 100644 --- a/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceHuntingRiflePickup.uc +++ b/sources/Weapons/Playable/SniperWeapons/HuntingRifle/NiceHuntingRiflePickup.uc @@ -6,7 +6,7 @@ defaultproperties { Weight=6.000000 cost=750 - AmmoCost=35 + AmmoCost=34 BuyClipSize=5 PowerValue=55 SpeedValue=42 diff --git a/sources/Weapons/Playable/SniperWeapons/M14EBR/NiceM14EBRPickup.uc b/sources/Weapons/Playable/SniperWeapons/M14EBR/NiceM14EBRPickup.uc index 69b5c26..0791107 100644 --- a/sources/Weapons/Playable/SniperWeapons/M14EBR/NiceM14EBRPickup.uc +++ b/sources/Weapons/Playable/SniperWeapons/M14EBR/NiceM14EBRPickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=8.000000 cost=1000 - AmmoCost=15 + AmmoCost=25 BuyClipSize=20 PowerValue=55 SpeedValue=20 diff --git a/sources/Weapons/Playable/SniperWeapons/M99/NiceM99Pickup.uc b/sources/Weapons/Playable/SniperWeapons/M99/NiceM99Pickup.uc index 799297e..28ddbf9 100644 --- a/sources/Weapons/Playable/SniperWeapons/M99/NiceM99Pickup.uc +++ b/sources/Weapons/Playable/SniperWeapons/M99/NiceM99Pickup.uc @@ -2,7 +2,7 @@ class NiceM99Pickup extends NiceWeaponPickup; defaultproperties { cost=1250 - AmmoCost=60 + AmmoCost=13 BuyClipSize=1 PowerValue=95 SpeedValue=30 diff --git a/sources/Weapons/Playable/SniperWeapons/Mauler/NiceDamTypeMauler.uc b/sources/Weapons/Playable/SniperWeapons/Mauler/NiceDamTypeMauler.uc index bb878f8..8e180e6 100644 --- a/sources/Weapons/Playable/SniperWeapons/Mauler/NiceDamTypeMauler.uc +++ b/sources/Weapons/Playable/SniperWeapons/Mauler/NiceDamTypeMauler.uc @@ -8,7 +8,7 @@ static function ScoredNiceHeadshot(KFSteamStatsAndAchievements KFStatsAndAchieve defaultproperties { stunMultiplier=1.250000 - HeadShotDamageMult=4.000000 + HeadShotDamageMult=4.75 bSniperWeapon=True WeaponClass=Class'NicePack.NiceMaulerRifle' DeathString="%k killed %o (S.P. Mauler)." diff --git a/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerPickup.uc b/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerPickup.uc index a870828..affd25d 100644 --- a/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerPickup.uc +++ b/sources/Weapons/Playable/SniperWeapons/Mauler/NiceMaulerPickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=6.000000 cost=750 - AmmoCost=50 + AmmoCost=22 BuyClipSize=10 PowerValue=60 SpeedValue=10 diff --git a/sources/Weapons/Playable/SniperWeapons/SVD/NiceSVDPickup.uc b/sources/Weapons/Playable/SniperWeapons/SVD/NiceSVDPickup.uc index 2d3f119..2fa03da 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=50 + AmmoCost=42 BuyClipSize=10 PowerValue=90 SpeedValue=40 diff --git a/sources/Weapons/Playable/SniperWeapons/VSSD/NiceVSSDTPickup.uc b/sources/Weapons/Playable/SniperWeapons/VSSD/NiceVSSDTPickup.uc index 927a1b0..a653e16 100644 --- a/sources/Weapons/Playable/SniperWeapons/VSSD/NiceVSSDTPickup.uc +++ b/sources/Weapons/Playable/SniperWeapons/VSSD/NiceVSSDTPickup.uc @@ -3,7 +3,7 @@ defaultproperties { Weight=7.000000 cost=1000 - AmmoCost=15 + AmmoCost=25 BuyClipSize=10 PowerValue=80 SpeedValue=40 diff --git a/sources/Weapons/Playable/SniperWeapons/Winchester/NiceWinchesterPickup.uc b/sources/Weapons/Playable/SniperWeapons/Winchester/NiceWinchesterPickup.uc index 95cffce..2804e2e 100644 --- a/sources/Weapons/Playable/SniperWeapons/Winchester/NiceWinchesterPickup.uc +++ b/sources/Weapons/Playable/SniperWeapons/Winchester/NiceWinchesterPickup.uc @@ -3,7 +3,8 @@ class NiceWinchesterPickup extends NiceWeaponPickup; defaultproperties { Weight=6.000000 - cost=200 + AmmoCost=13 + cost=250 BuyClipSize=10 PowerValue=50 SpeedValue=35 diff --git a/sources/Zeds/Nice/NiceZombieJason.uc b/sources/Zeds/Nice/NiceZombieJason.uc index d4da111..178d974 100644 --- a/sources/Zeds/Nice/NiceZombieJason.uc +++ b/sources/Zeds/Nice/NiceZombieJason.uc @@ -152,7 +152,7 @@ state RunningState } defaultproperties { - RageHealthPct=0.750000 + RageHealthPct=1.1 RegenDelay=5.000000 RegenRate=4.000000 SawAttackLoopSound=Sound'KF_BaseGorefast.Attack.Gorefast_AttackSwish3' @@ -160,11 +160,13 @@ defaultproperties StunThreshold=1.000000 MoanVoice=None StunsRemaining=5 - BleedOutDuration=7.000000 + BleedOutDuration=4.000000 MeleeDamage=25 MeleeAttackHitSound=SoundGroup'KF_EnemiesFinalSnd.GoreFast.Gorefast_HitPlayer' JumpSound=None - HeadHealth=800.000000 + HeadHealth=300.000000 + HealthMax=500.000000 + Health=500 HitSound(0)=None DeathSound(0)=None ChallengeSound(0)=None