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

Use new ComponentPauseGenerator (#25183)

Browse Source 
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
This commit is contained in:
Pieter-Jan Briers
2024-02-26 04:36:19 +01:00
committed by GitHub
parent 2a2324ecaf
commit e00f74505c
130 changed files with 150 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
View File

@@ -42,7 +42,7 @@ public sealed class ClaimSalvageMessage : BoundUserInterfaceMessage
/// <summary>
/// Added per station to store data on their available salvage missions.
/// </summary>
[RegisterComponent]
[RegisterComponent, AutoGenerateComponentPause]
public sealed partial class SalvageExpeditionDataComponent : Component
{
/// <summary>
@@ -61,6 +61,7 @@ public sealed partial class SalvageExpeditionDataComponent : Component
/// Nexy time salvage missions are offered.
/// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("nextOffer", customTypeSerializer:typeof(TimeOffsetSerializer))]
[AutoPausedField]
public TimeSpan NextOffer;
[ViewVariables]

3
Content.Shared/Salvage/Fulton/FultonedComponent.cs
View File

@@ -7,7 +7,7 @@ namespace Content.Shared.Salvage.Fulton;
/// <summary>
/// Marks an entity as pending being fultoned.
/// </summary>
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), AutoGenerateComponentPause]
public sealed partial class FultonedComponent : Component
{
/// <summary>
@@ -26,6 +26,7 @@ public sealed partial class FultonedComponent : Component
/// When the fulton is travelling to the beacon.
/// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("nextFulton", customTypeSerializer:typeof(TimeOffsetSerializer)), AutoNetworkedField]
[AutoPausedField]
public TimeSpan NextFulton;
[ViewVariables(VVAccess.ReadWrite), DataField("sound"), AutoNetworkedField]

6
Content.Shared/Salvage/Fulton/SharedFultonSystem.cs
View File

@@ -40,7 +40,6 @@ public abstract partial class SharedFultonSystem : EntitySystem
SubscribeLocalEvent<FultonedDoAfterEvent>(OnFultonDoAfter);
SubscribeLocalEvent<FultonedComponent, EntityUnpausedEvent>(OnFultonUnpaused);
SubscribeLocalEvent<FultonedComponent, GetVerbsEvent<InteractionVerb>>(OnFultonedGetVerbs);
SubscribeLocalEvent<FultonedComponent, ExaminedEvent>(OnFultonedExamine);
SubscribeLocalEvent<FultonedComponent, EntGotInsertedIntoContainerMessage>(OnFultonContainerInserted);
@@ -106,11 +105,6 @@ public abstract partial class SharedFultonSystem : EntitySystem
Audio.PlayPredicted(fulton.FultonSound, args.Target.Value, args.User);
}
private void OnFultonUnpaused(EntityUid uid, FultonedComponent component, ref EntityUnpausedEvent args)
{
component.NextFulton += args.PausedTime;
}
private void OnFultonInteract(EntityUid uid, FultonComponent component, AfterInteractEvent args)
{
if (args.Target == null || args.Handled || !args.CanReach)