mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 05:27:38 +03:00
No spead merge (#475)
* Revert "[GoobPort] WIZ REAL (#465)"
This reverts commit 091a8ff433.
* fix local
This commit is contained in:
Spatison
@@ -1,104 +1,11 @@
|
||||
// SPDX-FileCopyrightText: 2024 AJCM <AJCM@tutanota.com>
|
||||
// SPDX-FileCopyrightText: 2024 Aiden <aiden@djkraz.com>
|
||||
// SPDX-FileCopyrightText: 2024 Alzore <140123969+Blackern5000@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 CaasGit <87243814+CaasGit@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 DrSmugleaf <DrSmugleaf@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Ed <96445749+TheShuEd@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Emisse <99158783+Emisse@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 EmoGarbage404 <retron404@gmail.com>
|
||||
// SPDX-FileCopyrightText: 2024 Eoin Mcloughlin <helloworld@eoinrul.es>
|
||||
// SPDX-FileCopyrightText: 2024 Errant <35878406+Errant-4@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Flareguy <78941145+Flareguy@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Hrosts <35345601+Hrosts@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Ian <ignaz.k@live.de>
|
||||
// SPDX-FileCopyrightText: 2024 Ilya246 <57039557+Ilya246@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Joel Zimmerman <JoelZimmerman@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 JustCone <141039037+JustCone14@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Killerqu00 <47712032+Killerqu00@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Lye <128915833+Lyroth001@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 MerrytheManokit <167581110+MerrytheManokit@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Mervill <mervills.email@gmail.com>
|
||||
// SPDX-FileCopyrightText: 2024 Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 MureixloI <132683811+MureixloI@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 NakataRin <45946146+NakataRin@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 OrangeMoronage9622 <whyteterry0092@gmail.com>
|
||||
// SPDX-FileCopyrightText: 2024 PJBot <pieterjan.briers+bot@gmail.com>
|
||||
// SPDX-FileCopyrightText: 2024 Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
|
||||
// SPDX-FileCopyrightText: 2024 Piras314 <p1r4s@proton.me>
|
||||
// SPDX-FileCopyrightText: 2024 Plykiya <58439124+Plykiya@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Preston Smith <92108534+thetolbean@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Repo <47093363+Titian3@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Simon <63975668+Simyon264@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Stalen <33173619+stalengd@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 TakoDragon <69509841+BackeTako@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Thomas <87614336+Aeshus@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Ubaser <134914314+UbaserB@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
|
||||
// SPDX-FileCopyrightText: 2024 Vasilis <vasilis@pikachu.systems>
|
||||
// SPDX-FileCopyrightText: 2024 Vigers Ray <60344369+VigersRay@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 beck-thompson <107373427+beck-thompson@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 deathride58 <deathride58@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 deltanedas <39013340+deltanedas@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 deltanedas <@deltanedas:kde.org>
|
||||
// SPDX-FileCopyrightText: 2024 dffdff2423 <dffdff2423@gmail.com>
|
||||
// SPDX-FileCopyrightText: 2024 eoineoineoin <github@eoinrul.es>
|
||||
// SPDX-FileCopyrightText: 2024 foboscheshir <156405958+foboscheshir@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 lzk <124214523+lzk228@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 metalgearsloth <comedian_vs_clown@hotmail.com>
|
||||
// SPDX-FileCopyrightText: 2024 nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 plykiya <plykiya@protonmail.com>
|
||||
// SPDX-FileCopyrightText: 2024 saintmuntzer <47153094+saintmuntzer@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 shamp <140359015+shampunj@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 strO0pwafel <153459934+strO0pwafel@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 stroopwafel <j.o.luijkx@student.tudelft.nl>
|
||||
// SPDX-FileCopyrightText: 2024 themias <89101928+themias@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 to4no_fix <156101927+chavonadelal@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2024 voidnull000 <18663194+voidnull000@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2025 ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2025 ActiveMammmoth <kmcsmooth@gmail.com>
|
||||
// SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2025 Aviu00 <93730715+Aviu00@users.noreply.github.com>
|
||||
// SPDX-FileCopyrightText: 2025 Misandry <mary@thughunt.ing>
|
||||
// SPDX-FileCopyrightText: 2025 gus <august.eymann@gmail.com>
|
||||
// SPDX-FileCopyrightText: 2025 keronshb <54602815+keronshb@users.noreply.github.com>
|
||||
//
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
using System.Linq;
|
||||
using System.Numerics;
|
||||
using Content.Shared.Changeling;
|
||||
using Content.Shared._Shitcode.Wizard;
|
||||
using Content.Shared._Shitcode.Wizard.BindSoul;
|
||||
using Content.Shared._Shitcode.Wizard.Chuuni;
|
||||
using Content.Shared._Shitcode.Wizard.FadingTimedDespawn;
|
||||
using Content.Shared._Shitmed.Targeting;
|
||||
using System.Numerics;
|
||||
using Content.Shared.Actions;
|
||||
using Content.Shared.Body.Components;
|
||||
using Content.Shared.Body.Systems;
|
||||
using Content.Shared.Chat;
|
||||
using Content.Shared.Coordinates.Helpers;
|
||||
using Content.Shared.Damage;
|
||||
using Content.Shared.Doors.Components;
|
||||
using Content.Shared.Doors.Systems;
|
||||
using Content.Shared.FixedPoint;
|
||||
using Content.Shared.Ghost;
|
||||
using Content.Shared.Gibbing.Events;
|
||||
using Content.Shared.Hands.Components;
|
||||
using Content.Shared.Hands.EntitySystems;
|
||||
using Content.Shared.Interaction;
|
||||
@@ -107,31 +14,20 @@ using Content.Shared.Lock;
|
||||
using Content.Shared.Magic.Components;
|
||||
using Content.Shared.Magic.Events;
|
||||
using Content.Shared.Maps;
|
||||
using Content.Shared.Mind;
|
||||
using Content.Shared.Mobs.Systems;
|
||||
using Content.Shared.NPC.Components;
|
||||
using Content.Shared.NPC.Prototypes;
|
||||
using Content.Shared.NPC.Systems;
|
||||
using Content.Shared.Physics;
|
||||
using Content.Shared.Popups;
|
||||
using Content.Shared.Revolutionary.Components;
|
||||
using Content.Shared.Speech.Muting;
|
||||
using Content.Shared.Storage;
|
||||
using Content.Shared.Stunnable;
|
||||
using Content.Shared.Tag;
|
||||
using Content.Shared.Weapons.Ranged.Components;
|
||||
using Content.Shared.Weapons.Ranged.Systems;
|
||||
using Content.Shared.Zombies;
|
||||
using Robust.Shared.Audio.Systems;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Map.Components;
|
||||
using Robust.Shared.Network;
|
||||
using Robust.Shared.Physics.Systems;
|
||||
using Robust.Shared.Prototypes;
|
||||
using Robust.Shared.Random;
|
||||
using Robust.Shared.Serialization.Manager;
|
||||
using Robust.Shared.Spawners;
|
||||
using Robust.Shared.Timing;
|
||||
|
||||
namespace Content.Shared.Magic;
|
||||
|
||||
@@ -140,7 +36,6 @@ namespace Content.Shared.Magic;
|
||||
/// </summary>
|
||||
public abstract class SharedMagicSystem : EntitySystem
|
||||
{
|
||||
[Dependency] private readonly IGameTiming _timing = default!; // Goobstation
|
||||
[Dependency] private readonly ISerializationManager _seriMan = default!;
|
||||
[Dependency] private readonly IComponentFactory _compFact = default!;
|
||||
[Dependency] private readonly IMapManager _mapManager = default!;
|
||||
@@ -159,12 +54,6 @@ public abstract class SharedMagicSystem : EntitySystem
|
||||
[Dependency] private readonly LockSystem _lock = default!;
|
||||
[Dependency] private readonly SharedHandsSystem _hands = default!;
|
||||
[Dependency] private readonly TagSystem _tag = default!;
|
||||
[Dependency] private readonly MobStateSystem _mobState = default!;
|
||||
[Dependency] private readonly SharedAudioSystem _audio = default!;
|
||||
[Dependency] private readonly SharedMindSystem _mind = default!;
|
||||
[Dependency] private readonly SharedStunSystem _stun = default!;
|
||||
[Dependency] private readonly DamageableSystem _damageable = default!; // Goobstation
|
||||
[Dependency] private readonly NpcFactionSystem _faction = default!; // Goobstation
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
@@ -179,8 +68,6 @@ public abstract class SharedMagicSystem : EntitySystem
|
||||
SubscribeLocalEvent<SmiteSpellEvent>(OnSmiteSpell);
|
||||
SubscribeLocalEvent<KnockSpellEvent>(OnKnockSpell);
|
||||
SubscribeLocalEvent<ChargeSpellEvent>(OnChargeSpell);
|
||||
SubscribeLocalEvent<RandomGlobalSpawnSpellEvent>(OnRandomGlobalSpawnSpell);
|
||||
SubscribeLocalEvent<MindSwapSpellEvent>(OnMindSwapSpell);
|
||||
|
||||
// Spell wishlist
|
||||
// A wishlish of spells that I'd like to implement or planning on implementing in a future PR
|
||||
@@ -261,66 +148,34 @@ public abstract class SharedMagicSystem : EntitySystem
|
||||
var comp = ent.Comp;
|
||||
var hasReqs = true;
|
||||
|
||||
// Goobstation start
|
||||
var requiresSpeech = comp.RequiresSpeech;
|
||||
var flags = SlotFlags.OUTERCLOTHING | SlotFlags.HEAD;
|
||||
var requiredSlots = 2;
|
||||
if (_inventory.TryGetSlotEntity(args.Performer, "eyes", out var eyepatch) &&
|
||||
HasComp<ChuuniEyepatchComponent>(eyepatch.Value))
|
||||
{
|
||||
requiresSpeech = true;
|
||||
flags = SlotFlags.OUTERCLOTHING;
|
||||
requiredSlots = 1;
|
||||
}
|
||||
|
||||
var slots = 0;
|
||||
// Goobstation end
|
||||
|
||||
if (comp.RequiresClothes)
|
||||
{
|
||||
if (!TryComp(args.Performer, out InventoryComponent? inventory)) // Goob edit
|
||||
hasReqs = false;
|
||||
else
|
||||
var enumerator = _inventory.GetSlotEnumerator(args.Performer, SlotFlags.OUTERCLOTHING | SlotFlags.HEAD);
|
||||
while (enumerator.MoveNext(out var containerSlot))
|
||||
{
|
||||
var enumerator = _inventory.GetSlotEnumerator((args.Performer, inventory), flags); // Goob edit
|
||||
while (enumerator.MoveNext(out var containerSlot))
|
||||
{
|
||||
slots++; // Goobstation
|
||||
if (containerSlot.ContainedEntity is { } item)
|
||||
hasReqs = HasComp<WizardClothesComponent>(item);
|
||||
else
|
||||
hasReqs = false;
|
||||
|
||||
if (containerSlot.ContainedEntity is { } item)
|
||||
hasReqs = HasComp<WizardClothesComponent>(item);
|
||||
else
|
||||
hasReqs = false;
|
||||
|
||||
if (!hasReqs)
|
||||
break;
|
||||
}
|
||||
if (!hasReqs)
|
||||
break;
|
||||
}
|
||||
|
||||
if (slots < requiredSlots) // Goobstation
|
||||
hasReqs = false;
|
||||
}
|
||||
|
||||
if (!hasReqs) // Goobstation
|
||||
{
|
||||
_popup.PopupClient(Loc.GetString("spell-requirements-failed-clothes"), args.Performer, args.Performer);
|
||||
args.Cancelled = true;
|
||||
return;
|
||||
}
|
||||
|
||||
if (requiresSpeech && HasComp<MutedComponent>(args.Performer)) // Goob edit
|
||||
if (comp.RequiresSpeech && HasComp<MutedComponent>(args.Performer))
|
||||
hasReqs = false;
|
||||
|
||||
if (hasReqs)
|
||||
return;
|
||||
|
||||
args.Cancelled = true;
|
||||
_popup.PopupClient(Loc.GetString("spell-requirements-failed-speech"), args.Performer, args.Performer); // Goob edit
|
||||
_popup.PopupClient(Loc.GetString("spell-requirements-failed"), args.Performer, args.Performer);
|
||||
|
||||
// TODO: Pre-cast do after, either here or in SharedActionsSystem
|
||||
}
|
||||
|
||||
public bool PassesSpellPrerequisites(EntityUid spell, EntityUid performer) // Goob edit
|
||||
private bool PassesSpellPrerequisites(EntityUid spell, EntityUid performer)
|
||||
{
|
||||
var ev = new BeforeCastSpellEvent(performer);
|
||||
RaiseLocalEvent(spell, ref ev);
|
||||
@@ -470,21 +325,16 @@ public abstract class SharedMagicSystem : EntitySystem
|
||||
#region Projectile Spells
|
||||
private void OnProjectileSpell(ProjectileSpellEvent ev)
|
||||
{
|
||||
if (ev.Handled || !PassesSpellPrerequisites(ev.Action, ev.Performer)) // Goob edit
|
||||
return;
|
||||
|
||||
if (ev.Coords == null) // Goob edit
|
||||
if (ev.Handled || !PassesSpellPrerequisites(ev.Action, ev.Performer) || !_net.IsServer)
|
||||
return;
|
||||
|
||||
ev.Handled = true;
|
||||
Speak(ev);
|
||||
|
||||
if (_net.IsClient) // Goobstation
|
||||
return;
|
||||
|
||||
var xform = Transform(ev.Performer);
|
||||
var fromCoords = xform.Coordinates;
|
||||
var toCoords = ev.Coords.Value; // Goob edit
|
||||
var toCoords = ev.Target;
|
||||
var userVelocity = _physics.GetMapLinearVelocity(ev.Performer);
|
||||
|
||||
// If applicable, this ensures the projectile is parented to grid on spawn, instead of the map.
|
||||
var fromMap = fromCoords.ToMap(EntityManager, _transform);
|
||||
@@ -492,15 +342,10 @@ public abstract class SharedMagicSystem : EntitySystem
|
||||
? fromCoords.WithEntityId(gridUid, EntityManager)
|
||||
: new(_mapManager.GetMapEntityId(fromMap.MapId), fromMap.Position);
|
||||
|
||||
var userVelocity = _physics.GetMapLinearVelocity(spawnCoords); // Goob edit
|
||||
|
||||
var ent = Spawn(ev.Prototype, spawnCoords);
|
||||
var direction = toCoords.ToMapPos(EntityManager, _transform) -
|
||||
spawnCoords.ToMapPos(EntityManager, _transform);
|
||||
_gunSystem.ShootProjectile(ent, direction, userVelocity, ev.Performer, ev.Performer);
|
||||
|
||||
if (ev.Entity != null) // Goobstation
|
||||
_gunSystem.SetTarget(ent, ev.Entity.Value, out _);
|
||||
}
|
||||
// End Projectile Spells
|
||||
#endregion
|
||||
@@ -512,11 +357,25 @@ public abstract class SharedMagicSystem : EntitySystem
|
||||
return;
|
||||
|
||||
ev.Handled = true;
|
||||
if (ev.DoSpeech)
|
||||
Speak(ev);
|
||||
Speak(ev);
|
||||
|
||||
RemoveComponents(ev.Target, ev.ToRemove);
|
||||
AddComponents(ev.Target, ev.ToAdd);
|
||||
foreach (var toRemove in ev.ToRemove)
|
||||
{
|
||||
if (_compFact.TryGetRegistration(toRemove, out var registration))
|
||||
RemComp(ev.Target, registration.Type);
|
||||
}
|
||||
|
||||
foreach (var (name, data) in ev.ToAdd)
|
||||
{
|
||||
if (HasComp(ev.Target, data.Component.GetType()))
|
||||
continue;
|
||||
|
||||
var component = (Component) _compFact.GetComponent(name);
|
||||
component.Owner = ev.Target;
|
||||
var temp = (object) component;
|
||||
_seriMan.CopyTo(data.Component, ref temp);
|
||||
EntityManager.AddComponent(ev.Target, (Component) temp!);
|
||||
}
|
||||
}
|
||||
// End Change Component Spells
|
||||
#endregion
|
||||
@@ -563,29 +422,6 @@ public abstract class SharedMagicSystem : EntitySystem
|
||||
comp.Uid = performer;
|
||||
}
|
||||
}
|
||||
|
||||
private void AddComponents(EntityUid target, ComponentRegistry comps)
|
||||
{
|
||||
foreach (var (name, data) in comps)
|
||||
{
|
||||
if (HasComp(target, data.Component.GetType()))
|
||||
continue;
|
||||
|
||||
var component = (Component)_compFact.GetComponent(name);
|
||||
var temp = (object)component;
|
||||
_seriMan.CopyTo(data.Component, ref temp);
|
||||
EntityManager.AddComponent(target, (Component)temp!);
|
||||
}
|
||||
}
|
||||
|
||||
private void RemoveComponents(EntityUid target, HashSet<string> comps)
|
||||
{
|
||||
foreach (var toRemove in comps)
|
||||
{
|
||||
if (_compFact.TryGetRegistration(toRemove, out var registration))
|
||||
RemComp(target, registration.Type);
|
||||
}
|
||||
}
|
||||
// End Spell Helpers
|
||||
#endregion
|
||||
#region Smite Spells
|
||||
@@ -605,8 +441,7 @@ public abstract class SharedMagicSystem : EntitySystem
|
||||
if (!TryComp<BodyComponent>(ev.Target, out var body))
|
||||
return;
|
||||
|
||||
if (_timing.IsFirstTimePredicted) // Goobstation
|
||||
_body.GibBody(ev.Target, true, body, splatModifier: 10f, contents: GibContentsOption.Skip); // Goob edit
|
||||
_body.GibBody(ev.Target, true, body);
|
||||
}
|
||||
// End Smite Spells
|
||||
#endregion
|
||||
@@ -626,11 +461,10 @@ public abstract class SharedMagicSystem : EntitySystem
|
||||
var transform = Transform(args.Performer);
|
||||
|
||||
// Look for doors and lockers, and don't open/unlock them if they're already opened/unlocked.
|
||||
foreach (var target in _lookup.GetEntitiesInRange(_transform.GetMapCoordinates(args.Performer, transform), args.Range, flags: LookupFlags.Dynamic | LookupFlags.Static | LookupFlags.Approximate)) // Goob edit
|
||||
foreach (var target in _lookup.GetEntitiesInRange(_transform.GetMapCoordinates(args.Performer, transform), args.Range, flags: LookupFlags.Dynamic | LookupFlags.Static))
|
||||
{
|
||||
// Goob edit
|
||||
// if (!_interaction.InRangeUnobstructed(args.Performer, target, range: 0, collisionMask: CollisionGroup.Opaque))
|
||||
// continue;
|
||||
if (!_interaction.InRangeUnobstructed(args.Performer, target, range: 0, collisionMask: CollisionGroup.Opaque))
|
||||
continue;
|
||||
|
||||
if (TryComp<DoorBoltComponent>(target, out var doorBoltComp) && doorBoltComp.BoltsDown)
|
||||
_door.SetBoltsDown((target, doorBoltComp), false, predicted: true);
|
||||
@@ -669,266 +503,24 @@ public abstract class SharedMagicSystem : EntitySystem
|
||||
_gunSystem.UpdateBasicEntityAmmoCount(wand.Value, basicAmmoComp.Count.Value + ev.Charge, basicAmmoComp);
|
||||
}
|
||||
// End Charge Spells
|
||||
#endregion
|
||||
#region Global Spells
|
||||
|
||||
private void OnRandomGlobalSpawnSpell(RandomGlobalSpawnSpellEvent ev)
|
||||
{
|
||||
if (!_net.IsServer || ev.Handled || !PassesSpellPrerequisites(ev.Action, ev.Performer) || ev.Spawns is not { } spawns)
|
||||
return;
|
||||
|
||||
ev.Handled = true;
|
||||
Speak(ev);
|
||||
|
||||
var allHumans = _mind.GetAliveHumans();
|
||||
|
||||
foreach (var human in allHumans)
|
||||
{
|
||||
if (!human.Comp.OwnedEntity.HasValue)
|
||||
continue;
|
||||
|
||||
var ent = human.Comp.OwnedEntity.Value;
|
||||
|
||||
var mapCoords = _transform.GetMapCoordinates(ent);
|
||||
foreach (var spawn in EntitySpawnCollection.GetSpawns(spawns, _random))
|
||||
{
|
||||
var spawned = Spawn(spawn, mapCoords);
|
||||
_hands.PickupOrDrop(ent, spawned);
|
||||
}
|
||||
}
|
||||
|
||||
_audio.PlayGlobal(ev.Sound, ev.Performer);
|
||||
}
|
||||
|
||||
#endregion
|
||||
#region Mindswap Spells
|
||||
|
||||
private void OnMindSwapSpell(MindSwapSpellEvent ev)
|
||||
{
|
||||
if (ev.Handled || !PassesSpellPrerequisites(ev.Action, ev.Performer))
|
||||
return;
|
||||
|
||||
// Goobstation start
|
||||
if (_mobState.IsIncapacitated(ev.Target) || HasComp<ZombieComponent>(ev.Target))
|
||||
{
|
||||
_popup.PopupClient(Loc.GetString("spell-fail-mindswap-dead"), ev.Performer, ev.Performer);
|
||||
return;
|
||||
}
|
||||
|
||||
List<(Type, string)> blockers = new()
|
||||
{
|
||||
(typeof(ChangelingComponent), "changeling"),
|
||||
// You should be able to mindswap with heretics,
|
||||
// but all of their data and abilities are not tied to their mind, I'm not making this work.
|
||||
// (typeof(HereticComponent), "heretic"), TODO: Uncomment, when heretic will be ported
|
||||
// (typeof(GhoulComponent), "ghoul"), TODO: Uncomment, when heretic will be ported
|
||||
// Mindswapping with aghost real.
|
||||
(typeof(GhostComponent), "ghost"),
|
||||
(typeof(SpectralComponent), "ghost"),
|
||||
(typeof(TimedDespawnComponent), "temporary"),
|
||||
(typeof(FadingTimedDespawnComponent), "temporary"),
|
||||
};
|
||||
|
||||
if (blockers.Any(x => CheckMindswapBlocker(x.Item1, x.Item2)))
|
||||
return;
|
||||
// Goobstation end
|
||||
|
||||
ev.Handled = true;
|
||||
Speak(ev);
|
||||
|
||||
// Need performer mind, but target mind is unnecessary, such as taking over a NPC
|
||||
// Need to get target mind before putting performer mind into their body if they have one
|
||||
// Thus, assign bool before first transfer, then check afterwards
|
||||
|
||||
if (!_mind.TryGetMind(ev.Performer, out var perMind, out var perMindComp))
|
||||
return;
|
||||
|
||||
var tarHasMind = _mind.TryGetMind(ev.Target, out var tarMind, out var tarMindComp);
|
||||
|
||||
_tag.AddTag(ev.Performer, SharedBindSoulSystem.IgnoreBindSoulTag); // Goobstation
|
||||
_tag.AddTag(ev.Target, SharedBindSoulSystem.IgnoreBindSoulTag); // Goobstation
|
||||
|
||||
_mind.TransferTo(perMind, ev.Target);
|
||||
|
||||
if (tarHasMind)
|
||||
{
|
||||
_mind.TransferTo(tarMind, ev.Performer);
|
||||
}
|
||||
|
||||
// Goobstation start
|
||||
List<Type> components = new()
|
||||
{
|
||||
typeof(RevolutionaryComponent),
|
||||
typeof(HeadRevolutionaryComponent),
|
||||
typeof(WizardComponent),
|
||||
typeof(ApprenticeComponent),
|
||||
};
|
||||
|
||||
foreach (var component in components)
|
||||
{
|
||||
TransferComponent(component, ev.Performer, ev.Target);
|
||||
}
|
||||
|
||||
TransferFactions();
|
||||
|
||||
if (_net.IsServer)
|
||||
{
|
||||
_audio.PlayEntity(ev.Sound, ev.Target, ev.Target);
|
||||
_audio.PlayEntity(ev.Sound, ev.Performer, ev.Performer);
|
||||
}
|
||||
// Goobstation end
|
||||
|
||||
_tag.RemoveTag(ev.Performer, SharedBindSoulSystem.IgnoreBindSoulTag); // Goobstation
|
||||
_tag.RemoveTag(ev.Target, SharedBindSoulSystem.IgnoreBindSoulTag); // Goobstation
|
||||
|
||||
_stun.KnockdownOrStun(ev.Target, ev.TargetStunDuration, true); // Goob edit
|
||||
_stun.KnockdownOrStun(ev.Performer, ev.PerformerStunDuration, true); // Goob edit
|
||||
|
||||
// Goobstation start
|
||||
return;
|
||||
|
||||
void TransferFactions()
|
||||
{
|
||||
TryComp(ev.Performer, out NpcFactionMemberComponent? performerFaction);
|
||||
TryComp(ev.Target, out NpcFactionMemberComponent? targetFaction);
|
||||
|
||||
if (performerFaction == null && targetFaction == null)
|
||||
return;
|
||||
|
||||
var performerHadFaction = true;
|
||||
var targetHadFaction = true;
|
||||
|
||||
if (performerFaction == null)
|
||||
{
|
||||
performerFaction = AddComp<NpcFactionMemberComponent>(ev.Performer);
|
||||
performerHadFaction = false;
|
||||
}
|
||||
|
||||
if (targetFaction == null)
|
||||
{
|
||||
targetFaction = AddComp<NpcFactionMemberComponent>(ev.Target);
|
||||
targetHadFaction = false;
|
||||
}
|
||||
|
||||
List<ProtoId<NpcFactionPrototype>> factionsToTransfer = new()
|
||||
{
|
||||
"Wizard",
|
||||
};
|
||||
|
||||
ProtoId<NpcFactionPrototype> fallbackFaction = "NanoTrasen";
|
||||
|
||||
var performerFactions = new HashSet<ProtoId<NpcFactionPrototype>>();
|
||||
var targetFactions = new HashSet<ProtoId<NpcFactionPrototype>>();
|
||||
|
||||
foreach (var faction in FilterFactions(performerFaction.Factions))
|
||||
{
|
||||
performerFactions.Add(faction);
|
||||
}
|
||||
|
||||
foreach (var faction in FilterFactions(targetFaction.Factions))
|
||||
{
|
||||
targetFactions.Add(faction);
|
||||
}
|
||||
|
||||
Entity<NpcFactionMemberComponent?> targetFactionEnt = (ev.Target, targetFaction);
|
||||
foreach (var faction in targetFactions)
|
||||
{
|
||||
_faction.RemoveFaction(targetFactionEnt, faction, false);
|
||||
}
|
||||
|
||||
Entity<NpcFactionMemberComponent?> performerFactionEnt = (ev.Performer, performerFaction);
|
||||
foreach (var faction in performerFactions)
|
||||
{
|
||||
_faction.RemoveFaction(performerFactionEnt, faction, false);
|
||||
}
|
||||
|
||||
if (performerHadFaction)
|
||||
_faction.AddFactions(targetFactionEnt, performerFactions);
|
||||
|
||||
if (targetHadFaction)
|
||||
_faction.AddFactions(performerFactionEnt, targetFactions);
|
||||
|
||||
if (targetFaction.Factions.Count == 0)
|
||||
_faction.AddFaction(targetFactionEnt, fallbackFaction);
|
||||
|
||||
if (performerFaction.Factions.Count == 0)
|
||||
_faction.AddFaction(performerFactionEnt, fallbackFaction);
|
||||
return;
|
||||
|
||||
IEnumerable<ProtoId<NpcFactionPrototype>> FilterFactions(HashSet<ProtoId<NpcFactionPrototype>> factions)
|
||||
{
|
||||
return factions.Where(x => factionsToTransfer.Contains(x));
|
||||
}
|
||||
}
|
||||
|
||||
bool CheckMindswapBlocker(Type type, string message)
|
||||
{
|
||||
if (!HasComp(ev.Target, type))
|
||||
return false;
|
||||
|
||||
_popup.PopupClient(Loc.GetString($"spell-fail-mindswap-{message}"), ev.Performer, ev.Performer);
|
||||
return true;
|
||||
}
|
||||
// Goobstation end
|
||||
}
|
||||
|
||||
private void TransferComponent(Type type, EntityUid a, EntityUid b)
|
||||
{
|
||||
var aHasComp = HasComp(a, type);
|
||||
var bHasComp = HasComp(b, type);
|
||||
|
||||
if (aHasComp && bHasComp)
|
||||
return;
|
||||
|
||||
var comp = _compFact.GetComponent(type);
|
||||
if (aHasComp)
|
||||
{
|
||||
AddComp(b, comp);
|
||||
RemCompDeferred(a, type);
|
||||
}
|
||||
else if (bHasComp)
|
||||
{
|
||||
AddComp(a, comp);
|
||||
RemCompDeferred(b, type);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
// End Spells
|
||||
#endregion
|
||||
|
||||
// When any spell is cast it will raise this as an event, so then it can be played in server or something. At least until chat gets moved to shared
|
||||
// TODO: Temp until chat is in shared
|
||||
public void Speak(BaseActionEvent args) // Goob edit
|
||||
public void Speak(BaseActionEvent args)
|
||||
{
|
||||
// Goob edit start
|
||||
var speech = string.Empty;
|
||||
|
||||
if (args is ISpeakSpell speak && !string.IsNullOrWhiteSpace(speak.Speech))
|
||||
speech = speak.Speech;
|
||||
|
||||
if (TryComp(args.Action, out MagicComponent? magic))
|
||||
{
|
||||
var invocationEv = new GetSpellInvocationEvent(magic.School, args.Performer);
|
||||
RaiseLocalEvent(args.Performer, invocationEv);
|
||||
if (invocationEv.Invocation.HasValue)
|
||||
speech = invocationEv.Invocation;
|
||||
if (invocationEv.ToHeal.GetTotal() > FixedPoint2.Zero)
|
||||
{
|
||||
_damageable.TryChangeDamage(args.Performer,
|
||||
-invocationEv.ToHeal,
|
||||
true,
|
||||
false,
|
||||
canSever: false,
|
||||
targetPart: TargetBodyPart.All);
|
||||
}
|
||||
}
|
||||
|
||||
if (string.IsNullOrEmpty(speech))
|
||||
if (args is not ISpeakSpell speak || string.IsNullOrWhiteSpace(speak.Speech))
|
||||
return;
|
||||
|
||||
var ev = new SpeakSpellEvent(args.Performer, speech);
|
||||
// Goob edit end
|
||||
var ev = new SpeakSpellEvent(args.Performer, speak.Speech, speak.ChatType);
|
||||
RaiseLocalEvent(ref ev);
|
||||
}
|
||||
|
||||
public void Speak(EntityUid uid, string speech, InGameICChatType inGameICChatType)
|
||||
{
|
||||
var ev = new SpeakSpellEvent(uid, speech, inGameICChatType);
|
||||
RaiseLocalEvent(ref ev);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user