Merge pull request #143 from CattyLucky/master

LegionPol
Corvax-Frontier · Jan 21, 2025 · 80a92bf · 80a92bf
2 parents 773fec1 + 682bdf2
commit 80a92bf
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 48 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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