Skip to content

Commit

Permalink
Merge pull request #449 from AirFryerBuyOneGetOneFree/GhostBar
Browse files Browse the repository at this point in the history
GHOST BAR
  • Loading branch information
formlessnameless authored Oct 11, 2024
2 parents aee3afe + 6fbb68a commit cf8093b
Show file tree
Hide file tree
Showing 13 changed files with 15,070 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Content.Client/Ghost/GhostSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,12 @@ public void OpenGhostRoles()
_console.RemoteExecuteCommand(null, "ghostroles");
}

public void ToggleGhostVisibility(bool? visibility = null)
public void GhostBarSpawn() // Goobstation - Ghost Bar
{
RaiseNetworkEvent(new GhostBarSpawnEvent());
}

public void ToggleGhostVisibility(bool? visibility = null)
{
GhostVisibility = visibility ?? !GhostVisibility;
}
Expand Down
14 changes: 14 additions & 0 deletions Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ public void LoadGui()
Gui.RequestWarpsPressed += RequestWarps;
Gui.ReturnToBodyPressed += ReturnToBody;
Gui.GhostRolesPressed += GhostRolesPressed;
Gui.GhostBarPressed += GhostBarPressed; // Goobstation - Ghost Bar
Gui.GhostBarWindow.SpawnButtonPressed += GhostBarSpawnPressed; // Goobstation - Ghost Bar
Gui.TargetWindow.WarpClicked += OnWarpClicked;
Gui.TargetWindow.OnGhostnadoClicked += OnGhostnadoClicked;

Expand All @@ -139,6 +141,8 @@ public void UnloadGui()
Gui.RequestWarpsPressed -= RequestWarps;
Gui.ReturnToBodyPressed -= ReturnToBody;
Gui.GhostRolesPressed -= GhostRolesPressed;
Gui.GhostBarPressed -= GhostBarPressed; // Goobstation - Ghost Bar
Gui.GhostBarWindow.SpawnButtonPressed -= GhostBarSpawnPressed; // Goobstation - Ghost Bar
Gui.TargetWindow.WarpClicked -= OnWarpClicked;

Gui.Hide();
Expand All @@ -160,4 +164,14 @@ private void GhostRolesPressed()
{
_system?.OpenGhostRoles();
}

private void GhostBarPressed() // Goobstation - Ghost Bar
{
Gui?.GhostBarWindow.OpenCentered();
}

