Fix gamemap name casing (#11474)

2022-10-04 14:33:14 +11:00
parent 600c0e3255
commit b29eeb7c16
20 changed files with 40 additions and 40 deletions
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -42,7 +42,7 @@ public static class PoolManager
        (CCVars.DatabaseSynchronous.Name, "true", false),
        (CCVars.DatabaseSqliteDelay.Name, "0", false),
        (CCVars.HolidaysEnabled.Name, "false", false),
-        (CCVars.GameMap.Name, "empty", true),
+        (CCVars.GameMap.Name, "Empty", true),
        (CCVars.GameMapForced.Name, "true", true),
        (CCVars.AdminLogsQueueSendDelay.Name, "0", true),
        (CCVars.NetPVS.Name, "false", true),
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -91,9 +91,9 @@ namespace Content.IntegrationTests.Tests
                    var mapNames = new List<string>();
                    var naughty = new HashSet<string>()
                    {
-                        "empty",
-                        "infiltrator",
-                        "pirate",
+                        "Empty",
+                        "Infiltrator",
+                        "Pirate",
                    };

                    foreach (var map in maps)
--- a/Content.Server/Station/Components/StationDataComponent.cs
+++ b/Content.Server/Station/Components/StationDataComponent.cs
@@ -36,5 +36,5 @@ public sealed class StationDataComponent : Component
    /// Emergency shuttle map path for this station.
    /// </summary>
    [ViewVariables(VVAccess.ReadWrite), Access(typeof(ShuttleSystem), Other = AccessPermissions.ReadWriteExecute)]
-    public ResourcePath EmergencyShuttlePath = new("/Maps/Shuttles/emergency_shuttle.yml");
+    public ResourcePath EmergencyShuttlePath = new("/Maps/Shuttles/emergency.yml");
 }
--- a/Resources/Maps/Shuttles/cargo.yml
+++ b/Resources/Maps/Shuttles/cargo.yml
--- a/Resources/Maps/Shuttles/emergency_shuttle.yml
+++ b/Resources/Maps/Shuttles/emergency_shuttle.yml
--- a/Resources/Maps/packedstation.yml
+++ b/Resources/Maps/packedstation.yml
--- a/Resources/Prototypes/Maps/bagel.yml
+++ b/Resources/Prototypes/Maps/bagel.yml
@@ -1,5 +1,5 @@
 - type: gameMap
-  id: bagelstation
+  id: Bagel
  mapName: 'Bagel Station'
  mapPath: /Maps/bagel.yml
  minPlayers: 35
--- a/Resources/Prototypes/Maps/box.yml
+++ b/Resources/Prototypes/Maps/box.yml
@@ -1,5 +1,5 @@
 - type: gameMap
-  id: boxstation
+  id: Box
  mapName: 'Box Station'
  mapPath: /Maps/box.yml
  minPlayers: 35
--- a/Resources/Prototypes/Maps/centcomm.yml
+++ b/Resources/Prototypes/Maps/centcomm.yml
@@ -1,5 +1,5 @@
 - type: gameMap
-  id: centcomm
+  id: CentComm
  mapName: 'Central Command'
  mapPath: /Maps/centcomm.yml
  minPlayers: 10
--- a/Resources/Prototypes/Maps/infiltrator.yml
+++ b/Resources/Prototypes/Maps/infiltrator.yml
@@ -1,5 +1,5 @@
 - type: gameMap
-  id: infiltrator
+  id: Infiltrator
  mapName: 'Syndicate Infiltrator'
  mapPath: /Maps/infiltrator.yml
  minPlayers: 0
--- a/Resources/Prototypes/Maps/lighthouse.yml
+++ b/Resources/Prototypes/Maps/lighthouse.yml
@@ -1,5 +1,5 @@
 - type: gameMap
-  id: lighthouse
+  id: Lighthouse
  mapName: 'Lighthouse'
  mapPath: /Maps/lighthouse.yml
  minPlayers: 35
--- a/Resources/Prototypes/Maps/marathon.yml
+++ b/Resources/Prototypes/Maps/marathon.yml
@@ -1,5 +1,5 @@
 - type: gameMap
