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

New salv naming #841

Closed
Closed
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-proto-{salvage.SalvageMap.Size}"); /* Delta V Change to strings */
break;
default:
throw new ArgumentOutOfRangeException();
Expand Down
6 changes: 6 additions & 0 deletions Content.Shared/Salvage/SalvageMapPrototype.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,10 @@ 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>
/// Add Size field for Delta V naming strings
/// </summary>
[DataField("size"), ViewVariables(VVAccess.ReadWrite)]
public string Size { get; } = default!;
}
3 changes: 3 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,3 @@
salvage-map-proto-Small = Small Space Debris
salvage-map-proto-Medium = Medium Space Debris
salvage-map-proto-Large = Large Space Debris
46 changes: 46 additions & 0 deletions Resources/Prototypes/Maps/salvage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,199 +62,245 @@

- type: salvageMap
id: OutpostArm
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-outpost-arm.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: Medium1
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-medium-01.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: MediumVault1
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-med-vault-01.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: MediumOrchestra
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-med-silent-orchestra.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: MediumLibraryWreck
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-med-library.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: MediumCargoWreck
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-cargo-01.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: MediumPirateWreck
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-med-pirate.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: TickColony
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-tick-colony.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: CargoDock
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-med-dock.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: SpaceWaffleHome
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-wh-salvage.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: MediumShuttleWreck
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-med-ruined-emergency-shuttle.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: mediumPetHospital
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-med-pet-hospital.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: MediumCrashedShuttle
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-med-crashed-shuttle.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: Meatball
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-meatball.yml

- type: salvageMap
id: MediumHaulingShuttleWreck
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-hauling-shuttle.yml

# """Large""" maps

- type: salvageMap
id: StationStation
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-stationstation.yml

- type: salvageMap
id: AsteroidBase
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-asteroid-base.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: RuinCargoBase
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-ruin-cargo-salvage.yml #DeltaV: DV salvage map Location

- type: salvageMap
id: SecurityChunk
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-security-chunk.yml #DeltaV: DV salvage map Location

#Nyano Maps
#Medium

- type: salvageMap
id: AnimalFarm
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-animalfarm.yml

- type: salvageMap
id: MediumChunk01
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-med-chunk-01.yml

- type: salvageMap
id: MediumMiningOutpost01
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-mining-outpost-01.yml

- type: salvageMap
id: AtlasPerma
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-atlas-perma.yml

- type: salvageMap
id: AtlasCells
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-atlas-jailcells.yml

- type: salvageMap
id: AtlasSalvage
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-atlas-salvage.yml

- type: salvageMap
id: AtlasAtmos
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-atlas-atmos.yml

- type: salvageMap
id: AtlasCargo
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-atlas-cargo.yml

- type: salvageMap
id: ServiceChunk
size: Medium #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-med-service-chunk-01.yml

# Large
- type: salvageMap
id: ResearchPost
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-research-outpost-01.yml

- type: salvageMap
id: LargeEngineerChunk
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-large-engineer-chunk.yml

- type: salvageMap
id: AtlasConferenceRoom
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-atlas-conference-room.yml

- type: salvageMap
id: AtlasDorms
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-atlas-dorms.yml

- type: salvageMap
id: AtlasEpistemics
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-atlas-epi.yml

- type: salvageMap
id: AtlasMedbay
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-atlas-medical.yml

- type: salvageMap
id: AtlasService
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-atlas-salvage.yml

# Asteroids 30x30

- type: salvageMap
id: LargeAsteroid_1
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-asteroid-large-01.yml

- type: salvageMap
id: LargeAsteroid_2
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-asteroid-large-02.yml

- type: salvageMap
id: LargeAsteroid_3
size: Large #DeltaV: Adds size for naming strings
mapPath: /Maps/Salvage/DeltaV/DV-asteroid-large-03.yml

#Delta V Maps
#Medium

- type: salvageMap
id: AsteroidSyndiHideout
size: Medium
mapPath: /Maps/Salvage/DeltaV/DV-syndi-hideout.yml

#Large

- type: salvageMap
id: AsteroidChemlab
size: Large
mapPath: /Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml

- type: salvageMap
id: LaundromatChunk
size: Large
mapPath: /Maps/Salvage/DeltaV/DV-laundromat-chunk.yml

# Asteroids

- type: salvageMap
id: AsteroidTickNest
size: Large
mapPath: /Maps/Salvage/DeltaV/DV-tick-nest.yml

- type: salvageMap
id: AsteroidMiningMed1
size: Large
mapPath: /Maps/Salvage/DeltaV/DV-large-asteroid-mining-01.yml

- type: salvageMap
id: AsteroidMiningLarge1
size: Large
mapPath: /Maps/Salvage/DeltaV/DV-med-asteroid-mining-01.yml

- type: salvageMap
id: AsteroidCrystalCave
size: Large
mapPath: /Maps/Salvage/DeltaV/DV-crystal-cave.yml

- type: salvageMap
id: AsteroidBoneCave
size: Large
mapPath: /Maps/Salvage/DeltaV/DV-bone-cave.yml
Loading