diff --git a/sources/NiceHumanPawn.uc b/sources/NiceHumanPawn.uc index ce2ed49..281c706 100644 --- a/sources/NiceHumanPawn.uc +++ b/sources/NiceHumanPawn.uc @@ -65,7 +65,7 @@ simulated function bool IsZedExtentionsRecorded(NiceMonster niceZed){ } function ReplaceRequiredEquipment(){ Super.ReplaceRequiredEquipment(); - RequiredEquipment[0] = String(class'NicePack.NiceKnife'); + RequiredEquipment[0] = String(class'NicePack.NiceMachete'); RequiredEquipment[1] = String(class'NicePack.Nice9mmPlus'); RequiredEquipment[2] = String(class'ScrnBalanceSrv.ScrnFrag'); RequiredEquipment[3] = String(class'ScrnBalanceSrv.ScrnSyringe'); diff --git a/sources/NicePack.uc b/sources/NicePack.uc index 7e0f29e..993399e 100644 --- a/sources/NicePack.uc +++ b/sources/NicePack.uc @@ -173,6 +173,9 @@ simulated function PostBeginPlay(){ local MeanVoting VO; local NiceFFVoting FFVO; super.PostBeginPlay(); + class'ScrnLightVestPickup'.default.cost = 50; + class'ScrnHorzineVestPickup'.default.weight = 2; + class'ScrnHorzineVestPickup'.default.cost = 750; class'NicePack'.default.Mut = self; // Gun skins class'NicePack.NiceMaulerPickup'.default.VariantClasses[class'NicePack.NiceMaulerPickup'.default.VariantClasses.length] = class'ScrnBalanceSrv.ScrnSPSniperPickup'; diff --git a/sources/Perks/Commando/NiceVetCommando.uc b/sources/Perks/Commando/NiceVetCommando.uc index 654572d..d3110aa 100644 --- a/sources/Perks/Commando/NiceVetCommando.uc +++ b/sources/Perks/Commando/NiceVetCommando.uc @@ -42,7 +42,7 @@ static function float GetMovementSpeedModifier(KFPlayerReplicationInfo KFPRI, KF return 1.1; } static function float GetReloadSpeedModifierStatic(KFPlayerReplicationInfo KFPRI, class Other){ - return 1.3; + return 1.15; } static function float GetFireSpeedModStatic(KFPlayerReplicationInfo KFPRI, class other){ local float fireSpeed; @@ -102,7 +102,7 @@ defaultproperties OnHUDIcons(3)=(PerkIcon=Texture'ScrnTex.Perks.Perk_Commando_Blue',StarIcon=Texture'ScrnTex.Perks.Hud_Perk_Star_Blue',DrawColor=(B=255,G=255,R=255,A=255)) OnHUDIcons(4)=(PerkIcon=Texture'ScrnTex.Perks.Perk_Commando_Purple',StarIcon=Texture'ScrnTex.Perks.Hud_Perk_Star_Purple',DrawColor=(B=255,G=255,R=255,A=255)) OnHUDIcons(5)=(PerkIcon=Texture'ScrnTex.Perks.Perk_Commando_Orange',StarIcon=Texture'ScrnTex.Perks.Hud_Perk_Star_Orange',DrawColor=(B=255,G=255,R=255,A=255)) - CustomLevelInfo="Level up by doing damage with perked weapons|30% faster reload with all weapons|10% faster movement speed|You get four additional Zed-Time Extensions|See health and cloacked zeds from 16 meters distance|Better Syringe handling" + CustomLevelInfo="Level up by doing damage with perked weapons|15% faster reload with all weapons|10% faster movement speed|You get four additional Zed-Time Extensions|See health and cloacked zeds from 16 meters distance|Better Syringe handling" PerkIndex=3 OnHUDIcon=Texture'KillingFloorHUD.Perks.Perk_Commando' OnHUDGoldIcon=Texture'KillingFloor2HUD.Perk_Icons.Perk_Commando_Gold' diff --git a/sources/Weapons/Playable/AssaultRifles/AK47/NiceAK47Ammo.uc b/sources/Weapons/Playable/AssaultRifles/AK47/NiceAK47Ammo.uc index e1bcf99..935b8a2 100644 --- a/sources/Weapons/Playable/AssaultRifles/AK47/NiceAK47Ammo.uc +++ b/sources/Weapons/Playable/AssaultRifles/AK47/NiceAK47Ammo.uc @@ -4,7 +4,7 @@ defaultproperties { WeaponPickupClass=Class'NicePack.NiceAK47Pickup' AmmoPickupAmount=30 - MaxAmmo=270 + MaxAmmo=240 InitialAmount=90 PickupClass=Class'NicePack.NiceAK47AmmoPickup' IconMaterial=Texture'KillingFloorHUD.Generic.HUD' diff --git a/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Ammo.uc b/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Ammo.uc index 0de04bb..8c1bab7 100644 --- a/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Ammo.uc +++ b/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Ammo.uc @@ -4,7 +4,7 @@ defaultproperties { WeaponPickupClass=Class'NicePack.NiceMKb42Pickup' AmmoPickupAmount=30 - MaxAmmo=240 + MaxAmmo=270 InitialAmount=60 PickupClass=Class'NicePack.NiceMKb42AmmoPickup' IconMaterial=Texture'KillingFloorHUD.Generic.HUD' diff --git a/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Fire.uc b/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Fire.uc index e4ccde2..74b40ed 100644 --- a/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Fire.uc +++ b/sources/Weapons/Playable/AssaultRifles/MKb42/NiceMKb42Fire.uc @@ -23,7 +23,7 @@ defaultproperties FireLoopAnim="Fire" TweenTime=0.025000 FireForce="AssaultRifleFire" - FireRate=0.1750000 + FireRate=0.140000 AmmoClass=Class'NicePack.NiceMKb42Ammo' ShakeRotMag=(X=50.000000,Y=50.000000,Z=350.000000) ShakeRotRate=(X=5000.000000,Y=5000.000000,Z=5000.000000) diff --git a/sources/Weapons/Playable/Melee/Machete/NiceMachete.uc b/sources/Weapons/Playable/Melee/Machete/NiceMachete.uc index ac7942a..800214e 100644 --- a/sources/Weapons/Playable/Melee/Machete/NiceMachete.uc +++ b/sources/Weapons/Playable/Melee/Machete/NiceMachete.uc @@ -5,7 +5,9 @@ defaultproperties BloodSkinSwitchArray=0 BloodyMaterialRef="KF_Weapons_Trip_T.melee.machete_bloody_cmb" bSpeedMeUp=True - Weight=1.000000 + Weight=0.000000 + bCanThrow=false + bKFNeverThrow=True StandardDisplayFOV=70.000000 TraderInfoTexture=Texture'KillingFloorHUD.Trader_Weapon_Images.Trader_Machete' bIsTier2Weapon=True diff --git a/sources/Weapons/Playable/Melee/Machete/NiceMachetePickup.uc b/sources/Weapons/Playable/Melee/Machete/NiceMachetePickup.uc index 3d6ec5b..7a5d732 100644 --- a/sources/Weapons/Playable/Melee/Machete/NiceMachetePickup.uc +++ b/sources/Weapons/Playable/Melee/Machete/NiceMachetePickup.uc @@ -1,7 +1,7 @@ class NiceMachetePickup extends NiceWeaponPickup; defaultproperties { - Weight=1.000000 + Weight=0.000000 cost=200 PowerValue=35 SpeedValue=56 diff --git a/sources/Weapons/Playable/Pistols/9mmPlus/NiceDamType9mmPlus.uc b/sources/Weapons/Playable/Pistols/9mmPlus/NiceDamType9mmPlus.uc index 559aee9..228134f 100644 --- a/sources/Weapons/Playable/Pistols/9mmPlus/NiceDamType9mmPlus.uc +++ b/sources/Weapons/Playable/Pistols/9mmPlus/NiceDamType9mmPlus.uc @@ -2,7 +2,7 @@ class NiceDamType9mmPlus extends NiceDamageTypeVetSharpshooter abstract; defaultproperties { - goodDecapMod=0.500000 + goodDecapMod=0.600000 WeaponClass=Class'NicePack.Nice9mmPlus' DeathString="%k killed %o (Beretta)." FemaleSuicide="%o shot herself in the foot." diff --git a/sources/Weapons/Playable/Pistols/9mmPlus/NiceDual9mmPlusFire.uc b/sources/Weapons/Playable/Pistols/9mmPlus/NiceDual9mmPlusFire.uc index 6a2395b..64dba17 100644 --- a/sources/Weapons/Playable/Pistols/9mmPlus/NiceDual9mmPlusFire.uc +++ b/sources/Weapons/Playable/Pistols/9mmPlus/NiceDual9mmPlusFire.uc @@ -9,7 +9,9 @@ defaultproperties NoAmmoSoundRef="KF_9MMSnd.9mm_DryFire" DamageType=Class'NicePack.NiceDamType9mmPlus' Momentum=10000.000000 - bWaitForRelease=False - FireRate=0.125000 + FireRate=0.167 + Spread=500.0 + SpreadStyle=SS_Random + bWaitForRelease=Flash2Emitter AmmoClass=Class'NicePack.NiceDual9mmPlusAmmo' } diff --git a/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeagleFire.uc b/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeagleFire.uc index a1ec19a..750b6d5 100644 --- a/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeagleFire.uc +++ b/sources/Weapons/Playable/Pistols/Deagle/NiceDualDeagleFire.uc @@ -12,7 +12,9 @@ defaultproperties DamageMin=120 DamageMax=120 Momentum=20000.000000 - FireRate=0.250000 + FireRate=0.34 + Spread=500.0 + SpreadStyle=SS_Random AmmoClass=Class'NicePack.NiceDualDeagleAmmo' ShakeRotMag=(Z=400.000000) ShakeRotRate=(X=12500.000000,Y=12500.000000) diff --git a/sources/Weapons/Playable/Pistols/Glock/NiceDualGlockFire.uc b/sources/Weapons/Playable/Pistols/Glock/NiceDualGlockFire.uc index 7d5f899..aae61f1 100644 --- a/sources/Weapons/Playable/Pistols/Glock/NiceDualGlockFire.uc +++ b/sources/Weapons/Playable/Pistols/Glock/NiceDualGlockFire.uc @@ -11,7 +11,9 @@ defaultproperties DamageMax=35 Momentum=18000.000000 bWaitForRelease=False - FireRate=0.087500 + FireRate=0.117 + Spread=500.0 + SpreadStyle=SS_Random AmmoClass=Class'NicePack.NiceDualGlockAmmo' ShakeRotMag=(Z=290.000000) ShakeRotRate=(X=10080.000000,Y=10080.000000) diff --git a/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Fire.uc b/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Fire.uc index 8be202d..43ff39a 100644 --- a/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Fire.uc +++ b/sources/Weapons/Playable/Pistols/MK32/NiceDualMK23Fire.uc @@ -14,7 +14,11 @@ defaultproperties Momentum=18000.000000 NoAmmoSound=None bWaitForRelease=False - FireRate=0.175000 + FireAnimRate + FireAnimRate=1.5 + FireRate=0.2 + Spread=500.0 + SpreadStyle=SS_Random AmmoClass=Class'NicePack.NiceDualMK23Ammo' ShakeRotMag=(Z=290.000000) ShakeRotRate=(X=10080.000000,Y=10080.000000) diff --git a/sources/Weapons/Playable/Pistols/MK32/NiceMK23Fire.uc b/sources/Weapons/Playable/Pistols/MK32/NiceMK23Fire.uc index ddf2c6f..e90ce16 100644 --- a/sources/Weapons/Playable/Pistols/MK32/NiceMK23Fire.uc +++ b/sources/Weapons/Playable/Pistols/MK32/NiceMK23Fire.uc @@ -13,7 +13,8 @@ defaultproperties Momentum=18000.000000 FireLoopAnim= FireEndAnim= - FireRate=0.350000 + FireAnimRate=1.5 + FireRate=0.30000 bWaitForRelease=False AmmoClass=Class'NicePack.NiceMK23Ammo' ShakeRotMag=(Z=290.000000) diff --git a/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumFire.uc b/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumFire.uc index 304a9f7..2f46450 100644 --- a/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumFire.uc +++ b/sources/Weapons/Playable/Pistols/Magnum/NiceDualMagnumFire.uc @@ -9,11 +9,13 @@ defaultproperties StereoFireSoundRef="KF_RevolverSnd.Revolver_Fire_S" NoAmmoSoundRef="KF_HandcannonSnd.50AE_DryFire" DamageType=Class'NicePack.NiceDamTypeMagnumPistol' - DamageMin=61 - DamageMax=61 + DamageMin=82 + DamageMax=82 + Spread=500.0 + SpreadStyle=SS_Random Momentum=15000.000000 bWaitForRelease=False - FireRate=0.125000 + FireRate=0.167 AmmoClass=Class'NicePack.NiceDualMagnumAmmo' ShakeRotMag=(Z=400.000000) ShakeRotRate=(X=12500.000000,Y=12500.000000) diff --git a/sources/Weapons/Playable/Shotguns/Benelli/NiceBenelliFire.uc b/sources/Weapons/Playable/Shotguns/Benelli/NiceBenelliFire.uc index d677c26..fe032d2 100644 --- a/sources/Weapons/Playable/Shotguns/Benelli/NiceBenelliFire.uc +++ b/sources/Weapons/Playable/Shotguns/Benelli/NiceBenelliFire.uc @@ -7,6 +7,7 @@ defaultproperties DamageType=Class'NicePack.NiceDamTypeBenelli' FireAnimRate=1.000000 FireRate=0.200000 + DamageMax=63 AmmoClass=Class'NicePack.NiceBenelliAmmo' BotRefireRate=0.200000 } diff --git a/sources/Zeds/Nice/NiceZombieJason.uc b/sources/Zeds/Nice/NiceZombieJason.uc index 178d974..ab0a1f6 100644 --- a/sources/Zeds/Nice/NiceZombieJason.uc +++ b/sources/Zeds/Nice/NiceZombieJason.uc @@ -119,18 +119,7 @@ state RunningState { function BeginState() { - local NiceHumanPawn rageTarget; bWasRaged = true; - if(bWasCalm){ - bWasCalm = false; - rageTarget = NiceHumanPawn(Controller.focus); - if( rageTarget != none && KFGameType(Level.Game) != none - && class'NiceVeterancyTypes'.static.HasSkill(NicePlayerController(rageTarget.Controller), - class'NiceSkillCommandoPerfectExecution') ){ - NiceGameType(Level.Game).lessDramatic = true; - KFGameType(Level.Game).DramaticEvent(1.0); - } - } if( bZapped ) GoToState(''); else { diff --git a/sources/Zeds/Nice/NiceZombieShiver.uc b/sources/Zeds/Nice/NiceZombieShiver.uc index 9492af5..fbd612a 100644 --- a/sources/Zeds/Nice/NiceZombieShiver.uc +++ b/sources/Zeds/Nice/NiceZombieShiver.uc @@ -441,11 +441,8 @@ defaultproperties { HeadOffsetY=-3.000000 idleInsertFrame=0.468000 - PlayerCountHealthScale=0.200000 OnlineHeadshotOffset=(X=19.000000,Z=39.000000) ScoringValue=15 - HealthMax=300.000000 - Health=300 HeadRadius=8.000000 HeadHeight=3.000000 } diff --git a/sources/Zeds/Nice/NiceZombieShiverBase.uc b/sources/Zeds/Nice/NiceZombieShiverBase.uc index 3246b61..65e0041 100644 --- a/sources/Zeds/Nice/NiceZombieShiverBase.uc +++ b/sources/Zeds/Nice/NiceZombieShiverBase.uc @@ -91,8 +91,8 @@ defaultproperties WaterSpeed=100.000000 AccelRate=1024.000000 JumpZ=340.000000 - HealthMax=190.000000 - Health=190 + HealthMax=250.000000 + Health=250 MenuName="Shiver" MovementAnims(0)="ClotWalk" AmbientSound=SoundGroup'ScrnZedPack_S.Shiver.ShiverIdleGroup'