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

Refactor InRangeUnobstructed and add extension methods (#1925)

Browse Source 
* Sort out InRangeUnobstructed and add extension methods

* Rename client RangeChecks to RangeExtensions

* Add container extension methods and test

* Add missing component methods

Component to container
Grid coordinates to container
Map coordinates to container
Local player to container

* Actually use the field

* Merge fixes

* Add popup argument to local player extension methods

* Reduce code repetition for client range extensions
This commit is contained in:
DrSmugleaf
2020-08-30 11:37:06 +02:00
committed by GitHub
parent 9ec3ddf368
commit 9d6c394f6b
39 changed files with 1287 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.GameObjects.Components.Body;
using Content.Server.GameObjects.Components.Body;
using Content.Server.GameObjects.EntitySystems.DoAfter;
using Content.Shared.GameObjects.Components.Movement;
using Content.Shared.GameObjects.EntitySystems;
@@ -18,6 +18,7 @@ using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using System;
using Content.Server.Utility;
using Content.Shared.Utility;
namespace Content.Server.GameObjects.Components.Movement
{
@@ -107,12 +108,7 @@ namespace Content.Server.GameObjects.Components.Movement
return false;
}
var userPosition = user.Transform.MapPosition;
var climbablePosition = target.Transform.MapPosition;
var interaction = EntitySystem.Get<SharedInteractionSystem>();
bool Ignored(IEntity entity) => (entity == target || entity == user);
if (!interaction.InRangeUnobstructed(userPosition, climbablePosition, _range, predicate: Ignored))
if (!user.InRangeUnobstructed(target, _range))
{
reason = Loc.GetString("You can't reach there!");
return false;
@@ -144,14 +140,10 @@ namespace Content.Server.GameObjects.Components.Movement
return false;
}
var userPosition = user.Transform.MapPosition;
var otherUserPosition = dragged.Transform.MapPosition;
var climbablePosition = target.Transform.MapPosition;
var interaction = EntitySystem.Get<SharedInteractionSystem>();
bool Ignored(IEntity entity) => (entity == target || entity == user || entity == dragged);
bool Ignored(IEntity entity) => entity == target || entity == user || entity == dragged;
if (!interaction.InRangeUnobstructed(userPosition, climbablePosition, _range, predicate: Ignored) ||
!interaction.InRangeUnobstructed(userPosition, otherUserPosition, _range, predicate: Ignored))
if (!user.InRangeUnobstructed(target, _range, predicate: Ignored) ||
!user.InRangeUnobstructed(dragged, _range, predicate: Ignored))
{
reason = Loc.GetString("You can't reach there!");
return false;