Еще фиксы лоадаутов (#455)

* fix: fix hop pda * add: add captain gloves * new items to loadouts * fixed reporter and intern
2024-07-17 15:13:17 +03:00
parent 5d38bc15f3
commit f1a387a7c9
12 changed files with 111 additions and 14 deletions
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
@@ -19,7 +19,7 @@

 # Ears

- type: itemLoadout
+- type: itemLoadout # WD
  id: QuartermasterHeadset
  equipment: QuartermasterHeadset
 - type: startingGear
@@ -27,6 +27,14 @@
  equipment:
    ears: ClothingHeadsetQM

+- type: itemLoadout # WD
+  id: QuartermasterHeadsetAlt
+  equipment: QuartermasterHeadsetAlt
+- type: startingGear
+  id: QuartermasterHeadsetAlt
+  equipment:
+    ears: ClothingHeadsetAltCargo
+
 # Jumpsuit
 - type: itemLoadout
  id: QuartermasterJumpsuit
--- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml
@@ -1,3 +1,13 @@
+# Ears
+
+- type: itemLoadout # WD
+  id: SalvageSpecialistHeadset
+  equipment: SalvageSpecialistHeadset
+- type: startingGear
+  id: SalvageSpecialistHeadset
+  equipment:
+    ears: ClothingHeadsetMining
+
 # Mask

 - type: itemLoadout # WD
--- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
@@ -97,6 +97,17 @@
  equipment:
    outerClothing: ClothingOuterWinterJani

+- type: itemLoadout # WD
+  id: JanitorWetFloorSign
+  equipment: JanitorWetFloorSign
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: TimerJanitorFunnyHeads
+- type: startingGear
+  id: JanitorWetFloorSign
+  equipment:
+    outerClothing: WetFloorSign
+
 # PDA

 - type: itemLoadout # WD
--- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
@@ -120,6 +120,15 @@
  equipment:
    outerClothing: ClothingOuterWinterCap

+# Gloves
+- type: itemLoadout
+  id: CaptainGloves
+  equipment: CaptainGloves
+- type: startingGear
+  id: CaptainGloves
+  equipment:
+    gloves: ClothingHandsGlovesCaptain
+
 # PDA

 - type: itemLoadout # WD
--- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
@@ -122,7 +122,7 @@
 - type: startingGear
  id: HoPPDA
  equipment:
-    gloves: HoPPDA
+    id: HoPPDA

 # Ears
 - type: itemLoadout # WD
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
@@ -1,3 +1,13 @@
+# Glasses
+
+- type: itemLoadout
+  id: ChemistGlasses
+  equipment: ChemistGlasses
+- type: startingGear
+  id: ChemistGlasses
+  equipment:
+    eyes: ClothingEyesGlassesChemical
+
 # Jumpsuit
 - type: itemLoadout
  id: ChemistJumpsuit
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
@@ -103,6 +103,14 @@
  equipment:
    ears: ClothingHeadsetCMO

+- type: itemLoadout # WD
+  id: CMOHeadsetAlt
+  equipment: CMOHeadsetAlt
+- type: startingGear
+  id: CMOHeadsetAlt
+  equipment:
+    ears: ClothingHeadsetAltMedical
+
 # PDA

 - type: itemLoadout # WD
--- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
@@ -25,4 +25,4 @@
 - type: startingGear
  id: MedicalInternPDA
  equipment:
-    jumpsuit: MedicalInternPDA
+    id: MedicalInternPDA
--- a/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml
@@ -23,4 +23,4 @@
 - type: startingGear
  id: ReporterPDA
  equipment:
-    jumpsuit: ReporterPDA
+    id: ReporterPDA
--- a/Resources/Prototypes/Loadouts/Jobs/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/common.yml
@@ -1,4 +1,15 @@
-# Eyes
+# Timers
+
+- type: loadoutEffectGroup # WD
+  id: TimerTrueAssistant
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:RoleTimeRequirement
+      role: JobPassenger
+      time: 180000 # 50 hours
+
+# Eyes

 - type: itemLoadout
  id: GlassesGarOrange
@@ -141,6 +152,17 @@
  equipment:
    outerClothing: ClothingOuterHoodieBlack

+- type: itemLoadout
+  id: CoatSpaceAsshole
+  equipment: CoatSpaceAsshole
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: TimerTrueAssistant
+- type: startingGear
+  id: CoatSpaceAsshole
+  equipment:
+    outerClothing: ClothingOuterCoatSpaceAsshole
+
 # Gloves

 - type: itemLoadout
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -65,6 +65,7 @@
  - CaptainBackpack
  - CaptainSatchel
  - CaptainDuffel
+  - CaptainDuffel
  - CommonSatchelLeather # WD

 - type: loadoutGroup
@@ -75,6 +76,13 @@
  - CaptainOuterClothing
  - CaptainWintercoat

+- type: loadoutGroup
+  id: CaptainOuterClothing
+  name: loadout-group-gloves
+  minLimit: 0
+  loadouts:
+  - CaptainGloves
+
 - type: loadoutGroup
  id: CaptainShoes
  name: loadout-group-shoes
@@ -209,6 +217,7 @@
  - CoatGentle
  - AssistantWintercoat
  - CoatBomber
+  - CoatSpaceAsshole

 - type: loadoutGroup # WD
  id: AssistantPDA
@@ -405,6 +414,7 @@
  minLimit: 0
  loadouts:
  - JanitorWintercoat
+  - JanitorWetFloorSign # WD

 - type: loadoutGroup
  id: JanitorPDA
@@ -749,6 +759,7 @@
  name: loadout-group-ears
  loadouts:
  - QuartermasterHeadset
+  - QuartermasterHeadsetAlt

 - type: loadoutGroup
  id: QuartermasterJumpsuit
@@ -858,6 +869,12 @@
  - MercenaryBand
  - MercenaryBeret

+- type: loadoutGroup # WD
+  id: SalvageSpecialistHeadset
+  name: loadout-group-ears
+  loadouts:
+  - SalvageSpecialistHeadset
+
 - type: loadoutGroup # WD
  id: SalvageSpecialistEyes
  name: loadout-group-eyes
@@ -1582,12 +1599,6 @@

 # Medical

- type: loadoutGroup
-  id: ChiefMedicalOfficerEars
-  name: loadout-group-ears
-  loadouts:
-  - CMOHeadset
-
 - type: loadoutGroup
  id: ChiefMedicalOfficerHead
  name: loadout-group-head
@@ -1600,6 +1611,13 @@
  - PurpleSurgeryCap
  - CowboyWhite

+- type: loadoutGroup # WD
+  id: ChiefMedicalOfficerEars
+  name: loadout-group-ears
+  loadouts:
+  - CMOHeadset
+  - CMOHeadsetAlt
+
 - type: loadoutGroup
  id: ChiefMedicalOfficerJumpsuit
  name: loadout-group-jumpsuit
@@ -1749,7 +1767,7 @@

 - type: loadoutGroup
  id: MedicalInternPDA
-  name: loadout-group-jumpsuit
+  name: loadout-group-pda
  loadouts:
  - MedicalInternPDA

@@ -1764,11 +1782,12 @@
  - PurpleSurgeryCap
  - CowboyWhite

- type: loadoutGroup
+- type: loadoutGroup # WD
  id: ChemistEyes
  name: loadout-group-eyes
  minLimit: 0
  loadouts:
+  - ChemistGlasses
  - GlassesGarOrange

 - type: loadoutGroup
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -224,7 +224,7 @@
  id: JobSalvageSpecialist
  groups:
  - SalvageSpecialistHead # WD
-  - CommonCargoEars # WD
+  - SalvageSpecialistHeadset # WD
  - SalvageSpecialistEyes # WD
  - SalvageSpecialistMask # WD
  - SalvageSpecialistJumpsuit # WD