Cherrypicks 4 (#393)
* Immovable Rod changes (#26757) * Adds non randomized rod velocity (#27123) * adds non randomized rod velocity * Adds despawn suffix to despawn rod * make fire spreading scale with mass (#27202) * make fire spreading scale with mass * realer --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * lower max firestacks to 10, refactor flammable (#27159) * lower max firestacks to 10, refactor flammable * fix * uncap fire stack damage, lower fire stack damage * fix fire spread round removal (#27986) * fix a resolve debug assert * rewrite fire spread --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * fire troll fix (#28034) Co-authored-by: deltanedas <@deltanedas:kde.org> * Hide doafters if you're in a container (#29487) * Hide doafters if you're in a container * Out of the loop --------- Co-authored-by: plykiya <plykiya@protonmail.com> * Add ghost role raffles (#26629) * Add ghost role raffles * GRR: Fix dialogue sizing, fix merge * GRR: Add raffle deciders (winner picker) * GRR: Make settings prototype based with option to override * GRR: Use Raffles folder and namespace * GRR: DataFieldify and TimeSpanify * GRR: Don't actually DataFieldify HashSet<ICommonSession>s * GRR: add GetGhostRoleCount() + docs * update engine on branch * Ghost role raffles: docs, fix window size, cleanup, etc * GRR: Admin UI * GRR: Admin UI: Display initial/max/ext of selected raffle settings proto * GRR: Make a ton of roles raffled * Make ERT use short raffle timer (#27830) Co-authored-by: plykiya <plykiya@protonmail.com> * gives loneops a proper ghost role raffle (#27841) * shorten short raffle (#28685) * - fix: Conflicts. * - fix. --------- Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: plykiya <plykiya@protonmail.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: HS <81934438+HolySSSS@users.noreply.github.com>
This commit is contained in:
@@ -12,6 +12,21 @@ namespace Content.Shared.Ghost.Roles
|
||||
public string Description { get; set; }
|
||||
public string Rules { get; set; }
|
||||
public HashSet<JobRequirement>? Requirements { get; set; }
|
||||
|
||||
/// <inheritdoc cref="GhostRoleKind"/>
|
||||
public GhostRoleKind Kind { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// if <see cref="Kind"/> is <see cref="GhostRoleKind.RaffleInProgress"/>, specifies how many players are currently
|
||||
/// in the raffle for this role.
|
||||
/// </summary>
|
||||
public uint RafflePlayerCount { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// if <see cref="Kind"/> is <see cref="GhostRoleKind.RaffleInProgress"/>, specifies when raffle finishes.
|
||||
/// </summary>
|
||||
public TimeSpan RaffleEndTime { get; set; }
|
||||
|
||||
}
|
||||
|
||||
[NetSerializable, Serializable]
|
||||
@@ -26,24 +41,62 @@ namespace Content.Shared.Ghost.Roles
|
||||
}
|
||||
|
||||
[NetSerializable, Serializable]
|
||||
public sealed class GhostRoleTakeoverRequestMessage : EuiMessageBase
|
||||
public sealed class RequestGhostRoleMessage : EuiMessageBase
|
||||
{
|
||||
public uint Identifier { get; }
|
||||
|
||||
public GhostRoleTakeoverRequestMessage(uint identifier)
|
||||
public RequestGhostRoleMessage(uint identifier)
|
||||
{
|
||||
Identifier = identifier;
|
||||
}
|
||||
}
|
||||
|
||||
[NetSerializable, Serializable]
|
||||
public sealed class GhostRoleFollowRequestMessage : EuiMessageBase
|
||||
public sealed class FollowGhostRoleMessage : EuiMessageBase
|
||||
{
|
||||
public uint Identifier { get; }
|
||||
|
||||
public GhostRoleFollowRequestMessage(uint identifier)
|
||||
public FollowGhostRoleMessage(uint identifier)
|
||||
{
|
||||
Identifier = identifier;
|
||||
}
|
||||
}
|
||||
|
||||
[NetSerializable, Serializable]
|
||||
public sealed class LeaveGhostRoleRaffleMessage : EuiMessageBase
|
||||
{
|
||||
public uint Identifier { get; }
|
||||
|
||||
public LeaveGhostRoleRaffleMessage(uint identifier)
|
||||
{
|
||||
Identifier = identifier;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Determines whether a ghost role is a raffle role, and if it is, whether it's running.
|
||||
/// </summary>
|
||||
[NetSerializable, Serializable]
|
||||
public enum GhostRoleKind
|
||||
{
|
||||
/// <summary>
|
||||
/// Role is not a raffle role and can be taken immediately.
|
||||
/// </summary>
|
||||
FirstComeFirstServe,
|
||||
|
||||
/// <summary>
|
||||
/// Role is a raffle role, but raffle hasn't started yet.
|
||||
/// </summary>
|
||||
RaffleReady,
|
||||
|
||||
/// <summary>
|
||||
/// Role is raffle role and currently being raffled, but player hasn't joined raffle.
|
||||
/// </summary>
|
||||
RaffleInProgress,
|
||||
|
||||
/// <summary>
|
||||
/// Role is raffle role and currently being raffled, and player joined raffle.
|
||||
/// </summary>
|
||||
RaffleJoined
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user