1
0
This commit is contained in:
2021-06-02 23:06:18 +03:00
parent 9553ac0b31
commit 90e235396c
96 changed files with 5520 additions and 161 deletions

View File

@ -11,13 +11,21 @@ class GravityVolume extends PhysicsVolume
/** Gravity along Z axis applied to objects inside this volume. */
var() float GravityZ;
/** Scaling GravityZ and being used different function (GetGravityZHuman) to retrieve GravityZ */
var() float ScaleGravityHuman;
/** Scaling GravityZ and being used different function (GetGravityZMonster) to retrieve GravityZ */
var() float ScaleGravityMonster;
cpptext
{
virtual FLOAT GetGravityZ() { return GravityZ; }
virtual FLOAT GetGravityZHuman() { return GravityZ * ScaleGravityHuman; }
virtual FLOAT GetGravityZMonster() { return GravityZ * ScaleGravityMonster; }
}
defaultproperties
{
GravityZ = -520.0
ScaleGravityHuman = 1.0
ScaleGravityMonster = 1.0
}

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.
*/

View File

@ -79,6 +79,8 @@ cpptext
}
native function float GetGravityZ();
native function float GetGravityZHuman();
native function float GetGravityZMonster();
native function vector GetZoneVelocityForActor(Actor TheActor);
simulated event PostBeginPlay()