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
This commit is contained in:
Anton Tarasenko 2021-12-01 04:10:42 +07:00
parent d8689b9ca0
commit 9bb40e03c8
22 changed files with 43 additions and 83 deletions

View File

@ -202,12 +202,17 @@ function ScoreKill(Controller Killer, Controller Other)
function DramaticEvent(float BaseZedTimePossibility, optional float DesiredZedTimeDuration){ function DramaticEvent(float BaseZedTimePossibility, optional float DesiredZedTimeDuration){
local bool bWasZedTime; local bool bWasZedTime;
bWasZedTime = bZEDTimeActive; bWasZedTime = bZEDTimeActive;
if (lessDramatic) { if (lessDramatic)
ZedTimeSlomoScale = LesserZedTimeSlomoScale; {
if (bZEDTimeActive) {
return;
}
else {
ZedTimeSlomoScale = LesserZedTimeSlomoScale;
}
} }
Super.DramaticEvent(BaseZedTimePossibility, DesiredZedTimeDuration); Super.DramaticEvent(BaseZedTimePossibility, DesiredZedTimeDuration);
ZedTimeSlomoScale = default.ZedTimeSlomoScale; ZedTimeSlomoScale = default.ZedTimeSlomoScale;
lessDramatic = false;
// Call event // Call event
if(!bWasZedTime && bZEDTimeActive) if(!bWasZedTime && bZEDTimeActive)
NicePackMutator.ZedTimeActivated(); NicePackMutator.ZedTimeActivated();
@ -232,10 +237,11 @@ event Tick(float DeltaTime){
if(CurrentZEDTimeDuration <= 0){ if(CurrentZEDTimeDuration <= 0){
if(bZEDTimeActive) if(bZEDTimeActive)
NicePackMutator.ZedTimeDeactivated(); NicePackMutator.ZedTimeDeactivated();
bZEDTimeActive = false; lessDramatic = false;
bSpeedingBackUp = false; bZEDTimeActive = false;
SetGameSpeed(1.0); bSpeedingBackUp = false;
ZedTimeExtensionsUsed = 0; SetGameSpeed(1.0);
ZedTimeExtensionsUsed = 0;
} }
} }
} }

View File

