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.

Sign up for GitHub

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

Fix attempt to job priority #2674

Merged
merged 8 commits into from
Jan 10, 2025
Merged

Fix attempt to job priority #2674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
314df36
-2 and -3 funny
dvir001 Jan 10, 2025
d9d5a25
fix
dvir001 Jan 10, 2025
a1faca9
Fixup
dvir001 Jan 10, 2025
ad3d640
Merge branch 'master' into 2025-01-10-FixJobPriority
dvir001 Jan 10, 2025
c0f8c33
Update JobTest.cs
dvir001 Jan 10, 2025
8ad827a
Merge branch '2025-01-10-FixJobPriority' of https://github.com/dvir00…
dvir001 Jan 10, 2025
1790d4e
Fix test
dvir001 Jan 10, 2025
5e09ab8
Merge branch 'master' into 2025-01-10-FixJobPriority
dvir001 Jan 10, 2025
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
2 changes: 1 addition & 1 deletion Content.IntegrationTests/Tests/Round/JobTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Content.IntegrationTests.Tests.Round;
public sealed class JobTest
{
private static readonly ProtoId<JobPrototype> Passenger = "Contractor"; // Frontier: use job prototypes that exist
private static readonly ProtoId<JobPrototype> Engineer = "Pilot"; // Frontier
private static readonly ProtoId<JobPrototype> Engineer = "Prisoner"; // Frontier
private static readonly ProtoId<JobPrototype> Captain = "StationRepresentative"; // Frontier

private static string _map = "JobTestMap";
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
canBeAntag: false
icon: "JobIconPrisoner"
supervisors: job-supervisors-prisoner
weight: 10 # Frontier
displayWeight: 10 # Frontier
special:
- !type:AddImplantSpecial
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/departments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/_NF/Roles/Jobs/Civilian/contractor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/Roles/Jobs/Civilian/mercenary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/Roles/Jobs/Civilian/pilot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Roles/Jobs/departments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading