mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-25 01:27:06 +03:00
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog 🆑 - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com> Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com> Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Jezithyr <jezithyr@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Ciac32 <aknoxlor@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: nao fujiwara <awkwarddryad@gmail.com> Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com> Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com> Co-authored-by: exincore <me@exin.xyz> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com> Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com> Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com> Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com> Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml # Content.Client/Lobby/UI/LobbyGui.xaml # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/Input/ContentKeyFunctions.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs # Resources/ConfigPresets/EinsteinEngines/default.toml # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/keybinds.yml
348 lines
13 KiB
C#
348 lines
13 KiB
C#
using System.Linq;
|
|
using Content.Client.UserInterface.Systems.Chat;
|
|
using Content.Shared._White;
|
|
using Content.Shared.Chat;
|
|
using Content.Shared.Examine;
|
|
using Content.Shared.GameTicking;
|
|
using Content.Shared.Popups;
|
|
using Robust.Client.Graphics;
|
|
using Robust.Client.Input;
|
|
using Robust.Client.Player;
|
|
using Robust.Client.UserInterface;
|
|
using Robust.Shared.Configuration;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Player;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Replays;
|
|
using Robust.Shared.Timing;
|
|
using Robust.Shared.Utility;
|
|
|
|
namespace Content.Client.Popups
|
|
{
|
|
public sealed class PopupSystem : SharedPopupSystem
|
|
{
|
|
[Dependency] private readonly IConfigurationManager _configManager = default!;
|
|
[Dependency] private readonly IInputManager _inputManager = default!;
|
|
[Dependency] private readonly IOverlayManager _overlay = default!;
|
|
[Dependency] private readonly IPlayerManager _playerManager = default!;
|
|
[Dependency] private readonly IPrototypeManager _prototype = default!;
|
|
[Dependency] private readonly IGameTiming _timing = default!;
|
|
[Dependency] private readonly IUserInterfaceManager _uiManager = default!;
|
|
[Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
|
|
[Dependency] private readonly ExamineSystemShared _examine = default!;
|
|
[Dependency] private readonly SharedTransformSystem _transform = default!;
|
|
|
|
public IReadOnlyList<WorldPopupLabel> WorldLabels => _aliveWorldLabels;
|
|
public IReadOnlyList<CursorPopupLabel> CursorLabels => _aliveCursorLabels;
|
|
|
|
private readonly List<WorldPopupLabel> _aliveWorldLabels = new();
|
|
private readonly List<CursorPopupLabel> _aliveCursorLabels = new();
|
|
|
|
public const float MinimumPopupLifetime = 0.7f;
|
|
public const float MaximumPopupLifetime = 5f;
|
|
public const float PopupLifetimePerCharacter = 0.04f;
|
|
|
|
// WD EDIT START
|
|
private static readonly Dictionary<PopupType, string> FontSizeDict = new()
|
|
{
|
|
{ PopupType.Medium, "12" },
|
|
{ PopupType.MediumCaution, "12" },
|
|
{ PopupType.Large, "15" },
|
|
{ PopupType.LargeCaution, "15" }
|
|
};
|
|
|
|
private bool _shouldLogInChat;
|
|
// WD EDIT END
|
|
|
|
public override void Initialize()
|
|
{
|
|
SubscribeNetworkEvent<PopupCursorEvent>(OnPopupCursorEvent);
|
|
SubscribeNetworkEvent<PopupCoordinatesEvent>(OnPopupCoordinatesEvent);
|
|
SubscribeNetworkEvent<PopupEntityEvent>(OnPopupEntityEvent);
|
|
SubscribeNetworkEvent<RoundRestartCleanupEvent>(OnRoundRestart);
|
|
_overlay
|
|
.AddOverlay(new PopupOverlay(
|
|
_configManager,
|
|
EntityManager,
|
|
_playerManager,
|
|
_prototype,
|
|
_uiManager,
|
|
_uiManager.GetUIController<PopupUIController>(),
|
|
_examine,
|
|
_transform,
|
|
this));
|
|
|
|
// WD EDIT START
|
|
_shouldLogInChat = _configManager.GetCVar(WhiteCVars.LogInChat);
|
|
_configManager.OnValueChanged(WhiteCVars.LogInChat, log => { _shouldLogInChat = log; });
|
|
// WD EDIT END
|
|
}
|
|
|
|
public override void Shutdown()
|
|
{
|
|
base.Shutdown();
|
|
_overlay
|
|
.RemoveOverlay<PopupOverlay>();
|
|
}
|
|
|
|
private void PopupMessage(string? message, PopupType type, EntityCoordinates coordinates, EntityUid? entity, bool recordReplay)
|
|
{
|
|
if (message == null)
|
|
return;
|
|
|
|
if (recordReplay && _replayRecording.IsRecording)
|
|
{
|
|
if (entity != null)
|
|
_replayRecording.RecordClientMessage(new PopupEntityEvent(message, type, GetNetEntity(entity.Value)));
|
|
else
|
|
_replayRecording.RecordClientMessage(new PopupCoordinatesEvent(message, type, GetNetCoordinates(coordinates)));
|
|
}
|
|
|
|
var label = new WorldPopupLabel(coordinates)
|
|
{
|
|
Text = message,
|
|
Type = type,
|
|
};
|
|
|
|
_aliveWorldLabels.Add(label);
|
|
|
|
// WD EDIT START
|
|
if (!_shouldLogInChat)
|
|
return;
|
|
|
|
if (_playerManager.LocalEntity == null)
|
|
return;
|
|
|
|
if (!_examine.InRangeUnOccluded(_playerManager.LocalEntity.Value, coordinates, 10))
|
|
return;
|
|
|
|
var fontsize = FontSizeDict.GetValueOrDefault(type, "10");
|
|
var fontcolor = type is PopupType.LargeCaution or PopupType.MediumCaution or PopupType.SmallCaution
|
|
? "#C62828"
|
|
: "#AEABC4";
|
|
|
|
var wrappedMessage = $"[font size={fontsize}][color={fontcolor}]{message}[/color][/font]";
|
|
var chatMsg = new ChatMessage(ChatChannel.Emotes, message, wrappedMessage, GetNetEntity(EntityUid.Invalid), null);
|
|
_uiManager.GetUIController<ChatUIController>().ProcessChatMessage(chatMsg);
|
|
// WD EDIT END
|
|
}
|
|
|
|
#region Abstract Method Implementations
|
|
public override void PopupCoordinates(string? message, EntityCoordinates coordinates, PopupType type = PopupType.Small)
|
|
{
|
|
PopupMessage(message, type, coordinates, null, true);
|
|
}
|
|
|
|
public override void PopupCoordinates(string? message, EntityCoordinates coordinates, ICommonSession recipient, PopupType type = PopupType.Small)
|
|
{
|
|
if (_playerManager.LocalSession == recipient)
|
|
PopupMessage(message, type, coordinates, null, true);
|
|
}
|
|
|
|
public override void PopupCoordinates(string? message, EntityCoordinates coordinates, EntityUid recipient, PopupType type = PopupType.Small)
|
|
{
|
|
if (_playerManager.LocalEntity == recipient)
|
|
PopupMessage(message, type, coordinates, null, true);
|
|
}
|
|
|
|
private void PopupCursorInternal(string? message, PopupType type, bool recordReplay)
|
|
{
|
|
if (message == null)
|
|
return;
|
|
|
|
if (recordReplay && _replayRecording.IsRecording)
|
|
_replayRecording.RecordClientMessage(new PopupCursorEvent(message, type));
|
|
|
|
var label = new CursorPopupLabel(_inputManager.MouseScreenPosition)
|
|
{
|
|
Text = message,
|
|
Type = type,
|
|
};
|
|
|
|
_aliveCursorLabels.Add(label);
|
|
}
|
|
|
|
public override void PopupCursor(string? message, PopupType type = PopupType.Small)
|
|
=> PopupCursorInternal(message, type, true);
|
|
|
|
public override void PopupCursor(string? message, ICommonSession recipient, PopupType type = PopupType.Small)
|
|
{
|
|
if (_playerManager.LocalSession == recipient)
|
|
PopupCursor(message, type);
|
|
}
|
|
|
|
public override void PopupCursor(string? message, EntityUid recipient, PopupType type = PopupType.Small)
|
|
{
|
|
if (_playerManager.LocalEntity == recipient)
|
|
PopupCursor(message, type);
|
|
}
|
|
|
|
public override void PopupCoordinates(string? message, EntityCoordinates coordinates, Filter filter, bool replayRecord, PopupType type = PopupType.Small)
|
|
{
|
|
PopupCoordinates(message, coordinates, type);
|
|
}
|
|
|
|
public override void PopupEntity(string? message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small)
|
|
{
|
|
if (_playerManager.LocalEntity == recipient)
|
|
PopupEntity(message, uid, type);
|
|
}
|
|
|
|
public override void PopupEntity(string? message, EntityUid uid, ICommonSession recipient, PopupType type = PopupType.Small)
|
|
{
|
|
if (_playerManager.LocalSession == recipient)
|
|
PopupEntity(message, uid, type);
|
|
}
|
|
|
|
public override void PopupEntity(string? message, EntityUid uid, Filter filter, bool recordReplay, PopupType type = PopupType.Small)
|
|
{
|
|
if (!filter.Recipients.Contains(_playerManager.LocalSession))
|
|
return;
|
|
|
|
PopupEntity(message, uid, type);
|
|
}
|
|
|
|
public override void PopupClient(string? message, EntityUid? recipient, PopupType type = PopupType.Small)
|
|
{
|
|
if (recipient == null)
|
|
return;
|
|
|
|
if (_timing.IsFirstTimePredicted)
|
|
PopupCursor(message, recipient.Value, type);
|
|
}
|
|
|
|
public override void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
|
|
{
|
|
if (recipient == null)
|
|
return;
|
|
|
|
if (_timing.IsFirstTimePredicted)
|
|
PopupEntity(message, uid, recipient.Value, type);
|
|
}
|
|
|
|
public override void PopupClient(string? message, EntityCoordinates coordinates, EntityUid? recipient, PopupType type = PopupType.Small)
|
|
{
|
|
if (recipient == null)
|
|
return;
|
|
|
|
if (_timing.IsFirstTimePredicted)
|
|
PopupCoordinates(message, coordinates, recipient.Value, type);
|
|
}
|
|
|
|
public override void PopupEntity(string? message, EntityUid uid, PopupType type = PopupType.Small)
|
|
{
|
|
if (TryComp(uid, out TransformComponent? transform))
|
|
PopupMessage(message, type, transform.Coordinates, uid, true);
|
|
}
|
|
|
|
public override void PopupPredicted(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
|
|
{
|
|
if (recipient != null && _timing.IsFirstTimePredicted)
|
|
PopupEntity(message, uid, recipient.Value, type);
|
|
}
|
|
|
|
public override void PopupPredicted(string? recipientMessage, string? othersMessage, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small)
|
|
{
|
|
if (recipient != null && _timing.IsFirstTimePredicted)
|
|
PopupEntity(recipientMessage, uid, recipient.Value, type);
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region Network Event Handlers
|
|
|
|
private void OnPopupCursorEvent(PopupCursorEvent ev)
|
|
{
|
|
PopupCursorInternal(ev.Message, ev.Type, false);
|
|
}
|
|
|
|
private void OnPopupCoordinatesEvent(PopupCoordinatesEvent ev)
|
|
{
|
|
PopupMessage(ev.Message, ev.Type, GetCoordinates(ev.Coordinates), null, false);
|
|
}
|
|
|
|
private void OnPopupEntityEvent(PopupEntityEvent ev)
|
|
{
|
|
var entity = GetEntity(ev.Uid);
|
|
|
|
if (TryComp(entity, out TransformComponent? transform))
|
|
PopupMessage(ev.Message, ev.Type, transform.Coordinates, entity, false);
|
|
}
|
|
|
|
private void OnRoundRestart(RoundRestartCleanupEvent ev)
|
|
{
|
|
_aliveCursorLabels.Clear();
|
|
_aliveWorldLabels.Clear();
|
|
}
|
|
|
|
#endregion
|
|
|
|
public static float GetPopupLifetime(PopupLabel label)
|
|
{
|
|
return Math.Clamp(PopupLifetimePerCharacter * label.Text.Length,
|
|
MinimumPopupLifetime,
|
|
MaximumPopupLifetime);
|
|
}
|
|
|
|
public override void FrameUpdate(float frameTime)
|
|
{
|
|
if (_aliveWorldLabels.Count == 0 && _aliveCursorLabels.Count == 0)
|
|
return;
|
|
|
|
for (var i = 0; i < _aliveWorldLabels.Count; i++)
|
|
{
|
|
var label = _aliveWorldLabels[i];
|
|
label.TotalTime += frameTime;
|
|
|
|
if (label.TotalTime > GetPopupLifetime(label) || Deleted(label.InitialPos.EntityId))
|
|
{
|
|
_aliveWorldLabels.RemoveSwap(i);
|
|
i--;
|
|
}
|
|
}
|
|
|
|
for (var i = 0; i < _aliveCursorLabels.Count; i++)
|
|
{
|
|
var label = _aliveCursorLabels[i];
|
|
label.TotalTime += frameTime;
|
|
|
|
if (label.TotalTime > GetPopupLifetime(label))
|
|
{
|
|
_aliveCursorLabels.RemoveSwap(i);
|
|
i--;
|
|
}
|
|
}
|
|
}
|
|
|
|
public abstract class PopupLabel
|
|
{
|
|
public PopupType Type = PopupType.Small;
|
|
public string Text { get; set; } = string.Empty;
|
|
public float TotalTime { get; set; }
|
|
}
|
|
|
|
public sealed class CursorPopupLabel : PopupLabel
|
|
{
|
|
public ScreenCoordinates InitialPos;
|
|
|
|
public CursorPopupLabel(ScreenCoordinates screenCoords)
|
|
{
|
|
InitialPos = screenCoords;
|
|
}
|
|
}
|
|
|
|
public sealed class WorldPopupLabel : PopupLabel
|
|
{
|
|
/// <summary>
|
|
/// The original EntityCoordinates of the label.
|
|
/// </summary>
|
|
public EntityCoordinates InitialPos;
|
|
|
|
public WorldPopupLabel(EntityCoordinates coordinates)
|
|
{
|
|
InitialPos = coordinates;
|
|
}
|
|
}
|
|
}
|
|
}
|