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.

Sign up for GitHub

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

Zealot Duster and Followers Armored Coat crafting + fix for the loadout stuff #775

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Zealot Duster and Followers Armored Coat crafting + fix for the loadout stuff #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4ed30a
Fixes and adding
HungryCuban Jan 5, 2025
6b0d3e7
Update outerClothing.yml
HungryCuban Jan 5, 2025
c165a29
Tag fix
HungryCuban Jan 5, 2025
eb28454
Merge branch 'master' into Zealot-duster-and-Follower-coat-crafting
HungryCuban Jan 13, 2025
cca0a7b
Merge branch 'master' into Zealot-duster-and-Follower-coat-crafting
HungryCuban Jan 14, 2025
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
9 changes: 9 additions & 0 deletions Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@
- id: N14ClothingOuterBattlecoatCoat
prob: 0.07
orGroup: Clothing
- id: N14ClothingOuterZealotDuster
prob: 0.6
orGroup: Clothing
- id: N14ClothingHeadHatBaseball
prob: 0.12
orGroup: Clothing
Expand Down Expand Up @@ -864,6 +867,9 @@
- id: N14ClothingOuterRaiderCombat2
prob: 0.12
orGroup: Clothing
- id: N14ClothingOuterZealotDuster
prob: 0.6
orGroup: Clothing
- id: N14ClothingBootsCowboy
prob: 0.07
orGroup: Clothing
Expand Down Expand Up @@ -2470,6 +2476,9 @@
- id: N14ClothingBootsFire
prob: 0.07
orGroup: Clothing
- id: N14ClothingOuterZealotDuster
prob: 0.07
orGroup: Clothing
- id: N14EmptySlot
prob: 0.75
orGroup: Ammunition
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/_Nuclear14/CharacterItemGroups/neckGroup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
- type: loadout
id: N14LoadoutNeckCloakLeather
- type: loadout
id: N14LoadoutNeckMantleLeather
id: N14LoadoutNeckMantleLeather
- type: loadout
id: N14LoadoutNeckCloakDarkCloak
4 changes: 3 additions & 1 deletion Resources/Prototypes/_Nuclear14/CharacterItemGroups/outerwearGroup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,6 @@
- type: loadout
id: N14LoadoutOuterRaiderBadlands
- type: loadout
id: N14LoadoutOuterRaiderBlastmaster
id: N14LoadoutOuterRaiderBlastmaster
- type: loadout
id: N14LoadoutOuterHarperCoat
3 changes: 3 additions & 0 deletions Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@
sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutfollowerlabcoat.rsi
- type: Clothing
sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutfollowerlabcoat.rsi
- type: Tag #For crafting
tags:
- FollowerLabcoat
# - type: ClothingSpecialModifier
# intelligenceModifier: 1

Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@
priceMultiplier: 0.5
- type: ExplosionResistance
damageCoefficient: 0.85
- type: Construction
graph: CoatFollowersArmoredGraph
node: followercoat
# - type: ClothingSpecialModifier
# intelligenceModifier: 1

Expand Down Expand Up @@ -570,6 +573,9 @@
priceMultiplier: 0.5
- type: ExplosionResistance
damageCoefficient: 0.85
- type: Tag #For crafting
tags:
- PoliceVest

- type: entity
parent: N14ClothingOuterPoliceVest
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@
- N14ClothingOuterTribalArmorHeavy
- N14ClothingOuterInsectArmor
- N14ClothingOuterMetalArmor
- N14ClothingOuterZealotDuster
# Shield's
- N14InsectShield
- MakeshiftShield
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,3 +237,4 @@
group: N14LoadoutOuter
items:
- N14ClothingOuterHarperCoat

22 changes: 22 additions & 0 deletions Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,28 @@
- node: rags
entity: N14ClothingUniformJumpsuitRags

- type: constructionGraph
id: CoatFollowersArmoredGraph
start: start
graph:
- node: start
edges:
- to: followercoat
steps:
- tag: FollowerLabcoat
name: follower's labcoat
icon:
sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutfollowerlabcoat.rsi
state: icon
- tag: PoliceVest
name: police vest
icon:
sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutpolicevest.rsi
state: icon
doAfter: 8
- node: followercoat
entity: N14ClothingOuterCoatFollowersArmored

#MARK: Mantie's
- type: constructionGraph
id: LeatherMantleGraph
Expand Down
14 changes: 14 additions & 0 deletions Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,20 @@
state: icon
hide: false

- type: construction
name: Followers armored coat
id: CoatFollowersArmored
graph: CoatFollowersArmoredGraph
startNode: start
targetNode: followercoat
category: construction-category-clothing
objectType: Item
description: Protection for the followers.
icon:
sprite: _Nuclear14/Clothing/OuterClothing/Armor/falloutfoaarmoredcoat.rsi
state: icon
hide: false

#MARK: Mantle's
- type: construction
id: LeatherMantle
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,17 @@
Cloth: 1000
Steel: 2000

- type: latheRecipe
id: N14ClothingOuterZealotDuster
result: N14ClothingOuterZealotDuster
category: N14Armor
completetime: 8
materials:
Cloth: 1000
Steel: 1000
Leather: 300
Thread: 200

# Shield's
- type: latheRecipe
id: N14InsectShield
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/_Nuclear14/tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@
- type: Tag
id: Transistor2

- type: Tag
id: PoliceVest

- type: Tag
id: FollowerLabcoat

#MARK: Guns types.
- type: Tag
id: Revolver
Expand Down
Loading