anonymize salvage wrecks (#31087)

* anonymize salvage wrecks

* display wreck size

diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
index 56cabb0ea5cdb764df34e894dfc427f7f9147686..7e99426f87be8e03488e88185f2698ddcbc3080b 100644 (file)
--- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
+++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Client.Message;
 using Content.Shared.Salvage;
 using Content.Shared.Salvage.Magnet;
 using Robust.Client.UserInterface;
@@ -99,7 +100,31 @@ public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface
 
                     break;
                 case SalvageOffering salvage:
-                    option.Title = Loc.GetString($"salvage-map-proto-{salvage.SalvageMap.ID}");
+                    option.Title = Loc.GetString($"salvage-map-wreck");
+
+                    var salvContainer = new BoxContainer
+                    {
+                        Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                        HorizontalExpand = true,
+                    };
+
+                    var sizeLabel = new Label
+                    {
+                        Text = Loc.GetString("salvage-map-wreck-desc-size"),
+                        HorizontalAlignment = Control.HAlignment.Left,
+                    };
+
+                    var sizeValueLabel = new RichTextLabel
+                    {
+                        HorizontalAlignment = Control.HAlignment.Right,
+                        HorizontalExpand = true,
+                    };
+                    sizeValueLabel.SetMarkup(Loc.GetString(salvage.SalvageMap.SizeString));
+
+                    salvContainer.AddChild(sizeLabel);
+                    salvContainer.AddChild(sizeValueLabel);
+
+                    option.AddContent(salvContainer);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();

diff --git a/Content.Shared/Salvage/SalvageMapPrototype.cs b/Content.Shared/Salvage/SalvageMapPrototype.cs
index 63a3164556e7b94290fa1ba453a03beeeeb3b1f1..f3903926ac5900ba25b60f3aa92bbbbb058e41c0 100644 (file)
--- a/Content.Shared/Salvage/SalvageMapPrototype.cs
+++ b/Content.Shared/Salvage/SalvageMapPrototype.cs
@@ -12,4 +12,10 @@ public sealed partial class SalvageMapPrototype : IPrototype
     /// Relative directory path to the given map, i.e. `Maps/Salvage/template.yml`
     /// </summary>
     [DataField(required: true)] public ResPath MapPath;
+
+    /// <summary>
+    /// String that describes the size of the map.
+    /// </summary>
+    [DataField(required: true)]
+    public LocId SizeString;
 }

diff --git a/Resources/Locale/en-US/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
index 462a8123b5236e5bba68212cdf48969e8a087c7b..5ed2649569caad016c8fd3a2f8f8d1943f63d666 100644 (file)
--- a/Resources/Locale/en-US/salvage/salvage-magnet.ftl
+++ b/Resources/Locale/en-US/salvage/salvage-magnet.ftl
@@ -38,39 +38,8 @@ dungeon-config-proto-SpindlyAsteroid = Asteroid spiral
 dungeon-config-proto-SwissCheeseAsteroid = Asteroid fragments
 
 # Wrecks
-salvage-map-proto-Small1 = Engineering Storage
-salvage-map-proto-Small2 = Gaming Nook
-salvage-map-proto-Small3 = Laundromat
-salvage-map-proto-Small4 = Bar Salvage
-salvage-map-proto-SmallShip1 = Pill
-salvage-map-proto-SmallAISurveyDrone = AI Survey Drone
-salvage-map-proto-SmallCargo = Mining Pod
-salvage-map-proto-SmallChapel = Chapel
-salvage-map-proto-SmallChef = Restaurant
-salvage-map-proto-SmallParty = Birthday Party
-salvage-map-proto-SmallSyndicate = Ruined Syndicate Ship
-salvage-map-proto-SmallTesla = Tesla Containment
-
-salvage-map-proto-SmallA1 = Asteroid Plasmafire
-salvage-map-proto-Medium1 = Plasma-Trapped Cache
-salvage-map-proto-MediumVault1 = Vault
-salvage-map-proto-MediumOrchestra = Silent Orchestra
-salvage-map-proto-MediumLibraryWreck = Abandoned Library
-salvage-map-proto-MediumCargoWreck = Cargo Department Wreck
-salvage-map-proto-MediumPirateWreck = Pirate Barge Fragment
-salvage-map-proto-MediumHaulingShuttleWreck = Ruined Hauling Ship
-salvage-map-proto-TickColony = Space Tick colony
-salvage-map-proto-CargoDock = Asteroid Cargo Dock
-salvage-map-proto-SpaceWaffleHome = Waffle Home
-salvage-map-proto-MediumShuttleWreck = Ruined Emergency Shuttle
-salvage-map-proto-MediumPetHospital = Pet and Bear Hospital
-salvage-map-proto-MediumCrashedShuttle = Crashed Shuttle
-salvage-map-proto-Meatball = Meatball
-salvage-map-proto-VeganMeatball = Vegan Meatball
-
-salvage-map-proto-StationStation = Station station
-salvage-map-proto-AsteroidBase = Asteroid Base
-salvage-map-proto-RuinCargoBase = Ruined Cargo Storage
-salvage-map-proto-SecurityChunk = Security Department Chunk
-salvage-map-proto-EngineeringChunk = Engineering Department Chunk
-salvage-map-proto-OutpostArm = Overrun Outpost Arm
+salvage-map-wreck = Salvage wreck
+salvage-map-wreck-desc-size = Size:
+salvage-map-wreck-size-small = [color=lime]Small[/color]
+salvage-map-wreck-size-medium = [color=cornflowerblue]Medium[/color]
+salvage-map-wreck-size-large = [color=orchid]Large[/color]

