Skip to content

Commit

Permalink
updated Midwest scribe sprites, added a new non Power-armor option fo…
Browse files Browse the repository at this point in the history
…r Paladins and Paladin Commanders, fixed up some loadout description issues and small fixes (#657)

* updated Midwest scribe sprites, added a new non Power-armor option for Paladins and Paladin Commanders, fixed up some loadout description issues and small fixes

* fixed the referencing issue for helmets, cant figure out what the other errors telling me though

* webbing fix and field scribe jumpsuit for kit

* loadout time req fix

* fix for loadout fix

---------

Co-authored-by: the-adom <[email protected]>
  • Loading branch information
the-adom and the-adom authored Nov 5, 2024
1 parent 6327ebe commit a73aa2d
Show file tree
Hide file tree
Showing 49 changed files with 390 additions and 14 deletions.
12 changes: 6 additions & 6 deletions Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,14 @@ 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 MFC cells, 1 stimpak, C ration MRE
Includes 1 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 MFC cells, 1 stimpak, 1 C ration MRE
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
Expand All @@ -164,28 +164,28 @@ undecided-loadout-category-bos-scribe-medic-name = Brotherhood Scribe Medical Ki
undecided-loadout-category-bos-scribe-medic-description =
A crate containing everything a member of Brotherhood scribes.
For keeping the fighting forces alive.
Includes 1 10mm revolver, 2 10mm speedloaders, 1 medical belt,
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-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 medical belt,
Includes 1 varmint rifle, 1 5.56 ammo box, 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
undecided-loadout-category-bos-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 MFC cells, 1 utility belt,
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-ranged-name = Brotherhood Ranged Paladin Kit
undecided-loadout-category-bos-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 Focused-MF cells, 2 MFC cells,
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-plasma-name = Brotherhood Plasma Paladin Kit
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/_Nuclear14/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,18 @@
sprite: _Nuclear14/Clothing/Belt/boswebbing.rsi
- type: Appearance

- type: entity
parent: N14ClothingBeltStorageBase
id: ClothingBeltBoSMidwestWebbing
name: Midwest BoS carrier
description: A simple black carrier capable of holding all kind of ammo.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/Belt/midwestboswebbing.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Belt/midwestboswebbing.rsi
- type: Appearance

- type: entity
parent: N14ClothingBeltStorageBase
id: ClothingBeltMilitary
Expand Down
15 changes: 15 additions & 0 deletions Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,21 @@
- type: Clothing
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/midwest-brotherhood/boshelmetV2.rsi

- type: entity
parent: N14ClothingHeadHatBaseHelmetMK2
id: N14ClothingHeadHatBrotherhoodMidwestHelmetRecon
name: midwest BoS recon helmet
description: A helmet made by the Midwest Brotherhood, expertly designed for both protection and stealth.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/midwest-brotherhood/bosreconhelmet.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Head/FalloutHelmets/midwest-brotherhood/bosreconhelmet.rsi
- type: Tag
tags:
- HidesHair
- HidesBeard

- type: entity
parent: ClothingHeadHatLightBase
id: ClothingHeadBrotherhoodScribeHeadset
Expand Down
15 changes: 15 additions & 0 deletions Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hoods.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,18 @@
- HidesHair
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: N14ClothingHeadHatHoodScribeTabard
name: midwest Scribe tabard hood
description: A hood attached to the tabard, affixed with an optical lens.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/Head/FalloutHoods/midwestscribetabard.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Head/FalloutHoods/midwestscribetabard.rsi
- type: Tag
tags:
- HidesHair
- WhitelistChameleon

Original file line number Diff line number Diff line change
Expand Up @@ -489,10 +489,43 @@
- type: Armor
modifiers:
coefficients:
Blunt: 0.75
Slash: 0.75
Blunt: 0.70
Slash: 0.70
Piercing: 0.85
Heat: 0.85
Heat: 0.80
- type: ExplosionResistance
damageCoefficient: 0.8
- type: ToggleableClothing
clothingPrototype: N14ClothingHeadHatHoodScribeTabard

- type: entity
parent: N14ClothingOuterCoatWinterArmored
id: N14ClothingOuterBrotherhoodMidwestFieldScribeCoat
name: Midwest Brotherhood field Scribe coat
description: A warm coat worn by Brotherhood field Scribes, a patch on each arm signifying membership of the Midwest chapter.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/OuterClothing/Coats/midwestbosfieldscribe.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/OuterClothing/Coats/midwestbosfieldscribe.rsi

- type: entity
parent: ClothingOuterStorageBase
id: N14ClothingOuterBrotherhoodMidwestMedicalScribeRobes
name: Midwest 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/midwestbosmedicalscribe.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/OuterClothing/Coats/midwestbosmedicalscribe.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.80
Slash: 0.85
Piercing: 0.70
Heat: 0.70

#MARK: Washington BoS
- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -921,6 +921,26 @@
- type: Clothing
sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutmidbosarmorV2.rsi

- type: entity
parent: N14ClothingOuterCombatArmor
id: N14ClothingOuterMidwestReconArmor
name: midwest BoS recon armor
description: A suit of recon armor manufactured by the Midwest Brotherhood, reserved for only higher ranked members.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutmidbosreconarmor.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutmidbosreconarmor.rsi
- type: Armor
modifiers:
coefficients:
Blunt: 0.65
Slash: 0.65
Piercing: 0.5
Heat: 0.5
- type: ExplosionResistance
damageCoefficient: 0.7

#MARK: craftable armors

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,30 @@
- type: Clothing
sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/Brotherhood/bosrecon.rsi

- type: entity
parent: ClothingUniformBase
id: N14ClothingUniformJumpsuitBOSScribe
name: MidWest brotherhood scribe uniform
description: A uniform worn by scribes of The Midwest Brotherhood of Steel. Affixed with an apron and pockets.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/Brotherhood/midwestbosscribe.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/Brotherhood/midwestbosscribe.rsi

- type: entity
parent: ClothingUniformBase
id: N14ClothingUniformJumpsuitBOSFieldScribe
name: MidWest brotherhood scribe uniform
description: An orange jumper and brown combat trousers, the uniform worn by field-scribes of the Midwest's Brotherhood of Steel.
components:
- type: Sprite
sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/Brotherhood/midwestbosfieldscribe.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/Brotherhood/midwestbosfieldscribe.rsi



#washington BoS

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@
- id: ClothingHandsGlovesChemist
- id: ClothingHeadBrotherhoodScribeHeadset
- id: N14ClothingBootsBlack
- id: N14ClothingOuterBosScribe
- id: N14ClothingOuterBrotherhoodMidwestMedicalScribeRobes
- id: N14CombatKnife
- id: N14Stimpak
- id: N14BoxCardboardMREBoxKFilled
Expand All @@ -651,15 +651,20 @@
size: Huge
- type: SpawnItemsOnUse
items:
- id: N14WeaponLaserPistol
- id: N14PowerCellSmall
amount: 2
- id: N14WeaponSniper556VarmintRifle
- id: MagazineBox556
- id: N14ClothingBeltMedicalFilled
- id: ClothingHandsGlovesFingerless
- id: N14ClothingHeadHatBrotherhoodFieldCap
- id: N14ClothingOuterBrotherhoodFieldScribeCoat
- id: N14ClothingOuterBrotherhoodMidwestFieldScribeCoat
- id: N14CombatKnife
- id: N14Stimpak
- id: N14BoxCardboardMREBoxKFilled
- id: ClothingBeltBoSMidwestWebbing
- id: N14ClothingUniformJumpsuitBOSFieldScribe

#engineer scribe
- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,66 @@
items:
- N14ClothingOuterPowerArmorT45

- type: loadout
id: LoadoutBoSMidwestReconArmor
category: Roles
cost: 6
exclusive: true
requirements:
- !type:CharacterJobRequirement
jobs:
- BoSMidPaladin
- !type:CharacterPlaytimeRequirement
tracker: BoSMidPaladin
min: 54000 # 15 hours veterancy unlock
items:
- N14ClothingOuterMidwestReconArmor

- type: loadout
id: LoadoutBoSMidwestReconHelmet
category: Roles
cost: 2
exclusive: true
requirements:
- !type:CharacterJobRequirement
jobs:
- BoSMidPaladin
- !type:CharacterPlaytimeRequirement
tracker: BoSMidPaladin
min: 54000 # 15 hours veterancy unlock
items:
- N14ClothingHeadHatBrotherhoodMidwestHelmetRecon

- type: loadout
id: LoadoutBoSMidwestReconArmorPaladin
category: Roles
cost: 6
exclusive: true
requirements:
- !type:CharacterJobRequirement
jobs:
- BoSMidPaladinCommander
- !type:CharacterPlaytimeRequirement
tracker: BoSMidPaladinCommander
min: 54000 # 15 hours veterancy unlock
items:
- N14ClothingOuterMidwestReconArmor

- type: loadout
id: LoadoutBoSMidwestReconHelmetPaladin
category: Roles
cost: 2
exclusive: true
requirements:
- !type:CharacterJobRequirement
jobs:
- BoSMidPaladinCommander
- !type:CharacterPlaytimeRequirement
tracker: BoSMidPaladinCommander
min: 54000 # 15 hours veterancy unlock
items:
- N14ClothingHeadHatBrotherhoodMidwestHelmetRecon

- type: loadout
id: LoadoutBoSMidwestT60
category: Roles
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
- type: startingGear
id: BoSMidScribeGear
equipment:
jumpsuit: N14ClothingUniformJumpsuitBOSGreen
jumpsuit: N14ClothingUniformJumpsuitBOSScribe
back: N14ClothingBackpackSatchelMilitary
shoes: N14ClothingBootsLeather
pocket1: NCRBoSMidwestScribekits
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "made by PatoGrone for N14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Made by PatoGrone for N14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "made by adom for N14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a73aa2d

Please sign in to comment.