mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 21:48:58 +03:00
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description the adding AI is now up to y'all because i'm not touching loadout code for name datasets, but it shouldn't be too bad from here --------- Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com> Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: themias <89101928+themias@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com> Co-authored-by: Saphire <lattice@saphi.re> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com> Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: SlamBamActionman <slambamactionman@gmail.com> Co-authored-by: Doomsdrayk <robotdoughnut@comcast.net> Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: ElectroJr <leonsfriedrich@gmail.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Julian Giebel <juliangiebel@live.de> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: TGRCDev <tgrc@tgrc.dev> Co-authored-by: Milon <milonpl.git@proton.me> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: Fildrance <fildrance@gmail.com> Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> Co-authored-by: chavonadelal <156101927+chavonadelal@users.noreply.github.com> Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: ArchRBX <5040911+ArchRBX@users.noreply.github.com> Co-authored-by: archrbx <punk.gear5260@fastmail.com> Co-authored-by: Radezolid <snappednexus@gmail.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: EmoGarbage404 <retron404@gmail.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Co-authored-by: Velcroboy <velcroboy333@hotmail.com> Co-authored-by: neuPanda <chriseparton@gmail.com> Co-authored-by: neuPanda <spainman0@yahoo.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com> (cherry picked from commit 93ed70acfeda357133a701f637d3faeec02749bb)
156 lines
6.2 KiB
C#
156 lines
6.2 KiB
C#
using Content.Shared._White.Blocking;
|
||
using Content.Server.Chemistry.Containers.EntitySystems;
|
||
using Content.Shared.Chemistry.Components;
|
||
using Content.Shared.Chemistry.EntitySystems;
|
||
using Content.Shared.Chemistry.Reaction;
|
||
using Content.Shared.Chemistry;
|
||
using Content.Shared.Chemistry.Reagent;
|
||
using Content.Shared.Clothing;
|
||
using Content.Shared.CombatMode.Pacification;
|
||
using Content.Shared.Database;
|
||
using Content.Shared.FixedPoint;
|
||
using Content.Shared.Fluids.Components;
|
||
using Content.Shared.IdentityManagement;
|
||
using Content.Shared.Nutrition.EntitySystems;
|
||
using Content.Shared.Popups;
|
||
using Content.Shared.Spillable;
|
||
using Content.Shared.Throwing;
|
||
using Content.Shared.Weapons.Melee.Events;
|
||
using Robust.Shared.Player;
|
||
|
||
namespace Content.Server.Fluids.EntitySystems;
|
||
|
||
public sealed partial class PuddleSystem
|
||
{
|
||
protected override void InitializeSpillable()
|
||
{
|
||
base.InitializeSpillable();
|
||
|
||
SubscribeLocalEvent<SpillableComponent, LandEvent>(SpillOnLand);
|
||
// Openable handles the event if it's closed
|
||
SubscribeLocalEvent<SpillableComponent, MeleeHitEvent>(SplashOnMeleeHit, before: [typeof(MeleeBlockSystem)], after: [typeof(OpenableSystem)]); // WD EDIT START
|
||
SubscribeLocalEvent<SpillableComponent, SolutionContainerOverflowEvent>(OnOverflow);
|
||
SubscribeLocalEvent<SpillableComponent, SpillDoAfterEvent>(OnDoAfter);
|
||
SubscribeLocalEvent<SpillableComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
|
||
}
|
||
|
||
private void OnOverflow(Entity<SpillableComponent> entity, ref SolutionContainerOverflowEvent args)
|
||
{
|
||
if (args.Handled)
|
||
return;
|
||
|
||
TrySpillAt(Transform(entity).Coordinates, args.Overflow, out _);
|
||
args.Handled = true;
|
||
}
|
||
|
||
private void SplashOnMeleeHit(Entity<SpillableComponent> entity, ref MeleeHitEvent args)
|
||
{
|
||
if (args.Handled)
|
||
return;
|
||
|
||
// When attacking someone reactive with a spillable entity,
|
||
// splash a little on them (touch react)
|
||
// If this also has solution transfer, then assume the transfer amount is how much we want to spill.
|
||
// Otherwise let's say they want to spill a quarter of its max volume.
|
||
|
||
if (!_solutionContainerSystem.TryGetDrainableSolution(entity.Owner, out var soln, out var solution))
|
||
return;
|
||
|
||
var hitCount = args.HitEntities.Count;
|
||
|
||
var totalSplit = FixedPoint2.Min(solution.MaxVolume * 0.25, solution.Volume);
|
||
if (TryComp<SolutionTransferComponent>(entity, out var transfer))
|
||
{
|
||
totalSplit = FixedPoint2.Min(transfer.TransferAmount, solution.Volume);
|
||
}
|
||
|
||
// a little lame, but reagent quantity is not very balanced and we don't want people
|
||
// spilling like 100u of reagent on someone at once!
|
||
totalSplit = FixedPoint2.Min(totalSplit, entity.Comp.MaxMeleeSpillAmount);
|
||
|
||
if (totalSplit == 0)
|
||
return;
|
||
|
||
args.Handled = true;
|
||
|
||
// First update the hit count so anything that is not reactive wont count towards the total!
|
||
foreach (var hit in args.HitEntities)
|
||
{
|
||
if (!HasComp<ReactiveComponent>(hit))
|
||
hitCount -= 1;
|
||
}
|
||
|
||
foreach (var hit in args.HitEntities)
|
||
{
|
||
if (!HasComp<ReactiveComponent>(hit))
|
||
continue;
|
||
|
||
var splitSolution = _solutionContainerSystem.SplitSolution(soln.Value, totalSplit / hitCount);
|
||
|
||
_adminLogger.Add(LogType.MeleeHit, $"{ToPrettyString(args.User)} splashed {SharedSolutionContainerSystem.ToPrettyString(splitSolution):solution} from {ToPrettyString(entity.Owner):entity} onto {ToPrettyString(hit):target}");
|
||
_reactive.DoEntityReaction(hit, splitSolution, ReactionMethod.Touch);
|
||
|
||
_popups.PopupEntity(
|
||
Loc.GetString("spill-melee-hit-attacker", ("amount", totalSplit / hitCount), ("spillable", entity.Owner),
|
||
("target", Identity.Entity(hit, EntityManager))),
|
||
hit, args.User);
|
||
|
||
_popups.PopupEntity(
|
||
Loc.GetString("spill-melee-hit-others", ("attacker", args.User), ("spillable", entity.Owner),
|
||
("target", Identity.Entity(hit, EntityManager))),
|
||
hit, Filter.PvsExcept(args.User), true, PopupType.SmallCaution);
|
||
}
|
||
}
|
||
|
||
private void SpillOnLand(Entity<SpillableComponent> entity, ref LandEvent args)
|
||
{
|
||
if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.SolutionName, out var soln, out var solution))
|
||
return;
|
||
|
||
if (Openable.IsClosed(entity.Owner))
|
||
return;
|
||
|
||
if (!entity.Comp.SpillWhenThrown)
|
||
return;
|
||
|
||
if (args.User != null)
|
||
{
|
||
_adminLogger.Add(LogType.Landed,
|
||
$"{ToPrettyString(entity.Owner):entity} spilled a solution {SharedSolutionContainerSystem.ToPrettyString(solution):solution} on landing");
|
||
}
|
||
|
||
var drainedSolution = _solutionContainerSystem.Drain(entity.Owner, soln.Value, solution.Volume);
|
||
TrySplashSpillAt(entity.Owner, Transform(entity).Coordinates, drainedSolution, out _);
|
||
}
|
||
|
||
/// <summary>
|
||
/// Prevent Pacified entities from throwing items that can spill liquids.
|
||
/// </summary>
|
||
private void OnAttemptPacifiedThrow(Entity<SpillableComponent> ent, ref AttemptPacifiedThrowEvent args)
|
||
{
|
||
// Don’t care about closed containers.
|
||
if (Openable.IsClosed(ent))
|
||
return;
|
||
|
||
// Don’t care about empty containers.
|
||
if (!_solutionContainerSystem.TryGetSolution(ent.Owner, ent.Comp.SolutionName, out _, out var solution) || solution.Volume <= 0)
|
||
return;
|
||
|
||
args.Cancel("pacified-cannot-throw-spill");
|
||
}
|
||
|
||
private void OnDoAfter(Entity<SpillableComponent> entity, ref SpillDoAfterEvent args)
|
||
{
|
||
if (args.Handled || args.Cancelled || args.Args.Target == null)
|
||
return;
|
||
|
||
//solution gone by other means before doafter completes
|
||
if (!_solutionContainerSystem.TryGetDrainableSolution(entity.Owner, out var soln, out var solution) || solution.Volume == 0)
|
||
return;
|
||
|
||
var puddleSolution = _solutionContainerSystem.SplitSolution(soln.Value, solution.Volume);
|
||
TrySpillAt(Transform(entity).Coordinates, puddleSolution, out _);
|
||
args.Handled = true;
|
||
}
|
||
}
|