From 6260e4b35b829485149206636861bb7402488724 Mon Sep 17 00:00:00 2001 From: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Date: Tue, 12 Mar 2024 18:52:32 -0500 Subject: [PATCH] Improvised shell crafting recipe (#25545) * Changed Projectile Sprite to Shard * Removed Notes on Recipe * Made Recipe * Added a space * Update improvised.yml * Update shotgun.yml * Removed Note * Reduced needed matches from 8->6 * Update improvised_shotgun_shell.yml * Matchbox fix didn't work * Reduced glass needed from 5-4 * Added backspace * Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../Guns/Ammunition/Cartridges/shotgun.yml | 11 +-- .../Guns/Ammunition/Projectiles/shotgun.yml | 5 +- .../improvised/improvised_shotgun_shell.yml | 76 +++++++++++++++++++ .../Recipes/Crafting/improvised.yml | 13 ++++ 4 files changed, 98 insertions(+), 7 deletions(-) create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index b7b98ba699..e26c4e9540 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -130,22 +130,23 @@ maxTransferAmount: 7 - type: SpentAmmoVisuals state: "practice" - -#Not yet craftable due to balance concerns. Should take a good bit of setup to create like the /tg/station recipe. -#Either the improvised shotgun or its recipe (as of July 2023) will also probably have to be nerfed if you decide to make this craftable. + - type: entity id: ShellShotgunImprovised name: improvised shotgun shell - description: A homemade shotgun shell that shoots painful metal shrapnel. The spread is so wide that it couldn't hit the broad side of a barn. + description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn. parent: BaseShellShotgun components: - type: Sprite layers: - state: improvised map: [ "enum.AmmoVisualLayers.Base" ] + - type: Construction + graph: ImprovisedShotgunShellGraph + node: shell - type: CartridgeAmmo count: 10 - spread: 45 #deadly if you can get up close... otherwise, good luck doing any kind of real damage + spread: 45 proto: PelletShotgunImprovised - type: SpentAmmoVisuals state: "improvised" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index e62fb9115e..757b8934d4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -81,12 +81,13 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot + state: shard - type: Projectile damage: types: Piercing: 3 - Slash: 3 #remember, it's metal shrapnel! + Slash: 3 + - type: entity id: PelletShotgunTranquilizer diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml new file mode 100644 index 0000000000..9f666dd61c --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml @@ -0,0 +1,76 @@ +- type: constructionGraph + id: ImprovisedShotgunShellGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: Steel + amount: 1 + doAfter: 0.5 + - material: Plastic + amount: 1 + doAfter: 0.5 + - tag: GlassShard + name: glass shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 0.5 + - tag: GlassShard + name: glass shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard2 + doAfter: 0.5 + - tag: GlassShard + name: glass shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard1 + doAfter: 0.5 + - tag: GlassShard + name: glass shard + icon: + sprite: Objects/Materials/Shards/shard.rsi + state: shard3 + doAfter: 0.5 + - tag: Matchstick + name: match stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - tag: Matchstick + name: match stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - tag: Matchstick + name: match stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - tag: Matchstick + name: match stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - tag: Matchstick + name: match stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - tag: Matchstick + name: match stick + icon: + sprite: Objects/Tools/matches.rsi + state: match_unlit + doAfter: 0.5 + - node: shell + entity: ShellShotgunImprovised diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 12fbe97e28..23b9eb2c92 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -163,6 +163,19 @@ sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun.rsi state: icon +- type: construction + name: improvised shotgun shell + id: ShellShotgunImprovised + graph: ImprovisedShotgunShellGraph + startNode: start + targetNode: shell + category: construction-category-weapons + objectType: Item + description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a Barn + icon: + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: improvised + - type: construction name: rifle stock id: riflestock -- 2.51.2