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
286 lines
11 KiB
C#
286 lines
11 KiB
C#
using Content.Shared.Chemistry.Reagent;
|
|
using Content.Shared.Chemistry.EntitySystems;
|
|
using Content.Shared.Hands.EntitySystems;
|
|
using Content.Shared.Nutrition.Components;
|
|
using Content.Shared.Throwing;
|
|
using Content.Shared.IdentityManagement;
|
|
using Robust.Shared.Audio.Systems;
|
|
using Robust.Shared.Random;
|
|
using Robust.Shared.Timing;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Network;
|
|
using Content.Shared.Fluids;
|
|
using Content.Shared.Popups;
|
|
|
|
namespace Content.Shared.Nutrition.EntitySystems;
|
|
|
|
public sealed partial class PressurizedSolutionSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
|
|
[Dependency] private readonly OpenableSystem _openable = default!;
|
|
[Dependency] private readonly SharedAudioSystem _audio = default!;
|
|
[Dependency] private readonly SharedHandsSystem _hands = default!;
|
|
[Dependency] private readonly SharedPopupSystem _popup = default!;
|
|
[Dependency] private readonly SharedPuddleSystem _puddle = default!;
|
|
[Dependency] private readonly INetManager _net = default!;
|
|
[Dependency] private readonly IGameTiming _timing = default!;
|
|
[Dependency] private readonly IRobustRandom _random = default!;
|
|
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<PressurizedSolutionComponent, MapInitEvent>(OnMapInit);
|
|
SubscribeLocalEvent<PressurizedSolutionComponent, ShakeEvent>(OnShake);
|
|
SubscribeLocalEvent<PressurizedSolutionComponent, OpenableOpenedEvent>(OnOpened);
|
|
SubscribeLocalEvent<PressurizedSolutionComponent, LandEvent>(OnLand);
|
|
SubscribeLocalEvent<PressurizedSolutionComponent, SolutionContainerChangedEvent>(OnSolutionUpdate);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Helper method for checking if the solution's fizziness is high enough to spray.
|
|
/// <paramref name="chanceMod"/> is added to the actual fizziness for the comparison.
|
|
/// </summary>
|
|
private bool SprayCheck(Entity<PressurizedSolutionComponent> entity, float chanceMod = 0)
|
|
{
|
|
return Fizziness((entity, entity.Comp)) + chanceMod > entity.Comp.SprayFizzinessThresholdRoll;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Calculates how readily the contained solution becomes fizzy.
|
|
/// </summary>
|
|
private float SolutionFizzability(Entity<PressurizedSolutionComponent> entity)
|
|
{
|
|
if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var _, out var solution))
|
|
return 0;
|
|
|
|
// An empty solution can't be fizzy
|
|
if (solution.Volume <= 0)
|
|
return 0;
|
|
|
|
var totalFizzability = 0f;
|
|
|
|
// Check each reagent in the solution
|
|
foreach (var reagent in solution.Contents)
|
|
{
|
|
if (_prototypeManager.TryIndex(reagent.Reagent.Prototype, out ReagentPrototype? reagentProto) && reagentProto != null)
|
|
{
|
|
// What portion of the solution is this reagent?
|
|
var proportion = (float) (reagent.Quantity / solution.Volume);
|
|
totalFizzability += reagentProto.Fizziness * proportion;
|
|
}
|
|
}
|
|
|
|
return totalFizzability;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Increases the fizziness level of the solution by the given amount,
|
|
/// scaled by the solution's fizzability.
|
|
/// 0 will result in no change, and 1 will maximize fizziness.
|
|
/// Also rerolls the spray threshold.
|
|
/// </summary>
|
|
private void AddFizziness(Entity<PressurizedSolutionComponent> entity, float amount)
|
|
{
|
|
var fizzability = SolutionFizzability(entity);
|
|
|
|
// Can't add fizziness if the solution isn't fizzy
|
|
if (fizzability <= 0)
|
|
return;
|
|
|
|
// Make sure nothing is preventing fizziness from being added
|
|
var attemptEv = new AttemptAddFizzinessEvent(entity, amount);
|
|
RaiseLocalEvent(entity, ref attemptEv);
|
|
if (attemptEv.Cancelled)
|
|
return;
|
|
|
|
// Scale added fizziness by the solution's fizzability
|
|
amount *= fizzability;
|
|
|
|
// Convert fizziness to time
|
|
var duration = amount * entity.Comp.FizzinessMaxDuration;
|
|
|
|
// Add to the existing settle time, if one exists. Otherwise, add to the current time
|
|
var start = entity.Comp.FizzySettleTime > _timing.CurTime ? entity.Comp.FizzySettleTime : _timing.CurTime;
|
|
var newTime = start + duration;
|
|
|
|
// Cap the maximum fizziness
|
|
var maxEnd = _timing.CurTime + entity.Comp.FizzinessMaxDuration;
|
|
if (newTime > maxEnd)
|
|
newTime = maxEnd;
|
|
|
|
entity.Comp.FizzySettleTime = newTime;
|
|
|
|
// Roll a new fizziness threshold
|
|
RollSprayThreshold(entity);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Helper method. Performs a <see cref="SprayCheck"/>. If it passes, calls <see cref="TrySpray"/>. If it fails, <see cref="AddFizziness"/>.
|
|
/// </summary>
|
|
private void SprayOrAddFizziness(Entity<PressurizedSolutionComponent> entity, float chanceMod = 0, float fizzinessToAdd = 0, EntityUid? user = null)
|
|
{
|
|
if (SprayCheck(entity, chanceMod))
|
|
TrySpray((entity, entity.Comp), user);
|
|
else
|
|
AddFizziness(entity, fizzinessToAdd);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Randomly generates a new spray threshold.
|
|
/// This is the value used to compare fizziness against when doing <see cref="SprayCheck"/>.
|
|
/// Since RNG will give different results between client and server, this is run on the server
|
|
/// and synced to the client by marking the component dirty.
|
|
/// We roll this in advance, rather than during <see cref="SprayCheck"/>, so that the value (hopefully)
|
|
/// has time to get synced to the client, so we can try be accurate with prediction.
|
|
/// </summary>
|
|
private void RollSprayThreshold(Entity<PressurizedSolutionComponent> entity)
|
|
{
|
|
// Can't predict random, so we wait for the server to tell us
|
|
if (!_net.IsServer)
|
|
return;
|
|
|
|
entity.Comp.SprayFizzinessThresholdRoll = _random.NextFloat();
|
|
Dirty(entity, entity.Comp);
|
|
}
|
|
|
|
#region Public API
|
|
|
|
/// <summary>
|
|
/// Does the entity contain a solution capable of being fizzy?
|
|
/// </summary>
|
|
public bool CanSpray(Entity<PressurizedSolutionComponent?> entity)
|
|
{
|
|
if (!Resolve(entity, ref entity.Comp, false))
|
|
return false;
|
|
|
|
return SolutionFizzability((entity, entity.Comp)) > 0;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Attempts to spray the solution onto the given entity, or the ground if none is given.
|
|
/// Fails if the solution isn't able to be sprayed.
|
|
/// </summary>
|
|
public bool TrySpray(Entity<PressurizedSolutionComponent?> entity, EntityUid? target = null)
|
|
{
|
|
if (!Resolve(entity, ref entity.Comp))
|
|
return false;
|
|
|
|
if (!CanSpray(entity))
|
|
return false;
|
|
|
|
if (!_solutionContainer.TryGetSolution(entity.Owner, entity.Comp.Solution, out var soln, out var interactions))
|
|
return false;
|
|
|
|
// If the container is openable, open it
|
|
_openable.SetOpen(entity, true);
|
|
|
|
// Get the spray solution from the container
|
|
var solution = _solutionContainer.SplitSolution(soln.Value, interactions.Volume);
|
|
|
|
// Spray the solution onto the ground and anyone nearby
|
|
if (TryComp<TransformComponent>(entity, out var transform))
|
|
_puddle.TrySplashSpillAt(entity, transform.Coordinates, solution, out _, sound: false);
|
|
|
|
var drinkName = Identity.Entity(entity, EntityManager);
|
|
|
|
if (target != null)
|
|
{
|
|
var victimName = Identity.Entity(target.Value, EntityManager);
|
|
|
|
var selfMessage = Loc.GetString(entity.Comp.SprayHolderMessageSelf, ("victim", victimName), ("drink", drinkName));
|
|
var othersMessage = Loc.GetString(entity.Comp.SprayHolderMessageOthers, ("victim", victimName), ("drink", drinkName));
|
|
_popup.PopupPredicted(selfMessage, othersMessage, target.Value, target.Value);
|
|
}
|
|
else
|
|
{
|
|
// Show a popup to everyone in PVS range
|
|
if (_timing.IsFirstTimePredicted)
|
|
_popup.PopupEntity(Loc.GetString(entity.Comp.SprayGroundMessage, ("drink", drinkName)), entity);
|
|
}
|
|
|
|
_audio.PlayPredicted(entity.Comp.SpraySound, entity, target);
|
|
|
|
// We just used all our fizziness, so clear it
|
|
TryClearFizziness(entity);
|
|
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// What is the current fizziness level of the solution, from 0 to 1?
|
|
/// </summary>
|
|
public double Fizziness(Entity<PressurizedSolutionComponent?> entity)
|
|
{
|
|
// No component means no fizz
|
|
if (!Resolve(entity, ref entity.Comp, false))
|
|
return 0;
|
|
|
|
// No negative fizziness
|
|
if (entity.Comp.FizzySettleTime <= _timing.CurTime)
|
|
return 0;
|
|
|
|
var currentDuration = entity.Comp.FizzySettleTime - _timing.CurTime;
|
|
return Easings.InOutCubic((float) Math.Min(currentDuration / entity.Comp.FizzinessMaxDuration, 1));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Attempts to clear any fizziness in the solution.
|
|
/// </summary>
|
|
/// <remarks>Rolls a new spray threshold.</remarks>
|
|
public void TryClearFizziness(Entity<PressurizedSolutionComponent?> entity)
|
|
{
|
|
if (!Resolve(entity, ref entity.Comp))
|
|
return;
|
|
|
|
entity.Comp.FizzySettleTime = TimeSpan.Zero;
|
|
|
|
// Roll a new fizziness threshold
|
|
RollSprayThreshold((entity, entity.Comp));
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region Event Handlers
|
|
private void OnMapInit(Entity<PressurizedSolutionComponent> entity, ref MapInitEvent args)
|
|
{
|
|
RollSprayThreshold(entity);
|
|
}
|
|
|
|
private void OnOpened(Entity<PressurizedSolutionComponent> entity, ref OpenableOpenedEvent args)
|
|
{
|
|
// Make sure the opener is actually holding the drink
|
|
var held = args.User != null && _hands.IsHolding(args.User.Value, entity, out _);
|
|
|
|
SprayOrAddFizziness(entity, entity.Comp.SprayChanceModOnOpened, -1, held ? args.User : null);
|
|
}
|
|
|
|
private void OnShake(Entity<PressurizedSolutionComponent> entity, ref ShakeEvent args)
|
|
{
|
|
SprayOrAddFizziness(entity, entity.Comp.SprayChanceModOnShake, entity.Comp.FizzinessAddedOnShake, args.Shaker);
|
|
}
|
|
|
|
private void OnLand(Entity<PressurizedSolutionComponent> entity, ref LandEvent args)
|
|
{
|
|
SprayOrAddFizziness(entity, entity.Comp.SprayChanceModOnLand, entity.Comp.FizzinessAddedOnLand);
|
|
}
|
|
|
|
private void OnSolutionUpdate(Entity<PressurizedSolutionComponent> entity, ref SolutionContainerChangedEvent args)
|
|
{
|
|
if (args.SolutionId != entity.Comp.Solution)
|
|
return;
|
|
|
|
// If the solution is no longer capable of being fizzy, clear any built up fizziness
|
|
if (SolutionFizzability(entity) <= 0)
|
|
TryClearFizziness((entity, entity.Comp));
|
|
}
|
|
|
|
#endregion
|
|
}
|
|
|
|
[ByRefEvent]
|
|
public record struct AttemptAddFizzinessEvent(Entity<PressurizedSolutionComponent> Entity, float Amount)
|
|
{
|
|
public bool Cancelled;
|
|
}
|