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

Fix halved buckle range not applying, add range property to strap

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-08 12:54:00 +02:00
parent e2a96ac717
commit da4b55814a
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs
View File

@@ -29,8 +29,10 @@ namespace Content.Server.GameObjects.Components.Mobs
[Dependency] private readonly IServerNotifyManager _notifyManager = default!; [Dependency] private readonly IServerNotifyManager _notifyManager = default!;
#pragma warning restore 649 #pragma warning restore 649
private StrapComponent? _buckledTo;
private int _size; private int _size;
private float _range;
private StrapComponent? _buckledTo;
[ViewVariables] [ViewVariables]
public StrapComponent? BuckledTo public StrapComponent? BuckledTo
@@ -74,10 +76,18 @@ namespace Content.Server.GameObjects.Components.Mobs
return false; return false;
} }
var strapPosition = Owner.Transform.MapPosition; if (!to.TryGetComponent(out StrapComponent strap))
var range = SharedInteractionSystem.InteractionRange / 2; {
_notifyManager.PopupMessage(Owner, user,
Loc.GetString(Owner == user
? "You can't buckle yourself there!"
: "You can't buckle {0:them} there!", Owner));
return false;
}
if (!InteractionChecks.InRangeUnobstructed(user, strapPosition, range) || var strapPosition = strap.Owner.Transform.MapPosition;
if (!InteractionChecks.InRangeUnobstructed(user, strapPosition, _range) ||
ContainerHelpers.IsInContainer(Owner)) ContainerHelpers.IsInContainer(Owner))
{ {
_notifyManager.PopupMessage(user, user, _notifyManager.PopupMessage(user, user,
@@ -101,15 +111,6 @@ namespace Content.Server.GameObjects.Components.Mobs
return false; return false;
} }
if (!to.TryGetComponent(out StrapComponent strap))
{
_notifyManager.PopupMessage(Owner, user,
Loc.GetString(Owner == user
? "You can't buckle yourself there!"
: "You can't buckle {0:them} there!", Owner));
return false;
}
var parent = to.Transform.Parent; var parent = to.Transform.Parent;
while (parent != null) while (parent != null)
{ {
@@ -195,9 +196,8 @@ namespace Content.Server.GameObjects.Components.Mobs
} }
var strapPosition = Owner.Transform.MapPosition; var strapPosition = Owner.Transform.MapPosition;
var range = SharedInteractionSystem.InteractionRange / 2;
if (!InteractionChecks.InRangeUnobstructed(user, strapPosition, range)) if (!InteractionChecks.InRangeUnobstructed(user, strapPosition, _range))
{ {
_notifyManager.PopupMessage(user, user, _notifyManager.PopupMessage(user, user,
Loc.GetString("You can't reach there!")); Loc.GetString("You can't reach there!"));
@@ -265,6 +265,7 @@ namespace Content.Server.GameObjects.Components.Mobs
base.ExposeData(serializer); base.ExposeData(serializer);
serializer.DataField(ref _size, "size", 100); serializer.DataField(ref _size, "size", 100);
serializer.DataField(ref _range, "range", SharedInteractionSystem.InteractionRange / 2);
} }
protected override void Startup() protected override void Startup()