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

4
KFGame/Classes/KFDT_Toxic_HRG_Locust.uc
View File

@ -23,7 +23,7 @@ defaultproperties
DoT_Type=DOT_Bleeding
DoT_Duration=3.0
DoT_Interval=0.5
DoT_DamageScale=1.0
DoT_DamageScale=0.5
BleedPower = 20
PoisonPower = 25
@ -32,5 +32,5 @@ defaultproperties
WeaponDef=class'KFWeapDef_HRG_Locust'
SpreadOnTouchDamage=40
SpreadOnTouchDamage=30
}

13
KFGame/Classes/KFGFxControlsContainer_Input.uc
View File

@ -38,7 +38,6 @@ var localized string ViewAccelerationString;
var KFGFxOptionsMenu_Controls ControlsMenu;
function Initialize( KFGFxObject_Menu NewParentMenu )
{
super.Initialize( NewParentMenu );
@ -178,15 +177,12 @@ function ResetInputOptions()
KFPI.MouseLookUpScale = ControlsMenu.Manager.CachedProfile.GetDefaultFloat(KFID_MouseLookUpScale);
ControlsMenu.Manager.CachedProfile.SetProfileSettingValueFloat(KFID_MouseLookUpScale, KFPI.MouseLookUpScale);
KFPI.LookUpScale = KFPI.MouseLookUpScale;
class'PlayerInput'.default.LookUpScale = KFPI.MouseLookUpScale;
KFPI.MouseLookRightScale = ControlsMenu.Manager.CachedProfile.GetDefaultFloat(KFID_MouseLookRightScale);
ControlsMenu.Manager.CachedProfile.SetProfileSettingValueFloat(KFID_MouseLookRightScale, KFPI.MouseLookRightScale);
KFPI.LookRightScale = KFPI.MouseLookRightScale;
class'PlayerInput'.default.LookRightScale = KFPI.MouseLookRightScale;
class'PlayerInput'.static.StaticSaveConfig();
KFPI.ResetLookScales();
KFPI.bViewSmoothingEnabled = ControlsMenu.Manager.CachedProfile.GetDefaultBool(KFID_ViewSmoothingEnabled);
ControlsMenu.Manager.CachedProfile.SetProfileSettingValueBool(KFID_ViewSmoothingEnabled, KFPI.bViewSmoothingEnabled);
@ -227,4 +223,3 @@ function ResetInputOptions()
InitializeOptions();
}

13
KFGame/Classes/KFGFxOptionsMenu_Controls.uc
View File

@ -342,11 +342,9 @@ function Callback_MouseLookUpScale(float NewValue)
KFPI = KFPlayerInput(GetPC().PlayerInput);
KFPI.MouseLookUpScale = NewValue;
KFPI.LookUpScale = NewValue;
class'PlayerInput'.default.LookUpScale = KFPI.MouseLookUpScale;
class'PlayerInput'.static.StaticSaveConfig();
KFPI.SaveConfig();
Manager.CachedProfile.SetProfileSettingValueFloat(KFID_MouseLookUpScale, NewValue);
//Manager.CachedProfile.SetProfileSettingValueFloat(KFID_MouseLookUpScale, NewValue);
}
function Callback_MouseLookRightScale(float NewValue)
@ -355,12 +353,9 @@ function Callback_MouseLookRightScale(float NewValue)
KFPI = KFPlayerInput(GetPC().PlayerInput);
KFPI.MouseLookRightScale = NewValue;
KFPI.LookRightScale = NewValue;
class'PlayerInput'.default.LookRightScale = KFPI.MouseLookRightScale;
class'PlayerInput'.static.StaticSaveConfig();
Manager.CachedProfile.SetProfileSettingValueFloat(KFID_MouseLookRightScale, NewValue);
KFPI.SaveConfig();
// Manager.CachedProfile.SetProfileSettingValueFloat(KFID_MouseLookRightScale, NewValue);
}
function Callback_ViewSmoothingChanged(bool bActive)

30
KFGame/Classes/KFLaserSightAttachment.uc
View File

@ -57,6 +57,9 @@ var() float AnimBlendRate;
var transient float LaserSightAimStrength;
var transient float DesiredAimStrength;
// Use for automatic weapons, then the Laser Dot will always steer to the hit location no matter what
var transient bool bForceDotToMatch;
var transient bool IsVisible;
/** Create/Attach lasersight components */
@ -296,6 +299,21 @@ simulated function Update(float DeltaTime, KFWeapon OwningWeapon)
}
}
function bool IsIdleFidgetAnimation(KFWeapon W, name AnimationName)
{
local int i;
for (i = 0; i < W.IdleFidgetAnims.Length; ++i)
{
if (AnimationName == W.IdleFidgetAnims[i])
{
return true;
}
}
return false;
}
/** Determine how much to weigh screen center versus weapon socket */
function UpdateFirstPersonAImStrength(float DeltaTime, KFWeapon W)
{
@ -306,8 +324,16 @@ function UpdateFirstPersonAImStrength(float DeltaTime, KFWeapon W)
{
DesiredAimStrength = 1.f - AnimWeight;
}
// we are forcing the dot to match, don't do while reloading though
else if (bForceDotToMatch
&& (W.IsInstate('Reloading') == false
&& W.IsInState('WeaponSprinting') == false
&& IsIdleFidgetAnimation(W, W.WeaponAnimSeqNode.AnimSeqName) == false))
{
DesiredAimStrength = 1.f - AnimWeight;
}
// follow weapon
else
else
{
DesiredAimStrength = 0.f;
}
@ -420,4 +446,6 @@ defaultproperties
LaserDotDepthBias=0.95f
IsVisible=true
bForceDotToMatch=false
}

