Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Roles tweaks #237

Merged
merged 4 commits into from
Jun 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions Resources/Prototypes/Nuclear14/Catalog/Fills/Belts/belt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
- type: entity
noSpawn: true
parent: ClothingBeltRevolver
id: ClothingBeltRevolverfilled
components:
- type: StorageFill
contents:
- id: N14WeaponRevolverMagnun
- id: SpeedLoader44
- id: SpeedLoader44
- id: SpeedLoader44

- type: entity
noSpawn: true
parent: ClothingBeltNCRHarness
id: ClothingBeltNCRHarnessfilled
components:
- type: StorageFill
contents:
- id: N14ChemicalSyringeAntidote
- id: N14ChemicalSyringeAntidote
- id: N14DoctorSyringe
- id: N14Stimpak
- id: N14Stimpak
- id: N14Stimpak
- id: N14Stimpak
- id: N14RadXCanister
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@
parent: ClothingHeadBase
id: N14ClothingHeadHatBrotherhoodFieldCap
name: brotherhood of steel field cap
description: A cap worn by scribes of the Brotherhood of Steel during their field duties.
description: A cap worn by paladins of the midwest BoS during their field duties.
components:
- type: Sprite
sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi
sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi
- type: Clothing
sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodscribe.rsi
sprite: Nuclear14/Clothing/Head/FalloutHats/brotherhoodhat.rsi

# Enclave
- type: entity
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/Nuclear14/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,18 @@
layers:
- state: green
- state: passenger # TODO make new icons

- type: entity
id: N14SpawnPointNCRRanger
parent: N14SpawnPointWastelander
name: NCR ranger
components:
- type: SpawnPoint
job_id: NCRRanger
- type: Sprite
layers:
- state: green
- state: passenger # TODO make new icons

- type: entity
id: N14SpawnPointNCRSoldier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,30 @@
sound:
path: /Audio/Effects/unwrap.ogg

- type: entity
name: morale booster kit
parent: KitBase
id: KitMorale
description: Only the most loyal troops of the NCR carry low quality equipment, a special troop made only to boost the morale during suicide charges.
components:
- type: Sprite
state: pointman
- type: Item
size: Huge
- type: SpawnItemsOnUse
items:
- id: N14ClothingOuterNCRPlate
- id: N14ClothingMaskPlate
- id: ClothingBeltNCRPouches
- id: N14WastelandFlagSpear
- id: N14ClothingBackpackSatchelNCR
- id: N14WeaponPistolColt
- id: N14MagazinePistol45
- id: N14MagazinePistol45
- id: N14CombatKnife
sound:
path: /Audio/Effects/unwrap.ogg

- type: entity
name: medic kit
parent: KitBase
Expand All @@ -130,7 +154,7 @@
- type: SpawnItemsOnUse
items:
- id: N14ClothingOuterNCRPouchedVest
- id: ClothingBeltNCRHarness
- id: ClothingBeltNCRHarnessfilled
- id: N14ClothingBackpackSatchelNCR
- id: N14weapon9mmSMG
- id: N14MagazineSMG9mm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
proto: N14CartridgePistol10

- type: entity
name: Magnum revolver
name: magnum revolver
parent: BaseWeaponRevolver
id: N14WeaponRevolverMagnun
description: The Big Iron. Uses .44 magnum ammo.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: Ginormous
sprite: Nuclear14/Objects/Weapons/Guns/Shotguns/riot_shotgun.rsi
- type: Wieldable
- type: GunWieldBonus
Expand Down
18 changes: 17 additions & 1 deletion Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ncr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,22 @@
- Survivor
items:
- KitRifleman

- type: loadout
id: LoadoutNCRKitMorale
category: Roles
cost: 8
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRCadet
- NCRSoldier
- NCRNCO
- NCROfficer
- Survivor
items:
- KitMorale

- type: loadout
id: LoadoutNCRKitGunner
Expand Down Expand Up @@ -132,4 +148,4 @@
- NCROfficer
- Survivor
items:
- KitSpecialPointman
- KitSpecialPointman
148 changes: 148 additions & 0 deletions Resources/Prototypes/Nuclear14/Loadouts/Roles/loadouts_ranger.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
- type: loadout
id: LoadoutNCRRangerArmor
category: Roles
cost: 4
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- N14ClothingOuterRangerVest

- type: loadout
id: LoadoutNCRRangerArmorV2
category: Roles
cost: 4
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- N14ClothingOuterRangerArmor

- type: loadout
id: LoadoutNCRRangerGun1
category: Roles
cost: 4
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- N14Weapon50NcrRifle
- MagazineBox50

