Refactor antag rule code (#23445)
* Initial Pass, Rev, Thief * Zombie initial pass * Rebase, Traitor * Nukeops, More overloads * Revert RevolutionaryRuleComponent * Use TryRoundStartAttempt, Rewrite nukie spawning * Comments, Add task scheduler to GameRuleSystem * Zombie initial testing done * Sort methods, rework GameRuleTask * Add CCVar, Initial testing continues * Might as well get rid of the obsolete logging * Oops, i dont know how to log apparently * Suggested formatting fixes * Suggested changes * Fix merge issues * Minor optimisation * Allowed thief to choose other antags * Review changes * Spawn items on floor first, then inserting * minor tweaks * Shift as much as possible to ProtoId<> * Remove unneeded * Add exclusive antag attribute * Fix merge issues * Minor formatting fix * Convert to struct * Cleanup * Review cleanup (need to test a lot) * Some fixes, (mostly) tested * oop * Pass tests (for real) --------- Co-authored-by: Rainfall <rainfey0+git@gmail.com> Co-authored-by: AJCM <AJCM@tutanota.com>
This commit is contained in:
@@ -1,11 +1,15 @@
|
||||
using Robust.Shared.Audio;
|
||||
using Content.Server.GameTicking.Rules;
|
||||
using Content.Shared.NukeOps;
|
||||
using Robust.Shared.Audio;
|
||||
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
|
||||
|
||||
namespace Content.Server.NukeOps;
|
||||
|
||||
/// <summary>
|
||||
/// Used with NukeOps game rule to send war declaration announcement
|
||||
/// </summary>
|
||||
[RegisterComponent]
|
||||
[RegisterComponent, AutoGenerateComponentPause]
|
||||
[Access(typeof(WarDeclaratorSystem), typeof(NukeopsRuleSystem))]
|
||||
public sealed partial class WarDeclaratorComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
@@ -23,22 +27,43 @@ public sealed partial class WarDeclaratorComponent : Component
|
||||
public bool AllowEditingMessage = true;
|
||||
|
||||
/// <summary>
|
||||
/// War declarement text color
|
||||
/// War declaration text color
|
||||
/// </summary>
|
||||
[ViewVariables(VVAccess.ReadWrite)]
|
||||
[DataField]
|
||||
public Color Color = Color.Red;
|
||||
|
||||
/// <summary>
|
||||
/// War declarement sound file path
|
||||
/// War declaration sound file path
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Announcements/war.ogg");
|
||||
|
||||
/// <summary>
|
||||
/// Fluent ID for the declarement title
|
||||
/// Fluent ID for the declaration sender title
|
||||
/// </summary>
|
||||
[ViewVariables(VVAccess.ReadWrite)]
|
||||
[DataField]
|
||||
public LocId Title = "comms-console-announcement-title-nukie";
|
||||
public LocId SenderTitle = "comms-console-announcement-title-nukie";
|
||||
|
||||
/// <summary>
|
||||
/// Time allowed for declaration of war
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public float WarDeclarationDelay = 6.0f;
|
||||
|
||||
[DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
|
||||
public TimeSpan DisableAt;
|
||||
|
||||
/// <summary>
|
||||
/// How long the shuttle will be disabled for
|
||||
/// </summary>
|
||||
[DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
|
||||
public TimeSpan ShuttleDisabledTime;
|
||||
|
||||
[DataField]
|
||||
public WarConditionStatus? CurrentStatus;
|
||||
}
|
||||
|
||||
[ByRefEvent]
|
||||
public record struct WarDeclaredEvent(WarConditionStatus? Status, Entity<WarDeclaratorComponent> DeclaratorEntity);
|
||||
|
||||
Reference in New Issue
Block a user