From f55ab5cc546a964cfdd3c308fcf8863b517389e6 Mon Sep 17 00:00:00 2001
From: Jonathan <44554691+Mike32oz@users.noreply.github.com>
Date: Sun, 19 Jan 2025 22:51:25 -0600
Subject: [PATCH 001/138] ATS V2 (#1612)
# Description
Howdy, y'all, I just wanted to give you a quick update on the ATS. I've
added the proper tiny fan, add snacks, and drinks vendors, and some
lighting.
Media
Date: Mon, 20 Jan 2025 04:51:49 +0000
Subject: [PATCH 002/138] Automatic Changelog Update (#1612)
---
Resources/Changelog/Changelog.yml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 193b397ddb..d182d556f6 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10413,3 +10413,14 @@ Entries:
id: 6736
time: '2025-01-20T02:43:40.0000000+00:00'
url: https://github.com/Simple-Station/Einstein-Engines/pull/1609
+- author: Mike32oz
+ changes:
+ - type: Add
+ message: ATS, light post, snacks/drinks vendors.
+ - type: Tweak
+ message: ATS, tiny fan, convenient belt.
+ - type: Remove
+ message: ATS, spawn-MobBear in the Maintenance room.
+ id: 6737
+ time: '2025-01-20T04:51:26.0000000+00:00'
+ url: https://github.com/Simple-Station/Einstein-Engines/pull/1612
From 7d59d26654da45df2783767512c2a4c1dc8af746 Mon Sep 17 00:00:00 2001
From: Eris
Date: Sun, 19 Jan 2025 23:52:00 -0500
Subject: [PATCH 003/138] Modular Computers Part 2: Disk Burner (#1580)
# Description
This is **Part 2** of the Modular Computers system, adding the
functional player facing stuff- the modular computer itself, a way to
make and burn disks via the Disk Burner and a related research.
Also comes with some cleanup changes to fix parts of the system that
broke in testing.
---
# TODO
- [x] Actually run through this thing when my laptop is out of battery
(everything worked except CONSTRUCTING the disk burner)
- [ ] Add disk burning delay, make it more intuitive? Maybe a guidebook
entry?
---
Media
NO.
Signed-off-by: Eris
Co-authored-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Co-authored-by: VMSolidus
---
.../Components/ComputerBoardComponent.cs | 4 +
.../Computer/ComputerDiskComponent.cs | 9 +-
.../_Arcadis/Computer/ComputerDiskSystem.cs | 47 +++++++
.../_Arcadis/Computer/DiskBurnerComponent.cs | 21 ++++
.../_Arcadis/Computer/DiskBurnerSystem.cs | 117 ++++++++++++++++++
.../Computer/ModularComputerComponent.cs | 4 +
.../Computer/ModularComputerSystem.cs | 15 ++-
.../Locale/en-US/_Arcadis/modularComputer.ftl | 18 +++
.../Devices/Circuitboards/computer.yml | 5 +
.../Entities/Structures/Machines/lathe.yml | 3 +
.../Objects/Computers/baseComputerModular.yml | 26 +++-
.../Objects/Computers/computerDisk.yml | 41 ++++++
.../Objects/Computers/computerDisks.yml | 40 ------
.../Entities/Objects/Computers/diskBurner.yml | 75 +++++++++++
.../Entities/Objects/Computers/recipes.yml | 12 ++
Resources/Prototypes/_Arcadis/tags.yml | 8 ++
16 files changed, 398 insertions(+), 47 deletions(-)
create mode 100644 Content.Shared/_Arcadis/Computer/ComputerDiskSystem.cs
create mode 100644 Content.Shared/_Arcadis/Computer/DiskBurnerComponent.cs
create mode 100644 Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs
create mode 100644 Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisk.yml
delete mode 100644 Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisks.yml
create mode 100644 Resources/Prototypes/_Arcadis/Entities/Objects/Computers/diskBurner.yml
create mode 100644 Resources/Prototypes/_Arcadis/Entities/Objects/Computers/recipes.yml
create mode 100644 Resources/Prototypes/_Arcadis/tags.yml
diff --git a/Content.Shared/Construction/Components/ComputerBoardComponent.cs b/Content.Shared/Construction/Components/ComputerBoardComponent.cs
index 539e09245d..6e9bc3fd2b 100644
--- a/Content.Shared/Construction/Components/ComputerBoardComponent.cs
+++ b/Content.Shared/Construction/Components/ComputerBoardComponent.cs
@@ -11,5 +11,9 @@ public sealed partial class ComputerBoardComponent : Component
{
[DataField("prototype", customTypeSerializer: typeof(PrototypeIdSerializer))]
public string? Prototype { get; private set; }
+
+ [DataField]
+
+ public EntProtoId? ModularComputerProgramPrototype;
}
}
diff --git a/Content.Shared/_Arcadis/Computer/ComputerDiskComponent.cs b/Content.Shared/_Arcadis/Computer/ComputerDiskComponent.cs
index 5813c0342a..c170349253 100644
--- a/Content.Shared/_Arcadis/Computer/ComputerDiskComponent.cs
+++ b/Content.Shared/_Arcadis/Computer/ComputerDiskComponent.cs
@@ -7,17 +7,20 @@ namespace Content.Shared._Arcadis.Computer;
///
/// Main component for the ComputerDisk system
///
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
//[Access(typeof(ComputerDiskSystem))]
public sealed partial class ComputerDiskComponent : Component
{
///
/// The prototype of the computer that will be used
///
- [DataField]
+ [DataField, AutoNetworkedField]
public EntProtoId ProgramPrototype;
+
+ [AutoNetworkedField]
+
public EntityUid? ProgramPrototypeEntity;
- [DataField]
+ [DataField, AutoNetworkedField]
public bool PersistState;
}
diff --git a/Content.Shared/_Arcadis/Computer/ComputerDiskSystem.cs b/Content.Shared/_Arcadis/Computer/ComputerDiskSystem.cs
new file mode 100644
index 0000000000..c740029679
--- /dev/null
+++ b/Content.Shared/_Arcadis/Computer/ComputerDiskSystem.cs
@@ -0,0 +1,47 @@
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Coordinates;
+using Robust.Shared.Audio;
+using Content.Shared.Audio;
+using Robust.Shared.Network;
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Audio.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._Arcadis.Computer;
+
+public sealed class ComputerDiskSystem : EntitySystem
+{
+ public string BlankDiskPrototype = "UnburnedDiskPrototype";
+
+ [Dependency] private readonly IPrototypeManager _protoMan = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnExamined);
+ }
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+ }
+
+ private void OnExamined(EntityUid uid, ComputerDiskComponent component, ExaminedEvent args)
+ {
+ if (component.ProgramPrototype == BlankDiskPrototype)
+ args.PushMarkup(Loc.GetString("program-disk-no-program"));
+ else
+ {
+ if (!_protoMan.TryIndex(component.ProgramPrototype, out EntityPrototype? prototype))
+ args.PushMarkup(Loc.GetString("program-disk-error"));
+ else
+ args.PushMarkup(Loc.GetString("program-disk-has-program", ("program", prototype.Name)));
+ }
+ }
+}
diff --git a/Content.Shared/_Arcadis/Computer/DiskBurnerComponent.cs b/Content.Shared/_Arcadis/Computer/DiskBurnerComponent.cs
new file mode 100644
index 0000000000..3aa645d6f4
--- /dev/null
+++ b/Content.Shared/_Arcadis/Computer/DiskBurnerComponent.cs
@@ -0,0 +1,21 @@
+using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared._Arcadis.Computer;
+
+///
+/// Component responsible for handling DiskBurner behaviour
+///
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DiskBurnerComponent : Component {
+
+ [DataField]
+ public string DiskSlot = "diskSlot";
+
+ [DataField]
+ public string BoardSlot = "boardSlot";
+
+ [DataField]
+ public string VerbName = "Burn Disk";
+}
diff --git a/Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs b/Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs
new file mode 100644
index 0000000000..0856b2fbe6
--- /dev/null
+++ b/Content.Shared/_Arcadis/Computer/DiskBurnerSystem.cs
@@ -0,0 +1,117 @@
+using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Coordinates;
+using Robust.Shared.Audio;
+using Content.Shared.Audio;
+using Robust.Shared.Network;
+using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Audio.Systems;
+using Content.Shared.Popups;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Robust.Shared.Timing;
+using Content.Shared.Construction.Components;
+using Content.Shared.Verbs;
+using Robust.Shared.Utility;
+
+namespace Content.Shared._Arcadis.Computer;
+
+public sealed class DiskBurnerSystem : EntitySystem
+{
+ [Dependency] private readonly IPrototypeManager _protoMan = default!;
+
+ [Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
+
+ [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnExamined);
+ SubscribeLocalEvent>(GetVerb);
+ }
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+ }
+
+ private void GetVerb(EntityUid uid, DiskBurnerComponent component, GetVerbsEvent args)
+ {
+ args.Verbs.Add(new Verb
+ {
+ Act = () => BurnDisk(args.User, uid, component),
+ Text = Loc.GetString(component.VerbName),
+ // TODO VERB ICON find a better icon
+ Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/settings.svg.192dpi.png")),
+ });
+ }
+
+ private void BurnDisk(EntityUid user, EntityUid entity, DiskBurnerComponent component)
+ {
+ if (!TryComp(entity, out ItemSlotsComponent? slots)
+ || !_itemSlots.TryGetSlot(entity, component.DiskSlot, out var diskSlot)
+ || !_itemSlots.TryGetSlot(entity, component.BoardSlot, out var boardSlot)
+ || diskSlot.Item is null
+ || boardSlot.Item is null
+ || !TryComp(boardSlot.Item.Value, out ComputerBoardComponent? boardComp)
+ || boardComp.ModularComputerProgramPrototype is null
+ || !TryComp(diskSlot.Item.Value, out ComputerDiskComponent? diskComp))
+ {
+ _popupSystem.PopupPredicted(Loc.GetString("disk-burner-activate-not-ready"), entity, user);
+ return;
+ }
+
+ diskComp.ProgramPrototype = boardComp.ModularComputerProgramPrototype.Value;
+ _popupSystem.PopupPredicted(Loc.GetString("disk-burner-activate-finished"), entity, user);
+
+ }
+
+ private void OnExamined(EntityUid uid, DiskBurnerComponent component, ExaminedEvent args)
+ {
+ if (!TryComp(uid, out ItemSlotsComponent? slots)
+ || !_itemSlots.TryGetSlot(uid, component.DiskSlot, out var diskSlot)
+ || !_itemSlots.TryGetSlot(uid, component.BoardSlot, out var boardSlot))
+ {
+ args.PushMarkup(Loc.GetString("disk-burner-admemes-fail"));
+ return;
+ }
+
+ if (diskSlot.Item is null || boardSlot.Item is null)
+ {
+ var missing = new List();
+
+ if (diskSlot.Item is null)
+ missing.Add("disk");
+
+ if (boardSlot.Item is null)
+ missing.Add("or");
+
+ args.PushMarkup(Loc.GetString("disk-burner-missing", ("missing", string.Join(", or ", missing))));
+ return;
+ }
+
+ if (!TryComp(diskSlot.Item.Value, out ComputerDiskComponent? diskComp))
+ {
+ args.PushMarkup(Loc.GetString("disk-burner-bad-disk"));
+ return;
+ }
+
+ if (!TryComp(boardSlot.Item.Value, out ComputerBoardComponent? boardComp))
+ {
+ args.PushMarkup(Loc.GetString("disk-burner-incompatible-board"));
+ return;
+ }
+
+ if (boardComp.ModularComputerProgramPrototype is null)
+ {
+ args.PushMarkup(Loc.GetString("disk-burner-incompatible-board"));
+ return;
+ }
+
+ args.PushMarkup(Loc.GetString("disk-burner-ready"));
+
+ }
+}
diff --git a/Content.Shared/_Arcadis/Computer/ModularComputerComponent.cs b/Content.Shared/_Arcadis/Computer/ModularComputerComponent.cs
index de4fe5f2d2..3b552585ba 100644
--- a/Content.Shared/_Arcadis/Computer/ModularComputerComponent.cs
+++ b/Content.Shared/_Arcadis/Computer/ModularComputerComponent.cs
@@ -17,4 +17,8 @@ public sealed partial class ModularComputerComponent : Component
[DataField]
public SoundSpecifier? DiskInsertSound = new SoundPathSpecifier("/Audio/_Arcadis/computer_startup.ogg");
+
+ [DataField]
+
+ public bool RequiresPower = true;
}
diff --git a/Content.Shared/_Arcadis/Computer/ModularComputerSystem.cs b/Content.Shared/_Arcadis/Computer/ModularComputerSystem.cs
index 7a6d7742d1..eb4f2d27fe 100644
--- a/Content.Shared/_Arcadis/Computer/ModularComputerSystem.cs
+++ b/Content.Shared/_Arcadis/Computer/ModularComputerSystem.cs
@@ -11,6 +11,7 @@
using Content.Shared.Examine;
using Content.Shared.Interaction;
using Robust.Shared.Timing;
+using Content.Shared.Power.EntitySystems;
namespace Content.Shared._Arcadis.Computer;
@@ -28,6 +29,8 @@ public sealed class ModularComputerSystem : EntitySystem
[Dependency] private readonly IGameTiming _gameTiming = default!;
+ [Dependency] private readonly SharedPowerReceiverSystem _power = default!;
+
public string BlankDiskPrototype = "UnburnedDiskPrototype";
public override void Initialize()
{
@@ -49,6 +52,9 @@ private void OnExamined(EntityUid uid, ModularComputerComponent component, Exami
|| !_itemSlots.TryGetSlot(uid, component.DiskSlot, out var diskSlot, slots))
return;
+ if (component.RequiresPower && _power.IsPowered(uid) == false)
+ return;
+
if (diskSlot.Item == null || !TryComp(diskSlot.Item, out ComputerDiskComponent? diskComp))
{
args.PushMarkup(Loc.GetString("modular-computer-examine-no-disk"));
@@ -70,6 +76,12 @@ private void OnActivate(EntityUid uid, ModularComputerComponent component, Activ
|| !_itemSlots.TryGetSlot(uid, component.DiskSlot, out var diskSlot, slots))
return;
+ if (component.RequiresPower && _power.IsPowered(uid) == false)
+ {
+ _popupSystem.PopupPredicted(Loc.GetString("modular-computer-no-power"), uid, args.User);
+ return;
+ }
+
if (diskSlot.Item == null || !TryComp(diskSlot.Item, out ComputerDiskComponent? diskComp))
{
_popupSystem.PopupPredicted(Loc.GetString("modular-computer-no-program"), uid, args.User);
@@ -82,7 +94,8 @@ private void OnActivate(EntityUid uid, ModularComputerComponent component, Activ
return;
}
- if (_gameTiming.IsFirstTimePredicted || _netMan.IsServer) {
+ if (_netMan.IsServer) // Has to run only on server or mispredict opens 2 seperate UIs. Very bad.
+ {
var activateMsg = new ActivateInWorldEvent(args.User, diskComp.ProgramPrototypeEntity.Value, true);
RaiseLocalEvent(diskComp.ProgramPrototypeEntity.Value, activateMsg);
}
diff --git a/Resources/Locale/en-US/_Arcadis/modularComputer.ftl b/Resources/Locale/en-US/_Arcadis/modularComputer.ftl
index c3c60f3bb8..817b73cfae 100644
--- a/Resources/Locale/en-US/_Arcadis/modularComputer.ftl
+++ b/Resources/Locale/en-US/_Arcadis/modularComputer.ftl
@@ -3,3 +3,21 @@ modular-computer-no-program-on-disk = ERROR: No program on disk!
modular-computer-examine-no-disk = This computer doesn't have a program loaded.
modular-computer-examine-disk-error = This computer doesn't have a program loaded. An error on the display reports that the loaded disk has no program.
modular-computer-examine-has-program = This computer has the {$program} program loaded.
+
+modular-computer-no-power = The computer is unpowered.
+
+program-disk-no-program = This disk has no program burnt to it.
+program-disk-error = This disk has a corrupted program burnt to it.
+program-disk-has-program = This disk has the {$program} program burnt to it.
+
+disk-burner-missing = The disk burner reports that there is no {$missing} inserted.
+disk-burner-bad-disk = The disk burner reports that the disk is not suitable to be burned to.
+disk-burner-incompatible-board = The disk burner reports that the inserted board is not compatible.
+disk-burner-ready = The disk burner reports that it is ready.
+
+disk-burner-admemes-fail = The disk burner reports that a required slot is not available.
+
+disk-burner-activate-not-ready = The disk burner isn't ready yet!
+disk-burner-activate-finished = The disk burner beeps successfully!
+
+research-technology-modular-computing = Modular Computing
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index e1fd49972c..3f84df2a2a 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -17,6 +17,10 @@
Glass: 230
chemicalComposition:
Silicon: 20
+ - type: Tag
+ tags:
+ - ComputerBoard
+
- type: entity
parent: BaseComputerCircuitboard
@@ -277,6 +281,7 @@
state: cpu_command
- type: ComputerBoard
prototype: ComputerComms
+ modularComputerProgramPrototype: CommunicationsConsoleDiskPrototype
- type: entity
parent: BaseComputerCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 7355c3e5d1..1f9674a06f 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -200,6 +200,7 @@
- WeaponCapacitorRechargerCircuitboard
- HandheldStationMap
- ClothingHeadHatWelding
+ - ProgramDiskUnburnt # Arcadis - Modular Computer System
- FauxTileAstroGrass
- FauxTileMowedAstroGrass
- FauxTileJungleAstroGrass
@@ -574,6 +575,8 @@
- AutodocCircuitboard # Shitmed Change
- OperatingTableCircuitboard # Shitmed Change
- MaterialSiloCircuitboard
+ - BaseComputerModularCircuitBoard # Arcadis - Modular Computer System
+ - DiskBurnerMachineCircuitboard # Arcadis - Modular Computer System
- type: EmagLatheRecipes
emagDynamicRecipes:
- ShuttleGunDusterCircuitboard
diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/baseComputerModular.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/baseComputerModular.yml
index d522babc58..d8da10eb44 100644
--- a/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/baseComputerModular.yml
+++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/baseComputerModular.yml
@@ -4,16 +4,20 @@
name: modular computer
description: Part of a recent initiative to make computers less static. Comes with a disk slot for various "program disks".
components:
+ - type: Computer
+ board: BaseComputerModularCircuitBoard
- type: ModularComputer
- # I plan to make modular itemslots a thing in the future for stuff like the fax machine. Coming Soon:tm:
- type: ItemSlots
slots:
modularComputerDiskSlot:
- name: Disk
+ name: Program disk
insertSound:
path: /Audio/Machines/terminal_insert_disc.ogg
ejectSound:
path: /Audio/Machines/terminal_insert_disc.ogg
+ whitelist:
+ tags:
+ - ComputerDisk
- type: ContainerContainer
containers:
board: !type:Container
@@ -25,5 +29,21 @@
occludes: True
ent: null
+- type: entity
+ parent: BaseComputerCircuitboard
+ id: BaseComputerModularCircuitBoard
+ name: modular computer board
+ description: A computer printed circuit board for a modular computer.
+ components:
+ - type: ComputerBoard
+ prototype: BaseComputerModular
-
+- type: latheRecipe
+ id: BaseComputerModularCircuitBoard
+ result: BaseComputerModularCircuitBoard
+ category: Circuitry
+ completetime: 4
+ materials:
+ Steel: 100
+ Glass: 500
+ Gold: 100
diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisk.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisk.yml
new file mode 100644
index 0000000000..bb7d17865a
--- /dev/null
+++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisk.yml
@@ -0,0 +1,41 @@
+- type: entity
+ parent: BaseItem
+ id: BaseProgramDisk
+ abstract: true
+ name: program disk
+ components:
+ - type: Sprite
+ sprite: Objects/Misc/cd.rsi
+ state: icon
+ - type: ComputerDisk
+ - type: Tag
+ tags:
+ - ComputerDisk
+
+- type: entity
+ parent: BaseProgramDisk
+ id: ProgramDiskCommunications
+ name: program disk
+ suffix: Communications
+ description: A diskette for usage in a computer.
+ components:
+ - type: ComputerDisk
+ programPrototype: CommunicationsConsoleDiskPrototype
+ persistState: true
+
+- type: entity
+ parent: BaseProgramDisk
+ id: ProgramDiskUnburnt
+ name: program disk
+ description: A diskette for usage in a computer.
+ components:
+ - type: ComputerDisk
+ programPrototype: UnburnedDiskPrototype
+ persistState: true
+
+- type: latheRecipe
+ id: ProgramDiskUnburnt
+ result: ProgramDiskUnburnt
+ completetime: 2
+ materials:
+ Plastic: 50
diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisks.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisks.yml
deleted file mode 100644
index f742f46dc9..0000000000
--- a/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/computerDisks.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-- type: entity
- parent: BaseItem
- id: BaseProgramDisk
- abstract: true
- name: program disk
- components:
- - type: Sprite
- sprite: Objects/Misc/cd.rsi
- state: icon
- - type: ComputerDisk
- saveData: false
-
-- type: entity
- parent: BaseProgramDisk
- id: ProgramDiskCrewMonitor
- name: program disk (crew monitor)
- description: A diskette for usage in a computer. This one has the "Crew Monitor" program burnt to it.
- components:
- - type: ComputerDisk
- programPrototype: CrewMonitorDiskPrototype
- persistState: true
-
-- type: entity
- parent: BaseProgramDisk
- id: ProgramDiskCommunicationsConsole
- name: program disk (communications console)
- description: A diskette for usage in a computer. This one has the "Communications Console" program burnt to it.
- components:
- - type: ComputerDisk
- programPrototype: CommunicationsConsoleDiskPrototype
- persistState: true
-
-- type: entity
- parent: BaseProgramDisk
- id: ProgramDiskUnburnt
- name: program disk
- description: A diskette for usage in a computer. This one has no program burnt to it.
- components:
- - type: ComputerDisk
- programPrototype: UnburnedDiskPrototype
diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/diskBurner.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/diskBurner.yml
new file mode 100644
index 0000000000..1c012ba049
--- /dev/null
+++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/diskBurner.yml
@@ -0,0 +1,75 @@
+- type: entity
+ id: DiskBurner
+ parent: [ BaseMachinePowered, ConstructibleMachine ]
+ name: disk burner
+ description: Takes a computer circuit board and disk as input. Burns the computer board's program to the disk.
+ components:
+ - type: Sprite
+ sprite: Structures/Machines/circuit_imprinter.rsi
+ snapCardinals: true
+ layers:
+ - state: icon
+ map: ["enum.LatheVisualLayers.IsRunning"]
+ - state: unlit
+ shader: unshaded
+ map: ["enum.PowerDeviceVisualLayers.Powered"]
+ - type: Machine
+ board: DiskBurnerMachineCircuitboard
+ - type: ItemSlots
+ slots:
+ diskSlot:
+ name: Disk
+ insertSound:
+ path: /Audio/Machines/terminal_insert_disc.ogg
+ ejectSound:
+ path: /Audio/Machines/terminal_insert_disc.ogg
+ whitelist:
+ tags:
+ - ComputerDisk
+ boardSlot:
+ name: Board
+ whitelist:
+ tags:
+ - ComputerBoard
+ - type: DiskBurner
+ - type: ContainerContainer
+ containers:
+ machine_board: !type:Container
+ showEnts: False
+ occludes: True
+ ents: []
+ machine_parts: !type:Container
+ showEnts: False
+ occludes: True
+ ents: []
+ diskSlot: !type:ContainerSlot
+ showEnts: False
+ occludes: True
+ ent: null
+ boardSlot: !type:ContainerSlot
+ showEnts: False
+ occludes: True
+ ent: null
+
+- type: entity
+ id: DiskBurnerMachineCircuitboard
+ parent: BaseMachineCircuitboard
+ name: disk burner machine board
+ components:
+ - type: Sprite
+ state: science
+ - type: MachineBoard
+ prototype: DiskBurner
+ requirements:
+ Capacitor: 2
+ Manipulator: 2
+
+- type: latheRecipe
+ id: DiskBurnerMachineCircuitboard
+ result: DiskBurnerMachineCircuitboard
+ category: Circuitry
+ completetime: 4
+ materials:
+ Steel: 100
+ Glass: 700
+ Gold: 100
diff --git a/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/recipes.yml b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/recipes.yml
new file mode 100644
index 0000000000..015d0a0494
--- /dev/null
+++ b/Resources/Prototypes/_Arcadis/Entities/Objects/Computers/recipes.yml
@@ -0,0 +1,12 @@
+- type: technology
+ id: ModularComputing
+ name: research-technology-modular-computing
+ icon:
+ sprite: Objects/Misc/cd.rsi
+ state: icon
+ discipline: Experimental
+ tier: 2
+ cost: 15000
+ recipeUnlocks:
+ - BaseComputerModularCircuitBoard
+ - DiskBurnerMachineCircuitboard
diff --git a/Resources/Prototypes/_Arcadis/tags.yml b/Resources/Prototypes/_Arcadis/tags.yml
new file mode 100644
index 0000000000..145c1de108
--- /dev/null
+++ b/Resources/Prototypes/_Arcadis/tags.yml
@@ -0,0 +1,8 @@
+- type: Tag
+ id: ComputerDisk
+
+- type: Tag
+ id: ComputerBoard
+
+- type: Tag
+ id: ModularComputerEntity
From 821acb748059a270621b31daa4f18df6e259d8db Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs
Date: Mon, 20 Jan 2025 04:52:24 +0000
Subject: [PATCH 004/138] Automatic Changelog Update (#1580)
---
Resources/Changelog/Changelog.yml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index d182d556f6..3249019f9f 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -10424,3 +10424,12 @@ Entries:
id: 6737
time: '2025-01-20T04:51:26.0000000+00:00'
url: https://github.com/Simple-Station/Einstein-Engines/pull/1612
+- author: Erisfiregamer1
+ changes:
+ - type: Add
+ message: >-
+ Added the Disk Burner, the Modular Computer as a board and a way to make
+ computer disks.
+ id: 6738
+ time: '2025-01-20T04:52:00.0000000+00:00'
+ url: https://github.com/Simple-Station/Einstein-Engines/pull/1580
From 9a12e7b9980d1aef0be21bc1267064c515eaf902 Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Mon, 20 Jan 2025 02:42:04 -0400
Subject: [PATCH 005/138] Update CODEOWNERS (#1613)
---
.github/CODEOWNERS | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8cf49bc037..85545ac8a7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,10 +1,13 @@
+# hasn't specified or all
+* @sleepyyapril @VMSolidus @Remuchi
+
/.* @DEATHB4DEFEAT
*.sln @DEATHB4DEFEAT
*.csproj @DEATHB4DEFEAT
*.dotsettings @DEATHB4DEFEAT
*.DotSettings @DEATHB4DEFEAT
*.toml @DEATHB4DEFEAT
-/Content.*/IoC @sleepyyapril @DEATHB4DEFEAT
+/Content.*/IoC @DEATHB4DEFEAT
# Nix
@@ -14,8 +17,8 @@
# UI
-*.xaml @sleepyyapril @DEATHB4DEFEAT
-*.xaml.cs @sleepyyapril @DEATHB4DEFEAT
+*.xaml @DEATHB4DEFEAT
+*.xaml.cs @DEATHB4DEFEAT
# Lobby
/Content.Client/Lobby @DEATHB4DEFEAT
@@ -28,7 +31,7 @@
# Writing
*.xml @DEATHB4DEFEAT
-*.ftl @DEATHB4DEFEAT @sleepyyapril
+*.ftl @DEATHB4DEFEAT
*.md @DEATHB4DEFEAT
*.txt @DEATHB4DEFEAT
@@ -67,15 +70,15 @@
# Database
-/Content.*/Database @sleepyyapril @DEATHB4DEFEAT
-/Content.*/.Database @sleepyyapril @DEATHB4DEFEAT
+/Content.*/Database @DEATHB4DEFEAT
+/Content.*/.Database @DEATHB4DEFEAT
# Preferences
/Content.*/Preferences @DEATHB4DEFEAT
-**/*CVar*/*.cs @sleepyyapril @DEATHB4DEFEAT
+**/*CVar*/*.cs @DEATHB4DEFEAT
# Discord
-/Content.*/Discord* @sleepyyapril @DEATHB4DEFEAT
+/Content.*/Discord* @DEATHB4DEFEAT
# Loadouts
/Resources/Prototypes/Loadouts @angelofallars
From 9272f65b64392f66a7cd4fd7c84bb152dc93b65a Mon Sep 17 00:00:00 2001
From: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
Date: Mon, 20 Jan 2025 03:24:23 -0400
Subject: [PATCH 006/138] Mapping Mini-Wizmerge & New Central Command (#1610)
# Description
Ports https://github.com/space-wizards/space-station-14/pull/32294
Ports https://github.com/ss14-harmony/ss14-harmony/pull/310 (and
everything needed for it to function)
Early-merges
https://github.com/space-wizards/space-station-14/pull/34302
Adds the ability for multiple central command maps that get randomly
selected.
Tested and works.
---
# Changelog
:cl: Several contributors
- add: Added a new central command map that is randomly picked alongside
the old one (thank you to Spanky from Harmony)
- add: Added Advanced SMES for mappers.
- add: Added the atmospheric network monitor for seeing what the
temperature, moles, and pressure is on every pipe everywhere through a
computer.
- add: Nukie med bundle now contains a compact defibrillator.
- add: Ported a better mapping editor.
- add: Added the throngler plushie.
- remove: Removed the Throngler as a possible loot spawn for gamble
crates.
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
---
.../Consoles/AtmosAlarmEntryContainer.xaml.cs | 22 +-
...tmosMonitoringConsoleBoundUserInterface.cs | 40 +
.../AtmosMonitoringConsoleNavMapControl.cs | 295 +
.../Consoles/AtmosMonitoringConsoleSystem.cs | 69 +
.../AtmosMonitoringConsoleWindow.xaml | 99 +
.../AtmosMonitoringConsoleWindow.xaml.cs | 455 +
.../AtmosMonitoringEntryContainer.xaml | 74 +
.../AtmosMonitoringEntryContainer.xaml.cs | 166 +
.../Commands/MappingClientSideSetupCommand.cs | 5 +-
.../Mapping/MappingActionsButton.xaml | 4 +-
Content.Client/Mapping/MappingManager.cs | 46 +
Content.Client/Mapping/MappingOverlay.cs | 77 +-
Content.Client/Mapping/MappingPrototype.cs | 5 +
.../Mapping/MappingPrototypeList.xaml | 17 +-
.../Mapping/MappingPrototypeList.xaml.cs | 189 +-
Content.Client/Mapping/MappingScreen.xaml | 183 +-
Content.Client/Mapping/MappingScreen.xaml.cs | 153 +-
.../Mapping/MappingSpawnButton.xaml | 20 +-
.../Mapping/MappingSpawnButton.xaml.cs | 77 +-
Content.Client/Mapping/MappingState.cs | 1005 +-
.../Mapping/MappingVisibilityButton.xaml | 5 +
.../Mapping/MappingVisibilityButton.xaml.cs | 15 +
.../Mapping/MappingVisibilityGroupButton.xaml | 5 +
.../MappingVisibilityGroupButton.xaml.cs | 15 +
.../Mapping/MappingVisibilityUIController.cs | 155 +
.../Mapping/MappingVisibilityWindow.xaml | 21 +
.../Mapping/MappingVisibilityWindow.xaml.cs | 15 +
.../Options/UI/Tabs/KeyRebindTab.xaml.cs | 3 +
Content.Client/Pinpointer/UI/NavMapControl.cs | 49 +-
.../Systems/Admin/AdminUIController.cs | 8 +
.../Systems/EscapeMenu/EscapeUIController.cs | 70 +-
.../Interaction/ComputerContruction.cs | 4 +-
.../Tests/PostMapInitTest.cs | 9 +-
.../Consoles/AtmosMonitoringConsoleSystem.cs | 542 +
.../AtmosphereSystem.Commands.cs | 5 +-
.../EntitySystems/AtmosphereSystem.Hotspot.cs | 33 +-
.../Atmos/EntitySystems/AtmosphereSystem.cs | 19 +
.../Monitor/Components/AirAlarmComponent.cs | 4 +-
.../Components/AtmosMonitorComponent.cs | 19 +-
.../Monitor/Systems/AtmosMonitoringSystem.cs | 17 +-
.../Components/AtmosPipeColorComponent.cs | 29 +-
.../EntitySystems/AtmosPipeColorSystem.cs | 3 +
.../Trinary/Components/GasFilterComponent.cs | 28 +-
.../Components/GasVentScrubberComponent.cs | 22 +-
Content.Server/Decals/DecalSystem.cs | 28 -
Content.Server/Mapping/MappingManager.cs | 58 +-
.../Power/Components/CableComponent.cs | 5 +-
.../Power/EntitySystems/CableSystem.cs | 5 +-
.../Components/StationCentcommComponent.cs | 6 +-
.../Systems/EmergencyShuttleSystem.cs | 29 +-
Content.Shared/Atmos/Atmospherics.cs | 16 +
.../Components/GasPipeSensorComponent.cs | 10 +
.../AtmosMonitoringConsoleComponent.cs | 235 +
.../AtmosMonitoringConsoleDeviceComponent.cs | 21 +
.../SharedAtmosMonitoringConsoleSystem.cs | 115 +
Content.Shared/Decals/SharedDecalSystem.cs | 28 +
Content.Shared/Input/ContentKeyFunctions.cs | 1 +
.../Mapping/MappingFavoritesDataMessage.cs | 31 +
.../Mapping/MappingFavoritesLoadMessage.cs | 19 +
.../Mapping/MappingFavoritesSaveMessage.cs | 31 +
.../Mapping/MappingTemplatePrototype.cs | 33 +
Content.Shared/Prayer/PrayableComponent.cs | 10 +-
.../Prototypes/NavMapBlipPrototype.cs | 42 +
.../en-US/atmos/atmos-alerts-console.ftl | 3 +
.../Locale/en-US/atmos/gas-pipe-sensor.ftl | 5 +
Resources/Locale/en-US/atmos/gases.ftl | 10 +
.../components/atmos-monitoring-component.ftl | 14 +
.../en-US/escape-menu/ui/options-menu.ftl | 5 +-
Resources/Locale/en-US/forensics/fibers.ftl | 6 +-
Resources/Locale/en-US/mapping/editor.ftl | 25 +-
.../en-US/mapping/mapping-visibility.ftl | 14 +
Resources/Locale/en-US/mapping/templates.ftl | 55 +
.../Locale/en-US/store/uplink-catalog.ftl | 4 +-
Resources/Maps/CentralCommand/harmony.yml | 44804 ++++++++
.../{centcomm.yml => CentralCommand/main.yml} | 84122 ++++++++--------
.../Prototypes/Atmospherics/thresholds.yml | 27 +-
.../Catalog/Fills/Backpacks/duffelbag.yml | 16 +-
.../Prototypes/Catalog/Fills/Crates/cargo.yml | 5 +-
.../Prototypes/Catalog/uplink_catalog.yml | 4 +-
.../Prototypes/Decals/Overlays/grayscale.yml | 120 +
.../Prototypes/Decals/Overlays/markups.yml | 49 +
.../Prototypes/Decals/bricktile_dark.yml | 27 +
.../Prototypes/Decals/bricktile_steel.yml | 23 +
.../Prototypes/Decals/bricktile_white.yml | 23 +
Resources/Prototypes/Decals/burnt.yml | 39 +
Resources/Prototypes/Decals/concrete_trim.yml | 66 +
Resources/Prototypes/Decals/crayons.yml | 237 +-
Resources/Prototypes/Decals/derelictsign.yml | 21 +
Resources/Prototypes/Decals/dirty.yml | 13 +-
Resources/Prototypes/Decals/flora.yml | 146 +
Resources/Prototypes/Decals/markings.yml | 71 +
Resources/Prototypes/Decals/minitile_dark.yml | 23 +
.../Prototypes/Decals/minitile_steel.yml | 23 +
.../Prototypes/Decals/minitile_white.yml | 23 +
Resources/Prototypes/Decals/originsign.yml | 17 +
Resources/Prototypes/Decals/planet.yml | 13 +
Resources/Prototypes/Decals/rock.yml | 10 +
Resources/Prototypes/Decals/ss14sign.yml | 12 +-
Resources/Prototypes/Decals/stairs.yml | 35 +-
Resources/Prototypes/Decals/syndlogo.yml | 26 +-
.../Prototypes/Decals/wood_trim_thin.yml | 22 +
.../Markers/Spawners/Random/miningrock.yml | 1 +
.../Entities/Clothing/Back/backpacks.yml | 10 +
.../Entities/Clothing/Multiple/towel.yml | 765 +
.../Markers/Spawners/Random/posters.yml | 2 +
.../Entities/Markers/atmos_blocker.yml | 9 +
.../Circuitboards/Machine/production.yml | 17 +
.../Devices/Circuitboards/computer.yml | 9 +
.../Objects/Devices/hand_teleporter.yml | 16 +
.../Fun/Instruments/instruments_misc.yml | 15 +-
.../Prototypes/Entities/Objects/Fun/toys.yml | 16 +
.../Objects/Specific/Medical/defib.yml | 66 +
.../Objects/Specific/Medical/hypospray.yml | 97 +-
.../Structures/Doors/Airlocks/access.yml | 9 +
.../Computers/base_structurecomputers.yml | 29 +
.../Machines/Computers/computers.yml | 215 +-
.../Machines/Computers/nav_map_blips.yml | 56 +
.../Structures/Machines/Medical/cryo_pod.yml | 2 +
.../Entities/Structures/Machines/lathe.yml | 1 +
.../Structures/Piping/Atmospherics/binary.yml | 34 +-
.../Piping/Atmospherics/gas_pipe_sensor.yml | 87 +
.../Structures/Piping/Atmospherics/pipes.yml | 1 +
.../Piping/Atmospherics/special.yml | 29 +
.../Piping/Atmospherics/trinary.yml | 10 +-
.../Structures/Piping/Atmospherics/unary.yml | 65 +-
.../Structures/Piping/Disposal/pipes.yml | 4 +
.../Structures/Power/cable_terminal.yml | 8 +
.../Entities/Structures/Power/cables.yml | 27 +
.../Entities/Structures/Power/smes.yml | 45 +
.../Specific/Atmospherics/sensor.yml | 58 +-
.../Structures/Specific/Atmospherics/vox.yml | 50 +
.../Structures/Wallmounts/Signs/posters.yml | 19 +
.../Structures/Wallmounts/Signs/signs.yml | 9 +
.../Prototypes/Loadouts/loadout_groups.yml | 0
.../Prototypes/Mapping/mapping_templates.yml | 1160 +
.../Maps/CentralCommand/harmony.yml | 14 +
.../{centcomm.yml => CentralCommand/main.yml} | 8 +-
Resources/Prototypes/Palettes/atmos.yml | 9 +
.../Construction/Graphs/machines/computer.yml | 6 +-
.../Graphs/utilities/gas_pipe_sensor.yml | 29 +
.../Recipes/Construction/utilities.yml | 15 +
.../Prototypes/Recipes/Lathes/electronics.yml | 67 +
Resources/Prototypes/Research/industrial.yml | 1 +
Resources/Prototypes/Wires/layouts.yml | 6 +-
.../Entities/Objects/Devices/red_phone.yml | 49 +
Resources/Prototypes/tags.yml | 13 +-
.../Clothing/Multiple/towel.rsi/NTmono.png | Bin 0 -> 1369 bytes
.../Multiple/towel.rsi/equipped-BELT.png | Bin 0 -> 545 bytes
.../Multiple/towel.rsi/equipped-HELMET.png | Bin 0 -> 556 bytes
.../towel.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 584 bytes
.../Clothing/Multiple/towel.rsi/icon.png | Bin 0 -> 284 bytes
.../Multiple/towel.rsi/iconstripe.png | Bin 0 -> 1506 bytes
.../Multiple/towel.rsi/inhand-left.png | Bin 0 -> 428 bytes
.../Multiple/towel.rsi/inhand-right.png | Bin 0 -> 430 bytes
.../Clothing/Multiple/towel.rsi/meta.json | 40 +
.../Decals/Overlays/markups.rsi/meta.json | 26 +
.../Overlays/markups.rsi/rectangle1x2.png | Bin 0 -> 115 bytes
.../markups.rsi/rectangle1x2center.png | Bin 0 -> 115 bytes
.../Decals/Overlays/markups.rsi/square.png | Bin 0 -> 117 bytes
.../Overlays/markups.rsi/squareQuater.png | Bin 0 -> 116 bytes
.../markups.rsi/squareQuaterCenter.png | Bin 0 -> 122 bytes
.../Textures/Decals/burnt.rsi/burnt1.png | Bin 0 -> 896 bytes
.../Textures/Decals/burnt.rsi/burnt2.png | Bin 0 -> 938 bytes
.../Textures/Decals/burnt.rsi/burnt3.png | Bin 0 -> 928 bytes
.../Textures/Decals/burnt.rsi/burnt4.png | Bin 0 -> 1041 bytes
Resources/Textures/Decals/burnt.rsi/meta.json | 27 +
.../Interface/NavMap/attributions.yml | 59 +
.../Interface/NavMap/beveled_arrow_east.png | Bin 0 -> 1135 bytes
.../NavMap/beveled_arrow_east.png.yml | 2 +
.../Interface/NavMap/beveled_arrow_north.png | Bin 0 -> 1034 bytes
.../NavMap/beveled_arrow_north.png.yml | 2 +
.../Interface/NavMap/beveled_arrow_south.png | Bin 0 -> 1151 bytes
.../NavMap/beveled_arrow_south.png.yml | 2 +
.../Interface/NavMap/beveled_arrow_west.png | Bin 0 -> 1203 bytes
.../NavMap/beveled_arrow_west.png.yml | 2 +
.../Interface/NavMap/beveled_diamond.png | Bin 0 -> 2481 bytes
.../Interface/NavMap/beveled_diamond.png.yml | 2 +
.../NavMap/beveled_diamond_east_west.png | Bin 0 -> 1779 bytes
.../NavMap/beveled_diamond_east_west.png.yml | 2 +
.../NavMap/beveled_diamond_north_south.png | Bin 0 -> 1928 bytes
.../beveled_diamond_north_south.png.yml | 2 +
.../Interface/NavMap/beveled_star.png | Bin 0 -> 1920 bytes
.../Interface/NavMap/beveled_star.png.yml | 2 +
.../Interface/VerbIcons/ATTRIBUTION.txt | 5 +
.../VerbIcons/chevron-down-solid.svg | 1 +
.../chevron-down-solid.svg.192dpi.png | Bin 0 -> 2595 bytes
.../chevron-down-solid.svg.192dpi.png.yml | 2 +
.../VerbIcons/chevron-right-solid.svg | 1 +
.../chevron-right-solid.svg.192dpi.png | Bin 0 -> 2203 bytes
.../chevron-right-solid.svg.192dpi.png.yml | 2 +
.../Textures/Interface/VerbIcons/collapse.svg | 22 +
.../VerbIcons/collapse.svg.192dpi.png | Bin 0 -> 29831 bytes
.../VerbIcons/collapse.svg.192dpi.png.yml | 2 +
.../VerbIcons/comment-dots-regular.svg | 1 +
.../comment-dots-regular.svg.192dpi.png | Bin 0 -> 9270 bytes
.../comment-dots-regular.svg.192dpi.png.yml | 2 +
.../Interface/VerbIcons/layer-group-solid.svg | 1 +
.../layer-group-solid.svg.192dpi.png | Bin 0 -> 7705 bytes
.../layer-group-solid.svg.192dpi.png.yml | 2 +
.../Textures/Interface/VerbIcons/oxygen.svg | 22 +
.../Interface/VerbIcons/oxygen.svg.192dpi.png | Bin 0 -> 43844 bytes
.../VerbIcons/oxygen.svg.192dpi.png.yml | 2 +
.../VerbIcons/paint-roller-solid.svg | 1 +
.../paint-roller-solid.svg.192dpi.png | Bin 0 -> 4923 bytes
.../paint-roller-solid.svg.192dpi.png.yml | 2 +
.../Interface/VerbIcons/star-regular.svg | 1 +
.../VerbIcons/star-regular.svg.192dpi.png | Bin 0 -> 16253 bytes
.../VerbIcons/star-regular.svg.192dpi.png.yml | 2 +
.../Interface/VerbIcons/star-solid-yellow.svg | 1 +
.../star-solid-yellow.svg.192dpi.png | Bin 0 -> 5962 bytes
.../star-solid-yellow.svg.192dpi.png.yml | 2 +
.../VerbIcons/wand-magic-sparkles-solid.svg | 1 +
.../wand-magic-sparkles-solid.svg.192dpi.png | Bin 0 -> 7217 bytes
...nd-magic-sparkles-solid.svg.192dpi.png.yml | 2 +
.../Interface/VerbIcons/xmark-solid.svg | 1 +
.../VerbIcons/xmark-solid.svg.192dpi.png | Bin 0 -> 3825 bytes
.../VerbIcons/xmark-solid.svg.192dpi.png.yml | 2 +
.../Specific/Medical/defibsmall.rsi/icon.png | Bin 0 -> 300 bytes
.../Medical/defibsmall.rsi/inhand-left.png | Bin 0 -> 294 bytes
.../Medical/defibsmall.rsi/inhand-right.png | Bin 0 -> 300 bytes
.../Specific/Medical/defibsmall.rsi/meta.json | 28 +
.../Specific/Medical/defibsmall.rsi/ready.png | Bin 0 -> 178 bytes
.../Medical/defibsmall.rsi/screen.png | Bin 0 -> 198 bytes
.../Specific/Medical/defibsyndi.rsi/icon.png | Bin 0 -> 300 bytes
.../Medical/defibsyndi.rsi/inhand-left.png | Bin 0 -> 290 bytes
.../Medical/defibsyndi.rsi/inhand-right.png | Bin 0 -> 295 bytes
.../Specific/Medical/defibsyndi.rsi/meta.json | 28 +
.../Specific/Medical/defibsyndi.rsi/ready.png | Bin 0 -> 158 bytes
.../Medical/defibsyndi.rsi/screen.png | Bin 0 -> 191 bytes
.../Specific/Medical/medipen.rsi/dexpen.png | Bin 0 -> 286 bytes
.../Medical/medipen.rsi/dexpen_empty.png | Bin 0 -> 311 bytes
.../Specific/Medical/medipen.rsi/meta.json | 18 +
.../Specific/Medical/medipen.rsi/punctpen.png | Bin 0 -> 286 bytes
.../Medical/medipen.rsi/punctpen_empty.png | Bin 0 -> 311 bytes
.../Specific/Medical/medipen.rsi/pyrapen.png | Bin 0 -> 286 bytes
.../Medical/medipen.rsi/pyrapen_empty.png | Bin 0 -> 311 bytes
.../Melee/ThronglerPlushie.rsi/icon.png | Bin 0 -> 877 bytes
.../Melee/ThronglerPlushie.rsi/meta.json | 14 +
.../computers.rsi/generic_panel_open.png | Bin 0 -> 405 bytes
.../Machines/computers.rsi/meta.json | 6 +-
.../Atmospherics/directionalfan.rsi/icon.png | Bin 0 -> 16522 bytes
.../Atmospherics/directionalfan.rsi/meta.json | 29 +
.../Atmospherics/gas_pipe_sensor.rsi/base.png | Bin 0 -> 248 bytes
.../gas_pipe_sensor.rsi/blank.png | Bin 0 -> 83 bytes
.../Atmospherics/gas_pipe_sensor.rsi/icon.png | Bin 0 -> 523 bytes
.../gas_pipe_sensor.rsi/lights.png | Bin 0 -> 183 bytes
.../gas_pipe_sensor.rsi/meta.json | 29 +
.../Power/smes.rsi/advancedsmes-open.png | Bin 0 -> 1208 bytes
.../Power/smes.rsi/advancedsmes-static.png | Bin 0 -> 1124 bytes
.../Power/smes.rsi/advancedsmes.png | Bin 0 -> 1093 bytes
.../Structures/Power/smes.rsi/meta.json | 11 +-
.../Wallmounts/posters.rsi/meta.json | 8 +-
.../Wallmounts/posters.rsi/poster52_legit.png | Bin 0 -> 15982 bytes
.../Wallmounts/posters.rsi/poster53_legit.png | Bin 0 -> 3081 bytes
.../Structures/Wallmounts/signs.rsi/bath.png | Bin 0 -> 458 bytes
.../Structures/Wallmounts/signs.rsi/meta.json | 3 +
Resources/keybinds.yml | 4 +
257 files changed, 95730 insertions(+), 42831 deletions(-)
create mode 100644 Content.Client/Atmos/Consoles/AtmosMonitoringConsoleBoundUserInterface.cs
create mode 100644 Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
create mode 100644 Content.Client/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
create mode 100644 Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml
create mode 100644 Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml.cs
create mode 100644 Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml
create mode 100644 Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs
create mode 100644 Content.Client/Mapping/MappingVisibilityButton.xaml
create mode 100644 Content.Client/Mapping/MappingVisibilityButton.xaml.cs
create mode 100644 Content.Client/Mapping/MappingVisibilityGroupButton.xaml
create mode 100644 Content.Client/Mapping/MappingVisibilityGroupButton.xaml.cs
create mode 100644 Content.Client/Mapping/MappingVisibilityUIController.cs
create mode 100644 Content.Client/Mapping/MappingVisibilityWindow.xaml
create mode 100644 Content.Client/Mapping/MappingVisibilityWindow.xaml.cs
create mode 100644 Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
create mode 100644 Content.Shared/Atmos/Components/GasPipeSensorComponent.cs
create mode 100644 Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
create mode 100644 Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleDeviceComponent.cs
create mode 100644 Content.Shared/Atmos/Consoles/SharedAtmosMonitoringConsoleSystem.cs
create mode 100644 Content.Shared/Mapping/MappingFavoritesDataMessage.cs
create mode 100644 Content.Shared/Mapping/MappingFavoritesLoadMessage.cs
create mode 100644 Content.Shared/Mapping/MappingFavoritesSaveMessage.cs
create mode 100644 Content.Shared/Mapping/MappingTemplatePrototype.cs
create mode 100644 Content.Shared/Prototypes/NavMapBlipPrototype.cs
create mode 100644 Resources/Locale/en-US/atmos/gas-pipe-sensor.ftl
create mode 100644 Resources/Locale/en-US/atmos/gases.ftl
create mode 100644 Resources/Locale/en-US/components/atmos-monitoring-component.ftl
create mode 100644 Resources/Locale/en-US/mapping/mapping-visibility.ftl
create mode 100644 Resources/Locale/en-US/mapping/templates.ftl
create mode 100644 Resources/Maps/CentralCommand/harmony.yml
rename Resources/Maps/{centcomm.yml => CentralCommand/main.yml} (95%)
create mode 100644 Resources/Prototypes/Decals/Overlays/markups.yml
create mode 100644 Resources/Prototypes/Decals/burnt.yml
create mode 100644 Resources/Prototypes/Entities/Clothing/Multiple/towel.yml
create mode 100644 Resources/Prototypes/Entities/Structures/Machines/Computers/nav_map_blips.yml
create mode 100644 Resources/Prototypes/Entities/Structures/Piping/Atmospherics/gas_pipe_sensor.yml
create mode 100644 Resources/Prototypes/Entities/Structures/Specific/Atmospherics/vox.yml
delete mode 100644 Resources/Prototypes/Loadouts/loadout_groups.yml
create mode 100644 Resources/Prototypes/Mapping/mapping_templates.yml
create mode 100644 Resources/Prototypes/Maps/CentralCommand/harmony.yml
rename Resources/Prototypes/Maps/{centcomm.yml => CentralCommand/main.yml} (72%)
create mode 100644 Resources/Prototypes/Palettes/atmos.yml
create mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/utilities/gas_pipe_sensor.yml
create mode 100644 Resources/Prototypes/_Harmony/Entities/Objects/Devices/red_phone.yml
create mode 100644 Resources/Textures/Clothing/Multiple/towel.rsi/NTmono.png
create mode 100644 Resources/Textures/Clothing/Multiple/towel.rsi/equipped-BELT.png
create mode 100644 Resources/Textures/Clothing/Multiple/towel.rsi/equipped-HELMET.png
create mode 100644 Resources/Textures/Clothing/Multiple/towel.rsi/equipped-INNERCLOTHING.png
create mode 100644 Resources/Textures/Clothing/Multiple/towel.rsi/icon.png
create mode 100644 Resources/Textures/Clothing/Multiple/towel.rsi/iconstripe.png
create mode 100644 Resources/Textures/Clothing/Multiple/towel.rsi/inhand-left.png
create mode 100644 Resources/Textures/Clothing/Multiple/towel.rsi/inhand-right.png
create mode 100644 Resources/Textures/Clothing/Multiple/towel.rsi/meta.json
create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/meta.json
create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2.png
create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2center.png
create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/square.png
create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/squareQuater.png
create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/squareQuaterCenter.png
create mode 100644 Resources/Textures/Decals/burnt.rsi/burnt1.png
create mode 100644 Resources/Textures/Decals/burnt.rsi/burnt2.png
create mode 100644 Resources/Textures/Decals/burnt.rsi/burnt3.png
create mode 100644 Resources/Textures/Decals/burnt.rsi/burnt4.png
create mode 100644 Resources/Textures/Decals/burnt.rsi/meta.json
create mode 100644 Resources/Textures/Interface/NavMap/attributions.yml
create mode 100644 Resources/Textures/Interface/NavMap/beveled_arrow_east.png
create mode 100644 Resources/Textures/Interface/NavMap/beveled_arrow_east.png.yml
create mode 100644 Resources/Textures/Interface/NavMap/beveled_arrow_north.png
create mode 100644 Resources/Textures/Interface/NavMap/beveled_arrow_north.png.yml
create mode 100644 Resources/Textures/Interface/NavMap/beveled_arrow_south.png
create mode 100644 Resources/Textures/Interface/NavMap/beveled_arrow_south.png.yml
create mode 100644 Resources/Textures/Interface/NavMap/beveled_arrow_west.png
create mode 100644 Resources/Textures/Interface/NavMap/beveled_arrow_west.png.yml
create mode 100644 Resources/Textures/Interface/NavMap/beveled_diamond.png
create mode 100644 Resources/Textures/Interface/NavMap/beveled_diamond.png.yml
create mode 100644 Resources/Textures/Interface/NavMap/beveled_diamond_east_west.png
create mode 100644 Resources/Textures/Interface/NavMap/beveled_diamond_east_west.png.yml
create mode 100644 Resources/Textures/Interface/NavMap/beveled_diamond_north_south.png
create mode 100644 Resources/Textures/Interface/NavMap/beveled_diamond_north_south.png.yml
create mode 100644 Resources/Textures/Interface/NavMap/beveled_star.png
create mode 100644 Resources/Textures/Interface/NavMap/beveled_star.png.yml
create mode 100644 Resources/Textures/Interface/VerbIcons/chevron-down-solid.svg
create mode 100644 Resources/Textures/Interface/VerbIcons/chevron-down-solid.svg.192dpi.png
create mode 100644 Resources/Textures/Interface/VerbIcons/chevron-down-solid.svg.192dpi.png.yml
create mode 100644 Resources/Textures/Interface/VerbIcons/chevron-right-solid.svg
create mode 100644 Resources/Textures/Interface/VerbIcons/chevron-right-solid.svg.192dpi.png
create mode 100644 Resources/Textures/Interface/VerbIcons/chevron-right-solid.svg.192dpi.png.yml
create mode 100644 Resources/Textures/Interface/VerbIcons/collapse.svg
create mode 100644 Resources/Textures/Interface/VerbIcons/collapse.svg.192dpi.png
create mode 100644 Resources/Textures/Interface/VerbIcons/collapse.svg.192dpi.png.yml
create mode 100644 Resources/Textures/Interface/VerbIcons/comment-dots-regular.svg
create mode 100644 Resources/Textures/Interface/VerbIcons/comment-dots-regular.svg.192dpi.png
create mode 100644 Resources/Textures/Interface/VerbIcons/comment-dots-regular.svg.192dpi.png.yml
create mode 100644 Resources/Textures/Interface/VerbIcons/layer-group-solid.svg
create mode 100644 Resources/Textures/Interface/VerbIcons/layer-group-solid.svg.192dpi.png
create mode 100644 Resources/Textures/Interface/VerbIcons/layer-group-solid.svg.192dpi.png.yml
create mode 100644 Resources/Textures/Interface/VerbIcons/oxygen.svg
create mode 100644 Resources/Textures/Interface/VerbIcons/oxygen.svg.192dpi.png
create mode 100644 Resources/Textures/Interface/VerbIcons/oxygen.svg.192dpi.png.yml
create mode 100644 Resources/Textures/Interface/VerbIcons/paint-roller-solid.svg
create mode 100644 Resources/Textures/Interface/VerbIcons/paint-roller-solid.svg.192dpi.png
create mode 100644 Resources/Textures/Interface/VerbIcons/paint-roller-solid.svg.192dpi.png.yml
create mode 100644 Resources/Textures/Interface/VerbIcons/star-regular.svg
create mode 100644 Resources/Textures/Interface/VerbIcons/star-regular.svg.192dpi.png
create mode 100644 Resources/Textures/Interface/VerbIcons/star-regular.svg.192dpi.png.yml
create mode 100644 Resources/Textures/Interface/VerbIcons/star-solid-yellow.svg
create mode 100644 Resources/Textures/Interface/VerbIcons/star-solid-yellow.svg.192dpi.png
create mode 100644 Resources/Textures/Interface/VerbIcons/star-solid-yellow.svg.192dpi.png.yml
create mode 100644 Resources/Textures/Interface/VerbIcons/wand-magic-sparkles-solid.svg
create mode 100644 Resources/Textures/Interface/VerbIcons/wand-magic-sparkles-solid.svg.192dpi.png
create mode 100644 Resources/Textures/Interface/VerbIcons/wand-magic-sparkles-solid.svg.192dpi.png.yml
create mode 100644 Resources/Textures/Interface/VerbIcons/xmark-solid.svg
create mode 100644 Resources/Textures/Interface/VerbIcons/xmark-solid.svg.192dpi.png
create mode 100644 Resources/Textures/Interface/VerbIcons/xmark-solid.svg.192dpi.png.yml
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/meta.json
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/ready.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen_empty.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png
create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen_empty.png
create mode 100644 Resources/Textures/Objects/Weapons/Melee/ThronglerPlushie.rsi/icon.png
create mode 100644 Resources/Textures/Objects/Weapons/Melee/ThronglerPlushie.rsi/meta.json
create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/generic_panel_open.png
create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/icon.png
create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi/meta.json
create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/base.png
create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/blank.png
create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/icon.png
create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/lights.png
create mode 100644 Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi/meta.json
create mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes-open.png
create mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes-static.png
create mode 100644 Resources/Textures/Structures/Power/smes.rsi/advancedsmes.png
create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster52_legit.png
create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_legit.png
create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/bath.png
diff --git a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
index b0d0365ef6..3cc3a5f459 100644
--- a/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
+++ b/Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
@@ -31,19 +31,6 @@ public sealed partial class AtmosAlarmEntryContainer : BoxContainer
[AtmosAlarmType.Danger] = "atmos-alerts-window-danger-state",
};
- private Dictionary _gasShorthands = new Dictionary()
- {
- [Gas.Ammonia] = "NH₃",
- [Gas.CarbonDioxide] = "CO₂",
- [Gas.Frezon] = "F",
- [Gas.Nitrogen] = "N₂",
- [Gas.NitrousOxide] = "N₂O",
- [Gas.Oxygen] = "O₂",
- [Gas.Plasma] = "P",
- [Gas.Tritium] = "T",
- [Gas.WaterVapor] = "H₂O",
- };
-
public AtmosAlarmEntryContainer(NetEntity uid, EntityCoordinates? coordinates)
{
RobustXamlLoader.Load(this);
@@ -160,15 +147,12 @@ public void UpdateEntry(AtmosAlertsComputerEntry entry, bool isFocus, AtmosAlert
// Add an entry for each gas
foreach ((var gas, (var mol, var percent, var alert)) in gasData)
{
- var gasPercent = (FixedPoint2)0f;
- gasPercent = percent * 100f;
-
- if (!_gasShorthands.TryGetValue(gas, out var gasShorthand))
- gasShorthand = "X";
+ FixedPoint2 gasPercent = percent * 100f;
+ var gasAbbreviation = Atmospherics.GasAbbreviations.GetValueOrDefault(gas, Loc.GetString("gas-unknown-abbreviation"));
var gasLabel = new Label()
{
- Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasShorthand), ("value", gasPercent)),
+ Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasAbbreviation), ("value", gasPercent)),
FontOverride = normalFont,
FontColorOverride = GetAlarmStateColor(alert),
HorizontalAlignment = HAlignment.Center,
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleBoundUserInterface.cs b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleBoundUserInterface.cs
new file mode 100644
index 0000000000..563122f962
--- /dev/null
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleBoundUserInterface.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Atmos.Components;
+
+namespace Content.Client.Atmos.Consoles;
+
+public sealed class AtmosMonitoringConsoleBoundUserInterface : BoundUserInterface
+{
+ [ViewVariables]
+ private AtmosMonitoringConsoleWindow? _menu;
+
+ public AtmosMonitoringConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { }
+
+ protected override void Open()
+ {
+ base.Open();
+
+ _menu = new AtmosMonitoringConsoleWindow(this, Owner);
+ _menu.OpenCentered();
+ _menu.OnClose += Close;
+ }
+
+ protected override void UpdateState(BoundUserInterfaceState state)
+ {
+ base.UpdateState(state);
+
+ if (state is not AtmosMonitoringConsoleBoundInterfaceState castState)
+ return;
+
+ EntMan.TryGetComponent(Owner, out var xform);
+ _menu?.UpdateUI(xform?.Coordinates, castState.AtmosNetworks);
+ }
+
+ protected override void Dispose(bool disposing)
+ {
+ base.Dispose(disposing);
+ if (!disposing)
+ return;
+
+ _menu?.Dispose();
+ }
+}
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
new file mode 100644
index 0000000000..c23ebb6435
--- /dev/null
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs
@@ -0,0 +1,295 @@
+using Content.Client.Pinpointer.UI;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Pinpointer;
+using Robust.Client.Graphics;
+using Robust.Shared.Collections;
+using Robust.Shared.Map.Components;
+using System.Linq;
+using System.Numerics;
+
+namespace Content.Client.Atmos.Consoles;
+
+public sealed partial class AtmosMonitoringConsoleNavMapControl : NavMapControl
+{
+ [Dependency] private readonly IEntityManager _entManager = default!;
+
+ public bool ShowPipeNetwork = true;
+ public int? FocusNetId = null;
+
+ private const int ChunkSize = 4;
+
+ private readonly Color _basePipeNetColor = Color.LightGray;
+ private readonly Color _unfocusedPipeNetColor = Color.DimGray;
+
+ private List _atmosPipeNetwork = new();
+ private Dictionary _sRGBLookUp = new Dictionary();
+
+ // Look up tables for merging continuous lines. Indexed by line color
+ private Dictionary> _horizLines = new();
+ private Dictionary> _horizLinesReversed = new();
+ private Dictionary> _vertLines = new();
+ private Dictionary> _vertLinesReversed = new();
+
+ public AtmosMonitoringConsoleNavMapControl() : base()
+ {
+ PostWallDrawingAction += DrawAllPipeNetworks;
+ }
+
+ protected override void UpdateNavMap()
+ {
+ base.UpdateNavMap();
+
+ if (!_entManager.TryGetComponent(Owner, out var console))
+ return;
+
+ if (!_entManager.TryGetComponent(MapUid, out var grid))
+ return;
+
+ _atmosPipeNetwork = GetDecodedAtmosPipeChunks(console.AtmosPipeChunks, grid);
+ }
+
+ private void DrawAllPipeNetworks(DrawingHandleScreen handle)
+ {
+ if (!ShowPipeNetwork)
+ return;
+
+ // Draw networks
+ if (_atmosPipeNetwork != null && _atmosPipeNetwork.Any())
+ DrawPipeNetwork(handle, _atmosPipeNetwork);
+ }
+
+ private void DrawPipeNetwork(DrawingHandleScreen handle, List atmosPipeNetwork)
+ {
+ var offset = GetOffset();
+ offset = offset with { Y = -offset.Y };
+
+ if (WorldRange / WorldMaxRange > 0.5f)
+ {
+ var pipeNetworks = new Dictionary>();
+
+ foreach (var chunkedLine in atmosPipeNetwork)
+ {
+ var start = ScalePosition(chunkedLine.Origin - offset);
+ var end = ScalePosition(chunkedLine.Terminus - offset);
+
+ if (!pipeNetworks.TryGetValue(chunkedLine.Color, out var subNetwork))
+ subNetwork = new ValueList();
+
+ subNetwork.Add(start);
+ subNetwork.Add(end);
+
+ pipeNetworks[chunkedLine.Color] = subNetwork;
+ }
+
+ foreach ((var color, var subNetwork) in pipeNetworks)
+ {
+ if (subNetwork.Count > 0)
+ handle.DrawPrimitives(DrawPrimitiveTopology.LineList, subNetwork.Span, color);
+ }
+ }
+
+ else
+ {
+ var pipeVertexUVs = new Dictionary>();
+
+ foreach (var chunkedLine in atmosPipeNetwork)
+ {
+ var leftTop = ScalePosition(new Vector2
+ (Math.Min(chunkedLine.Origin.X, chunkedLine.Terminus.X) - 0.1f,
+ Math.Min(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) - 0.1f)
+ - offset);
+
+ var rightTop = ScalePosition(new Vector2
+ (Math.Max(chunkedLine.Origin.X, chunkedLine.Terminus.X) + 0.1f,
+ Math.Min(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) - 0.1f)
+ - offset);
+
+ var leftBottom = ScalePosition(new Vector2
+ (Math.Min(chunkedLine.Origin.X, chunkedLine.Terminus.X) - 0.1f,
+ Math.Max(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) + 0.1f)
+ - offset);
+
+ var rightBottom = ScalePosition(new Vector2
+ (Math.Max(chunkedLine.Origin.X, chunkedLine.Terminus.X) + 0.1f,
+ Math.Max(chunkedLine.Origin.Y, chunkedLine.Terminus.Y) + 0.1f)
+ - offset);
+
+ if (!pipeVertexUVs.TryGetValue(chunkedLine.Color, out var pipeVertexUV))
+ pipeVertexUV = new ValueList();
+
+ pipeVertexUV.Add(leftBottom);
+ pipeVertexUV.Add(leftTop);
+ pipeVertexUV.Add(rightBottom);
+ pipeVertexUV.Add(leftTop);
+ pipeVertexUV.Add(rightBottom);
+ pipeVertexUV.Add(rightTop);
+
+ pipeVertexUVs[chunkedLine.Color] = pipeVertexUV;
+ }
+
+ foreach ((var color, var pipeVertexUV) in pipeVertexUVs)
+ {
+ if (pipeVertexUV.Count > 0)
+ handle.DrawPrimitives(DrawPrimitiveTopology.TriangleList, pipeVertexUV.Span, color);
+ }
+ }
+ }
+
+ private List GetDecodedAtmosPipeChunks(Dictionary? chunks, MapGridComponent? grid)
+ {
+ var decodedOutput = new List();
+
+ if (chunks == null || grid == null)
+ return decodedOutput;
+
+ // Clear stale look up table values
+ _horizLines.Clear();
+ _horizLinesReversed.Clear();
+ _vertLines.Clear();
+ _vertLinesReversed.Clear();
+
+ // Generate masks
+ var northMask = (ulong)1 << 0;
+ var southMask = (ulong)1 << 1;
+ var westMask = (ulong)1 << 2;
+ var eastMask = (ulong)1 << 3;
+
+ foreach ((var chunkOrigin, var chunk) in chunks)
+ {
+ var list = new List();
+
+ foreach (var ((netId, hexColor), atmosPipeData) in chunk.AtmosPipeData)
+ {
+ // Determine the correct coloration for the pipe
+ var color = Color.FromHex(hexColor) * _basePipeNetColor;
+
+ if (FocusNetId != null && FocusNetId != netId)
+ color *= _unfocusedPipeNetColor;
+
+ // Get the associated line look up tables
+ if (!_horizLines.TryGetValue(color, out var horizLines))
+ {
+ horizLines = new();
+ _horizLines[color] = horizLines;
+ }
+
+ if (!_horizLinesReversed.TryGetValue(color, out var horizLinesReversed))
+ {
+ horizLinesReversed = new();
+ _horizLinesReversed[color] = horizLinesReversed;
+ }
+
+ if (!_vertLines.TryGetValue(color, out var vertLines))
+ {
+ vertLines = new();
+ _vertLines[color] = vertLines;
+ }
+
+ if (!_vertLinesReversed.TryGetValue(color, out var vertLinesReversed))
+ {
+ vertLinesReversed = new();
+ _vertLinesReversed[color] = vertLinesReversed;
+ }
+
+ // Loop over the chunk
+ for (var tileIdx = 0; tileIdx < ChunkSize * ChunkSize; tileIdx++)
+ {
+ if (atmosPipeData == 0)
+ continue;
+
+ var mask = (ulong)SharedNavMapSystem.AllDirMask << tileIdx * SharedNavMapSystem.Directions;
+
+ if ((atmosPipeData & mask) == 0)
+ continue;
+
+ var relativeTile = GetTileFromIndex(tileIdx);
+ var tile = (chunk.Origin * ChunkSize + relativeTile) * grid.TileSize;
+ tile = tile with { Y = -tile.Y };
+
+ // Calculate the draw point offsets
+ var vertLineOrigin = (atmosPipeData & northMask << tileIdx * SharedNavMapSystem.Directions) > 0 ?
+ new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 1f) : new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 0.5f);
+
+ var vertLineTerminus = (atmosPipeData & southMask << tileIdx * SharedNavMapSystem.Directions) > 0 ?
+ new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 0f) : new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 0.5f);
+
+ var horizLineOrigin = (atmosPipeData & eastMask << tileIdx * SharedNavMapSystem.Directions) > 0 ?
+ new Vector2(grid.TileSize * 1f, -grid.TileSize * 0.5f) : new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 0.5f);
+
+ var horizLineTerminus = (atmosPipeData & westMask << tileIdx * SharedNavMapSystem.Directions) > 0 ?
+ new Vector2(grid.TileSize * 0f, -grid.TileSize * 0.5f) : new Vector2(grid.TileSize * 0.5f, -grid.TileSize * 0.5f);
+
+ // Since we can have pipe lines that have a length of a half tile,
+ // double the vectors and convert to vector2i so we can merge them
+ AddOrUpdateNavMapLine(ConvertVector2ToVector2i(tile + horizLineOrigin, 2), ConvertVector2ToVector2i(tile + horizLineTerminus, 2), horizLines, horizLinesReversed);
+ AddOrUpdateNavMapLine(ConvertVector2ToVector2i(tile + vertLineOrigin, 2), ConvertVector2ToVector2i(tile + vertLineTerminus, 2), vertLines, vertLinesReversed);
+ }
+ }
+ }
+
+ // Scale the vector2is back down and convert to vector2
+ foreach (var (color, horizLines) in _horizLines)
+ {
+ // Get the corresponding sRBG color
+ var sRGB = GetsRGBColor(color);
+
+ foreach (var (origin, terminal) in horizLines)
+ decodedOutput.Add(new AtmosMonitoringConsoleLine
+ (ConvertVector2iToVector2(origin, 0.5f), ConvertVector2iToVector2(terminal, 0.5f), sRGB));
+ }
+
+ foreach (var (color, vertLines) in _vertLines)
+ {
+ // Get the corresponding sRBG color
+ var sRGB = GetsRGBColor(color);
+
+ foreach (var (origin, terminal) in vertLines)
+ decodedOutput.Add(new AtmosMonitoringConsoleLine
+ (ConvertVector2iToVector2(origin, 0.5f), ConvertVector2iToVector2(terminal, 0.5f), sRGB));
+ }
+
+ return decodedOutput;
+ }
+
+ private Vector2 ConvertVector2iToVector2(Vector2i vector, float scale = 1f)
+ {
+ return new Vector2(vector.X * scale, vector.Y * scale);
+ }
+
+ private Vector2i ConvertVector2ToVector2i(Vector2 vector, float scale = 1f)
+ {
+ return new Vector2i((int)MathF.Round(vector.X * scale), (int)MathF.Round(vector.Y * scale));
+ }
+
+ private Vector2i GetTileFromIndex(int index)
+ {
+ var x = index / ChunkSize;
+ var y = index % ChunkSize;
+ return new Vector2i(x, y);
+ }
+
+ private Color GetsRGBColor(Color color)
+ {
+ if (!_sRGBLookUp.TryGetValue(color, out var sRGB))
+ {
+ sRGB = Color.ToSrgb(color);
+ _sRGBLookUp[color] = sRGB;
+ }
+
+ return sRGB;
+ }
+}
+
+public struct AtmosMonitoringConsoleLine
+{
+ public readonly Vector2 Origin;
+ public readonly Vector2 Terminus;
+ public readonly Color Color;
+
+ public AtmosMonitoringConsoleLine(Vector2 origin, Vector2 terminus, Color color)
+ {
+ Origin = origin;
+ Terminus = terminus;
+ Color = color;
+ }
+}
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
new file mode 100644
index 0000000000..bfbb05d2ab
--- /dev/null
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
@@ -0,0 +1,69 @@
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.Consoles;
+using Robust.Shared.GameStates;
+
+namespace Content.Client.Atmos.Consoles;
+
+public sealed class AtmosMonitoringConsoleSystem : SharedAtmosMonitoringConsoleSystem
+{
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnHandleState);
+ }
+
+ private void OnHandleState(EntityUid uid, AtmosMonitoringConsoleComponent component, ref ComponentHandleState args)
+ {
+ Dictionary> modifiedChunks;
+ Dictionary atmosDevices;
+
+ switch (args.Current)
+ {
+ case AtmosMonitoringConsoleDeltaState delta:
+ {
+ modifiedChunks = delta.ModifiedChunks;
+ atmosDevices = delta.AtmosDevices;
+
+ foreach (var index in component.AtmosPipeChunks.Keys)
+ {
+ if (!delta.AllChunks!.Contains(index))
+ component.AtmosPipeChunks.Remove(index);
+ }
+
+ break;
+ }
+
+ case AtmosMonitoringConsoleState state:
+ {
+ modifiedChunks = state.Chunks;
+ atmosDevices = state.AtmosDevices;
+
+ foreach (var index in component.AtmosPipeChunks.Keys)
+ {
+ if (!state.Chunks.ContainsKey(index))
+ component.AtmosPipeChunks.Remove(index);
+ }
+
+ break;
+ }
+ default:
+ return;
+ }
+
+ foreach (var (origin, chunk) in modifiedChunks)
+ {
+ var newChunk = new AtmosPipeChunk(origin);
+ newChunk.AtmosPipeData = new Dictionary<(int, string), ulong>(chunk);
+
+ component.AtmosPipeChunks[origin] = newChunk;
+ }
+
+ component.AtmosDevices.Clear();
+
+ foreach (var (nuid, atmosDevice) in atmosDevices)
+ {
+ component.AtmosDevices[nuid] = atmosDevice;
+ }
+ }
+}
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml
new file mode 100644
index 0000000000..b6fde7592f
--- /dev/null
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml.cs b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml.cs
new file mode 100644
index 0000000000..515f91790f
--- /dev/null
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleWindow.xaml.cs
@@ -0,0 +1,455 @@
+using Content.Client.Pinpointer.UI;
+using Content.Client.UserInterface.Controls;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Prototypes;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+namespace Content.Client.Atmos.Consoles;
+
+[GenerateTypedNameReferences]
+public sealed partial class AtmosMonitoringConsoleWindow : FancyWindow
+{
+ private readonly IEntityManager _entManager;
+ private readonly IPrototypeManager _protoManager;
+ private readonly SpriteSystem _spriteSystem;
+
+ private EntityUid? _owner;
+ private NetEntity? _focusEntity;
+ private int? _focusNetId;
+
+ private bool _autoScrollActive = false;
+
+ private readonly Color _unfocusedDeviceColor = Color.DimGray;
+ private ProtoId _navMapConsoleProtoId = "NavMapConsole";
+ private ProtoId _gasPipeSensorProtoId = "GasPipeSensor";
+
+ public AtmosMonitoringConsoleWindow(AtmosMonitoringConsoleBoundUserInterface userInterface, EntityUid? owner)
+ {
+ RobustXamlLoader.Load(this);
+ _entManager = IoCManager.Resolve();
+ _protoManager = IoCManager.Resolve();
+ _spriteSystem = _entManager.System();
+
+ // Pass the owner to nav map
+ _owner = owner;
+ NavMap.Owner = _owner;
+
+ // Set nav map grid uid
+ var stationName = Loc.GetString("atmos-monitoring-window-unknown-location");
+ EntityCoordinates? consoleCoords = null;
+
+ if (_entManager.TryGetComponent(owner, out var xform))
+ {
+ consoleCoords = xform.Coordinates;
+ NavMap.MapUid = xform.GridUid;
+
+ // Assign station name
+ if (_entManager.TryGetComponent(xform.GridUid, out var stationMetaData))
+ stationName = stationMetaData.EntityName;
+
+ var msg = new FormattedMessage();
+ msg.TryAddMarkup(Loc.GetString("atmos-monitoring-window-station-name", ("stationName", stationName)), out _);
+
+ StationName.SetMessage(msg);
+ }
+
+ else
+ {
+ StationName.SetMessage(stationName);
+ NavMap.Visible = false;
+ }
+
+ // Set trackable entity selected action
+ NavMap.TrackedEntitySelectedAction += SetTrackedEntityFromNavMap;
+
+ // Update nav map
+ NavMap.ForceNavMapUpdate();
+
+ // Set tab container headers
+ MasterTabContainer.SetTabTitle(0, Loc.GetString("atmos-monitoring-window-tab-networks"));
+
+ // Set UI toggles
+ ShowPipeNetwork.OnToggled += _ => OnShowPipeNetworkToggled();
+ ShowGasPipeSensors.OnToggled += _ => OnShowGasPipeSensors();
+
+ // Set nav map colors
+ if (!_entManager.TryGetComponent(_owner, out var console))
+ return;
+
+ NavMap.TileColor = console.NavMapTileColor;
+ NavMap.WallColor = console.NavMapWallColor;
+
+ // Initalize
+ UpdateUI(consoleCoords, Array.Empty());
+ }
+
+ #region Toggle handling
+
+ private void OnShowPipeNetworkToggled()
+ {
+ if (_owner == null)
+ return;
+
+ if (!_entManager.TryGetComponent(_owner.Value, out var console))
+ return;
+
+ NavMap.ShowPipeNetwork = ShowPipeNetwork.Pressed;
+
+ foreach (var (netEnt, device) in console.AtmosDevices)
+ {
+ if (device.NavMapBlip == _gasPipeSensorProtoId)
+ continue;
+
+ if (ShowPipeNetwork.Pressed)
+ AddTrackedEntityToNavMap(device);
+
+ else
+ NavMap.TrackedEntities.Remove(netEnt);
+ }
+ }
+
+ private void OnShowGasPipeSensors()
+ {
+ if (_owner == null)
+ return;
+
+ if (!_entManager.TryGetComponent(_owner.Value, out var console))
+ return;
+
+ foreach (var (netEnt, device) in console.AtmosDevices)
+ {
+ if (device.NavMapBlip != _gasPipeSensorProtoId)
+ continue;
+
+ if (ShowGasPipeSensors.Pressed)
+ AddTrackedEntityToNavMap(device, true);
+
+ else
+ NavMap.TrackedEntities.Remove(netEnt);
+ }
+ }
+
+ #endregion
+
+ public void UpdateUI
+ (EntityCoordinates? consoleCoords,
+ AtmosMonitoringConsoleEntry[] atmosNetworks)
+ {
+ if (_owner == null)
+ return;
+
+ if (!_entManager.TryGetComponent(_owner.Value, out var console))
+ return;
+
+ // Reset nav map values
+ NavMap.TrackedCoordinates.Clear();
+ NavMap.TrackedEntities.Clear();
+
+ if (_focusEntity != null && !console.AtmosDevices.Any(x => x.Key == _focusEntity))
+ ClearFocus();
+
+ // Add tracked entities to the nav map
+ UpdateNavMapBlips();
+
+ // Show the monitor location
+ var consoleNetEnt = _entManager.GetNetEntity(_owner);
+
+ if (consoleCoords != null && consoleNetEnt != null)
+ {
+ var proto = _protoManager.Index(_navMapConsoleProtoId);
+
+ if (proto.TexturePaths != null && proto.TexturePaths.Length != 0)
+ {
+ var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(proto.TexturePaths[0]));
+ var blip = new NavMapBlip(consoleCoords.Value, texture, proto.Color, proto.Blinks, proto.Selectable);
+ NavMap.TrackedEntities[consoleNetEnt.Value] = blip;
+ }
+ }
+
+ // Update the nav map
+ NavMap.ForceNavMapUpdate();
+
+ // Clear excess children from the tables
+ while (AtmosNetworksTable.ChildCount > atmosNetworks.Length)
+ AtmosNetworksTable.RemoveChild(AtmosNetworksTable.GetChild(AtmosNetworksTable.ChildCount - 1));
+
+ // Update all entries in each table
+ for (int index = 0; index < atmosNetworks.Length; index++)
+ {
+ var entry = atmosNetworks.ElementAt(index);
+ UpdateUIEntry(entry, index, AtmosNetworksTable, console);
+ }
+ }
+
+ private void UpdateNavMapBlips()
+ {
+ if (_owner == null || !_entManager.TryGetComponent(_owner.Value, out var console))
+ return;
+
+ if (NavMap.Visible)
+ {
+ foreach (var (netEnt, device) in console.AtmosDevices)
+ {
+ // Update the focus network ID, incase it has changed
+ if (_focusEntity == netEnt)
+ {
+ _focusNetId = device.NetId;
+ NavMap.FocusNetId = _focusNetId;
+ }
+
+ var isSensor = device.NavMapBlip == _gasPipeSensorProtoId;
+
+ // Skip network devices if the toggled is off
+ if (!ShowPipeNetwork.Pressed && !isSensor)
+ continue;
+
+ // Skip gas pipe sensors if the toggle is off
+ if (!ShowGasPipeSensors.Pressed && isSensor)
+ continue;
+
+ AddTrackedEntityToNavMap(device, isSensor);
+ }
+ }
+ }
+
+ private void AddTrackedEntityToNavMap(AtmosDeviceNavMapData metaData, bool isSensor = false)
+ {
+ var proto = _protoManager.Index(metaData.NavMapBlip);
+
+ if (proto.TexturePaths == null || proto.TexturePaths.Length == 0)
+ return;
+
+ var idx = Math.Clamp((int)metaData.Direction / 2, 0, proto.TexturePaths.Length - 1);
+ var texture = proto.TexturePaths.Length > 0 ? proto.TexturePaths[idx] : proto.TexturePaths[0];
+ var color = isSensor ? proto.Color : proto.Color * metaData.PipeColor;
+
+ if (_focusNetId != null && metaData.NetId != _focusNetId)
+ color *= _unfocusedDeviceColor;
+
+ var blinks = proto.Blinks || _focusEntity == metaData.NetEntity;
+ var coords = _entManager.GetCoordinates(metaData.NetCoordinates);
+ var blip = new NavMapBlip(coords, _spriteSystem.Frame0(new SpriteSpecifier.Texture(texture)), color, blinks, proto.Selectable, proto.Scale);
+ NavMap.TrackedEntities[metaData.NetEntity] = blip;
+ }
+
+ private void UpdateUIEntry(AtmosMonitoringConsoleEntry data, int index, Control table, AtmosMonitoringConsoleComponent console)
+ {
+ // Make new UI entry if required
+ if (index >= table.ChildCount)
+ {
+ var newEntryContainer = new AtmosMonitoringEntryContainer(data);
+
+ // On click
+ newEntryContainer.FocusButton.OnButtonUp += args =>
+ {
+ if (_focusEntity == newEntryContainer.Data.NetEntity)
+ {
+ ClearFocus();
+ }
+
+ else
+ {
+ SetFocus(newEntryContainer.Data.NetEntity, newEntryContainer.Data.NetId);
+
+ var coords = _entManager.GetCoordinates(newEntryContainer.Data.Coordinates);
+ NavMap.CenterToCoordinates(coords);
+ }
+
+ // Update affected UI elements across all tables
+ UpdateConsoleTable(console, AtmosNetworksTable, _focusEntity);
+ };
+
+ // Add the entry to the current table
+ table.AddChild(newEntryContainer);
+ }
+
+ // Update values and UI elements
+ var tableChild = table.GetChild(index);
+
+ if (tableChild is not AtmosMonitoringEntryContainer)
+ {
+ table.RemoveChild(tableChild);
+ UpdateUIEntry(data, index, table, console);
+
+ return;
+ }
+
+ var entryContainer = (AtmosMonitoringEntryContainer)tableChild;
+ entryContainer.UpdateEntry(data, data.NetEntity == _focusEntity);
+ }
+
+ private void UpdateConsoleTable(AtmosMonitoringConsoleComponent console, Control table, NetEntity? currTrackedEntity)
+ {
+ foreach (var tableChild in table.Children)
+ {
+ if (tableChild is not AtmosAlarmEntryContainer)
+ continue;
+
+ var entryContainer = (AtmosAlarmEntryContainer)tableChild;
+
+ if (entryContainer.NetEntity != currTrackedEntity)
+ entryContainer.RemoveAsFocus();
+
+ else if (entryContainer.NetEntity == currTrackedEntity)
+ entryContainer.SetAsFocus();
+ }
+ }
+
+ private void SetTrackedEntityFromNavMap(NetEntity? focusEntity)
+ {
+ if (focusEntity == null)
+ return;
+
+ if (!_entManager.TryGetComponent(_owner, out var console))
+ return;
+
+ foreach (var (netEnt, device) in console.AtmosDevices)
+ {
+ if (netEnt != focusEntity)
+ continue;
+
+ if (device.NavMapBlip != _gasPipeSensorProtoId)
+ return;
+
+ // Set new focus
+ SetFocus(focusEntity.Value, device.NetId);
+
+ // Get the scroll position of the selected entity on the selected button the UI
+ ActivateAutoScrollToFocus();
+
+ break;
+ }
+ }
+
+ protected override void FrameUpdate(FrameEventArgs args)
+ {
+ AutoScrollToFocus();
+ }
+
+ private void ActivateAutoScrollToFocus()
+ {
+ _autoScrollActive = true;
+ }
+
+ private void AutoScrollToFocus()
+ {
+ if (!_autoScrollActive)
+ return;
+
+ var scroll = AtmosNetworksTable.Parent as ScrollContainer;
+ if (scroll == null)
+ return;
+
+ if (!TryGetVerticalScrollbar(scroll, out var vScrollbar))
+ return;
+
+ if (!TryGetNextScrollPosition(out float? nextScrollPosition))
+ return;
+
+ vScrollbar.ValueTarget = nextScrollPosition.Value;
+
+ if (MathHelper.CloseToPercent(vScrollbar.Value, vScrollbar.ValueTarget))
+ _autoScrollActive = false;
+ }
+
+ private bool TryGetVerticalScrollbar(ScrollContainer scroll, [NotNullWhen(true)] out VScrollBar? vScrollBar)
+ {
+ vScrollBar = null;
+
+ foreach (var control in scroll.Children)
+ {
+ if (control is not VScrollBar)
+ continue;
+
+ vScrollBar = (VScrollBar)control;
+
+ return true;
+ }
+
+ return false;
+ }
+
+ private bool TryGetNextScrollPosition([NotNullWhen(true)] out float? nextScrollPosition)
+ {
+ nextScrollPosition = null;
+
+ var scroll = AtmosNetworksTable.Parent as ScrollContainer;
+ if (scroll == null)
+ return false;
+
+ var container = scroll.Children.ElementAt(0) as BoxContainer;
+ if (container == null || container.Children.Count() == 0)
+ return false;
+
+ // Exit if the heights of the children haven't been initialized yet
+ if (!container.Children.Any(x => x.Height > 0))
+ return false;
+
+ nextScrollPosition = 0;
+
+ foreach (var control in container.Children)
+ {
+ if (control is not AtmosMonitoringEntryContainer)
+ continue;
+
+ var entry = (AtmosMonitoringEntryContainer)control;
+
+ if (entry.Data.NetEntity == _focusEntity)
+ return true;
+
+ nextScrollPosition += control.Height;
+ }
+
+ // Failed to find control
+ nextScrollPosition = null;
+
+ return false;
+ }
+
+ private void SetFocus(NetEntity focusEntity, int focusNetId)
+ {
+ _focusEntity = focusEntity;
+ _focusNetId = focusNetId;
+ NavMap.FocusNetId = focusNetId;
+
+ OnFocusChanged();
+ }
+
+ private void ClearFocus()
+ {
+ _focusEntity = null;
+ _focusNetId = null;
+ NavMap.FocusNetId = null;
+
+ OnFocusChanged();
+ }
+
+ private void OnFocusChanged()
+ {
+ UpdateNavMapBlips();
+ NavMap.ForceNavMapUpdate();
+
+ if (!_entManager.TryGetComponent(_owner, out var console))
+ return;
+
+ for (int index = 0; index < AtmosNetworksTable.ChildCount; index++)
+ {
+ var entry = (AtmosMonitoringEntryContainer)AtmosNetworksTable.GetChild(index);
+
+ if (entry == null)
+ continue;
+
+ UpdateUIEntry(entry.Data, index, AtmosNetworksTable, console);
+ }
+ }
+}
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml b/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml
new file mode 100644
index 0000000000..6a19f0775f
--- /dev/null
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs b/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs
new file mode 100644
index 0000000000..0ce0c9c880
--- /dev/null
+++ b/Content.Client/Atmos/Consoles/AtmosMonitoringEntryContainer.xaml.cs
@@ -0,0 +1,166 @@
+using Content.Client.Stylesheets;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Content.Shared.FixedPoint;
+using Content.Shared.Temperature;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.ResourceManagement;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using System.Linq;
+
+namespace Content.Client.Atmos.Consoles;
+
+[GenerateTypedNameReferences]
+public sealed partial class AtmosMonitoringEntryContainer : BoxContainer
+{
+ public AtmosMonitoringConsoleEntry Data;
+
+ private readonly IEntityManager _entManager;
+ private readonly IResourceCache _cache;
+
+ public AtmosMonitoringEntryContainer(AtmosMonitoringConsoleEntry data)
+ {
+ RobustXamlLoader.Load(this);
+ _entManager = IoCManager.Resolve();
+ _cache = IoCManager.Resolve();
+
+ Data = data;
+
+ // Modulate colored stripe
+ NetworkColorStripe.Modulate = data.Color;
+
+ // Load fonts
+ var headerFont = new VectorFont(_cache.GetResource("/Fonts/NotoSans/NotoSans-Bold.ttf"), 11);
+ var normalFont = new VectorFont(_cache.GetResource("/Fonts/NotoSansDisplay/NotoSansDisplay-Regular.ttf"), 11);
+
+ // Set fonts
+ TemperatureHeaderLabel.FontOverride = headerFont;
+ PressureHeaderLabel.FontOverride = headerFont;
+ TotalMolHeaderLabel.FontOverride = headerFont;
+ GasesHeaderLabel.FontOverride = headerFont;
+
+ TemperatureLabel.FontOverride = normalFont;
+ PressureLabel.FontOverride = normalFont;
+ TotalMolLabel.FontOverride = normalFont;
+
+ NoDataLabel.FontOverride = headerFont;
+ }
+
+ public void UpdateEntry(AtmosMonitoringConsoleEntry updatedData, bool isFocus)
+ {
+ // Load fonts
+ var normalFont = new VectorFont(_cache.GetResource("/Fonts/NotoSansDisplay/NotoSansDisplay-Regular.ttf"), 11);
+
+ // Update name and values
+ if (!string.IsNullOrEmpty(updatedData.Address))
+ NetworkNameLabel.Text = Loc.GetString("atmos-alerts-window-alarm-label", ("name", updatedData.EntityName), ("address", updatedData.Address));
+
+ else
+ NetworkNameLabel.Text = Loc.GetString(updatedData.EntityName);
+
+ Data = updatedData;
+
+ // Modulate colored stripe
+ NetworkColorStripe.Modulate = Data.Color;
+
+ // Focus updates
+ if (isFocus)
+ SetAsFocus();
+ else
+ RemoveAsFocus();
+
+ // Check if powered
+ if (!updatedData.IsPowered)
+ {
+ MainDataContainer.Visible = false;
+ NoDataLabel.Visible = true;
+
+ return;
+ }
+
+ // Set container visibility
+ MainDataContainer.Visible = true;
+ NoDataLabel.Visible = false;
+
+ // Update temperature
+ var isNotVacuum = updatedData.TotalMolData > 1e-6f;
+ var tempK = (FixedPoint2)updatedData.TemperatureData;
+ var tempC = (FixedPoint2)TemperatureHelpers.KelvinToCelsius(tempK.Float());
+
+ TemperatureLabel.Text = isNotVacuum ?
+ Loc.GetString("atmos-alerts-window-temperature-value", ("valueInC", tempC), ("valueInK", tempK)) :
+ Loc.GetString("atmos-alerts-window-invalid-value");
+
+ TemperatureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
+
+ // Update pressure
+ PressureLabel.Text = Loc.GetString("atmos-alerts-window-pressure-value", ("value", (FixedPoint2)updatedData.PressureData));
+ PressureLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
+
+ // Update total mol
+ TotalMolLabel.Text = Loc.GetString("atmos-alerts-window-total-mol-value", ("value", (FixedPoint2)updatedData.TotalMolData));
+ TotalMolLabel.FontColorOverride = isNotVacuum ? Color.DarkGray : StyleNano.DisabledFore;
+
+ // Update other present gases
+ GasGridContainer.RemoveAllChildren();
+
+ if (updatedData.GasData.Count() == 0)
+ {
+ // No gases
+ var gasLabel = new Label()
+ {
+ Text = Loc.GetString("atmos-alerts-window-other-gases-value-nil"),
+ FontOverride = normalFont,
+ FontColorOverride = StyleNano.DisabledFore,
+ HorizontalAlignment = HAlignment.Center,
+ VerticalAlignment = VAlignment.Center,
+ HorizontalExpand = true,
+ Margin = new Thickness(0, 2, 0, 0),
+ SetHeight = 24f,
+ };
+
+ GasGridContainer.AddChild(gasLabel);
+ }
+
+ else
+ {
+ // Add an entry for each gas
+ foreach (var (gas, percent) in updatedData.GasData)
+ {
+ var gasPercent = (FixedPoint2)0f;
+ gasPercent = percent * 100f;
+
+ var gasAbbreviation = Atmospherics.GasAbbreviations.GetValueOrDefault(gas, Loc.GetString("gas-unknown-abbreviation"));
+
+ var gasLabel = new Label()
+ {
+ Text = Loc.GetString("atmos-alerts-window-other-gases-value", ("shorthand", gasAbbreviation), ("value", gasPercent)),
+ FontOverride = normalFont,
+ HorizontalAlignment = HAlignment.Center,
+ VerticalAlignment = VAlignment.Center,
+ HorizontalExpand = true,
+ Margin = new Thickness(0, 2, 0, 0),
+ SetHeight = 24f,
+ };
+
+ GasGridContainer.AddChild(gasLabel);
+ }
+ }
+ }
+
+ public void SetAsFocus()
+ {
+ FocusButton.AddStyleClass(StyleNano.StyleClassButtonColorGreen);
+ ArrowTexture.TexturePath = "/Textures/Interface/Nano/inverted_triangle.svg.png";
+ FocusContainer.Visible = true;
+ }
+
+ public void RemoveAsFocus()
+ {
+ FocusButton.RemoveStyleClass(StyleNano.StyleClassButtonColorGreen);
+ ArrowTexture.TexturePath = "/Textures/Interface/Nano/triangle_right.png";
+ FocusContainer.Visible = false;
+ }
+}
diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs
index eb2d13c954..464f39e6e6 100644
--- a/Content.Client/Commands/MappingClientSideSetupCommand.cs
+++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs
@@ -24,8 +24,9 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
{
_entitySystemManager.GetEntitySystem().MarkersVisible = true;
_lightManager.Enabled = false;
- shell.ExecuteCommand("showsubfloorforever");
- _stateManager.RequestStateChange();
+ shell.ExecuteCommand("showsubfloor");
+ shell.ExecuteCommand("zoom 1.5");
+ shell.ExecuteCommand("scene MappingState");
}
}
}
diff --git a/Content.Client/Mapping/MappingActionsButton.xaml b/Content.Client/Mapping/MappingActionsButton.xaml
index 099719a70e..d96335b02c 100644
--- a/Content.Client/Mapping/MappingActionsButton.xaml
+++ b/Content.Client/Mapping/MappingActionsButton.xaml
@@ -1,8 +1,8 @@
-
diff --git a/Content.Client/Mapping/MappingManager.cs b/Content.Client/Mapping/MappingManager.cs
index 1aac02be71..c2a5868779 100644
--- a/Content.Client/Mapping/MappingManager.cs
+++ b/Content.Client/Mapping/MappingManager.cs
@@ -1,9 +1,13 @@
using System.IO;
+using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Content.Shared.Decals;
using Content.Shared.Mapping;
+using Content.Shared.Maps;
using Robust.Client.UserInterface;
using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
namespace Content.Client.Mapping;
@@ -11,15 +15,21 @@ public sealed class MappingManager : IPostInjectInit
{
[Dependency] private readonly IFileDialogManager _file = default!;
[Dependency] private readonly IClientNetManager _net = default!;
+ [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
private Stream? _saveStream;
private MappingMapDataMessage? _mapData;
+ private List? _favoritePrototypes;
+
+ public event Action>? OnFavoritePrototypesLoaded;
public void PostInject()
{
_net.RegisterNetMessage();
_net.RegisterNetMessage(OnSaveError);
_net.RegisterNetMessage(OnMapData);
+ _net.RegisterNetMessage(OnFavoritesData);
+ _net.RegisterNetMessage();
}
private void OnSaveError(MappingSaveMapErrorMessage message)
@@ -43,6 +53,23 @@ private async void OnMapData(MappingMapDataMessage message)
_mapData = null;
}
+ private void OnFavoritesData(MappingFavoritesDataMessage message)
+ {
+ _favoritePrototypes = new List();
+
+ foreach (var prototype in message.PrototypeIDs)
+ {
+ if (_prototypeManager.TryIndex(prototype, out var entity))
+ _favoritePrototypes.Add(entity);
+ else if (_prototypeManager.TryIndex(prototype, out var tile))
+ _favoritePrototypes.Add(tile);
+ else if (_prototypeManager.TryIndex(prototype, out var decal))
+ _favoritePrototypes.Add(decal);
+ }
+
+ OnFavoritePrototypesLoaded?.Invoke(_favoritePrototypes);
+ }
+
public async Task SaveMap()
{
if (_saveStream != null)
@@ -66,4 +93,23 @@ public async Task SaveMap()
_saveStream = stream;
}
+
+ public void SaveFavorites(List prototypes)
+ {
+ // TODO: that doesnt save null prototypes (mapping templates and abstract parents)
+ var msg = new MappingFavoritesSaveMessage()
+ {
+ PrototypeIDs = prototypes
+ .FindAll(p => p.Prototype != null)
+ .Select(p => p.Prototype!.ID)
+ .ToList(),
+ };
+ _net.ClientSendMessage(msg);
+ }
+
+ public void LoadFavorites()
+ {
+ var request = new MappingFavoritesLoadMessage();
+ _net.ClientSendMessage(request);
+ }
}
diff --git a/Content.Client/Mapping/MappingOverlay.cs b/Content.Client/Mapping/MappingOverlay.cs
index ef9f3e795e..9e04830d56 100644
--- a/Content.Client/Mapping/MappingOverlay.cs
+++ b/Content.Client/Mapping/MappingOverlay.cs
@@ -1,9 +1,8 @@
-using Robust.Client.GameObjects;
+using System.Numerics;
+using Robust.Client.GameObjects;
using Robust.Client.Graphics;
-using Robust.Client.Input;
-using Robust.Client.Player;
-using Robust.Client.UserInterface;
using Robust.Shared.Enums;
+using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using static Content.Client.Mapping.MappingState;
@@ -12,13 +11,8 @@ namespace Content.Client.Mapping;
public sealed class MappingOverlay : Overlay
{
[Dependency] private readonly IEntityManager _entities = default!;
- [Dependency] private readonly IPlayerManager _player = default!;
[Dependency] private readonly IPrototypeManager _prototypes = default!;
- // 1 off in case something else uses these colors since we use them to compare
- private static readonly Color PickColor = new(1, 255, 0);
- private static readonly Color DeleteColor = new(255, 1, 0);
-
private readonly Dictionary _oldColors = new();
private readonly MappingState _state;
@@ -38,41 +32,82 @@ protected override void Draw(in OverlayDrawArgs args)
{
foreach (var (id, color) in _oldColors)
{
- if (!_entities.TryGetComponent(id, out SpriteComponent? sprite))
- continue;
-
- if (sprite.Color == DeleteColor || sprite.Color == PickColor)
+ if (_entities.TryGetComponent(id, out SpriteComponent? sprite))
sprite.Color = color;
}
_oldColors.Clear();
- if (_player.LocalEntity == null)
- return;
-
var handle = args.WorldHandle;
handle.UseShader(_shader);
- switch (_state.State)
+ switch (_state.Meta.State)
{
- case CursorState.Pick:
+ case CursorState.Tile:
+ {
+ if (_state.GetHoveredTileBox2() is { } box)
+ args.WorldHandle.DrawRect(box, _state.Meta.Color);
+
+ break;
+ }
+ case CursorState.Decal:
+ {
+ if (_state.GetHoveredDecalData() is { } hovered)
+ {
+ var (texture, box) = hovered;
+ args.WorldHandle.DrawTextureRect(texture, box, _state.Meta.Color);
+ }
+
+ break;
+ }
+ case CursorState.Entity:
{
if (_state.GetHoveredEntity() is { } entity &&
_entities.TryGetComponent(entity, out SpriteComponent? sprite))
{
_oldColors[entity] = sprite.Color;
- sprite.Color = PickColor;
+ sprite.Color = _state.Meta.Color;
}
break;
}
- case CursorState.Delete:
+ case CursorState.Grid:
+ {
+ if (args.MapId == MapId.Nullspace || _state.GetHoveredGrid() is not { } grid)
+ break;
+
+ var mapSystem = _entities.System();
+ var xformSystem = _entities.System();
+
+ var tileSize = grid.Comp.TileSize;
+ var tileDimensions = new Vector2(tileSize, tileSize);
+ var (_, _, worldMatrix, invMatrix) = xformSystem.GetWorldPositionRotationMatrixWithInv(grid.Owner);
+ args.WorldHandle.SetTransform(worldMatrix);
+ var bounds = args.WorldBounds;
+ bounds = new Box2Rotated(bounds.Box.Enlarged(1), bounds.Rotation, bounds.Origin);
+ var localAABB = invMatrix.TransformBox(bounds);
+
+ var enumerator = mapSystem.GetLocalTilesEnumerator(grid.Owner, grid, localAABB);
+
+ while (enumerator.MoveNext(out var tileRef))
+ {
+ var box = Box2.FromDimensions(tileRef.GridIndices, tileDimensions);
+ args.WorldHandle.DrawRect(box, _state.Meta.Color);
+ }
+
+ break;
+ }
+ case CursorState.EntityOrTile:
{
if (_state.GetHoveredEntity() is { } entity &&
_entities.TryGetComponent(entity, out SpriteComponent? sprite))
{
_oldColors[entity] = sprite.Color;
- sprite.Color = DeleteColor;
+ sprite.Color = _state.Meta.Color;
+ }
+ else if (_state.GetHoveredTileBox2() is { } box)
+ {
+ args.WorldHandle.DrawRect(box, _state.Meta.SecondColor ?? _state.Meta.Color);
}
break;
diff --git a/Content.Client/Mapping/MappingPrototype.cs b/Content.Client/Mapping/MappingPrototype.cs
index eff2dfab15..4886165ef0 100644
--- a/Content.Client/Mapping/MappingPrototype.cs
+++ b/Content.Client/Mapping/MappingPrototype.cs
@@ -21,6 +21,11 @@ public sealed class MappingPrototype
///
public readonly string Name;
+ ///
+ /// Whether the prototype is in the “Favorites” list.
+ ///
+ public bool Favorite;
+
///
/// Which other prototypes (buttons) this one is nested inside of.
///
diff --git a/Content.Client/Mapping/MappingPrototypeList.xaml b/Content.Client/Mapping/MappingPrototypeList.xaml
index de311240df..f7b30617a3 100644
--- a/Content.Client/Mapping/MappingPrototypeList.xaml
+++ b/Content.Client/Mapping/MappingPrototypeList.xaml
@@ -1,13 +1,16 @@
-
-
-
+
diff --git a/Content.Client/Mapping/MappingPrototypeList.xaml.cs b/Content.Client/Mapping/MappingPrototypeList.xaml.cs
index 8b59e6eb6f..1f7b8bdb1d 100644
--- a/Content.Client/Mapping/MappingPrototypeList.xaml.cs
+++ b/Content.Client/Mapping/MappingPrototypeList.xaml.cs
@@ -14,43 +14,71 @@ namespace Content.Client.Mapping;
public sealed partial class MappingPrototypeList : Control
{
private (int start, int end) _lastIndices;
- private readonly List _prototypes = new();
+ private readonly List _allPrototypes = new();
private readonly List _insertTextures = new();
private readonly List _search = new();
public MappingSpawnButton? Selected;
+ public MappingPrototype FavoritesPrototype;
+ private MappingSpawnButton? _favoriteList;
+
+ ///
+ /// if true, elements with no children will be grouped into a grid
+ ///
+ public bool Gallery { get; set; }
+
+ ///
+ /// A color that applies to all textures in the list
+ ///
+ public Color? TexturesModulate { get; set; }
+
public Action>? GetPrototypeData;
- public event Action? SelectionChanged;
- public event Action? CollapseToggled;
+ public event Action? SelectionChanged;
+ public event Action? FavoriteChanged;
public MappingPrototypeList()
{
RobustXamlLoader.Load(this);
+ FavoritesPrototype = new MappingPrototype(null, Loc.GetString("mapping-favorite"));
MeasureButton.Measure(Vector2Helpers.Infinity);
ScrollContainer.OnScrolled += UpdateSearch;
+ CollapseAllButton.OnPressed += OnCollapseAll;
+ SearchBar.OnTextChanged += OnSearch;
+ ClearSearchButton.OnPressed += _ =>
+ {
+ SearchBar.Text = string.Empty;
+ OnSearch(new LineEdit.LineEditEventArgs(SearchBar, string.Empty));
+ };
OnResized += UpdateSearch;
+
+ CollapseAllButton.Texture.TexturePath = "/Textures/Interface/VerbIcons/collapse.svg.192dpi.png";
+ ClearSearchButton.Texture.TexturePath = "/Textures/Interface/VerbIcons/xmark-solid.svg.192dpi.png";
}
- public void UpdateVisible(List prototypes)
+ public void UpdateVisible(List prototypes, List allPrototypes)
{
- _prototypes.Clear();
-
+ _allPrototypes.Clear();
PrototypeList.DisposeAllChildren();
-
- _prototypes.AddRange(prototypes);
+ _allPrototypes.AddRange(allPrototypes);
Selected = null;
ScrollContainer.SetScrollValue(new Vector2(0, 0));
- foreach (var prototype in _prototypes)
+ _favoriteList = Insert(PrototypeList, FavoritesPrototype, false, false);
+ _favoriteList.CollapseButtonWrapper.Visible = true;
+ _favoriteList.CollapseButton.Visible = true;
+ _favoriteList.FavoriteButton.Visible = false;
+ _favoriteList.CollapseButton.OnToggled += _ => ToggleCollapse(_favoriteList);
+
+ foreach (var prototype in prototypes)
{
- Insert(PrototypeList, prototype, true);
+ Insert(PrototypeList, prototype, true, false).FavoriteButton.Visible = false;
}
}
- public MappingSpawnButton Insert(Container list, MappingPrototype mapping, bool includeChildren)
+ private MappingSpawnButton Insert(Container list, MappingPrototype mapping, bool includeChildren, bool galleryLayout)
{
var prototype = mapping.Prototype;
@@ -61,15 +89,13 @@ public MappingSpawnButton Insert(Container list, MappingPrototype mapping, bool
var button = new MappingSpawnButton { Prototype = mapping };
button.Label.Text = mapping.Name;
+ button.Button.ToolTip = button.Label.Text;
if (_insertTextures.Count > 0)
{
- button.Texture.Textures.AddRange(_insertTextures);
- button.Texture.InvalidateMeasure();
- }
- else
- {
- button.Texture.Visible = false;
+ button.SetTextures(_insertTextures);
+ if (TexturesModulate is { } modulate)
+ button.Texture.Modulate = modulate;
}
if (prototype != null && button.Prototype == Selected?.Prototype)
@@ -80,15 +106,23 @@ public MappingSpawnButton Insert(Container list, MappingPrototype mapping, bool
list.AddChild(button);
- button.Button.OnToggled += _ => SelectionChanged?.Invoke(button, prototype);
+ button.Button.OnToggled += _ => SelectionChanged?.Invoke(this, button, prototype);
+ button.FavoriteButton.OnToggled += _ => OnFavoriteToggle(button);
+ FavoriteChanged += proto =>
+ {
+ if (proto == button.Prototype)
+ button.ToggleFavorite(proto.Favorite);
+ };
if (includeChildren && mapping.Children?.Count > 0)
{
button.CollapseButton.Visible = true;
- button.CollapseButton.OnToggled += args => CollapseToggled?.Invoke(button, args);
+ button.CollapseButton.OnToggled += _ => ToggleCollapse(button);
}
else
{
+ if (galleryLayout)
+ button.Gallery();
button.CollapseButtonWrapper.Visible = false;
button.CollapseButton.Visible = false;
}
@@ -96,7 +130,7 @@ public MappingSpawnButton Insert(Container list, MappingPrototype mapping, bool
return button;
}
- public void Search(List prototypes)
+ private void Search(List prototypes)
{
_search.Clear();
SearchList.DisposeAllChildren();
@@ -158,13 +192,124 @@ private void UpdateSearch()
// insert buttons that can now be seen, from the start
for (var i = Math.Min(prevStart - 1, endIndex); i >= startIndex; i--)
{
- Insert(SearchList, _search[i], false).SetPositionInParent(0);
+ Insert(SearchList, _search[i], false, false).SetPositionInParent(0);
}
// insert buttons that can now be seen, from the end
for (var i = Math.Max(prevEnd + 1, startIndex); i <= endIndex; i++)
{
- Insert(SearchList, _search[i], false);
+ Insert(SearchList, _search[i], false, false);
+ }
+ }
+
+ private void OnCollapseAll(ButtonEventArgs args)
+ {
+ foreach (var child in PrototypeList.Children)
+ {
+ if (child is not MappingSpawnButton button)
+ continue;
+
+ button.Collapse();
}
+
+ ScrollContainer.SetScrollValue(new Vector2(0, 0));
+ }
+
+ public void ToggleCollapse(MappingSpawnButton button)
+ {
+ if (!button.CollapseButton.Pressed)
+ {
+ button.Collapse();
+ return;
+ }
+
+ button.UnCollapse();
+ if (button.Prototype?.Children == null)
+ return;
+
+ foreach (var child in button.Prototype.Children)
+ {
+ if (child.Children == null && Gallery)
+ Insert(button.ChildrenPrototypesGallery, child, false, true);
+ else
+ Insert(button.ChildrenPrototypes, child, true, false);
+ }
+ }
+
+ private void OnSearch(LineEdit.LineEditEventArgs args)
+ {
+ if (string.IsNullOrEmpty(args.Text))
+ {
+ PrototypeList.Visible = true;
+ SearchList.Visible = false;
+ return;
+ }
+
+ var matches = new List();
+ foreach (var prototype in _allPrototypes)
+ {
+ if (prototype.Name.Contains(args.Text, StringComparison.OrdinalIgnoreCase) ||
+ (prototype.Prototype != null && prototype.Prototype.ID.Contains(args.Text, StringComparison.OrdinalIgnoreCase)))
+ matches.Add(prototype);
+ }
+
+ matches.Sort(static (a, b) =>
+ string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase));
+
+ PrototypeList.Visible = false;
+ SearchList.Visible = true;
+ Search(matches);
+ }
+
+ private void OnFavoriteToggle(MappingSpawnButton button)
+ {
+ if (button.Prototype is not { } prototype ||
+ _favoriteList == null)
+ return;
+
+ FavoritesPrototype.Children ??= [];
+ if (button.FavoriteButton.Pressed)
+ {
+ if (prototype.Favorite)
+ return;
+
+ if (!FavoritesPrototype.Children.Contains(prototype))
+ FavoritesPrototype.Children.Add(prototype);
+
+ if (_favoriteList.CollapseButton.Pressed)
+ {
+ prototype.Favorite = true;
+ if (prototype.Children == null && Gallery)
+ Insert(_favoriteList.ChildrenPrototypesGallery, prototype, false, true).ToggleFavorite(true);
+ else
+ Insert(_favoriteList.ChildrenPrototypes, prototype, true, false).ToggleFavorite(true);
+ }
+ }
+ else
+ {
+ if (!prototype.Favorite)
+ return;
+
+ FavoritesPrototype.Children.Remove(prototype);
+ if (_favoriteList.CollapseButton.Pressed)
+ {
+ var lists = new List([_favoriteList.ChildrenPrototypes, _favoriteList.ChildrenPrototypesGallery]);
+ foreach (var list in lists)
+ {
+ foreach (var child in list.Children)
+ {
+ if (child is not MappingSpawnButton childButton
+ || childButton.Prototype != prototype)
+ continue;
+
+ list.RemoveChild(childButton);
+ break;
+ }
+ }
+ }
+ }
+
+ prototype.Favorite = button.FavoriteButton.Pressed;
+ FavoriteChanged?.Invoke(prototype);
}
}
diff --git a/Content.Client/Mapping/MappingScreen.xaml b/Content.Client/Mapping/MappingScreen.xaml
index b641360847..6775b94581 100644
--- a/Content.Client/Mapping/MappingScreen.xaml
+++ b/Content.Client/Mapping/MappingScreen.xaml
@@ -1,6 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
diff --git a/Content.Client/Mapping/MappingScreen.xaml.cs b/Content.Client/Mapping/MappingScreen.xaml.cs
index b2ad2fd83f..16283a1613 100644
--- a/Content.Client/Mapping/MappingScreen.xaml.cs
+++ b/Content.Client/Mapping/MappingScreen.xaml.cs
@@ -25,7 +25,9 @@ public sealed partial class MappingScreen : InGameScreen
private PaletteColorPicker? _picker;
private ProtoId? _id;
- private Color _decalColor = Color.White;
+ private readonly FloatSpinBox _rotationSpinBox;
+ public Color DecalColor { get; private set; } = Color.White;
+ private bool _decalEnableColor;
private float _decalRotation;
private bool _decalSnap;
private int _decalZIndex;
@@ -35,34 +37,34 @@ public sealed partial class MappingScreen : InGameScreen
public override ChatBox ChatBox => GetWidget()!;
- public event Func? IsDecalVisible;
-
public MappingScreen()
{
RobustXamlLoader.Load(this);
IoCManager.InjectDependencies(this);
+ var visibilityUIController = UserInterfaceManager.GetUIController();
+
AutoscaleMaxResolution = new Vector2i(1080, 770);
- SetAnchorPreset(ScreenContainer, LayoutPreset.Wide);
+ SetAnchorPreset(LeftContainer, LayoutPreset.Wide);
SetAnchorPreset(ViewportContainer, LayoutPreset.Wide);
SetAnchorPreset(SpawnContainer, LayoutPreset.Wide);
SetAnchorPreset(MainViewport, LayoutPreset.Wide);
SetAnchorAndMarginPreset(Hotbar, LayoutPreset.BottomWide, margin: 5);
SetAnchorAndMarginPreset(Actions, LayoutPreset.TopWide, margin: 5);
- ScreenContainer.OnSplitResizeFinished += () =>
- OnChatResized?.Invoke(new Vector2(ScreenContainer.SplitFraction, 0));
+ LeftContainer.OnSplitResizeFinished += () =>
+ OnChatResized?.Invoke(new Vector2(LeftContainer.SplitFraction, 0));
- var rotationSpinBox = new FloatSpinBox(90.0f, 0)
+ _rotationSpinBox = new FloatSpinBox(90.0f, 0)
{
HorizontalExpand = true
};
- DecalSpinBoxContainer.AddChild(rotationSpinBox);
+ DecalSpinBoxContainer.AddChild(_rotationSpinBox);
DecalColorPicker.OnColorChanged += OnDecalColorPicked;
DecalPickerOpen.OnPressed += OnDecalPickerOpenPressed;
- rotationSpinBox.OnValueChanged += args =>
+ _rotationSpinBox.OnValueChanged += args =>
{
_decalRotation = args.Value;
UpdateDecal();
@@ -73,6 +75,12 @@ public MappingScreen()
if (_id is { } id)
SelectDecal(id);
};
+ DecalEnableColor.OnToggled += args =>
+ {
+ _decalEnableColor = args.Pressed;
+ UpdateDecal();
+ RefreshDecalList();
+ };
DecalEnableSnap.OnToggled += args =>
{
_decalSnap = args.Pressed;
@@ -95,14 +103,40 @@ public MappingScreen()
}
Pick.Texture.TexturePath = "/Textures/Interface/eyedropper.svg.png";
- Delete.Texture.TexturePath = "/Textures/Interface/eraser.svg.png";
+ PickDecal.Texture.TexturePath = "/Textures/Interface/VerbIcons/wand-magic-sparkles-solid.svg.192dpi.png";
+ Flip.Texture.TexturePath = "/Textures/Interface/VerbIcons/rotate_cw.svg.192dpi.png";
+ Flip.OnPressed += _ => FlipSides();
+ Visibility.Texture.TexturePath = "/Textures/Interface/VerbIcons/layer-group-solid.svg.192dpi.png";
+ Visibility.OnPressed += _ => visibilityUIController.ToggleWindow();
+ FixGridAtmos.Texture.TexturePath = "/Textures/Interface/VerbIcons/oxygen.svg.192dpi.png";
+ RemoveGrid.Texture.TexturePath = "/Textures/Interface/VerbIcons/delete_transparent.svg.192dpi.png";
+ MoveGrid.Texture.TexturePath = "/Textures/Interface/VerbIcons/point.svg.192dpi.png";
+ GridVV.Texture.TexturePath = "/Textures/Interface/VerbIcons/vv.svg.192dpi.png";
+ PipesColor.Texture.TexturePath = "/Textures/Interface/VerbIcons/paint-roller-solid.svg.192dpi.png";
+ ChatButton.Texture.TexturePath = "/Textures/Interface/VerbIcons/comment-dots-regular.svg.192dpi.png";
+ }
+
+ private void FlipSides()
+ {
+ LeftContainer.Flip();
+ RightContainer.Flip();
+
+ if (SpawnContainer.GetPositionInParent() == 0)
+ {
+ Flip.Texture.TexturePath = "/Textures/Interface/VerbIcons/rotate_cw.svg.192dpi.png";
+ }
+ else
+ {
+ Flip.Texture.TexturePath = "/Textures/Interface/VerbIcons/rotate_ccw.svg.192dpi.png";
+ }
}
private void OnDecalColorPicked(Color color)
{
- _decalColor = color;
+ DecalColor = color;
DecalColorPicker.Color = color;
UpdateDecal();
+ RefreshDecalList();
}
private void OnDecalPickerOpenPressed(ButtonEventArgs obj)
@@ -131,7 +165,7 @@ private void UpdateDecal()
if (_id is not { } id)
return;
- DecalSystem.UpdateDecalInfo(id, _decalColor, _decalRotation, _decalSnap, _decalZIndex, _decalCleanable);
+ DecalSystem.UpdateDecalInfo(id, _decalEnableColor ? DecalColor : Color.White, _decalRotation, _decalSnap, _decalZIndex, _decalCleanable);
}
public void SelectDecal(string decalId)
@@ -143,46 +177,88 @@ public void SelectDecal(string decalId)
if (_decalAuto)
{
- _decalColor = Color.White;
+ _decalEnableColor = decal.DefaultCustomColor;
_decalCleanable = decal.DefaultCleanable;
_decalSnap = decal.DefaultSnap;
- DecalColorPicker.Color = _decalColor;
+ DecalColorPicker.Color = DecalColor;
DecalEnableCleanable.Pressed = _decalCleanable;
DecalEnableSnap.Pressed = _decalSnap;
+ DecalEnableColor.Pressed = _decalEnableColor;
}
UpdateDecal();
- RefreshList();
+ RefreshDecalList();
}
- private void RefreshList()
+ public void SelectDecal(Decal decal)
{
- foreach (var control in Prototypes.Children)
+ if (!_decalAuto)
+ return;
+
+ _id = decal.Id;
+ _decalCleanable = decal.Cleanable;
+
+ if (decal.Color is { } color)
+ DecalColor = color;
+ else
+ _decalEnableColor = false;
+
+ DecalColorPicker.Color = DecalColor;
+ DecalEnableCleanable.Pressed = _decalCleanable;
+ DecalEnableSnap.Pressed = _decalSnap;
+ DecalEnableColor.Pressed = _decalEnableColor;
+
+ UpdateDecal();
+ RefreshDecalList();
+ }
+
+ public void ChangeDecalRotation(float rotation)
+ {
+ _decalRotation += rotation;
+
+ if (_decalRotation > 360)
+ _decalRotation = 0;
+ if (_decalRotation < 0)
+ _decalRotation = 360;
+
+ _rotationSpinBox.Value = _decalRotation;
+ UpdateDecal();
+ }
+
+ private void RefreshDecalList()
+ {
+ Decals.TexturesModulate = _decalEnableColor ? DecalColor : Color.White;
+ var children = Decals.PrototypeList.Children.ToList().Union(Decals.SearchList.Children);
+ foreach (var control in children)
{
- if (control is not MappingSpawnButton button ||
- button.Prototype?.Prototype is not DecalPrototype)
- {
+ if (control is not MappingSpawnButton button)
continue;
- }
- foreach (var child in button.Children)
- {
- if (child is not MappingSpawnButton { Prototype.Prototype: DecalPrototype } childButton)
- {
- continue;
- }
-
- childButton.Texture.Modulate = _decalColor;
- childButton.Visible = IsDecalVisible?.Invoke(childButton) ?? true;
- }
+ RefreshDecalButton(button);
+ }
+ }
+
+ private void RefreshDecalButton(MappingSpawnButton button)
+ {
+ var children =
+ button.ChildrenPrototypes.Children.ToList().Union(button.ChildrenPrototypesGallery.Children);
+
+ foreach (var control in children)
+ {
+ if (control is not MappingSpawnButton { } childButton)
+ continue;
+
+ if (childButton.Texture.Visible)
+ childButton.Texture.Modulate = _decalEnableColor ? DecalColor : Color.White;
+
+ RefreshDecalButton(childButton);
}
}
public override void SetChatSize(Vector2 size)
{
- ScreenContainer.DesiredSplitCenter = size.X;
- ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize;
+ LeftContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize;
}
public void UnPressActionsExcept(Control except)
@@ -192,6 +268,15 @@ public void UnPressActionsExcept(Control except)
Grab.Pressed = Grab == except;
Move.Pressed = Move == except;
Pick.Pressed = Pick == except;
- Delete.Pressed = Delete == except;
+ PickDecal.Pressed = PickDecal == except;
+ FixGridAtmos.Pressed = FixGridAtmos == except;
+ RemoveGrid.Pressed = RemoveGrid == except;
+ MoveGrid.Pressed = MoveGrid == except;
+ GridVV.Pressed = GridVV == except;
+ PipesColor.Pressed = PipesColor == except;
+
+ EraseEntityButton.Pressed = EraseEntityButton == except;
+ EraseDecalButton.Pressed = EraseDecalButton == except;
+ EraseTileButton.Pressed = EraseTileButton == except;
}
}
diff --git a/Content.Client/Mapping/MappingSpawnButton.xaml b/Content.Client/Mapping/MappingSpawnButton.xaml
index a944d5ec2f..92efc0612d 100644
--- a/Content.Client/Mapping/MappingSpawnButton.xaml
+++ b/Content.Client/Mapping/MappingSpawnButton.xaml
@@ -3,14 +3,17 @@
xmlns:mapping="clr-namespace:Content.Client.Mapping">
-
-
-
+
+
diff --git a/Content.Client/Mapping/MappingSpawnButton.xaml.cs b/Content.Client/Mapping/MappingSpawnButton.xaml.cs
index 29fb884ed6..2abfee0825 100644
--- a/Content.Client/Mapping/MappingSpawnButton.xaml.cs
+++ b/Content.Client/Mapping/MappingSpawnButton.xaml.cs
@@ -1,4 +1,6 @@
-using Robust.Client.AutoGenerated;
+using System.Numerics;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.XAML;
@@ -7,10 +9,81 @@ namespace Content.Client.Mapping;
[GenerateTypedNameReferences]
public sealed partial class MappingSpawnButton : Control
{
- public MappingPrototype? Prototype;
+ private MappingPrototype? _prototype;
+
+ public MappingPrototype? Prototype
+ {
+ get => _prototype;
+ set
+ {
+ _prototype = value;
+ if (_prototype != null)
+ ToggleFavorite(_prototype.Favorite);
+ }
+ }
public MappingSpawnButton()
{
RobustXamlLoader.Load(this);
+
+ CollapseTexture.TexturePath = "/Textures/Interface/VerbIcons/chevron-right-solid.svg.192dpi.png";
+ FavoriteTexture.TexturePath = "/Textures/Interface/VerbIcons/star-regular.svg.192dpi.png";
+ OnResized += OnResizedGallery;
+ FavoriteButton.OnPressed += args => ToggleFavorite(args.Button.Pressed);
+ }
+
+ private void OnResizedGallery()
+ {
+ if (Parent != null)
+ ChildrenPrototypesGallery.MaxGridWidth = Math.Max(1, Parent.Width - ChildrenPrototypesGallery.Margin.Left );
+ }
+
+ public void Gallery()
+ {
+ Label.Visible = false;
+ Button.AddStyleClass("ButtonSquare");
+ SetWidth = 48;
+ SetHeight = 48;
+ // TODO: I don't know how to successfully add a favorite button to the gallery layout
+ FavoriteButton.Visible = false;
+ }
+
+ public void SetTextures(List textures)
+ {
+ Button.RemoveStyleClass("OpenBoth");
+ Button.AddStyleClass("OpenLeft");
+ CollapseButton.RemoveStyleClass("OpenRight");
+ CollapseButton.AddStyleClass("ButtonSquare");
+ Texture.Visible = true;
+ Texture.Textures.AddRange(textures);
+
+ foreach (var texture in textures)
+ {
+ Texture.TextureScale = new Vector2(Texture.SetSize.X / texture.Height, Texture.SetSize.X / texture.Height);
+ }
+
+ Texture.InvalidateMeasure();
+ }
+
+ public void Collapse()
+ {
+ CollapseButton.Pressed = false;
+ ChildrenPrototypes.DisposeAllChildren();
+ ChildrenPrototypesGallery.DisposeAllChildren();
+ CollapseTexture.TexturePath = "/Textures/Interface/VerbIcons/chevron-right-solid.svg.192dpi.png";
+ }
+
+ public void UnCollapse()
+ {
+ CollapseButton.Pressed = true;
+ CollapseTexture.TexturePath = "/Textures/Interface/VerbIcons/chevron-down-solid.svg.192dpi.png";
+ }
+
+ public void ToggleFavorite(bool enabled)
+ {
+ FavoriteButton.Pressed = enabled;
+ FavoriteTexture.TexturePath = FavoriteButton.Pressed
+ ? "/Textures/Interface/VerbIcons/star-solid-yellow.svg.192dpi.png"
+ : "/Textures/Interface/VerbIcons/star-regular.svg.192dpi.png";
}
}
diff --git a/Content.Client/Mapping/MappingState.cs b/Content.Client/Mapping/MappingState.cs
index bcc739fe4f..edd23db436 100644
--- a/Content.Client/Mapping/MappingState.cs
+++ b/Content.Client/Mapping/MappingState.cs
@@ -1,16 +1,19 @@
using System.Linq;
-using System.Numerics;
using Content.Client.Administration.Managers;
using Content.Client.ContextMenu.UI;
using Content.Client.Decals;
using Content.Client.Gameplay;
+using Content.Client.Maps;
+using Content.Client.SubFloor;
using Content.Client.UserInterface.Controls;
using Content.Client.UserInterface.Systems.Gameplay;
using Content.Client.Verbs;
using Content.Shared.Administration;
using Content.Shared.Decals;
using Content.Shared.Input;
+using Content.Shared.Mapping;
using Content.Shared.Maps;
+using Robust.Client.Console;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Client.Input;
@@ -19,19 +22,20 @@
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.Enums;
+using Robust.Shared.Input;
using Robust.Shared.Input.Binding;
using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Markdown.Sequence;
using Robust.Shared.Serialization.Markdown.Value;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
-using static System.StringComparison;
using static Robust.Client.UserInterface.Controls.BaseButton;
-using static Robust.Client.UserInterface.Controls.LineEdit;
using static Robust.Client.UserInterface.Controls.OptionButton;
using static Robust.Shared.Input.Binding.PointerInputCmdHandler;
+using Vector2 = System.Numerics.Vector2;
namespace Content.Client.Mapping;
@@ -39,6 +43,7 @@ public sealed class MappingState : GameplayStateBase
{
[Dependency] private readonly IClientAdminManager _admin = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
+ [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
[Dependency] private readonly IEntityNetworkManager _entityNetwork = default!;
[Dependency] private readonly IInputManager _input = default!;
[Dependency] private readonly ILogManager _log = default!;
@@ -49,6 +54,8 @@ public sealed class MappingState : GameplayStateBase
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IResourceCache _resources = default!;
[Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
+ [Dependency] private readonly ILocalizationManager _locale = default!;
private EntityMenuUIController _entityMenuController = default!;
@@ -56,23 +63,32 @@ public sealed class MappingState : GameplayStateBase
private SpriteSystem _sprite = default!;
private TransformSystem _transform = default!;
private VerbSystem _verbs = default!;
+ private GridDraggingSystem _gridDrag = default!;
+ private MapSystem _map = default!;
+ private SharedDecalSystem _sharedDecal = default!;
+
+ // 1 off in case something else uses these colors since we use them to compare
+ private static readonly Color PickColor = new(1, 255, 0);
+ private static readonly Color DeleteColor = new(255, 1, 0);
+ private static readonly Color EraseDecalColor = Color.Red.WithAlpha(0.2f);
+ private static readonly Color GridSelectColor = Color.Green.WithAlpha(0.2f);
+ private static readonly Color GridRemoveColor = Color.Red.WithAlpha(0.2f);
private readonly ISawmill _sawmill;
private readonly GameplayStateLoadController _loadController;
private bool _setup;
- private readonly List _allPrototypes = new();
+ private readonly Dictionary> _allPrototypes = new();
private readonly Dictionary _allPrototypesDict = new();
private readonly Dictionary> _idDict = new();
- private readonly List _prototypes = new();
private (TimeSpan At, MappingSpawnButton Button)? _lastClicked;
- private Control? _scrollTo;
- private bool _updatePlacement;
- private bool _updateEraseDecal;
+ private (Control, MappingPrototypeList)? _scrollTo;
+ private bool _tileErase;
+ private int _decalIndex;
private MappingScreen Screen => (MappingScreen) UserInterfaceManager.ActiveScreen!;
private MainViewport Viewport => UserInterfaceManager.ActiveScreen!.GetWidget()!;
- public CursorState State { get; set; }
+ public CursorMeta Meta { get; }
public MappingState()
{
@@ -80,6 +96,8 @@ public MappingState()
_sawmill = _log.GetSawmill("mapping");
_loadController = UserInterfaceManager.GetUIController();
+
+ Meta = new CursorMeta();
}
protected override void Startup()
@@ -94,86 +112,90 @@ protected override void Startup()
context.AddFunction(ContentKeyFunctions.MappingUnselect);
context.AddFunction(ContentKeyFunctions.SaveMap);
context.AddFunction(ContentKeyFunctions.MappingEnablePick);
+ context.AddFunction(ContentKeyFunctions.MappingEnableDecalPick);
context.AddFunction(ContentKeyFunctions.MappingEnableDelete);
context.AddFunction(ContentKeyFunctions.MappingPick);
context.AddFunction(ContentKeyFunctions.MappingRemoveDecal);
context.AddFunction(ContentKeyFunctions.MappingCancelEraseDecal);
context.AddFunction(ContentKeyFunctions.MappingOpenContextMenu);
+ context.AddFunction(ContentKeyFunctions.MouseMiddle);
Screen.DecalSystem = _decal;
- Screen.Prototypes.SearchBar.OnTextChanged += OnSearch;
- Screen.Prototypes.CollapseAllButton.OnPressed += OnCollapseAll;
- Screen.Prototypes.ClearSearchButton.OnPressed += OnClearSearch;
- Screen.Prototypes.GetPrototypeData += OnGetData;
- Screen.Prototypes.SelectionChanged += OnSelected;
- Screen.Prototypes.CollapseToggled += OnCollapseToggled;
+
+ Screen.Entities.GetPrototypeData += OnGetData;
+ Screen.Entities.SelectionChanged += OnSelected;
+ Screen.Tiles.GetPrototypeData += OnGetData;
+ Screen.Tiles.SelectionChanged += OnSelected;
+ Screen.Decals.GetPrototypeData += OnGetData;
+ Screen.Decals.SelectionChanged += OnSelected;
+
Screen.Pick.OnPressed += OnPickPressed;
- Screen.Delete.OnPressed += OnDeletePressed;
+ Screen.PickDecal.OnPressed += OnPickDecalPressed;
Screen.EntityReplaceButton.OnToggled += OnEntityReplacePressed;
Screen.EntityPlacementMode.OnItemSelected += OnEntityPlacementSelected;
Screen.EraseEntityButton.OnToggled += OnEraseEntityPressed;
+ Screen.EraseTileButton.OnToggled += OnEraseTilePressed;
Screen.EraseDecalButton.OnToggled += OnEraseDecalPressed;
+ Screen.FixGridAtmos.OnPressed += OnFixGridAtmosPressed;
+ Screen.RemoveGrid.OnPressed += OnRemoveGridPressed;
+ Screen.MoveGrid.OnPressed += OnMoveGridPressed;
+ Screen.GridVV.OnPressed += OnGridVVPressed;
+ Screen.PipesColor.OnPressed += OnPipesColorPressed;
+ Screen.ChatButton.OnPressed += OnChatButtonPressed;
_placement.PlacementChanged += OnPlacementChanged;
+ _mapping.OnFavoritePrototypesLoaded += OnFavoritesLoaded;
CommandBinds.Builder
.Bind(ContentKeyFunctions.MappingUnselect, new PointerInputCmdHandler(HandleMappingUnselect, outsidePrediction: true))
.Bind(ContentKeyFunctions.SaveMap, new PointerInputCmdHandler(HandleSaveMap, outsidePrediction: true))
.Bind(ContentKeyFunctions.MappingEnablePick, new PointerStateInputCmdHandler(HandleEnablePick, HandleDisablePick, outsidePrediction: true))
+ .Bind(ContentKeyFunctions.MappingEnableDecalPick, new PointerStateInputCmdHandler(HandleEnableDecalPick, HandleDisableDecalPick, outsidePrediction: true))
.Bind(ContentKeyFunctions.MappingEnableDelete, new PointerStateInputCmdHandler(HandleEnableDelete, HandleDisableDelete, outsidePrediction: true))
.Bind(ContentKeyFunctions.MappingPick, new PointerInputCmdHandler(HandlePick, outsidePrediction: true))
.Bind(ContentKeyFunctions.MappingRemoveDecal, new PointerInputCmdHandler(HandleEditorCancelPlace, outsidePrediction: true))
.Bind(ContentKeyFunctions.MappingCancelEraseDecal, new PointerInputCmdHandler(HandleCancelEraseDecal, outsidePrediction: true))
.Bind(ContentKeyFunctions.MappingOpenContextMenu, new PointerInputCmdHandler(HandleOpenContextMenu, outsidePrediction: true))
+ .Bind(ContentKeyFunctions.MouseMiddle, new PointerInputCmdHandler(HandleMouseMiddle, outsidePrediction: true))
+ .Bind(EngineKeyFunctions.Use, new PointerInputCmdHandler(HandleUse, outsidePrediction: true))
.Register();
_overlays.AddOverlay(new MappingOverlay(this));
_prototypeManager.PrototypesReloaded += OnPrototypesReloaded;
- Screen.Prototypes.UpdateVisible(_prototypes);
- }
-
- private void OnPrototypesReloaded(PrototypesReloadedEventArgs obj)
- {
- if (!obj.WasModified() &&
- !obj.WasModified() &&
- !obj.WasModified())
- {
- return;
- }
-
+ _mapping.LoadFavorites();
ReloadPrototypes();
- }
-
- private bool HandleOpenContextMenu(in PointerInputCmdArgs args)
- {
- Deselect();
-
- var coords = args.Coordinates.ToMap(_entityManager, _transform);
- if (_verbs.TryGetEntityMenuEntities(coords, out var entities))
- _entityMenuController.OpenRootMenu(entities);
-
- return true;
+ UpdateLocale();
}
protected override void Shutdown()
{
+ SaveFavorites();
CommandBinds.Unregister();
- Screen.Prototypes.SearchBar.OnTextChanged -= OnSearch;
- Screen.Prototypes.CollapseAllButton.OnPressed -= OnCollapseAll;
- Screen.Prototypes.ClearSearchButton.OnPressed -= OnClearSearch;
- Screen.Prototypes.GetPrototypeData -= OnGetData;
- Screen.Prototypes.SelectionChanged -= OnSelected;
- Screen.Prototypes.CollapseToggled -= OnCollapseToggled;
+ Screen.Entities.GetPrototypeData -= OnGetData;
+ Screen.Entities.SelectionChanged -= OnSelected;
+ Screen.Tiles.GetPrototypeData -= OnGetData;
+ Screen.Tiles.SelectionChanged -= OnSelected;
+ Screen.Decals.GetPrototypeData -= OnGetData;
+ Screen.Decals.SelectionChanged -= OnSelected;
+
Screen.Pick.OnPressed -= OnPickPressed;
- Screen.Delete.OnPressed -= OnDeletePressed;
+ Screen.PickDecal.OnPressed -= OnPickDecalPressed;
Screen.EntityReplaceButton.OnToggled -= OnEntityReplacePressed;
Screen.EntityPlacementMode.OnItemSelected -= OnEntityPlacementSelected;
Screen.EraseEntityButton.OnToggled -= OnEraseEntityPressed;
+ Screen.EraseTileButton.OnToggled -= OnEraseTilePressed;
Screen.EraseDecalButton.OnToggled -= OnEraseDecalPressed;
+ Screen.FixGridAtmos.OnPressed -= OnFixGridAtmosPressed;
+ Screen.RemoveGrid.OnPressed -= OnRemoveGridPressed;
+ Screen.MoveGrid.OnPressed -= OnMoveGridPressed;
+ Screen.GridVV.OnPressed -= OnGridVVPressed;
+ Screen.PipesColor.OnPressed -= OnPipesColorPressed;
+ Screen.ChatButton.OnPressed -= OnChatButtonPressed;
_placement.PlacementChanged -= OnPlacementChanged;
_prototypeManager.PrototypesReloaded -= OnPrototypesReloaded;
+ _mapping.OnFavoritePrototypesLoaded -= OnFavoritesLoaded;
UserInterfaceManager.ClearWindows();
_loadController.UnloadScreen();
@@ -183,6 +205,7 @@ protected override void Shutdown()
context.RemoveFunction(ContentKeyFunctions.MappingUnselect);
context.RemoveFunction(ContentKeyFunctions.SaveMap);
context.RemoveFunction(ContentKeyFunctions.MappingEnablePick);
+ context.RemoveFunction(ContentKeyFunctions.MappingEnableDecalPick);
context.RemoveFunction(ContentKeyFunctions.MappingEnableDelete);
context.RemoveFunction(ContentKeyFunctions.MappingPick);
context.RemoveFunction(ContentKeyFunctions.MappingRemoveDecal);
@@ -207,15 +230,41 @@ private void EnsureSetup()
_sprite = _entityManager.System();
_transform = _entityManager.System();
_verbs = _entityManager.System();
- ReloadPrototypes();
+ _gridDrag = _entityManager.System();
+ _map = _entityManager.System();
+ _sharedDecal = _entityManager.System();
}
- private void ReloadPrototypes()
+ private void UpdateLocale()
{
- var entities = new MappingPrototype(null, Loc.GetString("mapping-entities")) { Children = new List() };
- _prototypes.Add(entities);
+ if (_input.TryGetKeyBinding(ContentKeyFunctions.MappingEnablePick, out var enablePickBinding))
+ Screen.Pick.ToolTip = Loc.GetString("mapping-pick-tooltip", ("key", enablePickBinding.GetKeyString()));
+ if (_input.TryGetKeyBinding(ContentKeyFunctions.MappingEnableDecalPick, out var enableDecalPickBinding))
+ Screen.PickDecal.ToolTip = Loc.GetString("mapping-pick-decal-tooltip", ("key", enableDecalPickBinding.GetKeyString()));
+
+ if (_input.TryGetKeyBinding(ContentKeyFunctions.MappingEnableDelete, out var enableDeleteBinding))
+ Screen.EraseEntityButton.ToolTip = Loc.GetString("mapping-erase-entity-tooltip", ("key", enableDeleteBinding.GetKeyString()));
+ }
+
+ private void SaveFavorites()
+ {
+ Screen.Entities.FavoritesPrototype.Children ??= new List();
+ Screen.Tiles.FavoritesPrototype.Children ??= new List();
+ Screen.Decals.FavoritesPrototype.Children ??= new List();
+
+ var children = Screen.Entities.FavoritesPrototype.Children
+ .Union(Screen.Tiles.FavoritesPrototype.Children)
+ .Union(Screen.Decals.FavoritesPrototype.Children)
+ .ToList();
+
+ _mapping.SaveFavorites(children);
+ }
+
+ private void ReloadPrototypes()
+ {
var mappings = new Dictionary();
+ var entities = new MappingPrototype(null, Loc.GetString("mapping-entities")) { Children = new List() };
foreach (var entity in _prototypeManager.EnumeratePrototypes())
{
Register(entity, entity.ID, entities);
@@ -225,8 +274,6 @@ private void ReloadPrototypes()
mappings.Clear();
var tiles = new MappingPrototype(null, Loc.GetString("mapping-tiles")) { Children = new List() };
- _prototypes.Add(tiles);
-
foreach (var tile in _prototypeManager.EnumeratePrototypes())
{
Register(tile, tile.ID, tiles);
@@ -236,39 +283,98 @@ private void ReloadPrototypes()
mappings.Clear();
var decals = new MappingPrototype(null, Loc.GetString("mapping-decals")) { Children = new List() };
- _prototypes.Add(decals);
-
foreach (var decal in _prototypeManager.EnumeratePrototypes())
{
- Register(decal, decal.ID, decals);
+ if (decal.ShowMenu)
+ Register(decal, decal.ID, decals);
}
Sort(mappings, decals);
mappings.Clear();
+
+ var entitiesTemplate = new MappingPrototype(null, Loc.GetString("mapping-template"));
+ var tilesTemplate = new MappingPrototype(null, Loc.GetString("mapping-template"));
+ var decalsTemplate = new MappingPrototype(null, Loc.GetString("mapping-template"));
+
+ foreach (var favorite in _prototypeManager.EnumeratePrototypes())
+ {
+ switch (favorite.RootType)
+ {
+ case TemplateType.Entity:
+ RegisterTemplates(favorite, favorite.RootType, entitiesTemplate);
+ break;
+ case TemplateType.Tile:
+ RegisterTemplates(favorite, favorite.RootType, tilesTemplate);
+ break;
+ case TemplateType.Decal:
+ RegisterTemplates(favorite, favorite.RootType, decalsTemplate);
+ break;
+ }
+ }
+
+ Sort(mappings, entitiesTemplate);
+ mappings.Clear();
+ Screen.Entities.UpdateVisible(
+ new (entitiesTemplate.Children?.Count > 0 ? [entitiesTemplate, entities] : [entities]),
+ _allPrototypes.GetOrNew(typeof(EntityPrototype)));
+
+ Sort(mappings, tilesTemplate);
+ mappings.Clear();
+ Screen.Tiles.UpdateVisible(
+ new (tilesTemplate.Children?.Count > 0 ? [tilesTemplate, tiles] : [tiles]),
+ _allPrototypes.GetOrNew(typeof(ContentTileDefinition)));
+
+ Sort(mappings, decalsTemplate);
+ mappings.Clear();
+ Screen.Decals.UpdateVisible(
+ new (decalsTemplate.Children?.Count > 0 ? [decalsTemplate, decals] : [decals]),
+ _allPrototypes.GetOrNew(typeof(DecalPrototype)));
}
- private void Sort(Dictionary prototypes, MappingPrototype topLevel)
+ private void RegisterTemplates(MappingTemplatePrototype templateProto, TemplateType? type, MappingPrototype toplevel)
{
- static int Compare(MappingPrototype a, MappingPrototype b)
+ if (type == null)
{
- return string.Compare(a.Name, b.Name, OrdinalIgnoreCase);
+ if (templateProto.RootType == null)
+ return;
+ type = templateProto.RootType;
}
- topLevel.Children ??= new List();
+ MappingPrototype? proto = null;
+ switch (type)
+ {
+ case TemplateType.Decal:
+ if (_idDict.GetOrNew(typeof(DecalPrototype)).TryGetValue(templateProto.ID, out var decal))
+ proto = decal;
+ break;
+ case TemplateType.Tile:
+ if (_idDict.GetOrNew(typeof(ContentTileDefinition)).TryGetValue(templateProto.ID, out var tile))
+ proto = tile;
+ break;
+ case TemplateType.Entity:
+ if (_idDict.GetOrNew(typeof(EntityPrototype)).TryGetValue(templateProto.ID, out var entity))
+ proto = entity;
+ break;
+ }
- foreach (var prototype in prototypes.Values)
+ if (proto == null)
{
- if (prototype.Parents == null && prototype != topLevel)
- {
- prototype.Parents = new List { topLevel };
- topLevel.Children.Add(prototype);
- }
+ var name = templateProto.ID;
+ if (_locale.TryGetString($"mapping-template-{templateProto.ID.ToLower()}", out var locale))
+ name = locale;
+ proto = new MappingPrototype(null, name);
+ }
- prototype.Parents?.Sort(Compare);
- prototype.Children?.Sort(Compare);
+ proto.Parents ??= new List();
+ proto.Parents.Add(toplevel);
+
+ foreach (var child in templateProto.Children)
+ {
+ RegisterTemplates(child, type, proto);
}
- topLevel.Children.Sort(Compare);
+ toplevel.Children ??= new List();
+ toplevel.Children.Add(proto);
}
private MappingPrototype? Register(T? prototype, string id, MappingPrototype topLevel) where T : class, IPrototype, IInheritingPrototype
@@ -306,7 +412,7 @@ static int Compare(MappingPrototype a, MappingPrototype b)
name = $"{name} [{suffix.Value}]";
mapping = new MappingPrototype(prototype, name);
- _allPrototypes.Add(mapping);
+ _allPrototypes.GetOrNew(typeof(T)).Add(mapping);
ids.Add(id, mapping);
if (node.TryGet("parent", out ValueDataNode? parentValue))
@@ -363,7 +469,7 @@ static int Compare(MappingPrototype a, MappingPrototype b)
name = $"{name} [{entity.EditorSuffix}]";
mapping = new MappingPrototype(prototype, name);
- _allPrototypes.Add(mapping);
+ _allPrototypes.GetOrNew(typeof(T)).Add(mapping);
_allPrototypesDict.Add(prototype, mapping);
ids.Add(prototype.ID, mapping);
}
@@ -394,59 +500,168 @@ static int Compare(MappingPrototype a, MappingPrototype b)
}
}
- private void OnPlacementChanged(object? sender, EventArgs e)
+ private void Sort(Dictionary prototypes, MappingPrototype topLevel)
{
- _updatePlacement = true;
- }
+ static int Compare(MappingPrototype a, MappingPrototype b)
+ {
+ return string.Compare(a.Name, b.Name, StringComparison.OrdinalIgnoreCase);
+ }
- protected override void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args)
- {
- if (args.Viewport == null)
- base.OnKeyBindStateChanged(new ViewportBoundKeyEventArgs(args.KeyEventArgs, Viewport.Viewport));
- else
- base.OnKeyBindStateChanged(args);
+ topLevel.Children ??= new List();
+
+ foreach (var prototype in prototypes.Values)
+ {
+ if (prototype.Parents == null && prototype != topLevel)
+ {
+ prototype.Parents = new List { topLevel };
+ topLevel.Children.Add(prototype);
+ }
+
+ prototype.Parents?.Sort(Compare);
+ prototype.Children?.Sort(Compare);
+ }
+
+ topLevel.Children.Sort(Compare);
}
- private void OnSearch(LineEditEventArgs args)
+ private void Deselect()
{
- if (string.IsNullOrEmpty(args.Text))
+ if (Screen.Entities.Selected is { } entitySelected)
{
- Screen.Prototypes.PrototypeList.Visible = true;
- Screen.Prototypes.SearchList.Visible = false;
- return;
+ entitySelected.Button.Pressed = false;
+ Screen.Entities.Selected = null;
+
+ if (entitySelected.Prototype?.Prototype is EntityPrototype)
+ _placement.Clear();
}
- var matches = new List();
- foreach (var prototype in _allPrototypes)
+ if (Screen.Tiles.Selected is { } tileSelected)
{
- if (prototype.Name.Contains(args.Text, OrdinalIgnoreCase))
- matches.Add(prototype);
+ tileSelected.Button.Pressed = false;
+ Screen.Tiles.Selected = null;
+
+ if (tileSelected.Prototype?.Prototype is ContentTileDefinition)
+ _placement.Clear();
}
- matches.Sort(static (a, b) => string.Compare(a.Name, b.Name, OrdinalIgnoreCase));
+ if (Screen.Decals.Selected is { } decalSelected)
+ {
+ decalSelected.Button.Pressed = false;
+ Screen.Decals.Selected = null;
- Screen.Prototypes.PrototypeList.Visible = false;
- Screen.Prototypes.SearchList.Visible = true;
- Screen.Prototypes.Search(matches);
+ if (decalSelected.Prototype?.Prototype is DecalPrototype)
+ _decal.SetActive(false);
+ }
}
- private void OnCollapseAll(ButtonEventArgs args)
+ private void EnableEntityEraser()
{
- foreach (var child in Screen.Prototypes.PrototypeList.Children)
- {
- if (child is not MappingSpawnButton button)
- continue;
+ if (_placement.Eraser)
+ return;
+
+ Deselect();
+ _placement.Clear();
+ _placement.ToggleEraser();
+
+ if (Screen.EraseDecalButton.Pressed)
+ Screen.EraseDecalButton.Pressed = false;
+
+ Screen.UnPressActionsExcept(Screen.EraseEntityButton);
+ Screen.EntityPlacementMode.Disabled = true;
+
+ Meta.State = CursorState.Entity;
+ Meta.Color = DeleteColor;
+ }
- Collapse(button);
+ private void DisableEntityEraser()
+ {
+ if (!_placement.Eraser)
+ return;
+
+ _placement.ToggleEraser();
+ Meta.State = CursorState.None;
+ Screen.EntityPlacementMode.Disabled = false;
+ }
+
+ #region On Event
+ private void OnPrototypesReloaded(PrototypesReloadedEventArgs obj)
+ {
+ if (!obj.WasModified() &&
+ !obj.WasModified() &&
+ !obj.WasModified() &&
+ !obj.WasModified())
+ {
+ return;
}
- Screen.Prototypes.ScrollContainer.SetScrollValue(new Vector2(0, 0));
+ SaveFavorites();
+ ReloadPrototypes();
+ }
+
+ private void OnPlacementChanged(object? sender, EventArgs e)
+ {
+ if (!_placement.IsActive && _decal.GetActiveDecal().Decal == null)
+ Deselect();
+
+ Screen.EraseEntityButton.Pressed = _placement.Eraser;
+ Screen.EntityPlacementMode.Disabled = _placement.Eraser;
}
- private void OnClearSearch(ButtonEventArgs obj)
+ private void OnFavoritesLoaded(List prototypes)
{
- Screen.Prototypes.SearchBar.Text = string.Empty;
- OnSearch(new LineEditEventArgs(Screen.Prototypes.SearchBar, string.Empty));
+ Screen.Entities.FavoritesPrototype.Children = new List();
+ Screen.Decals.FavoritesPrototype.Children = new List();
+ Screen.Tiles.FavoritesPrototype.Children = new List();
+
+ foreach (var prototype in prototypes)
+ {
+ switch (prototype)
+ {
+ case EntityPrototype entityPrototype:
+ {
+ if (_idDict.GetOrNew(typeof(EntityPrototype)).TryGetValue(entityPrototype.ID, out var entity))
+ {
+ Screen.Entities.FavoritesPrototype.Children.Add(entity);
+ entity.Parents ??= new List();
+ entity.Parents.Add(Screen.Entities.FavoritesPrototype);
+ entity.Favorite = true;
+ }
+ break;
+ }
+ case DecalPrototype decalPrototype:
+ {
+ if (_idDict.GetOrNew(typeof(DecalPrototype)).TryGetValue(decalPrototype.ID, out var decal))
+ {
+ Screen.Decals.FavoritesPrototype.Children.Add(decal);
+ decal.Parents ??= new List();
+ decal.Parents.Add(Screen.Decals.FavoritesPrototype);
+ decal.Favorite = true;
+ }
+ break;
+ }
+ case ContentTileDefinition tileDefinition:
+ {
+ if (_idDict.GetOrNew(typeof(ContentTileDefinition)).TryGetValue(tileDefinition.ID, out var tile))
+ {
+ Screen.Tiles.FavoritesPrototype.Children.Add(tile);
+ tile.Parents ??= new List();
+ tile.Parents.Add(Screen.Tiles.FavoritesPrototype);
+ tile.Favorite = true;
+ }
+ break;
+ }
+ }
+ }
+ }
+
+ protected override void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args)
+ {
+ if (args.Viewport == null)
+ base.OnKeyBindStateChanged(new ViewportBoundKeyEventArgs(args.KeyEventArgs, Viewport.Viewport));
+ else
+ base.OnKeyBindStateChanged(args);
+
+ UpdateLocale();
}
private void OnGetData(IPrototype prototype, List textures)
@@ -466,7 +681,7 @@ private void OnGetData(IPrototype prototype, List textures)
}
}
- private void OnSelected(MappingPrototype mapping)
+ private void OnSelected(MappingPrototypeList list, MappingPrototype mapping)
{
if (mapping.Prototype == null)
return;
@@ -484,7 +699,7 @@ private void OnSelected(MappingPrototype mapping)
_lastClicked = null;
Control? last = null;
- var children = Screen.Prototypes.PrototypeList.Children;
+ var children = list.PrototypeList.Children.ToList();
foreach (var prototype in chain)
{
foreach (var child in children)
@@ -492,20 +707,22 @@ private void OnSelected(MappingPrototype mapping)
if (child is MappingSpawnButton button &&
button.Prototype == prototype)
{
- UnCollapse(button);
- OnSelected(button, prototype.Prototype);
- children = button.ChildrenPrototypes.Children;
+ button.CollapseButton.Pressed = true;
+ list.ToggleCollapse(button);
+ OnSelected(list, button, prototype.Prototype);
+ children = button.ChildrenPrototypes.Children.ToList();
+ children.AddRange(button.ChildrenPrototypesGallery.Children);
last = child;
break;
}
}
}
- if (last != null && Screen.Prototypes.PrototypeList.Visible)
- _scrollTo = last;
+ if (last != null && list.PrototypeList.Visible)
+ _scrollTo = (last, list);
}
- private void OnSelected(MappingSpawnButton button, IPrototype? prototype)
+ private void OnSelected(MappingPrototypeList list, MappingSpawnButton button, IPrototype? prototype)
{
var time = _timing.CurTime;
if (prototype is DecalPrototype)
@@ -515,13 +732,13 @@ private void OnSelected(MappingSpawnButton button, IPrototype? prototype)
if (_lastClicked is { } lastClicked &&
lastClicked.Button == button &&
lastClicked.At > time - TimeSpan.FromSeconds(0.333) &&
- string.IsNullOrEmpty(Screen.Prototypes.SearchBar.Text) &&
+ string.IsNullOrEmpty(list.SearchBar.Text) &&
button.CollapseButton.Visible)
{
button.CollapseButton.Pressed = !button.CollapseButton.Pressed;
- ToggleCollapse(button);
+ list.ToggleCollapse(button);
button.Button.Pressed = true;
- Screen.Prototypes.Selected = button;
+ list.Selected = button;
_lastClicked = null;
return;
}
@@ -539,14 +756,14 @@ private void OnSelected(MappingSpawnButton button, IPrototype? prototype)
if (button.Prototype == null)
return;
- if (Screen.Prototypes.Selected is { } oldButton &&
+ if (list.Selected is { } oldButton &&
oldButton != button)
{
Deselect();
}
- Screen.EntityContainer.Visible = false;
- Screen.DecalContainer.Visible = false;
+ Meta.State = CursorState.None;
+ Screen.UnPressActionsExcept(new Control());
switch (prototype)
{
@@ -561,7 +778,6 @@ private void OnSelected(MappingSpawnButton button, IPrototype? prototype)
IsTile = false
};
- Screen.EntityContainer.Visible = true;
_decal.SetActive(false);
_placement.BeginPlacing(placement);
break;
@@ -570,8 +786,7 @@ private void OnSelected(MappingSpawnButton button, IPrototype? prototype)
_placement.Clear();
_decal.SetActive(true);
- _decal.UpdateDecalInfo(decal.ID, Color.White, 0, true, 0, false);
- Screen.DecalContainer.Visible = true;
+ Screen.SelectDecal(decal.ID);
break;
case ContentTileDefinition tile:
{
@@ -591,57 +806,11 @@ private void OnSelected(MappingSpawnButton button, IPrototype? prototype)
break;
}
- Screen.Prototypes.Selected = button;
+ list.Selected = button;
button.Button.Pressed = true;
}
- private void Deselect()
- {
- if (Screen.Prototypes.Selected is { } selected)
- {
- selected.Button.Pressed = false;
- Screen.Prototypes.Selected = null;
-
- if (selected.Prototype?.Prototype is DecalPrototype)
- {
- _decal.SetActive(false);
- Screen.DecalContainer.Visible = false;
- }
-
- if (selected.Prototype?.Prototype is EntityPrototype)
- {
- _placement.Clear();
- }
-
- if (selected.Prototype?.Prototype is ContentTileDefinition)
- {
- _placement.Clear();
- }
- }
- }
-
- private void OnCollapseToggled(MappingSpawnButton button, ButtonToggledEventArgs args)
- {
- ToggleCollapse(button);
- }
-
- private void OnPickPressed(ButtonEventArgs args)
- {
- if (args.Button.Pressed)
- EnablePick();
- else
- DisablePick();
- }
-
- private void OnDeletePressed(ButtonEventArgs obj)
- {
- if (obj.Button.Pressed)
- EnableDelete();
- else
- DisableDelete();
- }
-
private void OnEntityReplacePressed(ButtonToggledEventArgs args)
{
_placement.Replacement = args.Pressed;
@@ -672,70 +841,209 @@ private void OnEraseEntityPressed(ButtonEventArgs args)
return;
if (args.Button.Pressed)
- EnableEraser();
+ EnableEntityEraser();
else
- DisableEraser();
+ DisableEntityEraser();
}
- private void OnEraseDecalPressed(ButtonToggledEventArgs args)
+ private void OnEraseTilePressed(ButtonEventArgs args)
{
+ Meta.State = CursorState.None;
_placement.Clear();
Deselect();
- Screen.EraseEntityButton.Pressed = false;
- _updatePlacement = true;
- _updateEraseDecal = args.Pressed;
- }
- private void EnableEraser()
- {
- if (_placement.Eraser)
+ if (!args.Button.Pressed)
+ {
+ Screen.EntityPlacementMode.Disabled = false;
+ _tileErase = false;
return;
+ }
- _placement.Clear();
- _placement.ToggleEraser();
+ _placement.BeginPlacing(new PlacementInformation
+ {
+ PlacementOption = "AlignTileAny",
+ TileType = 0,
+ Range = 400,
+ IsTile = true,
+ });
+
+ Screen.UnPressActionsExcept(Screen.EraseTileButton);
+ _tileErase = true;
Screen.EntityPlacementMode.Disabled = true;
- Screen.EraseDecalButton.Pressed = false;
- Deselect();
}
- private void DisableEraser()
+ private void OnEraseDecalPressed(ButtonToggledEventArgs args)
{
- if (!_placement.Eraser)
- return;
+ if (args.Button.Pressed)
+ {
+ Meta.State = CursorState.Tile;
+ Meta.Color = EraseDecalColor;
- _placement.ToggleEraser();
- Screen.EntityPlacementMode.Disabled = false;
+ Screen.UnPressActionsExcept(Screen.EraseDecalButton);
+ _placement.Clear();
+ Deselect();
+ }
+ else
+ {
+ Meta.State = CursorState.None;
+ }
+ }
+ #endregion
+
+ #region Mapping Actions
+ private void OnPickPressed(ButtonEventArgs args)
+ {
+ if (args.Button.Pressed)
+ EnablePick();
+ else
+ DisablePick();
}
private void EnablePick()
{
+ Deselect();
Screen.UnPressActionsExcept(Screen.Pick);
- State = CursorState.Pick;
+ Meta.State = CursorState.EntityOrTile;
+ Meta.Color = PickColor;
+ Meta.SecondColor = PickColor.WithAlpha(0.2f);
}
private void DisablePick()
{
Screen.Pick.Pressed = false;
- State = CursorState.None;
+ Meta.State = CursorState.None;
}
- private void EnableDelete()
+ private void OnPickDecalPressed(ButtonEventArgs args)
{
- Screen.UnPressActionsExcept(Screen.Delete);
- State = CursorState.Delete;
- EnableEraser();
+ if (args.Button.Pressed)
+ {
+ Deselect();
+ Meta.State = CursorState.Decal;
+ Meta.Color = PickColor;
+ Screen.UnPressActionsExcept(args.Button);
+ }
+ else
+ {
+ Meta.State = CursorState.None;
+ }
}
- private void DisableDelete()
+ private void OnFixGridAtmosPressed(ButtonEventArgs args)
{
- Screen.Delete.Pressed = false;
- State = CursorState.None;
- DisableEraser();
+ if (args.Button.Pressed)
+ {
+ Deselect();
+ Meta.State = CursorState.Grid;
+ Meta.Color = GridSelectColor;
+ Screen.UnPressActionsExcept(args.Button);
+ }
+ else
+ {
+ Meta.State = CursorState.None;
+ }
+ }
+
+ private void OnRemoveGridPressed(ButtonEventArgs args)
+ {
+ if (args.Button.Pressed)
+ {
+ Deselect();
+ Meta.State = CursorState.Grid;
+ Meta.Color = GridRemoveColor;
+ Screen.UnPressActionsExcept(args.Button);
+ }
+ else
+ {
+ Meta.State = CursorState.None;
+ }
+ }
+
+ private void OnMoveGridPressed(ButtonEventArgs args)
+ {
+ if (args.Button.Pressed)
+ {
+ Deselect();
+ Meta.State = CursorState.Grid;
+ Meta.Color = GridSelectColor;
+ Screen.UnPressActionsExcept(args.Button);
+ }
+ else
+ {
+ Meta.State = CursorState.None;
+ }
+
+ var gridDragSystem = _entitySystemManager.GetEntitySystem();
+ if (args.Button.Pressed != gridDragSystem.Enabled)
+ {
+ _consoleHost.ExecuteCommand("griddrag");
+ }
+ }
+
+ private void OnGridVVPressed(ButtonEventArgs args)
+ {
+ if (args.Button.Pressed)
+ {
+ Deselect();
+ Meta.State = CursorState.Grid;
+ Meta.Color = GridSelectColor;
+ Screen.UnPressActionsExcept(args.Button);
+ }
+ else
+ {
+ Meta.State = CursorState.None;
+ }
+ }
+
+ private void OnPipesColorPressed(ButtonEventArgs args)
+ {
+ _entitySystemManager.GetEntitySystem().ShowAll = args.Button.Pressed;
+
+ if (args.Button.Pressed)
+ {
+ Deselect();
+ Meta.State = CursorState.Entity;
+ Meta.Color = PickColor;
+ Screen.UnPressActionsExcept(args.Button);
+ }
+ else
+ {
+ Meta.State = CursorState.None;
+ }
+ }
+
+ private void OnChatButtonPressed(ButtonEventArgs args)
+ {
+ Screen.Chat.Visible = args.Button.Pressed;
+ }
+ #endregion
+
+ #region Handle Bindings
+ private bool HandleOpenContextMenu(in PointerInputCmdArgs args)
+ {
+ Deselect();
+
+ var coords = _transform.ToMapCoordinates(args.Coordinates);
+ if (_verbs.TryGetEntityMenuEntities(coords, out var entities))
+ _entityMenuController.OpenRootMenu(entities);
+
+ return true;
}
private bool HandleMappingUnselect(in PointerInputCmdArgs args)
{
- if (Screen.Prototypes.Selected is not { Prototype.Prototype: DecalPrototype })
+ if (Screen.MoveGrid.Pressed && _gridDrag.Enabled)
+ {
+ _consoleHost.ExecuteCommand("griddrag");
+ }
+
+ if (_placement.Eraser)
+ _placement.ToggleEraser();
+
+ Screen.UnPressActionsExcept(new Control());
+ Meta.State = CursorState.None;
+
+ if (Screen.Decals.Selected is not { Prototype.Prototype: DecalPrototype })
return false;
Deselect();
@@ -766,59 +1074,105 @@ private bool HandleDisablePick(ICommonSession? session, EntityCoordinates coords
return true;
}
+ private bool HandleEnableDecalPick(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+ {
+ Deselect();
+ Screen.PickDecal.Pressed = true;
+ Meta.State = CursorState.Decal;
+ Meta.Color = PickColor;
+ Screen.UnPressActionsExcept(Screen.PickDecal);
+ return true;
+ }
+
+ private bool HandleDisableDecalPick(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
+ {
+ Screen.PickDecal.Pressed = false;
+ Meta.State = CursorState.None;
+ return true;
+ }
+
private bool HandleEnableDelete(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
{
- EnableDelete();
+ Screen.EraseEntityButton.Pressed = true;
+ EnableEntityEraser();
return true;
}
private bool HandleDisableDelete(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
{
- DisableDelete();
+ Screen.EraseEntityButton.Pressed = false;
+ DisableEntityEraser();
return true;
}
private bool HandlePick(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
{
- if (State != CursorState.Pick)
- return false;
-
MappingPrototype? button = null;
- // Try and get tile under it
- // TODO: Separate mode for decals.
- if (!uid.IsValid())
+ if (Screen.Pick.Pressed)
{
- var mapPos = _transform.ToMapCoordinates(coords);
-
- if (_mapMan.TryFindGridAt(mapPos, out var gridUid, out var grid) &&
- _entityManager.System().TryGetTileRef(gridUid, grid, coords, out var tileRef) &&
- _allPrototypesDict.TryGetValue(tileRef.GetContentTileDefinition(), out button))
+ if (!uid.IsValid())
{
- OnSelected(button);
- return true;
+ var mapPos = _transform.ToMapCoordinates(coords);
+
+ if (_mapMan.TryFindGridAt(mapPos, out var gridUid, out var grid) &&
+ _entityManager.System().TryGetTileRef(gridUid, grid, coords, out var tileRef) &&
+ _allPrototypesDict.TryGetValue(tileRef.GetContentTileDefinition(), out button))
+ {
+ switch (button.Prototype)
+ {
+ case EntityPrototype:
+ {
+ OnSelected(Screen.Entities, button);
+ break;
+ }
+ case ContentTileDefinition:
+ {
+ OnSelected(Screen.Tiles, button);
+ break;
+ }
+ }
+
+ return true;
+ }
}
}
-
- if (button == null)
+ else if (Screen.PickDecal.Pressed)
{
- if (uid == EntityUid.Invalid ||
- _entityManager.GetComponentOrNull(uid) is not { EntityPrototype: { } prototype } ||
- !_allPrototypesDict.TryGetValue(prototype, out button))
+ if (GetHoveredDecal() is { } decal &&
+ _prototypeManager.TryIndex(decal.Id, out var decalProto) &&
+ _allPrototypesDict.TryGetValue(decalProto, out button))
{
- // we always block other input handlers if pick mode is enabled
- // this makes you not accidentally place something in space because you
- // miss-clicked while holding down the pick hotkey
+ OnSelected(Screen.Decals, button);
+ Screen.SelectDecal(decal);
return true;
}
+ }
+ else
+ {
+ return false;
+ }
- // Selected an entity
- OnSelected(button);
+ if (button != null)
+ return false;
- // Match rotation
- _placement.Direction = _entityManager.GetComponent(uid).LocalRotation.GetDir();
+ if (uid == EntityUid.Invalid ||
+ _entityManager.GetComponentOrNull(uid) is not
+ { EntityPrototype: { } prototype } ||
+ !_allPrototypesDict.TryGetValue(prototype, out button))
+ {
+ // we always block other input handlers if pick mode is enabled
+ // this makes you not accidentally place something in space because you
+ // miss-clicked while holding down the pick hotkey
+ return true;
}
+ // Selected an entity
+ OnSelected(Screen.Entities, button);
+
+ // Match rotation
+ _placement.Direction = _entityManager.GetComponent(uid).LocalRotation.GetDir();
+
return true;
}
@@ -840,49 +1194,72 @@ private bool HandleCancelEraseDecal(in PointerInputCmdArgs args)
return true;
}
- private async void SaveMap()
+ private bool HandleUse(in PointerInputCmdArgs args)
{
- await _mapping.SaveMap();
- }
+ if (Screen.FixGridAtmos.Pressed)
+ {
+ Screen.FixGridAtmos.Pressed = false;
+ Meta.State = CursorState.None;
+ if (GetHoveredGrid() is { } grid)
+ _consoleHost.ExecuteCommand($"fixgridatmos {_entityManager.GetNetEntity(grid.Owner).Id}");
- private void ToggleCollapse(MappingSpawnButton button)
- {
- if (button.CollapseButton.Pressed)
+ return true;
+ }
+
+ if (Screen.RemoveGrid.Pressed)
{
- if (button.Prototype?.Children != null)
- {
- foreach (var child in button.Prototype.Children)
- {
- Screen.Prototypes.Insert(button.ChildrenPrototypes, child, true);
- }
- }
+ Screen.RemoveGrid.Pressed = false;
+ Meta.State = CursorState.None;
+ if (GetHoveredGrid() is { } grid)
+ _consoleHost.ExecuteCommand($"rmgrid {_entityManager.GetNetEntity(grid.Owner).Id}");
- button.CollapseButton.Label.Text = "▼";
+ return true;
}
- else
+
+ if (Screen.GridVV.Pressed)
{
- button.ChildrenPrototypes.DisposeAllChildren();
- button.CollapseButton.Label.Text = "▶";
+ Screen.GridVV.Pressed = false;
+ Meta.State = CursorState.None;
+ if (GetHoveredGrid() is { } grid)
+ _consoleHost.ExecuteCommand($"vv {_entityManager.GetNetEntity(grid.Owner).Id}");
+
+ return true;
}
+
+ if (Screen.PipesColor.Pressed)
+ {
+ Screen.PipesColor.Pressed = false;
+ Meta.State = CursorState.None;
+ if (GetHoveredEntity() is { } entity)
+ _consoleHost.ExecuteCommand($"colornetwork {_entityManager.GetNetEntity(entity).Id} Pipe {Screen.DecalColor.ToHex()}");
+
+ return true;
+ }
+
+ return false;
}
- private void Collapse(MappingSpawnButton button)
+ private bool HandleMouseMiddle(in PointerInputCmdArgs args)
{
- if (!button.CollapseButton.Pressed)
- return;
+ if (Screen.PickDecal.Pressed)
+ {
+ _decalIndex += 1;
+ return true;
+ }
- button.CollapseButton.Pressed = false;
- ToggleCollapse(button);
- }
+ if (_decal.GetActiveDecal() is { Decal: not null })
+ {
+ Screen.ChangeDecalRotation(90f);
+ return true;
+ }
+ return false;
+ }
+ #endregion
- private void UnCollapse(MappingSpawnButton button)
+ private async void SaveMap()
{
- if (button.CollapseButton.Pressed)
- return;
-
- button.CollapseButton.Pressed = true;
- ToggleCollapse(button);
+ await _mapping.SaveMap();
}
public EntityUid? GetHoveredEntity()
@@ -897,40 +1274,136 @@ private void UnCollapse(MappingSpawnButton button)
return GetClickedEntity(mapPos);
}
- public override void FrameUpdate(FrameEventArgs e)
+ public Entity? GetHoveredGrid()
+ {
+ if (UserInterfaceManager.CurrentlyHovered is not IViewportControl viewport ||
+ _input.MouseScreenPosition is not { IsValid: true } position)
+ {
+ return null;
+ }
+
+ var mapPos = viewport.PixelToMap(position.Position);
+ if (_mapMan.TryFindGridAt(mapPos, out var gridUid, out var grid))
+ {
+ return new Entity(gridUid, grid);
+ }
+
+ return null;
+ }
+
+ public Box2Rotated? GetHoveredTileBox2()
+ {
+ if (UserInterfaceManager.CurrentlyHovered is not IViewportControl viewport ||
+ _input.MouseScreenPosition is not { IsValid: true } coords)
+ {
+ return null;
+ }
+
+ if (GetHoveredGrid() is not { } grid)
+ return null;
+
+ if (!_entityManager.TryGetComponent(grid, out var xform))
+ return null;
+
+ var mapCoords = viewport.PixelToMap(coords.Position);
+ var tileSize = grid.Comp.TileSize;
+ var tileDimensions = new Vector2(tileSize, tileSize);
+ var tileRef = _map.GetTileRef(grid, mapCoords);
+ var worldCoord = _map.LocalToWorld(grid.Owner, grid.Comp, tileRef.GridIndices);
+ var box = Box2.FromDimensions(worldCoord, tileDimensions);
+
+ return new Box2Rotated(box, xform.LocalRotation, box.BottomLeft);
+ }
+
+ private Decal? GetHoveredDecal()
{
- if (_updatePlacement)
+ if (UserInterfaceManager.CurrentlyHovered is not IViewportControl viewport ||
+ _input.MouseScreenPosition is not { IsValid: true } coords)
{
- _updatePlacement = false;
+ return null;
+ }
+
+ if (GetHoveredGrid() is not { } grid)
+ return null;
+
+ var mapCoords = viewport.PixelToMap(coords.Position);
+ var localCoords = _map.WorldToLocal(grid.Owner, grid.Comp, mapCoords.Position);
+ var bounds = Box2.FromDimensions(localCoords, new Vector2(1.05f, 1.05f)).Translated(new Vector2(-1, -1));
+ var decals = _sharedDecal.GetDecalsIntersecting(grid.Owner, bounds);
+
+ if (decals.FirstOrDefault() is not { Decal: not null })
+ return null;
+
+ if (!decals.ToList().TryGetValue(_decalIndex % decals.Count, out var decal))
+ return null;
- if (!_placement.IsActive && _decal.GetActiveDecal().Decal == null)
- Deselect();
+ _decalIndex %= decals.Count;
+ return decal.Decal;
+ }
+
+ public (Texture, Box2Rotated)? GetHoveredDecalData()
+ {
+ if (GetHoveredGrid() is not { } grid ||
+ !_entityManager.TryGetComponent(grid, out var xform))
+ return null;
- Screen.EraseEntityButton.Pressed = _placement.Eraser;
- Screen.EraseDecalButton.Pressed = _updateEraseDecal;
- Screen.EntityPlacementMode.Disabled = _placement.Eraser;
+ if (GetHoveredDecal() is not { } decal ||
+ !_prototypeManager.TryIndex(decal.Id, out var decalProto))
+ return null;
+
+ var worldCoords = _map.LocalToWorld(grid.Owner, grid.Comp, decal.Coordinates);
+ var texture = _sprite.Frame0(decalProto.Sprite);
+ var box = Box2.FromDimensions(worldCoords, new Vector2(1, 1));
+ return (texture, new Box2Rotated(box, decal.Angle + xform.LocalRotation, box.BottomLeft));
+ }
+
+ public override void FrameUpdate(FrameEventArgs e)
+ {
+ if (!Screen.EraseTileButton.Pressed && _tileErase)
+ {
+ _placement.Clear();
+ _tileErase = false;
}
if (_scrollTo is not { } scrollTo)
return;
+ var (control, list) = scrollTo;
+
// this is not ideal but we wait until the control's height is computed to use
// its position to scroll to
- if (scrollTo.Height > 0 && Screen.Prototypes.PrototypeList.Visible)
+ if (control.Height > 0 && list.PrototypeList.Visible)
{
- var y = scrollTo.GlobalPosition.Y - Screen.Prototypes.ScrollContainer.Height / 2 + scrollTo.Height;
- var scroll = Screen.Prototypes.ScrollContainer;
+ var y = control.GlobalPosition.Y - list.ScrollContainer.Height / 2 + control.Height - list.GlobalPosition.Y;
+ var scroll = list.ScrollContainer;
scroll.SetScrollValue(scroll.GetScrollValue() + new Vector2(0, y));
_scrollTo = null;
}
}
- // TODO this doesn't handle pressing down multiple state hotkeys at the moment
public enum CursorState
{
None,
- Pick,
- Delete
+ Tile,
+ Decal,
+ Entity,
+ Grid,
+ EntityOrTile,
+ }
+
+ public sealed class CursorMeta
+ {
+ ///
+ /// Defines how the overlay will be rendered
+ ///
+ public CursorState State = CursorState.None;
+
+ ///
+ /// Color with which the mapping overlay will be drawn
+ ///
+ public Color Color = Color.White;
+
+ public Color? SecondColor;
}
}
diff --git a/Content.Client/Mapping/MappingVisibilityButton.xaml b/Content.Client/Mapping/MappingVisibilityButton.xaml
new file mode 100644
index 0000000000..36971ae846
--- /dev/null
+++ b/Content.Client/Mapping/MappingVisibilityButton.xaml
@@ -0,0 +1,5 @@
+]
+ private const string WallTag = "Wall";
+
+ [ValidatePrototypeId]
+ private const string CableTag = "Cable";
+
+ [ValidatePrototypeId]
+ private const string DisposalTag = "Disposal";
+
+ public void ToggleWindow()
+ {
+ EnsureWindow();
+
+ if (_window!.IsOpen)
+ {
+ _window.Close();
+ }
+ else
+ {
+ _window.Open();
+ }
+ }
+
+ private void EnsureWindow()
+ {
+ if (_window is { Disposed: false })
+ return;
+
+ _window = UIManager.CreateWindow();
+
+ _window.Light.Pressed = _lightManager.Enabled;
+ _window.Light.OnPressed += args => _lightManager.Enabled = args.Button.Pressed;
+
+ _window.Fov.Pressed = _eyeManager.CurrentEye.DrawFov;
+ _window.Fov.OnPressed += args => _eyeManager.CurrentEye.DrawFov = args.Button.Pressed;
+
+ _window.Shadows.Pressed = _lightManager.DrawShadows;
+ _window.Shadows.OnPressed += args => _lightManager.DrawShadows = args.Button.Pressed;
+
+ _window.Entities.Pressed = true;
+ _window.Entities.OnPressed += OnToggleEntitiesPressed;
+
+ _window.Markers.Pressed = _entitySystemManager.GetEntitySystem().MarkersVisible;
+ _window.Markers.OnPressed += args =>
+ {
+ _entitySystemManager.GetEntitySystem().MarkersVisible = args.Button.Pressed;
+ };
+
+ _window.Walls.Pressed = true;
+ _window.Walls.OnPressed += args => ToggleWithTag(args, WallTag);
+
+ _window.Airlocks.Pressed = true;
+ _window.Airlocks.OnPressed += ToggleWithComp;
+
+ _window.Decals.Pressed = true;
+ _window.Decals.OnPressed += _ =>
+ {
+ _entitySystemManager.GetEntitySystem().ToggleOverlay();
+ };
+
+ _window.SubFloor.Pressed = _entitySystemManager.GetEntitySystem().ShowAll;
+ _window.SubFloor.OnPressed += OnToggleSubfloorPressed;
+
+ _window.Cables.Pressed = true;
+ _window.Cables.OnPressed += args => ToggleWithTag(args, CableTag);
+
+ _window.Disposal.Pressed = true;
+ _window.Disposal.OnPressed += args => ToggleWithTag(args, DisposalTag);
+
+ _window.Atmos.Pressed = true;
+ _window.Atmos.OnPressed += ToggleWithComp;
+
+ LayoutContainer.SetAnchorPreset(_window, LayoutContainer.LayoutPreset.CenterTop);
+ }
+
+ private void OnToggleEntitiesPressed(BaseButton.ButtonEventArgs args)
+ {
+ var query = _entityManager.AllEntityQueryEnumerator();
+
+ if (args.Button.Pressed && _window != null)
+ {
+ _window.Markers.Pressed = true;
+ _window.Walls.Pressed = true;
+ _window.Airlocks.Pressed = true;
+ }
+ else if (_window != null)
+ {
+ _window.Markers.Pressed = false;
+ _window.Walls.Pressed = false;
+ _window.Airlocks.Pressed = false;
+ }
+
+ while (query.MoveNext(out _, out var sprite))
+ {
+ sprite.Visible = args.Button.Pressed;
+ }
+ }
+
+ private void OnToggleSubfloorPressed(BaseButton.ButtonEventArgs args)
+ {
+ _entitySystemManager.GetEntitySystem().ShowAll = args.Button.Pressed;
+
+ if (args.Button.Pressed && _window != null)
+ {
+ _window.Cables.Pressed = true;
+ _window.Atmos.Pressed = true;
+ _window.Disposal.Pressed = true;
+ }
+ }
+
+ private void ToggleWithComp(BaseButton.ButtonEventArgs args) where TComp : IComponent
+ {
+ var query = _entityManager.AllEntityQueryEnumerator();
+
+ while (query.MoveNext(out _, out _, out var sprite))
+ {
+ sprite.Visible = args.Button.Pressed;
+ }
+ }
+
+ private void ToggleWithTag(BaseButton.ButtonEventArgs args, ProtoId tag)
+ {
+ var query = _entityManager.AllEntityQueryEnumerator();
+ var tagSystem = _entityManager.EntitySysManager.GetEntitySystem();
+
+ while (query.MoveNext(out var uid, out _, out var sprite))
+ {
+ if (tagSystem.HasTag(uid, tag))
+ sprite.Visible = args.Button.Pressed;
+ }
+ }
+}
diff --git a/Content.Client/Mapping/MappingVisibilityWindow.xaml b/Content.Client/Mapping/MappingVisibilityWindow.xaml
new file mode 100644
index 0000000000..71f4ac448a
--- /dev/null
+++ b/Content.Client/Mapping/MappingVisibilityWindow.xaml
@@ -0,0 +1,21 @@
+
+
+
+
diff --git a/Content.Client/Mapping/MappingVisibilityWindow.xaml.cs b/Content.Client/Mapping/MappingVisibilityWindow.xaml.cs
new file mode 100644
index 0000000000..c9e88e01ef
--- /dev/null
+++ b/Content.Client/Mapping/MappingVisibilityWindow.xaml.cs
@@ -0,0 +1,15 @@
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Mapping;
+
+[GenerateTypedNameReferences]
+public sealed partial class MappingVisibilityWindow : DefaultWindow
+{
+ public MappingVisibilityWindow()
+ {
+ RobustXamlLoader.Load(this);
+ }
+}
+
diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index a0a70b8165..a11f77dc4f 100644
--- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -294,6 +294,9 @@ void AddCheckBox(string checkBoxName, bool currentState, Action("/Fonts/NotoSans/NotoSans-Bold.ttf"), fontSize);
-
- foreach (var beacon in _navMap.Beacons.Values)
- {
- var position = beacon.Position - offset;
- position = ScalePosition(position with { Y = -position.Y });
-
- var textDimensions = handle.GetDimensions(font, beacon.Text, 1f);
- handle.DrawRect(new UIBox2(position - textDimensions / 2 - rectBuffer, position + textDimensions / 2 + rectBuffer), BackgroundColor);
- handle.DrawString(font, position - textDimensions / 2, beacon.Text, beacon.Color);
- }
- }
-
var curTime = Timing.RealTime;
var blinkFrequency = 1f / 1f;
var lit = curTime.TotalSeconds % blinkFrequency > blinkFrequency / 2f;
@@ -443,11 +423,31 @@ protected override void Draw(DrawingHandleScreen handle)
position = ScalePosition(new Vector2(position.X, -position.Y));
var scalingCoefficient = MinmapScaleModifier * float.Sqrt(MinimapScale);
- var positionOffset = new Vector2(scalingCoefficient * blip.Texture.Width, scalingCoefficient * blip.Texture.Height);
+ var positionOffset = new Vector2(scalingCoefficient * blip.Scale * blip.Texture.Width, scalingCoefficient * blip.Scale * blip.Texture.Height);
handle.DrawTextureRect(blip.Texture, new UIBox2(position - positionOffset, position + positionOffset), blip.Color);
}
}
+
+ // Beacons
+ if (_beacons.Pressed)
+ {
+ var rectBuffer = new Vector2(5f, 3f);
+
+ // Calculate font size for current zoom level
+ var fontSize = (int)Math.Round(1 / WorldRange * DefaultDisplayedRange * UIScale * _targetFontsize, 0);
+ var font = new VectorFont(_cache.GetResource("/Fonts/NotoSans/NotoSans-Bold.ttf"), fontSize);
+
+ foreach (var beacon in _navMap.Beacons.Values)
+ {
+ var position = beacon.Position - offset;
+ position = ScalePosition(position with { Y = -position.Y });
+
+ var textDimensions = handle.GetDimensions(font, beacon.Text, 1f);
+ handle.DrawRect(new UIBox2(position - textDimensions / 2 - rectBuffer, position + textDimensions / 2 + rectBuffer), BackgroundColor);
+ handle.DrawString(font, position - textDimensions / 2, beacon.Text, beacon.Color);
+ }
+ }
}
protected override void FrameUpdate(FrameEventArgs args)
@@ -689,6 +689,9 @@ protected void AddOrUpdateNavMapLine(
Vector2i foundTermius;
Vector2i foundOrigin;
+ if (origin == terminus)
+ return;
+
// Does our new line end at the beginning of an existing line?
if (lookup.Remove(terminus, out foundTermius))
{
@@ -739,13 +742,15 @@ public struct NavMapBlip
public Color Color;
public bool Blinks;
public bool Selectable;
+ public float Scale;
- public NavMapBlip(EntityCoordinates coordinates, Texture texture, Color color, bool blinks, bool selectable = true)
+ public NavMapBlip(EntityCoordinates coordinates, Texture texture, Color color, bool blinks, bool selectable = true, float scale = 1f)
{
Coordinates = coordinates;
Texture = texture;
Color = color;
Blinks = blinks;
Selectable = selectable;
+ Scale = scale;
}
}
diff --git a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
index d36a91c373..78dd922112 100644
--- a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
+++ b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
@@ -7,6 +7,7 @@
using Content.Client.Administration.UI.Tabs.PlayerTab;
using Content.Client.Gameplay;
using Content.Client.Lobby;
+using Content.Client.Mapping;
using Content.Client.UserInterface.Controls;
using Content.Client.Verbs.UI;
using Content.Shared.Administration.Events;
@@ -27,6 +28,7 @@ namespace Content.Client.UserInterface.Systems.Admin;
public sealed class AdminUIController : UIController,
IOnStateEntered,
IOnStateEntered,
+ IOnStateEntered,
IOnSystemChanged
{
[Dependency] private readonly IClientAdminManager _admin = default!;
@@ -83,6 +85,12 @@ public void OnStateEntered(LobbyState state)
AdminStatusUpdated();
}
+ public void OnStateEntered(MappingState state)
+ {
+ EnsureWindow();
+ AdminStatusUpdated();
+ }
+
public void OnSystemLoaded(AdminSystem system)
{
EnsureWindow();
diff --git a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs
index 85c4af7672..c80de05da2 100644
--- a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs
+++ b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs
@@ -1,4 +1,5 @@
using Content.Client.Gameplay;
+using Content.Client.Mapping;
using Content.Client.UserInterface.Controls;
using Content.Client.UserInterface.Systems.Guidebook;
using Content.Client.UserInterface.Systems.Info;
@@ -16,7 +17,7 @@
namespace Content.Client.UserInterface.Systems.EscapeMenu;
[UsedImplicitly]
-public sealed class EscapeUIController : UIController, IOnStateEntered, IOnStateExited
+public sealed class EscapeUIController : UIController, IOnStateEntered, IOnStateExited, IOnStateEntered, IOnStateExited
{
[Dependency] private readonly IClientConsoleHost _console = default!;
[Dependency] private readonly IUriOpener _uri = default!;
@@ -123,6 +124,73 @@ public void OnStateExited(GameplayState state)
CommandBinds.Unregister();
}
+ public void OnStateEntered(MappingState state)
+ {
+ _escapeWindow = UIManager.CreateWindow();
+
+ _escapeWindow.OnClose += DeactivateButton;
+ _escapeWindow.OnOpen += ActivateButton;
+
+ _escapeWindow.ChangelogButton.OnPressed += _ =>
+ {
+ CloseEscapeWindow();
+ _changelog.ToggleWindow();
+ };
+
+ _escapeWindow.RulesButton.OnPressed += _ =>
+ {
+ CloseEscapeWindow();
+ _info.OpenWindow();
+ };
+
+ _escapeWindow.DisconnectButton.OnPressed += _ =>
+ {
+ CloseEscapeWindow();
+ _console.ExecuteCommand("disconnect");
+ };
+
+ _escapeWindow.OptionsButton.OnPressed += _ =>
+ {
+ CloseEscapeWindow();
+ _options.OpenWindow();
+ };
+
+ _escapeWindow.QuitButton.OnPressed += _ =>
+ {
+ CloseEscapeWindow();
+ _console.ExecuteCommand("quit");
+ };
+
+ _escapeWindow.WikiButton.OnPressed += _ =>
+ {
+ _uri.OpenUri(_cfg.GetCVar(CCVars.InfoLinksWiki));
+ };
+
+ _escapeWindow.GuidebookButton.OnPressed += _ =>
+ {
+ _guidebook.ToggleGuidebook();
+ };
+
+ // Hide wiki button if we don't have a link for it.
+ _escapeWindow.WikiButton.Visible = _cfg.GetCVar(CCVars.InfoLinksWiki) != "";
+
+ CommandBinds.Builder
+ .Bind(EngineKeyFunctions.EscapeMenu,
+ InputCmdHandler.FromDelegate(_ => ToggleWindow()))
+ .Register();
+ }
+
+ public void OnStateExited(MappingState state)
+ {
+ if (_escapeWindow != null)
+ {
+ _escapeWindow.Dispose();
+ _escapeWindow = null;
+ }
+
+ CommandBinds.Unregister();
+ }
+
private void EscapeButtonOnOnPressed(ButtonEventArgs obj)
{
ToggleWindow();
diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
index 8af5edaf31..9a819b257b 100644
--- a/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
@@ -39,7 +39,7 @@ public async Task DeconstructComputer()
await StartDeconstruction(ComputerId);
// Initial interaction turns id computer into generic computer
- await InteractUsing(Screw);
+ await InteractUsing(Pry);
AssertPrototype(ComputerFrame);
// Perform deconstruction steps
@@ -69,7 +69,7 @@ public async Task ChangeComputer()
await SpawnTarget(ComputerId);
// Initial interaction turns id computer into generic computer
- await InteractUsing(Screw);
+ await InteractUsing(Pry);
AssertPrototype(ComputerFrame);
// Perform partial deconstruction steps
diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs
index 03a83abda7..3cbd7584f3 100644
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -29,14 +29,16 @@ public sealed class PostMapInitTest
private static readonly string[] NoSpawnMaps =
{
- "CentComm",
+ "CentCommMain",
+ "CentCommHarmony",
"Dart",
"NukieOutpost"
};
private static readonly string[] Grids =
{
- "/Maps/centcomm.yml",
+ "/Maps/CentralCommand/main.yml",
+ "/Maps/CentralCommand/harmony.yml", // Harmony CC version
"/Maps/Shuttles/cargo.yml",
"/Maps/Shuttles/emergency.yml",
"/Maps/Shuttles/infiltrator.yml",
@@ -46,7 +48,8 @@ public sealed class PostMapInitTest
{
"Dev",
"TestTeg",
- "CentComm",
+ "CentCommMain",
+ "CentCommHarmony",
"MeteorArena",
"NukieOutpost",
"Core",
diff --git a/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs b/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
new file mode 100644
index 0000000000..5ecadc7154
--- /dev/null
+++ b/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs
@@ -0,0 +1,542 @@
+using Content.Server.Atmos.Components;
+using Content.Server.Atmos.Piping.Components;
+using Content.Server.DeviceNetwork.Components;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.EntitySystems;
+using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.Nodes;
+using Content.Server.Power.Components;
+using Content.Shared.Atmos;
+using Content.Shared.Atmos.Components;
+using Content.Shared.Atmos.Consoles;
+using Content.Shared.Labels.Components;
+using Content.Shared.Pinpointer;
+using Robust.Server.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Timing;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+namespace Content.Server.Atmos.Consoles;
+
+public sealed class AtmosMonitoringConsoleSystem : SharedAtmosMonitoringConsoleSystem
+{
+ [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
+ [Dependency] private readonly SharedMapSystem _sharedMapSystem = default!;
+ [Dependency] private readonly IGameTiming _gameTiming = default!;
+
+ // Private variables
+ // Note: this data does not need to be saved
+ private Dictionary> _gridAtmosPipeChunks = new();
+ private float _updateTimer = 1.0f;
+
+ // Constants
+ private const float UpdateTime = 1.0f;
+ private const int ChunkSize = 4;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ // Console events
+ SubscribeLocalEvent(OnConsoleInit);
+ SubscribeLocalEvent(OnConsoleAnchorChanged);
+ SubscribeLocalEvent(OnConsoleParentChanged);
+
+ // Tracked device events
+ SubscribeLocalEvent(OnEntityNodeGroupsRebuilt);
+ SubscribeLocalEvent(OnEntityPipeColorChanged);
+ SubscribeLocalEvent(OnEntityShutdown);
+
+ // Grid events
+ SubscribeLocalEvent(OnGridSplit);
+ }
+
+ #region Event handling
+
+ private void OnConsoleInit(EntityUid uid, AtmosMonitoringConsoleComponent component, ComponentInit args)
+ {
+ InitializeAtmosMonitoringConsole(uid, component);
+ }
+
+ private void OnConsoleAnchorChanged(EntityUid uid, AtmosMonitoringConsoleComponent component, AnchorStateChangedEvent args)
+ {
+ InitializeAtmosMonitoringConsole(uid, component);
+ }
+
+ private void OnConsoleParentChanged(EntityUid uid, AtmosMonitoringConsoleComponent component, EntParentChangedMessage args)
+ {
+ component.ForceFullUpdate = true;
+ InitializeAtmosMonitoringConsole(uid, component);
+ }
+
+ private void OnEntityNodeGroupsRebuilt(EntityUid uid, AtmosMonitoringConsoleDeviceComponent component, NodeGroupsRebuilt args)
+ {
+ InitializeAtmosMonitoringDevice(uid, component);
+ }
+
+ private void OnEntityPipeColorChanged(EntityUid uid, AtmosMonitoringConsoleDeviceComponent component, AtmosPipeColorChangedEvent args)
+ {
+ InitializeAtmosMonitoringDevice(uid, component);
+ }
+
+ private void OnEntityShutdown(EntityUid uid, AtmosMonitoringConsoleDeviceComponent component, EntityTerminatingEvent args)
+ {
+ ShutDownAtmosMonitoringEntity(uid, component);
+ }
+
+ private void OnGridSplit(ref GridSplitEvent args)
+ {
+ // Collect grids
+ var allGrids = args.NewGrids.ToList();
+
+ if (!allGrids.Contains(args.Grid))
+ allGrids.Add(args.Grid);
+
+ // Rebuild the pipe networks on the affected grids
+ foreach (var ent in allGrids)
+ {
+ if (!TryComp(ent, out var grid))
+ continue;
+
+ RebuildAtmosPipeGrid(ent, grid);
+ }
+
+ // Update atmos monitoring consoles that stand upon an updated grid
+ var query = AllEntityQuery();
+ while (query.MoveNext(out var ent, out var entConsole, out var entXform))
+ {
+ if (entXform.GridUid == null)
+ continue;
+
+ if (!allGrids.Contains(entXform.GridUid.Value))
+ continue;
+
+ InitializeAtmosMonitoringConsole(ent, entConsole);
+ }
+ }
+
+ #endregion
+
+ #region UI updates
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+
+ _updateTimer += frameTime;
+
+ if (_updateTimer >= UpdateTime)
+ {
+ _updateTimer -= UpdateTime;
+
+ var query = AllEntityQuery();
+ while (query.MoveNext(out var ent, out var entConsole, out var entXform))
+ {
+ if (entXform?.GridUid == null)
+ continue;
+
+ UpdateUIState(ent, entConsole, entXform);
+ }
+ }
+ }
+
+ public void UpdateUIState
+ (EntityUid uid,
+ AtmosMonitoringConsoleComponent component,
+ TransformComponent xform)
+ {
+ if (!_userInterfaceSystem.IsUiOpen(uid, AtmosMonitoringConsoleUiKey.Key))
+ return;
+
+ var gridUid = xform.GridUid!.Value;
+
+ if (!TryComp(gridUid, out var mapGrid))
+ return;
+
+ if (!TryComp(gridUid, out var atmosphere))
+ return;
+
+ // The grid must have a NavMapComponent to visualize the map in the UI
+ EnsureComp(gridUid);
+
+ // Gathering data to be send to the client
+ var atmosNetworks = new List();
+ var query = AllEntityQuery();
+
+ while (query.MoveNext(out var ent, out var entSensor, out var entXform))
+ {
+ if (entXform?.GridUid != xform.GridUid)
+ continue;
+
+ if (!entXform.Anchored)
+ continue;
+
+ var entry = CreateAtmosMonitoringConsoleEntry(ent, entXform);
+
+ if (entry != null)
+ atmosNetworks.Add(entry.Value);
+ }
+
+ // Set the UI state
+ _userInterfaceSystem.SetUiState(uid, AtmosMonitoringConsoleUiKey.Key,
+ new AtmosMonitoringConsoleBoundInterfaceState(atmosNetworks.ToArray()));
+ }
+
+ private AtmosMonitoringConsoleEntry? CreateAtmosMonitoringConsoleEntry(EntityUid uid, TransformComponent xform)
+ {
+ AtmosMonitoringConsoleEntry? entry = null;
+
+ var netEnt = GetNetEntity(uid);
+ var name = MetaData(uid).EntityName;
+ var address = string.Empty;
+
+ if (xform.GridUid == null)
+ return null;
+
+ if (!TryGettingFirstPipeNode(uid, out var pipeNode, out var netId) ||
+ pipeNode == null ||
+ netId == null)
+ return null;
+
+ var pipeColor = TryComp(uid, out var colorComponent) ? colorComponent.Color : Color.White;
+
+ // Name the entity based on its label, if available
+ if (TryComp(uid, out var label) && label.CurrentLabel != null)
+ name = label.CurrentLabel;
+
+ // Otherwise use its base name and network address
+ else if (TryComp(uid, out var deviceNet))
+ address = deviceNet.Address;
+
+ // Entry for unpowered devices
+ if (TryComp(uid, out var apcPowerReceiver) && !apcPowerReceiver.Powered)
+ {
+ entry = new AtmosMonitoringConsoleEntry(netEnt, GetNetCoordinates(xform.Coordinates), netId.Value, name, address)
+ {
+ IsPowered = false,
+ Color = pipeColor
+ };
+
+ return entry;
+ }
+
+ // Entry for powered devices
+ var gasData = new Dictionary();
+ var isAirPresent = pipeNode.Air.TotalMoles > 0;
+
+ if (isAirPresent)
+ {
+ foreach (var gas in Enum.GetValues())
+ {
+ if (pipeNode.Air[(int)gas] > 0)
+ gasData.Add(gas, pipeNode.Air[(int)gas] / pipeNode.Air.TotalMoles);
+ }
+ }
+
+ entry = new AtmosMonitoringConsoleEntry(netEnt, GetNetCoordinates(xform.Coordinates), netId.Value, name, address)
+ {
+ TemperatureData = isAirPresent ? pipeNode.Air.Temperature : 0f,
+ PressureData = pipeNode.Air.Pressure,
+ TotalMolData = pipeNode.Air.TotalMoles,
+ GasData = gasData,
+ Color = pipeColor
+ };
+
+ return entry;
+ }
+
+ private Dictionary GetAllAtmosDeviceNavMapData(EntityUid gridUid)
+ {
+ var atmosDeviceNavMapData = new Dictionary();
+
+ var query = AllEntityQuery();
+ while (query.MoveNext(out var ent, out var entComponent, out var entXform))
+ {
+ if (TryGetAtmosDeviceNavMapData(ent, entComponent, entXform, gridUid, out var data))
+ atmosDeviceNavMapData.Add(data.Value.NetEntity, data.Value);
+ }
+
+ return atmosDeviceNavMapData;
+ }
+
+ private bool TryGetAtmosDeviceNavMapData
+ (EntityUid uid,
+ AtmosMonitoringConsoleDeviceComponent component,
+ TransformComponent xform,
+ EntityUid gridUid,
+ [NotNullWhen(true)] out AtmosDeviceNavMapData? device)
+ {
+ device = null;
+
+ if (component.NavMapBlip == null)
+ return false;
+
+ if (xform.GridUid != gridUid)
+ return false;
+
+ if (!xform.Anchored)
+ return false;
+
+ var direction = xform.LocalRotation.GetCardinalDir();
+
+ if (!TryGettingFirstPipeNode(uid, out var _, out var netId))
+ netId = -1;
+
+ var color = Color.White;
+
+ if (TryComp(uid, out var atmosPipeColor))
+ color = atmosPipeColor.Color;
+
+ device = new AtmosDeviceNavMapData(GetNetEntity(uid), GetNetCoordinates(xform.Coordinates), netId.Value, component.NavMapBlip.Value, direction, color);
+
+ return true;
+ }
+
+ #endregion
+
+ #region Pipe net functions
+
+ private void RebuildAtmosPipeGrid(EntityUid gridUid, MapGridComponent grid)
+ {
+ var allChunks = new Dictionary();
+
+ // Adds all atmos pipes to the nav map via bit mask chunks
+ var queryPipes = AllEntityQuery();
+ while (queryPipes.MoveNext(out var ent, out var entAtmosPipeColor, out var entNodeContainer, out var entXform))
+ {
+ if (entXform.GridUid != gridUid)
+ continue;
+
+ if (!entXform.Anchored)
+ continue;
+
+ var tile = _sharedMapSystem.GetTileRef(gridUid, grid, entXform.Coordinates);
+ var chunkOrigin = SharedMapSystem.GetChunkIndices(tile.GridIndices, ChunkSize);
+ var relative = SharedMapSystem.GetChunkRelative(tile.GridIndices, ChunkSize);
+
+ if (!allChunks.TryGetValue(chunkOrigin, out var chunk))
+ {
+ chunk = new AtmosPipeChunk(chunkOrigin);
+ allChunks[chunkOrigin] = chunk;
+ }
+
+ UpdateAtmosPipeChunk(ent, entNodeContainer, entAtmosPipeColor, GetTileIndex(relative), ref chunk);
+ }
+
+ // Add or update the chunks on the associated grid
+ _gridAtmosPipeChunks[gridUid] = allChunks;
+
+ // Update the consoles that are on the same grid
+ var queryConsoles = AllEntityQuery();
+ while (queryConsoles.MoveNext(out var ent, out var entConsole, out var entXform))
+ {
+ if (gridUid != entXform.GridUid)
+ continue;
+
+ entConsole.AtmosPipeChunks = allChunks;
+ Dirty(ent, entConsole);
+ }
+ }
+
+ private void RebuildSingleTileOfPipeNetwork(EntityUid gridUid, MapGridComponent grid, EntityCoordinates coords)
+ {
+ if (!_gridAtmosPipeChunks.TryGetValue(gridUid, out var allChunks))
+ allChunks = new Dictionary();
+
+ var tile = _sharedMapSystem.GetTileRef(gridUid, grid, coords);
+ var chunkOrigin = SharedMapSystem.GetChunkIndices(tile.GridIndices, ChunkSize);
+ var relative = SharedMapSystem.GetChunkRelative(tile.GridIndices, ChunkSize);
+ var tileIdx = GetTileIndex(relative);
+
+ if (!allChunks.TryGetValue(chunkOrigin, out var chunk))
+ chunk = new AtmosPipeChunk(chunkOrigin);
+
+ // Remove all stale values for the tile
+ foreach (var (index, atmosPipeData) in chunk.AtmosPipeData)
+ {
+ var mask = (ulong)SharedNavMapSystem.AllDirMask << tileIdx * SharedNavMapSystem.Directions;
+ chunk.AtmosPipeData[index] = atmosPipeData & ~mask;
+ }
+
+ // Rebuild the tile's pipe data
+ foreach (var ent in _sharedMapSystem.GetAnchoredEntities(gridUid, grid, coords))
+ {
+ if (!TryComp(ent, out var entAtmosPipeColor))
+ continue;
+
+ if (!TryComp(ent, out var entNodeContainer))
+ continue;
+
+ UpdateAtmosPipeChunk(ent, entNodeContainer, entAtmosPipeColor, tileIdx, ref chunk);
+ }
+
+ // Add or update the chunk on the associated grid
+ // Only the modified chunk will be sent to the client
+ chunk.LastUpdate = _gameTiming.CurTick;
+ allChunks[chunkOrigin] = chunk;
+ _gridAtmosPipeChunks[gridUid] = allChunks;
+
+ // Update the components of the monitoring consoles that are attached to the same grid
+ var query = AllEntityQuery();
+
+ while (query.MoveNext(out var ent, out var entConsole, out var entXform))
+ {
+ if (gridUid != entXform.GridUid)
+ continue;
+
+ entConsole.AtmosPipeChunks = allChunks;
+ Dirty(ent, entConsole);
+ }
+ }
+
+ private void UpdateAtmosPipeChunk(EntityUid uid, NodeContainerComponent nodeContainer, AtmosPipeColorComponent pipeColor, int tileIdx, ref AtmosPipeChunk chunk)
+ {
+ // Entities that are actively being deleted are not to be drawn
+ if (MetaData(uid).EntityLifeStage >= EntityLifeStage.Terminating)
+ return;
+
+ foreach ((var id, var node) in nodeContainer.Nodes)
+ {
+ if (node is not PipeNode)
+ continue;
+
+ var pipeNode = (PipeNode)node;
+ var netId = GetPipeNodeNetId(pipeNode);
+ var pipeDirection = pipeNode.CurrentPipeDirection;
+
+ chunk.AtmosPipeData.TryGetValue((netId, pipeColor.Color.ToHex()), out var atmosPipeData);
+ atmosPipeData |= (ulong)pipeDirection << tileIdx * SharedNavMapSystem.Directions;
+ chunk.AtmosPipeData[(netId, pipeColor.Color.ToHex())] = atmosPipeData;
+ }
+ }
+
+ private bool TryGettingFirstPipeNode(EntityUid uid, [NotNullWhen(true)] out PipeNode? pipeNode, [NotNullWhen(true)] out int? netId)
+ {
+ pipeNode = null;
+ netId = null;
+
+ if (!TryComp(uid, out var nodeContainer))
+ return false;
+
+ foreach (var node in nodeContainer.Nodes.Values)
+ {
+ if (node is PipeNode)
+ {
+ pipeNode = (PipeNode)node;
+ netId = GetPipeNodeNetId(pipeNode);
+
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ private int GetPipeNodeNetId(PipeNode pipeNode)
+ {
+ if (pipeNode.NodeGroup is BaseNodeGroup)
+ {
+ var nodeGroup = (BaseNodeGroup)pipeNode.NodeGroup;
+
+ return nodeGroup.NetId;
+ }
+
+ return -1;
+ }
+
+ #endregion
+
+ #region Initialization functions
+
+ private void InitializeAtmosMonitoringConsole(EntityUid uid, AtmosMonitoringConsoleComponent component)
+ {
+ var xform = Transform(uid);
+
+ if (xform.GridUid == null)
+ return;
+
+ var grid = xform.GridUid.Value;
+
+ if (!TryComp(grid, out var map))
+ return;
+
+ component.AtmosDevices = GetAllAtmosDeviceNavMapData(grid);
+
+ if (!_gridAtmosPipeChunks.TryGetValue(grid, out var chunks))
+ {
+ RebuildAtmosPipeGrid(grid, map);
+ }
+
+ else
+ {
+ component.AtmosPipeChunks = chunks;
+ Dirty(uid, component);
+ }
+ }
+
+ private void InitializeAtmosMonitoringDevice(EntityUid uid, AtmosMonitoringConsoleDeviceComponent component)
+ {
+ // Rebuild tile
+ var xform = Transform(uid);
+ var gridUid = xform.GridUid;
+
+ if (gridUid != null && TryComp(gridUid, out var grid))
+ RebuildSingleTileOfPipeNetwork(gridUid.Value, grid, xform.Coordinates);
+
+ // Update blips on affected consoles
+ if (component.NavMapBlip == null)
+ return;
+
+ var netEntity = EntityManager.GetNetEntity(uid);
+ var query = AllEntityQuery();
+
+ while (query.MoveNext(out var ent, out var entConsole, out var entXform))
+ {
+ var isDirty = entConsole.AtmosDevices.Remove(netEntity);
+
+ if (gridUid != null &&
+ gridUid == entXform.GridUid &&
+ xform.Anchored &&
+ TryGetAtmosDeviceNavMapData(uid, component, xform, gridUid.Value, out var data))
+ {
+ entConsole.AtmosDevices.Add(netEntity, data.Value);
+ isDirty = true;
+ }
+
+ if (isDirty)
+ Dirty(ent, entConsole);
+ }
+ }
+
+ private void ShutDownAtmosMonitoringEntity(EntityUid uid, AtmosMonitoringConsoleDeviceComponent component)
+ {
+ // Rebuild tile
+ var xform = Transform(uid);
+ var gridUid = xform.GridUid;
+
+ if (gridUid != null && TryComp(gridUid, out var grid))
+ RebuildSingleTileOfPipeNetwork(gridUid.Value, grid, xform.Coordinates);
+
+ // Update blips on affected consoles
+ if (component.NavMapBlip == null)
+ return;
+
+ var netEntity = EntityManager.GetNetEntity(uid);
+ var query = AllEntityQuery();
+
+ while (query.MoveNext(out var ent, out var entConsole))
+ {
+ if (entConsole.AtmosDevices.Remove(netEntity))
+ Dirty(ent, entConsole);
+ }
+ }
+
+ #endregion
+
+ private int GetTileIndex(Vector2i relativeTile)
+ {
+ return relativeTile.X * ChunkSize + relativeTile.Y;
+ }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
index f711b235af..0f009a5063 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
@@ -36,7 +36,7 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar
return;
}
- var mixtures = new GasMixture[7];
+ var mixtures = new GasMixture[8];
for (var i = 0; i < mixtures.Length; i++)
mixtures[i] = new GasMixture(Atmospherics.CellVolume) { Temperature = Atmospherics.T20C };
@@ -65,6 +65,9 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar
mixtures[6].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesStandard);
mixtures[6].Temperature = 235f; // Little colder than an actual freezer but gives a grace period to get e.g. themomachines set up, should keep warm for a few door openings
+ // 7: Nitrogen (101kpa) for vox rooms
+ mixtures[7].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellStandard);
+
foreach (var arg in args)
{
if (!NetEntity.TryParse(arg, out var netEntity) || !TryGetEntity(netEntity, out var euid))
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
index db95223733..a03f27b561 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs
@@ -1,19 +1,21 @@
using Content.Server.Atmos.Components;
-using Content.Server.Atmos.Reactions;
+using Content.Server.Decals;
using Content.Shared.Atmos;
using Content.Shared.Atmos.Components;
using Content.Shared.Atmos.Reactions;
-using Content.Shared.Audio;
using Content.Shared.Database;
using Robust.Shared.Audio;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
-using Robust.Shared.Player;
+using Robust.Shared.Random;
namespace Content.Server.Atmos.EntitySystems
{
public sealed partial class AtmosphereSystem
{
+ [Dependency] private readonly DecalSystem _decalSystem = default!;
+ [Dependency] private readonly IRobustRandom _random = default!;
+
private const int HotspotSoundCooldownCycles = 200;
private int _hotspotSoundCooldown = 0;
@@ -56,7 +58,30 @@ private void ProcessHotspot(
if (tile.Hotspot.Bypassing)
{
tile.Hotspot.State = 3;
- // TODO ATMOS: Burn tile here
+
+ var gridUid = ent.Owner;
+ var tilePos = tile.GridIndices;
+
+ // Get the existing decals on the tile
+ var tileDecals = _decalSystem.GetDecalsInRange(gridUid, tilePos);
+
+ // Count the burnt decals on the tile
+ var tileBurntDecals = 0;
+
+ foreach (var set in tileDecals)
+ {
+ if (Array.IndexOf(_burntDecals, set.Decal.Id) == -1)
+ continue;
+
+ tileBurntDecals++;
+
+ if (tileBurntDecals > 4)
+ break;
+ }
+
+ // Add a random burned decal to the tile only if there are less than 4 of them
+ if (tileBurntDecals < 4)
+ _decalSystem.TryAddDecal(_burntDecals[_random.Next(_burntDecals.Length)], new EntityCoordinates(gridUid, tilePos), out _, cleanable: true);
if (tile.Air.Temperature > Atmospherics.FireMinimumTemperatureToSpread)
{
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
index dbbe769bea..9b7d4615ae 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
@@ -4,6 +4,7 @@
using Content.Server.Fluids.EntitySystems;
using Content.Server.NodeContainer.EntitySystems;
using Content.Shared.Atmos.EntitySystems;
+using Content.Shared.Decals;
using Content.Shared.Doors.Components;
using Content.Shared.Maps;
using Content.Shared.Throwing;
@@ -13,7 +14,9 @@
using Robust.Shared.Containers;
using Robust.Shared.Map;
using Robust.Shared.Physics.Systems;
+using Robust.Shared.Prototypes;
using Robust.Shared.Random;
+using System.Linq;
namespace Content.Server.Atmos.EntitySystems;
@@ -37,6 +40,7 @@ public sealed partial class AtmosphereSystem : SharedAtmosphereSystem
[Dependency] private readonly SharedTransformSystem _transformSystem = default!;
[Dependency] private readonly TileSystem _tile = default!;
[Dependency] private readonly MapSystem _map = default!;
+ [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] public readonly PuddleSystem Puddle = default!;
[Dependency] private readonly ThrowingSystem _throwing = default!;
@@ -49,6 +53,8 @@ public sealed partial class AtmosphereSystem : SharedAtmosphereSystem
private EntityQuery _firelockQuery;
private HashSet _entSet = new();
+ private string[] _burntDecals = [];
+
public override void Initialize()
{
base.Initialize();
@@ -68,7 +74,9 @@ public override void Initialize()
_firelockQuery = GetEntityQuery();
SubscribeLocalEvent(OnTileChanged);
+ SubscribeLocalEvent(OnPrototypesReloaded);
+ CacheDecals();
}
public override void Shutdown()
@@ -83,6 +91,12 @@ private void OnTileChanged(ref TileChangedEvent ev)
InvalidateTile(ev.NewTile.GridUid, ev.NewTile.GridIndices);
}
+ private void OnPrototypesReloaded(PrototypesReloadedEventArgs ev)
+ {
+ if (ev.WasModified())
+ CacheDecals();
+ }
+
public override void Update(float frameTime)
{
base.Update(frameTime);
@@ -109,4 +123,9 @@ public override void Update(float frameTime)
_exposedTimer -= ExposedUpdateDelay;
}
+
+ private void CacheDecals()
+ {
+ _burntDecals = _prototypeManager.EnumeratePrototypes().Where(x => x.Tags.Contains("burnt")).Select(x => x.ID).ToArray();
+ }
}
diff --git a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs
index 93f704fe21..643b0ce782 100644
--- a/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AirAlarmComponent.cs
@@ -11,8 +11,8 @@ namespace Content.Server.Atmos.Monitor.Components;
[RegisterComponent]
public sealed partial class AirAlarmComponent : Component
{
- [ViewVariables] public AirAlarmMode CurrentMode { get; set; } = AirAlarmMode.Filtering;
- [ViewVariables] public bool AutoMode { get; set; } = true;
+ [DataField] public AirAlarmMode CurrentMode { get; set; } = AirAlarmMode.Filtering;
+ [DataField] public bool AutoMode { get; set; } = true;
// Remember to null this afterwards.
[ViewVariables] public IAirAlarmModeUpdate? CurrentModeUpdater { get; set; }
diff --git a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
index cb6d4d1630..830479561d 100644
--- a/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
+++ b/Content.Server/Atmos/Monitor/Components/AtmosMonitorComponent.cs
@@ -48,7 +48,9 @@ public sealed partial class AtmosMonitorComponent : Component
[DataField("gasThresholds")]
public Dictionary? GasThresholds;
- // Stores a reference to the gas on the tile this is on.
+ ///
+ /// Stores a reference to the gas on the tile this entity is on (or the pipe network it monitors; see
[ViewVariables]
public GasMixture? TileGas;
@@ -65,4 +67,19 @@ public sealed partial class AtmosMonitorComponent : Component
///
[DataField("registeredDevices")]
public HashSet RegisteredDevices = new();
+
+ ///
+ /// Specifies whether this device monitors its own internal pipe network rather than the surrounding atmosphere.
+ ///
+ ///
+ /// If 'true', the entity will require a NodeContainerComponent with one or more PipeNodes to function.
+ ///
+ [DataField]
+ public bool MonitorsPipeNet = false;
+
+ ///
+ /// Specifies the name of the pipe node that this device is monitoring.
+ ///
+ [DataField]
+ public string NodeNameMonitoredPipe = "monitored";
}
diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
index 2c9a358755..78b70ac234 100644
--- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
+++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs
@@ -4,6 +4,9 @@
using Content.Server.Atmos.Piping.EntitySystems;
using Content.Server.DeviceNetwork;
using Content.Server.DeviceNetwork.Systems;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.EntitySystems;
+using Content.Server.NodeContainer.Nodes;
using Content.Server.Power.Components;
using Content.Server.Power.EntitySystems;
using Content.Shared.Atmos;
@@ -25,6 +28,7 @@ public sealed class AtmosMonitorSystem : EntitySystem
[Dependency] private readonly AtmosDeviceSystem _atmosDeviceSystem = default!;
[Dependency] private readonly DeviceNetworkSystem _deviceNetSystem = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+ [Dependency] private readonly NodeContainerSystem _nodeContainerSystem = default!;
// Commands
public const string AtmosMonitorSetThresholdCmd = "atmos_monitor_set_threshold";
@@ -56,8 +60,15 @@ private void OnAtmosDeviceLeaveAtmosphere(EntityUid uid, AtmosMonitorComponent a
private void OnAtmosDeviceEnterAtmosphere(EntityUid uid, AtmosMonitorComponent atmosMonitor, ref AtmosDeviceEnabledEvent args)
{
+ if (atmosMonitor.MonitorsPipeNet && _nodeContainerSystem.TryGetNode(uid, atmosMonitor.NodeNameMonitoredPipe, out var pipeNode))
+ {
+ atmosMonitor.TileGas = pipeNode.Air;
+ return;
+ }
+
atmosMonitor.TileGas = _atmosphereSystem.GetContainingMixture(uid, true);
}
+
private void OnMapInit(EntityUid uid, AtmosMonitorComponent component, MapInitEvent args)
{
if (component.TemperatureThresholdId != null)
@@ -205,7 +216,7 @@ private void OnAtmosUpdate(EntityUid uid, AtmosMonitorComponent component, ref A
if (!this.IsPowered(uid, EntityManager))
return;
- if (args.Grid == null)
+ if (args.Grid == null)
return;
// if we're not monitoring atmos, don't bother
@@ -214,6 +225,10 @@ private void OnAtmosUpdate(EntityUid uid, AtmosMonitorComponent component, ref A
&& component.GasThresholds == null)
return;
+ // If monitoring a pipe network, get its most recent gas mixture
+ if (component.MonitorsPipeNet && _nodeContainerSystem.TryGetNode(uid, component.NodeNameMonitoredPipe, out var pipeNode))
+ component.TileGas = pipeNode.Air;
+
UpdateState(uid, component.TileGas, component);
}
diff --git a/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs b/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs
index 455d125e44..a8edb07d31 100644
--- a/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs
+++ b/Content.Server/Atmos/Piping/Components/AtmosPipeColorComponent.cs
@@ -1,19 +1,24 @@
using Content.Server.Atmos.Piping.EntitySystems;
using JetBrains.Annotations;
-namespace Content.Server.Atmos.Piping.Components
+namespace Content.Server.Atmos.Piping.Components;
+
+[RegisterComponent]
+public sealed partial class AtmosPipeColorComponent : Component
{
- [RegisterComponent]
- public sealed partial class AtmosPipeColorComponent : Component
- {
- [DataField("color")]
- public Color Color { get; set; } = Color.White;
+ [DataField]
+ public Color Color { get; set; } = Color.White;
- [ViewVariables(VVAccess.ReadWrite), UsedImplicitly]
- public Color ColorVV
- {
- get => Color;
- set => EntitySystem.Get().SetColor(Owner, this, value);
- }
+ [ViewVariables(VVAccess.ReadWrite), UsedImplicitly]
+ public Color ColorVV
+ {
+ get => Color;
+ set => IoCManager.Resolve().System().SetColor(Owner, this, value);
}
}
+
+[ByRefEvent]
+public record struct AtmosPipeColorChangedEvent(Color color)
+{
+ public Color Color = color;
+}
diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
index b9ee668032..dcb08dcd57 100644
--- a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
+++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs
@@ -40,6 +40,9 @@ public void SetColor(EntityUid uid, AtmosPipeColorComponent component, Color col
return;
_appearance.SetData(uid, PipeColorVisuals.Color, color, appearance);
+
+ var ev = new AtmosPipeColorChangedEvent(color);
+ RaiseLocalEvent(uid, ref ev);
}
}
}
diff --git a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs
index eac8dc8312..4400387dc8 100644
--- a/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs
+++ b/Content.Server/Atmos/Piping/Trinary/Components/GasFilterComponent.cs
@@ -5,31 +5,25 @@ namespace Content.Server.Atmos.Piping.Trinary.Components
[RegisterComponent]
public sealed partial class GasFilterComponent : Component
{
- [ViewVariables(VVAccess.ReadWrite)]
- [DataField("enabled")]
- public bool Enabled { get; set; } = true;
+ [DataField]
+ public bool Enabled = true;
- [ViewVariables(VVAccess.ReadWrite)]
[DataField("inlet")]
- public string InletName { get; set; } = "inlet";
+ public string InletName = "inlet";
- [ViewVariables(VVAccess.ReadWrite)]
[DataField("filter")]
- public string FilterName { get; set; } = "filter";
+ public string FilterName = "filter";
- [ViewVariables(VVAccess.ReadWrite)]
[DataField("outlet")]
- public string OutletName { get; set; } = "outlet";
+ public string OutletName = "outlet";
- [ViewVariables(VVAccess.ReadWrite)]
+ [DataField]
+ public float TransferRate = Atmospherics.MaxTransferRate;
- [DataField("transferRate")]
- public float TransferRate { get; set; } = Atmospherics.MaxTransferRate;
+ [DataField]
+ public float MaxTransferRate = Atmospherics.MaxTransferRate;
- [DataField("maxTransferRate")]
- public float MaxTransferRate { get; set; } = Atmospherics.MaxTransferRate;
-
- [ViewVariables(VVAccess.ReadWrite)]
- public Gas? FilteredGas { get; set; }
+ [DataField]
+ public Gas? FilteredGas;
}
}
diff --git a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs
index 064077a8db..b2143283f7 100644
--- a/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs
+++ b/Content.Server/Atmos/Piping/Unary/Components/GasVentScrubberComponent.cs
@@ -9,26 +9,25 @@ namespace Content.Server.Atmos.Piping.Unary.Components
[Access(typeof(GasVentScrubberSystem))]
public sealed partial class GasVentScrubberComponent : Component
{
- [ViewVariables(VVAccess.ReadWrite)]
- public bool Enabled { get; set; } = true;
+ [DataField]
+ public bool Enabled { get; set; } = false;
- [ViewVariables]
+ [DataField]
public bool IsDirty { get; set; } = false;
- [ViewVariables(VVAccess.ReadWrite)]
[DataField("outlet")]
public string OutletName { get; set; } = "pipe";
- [ViewVariables]
- public readonly HashSet FilterGases = new(GasVentScrubberData.DefaultFilterGases);
+ [DataField]
+ public HashSet FilterGases = new(GasVentScrubberData.DefaultFilterGases);
- [ViewVariables(VVAccess.ReadWrite)]
+ [DataField]
public ScrubberPumpDirection PumpDirection { get; set; } = ScrubberPumpDirection.Scrubbing;
///
/// Target volume to transfer. If
- [ViewVariables(VVAccess.ReadWrite)]
+ [DataField]
public float TransferRate
{
get => _transferRate;
@@ -37,18 +36,17 @@ public float TransferRate
private float _transferRate = Atmospherics.MaxTransferRate;
- [ViewVariables(VVAccess.ReadWrite)]
- [DataField("maxTransferRate")]
+ [DataField]
public float MaxTransferRate = Atmospherics.MaxTransferRate;
///
/// As pressure difference approaches this number, the effective volume rate may be smaller than
- [DataField("maxPressure")]
+ [DataField]
public float MaxPressure = Atmospherics.MaxOutputPressure;
- [ViewVariables(VVAccess.ReadWrite)]
+ [DataField]
public bool WideNet { get; set; } = false;
public GasVentScrubberData ToAirAlarmData()
diff --git a/Content.Server/Decals/DecalSystem.cs b/Content.Server/Decals/DecalSystem.cs
index c8e062ce6f..d274bc7ccd 100644
--- a/Content.Server/Decals/DecalSystem.cs
+++ b/Content.Server/Decals/DecalSystem.cs
@@ -21,7 +21,6 @@
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using static Content.Shared.Decals.DecalGridComponent;
-using ChunkIndicesEnumerator = Robust.Shared.Map.Enumerators.ChunkIndicesEnumerator;
namespace Content.Server.Decals
{
@@ -341,33 +340,6 @@ public override bool RemoveDecal(EntityUid gridId, uint decalId, DecalGridCompon
return decalIds;
}
- public HashSet<(uint Index, Decal Decal)> GetDecalsIntersecting(EntityUid gridUid, Box2 bounds, DecalGridComponent? component = null)
- {
- var decalIds = new HashSet<(uint, Decal)>();
- var chunkCollection = ChunkCollection(gridUid, component);
-
- if (chunkCollection == null)
- return decalIds;
-
- var chunks = new ChunkIndicesEnumerator(bounds, ChunkSize);
-
- while (chunks.MoveNext(out var chunkOrigin))
- {
- if (!chunkCollection.TryGetValue(chunkOrigin.Value, out var chunk))
- continue;
-
- foreach (var (id, decal) in chunk.Decals)
- {
- if (!bounds.Contains(decal.Coordinates))
- continue;
-
- decalIds.Add((id, decal));
- }
- }
-
- return decalIds;
- }
-
///
/// Changes a decals position. Note this will actually result in a new decal being created, possibly on a new grid or chunk.
///
diff --git a/Content.Server/Mapping/MappingManager.cs b/Content.Server/Mapping/MappingManager.cs
index e8c6eca204..ae924da152 100644
--- a/Content.Server/Mapping/MappingManager.cs
+++ b/Content.Server/Mapping/MappingManager.cs
@@ -1,12 +1,18 @@
using System.IO;
+using System.Linq;
using Content.Server.Administration.Managers;
using Content.Shared.Administration;
using Content.Shared.Mapping;
using Robust.Server.GameObjects;
using Robust.Server.Player;
+using Robust.Shared.ContentPack;
using Robust.Shared.Map;
using Robust.Shared.Network;
+using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Serialization.Markdown;
+using Robust.Shared.Serialization.Markdown.Mapping;
using Robust.Shared.Utility;
using YamlDotNet.Core;
using YamlDotNet.RepresentationModel;
@@ -21,18 +27,27 @@ public sealed class MappingManager : IPostInjectInit
[Dependency] private readonly IServerNetManager _net = default!;
[Dependency] private readonly IPlayerManager _players = default!;
[Dependency] private readonly IEntitySystemManager _systems = default!;
+ [Dependency] private readonly ISerializationManager _serialization = default!;
+ [Dependency] private readonly IResourceManager _resourceMan = default!;
private ISawmill _sawmill = default!;
private ZStdCompressionContext _zstd = default!;
+ private const string FavoritesPath = "/mapping_editor_favorites.yml";
+
public void PostInject()
{
+ _net.RegisterNetMessage(OnMappingFavoritesSave);
+ _net.RegisterNetMessage(OnMappingFavoritesLoad);
+ _net.RegisterNetMessage();
+
+ _sawmill = _log.GetSawmill("mapping");
+
#if !FULL_RELEASE
_net.RegisterNetMessage(OnMappingSaveMap);
_net.RegisterNetMessage();
_net.RegisterNetMessage();
- _sawmill = _log.GetSawmill("mapping");
_zstd = new ZStdCompressionContext();
#endif
}
@@ -73,4 +88,45 @@ private void OnMappingSaveMap(MappingSaveMapMessage message)
}
#endif
}
+
+ private void OnMappingFavoritesSave(MappingFavoritesSaveMessage message)
+ {
+ var mapping = new MappingDataNode();
+ mapping.Add("prototypes", _serialization.WriteValue(message.PrototypeIDs, notNullableOverride: true));
+
+ var path = new ResPath(FavoritesPath);
+ using var writer = _resourceMan.UserData.OpenWriteText(path);
+ var stream = new YamlStream {new(mapping.ToYaml())};
+ stream.Save(new YamlMappingFix(new Emitter(writer)), false);
+ }
+
+ private void OnMappingFavoritesLoad(MappingFavoritesLoadMessage message)
+ {
+ var path = new ResPath(FavoritesPath);
+
+ if (!_resourceMan.UserData.Exists(path))
+ return;
+
+ try
+ {
+ var reader = _resourceMan.UserData.OpenText(path);
+ var documents = DataNodeParser.ParseYamlStream(reader).First();
+ var mapping = (MappingDataNode) documents.Root;
+
+ if (!mapping.TryGet("prototypes", out var prototypesNode))
+ return;
+
+ var ids = _serialization.Read(prototypesNode, notNullableOverride: true).ToList();
+
+ var msg = new MappingFavoritesDataMessage()
+ {
+ PrototypeIDs = ids,
+ };
+ _net.ServerSendMessage(msg, message.MsgChannel);
+ }
+ catch (Exception e)
+ {
+ _sawmill.Error("Failed to load user favorite objects: " + e);
+ }
+ }
}
diff --git a/Content.Server/Power/Components/CableComponent.cs b/Content.Server/Power/Components/CableComponent.cs
index 7398bc0616..63899735b5 100644
--- a/Content.Server/Power/Components/CableComponent.cs
+++ b/Content.Server/Power/Components/CableComponent.cs
@@ -18,8 +18,11 @@ public sealed partial class CableComponent : Component
[DataField]
public EntProtoId CableDroppedOnCutPrototype = "CableHVStack1";
+ ///
+ /// The tool quality needed to cut the cable. Setting to null prevents cutting.
+ ///
[DataField]
- public ProtoId CuttingQuality = SharedToolSystem.CutQuality;
+ public ProtoId? CuttingQuality = SharedToolSystem.CutQuality;
///
/// Checked by Maps = new()
+ {
+ new("/Maps/CentralCommand/main.yml"),
+ new("/Maps/CentralCommand/harmony.yml")
+ };
///
/// Centcomm entity that was loaded.
diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index 90be263ae2..8ceee270c7 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -69,6 +69,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
[Dependency] private readonly TransformSystem _transformSystem = default!;
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
[Dependency] private readonly AnnouncerSystem _announcer = default!;
+ [Dependency] private readonly MapSystem _mapSystem = default!;
private const float ShuttleSpawnBuffer = 1f;
@@ -430,29 +431,37 @@ private void AddCentcomm(EntityUid station, StationCentcommComponent component)
return;
}
- if (string.IsNullOrEmpty(component.Map.ToString()))
+ var mapPath = _random.Pick(component.Maps).ToString();
+ AddSingleCentcomm(station, component, mapPath);
+ }
+
+ private void AddSingleCentcomm(EntityUid station, StationCentcommComponent component, string mapPath)
+ {
+ if (string.IsNullOrEmpty(mapPath))
{
Log.Warning("No CentComm map found, skipping setup.");
return;
}
- var mapId = _mapManager.CreateMap();
- var grid = _map.LoadGrid(mapId, component.Map.ToString(), new MapLoadOptions()
- {
- LoadMap = false,
- });
- var map = _mapManager.GetMapEntityId(mapId);
+ var map = _mapSystem.CreateMap(out var mapId);
+ var grid = _map.LoadGrid(
+ mapId,
+ mapPath,
+ new()
+ {
+ LoadMap = false,
+ });
- if (!Exists(map))
+ if (!Exists(map) || map == EntityUid.Invalid)
{
- Log.Error($"Failed to set up centcomm map!");
+ Log.Error("Failed to set up centcomm map!");
QueueDel(grid);
return;
}
if (!Exists(grid))
{
- Log.Error($"Failed to set up centcomm grid!");
+ Log.Error("Failed to set up centcomm grid!");
QueueDel(map);
return;
}
diff --git a/Content.Shared/Atmos/Atmospherics.cs b/Content.Shared/Atmos/Atmospherics.cs
index 78b692d52d..896da677e4 100644
--- a/Content.Shared/Atmos/Atmospherics.cs
+++ b/Content.Shared/Atmos/Atmospherics.cs
@@ -145,6 +145,22 @@ public static class Atmospherics
///
public const float SpaceHeatCapacity = 7000f;
+ ///
+ /// Dictionary of chemical abbreviations for
+ public static Dictionary GasAbbreviations = new Dictionary()
+ {
+ [Gas.Ammonia] = Loc.GetString("gas-ammonia-abbreviation"),
+ [Gas.CarbonDioxide] = Loc.GetString("gas-carbon-dioxide-abbreviation"),
+ [Gas.Frezon] = Loc.GetString("gas-frezon-abbreviation"),
+ [Gas.Nitrogen] = Loc.GetString("gas-nitrogen-abbreviation"),
+ [Gas.NitrousOxide] = Loc.GetString("gas-nitrous-oxide-abbreviation"),
+ [Gas.Oxygen] = Loc.GetString("gas-oxygen-abbreviation"),
+ [Gas.Plasma] = Loc.GetString("gas-plasma-abbreviation"),
+ [Gas.Tritium] = Loc.GetString("gas-tritium-abbreviation"),
+ [Gas.WaterVapor] = Loc.GetString("gas-water-vapor-abbreviation"),
+ };
+
#region Excited Groups
///
diff --git a/Content.Shared/Atmos/Components/GasPipeSensorComponent.cs b/Content.Shared/Atmos/Components/GasPipeSensorComponent.cs
new file mode 100644
index 0000000000..3393948f4f
--- /dev/null
+++ b/Content.Shared/Atmos/Components/GasPipeSensorComponent.cs
@@ -0,0 +1,10 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Atmos.Components;
+
+///
+/// Entities with component will be queried against for their
+/// atmos monitoring data on atmos monitoring consoles
+///
+[RegisterComponent, NetworkedComponent]
+public sealed partial class GasPipeSensorComponent : Component;
diff --git a/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs b/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
new file mode 100644
index 0000000000..2ac0d2a9af
--- /dev/null
+++ b/Content.Shared/Atmos/Consoles/Components/AtmosMonitoringConsoleComponent.cs
@@ -0,0 +1,235 @@
+using Content.Shared.Atmos.Consoles;
+using Content.Shared.Pinpointer;
+using Content.Shared.Prototypes;
+using Robust.Shared.GameStates;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Atmos.Components;
+
+///
+/// Entities capable of opening the atmos monitoring console UI
+/// require this component to function correctly
+///
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedAtmosMonitoringConsoleSystem))]
+public sealed partial class AtmosMonitoringConsoleComponent : Component
+{
+ /*
+ * Don't need DataFields as this can be reconstructed
+ */
+
+ ///
+ /// A dictionary of the all the nav map chunks that contain anchored atmos pipes
+ ///
+ [ViewVariables]
+ public Dictionary AtmosPipeChunks = new();
+
+ ///
+ /// A list of all the atmos devices that will be used to populate the nav map
+ ///
+ [ViewVariables]
+ public Dictionary AtmosDevices = new();
+
+ ///
+ /// Color of the floor tiles on the nav map screen
+ ///
+ [DataField, ViewVariables]
+ public Color NavMapTileColor;
+
+ ///
+ /// Color of the wall lines on the nav map screen
+ ///
+ [DataField, ViewVariables]
+ public Color NavMapWallColor;
+
+ ///
+ /// The next time this component is dirtied, it will force the full state
+ /// to be sent to the client, instead of just the delta state
+ ///
+ [ViewVariables]
+ public bool ForceFullUpdate = false;
+}
+
+[Serializable, NetSerializable]
+public struct AtmosPipeChunk(Vector2i origin)
+{
+ ///
+ /// Chunk position
+ ///
+ [ViewVariables]
+ public readonly Vector2i Origin = origin;
+
+ ///
+ /// Bitmask look up for atmos pipes, 1 for occupied and 0 for empty.
+ /// Indexed by the color hexcode of the pipe
+ ///
+ [ViewVariables]
+ public Dictionary<(int, string), ulong> AtmosPipeData = new();
+
+ ///
+ /// The last game tick that the chunk was updated
+ ///
+ [NonSerialized]
+ public GameTick LastUpdate;
+}
+
+[Serializable, NetSerializable]
+public struct AtmosDeviceNavMapData
+{
+ ///
+ /// The entity in question
+ ///
+ public NetEntity NetEntity;
+
+ ///
+ /// Location of the entity
+ ///
+ public NetCoordinates NetCoordinates;
+
+ ///
+ /// The associated pipe network ID
+ ///
+ public int NetId = -1;
+
+ ///
+ /// Prototype ID for the nav map blip
+ ///
+ public ProtoId NavMapBlip;
+
+ ///