mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 05:27:38 +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
202 lines
9.8 KiB
C#
202 lines
9.8 KiB
C#
using Robust.Shared.Map;
|
|
using Robust.Shared.Player;
|
|
using Robust.Shared.Serialization;
|
|
|
|
namespace Content.Shared.Popups
|
|
{
|
|
/// <summary>
|
|
/// System for displaying small text popups on users' screens.
|
|
/// </summary>
|
|
public abstract class SharedPopupSystem : EntitySystem
|
|
{
|
|
/// <summary>
|
|
/// Shows a popup at the local users' cursor. Does nothing on the server.
|
|
/// </summary>
|
|
/// <param name="message">The message to display.</param>
|
|
/// <param name="type">Used to customize how this popup should appear visually.</param>
|
|
public abstract void PopupCursor(string? message, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Shows a popup at a users' cursor.
|
|
/// </summary>
|
|
/// <param name="message">The message to display.</param>
|
|
/// <param name="recipient">Client that will see this popup.</param>
|
|
/// <param name="type">Used to customize how this popup should appear visually.</param>
|
|
public abstract void PopupCursor(string? message, ICommonSession recipient, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Shows a popup at a users' cursor.
|
|
/// </summary>
|
|
/// <param name="message">The message to display.</param>
|
|
/// <param name="recipient">Client that will see this popup.</param>
|
|
/// <param name="type">Used to customize how this popup should appear visually.</param>
|
|
public abstract void PopupCursor(string? message, EntityUid recipient, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Shows a popup at a world location to every entity in PVS range.
|
|
/// </summary>
|
|
/// <param name="message">The message to display.</param>
|
|
/// <param name="coordinates">The coordinates where to display the message.</param>
|
|
/// <param name="type">Used to customize how this popup should appear visually.</param>
|
|
public abstract void PopupCoordinates(string? message, EntityCoordinates coordinates, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Filtered variant of <see cref="PopupCoordinates(string, EntityCoordinates, PopupType)"/>, which should only be used
|
|
/// if the filtering has to be more specific than simply PVS range based.
|
|
/// </summary>
|
|
/// <param name="filter">Filter for the players that will see the popup.</param>
|
|
/// <param name="recordReplay">If true, this pop-up will be considered as a globally visible pop-up that gets shown during replays.</param>
|
|
public abstract void PopupCoordinates(string? message, EntityCoordinates coordinates, Filter filter, bool recordReplay, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Variant of <see cref="PopupCoordinates(string, EntityCoordinates, PopupType)"/> that sends a pop-up to the player attached to some entity.
|
|
/// </summary>
|
|
public abstract void PopupCoordinates(string? message, EntityCoordinates coordinates, EntityUid recipient, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Variant of <see cref="PopupCoordinates(string, EntityCoordinates, PopupType)"/> that sends a pop-up to a specific player.
|
|
/// </summary>
|
|
public abstract void PopupCoordinates(string? message, EntityCoordinates coordinates, ICommonSession recipient, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Shows a popup above an entity for every player in pvs range.
|
|
/// </summary>
|
|
/// <param name="message">The message to display.</param>
|
|
/// <param name="uid">The UID of the entity.</param>
|
|
/// <param name="type">Used to customize how this popup should appear visually.</param>
|
|
public abstract void PopupEntity(string? message, EntityUid uid, PopupType type=PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Variant of <see cref="PopupEntity(string, EntityUid, PopupType)"/> that shows the popup only to some specific client.
|
|
/// </summary>
|
|
public abstract void PopupEntity(string? message, EntityUid uid, EntityUid recipient, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Variant of <see cref="PopupEntity(string, EntityUid, PopupType)"/> that shows the popup only to some specific client.
|
|
/// </summary>
|
|
public abstract void PopupEntity(string? message, EntityUid uid, ICommonSession recipient, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Filtered variant of <see cref="PopupEntity(string, EntityUid, PopupType)"/>, which should only be used
|
|
/// if the filtering has to be more specific than simply PVS range based.
|
|
/// </summary>
|
|
public abstract void PopupEntity(string? message, EntityUid uid, Filter filter, bool recordReplay, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Variant of <see cref="PopupCursor(string, EntityUid, PopupType)"/> that only runs on the client, outside of prediction.
|
|
/// Useful for shared code that is always ran by both sides to avoid duplicate popups.
|
|
/// </summary>
|
|
public abstract void PopupClient(string? message, EntityUid? recipient, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> that only runs on the client, outside of prediction.
|
|
/// Useful for shared code that is always ran by both sides to avoid duplicate popups.
|
|
/// </summary>
|
|
public abstract void PopupClient(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Variant of <see cref="PopupCoordinates(string, EntityCoordinates, PopupType)"/> that only runs on the client, outside of prediction.
|
|
/// Useful for shared code that is always ran by both sides to avoid duplicate popups.
|
|
/// </summary>
|
|
public abstract void PopupClient(string? message, EntityCoordinates coordinates, EntityUid? recipient, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Variant of <see cref="PopupEntity(string, EntityUid, EntityUid, PopupType)"/> for use with prediction. The local client will show
|
|
/// the popup to the recipient, and the server will show it to every other player in PVS range. If recipient is null, the local client
|
|
/// will do nothing and the server will show the message to every player in PVS range.
|
|
/// </summary>
|
|
public abstract void PopupPredicted(string? message, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small);
|
|
|
|
/// <summary>
|
|
/// Variant of <see cref="PopupPredicted(string?, EntityUid, EntityUid?, PopupType)"/> that displays <paramref name="recipientMessage"/>
|
|
/// to the recipient and <paramref name="othersMessage"/> to everyone else in PVS range.
|
|
/// </summary>
|
|
public abstract void PopupPredicted(string? recipientMessage, string? othersMessage, EntityUid uid, EntityUid? recipient, PopupType type = PopupType.Small);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Common base for all popup network events.
|
|
/// </summary>
|
|
[Serializable, NetSerializable]
|
|
public abstract class PopupEvent : EntityEventArgs
|
|
{
|
|
public string Message { get; }
|
|
|
|
public PopupType Type { get; }
|
|
|
|
protected PopupEvent(string message, PopupType type)
|
|
{
|
|
Message = message;
|
|
Type = type;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Network event for displaying a popup on the user's cursor.
|
|
/// </summary>
|
|
[Serializable, NetSerializable]
|
|
public sealed class PopupCursorEvent : PopupEvent
|
|
{
|
|
public PopupCursorEvent(string message, PopupType type) : base(message, type)
|
|
{
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Network event for displaying a popup at a world location.
|
|
/// </summary>
|
|
[Serializable, NetSerializable]
|
|
public sealed class PopupCoordinatesEvent : PopupEvent
|
|
{
|
|
public NetCoordinates Coordinates { get; }
|
|
|
|
public PopupCoordinatesEvent(string message, PopupType type, NetCoordinates coordinates) : base(message, type)
|
|
{
|
|
Coordinates = coordinates;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Network event for displaying a popup above an entity.
|
|
/// </summary>
|
|
[Serializable, NetSerializable]
|
|
public sealed class PopupEntityEvent : PopupEvent
|
|
{
|
|
public NetEntity Uid { get; }
|
|
|
|
public PopupEntityEvent(string message, PopupType type, NetEntity uid) : base(message, type)
|
|
{
|
|
Uid = uid;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Used to determine how a popup should appear visually to the client. Caution variants simply have a red color.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// Actions which can fail or succeed should use a smaller popup for failure and a larger popup for success.
|
|
/// Actions which have different popups for the user vs. others should use a larger popup for the user and a smaller popup for others.
|
|
/// Actions which result in harm or are otherwise dangerous should always show as the caution variant.
|
|
/// </remarks>
|
|
[Serializable, NetSerializable]
|
|
public enum PopupType : byte
|
|
{
|
|
/// <summary>
|
|
/// Small popups are the default, and denote actions that may be spammable or are otherwise unimportant.
|
|
/// </summary>
|
|
Small,
|
|
SmallCaution,
|
|
/// <summary>
|
|
/// Medium popups should be used for actions which are not spammable but may not be particularly important.
|
|
/// </summary>
|
|
Medium,
|
|
MediumCaution,
|
|
/// <summary>
|
|
/// Large popups should be used for actions which may be important or very important to one or more users,
|
|
/// but is not life-threatening.
|
|
/// </summary>
|
|
Large,
|
|
LargeCaution
|
|
}
|
|
}
|