From 54ecb1b23e71226b9c4447a05ad0488673fe3b8b Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Thu, 27 Jun 2024 23:29:27 +0300
Subject: [PATCH] added battle staff (#286)

---
 .../Objects/Weapons/Melee/battleStaff.yml     |  38 ++++++++++++++++++
 .../battleStaff.rsi/equipped-BACKPACK.png     | Bin 0 -> 557 bytes
 .../BattleStaff/battleStaff.rsi/icon.png      | Bin 0 -> 309 bytes
 .../battleStaff.rsi/inhand-left.png           | Bin 0 -> 802 bytes
 .../battleStaff.rsi/inhand-right.png          | Bin 0 -> 799 bytes
 .../BattleStaff/battleStaff.rsi/meta.json     |  34 ++++++++++++++++
 .../battleStaff.rsi/wielded-inhand-left.png   | Bin 0 -> 772 bytes
 .../battleStaff.rsi/wielded-inhand-right.png  | Bin 0 -> 787 bytes
 8 files changed, 72 insertions(+)
 create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/equipped-BACKPACK.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/icon.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/meta.json
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/wielded-inhand-right.png

diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml
new file mode 100644
index 0000000000..5ae929320f
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml
@@ -0,0 +1,38 @@
+- type: entity
+  id: CP14BaseBattleStaff
+  parent:
+  - BaseItem
+  - CP14BaseWeaponDestructible
+  name: battle staff
+  description: an extremely simple and effective weapon - a long straight and heavy stick.
+  components:
+  - type: Item
+    size: Ginormous
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi
+    layers:
+    - state: icon
+  - type: Clothing
+    equipDelay: 1
+    unequipDelay: 1
+    sprite: _CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi
+    quickEquip: false
+    breakOnMove: false
+    slots:
+    - back
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types: 
+        Blunt: 8
+  - type: MeleeWeapon
+    attackRate: 0.8
+    wideAnimationRotation: -30
+    wideAnimation: CP14WeaponArcSlash
+    damage:
+      types:
+        Blunt: 12
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.3
+    cPAnimationOffset: -1.3
\ No newline at end of file
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/equipped-BACKPACK.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e1cb44a14bc13ed72e0c8bebbbcf18a8959f4e2
GIT binary patch
literal 557
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zpL@DEhE&XX
zd&f5Kkb^+mL(eJP0hb@JeZTON$>ayemk=3+FBg<9x;Tl<QRGb(k(%Z5PH2^aV%DxL
zexjQD|MZo!f2-w7c;EGN!``@l4xr%-G8(7FekNF)tnEL%^kBiH^qWqp=ggPOJxDa0
ze*9)kvQGNpJ2jIv&i&35a^d=wIY~WmjoJ0=wak0h+}p~RI_qX-R#<E3t*iQrW;6)Q
zSo=@l%dM4FU%MwX?7jMGqKS0q{lgrWcicX;e6gS6bqk>l?L|vfUOzqd-Qdub?B%VY
z`#TOz{;;%q?)n;j#TeH+-~S&mP2hg_+qNk1uae4x_>leX>sH0Lu>9$K_5DOD$kg~1
zb^S5n`#Cs&sCB%0zcqMr{<*HG_xF!hGG%=|@m2HtqwKx+Psd-_aocEW)A^5g?%j>w
zX}A5ee8S#49y^1IYHzJ=ihe)8&uZt?Y{!eQ|L(4+l>hMOOIq68yQeJXcrUu~d)}pk
z1&^Mdd#=6yJmbFa5x?y0K|urs8?=s;rQY(pHBBgKw^6ZER(Kf8)ZR$Pni~m{nig`t
zzx7;&j;3v!GhcWs3()7A=gTvKHO|p|YpO40Cfi}E&%A80-@2<s?JP0}lTOclkg@fS
tBBT4JD@E!NQo7|H2Rd(vvx2ppJHh^W+KJU|N&%K2zNf37%Q~loCID+P0ZIS>

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5c445f5a5f4c270cabb208a7cab6fcd75a969bb
GIT binary patch
literal 309
zcmV-50m}Y~P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#?@2^KRA_<i*ewpiKoExEFWdl)p$0s-UI0UnfJgNLc(5eM2Ei>V2{kn|b%27T
zLF2HCs^U*{b~Y^EbAV}+H_dhyAR;3AXJvUZ%hkrXdVZ_vfNhpzm*o=g;!YU!%_0h&
zRA^kFcBt-Bqug*+L977aNrm||Qmr6bU_9z!FbpI|>PwT@tY;Io3Zex7;Ci{C(``$S
z)s-f(+P5HH004^p8OOY`F<Ot-xnQM0&5Luvb_J^i09N?QdI5kHK2j+Fu)<qv1prSf
zNdF_L7T~_{f@%SP`@$3T0)R*Rg2bJwlLED$zf&b5B5LXZNHJ@Fyj@0s00000NkvXX
Hu0mjfkrI8s

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ebd956fd43b93cf086115559645612332e0028f
GIT binary patch
literal 802
zcmV+-1Ks?IP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00001b5ch_0Itp)
z=>Px%+(|@1RCt{2+%an#F%$=Ixpc|Yh7KJ<AP2?HXp+S}Na@rpxsQ-69qP$@lezX*
z3|;~zgXz}Q6g;*K7%vHi42{9yfXUDyB!*It>U1<qe6ggbC!PMk4`2!Fp3l;IdO`pI
z0001?W~(EI!;$2k$0EbwNH$v?t8;v6YoMQ}16xBW`+hp`VxCKDB(aR6lG9IrDvnCB
zk;K;K`ozW{AG`g6jd4u*HT}yyg|OL-0xJ>VBSZnSI4a3{H6f1zM8E^~c8g+bJK~;3
z*m~`nJUQAYjRHi#0@qi!Vr^rUdm3TuwQHpB0z^QD^RtP#989^V5jM(w0V3d$urFXn
z6$OZZB_IlzQAB~U2skL0y*O^xWjYFsEx>p-H}z4@>Q6?6@oX+kMuD*f=ubvoo%!o<
z>RsSdw#!A@5#ZF*5Sn^53HIqXl`qhWfUWIF?ClnH=invwe8I`lzU;MYK|cK{6Zrz=
z2w2-#71vj{I%9i}EniTtCc!`bDcyX5Qe_;@$N#gQFKD(p!T$4kNF0@vYf6`X2jsGL
z(g1uf00000000000002_W2*UxwPqc8g9HpCljWGoWhorJbzEVx98-A#a@$)cLnDdh
zcs4gy4X*qS`1-jnUOiheF$b?WRg8R4E?aGG#EqgDS*tiVgj+H99UgZJP8B1^QAvh!
zH;jr_1f(w_8+~>1O8bV)W@R0Hbu?%%z{?lUP0Ryy*l28&S4OU>qOp-WBZqOnZ|=m8
zZx<#$3RH!*DRT}kZKy%J8UO$Q;K$K?1pk8W$yM_a-!^4j%|}Qgz{gD)SMw3FpCG4_
z*BR1;()&+etoOYmS%5TC=F1WF<zOn#&n7HmlSRO0W!;M->Sn7W$FsROJnph|eI#1|
zUovI6E-pi+EF0-Q0GYCEq~+<zlsN#Ivc<@cBK{O#i<NgDsE6?u`2xJzsff2b73yIC
g00000001869|bxtCzwx;O#lD@07*qoM6N<$f<TdACIA2c

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4b8e03a82fb504ddf1b8a2ccc76d00b200129d5
GIT binary patch
literal 799
zcmV+)1K|9LP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00001b5ch_0Itp)
z=>Px%*-1n}RCt{2-LY#EQ5*;GU!;rRU~q5<LT*VML%YO-ij!S>i-TLcI2f1gwX?|@
z2!aqg1i`_zOD2&PYCx3RG*W1xba0TiQ0({|YQ+ZHBX{q;@4I{7&mZva9q+x%-S7S0
zFCs)lL`0NP98XlQKUC;`n9%DFRUA*W-`kwd#y)P3Wovt^vq@*<=Dxz9uDVfJs8!I7
zLKOyeBlmQ}M5Ak)J0%nCqI^5}jqZZKOwN80Lo1+2IQxM*t;p!?7vT!H*8D;s%S$zM
zH~h4*zM@8hw(++)u7E34s%1IcKSFoIPn}j|W%i3`{t_;V@8bh>7yM=Vy?+{i1E%o3
zAISFX7vT!HgtH$AG5bXTD`2(Ja57Yln*G)XVE5$A_9YW_qfqUhoXO7K#CjOr`T!tq
zGKqK3{vz(0r3HHn@^03-CJgGT(~6+0z(%}332X%{FV$pzAwXSTL>TXv(V(q1)>j}i
z&{n)Z3G_?&aQ{du)iUJTjQ9UF8nmtd7TApUCxPz=eEqU#J^s#k|CBJOTgxf!^@s2`
zpZ_@%4YiefnVTF>A|fIpA|fIpA|fIpa!8TO)R?AaOR~siYLb|$BQ!H#6K<b8eUWMP
zYfVe>G2!;sk5BUc^9OV{&iS?qx>2aIp7_z8mQu80O-Ztz_|ZB5E}nidNyj7CnZ&HT
zxyWbDI_coKp?UT1Y(pGpYKJQzgS&Tbqr2cIorgQP0#eX<xPt?b!n@a7^7Gd*x*LAd
z@$p3&={(@UM-UMa5s?*qhrSF_vJ73OW>zM5`K%9s3uS83$kl(yT<7JR&63D@MA7!O
z(=wTC0QnL|mZ_Q5#Y8c+-3l3iXRqFtL?jo#1(j-9?l<olYabR1LX@dVtFSv?Hp|qc
zVWX@WJR0h9PASWpfvq+g@Y0&zvbFOCe+0Se=HusbT6<vpIvjv2JX&nZ!^I}L8$?7z
dL_|cS+aKpbCI?|<Vsiih002ovPDHLkV1mb5fz1E_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/meta.json
new file mode 100644
index 0000000000..2c3cbc4e20
--- /dev/null
+++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/meta.json
@@ -0,0 +1,34 @@
+{
+  "version": 1,
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk",
+  "size": {
+    "x": 48,
+    "y": 48
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..e522fe8f3062424f32189635d3a53981a41bb525
GIT binary patch
literal 772
zcmV+f1N;1mP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00001b5ch_0Itp)
z=>Px%zDYzuRCt{2+_7sDVHn5pU%@3ss6|kr1R5-)9h4(g2!X0Ns339Z(5-POVmc@~
z+Jb{%IvUKPNQda3PzvfGwSf|lmctG;5NRP4svtEW&G<UhJFo3fC70eMd_P;rareH@
z`@C=73%rj6000000000000000pwn~(-GH~R?wiexZT0o{YI9>-ALmz<n0TlwBS~3S
zyy^DYcEv1|%37Iyrpq_axzFkA@70Yv&jauOu~t7|CY>^pv{u{EP_$c;^k{C$?fB-#
zwj^m~d0k)1HC5{k{VJ7xd;UVHti@7UTlI!CzpBAxRHsj#aGx8rrZZr6dfZGrebeRr
z{QdJ+H{ffv9Z6EP-q1i#MAdpjkEgDOBKyMN&>%Qdxbgnwf$vV8KYL&*XDrK9>kaps
zrS(cj1=^c%PO|M6xpw!Tm(W9(AZH36|C7m*+$>&MUY9rfCF!+ocT~Xl^Y-`KkDp51
zx}YbycN*x4xYzi(gaQBn000000000000000000000DyLrFBHw_*raLpKBHrkCSNEv
zeV<kd-I3B<Hf@{}^HTHYj8n0=k)(m1hz65UO}&^4Ri8uCnAz!Z)7RfCX}4^F-+{_y
z(<U(-leAkNVgLE&pakBCqYg}~2fA&{q*EqiStb>Wn_M=1<ZE;;n>MLf++-}vI0Z$5
z5Xk6z>q!J%OTzmb(a~iVoQ#+Lb~;R)HXZehX!(fGq*G?Cw&UBbrq#SNVkp|Zr?ydB
zO2y(Pj2VBJc5SzE*|fXVbdro^wPds4Tgfu-_D+&y+kV|T6b6$~C5B^ejXS@#%T3=T
ztS>mN5}Nmjp!e}X^Xon0zelg#b~UZm?5^pbFU}W=X0cS()~64W2>gD|K%BXFRhLGR
zdT{Tyzwxo{N~r(V4U2rCXl%PeoB#j-00000V2|HgfKA*AJwVX_0000<MNUMnLSTXd
C^>M@i

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..456c59b82436ff175a7370c2e7dfa8c847eacfb0
GIT binary patch
literal 787
zcmV+u1MK{XP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00001b5ch_0Itp)
z=>Px%%}GQ-RCt{2-LXqsK^zD0vvhH4#i4@;J}8M}&?S9f=~Nfr(xIC!9r|3dx6XZT
zC6J{M974CQQpjixge;ao2Mq`j#KA$VQ0jP{9_?ak-u-^}yL<Qj`~kTix%cDc?sxZ#
zQUCw|0Kll(>geHcq^0ASWH=n@W~*a0#)q~BI_wQ>4OQ4dZ{S6oQ`=2q9Y<BCpZ;7N
zRrPKXTZ{F9jX~b+_h)R3L*@AVw{!?$vzY}}GQda30%37f)mfUbX8|(c4jbzgwXzyX
zhY_}JyP@}XHd(U(88E@c*|l0&nv)JAY~6N)^<97r_>b>LV|6k(mkuLroa+K)z&&AI
zAdD*ukO5Ob76{|W0<sL)s@1&MZZ<`o1!NO&dUH$lQO@d*M>D54w~8_g$R?ma9(lFr
zZ^Ef}flt*g7a3=OQ%^%^vNQ?y>8Gj}7-hi9YNR&SE2c4cNxWXLx3j6c?M9GKe~zMF
zP&fk?mgdyO*|o{o-V>`AWN8xo)1Nb~7Zf@fhyC%ttk(;gtxmANeC`rQ)xu{=r+x>N
z^6Vr5d@le10000000000002-Pl&yCPA4`$wt>cQr-as8lmmr(1j(+ueJGcp;K8#$r
zVbhn7nR@zYmMRW!ICU6#t5&nx+(;V7QGBDrxgp$&`4>myDcld367@|WqY21^vC&tj
ztc){YxxR?LItGj<;K}@Bia5Z8jmAc0MRH9Qjg5*U>709c^;3QO`h()5ps3ImWzNB+
zjbhNQ1^@s6Ab1jO*VulB`nD*`(nL!Xm{=yj$3>Y`>m9ZX@TpRk@8rJ!v~Rud9m@pd
zl`>zps3lwPuw}q<ebI|8>b#u#=EG-^u8(Yg<mOAItkkV{T(6Y5(0Ye;H`Mh?S?OEM
zWND&9=_&0jRLUk}FUb6=JX5nT-*OM*E%pg`zE)Q+*6Q5D000000002o&mS8PBTAvd
R8a)62002ovPDHLkV1gOhZgc<u

literal 0
HcmV?d00001