From 314df36f4766561554aa9ce7d4e6e467ac85993a Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 10 Jan 2025 12:47:11 +0200 Subject: [PATCH 1/5] -2 and -3 funny --- Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml | 2 +- Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml index e7c7e1374cc..ce7ca643f6a 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml @@ -6,7 +6,7 @@ startingGear: ContractorGear icon: "JobIconContractor" supervisors: job-supervisors-hire - weight: -1 # Prioritize station & department jobs + weight: -3 # Prioritize station & department jobs displayWeight: 40 # Top accessGroups: # Frontier - GeneralAccess # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml index e65a9a10086..8108733d84f 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml @@ -9,7 +9,7 @@ startingGear: PilotGear icon: "JobIconPilot" supervisors: job-supervisors-hire - weight: -1 # Prioritize station & department jobs + weight: -2 # Prioritize station & department jobs displayWeight: 30 # Second from the top accessGroups: # Frontier - GeneralAccess From d9d5a25fd2e810e6f7856aeb8832f340b3a52a35 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 10 Jan 2025 12:56:36 +0200 Subject: [PATCH 2/5] fix --- Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml | 2 +- Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml | 2 +- Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml index ce7ca643f6a..2bd66b7edee 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml @@ -6,7 +6,7 @@ startingGear: ContractorGear icon: "JobIconContractor" supervisors: job-supervisors-hire - weight: -3 # Prioritize station & department jobs + weight: 1 # Prioritize station & department jobs displayWeight: 40 # Top accessGroups: # Frontier - GeneralAccess # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml index 7f433199fd7..47820530de6 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml @@ -10,7 +10,7 @@ canBeAntag: true icon: "JobIconMercenary" supervisors: job-supervisors-hire - weight: -1 # Prioritize station & department jobs + weight: 3 # Prioritize station & department jobs displayWeight: 20 # Second from the bottom setPreference: true access: diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml index 8108733d84f..5b44c5ff5f6 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml @@ -9,7 +9,7 @@ startingGear: PilotGear icon: "JobIconPilot" supervisors: job-supervisors-hire - weight: -2 # Prioritize station & department jobs + weight: 2 # Prioritize station & department jobs displayWeight: 30 # Second from the top accessGroups: # Frontier - GeneralAccess From a1faca97960c3657ee2742019ff943324ff67eca Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 10 Jan 2025 14:50:26 +0200 Subject: [PATCH 3/5] Fixup --- Resources/Prototypes/Roles/Jobs/departments.yml | 4 ++-- Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml | 1 - Resources/Prototypes/_NF/Roles/Jobs/departments.yml | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 1fc9b4b2e91..2b151e88215 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -12,7 +12,7 @@ name: department-Civilian description: department-NFCivilian-description # Frontier color: "#9FED58" - weight: 0 # Frontier: -10<0 accounted for in jobs + weight: -10 roles: # - Bartender # Frontier # - Botanist # Frontier @@ -79,7 +79,7 @@ - Sheriff # Frontier - StationTrafficController # Frontier primary: false - weight: 2 # Frontier: 100<2 - accounted for in jobs + weight: 100 - type: department id: Engineering diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml index 2bd66b7edee..8b6876c9a08 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml @@ -6,7 +6,6 @@ startingGear: ContractorGear icon: "JobIconContractor" supervisors: job-supervisors-hire - weight: 1 # Prioritize station & department jobs displayWeight: 40 # Top accessGroups: # Frontier - GeneralAccess # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml index 9057f9c8c93..d431d2a6c87 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml @@ -3,7 +3,7 @@ name: department-Frontier description: department-NF-description color: "#334E6D" - weight: 1 # accounted for in jobs + weight: 50 # accounted for in jobs roles: - StationRepresentative - StationTrafficController @@ -17,7 +17,7 @@ name: department-Antag description: department-NFAntag-description color: "#DE3A3A" - weight: -1 # accounted for in jobs + weight: -20 # accounted for in jobs roles: - PirateCaptain - PirateFirstMate From c0f8c3314618594d51586e9ed851853239a9410a Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 10 Jan 2025 15:13:44 +0200 Subject: [PATCH 4/5] Update JobTest.cs --- Content.IntegrationTests/Tests/Round/JobTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.IntegrationTests/Tests/Round/JobTest.cs b/Content.IntegrationTests/Tests/Round/JobTest.cs index 865f68db815..2b47fe647f5 100644 --- a/Content.IntegrationTests/Tests/Round/JobTest.cs +++ b/Content.IntegrationTests/Tests/Round/JobTest.cs @@ -19,7 +19,7 @@ namespace Content.IntegrationTests.Tests.Round; public sealed class JobTest { private static readonly ProtoId Passenger = "Contractor"; // Frontier: use job prototypes that exist - private static readonly ProtoId Engineer = "Pilot"; // Frontier + private static readonly ProtoId Engineer = "Deputy"; // Frontier private static readonly ProtoId Captain = "StationRepresentative"; // Frontier private static string _map = "JobTestMap"; From 1790d4e3723db67e0a2044036b58dec042e3962a Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 10 Jan 2025 15:28:35 +0200 Subject: [PATCH 5/5] Fix test --- Content.IntegrationTests/Tests/Round/JobTest.cs | 2 +- .../Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Content.IntegrationTests/Tests/Round/JobTest.cs b/Content.IntegrationTests/Tests/Round/JobTest.cs index 2b47fe647f5..befb96c7dcf 100644 --- a/Content.IntegrationTests/Tests/Round/JobTest.cs +++ b/Content.IntegrationTests/Tests/Round/JobTest.cs @@ -19,7 +19,7 @@ namespace Content.IntegrationTests.Tests.Round; public sealed class JobTest { private static readonly ProtoId Passenger = "Contractor"; // Frontier: use job prototypes that exist - private static readonly ProtoId Engineer = "Deputy"; // Frontier + private static readonly ProtoId Engineer = "Prisoner"; // Frontier private static readonly ProtoId Captain = "StationRepresentative"; // Frontier private static string _map = "JobTestMap"; diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index 64622172a9c..a685f27b714 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -15,7 +15,6 @@ canBeAntag: false icon: "JobIconPrisoner" supervisors: job-supervisors-prisoner - weight: 10 # Frontier displayWeight: 10 # Frontier special: - !type:AddImplantSpecial