Fixed up ranger loadouts and added Desert ranger options for veteran

Resources/Prototypes/_Nuclear14/Entities/Objects/Tools/instruments.yml

@@ -0,0 +1,144 @@
+- type: entity
+  parent: TrumpetInstrument 
+  id: N14InstrumentTrumpet
+  name: trumpet
+  description: A jazzy and versitile instrument.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/trumpet.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/Instruments/trumpet.rsi
+
+- type: entity
+  parent: TromboneInstrument 
+  id: N14InstrumentTrombone 
+  name: trombone
+  description: A brass instrument with an adjustable slide, has some weight too it.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/trombone.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/Instruments/trombone.rsi
+
+- type: entity
+  parent: BanjoInstrument 
+  id: N14InstrumentBanjo
+  name: banjo
+  description: An old rustic country instrument.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/banjo.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/Instruments/banjo.rsi
+
+- type: entity
+  parent: ViolinInstrument 
+  id: N14InstrumentViolin
+  name: violin
+  description: Played in first chairs and lawn chairs.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/violin.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/Instruments/violin.rsi
+
+
+- type: entity
+  parent: AcousticGuitarInstrument 
+  id: N14InstrumentGuitar
+  name: acoustic guitar
+  description: Play it again... My Johnny...
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/guitar.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Fun/Instruments/guitar.rsi
+    size: Normal
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    sprite: Objects/Fun/Instruments/guitar.rsi
+
+
+- type: entity
+  parent: SaxophoneInstrument 
+  id: N14InstrumentSaxaphone
+  name: saxophone
+  description: Take more than a few bombs too kill Jazz.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/saxophone.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/Instruments/saxophone.rsi
+
+
+- type: entity
+  parent: HarmonicaInstrument 
+  id: N14InstrumentHarmonica
+  name: harmonica
+  description: A nifty pocket sized instrument, for lettin your soul sing on the trails...
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/harmonica.rsi
+    state: icon
+  - type: Item
+    size: Small
+    sprite: Objects/Fun/Instruments/harmonica.rsi
+
+
+- type: entity
+  parent: ClarinetInstrument 
+  id: N14InstrumentClarinet
+  name: clarinet
+  description: A refined reed instrument.
+  components:
+  - type: Instrument
+    program: 71
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/clarinet.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/Instruments/clarinet.rsi
+
+- type: entity
+  parent: FluteInstrument 
+  id: N14InstrumentFlute
+  name: flute
+  description: A elegant woodwind instrument
+  components:
+  - type: Instrument
+    program: 73
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/flute.rsi
+    state: icon
+  - type: Item
+    size: Normal
+    sprite: Objects/Fun/Instruments/flute.rsi
+
+- type: entity
+  parent: PanFluteInstrument 
+  id: N14InstrumentPanflute
+  name: pan flute
+  description: A tribal instrument of ancient design, constructed from reeds.
+  components:
+  - type: Instrument
+    program: 75
+  - type: Sprite
+    sprite: Objects/Fun/Instruments/panflute.rsi
+    state: icon
+  - type: Item
+    size: Small
+    sprite: Objects/Fun/Instruments/panflute.rsi

Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml

@@ -62,7 +62,7 @@
 - type: loadout
   id: LoadoutNCRmaskCombat
   category: Roles
-  cost: 8
+  cost: 4
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
@@ -73,48 +73,6 @@
 
 # MARK: Ranger + Vet
 
-- type: loadout
-  id: LoadoutNCR308
-  category: Roles
-  cost: 2
-  exclusive: true
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - NCRRanger
-        - NCRRangerVeteran
-  items:
-    - MagazineBox308
-
-- type: loadout
-  id: LoadoutNCR20gauge
-  category: Roles
-  cost: 2
-  exclusive: true
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - NCRRanger
-        - NCRRangerVeteran
-  items:
-    - N14MagazineShotgun20
-    - N14MagazineShotgun20
-    - MagazineBox20gauge
-
-- type: loadout
-  id: LoadoutNCR44
-  category: Roles
-  cost: 2
-  exclusive: true
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - NCRRanger
-        - NCRRangerVeteran
-  items:
-    - MagazineBox44
-    - MagazineBox44
-
 - type: loadout
   id: LoadoutNCRhatB
   category: Roles
