KillingFloor2/KF2-Dev-Scripts
1
0
Fork 0
Code Activity

upload

Browse Source
This commit is contained in:
GenZmeY
2021-07-08 18:50:49 +03:00
parent 9a5bfed23e
commit 415265eca9
10 changed files with 102 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
KFGame/Classes/KFGameInfo.uc
View File

@ -436,11 +436,6 @@ enum EMonsterProperties
var int SpawnedMonsterProperties[EMonsterProperties];
/************************************************************************************
* @name Force to sort maps by name
***********************************************************************************/
var bool bForceMapSorting;
/************************************************************************************
* @name Native
***********************************************************************************/
@ -2896,10 +2891,10 @@ function string GetNextMap()
{
MapCycleIndex = MapCycleIndex + 1 < GameMapCycles[ActiveMapCycle].Maps.length ? (MapCycleIndex + 1) : 0;
if (class'KFGameEngine'.static.GetWeeklyEventIndexMod() == 11)
if ((class'KFGameEngine'.static.GetWeeklyEventIndexMod() == 11 || OutbreakEvent.ActiveEvent == OutbreakEvent.SetEvents[11])
&& MyKFGRI.IsA('KFGameReplicationInfo_WeeklySurvival'))
{
if (MyKFGRI.IsA('KFGameReplicationInfo_WeeklySurvival') &&
GameMapCycles[ActiveMapCycle].Maps[MapCycleIndex] == "KF-Biolapse" ||
if (GameMapCycles[ActiveMapCycle].Maps[MapCycleIndex] == "KF-Biolapse" ||
GameMapCycles[ActiveMapCycle].Maps[MapCycleIndex] == "KF-Nightmare" ||
GameMapCycles[ActiveMapCycle].Maps[MapCycleIndex] == "KF-PowerCore_Holdout" ||
GameMapCycles[ActiveMapCycle].Maps[MapCycleIndex] == "KF-TheDescent" ||
@ -3895,6 +3890,4 @@ defaultproperties
DebugForcedOutbreakIdx=INDEX_NONE
DebugForceSpecialWaveZedType=INDEX_NONE
bForceMapSorting=True
}

2
KFGame/Classes/KFPerk_Berserker.uc
View File

@ -159,7 +159,7 @@ simulated function ModifyDamageGiven( out int InDamage, optional Actor DamageCau
}
`QALog( GetFuncName() @ "Base damage:" @ InDamage , bLogPerk);
if( (MyKFWeapon != none && IsWeaponOnPerk( MyKFWeapon,, self.class )) || IsDamageTypeOnPerk( DamageType ) )
if( ((MyKFWeapon != none && IsWeaponOnPerk( MyKFWeapon,, self.class )) || IsDamageTypeOnPerk( DamageType )) && !IsBlastBrawlers(MyKFWeapon) )
{
TempDamage += InDamage * GetPassiveValue( BerserkerDamage, CurrentLevel );
if( IsSpeedActive() )

7
KFGame/Classes/KFPerk_Commando.uc
View File

@ -303,6 +303,8 @@ simulated function float GetZedTimeModifier( KFWeapon W )
local name StateName;
StateName = W.GetStateName();
`Log("STATE NAME: " $StateName);
if( IsProfessionalActive() && (IsWeaponOnPerk( W,, self.class ) || IsBackupWeapon( W ) || IsDual9mm( W )) )
{
if( StateName == 'Reloading' ||
@ -315,8 +317,9 @@ simulated function float GetZedTimeModifier( KFWeapon W )
return 0.3f;
}
}
if( CouldRapidFireActive() && (Is9mm(W) || IsDual9mm( W ) || IsWeaponOnPerk( W,, self.class )) && ZedTimeModifyingStates.Find( StateName ) != INDEX_NONE )
// FAMAS uses alt fire as common firing. Needs a special case
if( CouldRapidFireActive() && (Is9mm(W) || IsDual9mm( W ) || IsWeaponOnPerk( W,, self.class )) &&
(ZedTimeModifyingStates.Find( StateName ) != INDEX_NONE || (IsFAMAS(W) && StateName == 'FiringSecondaryState')) )
{
return RapidFireFiringRate;
}

5
KFGame/Classes/KFPerk_Support.uc
View File

@ -561,8 +561,11 @@ simulated function float GetZedTimeModifier( KFWeapon W )
StateName = W.GetStateName();
// Blast Brawlers use a different state for shooting (combining melee + firing). Needs a special case for this
// FAMAS uses alt fire as common firing. Another special case added
if( IsWeaponOnPerk( W,, self.class ) && CouldBarrageActive() &&
(ZedTimeModifyingStates.Find( StateName ) != INDEX_NONE || (StateName == 'MeleeChainAttacking' && IsBlastBrawlers(W))))
(ZedTimeModifyingStates.Find( StateName ) != INDEX_NONE ||
(StateName == 'MeleeChainAttacking' && IsBlastBrawlers(W)) ||
(IsFAMAS(W) && StateName == 'FiringSecondaryState')))
{
return BarrageFiringRate;
}

5
KFGame/Classes/KFPerk_Survivalist.uc
View File

@ -468,7 +468,10 @@ simulated function float GetZedTimeModifier( KFWeapon W )
`Warn(StateName);
// Blast Brawlers use a different state for shooting (combining melee + firing). Needs a special case for this
if( ZedTimeModifyingStates.Find( StateName ) != INDEX_NONE || (StateName == 'MeleeChainAttacking' && IsBlastBrawlers(W)) )
// FAMAS uses alt fire as common firing. Another special case added
if( ZedTimeModifyingStates.Find( StateName ) != INDEX_NONE ||
(StateName == 'MeleeChainAttacking' && IsBlastBrawlers(W)) ||
(StateName == 'FiringSecondaryState' && IsFAMAS(W)))
{
return GetSkillValue( PerkSkills[ESurvivalist_MadMan] );
}

4
KFGame/Classes/KFWeaponAttachment.uc
View File

@ -105,6 +105,8 @@ enum EWeaponState
WEP_ReloadSingleEmpty_Elite,
WEP_ReloadSecondary,
WEP_ReloadSecondary_Elite,
WEP_ReloadSecondaryEmpty,
WEP_ReloadSecondaryEmpty_Elite,
WEP_ReloadDualsOneEmpty,
WEP_ReloadDualsOneEmpty_Elite,
WEP_MeleeBasic,
@ -799,6 +801,8 @@ simulated function UpdateThirdPersonWeaponAction(EWeaponState NewWeaponState, KF
case WEP_ReloadSecondary_Elite:
case WEP_ReloadDualsOneEmpty:
case WEP_ReloadDualsOneEmpty_Elite:
case WEP_ReloadSecondaryEmpty:
case WEP_ReloadSecondaryEmpty_Elite:
bIsReloading = true;
PlayReloadMagazineAnim(NewWeaponState, P);
break;