Beacon localization (#24138)

* localize beacons * No not like that * Tesla beacons were already depreciated, time to give the reaper their due * Entity name fallback * The real treasure was the far easier solution we missed along the way * weh * Shared mapinit * fix RT version * a single line break
2024-01-20 09:59:41 +01:00
parent 18a111bb36
commit efdc6f8d4c
6 changed files with 153 additions and 72 deletions
--- a/Content.Server/Pinpointer/NavMapSystem.cs
+++ b/Content.Server/Pinpointer/NavMapSystem.cs
@@ -225,7 +225,7 @@ public sealed class NavMapSystem : SharedNavMapSystem
            // TODO: Make warp points use metadata name instead.
            string? name = beacon.Text;

-            if (name == null)
+            if (string.IsNullOrEmpty(name))
            {
                if (TryComp<WarpPointComponent>(beaconUid, out var warpPoint) && warpPoint.Location != null)
                {
--- a/Content.Shared/Pinpointer/SharedNavMapSystem.cs
+++ b/Content.Shared/Pinpointer/SharedNavMapSystem.cs
@@ -8,6 +8,13 @@ public abstract class SharedNavMapSystem : EntitySystem
 {
    public const byte ChunkSize = 4;

+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<NavMapBeaconComponent, MapInitEvent>(OnNavMapBeaconMapInit);
+    }
+
    /// <summary>
    /// Converts the chunk's tile into a bitflag for the slot.
    /// </summary>
@@ -31,6 +38,13 @@ public abstract class SharedNavMapSystem : EntitySystem
        return new Vector2i(x, y);
    }

+    private void OnNavMapBeaconMapInit(EntityUid uid, NavMapBeaconComponent component, MapInitEvent args)
+    {
+        component.Text ??= string.Empty;
+        component.Text = Loc.GetString(component.Text);
+        Dirty(uid, component);
+    }
+
    [Serializable, NetSerializable]
    protected sealed class NavMapComponentState : ComponentState
    {
--- a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
+++ b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
@@ -0,0 +1,72 @@
+station-beacon-general = General
+
+station-beacon-command = Command
+station-beacon-bridge = Bridge
+station-beacon-vault = Vault
+station-beacon-captain = Captain
+station-beacon-hop = HOP
+
+station-beacon-security = Security
+station-beacon-brig = Brig
+station-beacon-warden = Warden
+station-beacon-hos = HOS
+station-beacon-armory = Armory
+station-beacon-perma-brig = Perma
+station-beacon-detective = Detective
+station-beacon-courtroom = Courtroom
+station-beacon-law = Law Office
+station-beacon-security-checkpoint = Checkpoint
+
+station-beacon-medical = Medical
+station-beacon-medbay = Medbay
+station-beacon-chemistry = Chem
+station-beacon-cryonics = Cryo
+station-beacon-cmo = CMO
+station-beacon-morgue = Morgue
+station-beacon-surgery = Surgery
+
+station-beacon-science = Science
+station-beacon-research-and-development = Research
+station-beacon-research-server = Server
+station-beacon-research-director = RD
+station-beacon-robotics = Robotics
+station-beacon-artifact-lab = Artifact
+station-beacon-anomaly-gen = Anomaly
+
+station-beacon-supply = Supply
+station-beacon-cargo = Cargo
+station-beacon-cargo-bay = Cargo Bay
+station-beacon-qm = QM
+station-beacon-salvage = Salvage
+
+station-beacon-engineering = Engineering
+station-beacon-ce = CE
+station-beacon-ame = AME
+station-beacon-solars = Solars
+station-beacon-gravgen = Grav
+station-beacon-pa = PA Control
+station-beacon-smes = SMES
+station-beacon-telecoms = Telecoms
+station-beacon-atmos = Atmos
+station-beacon-teg = TEG
+station-beacon-tech-vault = Tech Vault
+
+station-beacon-service = Service
+station-beacon-kitchen = Kitchen
+station-beacon-bar = Bar
+station-beacon-botany = Botany
+station-beacon-janitor = Janitor
+
+station-beacon-ai = AI
+station-beacon-ai-sat = AI Sat
+station-beacon-ai-core = AI Core
+
+station-beacon-arrivals = Arrivals
+station-beacon-evac = Evac
+station-beacon-eva-storage = EVA Storage
+station-beacon-chapel = Chapel
+station-beacon-library = Library
+station-beacon-dorms = Dorms
+station-beacon-theater = Theater
+station-beacon-tools = Tools
+station-beacon-disposals = Disposals
--- a/Resources/Locale/en-US/navmap-beacons/station_map.ftl
+++ b/Resources/Locale/en-US/navmap-beacons/station_map.ftl
--- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml
@@ -22,7 +22,7 @@
          False: {state: icon}
  - type: ConfigurableNavMapBeacon
  - type: NavMapBeacon
-    text: general
+    text: station-beacon-general
    color: "#D4D4D496"
  - type: WarpPoint
  - type: ActivatableUI
@@ -118,7 +118,7 @@
  suffix: Command
  components:
  - type: NavMapBeacon
-    text: Command
+    text: station-beacon-command
    color: "#FFFF00"

 - type: entity
@@ -127,7 +127,7 @@
  suffix: Bridge
  components:
  - type: NavMapBeacon
-    text: Bridge
+    text: station-beacon-bridge

 - type: entity
  parent: DefaultStationBeaconCommand
@@ -135,7 +135,7 @@
  suffix: Vault
  components:
  - type: NavMapBeacon
-    text: Vault
+    text: station-beacon-vault

 - type: entity
  parent: DefaultStationBeaconCommand
@@ -143,7 +143,7 @@
  suffix: Captain's Quarters
  components:
  - type: NavMapBeacon
-    text: Captain
+    text: station-beacon-captain

 - type: entity
  parent: DefaultStationBeaconCommand
@@ -151,7 +151,7 @@
  suffix: HOP's Office
  components:
  - type: NavMapBeacon
-    text: HOP
+    text: station-beacon-hop

 - type: entity
  parent: DefaultStationBeacon
@@ -159,7 +159,7 @@
  suffix: Security
  components:
  - type: NavMapBeacon
-    text: Security
+    text: station-beacon-security
    color: "#DE3A3A"

 - type: entity
@@ -168,7 +168,7 @@
  suffix: Brig
  components:
  - type: NavMapBeacon
-    text: Brig
+    text: station-beacon-brig

 - type: entity
  parent: DefaultStationBeaconSecurity
@@ -176,7 +176,7 @@
  suffix: Warden's Office
  components:
  - type: NavMapBeacon
-    text: Warden
+    text: station-beacon-warden

 - type: entity
  parent: DefaultStationBeaconSecurity
@@ -184,7 +184,7 @@
  suffix: HOS’s Room
  components:
  - type: NavMapBeacon
-    text: HOS
+    text: station-beacon-hos

 - type: entity
  parent: DefaultStationBeaconSecurity
@@ -192,7 +192,7 @@
  suffix: Armory
  components:
  - type: NavMapBeacon
-    text: Armory
+    text: station-beacon-armory

 - type: entity
  parent: DefaultStationBeaconSecurity
@@ -200,7 +200,7 @@
  suffix: Perma Brig
  components:
  - type: NavMapBeacon
-    text: Perma
+    text: station-beacon-perma-brig

 - type: entity
  parent: DefaultStationBeaconSecurity
@@ -208,7 +208,7 @@
  suffix: Detective's Room
  components:
  - type: NavMapBeacon
-    text: Detective
+    text: station-beacon-detective

 - type: entity
  parent: DefaultStationBeaconSecurity
@@ -216,7 +216,7 @@
  suffix: Courtroom
  components:
  - type: NavMapBeacon
-    text: Courtroom
+    text: station-beacon-courtroom

 - type: entity
  parent: DefaultStationBeaconSecurity
@@ -224,7 +224,7 @@
  suffix: Law Office
  components:
  - type: NavMapBeacon
-    text: Law Office
+    text: station-beacon-law

 - type: entity
  parent: DefaultStationBeaconSecurity
@@ -232,7 +232,7 @@
  suffix: Sec Checkpoint
  components:
  - type: NavMapBeacon
-    text: Checkpoint
+    text: station-beacon-security-checkpoint

 - type: entity
  parent: DefaultStationBeacon
@@ -240,7 +240,7 @@
  suffix: Medical
  components:
  - type: NavMapBeacon
-    text: Medical
+    text: station-beacon-medical
    color: "#52B4E9"

 - type: entity
@@ -249,7 +249,7 @@
  suffix: Medbay
  components:
  - type: NavMapBeacon
-    text: Medbay
+    text: station-beacon-medbay

 - type: entity
  parent: DefaultStationBeaconMedical
@@ -257,7 +257,7 @@
  suffix: Chemistry
  components:
  - type: NavMapBeacon
-    text: Chem
+    text: station-beacon-chemistry

 - type: entity
  parent: DefaultStationBeaconMedical
@@ -265,7 +265,7 @@
  suffix: Cryonics
  components:
  - type: NavMapBeacon
-    text: Cryo
+    text: station-beacon-cryonics

 - type: entity
  parent: DefaultStationBeaconMedical
@@ -273,7 +273,7 @@
  suffix: CMO's room
  components:
  - type: NavMapBeacon
-    text: CMO
+    text: station-beacon-cmo

 - type: entity
  parent: DefaultStationBeaconMedical
@@ -281,7 +281,7 @@
  suffix: Morgue
  components:
  - type: NavMapBeacon
-    text: Morgue
+    text: station-beacon-morgue

 - type: entity
  parent: DefaultStationBeaconMedical
@@ -289,7 +289,7 @@
  suffix: Surgery
  components:
  - type: NavMapBeacon
-    text: Surgery
+    text: station-beacon-surgery

 - type: entity
  parent: DefaultStationBeacon
@@ -297,7 +297,7 @@
  suffix: Science
  components:
  - type: NavMapBeacon
-    text: Science
+    text: station-beacon-science
    color: "#D381C9"

 - type: entity
@@ -306,7 +306,7 @@
  suffix: Research and Development
  components:
  - type: NavMapBeacon
-    text: Research
+    text: station-beacon-research-and-development

 - type: entity
  parent: DefaultStationBeaconScience
@@ -314,7 +314,7 @@
  suffix: Research Server Room
  components:
  - type: NavMapBeacon
-    text: Server
+    text: station-beacon-research-server

 - type: entity
  parent: DefaultStationBeaconScience
@@ -322,7 +322,7 @@
  suffix: RD's Room
  components:
  - type: NavMapBeacon
-    text: RD
+    text: station-beacon-research-director

 - type: entity
  parent: DefaultStationBeaconScience
@@ -330,7 +330,7 @@
  suffix: Robotics
  components:
  - type: NavMapBeacon
-    text: Robotics
+    text: station-beacon-robotics

 - type: entity
  parent: DefaultStationBeaconScience
@@ -338,7 +338,7 @@
  suffix: Artifact Lab
  components:
  - type: NavMapBeacon
-    text: Artifact
+    text: station-beacon-artifact-lab

 - type: entity
  parent: DefaultStationBeaconScience
@@ -346,7 +346,7 @@
  suffix: Anomaly Generator
  components:
  - type: NavMapBeacon
-    text: Anomaly
+    text: station-beacon-anomaly-gen

 - type: entity
  parent: DefaultStationBeacon
@@ -354,7 +354,7 @@
  suffix: Supply
  components:
  - type: NavMapBeacon
-    text: Supply
+    text: station-beacon-supply
    color: "#A46106"

 - type: entity
@@ -363,7 +363,7 @@
  suffix: Cargo Reception
  components:
  - type: NavMapBeacon
-    text: Cargo
+    text: station-beacon-cargo

 - type: entity
  parent: DefaultStationBeaconSupply
@@ -371,7 +371,7 @@
  suffix: Cargo Bay
  components:
  - type: NavMapBeacon
-    text: Cargo Bay
+    text: station-beacon-cargo-bay

 - type: entity
  parent: DefaultStationBeaconSupply
@@ -379,7 +379,7 @@
  suffix: QM's Room
  components:
  - type: NavMapBeacon
-    text: QM
+    text: station-beacon-qm

 - type: entity
  parent: DefaultStationBeaconSupply
@@ -387,7 +387,7 @@
  suffix: Salvage
  components:
  - type: NavMapBeacon
-    text: Salvage
+    text: station-beacon-salvage

 - type: entity
  parent: DefaultStationBeacon
@@ -395,7 +395,7 @@
  suffix: Engineering
  components:
  - type: NavMapBeacon
-    text: Engineering
+    text: station-beacon-engineering
    color: "#EFB341"

 - type: entity
@@ -404,7 +404,7 @@
  suffix: CE's Room
  components:
  - type: NavMapBeacon
-    text: CE
+    text: station-beacon-ce

 - type: entity
  parent: DefaultStationBeaconEngineering
@@ -412,7 +412,7 @@
  suffix: AME
  components:
  - type: NavMapBeacon
-    text: AME
+    text: station-beacon-ame

 - type: entity
  parent: DefaultStationBeaconEngineering
@@ -420,7 +420,7 @@
  suffix: Solars
  components:
  - type: NavMapBeacon
-    text: Solars
+    text: station-beacon-solars

 - type: entity
  parent: DefaultStationBeaconEngineering
@@ -428,7 +428,7 @@
  suffix: Grav Gen
  components:
  - type: NavMapBeacon
-    text: Grav
+    text: station-beacon-gravgen

 - type: entity
  parent: DefaultStationBeaconEngineering
@@ -436,7 +436,7 @@
  suffix: PA Control
  components:
  - type: NavMapBeacon
-    text: PA Control
+    text: station-beacon-pa

 - type: entity
  parent: DefaultStationBeaconEngineering
@@ -444,7 +444,7 @@
  suffix: SMES Power Bank
  components:
  - type: NavMapBeacon
-    text: SMES
+    text: station-beacon-smes

 - type: entity
  parent: DefaultStationBeaconEngineering
@@ -452,7 +452,7 @@
  suffix: Telecoms
  components:
  - type: NavMapBeacon
-    text: Telecoms
+    text: station-beacon-telecoms

 - type: entity
  parent: DefaultStationBeaconEngineering
@@ -460,7 +460,7 @@
  suffix: Atmospherics
  components:
  - type: NavMapBeacon
-    text: Atmos
+    text: station-beacon-atmos

 - type: entity
  parent: DefaultStationBeaconEngineering
@@ -468,15 +468,7 @@
  suffix: TEG
  components:
  - type: NavMapBeacon
-    text: TEG
-
- type: entity
-  parent: DefaultStationBeaconEngineering
-  id: DefaultStationBeaconTeslaEngine
-  suffix: Tesla Engine (Do Not Map - use PA Control instead)
-  components:
-  - type: NavMapBeacon
-    text: Tesla
+    text: station-beacon-teg

 - type: entity
  parent: DefaultStationBeaconEngineering
@@ -484,7 +476,7 @@
  suffix: Tech Vault
  components:
  - type: NavMapBeacon
-    text: Tech Vault
+    text: station-beacon-tech-vault

 - type: entity
  parent: DefaultStationBeacon
@@ -492,7 +484,7 @@
  suffix: Service
  components:
  - type: NavMapBeacon
-    text: Service
+    text: station-beacon-service
    color: "#9FED58"

 - type: entity
@@ -501,7 +493,7 @@
  suffix: Kitchen
  components:
  - type: NavMapBeacon
-    text: Kitchen
+    text: station-beacon-kitchen

 - type: entity
  parent: DefaultStationBeaconService
@@ -509,7 +501,7 @@
  suffix: Bar
  components:
  - type: NavMapBeacon
-    text: Bar
+    text: station-beacon-bar

 - type: entity
  parent: DefaultStationBeaconService
@@ -517,7 +509,7 @@
  suffix: Botany
  components:
  - type: NavMapBeacon
-    text: Botany
+    text: station-beacon-botany

 - type: entity
  parent: DefaultStationBeaconService
@@ -525,7 +517,7 @@
  suffix: Janitor's Closet
  components:
  - type: NavMapBeacon
-    text: Janitor
+    text: station-beacon-janitor

 - type: entity
  parent: DefaultStationBeacon
@@ -533,7 +525,7 @@
  suffix: AI
  components:
  - type: NavMapBeacon
-    text: AI
+    text: station-beacon-ai
    color: "#2ed2fd"

 - type: entity
@@ -542,7 +534,7 @@
  suffix: AI Satellite
  components:
  - type: NavMapBeacon
-    text: AI Sat
+    text: station-beacon-ai-sat

 - type: entity
  parent: DefaultStationBeaconAI
@@ -550,7 +542,7 @@
  suffix: AI Core
  components:
  - type: NavMapBeacon
-    text: AI Core
+    text: station-beacon-ai-core

 - type: entity
  parent: DefaultStationBeacon
@@ -558,7 +550,7 @@
  suffix: Arrivals
  components:
  - type: NavMapBeacon
-    text: Arrivals
+    text: station-beacon-arrivals

 - type: entity
  parent: DefaultStationBeacon
@@ -566,7 +558,7 @@
  suffix: Evac
  components:
  - type: NavMapBeacon
-    text: Evac
+    text: station-beacon-evac

 - type: entity
  parent: DefaultStationBeacon
@@ -574,7 +566,7 @@
  suffix: EVA Storage
  components:
  - type: NavMapBeacon
-    text: EVA Storage
+    text: station-beacon-eva-storage

 - type: entity
  parent: DefaultStationBeacon
@@ -582,7 +574,7 @@
  suffix: Chapel
  components:
  - type: NavMapBeacon
-    text: Chapel
+    text: station-beacon-chapel

 - type: entity
  parent: DefaultStationBeacon
@@ -590,7 +582,7 @@
  suffix: Library
  components:
  - type: NavMapBeacon
-    text: Library
+    text: station-beacon-library

 - type: entity
  parent: DefaultStationBeacon
@@ -598,7 +590,7 @@
  suffix: Theater
  components:
  - type: NavMapBeacon
-    text: Theater
+    text: station-beacon-theater

 - type: entity
  parent: DefaultStationBeacon
@@ -606,7 +598,7 @@
  suffix: Dorms
  components:
  - type: NavMapBeacon
-    text: Dorms
+    text: station-beacon-dorms

 - type: entity
  parent: DefaultStationBeacon
@@ -614,7 +606,7 @@
  suffix: Tool Room
  components:
  - type: NavMapBeacon
-    text: Tools
+    text: station-beacon-tools

 - type: entity
  parent: DefaultStationBeacon
@@ -622,5 +614,5 @@
  suffix: Disposals
  components:
  - type: NavMapBeacon
-    text: Disposals
+    text: station-beacon-disposals

--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -162,3 +162,6 @@ SpaceMedipen: null

 # 2024-01-18
 ClothingHeadHelmetVoidParamed: null
+
+# 2024-01-19
+DefaultStationBeaconTeslaEngine: null