From 140b26ec299db7f2bb59aa72b4ebfc410958ea11 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Thu, 14 Dec 2023 00:30:20 +0000 Subject: [PATCH] Townsfolk & Followers of the Apocalypse (#142) * start of townsfolk, zetan and followers factions * more faction stuff --- .../Locale/en-US/Nuclear14/department.ftl | 23 ++++ .../Locale/en-US/Nuclear14/job-names.ftl | 50 +++++++++ .../en-US/Nuclear14/job-supervisors.ftl | 14 +++ Resources/Locale/en-US/job/department.ftl | 13 +-- Resources/Locale/en-US/job/job-names.ftl | 33 +----- .../Locale/en-US/job/job-supervisors.ftl | 15 +-- .../Nuclear14/Catalog/Fills/Items/belt.yml | 2 +- .../Entities/Objects/Misc/identification.yml | 21 +++- .../Nuclear14/Markers/Spawners/jobs.yml | 104 ++++++++++++++++++ .../Nuclear14/Roles/Jobs/Fun/followers.yml | 21 ++++ .../Nuclear14/Roles/Jobs/Fun/zetan.yml | 18 +++ .../Roles/Jobs/Townsfolk/Towndoctor.yml | 20 ++++ .../Roles/Jobs/Townsfolk/Townmechanic.yml | 20 ++++ .../Roles/Jobs/Townsfolk/Townshopkeeper.yml | 19 ++++ .../Roles/Jobs/Townsfolk/Townsperson.yml | 19 ++++ .../Roles/Jobs/Townsfolk/towndeputy.yml | 22 ++++ .../Roles/Jobs/Townsfolk/townmayor.yml | 20 ++++ .../Roles/Jobs/Townsfolk/townsheriff.yml | 22 ++++ .../Nuclear14/Roles/Jobs/factions.yml | 27 +++++ .../Nuclear14/Roles/playtime_trackers.yml | 38 ++++++- 20 files changed, 460 insertions(+), 61 deletions(-) create mode 100644 Resources/Locale/en-US/Nuclear14/department.ftl create mode 100644 Resources/Locale/en-US/Nuclear14/job-names.ftl create mode 100644 Resources/Locale/en-US/Nuclear14/job-supervisors.ftl create mode 100644 Resources/Prototypes/Nuclear14/Roles/Jobs/Fun/followers.yml create mode 100644 Resources/Prototypes/Nuclear14/Roles/Jobs/Fun/zetan.yml create mode 100644 Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Towndoctor.yml create mode 100644 Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml create mode 100644 Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml create mode 100644 Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townsperson.yml create mode 100644 Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml create mode 100644 Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml create mode 100644 Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml diff --git a/Resources/Locale/en-US/Nuclear14/department.ftl b/Resources/Locale/en-US/Nuclear14/department.ftl new file mode 100644 index 00000000000..8a47914aaa7 --- /dev/null +++ b/Resources/Locale/en-US/Nuclear14/department.ftl @@ -0,0 +1,23 @@ +# Names +department-BrotherhoodMidwest = Midwest Brotherhood of Steel +department-BrotherhoodWashington = Washington Brotherhood of Steel +department-CaravanCompany = Caravan Company +department-NCR = New California Republic +department-Tribe = Tribal +department-Vault = Vault Dwellers +department-Wastelander = Wastelander +department-Townsfolk = Townsfolk +department-Followers = Followers of the Apocalypse +department-Zetan = Zetan + +# Descriptions +department-BrotherhoodMidwest-description = Midwest branch of the Brotherhood of Steel +department-BrotherhoodWashington-description = Washington branch of the Brotherhood of Steel +department-CaravanCompany-description = The local Caravan Company responsible for import and export of goods. +department-NCR-description = A settler detachment sent by the New California Republic +department-Tribe-description = A local tribal group trying to get by. +department-Vault-description = The local Vault Dwellers +department-Wastelander-description = Wastelanders living in the pacific northwest. +department-Townsfolk-description = Townsfolk from a local town trying to keep it civilised. +department-Followers-description = Followers of the Apocalypse on a humanitarian mission. +department-Zetan-description = Zetan abductors here to probe you! \ No newline at end of file diff --git a/Resources/Locale/en-US/Nuclear14/job-names.ftl b/Resources/Locale/en-US/Nuclear14/job-names.ftl new file mode 100644 index 00000000000..8173e67c207 --- /dev/null +++ b/Resources/Locale/en-US/Nuclear14/job-names.ftl @@ -0,0 +1,50 @@ +# N14 +job-name-bos-mid-knight-comm = Midwest Brotherhood Knight Commander +job-name-bos-mid-scribe = Midwest Brotherhood Scribe + +job-name-bos-washington-elder = Washington Brotherhood Elder +job-name-bos-washington-initiate = Washington Brotherhood Initiate +job-name-bos-washington-knight = Washington Brotherhood Knight +job-name-bos-washington-paladin = Washington Brotherhood Paladin +job-name-bos-washington-scribe = Washington Brotherhood Scribe + +job-name-caravan-leader = Caravan Leader +job-name-caravan-trader = Caravan Trader + +job-name-ncr-cadet = NCR Cadet +job-name-ncr-nco = NCR NCO +job-name-ncr-officer = NCR Officer +job-name-ncr-soldier = NCR Soldier + +job-name-tribal = Tribesperson +job-name-tribal-elder = Tribe Elder +job-name-tribal-farmer = Tribal Farmer +job-name-tribal-healer = Tribal Healer + +job-name-overseer = Vault Overseer +job-name-vault-doctor = Vault Doctor +job-name-vault-dweller = Vault Dweller +job-name-vault-engineer = Vault Engineer +job-name-vault-security = Vault Security + +job-name-farmer = Farmer +job-name-scavenger = Scavenger +job-name-wastelander = Wastelander + +job-name-townsperson = Townsperson +job-name-towndoctor = Town Doctor +job-name-townmechanic = Town Mechanic +job-name-townshopkeeper = Town Shopkeeper +job-name-towndeputy = Town Deputy +job-name-townsheriff = Town Sheriff +job-name-townmayor = Town Mayor + +# Followers +job-name-followers = Followers of the Apocalypse + +# Fun +job-name-survivor = Survivor +job-name-zetan = Zetan abductor + +# N14 Role Timers +Survivor = Survivor \ No newline at end of file diff --git a/Resources/Locale/en-US/Nuclear14/job-supervisors.ftl b/Resources/Locale/en-US/Nuclear14/job-supervisors.ftl new file mode 100644 index 00000000000..abe65c9e335 --- /dev/null +++ b/Resources/Locale/en-US/Nuclear14/job-supervisors.ftl @@ -0,0 +1,14 @@ +job-supervisors-bos-mid = the midwest brotherhood knight commander +job-supervisors-bos-washington-elder = 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-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-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 \ No newline at end of file diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl index 6a57c1b419d..b730b06feb9 100644 --- a/Resources/Locale/en-US/job/department.ftl +++ b/Resources/Locale/en-US/job/department.ftl @@ -5,15 +5,4 @@ department-Engineering = Engineering department-Medical = Medical department-Security = Security department-Science = Science -department-Specific = Station specific - - - - -department-BrotherhoodMidwest = Midwest Brotherhood of Steel -department-BrotherhoodWashington = Washington Brotherhood of Steel -department-CaravanCompany = Caravan Company -department-NCR = New California Republic -department-Tribe = Tribal -department-Vault = Vault Dwellers -department-Wastelander = Wastelander +department-Specific = Station specific \ No newline at end of file diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index b31a9446345..1df674671b0 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -99,35 +99,4 @@ JobServiceWorker = Service Worker JobStationEngineer = Station Engineer JobTechnicalAssistant = Technical Assistant JobWarden = Warden -JobZookeeper = Zookeeper - -# N14 -job-name-bos-mid-knight-comm = Midwest Brotherhood Knight Commander -job-name-bos-mid-scribe = Midwest Brotherhood Scribe -job-name-bos-washington-elder = Washington Brotherhood Elder -job-name-bos-washington-initiate = Washington Brotherhood Initiate -job-name-bos-washington-knight = Washington Brotherhood Knight -job-name-bos-washington-paladin = Washington Brotherhood Paladin -job-name-bos-washington-scribe = Washington Brotherhood Scribe -job-name-caravan-leader = Caravan Leader -job-name-caravan-trader = Caravan Trader -job-name-ncr-cadet = NCR Cadet -job-name-ncr-nco = NCR NCO -job-name-ncr-officer = NCR Officer -job-name-ncr-soldier = NCR Soldier -job-name-tribal = Tribesperson -job-name-tribal-elder = Tribe Elder -job-name-tribal-farmer = Tribal Farmer -job-name-tribal-healer = Tribal Healer -job-name-overseer = Vault Overseer -job-name-vault-doctor = Vault Doctor -job-name-vault-dweller = Vault Dweller -job-name-vault-engineer = Vault Engineer -job-name-vault-security = Vault Security -job-name-farmer = Farmer -job-name-scavenger = Scavenger -job-name-wastelander = Wastelander -job-name-survivor = Survivor - -# N14 Role Timers -Survivor = Survivor \ No newline at end of file +JobZookeeper = Zookeeper \ No newline at end of file diff --git a/Resources/Locale/en-US/job/job-supervisors.ftl b/Resources/Locale/en-US/job/job-supervisors.ftl index 3d004afd61d..61fbb669641 100644 --- a/Resources/Locale/en-US/job/job-supervisors.ftl +++ b/Resources/Locale/en-US/job/job-supervisors.ftl @@ -12,17 +12,4 @@ job-supervisors-medicine = medical doctors, chemists, the senior physician, and job-supervisors-security = security officers, the senior officer, the warden, and the head of security job-supervisors-science = scientists, the senior researcher, and the research director job-supervisors-hire = whoever hires you -job-supervisors-everyone = absolutely everyone -job-supervisors-bos-mid = the midwest brotherhood knight commander -job-supervisors-bos-washington-elder = 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-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-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 \ No newline at end of file +job-supervisors-everyone = absolutely everyone \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Nuclear14/Catalog/Fills/Items/belt.yml index 7a52260f82d..d1fee7ea259 100644 --- a/Resources/Prototypes/Nuclear14/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Nuclear14/Catalog/Fills/Items/belt.yml @@ -56,7 +56,7 @@ - type: StorageFill contents: - id: GrenadeFlashBang - - id: Stunbaton + - id: Stunbaton # TODO: Replace with fallout friendly baton - id: Handcuffs - id: Handcuffs diff --git a/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/identification.yml b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/identification.yml index dc508a5e5d6..891b0b611b5 100644 --- a/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/identification.yml +++ b/Resources/Prototypes/Nuclear14/Entities/Objects/Misc/identification.yml @@ -209,6 +209,18 @@ state: ranger_chief # Townsfolk +- type: entity + parent: N14IDPassportPhoto + id: N14IDPassportTownsfolk + name: passport + description: A passport used by townsfolk as ID. + +- type: entity + parent: N14IDDoctor + id: N14IDDoctorTown + name: doctors ID + description: An ID card worn by the town doctor. + - type: entity parent: N14IDPassportBlank id: N14IDBadgeTownDeputy @@ -278,4 +290,11 @@ components: - type: Sprite sprite: Nuclear14/Objects/Misc/identification.rsi - state: boss \ No newline at end of file + state: boss + +# Fun / Misc +- type: entity + parent: N14IDDoctor + id: N14IDDoctorFollower + name: followers ID + description: An ID card worn by the Followers of the Apocalypse. \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Markers/Spawners/jobs.yml b/Resources/Prototypes/Nuclear14/Markers/Spawners/jobs.yml index 02677701785..28f983267e6 100644 --- a/Resources/Prototypes/Nuclear14/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Nuclear14/Markers/Spawners/jobs.yml @@ -351,6 +351,110 @@ - type: SpawnPoint job_id: WastelandScavenger - type: Sprite + layers: + - state: green + - state: passenger # TODO make new icons + +# Townsfolk +- type: entity + id: N14SpawnPointTownsfolkTownsperson + parent: SpawnPointJobBase + name: townsperson + components: + - type: SpawnPoint + job_id: Townsperson + - type: Sprite + layers: + - state: green + - state: passenger # TODO make new icons + +- type: entity + id: N14SpawnPointTownsfolkTownMechanic + parent: SpawnPointJobBase + name: town mechanic + components: + - type: SpawnPoint + job_id: TownMechanic + - type: Sprite + layers: + - state: green + - state: passenger # TODO make new icons + +- type: entity + id: N14SpawnPointTownsfolkTownDoctor + parent: SpawnPointJobBase + name: town doctor + components: + - type: SpawnPoint + job_id: TownDoctor + layers: + - state: green + - state: passenger # TODO make new icons + +- type: entity + id: N14SpawnPointTownsfolkTownShopkeeper + parent: SpawnPointJobBase + name: town shopkeeper + components: + - type: SpawnPoint + job_id: TownShopkeeper + layers: + - state: green + - state: passenger # TODO make new icons + +- type: entity + id: N14SpawnPointTownsfolkTownDeputy + parent: SpawnPointJobBase + name: town deputy + components: + - type: SpawnPoint + job_id: TownDeputy + layers: + - state: green + - state: passenger # TODO make new icons + +- type: entity + id: N14SpawnPointTownsfolkTownSheriff + parent: SpawnPointJobBase + name: town sheriff + components: + - type: SpawnPoint + job_id: TownSheriff + layers: + - state: green + - state: passenger # TODO make new icons + +- type: entity + id: N14SpawnPointTownsfolkTownMayor + parent: SpawnPointJobBase + name: town mayor + components: + - type: SpawnPoint + job_id: TownMayor + layers: + - state: green + - state: passenger # TODO make new icons + + +# Fun / Misc +- type: entity + id: N14SpawnPointFollowers + parent: SpawnPointJobBase + name: followers of the apocalypse + components: + - type: SpawnPoint + job_id: Followers + layers: + - state: green + - state: passenger # TODO make new icons + +- type: entity + id: N14SpawnPointZetan + parent: SpawnPointJobBase + name: Zetan + components: + - type: SpawnPoint + job_id: Zetan layers: - state: green - state: passenger # TODO make new icons \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Fun/followers.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Fun/followers.yml new file mode 100644 index 00000000000..2cd3b075e91 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Fun/followers.yml @@ -0,0 +1,21 @@ +- type: job + id: Followers + setPreference: false # Delete line for RP + name: job-name-followers + playTimeTracker: Followers + startingGear: FollowersGear + icon: "JobIconPassenger" + supervisors: job-supervisors-followers + +- type: startingGear + id: FollowersGear + equipment: + jumpsuit: N14ClothingUniformJumpsuitFollowers + back: N14ClothingBackpackWastelanderFilled # N14TODO: Doctors Bag + shoes: ClothingShoesColorBlack + id: N14IDDoctorFollower + outerClothing: ClothingOuterCoatLab + belt: N14ClothingBeltMedicalFilled + innerclothingskirt: N14ClothingUniformJumpskirtFalloutBlack + satchel: N14ClothingBackpackSatchelWastelanderFilled + duffelbag: N14ClothingBackpackDuffelFilled # N14TODO: Doctors Bag diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Fun/zetan.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Fun/zetan.yml new file mode 100644 index 00000000000..1ca95ea354d --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Fun/zetan.yml @@ -0,0 +1,18 @@ +- type: job + id: Zetan + setPreference: false # Delete line for RP + name: job-name-zetan + playTimeTracker: Zetan + startingGear: ZetanGear + icon: "JobIconPassenger" + supervisors: job-supervisors-zetan + +- type: startingGear + id: ZetanGear + equipment: + jumpsuit: N14ClothingUniformJumpsuitFollowers # N14TODO: Zetan stuff + back: N14ClothingBackpackWastelanderFilled # N14TODO: Zetan stuff + shoes: ClothingShoesColorBlack # N14TODO: Zetan stuff + id: N14IDDoctorFollower # N14TODO: Zetan stuff. Some crystal that opens doors or something + outerClothing: ClothingOuterCoatLab # N14TODO: space suit? + belt: N14ClothingBeltMedicalFilled # N14TODO: probes and stuff diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Towndoctor.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Towndoctor.yml new file mode 100644 index 00000000000..592bbdeb2cd --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Towndoctor.yml @@ -0,0 +1,20 @@ +- type: job + id: TownDoctor + setPreference: false # Delete line for RP + name: job-name-towndoctor + playTimeTracker: TownDoctor + startingGear: TownDoctorGear + icon: "JobIconPassenger" + supervisors: job-supervisors-townsfolk + +- type: startingGear + id: TownDoctorGear + equipment: + jumpsuit: N14ClothingUniformJumpsuitWastelandDoc + back: N14ClothingBackpackWastelanderFilled # N14TODO: Doctors Bag + shoes: ClothingShoesColorBlack + id: N14IDDoctorTown + outerClothing: ClothingOuterCoatLab + innerclothingskirt: N14ClothingUniformJumpskirtFalloutBlack + satchel: N14ClothingBackpackSatchelWastelanderFilled + duffelbag: N14ClothingBackpackDuffelFilled # N14TODO: Doctors Bag diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml new file mode 100644 index 00000000000..d5ac97b661e --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml @@ -0,0 +1,20 @@ +- type: job + id: TownMechanic + setPreference: false # Delete line for RP + name: job-name-townmechanic + playTimeTracker: TownMechanic + startingGear: TownMechanicGear + icon: "JobIconPassenger" + supervisors: job-supervisors-townsfolk + +- type: startingGear + id: TownMechanicGear + equipment: + jumpsuit: N14ClothingUniformJumpsuitMechanic + back: N14ClothingBackpackWastelanderFilled + shoes: ClothingShoesColorBlack + id: N14IDPassportTownsfolk + belt: N14ClothingBeltUtilityFilled + innerclothingskirt: N14ClothingUniformJumpskirtFalloutBlack + satchel: N14ClothingBackpackSatchelWastelanderFilled + duffelbag: N14ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml new file mode 100644 index 00000000000..2edfaed99b1 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml @@ -0,0 +1,19 @@ +- type: job + id: TownShopkeeper + setPreference: false # Delete line for RP + name: job-name-townshopkeeper + playTimeTracker: TownShopkeeper + startingGear: TownShopkeeperGear + icon: "JobIconPassenger" + supervisors: job-supervisors-townsfolk + +- type: startingGear + id: TownShopkeeperGear + equipment: + jumpsuit: N14ClothingUniformJumpsuitMerchant + back: N14ClothingBackpackWastelanderFilled # N14TODO: Trader bag + shoes: ClothingShoesColorBlack + id: N14IDPassportTownsfolk + innerclothingskirt: N14ClothingUniformJumpskirtFalloutBlack + satchel: N14ClothingBackpackSatchelWastelanderFilled + duffelbag: N14ClothingBackpackDuffelFilled # N14TODO: Trader bag diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townsperson.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townsperson.yml new file mode 100644 index 00000000000..16c56a17ed2 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Townsperson.yml @@ -0,0 +1,19 @@ +- type: job + id: Townsperson + setPreference: false # Delete line for RP + name: job-name-townsperson + playTimeTracker: Townsperson + startingGear: TownspersonGear + icon: "JobIconPassenger" + supervisors: job-supervisors-townsfolk + +- type: startingGear + id: TownspersonGear + equipment: + jumpsuit: N14ClothingUniformJumpsuitSettlerRags + back: N14ClothingBackpackWastelanderFilled + shoes: ClothingShoesColorBlack + id: N14IDPassportTownsfolk + innerclothingskirt: N14ClothingUniformJumpskirtFalloutBlack + satchel: N14ClothingBackpackSatchelWastelanderFilled + duffelbag: N14ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml new file mode 100644 index 00000000000..dbdb12d8519 --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml @@ -0,0 +1,22 @@ +- type: job + id: TownDeputy + setPreference: false # Delete line for RP + name: job-name-towndeputy + playTimeTracker: TownDeputy + startingGear: TownDeputyGear + icon: "JobIconPassenger" + supervisors: job-supervisors-townsfolk + +- type: startingGear + id: TownDeputyGear + equipment: + jumpsuit: N14ClothingUniformJumpsuitCowboyBrown + back: N14ClothingBackpackWastelanderFilled + shoes: ClothingShoesColorBlack + id: N14IDBadgeTownDeputy + outerClothing: N14ClothingOuterLeatherArmor + pocket1: RadioHandheld + belt: N14ClothingBeltPoliceFilled + innerclothingskirt: N14ClothingUniformJumpskirtFalloutBlack + satchel: N14ClothingBackpackSatchelWastelanderFilled + duffelbag: N14ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml new file mode 100644 index 00000000000..a52aab6a8cb --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml @@ -0,0 +1,20 @@ +- type: job + id: TownMayor + setPreference: false # Delete line for RP + name: job-name-townmayor + playTimeTracker: TownMayor + startingGear: TownMayorGear + icon: "JobIconPassenger" + supervisors: job-supervisors-townsfolk + +- type: startingGear + id: TownMayorGear + equipment: + jumpsuit: N14ClothingUniformJumpsuitCheckered + back: N14ClothingBackpackWastelanderFilled + shoes: ClothingShoesColorBlack + id: N14IDBadgeTownMayor + pocket1: RadioHandheld + innerclothingskirt: N14ClothingUniformJumpskirtFalloutBlack + satchel: N14ClothingBackpackSatchelWastelanderFilled + duffelbag: N14ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml new file mode 100644 index 00000000000..33b3188a29a --- /dev/null +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml @@ -0,0 +1,22 @@ +- type: job + id: TownSheriff + setPreference: false # Delete line for RP + name: job-name-townsheriff + playTimeTracker: TownSheriff + startingGear: TownSheriffGear + icon: "JobIconPassenger" + supervisors: job-supervisors-townsfolk + +- type: startingGear + id: TownSheriffGear + equipment: + jumpsuit: N14ClothingUniformJumpsuitCowboyGrey + back: N14ClothingBackpackWastelanderFilled + shoes: ClothingShoesColorBlack + id: N14IDBadgeTownSheriff + outerClothing: N14ClothingOuterCombatArmor + pocket1: RadioHandheld + belt: N14ClothingBeltPoliceFilled + innerclothingskirt: N14ClothingUniformJumpskirtFalloutBlack + satchel: N14ClothingBackpackSatchelWastelanderFilled + duffelbag: N14ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml index 8cb4ff510c1..8a96d854219 100644 --- a/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml +++ b/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml @@ -69,3 +69,30 @@ - WastelandMusician - WastelandReporter - WastelandScavenger + +- type: department + id: Townsfolk + description: department-Townsfolk-description + color: "#5c733a" + roles: + - Townsperson + - TownDoctor + - TownMechanic + - TownShopkeeper + - TownDeputy + - TownSheriff + - TownMayor + +- type: department + id: Zetan + description: department-Zetan-description + color: "#7ec133" + roles: + - Zetan + +- type: department + id: Followers + description: department-Followers-description + color: "#33a1c1" + roles: + - Followers \ No newline at end of file diff --git a/Resources/Prototypes/Nuclear14/Roles/playtime_trackers.yml b/Resources/Prototypes/Nuclear14/Roles/playtime_trackers.yml index 10a63f7cffb..fd993f28158 100644 --- a/Resources/Prototypes/Nuclear14/Roles/playtime_trackers.yml +++ b/Resources/Prototypes/Nuclear14/Roles/playtime_trackers.yml @@ -1,12 +1,14 @@ # Nuclear 14 Role Trackers # Jobs +# BOS Midwest - type: playTimeTracker id: BoSMidKnightCommander - type: playTimeTracker id: BoSMidScribe +# BOS Washington - type: playTimeTracker id: BoSWashingtonElder @@ -22,12 +24,14 @@ - type: playTimeTracker id: BoSWashingtonInitiate +# Caravan - type: playTimeTracker id: CaravanLeader - type: playTimeTracker id: CaravanTrader +# NCR - type: playTimeTracker id: NCRCadet @@ -40,6 +44,7 @@ - type: playTimeTracker id: NCRSoldier +# Tribe - type: playTimeTracker id: TribalHealer @@ -52,6 +57,7 @@ - type: playTimeTracker id: TribalFarmer +# Vault - type: playTimeTracker id: VaultSecurity @@ -67,6 +73,7 @@ - type: playTimeTracker id: VaultEngineer +# Wastelanders - type: playTimeTracker id: Wastelander @@ -87,6 +94,35 @@ - type: playTimeTracker id: WastelandScavenger + +# Townsfolk +- type: playTimeTracker + id: Townsperson + +- type: playTimeTracker + id: TownDoctor + +- type: playTimeTracker + id: TownMechanic + +- type: playTimeTracker + id: TownShopkeeper + +- type: playTimeTracker + id: TownDeputy + +- type: playTimeTracker + id: TownSheriff + +- type: playTimeTracker + id: TownMayor + +# Fun & Misc +- type: playTimeTracker + id: Survivor + +- type: playTimeTracker + id: Followers - type: playTimeTracker - id: Survivor \ No newline at end of file + id: Zetan \ No newline at end of file