private void GhostBarSpawnPressed() // Goobstation - Ghost Bar
{
_system?.GhostBarSpawn();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
<Button Name="ReturnToBodyButton" Text="{Loc ghost-gui-return-to-body-button}" />
<Button Name="GhostWarpButton" Text="{Loc ghost-gui-ghost-warp-button}" />
<Button Name="GhostRolesButton" />
<Button Name="GhostBarButton" Text="{Loc 'ghost-target-window-ghostbar'}" /> <!-- Goobstation - Ghost Bar -->
</BoxContainer>
</widgets:GhostGui>
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,41 @@
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Content.Client._Goobstation.UserInterface.Systems.Ghost.Controls;

namespace Content.Client.UserInterface.Systems.Ghost.Widgets;

[GenerateTypedNameReferences]
public sealed partial class GhostGui : UIWidget
{
public GhostTargetWindow TargetWindow { get; }
public GhostBarRulesWindow GhostBarWindow { get; }

public event Action? RequestWarpsPressed;
public event Action? ReturnToBodyPressed;
public event Action? GhostRolesPressed;
public event Action? GhostBarPressed; // Goobstation - Ghost Bar

public GhostGui()
{
RobustXamlLoader.Load(this);

TargetWindow = new GhostTargetWindow();

GhostBarWindow = new GhostBarRulesWindow();

MouseFilter = MouseFilterMode.Ignore;

GhostWarpButton.OnPressed += _ => RequestWarpsPressed?.Invoke();
ReturnToBodyButton.OnPressed += _ => ReturnToBodyPressed?.Invoke();
GhostRolesButton.OnPressed += _ => GhostRolesPressed?.Invoke();
GhostBarButton.OnPressed += _ => GhostBarPressed?.Invoke(); // Goobstation - Ghost Bar
}

public void Hide()
{
TargetWindow.Close();
GhostBarWindow.Close(); // Goobstation - Ghost Bar
Visible = false;
}

Expand Down Expand Up @@ -61,6 +68,7 @@ protected override void Dispose(bool disposing)
if (disposing)
{
TargetWindow.Dispose();
GhostBarWindow.Dispose(); // Goobstation - Ghost Bar
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<DefaultWindow xmlns="https://spacestation14.io"
Title="{Loc 'ghost-target-window-ghostbar'}"
MinSize="500 300"
SetSize="500 300">
<BoxContainer Orientation="Vertical"
HorizontalExpand="True">
<RichTextLabel Name="TopBanner" VerticalExpand="True"/>
<Button Name="SpawnButton"
Text="{Loc 'ghost-window-spawn-ghostbar-button'}"
Disabled="True"
TextAlign="Center"
HorizontalAlignment="Center"
VerticalAlignment="Center" />
</BoxContainer>
</DefaultWindow>
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
using Content.Shared.CCVar;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Configuration;
using Robust.Shared.Timing;
using Robust.Shared.Utility;

namespace Content.Client._Goobstation.UserInterface.Systems.Ghost.Controls
{
[GenerateTypedNameReferences]
public sealed partial class GhostBarRulesWindow : DefaultWindow
{
[Dependency] private readonly IConfigurationManager _cfg = IoCManager.Resolve<IConfigurationManager>();
private float _timer;

public event Action? SpawnButtonPressed;
public GhostBarRulesWindow()
{
RobustXamlLoader.Load(this);
var ghostBarTime = _cfg.GetCVar(CCVars.GhostRoleTime);
_timer = ghostBarTime;

if (ghostBarTime > 0f)
{
SpawnButton.Text = Loc.GetString("ghost-window-spawn-ghostbar-button-timer", ("time", $"{_timer:0.0}"));
TopBanner.SetMessage(FormattedMessage.FromMarkupPermissive(Loc.GetString("ghost-bar-rules") + "\n" + Loc.GetString("ghost-roles-window-rules-footer", ("time", ghostBarTime))));
SpawnButton.Disabled = true;
}

SpawnButton.OnPressed += _ => SpawnButtonPressed?.Invoke();
}


protected override void FrameUpdate(FrameEventArgs args)
{
base.FrameUpdate(args);
if (!SpawnButton.Disabled) return;
if (_timer > 0.0)
{
_timer -= args.DeltaSeconds;
SpawnButton.Text = Loc.GetString("ghost-window-spawn-ghostbar-button-timer", ("time", $"{_timer:0.0}"));
}
else
{
SpawnButton.Disabled = false;
SpawnButton.Text = Loc.GetString("ghost-window-spawn-ghostbar-button");
}
}
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace Content.Server._Goobstation.Ghostbar.Components;

/// <summary>
/// Tracker for ghostbar players
/// </summary>
[RegisterComponent]
public sealed partial class GhostBarPlayerComponent : Component
{

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
namespace Content.Server._Goobstation.Ghostbar.Components;

/// <summary>
/// Target for ghosts to spawn at
/// </summary>
[RegisterComponent]
public sealed partial class GhostBarSpawnComponent : Component
{

}
105 changes: 105 additions & 0 deletions Content.Server/_Goobstation/Ghostbar/GhostBarSystem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
using Robust.Server.GameObjects;
using Content.Server.GameTicking;
using Content.Server.GameTicking.Events;
using Content.Server.Station.Components;
using Content.Server.Station.Events;
using Content.Server.Station.Systems;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using Robust.Server.Maps;
using Robust.Shared.Random;
using Content.Shared.Ghost;
using Content.Server._Goobstation.Ghostbar.Components;
using Content.Server.Mind;
using Content.Shared.Mind;
using Content.Shared.Mind.Components;
using Content.Shared.Roles.Jobs;
using Content.Shared.Roles;
using Content.Shared.Inventory;
using Content.Server.Antag.Components;
using Content.Shared.Mindshield.Components;

namespace Content.Server._Goobstation.Ghostbar;

public sealed class GhostBarSystem : EntitySystem
{
[Dependency] private readonly SharedMapSystem _mapSystem = default!;
[Dependency] private readonly MapLoaderSystem _mapLoader = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly GameTicker _ticker = default!;
[Dependency] private readonly StationSpawningSystem _spawningSystem = default!;
[Dependency] private readonly MindSystem _mindSystem = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;

private static readonly List<JobComponent> _jobComponents = new()
{
new JobComponent { Prototype = "Passenger" },
new JobComponent { Prototype = "Bartender" },
new JobComponent { Prototype = "Botanist" },
new JobComponent { Prototype = "Chef" },
new JobComponent { Prototype = "Janitor" }
};

public override void Initialize()
{
SubscribeLocalEvent<RoundStartingEvent>(OnRoundStart);
SubscribeNetworkEvent<GhostBarSpawnEvent>(SpawnPlayer);
SubscribeLocalEvent<GhostBarPlayerComponent, MindRemovedMessage>(OnPlayerGhosted);
}

const string MapPath = "Maps/_Goobstation/Nonstations/ghostbar.yml";
private void OnRoundStart(RoundStartingEvent ev)
{
_mapSystem.CreateMap(out var mapId);
var options = new MapLoadOptions { LoadMap = true };

if (_mapLoader.TryLoad(mapId, MapPath, out _, options))
_mapSystem.SetPaused(mapId, false);
}

public void SpawnPlayer(GhostBarSpawnEvent msg, EntitySessionEventArgs args)
{
if (!_entityManager.HasComponent<GhostComponent>(args.SenderSession.AttachedEntity))
{
Log.Warning($"User {args.SenderSession.Name} tried to spawn at ghost bar without being a ghost.");
return;
}

var spawnPoints = new List<EntityCoordinates>();
var query = EntityQueryEnumerator<GhostBarSpawnComponent>();
while (query.MoveNext(out var ent, out _))
{
spawnPoints.Add(_entityManager.GetComponent<TransformComponent>(ent).Coordinates);
}

if (spawnPoints.Count == 0)
{
Log.Warning("No spawn points found for ghost bar.");
return;
}


var randomSpawnPoint = _random.Pick(spawnPoints);
var randomJob = _random.Pick(_jobComponents);
var profile = _ticker.GetPlayerProfile(args.SenderSession);
var mobUid = _spawningSystem.SpawnPlayerMob(randomSpawnPoint, randomJob, profile, null);

_entityManager.EnsureComponent<GhostBarPlayerComponent>(mobUid);
_entityManager.EnsureComponent<MindShieldComponent>(mobUid);
_entityManager.EnsureComponent<AntagImmuneComponent>(mobUid);

var targetMind = _mindSystem.GetMind(args.SenderSession.UserId);


if (targetMind != null)
{
_mindSystem.TransferTo(targetMind.Value, mobUid, true);
}
}

private void OnPlayerGhosted(EntityUid uid, GhostBarPlayerComponent component, MindRemovedMessage args)
{
_entityManager.DeleteEntity(uid);
}
}

8 changes: 8 additions & 0 deletions Content.Shared/Ghost/SharedGhostSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ public void SetCanReturnToBody(GhostComponent component, bool value)
[Serializable, NetSerializable]
public sealed class GhostWarpsRequestEvent : EntityEventArgs
{
}

/// <summary>
/// Goobstation - A server to client request for them to spawn at the ghost bar
/// </summary>
[Serializable, NetSerializable]
public sealed class GhostBarSpawnEvent : EntityEventArgs
{
}

/// <summary>
Expand Down
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/_Goobstation/guidebook/ghost-gui.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ghost-target-window-ghostbar = Ghost Bar
ghost-window-spawn-ghostbar-button = Spawn at Ghost Bar
ghost-window-spawn-ghostbar-button-timer = Spawn at Ghost Bar ({$time}s)
ghost-bar-rules = Treat this role, and station, as you would just being a regular Ghost. You may talk about all current round events without the need for LOOC, and you remember everything from your previous life. DO NOT attack others, start fights, or attempt to break the station. If you see anyone doing this, please Ahelp and they will be promptly thrown into space. Also, if you decide to leave the bar, you DO NOT remember anything from being here, or your life before it.
Loading

0 comments on commit cf8093b

Please sign in to comment.