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

Merge branch 'master' into preview

Browse Source
This commit is contained in:
GenZmeY
2022-11-28 00:40:54 +03:00
parent 3e3e8af04f 23d1ca3a9a
commit ecab3a97a7
15 changed files with 145 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
KFGameContent/Classes/KFDT_Explosive_HRG_Locust.uc
View File

@ -23,7 +23,7 @@ static function ApplySecondaryDamage(KFPawn Victim, int DamageTaken, optional Co
if (default.DoTDamageType.default.DoT_Type != DOT_None)
{
Victim.ApplyDamageOverTime(class'KFDT_Toxic_HRG_Locust'.default.SpreadOnTouchDamage, InstigatedBy, default.DoTDamageType);
Victim.ApplyDamageOverTime(DamageTaken, InstigatedBy, default.DoTDamageType);
}
}

23
KFGameContent/Classes/KFDT_Piercing_ScytheStabFolded.uc Normal file
View File

@ -0,0 +1,23 @@
//=============================================================================
// KFDT_Piercing_ScytheStabFolded
//=============================================================================
// Killing Floor 2
// Copyright (C) 2022 Tripwire Interactive LLC
//=============================================================================
class KFDT_Piercing_ScytheStabFolded extends KFDT_Piercing
abstract
hidedropdown;
defaultproperties
{
KDamageImpulse=200
KDeathUpKick=250
StumblePower=50
MeleeHitPower=100
WeaponDef=class'KFWeapDef_Scythe'
ModifierPerkList(0)=class'KFPerk_Berserker'
}

21
KFGameContent/Classes/KFExplosion_HRG_Locust.uc
View File

@ -9,25 +9,6 @@
class KFExplosion_HRG_Locust extends KFExplosionActorLingering;
var private bool bFirstExplosion;
protected simulated function bool DoExplosionDamage(bool bCauseDamage, bool bCauseEffects)
{
local bool bReturnValue;
// Only does explosion damage one time
if (bCauseDamage && bFirstExplosion == false)
{
bCauseDamage = false;
}
bReturnValue = super.DoExplosionDamage(bCauseDamage, bCauseEffects);
bFirstExplosion = false;
return bReturnValue;
}
DefaultProperties
{
Interval=0.5f
@ -36,8 +17,6 @@ DefaultProperties
bOnlyDamagePawns=true
bDoFullDamage=false
bFirstExplosion=true
LoopStartEvent=AkEvent'WW_WEP_HRG_Locust.Play_WEP_HRG_Locust_Insects'
LoopStopEvent=AkEvent'WW_WEP_HRG_Locust.Stop_WEP_HRG_Locust_Insect'
}

4
KFGameContent/Classes/KFProj_HRG_Locust.uc
View File

@ -135,8 +135,8 @@ defaultproperties
// explosion
Begin Object Class=KFGameExplosion Name=ExploTemplate0
Damage=80
DamageRadius=300
Damage=60
DamageRadius=200
DamageFalloffExponent=0.5f
DamageDelay=0.f

4
KFGameContent/Classes/KFProj_Mine_Reconstructor.uc
View File

@ -886,8 +886,8 @@ defaultproperties
// Camera Shake
CamShake=CameraShake'WEP_Mine_Reconstructor_Arch.Camera_Shake'
CamShakeInnerRadius=200
CamShakeOuterRadius=400
CamShakeInnerRadius=0
CamShakeOuterRadius=0
CamShakeFalloff=1.f
bOrientCameraShakeTowardsEpicenter=true
End Object

25
KFGameContent/Classes/KFWeap_AssaultRifle_G36C.uc
View File

