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:
@@ -2,98 +2,85 @@ using Content.Shared.Roles;
|
||||
using Robust.Shared.Audio;
|
||||
using Robust.Shared.Prototypes;
|
||||
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
|
||||
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
|
||||
|
||||
namespace Content.Server.GameTicking.Rules.Components;
|
||||
|
||||
[RegisterComponent, Access(typeof(ZombieRuleSystem))]
|
||||
public sealed partial class ZombieRuleComponent : Component
|
||||
{
|
||||
[DataField("initialInfectedNames")]
|
||||
[DataField]
|
||||
public Dictionary<string, string> InitialInfectedNames = new();
|
||||
|
||||
[DataField("patientZeroPrototypeId", customTypeSerializer: typeof(PrototypeIdSerializer<AntagPrototype>))]
|
||||
public string PatientZeroPrototypeId = "InitialInfected";
|
||||
|
||||
/// <summary>
|
||||
/// Whether or not the initial infected have been chosen.
|
||||
/// </summary>
|
||||
[DataField("infectedChosen")]
|
||||
public bool InfectedChosen;
|
||||
[DataField]
|
||||
public ProtoId<AntagPrototype> PatientZeroPrototypeId = "InitialInfected";
|
||||
|
||||
/// <summary>
|
||||
/// When the round will next check for round end.
|
||||
/// </summary>
|
||||
[DataField("nextRoundEndCheck", customTypeSerializer: typeof(TimeOffsetSerializer))]
|
||||
public TimeSpan NextRoundEndCheck;
|
||||
[DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
|
||||
public TimeSpan? NextRoundEndCheck;
|
||||
|
||||
/// <summary>
|
||||
/// The amount of time between each check for the end of the round.
|
||||
/// </summary>
|
||||
[DataField("endCheckDelay")]
|
||||
[DataField]
|
||||
public TimeSpan EndCheckDelay = TimeSpan.FromSeconds(30);
|
||||
|
||||
/// <summary>
|
||||
/// The time at which the initial infected will be chosen.
|
||||
/// </summary>
|
||||
[DataField("startTime", customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
|
||||
[DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), ViewVariables(VVAccess.ReadWrite)]
|
||||
public TimeSpan? StartTime;
|
||||
|
||||
/// <summary>
|
||||
/// The minimum amount of time after the round starts that the initial infected will be chosen.
|
||||
/// </summary>
|
||||
[DataField("minStartDelay")]
|
||||
[DataField]
|
||||
public TimeSpan MinStartDelay = TimeSpan.FromMinutes(10);
|
||||
|
||||
/// <summary>
|
||||
/// The maximum amount of time after the round starts that the initial infected will be chosen.
|
||||
/// </summary>
|
||||
[DataField("maxStartDelay")]
|
||||
[DataField]
|
||||
public TimeSpan MaxStartDelay = TimeSpan.FromMinutes(15);
|
||||
|
||||
/// <summary>
|
||||
/// The sound that plays when someone becomes an initial infected.
|
||||
/// todo: this should have a unique sound instead of reusing the zombie one.
|
||||
/// </summary>
|
||||
[DataField("initialInfectedSound")]
|
||||
[DataField]
|
||||
public SoundSpecifier InitialInfectedSound = new SoundPathSpecifier("/Audio/Ambience/Antag/zombie_start.ogg");
|
||||
|
||||
/// <summary>
|
||||
/// The minimum amount of time initial infected have before they start taking infection damage.
|
||||
/// </summary>
|
||||
[DataField("minInitialInfectedGrace")]
|
||||
[DataField]
|
||||
public TimeSpan MinInitialInfectedGrace = TimeSpan.FromMinutes(12.5f);
|
||||
|
||||
/// <summary>
|
||||
/// The maximum amount of time initial infected have before they start taking damage.
|
||||
/// </summary>
|
||||
[DataField("maxInitialInfectedGrace")]
|
||||
[DataField]
|
||||
public TimeSpan MaxInitialInfectedGrace = TimeSpan.FromMinutes(15f);
|
||||
|
||||
/// <summary>
|
||||
/// How many players for each initial infected.
|
||||
/// </summary>
|
||||
[DataField("playersPerInfected")]
|
||||
[DataField]
|
||||
public int PlayersPerInfected = 10;
|
||||
|
||||
/// <summary>
|
||||
/// The maximum number of initial infected.
|
||||
/// </summary>
|
||||
[DataField("maxInitialInfected")]
|
||||
[DataField]
|
||||
public int MaxInitialInfected = 6;
|
||||
|
||||
/// <summary>
|
||||
/// After this amount of the crew become zombies, the shuttle will be automatically called.
|
||||
/// </summary>
|
||||
[DataField("zombieShuttleCallPercentage")]
|
||||
[DataField]
|
||||
public float ZombieShuttleCallPercentage = 0.7f;
|
||||
|
||||
/// <summary>
|
||||
/// Have we called the evac shuttle yet?
|
||||
/// </summary>
|
||||
[DataField("shuttleCalled")]
|
||||
public bool ShuttleCalled;
|
||||
|
||||
[ValidatePrototypeId<EntityPrototype>]
|
||||
public const string ZombifySelfActionPrototype = "ActionTurnUndead";
|
||||
[DataField]
|
||||
public EntProtoId ZombifySelfActionPrototype = "ActionTurnUndead";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user