Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Content.Server/Buckle/Components/BuckleComponent.cs
View File

@@ -118,8 +118,8 @@ namespace Content.Server.Buckle.Components
/// <param name="strap">The strap to reattach to.</param>
public void ReAttach(StrapComponent strap)
{
var ownTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid);
var strapTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(strap.Owner.Uid);
var ownTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner);
var strapTransform = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(strap.Owner);
ownTransform.AttachParent(strapTransform);
ownTransform.LocalRotation = Angle.Zero;
@@ -129,10 +129,10 @@ namespace Content.Server.Buckle.Components
case StrapPosition.None:
break;
case StrapPosition.Stand:
EntitySystem.Get<StandingStateSystem>().Stand(Owner.Uid);
EntitySystem.Get<StandingStateSystem>().Stand((EntityUid) Owner);
break;
case StrapPosition.Down:
EntitySystem.Get<StandingStateSystem>().Down(Owner.Uid, false, false);
EntitySystem.Get<StandingStateSystem>().Down((EntityUid) Owner, false, false);
break;
}
@@ -148,13 +148,13 @@ namespace Content.Server.Buckle.Components
return false;
}
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user.Uid))
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user))
{
user.PopupMessage(Loc.GetString("buckle-component-cannot-do-that-message"));
return false;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(to.Uid, out strap))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(to, out strap))
{
return false;
}
@@ -178,7 +178,7 @@ namespace Content.Server.Buckle.Components
}
}
if (!IoCManager.Resolve<IEntityManager>().HasComponent<HandsComponent>(user.Uid))
if (!IoCManager.Resolve<IEntityManager>().HasComponent<HandsComponent>(user))
{
user.PopupMessage(Loc.GetString("buckle-component-no-hands-message "));
return false;
@@ -194,10 +194,10 @@ namespace Content.Server.Buckle.Components
return false;
}
var parent = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(to.Uid).Parent;
var parent = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(to).Parent;
while (parent != null)
{
if (parent == IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(user.Uid))
if (parent == IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(user))
{
var message = Loc.GetString(Owner == user
? "buckle-component-cannot-buckle-message"
@@ -246,7 +246,7 @@ namespace Content.Server.Buckle.Components
ReAttach(strap);
BuckledTo = strap;
LastEntityBuckledTo = BuckledTo.Owner.Uid;
LastEntityBuckledTo = BuckledTo.Owner;
DontCollide = true;
UpdateBuckleStatus();
@@ -255,7 +255,7 @@ namespace Content.Server.Buckle.Components
SendMessage(new BuckleMessage(Owner, to));
#pragma warning restore 618
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out SharedPullableComponent? ownerPullable))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out SharedPullableComponent? ownerPullable))
{
if (ownerPullable.Puller != null)
{
@@ -263,7 +263,7 @@ namespace Content.Server.Buckle.Components
}
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(to.Uid, out SharedPullableComponent? toPullable))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(to, out SharedPullableComponent? toPullable))
{
if (toPullable.Puller == Owner)
{
@@ -303,7 +303,7 @@ namespace Content.Server.Buckle.Components
return false;
}
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user.Uid))
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(user))
{
user.PopupMessage(Loc.GetString("buckle-component-cannot-do-that-message"));
return false;
@@ -317,25 +317,25 @@ namespace Content.Server.Buckle.Components
BuckledTo = null;
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).Parent == IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(oldBuckledTo.Owner.Uid))
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).Parent == IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(oldBuckledTo.Owner))
{
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).AttachParentToContainerOrGrid();
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).WorldRotation = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(oldBuckledTo.Owner.Uid).WorldRotation;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).AttachParentToContainerOrGrid();
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).WorldRotation = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(oldBuckledTo.Owner).WorldRotation;
}
Appearance?.SetData(BuckleVisuals.Buckled, false);
if (IoCManager.Resolve<IEntityManager>().HasComponent<KnockedDownComponent>(Owner.Uid)
if (IoCManager.Resolve<IEntityManager>().HasComponent<KnockedDownComponent>(Owner)
|| (_mobState?.IsIncapacitated() ?? false))
{
EntitySystem.Get<StandingStateSystem>().Down(Owner.Uid);
EntitySystem.Get<StandingStateSystem>().Down((EntityUid) Owner);
}
else
{
EntitySystem.Get<StandingStateSystem>().Stand(Owner.Uid);
EntitySystem.Get<StandingStateSystem>().Stand((EntityUid) Owner);
}
_mobState?.CurrentState?.EnterState(Owner.Uid, IoCManager.Resolve<IEntityManager>());
_mobState?.CurrentState?.EnterState(Owner, IoCManager.Resolve<IEntityManager>());
UpdateBuckleStatus();
@@ -395,7 +395,7 @@ namespace Content.Server.Buckle.Components
int? drawDepth = null;
if (BuckledTo != null &&
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(BuckledTo.Owner.Uid).LocalRotation.GetCardinalDir() == Direction.North &&
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(BuckledTo.Owner).LocalRotation.GetCardinalDir() == Direction.North &&
BuckledTo.SpriteComponent != null)
{
drawDepth = BuckledTo.SpriteComponent.DrawDepth - 1;

6
Content.Server/Buckle/Components/StrapComponent.cs
View File

@@ -149,7 +149,7 @@ namespace Content.Server.Buckle.Components
{
foreach (var entity in _buckledEntities.ToArray())
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<BuckleComponent?>(entity.Uid, out var buckle))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<BuckleComponent?>(entity, out var buckle))
{
buckle.TryUnbuckle(entity, true);
}
@@ -166,7 +166,7 @@ namespace Content.Server.Buckle.Components
bool IInteractHand.InteractHand(InteractHandEventArgs eventArgs)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<BuckleComponent?>(eventArgs.User.Uid, out var buckle))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<BuckleComponent?>(eventArgs.User, out var buckle))
{
return false;
}
@@ -176,7 +176,7 @@ namespace Content.Server.Buckle.Components
public override bool DragDropOn(DragDropEvent eventArgs)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Dragged.Uid, out BuckleComponent? buckleComponent)) return false;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Dragged, out BuckleComponent? buckleComponent)) return false;
return buckleComponent.TryBuckle(eventArgs.User, Owner);
}
}

