Skip to content

Commit

Permalink
Townsfolk & Followers of the Apocalypse (#142)
Browse files Browse the repository at this point in the history
* start of townsfolk, zetan and followers factions

* more faction stuff
  • Loading branch information
Peptide90 authored Dec 14, 2023
1 parent 44b6406 commit 140b26e
Show file tree
Hide file tree
Showing 20 changed files with 460 additions and 61 deletions.
23 changes: 23 additions & 0 deletions Resources/Locale/en-US/Nuclear14/department.ftl
Original file line number Diff line number Diff line change
@@ -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!
50 changes: 50 additions & 0 deletions Resources/Locale/en-US/Nuclear14/job-names.ftl
Original file line number Diff line number Diff line change
@@ -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
14 changes: 14 additions & 0 deletions Resources/Locale/en-US/Nuclear14/job-supervisors.ftl
Original file line number Diff line number Diff line change
@@ -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
13 changes: 1 addition & 12 deletions Resources/Locale/en-US/job/department.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
33 changes: 1 addition & 32 deletions Resources/Locale/en-US/job/job-names.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
JobZookeeper = Zookeeper
15 changes: 1 addition & 14 deletions Resources/Locale/en-US/job/job-supervisors.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
job-supervisors-everyone = absolutely everyone
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
- type: StorageFill
contents:
- id: GrenadeFlashBang
- id: Stunbaton
- id: Stunbaton # TODO: Replace with fallout friendly baton
- id: Handcuffs
- id: Handcuffs

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -278,4 +290,11 @@
components:
- type: Sprite
sprite: Nuclear14/Objects/Misc/identification.rsi
state: boss
state: boss

# Fun / Misc
- type: entity
parent: N14IDDoctor
id: N14IDDoctorFollower
name: followers ID
description: An ID card worn by the Followers of the Apocalypse.
104 changes: 104 additions & 0 deletions Resources/Prototypes/Nuclear14/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
21 changes: 21 additions & 0 deletions Resources/Prototypes/Nuclear14/Roles/Jobs/Fun/followers.yml
Original file line number Diff line number Diff line change
@@ -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
18 changes: 18 additions & 0 deletions Resources/Prototypes/Nuclear14/Roles/Jobs/Fun/zetan.yml
Original file line number Diff line number Diff line change
@@ -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
20 changes: 20 additions & 0 deletions Resources/Prototypes/Nuclear14/Roles/Jobs/Townsfolk/Towndoctor.yml
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 140b26e

Please sign in to comment.