-  id: marathonstation
+  id: Marathon
  mapName: 'Marathon Station'
  mapPath: /Maps/marathon.yml
  minPlayers: 35
--- a/Resources/Prototypes/Maps/meta.yml
+++ b/Resources/Prototypes/Maps/meta.yml
@@ -1,5 +1,5 @@
 - type: gameMap
-  id: metastation
+  id: Meta
  mapName: 'Meta Station'
  mapPath: /Maps/meta.yml
  minPlayers: 35
--- a/Resources/Prototypes/Maps/omega.yml
+++ b/Resources/Prototypes/Maps/omega.yml
@@ -1,5 +1,5 @@
 - type: gameMap
-  id: omega
+  id: Omega
  mapName: 'Omega'
  mapPath: /Maps/omega.yml
  minPlayers: 0
--- a/Resources/Prototypes/Maps/packedstation.yml
+++ b/Resources/Prototypes/Maps/packedstation.yml
@@ -1,7 +1,7 @@
 - type: gameMap
-  id: packedstation
+  id: Packed
  mapName: 'Packedstation'
-  mapPath: /Maps/packedstation.yml
+  mapPath: /Maps/packed.yml
  minPlayers: 0
  maxPlayers: 35
  votable: true
--- a/Resources/Prototypes/Maps/pirate.yml
+++ b/Resources/Prototypes/Maps/pirate.yml
@@ -1,5 +1,5 @@
 - type: gameMap
-  id: pirate
+  id: Pirate
  mapName: 'Pirate Ship'
  mapPath: /Maps/pirate.yml
  minPlayers: 0
--- a/Resources/Prototypes/Maps/saltern.yml
+++ b/Resources/Prototypes/Maps/saltern.yml
@@ -1,5 +1,5 @@
 - type: gameMap
-  id: saltern
+  id: Saltern
  mapName: 'Saltern'
  mapPath: /Maps/saltern.yml
  minPlayers: 0
--- a/Resources/Prototypes/Maps/salvage.yml
+++ b/Resources/Prototypes/Maps/salvage.yml
@@ -6,37 +6,37 @@
 # "Small"-class maps - Max size square: 7x7, indicated size: 3.5

 - type: salvageMap
-  id: small1
+  id: Small1
  name: "Small / Engineering Storage 1"
  mapPath: /Maps/Salvage/small-1.yml
  bounds: "-2.5,-3.5,3.5,3.5"

 - type: salvageMap
-  id: small2
+  id: Small2
  name: "Small / Gaming Nook 1"
  mapPath: /Maps/Salvage/small-2.yml
  bounds: "-3.5,-3.5,3.5,3.5"

 - type: salvageMap
-  id: small-ship-1
+  id: Small-ship-1
  name: "Small / Ship 1 (Pill)"
  mapPath: /Maps/Salvage/small-ship-1.yml
  bounds: "-1.5,-0.5,2.5,1.5"

 - type: salvageMap
-  id: small3
+  id: Small3
  name: "Small / Laundromat 1"
  mapPath: /Maps/Salvage/small-3.yml
  bounds: "-3.5,-3.5,2.5,3.5"

 - type: salvageMap
-  id: smallAISurveyDrone
+  id: SmallAISurveyDrone
  name: "Small / AI Survey Drone"
  mapPath: /Maps/Salvage/small-ai-survey-drone.yml
  bounds: "-3.5,-3.5,3.5,3.5"

 - type: salvageMap
-  id: small4
+  id: Small4
  name: "Small / Bar Salvage"
  mapPath: /Maps/Salvage/small-4.yml
  bounds: "-3.5,-3.5,3.5,3.5"
@@ -44,7 +44,7 @@
 # Small - Asteroids

 - type: salvageMap
-  id: smallA1
+  id: SmallA1
  name: "Small / Asteroid 1 Plasmafire"
  mapPath: /Maps/Salvage/small-a-1.yml
  bounds: "-3.5,-3.5,3.5,3.5"
@@ -52,61 +52,61 @@
 # "Medium"-class maps - Max size square: 15x15, indicated size: 7.5

 - type: salvageMap
-  id: medium1
+  id: Medium1
  name: "Medium / Plasma-Trapped Cache 1"
  mapPath: /Maps/Salvage/medium-1.yml
  bounds: "-7.5,-7.5,7.5,7.5"

 - type: salvageMap