- type: loadout
id: LoadoutNCRRangerGun2
category: Roles
cost: 4
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- N14WeaponCarbine
- LongMagazine5.56Rifle
- LongMagazine5.56Rifle

- type: loadout
id: LoadoutNCRRangerGun3
category: Roles
cost: 4
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- N14WeaponLeverRifle
- MagazineBox308

- type: loadout
id: LoadoutNCR5.56
category: Roles
cost: 2
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- LongMagazine5.56Rifle
- LongMagazine5.56Rifle

- type: loadout
id: LoadoutNCR50
category: Roles
cost: 2
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- MagazineBox50

- type: loadout
id: LoadoutNCR308
category: Roles
cost: 2
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- MagazineBox308

- type: loadout
id: LoadoutNCRmask1
category: Roles
cost: 2
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- ClothingMaskGasRiot

- type: loadout
id: LoadoutNCRmask2
category: Roles
cost: 2
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- ClothingMaskGasCombat

- type: loadout
id: LoadoutNCRhelmet
category: Roles
cost: 2
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- N14ClothingHeadHatRangerHelmet

- type: loadout
id: LoadoutNCRhat
category: Roles
cost: 2
exclusive: true
requirements:
- !type:LoadoutJobRequirement
jobs:
- NCRRanger
items:
- N14ClothingHeadHatRanger
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- type: job
id: BoSMidKnight
setPreference: true
name: job-name-bos-mid-knight
description: job-description-bos-mid-knight
name: Midwest knight
description: follow the paladins orders and fight for the brotherhood.
playTimeTracker: BoSMidKnight
startingGear: BoSMidKnight
icon: "JobIconPassenger"
Expand All @@ -20,7 +20,6 @@
outerClothing: N14ClothingOuterMidwestArmorMK2
hands: N14ClothingHandsGlovesCombat
id: N14IDBrotherhoodHolotag
ears: ClothingHeadsetSecurity #placeholder
belt: ClothingBeltMilitary

- type: playTimeTracker
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- type: job
id: BoSMidPaladinCommander
setPreference: true
name: job-name-bos-mid-paladin-comm
description: job-description-bos-mid-paladin-comm
name: Midwest paladin commander
description: Lead the midwest exploration team, follow the objetives and take decisions to take control over the wasteland.
playTimeTracker: BoSMidPaladinCommander
startingGear: BoSMidPaladinCommGear
icon: "JobIconPassenger"
Expand All @@ -18,7 +18,7 @@
shoes: N14ClothingBootsCombat
hands: N14ClothingHandsGlovesCombat
id: N14IDBrotherhoodHolotag
ears: ClothingHeadsetSecurity #placeholder
ears: N14ClothingHeadsetBOSMidwest
belt: ClothingBeltMilitary

- type: playTimeTracker
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- type: job
id: BoSMidPaladin
setPreference: true
name: job-name-bos-mid-paladin-comm
description: job-description-bos-mid-paladin
name: Midwest paladin
description: lead the knights and squired during the mission, follow the paladin commander directions and fight for the brotherhood.
playTimeTracker: BoSMidPaladin
startingGear: BoSMidPaladinGear
icon: "JobIconPassenger"
Expand All @@ -16,9 +16,11 @@
jumpsuit: N14ClothingUniformBosRecon
back: N14ClothingBackpackMilitary
shoes: N14ClothingBootsCombat
head: N14ClothingHeadHatBrotherhoodFieldCap
outerClothing: N14ClothingOuterMidwestArmorMK2
hands: N14ClothingHandsGlovesCombat
id: N14IDBrotherhoodHolotag
ears: ClothingHeadsetSecurity #placeholder
ears: N14ClothingHeadsetBOSMidwest #placeholder
belt: ClothingBeltMilitary

- type: playTimeTracker
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
- type: job
id: BoSMidScribe
setPreference: true
name: job-name-bos-mid-scribe
description: job-description-bos-mid-scribe
name: Midwest scribe
description: Maintain equipment and support the knights and paladins in their mission.
playTimeTracker: BoSMidScribe
startingGear: BoSMidScribeGear
icon: "JobIconPassenger"
Expand All @@ -19,7 +19,7 @@
shoes: N14ClothingBootsCombat
outerClothing: N14ClothingOuterMidwestBoSCoat
id: N14IDBrotherhoodHolotag
ears: ClothingHeadsetScience #placeholder
ears: N14ClothingHeadsetBOSMidwest
belt: N14ClothingBeltUtilityFilled

- type: playTimeTracker
Expand Down
Loading
Loading