mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 13:37:47 +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
257 lines
9.8 KiB
C#
257 lines
9.8 KiB
C#
using System.Linq;
|
|
using Content.Server.Flash.Components;
|
|
using Content.Shared.Flash.Components;
|
|
using Content.Server.Light.EntitySystems;
|
|
using Content.Server.Popups;
|
|
using Content.Server.Stunnable;
|
|
using Content.Shared.Charges.Components;
|
|
using Content.Shared.Charges.Systems;
|
|
using Content.Shared.Eye.Blinding.Components;
|
|
using Content.Shared.Flash;
|
|
using Content.Shared.IdentityManagement;
|
|
using Content.Shared.Interaction;
|
|
using Content.Shared.Interaction.Events;
|
|
using Content.Shared.Inventory;
|
|
using Content.Shared.Physics;
|
|
using Content.Shared.Tag;
|
|
using Content.Shared.Weapons.Melee.Events;
|
|
using Robust.Server.Audio;
|
|
using Robust.Server.GameObjects;
|
|
using Robust.Shared.Audio;
|
|
using Robust.Shared.Random;
|
|
using Robust.Shared.Timing;
|
|
using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
|
|
using Content.Shared.Traits.Assorted.Components;
|
|
using Robust.Shared.Random;
|
|
using Content.Shared.Eye.Blinding.Systems;
|
|
|
|
namespace Content.Server.Flash
|
|
{
|
|
internal sealed class FlashSystem : SharedFlashSystem
|
|
{
|
|
[Dependency] private readonly AppearanceSystem _appearance = default!;
|
|
[Dependency] private readonly AudioSystem _audio = default!;
|
|
[Dependency] private readonly SharedChargesSystem _charges = default!;
|
|
[Dependency] private readonly EntityLookupSystem _entityLookup = default!;
|
|
[Dependency] private readonly IGameTiming _timing = default!;
|
|
[Dependency] private readonly SharedTransformSystem _transform = default!;
|
|
[Dependency] private readonly SharedInteractionSystem _interaction = default!;
|
|
[Dependency] private readonly InventorySystem _inventory = default!;
|
|
[Dependency] private readonly PopupSystem _popup = default!;
|
|
[Dependency] private readonly StunSystem _stun = default!;
|
|
[Dependency] private readonly TagSystem _tag = default!;
|
|
[Dependency] private readonly IRobustRandom _random = default!;
|
|
[Dependency] private readonly BlindableSystem _blindingSystem = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
|
|
SubscribeLocalEvent<FlashComponent, MeleeHitEvent>(OnFlashMeleeHit);
|
|
// ran before toggling light for extra-bright lantern
|
|
SubscribeLocalEvent<FlashComponent, UseInHandEvent>(OnFlashUseInHand, before: new []{ typeof(HandheldLightSystem) });
|
|
SubscribeLocalEvent<InventoryComponent, FlashAttemptEvent>(OnInventoryFlashAttempt);
|
|
SubscribeLocalEvent<FlashImmunityComponent, FlashAttemptEvent>(OnFlashImmunityFlashAttempt);
|
|
SubscribeLocalEvent<PermanentBlindnessComponent, FlashAttemptEvent>(OnPermanentBlindnessFlashAttempt);
|
|
SubscribeLocalEvent<TemporaryBlindnessComponent, FlashAttemptEvent>(OnTemporaryBlindnessFlashAttempt);
|
|
}
|
|
|
|
private void OnFlashMeleeHit(EntityUid uid, FlashComponent comp, MeleeHitEvent args)
|
|
{
|
|
if (!args.IsHit ||
|
|
!args.HitEntities.Any() ||
|
|
!UseFlash(uid, comp, args.User))
|
|
{
|
|
return;
|
|
}
|
|
|
|
args.Handled = true;
|
|
foreach (var e in args.HitEntities)
|
|
{
|
|
Flash(e, args.User, uid, comp.FlashDuration, comp.SlowTo, melee: true, stunDuration: comp.MeleeStunDuration);
|
|
}
|
|
}
|
|
|
|
private void OnFlashUseInHand(EntityUid uid, FlashComponent comp, UseInHandEvent args)
|
|
{
|
|
if (args.Handled || !UseFlash(uid, comp, args.User))
|
|
return;
|
|
|
|
args.Handled = true;
|
|
FlashArea(uid, args.User, comp.Range, comp.AoeFlashDuration, comp.SlowTo, true, comp.Probability);
|
|
}
|
|
|
|
private bool UseFlash(EntityUid uid, FlashComponent comp, EntityUid user)
|
|
{
|
|
if (comp.Flashing)
|
|
return false;
|
|
|
|
TryComp<LimitedChargesComponent>(uid, out var charges);
|
|
if (_charges.IsEmpty(uid, charges))
|
|
return false;
|
|
|
|
_charges.UseCharge(uid, charges);
|
|
_audio.PlayPvs(comp.Sound, uid);
|
|
comp.Flashing = true;
|
|
_appearance.SetData(uid, FlashVisuals.Flashing, true);
|
|
|
|
if (_charges.IsEmpty(uid, charges))
|
|
{
|
|
_appearance.SetData(uid, FlashVisuals.Burnt, true);
|
|
_tag.AddTag(uid, "Trash");
|
|
_popup.PopupEntity(Loc.GetString("flash-component-becomes-empty"), user);
|
|
}
|
|
|
|
uid.SpawnTimer(400, () =>
|
|
{
|
|
_appearance.SetData(uid, FlashVisuals.Flashing, false);
|
|
comp.Flashing = false;
|
|
});
|
|
|
|
return true;
|
|
}
|
|
|
|
public void Flash(EntityUid target,
|
|
EntityUid? user,
|
|
EntityUid? used,
|
|
float flashDuration,
|
|
float slowTo,
|
|
bool displayPopup = true,
|
|
FlashableComponent? flashable = null,
|
|
bool melee = false,
|
|
TimeSpan? stunDuration = null)
|
|
{
|
|
if (!Resolve(target, ref flashable, false))
|
|
return;
|
|
|
|
var attempt = new FlashAttemptEvent(target, user, used);
|
|
RaiseLocalEvent(target, attempt, true);
|
|
|
|
if (attempt.Cancelled)
|
|
return;
|
|
|
|
if (melee)
|
|
{
|
|
var ev = new AfterFlashedEvent(target, user, used);
|
|
if (user != null)
|
|
RaiseLocalEvent(user.Value, ref ev);
|
|
if (used != null)
|
|
RaiseLocalEvent(used.Value, ref ev);
|
|
}
|
|
|
|
flashDuration *= flashable.DurationMultiplier;
|
|
|
|
flashable.LastFlash = _timing.CurTime;
|
|
flashable.Duration = flashDuration / 1000f; // TODO: Make this sane...
|
|
Dirty(target, flashable);
|
|
|
|
if (TryComp<BlindableComponent>(target, out var blindable)
|
|
&& !blindable.IsBlind
|
|
&& _random.Prob(flashable.EyeDamageChance))
|
|
_blindingSystem.AdjustEyeDamage((target, blindable), flashable.EyeDamage);
|
|
|
|
if (stunDuration != null)
|
|
{
|
|
_stun.TryParalyze(target, stunDuration.Value, true);
|
|
}
|
|
else
|
|
{
|
|
_stun.TrySlowdown(target, TimeSpan.FromSeconds(flashDuration/1000f), true,
|
|
slowTo, slowTo);
|
|
}
|
|
|
|
if (displayPopup && user != null && target != user && Exists(user.Value))
|
|
{
|
|
_popup.PopupEntity(Loc.GetString("flash-component-user-blinds-you",
|
|
("user", Identity.Entity(user.Value, EntityManager))), target, target);
|
|
}
|
|
}
|
|
|
|
public void FlashArea(Entity<FlashComponent?> source, EntityUid? user, float range, float duration, float slowTo = 0.8f, bool displayPopup = false, float probability = 1f, SoundSpecifier? sound = null)
|
|
{
|
|
var transform = Transform(source);
|
|
var mapPosition = _transform.GetMapCoordinates(transform);
|
|
var flashableQuery = GetEntityQuery<FlashableComponent>();
|
|
|
|
foreach (var entity in _entityLookup.GetEntitiesInRange(transform.Coordinates, range))
|
|
{
|
|
if (!_random.Prob(probability))
|
|
continue;
|
|
|
|
if (!flashableQuery.TryGetComponent(entity, out var flashable))
|
|
continue;
|
|
|
|
// Check for unobstructed entities while ignoring the mobs with flashable components.
|
|
if (!_interaction.InRangeUnobstructed(entity, mapPosition, range, flashable.CollisionGroup, predicate: (e) => flashableQuery.HasComponent(e) || e == source.Owner))
|
|
continue;
|
|
|
|
// They shouldn't have flash removed in between right?
|
|
Flash(entity, user, source, duration, slowTo, displayPopup, flashableQuery.GetComponent(entity));
|
|
}
|
|
|
|
_audio.PlayPvs(sound, source, AudioParams.Default.WithVolume(1f).WithMaxDistance(3f));
|
|
}
|
|
|
|
private void OnInventoryFlashAttempt(EntityUid uid, InventoryComponent component, FlashAttemptEvent args)
|
|
{
|
|
foreach (var slot in new[] { "head", "eyes", "mask" })
|
|
{
|
|
if (args.Cancelled)
|
|
break;
|
|
if (_inventory.TryGetSlotEntity(uid, slot, out var item, component))
|
|
RaiseLocalEvent(item.Value, args, true);
|
|
}
|
|
}
|
|
|
|
private void OnFlashImmunityFlashAttempt(EntityUid uid, FlashImmunityComponent component, FlashAttemptEvent args)
|
|
{
|
|
if(component.Enabled)
|
|
args.Cancel();
|
|
}
|
|
|
|
private void OnPermanentBlindnessFlashAttempt(EntityUid uid, PermanentBlindnessComponent component, FlashAttemptEvent args)
|
|
{
|
|
args.Cancel();
|
|
}
|
|
|
|
private void OnTemporaryBlindnessFlashAttempt(EntityUid uid, TemporaryBlindnessComponent component, FlashAttemptEvent args)
|
|
{
|
|
args.Cancel();
|
|
}
|
|
}
|
|
|
|
public sealed class FlashAttemptEvent : CancellableEntityEventArgs
|
|
{
|
|
public readonly EntityUid Target;
|
|
public readonly EntityUid? User;
|
|
public readonly EntityUid? Used;
|
|
|
|
public FlashAttemptEvent(EntityUid target, EntityUid? user, EntityUid? used)
|
|
{
|
|
Target = target;
|
|
User = user;
|
|
Used = used;
|
|
}
|
|
}
|
|
/// <summary>
|
|
/// Called after a flash is used via melee on another person to check for rev conversion.
|
|
/// Raised on the user of the flash, the target hit by the flash, and the flash used.
|
|
/// </summary>
|
|
[ByRefEvent]
|
|
public readonly struct AfterFlashedEvent
|
|
{
|
|
public readonly EntityUid Target;
|
|
public readonly EntityUid? User;
|
|
public readonly EntityUid? Used;
|
|
|
|
public AfterFlashedEvent(EntityUid target, EntityUid? user, EntityUid? used)
|
|
{
|
|
Target = target;
|
|
User = user;
|
|
Used = used;
|
|
}
|
|
}
|
|
|
|
|
|
}
|