(bf212a41f) v0.9.2.0 pre-release test version
This commit is contained in:
@@ -11,22 +11,9 @@ namespace Barotrauma
|
||||
{
|
||||
}
|
||||
|
||||
partial void AdjustKarma(Character attacker, AttackResult attackResult)
|
||||
partial void OnAttackedProjSpecific(Character attacker, AttackResult attackResult)
|
||||
{
|
||||
if (attacker == null) return;
|
||||
|
||||
Client attackerClient = GameMain.Server.ConnectedClients.Find(c => c.Character == attacker);
|
||||
if (attackerClient == null) return;
|
||||
|
||||
Client targetClient = GameMain.Server.ConnectedClients.Find(c => c.Character == this);
|
||||
if (targetClient != null)
|
||||
{
|
||||
if (attacker.TeamID == TeamID)
|
||||
{
|
||||
attackerClient.Karma -= attackResult.Damage * 0.01f;
|
||||
if (CharacterHealth.MaxVitality <= CharacterHealth.MinVitality) attackerClient.Karma = 0.0f;
|
||||
}
|
||||
}
|
||||
GameMain.Server.KarmaManager.OnCharacterHealthChanged(this, attacker, attackResult.Damage, attackResult.Afflictions);
|
||||
}
|
||||
|
||||
partial void KillProjSpecific(CauseOfDeathType causeOfDeath, Affliction causeOfDeathAffliction)
|
||||
|
||||
@@ -21,29 +21,25 @@ namespace Barotrauma
|
||||
{
|
||||
if (!Enabled) { return 1000.0f; }
|
||||
|
||||
if (recipient.Character == null || recipient.Character.IsDead)
|
||||
{
|
||||
return 0.2f;
|
||||
}
|
||||
else
|
||||
{
|
||||
float distance = Vector2.Distance(recipient.Character.WorldPosition, WorldPosition);
|
||||
float priority = 1.0f - MathUtils.InverseLerp(
|
||||
NetConfig.HighPrioCharacterPositionUpdateDistance,
|
||||
NetConfig.LowPrioCharacterPositionUpdateDistance,
|
||||
distance);
|
||||
Vector2 comparePosition = recipient.SpectatePos == null ? recipient.Character.WorldPosition : recipient.SpectatePos.Value;
|
||||
|
||||
float interval = MathHelper.Lerp(
|
||||
NetConfig.LowPrioCharacterPositionUpdateInterval,
|
||||
NetConfig.HighPrioCharacterPositionUpdateInterval,
|
||||
priority);
|
||||
float distance = Vector2.Distance(comparePosition, WorldPosition);
|
||||
float priority = 1.0f - MathUtils.InverseLerp(
|
||||
NetConfig.HighPrioCharacterPositionUpdateDistance,
|
||||
NetConfig.LowPrioCharacterPositionUpdateDistance,
|
||||
distance);
|
||||
|
||||
if (IsDead)
|
||||
{
|
||||
interval = Math.Max(interval * 2, 0.1f);
|
||||
}
|
||||
return interval;
|
||||
float interval = MathHelper.Lerp(
|
||||
NetConfig.LowPrioCharacterPositionUpdateInterval,
|
||||
NetConfig.HighPrioCharacterPositionUpdateInterval,
|
||||
priority);
|
||||
|
||||
if (IsDead)
|
||||
{
|
||||
interval = Math.Max(interval * 2, 0.1f);
|
||||
}
|
||||
|
||||
return interval;
|
||||
}
|
||||
|
||||
partial void UpdateNetInput()
|
||||
|
||||
Reference in New Issue
Block a user