From 358d88571a15a428ad7e1c83c5ec7e7cca8ce09e Mon Sep 17 00:00:00 2001 From: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com> Date: Sun, 15 Sep 2024 13:24:42 +0400 Subject: [PATCH] Middle-major crafting update (#520) --- .../Locale/en-US/_Nuclear14/construction.ftl | 11 +- .../Locale/en-US/_Nuclear14/reagents.ftl | 11 +- .../Hands/base_butcherable_leather_gloves.yml | 10 + .../Entities/Clothing/Hands/gloves.yml | 15 +- .../Entities/Clothing/Head/hats.yml | 5 + .../Entities/Clothing/Neck/cloaks.yml | 19 +- .../Entities/Clothing/Neck/mantles.yml | 8 + .../OuterClothing/coats_and_outer.yml | 40 +++ .../Clothing/OuterClothing/falloutarmor.yml | 5 + .../Clothing/Shoes/falloutbootsbasic.yml | 18 + .../Clothing/Uniform/falloutjumpsuits.yml | 3 + .../_Nuclear14/Entities/Mobs/NPCs/animals.yml | 14 +- .../_Nuclear14/Entities/Mobs/NPCs/basemob.yml | 2 + .../_Nuclear14/Entities/Mobs/NPCs/insects.yml | 6 +- .../Entities/Objects/Materials/materials.yml | 319 ++++++++++++------ .../Entities/Objects/Materials/ore.yml | 2 +- .../Objects/Misc/craftingmaterials.yml | 84 +++-- .../Entities/Objects/Misc/currency.yml | 4 +- .../Entities/Objects/Misc/materials.yml | 115 ++++--- .../Structures/Misc/craftingbenches.yml | 89 ++++- .../_Nuclear14/Reagents/materials.yml | 32 ++ .../Recipes/Crafting/Graphs/bandanas.yml | 111 ++++++ .../Recipes/Crafting/Graphs/clothing.yml | 75 ++++ .../Recipes/Crafting/Graphs/items.yml | 24 ++ .../Recipes/Crafting/Graphs/materials.yml | 26 ++ .../Recipes/Crafting/Graphs/medical.yml | 158 +++++++++ .../Recipes/Crafting/Graphs/smokeables.yml | 28 ++ .../Recipes/Crafting/Graphs/storage.yml | 105 ++++++ .../_Nuclear14/Recipes/Crafting/clothing.yml | 193 +++++------ .../_Nuclear14/Recipes/Crafting/items.yml | 27 +- .../_Nuclear14/Recipes/Crafting/materials.yml | 29 +- .../_Nuclear14/Recipes/Crafting/medical.yml | 153 +-------- .../Recipes/Crafting/smokeables.yml | 29 +- .../_Nuclear14/Recipes/Crafting/storage.yml | 105 ------ .../_Nuclear14/Recipes/Lathes/ammo.yml | 94 +++--- .../_Nuclear14/Recipes/Lathes/armor.yml | 105 ++++++ .../_Nuclear14/Recipes/Lathes/categories.yml | 40 +++ .../_Nuclear14/Recipes/Lathes/janitorial.yml | 11 + .../ores.yml => Lathes/materials.yml} | 10 +- .../_Nuclear14/Recipes/Lathes/misc.yml | 51 ++- .../_Nuclear14/Recipes/Lathes/tools.yml | 19 +- .../_Nuclear14/Recipes/Lathes/weapons.yml | 104 ++++++ .../_Nuclear14/Stacks/material_stacks.yml | 29 +- Resources/Prototypes/_Nuclear14/tags.yml | 7 + .../Objects/Misc/materials.rsi/leather.png | Bin 488 -> 0 bytes .../Objects/Misc/materials.rsi/leather_1.png | Bin 0 -> 484 bytes .../Objects/Misc/materials.rsi/leather_2.png | Bin 0 -> 580 bytes .../Objects/Misc/materials.rsi/leather_3.png | Bin 0 -> 603 bytes .../Objects/Misc/materials.rsi/meta.json | 14 +- .../Misc/materials.rsi/raw_leather_1.png | Bin 0 -> 484 bytes .../Misc/materials.rsi/raw_leather_2.png | Bin 0 -> 476 bytes .../Objects/Misc/mob_drops.rsi/chitin.png | Bin 461 -> 484 bytes .../Objects/Misc/mob_drops.rsi/chitin_1.png | Bin 0 -> 484 bytes .../{hide_brahmin.png => hide_brahmin_1.png} | Bin .../Objects/Misc/mob_drops.rsi/meta.json | 5 +- .../Objects/Misc/storage.rsi/coinpouch.png | Bin 0 -> 279 bytes .../Objects/Misc/storage.rsi/meta.json | 6 + .../Objects/Misc/storage.rsi/moneybag.png | Bin 1031 -> 791 bytes .../Objects/Misc/storage.rsi/moneybag_alt.png | Bin 0 -> 1031 bytes .../Objects/Misc/storage.rsi/wallet.png | Bin 408 -> 429 bytes .../Objects/Misc/storage.rsi/wallet_new.png | Bin 0 -> 427 bytes .../Misc/workbenches.rsi/armorbenchframe0.png | Bin 0 -> 476 bytes .../Misc/workbenches.rsi/armorbenchframe1.png | Bin 0 -> 523 bytes .../Misc/workbenches.rsi/armorbenchframe2.png | Bin 0 -> 1212 bytes .../Misc/workbenches.rsi/armorbenchframe3.png | Bin 0 -> 945 bytes .../Misc/workbenches.rsi/armorbenchframe4.png | Bin 0 -> 708 bytes .../Structures/Misc/workbenches.rsi/meta.json | 30 ++ .../workbenches.rsi/weaponbenchframe0.png | Bin 0 -> 597 bytes .../workbenches.rsi/weaponbenchframe1.png | Bin 0 -> 1157 bytes .../workbenches.rsi/weaponbenchframe2.png | Bin 0 -> 678 bytes .../workbenches.rsi/weaponbenchframe3.png | Bin 0 -> 768 bytes .../workbenches.rsi/weaponbenchframe4.png | Bin 0 -> 1414 bytes 72 files changed, 1652 insertions(+), 748 deletions(-) create mode 100644 Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/base_butcherable_leather_gloves.yml create mode 100644 Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/bandanas.yml create mode 100644 Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml create mode 100644 Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/items.yml create mode 100644 Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/materials.yml create mode 100644 Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/medical.yml create mode 100644 Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/smokeables.yml create mode 100644 Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/storage.yml create mode 100644 Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml rename Resources/Prototypes/_Nuclear14/Recipes/{Reactions/ores.yml => Lathes/materials.yml} (84%) create mode 100644 Resources/Prototypes/_Nuclear14/Recipes/Lathes/weapons.yml delete mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_1.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_2.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_3.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_1.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/raw_leather_2.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/chitin_1.png rename Resources/Textures/_Nuclear14/Objects/Misc/mob_drops.rsi/{hide_brahmin.png => hide_brahmin_1.png} (100%) create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/coinpouch.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/moneybag_alt.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/wallet_new.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe0.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe1.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe2.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe3.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/armorbenchframe4.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe0.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe1.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe2.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe3.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe4.png diff --git a/Resources/Locale/en-US/_Nuclear14/construction.ftl b/Resources/Locale/en-US/_Nuclear14/construction.ftl index e1294ed6cef..94977abb74e 100644 --- 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 \ No newline at end of file +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 \ No newline at end of file diff --git a/Resources/Locale/en-US/_Nuclear14/reagents.ftl b/Resources/Locale/en-US/_Nuclear14/reagents.ftl index 33de561803f..a5530e0578b 100644 --- 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 new file mode 100644 index 00000000000..bac8fca8977 --- /dev/null +++ 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 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Hands/gloves.yml index 63d7d224513..c9e3afaaaf3 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml index 59893df9c77..d5ed55dec22 100644 --- 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 index 910331457a6..487026754e5 100644 --- 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 \ No newline at end of file + sprite: _Nuclear14/Clothing/Neck/yaoguai.rsi + - type: Construction + graph: YaoguaiCloakGraph + node: cloak + - type: Butcherable + butcheringType: Knife + spawned: + - id: N14MaterialYaoguaiHide + amount: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Neck/mantles.yml index 4d5b0657197..a38f53d1467 100644 --- 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 index c4a9c2f5441..c57f138c128 100644 --- 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 index 47b5f8d844b..c01a8a6c42f 100644 --- 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 index 896120f5c36..bc1df73b5a8 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml index 67d8c3aa72c..2f7d57d6c66 100644 --- 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 index 6bc5eba678a..821b8db8955 100644 --- 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 index 6fa8176e022..317c4a37d21 100644 --- 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 index 9b02099bf2a..95f9b508aa1 100644 --- 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 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml index f36031b9fc2..f7af87fe56d 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml @@ -1,12 +1,39 @@ # See specific/hydroponics for fertilizer. +#MARK: Base - type: entity - parent: BaseItem - id: Gunpowder - name: gunpowder + abstract: true + parent: MaterialBase + id: N14MaterialBase suffix: Full, 30 + description: A raw material. components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/materials.rsi - type: Material + - type: Appearance + +- type: entity + parent: N14MaterialBase + id: N14MaterialBasePowder + abstract: true + components: + - type: Sprite + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: powder_lead + - type: ExaminableSolution + solution: powder + - type: Extractable + grindableSolutionName: powder + +# Other +#MARK: Gunpowder +- type: entity + parent: N14MaterialBasePowder + id: Gunpowder + name: gunpowder + description: Explosive. + components: - type: PhysicalComposition materialComposition: Gunpowder: 100 @@ -21,39 +48,32 @@ map: ["base"] - type: Item heldPrefix: powder_lead - - type: Appearance - type: SolutionContainerManager solutions: powder: reagents: - ReagentId: Gunpowder Quantity: 10 - - type: ExaminableSolution - solution: powder - - type: Tag - tags: - - RawMaterial - - type: Extractable - grindableSolutionName: powder - type: entity parent: Gunpowder - id: Gunpowder1 - suffix: Single + id: Gunpowder10 + suffix: 10 components: - type: Stack - count: 1 + count: 10 - type: entity parent: Gunpowder - id: Gunpowder10 - suffix: 10 + id: Gunpowder1 + suffix: Single components: - type: Stack - count: 10 + count: 1 +#MARK: Sulfur - type: entity - parent: Gunpowder + parent: N14MaterialBasePowder id: SulfurPowder name: sulfur components: @@ -71,7 +91,6 @@ map: ["base"] - type: Item heldPrefix: powder_brass - - type: Appearance - type: SolutionContainerManager solutions: powder: @@ -81,25 +100,26 @@ - type: entity parent: SulfurPowder - id: SulfurPowder1 - suffix: Single + id: SulfurPowder10 + suffix: 10 components: - type: Stack - count: 1 + count: 10 - type: entity parent: SulfurPowder - id: SulfurPowder10 - suffix: 10 + id: SulfurPowder1 + suffix: Single components: - type: Stack - count: 10 + count: 1 +#MARK: Sheet paper - type: entity - parent: SheetPaper + parent: SheetOtherBase id: N14Paper name: paper - suffix: 10 + suffix: Full, 10 components: - type: Stack stackType: N14Paper @@ -107,6 +127,7 @@ baseLayer: base layerStates: - paper + - type: Material - type: Sprite sprite: /Textures/_Nuclear14/Objects/Misc/clutter.rsi state: paper @@ -118,25 +139,37 @@ - type: Construction graph: N14Paper node: paper + - type: PhysicalComposition + materialComposition: + Paper: 100 + - type: Extractable + grindableSolutionName: paper + - type: SolutionContainerManager + solutions: + paper: + reagents: + - ReagentId: Cellulose + Quantity: 3 - type: entity parent: N14Paper - id: N14Paper1 - suffix: Single + id: N14Paper10 + suffix: 10 components: - type: Stack - count: 1 + count: 10 - type: entity parent: N14Paper - id: N14Paper10 - suffix: 10 + id: N14Paper1 + suffix: Single components: - type: Stack - count: 10 + count: 1 +#MARK: Charcoal - type: entity - parent: Gunpowder + parent: N14MaterialBasePowder id: Charcoal name: charcoal components: @@ -163,6 +196,14 @@ - ReagentId: Charcoal Quantity: 10 +- type: entity + parent: Charcoal + id: Charcoal10 + suffix: 10 + components: + - type: Stack + count: 10 + - type: entity parent: Charcoal id: Charcoal1 @@ -171,82 +212,168 @@ - type: Stack count: 1 +#MARK: Circuitry - type: entity - parent: Charcoal - id: Charcoal10 + parent: N14MaterialBase + id: N14MaterialCircuitry + name: circuitry + suffix: Full + components: + - type: Material + - type: PhysicalComposition + materialComposition: + Circuitry: 100 + - type: Stack + stackType: Circuitry + baseLayer: base + layerStates: + - circuits + - circuits_2 + - circuits_3 + count: 15 + - type: Sprite + state: circuits_3 + layers: + - state: circuits_3 + map: ["base"] + - type: Appearance + +- type: entity + parent: N14MaterialCircuitry + id: N14MaterialCircuitry10 suffix: 10 components: + - type: Sprite + state: circuits_2 - type: Stack count: 10 - type: entity - parent: BaseItem - id: N14Dung - name: dung pile - description: flip those cowpats for free fertilizer! + parent: N14MaterialCircuitry + id: N14MaterialCircuitry1 + suffix: Single + components: + - type: Sprite + state: circuits + - type: Stack + count: 1 + +# Organic +#MARK: Leather +- type: entity + parent: N14MaterialBase + id: N14MaterialLeather + name: leather + description: A piece of leather, just non-special leather. + suffix: Full, 15 components: - type: Sprite - sprite: /Textures/_Nuclear14/Objects/Misc/crafting_material.rsi - noRot: true + state: leather_3 layers: - - state: dung - - state: dung-flies -# N14:TODO: Add creampie ing but worse and it makes you throw up. - - type: SolutionContainerManager - solutions: - dung: - maxVol: 25 - reagents: - - ReagentId: Dung - Quantity: 25 - - type: DrainableSolution - solution: dung - - type: SolutionTransfer - canChangeTransferAmount: false - - type: DeleteOnSolutionEmpty - solution: dung - - type: TimedDespawn - lifetime: 300 - -- type: entity - parent: N14Dung - id: N14BrahminDung - name: brahmin dung - description: A dung pile more acrid and vile than the rest, rancher's gold. + - state: leather_3 + map: ["base"] + - type: Stack + stackType: Leather + count: 15 + baseLayer: base + layerStates: + - leather_1 + - leather_2 + - leather_3 + - type: PhysicalComposition + materialComposition: + Leather: 100 + +- type: entity + parent: N14MaterialLeather + id: N14MaterialLeather1 + suffix: Single components: - - type: SolutionContainerManager - solutions: - dung: - maxVol: 25 - reagents: - - ReagentId: Dung - Quantity: 15 - - ReagentId: Ammonia - Quantity: 10 + - type: Stack + count: 1 +#MARK: Raw leather - type: entity - parent: BaseItem - id: N14CompostRotted - name: compost - description: Rotting remains, like a compost. Good for fertilizing. + parent: N14MaterialBase + id: N14MaterialRawLeather + name: raw leather + description: A piece of raw, unusable skin. Nothing special. + suffix: Full, 15 components: - type: Sprite - sprite: /Textures/_Nuclear14/Objects/Misc/crafting_material.rsi - state: compost - - type: SolutionContainerManager - solutions: - compost: - maxVol: 25 - reagents: - - ReagentId: Fertilizer - Quantity: 25 - - type: DrainableSolution - solution: compost - - type: SolutionTransfer - canChangeTransferAmount: false - - type: DeleteOnSolutionEmpty - solution: compost - - type: Material + state: raw_leather_2 + layers: + - state: raw_leather_2 + map: ["base"] + - type: Stack + stackType: RawLeather + count: 15 + baseLayer: base + layerStates: + - raw_leather_1 + - raw_leather_2 + - type: PhysicalComposition + materialComposition: + RawLeather: 100 + +- type: entity + parent: N14MaterialRawLeather + id: N14MaterialRawLeather1 + suffix: Single + components: - type: Stack - stackType: Compost count: 1 + +#MARK: Ant-chitin +- type: entity + parent: N14MaterialBase + id: N14MaterialAntChitin + name: ant chitin + description: A strong and resistent piece of ant "skin". + suffix: Full, 3 + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/mob_drops.rsi + state: chitin_3 + layers: + - state: chitin_3 + map: ["base"] + - type: Stack + stackType: AntChitin + count: 3 + baseLayer: base + layerStates: + - chitin_1 + - chitin_1 + - chitin_2 + - chitin_3 + - type: PhysicalComposition + materialComposition: + AntChitin: 100 + - type: Item + size: Small + +- type: entity + parent: N14MaterialAntChitin + id: N14MaterialAntChitin1 + suffix: Single + components: + - type: Stack + count: 1 + +#MARK: Exoskeleton +- type: entity + parent: N14MaterialBase + id: N14MaterialExoskeleton + name: radscorpion exoskeleton piece + description: A strong and resistent piece of radscorpion exoskeleton. + suffix: "" + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/mob_drops.rsi + state: rad_exo + - type: PhysicalComposition + materialComposition: + Exoskeleton: 100 + - type: Item + size: Small \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml index 87388bb7f7f..b479975f863 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/ore.yml @@ -1,5 +1,5 @@ - type: entity - parent: OreBase + parent: OreBase # From Entities\Objects\Materials\ore.yml id: LeadOre name: lead ore suffix: Full diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/craftingmaterials.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/craftingmaterials.yml index a00de12e076..bba4c034276 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/craftingmaterials.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/craftingmaterials.yml @@ -1,4 +1,4 @@ -# Animal Parts +#MARK: Animal Parts - type: entity parent: BaseItem id: N14MaterialRadscorpionTail @@ -21,66 +21,80 @@ - ReagentId: ScorpionTail Quantity: 10 +#MARK: Hide's - type: entity parent: BaseItem - id: N14MaterialBrahminHide - name: brahmin hide - description: The flesh of a brahmin. Leather-like and tough. + id: N14MaterialBaseHide + abstract: true components: - type: Sprite sprite: _Nuclear14/Objects/Misc/mob_drops.rsi state: hide_brahmin - - type: Stack - stackType: BrahminHide + - type: Tag + tags: + - RawLeather + - type: PhysicalComposition + materialComposition: + RawLeather: 400 + - type: Material + - type: Item + size: Normal - type: entity - parent: BaseItem - id: N14MaterialAntChitin - name: ant chitin - description: A strong and resistent piece of ant "skin". + parent: N14MaterialBaseHide + id: N14MaterialBrahminHide + name: brahmin hide + description: The flesh of a brahmin. Leather-like and tough. + suffix: Full, 4 components: - type: Sprite - sprite: _Nuclear14/Objects/Misc/mob_drops.rsi - state: chitin + state: hide_brahmin_2 + layers: + - state: hide_brahmin_2 + map: ["base"] + - type: Stack + stackType: BrahminHide + count: 4 + baseLayer: base + layerStates: + - hide_brahmin_1 + - hide_brahmin_1 + - hide_brahmin_2 + - type: Appearance - type: entity - parent: BaseItem - id: N14MaterialExoskeleton - name: radscorpion exoskeleton piece - description: A strong and resistent piece of radscorpion exoskeleton. + parent: N14MaterialBrahminHide + id: N14MaterialBrahminHide1 + suffix: Single components: - - type: Sprite - sprite: _Nuclear14/Objects/Misc/mob_drops.rsi - state: rad_exo + - type: Stack + stackType: BrahminHide + count: 1 - type: entity - parent: BaseItem + parent: N14MaterialBaseHide id: N14MaterialNightstalkerPelt name: nightstalker pelt description: A pelt of fresh nightstalker leather. components: - type: Sprite - sprite: _Nuclear14/Objects/Misc/mob_drops.rsi state: pelt_nightstalker + - type: PhysicalComposition + materialComposition: + RawLeather: 300 - type: entity - parent: BaseItem + parent: N14MaterialBaseHide id: N14MaterialYaoguaiHide name: yaoguai hide description: A big hide of yaoguai, heavy and strong. components: - type: Sprite - sprite: _Nuclear14/Objects/Misc/mob_drops.rsi state: hide_yaoguai - -# Materials - -- type: entity - parent: BaseItem - id: N14MaterialLeather - name: leather - description: A piece of leather, just non-special leather. - components: - - type: Sprite - sprite: _Nuclear14/Objects/Misc/materials.rsi - state: leather \ No newline at end of file + - type: Tag + tags: + - YaoguaiHide + - RawLeather + - type: PhysicalComposition + materialComposition: + RawLeather: 600 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml index ccf2304811e..9fa7b811583 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml @@ -7,7 +7,8 @@ - type: Sprite sprite: _Nuclear14/Objects/Misc/storage.rsi state: wallet - scale: 0.6, 0.6 + offset: "0.0,-0.02" + # scale: 0.8, 0.8 - type: Item storedRotation: -90 - type: Clothing @@ -28,6 +29,7 @@ - type: Construction graph: N14Wallet node: wallet + # Caps # Scroll down for other currencies - type: entity diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/materials.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/materials.yml index 4e021fa4488..1ff4c58189f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/materials.yml @@ -1,70 +1,73 @@ # There may be some overlap with the Junk.yml so look there for other crafting components. -- type: entity - abstract: true - parent: BaseItem - id: N14MaterialBase - description: A raw material. - components: - - type: Sprite - sprite: _Nuclear14/Objects/Misc/materials.rsi - - type: Item - sprite: _Nuclear14/Objects/Misc/materials.rsi - size: Normal - - type: Tag - tags: - - RawMaterial - - type: Damageable - damageContainer: Inorganic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - type: entity - parent: N14MaterialBase - id: N14MaterialCircuitry - name: circuitry - suffix: Full + parent: BaseItem + id: N14Dung + name: dung pile + description: flip those cowpats for free fertilizer! components: - - type: Material -# - type: PhysicalComposition -# materialComposition: -# Circuitry: 100 - - type: Stack - stackType: Circuitry - baseLayer: base - layerStates: - - circuits - - circuits_2 - - circuits_3 - count: 15 - type: Sprite - state: circuits_3 + sprite: /Textures/_Nuclear14/Objects/Misc/crafting_material.rsi + noRot: true layers: - - state: circuits_3 - map: ["base"] - - type: Appearance - + - state: dung + - state: dung-flies +# N14:TODO: Add creampie ing but worse and it makes you throw up. + - type: SolutionContainerManager + solutions: + dung: + maxVol: 25 + reagents: + - ReagentId: Dung + Quantity: 25 + - type: DrainableSolution + solution: dung + - type: SolutionTransfer + canChangeTransferAmount: false + - type: DeleteOnSolutionEmpty + solution: dung + - type: TimedDespawn + lifetime: 300 + - type: entity - parent: N14MaterialCircuitry - id: N14MaterialCircuitry10 - suffix: 10 + parent: N14Dung + id: N14BrahminDung + name: brahmin dung + description: A dung pile more acrid and vile than the rest, rancher's gold. components: - - type: Sprite - state: circuits_2 - - type: Stack - count: 10 + - type: SolutionContainerManager + solutions: + dung: + maxVol: 25 + reagents: + - ReagentId: Dung + Quantity: 15 + - ReagentId: Ammonia + Quantity: 10 - type: entity - parent: N14MaterialCircuitry - id: N14MaterialCircuitry1 - suffix: Single + parent: BaseItem + id: N14CompostRotted + name: compost + description: Rotting remains, like a compost. Good for fertilizing. components: - type: Sprite - state: circuits + sprite: /Textures/_Nuclear14/Objects/Misc/crafting_material.rsi + state: compost + - type: SolutionContainerManager + solutions: + compost: + maxVol: 25 + reagents: + - ReagentId: Fertilizer + Quantity: 25 + - type: DrainableSolution + solution: compost + - type: SolutionTransfer + canChangeTransferAmount: false + - type: DeleteOnSolutionEmpty + solution: compost + - type: Material - type: Stack + stackType: Compost count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml index 8584d67fcb3..13fcf924e5e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml @@ -42,6 +42,22 @@ components: - type: Sprite state: weaponbench + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + - type: Lathe + idleState: icon + runningState: icon # change this + staticRecipes: # Guns or melee weapons related only. + # Guns + - BowImprovised + # Melee + - N14ScrapMachete + - N14WastelandSpear + - N14WastelandTribalJavelin - type: entity parent: N14WorkbenchBase @@ -141,6 +157,34 @@ components: - type: Sprite state: armorbench + - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + - RawLeather # move it to the tanning machine + - type: Lathe + idleState: icon + runningState: icon # change this + staticRecipes: + # Armor + - N14ClothingOuterCoatLeatherDuster + - N14ClothingOuterCoatWinterArmored + - N14ClothingOuterLeatherArmor + - N14ClothingOuterChitinArmor + - N14ClothingOuterPainspike + - N14ClothingOuterTribalArmorHeavy + - N14ClothingOuterInsectArmor + - N14ClothingOuterMetalArmor + # Shield's + - N14InsectShield + - MakeshiftShield + - WoodenBuckler + # Other + - N14MaterialLeather + - ClothingBeltQuiver # In misc.yml + - ClothingBeltQuiverSpear - type: entity parent: N14WorkbenchBase @@ -150,6 +194,27 @@ components: - type: Sprite state: tinkerbench + - type: PointLight + color: "#fffbeb" + energy: 2 + offset: 0.5, 0 + radius: 1.5 + - type: Lathe + idleState: icon + runningState: icon # change this + staticRecipes: + #Tools + - N14Multitool + - N14NetworkConfigurator + - N14PowerDrill + - N14HandheldGPSBasic + - N14TRayScanner + - N14GasAnalyzer + - N14RPED + - N14MiningDrill + #Misc + - N14FlashlightLantern + - N14GlowstickRed - type: entity parent: BaseStructure @@ -235,12 +300,6 @@ description: A workbench with metal working tools for crafting. name: workbench components: - - type: PointLight - radius: 2 - energy: 1 - softness: 0.5 - color: "#f05e1b" - offset: "0.5, 0" - type: Construction graph: N14WorkbenchMetal node: WorkbenchMetal @@ -265,15 +324,7 @@ - N14Crowbar - N14Pickaxe - N14Shovel - - N14Multitool - - N14NetworkConfigurator - - N14PowerDrill - - N14HandheldGPSBasic - - N14TRayScanner - - N14GasAnalyzer - N14SprayPainter - - N14RPED - - N14MiningDrill - N14ClothingEyesGlassesWelding # Kitchen - N14ButchersCleaver @@ -324,10 +375,10 @@ - N14ExteriorLightTube - N14LightBulb - N14LedLightBulb - - N14GlowstickRed - N14Flare - - N14FlashlightLantern - N14Matchbox + # Ammo + - ArrowRegular - type: entity parent: N14WorkbenchBase @@ -369,8 +420,10 @@ sprite: _Nuclear14/Structures/Misc/forgeworkbench.rsi state: forge - type: PointLight - energy: 2 - offset: "-0.65, 0" + offset: "-0.13, 0" + color: "#f05e1b" + radius: 3 + energy: 3 - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml index ceacac48407..31cb474d244 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml @@ -131,3 +131,35 @@ icon: { sprite: _Nuclear14/Structures/Decoration/flora.rsi, state: tree_timber } color: "#1D3B3E" price: 0.15 + +- type: material + id: Leather + stackEntity: N14MaterialLeather1 + name: materials-leather + unit: materials-unit-roll + icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: leather_3 } + price: 0.15 + +- type: material + id: Exoskeleton + stackEntity: N14MaterialExoskeleton + name: materials-exoskeleton + unit: materials-unit-piece + icon: { sprite: _Nuclear14/Objects/Misc/mob_drops.rsi, state: rad_exo } + price: 0.05 + +- type: material + id: AntChitin + stackEntity: N14MaterialAntChitin1 + name: materials-antchitin + unit: materials-unit-piece + icon: { sprite: _Nuclear14/Objects/Misc/mob_drops.rsi, state: chitin_3 } + price: 0.05 + +- type: material + id: RawLeather + stackEntity: N14MaterialRawLeather1 + name: materials-raw-leather + unit: materials-unit-roll + icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: raw_leather_2 } + price: 0.10 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/bandanas.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/bandanas.yml new file mode 100644 index 00000000000..a8728020b98 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/bandanas.yml @@ -0,0 +1,111 @@ +- type: constructionGraph + id: blackbandana + start: start + graph: + - node: start + edges: + - to: bandanablack + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanablack + entity: ClothingMaskBandBlack + +- type: constructionGraph + id: bluebandana + start: start + graph: + - node: start + edges: + - to: bandanablue + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanablue + entity: ClothingMaskBandBlue + +- type: constructionGraph + id: brownbandana + start: start + graph: + - node: start + edges: + - to: bandanabrown + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanabrown + entity: ClothingMaskBandBrown + +- type: constructionGraph + id: goldbandana + start: start + graph: + - node: start + edges: + - to: bandanagold + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanagold + entity: ClothingMaskBandGold + +- type: constructionGraph + id: greenbandana + start: start + graph: + - node: start + edges: + - to: bandanagreen + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanagreen + entity: ClothingMaskBandGreen + +- type: constructionGraph + id: greybandana + start: start + graph: + - node: start + edges: + - to: bandanagrey + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanagrey + entity: ClothingMaskBandGrey + +- type: constructionGraph + id: redbandana + start: start + graph: + - node: start + edges: + - to: bandanared + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanared + entity: ClothingMaskBandRed + +- type: constructionGraph + id: skullbandana + start: start + graph: + - node: start + edges: + - to: bandanaskull + steps: + - material: Cloth + amount: 1 + doAfter: 5 + - node: bandanaskull + entity: ClothingMaskBandSkull \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml new file mode 100644 index 00000000000..850d2d999af --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/clothing.yml @@ -0,0 +1,75 @@ +#MARK: Uniform's +- type: constructionGraph + id: WastelanderRagsGraph + start: start + graph: + - node: start + edges: + - to: rags + steps: + - material: Cloth + amount: 4 + doAfter: 8 + - node: rags + entity: N14ClothingUniformJumpsuitRags + +#MARK: Mantie's +- type: constructionGraph + id: LeatherMantleGraph + start: start + graph: + - node: start + edges: + - to: mantle + steps: + - material: Leather + amount: 2 + doAfter: 4 + - node: mantle + entity: N14ClothingNeckMantleLeather + +- type: constructionGraph + id: LeatherCloakGraph + start: start + graph: + - node: start + edges: + - to: cloak + steps: + - material: Leather + amount: 2 + doAfter: 4 + - node: cloak + entity: N14ClothingNeckCloakLeather + +- type: constructionGraph + id: YaoguaiCloakGraph + start: start + graph: + - node: start + edges: + - to: cloak + steps: + - tag: YaoguaiHide + name: yaoguai hide + icon: + sprite: _Nuclear14/Objects/Misc/mob_drops.rsi + state: hide_yaoguai + doAfter: 8 + - node: cloak + entity: N14ClothingNeckCloakYaoguai + +#MARK: Gloves +- type: constructionGraph + id: GlovesClothGraph + start: start + graph: + - node: start + edges: + - to: gloves + steps: + - material: Cloth + amount: 2 + doAfter: 4 + - node: gloves + entity: N14ClothingHandsGlovesCloth \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/items.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/items.yml new file mode 100644 index 00000000000..c1846375b65 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/items.yml @@ -0,0 +1,24 @@ +- type: constructionGraph + id: N14BedrollItem + start: start + graph: + - node: start + edges: + - to: bedroll + steps: + - material: Cloth + amount: 3 + doAfter: 3 + + - node: bedroll + entity: N14BedrollItem + edges: + - to: start + steps: + - tool: Cutting + doAfter: 3 + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + - !type:DeleteEntity \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/materials.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/materials.yml new file mode 100644 index 00000000000..b3629a2813a --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/materials.yml @@ -0,0 +1,26 @@ +- type: constructionGraph + id: N14Cardboard + start: start + graph: + - node: start + edges: + - to: cardboard + steps: + - material: N14Paper + amount: 2 + doAfter: 2 + - node: cardboard + entity: MaterialCardboard1 + +- type: constructionGraph + id: N14Paper + start: start + graph: + - node: start + edges: + - to: paper + steps: + - material: WoodPlank + doAfter: 2 + - node: paper + entity: N14Paper \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/medical.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/medical.yml new file mode 100644 index 00000000000..30bb19abf97 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/medical.yml @@ -0,0 +1,158 @@ +# Mortar and pestle +- type: constructionGraph + id: N14MortarPestle + start: start + graph: + - node: start + edges: + - to: mortarpestle + steps: + - material: WoodPlank + amount: 2 + doAfter: 5 + + - node: mortarpestle + entity: N14MortarpestleGrinder + + +# Healing Powder +- type: constructionGraph + id: N14HealingPowder + start: start + graph: + - node: start + edges: + - to: healingpowder + steps: + - material: BrocFlower + - material: XanderRoot # TODO: Find out if we can add a tool step for crushing. Tests fail for now with it in. Slap crafting doesn't like tool steps. + + - node: healingpowder + entity: N14HealingPowder + +# Stimpaks +- type: constructionGraph + id: N14Stimpak + start: start + graph: + - node: start + edges: + - to: stimpak + steps: + - material: BrocFlower + - material: XanderRoot + - tag: Syringe + name: a syringe + icon: + sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi + state: stimpak + doAfter: 1 + - material: Bloodpack + doAfter: 1 + + - node: stimpak + entity: N14Stimpak + +# RadAway Inhaler +- type: constructionGraph + id: N14RadAwayInhaler + start: start + graph: + - node: start + edges: + - to: empty + steps: + - tag: Jet + name: jet + icon: + sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi + state: jet + - material: Glass + amount: 1 + doAfter: 3 + - node: empty + entity: N14RadAwayInhalerTrash + edges: + - to: refill + steps: + - tag: Phial + name: RadAway Phial + icon: + sprite: _Nuclear14/Objects/Specific/Medical/radinhaler.rsi + state: radawayphial_icon + doAfter: 2 + - node: refill + entity: N14RadAwayInhaler + edges: + - to: empty + steps: + - tool: Screwing + doAfter: 2 + +# RadAway Phial +- type: constructionGraph + id: N14RadAwayPhial + start: start + graph: + - node: start + edges: + - to: fill + conditions: + - !type:MinSolution + solution: beaker + reagent: + ReagentId: RadAway + quantity: 30 + steps: + - tool: Screwing + doAfter: 1 + - node: fill + entity: N14RadAwayPhial + +#TODO: Crashes game, needs a C# script to support it + +# - type: constructionGraph +# id: N14RadAwayPhialRefill +# start: start +# graph: +# - node: start +# edges: +# - to: phial +# steps: +# - material: CaveFungusRad +# - material: Plastic +# doAfter: 3 +# - node: phial +# entity: N14RadAwayPhialEmpty +# edges: +# - to: refill +# conditions: +# - !type:MinSolution +# solution: beaker +# reagent: +# ReagentId: Antiseptic +# quantity: 20 +# - !type:MinSolution +# solution: beaker +# reagent: +# ReagentId: Water +# quantity: 10 +# steps: +# - tool: Screwing +# doAfter: 1 +# - node: fill +# entity: N14RadAwayPhial + +# Jet +- type: constructionGraph + id: N14JetInhaler + start: start + graph: + - node: start + edges: + - to: jet + steps: + - material: Plastic + + - node: jet + entity: N14JetInhaler diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/smokeables.yml new file mode 100644 index 00000000000..52653c70b53 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/smokeables.yml @@ -0,0 +1,28 @@ +# Rolling Paper +- type: constructionGraph + id: N14RollingPaper + start: start + graph: + - node: start + edges: + - to: rollingpaper + steps: + - material: N14Paper + doAfter: 2 + - node: rollingpaper + entity: N14RollingPaper + +# Rollie +- type: constructionGraph + id: N14Cigarette + start: start + graph: + - node: start + edges: + - to: cigarette + steps: + - material: N14RollingPaper + - material: CoyoteTobacco + doAfter: 2 + - node: cigarette + entity: N14CigaretteRollie \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/storage.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/storage.yml new file mode 100644 index 00000000000..7165f8f3a19 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/Graphs/storage.yml @@ -0,0 +1,105 @@ +# Sacks +- type: constructionGraph + id: N14Sack + start: start + graph: + - node: start + edges: + - to: sack + steps: + - material: Cloth + amount: 3 + doAfter: 3 + + - node: sack + entity: N14Sack + edges: + - to: start + steps: + - tool: Cutting + doAfter: 3 + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + - !type:EmptyAllContainers + - !type:DeleteEntity + +- type: constructionGraph + id: N14SackCompost + start: start + graph: + - node: start + edges: + - to: sack + steps: + - material: Cloth + amount: 3 + doAfter: 3 + + - node: sack + entity: N14SackCompost + edges: + - to: start + steps: + - tool: Cutting + doAfter: 3 + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + - !type:EmptyAllContainers + - !type:DeleteEntity + +- type: constructionGraph + id: N14SackFertilizer + start: start + graph: + - node: start + edges: + - to: sack + steps: + - material: Cloth + amount: 3 + doAfter: 3 + + - node: sack + entity: N14SackFertilizer + edges: + - to: start + steps: + - tool: Cutting + doAfter: 3 + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + - !type:EmptyAllContainers + - !type:DeleteEntity + +# Wallet +- type: constructionGraph + id: N14Wallet + start: start + graph: + - node: start + edges: + - to: wallet + steps: + - material: Cloth + amount: 3 + doAfter: 3 + + - node: wallet + entity: N14Wallet + edges: + - to: start + steps: + - tool: Cutting + doAfter: 3 + completed: + - !type:SpawnPrototype + prototype: MaterialCloth1 + amount: 2 + - !type:EmptyAllContainers + - !type:DeleteEntity diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml index 5e989ba3855..b50405b0d7e 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/clothing.yml @@ -1,3 +1,4 @@ +#MARK: Bandanas - type: construction name: black bandana id: blackbandana @@ -12,20 +13,6 @@ state: icon_mask hide: false -- type: constructionGraph - id: blackbandana - start: start - graph: - - node: start - edges: - - to: bandanablack - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanablack - entity: ClothingMaskBandBlack - - type: construction name: blue bandana id: bluebandana @@ -38,21 +25,7 @@ icon: sprite: Clothing/Head/Bandanas/blue.rsi state: icon_mask - hide: false - -- type: constructionGraph - id: bluebandana - start: start - graph: - - node: start - edges: - - to: bandanablue - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanablue - entity: ClothingMaskBandBlue + hide: true #MARK: Hide - type: construction name: gold bandana @@ -66,21 +39,7 @@ icon: sprite: Clothing/Head/Bandanas/gold.rsi state: icon_mask - hide: false - -- type: constructionGraph - id: goldbandana - start: start - graph: - - node: start - edges: - - to: bandanagold - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanagold - entity: ClothingMaskBandGold + hide: true #MARK: Hide - type: construction name: green bandana @@ -94,21 +53,7 @@ icon: sprite: Clothing/Head/Bandanas/green.rsi state: icon_mask - hide: false - -- type: constructionGraph - id: greenbandana - start: start - graph: - - node: start - edges: - - to: bandanagreen - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanagreen - entity: ClothingMaskBandGreen + hide: true #MARK: Hide - type: construction name: red bandana @@ -122,21 +67,7 @@ icon: sprite: Clothing/Head/Bandanas/red.rsi state: icon_mask - hide: false - -- type: constructionGraph - id: redbandana - start: start - graph: - - node: start - edges: - - to: bandanared - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanared - entity: ClothingMaskBandRed + hide: true #MARK: Hide - type: construction name: skull bandana @@ -150,21 +81,7 @@ icon: sprite: Clothing/Head/Bandanas/skull.rsi state: icon_mask - hide: false - -- type: constructionGraph - id: skullbandana - start: start - graph: - - node: start - edges: - - to: bandanaskull - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanaskull - entity: ClothingMaskBandSkull + hide: true #MARK: Hide - type: construction name: brown bandana @@ -180,20 +97,6 @@ state: icon_mask hide: false -- type: constructionGraph - id: brownbandana - start: start - graph: - - node: start - edges: - - to: bandanabrown - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanabrown - entity: ClothingMaskBandBrown - - type: construction name: grey bandana id: greybandana @@ -208,16 +111,74 @@ state: icon_mask hide: false -- type: constructionGraph - id: greybandana - start: start - graph: - - node: start - edges: - - to: bandanagrey - steps: - - material: Cloth - amount: 1 - doAfter: 5 - - node: bandanagrey - entity: ClothingMaskBandGrey \ No newline at end of file +#MARK: Uniform's +- type: construction + name: wastelander rags + id: WastelanderRags + graph: WastelanderRagsGraph + startNode: start + targetNode: rags + category: construction-category-clothing + objectType: Item + description: Hey, it's better than nothing. + icon: + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/wastelanderrags.rsi + state: icon + hide: false + +#MARK: Mantle's +- type: construction + id: LeatherMantle + name: leather mantle + description: A comfortable brown long mantle. + category: construction-category-clothing + objectType: Item + graph: LeatherMantleGraph + startNode: start + targetNode: mantle + icon: + sprite: _Nuclear14/Clothing/Neck/leathermantle.rsi + state: icon + hide: false + +- type: construction + id: LeatherCloak + name: leather cloak + description: A handmade cloak, comfy and warm. + category: construction-category-clothing + objectType: Item + graph: LeatherCloakGraph + startNode: start + targetNode: cloak + icon: + sprite: _Nuclear14/Clothing/Neck/leathercloak.rsi + state: icon + hide: false + +- type: construction + id: YaoguaiCloak + name: yaoguai cloak + description: A handmade cloak, comfy and warm this piece comes from a dangerous yaoguai. + category: construction-category-clothing + objectType: Item + graph: YaoguaiCloakGraph + startNode: start + targetNode: cloak + icon: + sprite: _Nuclear14/Clothing/Neck/yaoguai.rsi + state: icon + hide: false + +- type: construction + id: GlovesCloth + name: cloth gloves + description: A piece of cloth to tie around the hand. + category: construction-category-clothing + objectType: Item + graph: GlovesClothGraph + startNode: start + targetNode: gloves + icon: + sprite: _Nuclear14/Clothing/Hands/Gloves/clothgloves.rsi + state: icon + hide: false diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml index 87af83333a1..f7721cc06f8 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/items.yml @@ -11,29 +11,4 @@ icon: sprite: _Nuclear14/Structures/Furniture/bedsandchairs.rsi state: bedroll_rolled - objectType: Item - -- type: constructionGraph - id: N14BedrollItem - start: start - graph: - - node: start - edges: - - to: bedroll - steps: - - material: Cloth - amount: 3 - doAfter: 3 - - - node: bedroll - entity: N14BedrollItem - edges: - - to: start - steps: - - tool: Cutting - doAfter: 3 - completed: - - !type:SpawnPrototype - prototype: MaterialCloth1 - amount: 2 - - !type:DeleteEntity \ No newline at end of file + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/materials.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/materials.yml index 638b8576a51..2f3ecf86026 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/materials.yml @@ -11,19 +11,6 @@ objectType: Item hide: false -- type: constructionGraph - id: N14Paper - start: start - graph: - - node: start - edges: - - to: paper - steps: - - material: WoodPlank - doAfter: 2 - - node: paper - entity: N14Paper - # Cardboard - type: construction name: cardboard @@ -35,18 +22,4 @@ description: "A sheet of cardboard." icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cardboard } objectType: Item - hide: false - -- type: constructionGraph - id: N14Cardboard - start: start - graph: - - node: start - edges: - - to: cardboard - steps: - - material: N14Paper - amount: 2 - doAfter: 2 - - node: cardboard - entity: MaterialCardboard1 \ No newline at end of file + hide: false \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml index fbace340654..c88979fd858 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/medical.yml @@ -13,22 +13,6 @@ state: mortar objectType: Item -- type: constructionGraph - id: N14MortarPestle - start: start - graph: - - node: start - edges: - - to: mortarpestle - steps: - - material: WoodPlank - amount: 2 - doAfter: 5 - - - node: mortarpestle - entity: N14MortarpestleGrinder - - # Healing Powder - type: construction name: healing powder @@ -44,20 +28,6 @@ state: healingpowder objectType: Item -- type: constructionGraph - id: N14HealingPowder - start: start - graph: - - node: start - edges: - - to: healingpowder - steps: - - material: BrocFlower - - material: XanderRoot # TODO: Find out if we can add a tool step for crushing. Tests fail for now with it in. Slap crafting doesn't like tool steps. - - - node: healingpowder - entity: N14HealingPowder - # Stimpaks - type: construction name: stimpak @@ -73,28 +43,6 @@ state: stimpak objectType: Item -- type: constructionGraph - id: N14Stimpak - start: start - graph: - - node: start - edges: - - to: stimpak - steps: - - material: BrocFlower - - material: XanderRoot - - tag: Syringe - name: a syringe - icon: - sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi - state: stimpak - doAfter: 1 - - material: Bloodpack - doAfter: 1 - - - node: stimpak - entity: N14Stimpak - # RadAway Inhaler - type: construction name: RadAway inhaler @@ -110,41 +58,6 @@ sprite: _Nuclear14/Objects/Specific/Medical/radinhaler.rsi state: radawayinhaler -- type: constructionGraph - id: N14RadAwayInhaler - start: start - graph: - - node: start - edges: - - to: empty - steps: - - tag: Jet - name: jet - icon: - sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi - state: jet - - material: Glass - amount: 1 - doAfter: 3 - - node: empty - entity: N14RadAwayInhalerTrash - edges: - - to: refill - steps: - - tag: Phial - name: RadAway Phial - icon: - sprite: _Nuclear14/Objects/Specific/Medical/radinhaler.rsi - state: radawayphial_icon - doAfter: 2 - - node: refill - entity: N14RadAwayInhaler - edges: - - to: empty - steps: - - tool: Screwing - doAfter: 2 - # RadAway Phial - type: construction @@ -161,25 +74,6 @@ state: radawayphial_icon objectType: Item -- type: constructionGraph - id: N14RadAwayPhial - start: start - graph: - - node: start - edges: - - to: fill - conditions: - - !type:MinSolution - solution: beaker - reagent: - ReagentId: RadAway - quantity: 30 - steps: - - tool: Screwing - doAfter: 1 - - node: fill - entity: N14RadAwayPhial - #TODO: Crashes game, needs a C# script to support it # RadAway phial simple refill # - type: construction @@ -196,38 +90,6 @@ # state: radawayphial_icon # objectType: Item -# - type: constructionGraph -# id: N14RadAwayPhialRefill -# start: start -# graph: -# - node: start -# edges: -# - to: phial -# steps: -# - material: CaveFungusRad -# - material: Plastic -# doAfter: 3 -# - node: phial -# entity: N14RadAwayPhialEmpty -# edges: -# - to: refill -# conditions: -# - !type:MinSolution -# solution: beaker -# reagent: -# ReagentId: Antiseptic -# quantity: 20 -# - !type:MinSolution -# solution: beaker -# reagent: -# ReagentId: Water -# quantity: 10 -# steps: -# - tool: Screwing -# doAfter: 1 -# - node: fill -# entity: N14RadAwayPhial - # Jet - type: construction name: jet inhaler @@ -241,17 +103,4 @@ icon: sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi state: jet - objectType: Item - -- type: constructionGraph - id: N14JetInhaler - start: start - graph: - - node: start - edges: - - to: jet - steps: - - material: Plastic - - - node: jet - entity: N14JetInhaler + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/smokeables.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/smokeables.yml index 10b14237e42..08e5eb4e0b0 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/smokeables.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/smokeables.yml @@ -11,19 +11,6 @@ objectType: Item hide: false -- type: constructionGraph - id: N14RollingPaper - start: start - graph: - - node: start - edges: - - to: rollingpaper - steps: - - material: N14Paper - doAfter: 2 - - node: rollingpaper - entity: N14RollingPaper - # Rollie - type: construction name: cigarette @@ -35,18 +22,4 @@ description: "A roll up cigarette filled with coyote tobacco" icon: { sprite: _Nuclear14/Objects/Consumable/Smokeables/Cigarettes/rollie.rsi, state: unlit-icon } objectType: Item - hide: false - -- type: constructionGraph - id: N14Cigarette - start: start - graph: - - node: start - edges: - - to: cigarette - steps: - - material: N14RollingPaper - - material: CoyoteTobacco - doAfter: 2 - - node: cigarette - entity: N14CigaretteRollie \ No newline at end of file + hide: false \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/storage.yml b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/storage.yml index 6074a4ac8bb..e00c9922e40 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Crafting/storage.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Crafting/storage.yml @@ -1,4 +1,3 @@ - #Sacks - type: construction name: sack @@ -14,32 +13,6 @@ state: icon objectType: Item -- type: constructionGraph - id: N14Sack - start: start - graph: - - node: start - edges: - - to: sack - steps: - - material: Cloth - amount: 3 - doAfter: 3 - - - node: sack - entity: N14Sack - edges: - - to: start - steps: - - tool: Cutting - doAfter: 3 - completed: - - !type:SpawnPrototype - prototype: MaterialCloth1 - amount: 2 - - !type:EmptyAllContainers - - !type:DeleteEntity - - type: construction name: sack compost id: N14SackCompost @@ -54,32 +27,6 @@ state: icon objectType: Item -- type: constructionGraph - id: N14SackCompost - start: start - graph: - - node: start - edges: - - to: sack - steps: - - material: Cloth - amount: 3 - doAfter: 3 - - - node: sack - entity: N14SackCompost - edges: - - to: start - steps: - - tool: Cutting - doAfter: 3 - completed: - - !type:SpawnPrototype - prototype: MaterialCloth1 - amount: 2 - - !type:EmptyAllContainers - - !type:DeleteEntity - - type: construction name: sack fertilizer id: N14SackFertilizer @@ -94,32 +41,6 @@ state: icon objectType: Item -- type: constructionGraph - id: N14SackFertilizer - start: start - graph: - - node: start - edges: - - to: sack - steps: - - material: Cloth - amount: 3 - doAfter: 3 - - - node: sack - entity: N14SackFertilizer - edges: - - to: start - steps: - - tool: Cutting - doAfter: 3 - completed: - - !type:SpawnPrototype - prototype: MaterialCloth1 - amount: 2 - - !type:EmptyAllContainers - - !type:DeleteEntity - # Wallet - type: construction name: wallet @@ -134,29 +55,3 @@ sprite: _Nuclear14/Objects/Misc/storage.rsi state: wallet objectType: Item - -- type: constructionGraph - id: N14Wallet - start: start - graph: - - node: start - edges: - - to: wallet - steps: - - material: Cloth - amount: 3 - doAfter: 3 - - - node: wallet - entity: N14Wallet - edges: - - to: start - steps: - - tool: Cutting - doAfter: 3 - completed: - - !type:SpawnPrototype - prototype: MaterialCloth1 - amount: 2 - - !type:EmptyAllContainers - - !type:DeleteEntity diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/ammo.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/ammo.yml index 1f11e3bcf89..dda0506358a 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/ammo.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/ammo.yml @@ -1,6 +1,6 @@ # Cartride = 10 steel # Magazine = no. cartridges + 100 steel -# Box = no. cartridges + 10 cardboard +# Box = no. cartridges + 100 cardboard # Cartridges 1,2,3 lead, 2,3,4 steel, 2,3 gunpowder for: # Small: @@ -38,7 +38,7 @@ - type: latheRecipe id: Magazine556Rifle result: Magazine556Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 50 @@ -48,7 +48,7 @@ - type: latheRecipe id: LongMagazine556Rifle result: LongMagazine556Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 70 @@ -58,7 +58,7 @@ - type: latheRecipe id: LMGMagazine556Rifle result: LMGMagazine556Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 110 @@ -68,13 +68,13 @@ - type: latheRecipe id: MagazineBox556 result: MagazineBox556 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 150 Steel: 225 Gunpowder: 150 - Cardboard: 10 + Cardboard: 100 # 5mm - type: latheRecipe @@ -90,7 +90,7 @@ - type: latheRecipe id: N14MagazineMinigun5mm result: N14MagazineMinigun5mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 500 @@ -111,7 +111,7 @@ - type: latheRecipe id: Magazine762Rifle result: Magazine762Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 60 @@ -121,13 +121,13 @@ - type: latheRecipe id: MagazineBox762 result: MagazineBox762 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 120 Steel: 180 Gunpowder: 120 - Cardboard: 10 + Cardboard: 100 # 9mm - type: latheRecipe @@ -143,7 +143,7 @@ - type: latheRecipe id: N14MagazinePistol9mm result: N14MagazinePistol9mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 24 @@ -153,7 +153,7 @@ - type: latheRecipe id: N14MagazineSMG9mm result: N14MagazineSMG9mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 31 @@ -173,13 +173,13 @@ - type: latheRecipe id: MagazineBox9mm result: MagazineBox9mm - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 80 Steel: 160 Gunpowder: 160 - Cardboard: 10 + Cardboard: 100 # 10mm - type: latheRecipe @@ -195,7 +195,7 @@ - type: latheRecipe id: N14MagazinePistol10mm result: N14MagazinePistol10mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 10 @@ -205,7 +205,7 @@ - type: latheRecipe id: N14MagazineSMG10mm result: N14MagazineSMG10mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 35 @@ -225,13 +225,13 @@ - type: latheRecipe id: MagazineBox10mm result: MagazineBox10mm - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 80 Steel: 160 Gunpowder: 160 - Cardboard: 10 + Cardboard: 100 # 12.7mm - type: latheRecipe @@ -247,7 +247,7 @@ - type: latheRecipe id: N14MagazinePistol12mm result: N14MagazinePistol12mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 20 @@ -257,7 +257,7 @@ - type: latheRecipe id: N14MagazineSMG12mm result: N14MagazineSMG12mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 56 @@ -267,7 +267,7 @@ - type: latheRecipe id: N14TopMagazineSMG12mm result: N14TopMagazineSMG12mm - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 80 @@ -277,13 +277,13 @@ - type: latheRecipe id: MagazineBox12 result: MagazineBox12 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 150 Steel: 225 Gunpowder: 150 - Cardboard: 10 + Cardboard: 100 # 12ga - type: latheRecipe @@ -299,7 +299,7 @@ - type: latheRecipe id: N14MagazineShotgun12 result: N14MagazineShotgun12 - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 16 @@ -310,13 +310,13 @@ - type: latheRecipe id: MagazineBox12gauge result: MagazineBox12gauge - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 60 Paper: 90 Gunpowder: 60 - Cardboard: 10 + Cardboard: 100 # 20ga - type: latheRecipe @@ -332,7 +332,7 @@ - type: latheRecipe id: N14MagazineShotgun20 result: N14MagazineShotgun20 - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 20 @@ -343,13 +343,13 @@ - type: latheRecipe id: MagazineBox20gauge result: MagazineBox20gauge - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 30 Paper: 60 Gunpowder: 60 - Cardboard: 10 + Cardboard: 100 # 22lr - type: latheRecipe @@ -365,7 +365,7 @@ - type: latheRecipe id: N14MagazinePistol22lr result: N14MagazinePistol22lr - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 80 @@ -375,13 +375,13 @@ - type: latheRecipe id: MagazineBox22 result: MagazineBox22 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 75 Steel: 150 Gunpowder: 150 - Cardboard: 10 + Cardboard: 100 # 44 magnmum - type: latheRecipe @@ -407,13 +407,13 @@ - type: latheRecipe id: MagazineBox44 result: MagazineBox44 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 44 Steel: 166 Gunpowder: 44 - Cardboard: 10 + Cardboard: 100 # .45 auto - type: latheRecipe @@ -429,7 +429,7 @@ - type: latheRecipe id: N14MagazinePistol45 result: N14MagazinePistol45 - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 18 @@ -439,7 +439,7 @@ - type: latheRecipe id: Magazine45SubMachineGun result: Magazine45SubMachineGun - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 25 @@ -449,13 +449,13 @@ - type: latheRecipe id: MagazineBox45 result: MagazineBox45 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 75 Steel: 150 Gunpowder: 150 - Cardboard: 10 + Cardboard: 100 # .308 - type: latheRecipe @@ -471,7 +471,7 @@ - type: latheRecipe id: Magazine308Rifle result: Magazine308Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 33 @@ -481,7 +481,7 @@ - type: latheRecipe id: ClipMagazine308Rifle result: ClipMagazine308Rifle - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 24 @@ -491,13 +491,13 @@ - type: latheRecipe id: MagazineBox308 result: MagazineBox308 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 96 Steel: 128 Gunpowder: 96 - Cardboard: 10 + Cardboard: 100 # 45-70 gov't - type: latheRecipe @@ -523,19 +523,19 @@ - type: latheRecipe id: MagazineBox45-70 result: MagazineBox45-70 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 120 Steel: 150 Gunpowder: 100 - Cardboard: 10 + Cardboard: 100 # 50 - type: latheRecipe id: N14Magazine50AMR result: N14Magazine50AMR - category: N14Ammo + category: N14AmmoMagazine completetime: 5 materials: Lead: 25 @@ -545,10 +545,10 @@ - type: latheRecipe id: MagazineBox50 result: MagazineBox50 - category: N14Ammo + category: N14AmmoBox completetime: 5 materials: Lead: 150 Steel: 200 Gunpowder: 150 - Cardboard: 10 + Cardboard: 100 diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml new file mode 100644 index 00000000000..66d38af5a01 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/armor.yml @@ -0,0 +1,105 @@ +# Armor +- type: latheRecipe + id: N14ClothingOuterCoatLeatherDuster + result: N14ClothingOuterCoatLeatherDuster + category: N14Armor + completetime: 4 + materials: + Cloth: 500 + Leather: 300 + +- type: latheRecipe + id: N14ClothingOuterCoatWinterArmored + result: N14ClothingOuterCoatWinterArmored + category: N14Armor + completetime: 4 + materials: + Cloth: 600 + Leather: 100 + +- type: latheRecipe + id: N14ClothingOuterLeatherArmor + result: N14ClothingOuterLeatherArmor + category: N14Armor + completetime: 4 + materials: + Leather: 500 + +- type: latheRecipe + id: N14ClothingOuterChitinArmor + result: N14ClothingOuterChitinArmor + category: N14Armor + completetime: 6 + materials: + AntChitin: 300 + Cloth: 450 + +- type: latheRecipe + id: N14ClothingOuterPainspike + result: N14ClothingOuterPainspike + category: N14Armor + completetime: 6 + materials: + Cloth: 400 + Steel: 600 + Leather: 100 + +- type: latheRecipe + id: N14ClothingOuterTribalArmorHeavy + result: N14ClothingOuterTribalArmorHeavy + category: N14Armor + completetime: 8 + materials: + Cloth: 500 + Leather: 500 + Wood: 2000 + +- type: latheRecipe + id: N14ClothingOuterInsectArmor + result: N14ClothingOuterInsectArmor + category: N14Armor + completetime: 8 + materials: + # AntChitin: 600 + Exoskeleton: 300 + Cloth: 350 + +- type: latheRecipe + id: N14ClothingOuterMetalArmor + result: N14ClothingOuterMetalArmor + category: N14Armor + completetime: 8 + materials: + Cloth: 1000 + Steel: 2000 + +# Shield's +- type: latheRecipe + id: N14InsectShield + result: N14InsectShield + category: N14Shield + completetime: 6 + materials: + # AntChitin: 150 + Exoskeleton: 50 + Wood: 400 + +- type: latheRecipe + id: MakeshiftShield + result: MakeshiftShield + category: N14Shield + completetime: 6 + materials: + Steel: 600 + Wood: 200 + +- type: latheRecipe + id: WoodenBuckler + result: WoodenBuckler + category: N14Shield + completetime: 6 + materials: + Steel: 200 + Wood: 800 + +# Accessories \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/categories.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/categories.yml index 35e134b1e02..6e9d8cd8f91 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/categories.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/categories.yml @@ -1,6 +1,18 @@ - type: latheCategory id: N14Ammo name: lathe-category-ammo + +- type: latheCategory + id: N14AmmoBox + name: lathe-category-ammo-box + +- type: latheCategory + id: N14AmmoMagazine + name: lathe-category-ammo-magazines + +- type: latheCategory + id: N14Armor + name: lathe-category-armor - type: latheCategory id: N14Containers @@ -13,10 +25,18 @@ - type: latheCategory id: N14Circuitry name: lathe-category-circuitry + +- type: latheCategory + id: N14Cleaning + name: lathe-category-cleaning - type: latheCategory id: N14Kitchen name: lathe-category-kitchen + +- type: latheCategory + id: N14Lights + name: lathe-category-lights - type: latheCategory id: N14Misc @@ -26,6 +46,10 @@ id: N14Parts name: lathe-category-parts +- type: latheCategory + id: N14Shield + name: lathe-category-shields + - type: latheCategory id: N14Tools name: lathe-category-tools @@ -33,3 +57,19 @@ - type: latheCategory id: N14Weapons name: lathe-category-weapons + +- type: latheCategory + id: N14WeaponMelee + name: lathe-category-weapons-melee + +- type: latheCategory + id: N14WeaponPistols + name: lathe-category-weapons-pistols + +- type: latheCategory + id: N14WeaponRifles + name: lathe-category-weapons-rifles + +- type: latheCategory + id: N14WeaponSMGs + name: lathe-category-weapons-smgs \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/janitorial.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/janitorial.yml index 364a30c1e64..a07fea10bcd 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/janitorial.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/janitorial.yml @@ -1,6 +1,7 @@ - type: latheRecipe id: N14Mop result: N14Mop + category: N14Cleaning completetime: 2 materials: Plastic: 100 @@ -8,6 +9,7 @@ - type: latheRecipe id: N14MopBucket result: N14MopBucket + category: N14Cleaning completetime: 2 materials: Steel: 100 @@ -16,6 +18,7 @@ - type: latheRecipe id: N14Bucket result: Bucket + category: N14Cleaning completetime: 2 materials: Steel: 100 @@ -23,6 +26,7 @@ - type: latheRecipe id: N14WetFloorSign result: WetFloorSign + category: N14Cleaning completetime: 2 materials: Plastic: 100 @@ -30,6 +34,7 @@ - type: latheRecipe id: N14SprayBottle result: SprayBottle + category: N14Cleaning completetime: 2 materials: Plastic: 100 @@ -37,6 +42,7 @@ - type: latheRecipe id: N14TrashBag result: TrashBag + category: N14Cleaning completetime: 1.2 materials: Plastic: 100 @@ -44,6 +50,7 @@ - type: latheRecipe id: N14LightReplacer result: LightReplacerEmpty + category: N14Misc completetime: 2.4 materials: Steel: 100 @@ -52,6 +59,7 @@ - type: latheRecipe id: N14Mousetrap result: Mousetrap + category: N14Misc completetime: 1 materials: Wood: 100 @@ -60,6 +68,7 @@ - type: latheRecipe id: N14Plunger result: Plunger + category: N14Cleaning completetime: 2 materials: Plastic: 50 @@ -68,6 +77,7 @@ - type: latheRecipe id: N14WeaponSprayNozzle result: WeaponSprayNozzle + category: N14Cleaning completetime: 5 materials: Steel: 1500 @@ -76,6 +86,7 @@ - type: latheRecipe id: N14ClothingBackpackWaterTank result: ClothingBackpackWaterTank + category: N14Cleaning completetime: 4 materials: Steel: 250 diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Reactions/ores.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/materials.yml similarity index 84% rename from Resources/Prototypes/_Nuclear14/Recipes/Reactions/ores.yml rename to Resources/Prototypes/_Nuclear14/Recipes/Lathes/materials.yml index aff51e258e0..3d611afd77c 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Reactions/ores.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/materials.yml @@ -51,4 +51,12 @@ applyMaterialDiscount: false completetime: 2 materials: - RawQuartz: 100 \ No newline at end of file + RawQuartz: 100 + +- type: latheRecipe + id: N14MaterialLeather + result: N14MaterialLeather1 + category: N14Misc + completetime: 2 + materials: + RawLeather: 100 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/misc.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/misc.yml index 5353d323ddb..8e60a3a69ec 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/misc.yml @@ -1,7 +1,7 @@ - type: latheRecipe id: N14LightTube result: LightTube - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -10,7 +10,7 @@ - type: latheRecipe id: N14LedLightTube result: LedLightTube - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -19,7 +19,7 @@ - type: latheRecipe id: N14SodiumLightTube result: SodiumLightTube - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -28,7 +28,7 @@ - type: latheRecipe id: N14ExteriorLightTube result: ExteriorLightTube - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -37,7 +37,7 @@ - type: latheRecipe id: N14LightBulb result: LightBulb - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -46,7 +46,7 @@ - type: latheRecipe id: N14LedLightBulb result: LedLightBulb - category: Lights + category: N14Lights completetime: 2 materials: Steel: 50 @@ -55,7 +55,7 @@ - type: latheRecipe id: N14GlowstickRed result: GlowstickRed - category: Lights + category: N14Lights completetime: 2 materials: Plastic: 50 @@ -63,15 +63,16 @@ - type: latheRecipe id: N14Flare result: Flare - category: Lights + category: N14Lights completetime: 2 materials: Plastic: 50 + Sulfur: 25 - type: latheRecipe id: N14FlashlightLantern result: EmptyFlashlightLantern - category: Lights + category: N14Lights completetime: 2 materials: Steel: 100 @@ -81,6 +82,36 @@ - type: latheRecipe id: N14Matchbox result: Matchbox + category: N14Misc completetime: 1 materials: - Wood: 100 \ No newline at end of file + Wood: 100 + +- type: latheRecipe + id: ClothingBeltQuiverSpear + result: ClothingBeltQuiverSpear + category: N14Containers + completetime: 4 + materials: + Steel: 100 + Leather: 300 + Cloth: 100 + +- type: latheRecipe + id: ClothingBeltQuiver + result: ClothingBeltQuiver + category: N14Containers + completetime: 4 + materials: + Leather: 400 + Cloth: 200 + +- type: latheRecipe + id: ArrowRegular + result: ArrowRegular + category: N14Ammo + completetime: 1 + materials: + Steel: 10 + Wood: 20 + Paper: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/tools.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/tools.yml index fa6e8225822..1894d51848d 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/tools.yml @@ -42,17 +42,19 @@ id: N14CableStack result: CableApcStack1 category: N14Parts - completetime: 2 + completetime: 1 materials: - Steel: 30 + Steel: 10 + Cloth: 1 - type: latheRecipe id: N14CableMVStack result: CableMVStack1 category: N14Parts - completetime: 2 + completetime: 1 materials: - Steel: 30 + Steel: 20 + Cloth: 5 - type: latheRecipe id: N14CableHVStack @@ -61,6 +63,7 @@ completetime: 2 materials: Steel: 30 + Cloth: 10 - type: latheRecipe id: N14Crowbar @@ -95,7 +98,7 @@ completetime: 2 materials: Steel: 200 - Plastic: 200 + Plastic: 400 - type: latheRecipe id: N14NetworkConfigurator @@ -121,7 +124,7 @@ category: N14Tools completetime: 2 materials: - Steel: 800 + Plastic: 500 Glass: 300 - type: latheRecipe @@ -130,7 +133,7 @@ category: N14Tools completetime: 2 materials: - Steel: 800 + Plastic: 500 Glass: 300 - type: latheRecipe @@ -139,7 +142,7 @@ category: N14Tools completetime: 2 materials: - Steel: 800 + Plastic: 500 Glass: 300 - type: latheRecipe diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/weapons.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/weapons.yml new file mode 100644 index 00000000000..69a2294a0a1 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/weapons.yml @@ -0,0 +1,104 @@ +# MARK: Guns + +# - type: latheRecipe +# id: N14WeaponPipe10mm +# icon: +# sprite: _Nuclear14/Objects/Weapons/Guns/Pistols/10mmPIPEpistol.rsi +# state: icon +# result: N14WeaponPipe10mm +# category: N14WeaponPistols +# completetime: 6 +# materials: +# Steel: 500 +# Wood: 200 +# Cloth: 100 + +# - type: latheRecipe +# id: N14weapon10mmpipe +# icon: +# sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/10mmPIPE.rsi +# state: icon +# result: N14weapon10mmpipe +# category: N14WeaponSMGs +# completetime: 12 +# materials: +# Steel: 1000 +# Wood: 300 +# Cloth: 200 + +# - type: latheRecipe +# id: N14weapon12mmpipe +# icon: +# sprite: _Nuclear14/Objects/Weapons/Guns/SMGs/12mmPIPE.rsi +# state: icon +# result: N14weapon12mmpipe +# category: N14WeaponSMGs +# completetime: 4 +# materials: +# Steel: 2000 +# Wood: 300 +# Cloth: 200 + +# - type: latheRecipe +# id: N14WeaponPipeRifle +# icon: +# sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/piperifle.rsi +# state: base +# result: N14WeaponPipeRifle +# category: N14WeaponRifles +# completetime: 12 +# materials: +# Steel: 1000 +# Wood: 2000 +# Cloth: 300 + +- type: latheRecipe + id: BowImprovised + icon: + sprite: Objects/Weapons/Guns/Bow/bow.rsi + state: unwielded + result: BowImprovised + category: N14Weapons + completetime: 12 + materials: + Wood: 500 + Cloth: 200 + +# MARK: Melee +- type: latheRecipe + id: N14WastelandSpear + icon: + sprite: _Nuclear14/Objects/Weapons/Melee/spear.rsi + state: spear + result: N14WastelandSpear + category: N14WeaponMelee + completetime: 12 + materials: + Steel: 100 + Wood: 600 + Cloth: 100 + +- type: latheRecipe + id: N14WastelandTribalJavelin + icon: + sprite: _Nuclear14/Objects/Weapons/Melee/javelin.rsi + state: spear + result: N14WastelandTribalJavelin + category: N14WeaponMelee + completetime: 12 + materials: + Steel: 100 + Wood: 200 + Cloth: 100 + +- type: latheRecipe + id: N14ScrapMachete + icon: + sprite: _Nuclear14/Objects/Weapons/Melee/scrap_machete.rsi + state: icon + result: N14ScrapMachete + category: N14WeaponMelee + completetime: 12 + materials: + Steel: 400 + Cloth: 200 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml index ab47a678bb0..c1768f2d05f 100644 --- a/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml +++ b/Resources/Prototypes/_Nuclear14/Stacks/material_stacks.yml @@ -9,8 +9,9 @@ id: BrahminHide name: brahmin hides icon: { sprite: _Nuclear14/Objects/Misc/mob_drops.rsi, state: hide_brahmin_2 } - spawn: N14MaterialBrahminHide - maxCount: 3 + spawn: N14MaterialBrahminHide1 + maxCount: 4 + itemSize: 1 - type: stack id: Gunpowder @@ -44,6 +45,30 @@ maxCount: 5 itemSize: 1 +- type: stack + id: Leather + name: leather + icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: leather_3 } + spawn: N14MaterialLeather1 + maxCount: 15 + itemSize: 1 + +- type: stack + id: RawLeather + name: raw leather + icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: raw_leather_2 } + spawn: N14MaterialRawLeather1 + maxCount: 15 + itemSize: 1 + +- type: stack + id: AntChitin + name: ant chitin + icon: { sprite: _Nuclear14/Objects/Misc/mob_drops.rsi, state: chitin_3 } + spawn: N14MaterialAntChitin1 + maxCount: 3 + itemSize: 1 + # Ores - type: stack id: LeadOre diff --git a/Resources/Prototypes/_Nuclear14/tags.yml b/Resources/Prototypes/_Nuclear14/tags.yml index eadf60eb5a4..47f3c7c9110 100644 --- a/Resources/Prototypes/_Nuclear14/tags.yml +++ b/Resources/Prototypes/_Nuclear14/tags.yml @@ -26,6 +26,9 @@ - type: Tag id: Powder +- type: Tag + id: RawLeather + - type: Tag id: Saw @@ -54,6 +57,9 @@ - type: Tag id: Gear +- type: Tag + id: YaoguaiHide + - type: Tag id: GearSmall @@ -135,6 +141,7 @@ #MARK: Guns types. - type: Tag id: Revolver + #MARK: SpeedLoader #TODO: move to EE - type: Tag diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather.png deleted file mode 100644 index dcd84ddcb4468ced2eb2797e41482b94ec01958d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 488 zcmVP)R;ZFnz?pdAqKj2+!Sx%1j!zv<`1yt~h{~1F8qy&N@r{`Ct62<}q z6Ap+js&vCh0B}N?ye!miVExE>%#|n!F((ubi3Y2AS)6@ zNXWoWUOYX&lY$6Vq0>>;5SS5(+KIV}I}3mqCHQ`*wFyl`)WDcjAye>N0$QmW(flu> eR-hGVyuc4W1qx!^byuYT0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0eMM8K~z{r?UX-C z13?^xM=M1Q3u-_V3D_ul0}C(V`82O1ue#WzaV7Qk#Gsx36Nm z-vrlnK71(YRVHwJxR=#cY|r`D1#5Nd-UJl6K3rH{G2_Q^K6WeC9$z|qHyqrXw{&6# zPpMa{G)d*%t*-h0crS$AvCoK*q1(}`H*%NK6>wLGAO;+WxLcX}f<8tOzPP#z5{J^J zgUuvcO*+3Go)VA=dn`kkz8O8|>!K=l8}9~8&|-v#sEY0QF`+pLvtLj^$iHFj1{vAy zZ4_~1Mh^>IQBn1?b7|ZFx)vZ2&~+drVfv!(<=X@q5VjFF0oz2VIJ7e0L)Roig(H!F af-yfkYuMU3JhANn0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0oh4JK~z{r?UdU} z0#Ou(mkCjrCS^htA$ZflH|V05=z)5Yo}k+vps1Uos8BkfCDG9=CNtEEjDO=lZ1!x& z(TfP0?`EIY?EhbDZIzIakbh64GY-tk(p(#3Hj|Q?(~ynb)4uK;*Z_s6k}eqe;+e40T3dAP!MvOYvSnm0r)SgBtiQR!=Gtb2&`_ydRn;SbTYx}_Kn&nQh?|*lPB4d22=5(T zy5iW^<4mHR(Iq|{S!=`B$EQSxzLoHJYC_FlDzDONen~75bI))&&T)2dQj|usrS7RZ zby>`1<^1AKisc8{FFgit!CCoU%_oxy_0waqA=#f@8#=Q17HH9*#cCAM$8K6 zCUAzT4b%c18u4p^31Y#(EwI71fM01rH*_PtS`b7W^ku*X+eCs2hlKnQM1BC-&L8I= SOudEx0000z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_3.png b/Resources/Textures/_Nuclear14/Objects/Misc/materials.rsi/leather_3.png new file mode 100644 index 0000000000000000000000000000000000000000..7dbeb76c0ba7f40e1c5582e14e880f9f1e0b66a2 GIT binary patch literal 603 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 B+)4ld literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/wallet.png b/Resources/Textures/_Nuclear14/Objects/Misc/storage.rsi/wallet.png index fd0b8b9774584bf1ff04544993b5cf55f6c8a906..8321a0b9be8ad8ea439e0c2e5a20914b7dbd9cc1 100644 GIT binary patch delta 394 zcmbQiyq0-_q$o231B1(wu46!ou{g-xiSg!1o%)H2;`Izs0X`wFK;a-o#w}?klU#*Q z*Lv+)*uS(YZvLdMTs^i&TW759tGapR()Hz?yV{ZuZQrnIQeAy+LQ7Tg@<{cbs=VW~ z8+J@6pB{phz{sfvXR}$nG%+@*6;R$t^#P`mlgO#ia( zi}nr7(G3&l-Dj3QRDGUNPL}cI@7)cF44(qldWUsiiQ-!@!}$Fg?q(Aa^^QYNgneH0 zn{;*RcOG8sGTn1;))&*ftRH(0-?TfNTyR27yb# PlR=cHtDnm{r-UW|Gjg_V delta 373 zcmV-*0gC>u1DFGl83+ad0047(di0Sl7k>dtNkl1H8K?)2GW^Ho2)t2n`#uxVc4#X9V^B_*%W!u=G75cjUNT;N z1k-@3;y;3xgBIZzaxyv78kR~%(v@H1y%kl|%u;9VQ!Pj5=V{0R$Zoq{#T6T*KGh|IbK~13;E1 zxf(OvyMLc#%as%r85nk-{ZGgd1Vdon?z0T!fCG2l5v7ix11e)Y$#MW+cn3qJuRi$> z00qA^FDt{MjeAhU z{2QeB`@e&V5Q?~{hzQ&gd^C$w76Ze@a`GL3Y#}xPvIH-^xs!nyK+pkq6@9>Q{|TA~ zNTC_-^ik#jP&7zxo$~)Vh_iJH1F1B{bpZ%Wz4()$A(Vi@UmcG+VAKJl4jA?h003p9 V!C{!;Iq&0Tpe+78B+voIAj{!*SJ|M(GL0OBOA1 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 YXaU(AKnwzxf+vG0Pgg&ebxsLQ0N#G_r2qf` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe1.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe1.png new file mode 100644 index 0000000000000000000000000000000000000000..8ffe6cca27e3897e55b71b53c169f44e351edda0 GIT binary patch literal 1157 zcmV;01bX|4P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1OQ1yK~!i%?U>t3 zR6!iae-@=Fy6UQ#xydG!NYRCYNC=5uBIx$eQ`CD;{Q*V&3qjO#5%ks#!iO$wMK>yR zBW0Cru~iFAYO|YUn%`l5+w6GGnQ>P$X+AK_?VK~e-*w zK-Ph@>^?Xtn+uAEZC8x`883kI(dtqvuPCSf^mjQrJJg4k$(9*?ZQSc;59U67{6xv& zQKJZpWF3f?^H_vSK7`9kMN!*&0s1bJT)X+-l+GC zd>$2b5c>0V)MvmpRUp2%w=YGPE?x-qF(&~4FPMuEjLAtA-C;jeyKDq7rU1eS`J@9Q zP+*u^Oz?fc=6VJWv0!jgEh>06uDkubOQfy|s|eV&rCAuuhTEbW$EZ8cBB)~~f}#v- z;#t*oD=Cpk(AhI*@{0g48_vThE-GGQL71Wjc0!;hkDpL`PfCvZV~l{qM~+U;#Ve5U zixNL{J4T9|Wy_n2G0lq9Ml)Y>=L~3N~4|;wE?XX|ybC}0}Mkx}lr&O|E^i?q4b@vXXdmqUWf08}% z+y&r6(C^?eiJ%H#a#)82@B;$yE(eiU1n{S@UljN`s2-d%$#XT05}mK9dh1@|W0(N|h7+WPLReeC?M?dvJ_u$^8#zn{MVaNg^y3L-!d)DXeu z%PU_7dwWHV_dlY7(fcjiHd04d(kOt{r?C2CNZok`3;hk}!Jgf%R8khAa8lzy~#TF|8bRa@{_ygUG#prG43px6CV4<<@^{dxJm}3LHNDuYNmOnF20XVOQ7Up@O zP)&oV=L*#!tfhuG>*m+Z4%@?qB-+}$Y zd0-=eRSK~4z$UEb6P#Cw1VpV(L|O^J&Mzdq{>AdbD1ffwT<3W{ux)%!*+gqjZ-IZE znMADBAt;*}Ob5$+v5;(aI2;a#!!h3w{RZ4N4z)ppN9_Or01jnXNoGw=04e|g00;m8 X000000Mb*F00000NkvXXu0mjfBoP%z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe2.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe2.png new file mode 100644 index 0000000000000000000000000000000000000000..bb1422023beddc474c06493615c989aeb59a33fe GIT binary patch literal 678 zcmeAS@N?(olHy`uVBq!ia0vp^4nS&!Z`S}3}Y4x==2A-L=SrevApRTB;uVLyG)xAc? z#7Pacn;KL1y_=suT1W zbLO;lc5GSU6LNCW)P7#8K$RI2cWnq+rS*?t6<62{t0`J@cZD`N95>?<=wy8qlA7pH zF8H=((&L&w`zR%=X$#eF?)&`r-t*e~&vTmg^L&!u5znwN_d82@;|$OG>P`)d))i5D z7rt|>S*ny|%6#_yHzyY^JB6f#q9FNICwFVE*AiTK&?(?x2n)Al!0n)>mvRZGB-Dg& zx2!Y@O?|ke~|?!xmG# z^23%t#fLZk+E{d;%fc=@bHQT8^zg|kag3UCFHaL()}Mv>np^6tU2;FSg0oDn~@9W4XxtZAG>l~PX>MP-eC09=jn@XZW*7G z%i}&XzBPS1W&he82mYC?E&t1G^ZPi@DSUBX zx8q0M9ag{3(UyNKtB&8RI1pH7UM&5>zam!V*)68KaTAZu?B5>z#pZ_Oe(8?-4-LjK zTRj8agucJ{{{Q#^-rEMVZ>#qHbq6Jb)CkWsUtb0-Ae#e-LEuvGWDw=)>gTe~DWM4f DIK&@m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe3.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe3.png new file mode 100644 index 0000000000000000000000000000000000000000..8921255c0376d28c3a2dcfe321cdb7fc30420c89 GIT binary patch literal 768 zcmeAS@N?(olHy`uVBq!ia0vp^4nS45O$2P zGJU#^iJh#Ryj{NW5}+P|k|4iehX1JGKtQ)M0|S$>r;B4q#hm061qKOs(FGa_At@E# z8Rs)4vbNPf|EL)tmhhvVZ$6WvYg>PLfmQ-;asf-gUH|W?;DpaP)oQQf3~H+h`%95 zRbk)pAM-uMA`kYk`^ayzO{h4(;_qIe8@1mhBv>V` z>$YolY!m-6RsBQeD|R-u)@m=F`&@Pg93@6ITY}v;F{ONoWb62r-|8S(kOR2z-mX#9< z{)Mueyp*5t)pL5Ge1zlnKc72!1g8K0uW{gm_Vmi!4K@J}-ZnR%O<=A5Z@4WkAz{Ne zR@Mjq`Ohq6aHjZwyWc@2_H0um}N)C|!SGbh}(d_}{NL+wPxE=v;EZ zVy?Z6=Rx^!WJUvh07R?{m<<=f(;QR5L`5{-`k#k}P zLITt{zaPEMvWCmzVP8$uh2Bio_|RPnb*xV#3t0b4+9hp##2is%AnM4xl7V4c$AQw7 mew?Dfq{WvS;hE;^%b*2ha{w_2Tne5HqC8#wT-G@yGywo>8Z^iN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe4.png b/Resources/Textures/_Nuclear14/Structures/Misc/workbenches.rsi/weaponbenchframe4.png new file mode 100644 index 0000000000000000000000000000000000000000..ceac401fb0b5da2dee4836b9f0c3d6ef02eada42 GIT binary patch literal 1414 zcmV;11$p|3P)bD2RTMv~!lqkIrO67lu?sD2>>RbwB6K*)tY8s} z`bG9};0G1`ApRqQ13^ST_(?=T{ZNn^wqXj=%r0oVwpikpDr{+Rv8bz1;{Dy%^Lldg zl6#ZZt}*$+%gZ}?x%ZskJ?D4NOCF>qM~eVzaJ8Y<%0Hk_Woul50`^aY2 zDL4NWH42;vI6L)n(X{=k4g{K;_pXnH2ldK>7yu=5oNm+oL~`Z}YZ+PzK=83hJ9RwT zLF1&ao$jaQ#h*1fr@FSw?&}FXM6Qr?^LI^~{Os=UcZrnm zHWHjNzziP1O8>Bv>T>mE{io-?r%>OxChD)nZvw~ee575U^M7pm?@iz{GvG?WGx~a? z>NQJAOKf`*K{EsHZLE}(0fL7un;E2G6@UzuQR%%TgWpS=yccB1Y^p?L5b7qt6T0a# zJAy~hTZKHuPj6FtEw62}8y+c><7et})C|}J+dxFMY%*ab0QIlysqJWq9RaS-eoRM0 zoh5b-o-sWBw0c$b-_^e-M`iYy+F_Q)aP%b2rj}@AAZi`gNd0%L)b zb?>GBidy~tiXs=3%0WbYnaY=xlmy#NapgHLOg~4<%geU#+)BUwkK_HpxO#o+xPW(@}h3FgPJYamlEGvpGiFZNcgt+*!d!S=d7?2&>8N~ zBACdBH37fee!#DNxjG+wQp&c>3V$q1z?EP=Z%DXgz%y^W>$mbC1pSL5KwmqRz?u@2 z&0Jmwj6ux|2m)t-Y*K820i^07H1LLFZt_042oak7&F=IH1Alk~*jXAxlFHB9) zcdP%@pv>D=0j#D2atq`hLzY^#>;O=}yCRsN*uZcRW1-pZ*|1mI7b1 z_Mi>EoLsQZ;Ut0xeql9RVgnJ-2Ypu8Xgke&_8V=nb0t|PnI6Xog1)kNO<#vj_R>KB>b39g*F+TVTqD+W%mp8^x4a~c~)R1C#*n#te+`JSCQ2$*xhkLcsQ#gUg@bPgVH$^Z@?a7nBC3FrYb!P^Dw zi{eCp%X9T%!@lhTW?kd@AXB{-u&*rA`zC^ohFUV#Ndymj-810ll^T7u5}?w(A^znB z>hbk|Spv17MF2H9S_Dv&qeTEUIsOGNUb~q+VkJlb000hUSV?A0O#mtY000O800000 U007cclK=n!07*qoM6N<$f+WhL1poj5 literal 0 HcmV?d00001