From 330e0e37d90b9a72a990cf5042ca0d75b1f07fd4 Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Sat, 17 Feb 2024 01:48:04 +0100 Subject: [PATCH] *Properly* fix salvage strings (#840) Me when the maps --- .../UI/SalvageMagnetBoundUserInterface.cs | 2 +- Content.Shared/Salvage/SalvageMapPrototype.cs | 5 + .../IgnoredPrototypes/ignoredPrototypes.yml | 7 + .../en-US/deltav/salvage/salvage-magnet.ftl | 4 + Resources/Prototypes/DeltaV/Maps/salvage.yml | 40 +++ .../DeltaV/Maps/salvage_modified.yml | 100 +++++++ Resources/Prototypes/Maps/salvage.yml | 243 +++++------------- .../Prototypes/Nyanotrasen/Maps/salvage.yml | 97 +++++++ 8 files changed, 316 insertions(+), 182 deletions(-) create mode 100644 Resources/Locale/en-US/deltav/salvage/salvage-magnet.ftl create mode 100644 Resources/Prototypes/DeltaV/Maps/salvage.yml create mode 100644 Resources/Prototypes/DeltaV/Maps/salvage_modified.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Maps/salvage.yml diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs index 36fbdd90e28..d50839d9910 100644 --- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs @@ -99,7 +99,7 @@ protected override void UpdateState(BoundUserInterfaceState state) break; case SalvageOffering salvage: - option.Title = Loc.GetString($"salvage-map-proto-{salvage.SalvageMap.ID}"); + option.Title = Loc.GetString($"salvage-map-size-{salvage.SalvageMap.Size}"); // DeltaV - Replace map names with sizes break; default: throw new ArgumentOutOfRangeException(); diff --git a/Content.Shared/Salvage/SalvageMapPrototype.cs b/Content.Shared/Salvage/SalvageMapPrototype.cs index 518b64dafa9..a9814c7b0ac 100644 --- a/Content.Shared/Salvage/SalvageMapPrototype.cs +++ b/Content.Shared/Salvage/SalvageMapPrototype.cs @@ -12,4 +12,9 @@ public sealed class SalvageMapPrototype : IPrototype /// Relative directory path to the given map, i.e. `Maps/Salvage/template.yml` /// [DataField(required: true)] public ResPath MapPath; + + /// + /// DeltaV - Used for getting the proper name for the map + /// + [DataField] public string Size { get; } = "unknown"; } diff --git a/Resources/IgnoredPrototypes/ignoredPrototypes.yml b/Resources/IgnoredPrototypes/ignoredPrototypes.yml index 695cee007f6..e348f7ad036 100644 --- a/Resources/IgnoredPrototypes/ignoredPrototypes.yml +++ b/Resources/IgnoredPrototypes/ignoredPrototypes.yml @@ -6,3 +6,10 @@ # # - /Prototypes/Guidebook # - /Prototypes/Catalog/uplink_catalog.yml + +# 2024/02/15 +- /Prototypes/Maps/salvage.yml +# Replaced by +# /Prototypes/Nyanotrasen/Maps/salvage.yml +# /Prototypes/DeltaV/Maps/salvage_modified.yml +# /Prototypes/DeltaV/Maps/salvage.yml diff --git a/Resources/Locale/en-US/deltav/salvage/salvage-magnet.ftl b/Resources/Locale/en-US/deltav/salvage/salvage-magnet.ftl new file mode 100644 index 00000000000..115484ea51f --- /dev/null +++ b/Resources/Locale/en-US/deltav/salvage/salvage-magnet.ftl @@ -0,0 +1,4 @@ +salvage-map-size-unknown = Unidentified Space Debris +salvage-map-size-small = Small Space Debris +salvage-map-size-medium = Medium Space Debris +salvage-map-size-large = Large Space Debris diff --git a/Resources/Prototypes/DeltaV/Maps/salvage.yml b/Resources/Prototypes/DeltaV/Maps/salvage.yml new file mode 100644 index 00000000000..dfdbf7c095e --- /dev/null +++ b/Resources/Prototypes/DeltaV/Maps/salvage.yml @@ -0,0 +1,40 @@ +# "Medium"-class maps - Max size square: 15x15, indicated size: 7.5 + +- type: salvageMap + id: AsteroidSyndiHideout + mapPath: /Maps/Salvage/DeltaV/DV-syndi-hideout.yml + size: medium + +# """Large""" maps + +- type: salvageMap + id: AsteroidChemlab + mapPath: /Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml + size: large + +- type: salvageMap + id: LaundromatChunk + mapPath: /Maps/Salvage/DeltaV/DV-laundromat-chunk.yml + size: large + +# Asteroids + +- type: salvageMap + id: AsteroidTickNest + mapPath: /Maps/Salvage/DeltaV/DV-tick-nest.yml + +- type: salvageMap + id: AsteroidMiningMed1 + mapPath: /Maps/Salvage/DeltaV/DV-large-asteroid-mining-01.yml + +- type: salvageMap + id: AsteroidMiningLarge1 + mapPath: /Maps/Salvage/DeltaV/DV-med-asteroid-mining-01.yml + +- type: salvageMap + id: AsteroidCrystalCave + mapPath: /Maps/Salvage/DeltaV/DV-crystal-cave.yml + +- type: salvageMap + id: AsteroidBoneCave + mapPath: /Maps/Salvage/DeltaV/DV-bone-cave.yml diff --git a/Resources/Prototypes/DeltaV/Maps/salvage_modified.yml b/Resources/Prototypes/DeltaV/Maps/salvage_modified.yml new file mode 100644 index 00000000000..662bf302c36 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Maps/salvage_modified.yml @@ -0,0 +1,100 @@ +# Override for /Prototypes/Maps/salvage.yml + +# "Medium"-class maps - Max size square: 15x15, indicated size: 7.5 + +- type: salvageMap + id: DVOutpostArm + mapPath: /Maps/Salvage/DeltaV/DV-outpost-arm.yml + size: medium + +- type: salvageMap + id: DVMedium1 + mapPath: /Maps/Salvage/DeltaV/DV-medium-01.yml + size: medium + +- type: salvageMap + id: DVMediumVault1 + mapPath: /Maps/Salvage/DeltaV/DV-med-vault-01.yml + size: medium + +- type: salvageMap + id: DVMediumOrchestra + mapPath: /Maps/Salvage/DeltaV/DV-med-silent-orchestra.yml + size: medium + +- type: salvageMap + id: DVMediumLibraryWreck + mapPath: /Maps/Salvage/DeltaV/DV-med-library.yml + size: medium + +- type: salvageMap + id: DVMediumCargoWreck + mapPath: /Maps/Salvage/DeltaV/DV-cargo-01.yml + size: medium + +- type: salvageMap + id: DVMediumPirateWreck + mapPath: /Maps/Salvage/DeltaV/DV-med-pirate.yml + size: medium + +- type: salvageMap + id: DVTickColony + mapPath: /Maps/Salvage/DeltaV/DV-tick-colony.yml + size: medium + +- type: salvageMap + id: DVCargoDock + mapPath: /Maps/Salvage/DeltaV/DV-med-dock.yml + size: medium + +- type: salvageMap + id: DVSpaceWaffleHome + mapPath: /Maps/Salvage/DeltaV/DV-wh-salvage.yml + size: medium + +- type: salvageMap + id: DVMediumShuttleWreck + mapPath: /Maps/Salvage/DeltaV/DV-med-ruined-emergency-shuttle.yml + size: medium + +- type: salvageMap + id: DVmediumPetHospital + mapPath: /Maps/Salvage/DeltaV/DV-med-pet-hospital.yml + size: medium + +- type: salvageMap + id: DVMediumCrashedShuttle + mapPath: /Maps/Salvage/DeltaV/DV-med-crashed-shuttle.yml + size: medium + +- type: salvageMap + id: DVMeatball + mapPath: /Maps/Salvage/DeltaV/DV-meatball.yml + size: medium + +- type: salvageMap + id: DVMediumHaulingShuttleWreck + mapPath: /Maps/Salvage/DeltaV/DV-hauling-shuttle.yml + size: medium + +# """Large""" maps + +- type: salvageMap + id: DVStationStation + mapPath: /Maps/Salvage/DeltaV/DV-stationstation.yml + size: large + +- type: salvageMap + id: DVAsteroidBase + mapPath: /Maps/Salvage/DeltaV/DV-asteroid-base.yml + size: large + +- type: salvageMap + id: DVRuinCargoBase + mapPath: /Maps/Salvage/DeltaV/DV-ruin-cargo-salvage.yml + size: large + +- type: salvageMap + id: DVSecurityChunk + mapPath: /Maps/Salvage/DeltaV/DV-security-chunk.yml + size: large diff --git a/Resources/Prototypes/Maps/salvage.yml b/Resources/Prototypes/Maps/salvage.yml index f1472b7e4b7..a191fec6b85 100644 --- a/Resources/Prototypes/Maps/salvage.yml +++ b/Resources/Prototypes/Maps/salvage.yml @@ -2,259 +2,140 @@ # "Small"-class maps - Max size square: 7x7, indicated size: 3.5 -# Delta V: Remove small maps -#- type: salvageMap -# id: Small1 -# mapPath: /Maps/Salvage/small-1.yml +- type: salvageMap + id: Small1 + mapPath: /Maps/Salvage/small-1.yml -#- type: salvageMap -# id: Small2 -# mapPath: /Maps/Salvage/small-2.yml +- type: salvageMap + id: Small2 + mapPath: /Maps/Salvage/small-2.yml -#- type: salvageMap -# id: Small-ship-1 -# mapPath: /Maps/Salvage/small-ship-1.yml +- type: salvageMap + id: SmallShip1 + mapPath: /Maps/Salvage/small-ship-1.yml -#- type: salvageMap -# id: Small3 -# mapPath: /Maps/Salvage/small-3.yml +- type: salvageMap + id: Small3 + mapPath: /Maps/Salvage/small-3.yml -#- type: salvageMap -# id: SmallAISurveyDrone -# mapPath: /Maps/Salvage/small-ai-survey-drone.yml +- type: salvageMap + id: SmallAISurveyDrone + mapPath: /Maps/Salvage/small-ai-survey-drone.yml -#- type: salvageMap -# id: Small4 -# mapPath: /Maps/Salvage/small-4.yml +- type: salvageMap + id: Small4 + mapPath: /Maps/Salvage/small-4.yml -#- type: salvageMap -# id: SmallCargo -# mapPath: /Maps/Salvage/small-cargo.yml +- type: salvageMap + id: SmallCargo + mapPath: /Maps/Salvage/small-cargo.yml -#- type: salvageMap -# id: SmallChapel -# mapPath: /Maps/Salvage/small-chapel.yml +- type: salvageMap + id: SmallChapel + mapPath: /Maps/Salvage/small-chapel.yml -#- type: salvageMap -# id: SmallChef -# mapPath: /Maps/Salvage/small-chef.yml +- type: salvageMap + id: SmallChef + mapPath: /Maps/Salvage/small-chef.yml -#- type: salvageMap -# id: SmallParty -# mapPath: /Maps/Salvage/small-party.yml +- type: salvageMap + id: SmallParty + mapPath: /Maps/Salvage/small-party.yml -#- type: salvageMap -# id: SmallSyndicate -# mapPath: /Maps/Salvage/small-syndicate.yml +- type: salvageMap + id: SmallSyndicate + mapPath: /Maps/Salvage/small-syndicate.yml -#- type: salvageMap -# id: SmallTesla -# mapPath: /Maps/Salvage/small-tesla.yml +- type: salvageMap + id: SmallTesla + mapPath: /Maps/Salvage/small-tesla.yml # Small - Asteroids -#- type: salvageMap -# id: SmallA1 -# name: "Small / Asteroid 1 Plasmafire" -# mapPath: /Maps/Salvage/small-a-1.yml +- type: salvageMap + id: SmallA1 + mapPath: /Maps/Salvage/small-a-1.yml # "Medium"-class maps - Max size square: 15x15, indicated size: 7.5 -- type: salvageMap - id: OutpostArm - mapPath: /Maps/Salvage/DeltaV/DV-outpost-arm.yml #DeltaV: DV salvage map Location - - type: salvageMap id: Medium1 - mapPath: /Maps/Salvage/DeltaV/DV-medium-01.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/medium-1.yml - type: salvageMap id: MediumVault1 - mapPath: /Maps/Salvage/DeltaV/DV-med-vault-01.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/medium-vault-1.yml - type: salvageMap id: MediumOrchestra - mapPath: /Maps/Salvage/DeltaV/DV-med-silent-orchestra.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/medium-silent-orchestra.yml - type: salvageMap id: MediumLibraryWreck - mapPath: /Maps/Salvage/DeltaV/DV-med-library.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/medium-library.yml - type: salvageMap id: MediumCargoWreck - mapPath: /Maps/Salvage/DeltaV/DV-cargo-01.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/cargo-1.yml - type: salvageMap id: MediumPirateWreck - mapPath: /Maps/Salvage/DeltaV/DV-med-pirate.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/medium-pirate.yml - type: salvageMap id: TickColony - mapPath: /Maps/Salvage/DeltaV/DV-tick-colony.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/tick-colony.yml - type: salvageMap id: CargoDock - mapPath: /Maps/Salvage/DeltaV/DV-med-dock.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/medium-dock.yml - type: salvageMap id: SpaceWaffleHome - mapPath: /Maps/Salvage/DeltaV/DV-wh-salvage.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/wh-salvage.yml - type: salvageMap id: MediumShuttleWreck - mapPath: /Maps/Salvage/DeltaV/DV-med-ruined-emergency-shuttle.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/medium-ruined-emergency-shuttle.yml - type: salvageMap - id: mediumPetHospital - mapPath: /Maps/Salvage/DeltaV/DV-med-pet-hospital.yml #DeltaV: DV salvage map Location + id: MediumPetHospital + mapPath: /Maps/Salvage/medium-pet-hospital.yml - type: salvageMap id: MediumCrashedShuttle - mapPath: /Maps/Salvage/DeltaV/DV-med-crashed-shuttle.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/medium-crashed-shuttle.yml - type: salvageMap id: Meatball - mapPath: /Maps/Salvage/DeltaV/DV-meatball.yml + mapPath: /Maps/Salvage/meatball.yml - type: salvageMap id: MediumHaulingShuttleWreck - mapPath: /Maps/Salvage/DeltaV/DV-hauling-shuttle.yml + mapPath: /Maps/Salvage/hauling-shuttle.yml # """Large""" maps - type: salvageMap id: StationStation - mapPath: /Maps/Salvage/DeltaV/DV-stationstation.yml + mapPath: /Maps/Salvage/stationstation.yml - type: salvageMap id: AsteroidBase - mapPath: /Maps/Salvage/DeltaV/DV-asteroid-base.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/asteroid-base.yml - type: salvageMap id: RuinCargoBase - mapPath: /Maps/Salvage/DeltaV/DV-ruin-cargo-salvage.yml #DeltaV: DV salvage map Location + mapPath: /Maps/Salvage/ruin-cargo-salvage.yml - type: salvageMap id: SecurityChunk - mapPath: /Maps/Salvage/DeltaV/DV-security-chunk.yml #DeltaV: DV salvage map Location - - #Nyano Maps - #Medium - -- type: salvageMap - id: AnimalFarm - mapPath: /Maps/Salvage/DeltaV/DV-animalfarm.yml - -- type: salvageMap - id: MediumChunk01 - mapPath: /Maps/Salvage/DeltaV/DV-med-chunk-01.yml - -- type: salvageMap - id: MediumMiningOutpost01 - mapPath: /Maps/Salvage/DeltaV/DV-mining-outpost-01.yml - -- type: salvageMap - id: AtlasPerma - mapPath: /Maps/Salvage/DeltaV/DV-atlas-perma.yml - -- type: salvageMap - id: AtlasCells - mapPath: /Maps/Salvage/DeltaV/DV-atlas-jailcells.yml - -- type: salvageMap - id: AtlasSalvage - mapPath: /Maps/Salvage/DeltaV/DV-atlas-salvage.yml - -- type: salvageMap - id: AtlasAtmos - mapPath: /Maps/Salvage/DeltaV/DV-atlas-atmos.yml - -- type: salvageMap - id: AtlasCargo - mapPath: /Maps/Salvage/DeltaV/DV-atlas-cargo.yml - -- type: salvageMap - id: ServiceChunk - mapPath: /Maps/Salvage/DeltaV/DV-med-service-chunk-01.yml - -# Large -- type: salvageMap - id: ResearchPost - mapPath: /Maps/Salvage/DeltaV/DV-research-outpost-01.yml - -- type: salvageMap - id: LargeEngineerChunk - mapPath: /Maps/Salvage/DeltaV/DV-large-engineer-chunk.yml - -- type: salvageMap - id: AtlasConferenceRoom - mapPath: /Maps/Salvage/DeltaV/DV-atlas-conference-room.yml - -- type: salvageMap - id: AtlasDorms - mapPath: /Maps/Salvage/DeltaV/DV-atlas-dorms.yml - -- type: salvageMap - id: AtlasEpistemics - mapPath: /Maps/Salvage/DeltaV/DV-atlas-epi.yml - -- type: salvageMap - id: AtlasMedbay - mapPath: /Maps/Salvage/DeltaV/DV-atlas-medical.yml - -- type: salvageMap - id: AtlasService - mapPath: /Maps/Salvage/DeltaV/DV-atlas-salvage.yml - -# Asteroids 30x30 - -- type: salvageMap - id: LargeAsteroid_1 - mapPath: /Maps/Salvage/DeltaV/DV-asteroid-large-01.yml - -- type: salvageMap - id: LargeAsteroid_2 - mapPath: /Maps/Salvage/DeltaV/DV-asteroid-large-02.yml + mapPath: /Maps/Salvage/security-chunk.yml - type: salvageMap - id: LargeAsteroid_3 - mapPath: /Maps/Salvage/DeltaV/DV-asteroid-large-03.yml - -#Delta V Maps -#Medium - -- type: salvageMap - id: AsteroidSyndiHideout - mapPath: /Maps/Salvage/DeltaV/DV-syndi-hideout.yml - -#Large - -- type: salvageMap - id: AsteroidChemlab - mapPath: /Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml - -- type: salvageMap - id: LaundromatChunk - mapPath: /Maps/Salvage/DeltaV/DV-laundromat-chunk.yml - -# Asteroids + id: EngineeringChunk + mapPath: /Maps/Salvage/engineering-chunk.yml - type: salvageMap - id: AsteroidTickNest - mapPath: /Maps/Salvage/DeltaV/DV-tick-nest.yml - -- type: salvageMap - id: AsteroidMiningMed1 - mapPath: /Maps/Salvage/DeltaV/DV-large-asteroid-mining-01.yml - -- type: salvageMap - id: AsteroidMiningLarge1 - mapPath: /Maps/Salvage/DeltaV/DV-med-asteroid-mining-01.yml - -- type: salvageMap - id: AsteroidCrystalCave - mapPath: /Maps/Salvage/DeltaV/DV-crystal-cave.yml - -- type: salvageMap - id: AsteroidBoneCave - mapPath: /Maps/Salvage/DeltaV/DV-bone-cave.yml + id: OutpostArm + mapPath: /Maps/Salvage/outpost-arm.yml diff --git a/Resources/Prototypes/Nyanotrasen/Maps/salvage.yml b/Resources/Prototypes/Nyanotrasen/Maps/salvage.yml new file mode 100644 index 00000000000..d83e55a61b5 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Maps/salvage.yml @@ -0,0 +1,97 @@ +# "Medium"-class maps - Max size square: 15x15, indicated size: 7.5 + +- type: salvageMap + id: AnimalFarm + mapPath: /Maps/Salvage/DeltaV/DV-animalfarm.yml + size: medium + +- type: salvageMap + id: MediumChunk01 + mapPath: /Maps/Salvage/DeltaV/DV-med-chunk-01.yml + size: medium + +- type: salvageMap + id: MediumMiningOutpost01 + mapPath: /Maps/Salvage/DeltaV/DV-mining-outpost-01.yml + size: medium + +- type: salvageMap + id: AtlasPerma + mapPath: /Maps/Salvage/DeltaV/DV-atlas-perma.yml + size: medium + +- type: salvageMap + id: AtlasCells + mapPath: /Maps/Salvage/DeltaV/DV-atlas-jailcells.yml + size: medium + +- type: salvageMap + id: AtlasSalvage + mapPath: /Maps/Salvage/DeltaV/DV-atlas-salvage.yml + size: medium + +- type: salvageMap + id: AtlasAtmos + mapPath: /Maps/Salvage/DeltaV/DV-atlas-atmos.yml + size: medium + +- type: salvageMap + id: AtlasCargo + mapPath: /Maps/Salvage/DeltaV/DV-atlas-cargo.yml + size: medium + +- type: salvageMap + id: ServiceChunk + mapPath: /Maps/Salvage/DeltaV/DV-med-service-chunk-01.yml + size: medium + +# """Large""" maps + +- type: salvageMap + id: ResearchPost + mapPath: /Maps/Salvage/DeltaV/DV-research-outpost-01.yml + size: large + +- type: salvageMap + id: LargeEngineerChunk + mapPath: /Maps/Salvage/DeltaV/DV-large-engineer-chunk.yml + size: large + +- type: salvageMap + id: AtlasConferenceRoom + mapPath: /Maps/Salvage/DeltaV/DV-atlas-conference-room.yml + size: large + +- type: salvageMap + id: AtlasDorms + mapPath: /Maps/Salvage/DeltaV/DV-atlas-dorms.yml + size: large + +- type: salvageMap + id: AtlasEpistemics + mapPath: /Maps/Salvage/DeltaV/DV-atlas-epi.yml + size: large + +- type: salvageMap + id: AtlasMedbay + mapPath: /Maps/Salvage/DeltaV/DV-atlas-medical.yml + size: large + +- type: salvageMap + id: AtlasService + mapPath: /Maps/Salvage/DeltaV/DV-atlas-salvage.yml + size: large + +# Asteroids 30x30 + +- type: salvageMap + id: LargeAsteroid_1 + mapPath: /Maps/Salvage/DeltaV/DV-asteroid-large-01.yml + +- type: salvageMap + id: LargeAsteroid_2 + mapPath: /Maps/Salvage/DeltaV/DV-asteroid-large-02.yml + +- type: salvageMap + id: LargeAsteroid_3 + mapPath: /Maps/Salvage/DeltaV/DV-asteroid-large-03.yml