mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 05:27:38 +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
222 lines
7.4 KiB
C#
222 lines
7.4 KiB
C#
using Content.Shared.Movement.Components;
|
|
using Robust.Shared.GameStates;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Map.Components;
|
|
using Robust.Shared.Network;
|
|
using Robust.Shared.Player;
|
|
|
|
namespace Content.Client.Replay.Spectator;
|
|
|
|
// This partial class contains functions for getting and setting the spectator's position data, so that
|
|
// a consistent view/camera can be maintained when jumping around in time.
|
|
public sealed partial class ReplaySpectatorSystem
|
|
{
|
|
/// <summary>
|
|
/// Simple struct containing position & rotation data for maintaining a persistent view when jumping around in time.
|
|
/// </summary>
|
|
public struct SpectatorData
|
|
{
|
|
// TODO REPLAYS handle ghost-following.
|
|
|
|
/// <summary>
|
|
/// The current entity being spectated.
|
|
/// </summary>
|
|
public EntityUid Entity;
|
|
|
|
/// <summary>
|
|
/// The player that was originally controlling <see cref="Entity"/>
|
|
/// </summary>
|
|
public NetUserId Controller;
|
|
|
|
public (EntityCoordinates Coords, Angle Rot)? Local;
|
|
public (EntityCoordinates Coords, Angle Rot)? World;
|
|
public (EntityUid? Ent, Angle Rot)? Eye;
|
|
}
|
|
|
|
public SpectatorData GetSpectatorData()
|
|
{
|
|
var data = new SpectatorData();
|
|
if (_player.LocalEntity is not { } player)
|
|
return data;
|
|
|
|
data.Controller = _player.LocalUser ?? DefaultUser;
|
|
|
|
if (!TryComp(player, out TransformComponent? xform) || xform.MapUid == null)
|
|
return data;
|
|
|
|
data.Local = (xform.Coordinates, xform.LocalRotation);
|
|
var (pos, rot) = _transform.GetWorldPositionRotation(player);
|
|
data.World = (new(xform.MapUid.Value, pos), rot);
|
|
|
|
if (TryComp(player, out InputMoverComponent? mover))
|
|
data.Eye = (mover.RelativeEntity, mover.TargetRelativeRotation);
|
|
|
|
data.Entity = player;
|
|
|
|
return data;
|
|
}
|
|
|
|
private void OnBeforeSetTick()
|
|
{
|
|
_spectatorData = GetSpectatorData();
|
|
}
|
|
|
|
private void OnAfterSetTick()
|
|
{
|
|
if (_spectatorData != null)
|
|
SetSpectatorPosition(_spectatorData.Value);
|
|
_spectatorData = null;
|
|
}
|
|
|
|
private void OnBeforeApplyState((GameState Current, GameState? Next) args)
|
|
{
|
|
// Before applying the game state, we want to check to see if a recorded player session is about to
|
|
// get attached to the entity that we are currently spectating. If it is, then we switch out local session
|
|
// to the recorded session. I.e., we switch from spectating the entity to spectating the session.
|
|
// This is required because having multiple sessions attached to a single entity is not currently supported.
|
|
|
|
if (_player.LocalUser != DefaultUser)
|
|
return; // Already spectating some session.
|
|
|
|
if (_player.LocalEntity is not {} uid)
|
|
return;
|
|
|
|
var netEnt = GetNetEntity(uid);
|
|
if (netEnt.IsClientSide())
|
|
return;
|
|
|
|
foreach (var playerState in args.Current.PlayerStates.Value)
|
|
{
|
|
if (playerState.ControlledEntity != netEnt)
|
|
continue;
|
|
|
|
if (!_player.TryGetSessionById(playerState.UserId, out var session))
|
|
session = _player.CreateAndAddSession(playerState.UserId, playerState.Name);
|
|
|
|
_player.SetLocalSession(session);
|
|
break;
|
|
}
|
|
}
|
|
|
|
public void SetSpectatorPosition(SpectatorData data)
|
|
{
|
|
if (_player.LocalSession == null)
|
|
return;
|
|
|
|
if (data.Controller != DefaultUser)
|
|
{
|
|
// the "local player" is currently set to some recorded session. As long as that session has an entity, we
|
|
// do nothing here
|
|
if (_player.TryGetSessionById(data.Controller, out var session)
|
|
&& Exists(session.AttachedEntity))
|
|
{
|
|
_player.SetLocalSession(session);
|
|
return;
|
|
}
|
|
|
|
// Spectated session is no longer valid - return to the client-side session
|
|
_player.SetLocalSession(_player.GetSessionById(DefaultUser));
|
|
}
|
|
|
|
if (Exists(data.Entity) && Transform(data.Entity).MapID != MapId.Nullspace)
|
|
{
|
|
_player.SetAttachedEntity(_player.LocalSession, data.Entity);
|
|
return;
|
|
}
|
|
|
|
if (data.Local != null && data.Local.Value.Coords.IsValid(EntityManager))
|
|
{
|
|
var newXform = SpawnSpectatorGhost(data.Local.Value.Coords, false);
|
|
newXform.LocalRotation = data.Local.Value.Rot;
|
|
}
|
|
else if (data.World != null && data.World.Value.Coords.IsValid(EntityManager))
|
|
{
|
|
var newXform = SpawnSpectatorGhost(data.World.Value.Coords, true);
|
|
newXform.LocalRotation = data.World.Value.Rot;
|
|
}
|
|
else if (TryFindFallbackSpawn(out var coords))
|
|
{
|
|
var newXform = SpawnSpectatorGhost(coords, true);
|
|
newXform.LocalRotation = 0;
|
|
}
|
|
else
|
|
{
|
|
Log.Error("Failed to find a suitable observer spawn point");
|
|
return;
|
|
}
|
|
|
|
if (data.Eye != null && TryComp(_player.LocalSession.AttachedEntity, out InputMoverComponent? newMover))
|
|
{
|
|
newMover.RelativeEntity = data.Eye.Value.Ent;
|
|
newMover.TargetRelativeRotation = newMover.RelativeRotation = data.Eye.Value.Rot;
|
|
}
|
|
}
|
|
|
|
private bool TryFindFallbackSpawn(out EntityCoordinates coords)
|
|
{
|
|
if (_replayPlayback.TryGetRecorderEntity(out var recorder))
|
|
{
|
|
coords = new EntityCoordinates(recorder.Value, default);
|
|
return true;
|
|
}
|
|
|
|
Entity<MapGridComponent>? maxUid = null;
|
|
float? maxSize = null;
|
|
var gridQuery = EntityQueryEnumerator<MapGridComponent>();
|
|
|
|
while (gridQuery.MoveNext(out var uid, out var grid))
|
|
{
|
|
var size = grid.LocalAABB.Size.LengthSquared();
|
|
if (maxSize == null || size > maxSize)
|
|
{
|
|
maxUid = (uid, grid);
|
|
maxSize = size;
|
|
}
|
|
}
|
|
|
|
coords = new EntityCoordinates(maxUid ?? default, default);
|
|
return maxUid != null;
|
|
}
|
|
|
|
private void OnTerminating(EntityUid uid, ReplaySpectatorComponent component, ref EntityTerminatingEvent args)
|
|
{
|
|
if (uid != _player.LocalEntity)
|
|
return;
|
|
|
|
var xform = Transform(uid);
|
|
if (xform.MapUid == null || Terminating(xform.MapUid.Value))
|
|
return;
|
|
|
|
SpawnSpectatorGhost(new EntityCoordinates(xform.MapUid.Value, default), true);
|
|
}
|
|
|
|
private void OnParentChanged(EntityUid uid, ReplaySpectatorComponent component, ref EntParentChangedMessage args)
|
|
{
|
|
if (uid != _player.LocalEntity)
|
|
return;
|
|
|
|
if (args.Transform.MapUid != null || args.OldMapId == null)
|
|
return;
|
|
|
|
if (_spectatorData != null)
|
|
{
|
|
// Currently scrubbing/setting the replay tick
|
|
// the observer will get respawned once the state was applied
|
|
return;
|
|
}
|
|
|
|
// The entity being spectated from was moved to null-space.
|
|
// This was probably because they were spectating some entity in a client-side replay that left PVS range.
|
|
// Simple respawn the ghost.
|
|
SetSpectatorPosition(default);
|
|
}
|
|
|
|
private void OnDetached(EntityUid uid, ReplaySpectatorComponent component, LocalPlayerDetachedEvent args)
|
|
{
|
|
if (IsClientSide(uid))
|
|
QueueDel(uid);
|
|
else
|
|
RemCompDeferred(uid, component);
|
|
}
|
|
}
|