juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Moony z level hack (#15031)" (#15032)

Browse Source 
This reverts commit 1f6663912b.
This commit is contained in:
Moony
2023-03-31 21:50:11 -05:00
committed by GitHub
parent 1f6663912b
commit eee96125df
17 changed files with 2 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

239
Content.Shared/zlevels/ThirdDimension/SharedZLevelSystem.cs
View File

@@ -1,239 +0,0 @@
using System.Linq;
using Content.Shared.Administration;
using Content.Shared.Administration.Managers;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
using Content.Shared.Ghost;
using Content.Shared.Gravity;
using Content.Shared.Movement.Components;
using Robust.Shared.Console;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Network;
using Robust.Shared.Physics.Components;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
namespace Content.Shared._Afterlight.ThirdDimension;
/// <summary>
/// This handles Z levels. I'm sorry to everyone who has to witness this.
/// </summary>
public sealed class SharedZLevelSystem : EntitySystem
{
[Dependency] private readonly SharedTransformSystem _xformSystem = default!;
[Dependency] private readonly DamageableSystem _damageableSystem = default!;
[Dependency] private readonly SharedGravitySystem _gravity = default!;
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly IMapManager _map = default!;
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly IConsoleHost _conHost = default!;
[Dependency] private readonly ISharedAdminManager _admin = default!;
[ViewVariables]
private List<MapId?> _mapAbove = new();
[ViewVariables]
private List<MapId?> _mapBelow = new();
public IReadOnlyList<MapId?> MapAbove => _mapAbove;
public IReadOnlyList<MapId?> MapBelow => _mapBelow;
private bool DontDrop = false; //HACK: oh god
/// <inheritdoc/>
public override void Initialize()
{
SubscribeLocalEvent<MapChangedEvent>(OnMapChanged);
SubscribeNetworkEvent<MapListChangedEvent>(OnMapListChanged);
if (_net.IsServer)
{
SubscribeLocalEvent<MoveEvent>(OnMove); // Sloth forgive me.
_conHost.RegisterCommand("ztool", ZTool);
}
}
private void OnMove(ref MoveEvent ev)
{
if (DontDrop || _mapBelow[(int) ev.Component.MapID] == null || HasComp<MapGridComponent>(ev.Sender) || _gravity.IsWeightless(ev.Sender) || HasComp<SharedGhostComponent>(ev.Sender) || !HasComp<PhysicsComponent>(ev.Sender))
return; // get out!
var mapEid = _map.GetMapEntityId(ev.Component.MapID);
if (ev.Component.Coordinates.EntityId != mapEid)
return; // Can't fall through the map if we're not on it!
if (TryComp<MapGridComponent>(mapEid, out var grid))
{
if (grid.TryGetTileRef(_xformSystem.GetWorldPosition(ev.Component), out var tile) && !tile.Tile.IsEmpty)
{
return; // Can't fall through grids.
}
}
var phys = Comp<PhysicsComponent>(ev.Sender);
if (phys.Momentum.Length < 0.2 || HasComp<InputMoverComponent>(ev.Sender) || HasComp<MobMoverComponent>(ev.Sender))
{
TryTraverse(false, ev.Sender);
// THWACK
_damageableSystem.TryChangeDamage(ev.Sender,
new DamageSpecifier(_prototype.Index<DamageTypePrototype>("Blunt"), FixedPoint2.New(69)));
}
}
[AnyCommand]
private void ZTool(IConsoleShell shell, string argstr, string[] args)
{
if (shell.Player?.AttachedEntity is not {} ent)
return;
if (!_admin.IsAdmin(ent))
{
shell.WriteLine("This code may be bad but it's not gonna let you break things.");
return;
}
switch (args[0].ToLowerInvariant())
{
case "above":
{
var xform = Transform(ent);
var map = MapAbove[(int) xform.MapID];
shell.WriteLine($"The map above you is {(map is not null ? ToPrettyString(_map.GetMapEntityId(map.Value)) : "none")}");
break;
}
case "below":
{
var xform = Transform(ent);
var map = MapBelow[(int) xform.MapID];
shell.WriteLine($"The map below you is {(map is not null ? ToPrettyString(_map.GetMapEntityId(map.Value)) : "none")}");
break;
}
case "link":
{
var dir = args[2].ToLowerInvariant();
var baseMap = new MapId(int.Parse(args[1]));
var linkedMap = new MapId(int.Parse(args[3]));
if (dir != "above" && dir != "below")
return;
if (dir != "above")
{
LinkMaps(baseMap, linkedMap);
}
else
{
LinkMaps(linkedMap, baseMap);
}
break;
}
case "traverse":
{
var dir = args[1].ToLowerInvariant();
if (dir != "above" && dir != "below")
return;
TryTraverse(dir == "above", ent);
break;
}
}
}
public int AllMapsBelow(MapId map, ref MapId[] maps)
{
var curr = map;
var idx = 0;
while (MapBelow[(int)curr] is { } below && idx < maps.Length)
{
maps[idx++] = below;
curr = below;
}
return idx;
}
public bool TryTraverse(bool direction, EntityUid traverser, TransformComponent? xform = default!)
{
if (!Resolve(traverser, ref xform))
return false;
var worldPosition = _xformSystem.GetWorldPosition(xform);
MapId? newMap;
if (direction) // Going up!
{
newMap = MapAbove[(int)xform.MapID];
}
else
{
newMap = MapBelow[(int)xform.MapID];
}
Logger.Debug($"Traversing to {newMap}..");
if (newMap is null)
return false;
var coords = EntityCoordinates.FromMap(_map, new MapCoordinates(worldPosition, newMap.Value));
DontDrop = true;
_xformSystem.SetCoordinates(traverser, coords);
DontDrop = false;
return true;
}
public void LinkMaps(MapId below, MapId above)
{
_mapBelow[(int)above] = below;
_mapAbove[(int)below] = above;
UpdateMapList();
}
private void OnMapListChanged(MapListChangedEvent ev)
{
if (!_net.IsClient)
return;
//yoink
_mapAbove = ev.MapAbove.ToList();
_mapBelow = ev.MapBelow.ToList();
}
private void OnMapChanged(MapChangedEvent ev)
{
if (!ev.Created)
return;
while ((int) ev.Map + 1 > _mapAbove.Count)
{
// Resize time.
_mapAbove.Add(null);
_mapBelow.Add(null);
}
UpdateMapList();
}
public void UpdateMapList()
{
if (!_net.IsServer)
return;
RaiseNetworkEvent(new MapListChangedEvent(_mapAbove.ToArray(), _mapBelow.ToArray()));
}
[Serializable, NetSerializable]
public sealed class MapListChangedEvent : EntityEventArgs
{
public MapId?[] MapAbove;
public MapId?[] MapBelow;
public MapListChangedEvent(MapId?[] mapAbove, MapId?[] mapBelow)
{
MapAbove = mapAbove;
MapBelow = mapBelow;
}
}
}

25
Content.Shared/zlevels/ThirdDimension/ZViewComponent.cs
View File

@@ -1,25 +0,0 @@
using Robust.Shared.GameStates;
using Robust.Shared.Serialization;
namespace Content.Shared._Afterlight.ThirdDimension;
/// <summary>
/// This is used for...
/// </summary>
[RegisterComponent, NetworkedComponent]
public sealed class ZViewComponent : Component
{
[ViewVariables]
public List<EntityUid> DownViewEnts = new();
}
[Serializable, NetSerializable]
public sealed class ZViewComponentState : ComponentState
{
public List<EntityUid> DownViewEnts;
public ZViewComponentState(List<EntityUid> downViewEnts)
{
DownViewEnts = downViewEnts;
}
}

113
Content.Shared/zlevels/ThirdDimension/ZViewSystem.cs
View File

@@ -1,113 +0,0 @@
using System.Linq;
using Content.Shared.Body.Components;
using Robust.Shared.GameStates;
using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Players;
namespace Content.Shared._Afterlight.ThirdDimension;
/// <summary>
/// This handles view between z levels
/// </summary>
public abstract class SharedZViewSystem : EntitySystem
{
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly IMapManager _map = default!;
[Dependency] private readonly ISharedPlayerManager _player = default!;
[Dependency] private readonly SharedTransformSystem _xformSystem = default!;
[Dependency] private readonly SharedZLevelSystem _zLevel = default!;
private const int ViewDepth = 3;
public override void Initialize()
{
SubscribeLocalEvent<ZViewComponent, ComponentHandleState>(ZViewComponentHandleState);
SubscribeLocalEvent<ZViewComponent, ComponentGetState>(ZViewComponentGetState);
}
private void ZViewComponentGetState(EntityUid uid, ZViewComponent component, ref ComponentGetState args)
{
args.State = new ZViewComponentState(component.DownViewEnts);
}
private void ZViewComponentHandleState(EntityUid uid, ZViewComponent component, ref ComponentHandleState args)
{
if (args.Current is not ZViewComponentState state)
return;
component.DownViewEnts = state.DownViewEnts;
}
public override void Update(float frameTime)
{
if (_net.IsServer)
FrameUpdate(frameTime);
}
/// <inheritdoc/>
public override void FrameUpdate(float frameTime)
{
var query = EntityQueryEnumerator<SharedEyeComponent>();
var toUpdate = new List<EntityUid>();
while (query.MoveNext(out var uid, out _))
{
var view = EnsureComp<ZViewComponent>(uid);
var xform = Transform(uid);
var maps = new MapId[ViewDepth];
var amt = _zLevel.AllMapsBelow(xform.MapID, ref maps);
if (amt == 0)
continue;
var currPos = _xformSystem.GetWorldPosition(xform);
if (view.DownViewEnts.Count != amt)
{
if (_net.IsClient || !CanSetup(uid))
continue;
toUpdate.Add(uid);
Logger.Debug("Queued Z view update.");
continue;
}
foreach (var (ent, map) in view.DownViewEnts.Zip(maps))
{
if (map == MapId.Nullspace)
continue;
var coords = EntityCoordinates.FromMap(_map, new MapCoordinates(currPos, map));
_xformSystem.SetCoordinates(ent, coords);
}
}
foreach (var uid in toUpdate)
{
Logger.Debug("Did z view update.");
var view = EnsureComp<ZViewComponent>(uid);
var xform = Transform(uid);
foreach (var e in view.DownViewEnts)
{
QueueDel(e);
}
view.DownViewEnts.Clear();
var maps = new MapId[ViewDepth];
var amt = _zLevel.AllMapsBelow(xform.MapID, ref maps);
if (amt == 0)
continue;
var currPos = _xformSystem.GetWorldPosition(xform);
foreach (var map in maps)
{
if (map == MapId.Nullspace)
continue;
view.DownViewEnts.Add(SpawnViewEnt(uid, new MapCoordinates(currPos, map)));
}
Dirty(view);
}
}
public abstract EntityUid SpawnViewEnt(EntityUid source, MapCoordinates loc);
public abstract bool CanSetup(EntityUid source);
}