Middle-major crafting update (Vault-Overseers#520)

Vonsant · Sep 15, 2024 · 358d885 · 358d885
1 parent 9d5c4ba
commit 358d885
Show file tree

Hide file tree

Showing 72 changed files with 1,652 additions and 748 deletions.
diff --git a/Resources/Locale/en-US/_Nuclear14/construction.ftl b/Resources/Locale/en-US/_Nuclear14/construction.ftl
@@ -1,6 +1,15 @@
 construction-category-medical = Medical
 
+lathe-category-ammo-box = Ammo box
+lathe-category-ammo-magazines = Magazines
+lathe-category-armor = Armor
 lathe-category-containers = Containers
 lathe-category-chemistry = Chemistry
+lathe-category-cleaning = Cleaning
 lathe-category-kitchen = Kitchen
-lathe-category-misc = Misc
+lathe-category-misc = Misc
+lathe-category-shields = Shields
+lathe-category-weapons-melee = Melee
+lathe-category-weapons-pistols = Pistols
+lathe-category-weapons-rifles = Rifles
+lathe-category-weapons-smgs = Smgs
diff --git a/Resources/Locale/en-US/_Nuclear14/reagents.ftl b/Resources/Locale/en-US/_Nuclear14/reagents.ftl
@@ -273,14 +273,19 @@ reagent-name-antiseptic = Antiseptic
 reagent-desc-antiseptic = A cleaning solution made from Abraxo Cleaner and some Rubbing Alcohol.
 
 # Ores, Metals, Materials
-materials-gunpowder = gunpowder
-materials-lead = lead
 materials-aluminum = aluminum
-materials-sulfur = sulfur
+materials-antchitin = chitin
 materials-charcoal = charcoal
+materials-exoskeleton = exoskeleton
+materials-gunpowder = gunpowder
+materials-leather = leather
+materials-lead = lead
 materials-raw-lead = raw lead
+materials-raw-leather = raw leather
 materials-raw-aluminum = raw aluminum
 materials-raw-sulfur = raw sulfur
+materials-sulfur = sulfur
+
 reagent-name-gunpowder = gunpowder
 reagent-desc-gunpowder = Small pellet gunpowder. Now just add lead.
 reagent-name-fertilizer = fertilizer

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/base_butcherable_leather_gloves.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/base_butcherable_leather_gloves.yml
@@ -0,0 +1,10 @@
+- type: entity
+  id: N14ClothingHandsButcherableLeather
+  parent: ClothingHandsButcherable
+  abstract: true
+  components:
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 1
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/gloves.yml
@@ -33,7 +33,7 @@
     # strengthModifier: 1
 
 - type: entity
-  parent: ClothingHandsButcherable
+  parent: N14ClothingHandsButcherableLeather
   id: N14ClothingHandsGlovesBlackLeather
   name: black leather gloves
   description: A pair of long black leather gloves.
@@ -48,7 +48,7 @@
   - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsButcherable
+  parent: N14ClothingHandsButcherableLeather
   id: N14ClothingHandsGlovesLeather
   name: leather gloves
   description: A pair of brown leather gloves.
@@ -126,7 +126,7 @@
   - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsButcherable
+  parent: N14ClothingHandsButcherableLeather
   id: N14ClothingHandsGlovesTribal
   name: tribal gloves
   description: A piece of soft leather to tie around the hand.
@@ -154,9 +154,12 @@
     fiberMaterial: fibers-leather
     fiberColor: fibers-white
   - type: FingerprintMask
+  - type: Construction
+    graph: GlovesClothGraph
+    node: gloves
 
 - type: entity
-  parent: ClothingHandsButcherable
+  parent: N14ClothingHandsButcherableLeather
   id: N14ClothingHandsGlovesNCR
   name: fingerless leather gloves
   description: Gloves made out of wasteland animal hides, tanned and stitched together without any fingers.
@@ -171,7 +174,7 @@
   - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsButcherable
+  parent: N14ClothingHandsButcherableLeather
   id: N14ClothingHandsGlovesPatrol
   name: leather patrol gloves
   description: Gloves made out of brahmin leather, tanned and stitched for the purpose of patrolling around the Mojave desert.
@@ -183,4 +186,4 @@
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-brown
-  - type: FingerprintMask
+  - type: FingerprintMask
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml
@@ -382,6 +382,11 @@
         Slash: 0.95
         Piercing: 0.95
         Heat: 0.9
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 2
 
 # Vault
 - type: entity

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/cloaks.yml
@@ -64,7 +64,6 @@
     sprite: _Nuclear14/Clothing/Neck/tribal.rsi
 
 # Neutral
-
 - type: entity
   parent: ClothingNeckBase
   id: N14ClothingNeckCloakLeather
@@ -81,6 +80,14 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
+  - type: Construction
+    graph: LeatherCloakGraph
+    node: cloak
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 2
 
 - type: entity
   parent: ClothingNeckBase
@@ -89,4 +96,12 @@
   description: A handmade cloak, comfy and warm this piece comes from a dangerous yaoguai.
   components:
   - type: Sprite
-    sprite: _Nuclear14/Clothing/Neck/yaoguai.rsi
+    sprite: _Nuclear14/Clothing/Neck/yaoguai.rsi
+  - type: Construction
+    graph: YaoguaiCloakGraph
+    node: cloak
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialYaoguaiHide
+      amount: 1
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/mantles.yml
@@ -38,3 +38,11 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot {}
+  - type: Construction
+    graph: LeatherMantleGraph
+    node: mantle
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 2
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml
@@ -119,6 +119,13 @@
         Slash: 0.95
         Piercing: 0.9
         Heat: 0.85
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 1
+    - id: MaterialCloth1
+      amount: 1
 
 - type: entity
   parent: ClothingOuterStorageBase
@@ -137,6 +144,13 @@
         Slash: 0.95
         Piercing: 0.9
         Heat: 0.85
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 2
+    - id: MaterialCloth1
+      amount: 1
 
 - type: entity
   parent: ClothingOuterBase
@@ -157,6 +171,13 @@
         Heat: 0.9
   - type: ClothingSpecialModifier
     strengthModifier: 1
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 1
+    - id: MaterialCloth1
+      amount: 1
 
 - type: entity
   parent: ClothingOuterStorageBase
@@ -175,6 +196,11 @@
         Slash: 0.95
         Piercing: 0.9
         Heat: 0.85
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 2
 
 - type: entity
   parent: ClothingOuterStorageBase
@@ -286,6 +312,13 @@
         Slash: 0.85
         Piercing: 0.9
         Heat: 0.9
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 2
+    - id: MaterialCloth1
+      amount: 1
 
 - type: entity
   parent: N14ClothingOuterBattlecoatCoat
@@ -352,6 +385,13 @@
     sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutarmoredofficer.rsi
   - type: Clothing
     sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutarmoredofficer.rsi
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 2
+    - id: MaterialCloth1
+      amount: 1
 
 #MARK: NCR
 - type: entity

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml
@@ -15,6 +15,11 @@
         Slash: 0.85
         Piercing: 0.85
         Heat: 0.75
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 4
 
 - type: entity
   parent: ClothingOuterBase

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Shoes/falloutbootsbasic.yml
@@ -8,6 +8,14 @@
     sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/blackboots.rsi
   - type: Clothing
     sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/blackboots.rsi
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 1
+    - id: MaterialCloth1
+      amount: 1
+
 
 - type: entity
   parent: ClothingShoesMilitaryBase
@@ -41,6 +49,11 @@
     sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/cowboyboots.rsi
   - type: Clothing
     sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/cowboyboots.rsi
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 2
 
 - type: entity
   parent: ClothingShoesBase
@@ -63,3 +76,8 @@
     sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/leatherboots.rsi
   - type: Clothing
     sprite: _Nuclear14/Clothing/Shoes/FalloutBoots/leatherboots.rsi
+  - type: Butcherable
+    butcheringType: Knife
+    spawned:
+    - id: N14MaterialLeather1
+      amount: 2
diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml
@@ -65,6 +65,9 @@
     sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/wastelanderrags.rsi
   - type: ClothingSpecialModifier
     charismaModifier: -1
+  - type: Construction
+    graph: WastelanderRagsGraph
+    node: rags
 
 - type: entity
   parent: ClothingUniformBase

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml
@@ -188,6 +188,8 @@
     spawned:
     - id: N14FoodMeatGecko
       amount: 3
+    - id: N14MaterialRawLeather1
+      amount: 1
   - type: Reproductive
     breedChance: 0.05
     birthPopup: reproductive-laid-egg-popup
@@ -588,6 +590,12 @@
   - type: Tag
     tags:
     - Deathclaw
+  - type: Butcherable
+    spawned:
+    - id: N14FoodMeatRadRaw
+      amount: 8
+    - id: N14MaterialRawLeather1
+      amount: 6
 
 #MARK: Albino Deathclaw
 - type: entity
@@ -709,7 +717,7 @@
     spawned:
     - id: N14FoodMeatBrahmin
       amount: 4
-    - id: N14MaterialBrahminHide
+    - id: N14MaterialBrahminHide1
       amount: 1
       prob: 0.95
   - type: SolutionContainerManager
@@ -775,6 +783,8 @@
     spawned:
     - id: N14FoodMeatBighorner
       amount: 4
+    - id: N14MaterialRawLeather1
+      amount: 4
   - type: MeleeWeapon
     altDisarm: false
     hidden: true
@@ -844,6 +854,8 @@
     spawned:
     - id: N14FoodMeatRadstag
       amount: 4
+    - id: N14MaterialRawLeather1
+      amount: 4
   - type: MeleeWeapon
     altDisarm: false
     hidden: true

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml
@@ -53,6 +53,8 @@
     spawned:
     - id: N14FoodMeatRadRaw
       amount: 1
+    - id: N14MaterialRawLeather1
+      amount: 1
   - type: Bloodstream
     bloodMaxVolume: 50
     bloodReagent: WastelandBlood

diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/insects.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/insects.yml
@@ -53,7 +53,7 @@
     useKey: false
   - type: Butcherable
     spawned:
-    - id: N14MaterialAntChitin
+    - id: N14MaterialAntChitin1
       amount: 1
     - id: N14FoodMeatRadRaw
       amount: 1
@@ -100,8 +100,8 @@
         Base: dead
   - type: Butcherable
     spawned:
-    - id: N14MaterialAntChitin
-      amount: 1
+    - id: N14MaterialAntChitin1
+      amount: 2
     - id: N14FoodMeatRadRaw
       amount: 3
   - type: Bloodstream