@@ -128,32 +86,6 @@
   items:
     - N14ClothingHeadHatRangerB
 
-- type: loadout
-  id: LoadoutNCRhatGrey
-  category: Roles
-  cost: 1
-  exclusive: true
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - NCRRanger
-        - NCRRangerVeteran
-  items:
-    - N14ClothingHeadHatCowboyGrey
-
-- type: loadout
-  id: LoadoutNCRhatGreyBanded
-  category: Roles
-  cost: 1
-  exclusive: true
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - NCRRanger
-        - NCRRangerVeteran
-  items:
-    - N14ClothingHeadHatCowboyGreyBanded
-
 - type: loadout
   id: LoadoutNCRhatBeret
   category: Roles
@@ -259,82 +191,46 @@
   items:
     - N14MedkitCombatFilled
 
-- type: loadout
-  id: LoadoutNCR556
-  category: Roles
-  cost: 2
-  exclusive: true
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - NCRRanger
-        - NCRRangerVeteran
-  items:
-    - LongMagazine556Rifle
-    - LongMagazine556Rifle
-    - MagazineBox556
-
-- type: loadout
-  id: LoadoutNCR762
-  category: Roles
-  cost: 2
-  exclusive: true
-  requirements:
-    - !type:CharacterJobRequirement
-      jobs:
-        - NCRRanger
-        - NCRRangerVeteran
-  items:
-    - Magazine762Rifle
-    - Magazine762Rifle
-    - MagazineBox762
+# MARK: Ranger Vet
 
 - type: loadout
-  id: LoadoutNCR12gauge
+  id: LoadoutNCRuniformModif
   category: Roles
-  cost: 2
+  cost: 1
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
       jobs:
-        - NCRRanger
         - NCRRangerVeteran
   items:
-    - N14MagazineShotgun12
-    - N14MagazineShotgun12
-    - MagazineBox12gauge
+    - N14ClothingUniformRangerModif
 
 - type: loadout
-  id: LoadoutNCR45-70
+  id: LoadoutNCRuniformBlue
   category: Roles
-  cost: 2
+  cost: 1
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
       jobs:
-        - NCRRanger
         - NCRRangerVeteran
   items:
-    - MagazineBox45-70
-    - MagazineBox45-70
-
-# MARK: Ranger Vet
+    - N14ClothingUniformRangerBlue
 
 - type: loadout
-  id: LoadoutNCR50
+  id: LoadoutNCRuniformBlack
   category: Roles
-  cost: 2
+  cost: 1
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
       jobs:
         - NCRRangerVeteran
   items:
-    - MagazineBox50
-    - MagazineBox50
+    - N14ClothingUniformRangerVeteranBlack
 
 - type: loadout
-  id: LoadoutNCRuniformModif
+  id: LoadoutNCRuniformRed
   category: Roles
   cost: 1
   exclusive: true
@@ -343,40 +239,40 @@
       jobs:
         - NCRRangerVeteran
   items:
-    - N14ClothingUniformRangerModif
+    - N14ClothingUniformRangerVeteranRed
 
 - type: loadout
-  id: LoadoutNCRuniformBlue
+  id: LoadoutNCRuniformHelmetDesert
   category: Roles
-  cost: 1
+  cost: 2
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
       jobs:
         - NCRRangerVeteran
   items:
-    - N14ClothingUniformRangerBlue
+    - N14ClothingHeadHatRangerHelmetDesert
 
 - type: loadout
-  id: LoadoutNCRuniformBlack
+  id: LoadoutNCRuniformMaskDesert
   category: Roles
-  cost: 1
+  cost: 2
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
       jobs:
         - NCRRangerVeteran
   items:
-    - N14ClothingUniformRangerVeteranBlack
+    - ClothingMaskGasRangerDesert
 
 - type: loadout
-  id: LoadoutNCRuniformRed
+  id: LoadoutNCRuniformCombatDesert 
   category: Roles
-  cost: 1
+  cost: 2
   exclusive: true
   requirements:
     - !type:CharacterJobRequirement
       jobs:
         - NCRRangerVeteran
   items:
-    - N14ClothingUniformRangerVeteranRed
+    - N14ClothingOuterRangerCombatDesert