From 43384c112599ccbcac1de171b20a60b139ae2d19 Mon Sep 17 00:00:00 2001
From: Ed <edwardxperia2000@gmail.com>
Date: Mon, 22 Apr 2024 20:36:54 +0300
Subject: [PATCH 1/3] weapon rebalance + weapons equipping on move

---
 .../Clothing/Components/ClothingComponent.cs      |  3 +++
 Content.Shared/Inventory/InventorySystem.Equip.cs |  4 ++--
 .../Entities/Objects/Weapons/Melee/dagger.yml     |  3 ++-
 .../Objects/Weapons/Melee/handheldAxe.yml         |  4 ++--
 .../Objects/Weapons/Melee/lightHammer.yml         |  2 +-
 .../_CP14/Entities/Objects/Weapons/Melee/mace.yml | 15 ++++++++++++---
 .../Entities/Objects/Weapons/Melee/sickle.yml     |  5 +++--
 .../Entities/Objects/Weapons/Melee/spear.yml      |  4 ++--
 .../Objects/Weapons/Melee/twoHandedSword.yml      |  3 ++-
 9 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/Content.Shared/Clothing/Components/ClothingComponent.cs b/Content.Shared/Clothing/Components/ClothingComponent.cs
index 6d7226e767..371217a785 100644
--- a/Content.Shared/Clothing/Components/ClothingComponent.cs
+++ b/Content.Shared/Clothing/Components/ClothingComponent.cs
@@ -76,6 +76,9 @@ public sealed partial class ClothingComponent : Component
 
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public TimeSpan UnequipDelay = TimeSpan.Zero;
+
+    [DataField]
+    public bool BreakOnMove = true; //CrystallPunk weapon unequipping on move
 }
 
 [Serializable, NetSerializable]
diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs
index 7c9279df20..017932234e 100644
--- a/Content.Shared/Inventory/InventorySystem.Equip.cs
+++ b/Content.Shared/Inventory/InventorySystem.Equip.cs
@@ -168,7 +168,7 @@ public abstract partial class InventorySystem
             {
                 BlockDuplicate = true,
                 BreakOnHandChange = true,
-                BreakOnMove = true,
+                BreakOnMove = clothing.BreakOnMove, //CrystallPunk weapon unequipping on move
                 CancelDuplicate = true,
                 RequireCanInteract = true,
                 NeedHand = true
@@ -413,7 +413,7 @@ public abstract partial class InventorySystem
             {
                 BlockDuplicate = true,
                 BreakOnHandChange = true,
-                BreakOnMove = true,
+                BreakOnMove = clothing.BreakOnMove, //CrystallPunk weapon unequipping on move
                 CancelDuplicate = true,
                 RequireCanInteract = true,
                 NeedHand = true
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml
index 60ef7ac66c..d9099f023e 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml
@@ -19,6 +19,7 @@
     unequipDelay: 0.25
     sprite: _CP14/Objects/Weapons/Melee/Dagger/dagger.rsi
     quickEquip: false
+    breakOnMove: false
     slots:
     - belt
   - type: Sprite
@@ -32,7 +33,7 @@
     damage:
       types:
         Slash: 5
-        Piercing: 5
+        Piercing: 3
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.15
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml
index 2229934a50..a8d432d882 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml
@@ -23,8 +23,8 @@
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Slash: 10
-        Piercing: 5
+        Slash: 7
+        Piercing: 2
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.25
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml
index a76dab20eb..f38193a211 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml
@@ -17,7 +17,7 @@
     layers:
     - state: icon
   - type: MeleeWeapon
-    attackRate: 1.5
+    attackRate: 1.2
     wideAnimationRotation: 225
     wideAnimation: CP14WeaponArcSlash
     cPAnimationLength: 0.18
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml
index c3c5525856..ec4402b706 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/mace.yml
@@ -3,6 +3,7 @@
   parent: 
   - BaseItem
   - CP14BaseWeaponDestructible
+  - CP14BaseWeaponThrowable
   name: mace
   description: A heavy piece of metal on a long stick. What could be simpler than that?
   components:
@@ -19,8 +20,16 @@
     wideAnimation: CP14WeaponArcSlash
     damage:
       types:
-        Blunt: 25
-        Piercing: 5
+        Blunt: 18
+        Piercing: 4
     soundHit:
       collection: MetalThud
-    cPAnimationLength: 0.25
\ No newline at end of file
+    cPAnimationLength: 0.25
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 10
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 10
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml
index ea02cd44d2..d3c9a9334c 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml
@@ -18,6 +18,7 @@
     unequipDelay: 0.45
     sprite: _CP14/Objects/Weapons/Melee/Sickle/sickle.rsi
     quickEquip: false
+    breakOnMove: false
     slots:
     - belt
   - type: Sprite
@@ -31,7 +32,7 @@
     cPAnimationLength: 0.18
     damage:
       types:
-        Slash: 8
-        Piercing: 4
+        Slash: 5
+        Piercing: 3
     soundHit:
       collection: MetalThud
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml
index 1c1e8cf9f1..66e7daa0c6 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml
@@ -17,12 +17,12 @@
     layers:
     - state: icon
   - type: MeleeWeapon
-    attackRate: 1
+    attackRate: 0.8
     wideAnimationRotation: -115
     wideAnimation: CP14WeaponArcThrust
     damage:
       types:
-        Piercing: 24
+        Piercing: 19
     soundHit:
       collection: MetalThud
     cPAnimationLength: 0.25
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
index 1acc47829e..2cefa0700e 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
@@ -16,13 +16,14 @@
     unequipDelay: 1
     sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi
     quickEquip: false
+    breakOnMove: false
     slots:
     - back
   - type: Icon
     sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword32.rsi
     state: icon
   - type: MeleeWeapon
-    attackRate: 0.5
+    attackRate: 0.7
     wideAnimationRotation: 205
     wideAnimation: CP14WeaponArcSlash
     damage:

From 39f64dea73368cc4c47fdade3b8ad3813d2cda90 Mon Sep 17 00:00:00 2001
From: Ed <edwardxperia2000@gmail.com>
Date: Mon, 22 Apr 2024 21:46:11 +0300
Subject: [PATCH 2/3] added light crossbow

---
 .../Objects/Weapons/Ranged/lightCrossbow.yml  |  54 ++++++++++++++++++
 .../light_crossbow.rsi/equipped-BELT1.png     | Bin 0 -> 454 bytes
 .../light_crossbow.rsi/equipped-BELT2.png     | Bin 0 -> 460 bytes
 .../Ranged/light_crossbow.rsi/inhand-left.png | Bin 0 -> 581 bytes
 .../light_crossbow.rsi/inhand-right.png       | Bin 0 -> 583 bytes
 .../Ranged/light_crossbow.rsi/meta.json       |  39 +++++++++++++
 .../light_crossbow.rsi/unwielded-arrow.png    | Bin 0 -> 147 bytes
 .../Ranged/light_crossbow.rsi/unwielded.png   | Bin 0 -> 345 bytes
 .../light_crossbow.rsi/wielded-arrow.png      | Bin 0 -> 145 bytes
 .../Ranged/light_crossbow.rsi/wielded.png     | Bin 0 -> 357 bytes
 10 files changed, 93 insertions(+)
 create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT1.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT2.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/unwielded-arrow.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/unwielded.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/wielded-arrow.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/wielded.png

diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml
new file mode 100644
index 0000000000..049772442f
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml
@@ -0,0 +1,54 @@
+- type: entity
+  id: CP14BaseLightCrossbow
+  name: light crossbow
+  parent: BaseItem
+  description: a small, compact crossbow that is comfortable to hold with one hand. Not too strong on the back side.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Ranged/light_crossbow.rsi
+    layers:
+    - state: unwielded
+      map: [ base ]
+  - type: Item
+    size: Small
+  - type: Clothing
+    equipDelay: 0.45
+    unequipDelay: 0.45
+    sprite: _CP14/Objects/Weapons/Ranged/light_crossbow.rsi
+    quickEquip: false
+    breakOnMove: false
+    slots:
+    - belt
+  - type: UseDelay
+    delay: 1
+  - type: Gun
+    fireRate: 1
+    minAngle: 15
+    maxAngle: 35
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundGunshot:
+      collection: BulletMiss
+    soundEmpty: null
+  - type: ItemSlots
+    slots:
+      projectiles:
+        name: Projectiles
+        startingItem: null
+        insertSound: /Audio/Weapons/Guns/Misc/arrow_nock.ogg
+        whitelist:
+          tags:
+          - Arrow
+  - type: ContainerContainer
+    containers:
+      projectiles: !type:ContainerSlot
+  - type: ContainerAmmoProvider
+    container: projectiles
+  - type: Appearance
+  - type: ItemMapper
+    mapLayers:
+      unwielded-arrow:
+        whitelist:
+          tags:
+            - Arrow
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9adf489066b0a538f73c30d6ac214a87355c793
GIT binary patch
literal 454
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z8$4YcLn`LH
zy|q94kb?~ChxC^Zt}U&1eW@_(<R#q~PgF#7ZYch5>Yf}RzPZbLdC-RJaNa9hOLmGK
zJlL>$f@(mF>kdD6^T}WI)K2~GX_V2w|3~5zpMnwuEczQKm-l2r;MB<H22XWfGemmZ
zG(2!m63w}MVp69IvxLd2PgC^dIt&|%mTEFS`1|;Cplr3+q6ujlvRcbe$*LAHOrI{!
z!0@oF>gc4kqVEJ+Zog!#-?`X@Pl3n$LyLa+L9y<aENdUGSU=M+baeu^{|_S`^JikE
z$Bkcd##>EOZT!(6E@t!4yWFOGuKqRm4Y#*(e|{>p`*!t}SAKc=atzN-o9@cBo|_-C
z^U{>ceZO50KwW9={g3XO?G^H_PoMIQfp2THOX-wV^Nd}y8I~P>^ZD=Buo?Q-cT`uI
z?pil7Tp?5afBdS&CZ5#{M<>nQG5LDpt{+#V9I`E5=`WjHV)b)RaR2V)NTW>k`RdQD
s)UUtlyAvC`{PxM`lHa)n1Z8)|3zkn++>&xt0vIt2p00i_>zopr0EDf^8~^|S

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/equipped-BELT2.png
new file mode 100644
index 0000000000000000000000000000000000000000..82ae7a6da84a16996a991003fc0e0995920acd0d
GIT binary patch
literal 460
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z+dN$yLn`LH
zy|vMsDN%y$!*iuWYmeHyd{JBccEw3g4xXG3@fn3&MIXZoGrJC43$s088ny4qi3`l(
z2iv0aras8-;9sS<y88XO=I7=+e|-4)>2CFd-%Ku0@TL52ROtOVvM<)0|0r)ADX);d
zTS&3{s?>pbE+Mau<Q+)b>b5=X?A>IApoZ+FI-h_3d-zd^;ndV!9)>=BC#S02V&+n1
zKV`e0p&_X-Ugh$W88MkjtQlW^&3&2CaWsq9pVf*-dEy;|o(C%(>c7m?O<k9HdfV3J
zOmF#)E!ulPwrA_|CYN8`H+U_q@?LH~9Q@<6>Mh^nxBm3r&o-AmJzrl{`RP>cQr)XR
zIuM{p#lOB^eUrR`skl#b2IH9wpDeu{okuL<wlJuNZ~ySz+h^W87x!fQ%$sFvlsd!|
zI(I%Ozx11F5v#|q<IM5jS-Diz%i`WmTVnT~+sED6r0TEVwREq!H^mLk*U!10mvz=_
xmbJv|n@=RyZx(M!oRanUuGAe*1*NW+vLPF0<RrLmR|G~6gQu&X%Q~loCID18(ZK)!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..d214fcbfd3bb5fbca8f021e66ba048d54c462006
GIT binary patch
literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px$|4BqaRCt{2+A(MoVHgJBSCD{EaOsdj$Gbw0P_zaPlR*kL0U=Xysd~swcBmS=
z2-1Xh$<g83%`F6jiiK_>wap~dBAn8p#6UX=cIYBb?ecZ{!=+SuNiH^N-e*cK$Itiw
z-<Mn71Bi%-h=_=Y=rTy9ZLzYh1iANWr;E7=6OkIQUkh~ar96PW-^bxCR>&lzkVym@
zr(V=B0h(^g>(a`i|C;B_0RT3)wio=@XC6P#?eBfN((wwLw7IptFqyoaSD*dA1*%!o
z&4vev9gmA0kJrCjSywdO?CObVrsgwGWBk^X3=UpL)QDmF!94)LySJZkP~FAh;UE0?
zzSeb}SFEfn2i08wK-7q}SF@&@;*=}mlq+4|b)^?;CL$stA|fIpA|fK9KBcn#z6>=|
zX}i8@f3R7yk{wH^1Lb8_)|EHQFFKwFI^~Mo7#+sylZViUA{d!W<FB`YFV!OeK+*Fq
zCX@7c<~;3=u2Zhax>pmG@Gj5iy7RA4$Rwm>B^yRojcqdr_AmbTd`{>5VQP7#RQ`VF
zeg*^AfT^eX`dX>9EgPSUp^U3K%%~B=*N-0%_DdNpFQ&Tk{@H8}0Q8{<Zsv<{Uo9bO
z#PC0!8DVItNKH4z--&gvCIGPW^A`Z%<)gbjv3a143Gk0502t$AJ+*NnA|j#_j;qc<
TyaO{o00000NkvXXu0mjf*x3>T

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..47103b8d09e2a375cedfa22050a7ebbbc946791d
GIT binary patch
literal 583
zcmV-N0=WH&P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%0ZBwbRCt{2+A(MoQ5XmCzalz`ONS1QcVI&Y(SyST1VK}gW)dn^Jmj`+UIlTn
zl7i%>tJOiL5*qEIodmH>7Kc)VSc`;MOh=&^x(I^M<?GUS-cn7>d(9R9zbQGw|Gj(f
zds)5*5D^g(5fKql+IT@E`4L}C<sUT_tjo~m8(ccRVJ!ccv1CnJTRZ)pLib9Atdt5_
zV`ZyT&lO<Vt~@V4nNB{dhxY&g)s@v^^7+J_yHlI3k4L)6x{|x_NM)(dsbkr$ctI5J
zxbHaPJ5K!F3nH;>x1);qTb6G7?nbxHoxd&v1E(;U8OHdnYXE?SSMShnHn6?@18bia
zJ02^U)owNb0E3xf%+E|}o3AmJ?MhgwNm!|Myz2*%MMOkIL_|bHL_|bHbRbl_%VeKF
zRZ4}dl)YU1vdJcC+7`h`uT3>GFJ?~Qq?5<D>JnO8I~aTM66;^T<H7CA#(R8T5J}&A
zi8BwUM0I!H*Eb}r)Ozj}cKX}CSDGq&U1wiqR99Au$s<+vay?zf&|V^z?Mim^M%>n3
zUYgS~Mt;PXWY*%-qWt^?e0cp905Dgt|I;|>@3-&qf=JrU1|}ch$LFFS-yOO+`)nHc
zeUqeHhh_l)K>dfD9XbsFxaypV=Wp4r{OS75eh$?FC}E{0&9yH8p#7*35fRb<V;3I=
V(mS5@=L-M;002ovPDHLkV1oT*4BG$z

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json
new file mode 100644
index 0000000000..6b32cef78f
--- /dev/null
+++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/meta.json
@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (github) for CrystallPunk14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "unwielded"
+    },
+    {
+      "name": "unwielded-arrow"
+    },
+    {
+      "name": "wielded"
+    },
+    {
+      "name": "wielded-arrow"
+    },
+    {
+      "name": "equipped-BELT1",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT2",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/unwielded-arrow.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/unwielded-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb3c9b28c0e1e1752292d2ad50acc54913762e2a
GIT binary patch
literal 147
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}zMd|QArY-_
z&u-*wFpyw<Sj^WwquxsTU?7Y1a&Mo9GPia*a5=tP{r;oFB$e8n7n1qE3z=Q~rrhe7
t!_bjgGrK5m$}NV7={sNhPg41NnOXJ~FVhPCI%%N644$rjF6*2UngD|aGAjT8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/unwielded.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/unwielded.png
new file mode 100644
index 0000000000000000000000000000000000000000..61561d69c379fe27b1118a142762be005e2797f1
GIT binary patch
literal 345
zcmV-f0jB<mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$6G=otR9J=W(y>d!KorOEuTWgGWKje`5FA{*q?6zzt$U!*L5D2jP>7r8kopfe
zJ2@$K(8WPqt#s2OQmD{XqQg1dD#3G*s9kI<MM2(YdmQ(E$Grza2qDBD8yiKFi|hM%
zdwr+wx()zZ8`?LgBk7$h{A;bez$!1WYnyvkd4U~tf2da~FR-rbptYe^E%J1E)_1-T
z9{_OMePC;K`P+=bFyZq{i*%YTYSkiFjS~P8lLGKMqv#%;(`mM-L>mM9<^F-t_wDS&
z_($D)e4(;`SYPqyb^%J|(8BxtGkNwP*8@uB&`v$yk(iW8r$Ay-qT@zi_)mi~xkjM1
rK{HLe_t`jtI9sw`-FhK}5dY2_bE;$Zp3sFo00000NkvXXu0mjfg43I&

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/wielded-arrow.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/wielded-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a62bc4a064b29bdc82fbabd656d2e52523eda68
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}-kvUwArY-_
z&n)C^Fc4w5n9S$$az3B)Aq^FYW!Wne_zHe#v3&pX)M1iJZO)6%?SFSLDye(ry7)01
rG1=#9sqdA`u;%oguhUgL|9@e4`-+!IKznaK&{zgfS3j3^P6<r_>w_@P

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/wielded.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/light_crossbow.rsi/wielded.png
new file mode 100644
index 0000000000000000000000000000000000000000..6951d61dad4e774e049bfc96945c679a1c1cfa0a
GIT binary patch
literal 357
zcmV-r0h<1aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px$A4x<(R9J=W(lJZJKp4jHe?{cBE?F$Df<p&QIvMCB$>J8B#3hS+Tto*yf&BtP
zHwzAeldDt^9IA*47CH&iEa#A=9HDRyB~mKr1qYY=O(ER9&%@n;Wm%SG{j<tnHY=r)
z;(OiSIdPmS08(Z=++P^YE>&PU5I_jgnqA|1kp`$YeO_*Ee=TBMKq-|Jfvy*6$EhM^
z#&#|Jws!5f4Z!2;I|sWPKW5CC77#+Tlv0W7MY`Vfkuqbo^2Q*|8KgPg{)ldW#C5(x
z=j@8Zy(6Q!#wQRr8hUwg0e5o?fb-K1?OyL|e-OqRCih=3c?U)Xf-u%gA5RRkF}3PE
z!)(mu^W8p7P9_LrT{gH>f#PA!4le$e4Ye%GvaD&Jm@;S-oBvfr00000NkvXXu0mjf
D*;<pt

literal 0
HcmV?d00001


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 3/3] 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