diff --git a/README b/README deleted file mode 100644 index e69de29..0000000 diff --git a/README.md b/README.md new file mode 100644 index 0000000..c52f619 --- /dev/null +++ b/README.md @@ -0,0 +1,7 @@ +# NicePack + +This repo contains sources for the last public NicePack release. + +It is a haphazard bunch of changes that were made to customize ScrN for ourselves. It is unfinished, but due to some reasons I don't want to release it publicly anymore. + +The link to the compiled NicePack, along with all necessary files, is here: diff --git a/sources/GUI/NiceInteraction.uc b/sources/GUI/NiceInteraction.uc index 6207782..f6f7e11 100644 --- a/sources/GUI/NiceInteraction.uc +++ b/sources/GUI/NiceInteraction.uc @@ -1,6 +1,7 @@ class NiceInteraction extends Interaction dependson(NicePack) dependson(NiceAbilityManager); +#exec OBJ LOAD FILE=KillingFloorHUD.utx #exec OBJ LOAD FILE=KillingFloor2HUD.utx var NicePack NicePackMutator; var Material bleedIcon, poisonIcon; @@ -48,7 +49,6 @@ function PostRender(Canvas C){ return; scrnHUDInstance = ScrnHUD(nicePlayer.myHUD); //// Draw bleed and poison icons - C.SetDrawColor(255, 255, 255); szRI = class'MeanReplicationInfo'.static.findSZri(ViewportOwner.Actor.PlayerReplicationInfo); offset = 4; if(szRI != none){ diff --git a/sources/NiceGameType.uc b/sources/NiceGameType.uc index 358430f..18cd564 100644 --- a/sources/NiceGameType.uc +++ b/sources/NiceGameType.uc @@ -1,6 +1,8 @@ // made to fix KFStoryGameInfo loading for KFO maps class NiceGameType extends ScrnGameType; var NicePack NicePackMutator; +var bool lessDramatic; +var float LesserZedTimeSlomoScale; function RegisterMutator(NicePack activePack){ NicePackMutator = activePack; } @@ -68,7 +70,12 @@ State MatchInProgress{ function DramaticEvent(float BaseZedTimePossibility, optional float DesiredZedTimeDuration){ local bool bWasZedTime; bWasZedTime = bZEDTimeActive; + if (lessDramatic) { + ZedTimeSlomoScale = LesserZedTimeSlomoScale; + } Super.DramaticEvent(BaseZedTimePossibility, DesiredZedTimeDuration); + ZedTimeSlomoScale = default.ZedTimeSlomoScale; + lessDramatic = false; // Call event if(!bWasZedTime && bZEDTimeActive) NicePackMutator.ZedTimeActivated(); @@ -162,4 +169,6 @@ defaultproperties { GameName="Nice Floor" Description="Nice Edition of ScrN Killing Floor game mode (ScrnGameType)." + ZedTimeSlomoScale=0.4 + LesserZedTimeSlomoScale=0.6 } diff --git a/sources/Perks/Berserker/Skills/NiceSkillZerkZEDAccelerate.uc b/sources/Perks/Berserker/Skills/NiceSkillZerkZEDAccelerate.uc index 1c66cde..f0bb7ff 100644 --- a/sources/Perks/Berserker/Skills/NiceSkillZerkZEDAccelerate.uc +++ b/sources/Perks/Berserker/Skills/NiceSkillZerkZEDAccelerate.uc @@ -3,5 +3,5 @@ class NiceSkillZerkZEDAccelerate extends NiceSkill defaultproperties { SkillName="Accelerate" - SkillEffects="Move and attack at the same speed during zed-time." + SkillEffects="Move and attack at regular speed during zed-time." } diff --git a/sources/Perks/Commando/NiceVetCommando.uc b/sources/Perks/Commando/NiceVetCommando.uc index 1d9377f..4383ad4 100644 --- a/sources/Perks/Commando/NiceVetCommando.uc +++ b/sources/Perks/Commando/NiceVetCommando.uc @@ -35,12 +35,7 @@ static function float GetMagCapacityMod(KFPlayerReplicationInfo KFPRI, KFWeapon return 1.0; } static function float GetSyringeChargeRate(KFPlayerReplicationInfo KFPRI){ - return 3.0; -} -static function float GetHealPotency(KFPlayerReplicationInfo KFPRI){ - local float potency; - potency = 1.5; - return potency; + return 1.5; } static function float GetMovementSpeedModifier(KFPlayerReplicationInfo KFPRI, KFGameReplicationInfo KFGRI){ return 1.1; @@ -83,7 +78,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|50% more potent medical injections|Better Syringe handling" + 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" PerkIndex=3 OnHUDIcon=Texture'KillingFloorHUD.Perks.Perk_Commando' OnHUDGoldIcon=Texture'KillingFloor2HUD.Perk_Icons.Perk_Commando_Gold' diff --git a/sources/Weapons/NiceWeapon.uc b/sources/Weapons/NiceWeapon.uc index 67e7a41..9cad557 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 timeDilationSpeedup; local NiceHumanPawn nicePawn; local NicePlayerController nicePlayer; local class 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; diff --git a/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Ammo.uc b/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Ammo.uc index 34b4c36..dc52734 100644 --- a/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Ammo.uc +++ b/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Ammo.uc @@ -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) diff --git a/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Pickup.uc b/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Pickup.uc index f8b8782..8c41ffd 100644 --- a/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Pickup.uc +++ b/sources/Weapons/Playable/AssaultRifles/M4/NiceM4Pickup.uc @@ -3,6 +3,7 @@ defaultproperties { Weight=5.000000 cost=500 + AmmoCost=20 BuyClipSize=30 PowerValue=30 SpeedValue=90 diff --git a/sources/Weapons/Playable/Grenades/NiceDamTypeCryoNade.uc b/sources/Weapons/Playable/Grenades/NiceDamTypeCryoNade.uc index 332e76b..76839bc 100644 --- a/sources/Weapons/Playable/Grenades/NiceDamTypeCryoNade.uc +++ b/sources/Weapons/Playable/Grenades/NiceDamTypeCryoNade.uc @@ -2,5 +2,5 @@ class NiceDamTypeCryoNade extends NiceWeaponDamageType abstract; defaultproperties { - freezePower=200.000000 + freezePower=160.000000 } diff --git a/sources/Weapons/Playable/Grenades/NiceNade.uc b/sources/Weapons/Playable/Grenades/NiceNade.uc index 9e45fa5..05884b3 100644 --- a/sources/Weapons/Playable/Grenades/NiceNade.uc +++ b/sources/Weapons/Playable/Grenades/NiceNade.uc @@ -113,12 +113,6 @@ simulated function HurtRadius( float DamageAmount, float DamageRadius, class= 1500) + if(niceZed != none && niceZed.default.Health >= 1000) return false; return (niceFP != none && VSizeSquared(niceFP.Velocity) >= 75 && Super.RelevantTo(P) && niceFP.Velocity dot (P.Location - niceFP.Location) > 0 ); } diff --git a/sources/Zeds/NiceMonsterController.uc b/sources/Zeds/NiceMonsterController.uc index 594a5bd..3e79aa7 100644 --- a/sources/Zeds/NiceMonsterController.uc +++ b/sources/Zeds/NiceMonsterController.uc @@ -417,15 +417,19 @@ Begin: function bool SetEnemy( pawn newEnemy, optional bool bHateMonster, optional float MonsterHateChanceOverride){ - local NiceMonster niceZed; + local NiceMonster niceZed; + local NiceZombieFleshpound niceFP; local bool bCanForceFight; // Can we fight anything? niceZed = NiceMonster(pawn); + niceFP = NiceZombieFleshpound(niceZed); if(niceZed != none) bCanForceFight = KFMonster(pawn).HeadHealth <= 0 || KFMonster(pawn).bDecapitated || newEnemy.Health <= 15; + if (niceFP != none && niceFP.IsInState('RageCharging')) + bCanForceFight = false; if(newEnemy != none) bCanForceFight = bCanForceFight && newEnemy.Health > 0 && newEnemy != enemy;