6
Content.Server/Buckle/Systems/BuckleSystem.cs
View File

@@ -79,7 +79,7 @@ namespace Content.Server.Buckle.Systems
return;
}
var strapPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(strap.Owner.Uid).Coordinates.Offset(buckle.BuckleOffset);
var strapPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(strap.Owner).Coordinates.Offset(buckle.BuckleOffset);
if (ev.NewPosition.InRange(EntityManager, strapPosition, 0.2f))
{
@@ -95,7 +95,7 @@ namespace Content.Server.Buckle.Systems
// This fixes buckle offsets and draw depths.
foreach (var buckledEntity in strap.BuckledEntities)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(buckledEntity.Uid, out BuckleComponent? buckled))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(buckledEntity, out BuckleComponent? buckled))
{
continue;
}
@@ -112,7 +112,7 @@ namespace Content.Server.Buckle.Systems
{
foreach (var buckledEntity in strap.BuckledEntities)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(buckledEntity.Uid, out BuckleComponent? buckled))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(buckledEntity, out BuckleComponent? buckled))
{
continue;
}

12
Content.Server/Buckle/Systems/StrapSystem.cs
View File

@@ -39,7 +39,7 @@ namespace Content.Server.Buckle.Systems
// Add unstrap verbs for every strapped entity.
foreach (var entity in component.BuckledEntities)
{
var buckledComp = IoCManager.Resolve<IEntityManager>().GetComponent<BuckleComponent>(entity.Uid);
var buckledComp = IoCManager.Resolve<IEntityManager>().GetComponent<BuckleComponent>(entity);
if (!_interactionSystem.InRangeUnobstructed(args.User, args.Target, range: buckledComp.Range))
continue;
@@ -50,7 +50,7 @@ namespace Content.Server.Buckle.Systems
if (entity == args.User)
verb.Text = Loc.GetString("verb-self-target-pronoun");
else
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityName;
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityName;
// In the event that you have more than once entity with the same name strapped to the same object,
// these two verbs will be identical according to Verb.CompareTo, and only one with actually be added to
@@ -61,7 +61,7 @@ namespace Content.Server.Buckle.Systems
}
// Add a verb to buckle the user.
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<BuckleComponent?>(args.User.Uid, out var buckle) &&
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<BuckleComponent?>(args.User, out var buckle) &&
buckle.BuckledTo != component &&
args.User != component.Owner &&
component.HasSpace(buckle) &&
@@ -76,7 +76,7 @@ namespace Content.Server.Buckle.Systems
// If the user is currently holding/pulling an entity that can be buckled, add a verb for that.
if (args.Using != null &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<BuckleComponent?>(args.Using.Uid, out var usingBuckle) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent<BuckleComponent?>(args.Using, out var usingBuckle) &&
component.HasSpace(usingBuckle) &&
_interactionSystem.InRangeUnobstructed(args.Using, args.Target, range: usingBuckle.Range))
{
@@ -88,11 +88,11 @@ namespace Content.Server.Buckle.Systems
Verb verb = new();
verb.Act = () => usingBuckle.TryBuckle(args.User, args.Target);
verb.Category = VerbCategory.Buckle;
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(args.Using.Uid).EntityName;
verb.Text = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(args.Using).EntityName;
// If the used entity is a person being pulled, prioritize this verb. Conversely, if it is
// just a held object, the user is probably just trying to sit down.
verb.Priority = IoCManager.Resolve<IEntityManager>().HasComponent<ActorComponent>(args.Using.Uid) ? 1 : -1;
verb.Priority = IoCManager.Resolve<IEntityManager>().HasComponent<ActorComponent>(args.Using) ? 1 : -1;
args.Verbs.Add(verb);
}