Townies, Guides & Grief (#745)

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

@@ -4,23 +4,6 @@ guide-entry-nuclear14 = Nuclear 14
 # Factions
 guide-entry-factions = Factions & Roles
 
-guide-entry-brotherhoodofsteel = Brotherhood of Steel (BOS)
-guide-entry-brotherhoodmidwest = BOS Midwest Chapter
-guide-entry-brotherhoodwashington = BOS Washington Chapter
-
-guide-entry-caravancompany = Caravan Company
-guide-entry-ncr = NCR
-guide-entry-townsfolk = Townsfolk
-guide-entry-tribes = Tribes
-guide-entry-vaultdwellers = Vault Dwellers
-guide-entry-wastelanders = Wastelanders
-
-guide-entry-minorfactions = Minor Factions
-guide-entry-childrenofatom = Children of Atom
-guide-entry-enclave = Enclave
-guide-entry-followersoftheapocalypse = Followers of the Apocalypse
-guide-entry-zetan = Zetan
-
 # Weapons and Ammo
 guide-entry-weaponsammo = Weapons & Ammo
 guide-entry-rangedweapons = Ranged Weapons

Resources/Locale/en-US/_Nuclear14/job-names.ftl

@@ -1,26 +1,26 @@
 # Midwest Brotherhood
 job-name-bos-mid-paladin-comm = Midwest BoS Paladin Commander
-job-description-bos-mid-paladin-comm = Lead the Midwest Brotherhood of Steel on their mission.
+job-description-bos-mid-paladin-comm = Lead the Midwestern Brotherhood of Steel on their mission.
 job-name-bos-mid-paladin = Midwest BoS Paladin
-job-description-bos-mid-paladin = Follow the Paladin Commander on their mission.
+job-description-bos-mid-paladin = Assist the Paladin Commander as their second in command & heavy infantry.
 job-name-bos-mid-knight = Midwest BoS Knight
-job-description-bos-mid-knight = Follow the Paladin Commander on their mission.
+job-description-bos-mid-knight = Follow the Paladins on their mission for the chapter.
 job-name-bos-mid-scribe = Midwest BoS Scribe
-job-description-bos-mid-scribe = Conduct scientific missions and research for your brotherhood chapter.
+job-description-bos-mid-scribe = Conduct scientific missions and research for your chapter.
 job-name-bos-mid-squire = Midwest BoS Squire
-job-description-bos-mid-squire = Follow your Knight into battle and do their bidding.
+job-description-bos-mid-squire = Follow the orders of your superiors and prove your worth.
 
 # Washington Brotherhood
 job-name-bos-washington-commander = Washington BoS Paladin Commander
-job-description-bos-washington-commander = Lead the Washington Brotherhood of Steel to glory in their mission.
+job-description-bos-washington-commander = Lead the Washington Brotherhood of Steel on their mission.
 job-name-bos-washington-initiate = Washington BoS Initiate
-job-description-bos-washington-initiate = Prove yourself to your chapter to progress through the ranks.
+job-description-bos-washington-initiate = Follow the orders of your superiors and prove your worth.
 job-name-bos-washington-knight = Washington BoS Knight
-job-description-bos-washington-knight = The military arm of the Brotherhood. Defend your chapter in their objectives and manufacture equipment.
+job-description-bos-washington-knight = Follow the Paladins on their mission for the chapter.
 job-name-bos-washington-paladin = Washington BoS Paladin
-job-description-bos-washington-paladin = Protect the Brotherhood at all costs. Take the Commanders will out into the wasteland.
+job-description-bos-washington-paladin = Assist the Paladin Commander as their second in command & heavy infantry.
 job-name-bos-washington-scribe = Washington BoS Scribe
-job-description-bos-washington-scribe = Conduct scientific missions and research for your brotherhood chapter.
+job-description-bos-washington-scribe = Conduct scientific missions and research for your chapter.
 
 # Caravan
 job-name-caravan-leader = Caravan Leader
@@ -36,19 +36,19 @@ job-description-ncr-cadet = Show your officers that youre ready to become a priv
 job-name-ncr-medic = NCR Medic
 job-description-ncr-medic = Treat the troopers and offer services to the wasteland people.
 job-name-ncr-sgt = NCR Sergeant
-job-description-ncr-sgt = A non commissioned officer in the NCR military. Lead a squad to protect the NCRs interests in the region. In the absence of a lieutenant, lead the base.
+job-description-ncr-sgt = A non-commissioned officer in the NCR military. Lead a squad to protect the NCRs interests in the region.
 job-name-ncr-lt = NCR Lieutenant
 job-description-ncr-lt = The local leader of the NCR military. Fulfil your missions by coordinating your military forces in the area. Organise your Sergeants.
 job-name-ncr-soldier = NCR Soldier
-job-description-ncr-soldier = The backbone of any military. Soldiers get stuff done and follow a SGT on missions.
+job-description-ncr-soldier = The backbone of any military. Soldiers get stuff done and follow a Sergeant on missions.
 job-name-ncr-engineer = NCR Engineer
-job-description-ncr-soldier = The backbone of any squad. Repair equipment, establish defenses, and follow a SGT on missions.
+job-description-ncr-soldier = The backbone of any squad. Repair equipment, establish defenses, and follow a Sergeant on missions.
 job-name-ncr-ws = NCR Weapon Specalist
-job-description-ncr-ws = The fire support of any squad. Lay down supportive fire and use special weapons inaccessible to others. Follow a SGT on missions.
+job-description-ncr-ws = The fire support of any squad. Lay down supportive fire, and follow a Sergeant on missions.
 job-name-ncr-ranger = NCR Ranger
-job-description-ncr-ranger = The most experienced and robust soldiers form part of this elite group of the NCR army, lead troops or act by yourself under the orders of the republic.
+job-description-ncr-ranger = The most experienced and robust soldiers form part of this elite group of the NCR Army, lead troops or act by yourself under the orders of the Republic.
 job-name-ncr-ranger-veteran = NCR Ranger Veteran
-job-description-ncr-ranger-veteran = The most experienced and robust soldiers form part of this elite group of the NCR army, lead troops or act by yourself under the orders of the republic.
+job-description-ncr-ranger-veteran = The most experienced and robust soldiers form part of this elite group of the NCR Army, lead troops or act by yourself under the orders of the Republic.
 
 # Rangers
 job-name-ranger-recruit = Desert Ranger Recruit
@@ -62,7 +62,7 @@ job-description-ranger-veteran = You answer to yourself, working either independ
 
 # Tribal
 job-name-tribal = Tribesperson
-job-description-tribal = Maintain your tribes way of life in the wasteland at all costs. Security, crafting, wellbeing, homelife, you do it all.
+job-description-tribal = Maintain your tribes way of life in the wasteland at all costs. Security, crafting, homelife, you do it all.
 job-name-tribal-elder = Tribe Elder
 job-description-tribal-elder = Lead your tribe through good times and bad times and maintain your beliefs.
 job-name-tribal-farmer = Tribal Farmer
@@ -74,7 +74,7 @@ job-description-tribal-healer = Produce medicines and compounds for the tribe, a
 job-name-overseer = Vault Overseer
 job-description-overseer = Follow Vault Tec's objectives in managing your Vault and ensure everything goes to plan...
 job-name-vault-doctor = Vault Doctor
-job-description-vault-doctor = Maintain the health and wellbeing of your fellow Vault Dwellers. Conduct research where necessary.
+job-description-vault-doctor = Maintain the health and well-being of your fellow Vault Dwellers. Conduct research where necessary.
 job-name-vault-dweller = Vault Dweller
 job-description-vault-dweller = The general populous of the Vault. Live a comfortable life and pull your own weight where necessary.
 job-name-vault-engineer = Vault Engineer
@@ -85,8 +85,10 @@ job-description-vault-security = Keep order within the Vault and report to the O
 # Wasteland
 job-name-farmer = Farmer
 job-description-farmer = Produce crops in the wasteland for yourself or to barter with others.
+job-name-waste-musician = Musician
+job-description-waste-musician = This role is going to be removed from the game, please set your preference to "NEVER" on all your characters!
 job-name-scavenger = Scavenger
-job-description-scavenger = Scavenge the ruins of the wastes for pre-war treasures and supplies to trade.
+job-description-scavenger = This role is going to be removed from the game, please set your preference to "NEVER" on all your characters!
 job-name-wastelander = Wastelander
 job-description-wastelander = Survive in the wasteland and carve out your own path. It's tough out there alone, consider finding others.
 
@@ -105,6 +107,10 @@ job-name-townsheriff = Town Sheriff
 job-description-townsheriff = Maintain law and order within the town and support the Mayor in their rule.
 job-name-townmayor = Town Mayor
 job-description-townmayor = Maintain civilisation in the town. Set taxes and laws and try not to be thrown out or taken over.
+job-name-townreporter = Town Reporter
+job-description-townreporter = Interview people and spread the news across the region, or just have a talk show!
+job-name-townbartender = Town Innkeeper
+job-description-townbartender = Manage the local bar, kitchen and rooms that are there for renting. Run a business in town!
 
 # Followers
 job-name-followers = Followers of the Apocalypse

Resources/Locale/en-US/_Nuclear14/job-supervisors.ftl

@@ -1,18 +1,23 @@
-job-supervisors-bos-mid = the midwest brotherhood knight commander
-job-supervisors-bos-washington-commander = lead your faction to victory!
-job-supervisors-bos-washington = follow your elder to victory!
-job-supervisors-bos-washington-initiate = follow orders from all other roles within the chapter
+job-supervisors-bos-mid-initiate = anyone in the Midwestern chapter
+job-supervisors-bos-mid-knight = the Paladins of the Midwestern chapter
+job-supervisors-bos-mid = your bunker's commanding officer
+job-supervisors-bos-mid-commander = no one, but the Elder Council & your sense of duty
+job-supervisors-bos-wash-initiate = anyone in the Washington chapter
+job-supervisors-bos-wash-knight = the Paladins of the Washington chapter
+job-supervisors-bos-wash = your bunker's commanding officer
+job-supervisors-bos-wash-commander = no one, but the Elder & your sense of duty
 job-supervisors-caravan = the caravan leader
-job-supervisors-caravan-leader = lead your caravan company to riches through trade
-job-supervisors-ncr = the NCR officer
-job-supervisors-ncr-nco = the NCR officer followed by the NCO
-job-supervisors-ncr-captain = the NCR Captain
-job-supervisors-ranger = the ranger
-job-supervisors-veteran-ranger = the veteran ranger
-job-supervisors-chief-ranger = the chief ranger
-job-supervisors-tribal = the tribe elder
-job-supervisors-tribal-elder = lead your tribe to health and prosperity
-job-supervisors-overseer = the vaults overseer
-job-supervisors-vault-overseer = lead your vault to prosperity and maintain the status quo
-job-supervisors-wastelander = look after yourself above all else
-job-supervisors-townsfolk = the town mayor
+job-supervisors-caravan-leader = your greed & Blue Line Co. leadership
+job-supervisors-ncr = the Sergeant of the NCR Army
+job-supervisors-ncr-sgt = the Lieutenant of the NCR Army
+job-supervisors-ncr-lt = your mission & NCR laws
+job-supervisors-ncr-ranger = your morale code & NCR laws
+job-supervisors-tribal = the Tribe elder
+job-supervisors-tribal-elder = your best judgement
+job-supervisors-vault = the Overseer
+job-supervisors-vault-overseer = your morale code
+job-supervisors-wastelander = yourself and you alone
+job-supervisors-townsfolk = the Mayor of the town
+job-supervisors-townsfolk-deputy = the local Sheriff
+job-supervisors-townsfolk-sheriff = the Mayor and/or your sense of justice
+job-supervisors-townsfolk-mayor = the people who you represent or your own ambitions

Resources/Prototypes/Maps/N14/sunnyvale.yml

@@ -17,12 +17,12 @@
             - Wastelander
           availableJobs:
             Wastelander: [ -1, -1 ]
-            WastelandScavenger: [ 3, 5 ]
-            WastelandReporter: [ 2, 3 ]
-            WastelandMusician: [ 2, 3 ]
-            WastelandFarmer: [ 2, 4 ]
-            WastelandChaplain: [ 2, 3 ]
-            WastelandBartender: [ 2, 3 ]
+            # WastelandScavenger: [ 3, 5 ]
+            WastelandReporter: [ 1, 2 ]
+            # WastelandMusician: [ 2, 3 ]
+            WastelandFarmer: [ 2, 3 ]
+            WastelandChaplain: [ 1, 2 ]
+            WastelandBartender: [ 1, 2 ]
             TribalElder: [ 1, 1 ]
             Tribal: [ 2, 4 ]
             TribalFarmer: [ 1, 2 ]

Resources/Prototypes/_Nuclear14/Access/miscfactions.yml

@@ -18,7 +18,15 @@
 
 - type: accessLevel
   id: TownieMechanic
-  name: id-card-access-level-townie-mechanic
+  name: id-card-access-level-townie-mechanic  
+
+- type: accessLevel
+  id: WastelandBartender
+  name: id-card-access-level-townie-bartender  
+
+- type: accessLevel
+  id: WastelandReporter
+  name: id-card-access-level-townie-reporter
 
 - type: accessGroup
   id: Townie
@@ -28,6 +36,18 @@
   - TownieShopkeeper
   - TownieDoctor
   - TownieMechanic
+  - WastelandBartender
+  - WastelandReporter
+
+# Wastelander
+
+- type: accessLevel
+  id: WastelandChaplain
+  name: id-card-access-level-waste-chaplain  
+
+- type: accessLevel
+  id: WastelandFarmer
+  name: id-card-access-level-waste-farmer
 
 #MARK: Followers
 

Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/raiders_ranged.yml

@@ -177,7 +177,7 @@
         state: inhand-right
 
 - type: entity
-  name: Psycho Raider Skrimisher
+  name: Psycho Raider Skirmisher
   parent: N14MobRaiderPsychoRanged
   id: N14MobRaiderSkrimisher
   description: Psychopatic raider armed with a scattergun. Deadly at close range.

Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/identification.yml

@@ -500,6 +500,34 @@
   - type: ClothingAddFaction
     faction: Townsfolk
 
+- type: entity
+  parent: N14IDPassportTownsfolk
+  id: N14IDReporterTown
+  name: reporter ID
+  description: A passport ID used by a town reporter.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Misc/identification.rsi
+    state: passport_presidential
+  - type: PresetIdCard
+    job: WastelandReporter
+  - type: ClothingAddFaction
+    faction: Townsfolk
+
+- type: entity
+  parent: N14IDPassportTownsfolk
+  id: N14IDBartenderTown
+  name: innkeeper ID
+  description: A passport ID used by a town inkeeper.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Misc/identification.rsi
+    state: passport_presidential
+  - type: PresetIdCard
+    job: WastelandBartender
+  - type: ClothingAddFaction
+    faction: Townsfolk
+
 - type: entity
   parent: N14IDPassportTownsfolk
   id: N14IDBadgeTownDeputy
@@ -536,6 +564,31 @@
   - type: PresetIdCard
     job: TownMayor
 
+# Wastelanders
+- type: entity
+  parent: N14IDPassportPhoto
+  id: N14IDPassportWasteChaplain
+  name: chaplain ID
+  description: A passport ID used by a chaplain of the region.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Misc/identification.rsi
+    state: passport
+  - type: PresetIdCard
+    job: WastelandChaplain
+
+- type: entity
+  parent: N14IDPassportPhoto
+  id: N14IDPassportWasteFarmer
+  name: farmer ID
+  description: A passport ID used by a farmer of the region.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Misc/identification.rsi
+    state: passport
+  - type: PresetIdCard
+    job: WastelandFarmer
+
 #MARK: Raiders / Tribes
 - type: entity
   parent: N14IDPassportBlank

Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access.yml

@@ -333,6 +333,48 @@
   - type: Wires
     layoutId: AirlockService
 
+- type: entity
+  parent: N14DoorWoodSecure
+  id: N14DoorWoodSecureLockedBartender
+  suffix: Townie, Locked, Bartender
+  components:
+  - type: AccessReader
+    access: [["WastelandBartender"]]
+  - type: Wires
+    layoutId: AirlockService
+
+- type: entity
+  parent: N14DoorWoodSecure
+  id: N14DoorWoodSecureLockedReporter
+  suffix: Townie, Locked, Reporter
+  components:
+  - type: AccessReader
+    access: [["WastelandReporter"]]
+  - type: Wires
+    layoutId: AirlockService
+
+# Wastelander
+
+- type: entity
+  parent: N14DoorWoodSecure
+  id: N14DoorWoodSecureLockedChaplain
+  suffix: Locked, Chaplain
+  components:
+  - type: AccessReader
+    access: [["WastelandChaplain"]]
+  - type: Wires
+    layoutId: AirlockService
+
+- type: entity
+  parent: N14DoorWoodSecure
+  id: N14DoorWoodSecureLockedFarmer
+  suffix: Locked, Farmer
+  components:
+  - type: AccessReader
+    access: [["WastelandFarmer"]]
+  - type: Wires
+    layoutId: AirlockService
+
 #MARK: Vault
 - type: entity
   parent: N14DoorBunker