dkanus/NicePack
dkanus/NicePack
1
0
Fork 0
Code Issues 12 Pull requests Projects Releases Wiki Activity

Last patch

Browse source 
Commits like that are lazy and shitty, but fuck it, it's the last patch.
This commit is contained in:
Anton Tarasenko 2020-07-03 18:03:21 +07:00
commit bd54850e38
35 changed files with 81 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sources/Weapons/NiceWeapon.uc
View file

@ -1122,6 +1122,7 @@ exec function ReloadMeNow(){
}
simulated function float GetCurrentReloadMult(){
local float ReloadMulti;
local float timeDilationSpeedup;
local NiceHumanPawn nicePawn;
local NicePlayerController nicePlayer;
local class<NiceVeterancyTypes> niceVet;
@ -1142,8 +1143,15 @@ simulated function float GetCurrentReloadMult(){
ReloadMulti *= activeSlowdown;
else if(bCanActiveReload && reloadType == RTYPE_SINGLE && subReloadStage == 0)
ReloadMulti *= activeSpeedup;
if(nicePlayer != none && niceVet.static.hasSkill(nicePlayer, class'NiceSkillCommandoZEDProfessional')) {
timeDilationSpeedup = (1.1 / Level.TimeDilation);
}
else {
timeDilationSpeedup = ((1.1 / Level.TimeDilation) - 1.0) * 0.5 + 1.0;
timeDilationSpeedup = FMax(1.0, timeDilationSpeedup);
}
if(nicePlayer != none && niceVet.static.hasSkill(nicePlayer, class'NiceSkillCommandoZEDProfessional'))
ReloadMulti /= (Level.TimeDilation / 1.1);
ReloadMulti *= timeDilationSpeedup;
if(bAutoReload && bAutoReloadRateApplied)
ReloadMulti *= autoReloadSpeedModifier;
return ReloadMulti;

4
sources/Weapons/Playable/AssaultRifles/M4/NiceM4Ammo.uc
View file

@ -4,8 +4,8 @@ defaultproperties
{
WeaponPickupClass=Class'NicePack.NiceM4Pickup'
AmmoPickupAmount=30
MaxAmmo=180
InitialAmount=45
MaxAmmo=240
InitialAmount=60
PickupClass=Class'NicePack.NiceM4AmmoPickup'
IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
IconCoords=(X1=336,Y1=82,X2=382,Y2=125)

1
sources/Weapons/Playable/AssaultRifles/M4/NiceM4Pickup.uc
View file

@ -3,6 +3,7 @@ defaultproperties
{
Weight=5.000000
cost=500
AmmoCost=20
BuyClipSize=30
PowerValue=30
SpeedValue=90

2
sources/Weapons/Playable/Grenades/NiceDamTypeCryoNade.uc
View file

@ -2,5 +2,5 @@ class NiceDamTypeCryoNade extends NiceWeaponDamageType
abstract;
defaultproperties
{
freezePower=200.000000
freezePower=160.000000
}

6
sources/Weapons/Playable/Grenades/NiceNade.uc
View file

@ -113,12 +113,6 @@ simulated function HurtRadius( float DamageAmount, float DamageRadius, class<Dam
if ( damageScale <= 0)
continue;
// Scrake Nader ach
if ( Role == ROLE_Authority && KFMonsterVictim != none && ZombieScrake(KFMonsterVictim) != none ) {
// need to check Scrake's stun before dealing damage, because he can unstun by himself from damage received
ScrakeNader(damageScale * DamageAmount, ZombieScrake(KFMonsterVictim), Stats);
}
}
if(NiceMonster(Victims) != none)
Victims.TakeDamage(damageScale * DamageAmount,Instigator,Victims.Location - 0.5 * (Victims.CollisionHeight + Victims.CollisionRadius) * dir

4
sources/Weapons/Playable/Heavy/M249/NiceM249Ammo.uc
View file

@ -4,8 +4,8 @@ defaultproperties
{
WeaponPickupClass=Class'NicePack.NiceM249Pickup'
AmmoPickupAmount=80
MaxAmmo=240
InitialAmount=120
MaxAmmo=160
InitialAmount=80
PickupClass=Class'NicePack.NiceM249AmmoPickup'
IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
IconCoords=(X1=336,Y1=82,X2=382,Y2=125)

2
sources/Weapons/Playable/Pistols/Contender/NiceContenderFire.uc
View file

@ -17,7 +17,7 @@ defaultproperties
bWaitForRelease=True
TransientSoundVolume=1.800000
FireForce="AssaultRifleFire"
FireRate=1.600000
FireRate=0.000000
AmmoClass=Class'NicePack.NiceContenderAmmo'
ShakeRotMag=(X=5.000000,Y=7.000000,Z=3.000000)
ShakeRotRate=(X=10000.000000,Y=10000.000000,Z=10000.000000)

4
sources/Weapons/Playable/SMG/Kriss/NiceKrissMAmmo.uc
View file

@ -2,8 +2,8 @@ class NiceKrissMAmmo extends NiceAmmo;
defaultproperties
{
AmmoPickupAmount=33
MaxAmmo=528
InitialAmount=132
MaxAmmo=264
InitialAmount=66
PickupClass=Class'NicePack.NiceKrissMAmmoPickup'
IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
IconCoords=(X1=336,Y1=82,X2=382,Y2=125)

4
sources/Weapons/Playable/SMG/Kriss/NiceKrissMFire.uc
View file

@ -5,7 +5,7 @@ defaultproperties
FireEndStereoSoundRef="KF_KrissSND.KF_WEP_KRISS_END_S"
AmbientFireSoundRef="KF_KrissSND.Kriss_Fire_Loop"
ProjectileSpeed=15200.000000
RecoilRate=0.100000
RecoilRate=0.0100000
maxVerticalRecoilAngle=20
maxHorizontalRecoilAngle=10
RecoilVelocityScale=0.000000
@ -25,4 +25,6 @@ defaultproperties
ShakeOffsetRate=(X=1000.000000,Y=1000.000000,Z=1000.000000)
ShakeOffsetTime=1.250000
FlashEmitterClass=Class'ROEffects.MuzzleFlash1stMP'
Spread=500.0
SpreadStyle=SS_Random
}

1
sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc
View file

@ -3,6 +3,7 @@ defaultproperties
{
Weight=4.000000
cost=750
AmmoCost=50
BuyClipSize=33
PowerValue=50
SpeedValue=90

6
sources/Weapons/Playable/SMG/M7A3/NiceM7A3MAmmo.uc
View file

@ -2,9 +2,9 @@ class NiceM7A3MAmmo extends NiceAmmo;
defaultproperties
{
WeaponPickupClass=Class'NicePack.NiceM7A3MPickup'
AmmoPickupAmount=15
MaxAmmo=300
InitialAmount=75
AmmoPickupAmount=30
MaxAmmo=180
InitialAmount=45
PickupClass=Class'NicePack.NiceM7A3MAmmoPickup'
IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
IconCoords=(X1=336,Y1=82,X2=382,Y2=125)

4
sources/Weapons/Playable/SMG/M7A3/NiceM7A3MFire.uc
View file

@ -3,7 +3,7 @@ defaultproperties
{
ProjectileSpeed=21250.000000
FireAimedAnim="Fire_Iron"
RecoilRate=0.085000
RecoilRate=0.0085000
maxVerticalRecoilAngle=120
maxHorizontalRecoilAngle=60
ShellEjectClass=Class'ROEffects.KFShellEjectSCAR'
@ -32,4 +32,6 @@ defaultproperties
BotRefireRate=0.990000
FlashEmitterClass=Class'ROEffects.MuzzleFlash1stSTG'
aimerror=42.000000
Spread=500.0
SpreadStyle=SS_Random
}

4
sources/Weapons/Playable/SMG/MP5M/NiceMP5MAmmo.uc
View file

@ -3,8 +3,8 @@ defaultproperties
{
WeaponPickupClass=Class'NicePack.NiceMP5MPickup'
AmmoPickupAmount=30
MaxAmmo=600
InitialAmount=150
MaxAmmo=300
InitialAmount=75
PickupClass=Class'NicePack.NiceMP5MAmmoPickup'
IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
IconCoords=(X1=336,Y1=82,X2=382,Y2=125)

4
sources/Weapons/Playable/SMG/MP5M/NiceMP5MFire.uc
View file

@ -5,7 +5,7 @@ defaultproperties
FireEndStereoSoundRef="KF_MP5Snd.MP5_Fire_Loop_End_S"
AmbientFireSoundRef="KF_MP5Snd.MP5_Fire_Loop"
ProjectileSpeed=21250.000000
RecoilRate=0.075000
RecoilRate=0.0075000
maxVerticalRecoilAngle=160
maxHorizontalRecoilAngle=80
RecoilVelocityScale=0.000000
@ -15,6 +15,8 @@ defaultproperties
DamageType=Class'NicePack.NiceDamTypeMP5M'
DamageMin=35
DamageMax=35
Spread=500.0
SpreadStyle=SS_Random
Momentum=5500.000000
FireRate=0.075000
AmmoClass=Class'NicePack.NiceMP5MAmmo'

2
sources/Weapons/Playable/SMG/MP5M/NiceMP5MPickup.uc
View file

@ -3,7 +3,7 @@ defaultproperties
{
Weight=4.000000
cost=250
AmmoCost=10
AmmoCost=20
BuyClipSize=30
PowerValue=30
SpeedValue=85

4
sources/Weapons/Playable/SMG/MP7M/NiceMP7MAmmo.uc
View file

@ -2,8 +2,8 @@ class NiceMP7MAmmo extends NiceAmmo;
defaultproperties
{
WeaponPickupClass=Class'NicePack.NiceMP7MPickup'
MaxAmmo=400
InitialAmount=100
MaxAmmo=200
InitialAmount=50
PickupClass=Class'NicePack.NiceMP7MAmmoPickup'
IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
IconCoords=(X1=336,Y1=82,X2=382,Y2=125)

4
sources/Weapons/Playable/SMG/MP7M/NiceMP7MFire.uc
View file

@ -5,7 +5,7 @@ defaultproperties
FireEndStereoSoundRef="KF_MP7Snd.MP7_tailST"
AmbientFireSoundRef="KF_MP7Snd.MP7_FireLoop"
ProjectileSpeed=36750.000000
RecoilRate=0.060000
RecoilRate=0.0060000
maxVerticalRecoilAngle=70
maxHorizontalRecoilAngle=35
RecoilVelocityScale=0.000000
@ -25,6 +25,6 @@ defaultproperties
ShakeOffsetRate=(X=1000.000000,Y=1000.000000,Z=1000.000000)
ShakeOffsetTime=1.250000
FlashEmitterClass=Class'ROEffects.MuzzleFlash1stMP'
Spread=0.012000
Spread=500.0
SpreadStyle=SS_Random
}

1
sources/Weapons/Playable/SMG/MP7M/NiceMP7MPickup.uc
View file

@ -4,6 +4,7 @@ defaultproperties
bBackupWeapon=True
Weight=3.000000
cost=200
AmmoCost=20
BuyClipSize=40
PowerValue=22
SpeedValue=95

2
sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGun.uc
View file

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

6
sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGunAmmo.uc
View file

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

4
sources/Weapons/Playable/Shotguns/Nailgun/NiceNailGunPickup.uc
View file

@ -3,8 +3,8 @@ defaultproperties
{
Weight=8.000000
cost=250
AmmoCost=30
BuyClipSize=42
AmmoCost=20
BuyClipSize=28
PowerValue=70
SpeedValue=55
RangeValue=25

1
sources/Weapons/Playable/SniperWeapons/Winchester/NiceDamTypeWinchester.uc
View file

@ -4,6 +4,7 @@ class NiceDamTypeWinchester extends NiceDamageTypeVetSharpshooter
defaultproperties
{
stunMultiplier=1.500000
flinchMultiplier=0.8
bIsProjectile=True
HeadShotDamageMult=2.500000
bSniperWeapon=True