@ -29,6 +29,21 @@ simulated function ZoomOut( bool bAnimateTransition, float ZoomTimeToGo )
}
}
simulated function AttachLaserSight()
{
if( WorldInfo.NetMode == NM_DedicatedServer )
{
return;
}
super.AttachLaserSight();
if (LaserSight != none)
{
LaserSight.bForceDotToMatch = true;
}
}
defaultproperties
{
bHasFireLastAnims=true
@ -70,10 +85,10 @@ defaultproperties
bReloadFromMagazine=true
// Recoil
maxRecoilPitch=90
minRecoilPitch=80
maxRecoilYaw=80
minRecoilYaw=-80
maxRecoilPitch=50
minRecoilPitch=40
maxRecoilYaw=70
minRecoilYaw=-70
RecoilRate=0.085
RecoilMaxYawLimit=500
RecoilMinYawLimit=65035
@ -83,7 +98,7 @@ defaultproperties
RecoilISMinYawLimit=65460
RecoilISMaxPitchLimit=350
RecoilISMinPitchLimit=65460
IronSightMeshFOVCompensationScale=4.0
IronSightMeshFOVCompensationScale=6.0
// Old Recoil Data
// maxRecoilPitch=80

23
KFGameContent/Classes/KFWeap_Edged_Scythe.uc
View File

@ -157,6 +157,10 @@ simulated function ChangeMode(bool IsFolded, bool bApplyBlend = true)
InstantHitDamageTypes[HEAVY_ATK_FIREMODE] = FoldedDTAlt;
PlayerViewOffset = OriginalPlayerViewOffset;
InstantHitDamageTypes[BASH_FIREMODE]=class'KFDT_Piercing_ScytheStabFolded';
InstantHitMomentum[BASH_FIREMODE]=100000.f;
InstantHitDamage[BASH_FIREMODE]=40;
}
else
{
@ -170,6 +174,10 @@ simulated function ChangeMode(bool IsFolded, bool bApplyBlend = true)
InstantHitDamageTypes[HEAVY_ATK_FIREMODE] = UnfoldedDTAlt;
PlayerViewOffset = PlayerViewOffsetUnfolded;
InstantHitDamageTypes[BASH_FIREMODE]=class'KFDT_Piercing_ScytheStab';
InstantHitMomentum[BASH_FIREMODE]=100000.f;
InstantHitDamage[BASH_FIREMODE]=60;
}
NotifyServerMode(bIsFolded);
@ -325,8 +333,8 @@ defaultproperties
// Short Range Mode Params
MaxHitRangeFolded=220
FoldedDamage = 60
FoldedDamageAlt = 87
FoldedDamage = 70
FoldedDamageAlt = 120
FoldedDT=class'KFDT_Slashing_ScytheShort'
FoldedDTAlt=class'KFDT_Slashing_ScytheShortAlt'
HitboxChainFolded = {(
@ -344,8 +352,8 @@ defaultproperties
// Long Range Mode Params
MaxHitRangeUnfolded=300
UnfoldedDamage=90
UnfoldedDamageAlt=150
UnfoldedDamage=140
UnfoldedDamageAlt=190
UnfoldedDT=class'KFDT_Slashing_ScytheLong'
UnfoldedDTAlt=class'KFDT_Slashing_ScytheLongAlt'
HitboxChainUnfolded = {(
@ -383,9 +391,10 @@ defaultproperties
FiringStatesArray(HEAVY_ATK_FIREMODE)=MeleeHeavyAttacking
InstantHitMomentum(HEAVY_ATK_FIREMODE)=30000.f
InstantHitDamageTypes(BASH_FIREMODE)=class'KFDT_Piercing_ScytheStab'
InstantHitMomentum(BASH_FIREMODE)=100000.f
InstantHitDamage(BASH_FIREMODE)=50
// Defined in ChangeMode function
//InstantHitDamageTypes(BASH_FIREMODE)=class'KFDT_Piercing_ScytheStab'
//InstantHitMomentum(BASH_FIREMODE)=100000.f
//InstantHitDamage(BASH_FIREMODE)=50
// Inventory
GroupPriority=50

4
KFGameContent/Classes/KFWeap_HRG_Dragonbreath.uc
View File

@ -156,7 +156,7 @@ defaultproperties
// Inventory
InventorySize=7
GroupPriority=110
WeaponSelectTexture=Texture2D'WEP_UI_Quad_Barrel_TEX.UI_WeaponSelect_QuadBarrel'
WeaponSelectTexture=Texture2D'WEP_UI_HRG_MegaDragonsbreath_TEX.UI_WeaponSelect_HRG_MegaDragonsbreath'
// FOV
MeshFOV=60
@ -232,7 +232,7 @@ defaultproperties
// Ammo
MagazineCapacity[0]=4
SpareAmmoCapacity[0]=48 //72
SpareAmmoCapacity[0]=60 //48 //72
InitialSpareMags[0]=3 //8
AmmoPickupScale[0]=2.0 //3.0
bCanBeReloaded=true