diff --git a/Resources/Prototypes/Maps/salvage.yml b/Resources/Prototypes/Maps/salvage.yml
index 09d8da9ff2700afb2b64ec57c62532133816998e..62b19a3180bfce67278f4e91c7cbdd1de0e0b033 100644 (file)
--- a/Resources/Prototypes/Maps/salvage.yml
+++ b/Resources/Prototypes/Maps/salvage.yml
@@ -5,141 +5,175 @@
 - type: salvageMap
   id: Small1
   mapPath: /Maps/Salvage/small-1.yml
+  sizeString: salvage-map-wreck-size-small
 
 - type: salvageMap
   id: Small2
   mapPath: /Maps/Salvage/small-2.yml
+  sizeString: salvage-map-wreck-size-small
 
 - type: salvageMap
   id: SmallShip1
   mapPath: /Maps/Salvage/small-ship-1.yml
+  sizeString: salvage-map-wreck-size-small
 
 - type: salvageMap
   id: Small3
   mapPath: /Maps/Salvage/small-3.yml
+  sizeString: salvage-map-wreck-size-small
 
 - type: salvageMap
   id: SmallAISurveyDrone
   mapPath: /Maps/Salvage/small-ai-survey-drone.yml
+  sizeString: salvage-map-wreck-size-small
 
 - type: salvageMap
   id: Small4
   mapPath: /Maps/Salvage/small-4.yml
+  sizeString: salvage-map-wreck-size-small
 
 - type: salvageMap
   id: SmallCargo
   mapPath: /Maps/Salvage/small-cargo.yml
+  sizeString: salvage-map-wreck-size-small
 
 - type: salvageMap
   id: SmallChapel
   mapPath: /Maps/Salvage/small-chapel.yml
+  sizeString: salvage-map-wreck-size-small
 
 - type: salvageMap
   id: SmallChef
   mapPath: /Maps/Salvage/small-chef.yml
+  sizeString: salvage-map-wreck-size-small
 
 - type: salvageMap
   id: SmallParty
   mapPath: /Maps/Salvage/small-party.yml
+  sizeString: salvage-map-wreck-size-small
 
 - type: salvageMap
   id: SmallSyndicate
   mapPath: /Maps/Salvage/small-syndicate.yml
+  sizeString: salvage-map-wreck-size-small
 
 - type: salvageMap
   id: SmallTesla
   mapPath: /Maps/Salvage/small-tesla.yml
+  sizeString: salvage-map-wreck-size-small
 
 # Small - Asteroids
 
 - type: salvageMap
   id: SmallA1
   mapPath: /Maps/Salvage/small-a-1.yml
+  sizeString: salvage-map-wreck-size-small
 
 # "Medium"-class maps - Max size square: 15x15, indicated size: 7.5
 
 - type: salvageMap
   id: Medium1
   mapPath: /Maps/Salvage/medium-1.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: MediumVault1
   mapPath: /Maps/Salvage/medium-vault-1.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: MediumOrchestra
   mapPath: /Maps/Salvage/medium-silent-orchestra.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: MediumLibraryWreck
   mapPath: /Maps/Salvage/medium-library.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: MediumCargoWreck
   mapPath: /Maps/Salvage/cargo-1.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: MediumPirateWreck
   mapPath: /Maps/Salvage/medium-pirate.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: TickColony
   mapPath: /Maps/Salvage/tick-colony.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: CargoDock
   mapPath: /Maps/Salvage/medium-dock.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: SpaceWaffleHome
+  sizeString: salvage-map-wreck-size-medium
   mapPath: /Maps/Salvage/wh-salvage.yml
 
 - type: salvageMap
   id: MediumShuttleWreck
   mapPath: /Maps/Salvage/medium-ruined-emergency-shuttle.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: MediumPetHospital
   mapPath: /Maps/Salvage/medium-pet-hospital.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: MediumCrashedShuttle
   mapPath: /Maps/Salvage/medium-crashed-shuttle.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: Meatball
   mapPath: /Maps/Salvage/meatball.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: VeganMeatball
   mapPath: /Maps/Salvage/vegan-meatball.yml
+  sizeString: salvage-map-wreck-size-medium
 
 - type: salvageMap
   id: MediumHaulingShuttleWreck
   mapPath: /Maps/Salvage/hauling-shuttle.yml
+  sizeString: salvage-map-wreck-size-medium
 
 # """Large""" maps
 
 - type: salvageMap
   id: StationStation
   mapPath: /Maps/Salvage/stationstation.yml
+  sizeString: salvage-map-wreck-size-large
 
 - type: salvageMap
   id: AsteroidBase
   mapPath: /Maps/Salvage/asteroid-base.yml
+  sizeString: salvage-map-wreck-size-large
 
 - type: salvageMap
   id: RuinCargoBase
   mapPath: /Maps/Salvage/ruin-cargo-salvage.yml
+  sizeString: salvage-map-wreck-size-large
 
 - type: salvageMap
   id: SecurityChunk
   mapPath: /Maps/Salvage/security-chunk.yml
+  sizeString: salvage-map-wreck-size-large
 
 - type: salvageMap
   id: EngineeringChunk
   mapPath: /Maps/Salvage/engineering-chunk.yml
+  sizeString: salvage-map-wreck-size-large
 
 - type: salvageMap
   id: OutpostArm
-  mapPath: /Maps/Salvage/outpost-arm.yml
\ No newline at end of file
+  mapPath: /Maps/Salvage/outpost-arm.yml
+  sizeString: salvage-map-wreck-size-large