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

Admin ghosts can now interact with stuff (#4178)

Browse Source 
* Ghosts now have a bool for interacting with stuff

* Wrong ghost

* Simping for Swept

* Merge cleanup

* IT'S ODNE

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Swept
2021-08-22 20:14:52 -07:00
committed by GitHub
parent 007cd32667
commit 49b81b2587
9 changed files with 80 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Content.Shared/Body/Components/SharedBodyComponent.cs
View File

@@ -94,8 +94,6 @@ namespace Content.Shared.Body.Components
SlotIds[slotId].SetConnectionsInternal(connections);
}
}
CalculateSpeed();
}
protected override void OnRemove()
@@ -474,51 +472,8 @@ namespace Content.Shared.Body.Components
}
}
private void CalculateSpeed()
{
if (!Owner.TryGetComponent(out MovementSpeedModifierComponent? playerMover))
{
return;
}
var legs = GetPartsWithProperty<LegComponent>().ToArray();
float speedSum = 0;
foreach (var leg in legs)
{
var footDistance = DistanceToNearestFoot(leg.part);
if (Math.Abs(footDistance - float.MinValue) <= 0.001f)
{
continue;
}
speedSum += leg.property.Speed * (1 + (float) Math.Log(footDistance, 1024.0));
}
if (speedSum <= 0.001f)
{
playerMover.BaseWalkSpeed = 0.8f;
playerMover.BaseSprintSpeed = 2.0f;
}
else
{
// Extra legs stack diminishingly.
playerMover.BaseWalkSpeed =
speedSum / (legs.Length - (float) Math.Log(legs.Length, 4.0));
playerMover.BaseSprintSpeed = playerMover.BaseWalkSpeed * 1.75f;
}
}
private void OnBodyChanged()
{
// Calculate move speed based on this body.
if (Owner.HasComponent<MovementSpeedModifierComponent>())
{
CalculateSpeed();
}
Dirty();
}

52
Content.Shared/Ghost/SharedGhostComponent.cs
View File

@@ -15,17 +15,43 @@ namespace Content.Shared.Ghost
{
public override string Name => "Ghost";
[ViewVariables(VVAccess.ReadWrite)]
public bool CanGhostInteract
{
get => _canGhostInteract;
set
{
if (_canGhostInteract == value) return;
_canGhostInteract = value;
Dirty();
}
}
[DataField("canInteract")]
private bool _canGhostInteract;
/// <summary>
/// Changed by <see cref="SharedGhostSystem.SetCanReturnToBody"/>
/// </summary>
// TODO MIRROR change this to use friend classes when thats merged
[DataField("canReturnToBody")]
[ViewVariables(VVAccess.ReadWrite)]
public bool CanReturnToBody { get; set; }
public bool CanReturnToBody
{
get => _canReturnToBody;
set
{
if (_canReturnToBody == value) return;
_canReturnToBody = value;
Dirty();
}
}
[DataField("canReturnToBody")]
private bool _canReturnToBody;
public override ComponentState GetComponentState(ICommonSession player)
{
return new GhostComponentState(CanReturnToBody);
return new GhostComponentState(CanReturnToBody, CanGhostInteract);
}
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
@@ -38,13 +64,14 @@ namespace Content.Shared.Ghost
}
CanReturnToBody = state.CanReturnToBody;
CanGhostInteract = state.CanGhostInteract;
}
public bool CanInteract() => false;
public bool CanUse() => false;
public bool CanInteract() => CanGhostInteract;
public bool CanUse() => CanGhostInteract;
public bool CanThrow() => false;
public bool CanDrop() => false;
public bool CanPickup() => false;
public bool CanDrop() => CanGhostInteract;
public bool CanPickup() => CanGhostInteract;
public bool CanEmote() => false;
public bool CanAttack() => false;
}
@@ -53,19 +80,14 @@ namespace Content.Shared.Ghost
public class GhostComponentState : ComponentState
{
public bool CanReturnToBody { get; }
public HashSet<string>? LocationWarps { get; }
public Dictionary<EntityUid, string>? PlayerWarps { get; }
public bool CanGhostInteract { get; }
public GhostComponentState(
bool canReturnToBody,
HashSet<string>? locationWarps = null,
Dictionary<EntityUid, string>? playerWarps = null)
bool canGhostInteract)
{
CanReturnToBody = canReturnToBody;
LocationWarps = locationWarps;
PlayerWarps = playerWarps;
CanGhostInteract = canGhostInteract;
}
}
}