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

upload

Browse Source
This commit is contained in:
GenZmeY
2021-03-02 14:56:51 +03:00
parent 1fd126afa1
commit 28f1e3c001
95 changed files with 3970 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Engine/Classes/DamageType.uc
View File

@ -13,7 +13,8 @@ class DamageType extends object
native
abstract;
var() bool bArmorStops; // does regular armor provide protection against this damage
var() bool bArmorStops; // does regular armor provide protection against this damage (only affects KFPawn_Human)
var float ArmorDamageModifier; // modifier for armor damage (only affects KFPawn_Monster)
var bool bCausedByWorld; //this damage was caused by the world (falling off level, into lava, etc)
var bool bExtraMomentumZ; // Add extra Z to momentum on walking pawns to throw them up into the air
@ -54,6 +55,7 @@ static function float VehicleDamageScalingFor(Vehicle V)
defaultproperties
{
bArmorStops=true
ArmorDamageModifier=1
KDamageImpulse=800
VehicleDamageScaling=+1.0
VehicleMomentumScaling=+1.0

16
Engine/Classes/GameInfo.uc
View File

@ -2173,6 +2173,22 @@ function Logout( Controller Exiting )
}
}
simulated function ExileServerUsingKickBan()
{
local OnlineGameSettings GameSettings;
if (GameInterface != None)
{
GameSettings = GameInterface.GetGameSettings(PlayerReplicationInfoClass.default.SessionName);
}
if (GameSettings != None)
{
GameSettings.bServerExiled = true;
}
}
/**
* Removes the player from the named session when they leave
*

7
Engine/Classes/OnlineGameSettings.uc
View File

@ -115,6 +115,10 @@ var databinding int BotPlayers;
var databinding string SteamServerUID;
//@SABER_EGS_END
//@SABER_BEGIN "Exiling" servers which kicks/bans
var databinding bool bServerExiled;
//@SABER_END
`if (`__TW_ONLINESUBSYSTEM_)
//used to keep track of the gfx objects in the serverbrowser's list
@ -176,4 +180,7 @@ defaultproperties
//@SABER_EGS_BEGIN Crossplay support
BotPlayers=0
//@SABER_EGS_END
//@SABER_BEGIN "Exiling" servers which kicks/bans
bServerExiled=false
//@SABER_END
}

1
Engine/Classes/OnlineSubsystem.uc
View File

@ -2301,6 +2301,7 @@ static function DumpGameSettings(const OnlineGameSettings GameSettings)
`Log(" bIsLanMatch: "$GameSettings.bIsLanMatch);
`Log(" bIsDedicated: "$GameSettings.bIsDedicated);
`Log(" bUsesStats: "$GameSettings.bUsesStats);
`Log(" bServerExiled: "$GameSettings.bServerExiled);
`Log(" bUsesArbitration: "$GameSettings.bUsesArbitration);
`Log(" bAntiCheatProtected: "$GameSettings.bAntiCheatProtected);
`Log(" bShouldAdvertise: "$GameSettings.bShouldAdvertise);

9
Engine/Classes/Pawn.uc
View File

@ -2596,10 +2596,17 @@ event TakeDamage(int Damage, Controller InstigatedBy, vector HitLocation, vector
Killer = SetKillInstigator(InstigatedBy, DamageType);
TearOffMomentum = momentum;
Died(Killer, damageType, HitLocation);
// using the passed in damage type instead of the hitfxinfo since that doesn't get updated when zero damage is done
HandleAfflictionsOnHit(InstigatedBy, Normal(Momentum), DamageType, DamageCauser);
}
else
{
HandleMomentum( momentum, HitLocation, DamageType, HitInfo );
// using the passed in damage type instead of the hitfxinfo since that doesn't get updated when zero damage is done
HandleAfflictionsOnHit(InstigatedBy, Normal(Momentum), DamageType, DamageCauser);
NotifyTakeHit(InstigatedBy, HitLocation, ActualDamage, DamageType, Momentum, DamageCauser);
if (DrivenVehicle != None)
{
@ -2619,6 +2626,8 @@ event TakeDamage(int Damage, Controller InstigatedBy, vector HitLocation, vector
`endif
}
function HandleAfflictionsOnHit(Controller DamageInstigator, vector HitDir, class<DamageType> DamageType, Actor DamageCauser);
/*
* Queries the PRI and returns our current team index.
*/