-  id: mediumvault1
+  id: MediumVault1
  name: "Medium / Vault 1"
  mapPath: /Maps/Salvage/medium-vault-1.yml
  bounds: "-7.5,-7.5,7.5,7.5"

 - type: salvageMap
-  id: mediumOrchestra
+  id: MediumOrchestra
  name: "Medium / Silent Orchestra"
  mapPath: /Maps/Salvage/medium-silent-orchestra.yml
  bounds: "-7.5,-7.5,7.5,7.5"

 - type: salvageMap
-  id: mediumLibraryWreck
+  id: MediumLibraryWreck
  name: "Medium / Abandoned Library"
  mapPath: /Maps/Salvage/medium-library.yml
  bounds: "-8.5,-8.5,6.5,7.5"

 - type: salvageMap
-  id: mediumCargoWreck
+  id: MediumCargoWreck
  name: "Medium / Cargo Department Wreck"
  mapPath: /Maps/Salvage/cargo-1.yml
  bounds: "-5.5,-5.5,5.5,9.5"

 - type: salvageMap
-  id: mediumPirateWreck
+  id: MediumPirateWreck
  name: "Medium / Pirate Barge Fragment"
  mapPath: /Maps/Salvage/medium-pirate.yml
  bounds: "-3.5,-9.5,6.5,7.5"

 - type: salvageMap
-  id: tickColony
+  id: TickColony
  name: "Space Tick colony"
  mapPath: /Maps/Salvage/tick-colony.yml
  bounds: "-6,-7,5,7"

 - type: salvageMap
-  id: cargoDock
+  id: CargoDock
  name: "Asteroid Cargo Dock"
  mapPath: /Maps/Salvage/medium-dock.yml
  bounds: "-7,-6,4,8"

 - type: salvageMap
-  id: spaceWaffleHome
+  id: SpaceWaffleHome
  name: "Waffle Home"
  mapPath: /Maps/Salvage/wh-salvage.yml
  bounds: "-13,-12,14,11"

 - type: salvageMap
-  id: mediumShuttleWreck
+  id: MediumShuttleWreck
  name: "Medium / Ruined Emergency Shuttle"
  mapPath: /Maps/Salvage/medium-ruined-emergency-shuttle.yml
  bounds: "-8.5,-8.5,8.5,8.5"
@@ -118,7 +118,7 @@
  bounds: "-5.5,-8.5,5.5,8.5"

 - type: salvageMap
-  id: mediumCrashedShuttle
+  id: MediumCrashedShuttle
  name: "Crashed Shuttle"
  mapPath: /Maps/Salvage/medium-crashed-shuttle.yml
  bounds: "-7,-8,5,9"
@@ -126,19 +126,19 @@
 # """Large""" maps

 - type: salvageMap
-  id: stationstation
+  id: StationStation
  name: "StationStation"
  mapPath: /Maps/Salvage/stationstation.yml
  bounds: "-17,-15,35,29"

 - type: salvageMap
-  id: asteroidBase
+  id: AsteroidBase
  name: "Asteroid Base"
  mapPath: /Maps/Salvage/asteroid-base.yml
  bounds: "-12,-13,15,11"

 - type: salvageMap
-  id: ruinCargoBase
+  id: RuinCargoBase
  name: "Ruined Cargo Storage"
  mapPath: /Maps/Salvage/ruin-cargo-salvage.yml
  bounds: "-15,-13,22,14"
--- a/Resources/Prototypes/Maps/test.yml
+++ b/Resources/Prototypes/Maps/test.yml
@@ -1,5 +1,5 @@
 - type: gameMap
-  id: empty
+  id: Empty
  mapName: Empty
  mapPath: /Maps/Test/empty.yml
  minPlayers: 0
--- a/Resources/Prototypes/shuttles.yml
+++ b/Resources/Prototypes/shuttles.yml
@@ -1,4 +1,4 @@
 # Cargo
 - type: cargoShuttle
  id: CargoShuttle
-  path: /Maps/cargo_shuttle.yml
+  path: /Maps/Shuttles/cargo.yml