tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove .Owner from melee weapons (#14600)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-12 15:56:05 +11:00
committed by GitHub
parent 5541edbadc
commit e93d5113ad
8 changed files with 96 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
View File

@@ -1,3 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Shared.ActionBlocker;
using Content.Shared.Administration.Logs;
@@ -34,13 +35,13 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
[Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!;
[Dependency] protected readonly ActionBlockerSystem Blocker = default!;
[Dependency] protected readonly DamageableSystem Damageable = default!;
[Dependency] protected readonly InventorySystem Inventory = default!;
[Dependency] private readonly InventorySystem _inventory = default!;
[Dependency] protected readonly SharedAudioSystem Audio = default!;
[Dependency] protected readonly SharedCombatModeSystem CombatMode = default!;
[Dependency] protected readonly SharedInteractionSystem Interaction = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] protected readonly SharedPopupSystem PopupSystem = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] protected readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly StaminaSystem _stamina = default!;
protected ISawmill Sawmill = default!;
@@ -106,10 +107,11 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
if (user == null)
return;
var weapon = GetWeapon(user.Value);
if (weapon?.Owner != msg.Weapon)
if (!TryGetWeapon(user.Value, out var weaponUid, out var weapon) ||
weaponUid != msg.Weapon)
{
return;
}
if (!weapon.Attacking)
return;
@@ -125,10 +127,11 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
if (user == null)
return;
var weapon = GetWeapon(user.Value);
if (weapon?.Owner != msg.Weapon)
if (!TryGetWeapon(user.Value, out var weaponUid, out var weapon) ||
weaponUid != msg.Weapon)
{
return;
}
DebugTools.Assert(weapon.WindUpStart == null);
weapon.WindUpStart = Timing.CurTime;
@@ -144,26 +147,27 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
if (user == null)
return;
var weapon = GetWeapon(user.Value);
if (weapon?.Owner != msg.Weapon)
if (!TryGetWeapon(user.Value, out var weaponUid, out var weapon) ||
weaponUid != msg.Weapon)
{
return;
}
AttemptAttack(args.SenderSession.AttachedEntity!.Value, msg.Weapon, weapon, msg, args.SenderSession);
}
private void OnStopHeavyAttack(StopHeavyAttackEvent msg, EntitySessionEventArgs args)
{
if (args.SenderSession.AttachedEntity == null ||
!TryComp<MeleeWeaponComponent>(msg.Weapon, out var weapon))
if (args.SenderSession.AttachedEntity == null)
{
return;
}
var userWeapon = GetWeapon(args.SenderSession.AttachedEntity.Value);
if (userWeapon != weapon)
if (!TryGetWeapon(args.SenderSession.AttachedEntity.Value, out var weaponUid, out var weapon) ||
weaponUid != msg.Weapon)
{
return;
}
if (weapon.WindUpStart.Equals(null))
{
@@ -176,16 +180,16 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
private void OnHeavyAttack(HeavyAttackEvent msg, EntitySessionEventArgs args)
{
if (args.SenderSession.AttachedEntity == null ||
!TryComp<MeleeWeaponComponent>(msg.Weapon, out var weapon))
if (args.SenderSession.AttachedEntity == null)
{
return;
}
var userWeapon = GetWeapon(args.SenderSession.AttachedEntity.Value);
if (userWeapon != weapon)
if (!TryGetWeapon(args.SenderSession.AttachedEntity.Value, out var weaponUid, out var weapon) ||
weaponUid != msg.Weapon)
{
return;
}
AttemptAttack(args.SenderSession.AttachedEntity.Value, msg.Weapon, weapon, msg, args.SenderSession);
}
@@ -197,12 +201,12 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
return;
}
var userWeapon = GetWeapon(args.SenderSession.AttachedEntity.Value);
if (userWeapon == null)
if (!TryGetWeapon(args.SenderSession.AttachedEntity.Value, out var weaponUid, out var weapon))
{
return;
}
AttemptAttack(args.SenderSession.AttachedEntity.Value, userWeapon.Owner, userWeapon, msg, args.SenderSession);
AttemptAttack(args.SenderSession.AttachedEntity.Value, weaponUid, weapon, msg, args.SenderSession);
}
private void OnGetState(EntityUid uid, MeleeWeaponComponent component, ref ComponentGetState args)
@@ -226,15 +230,22 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
component.Range = state.Range;
}
public MeleeWeaponComponent? GetWeapon(EntityUid entity)
public bool TryGetWeapon(EntityUid entity, out EntityUid weaponUid, [NotNullWhen(true)] out MeleeWeaponComponent? melee)
{
MeleeWeaponComponent? melee;
weaponUid = default;
melee = null;
var ev = new GetMeleeWeaponEvent();
RaiseLocalEvent(entity, ev);
if (ev.Handled)
{
return EntityManager.GetComponentOrNull<MeleeWeaponComponent>(ev.Weapon);
if (TryComp(ev.Weapon, out melee))
{
weaponUid = ev.Weapon.Value;
return true;
}
return false;
}
// Use inhands entity if we got one.
@@ -243,26 +254,30 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
{
if (EntityManager.TryGetComponent(held, out melee))
{
return melee;
weaponUid = held;
return true;
}
return null;
return false;
}
// Use hands clothing if applicable.
if (Inventory.TryGetSlotEntity(entity, "gloves", out var gloves) &&
if (_inventory.TryGetSlotEntity(entity, "gloves", out var gloves) &&
TryComp<MeleeWeaponComponent>(gloves, out var glovesMelee))
{
return glovesMelee;
weaponUid = gloves.Value;
melee = glovesMelee;
return true;
}
// Use our own melee
if (TryComp(entity, out melee))
{
return melee;
weaponUid = entity;
return true;
}
return null;
return false;
}
public void AttemptLightAttackMiss(EntityUid user, EntityUid weaponUid, MeleeWeaponComponent weapon, EntityCoordinates coordinates)
@@ -345,7 +360,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
throw new NotImplementedException();
}
DoLungeAnimation(user, weapon.Angle, attack.Coordinates.ToMap(EntityManager), weapon.Range, animation);
DoLungeAnimation(user, weapon.Angle, attack.Coordinates.ToMap(EntityManager, _transform), weapon.Range, animation);
weapon.Attacking = true;
Dirty(weapon);
}
@@ -441,7 +456,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
// If the target has stamina and is taking blunt damage, they should also take stamina damage based on their blunt to stamina factor
if (damageResult.DamageDict.TryGetValue("Blunt", out var bluntDamage))
{
_stamina.TakeStaminaDamage(ev.Target.Value, (bluntDamage * component.BluntStaminaDamageFactor).Float(), source:user, with:(component.Owner == user ? null : component.Owner));
_stamina.TakeStaminaDamage(ev.Target.Value, (bluntDamage * component.BluntStaminaDamageFactor).Float(), source:user, with:meleeUid == user ? null : meleeUid);
}
if (meleeUid == user)
@@ -452,7 +467,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
else
{
AdminLogger.Add(LogType.MeleeHit,
$"{ToPrettyString(user):user} melee attacked {ToPrettyString(ev.Target.Value):target} using {ToPrettyString(component.Owner):used} and dealt {damageResult.Total:damage} damage");
$"{ToPrettyString(user):user} melee attacked {ToPrettyString(ev.Target.Value):target} using {ToPrettyString(meleeUid):used} and dealt {damageResult.Total:damage} damage");
}
PlayHitSound(ev.Target.Value, user, GetHighestDamageSound(modifiedDamage, _protoManager), hitEvent.HitSoundOverride, component.HitSound);
@@ -489,7 +504,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
return;
}
var targetMap = ev.Coordinates.ToMap(EntityManager);
var targetMap = ev.Coordinates.ToMap(EntityManager, _transform);
if (targetMap.MapId != userXform.MapID)
{
@@ -570,7 +585,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
else
{
AdminLogger.Add(LogType.MeleeHit,
$"{ToPrettyString(user):user} melee attacked {ToPrettyString(entity):target} using {ToPrettyString(component.Owner):used} and dealt {damageResult.Total:damage} damage");
$"{ToPrettyString(user):user} melee attacked {ToPrettyString(entity):target} using {ToPrettyString(meleeUid):used} and dealt {damageResult.Total:damage} damage");
}
}
}
@@ -729,7 +744,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
if (!TryComp<TransformComponent>(user, out var userXform))
return;
var invMatrix = userXform.InvWorldMatrix;
var invMatrix = _transform.GetInvWorldMatrix(userXform);
var localPos = invMatrix.Transform(coordinates.Position);
if (localPos.LengthSquared <= 0f)
@@ -738,8 +753,8 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
localPos = userXform.LocalRotation.RotateVec(localPos);
// We'll play the effect just short visually so it doesn't look like we should be hitting but actually aren't.
const float BufferLength = 0.2f;
var visualLength = length - BufferLength;
const float bufferLength = 0.2f;
var visualLength = length - bufferLength;
if (localPos.Length > visualLength)
localPos = localPos.Normalized * visualLength;