juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve buckling's interactions with standing state (#29741)

Browse Source
This commit is contained in:
Tayrtahn
2024-07-07 02:20:53 -04:00
committed by GitHub
parent d9be666e8a
commit 23887d5bd9
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs
View File

@@ -196,7 +196,6 @@ public abstract partial class SharedBuckleSystem
buckle.Comp.BuckleTime = _gameTiming.CurTime;
ActionBlocker.UpdateCanMove(buckle);
Appearance.SetData(buckle, StrapVisuals.State, buckle.Comp.Buckled);
Appearance.SetData(buckle, RotationVisuals.RotationState, RotationState.Horizontal);
Dirty(buckle);
}
@@ -350,7 +349,6 @@ public abstract partial class SharedBuckleSystem
SetBuckledTo(buckle, strap!);
Appearance.SetData(strap, StrapVisuals.State, true);
Appearance.SetData(buckle, BuckleVisuals.Buckled, true);
Appearance.SetData(buckle, RotationVisuals.RotationState, RotationState.Horizontal);
_rotationVisuals.SetHorizontalAngle(buckle.Owner, strap.Comp.Rotation);
@@ -363,10 +361,10 @@ public abstract partial class SharedBuckleSystem
switch (strap.Comp.Position)
{
case StrapPosition.Stand:
_standing.Stand(buckle);
_standing.Stand(buckle, force: true);
break;
case StrapPosition.Down:
_standing.Down(buckle, false, false);
_standing.Down(buckle, false, false, force: true);
break;
}
@@ -458,10 +456,9 @@ public abstract partial class SharedBuckleSystem
_rotationVisuals.ResetHorizontalAngle(buckle.Owner);
Appearance.SetData(strap, StrapVisuals.State, strap.Comp.BuckledEntities.Count != 0);
Appearance.SetData(buckle, BuckleVisuals.Buckled, false);
Appearance.SetData(buckle, RotationVisuals.RotationState, RotationState.Vertical);
if (HasComp<KnockedDownComponent>(buckle) || _mobState.IsIncapacitated(buckle))
_standing.Down(buckle);
_standing.Down(buckle, playSound: false);
else
_standing.Stand(buckle);

16
Content.Shared/Standing/StandingStateSystem.cs
View File

@@ -25,7 +25,10 @@ namespace Content.Shared.Standing
return !standingState.Standing;
}
public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true,
public bool Down(EntityUid uid,
bool playSound = true,
bool dropHeldItems = true,
bool force = false,
StandingStateComponent? standingState = null,
AppearanceComponent? appearance = null,
HandsComponent? hands = null)
@@ -49,11 +52,14 @@ namespace Content.Shared.Standing
RaiseLocalEvent(uid, new DropHandItemsEvent(), false);
}
var msg = new DownAttemptEvent();
RaiseLocalEvent(uid, msg, false);
if (!force)
{
var msg = new DownAttemptEvent();
RaiseLocalEvent(uid, msg, false);
if (msg.Cancelled)
return false;
if (msg.Cancelled)
return false;
}
standingState.Standing = false;
Dirty(uid, standingState);