4
KFGame/Classes/KFPlayerController.uc
View File

@ -1633,8 +1633,8 @@ function OnReadProfileSettingsComplete(byte LocalUserNum,bool bWasSuccessful)
KFInput.bAllowSwapTo9mm = Profile.GetProfileBool(KFID_AllowSwapTo9mm);
// Console?? PC??
KFInput.MouseLookUpScale = Profile.GetProfileFloat(KFID_MouseLookUpScale);
KFInput.MouseLookRightScale = Profile.GetProfileFloat(KFID_MouseLookRightScale);
//KFInput.MouseLookUpScale = Profile.GetProfileFloat(KFID_MouseLookUpScale);
//KFInput.MouseLookRightScale = Profile.GetProfileFloat(KFID_MouseLookRightScale);
KFInput.bViewSmoothingEnabled = Profile.GetProfileBool(KFID_ViewSmoothingEnabled);
KFInput.bViewAccelerationEnabled = Profile.GetProfileBool(KFID_ViewAccelerationEnabled);

53
KFGame/Classes/KFPlayerInput.uc
View File

@ -244,8 +244,12 @@ var bool bUsingVersusGamepadScheme;
/*********************************************************************************************
* @name QoL: Mouse input options
********************************************************************************************* */
var float MouseLookUpScale;
var float MouseLookRightScale;
var config float MouseLookUpScale;
var config float MouseLookRightScale;
var config bool bUseDefaultLookScales;
var const float DefaultLookRightScale;
var const float DefaultLookUpScale;
cpptext
{
@ -341,6 +345,17 @@ function ClientInitInputSystem()
}
}
simulated function ResetLookScales()
{
LookRightScale = DefaultLookRightScale;
LookUpScale = DefaultLookUpScale;
SaveConfig();
class'PlayerInput'.default.LookRightScale = DefaultLookRightScale;
class'PlayerInput'.default.LookUpScale = DefaultLookUpScale;
class'PlayerInput'.static.StaticSaveConfig();
}
function UpdatePushToTalk(bool bValue)
{
if(bValue != bRequiresPushToTalk)
@ -411,9 +426,16 @@ function EDoubleClickDir CheckForDoubleClickMove(float DeltaTime)
event PlayerInput( float DeltaTime )
{
local float FOVScale, TimeScale;
local float MouseYScale, MouseXScale;
local vector RawJoyVector;
/** For checking if init values needs to be reset */
if (bUseDefaultLookScales)
{
bUseDefaultLookScales = false;
ResetLookScales();
}
/** */
// Save Raw values
RawJoyUp = aBaseY;
RawJoyRight = aStrafe;
@ -444,12 +466,8 @@ event PlayerInput( float DeltaTime )
aBaseY *= TimeScale * MoveForwardSpeed;
aStrafe *= TimeScale * MoveStrafeSpeed;
aUp *= TimeScale * MoveStrafeSpeed;
if (class'WorldInfo'.static.IsConsoleBuild() || bUsingGamepad)
{
aTurn *= TimeScale * LookRightScale;
aLookUp *= TimeScale * LookUpScale;
}
aTurn *= TimeScale * LookRightScale;
aLookUp *= TimeScale * LookUpScale;
PostProcessInput( DeltaTime );
@ -473,16 +491,14 @@ event PlayerInput( float DeltaTime )
aLookUp *= FOVScale;
aTurn *= FOVScale;
MouseXScale = (TimeScale * -MouseLookUpScale / 100.0f);
// Turning and strafing share the same axis.
if( bStrafe > 0 )
aStrafe += aBaseX + aMouseX * ( MouseXScale > 0.0f ? MouseXScale : 1.0f);
aStrafe += aBaseX + aMouseX;
else
aTurn += aBaseX + aMouseX * ( MouseXScale > 0.0f ? MouseXScale : 1.0f);
aTurn += aBaseX + aMouseX;
// Look up/down.
MouseYScale = (TimeScale * -MouseLookUpScale / 100.0f);
aLookup += aMouseY * ( MouseYScale > 0.0f ? MouseYScale : 1.0f);
aLookup += aMouseY;
if ( (!bUsingGamepad && bInvertMouse) || (bInvertController && bUsingGamepad) )
{
aLookup *= -1.f;
@ -587,6 +603,8 @@ function AdjustMouseSensitivity(float FOVScale)
}
Super.AdjustMouseSensitivity(FOVScale);
aMouseX *= MouseLookRightScale / 100.0f;
aMouseY *= MouseLookUpScale / -100.0f;
}
@ -3002,5 +3020,8 @@ defaultproperties
ForceLookAtPawnRotationRate=22
ForceLookAtPawnDampenedRotationRate=8
WeakBoneDistance = 0.02; //0.01;
WeakBoneDistance = 0.02 //0.01;
DefaultLookRightScale=300
DefaultLookUpScale=-250
}

2
KFGame/Classes/KFWeapDef_HRG_Dragonbreath.uc
View File

@ -14,7 +14,7 @@ DefaultProperties
BuyPrice=1400
AmmoPricePerMag=25
ImagePath="WEP_UI_Quad_Barrel_TEX.UI_WeaponSelect_QuadBarrel"
ImagePath="WEP_UI_HRG_MegaDragonsbreath_TEX.UI_WeaponSelect_HRG_MegaDragonsbreath"
EffectiveRange=25