mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-21 15:38:52 +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
227 lines
7.5 KiB
C#
227 lines
7.5 KiB
C#
using Content.Shared.Chemistry.EntitySystems;
|
|
using Content.Shared.Examine;
|
|
using Content.Shared.Interaction;
|
|
using Content.Shared.Interaction.Events;
|
|
using Content.Shared.Nutrition.Components;
|
|
using Content.Shared.Popups;
|
|
using Content.Shared.Verbs;
|
|
using Content.Shared.Weapons.Melee.Events;
|
|
using Robust.Shared.Audio.Systems;
|
|
using Robust.Shared.Utility;
|
|
|
|
namespace Content.Shared.Nutrition.EntitySystems;
|
|
|
|
/// <summary>
|
|
/// Provides API for openable food and drinks, handles opening on use and preventing transfer when closed.
|
|
/// </summary>
|
|
public sealed partial class OpenableSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
|
|
[Dependency] private readonly SharedAudioSystem _audio = default!;
|
|
[Dependency] private readonly SharedPopupSystem _popup = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<OpenableComponent, ComponentInit>(OnInit);
|
|
SubscribeLocalEvent<OpenableComponent, UseInHandEvent>(OnUse);
|
|
SubscribeLocalEvent<OpenableComponent, ExaminedEvent>(OnExamined);
|
|
SubscribeLocalEvent<OpenableComponent, MeleeHitEvent>(HandleIfClosed);
|
|
SubscribeLocalEvent<OpenableComponent, AfterInteractEvent>(HandleIfClosed);
|
|
SubscribeLocalEvent<OpenableComponent, GetVerbsEvent<Verb>>(AddOpenCloseVerbs);
|
|
SubscribeLocalEvent<OpenableComponent, SolutionTransferAttemptEvent>(OnTransferAttempt);
|
|
SubscribeLocalEvent<OpenableComponent, AttemptShakeEvent>(OnAttemptShake);
|
|
SubscribeLocalEvent<OpenableComponent, AttemptAddFizzinessEvent>(OnAttemptAddFizziness);
|
|
}
|
|
|
|
private void OnInit(EntityUid uid, OpenableComponent comp, ComponentInit args)
|
|
{
|
|
UpdateAppearance(uid, comp);
|
|
}
|
|
|
|
private void OnUse(EntityUid uid, OpenableComponent comp, UseInHandEvent args)
|
|
{
|
|
if (args.Handled || !comp.OpenableByHand)
|
|
return;
|
|
|
|
args.Handled = TryOpen(uid, comp, args.User);
|
|
}
|
|
|
|
private void OnExamined(EntityUid uid, OpenableComponent comp, ExaminedEvent args)
|
|
{
|
|
if (!comp.Opened || !args.IsInDetailsRange)
|
|
return;
|
|
|
|
var text = Loc.GetString(comp.ExamineText);
|
|
args.PushMarkup(text);
|
|
}
|
|
|
|
private void HandleIfClosed(EntityUid uid, OpenableComponent comp, HandledEntityEventArgs args)
|
|
{
|
|
// prevent spilling/pouring/whatever drinks when closed
|
|
args.Handled = !comp.Opened;
|
|
}
|
|
|
|
private void AddOpenCloseVerbs(EntityUid uid, OpenableComponent comp, GetVerbsEvent<Verb> args)
|
|
{
|
|
if (args.Hands == null || !args.CanAccess || !args.CanInteract)
|
|
return;
|
|
|
|
Verb verb;
|
|
if (comp.Opened)
|
|
{
|
|
if (!comp.Closeable)
|
|
return;
|
|
|
|
verb = new()
|
|
{
|
|
Text = Loc.GetString(comp.CloseVerbText),
|
|
Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/close.svg.192dpi.png")),
|
|
Act = () => TryClose(args.Target, comp, args.User)
|
|
};
|
|
}
|
|
else
|
|
{
|
|
verb = new()
|
|
{
|
|
Text = Loc.GetString(comp.OpenVerbText),
|
|
Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/open.svg.192dpi.png")),
|
|
Act = () => TryOpen(args.Target, comp, args.User)
|
|
};
|
|
}
|
|
args.Verbs.Add(verb);
|
|
}
|
|
|
|
private void OnTransferAttempt(Entity<OpenableComponent> ent, ref SolutionTransferAttemptEvent args)
|
|
{
|
|
if (!ent.Comp.Opened)
|
|
{
|
|
// message says its just for drinks, shouldn't matter since you typically dont have a food that is openable and can be poured out
|
|
args.Cancel(Loc.GetString("drink-component-try-use-drink-not-open", ("owner", ent.Owner)));
|
|
}
|
|
}
|
|
|
|
private void OnAttemptShake(Entity<OpenableComponent> entity, ref AttemptShakeEvent args)
|
|
{
|
|
// Prevent shaking open containers
|
|
if (entity.Comp.Opened)
|
|
args.Cancelled = true;
|
|
}
|
|
|
|
private void OnAttemptAddFizziness(Entity<OpenableComponent> entity, ref AttemptAddFizzinessEvent args)
|
|
{
|
|
// Can't add fizziness to an open container
|
|
if (entity.Comp.Opened)
|
|
args.Cancelled = true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns true if the entity either does not have OpenableComponent or it is opened.
|
|
/// Drinks that don't have OpenableComponent are automatically open, so it returns true.
|
|
/// </summary>
|
|
public bool IsOpen(EntityUid uid, OpenableComponent? comp = null)
|
|
{
|
|
if (!Resolve(uid, ref comp, false))
|
|
return true;
|
|
|
|
return comp.Opened;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns true if the entity both has OpenableComponent and is not opened.
|
|
/// Drinks that don't have OpenableComponent are automatically open, so it returns false.
|
|
/// If user is not null a popup will be shown to them.
|
|
/// </summary>
|
|
public bool IsClosed(EntityUid uid, EntityUid? user = null, OpenableComponent? comp = null)
|
|
{
|
|
if (!Resolve(uid, ref comp, false))
|
|
return false;
|
|
|
|
if (comp.Opened)
|
|
return false;
|
|
|
|
if (user != null)
|
|
_popup.PopupEntity(Loc.GetString(comp.ClosedPopup, ("owner", uid)), user.Value, user.Value);
|
|
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Update open visuals to the current value.
|
|
/// </summary>
|
|
public void UpdateAppearance(EntityUid uid, OpenableComponent? comp = null, AppearanceComponent? appearance = null)
|
|
{
|
|
if (!Resolve(uid, ref comp))
|
|
return;
|
|
|
|
_appearance.SetData(uid, OpenableVisuals.Opened, comp.Opened, appearance);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Sets the opened field and updates open visuals.
|
|
/// </summary>
|
|
public void SetOpen(EntityUid uid, bool opened = true, OpenableComponent? comp = null, EntityUid? user = null)
|
|
{
|
|
if (!Resolve(uid, ref comp, false) || opened == comp.Opened)
|
|
return;
|
|
|
|
comp.Opened = opened;
|
|
Dirty(uid, comp);
|
|
|
|
if (opened)
|
|
{
|
|
var ev = new OpenableOpenedEvent(user);
|
|
RaiseLocalEvent(uid, ref ev);
|
|
}
|
|
else
|
|
{
|
|
var ev = new OpenableClosedEvent(user);
|
|
RaiseLocalEvent(uid, ref ev);
|
|
}
|
|
|
|
UpdateAppearance(uid, comp);
|
|
}
|
|
|
|
/// <summary>
|
|
/// If closed, opens it and plays the sound.
|
|
/// </summary>
|
|
/// <returns>Whether it got opened</returns>
|
|
public bool TryOpen(EntityUid uid, OpenableComponent? comp = null, EntityUid? user = null)
|
|
{
|
|
if (!Resolve(uid, ref comp, false) || comp.Opened)
|
|
return false;
|
|
|
|
SetOpen(uid, true, comp, user);
|
|
_audio.PlayPredicted(comp.Sound, uid, user);
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// If opened, closes it and plays the close sound, if one is defined.
|
|
/// </summary>
|
|
/// <returns>Whether it got closed</returns>
|
|
public bool TryClose(EntityUid uid, OpenableComponent? comp = null, EntityUid? user = null)
|
|
{
|
|
if (!Resolve(uid, ref comp, false) || !comp.Opened || !comp.Closeable)
|
|
return false;
|
|
|
|
SetOpen(uid, false, comp, user);
|
|
if (comp.CloseSound != null)
|
|
_audio.PlayPredicted(comp.CloseSound, uid, user);
|
|
return true;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Raised after an Openable is opened.
|
|
/// </summary>
|
|
[ByRefEvent]
|
|
public record struct OpenableOpenedEvent(EntityUid? User = null);
|
|
|
|
/// <summary>
|
|
/// Raised after an Openable is closed.
|
|
/// </summary>
|
|
[ByRefEvent]
|
|
public record struct OpenableClosedEvent(EntityUid? User = null);
|