From 682bdf239aa020799f1961cd616523aa78217676 Mon Sep 17 00:00:00 2001 From: CattyLucky Date: Tue, 21 Jan 2025 19:40:19 +0600 Subject: [PATCH] LegionPol --- .../Roles/Jobs/CaesarLegion/centurion.yml | 18 +++++++++-------- .../Corvax/Roles/Jobs/CaesarLegion/dean.yml | 18 +++++++++-------- .../Roles/Jobs/CaesarLegion/frumentary.yml | 14 ++++++------- .../Jobs/CaesarLegion/legionnairerecruit.yml | 16 ++++++++------- .../Jobs/CaesarLegion/legionnaireveteran.yml | 20 ++++++++++--------- .../Jobs/CaesarLegion/legionnairewarrior.yml | 18 +++++++++-------- 6 files changed, 56 insertions(+), 48 deletions(-) diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/centurion.yml b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/centurion.yml index d0d4bb20314..a718b5b9c75 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/centurion.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/centurion.yml @@ -5,10 +5,17 @@ description: job-description-caesar-legion-centurion playTimeTracker: CaesarLegionCenturion requirements: - - !type:CharacterDepartmentTimeRequirement + - !type:CharacterDepartmentTimeRequirement department: CaesarLegion min: 0 # WL-only - - !type:CharacterWhitelistRequirement + - !type:CharacterWhitelistRequirement + - !type:CharacterSpeciesRequirement + species: + - Human + - !type:CharacterSexRequirement + sex: Male + - !type:CharacterGenderRequirement + gender: Male startingGear: CaesarLegionCenturionGear alwaysUseSpawner: true icon: "JobIconLegioner" @@ -22,12 +29,7 @@ - CaesarLegion - type: ReplacementAccent accent: latin - jobBlockForSpecies: - - !type:JobBlockForSpecie - nameSpecie: Ghoul - - !type:JobBlockForSpecie - nameSpecie: GhoulGlowing - + - type: startingGear id: CaesarLegionCenturionGear equipment: diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/dean.yml b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/dean.yml index 3444c8077fd..958ca1bf89c 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/dean.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/dean.yml @@ -5,9 +5,16 @@ description: job-description-caesar-legion-dean playTimeTracker: CaesarLegionDean requirements: - - !type:CharacterDepartmentTimeRequirement - department: CaesarLegion - min: 36000 #10 hours + - !type:CharacterDepartmentTimeRequirement + department: CaesarLegion + min: 36000 #10 hours + - !type:CharacterSpeciesRequirement + species: + - Human + - !type:CharacterSexRequirement + sex: Male + - !type:CharacterGenderRequirement + gender: Male startingGear: CaesarLegionDeanGear alwaysUseSpawner: true icon: "JobIconLegioner" @@ -21,11 +28,6 @@ - CaesarLegion - type: ReplacementAccent accent: latin - jobBlockForSpecies: - - !type:JobBlockForSpecie - nameSpecie: Ghoul - - !type:JobBlockForSpecie - nameSpecie: GhoulGlowing - type: startingGear id: CaesarLegionDeanGear diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/frumentary.yml b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/frumentary.yml index 49749ee5cb7..7b8d443cfb6 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/frumentary.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/frumentary.yml @@ -5,9 +5,12 @@ description: job-description-caesar-legion-frumentary playTimeTracker: CaesarLegionFrumentary requirements: - - !type:CharacterDepartmentTimeRequirement - department: CaesarLegion - min: 43200 #12 hours + - !type:CharacterDepartmentTimeRequirement + department: CaesarLegion + min: 43200 #12 hours + - !type:CharacterSpeciesRequirement + species: + - Human startingGear: CaesarLegionFrumentaryGear alwaysUseSpawner: true icon: "JobIconLegioner" @@ -19,11 +22,6 @@ - type: NpcFactionMember factions: - CaesarLegion - jobBlockForSpecies: - - !type:JobBlockForSpecie - nameSpecie: Ghoul - - !type:JobBlockForSpecie - nameSpecie: GhoulGlowing - type: startingGear id: CaesarLegionFrumentaryGear diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnairerecruit.yml b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnairerecruit.yml index e33b8aea4c7..1d735eb25bc 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnairerecruit.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnairerecruit.yml @@ -4,7 +4,14 @@ name: job-name-caesar-legion-legionnaire-recruit description: job-description-caesar-legionnaire-recruit playTimeTracker: CaesarLegionLegionnaireRecruit - #requirements: + requirements: + - !type:CharacterSpeciesRequirement + species: + - Human + - !type:CharacterSexRequirement + sex: Male + - !type:CharacterGenderRequirement + gender: Male # - !type:OverallPlaytimeRequirement # time: 7200 # 2 hour startingGear: CaesarLegionLegionnaireRecruitGear @@ -20,12 +27,7 @@ - CaesarLegion - type: ReplacementAccent accent: latin - jobBlockForSpecies: - - !type:JobBlockForSpecie - nameSpecie: Ghoul - - !type:JobBlockForSpecie - nameSpecie: GhoulGlowing - + - type: startingGear id: CaesarLegionLegionnaireRecruitGear equipment: diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnaireveteran.yml b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnaireveteran.yml index 29b02a64c42..d4cb59689b7 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnaireveteran.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnaireveteran.yml @@ -5,9 +5,16 @@ description: job-description-caesar-legionnaire-veteran playTimeTracker: CaesarLegionLegionnaireVeteran requirements: - - !type:CharacterDepartmentTimeRequirement - department: CaesarLegion - min: 18000 # 5 hours + - !type:CharacterDepartmentTimeRequirement + department: CaesarLegion + min: 18000 # 5 hours + - !type:CharacterSpeciesRequirement + species: + - Human + - !type:CharacterSexRequirement + sex: Male + - !type:CharacterGenderRequirement + gender: Male startingGear: CaesarLegionLegionnaireVeteranGear alwaysUseSpawner: true icon: "JobIconLegioner" @@ -21,12 +28,7 @@ - CaesarLegion - type: ReplacementAccent accent: latin - jobBlockForSpecies: - - !type:JobBlockForSpecie - nameSpecie: Ghoul - - !type:JobBlockForSpecie - nameSpecie: GhoulGlowing - + - type: startingGear id: CaesarLegionLegionnaireVeteranGear equipment: diff --git a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnairewarrior.yml b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnairewarrior.yml index 8ec9182ae8f..a3ccfb6882f 100644 --- a/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnairewarrior.yml +++ b/Resources/Prototypes/Corvax/Roles/Jobs/CaesarLegion/legionnairewarrior.yml @@ -5,9 +5,16 @@ description: job-description-caesar-legionnaire-warrior playTimeTracker: CaesarLegionLegionnaireWarrior requirements: - - !type:CharacterDepartmentTimeRequirement - department: CaesarLegion - min: 7200 # 2 hours + - !type:CharacterDepartmentTimeRequirement + department: CaesarLegion + min: 7200 # 2 hours + - !type:CharacterSpeciesRequirement + species: + - Human + - !type:CharacterSexRequirement + sex: Male + - !type:CharacterGenderRequirement + gender: Male startingGear: CaesarLegionLegionnaireWarriorGear alwaysUseSpawner: true icon: "JobIconLegioner" @@ -21,11 +28,6 @@ - CaesarLegion - type: ReplacementAccent accent: latin - jobBlockForSpecies: - - !type:JobBlockForSpecie - nameSpecie: Ghoul - - !type:JobBlockForSpecie - nameSpecie: GhoulGlowing - type: startingGear id: CaesarLegionLegionnaireWarriorGear