From 8ba56847bb441889c598c2ef7bb47b03950bf757 Mon Sep 17 00:00:00 2001
From: Ed <edwardxperia2000@gmail.com>
Date: Mon, 22 Apr 2024 22:01:47 +0300
Subject: [PATCH] add crossBOLT

---
 .../Ranged/Ammunition/crossbowBolts.yml       |  28 ++++++++++++++++++
 .../Objects/Weapons/Ranged/lightCrossbow.yml  |   4 +--
 Resources/Prototypes/_CP14/tags.yml           |   5 +++-
 .../Projectiles/crossbolt.rsi/meta.json       |  17 +++++++++++
 .../Ranged/Projectiles/crossbolt.rsi/rod.png  | Bin 0 -> 142 bytes
 .../Projectiles/crossbolt.rsi/solution1.png   | Bin 0 -> 132 bytes
 6 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/meta.json
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/rod.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/solution1.png

diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml
new file mode 100644
index 0000000000..1b08b2192f
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml
@@ -0,0 +1,28 @@
+- type: entity
+  parent: BaseArrow
+  id: CP14BaseCrossbolt
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - CP14CrossbowBolt
+
+- type: entity
+  id: CP14Crossbolt
+  parent: CP14BaseCrossbolt
+  name: crossbow bolt
+  description: Rod with a sharpened spike. No plumage, they're not bows.
+  components:
+  - type: Projectile
+    deleteOnCollide: false
+    onlyCollideWhenShot: true
+    damage:
+      types:
+        Piercing: 20
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi
+    layers:
+    - state: rod
+    - state: solution1
+      map: ["enum.SolutionContainerLayers.Fill"]
+      visible: false
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml
index 049772442f..3dc7138b34 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml
@@ -39,7 +39,7 @@
         insertSound: /Audio/Weapons/Guns/Misc/arrow_nock.ogg
         whitelist:
           tags:
-          - Arrow
+          - CP14CrossbowBolt
   - type: ContainerContainer
     containers:
       projectiles: !type:ContainerSlot
@@ -51,4 +51,4 @@
       unwielded-arrow:
         whitelist:
           tags:
-            - Arrow
\ No newline at end of file
+            - CP14CrossbowBolt
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml
index 2cd3ac01d1..a2b52ca4a7 100644
--- a/Resources/Prototypes/_CP14/tags.yml
+++ b/Resources/Prototypes/_CP14/tags.yml
@@ -2,4 +2,7 @@
   id: CP14Key
 
 - type: Tag
-  id: CP14Coin
\ No newline at end of file
+  id: CP14Coin
+
+- type: Tag
+  id: CP14CrossbowBolt
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/meta.json
new file mode 100644
index 0000000000..4780477b83
--- /dev/null
+++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for CrystallPunk14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "rod"
+    },
+    {
+      "name": "solution1"
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/rod.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/rod.png
new file mode 100644
index 0000000000000000000000000000000000000000..52f859779d7d947e43a6a0ff9116562de56ecbd6
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}9-c0aArY;~
z2@<S}6GVEN0u8PloT@$jU+|*&ol$&}r3X%w9(cREpZyx+s#BYoUpFxFGkP%|<*WGj
m$<*|YA(z`h4UonM3=CGn+>c7Qx<!CyGI+ZBxvX<aXaWE@fh`vR

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/solution1.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi/solution1.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb654a48ca7e128660e9216ba7f84082ddd38579
GIT binary patch
literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}cAhSdArY-_
z&mH7sP~dUCsMKN3{^`}f<vov>WEZt6{3-YUA;`e+pnOtUs=budJnMv=%zf4mb}^?N
dW@k8{&S*Q4g)jNk2`ivU44$rjF6*2UngCrNDGUGr

literal 0
HcmV?d00001