@ -38,7 +38,6 @@ var config int bigZedMinHealth; // If zed's base Health >= this
var config int mediumZedMinHealth; var config int mediumZedMinHealth;
var int maxPlayersInGame; var int maxPlayersInGame;
var bool bAppliedPlayersMult;
var bool bSpawnRateEnforced; // Set to true after spawn rate was altered var bool bSpawnRateEnforced; // Set to true after spawn rate was altered
// 'Adrenaline junkie' zed-time extensions // 'Adrenaline junkie' zed-time extensions
@ -470,7 +469,6 @@ simulated function bool CheckReplacement(Actor Other, out byte bSuperRelevant){
local NiceZombieBoss boss; local NiceZombieBoss boss;
local Controller cIt; local Controller cIt;
local int currNumPlayers; local int currNumPlayers;
local float HLBonus;
local NicePlayerController playerContr; local NicePlayerController playerContr;
local NiceRepInfoRemoteData remoteRI; local NiceRepInfoRemoteData remoteRI;
local NiceReplicationInfo niceRI; local NiceReplicationInfo niceRI;
@ -510,22 +508,6 @@ simulated function bool CheckReplacement(Actor Other, out byte bSuperRelevant){
if (bUseProgresiveCash) { if (bUseProgresiveCash) {
niceMonster.ScoringValue = 0; 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. // Replace zeds with a healthier ones.
// Code taken from a scary ghost's SpecimenHPConfig // Code taken from a scary ghost's SpecimenHPConfig
@ -680,7 +662,6 @@ simulated function Mutate(string MutateString, PlayerController kfPlayer){
i ++; i ++;
} }
nicePlayer = NicePlayerController(kfPlayer); nicePlayer = NicePlayerController(kfPlayer);
Log("UMBRA" @ command);
if(command ~= "ECHO") if(command ~= "ECHO")
kfPlayer.ClientMessage(Mid(MutateString, 5)); kfPlayer.ClientMessage(Mid(MutateString, 5));
else if(command ~= "ZED" && bAlwaysAllowSkillChange) 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 // Called when trader time begins
simulated function TraderStart(){ simulated function TraderStart(){

View File

@ -115,28 +115,6 @@ function int NetDamage(int OriginalDamage, int Damage, pawn injured, pawn instig
function bool NoFF(Pawn injured, float FF){ function bool NoFF(Pawn injured, float FF){
return (FF == 0.0 || (Vehicle(injured) != none && Vehicle(injured).bNoFriendlyFire)); 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){ function bool PreventDeath(Pawn Killed, Controller Killer, class<DamageType> damageType, vector HitLocation){
local NiceHumanPawn nicePawn; local NiceHumanPawn nicePawn;
local NicePlayerController nicePlayer; local NicePlayerController nicePlayer;

View File

@ -68,9 +68,9 @@ static function float ModifyRecoilSpread(KFPlayerReplicationInfo KFPRI, WeaponFi
return Recoil; return Recoil;
} }
static function int ZedTimeExtensions(KFPlayerReplicationInfo KFPRI){ static function int ZedTimeExtensions(KFPlayerReplicationInfo KFPRI){
/*if(HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillCommandoTactitian')) if(HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillCommandoOverclocking'))
return class'NiceSkillCommandoTactitian'.default.bonusExt + 3;*/ return class'NiceSkillCommandoOverclocking'.default.bonusExt;
return 4; return 0;
} }
static function string GetCustomLevelInfo(byte Level){ static function string GetCustomLevelInfo(byte Level){
return default.CustomLevelInfo; return default.CustomLevelInfo;

View File

@ -1,9 +1,11 @@
class NiceSkillCommandoOverclocking extends NiceSkill class NiceSkillCommandoOverclocking extends NiceSkill
abstract; abstract;
var float fireSpeedMult; var float fireSpeedMult;
var int bonusExt;
defaultproperties defaultproperties
{ {
bonusExt=4
fireSpeedMult=1.300000 fireSpeedMult=1.300000
SkillName="Overclocking" 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."
} }

View File

@ -1,9 +1,9 @@
class NiceCLGLAmmo extends NiceAmmo; class NiceCLGLAmmo extends NiceAmmo;
defaultproperties defaultproperties
{ {
AmmoPickupAmount=4 AmmoPickupAmount=2
MaxAmmo=30 MaxAmmo=20
InitialAmount=6 InitialAmount=5
PickupClass=Class'NicePack.NiceCLGLAmmoPickup' PickupClass=Class'NicePack.NiceCLGLAmmoPickup'
IconMaterial=Texture'KillingFloorHUD.Generic.HUD' IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
IconCoords=(X1=4,Y1=350,X2=110,Y2=395) IconCoords=(X1=4,Y1=350,X2=110,Y2=395)

View File

@ -1,7 +1,7 @@
class NiceCLGLAmmoPickup extends NiceAmmoPickup; class NiceCLGLAmmoPickup extends NiceAmmoPickup;
defaultproperties defaultproperties
{ {
AmmoAmount=4 AmmoAmount=2
InventoryType=Class'NicePack.NiceCLGLAmmo' InventoryType=Class'NicePack.NiceCLGLAmmo'
PickupMessage="CLGL Grenades" PickupMessage="CLGL Grenades"
StaticMesh=StaticMesh'KillingFloorStatics.FragPickup' StaticMesh=StaticMesh'KillingFloorStatics.FragPickup'

View File

@ -3,7 +3,7 @@ defaultproperties
{ {
Weight=6.000000 Weight=6.000000
cost=500 cost=500
AmmoCost=16 AmmoCost=32
BuyClipSize=4 BuyClipSize=4
PowerValue=85 PowerValue=85
SpeedValue=65 SpeedValue=65

View File

@ -2,9 +2,9 @@ class NiceLAWAmmo extends NiceAmmo;
#EXEC OBJ LOAD FILE=KillingFloorHUD.utx #EXEC OBJ LOAD FILE=KillingFloorHUD.utx
defaultproperties defaultproperties
{ {
AmmoPickupAmount=2 AmmoPickupAmount=1
MaxAmmo=20 MaxAmmo=10
InitialAmount=5 InitialAmount=1
IconMaterial=Texture'KillingFloorHUD.Generic.HUD' IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
IconCoords=(X1=458,Y1=34,X2=511,Y2=78) IconCoords=(X1=458,Y1=34,X2=511,Y2=78)
ItemName="L.A.W Rockets" ItemName="L.A.W Rockets"

View File

@ -1,7 +1,7 @@
class NiceLAWAmmoPickup extends NiceAmmoPickup; class NiceLAWAmmoPickup extends NiceAmmoPickup;
defaultproperties defaultproperties
{ {
AmmoAmount=2 AmmoAmount=1
InventoryType=Class'NicePack.NiceLAWAmmo' InventoryType=Class'NicePack.NiceLAWAmmo'
PickupMessage="HEAT Rockets" PickupMessage="HEAT Rockets"
StaticMesh=StaticMesh'KillingFloorStatics.LAWAmmo' StaticMesh=StaticMesh'KillingFloorStatics.LAWAmmo'

View File

@ -4,7 +4,7 @@ defaultproperties
{ {
Weight=9.000000 Weight=9.000000
cost=1250 cost=1250
AmmoCost=13 AmmoCost=40
BuyClipSize=1 BuyClipSize=1
PowerValue=100 PowerValue=100
SpeedValue=20 SpeedValue=20

View File

@ -3,8 +3,8 @@ defaultproperties
{ {
WeaponPickupClass=Class'NicePack.NiceM32Pickup' WeaponPickupClass=Class'NicePack.NiceM32Pickup'
AmmoPickupAmount=6 AmmoPickupAmount=6
MaxAmmo=36 MaxAmmo=32
InitialAmount=9 InitialAmount=6
PickupClass=Class'NicePack.NiceM32AmmoPickup' PickupClass=Class'NicePack.NiceM32AmmoPickup'
IconMaterial=Texture'KillingFloorHUD.Generic.HUD' IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
IconCoords=(X1=4,Y1=350,X2=110,Y2=395) IconCoords=(X1=4,Y1=350,X2=110,Y2=395)

View File

@ -2,7 +2,7 @@ class NiceM32Pickup extends NiceWeaponPickup;
defaultproperties defaultproperties
{ {
Weight=7.000000 Weight=7.000000
AmmoCost=33 AmmoCost=66
cost=1000 cost=1000
BuyClipSize=6 BuyClipSize=6
PowerValue=85 PowerValue=85

View File

@ -2,9 +2,9 @@ class NiceM79Ammo extends NiceAmmo;
defaultproperties defaultproperties
{ {
WeaponPickupClass=Class'NicePack.NiceM79Pickup' WeaponPickupClass=Class'NicePack.NiceM79Pickup'
AmmoPickupAmount=3 AmmoPickupAmount=2
MaxAmmo=24 MaxAmmo=16
InitialAmount=6 InitialAmount=4
PickupClass=Class'NicePack.NiceM79AmmoPickup' PickupClass=Class'NicePack.NiceM79AmmoPickup'
IconMaterial=Texture'KillingFloorHUD.Generic.HUD' IconMaterial=Texture'KillingFloorHUD.Generic.HUD'
IconCoords=(X1=4,Y1=350,X2=110,Y2=395) IconCoords=(X1=4,Y1=350,X2=110,Y2=395)

View File

@ -1,7 +1,7 @@
class NiceM79AmmoPickup extends NiceAmmoPickup; class NiceM79AmmoPickup extends NiceAmmoPickup;
defaultproperties defaultproperties
{ {
AmmoAmount=3 AmmoAmount=2
InventoryType=Class'NicePack.NiceM79Ammo' InventoryType=Class'NicePack.NiceM79Ammo'
PickupMessage="M79 Incendiary Grenades" PickupMessage="M79 Incendiary Grenades"
StaticMesh=StaticMesh'KillingFloorStatics.FragPickup' StaticMesh=StaticMesh'KillingFloorStatics.FragPickup'

View File

@ -4,7 +4,7 @@ defaultproperties
crossPerkIndecies(0)=10 crossPerkIndecies(0)=10
Weight=4.000000 Weight=4.000000
cost=250 cost=250
AmmoCost=4 AmmoCost=8
BuyClipSize=1 BuyClipSize=1
PowerValue=85 PowerValue=85
SpeedValue=5 SpeedValue=5

View File

@ -2,7 +2,7 @@ class NicePipeBombPickup extends ScrnPipeBombPickup;
defaultproperties defaultproperties
{ {
cost=50 cost=50
AmmoCost=50 AmmoCost=100
ItemName="Pipe Bomb NW" ItemName="Pipe Bomb NW"
ItemShortName="Pipe Bomb NW" ItemShortName="Pipe Bomb NW"
AmmoItemName="Pipe Bomb NW" AmmoItemName="Pipe Bomb NW"

View File

@ -10,7 +10,7 @@ defaultproperties
DamageType=Class'NicePack.NiceDamType9mmPlus' DamageType=Class'NicePack.NiceDamType9mmPlus'
Momentum=10000.000000 Momentum=10000.000000
FireRate=0.167 FireRate=0.167
Spread=500.0 Spread=250.0
SpreadStyle=SS_Random SpreadStyle=SS_Random
bWaitForRelease=Flash2Emitter bWaitForRelease=Flash2Emitter
AmmoClass=Class'NicePack.NiceDual9mmPlusAmmo' AmmoClass=Class'NicePack.NiceDual9mmPlusAmmo'

View File

@ -13,7 +13,7 @@ defaultproperties
DamageMax=120 DamageMax=120
Momentum=20000.000000 Momentum=20000.000000
FireRate=0.34 FireRate=0.34
Spread=500.0 Spread=250.0
SpreadStyle=SS_Random SpreadStyle=SS_Random
AmmoClass=Class'NicePack.NiceDualDeagleAmmo' AmmoClass=Class'NicePack.NiceDualDeagleAmmo'
ShakeRotMag=(Z=400.000000) ShakeRotMag=(Z=400.000000)

View File

@ -12,7 +12,7 @@ defaultproperties
Momentum=18000.000000 Momentum=18000.000000
bWaitForRelease=False bWaitForRelease=False
FireRate=0.117 FireRate=0.117
Spread=500.0 Spread=250.0
SpreadStyle=SS_Random SpreadStyle=SS_Random
AmmoClass=Class'NicePack.NiceDualGlockAmmo' AmmoClass=Class'NicePack.NiceDualGlockAmmo'
ShakeRotMag=(Z=290.000000) ShakeRotMag=(Z=290.000000)

View File

@ -17,7 +17,7 @@ defaultproperties
FireAnimRate FireAnimRate
FireAnimRate=1.5 FireAnimRate=1.5
FireRate=0.2 FireRate=0.2
Spread=500.0 Spread=250.0
SpreadStyle=SS_Random SpreadStyle=SS_Random
AmmoClass=Class'NicePack.NiceDualMK23Ammo' AmmoClass=Class'NicePack.NiceDualMK23Ammo'
ShakeRotMag=(Z=290.000000) ShakeRotMag=(Z=290.000000)

View File

@ -11,7 +11,7 @@ defaultproperties
DamageType=Class'NicePack.NiceDamTypeMagnumPistol' DamageType=Class'NicePack.NiceDamTypeMagnumPistol'
DamageMin=82 DamageMin=82
DamageMax=82 DamageMax=82
Spread=500.0 Spread=250.0
SpreadStyle=SS_Random SpreadStyle=SS_Random
Momentum=15000.000000 Momentum=15000.000000
bWaitForRelease=False bWaitForRelease=False