First attempt at pushing Washington changes, adding Loadouts, changin…

…g textures, adding some outer clothing options (#668)

Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl

@@ -145,14 +145,15 @@ undecided-loadout-category-bos-default-name = Brotherhood Basic Issue Kit
 undecided-loadout-category-bos-default-description =
     A crate containing everything a member of Brotherhood might need.
         For soldiers and laser lovers alike.
-    Includes 1 laser rifle, 1 laser pistol, 3 MF cells, 2 energy cells, 1 stimpak, C ration MRE
+    Includes 1 AER-9 laser rifle, 1 laser pistol, 3 MF cells, 2 energy cells, 1 stimpak, C ration MRE
 
 undecided-loadout-category-bos-carbine-name = Brotherhood Carbine Issue Kit
 undecided-loadout-category-bos-carbine-description =
     A crate containing everything a member of Brotherhood might need.
         For your ballistic needs.
     Includes 1 pre-war carbine rifle, 1 laser pistol, 3 carbine 556 magazines,
      2 energy cells, 1 stimpak, 1 C ration MRE
+
 undecided-loadout-category-bos-laser-name = Brotherhood Laser Issue Kit
 undecided-loadout-category-bos-laser-description =
     A crate containing everything a member of the Brotherhood might need
@@ -171,7 +172,7 @@ undecided-loadout-category-bos-scribe-field-name = Brotherhood Scribe Field Kit
 undecided-loadout-category-bos-scribe-field-description =
     A crate containing everything a member of Brotherhood scribes.
         For supporting your unit from the back.
-    Includes 1 varmint rifle, 1 5.56 ammo box, 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
+    Includes 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
      1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE
 
 undecided-loadout-category-bos-scribe-engineer-name = Brotherhood Scribe Engineer Kit
@@ -202,3 +203,57 @@ undecided-loadout-category-bos-ballistics-description =
     Includes 1 assault rifle, 3 5.56 magazines, 1 12.7mm pistol,
      2 12.7mm pistol magazines, 5.56 ammo box, 1 stimpak, 1 C ration MRE
 
+undecided-loadout-category-bos-washington-default-name = Brotherhood Basic Issue Kit
+undecided-loadout-category-bos-washington-default-description =
+    A crate containing everything a member of Brotherhood might need.
+        For soldiers and laser lovers alike.
+    Includes 1 1 plasma rifle, 1 laser pistol, 3 MF cells, 2 energy cells, 1 stimpak, C ration MRE
+
+undecided-loadout-category-bos-washington-carbine-name = Brotherhood Carbine Issue Kit
+undecided-loadout-category-bos-washington-carbine-description =
+    A crate containing everything a member of Brotherhood might need.
+        For your ballistic needs.
+    Includes 1 pre-war carbine rifle, 10mm pistol, 3 carbine 556 magazines,
+     2 10mm pistol magazines, 1 stimpak, 1 C ration MRE
+
+undecided-loadout-category-bos-washington-plasma-name = Brotherhood Plasma Issue Kit
+undecided-loadout-category-bos-washington-plasma-description =
+    A crate containing everything a member of the Brotherhood might need
+        too lay down some laser and lead.
+    Includes 1 modified plasma rifle, 1 10mm pistol, 3 plasma cartridges,
+     2 10mm pistol magazines, 1 stimpak, 1 C ration MRE
+
+undecided-loadout-category-bos-washington-scribe-medic-name = Brotherhood Scribe Medical Kit
+undecided-loadout-category-bos-washington-scribe-medic-description =
+    A crate containing everything a member of Brotherhood scribes.
+        For keeping the fighting forces alive.
+    Includes 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
+     1 bullet wound kit, 1 medical scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE
+
+undecided-loadout-category-bos-washington-scribe-field-name = Brotherhood Scribe Field Kit
+undecided-loadout-category-bos-washington-scribe-field-description =
+    A crate containing everything a member of Brotherhood scribes.
+        For supporting your unit from the back.
+    Includes 1 AEP-7 pistol, 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
+     1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE
+
+undecided-loadout-category-bos-washington-scribe-engineer-name = Brotherhood Scribe Engineer Kit
+undecided-loadout-category-bos-washington-scribe-engineer-description =
+    A crate containing everything a member of Brotherhood scribes.
+        For upkeeping the base and tinkering alike.
+    Includes 1 AEP-7 laser pistol, 2 energy cells, 1 utility belt,
+     1 engineer scribe clothing, 1 fire-axe, 1 stimpak, 1 C ration MRE
+
+undecided-loadout-category-bos-washington-ranged-name = Brotherhood Marksman Paladin Kit
+undecided-loadout-category-bos-washington-ranged-description =
+    A crate containing everything a paladin of Brotherhood might need.
+        For open range fights.
+    Includes 1 wattz 2000 rifle, 1 laser pistol, 3 H-MF cells, 2 energy cells,
+     1 stimpak, 1 C ration MRE
+
+undecided-loadout-category-bos-washington-ballistics-name = Brotherhood Assault Paladin Kit
+undecided-loadout-category-bos-washington-ballistics-description =
+    A crate containing everything a paladin of Brotherhood might need.
+        For his insane need of bullets downrange.
+    Includes 1 assault rifle, 3 5.56 magazines, 1 10mm pistol,
+     2 10mm pistol magazines, 5.56 ammo box, 1 stimpak, 1 C ration MRE

Resources/Prototypes/Maps/N14/sunnyvale.yml

@@ -46,11 +46,11 @@
             CaravanLeader: [ 1, 1 ]
             CaravanTrader: [ 1, 1 ]
             CaravanGuard: [ 2, 2 ]
-            # BoSWashingtonCommander: [ 1, 0 ]
-            # BoSWashingtonPaladin: [ 1, 0 ]
-            # BoSWashingtonScribe: [ 2, 0 ]
-            # BoSWashingtonKnight: [ 2, 2 ]
-            # BoSWashingtonInitiate: [ 0, 2 ]
+            BoSWashingtonCommander: [ 1, 0 ]
+            BoSWashingtonPaladin: [ 1, 0 ]
+            BoSWashingtonScribe: [ 2, 0 ]
+            BoSWashingtonKnight: [ 2, 2 ]
+            BoSWashingtonInitiate: [ 0, 2 ]
             BoSMidPaladinCommander: [ 1, 1 ]
             BoSMidPaladin: [ 1, 1 ]
             BoSMidKnight: [ 2, 3 ]

Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml

@@ -457,6 +457,22 @@
   - type: ClothingSpecialModifier
     intelligenceModifier: 1
 
+# Washington BoS
+
+- type: entity
+  parent: N14ClothingHeadHatBaseHelmetMK2
+  id: N14ClothingHeadHatBrotherhoodHelmetMK3
+  name: BoS helmet MK3
+  description: A helmet continuosly upgraded by the Washington Brotherhood, any pre-war components barely remaining.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/brotherhoodhelmetmk3.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Head/FalloutHelmets/brotherhoodhelmetmk3.rsi
+  - type: Tag
+    tags:
+    - HidesHair
+
 # Canadian mounties
 - type: entity
   parent: N14ClothingHeadHatBaseHelmetMK2

Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml

@@ -550,6 +550,24 @@
   - type: Clothing
     sprite: _Nuclear14/Clothing/OuterClothing/Coats/washington_bos_elder.rsi
 
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: N14ClothingOuterBrotherhoodMedicalScribeRobes
+  name: Washington Brotherhood medical Scribe coat
+  description: A finely made robe affixed with leather worn by medical Scribes, a symbol of the Brotherhood emblazoned across the chest and back.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/OuterClothing/Coats/brotherhoodmedicalscribe.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/OuterClothing/Coats/brotherhoodscribe.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.80
+        Slash: 0.85
+        Piercing: 0.70
+        Heat: 0.70
+
 #MARK: Tribal
 - type: entity
   parent: ClothingOuterStorageBase

Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml

@@ -897,6 +897,27 @@
         Piercing: 0.8
         Heat: 0.6
 
+- type: entity
+  parent: N14ClothingOuterCombatArmorMK2
+  id: N14ClothingOuterCombatArmorMK3
+  name: brotherhood combat armor mk3
+  description: Meticulously worked on by the Washington Scribes, its near unrecognisable from its original state.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutbosmk3armor.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutbosmk3armor.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.65
+        Slash: 0.65
+        Piercing: 0.5
+        Heat: 0.5
+  - type: ExplosionResistance
+    damageCoefficient: 0.7
+
+
 #MARK: midwest BoS
 
 - type: entity

Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml

@@ -553,6 +553,17 @@
 
 #washington BoS
 
+- type: entity
+  parent: ClothingUniformBase
+  id: N14ClothingUniformJumpsuitBOSWashingtonFieldScribe
+  name: MidWest brotherhood scribe uniform
+  description: A maroon jumper and black combat trousers, the uniform worn by field-scribes of Washington's Brotherhood of Steel.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/Brotherhood/bosfieldscribe.rsi
+  - type: Clothing
+    sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/Brotherhood/bosfieldscribe.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: N14ClothingUniformJumpsuitBOSRed

Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml

@@ -170,6 +170,27 @@
       - key: enum.UndecidedLoadoutBackpackUIKey.Key
         type: UndecidedLoadoutBackpackBoundUserInterface
 
+- type: entity
+  id: NCRBoSWashingtonkits
+  name: Undecided Washington BoS Kit
+  description: Please only take one.
+  parent: BaseItem
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Misc/kits.rsi
+    state: rifleman
+  - type: UndecidedLoadoutBackpack
+    transformAfterSelect: AlwaysPoweredWallLight
+    possibleSets:
+    - BoSWashingtonDefaultSet
+    - BoSWashingtonCarbineSet
+  - type: ActivatableUI
+    key: enum.UndecidedLoadoutBackpackUIKey.Key
+  - type: UserInterface
+    interfaces:
+      - key: enum.UndecidedLoadoutBackpackUIKey.Key
+        type: UndecidedLoadoutBackpackBoundUserInterface
+
 #MARK: Scribes
 - type: entity
   id: NCRBoSMidwestScribekits
@@ -193,6 +214,28 @@
       - key: enum.UndecidedLoadoutBackpackUIKey.Key
         type: UndecidedLoadoutBackpackBoundUserInterface
 
+- type: entity
+  id: NCRBoSWashingtonScribekits
+  name: Undecided BoS Scribe Washington Kit
+  description: Please only take one.
+  parent: BaseItem
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Misc/kits.rsi
+    state: rifleman
+  - type: UndecidedLoadoutBackpack
+    transformAfterSelect: AlwaysPoweredWallLight
+    possibleSets:
+    - BoSWashingtonScribeMedicalSet
+    - BoSWashingtonScribeFieldSet
+    - BoSWashingtonScribeEngineerSet
+  - type: ActivatableUI
+    key: enum.UndecidedLoadoutBackpackUIKey.Key
+  - type: UserInterface
+    interfaces:
+      - key: enum.UndecidedLoadoutBackpackUIKey.Key
+        type: UndecidedLoadoutBackpackBoundUserInterface
+
 #MARK: Paladins
 - type: entity
   id: NCRBoSMidwestPaladinkits
@@ -218,6 +261,29 @@
       - key: enum.UndecidedLoadoutBackpackUIKey.Key
         type: UndecidedLoadoutBackpackBoundUserInterface
 
+- type: entity
+  id: NCRBoSWashingtonPaladinkits
+  name: Undecided BoS Paladin Washington Kit
+  description: Please only take one.
+  parent: BaseItem
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Misc/kits.rsi
+    state: rifleman
+  - type: UndecidedLoadoutBackpack
+    transformAfterSelect: AlwaysPoweredWallLight
+    possibleSets:
+    - BoSWashingtonDefaultSet
+    - BoSWashingtonRangedSet
+    - BoSWashingtonPlasmaSet
+    - BoSWashingtonAssaultSet
+  - type: ActivatableUI
+    key: enum.UndecidedLoadoutBackpackUIKey.Key
+  - type: UserInterface
+    interfaces:
+      - key: enum.UndecidedLoadoutBackpackUIKey.Key
+        type: UndecidedLoadoutBackpackBoundUserInterface
+
 #MARK: Trooper Kits
 
 - type: UndecidedLoadoutBackpackSet
@@ -542,3 +608,95 @@
     state: rifleman
   content:
   - KitAssaultBoSMidwest
+
+#MARK: WBoS Kits
+#default
+- type: UndecidedLoadoutBackpackSet
+  id: BoSWashingtonDefaultSet
+  name: undecided-loadout-category-bos-washington-default-name
+  description: undecided-loadout-category-bos-washington-default-description
+  sprite:
+    sprite: _Nuclear14/Objects/Misc/kits.rsi
+    state: rifleman
+  content:
+  - KitDefaultBoSWashington
+
+#carbine
+- type: UndecidedLoadoutBackpackSet
+  id: BoSWashingtonCarbineSet
+  name: undecided-loadout-category-bos-washington-carbine-name
+  description: undecided-loadout-category-bos-washington-carbine-description
+  sprite:
+    sprite: _Nuclear14/Objects/Misc/kits.rsi
+    state: marksman
+  content:
+  - KitCarbineBoSWashington
+
+#MARK: WBoS Scribes
+#medic
+- type: UndecidedLoadoutBackpackSet
+  id: BoSWashingtonScribeMedicalSet
+  name: undecided-loadout-category-bos-washington-scribe-medic-name
+  description: undecided-loadout-category-bos-washington-cribe-medic-description
+  sprite:
+    sprite: _Nuclear14/Objects/Misc/kits.rsi
+    state: medic
+  content:
+  - KitScribeMedicBoSWashington
+
+#field scribe
+- type: UndecidedLoadoutBackpackSet
+  id: BoSWashingtonScribeFieldSet
+  name: undecided-loadout-category-bos-washington-scribe-field-name
+  description: undecided-loadout-category-bos-washington-scribe-field-description
+  sprite:
+    sprite: _Nuclear14/Objects/Misc/kits.rsi
+    state: rifleman
+  content:
+  - KitScribeFieldBoSWashington
+
+#engineer
+- type: UndecidedLoadoutBackpackSet
+  id: BoSWashingtonScribeEngineerSet
+  name: undecided-loadout-category-bos-washington-scribe-engineer-name
+  description: undecided-loadout-category-bos-washington-scribe-engineer-description
+  sprite:
+    sprite: _Nuclear14/Objects/Misc/kits.rsi
+    state: rifleman
+  content:
+  - KitScribeEngineerBoSWashington
+
+#MARK: WBoS Commander Special
+
+#PlasmaRifle
+- type: UndecidedLoadoutBackpackSet
+  id: BoSWashingtonPlasmaSet
+  name: undecided-loadout-category-bos-washington-plasma-name
+  description: undecided-loadout-category-washington-bos-plasma-description
+  sprite:
+    sprite: _Nuclear14/Objects/Misc/kits.rsi
+    state: rifleman
+  content:
+  - KitPlasmaBoSWashington
+
+#AssaultRifle
+- type: UndecidedLoadoutBackpackSet
+  id: BoSWashingtonAssaultSet
+  name: undecided-loadout-category-bos-washington-ballistics-name
+  description: undecided-loadout-category-bos-washington-ballistics-description
+  sprite:
+    sprite: _Nuclear14/Objects/Misc/kits.rsi
+    state: rifleman
+  content:
+  - KitAssaultBoSWashington
+
+#ranged-wattz
+- type: UndecidedLoadoutBackpackSet
+  id: BoSWashingtonRangedSet
+  name: undecided-loadout-category-bos-washington-ranged-name
+  description: undecided-loadout-category-bos-washington-ranged-description
+  sprite:
+    sprite: _Nuclear14/Objects/Misc/kits.rsi
+    state: marksman
+  content:
+  - KitMarksmanBoSWashington