mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-19 06:28:40 +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
280 lines
11 KiB
C#
280 lines
11 KiB
C#
using Content.Server.Chemistry.Containers.EntitySystems;
|
|
using Content.Server.DoAfter;
|
|
using Content.Server.Fluids.Components;
|
|
using Content.Server.Popups;
|
|
using Content.Shared.Audio;
|
|
using Content.Shared.Chemistry.Components.SolutionManager;
|
|
using Content.Shared.Database;
|
|
using Content.Shared.DoAfter;
|
|
using Content.Shared.Examine;
|
|
using Content.Shared.FixedPoint;
|
|
using Content.Shared.Fluids;
|
|
using Content.Shared.Fluids.Components;
|
|
using Content.Shared.Interaction;
|
|
using Content.Shared.Tag;
|
|
using Content.Shared.Verbs;
|
|
using Robust.Shared.Audio.Systems;
|
|
using Robust.Shared.Collections;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Random;
|
|
using Robust.Shared.Utility;
|
|
|
|
namespace Content.Server.Fluids.EntitySystems;
|
|
|
|
public sealed class DrainSystem : SharedDrainSystem
|
|
{
|
|
[Dependency] private readonly EntityLookupSystem _lookup = default!;
|
|
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
|
|
[Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!;
|
|
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
|
|
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
|
[Dependency] private readonly TagSystem _tagSystem = default!;
|
|
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
|
|
[Dependency] private readonly PuddleSystem _puddleSystem = default!;
|
|
[Dependency] private readonly IRobustRandom _random = default!;
|
|
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
SubscribeLocalEvent<DrainComponent, GetVerbsEvent<Verb>>(AddEmptyVerb);
|
|
SubscribeLocalEvent<DrainComponent, ExaminedEvent>(OnExamined);
|
|
SubscribeLocalEvent<DrainComponent, AfterInteractUsingEvent>(OnInteract);
|
|
SubscribeLocalEvent<DrainComponent, DrainDoAfterEvent>(OnDoAfter);
|
|
}
|
|
|
|
private void AddEmptyVerb(Entity<DrainComponent> entity, ref GetVerbsEvent<Verb> args)
|
|
{
|
|
if (!args.CanAccess || !args.CanInteract || args.Using == null)
|
|
return;
|
|
|
|
if (!TryComp(args.Using, out SpillableComponent? spillable) ||
|
|
!TryComp(args.Target, out DrainComponent? drain))
|
|
return;
|
|
|
|
var used = args.Using.Value;
|
|
var target = args.Target;
|
|
Verb verb = new()
|
|
{
|
|
Text = Loc.GetString("drain-component-empty-verb-inhand", ("object", Name(used))),
|
|
Act = () =>
|
|
{
|
|
Empty(used, spillable, target, drain);
|
|
},
|
|
Impact = LogImpact.Low,
|
|
Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/eject.svg.192dpi.png"))
|
|
|
|
};
|
|
args.Verbs.Add(verb);
|
|
}
|
|
|
|
private void Empty(EntityUid container, SpillableComponent spillable, EntityUid target, DrainComponent drain)
|
|
{
|
|
// Find the solution in the container that is emptied
|
|
if (!_solutionContainerSystem.TryGetDrainableSolution(container, out var containerSoln, out var containerSolution) || containerSolution.Volume == FixedPoint2.Zero)
|
|
{
|
|
_popupSystem.PopupEntity(
|
|
Loc.GetString("drain-component-empty-verb-using-is-empty-message", ("object", container)),
|
|
container);
|
|
return;
|
|
}
|
|
|
|
// try to find the drain's solution
|
|
if (!_solutionContainerSystem.ResolveSolution(target, DrainComponent.SolutionName, ref drain.Solution, out var drainSolution))
|
|
{
|
|
return;
|
|
}
|
|
|
|
// Try to transfer as much solution as possible to the drain
|
|
|
|
var amountToPutInDrain = drainSolution.AvailableVolume;
|
|
var amountToSpillOnGround = containerSolution.Volume - drainSolution.AvailableVolume;
|
|
|
|
if (amountToPutInDrain > 0)
|
|
{
|
|
var solutionToPutInDrain = _solutionContainerSystem.SplitSolution(containerSoln.Value, amountToPutInDrain);
|
|
_solutionContainerSystem.TryAddSolution(drain.Solution.Value, solutionToPutInDrain);
|
|
|
|
_audioSystem.PlayPvs(drain.ManualDrainSound, target);
|
|
_ambientSoundSystem.SetAmbience(target, true);
|
|
}
|
|
|
|
|
|
// Spill the remainder.
|
|
|
|
if (amountToSpillOnGround > 0)
|
|
{
|
|
var solutionToSpill = _solutionContainerSystem.SplitSolution(containerSoln.Value, amountToSpillOnGround);
|
|
_puddleSystem.TrySpillAt(Transform(target).Coordinates, solutionToSpill, out _);
|
|
_popupSystem.PopupEntity(
|
|
Loc.GetString("drain-component-empty-verb-target-is-full-message", ("object", target)),
|
|
container);
|
|
}
|
|
}
|
|
|
|
public override void Update(float frameTime)
|
|
{
|
|
base.Update(frameTime);
|
|
var managerQuery = GetEntityQuery<SolutionContainerManagerComponent>();
|
|
var xformQuery = GetEntityQuery<TransformComponent>();
|
|
var puddleQuery = GetEntityQuery<PuddleComponent>();
|
|
var puddles = new ValueList<(Entity<PuddleComponent> Entity, string Solution)>();
|
|
|
|
var query = EntityQueryEnumerator<DrainComponent>();
|
|
while (query.MoveNext(out var uid, out var drain))
|
|
{
|
|
drain.Accumulator += frameTime;
|
|
if (drain.Accumulator < drain.DrainFrequency)
|
|
{
|
|
continue;
|
|
}
|
|
drain.Accumulator -= drain.DrainFrequency;
|
|
|
|
// Disable ambient sound from emptying manually
|
|
if (!drain.AutoDrain)
|
|
{
|
|
_ambientSoundSystem.SetAmbience(uid, false);
|
|
continue;
|
|
}
|
|
|
|
if (!managerQuery.TryGetComponent(uid, out var manager))
|
|
continue;
|
|
|
|
// Best to do this one every second rather than once every tick...
|
|
if (!_solutionContainerSystem.ResolveSolution((uid, manager), DrainComponent.SolutionName, ref drain.Solution, out var drainSolution))
|
|
continue;
|
|
|
|
if (drainSolution.AvailableVolume <= 0)
|
|
{
|
|
_ambientSoundSystem.SetAmbience(uid, false);
|
|
continue;
|
|
}
|
|
|
|
// Remove a bit from the buffer
|
|
_solutionContainerSystem.SplitSolution(drain.Solution.Value, (drain.UnitsDestroyedPerSecond * drain.DrainFrequency));
|
|
|
|
// This will ensure that UnitsPerSecond is per second...
|
|
var amount = drain.UnitsPerSecond * drain.DrainFrequency;
|
|
|
|
if (!xformQuery.TryGetComponent(uid, out var xform))
|
|
continue;
|
|
|
|
puddles.Clear();
|
|
|
|
foreach (var entity in _lookup.GetEntitiesInRange(xform.MapPosition, drain.Range))
|
|
{
|
|
// No InRangeUnobstructed because there's no collision group that fits right now
|
|
// and these are placed by mappers and not buildable/movable so shouldnt really be a problem...
|
|
if (puddleQuery.TryGetComponent(entity, out var puddle))
|
|
{
|
|
puddles.Add(((entity, puddle), puddle.SolutionName));
|
|
}
|
|
}
|
|
|
|
if (puddles.Count == 0)
|
|
{
|
|
_ambientSoundSystem.SetAmbience(uid, false);
|
|
continue;
|
|
}
|
|
|
|
_ambientSoundSystem.SetAmbience(uid, true);
|
|
|
|
amount /= puddles.Count;
|
|
|
|
foreach (var (puddle, solution) in puddles)
|
|
{
|
|
// Queue the solution deletion if it's empty. EvaporationSystem might also do this
|
|
// but queuedelete should be pretty safe.
|
|
if (!_solutionContainerSystem.ResolveSolution(puddle.Owner, solution, ref puddle.Comp.Solution, out var puddleSolution))
|
|
{
|
|
EntityManager.QueueDeleteEntity(puddle);
|
|
continue;
|
|
}
|
|
|
|
// Removes the lowest of:
|
|
// the drain component's units per second adjusted for # of puddles
|
|
// the puddle's remaining volume (making it cleanly zero)
|
|
// the drain's remaining volume in its buffer.
|
|
var transferSolution = _solutionContainerSystem.SplitSolution(puddle.Comp.Solution.Value,
|
|
FixedPoint2.Min(FixedPoint2.New(amount), puddleSolution.Volume, drainSolution.AvailableVolume));
|
|
|
|
drainSolution.AddSolution(transferSolution, _prototypeManager);
|
|
|
|
if (puddleSolution.Volume <= 0)
|
|
{
|
|
QueueDel(puddle);
|
|
}
|
|
}
|
|
|
|
_solutionContainerSystem.UpdateChemicals(drain.Solution.Value);
|
|
}
|
|
}
|
|
|
|
private void OnExamined(Entity<DrainComponent> entity, ref ExaminedEvent args)
|
|
{
|
|
if (!args.IsInDetailsRange ||
|
|
!HasComp<SolutionContainerManagerComponent>(entity) ||
|
|
!_solutionContainerSystem.ResolveSolution(entity.Owner, DrainComponent.SolutionName, ref entity.Comp.Solution, out var drainSolution))
|
|
{
|
|
return;
|
|
}
|
|
|
|
var text = drainSolution.AvailableVolume != 0
|
|
? Loc.GetString("drain-component-examine-volume", ("volume", drainSolution.AvailableVolume))
|
|
: Loc.GetString("drain-component-examine-hint-full");
|
|
args.PushMarkup(text);
|
|
}
|
|
|
|
private void OnInteract(Entity<DrainComponent> entity, ref AfterInteractUsingEvent args)
|
|
{
|
|
if (!args.CanReach || args.Target == null ||
|
|
!_tagSystem.HasTag(args.Used, DrainComponent.PlungerTag) ||
|
|
!_solutionContainerSystem.ResolveSolution(args.Target.Value, DrainComponent.SolutionName, ref entity.Comp.Solution, out var drainSolution))
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (drainSolution.AvailableVolume > 0)
|
|
{
|
|
_popupSystem.PopupEntity(Loc.GetString("drain-component-unclog-notapplicable", ("object", args.Target.Value)), args.Target.Value);
|
|
return;
|
|
}
|
|
|
|
_audioSystem.PlayPvs(entity.Comp.PlungerSound, entity);
|
|
|
|
|
|
var doAfterArgs = new DoAfterArgs(EntityManager, args.User, entity.Comp.UnclogDuration, new DrainDoAfterEvent(), entity, args.Target, args.Used)
|
|
{
|
|
BreakOnTargetMove = true,
|
|
BreakOnUserMove = true,
|
|
BreakOnDamage = true,
|
|
BreakOnHandChange = true
|
|
};
|
|
|
|
_doAfterSystem.TryStartDoAfter(doAfterArgs);
|
|
}
|
|
|
|
private void OnDoAfter(Entity<DrainComponent> entity, ref DrainDoAfterEvent args)
|
|
{
|
|
if (args.Target == null)
|
|
return;
|
|
|
|
if (!_random.Prob(entity.Comp.UnclogProbability))
|
|
{
|
|
_popupSystem.PopupEntity(Loc.GetString("drain-component-unclog-fail", ("object", args.Target.Value)), args.Target.Value);
|
|
return;
|
|
}
|
|
|
|
|
|
if (!_solutionContainerSystem.ResolveSolution(args.Target.Value, DrainComponent.SolutionName, ref entity.Comp.Solution))
|
|
{
|
|
return;
|
|
}
|
|
|
|
|
|
_solutionContainerSystem.RemoveAllSolution(entity.Comp.Solution.Value);
|
|
_audioSystem.PlayPvs(entity.Comp.UnclogSound, args.Target.Value);
|
|
_popupSystem.PopupEntity(Loc.GetString("drain-component-unclog-success", ("object", args.Target.Value)), args.Target.Value);
|
|
}
|
|
}
|