mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-26 18:17:12 +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
328 lines
13 KiB
C#
328 lines
13 KiB
C#
using Content.Server.Body.Components;
|
|
using Content.Server.DoAfter;
|
|
using Content.Server.Fluids.EntitySystems;
|
|
using Content.Server.Forensics.Components;
|
|
using Content.Server.Popups;
|
|
using Content.Shared._White.Blocking;
|
|
using Content.Shared.Chemistry.Components;
|
|
using Content.Shared.DoAfter;
|
|
using Content.Shared.Forensics;
|
|
using Content.Shared.Interaction;
|
|
using Content.Shared.Interaction.Events;
|
|
using Content.Shared.Inventory;
|
|
using Content.Shared.Weapons.Melee.Events;
|
|
using Robust.Shared.Random;
|
|
using Content.Shared.Inventory.Events;
|
|
|
|
namespace Content.Server.Forensics
|
|
{
|
|
public sealed class ForensicsSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly IRobustRandom _random = default!;
|
|
[Dependency] private readonly InventorySystem _inventory = default!;
|
|
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
|
|
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
|
public override void Initialize()
|
|
{
|
|
SubscribeLocalEvent<FingerprintComponent, ContactInteractionEvent>(OnInteract);
|
|
SubscribeLocalEvent<ScentComponent, DidEquipEvent>(OnEquip);
|
|
SubscribeLocalEvent<FiberComponent, MapInitEvent>(OnFiberInit);
|
|
SubscribeLocalEvent<FingerprintComponent, MapInitEvent>(OnFingerprintInit);
|
|
SubscribeLocalEvent<DnaComponent, MapInitEvent>(OnDNAInit);
|
|
SubscribeLocalEvent<ScentComponent, MapInitEvent>(OnScentInit);
|
|
|
|
SubscribeLocalEvent<DnaComponent, BeingGibbedEvent>(OnBeingGibbed);
|
|
SubscribeLocalEvent<ForensicsComponent, MeleeHitEvent>(OnMeleeHit,
|
|
after: new[] {typeof(MeleeBlockSystem)}); // WD EDIT
|
|
SubscribeLocalEvent<ForensicsComponent, GotRehydratedEvent>(OnRehydrated);
|
|
SubscribeLocalEvent<CleansForensicsComponent, AfterInteractEvent>(OnAfterInteract, after: new[] { typeof(AbsorbentSystem) });
|
|
SubscribeLocalEvent<ForensicsComponent, CleanForensicsDoAfterEvent>(OnCleanForensicsDoAfter);
|
|
SubscribeLocalEvent<DnaComponent, TransferDnaEvent>(OnTransferDnaEvent);
|
|
}
|
|
|
|
private void OnInteract(EntityUid uid, FingerprintComponent component, ContactInteractionEvent args)
|
|
{
|
|
ApplyEvidence(uid, args.Other);
|
|
}
|
|
|
|
private void OnEquip(EntityUid uid, ScentComponent component, DidEquipEvent args)
|
|
{
|
|
ApplyScent(uid, args.Equipment);
|
|
}
|
|
|
|
private void OnFiberInit(EntityUid uid, FiberComponent component, MapInitEvent args)
|
|
{
|
|
component.Fiberprint = GenerateFingerprint(length: 7);
|
|
}
|
|
|
|
private void OnFingerprintInit(EntityUid uid, FingerprintComponent component, MapInitEvent args)
|
|
{
|
|
component.Fingerprint = GenerateFingerprint();
|
|
}
|
|
|
|
private void OnDNAInit(EntityUid uid, DnaComponent component, MapInitEvent args)
|
|
{
|
|
component.DNA = GenerateDNA();
|
|
|
|
}
|
|
|
|
private void OnScentInit(EntityUid uid, ScentComponent component, MapInitEvent args)
|
|
{
|
|
component.Scent = GenerateFingerprint(length: 5);
|
|
|
|
var updatecomp = EnsureComp<ForensicsComponent>(uid);
|
|
updatecomp.Scent = component.Scent;
|
|
|
|
Dirty(uid, updatecomp);
|
|
}
|
|
|
|
private void OnBeingGibbed(EntityUid uid, DnaComponent component, BeingGibbedEvent args)
|
|
{
|
|
foreach (EntityUid part in args.GibbedParts)
|
|
{
|
|
var partComp = EnsureComp<ForensicsComponent>(part);
|
|
partComp.DNAs.Add(component.DNA);
|
|
partComp.CanDnaBeCleaned = false;
|
|
Dirty(part, partComp);
|
|
}
|
|
}
|
|
|
|
private void OnMeleeHit(EntityUid uid, ForensicsComponent component, MeleeHitEvent args)
|
|
{
|
|
if (args.Handled) // WD EDIT
|
|
return;
|
|
|
|
if ((args.BaseDamage.DamageDict.TryGetValue("Blunt", out var bluntDamage) && bluntDamage.Value > 0) ||
|
|
(args.BaseDamage.DamageDict.TryGetValue("Slash", out var slashDamage) && slashDamage.Value > 0) ||
|
|
(args.BaseDamage.DamageDict.TryGetValue("Piercing", out var pierceDamage) && pierceDamage.Value > 0))
|
|
{
|
|
foreach (EntityUid hitEntity in args.HitEntities)
|
|
{
|
|
if (TryComp<DnaComponent>(hitEntity, out var hitEntityComp))
|
|
component.DNAs.Add(hitEntityComp.DNA);
|
|
}
|
|
}
|
|
Dirty(uid, component);
|
|
}
|
|
|
|
private void OnRehydrated(Entity<ForensicsComponent> ent, ref GotRehydratedEvent args)
|
|
{
|
|
CopyForensicsFrom(ent.Comp, args.Target);
|
|
Dirty(args.Target, ent.Comp);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Copy forensic information from a source entity to a destination.
|
|
/// Existing forensic information on the target is still kept.
|
|
/// </summary>
|
|
public void CopyForensicsFrom(ForensicsComponent src, EntityUid target)
|
|
{
|
|
var dest = EnsureComp<ForensicsComponent>(target);
|
|
foreach (var dna in src.DNAs)
|
|
{
|
|
dest.DNAs.Add(dna);
|
|
}
|
|
|
|
foreach (var fiber in src.Fibers)
|
|
{
|
|
dest.Fibers.Add(fiber);
|
|
}
|
|
|
|
foreach (var print in src.Fingerprints)
|
|
{
|
|
dest.Fingerprints.Add(print);
|
|
}
|
|
}
|
|
|
|
private void OnAfterInteract(EntityUid uid, CleansForensicsComponent component, AfterInteractEvent args)
|
|
{
|
|
if (args.Handled || !args.CanReach)
|
|
return;
|
|
|
|
if (TryComp<ForensicsComponent>(args.Target, out var forensicsComp)
|
|
&& forensicsComp.DNAs.Count > 0 && forensicsComp.CanDnaBeCleaned
|
|
&& forensicsComp.Fingerprints.Count + forensicsComp.Fibers.Count > 0
|
|
&& forensicsComp.Scent != string.Empty)
|
|
{
|
|
var cleanDelay = component.CleanDelay;
|
|
if (HasComp<ScentComponent>(args.Target))
|
|
cleanDelay += 30;
|
|
|
|
var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cleanDelay, new CleanForensicsDoAfterEvent(), uid, target: args.Target, used: args.Used)
|
|
{
|
|
BreakOnHandChange = true,
|
|
NeedHand = true,
|
|
BreakOnDamage = true,
|
|
BreakOnTargetMove = true,
|
|
MovementThreshold = 0.01f,
|
|
DistanceThreshold = forensicsComp.CleanDistance,
|
|
};
|
|
|
|
_doAfterSystem.TryStartDoAfter(doAfterArgs);
|
|
_popupSystem.PopupEntity(Loc.GetString("forensics-cleaning", ("target", args.Target)), args.User, args.User);
|
|
|
|
args.Handled = true;
|
|
return;
|
|
}
|
|
|
|
if (TryComp<ScentComponent>(args.Target, out var scentComp))
|
|
{
|
|
var cleanDelay = component.CleanDelay + 30;
|
|
var doAfterArgs = new DoAfterArgs(EntityManager, args.User, cleanDelay, new CleanForensicsDoAfterEvent(), uid, target: args.Target, used: args.Used)
|
|
{
|
|
BreakOnHandChange = true,
|
|
NeedHand = true,
|
|
BreakOnDamage = true,
|
|
BreakOnTargetMove = true,
|
|
MovementThreshold = 0.01f,
|
|
DistanceThreshold = 1.5f,
|
|
};
|
|
|
|
_doAfterSystem.TryStartDoAfter(doAfterArgs);
|
|
_popupSystem.PopupEntity(Loc.GetString("forensics-cleaning", ("target", args.Target)), args.User, args.User);
|
|
|
|
args.Handled = true;
|
|
}
|
|
}
|
|
|
|
private void OnCleanForensicsDoAfter(EntityUid uid, ForensicsComponent component, CleanForensicsDoAfterEvent args)
|
|
{
|
|
if (args.Handled || args.Cancelled || args.Args.Target == null)
|
|
return;
|
|
|
|
if (!TryComp<ForensicsComponent>(args.Target, out var targetComp))
|
|
return;
|
|
|
|
targetComp.Fibers = new();
|
|
targetComp.Fingerprints = new();
|
|
targetComp.Scent = String.Empty;
|
|
|
|
if (targetComp.CanDnaBeCleaned)
|
|
targetComp.DNAs = new();
|
|
|
|
// leave behind evidence it was cleaned
|
|
if (TryComp<FiberComponent>(args.Used, out var fiber))
|
|
targetComp.Fibers.Add(string.IsNullOrEmpty(fiber.FiberColor) ? Loc.GetString("forensic-fibers", ("material", fiber.FiberMaterial)) : Loc.GetString("forensic-fibers-colored", ("color", fiber.FiberColor), ("material", fiber.FiberMaterial)));
|
|
|
|
if (TryComp<ResidueComponent>(args.Used, out var residue))
|
|
targetComp.Residues.Add(string.IsNullOrEmpty(residue.ResidueColor) ? Loc.GetString("forensic-residue", ("adjective", residue.ResidueAdjective)) : Loc.GetString("forensic-residue-colored", ("color", residue.ResidueColor), ("adjective", residue.ResidueAdjective)));
|
|
|
|
// If the ent has a Scent Component, we compleatly generate a new one and apply the new scent to all currently weared items.
|
|
if (TryComp<ScentComponent>(args.Target, out var scentComp))
|
|
{
|
|
var generatedscent = GenerateFingerprint(length: 5);
|
|
scentComp.Scent = generatedscent;
|
|
targetComp.Scent = generatedscent;
|
|
|
|
if (args.Target is { Valid: true } target
|
|
&& _inventory.TryGetSlots(target, out var slotDefinitions))
|
|
foreach (var slot in slotDefinitions)
|
|
{
|
|
if (!_inventory.TryGetSlotEntity(target, slot.Name, out var slotEnt))
|
|
continue;
|
|
|
|
EnsureComp<ForensicsComponent>(slotEnt.Value, out var recipientComp);
|
|
recipientComp.Scent = generatedscent;
|
|
|
|
Dirty(slotEnt.Value, recipientComp);
|
|
}
|
|
}
|
|
|
|
if (args.Target is { Valid: true } targetuid)
|
|
Dirty(targetuid, targetComp);
|
|
}
|
|
|
|
public string GenerateFingerprint(int length = 16)
|
|
{
|
|
var fingerprint = new byte[Math.Clamp(length, 0, 255)];
|
|
_random.NextBytes(fingerprint);
|
|
return Convert.ToHexString(fingerprint);
|
|
}
|
|
|
|
public string GenerateDNA()
|
|
{
|
|
var letters = new[] { "A", "C", "G", "T" };
|
|
var DNA = string.Empty;
|
|
|
|
for (var i = 0; i < 16; i++)
|
|
{
|
|
DNA += letters[_random.Next(letters.Length)];
|
|
}
|
|
|
|
return DNA;
|
|
}
|
|
|
|
private void ApplyEvidence(EntityUid user, EntityUid target)
|
|
{
|
|
if (HasComp<IgnoresFingerprintsComponent>(target))
|
|
return;
|
|
|
|
var component = EnsureComp<ForensicsComponent>(target);
|
|
if (_inventory.TryGetSlotEntity(user, "gloves", out var gloves))
|
|
{
|
|
if (TryComp<FiberComponent>(gloves, out var fiber) && !string.IsNullOrEmpty(fiber.FiberMaterial))
|
|
{
|
|
var fiberLocale = string.IsNullOrEmpty(fiber.FiberColor)
|
|
? Loc.GetString("forensic-fibers", ("material", fiber.FiberMaterial))
|
|
: Loc.GetString("forensic-fibers-colored", ("color", fiber.FiberColor), ("material", fiber.FiberMaterial));
|
|
component.Fibers.Add(fiberLocale + " ; " + fiber.Fiberprint);
|
|
}
|
|
|
|
if (HasComp<FingerprintMaskComponent>(gloves))
|
|
{
|
|
Dirty(target, component);
|
|
return;
|
|
}
|
|
}
|
|
if (TryComp<FingerprintComponent>(user, out var fingerprint))
|
|
{
|
|
component.Fingerprints.Add(fingerprint.Fingerprint ?? "");
|
|
Dirty(target, component);
|
|
}
|
|
}
|
|
|
|
private void ApplyScent(EntityUid user, EntityUid target)
|
|
{
|
|
if (HasComp<ScentComponent>(target))
|
|
return;
|
|
|
|
var component = EnsureComp<ForensicsComponent>(target);
|
|
if (TryComp<ScentComponent>(user, out var scent))
|
|
component.Scent = scent.Scent;
|
|
|
|
Dirty(target, component);
|
|
}
|
|
|
|
private void OnTransferDnaEvent(EntityUid uid, DnaComponent component, ref TransferDnaEvent args)
|
|
{
|
|
var recipientComp = EnsureComp<ForensicsComponent>(args.Recipient);
|
|
recipientComp.DNAs.Add(component.DNA);
|
|
recipientComp.CanDnaBeCleaned = args.CanDnaBeCleaned;
|
|
|
|
Dirty(args.Recipient, recipientComp);
|
|
}
|
|
|
|
#region Public API
|
|
|
|
/// <summary>
|
|
/// Transfer DNA from one entity onto the forensics of another
|
|
/// </summary>
|
|
/// <param name="recipient">The entity receiving the DNA</param>
|
|
/// <param name="donor">The entity applying its DNA</param>
|
|
/// <param name="canDnaBeCleaned">If this DNA be cleaned off of the recipient. e.g. cleaning a knife vs cleaning a puddle of blood</param>
|
|
public void TransferDna(EntityUid recipient, EntityUid donor, bool canDnaBeCleaned = true)
|
|
{
|
|
if (TryComp<DnaComponent>(donor, out var donorComp))
|
|
{
|
|
EnsureComp<ForensicsComponent>(recipient, out var recipientComp);
|
|
recipientComp.DNAs.Add(donorComp.DNA);
|
|
recipientComp.CanDnaBeCleaned = canDnaBeCleaned;
|
|
|
|
Dirty(recipient, recipientComp);
|
|
}
|
|
}
|
|
|
|
#endregion
|
|
}
|
|
}
|