From 20d6ccffdb4c4ade02f87570362eac950a698eaa Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sun, 7 Jul 2024 12:55:03 +0300 Subject: [PATCH] Scythe (#311) * Scythe * Update entities.ftl --- .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 3 ++ .../Objects/Weapons/Melee/twoHandedSword.yml | 17 ++++++++- .../scythe.rsi/equipped-BACKPACK.png | Bin 0 -> 1023 bytes .../Melee/TwoHandedSword/scythe.rsi/icon.png | Bin 0 -> 615 bytes .../TwoHandedSword/scythe.rsi/inhand-left.png | Bin 0 -> 1229 bytes .../scythe.rsi/inhand-right.png | Bin 0 -> 1261 bytes .../Melee/TwoHandedSword/scythe.rsi/meta.json | 34 ++++++++++++++++++ .../scythe.rsi/wielded-inhand-left.png | Bin 0 -> 1178 bytes .../scythe.rsi/wielded-inhand-right.png | Bin 0 -> 1180 bytes 9 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/wielded-inhand-right.png diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 51524297c9..e82c4d6a2b 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -394,6 +394,9 @@ ent-CP14BaseThrowableSpear = метательное копьё ent-CP14BaseTwoHandedSword = двуручный меч .desc = Мощное оружие, требующее огромной силы и умения для эффективного использования. +ent-CP14TwoHandedSwordScythe = коса + .desc = Большая двуручная коса. Что вы будете косить ею? Пшено, или головы своих врагов? + ent-CP14WeaponRevolverNavy = револьвер "Марин" .desc = Увесистый капсюльный револьвер серии "Марин". В настоящее время револьверы серии "Марин" стоят баснословные деньги, и их могут позволить себе исключительно преуспевающие моряки и торговцы. diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml index 5313bd85ff..66368aa6df 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml @@ -47,4 +47,19 @@ - type: CP14SkillRequirement fuckupChance: 0.5 requiredSkills: - - Warcraft \ No newline at end of file + - Warcraft + +- type: entity + id: CP14TwoHandedSwordScythe + parent: CP14BaseTwoHandedSword + name: scythe + description: A large, two-handed scythe. What will you mow with it? Millet or heads? + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi + state: icon + - type: Clothing + sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi + - type: Tag + tags: + - CP14HerbalGathering \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/equipped-BACKPACK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..c21554bedcb8c1008b081f18695ec099fb4b2d32 GIT binary patch literal 1023 zcmVPx&xk*GpRCt{2-M>qlK^O<{CsGN9f+blxwFHa_6(oz0rX-|Y3awPg5HcxE(jiEp zi~oazgW%Amt=Oq_=pY)%pcVsGcoz|r_$sg90&4nbGt$i4ZJX^&AX@jS-L_;T|y@QB|3_$__Bums(LKey6j@QDzB zTj`wx^&WO$01%PVYf z@YzLQ7nch}bagC5=$gIc@(L5p4vfTS!MnE+A|fj8m#+L?Kj7S_j}ub*rRxis`(y`3 zx*W{r%aN)!{v7}S00000000000Dy&9p)ivOql!7{{&B7q3Nwl5iegSyD$FFpj-Oou z00000000000000005oH#cc(J@D&?z)cp}T(E~hPm5cc|++vSv2A45t2GU*h#d+k$x z&fVKXnRH6Zv80V!xmvSD;iiqlJ%`MHLL?;ss=9mcsv(`Ee0nae41<&a+^1ksr;^oY zDN9D!>u0=p(XXGMyLuVooA0r*DrL!)wg*HbA!!?vm1WW?ibg`xjwdAm{7R@V+SILh tA1#@1Sfvb^p6t*^000000002}`~#N@pr3dlLZbix002ovPDHLkV1i+W)-wPA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3e226cd8814efcec3f6318645d21f9490981b08d GIT binary patch literal 615 zcmV-t0+{`YP)Px%AxT6*RA_#H%6YwqqT+-H1`cklbT``zyz z4;&7M!!ZUC6N6T&HL-MWe&Bke+2%ugo40RPw7plWfDHcWOBaBHgOC2bY&P#-lX8t_ zo2O46jg>*0fDGSgwgCo$RjM@smm&bUspQzJa^w1u2T7;XLqi0GqzvT!)i~bS5CB_W zKP!nC*#o0esn$d`n`d=xo$vdb^iIx{1wyCO>4>?>X;CT^#q#~fLiPEmiBKv$d;Wrq z7pHe}#_jo8<>x~eINsR+;O4EnS2p;lgeovMIW00?oWuU9--T4mC^Ugmp(rw5oZk6` zzj0UB)|JahYa1PvQlTgku_(Rs3*PVV`CaGNDk!ah^_Dd({B^NjLOR2PWr0$mC;)BY z!LmRi7Ui&is&!0j0&@0se=1lLNW^}=>eYig%AX5=!%7#Doo698K`QA1aMbNnuDAY= zE+lKeTyI4dU%rbRb^D}}9uH?`#$FBM0)MLga=jI)ZGO`-zVVZISm$}YyZi5-1ExAp z5TgPn`u^`26R-UJ(6|fy1Gz!?P`yko` zY}S1cEdufrIgHWXj-eb5hr{7e;s?tJ*|=j$3c&yX002ovPDHLkV1fY= B8g>8x literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1aee844538823e816da5995034cd44c910879016 GIT binary patch literal 1229 zcmV;;1Ty=HP)Px(he7q$uKc!U!1%t{kdvf)u*w zqW?oTf{QLi=%RGdh18TRqNP$PWLFr8nc)ep+~i?48B)R9g*`TgiN^QioST{RS&Qes z`#tx2?!7PX0E(h0ilQirqA1Fz$Ii;4sctSCu6WhWWwW!g$QJKDMx_S;0EhKUoHtu+ z@y?qq9M&({;#o~DnKG-{EPFPtX0s-jOo^`o@fG02WALu7+2eXw*Kp!7_PD*s3otec zuiasf>$N*@#>5|AUVu*>Q31$05 z07?HRY^Vcb0!aHmAzcUL1Q7OrLb?vHM$V@*te0+&rMkIn^63og_*eya_1wXEvjq}C z(*Fq>Lv?f6oHtu|_1uvjQuOSsEV5_XedN;_vFm9O^E<3xTH*hM*Y1d2PwP2A7FVypcSWJ8>=3D9Vq zSZzOq*Y2RvIAM#&Ccqy@e{qEh4Ch$c>>!s+nTgpY0KhLl|6rvJQSrT~9k5v?YYkYK zpX*!TICmcXVr{IiVPSrbYZw3+1)z+YnM$BssTrDtLa}6A*EO6EzA!%r*LClVpcLWN-fn-+cX=bu3%kyXNJKdDP!F0pPaqa*spAi%A56 z`=MDYsoD_1-FQmr z!f)d#T>&BSbo`004^LEp5TKpjuW$Z-^h*gz zI{APK;F}=6-;E03lOVp|jSAp{u(BUe0elfw_5&)wqX{$n0TrMxtJ&-auNK10en17d zm)Bo@f$q0@VP`)ea1hI4cWWXcS~$J)eK zKm9%e+z3IhSHn)8;h7CVNQfvt;${^8x8Hq#Ta)Ol@~-th^2rAx6u_p27!N_+TMEUJc{=_C?^^GN zzgvn;4KW6x(KxwXmDE;;gGeXAmWCLEP$-tnKX3ko*Y4oQ>Tj5woMaheq<29#6FnRa zF)nHcaN;pc%r2q+wuwTqWNd9L^-+>brc5rGGF#ib#&um&uGCDqQZpagqW0r4e@p0P z+(%t>-xG{(IwW0-fZr!Wdv;~_V$ke r__J3PU;rMn7F+9@q9}@@DEII$nfpqNe(Fhs00000NkvXXu0mjfZp%Xh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7c36eb58e099134471c8c8eba8cf5d864b33d04a GIT binary patch literal 1261 zcmVPx(r%6OXRCt{2oX=|;M-<1u5>bV9aamt-Y7sb*sff@eU=(DO^i(2ZP(bKV9BR7< zVG2F8&_AKj91K46(#E)_(nAlyG5BCR#9#ut1cQw%n>G04ix%r5BLtcr%(zZlHLIC7 z+STs++;?Z@ef56KXy*Y8!!QiPFbu;mjKA4hniZ>+g7A7Ceqyy!5L-*LN;ZiO`oLMU zg`N6^%2R06~F3e*lKdnC_A2XAm?ptK2R(}HvFq5B#ZQDW)SSnY= z#%4`S-I)O3lQVJy$aPKKnZU+o?Y;Hewk=eDd`iYzURe`Q9_LX%ZUVq{;{EoUXMr^S zO_o>I1OVK<`x$^ML0-PvRbIQY!Q@0FVKBZV%xh;DhG7_nVHk#C7=~dOW9T&Ea07ps z^#O+7h=chX-9{Wt(BNiG^bC{(xLK1A;ATy<3|s{{-5w^#$4ty6lngAu`oVsvt|Xa8 zxn3&iH%w@oe}bfG%Uymli}v!)W`Vh_tzs~c*$HgD~7$ZC;v}aUe+Ep z<9h|U0HazFnP|k}1|wfZjM~1yR3i>I7!g2v!Km~RHPwj24aP=wx;> z3LuZG`-$++tDatBsu719jQU+a5lZE%c=9-Ja_E8ZvcZV)z_)&|A314V!iq(&E2G7Q zd3^W7Po{@<&3SDbx9>mlq}$g}GSA-WQRJj`iOKP?>qSy_9HGEOBMvtVE%nP*FXy#w z-!*kI)ri9lL;Drlwk^K={0mr#I6g{0@SO($^o=;&Fcc3cm8+tD+=-Jwk_(%P5kofi+_cZQn@Og z|M>lNFCp2;>E)|k0KskOq>6IGCIFDNyfn5%#?G7g&Xs+FmQg+wj@al7!!QiP_?Eu_ X;r2lsNwck400000NkvXXu0mjf=tWbZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/meta.json new file mode 100644 index 0000000000..2c3cbc4e20 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.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/TwoHandedSword/scythe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d5ca4921cebf2f25d632f1df8f8f67666b9d1829 GIT binary patch literal 1178 zcmV;L1ZDe)P)Px(R7pfZRCt{2-Opw{=v$=xMG)*in6&*XL zQvzNWz(_V%5DW8j0033p#Pju+cwcz}0C@54t!bH4p{M|WiR27UrH>;LnF0XZymcE7 z@89rUeSKFTy=<-^-dCPr?57_A0QFCwEd@aT`xD6-UpBnt+k&M+Q4tP~0syufyUiXA z0Dt^`$*|mVijgBme|)#Vd1b`w0vO4}6CxZO#dc#CA0sDlckMA2=I3zXe7ftg7tW`# zFh7U8Ymf0Uasu0pU4(<9$ix%AoBv&xR}_&~6w`*t#1kT~C_>KVQZ`o*rE;a?Vk#H! zQn_+q0Z)aZBCjaIk3n#K1YA1#GnQwk4I3g8Pl&NYBdG7~ADA+FnaA6I_r<%nf%@J) z#tx16ZX~!GfIF{V1$Jr;932lH_)OpUk2YQ#Hnys6qPkVd~E4XV0n_}Qb4*S-vb zCkxZsZx_W*t%1w;o(1%aty$wsrE*2cMwW}QoRT7uDV#f-G(BDh8u;2F`mRi$esKGO zsZdnx)EanN{Q$WhSZR1EHaU*iWEv~0>n-nFS)c(luj7|dFt7l~o-KDF@)ZCcys4wx zbkoV7*Z+dNNzI< z$}5VHQ&%b!75&~{*bcz*?6i1V{QzJv4eeL;y?x{rMaTs`tSI7i>zAI};-HaQMeJ@}p%`t5+ed=z2E>@l^IkFcqO zQn}LcQADX+8M*)r-3Tz7YP_0;z8i~6Mbp1(b^Dx%h=_=Yh=_=Yh=_=Yh=_=Yh=_=Y zh=_=YoaW2#`1X@CZrHe5nM^z(emyp3`rTTY^G)WGsDJtl0G3jgb)(PHV(0ila5Y=X z)#(s+YK@ln^bHQ6+30n&_V#RYMnoc0-@XZ16n283&(fj~u9u_A^$W{hDDzAJKrfA9 zlrN}P?LqIg3{D#Og`BReTpv_*({=y`UB+HGequK&BS(Q#0chuDKpe>zWK`Jg#x4No zdrvl35Jt&5oYY?C_GvTh;2L84!1jDWZq1*Xriqo+^?~*Nc1AlVqm9Gi_{nA_uWotk z^lVqci!EI?R}iPt$6afDz~0vRmn+wr_b%N!q;K}a{|Bj1R7@minm_-y@vo(P*JP2V zX0GPUy8w3^n_=5T2AXmP2iyCX+SCSQHlUaRXA s17K69DaOqW0ud1r5fKp)5fSy^3+E1&73I>Pf&c&j07*qoM6N<$f(leSPx(R!KxbRCt{2-OWo|Sr`WJ$Iy)ECgo<+l_g?gFd%m$Of4zeE(WT&$RfB(8RI64 zftg_z^FPdD0%4{bKgiI1F=u_%(MwCMI+dQ~!&7R6#wM4}1X zF&fZ2IPDu30B~dKF7AZCMj$W&09aXF!_&tPb)Q2QBGH6cjxPZK3WYtq*?Nbg+$I3v z?cs;I*cm2386E@xl>hw?H>U0~@D4?y32~I$gf@=05+Ju2nYl5~5CGudLzoXua{sq5ADR?no*^8Z zoZ@5P79PEPf#vuT7Usg%PnJa_lg-r?l4;+#h^eZuNh}D%haU#YXXjAdF2j|uzBnTu+`ie&YxrW#hbD#McA%R6vVGsHJQr+>&$#Q7~ z0u#9Z&6H^X<$%Ctab91X5hGp??)~qQqb>3&>zNM&$lYasuGajFJWbM&Gz8hL?~_-p6rw%6C&@N zw2xOYF?NFw06+cw3*?(L>00ecjlAKiorGK&<+F2WAA2n^+SM9URnhL+_4M(>f#vv8 zRqd=xKr0ws6=sQ<4PM8$f4=TWBGwmY#H;)<06@_c&~9i;0*n|XMi%f+8S#2B8$`zv zZl)>$LBF>vljw9Hx_PG-^m|b#T>f15KETOGspO1hY?G<9$YgU&K$~Q;IqQ!iy0s1U z16#38rqcYYR~s;{L_|bHL_|bHL_|bHL_|bHL_|bHL_|bHbTxJTd$O(erS-e(sR=dP zaizB18UQH6gOJ~ZH|pD_9skKr*-`(8W_9$N^0nmEDuX0Dt~4T}^+V(Pf3Hf2hhmGCsMqiR+9bEyn0hjDtoo1Z$Ix?EWZ16g|(eJ3OE5Iz^t?rT% z2u#>&wNpE$oMU7OB2w^fa__b$QmU?86K>3ask?xkfsvQOUpUv_aYKa zh-U9}I-L+lPnLZoR#w;WY4`6+(Df$M=^k>j2#=1Awskzci>{eoN0uvK+BYubJ@xND z#-X@f`1Cp88y4CB_4Q#Rb85&%6TGx&#VRmUd&M`~>&WtsK^Y#zSE1XLV@J8oE7|+4 zr^z-pc3RmKi$yl1aKNy0Zmo-!i(crpH3lyKzks$SBU!V(m1tY7$j?`R%N{tg<8Ezt ua5CpOSVlc>7