]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Power monitoring console overhaul (#20927)
authorchromiumboy <50505512+chromiumboy@users.noreply.github.com>
Sun, 24 Dec 2023 06:07:41 +0000 (00:07 -0600)
committerGitHub <noreply@github.com>
Sun, 24 Dec 2023 06:07:41 +0000 (17:07 +1100)
commit1de682e23fd3cb832fa3328a7e6c4bd4b1a858f7
treef12e92a08a3dc9b7ff1cd7d7ad3e1c247b5304c6
parente6b52cc294a9ecafadda75ff62b91c60152b7d96
Power monitoring console overhaul (#20927)

* Prototyping whole station wire map

* More prototyping

* Added icons for the different power distributors and toggleable cable displays

* Power cable layouts are now only sent to the client when the power monitor is open

* UI prototyping

* Power monitors can now see the sprites of distant entities, long entity names are truncated

* Updated how network devices are added to the player's PVS

* More feature prototypes

* Added source / load symbols

* Final prototype! Time to actually code it properly...

* Start of code clean up

* Continuing code clean up

* Fixed UI appearance

* Code clean up complete

* Removed unnecessary changes

* Updated how power values are calculated, added UI warnings for power sinks and power net checks

* Updated how power values are calculated again, added support for portable generators

* Removed unnecessary files

* Map beacons start toggled off, console map now works outside the station, fixed substation icon

* Made some of Sloth's requested changes. Power distributors don't blink anymore, unless selected

* Moved a number of static variables in PowerMonitoringHelper to sensible places in the main files. Added a NavMapTrackableComponent so that you can specify how individual entities appear on the navmap

* Updated the colors/positions of HV cables and SMESes to improve contrast

* Fixed SMES color in map legend

* Partially fixed auto-scrolling on device selection, made sublists alphabetical

* Changed how auto-scroll is handled

* Changed the font color of the console warning messages

* Reduced the font size of beacon labels

* Added the station name to the console

* Organized references

* Removed unwanted changes to RobustToolbox

* Fix merge conflict

* Fix merge conflict, maybe

* Fix merge conflict

* Updated outdated reference

* Fixed portable_generator.yml

* Implemented a number of requested changes, move bit masks to a shared component

* Navigate listings via the navmap

* First attempt at improving efficiency

* Second attempt at optimization, entity grouping added for solar panels

* Finished solar panel entity joining

* Finished major revisions, code clean up needed

* Finializing optimizations

* Made requested changes

* Bug fix, removed obsolete code

* Bug fixes

* Bug fixes

* STarted revisions

* Further revisions

* More revision

* Finalizing revisions. Need to make RT PR

* Code tidying

* More code tidying

* Trying to avoid merge conflicts

* Trying to avoid merge conflicts

* Removed use of PVS

* Improving efficiency

* Addressed a bunch of outstanding issues

* Clear old data on console refresh

* UI adjustments

* Made node comparison more robust. More devices can be combined into one entry

* Added missing component 'dirty'
55 files changed:
Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml
Content.Client/Pinpointer/UI/NavMapControl.cs
Content.Client/Power/PowerMonitoringConsoleBoundUserInterface.cs [new file with mode: 0644]
Content.Client/Power/PowerMonitoringConsoleNavMapControl.cs [new file with mode: 0644]
Content.Client/Power/PowerMonitoringWindow.xaml
Content.Client/Power/PowerMonitoringWindow.xaml.Widgets.cs [new file with mode: 0644]
Content.Client/Power/PowerMonitoringWindow.xaml.cs
Content.Server/Pinpointer/NavMapSystem.cs
Content.Server/Power/Components/CableComponent.cs
Content.Server/Power/Components/CablePlacerComponent.cs
Content.Server/Power/Components/PowerMonitoringConsoleComponent.cs [deleted file]
Content.Server/Power/Components/PowerMonitoringDeviceComponent.cs [new file with mode: 0644]
Content.Server/Power/EntitySystems/CableSystem.cs
Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs
Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
Content.Server/StationEvents/Events/PowerGridCheckRule.cs
Content.Shared/Pinpointer/NavMapBeaconComponent.cs
Content.Shared/Pinpointer/NavMapComponent.cs
Content.Shared/Power/PowerMonitoringCableNetworksComponent.cs [new file with mode: 0644]
Content.Shared/Power/SharedPower.cs
Content.Shared/Power/SharedPowerMonitoringConsoleComponent.cs
Content.Shared/Power/SharedPowerMonitoringConsoleSystem.cs [new file with mode: 0644]
Resources/Locale/en-US/components/power-monitoring-component.ftl
Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
Resources/Prototypes/Entities/Structures/Power/apc.yml
Resources/Prototypes/Entities/Structures/Power/smes.yml
Resources/Prototypes/Entities/Structures/Power/substation.yml
Resources/Textures/Interface/NavMap/beveled_hexagon.png [new file with mode: 0644]
Resources/Textures/Interface/NavMap/beveled_square.png [new file with mode: 0644]
Resources/Textures/Interface/NavMap/beveled_triangle.png [new file with mode: 0644]
Resources/Textures/Interface/PowerMonitoring/load_arrow.png [new file with mode: 0644]
Resources/Textures/Interface/PowerMonitoring/source_arrow.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/static.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/ame.rsi/meta.json
Resources/Textures/Structures/Power/Generation/ame.rsi/static.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/solar_panel.rsi/meta.json
Resources/Textures/Structures/Power/Generation/solar_panel.rsi/static.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json
Resources/Textures/Structures/Power/Generation/teg.rsi/static.png [new file with mode: 0644]
Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/meta.json
Resources/Textures/Structures/Power/Generation/wallmount_generator.rsi/static.png [new file with mode: 0644]
Resources/Textures/Structures/Power/apc.rsi/meta.json
Resources/Textures/Structures/Power/apc.rsi/static.png [new file with mode: 0644]
Resources/Textures/Structures/Power/smes.rsi/meta.json
Resources/Textures/Structures/Power/smes.rsi/static.png [new file with mode: 0644]
Resources/Textures/Structures/Power/substation.rsi/meta.json
Resources/Textures/Structures/Power/substation.rsi/substation_static.png [new file with mode: 0644]
Resources/Textures/Structures/Power/substation.rsi/substation_wall_static.png [new file with mode: 0644]