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
310 lines
12 KiB
C#
310 lines
12 KiB
C#
using Content.Client.Pinpointer.UI;
|
|
using Content.Shared.Pinpointer;
|
|
using Content.Shared.Power;
|
|
using Robust.Client.Graphics;
|
|
using Robust.Shared.Collections;
|
|
using Robust.Shared.Map.Components;
|
|
using System.Numerics;
|
|
using static Content.Shared.Power.SharedPowerMonitoringConsoleSystem;
|
|
|
|
namespace Content.Client.Power;
|
|
|
|
public sealed partial class PowerMonitoringConsoleNavMapControl : NavMapControl
|
|
{
|
|
[Dependency] private readonly IEntityManager _entManager = default!;
|
|
|
|
// Cable indexing
|
|
// 0: CableType.HighVoltage
|
|
// 1: CableType.MediumVoltage
|
|
// 2: CableType.Apc
|
|
|
|
private readonly Color[] _powerCableColors = { Color.OrangeRed, Color.Yellow, Color.LimeGreen };
|
|
private readonly Vector2[] _powerCableOffsets = { new Vector2(-0.2f, -0.2f), Vector2.Zero, new Vector2(0.2f, 0.2f) };
|
|
private Dictionary<Color, Color> _sRGBLookUp = new Dictionary<Color, Color>();
|
|
|
|
public PowerMonitoringCableNetworksComponent? PowerMonitoringCableNetworks;
|
|
public List<PowerMonitoringConsoleLineGroup> HiddenLineGroups = new();
|
|
public List<PowerMonitoringConsoleLine> PowerCableNetwork = new();
|
|
public List<PowerMonitoringConsoleLine> FocusCableNetwork = new();
|
|
|
|
private Dictionary<Vector2i, Vector2i>[] _horizLines = [new(), new(), new()];
|
|
private Dictionary<Vector2i, Vector2i>[] _horizLinesReversed = [new(), new(), new()];
|
|
private Dictionary<Vector2i, Vector2i>[] _vertLines = [new(), new(), new()];
|
|
private Dictionary<Vector2i, Vector2i>[] _vertLinesReversed = [new(), new(), new()];
|
|
|
|
private MapGridComponent? _grid;
|
|
|
|
public PowerMonitoringConsoleNavMapControl() : base()
|
|
{
|
|
// Set colors
|
|
TileColor = new Color(30, 57, 67);
|
|
WallColor = new Color(102, 164, 217);
|
|
BackgroundColor = Color.FromSrgb(TileColor.WithAlpha(BackgroundOpacity));
|
|
|
|
PostWallDrawingAction += DrawAllCableNetworks;
|
|
}
|
|
|
|
protected override void UpdateNavMap()
|
|
{
|
|
base.UpdateNavMap();
|
|
|
|
if (Owner == null)
|
|
return;
|
|
|
|
if (!_entManager.TryGetComponent<PowerMonitoringCableNetworksComponent>(Owner, out var cableNetworks))
|
|
return;
|
|
|
|
PowerCableNetwork = GetDecodedPowerCableChunks(cableNetworks.AllChunks);
|
|
FocusCableNetwork = GetDecodedPowerCableChunks(cableNetworks.FocusChunks);
|
|
}
|
|
|
|
public void DrawAllCableNetworks(DrawingHandleScreen handle)
|
|
{
|
|
if (!_entManager.TryGetComponent(MapUid, out _grid))
|
|
return;
|
|
|
|
// Draw full cable network
|
|
if (PowerCableNetwork != null && PowerCableNetwork.Count > 0)
|
|
{
|
|
var modulator = (FocusCableNetwork != null && FocusCableNetwork.Count > 0) ? Color.DimGray : Color.White;
|
|
DrawCableNetwork(handle, PowerCableNetwork, modulator);
|
|
}
|
|
|
|
// Draw focus network
|
|
if (FocusCableNetwork != null && FocusCableNetwork.Count > 0)
|
|
DrawCableNetwork(handle, FocusCableNetwork, Color.White);
|
|
}
|
|
|
|
public void DrawCableNetwork(DrawingHandleScreen handle, List<PowerMonitoringConsoleLine> fullCableNetwork, Color modulator)
|
|
{
|
|
if (!_entManager.TryGetComponent(MapUid, out _grid))
|
|
return;
|
|
|
|
var offset = GetOffset();
|
|
offset = offset with { Y = -offset.Y };
|
|
|
|
if (WorldRange / WorldMaxRange > 0.5f)
|
|
{
|
|
var cableNetworks = new ValueList<Vector2>[3];
|
|
|
|
foreach (var line in fullCableNetwork)
|
|
{
|
|
if (HiddenLineGroups.Contains(line.Group))
|
|
continue;
|
|
|
|
var cableOffset = _powerCableOffsets[(int) line.Group];
|
|
var start = ScalePosition(line.Origin + cableOffset - offset);
|
|
var end = ScalePosition(line.Terminus + cableOffset - offset);
|
|
|
|
cableNetworks[(int) line.Group].Add(start);
|
|
cableNetworks[(int) line.Group].Add(end);
|
|
}
|
|
|
|
for (int cableNetworkIdx = 0; cableNetworkIdx < cableNetworks.Length; cableNetworkIdx++)
|
|
{
|
|
var cableNetwork = cableNetworks[cableNetworkIdx];
|
|
|
|
if (cableNetwork.Count > 0)
|
|
{
|
|
var color = _powerCableColors[cableNetworkIdx] * modulator;
|
|
|
|
if (!_sRGBLookUp.TryGetValue(color, out var sRGB))
|
|
{
|
|
sRGB = Color.ToSrgb(color);
|
|
_sRGBLookUp[color] = sRGB;
|
|
}
|
|
|
|
handle.DrawPrimitives(DrawPrimitiveTopology.LineList, cableNetwork.Span, sRGB);
|
|
}
|
|
}
|
|
}
|
|
|
|
else
|
|
{
|
|
var cableVertexUVs = new ValueList<Vector2>[3];
|
|
|
|
foreach (var line in fullCableNetwork)
|
|
{
|
|
if (HiddenLineGroups.Contains(line.Group))
|
|
continue;
|
|
|
|
var cableOffset = _powerCableOffsets[(int) line.Group];
|
|
|
|
var leftTop = ScalePosition(new Vector2
|
|
(Math.Min(line.Origin.X, line.Terminus.X) - 0.1f,
|
|
Math.Min(line.Origin.Y, line.Terminus.Y) - 0.1f)
|
|
+ cableOffset - offset);
|
|
|
|
var rightTop = ScalePosition(new Vector2
|
|
(Math.Max(line.Origin.X, line.Terminus.X) + 0.1f,
|
|
Math.Min(line.Origin.Y, line.Terminus.Y) - 0.1f)
|
|
+ cableOffset - offset);
|
|
|
|
var leftBottom = ScalePosition(new Vector2
|
|
(Math.Min(line.Origin.X, line.Terminus.X) - 0.1f,
|
|
Math.Max(line.Origin.Y, line.Terminus.Y) + 0.1f)
|
|
+ cableOffset - offset);
|
|
|
|
var rightBottom = ScalePosition(new Vector2
|
|
(Math.Max(line.Origin.X, line.Terminus.X) + 0.1f,
|
|
Math.Max(line.Origin.Y, line.Terminus.Y) + 0.1f)
|
|
+ cableOffset - offset);
|
|
|
|
cableVertexUVs[(int) line.Group].Add(leftBottom);
|
|
cableVertexUVs[(int) line.Group].Add(leftTop);
|
|
cableVertexUVs[(int) line.Group].Add(rightBottom);
|
|
cableVertexUVs[(int) line.Group].Add(leftTop);
|
|
cableVertexUVs[(int) line.Group].Add(rightBottom);
|
|
cableVertexUVs[(int) line.Group].Add(rightTop);
|
|
}
|
|
|
|
for (int cableNetworkIdx = 0; cableNetworkIdx < cableVertexUVs.Length; cableNetworkIdx++)
|
|
{
|
|
var cableVertexUV = cableVertexUVs[cableNetworkIdx];
|
|
|
|
if (cableVertexUV.Count > 0)
|
|
{
|
|
var color = _powerCableColors[cableNetworkIdx] * modulator;
|
|
|
|
if (!_sRGBLookUp.TryGetValue(color, out var sRGB))
|
|
{
|
|
sRGB = Color.ToSrgb(color);
|
|
_sRGBLookUp[color] = sRGB;
|
|
}
|
|
|
|
handle.DrawPrimitives(DrawPrimitiveTopology.TriangleList, cableVertexUV.Span, sRGB);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public List<PowerMonitoringConsoleLine> GetDecodedPowerCableChunks(Dictionary<Vector2i, PowerCableChunk>? chunks)
|
|
{
|
|
var decodedOutput = new List<PowerMonitoringConsoleLine>();
|
|
|
|
if (!_entManager.TryGetComponent(MapUid, out _grid))
|
|
return decodedOutput;
|
|
|
|
if (chunks == null)
|
|
return decodedOutput;
|
|
|
|
Array.ForEach(_horizLines, x=> x.Clear());
|
|
Array.ForEach(_horizLinesReversed, x=> x.Clear());
|
|
Array.ForEach(_vertLines, x=> x.Clear());
|
|
Array.ForEach(_vertLinesReversed, x=> x.Clear());
|
|
|
|
foreach (var (chunkOrigin, chunk) in chunks)
|
|
{
|
|
for (var cableIdx = 0; cableIdx < 3; cableIdx++)
|
|
{
|
|
var horizLines = _horizLines[cableIdx];
|
|
var horizLinesReversed = _horizLinesReversed[cableIdx];
|
|
var vertLines = _vertLines[cableIdx];
|
|
var vertLinesReversed = _vertLinesReversed[cableIdx];
|
|
|
|
var chunkMask = chunk.PowerCableData[cableIdx];
|
|
|
|
for (var chunkIdx = 0; chunkIdx < ChunkSize * ChunkSize; chunkIdx++)
|
|
{
|
|
var value = 1 << chunkIdx;
|
|
var mask = chunkMask & value;
|
|
|
|
if (mask == 0x0)
|
|
continue;
|
|
|
|
var relativeTile = GetTileFromIndex(chunkIdx);
|
|
var tile = (chunk.Origin * ChunkSize + relativeTile) * _grid.TileSize;
|
|
tile = tile with { Y = -tile.Y };
|
|
|
|
PowerCableChunk neighborChunk;
|
|
bool neighbor;
|
|
|
|
// Note: we only check the north and east neighbors
|
|
|
|
// East
|
|
if (relativeTile.X == ChunkSize - 1)
|
|
{
|
|
neighbor = chunks.TryGetValue(chunkOrigin + new Vector2i(1, 0), out neighborChunk) &&
|
|
(neighborChunk.PowerCableData[cableIdx] & GetFlag(new Vector2i(0, relativeTile.Y))) != 0x0;
|
|
}
|
|
else
|
|
{
|
|
var flag = GetFlag(relativeTile + new Vector2i(1, 0));
|
|
neighbor = (chunkMask & flag) != 0x0;
|
|
}
|
|
|
|
if (neighbor)
|
|
{
|
|
// Add points
|
|
AddOrUpdateNavMapLine(tile, tile + new Vector2i(_grid.TileSize, 0), horizLines, horizLinesReversed);
|
|
}
|
|
|
|
// North
|
|
if (relativeTile.Y == ChunkSize - 1)
|
|
{
|
|
neighbor = chunks.TryGetValue(chunkOrigin + new Vector2i(0, 1), out neighborChunk) &&
|
|
(neighborChunk.PowerCableData[cableIdx] & GetFlag(new Vector2i(relativeTile.X, 0))) != 0x0;
|
|
}
|
|
else
|
|
{
|
|
var flag = GetFlag(relativeTile + new Vector2i(0, 1));
|
|
neighbor = (chunkMask & flag) != 0x0;
|
|
}
|
|
|
|
if (neighbor)
|
|
{
|
|
// Add points
|
|
AddOrUpdateNavMapLine(tile + new Vector2i(0, -_grid.TileSize), tile, vertLines, vertLinesReversed);
|
|
}
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
var gridOffset = new Vector2(_grid.TileSize * 0.5f, -_grid.TileSize * 0.5f);
|
|
|
|
for (var index = 0; index < _horizLines.Length; index++)
|
|
{
|
|
var horizLines = _horizLines[index];
|
|
foreach (var (origin, terminal) in horizLines)
|
|
{
|
|
decodedOutput.Add(new PowerMonitoringConsoleLine(origin + gridOffset, terminal + gridOffset,
|
|
(PowerMonitoringConsoleLineGroup) index));
|
|
}
|
|
}
|
|
|
|
for (var index = 0; index < _vertLines.Length; index++)
|
|
{
|
|
var vertLines = _vertLines[index];
|
|
foreach (var (origin, terminal) in vertLines)
|
|
{
|
|
decodedOutput.Add(new PowerMonitoringConsoleLine(origin + gridOffset, terminal + gridOffset,
|
|
(PowerMonitoringConsoleLineGroup) index));
|
|
}
|
|
}
|
|
|
|
return decodedOutput;
|
|
}
|
|
}
|
|
|
|
public struct PowerMonitoringConsoleLine
|
|
{
|
|
public readonly Vector2 Origin;
|
|
public readonly Vector2 Terminus;
|
|
public readonly PowerMonitoringConsoleLineGroup Group;
|
|
|
|
public PowerMonitoringConsoleLine(Vector2 origin, Vector2 terminus, PowerMonitoringConsoleLineGroup group)
|
|
{
|
|
Origin = origin;
|
|
Terminus = terminus;
|
|
Group = group;
|
|
}
|
|
}
|
|
|
|
public enum PowerMonitoringConsoleLineGroup : byte
|
|
{
|
|
HighVoltage,
|
|
MediumVoltage,
|
|
Apc,
|
|
}
|