Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*Properly* fix salvage strings #840

Merged
merged 1 commit into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
5 changes: 5 additions & 0 deletions Content.Shared/Salvage/SalvageMapPrototype.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,9 @@ public sealed class SalvageMapPrototype : IPrototype
/// Relative directory path to the given map, i.e. `Maps/Salvage/template.yml`
/// </summary>
[DataField(required: true)] public ResPath MapPath;

/// <summary>
/// DeltaV - Used for getting the proper name for the map
/// </summary>
[DataField] public string Size { get; } = "unknown";
}
7 changes: 7 additions & 0 deletions Resources/IgnoredPrototypes/ignoredPrototypes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/deltav/salvage/salvage-magnet.ftl
Original file line number Diff line number Diff line change
@@ -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
40 changes: 40 additions & 0 deletions Resources/Prototypes/DeltaV/Maps/salvage.yml
Original file line number Diff line number Diff line change
@@ -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
100 changes: 100 additions & 0 deletions Resources/Prototypes/DeltaV/Maps/salvage_modified.yml
Original file line number Diff line number Diff line change
@@ -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
Loading
Loading