]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Make baseball bat crafting require a slicing tool (#26742)
authorVerm <32827189+Vermidia@users.noreply.github.com>
Fri, 5 Apr 2024 15:41:35 +0000 (10:41 -0500)
committerGitHub <noreply@github.com>
Fri, 5 Apr 2024 15:41:35 +0000 (11:41 -0400)
Make baseball bat crafting harder

Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
Resources/Prototypes/Recipes/Crafting/Graphs/improvised/bat.yml
Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/meta.json [new file with mode: 0644]

index 8ba643a115521dbbdb541f4f7d88d0d1fc5e53fb..834d35a529732fd4e493f24825217d4decb9d316 100644 (file)
     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
index 56530f443eb3ffa879819a753eb8a2cc2a3a1d91..cecd031f972cc0cf4bb72583980b11bd925472e8 100644 (file)
@@ -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 (file)
index 0000000..6955b10
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/incomplete_bat.rsi/icon.png differ
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 (file)
index 0000000..c7c06ad
--- /dev/null
@@ -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"
+        }
+    ]
+}