From 5ee01ce90020628edfea298182cb1aabb91713cf Mon Sep 17 00:00:00 2001 From: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Date: Thu, 21 Dec 2023 01:32:11 -0500 Subject: [PATCH] Resprites energy sword and double energy sword (#22797) * Removes old inhand visuals from e_sword.rsi and its meta.json * Adds new visuals with a longer blade for the e sword * Makes e sword use its new sprites and modifies other energy weapons prototypes to keep using their own inhands * Makes the toy sword use the old less scary e sword sprites (and gives it BaseItem parent because I thought I broke something when i couldnt pick it up) * Removes old desword sprites and modifies meta.json * Temporarily removes esword blade sprites * Adds back esword sprites after modifying them to flash instead of shimmer * Adds new desword inhand sprites and modifies meta.json and entity prototype to use them * Moves desword sprites back to its own folder from inhands_64x after a supposed prefix conflict * Removes blade inhands * Adds back blade inhands * Moves all inhand sprites to their own inhand folders related to the items. Removes inhands_64x folder --- .../Prototypes/Entities/Objects/Fun/toys.yml | 4 +- .../Objects/Weapons/Melee/e_sword.yml | 22 +++- .../Objects/Fun/toy_sword.rsi/e_sword.png | Bin 0 -> 193 bytes .../Fun/toy_sword.rsi/e_sword_blade.png | Bin 0 -> 826 bytes .../Objects/Fun/toy_sword.rsi/icon.png | Bin 0 -> 335 bytes .../toy_sword.rsi}/inhand-left-blade.png | Bin .../toy_sword.rsi}/inhand-left.png | Bin .../toy_sword.rsi}/inhand-right-blade.png | Bin .../toy_sword.rsi}/inhand-right.png | Bin .../Objects/Fun/toy_sword.rsi/meta.json | 78 +++++++++++++++ .../e_sword-inhands.rsi/inhand-left-blade.png | Bin 0 -> 1645 bytes .../Melee/e_sword-inhands.rsi/inhand-left.png | Bin 0 -> 169 bytes .../inhand-right-blade.png | Bin 0 -> 1668 bytes .../e_sword-inhands.rsi/inhand-right.png | Bin 0 -> 174 bytes .../Melee/e_sword-inhands.rsi/meta.json | 63 ++++++++++++ .../Weapons/Melee/e_sword.rsi/meta.json | 52 ---------- .../inhand-left-blade.png | Bin 0 -> 1201 bytes .../inhand-left.png | Bin 0 -> 366 bytes .../inhand-right-blade.png | Bin 0 -> 1214 bytes .../inhand-right.png | Bin 0 -> 376 bytes .../e_sword_double-inhands.rsi/meta.json | 71 +++++++++++++ .../wielded-inhand-left.png | Bin 0 -> 675 bytes .../wielded-inhand-right.png | Bin 0 -> 671 bytes .../e_sword_double.rsi/e_sword_double.png | Bin 149 -> 160 bytes .../e_sword_double_blade.png | Bin 813 -> 431 bytes .../e_sword_double.rsi/inhand-left-blade.png | Bin 694 -> 0 bytes .../Melee/e_sword_double.rsi/inhand-left.png | Bin 313 -> 0 bytes .../e_sword_double.rsi/inhand-right-blade.png | Bin 722 -> 0 bytes .../Melee/e_sword_double.rsi/inhand-right.png | Bin 330 -> 0 bytes .../Melee/e_sword_double.rsi/meta.json | 94 ++++-------------- .../wielded-inhand-left.png | Bin 330 -> 0 bytes .../wielded-inhand-right.png | Bin 318 -> 0 bytes 32 files changed, 251 insertions(+), 133 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png create mode 100644 Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword_blade.png create mode 100644 Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png rename Resources/Textures/Objects/{Weapons/Melee/e_sword.rsi => Fun/toy_sword.rsi}/inhand-left-blade.png (100%) rename Resources/Textures/Objects/{Weapons/Melee/e_sword.rsi => Fun/toy_sword.rsi}/inhand-left.png (100%) rename Resources/Textures/Objects/{Weapons/Melee/e_sword.rsi => Fun/toy_sword.rsi}/inhand-right-blade.png (100%) rename Resources/Textures/Objects/{Weapons/Melee/e_sword.rsi => Fun/toy_sword.rsi}/inhand-right.png (100%) create mode 100644 Resources/Textures/Objects/Fun/toy_sword.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left-blade.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right-blade.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left-blade.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right-blade.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 450fc4dfe7..d6d79edcef 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -853,7 +853,7 @@ colorOptions: - DodgerBlue - type: Sprite - sprite: Objects/Weapons/Melee/e_sword.rsi + sprite: Objects/Fun/toy_sword.rsi layers: - state: e_sword - state: e_sword_blade @@ -863,7 +863,7 @@ map: [ "blade" ] - type: Item size: Small - sprite: Objects/Weapons/Melee/e_sword.rsi + sprite: Objects/Fun/toy_sword.rsi - type: UseDelay delay: 1.0 - type: PointLight diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 5b06f09946..b2b7bfd20c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -31,7 +31,7 @@ Blunt: 4.5 - type: Item size: Small - sprite: Objects/Weapons/Melee/e_sword.rsi + sprite: Objects/Weapons/Melee/e_sword-inhands.rsi - type: UseDelay delay: 1.0 - type: PointLight @@ -165,6 +165,15 @@ - type: Item size: Small sprite: Objects/Weapons/Melee/e_cutlass.rsi + - type: ToggleableLightVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + right: + - state: inhand-right-blade + shader: unshaded - type: entity name: Double Bladed Energy Sword @@ -201,10 +210,19 @@ map: [ "blade" ] - type: Item size: Small - sprite: Objects/Weapons/Melee/e_sword_double.rsi + sprite: Objects/Weapons/Melee/e_sword_double-inhands.rsi - type: Reflect enabled: true reflectProb: .75 spread: 75 - type: UseDelay delay: 1 + - type: ToggleableLightVisuals + spriteLayer: blade + inhandVisuals: + left: + - state: inhand-left-blade + shader: unshaded + right: + - state: inhand-right-blade + shader: unshaded diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/e_sword.png new file mode 100644 index 0000000000000000000000000000000000000000..c231db05b3eab91bbc4a2cfda171c23930daae5c GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5B&Wj{^Z;`saJ{8ADGyH?;rNdKB#t dYQYjB&!E2eo%Mrk%baqMVV-`gByp z-2czh)@G)??x6(G{pz}(<3Mm9s8wC}_tbT3XF%WuxHg;q63uDuoAhc^iyQ;t9pLh& zsVN7*)h;mnY{^`%O95JbO#?nIfc_jXa1ZpZd$Vfn4H1f~r~U zJw4mk9sn$9e*ufG6Mycminx z;$ozUE)=p0KR>(^-s5+(4T=bu;oI#G@R2h3Hv0oP_$K=UYjD1RcxgBwzs-3s}KL0+w)bouOBA zYV;ZUHC^F|FSKx=cuB_h2bQXuM#9ha1Uvyx;I9e10e@X>q9V5Q-2eap07*qoM6N<$ Ef~?PMRsaA1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png b/Resources/Textures/Objects/Fun/toy_sword.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..535d9de84eb15bdf8cd8728f336343c891cd80e0 GIT binary patch literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7lv3MOb`&u*#{KiEbxdd zW?X?_wfUrhg6t)pzOL-gc-TeM8K$z>`2mIQc)B=-L>zv5-IlM(L4frE`$Xpx zRgxOl4i#5utzX!x*jRlbf7@dwk!)p7mZN`XN=nB$IW72c&qzh*z&v~P$qq50v0@q5 zZI^v+7O0yOyXo`qodR{$@~fXHRop(ck6C-qI>rZF2hKe|AEdydt}oCvS*+vWNvU*Ylp-sqyZ7Aq)Gvz48`c zZMpvyvqWWwPg9+>jFCYi`Go!bn__l6%xkvle0avOY-;gi`S}f3PVINod^#m4?|(y4a;TL=CYMebB!no-9 z2fG?}SB7M_7NDKHpR( zUPm(d8bx2fJtnM zKTkSKQZ}OpX(8Nssq6JlY${KhW1jA^p(VIFP?N_I+qKE%1?GxZNbV4oZ7Mt}2pjV* z_aoc09`UEVf1_`4x^T+hr6k*&D<$9^i{^5Y+pUak4;E0_6k~piJZe%?lVr~_uxDkM z3f(^iQ&|uvqiHdS&f5Ju+_T(IO1RTJM9q1bn<_(cO=#08!q~O@fjBBOE1^lklU9D1 zpibu@xNmT2g|Rim3HDhWY`vWMYK;2!Xt`tIi|s(jI-sw)&PD2GIy*_{y*v zVp3AlX);-ga&UM?b0=E#Ks0n9Z+JkM85b(ETV66gKNBCYwXhpkh94Oe5a|0RS`d{=n2}(nwon@pOO`*;uE4Bjj9r` zh{XbocRt?vlVJ?wrYcRxtOumzY(q;tBe^qmSea5Uer=}ke#*31y9?4yN%>nvpPxQD z^QG@l9Pe4dTw)4rh^^2cnB(cS@{vM59VW5G9KUMbK@LT|YvhkL^3|ig4VQziH6yN* zk1rffk4gviYoq5T&m-}}d?fE)Q}gBxsI8OjAs`>Me}6zjFB(VQd-C|zum@+XkAZwO zs0wO%271iKzsCvKY+_n*x+!}KOveMs`X?KK@6^|C#=q9(kB zKqL|oE2csXzf*Wgh%mf#xuf8;L+2TX&-9sb3#n?5uhmRf?`XG59;R3-66^zd?A9aO zK%LtOh5l;sC3{ibku|Ps?rbgIQ9T=Pr^Nx+-Hr}1F)=Ah zQK}PYG>vhkE+y-fQz!vly*N>5M|v64u*=k-K8&z+a%#$Z2NGGdeI+xfZ`OqQm?sj6 zaOo}sEi4u*mow5exa^XVclZZ9Y!lm&i_dD(L%6s1`HUupjJ*|v>;o>e-}01LDr{F7 zTsnKlA&gGy&FU5a&c#n4chN2#yxm(;HaFw zM*|*aI*Ud!w@u*~0f8)FW3GFtB1YBUUwmcgY-=U*$F7NtZ$Hb(%&ZSv&-S$f>cVuE zRR24YLDtWQ2SWR%8+bh4Vqf1WEKyE-%G}OOF6_kS$!fw;gEltxmgCX83o-DolMw*y zyklaMBJyKN4RFnwc+hNTH421Y`aG){|5B$+%!*APtwmsI4}_Q~;HWBsdhbd{6D22H zu>CFqY(v`>7sIdouZas9>v5sA zc3GnSro!b57JBXvVFW5c0c)l&nf#@sPyJ7s##3e#8FUWMrwpkC)?$7X@jDh9R&h=9 SW&C9U683cUb6Mw<&;$Tj79+&~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right-blade.png new file mode 100644 index 0000000000000000000000000000000000000000..a536ccffbeced8897c4a67c1ab3ad98f0652b4ac GIT binary patch literal 1668 zcmZuxdsNZ~6h_xWD<>^2XQjC)Pfo>}$9$Bi$5PX9nr|Vk`4(TLAfnKT9;=q74XtUK ziW*^>lBlGSnxgpxAHVqmADs-*L9HJo`IE8zv#sO(=idAMaqoA&@1A?(N3@&H7Q-zt z7)-~*-PKo}FTr3MFs)7MinKzmg26UTz>MG9KJo2Giv`a$^I23|WCW4lM07h!O6cAOQRf-$3E0NMi4V%S=j zo(gc;ea08DfqBpB>Plym-xc&mdI%I!QC8=(-vx+tS@A-TbwAbr5hZr(zA3Pr?_N3= zX>ii)R#>IDMi-D0g+66RkMi2LhNA&bjv=LEHksc`A1kUUKoE-w5x+(4?;#aMmktyO zB^{kfIGo~SNmtme!!qBUboF2x}o7YGdmy&^;ljWh$9s92$U#Ar1)0?r}Eue^~ zF$6M2;JMsgPQvGo=`z70AuEW!(FurVN~B9mOI|e+r3R3e1*Aa|inmgJe!&(U9{{!4 zh0{(vfRTk9M;vGEp(MT`BrZ%^cJt%jmsY>DgFtnk6l7sgGV07=aJsB%KQARD*kEOS z5x+n$y`tNXetz@D6-8dXgMe07&hU6VZ4tl2-p-CcF%cqJU2XBH1%7JoDi0#3X=jQG z&KYDVKQg#nu8NqHw7%!hT_CzGEG*oP94nd7maRb~NC`@ktqdMvESW*(uN6>7ix(BB z4Qo7jwrPW?Ly3+0bi(!FmII7&-0S*kdeY$l=e(6vNO7Buy~dA*xY%udGbWSXk5d!gvqur zmF@0#QK8*|?JLz5Cc2mT6p=Czuj$3~GrRgwM&_1?wc!EGQNz49w%MuEP}`)&g|{y@ zJAYx^`mOE(K5p;aZ0+1^MW+C@EBBq|C;4*WwhmcE<^k&Fc9565tvG{tTD5H|e{JOs zXlhhzgM@yNOvA6Zh|~xiMBM}dRU112d-g0@o~8PqBM<})l1QY-0nEizdkJ#3(5>OqoL=kQSY_GgU6))#k|L2Di-vx=sUSi;1MsB`i0o?r&Hjc{2;asAg`{B~SIg1G0d=|8Ul zB~cuczFS(V&K*@!SmvJnQD+28Ic~&H$$FWH5In@N|7z+jo8`=%E& zzjIPk%P6xhXhbe&BRx81pUUPsZ#7xoH)DM#5(KG2_Mi-1Uv45&N~;~h4h@=NuGy95 zFqjm^)^LtQ)I$6-aA^KWZGnx?WuqOfZQth0oys<$00|h0J>p;H+FJR3+f&(wp9LT> zhd`qzHWqTOBQ0z-J{ZZ&k7rJOuAh$A=(C?41}TIrL$|eO4oMmp(Vy~aI70Ta7a?mT zNZ}7BY7T*Xg|ctdINP)&8%e+dNsW{B2@b5oe>h`VbCXyA+{=r75(g0`G%MZ6W6#MG zAG-%#0JpO+_1TN0yAUhBj&h~dB%8XKyzfbuw(;TQJyrTGN{#>MMCYqEdcVATUW>c< OH|lW$?ONj!e)%t@doVo! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..13b78ac7dc20a77791cae8196d26c7d24ac78a33 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSrJgR1Ar*7p-aW|4puod?fN#p* z>#O7Eb9E_{3oj8ku{ji|1{LUdT=M)?+V^;$&8tcI-l%fuyg5%5jTnSCqY7_GX9yGL Unzm=D?kmdKI;Vst0GbvhzW@LL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/meta.json new file mode 100644 index 0000000000..c5ff7a52d2 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/e_sword-inhands.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Inhands by RiceMar1244.", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json index 58c2a67aac..602e032963 100644 --- a/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/e_sword.rsi/meta.json @@ -12,14 +12,6 @@ }, { "name": "e_sword" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 }, { "name": "e_sword_blade", @@ -29,50 +21,6 @@ 0.1 ] ] - }, - { - "name": "inhand-left-blade", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "inhand-right-blade", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ] - ] } ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-left-blade.png new file mode 100644 index 0000000000000000000000000000000000000000..c5403860e51dcc52a90587ef5fe487c2f850ce61 GIT binary patch literal 1201 zcmeAS@N?(olHy`uVBq!ia0vp^4Gav73><7gR`t)i?6Vc zVB?pmBE_w1bzNW2TkP^kA>f@H%Sm@nd%;Ps_cnEZ`Pt<=;pC)*Wa?_Y%eHNg3C?HLDb`?X-8lBVex$E!dZTF9Tx3`1ILsRy4oOJS;x<5Y*pB3zjnf^08 z^y_YK!7X|XQ-W@LA3lBByP~2ZqxP?R-|^(v>>KXCcMcS37BBPC3<)*8rT%f6;q(9T zx4Dyh7Os08#(Xo!Op)hC?6=>wud|bT7ME;YwW{uE<-Z#b-PyDo^ggd&^{RY&^>)36 zUF-Vo>;JtedVlau+3q+0{_VTEwKTThsLkfQ{PJ1#(_PPgu9;(dV7`5QRC$BIA&uM$ zuhhu0R}9`W>tFK~+=|dm3QE2K^g(K*pDhoHAJI6|9^F=JtaFQ;HhD>V|H{&mH|6K} z?A(w0PnEM<=DMWa-rjz`^2=z=uA~o!J~QR+E&cqY^52!ze`~oFj?H-c{r5H51drKg zmwkQTYuIpT_y8Yt#W#Cp>|hEgFw_f$+F$Cw{LH|^mKB$)+NX81sYuw zf~u@+@91CO_}Qk-kSn2Q+pTML`}1qxM#w%e`R{q}b?meHS0QWHrY+uj!?me)c+n^Yi<=jI(mzhVVpk)ORPY z+VXMzl`|rCqRyZ9t9wenUsTR$606;Ien}@VDBI7beSWw1`K#un7f)9EiEYmDR&1FN z^lO@W_vUARj^FV)w~e9i_~X~iJIXe3BlzxWxb(_uj`u6!}dcf&#z3()@zD>cxCyO4W-Z6=85my`J(;s!{{e$X5xEStykl9_gv-0(WE9!@C&v_t#zdKLC|(RhM|1wSqVIT;+;8cRM>C zn(ddetTuP6m6tFrzwQ=!Ca?(2d?c$5EVlK1bnEi=J)yGFyN|QJ&RmzUeQ|Q|ugC?Z zvHoj|_uSgGZh42s^Upg=r`T~PL{2N(eK$x`_3Y<6f2Qn-vi(_VR`lBD?n%q(wt0W@ zZDSZ?tqwh7wmD@v-Tynw?$;aK#RQ)g?Oc+3`_k7c-|9cik2*UvW*ugJ{c>W*F%d?D bGd|ogpJN&GhNa%|4@l6{)z4*}Q$iB}H1&&@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/inhand-right-blade.png new file mode 100644 index 0000000000000000000000000000000000000000..e8ad57084e2e5faf981c62d7212e667dacfb0495 GIT binary patch literal 1214 zcmeAS@N?(olHy`uVBq!ia0vp^4Gav73><7gR`t)iB6#c_G`HldbZuVmbX2-_HBgh1B?Idd#>+3^Z&-msOT$h zxhtnt{6h8(Iy=JVNJ{&FX01UG}%Wus$^R}P-{JD5__Um18snDR&>z2Gf6Tf5&jV_o|MXY1`MTzfmGb7q_Fw6T)W)WWM?_ z?w+PG>v`q<+vkp@F3Omey1sZ;{dy*i)1UfXE-qibJZ1m=`Riw1KK$aa~Arz zT0+n2fRgO<|5Al|ZO`n>J*DeA?y+7dSuL^ccJA})y?gi0O?vTv$M=xhAfCCv^roub z?YV7fN5>|e|0gFO^(_9EoTsK9&Cq`M;U9*)xjIVIqItGIvoA5^`Nbs>RD5Z>pIGKB zwbV$xO&ob=?WKNqty;B6=X9K_!A+(P>Dec>j~d+6yXO9Rw%qsrnS1-DPu6V+4!v(3 zxg>MemD0ZxKKADBjjONP1dPq}X{meb&MWP=^}c2!JEw~U5wfVPhR7MAX#vK|f24Fy zEZiP*QuEzhX^WpsJH-8Jy?CRG1n+P!w_DbxYi#~u%ZIbB_uqg2?~<2Ld~x-vT{Au8 zywCCWbVPU8{renL%>3D=f0NF7yF+zNEeX8&^i&y?giX zKYsdj>E-9!Z|8pc^G8N-e;jjh^q13TqpwdnZz#Su^8#N%{_%Owf2Qm{8}RP!jpbJV z?=|n*{^IOe?@20?YZz+pMt`w9v;Vp_FqH!{->Y5!N{;VyS$=f?))&Py>fhUfl4bPd zeRuZg1_HBj_3Oi8Nu6{1-oD!M0ol&b77bK=tvZkcH{%yBwUH9joHtrtN)QoS- o>DAOEp0=<4(YS;e;Rc(_?6?0Ueff6kc0Wka)78&qol`;+06*EG-v9sr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json new file mode 100644 index 0000000000..a28cd72138 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/meta.json @@ -0,0 +1,71 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation and modified by RiceMar1244", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-blade", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a442878e763163e4abc167a8323e91680663024f GIT binary patch literal 675 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV9N4zaSW-L^Y-pWFKtJWV;}R| zIRuqDb_h6eZS+xOd85PpnQveJ)n9Ij^Bty?1V^=Quu|07&CNFDjPANfpMboruS5Us z*K2^;TwHwD z&YhWS&iMtiFVB?fTGX*-YtgyPoiScPcc*OLY`ipc)$!x*o|m$=22D%tdR*~b=6Ou8 zs@W+^_2+Yb{jHmuXn))8{oXGN-J1_Ol$VzWHOpruGe4MfIm3jjO8?)_pOzBIuhMd6 zZ;o24l-%>lCVc(%+h&fJ?zhFn$GdOezTJ1~%^9m#uYU3Hp=0H|)wkbf?Tve%^7~X- zf!#k);1Ub|XspeBy6sxq(;`X9V3lyE2Ssx`c+l_1XG8E;X`k^5n?@(^56M zoUTQwdR_{PT&D5I^@}S)LocQnWxh?#d%Ng-&++8S_s;w8hfhnD>UH~c z&%ID)`!|+tN28>--Mkm?oEo{zq7N7k-*QW9vnRJ7URbqv-o1PGuDmUq`n=MX=kw1$ z;k*Y5EY@t6m6vya{WWT?pL=L%rrrGd@=7e;ubX23mQ(V^l?IMOAX!gWKbLh*2~7Yf CaU^a4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a1b6f2b852360efa4999083e5c03a0df8d6a6f83 GIT binary patch literal 671 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU`q3JaSW-L^Y*Tz*JlTbV;|F< zrgDV3@U%@5E(tGqzA5$H1J{_!Cb^YQSd>I!&Rh!RJgB);g^~4Wjdb)Hv69IlfB)@| zWtw^B_qo$K@|-|pv4aoJGna{NyLRnfweeg(RnO*w4uK+9_s020PFs2X^~-<%?y)#7 z*u2@;*3K>~Ki@w!GRtV@nrjy_OfFr$8X9~%=gilyTi?BVS5i>0Ve7WsZC^D`8~LhD zK6Y;9?kP>p~OXY*ULBzB_mB z{8=*L-f#Wa1?Ns$F1P3lx6KNC=x@@2~rIZ}siBvz``Z9x^cb{rk6CU-HsS zt><$tnOsfUc;WD2=e@t4y?C)AZ!xED!8y&-n@V%3lssy}G*}n6djD zo9Kc1bz5VivU6?cpZ67D*|m3X?(6OQPyPJ4GcG>9w5lq~e5S;|xa5})<@c&4<*PJC zXO~t~ta$$XdH&JW|5@X&%CI=DZoJvMw7uR$hR-)NR66+W-tfq2Ur(O&jGdMmE7H1V zt5pB-+}zcsk3U9SixPF+82I^jOR49oRi}8`4`0iBHrH)3KO1x9`_~qIQ=jkr^>^Q% z?`mC(uB|(;Eh77MXm0-Yg`aG~MO@RY=Dy2`x6Un^r1Gk4cU5I&phR1g-t^arGtQ>f zXE97tiM(D`QOF}}Yrft5tZaX`shaZIhWIre>_JH5w^Er^Lr>mdKI;Vst E0LyhHv;Y7A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double.png index dfd3bb9ace240d3fec0f3f1c84f93381e6e63098..5601092c2e949a44bf3960eb62b265787d9e3f50 100644 GIT binary patch delta 114 zcmbQrxPWnj1SbbG0|SH0lCEPD6&2&yN`m}?8UBMnRpoW`nd?bl3>m+1*AD(4&G85=)Hvx+b=oX}v1JJkN; QCC~^4Pgg&ebxsLQ0L^(UXaE2J delta 103 zcmZ3$IF)gN1SbnK0|P^2Nc!=Kii*LEB|(0{3=Yq3qyYsDJzX3_G$tk|NH94tOg(+1 zL+yOavIfVStiFyMyO`LyL=6^dCkQw`Hr}*=bAfe{2Lppf2h(GD$LM1~%?zHdelF{r G5}E)&Hy^72 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/e_sword_double_blade.png index 9c19655cd432ab094929111268992fd01ef3bf77..31aecac1d25ac471222c4d716858b6669b9334e3 100644 GIT binary patch delta 11 ScmZ3>ww`%{%H~Ck-HZSk-UIvq delta 394 zcmV;50d@Yb1FZ&-B!6;gLqkw$V`BgSD3NuMJxjw-6o%inN<}Lj6clj?QpKUgq9Be^ z!7kOItzgw9xlLLjNyANw6j#B;q2M68_%-+sbQN3`1VIr*ocsZPEmGpSO`%2F6K>AK zd(V5g_guiA(wSj*#R0=~csiMoRo@Etw`FoZEo$;`HvGJlI%bc~-zs-}2|iC&%S z+D2bqwHe^+A)aLxcZlbSQ(KNDc#n9H73Dnf32~Iu0f}#gu6X<=xZv@ZV4h7c0DjR^ zDzvcD!mP**;z{C&p_f_XJmMxH)m+I?9-%b~8)+nwfCL3)Y(j^F7-f@Y*4`Jd`<786 z52L?@3OG3mD1VYSN@|(9s+2X-Rr+*P#N7YS)7ECDz3!m|(EaMVpW{GqAE;Gb_xIFw zYiB^<1-Lew{u0e;?wj;#Q;Qq};T_=erl~0hz|}4={A|fwu1f)0eoX^DE`a_VFmMm_ ou6wg;?Bo0i$ZpdU-2sP3zy#HYH~s(;v1k*1IlJKi0I?&C0UunuegFUf diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left-blade.png deleted file mode 100644 index 96d2136fcee81af9b021fb3144b10847b3de644a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 694 zcmV;n0!jUeP)Px%a7jc#RCt{2-NBB6Fc5&@lK3immWxlrm?zC=p+bP2TB^(wt zQ`^$1ad4dj0000000000N7uD(z#h!=?B(Bm-<$QzDF$F1N3We9hM}A1+28N?m-EZA zIOl8z!ejvA85UU0v~^w8_|r5!2SJ_>1JZTfF$TbUuXez)EUxeSPMe{_FcfQBD*m=@ z?smKVh!Y0HVuD;`K&fQ#a7k-1#&PtI$D>pz)wXTw`DvQe^QJjKTLYc5x%`~_ULLO3 zYt{I<98fAoik#fqz;^MIa!;-ybp>ck!zYrIDgT9T7n+ie}`GE)HrHIOSa>Sxs?~m@Hka)hB9gW(aIO5OJBL ztR$;F7@;3znWU^K4VBcT<91qYW(eG(JTO&BW>KpePe$1WxV?L~Be*sbn5*i>eVb$R+b_+g{$c=@p>uwk+~Yi{(fzz42!YIq5F7 z8)m4|wa5XolXH2{{FA2q`zUw800000000000001>ImMUat*Y~W!~Dm)_g0s4 zSo1vla7Y#v&*M1ybzPr_w63eSu7J)teQjoI)hgp!bh;FGda$R?cW&oN*rGnawQR%o zlsu1mv&fGnDEDjMwdKmXPeI$Ugrj!suycubEaBMG&ZVT}|4(u59QWzAw!1g=DajK6 c008)4U+Y5bGX#XK`Tzg`07*qoM6N<$f>`}Y*Z=?k diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-left.png deleted file mode 100644 index 2f06869cd1aae35826369f58f0b6a0406f2455f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|K6|=2hE&XX zd+Q)?vjIPx%j7da6RCt{2+d*=|AQZ;&$Bb9ewQM|1j>l=T!F6&Nx^QS;@uk)=K%)QOjGNjT z0=z)S4-o(W00000008jrT<->aiWp-mf9Ab+n;3u)!d>G;M22D5MEhQmJN|q=-@SLe zUT+m(jgH7|gsQeqZk>O*T+H`Qr_=5SAf=Q~5`QW{GOBJwoBTC+TH;!Y?ON)reQiX*OQtd%_^b|S#=a*i!RADj3!T%s2&owG^+qBpSk4|Ft04g&-|_V=9;^K{8=qK zyXRsq@-yi~9xvujupM`roCX|l_iL_nJt?NHp%n#NXt!EE3Y>n=8y_n|%AvLcZ zLP)yP%f2j6}Et1b6gfval_e-0mDfLJ~TdK~2 zJ!Ld|sd_%3N2hCLr)OK~e32b2!mV=py*zBxmKM*w2Zb%>BWUTYRttZf)%pn5jwQcp zUpwzy${kC7ZDr@OCbOhJ@w{#?o4lbtES>-W0KkrY0Z?Y#ECd+mKL7v#07*qoM6N<$ Ef~NCO2mk;8 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/inhand-right.png deleted file mode 100644 index ebaeb95b413585f29f10de4f483bedba356a9736..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zSv*}FLn`LH zy>&46h=M@t!e)yKKLx9`3%=9L@9pW>FxAZzwMRn=Q`w_dQ{IENQ(Is-%8WBc;B z`)T6a)8!NE)6T2;23P-?DY4jN`Ls&Sr`M|0YW_TZHf564bC)IOc|P1*z3SAq+{fFV zpI;IBe($q6$7>kVKi-S~&B~*=G$l{VOny?AVOO!=wA7cj%M2rJ)vh18w6OEAo}?5* afndB`UeXuyX09C|i#=WaT-G@yGywpTL5v>& diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json index d7ae4a0ad3..9e17f6e51a 100644 --- a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/meta.json @@ -6,81 +6,21 @@ "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "e_sword_double" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - }, - { - "name": "e_sword_double_blade", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "inhand-left-blade", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "inhand-right-blade", - "directions": 4, - "delays": [ - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ], - [ - 0.1, - 0.1 - ] - ] - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "e_sword_double" + }, + { + "name": "e_sword_double_blade", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_sword_double.rsi/wielded-inhand-left.png deleted file mode 100644 index 0160cafd5d512663c027b8047be3827af6020248..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zSv*}FLn`LH zy>+&?*+8J};Y~fAY^?`xq?Ykbca!Z9vIu6}bm!=slY%EFi3XMl2i$Xi)FAlS(0=)O zC7?+_aKQa%)i#H7H@!85lBWc9@f72h4eG1C6R`E!q)`Be1aX>DV<`-AA>>Ed6vZPi))anhrG zMwj%G^UqdayX>dcGU4>mPUZRcBvUt^vwZpcpLV@7(2AI&ys>2!wqJv-FM_P~boFyt I=akR{0QaAXmjD0& -- 2.51.2