fix distance

Space-Stories · Nov 25, 2024 · 5ca09d0 · 5ca09d0
1 parent e21480b
commit 5ca09d0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Content.Server/Stories/Garrote/GarroteSystem.cs b/Content.Server/Stories/Garrote/GarroteSystem.cs
@@ -45,7 +45,6 @@ public override void Initialize()
     private void OnGarroteAttempt(EntityUid uid, GarroteComponent comp, ref AfterInteractEvent args)
     {
         if (args.User == args.Target
-        || !args.CanReach
         || !HasComp<BodyComponent>(args.Target)
         || !HasComp<DamageableComponent>(args.Target)
         || !TryComp<MobStateComponent>(args.Target, out var mobstate)) return;
@@ -71,6 +70,13 @@ private void OnGarroteAttempt(EntityUid uid, GarroteComponent comp, ref AfterInt
             return;
         }
 
+        if (!args.CanReach)
+        {
+            var message = Loc.GetString("garrote-component-too-far-away", ("target", args.Target));
+            _popupSystem.PopupEntity(message, args.Target.Value, args.User);
+            return;
+        }
+
         var messagetarget = Loc.GetString("garrote-component-started-target", ("user", args.User));
         _popupSystem.PopupEntity(messagetarget, args.User, args.Target.Value, PopupType.LargeCaution);
 
@@ -82,7 +88,8 @@ private void OnGarroteAttempt(EntityUid uid, GarroteComponent comp, ref AfterInt
             BreakOnMove = true,
             BreakOnDamage = true,
             NeedHand = true,
-            DuplicateCondition = DuplicateConditions.SameTool
+            DuplicateCondition = DuplicateConditions.SameTool,
+            DistanceThreshold = 0.1f
         };
 
         if (!_doAfter.TryStartDoAfter(doAfterEventArgs)) return;

diff --git a/Resources/Locale/ru-RU/_stories/garrote/garrote-component.ftl b/Resources/Locale/ru-RU/_stories/garrote/garrote-component.ftl
@@ -1,4 +1,5 @@
 garrote-component-doesnt-breath = { $target } уже не дышит!
 garrote-component-must-be-behind = Вы должны быть сзади { $target }.
+garrote-component-too-far-away = Вы слишком далеко, чтобы использовать удавку!
 garrote-component-started-target = { $user } начинает удушать вас!
 garrote-component-started-others = { $user } начинает удушать { $target }!