From 3ee8164e1b37d5edb2e01ae465b5479b641efab7 Mon Sep 17 00:00:00 2001 From: Ed Date: Sun, 2 Jun 2024 12:54:25 +0300 Subject: [PATCH] Job rename --- Content.Shared/GameTicking/SharedGameTicker.cs | 2 +- Resources/Prototypes/Maps/arenas.yml | 4 ++-- Resources/Prototypes/Maps/debug.yml | 8 ++++---- .../_CP14/Entities/Markers/Spawners/jobs.yml | 2 +- Resources/Prototypes/_CP14/Maps/arenas.yml | 8 ++++---- .../_CP14/Roles/Jobs/Free/adventurer.yml | 14 +++++++------- .../Prototypes/_CP14/Roles/Jobs/departments.yml | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs index 8002a8d936..331934b22e 100644 --- a/Content.Shared/GameTicking/SharedGameTicker.cs +++ b/Content.Shared/GameTicking/SharedGameTicker.cs @@ -15,7 +15,7 @@ namespace Content.Shared.GameTicking // But this is easier, and at least it isn't hardcoded. //TODO: Move these, they really belong in StationJobsSystem or a cvar. [ValidatePrototypeId] - public const string FallbackOverflowJob = "CP14Adventurer"; + public const string FallbackOverflowJob = "CP14JobAdventurer"; public const string FallbackOverflowJobName = "cp14-job-name-adventurer"; diff --git a/Resources/Prototypes/Maps/arenas.yml b/Resources/Prototypes/Maps/arenas.yml index faa0f5dbba..1a03589a1d 100644 --- a/Resources/Prototypes/Maps/arenas.yml +++ b/Resources/Prototypes/Maps/arenas.yml @@ -11,6 +11,6 @@ mapNameTemplate: "Meteor Arena" - type: StationJobs overflowJobs: - - CP14Adventurer #CrystallPunk Dev replacement + - CP14JobAdventurer #CrystallPunk Dev replacement availableJobs: - CP14Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement + CP14JobAdventurer: [ -1, -1 ] #CrystallPunk Dev replacement diff --git a/Resources/Prototypes/Maps/debug.yml b/Resources/Prototypes/Maps/debug.yml index 41cfb24628..14e8cf04d2 100644 --- a/Resources/Prototypes/Maps/debug.yml +++ b/Resources/Prototypes/Maps/debug.yml @@ -11,9 +11,9 @@ mapNameTemplate: "Empty" - type: StationJobs overflowJobs: - - CP14Adventurer #CrystallPunk Dev replacement + - CP14JobAdventurer #CrystallPunk Dev replacement availableJobs: - CP14Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement + CP14JobAdventurer: [ -1, -1 ] #CrystallPunk Dev replacement - type: gameMap id: Dev @@ -33,9 +33,9 @@ mapNameTemplate: "Dev" - type: StationJobs overflowJobs: - - CP14Adventurer #CrystallPunk Dev replacement + - CP14JobAdventurer #CrystallPunk Dev replacement availableJobs: - CP14Adventurer: [ -1, -1 ] #CrystallPunk Dev replacement + CP14JobAdventurer: [ -1, -1 ] #CrystallPunk Dev replacement - type: CP14StationDungeonMap biome: CP14CavesGeneric diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml index 6a723258b7..e15bd661e6 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/jobs.yml @@ -6,7 +6,7 @@ - Spawner components: - type: SpawnPoint - job_id: CP14Adventurer + job_id: CP14JobAdventurer - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/_CP14/Maps/arenas.yml b/Resources/Prototypes/_CP14/Maps/arenas.yml index 76b8e39434..c38f3036b1 100644 --- a/Resources/Prototypes/_CP14/Maps/arenas.yml +++ b/Resources/Prototypes/_CP14/Maps/arenas.yml @@ -11,9 +11,9 @@ mapNameTemplate: "Cave Arena" - type: StationJobs overflowJobs: - - CP14Adventurer + - CP14JobAdventurer availableJobs: - CP14Adventurer: [ -1, -1 ] + CP14JobAdventurer: [ -1, -1 ] - type: gameMap id: AlchemyTest @@ -35,6 +35,6 @@ mapNameTemplate: "Alchemy test" - type: StationJobs overflowJobs: - - CP14Adventurer + - CP14JobAdventurer availableJobs: - CP14Adventurer: [ -1, -1 ] + CP14JobAdventurer: [ -1, -1 ] diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml index 8acd766742..5db53d11c4 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Free/adventurer.yml @@ -1,20 +1,20 @@ - type: job - id: CP14Adventurer + id: CP14JobAdventurer name: cp14-job-name-adventurer description: cp14-job-desc-adventurer playTimeTracker: CP14JobAdventurer - startingGear: CP14TestGear + startingGear: CP14AdventurerGear icon: "CP14JobIconAdventurer" supervisors: cp14-job-supervisors-command +- type: startingGear + id: CP14AdventurerGear + - type: job - id: CP14Alchemist + id: CP14JobAlchemist name: cp14-job-name-alchemist description: cp14-job-desc-alchemist playTimeTracker: CP14JobAlchemist - startingGear: CP14TestGear + startingGear: CP14AdventurerGear #TODO icon: "CP14JobIconAlchemist" supervisors: cp14-job-supervisors-command - -- type: startingGear - id: CP14TestGear \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml index 28aa2a5fe4..a8076725d8 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml @@ -3,8 +3,8 @@ description: department-CP14Free-desc color: "#429976" roles: - - CP14Adventurer - - CP14Alchemist + - CP14JobAdventurer + - CP14JobAlchemist - type: department id: CP14Command