From d802928610ae27627dc974663fd215490b81c06e Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Fri, 5 Apr 2024 10:41:35 -0500
Subject: [PATCH] Make baseball bat crafting require a slicing tool (#26742)

Make baseball bat crafting harder
---
 .../Objects/Weapons/Melee/baseball_bat.yml    |  15 ++++++++++++
 .../Crafting/Graphs/improvised/bat.yml        |  22 ++++++++++++++++--
 .../Weapons/Melee/incomplete_bat.rsi/icon.png | Bin 0 -> 703 bytes
 .../Melee/incomplete_bat.rsi/meta.json        |  14 +++++++++++
 4 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
index 8ba643a115..834d35a529 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -40,6 +40,21 @@
     tags:
     - BaseballBat
 
+- type: entity
+  name: incomplete baseball bat
+  parent: BaseItem
+  id: IncompleteBaseBallBat
+  description: A few planks of wood stuck together.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/incomplete_bat.rsi
+    state: icon
+  - type: Item
+    size: Normal
+  - type: Construction
+    graph: WoodenBat
+    node: incompleteBat
+
 - type: entity
   name: knockback stick
   parent: BaseBallBat
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml
index 56530f443e..cecd031f97 100644
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml
@@ -1,13 +1,31 @@
-- type: constructionGraph
+- type: constructionGraph
   id: WoodenBat
   start: start
   graph:
     - node: start
       edges:
-        - to: bat
+        - to: incompleteBat
           steps:
             - material: WoodPlank
               amount: 5
               doAfter: 4
+        
+    - node: incompleteBat
+      entity: IncompleteBaseBallBat
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 5
+            - !type:DeleteEntity {}
+          steps:
+            - tool: Prying
+              doAfter: 1
+        - to: bat
+          steps:
+            - tool: Slicing
+              doAfter: 4
+        
     - node: bat
       entity: BaseBallBat
diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6955b10e5d0ff8696d4a5db4f67b7b01b55e2346
GIT binary patch
literal 703
zcmV;w0zmzVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004RX+uL$X=7sm
z04R}lk-JO7P!z_$zNn8%2OXq1WT@iMf+&ciRIp2RXe(HCNp6!?NYZeVBE?m3aVR*5
zF1`l;16>7I1wl{*5l3fVi<Ee7Q)rR)UT)5hFZVl~d;$C!of&p;9xzOYXVWQZwXi0I
z-w{NJc0Xb=v#q7vVjex$&m(-IJ|so2-uJq$!J=w2z}H7S%Pj5?(=^CzIhNo(;t^Js
zi^M0y2~GnN-wIvv_)T!h<1fKHpIrd_qNh~qV5NgunH$8D#BoEfverD}OCqYdlA{`<
zGX@)3q>+LI1yyW9hl3<llQQe>n`-)&Q6Uebr-d3gIZ7y#H$iHZx~fz)(pB0zY9jal
zdD_~{wAVe70z$8@`#BDT_kl*;b$?G?w{ZppUVv+}?XOTybKj)b+gkh>i0%NFH*HNh
z0Iqg{(PvBMa#IS>@oO6JaRCe!fZ=;!VBO2A^&aO>Kz^Hk(H(Gj1WeHV=*AzrZ)fVh
zB10zt000SaNLh0L01FZT01FZU(%pXi0002?Nkl<ZSV!%bK@Ng25JgAh+6#CMZ{P(y
zg9q~rUcj{*_r|^MjfrdJH;$n|3vFkH#L$EgAnAMm!(t$s*3`hiH?UnV-#9`!=UN3+
zPy%?jSvf>VVxb`bc(ojSf4mdUm)pzTJDi`hI#a6w4;~BY*+{g(wR3XpiS(!IgPQ5_
zOjIBh4gs-O5QE2piZqauoL_gbKnc9~8z_Yr2}r=R1*G6v0+R4#0cm)WfChZ9fEIj^
zfF`_GKpP$vuz&{ztl*sjmhhH<HQW;z1O5{j3+@Tvf=6h~b68z7oW$H%-@}b$48rjE
l9iL6$tuTFmG1BR=-v=OQE#?fce^>wj002ovPDHLkV1goFGZ6p)

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
new file mode 100644
index 0000000000..c7c06adfc8
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, modified into incomplete version by Vermidia",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
-- 
2.52.0