roles (#254)

* roles * revolver sprite and standardized pistols --------- Co-authored-by: Peptide90 <[email protected]>
Vault-Overseers · Jul 1, 2024 · 911db12 · 911db12
1 parent e9e3f60
commit 911db12
Show file tree

Hide file tree

Showing 26 changed files with 240 additions and 33 deletions.
diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/Belts/belt.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/Belts/belt.yml
@@ -37,6 +37,18 @@
         - id: SpeedLoader45-70
         - id: SpeedLoader45-70
 
+- type: entity
+  noSpawn: true
+  parent: ClothingBeltRevolver
+  id: ClothingBeltRevolverCaptainfilled
+  components:
+    - type: StorageFill
+      contents:
+        - id: N14WeaponRevolverCaptainMagnun
+        - id: SpeedLoader44
+        - id: SpeedLoader44
+        - id: SpeedLoader44
+
 - type: entity
   noSpawn: true
   parent: ClothingBeltMedical

diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Head/hats.yml
@@ -232,9 +232,9 @@
 
 - type: entity
   parent: ClothingHeadBase
-  id: N14ClothingHeadHatNCRBeretSapper
-  name: NCR sapper beret
-  description: An black beret worn by NCR combat engineers.
+  id: N14ClothingHeadHatNCRBeretQM
+  name: NCR quartermaster beret
+  description: An black beret worn by NCR quartermasters.
   components:
   - type: Sprite
     sprite: Nuclear14/Clothing/Head/FalloutHats/ncrberetsapper.rsi

diff --git a/Resources/Prototypes/Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml b/Resources/Prototypes/Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml
@@ -314,13 +314,24 @@
   parent: ClothingUniformBase
   id: N14ClothingOfficerUniformNCR
   name: field NCR officer uniform
-  description: a field uniform wore with pride by the officers of the NCR,.
+  description: a field uniform wore with pride by the officers of the NCR.
   components:
   - type: Sprite
     sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/NCRofficer.rsi
   - type: Clothing
     sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/NCRofficer.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: N14ClothingMPUniformNCR
+  name: NCR military police uniform
+  description: a simple uniform used by the military police of the NCR.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/NCRmp.rsi
+  - type: Clothing
+    sprite: Nuclear14/Clothing/Uniforms/FalloutSuits/NCRmp.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: N14ClothingUniformRangerV1

diff --git a/Resources/Prototypes/Nuclear14/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Nuclear14/Entities/Markers/Spawners/jobs.yml
@@ -184,6 +184,42 @@
       - state: green
       - state: passenger # TODO make new icons
 
+- type: entity
+  id: N14SpawnPointNCRQM
+  parent: N14SpawnPointWastelander
+  name: NCR quartermaster
+  components:
+  - type: SpawnPoint
+    job_id: NCRQM
+  - type: Sprite
+    layers:
+      - state: green
+      - state: passenger # TODO make new icons
+
+- type: entity
+  id: N14SpawnPointNCRDoctor
+  parent: N14SpawnPointWastelander
+  name: NCR doctor
+  components:
+  - type: SpawnPoint
+    job_id: NCRDoctor
+  - type: Sprite
+    layers:
+      - state: green
+      - state: passenger # TODO make new icons
+
+- type: entity
+  id: N14SpawnPointNCRMP
+  parent: N14SpawnPointWastelander
+  name: NCR military police
+  components:
+  - type: SpawnPoint
+    job_id: NCRMP
+  - type: Sprite
+    layers:
+      - state: green
+      - state: passenger # TODO make new icons
+
 - type: entity
   id: N14SpawnPointNCRNCO
   parent: N14SpawnPointWastelander

diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Kits/kits.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Specific/Kits/kits.yml
@@ -84,10 +84,9 @@
       - id: N14ClothingBackpackSatchelNCR
       - id: N14WeaponSniperHunting
       - id: MagazineBox308
-      - id: N14WeaponPistolColt
-      - id: N14MagazinePistol45
-      - id: N14MagazinePistol45
-      - id: N14MagazinePistol45
+      - id: N14WeaponPistol9mm
+      - id: N14MagazinePistol9mm
+      - id: N14MagazinePistol9mm
       - id: N14CombatKnife
     sound:
       path: /Audio/Effects/unwrap.ogg
@@ -109,10 +108,9 @@
       - id: N14ClothingBackpackSatchelNCR
       - id: N14WeaponShotgun
       - id: MagazineBox12gauge
-      - id: N14WeaponPistolColt
-      - id: N14MagazinePistol45
-      - id: N14MagazinePistol45
-      - id: N14MagazinePistol45
+      - id: N14WeaponPistol9mm
+      - id: N14MagazinePistol9mm
+      - id: N14MagazinePistol9mm
       - id: N14CombatKnife
     sound:
       path: /Audio/Effects/unwrap.ogg
@@ -134,10 +132,10 @@
       - id: ClothingBeltNCRPouches
       - id: N14WastelandFlagSpear
       - id: N14ClothingBackpackSatchelNCR
-      - id: N14WeaponPistolColt
-      - id: N14MagazinePistol45
-      - id: N14MagazinePistol45
-      - id: N14CombatKnife
+      - id: N14WeaponPistol9mm
+      - id: N14MagazinePistol9mm
+      - id: N14MagazinePistol9mm
+      - id: N14CombatKnife         
     sound:
       path: /Audio/Effects/unwrap.ogg
 
@@ -161,9 +159,6 @@
       - id: N14MagazineSMG9mm
       - id: N14MagazineSMG9mm
       - id: N14MagazineSMG9mm
-      - id: N14WeaponPistol10mm
-      - id: N14MagazinePistol10mm
-      - id: N14MagazinePistol10mm
       - id: N14CombatKnife
     sound:
       path: /Audio/Effects/unwrap.ogg
@@ -186,9 +181,9 @@
       - id: ClipMagazine308Rifle
       - id: ClipMagazine308Rifle
       - id: ClipMagazine308Rifle
-      - id: N14WeaponPistol10mm
-      - id: N14MagazinePistol10mm
-      - id: N14MagazinePistol10mm
+      - id: N14WeaponPistol9mm
+      - id: N14MagazinePistol9mm
+      - id: N14MagazinePistol9mm
       - id: N14CombatKnife
     sound:
       path: /Audio/Effects/unwrap.ogg
@@ -209,9 +204,9 @@
       - id: LongMagazine5.56Rifle
       - id: LongMagazine5.56Rifle
       - id: LongMagazine5.56Rifle
-      - id: N14WeaponPistol10mm
-      - id: N14MagazinePistol10mm
-      - id: N14MagazinePistol10mm
+      - id: N14WeaponPistol9mm
+      - id: N14MagazinePistol9mm
+      - id: N14MagazinePistol9mm
       - id: N14CombatKnife
     sound:
       path: /Audio/Effects/unwrap.ogg
@@ -231,9 +226,9 @@
       - id: N14WeaponAutoRifle
       - id: Magazine308Rifle
       - id: Magazine308Rifle
-      - id: N14WeaponPistol10mm
-      - id: N14MagazinePistol10mm
-      - id: N14MagazinePistol10mm
+      - id: N14WeaponPistol9mm
+      - id: N14MagazinePistol9mm
+      - id: N14MagazinePistol9mm
       - id: N14CombatKnife
     sound:
       path: /Audio/Effects/unwrap.ogg
@@ -254,9 +249,9 @@
       - id: N14MagazineShotgun20
       - id: N14MagazineShotgun20
       - id: N14MagazineShotgun20
-      - id: N14WeaponPistol10mm
-      - id: N14MagazinePistol10mm
-      - id: N14MagazinePistol10mm
+      - id: N14WeaponPistol9mm
+      - id: N14MagazinePistol9mm
+      - id: N14MagazinePistol9mm
       - id: N14CombatKnife
     sound:
       path: /Audio/Effects/unwrap.ogg

diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -49,6 +49,23 @@
         - SpeedLoader
     proto: N14Cartridge44Magnum
 
+- type: entity
+  name: captain revolver
+  parent: BaseWeaponRevolver
+  id: N14WeaponRevolverCaptainMagnun
+  description: A true freedom fighter carries his flag everywhere, even on his gun. Uses .44 magnum ammo.
+  components:
+  - type: Sprite
+    sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi
+  - type: Clothing
+    sprite: Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi
+  - type: RevolverAmmoProvider
+    whitelist:
+      tags:
+        - N14Cartridge44Magnum
+        - SpeedLoader
+    proto: N14Cartridge44Magnum
+
 - type: entity
   name: hunting revolver
   parent: BaseWeaponRevolver

diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_doctor.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_doctor.yml
@@ -0,0 +1,28 @@
+- type: job
+  id: NCRDoctor
+  setPreference: true
+  name: NCR doctor
+  description: Treat the troopers and offer services to the wasteland people.
+  playTimeTracker: NCRDoctor
+  startingGear: NCRDoctorGear
+  icon: "JobIconPassenger"
+  supervisors: job-supervisors-ncr-nco
+
+- type: startingGear
+  id: NCRDoctorGear
+  equipment:
+    jumpsuit: N14ClothingUniformNCR
+    back: N14ClothingBackpackWastelanderFilled # N14TODO: Doctors Bag
+    head: N14ClothingHeadHatNCRBeretMedic
+    shoes: N14ClothingShoesBlack
+    gloves: N14ClothingHandsGlovesNitrile
+    belt: ClothingBeltMedicalfilled
+    id: N14IDNCRDogtag
+    pocket1: N14WeaponPistol9mm
+    outerClothing: ClothingOuterCoatLab
+  innerClothingSkirt: N14ClothingUniformNCR
+  satchel: N14ClothingBackpackSatchelWastelanderFilled
+  duffelbag: N14ClothingBackpackDuffelFilled  # N14TODO: Doctors Bag
+
+- type: playTimeTracker
+  id: NCRDoctor
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_mp.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_mp.yml
@@ -0,0 +1,29 @@
+- type: job
+  id: NCRMP
+  setPreference: true
+  name: NCR military police
+  description: Protect the camp and make sure the soldiers behave correctly.
+  playTimeTracker: NCRMP
+  startingGear: NCRMPGear
+  icon: "JobIconSecurityOfficer"
+  supervisors: job-supervisors-ncr
+  canBeAntag: false
+  access:
+  - NCRCadet
+  - NCRSoldier
+  - NCRNCO
+
+- type: startingGear
+  id: NCRMPGear
+  equipment:
+    head: N14ClothingHeadHatNCRHelmetMetalMilitaryPolice
+    back: N14ClothingBackpackNCR
+    jumpsuit: N14ClothingMPUniformNCR
+    shoes: N14ClothingBootsLeather
+    belt: N14ClothingBeltPoliceFilled
+    outerClothing: N14ClothingOuterNCRLightPouchedVest
+    id: N14IDNCRDogtag
+  innerClothingSkirt: N14ClothingMPUniformNCR #placeholder
+
+- type: playTimeTracker
+  id: NCRMP
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_nco.yml
@@ -16,12 +16,12 @@
 - type: startingGear
   id: NCRNCOGear
   equipment:
-    head: N14ClothingHeadHatNCRHelmetMetalMilitaryPolice
+    head: N14ClothingHeadHatNCRHelmetMetal
     back: N14ClothingBackpackNCR
     jumpsuit: N14ClothingOfficerUniformNCR
     shoes: N14ClothingBootsLeather
+    neck: N14ClothingNeckMantleNCR
     belt: ClothingBeltNCR
-    eyes: ClothingEyesGlassesSunglasses
     outerClothing: N14ClothingOuterNCRVest
     id: N14IDNCRDogtag
   innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder

diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_officer.yml
@@ -18,6 +18,7 @@
     head: N14ClothingHeadHatNCRBeretOfficer
     jumpsuit: N14ClothingOfficerUniformNCR
     shoes: N14ClothingBootsLeather
+    belt: ClothingBeltRevolverCaptainfilled
     eyes: ClothingEyesGlassesSunglasses
     id: N14IDNCRDogtag
   innerClothingSkirt: N14ClothingOfficerUniformNCR #placeholder

diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_quartermaster.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/NCR/ncr_quartermaster.yml
@@ -0,0 +1,25 @@
+- type: job
+  id: NCRQM
+  setPreference: true
+  name: NCR quartermaster
+  description: Protect the armory and trade looted equipment with any wastelander.
+  playTimeTracker: NCRQM
+  startingGear: NCRQMGear
+  icon: "JobIconWarden"
+  supervisors: job-supervisors-ncr-nco
+  canBeAntag: false
+  access:
+  - NCRCadet
+  - NCRSoldier
+
+- type: startingGear
+  id: NCRQMGear
+  equipment:
+    head: N14ClothingHeadHatNCRBeretQM
+    jumpsuit: N14ClothingUniformNCR
+    shoes: N14ClothingBootsLeather
+    id: N14IDNCRDogtag
+  innerClothingSkirt: N14ClothingUniformNCR #placeholder
+
+- type: playTimeTracker
+  id: NCRQM
diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml
@@ -35,6 +35,9 @@
   roles:
   - NCRCadet
   - NCRNCO
+  - NCRMP
+  - NCRQM
+  - NCRDoctor
   - NCROfficer
   - NCRSoldier
   - NCRRanger

diff --git a/...extures/Nuclear14/Clothing/Back/Backpacks/backpackncr.rsi/equipped-BACKPACK.png b/...extures/Nuclear14/Clothing/Back/Backpacks/backpackncr.rsi/equipped-BACKPACK.png
diff --git a/...s/Nuclear14/Clothing/Uniforms/FalloutSuits/NCRmp.rsi/equipped-INNERCLOTHING.png b/...s/Nuclear14/Clothing/Uniforms/FalloutSuits/NCRmp.rsi/equipped-INNERCLOTHING.png
diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/NCRmp.rsi/icon.png b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/NCRmp.rsi/icon.png
diff --git a/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/NCRmp.rsi/meta.json b/Resources/Textures/Nuclear14/Clothing/Uniforms/FalloutSuits/NCRmp.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from Mojave sun 13 https://github.com/Mojave-Sun/mojave-sun-13/blob/master/mojave/icons/objects/clothing/clothing_world/uniforms_world.dmi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}
diff --git a/...es/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/base.png b/...es/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/base.png
diff --git a/...xtures/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/bolt-open.png b/...xtures/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/bolt-open.png
diff --git a/...es/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/equipped-BELT.png b/...es/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/equipped-BELT.png
diff --git a/...es/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/icon.png b/...es/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/icon.png
diff --git a/...ures/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/inhand-left.png b/...ures/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/inhand-left.png
diff --git a/...res/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/inhand-right.png b/...res/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/inhand-right.png
diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/meta.json b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/captainmagnum.rsi/meta.json
@@ -0,0 +1,32 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken/modified from desertrose at https://github.com/DesertRose2/desertrose/commit/0b8f7b7694a4a814724ba8ed59f695916ce845ce",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+		{
+			"name": "equipped-BELT",
+			"directions": 4
+		}
+    ]
+}
diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/magnum.rsi/base.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/magnum.rsi/base.png
diff --git a/...rces/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/magnum.rsi/bolt-open.png b/...rces/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/magnum.rsi/bolt-open.png
diff --git a/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/magnum.rsi/icon.png b/Resources/Textures/Nuclear14/Objects/Weapons/Guns/Revolvers/magnum.rsi/icon.png