From ca23fddd8a2beb08c9a1b01850eebfdfb952bd14 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Fri, 17 Jan 2025 00:26:39 +0200 Subject: [PATCH] Lyre and flute (#759) * music * fix desc * Update T1_fire_rune.yml --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Ed --- .../Actions/Spells/Fire/T1_fire_rune.yml | 2 + .../Entities/Objects/Fun/instruments.yml | 45 ++++++++++ .../_CP14/Effects/music.rsi/meta.json | 77 ++++++++++++++++++ .../_CP14/Effects/music.rsi/notes_1.png | Bin 0 -> 184 bytes .../_CP14/Effects/music.rsi/notes_2.png | Bin 0 -> 404 bytes .../_CP14/Effects/music.rsi/notes_3.png | Bin 0 -> 681 bytes .../_CP14/Effects/music.rsi/notes_4.png | Bin 0 -> 436 bytes .../_CP14/Effects/music.rsi/notes_5.png | Bin 0 -> 370 bytes .../_CP14/Effects/music.rsi/notes_6.png | Bin 0 -> 180 bytes .../Fun/Instruments/flute.rsi/icon.png | Bin 0 -> 430 bytes .../Fun/Instruments/flute.rsi/inhand-left.png | Bin 0 -> 342 bytes .../Instruments/flute.rsi/inhand-right.png | Bin 0 -> 382 bytes .../Fun/Instruments/flute.rsi/meta.json | 22 +++++ .../Instruments/lira.rsi/equipped-BELT2.png | Bin 0 -> 373 bytes .../Objects/Fun/Instruments/lira.rsi/icon.png | Bin 0 -> 429 bytes .../Fun/Instruments/lira.rsi/inhand-left.png | Bin 0 -> 724 bytes .../Fun/Instruments/lira.rsi/inhand-right.png | Bin 0 -> 751 bytes .../Fun/Instruments/lira.rsi/meta.json | 26 ++++++ 18 files changed, 172 insertions(+) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml create mode 100644 Resources/Textures/_CP14/Effects/music.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Effects/music.rsi/notes_1.png create mode 100644 Resources/Textures/_CP14/Effects/music.rsi/notes_2.png create mode 100644 Resources/Textures/_CP14/Effects/music.rsi/notes_3.png create mode 100644 Resources/Textures/_CP14/Effects/music.rsi/notes_4.png create mode 100644 Resources/Textures/_CP14/Effects/music.rsi/notes_5.png create mode 100644 Resources/Textures/_CP14/Effects/music.rsi/notes_6.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/meta.json diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml index 57c69314f6..0a1ab2ec4e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml @@ -36,6 +36,7 @@ - type: entity id: CP14TelegraphyFireRune parent: CP14BaseMagicImpact + categories: [ HideSpawnMenu ] components: - type: PointLight color: "#eea911" @@ -54,6 +55,7 @@ - type: entity id: CP14AreaEntityEffectFireRune parent: CP14BaseMagicImpact + categories: [ HideSpawnMenu ] components: - type: PointLight color: "#eea911" diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml new file mode 100644 index 0000000000..426a5263e1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml @@ -0,0 +1,45 @@ +- type: entity + parent: BaseHandheldInstrument + id: CP14FluteInstrument + name: flute + description: A compact musical wind instrument, popular in villages as well as with large musical troupes. + categories: [ ForkFiltered ] + components: + - type: Instrument + program: 75 + - type: Sprite + sprite: _CP14/Objects/Fun/Instruments/flute.rsi + state: icon + - type: Item + size: Small + sprite: _CP14/Objects/Fun/Instruments/flute.rsi + - type: Tag + tags: + - WoodwindInstrument + +- type: entity + parent: BaseHandheldInstrument + id: CP14LyraInstrument + name: lyra + description: A common stringed instrument throughout Sylate, popular with various bards and musical troupes. + categories: [ ForkFiltered ] + components: + - type: Instrument + program: 46 + - type: Sprite + sprite: _CP14/Objects/Fun/Instruments/lira.rsi + state: icon + - type: Item + size: Normal + sprite: _CP14/Objects/Fun/Instruments/lira.rsi + - type: Clothing + equipDelay: 0.25 + unequipDelay: 0.25 + sprite: _CP14/Objects/Fun/Instruments/lira.rsi + quickEquip: false + breakOnMove: false + slots: + - belt + - type: Tag + tags: + - StringInstrument diff --git a/Resources/Textures/_CP14/Effects/music.rsi/meta.json b/Resources/Textures/_CP14/Effects/music.rsi/meta.json new file mode 100644 index 0000000000..11ab1b893d --- /dev/null +++ b/Resources/Textures/_CP14/Effects/music.rsi/meta.json @@ -0,0 +1,77 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "notes_1", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "notes_2", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "notes_3", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "notes_4", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "notes_5", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "notes_6", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + } + ] +} diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_1.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_1.png new file mode 100644 index 0000000000000000000000000000000000000000..2ce16cafc21dfb1753ea67cde76a84dd66b29df0 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|iacE$Ln`LH zy}gmQK|z4^LjQ05hfaA9rLvTJry2%^+0oMx-};!sHjF>ny%;>WWFHS_B$WL z_Swq|Yl~!oMiktQzxTNQB{PuuK>FS%>Ce-w7#JFg?>vkyW^&-4#Vhc>`L^%p>>rO^ fWtLr={WQOYMRDz;vr`uV)iZdy`njxgN@xNA{dz@h literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_2.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_2.png new file mode 100644 index 0000000000000000000000000000000000000000..a0dedfb9aa955f22fa2740f30bcc131d462754bc GIT binary patch literal 404 zcmV;F0c-w=P)Px$PDw;TRCt{2+rf>4Fc1aMZ?X;SnJy?IZO}+gd)Yc@gCb~QPbj%j0r8$Jp%r$# z$ewZVf5*sDJcHxlVK5eG0KfoG)TIFcxCB(H=GaNjJPmf92AgW!+i^jy%V^hS^adC^ zE+w%|V4enh`MjD`<5CezK-={uW_ibsOC@^(w!ySr@4d3I<5J`QprqK%?Ub9K^Z2;a z0sihq*%A=?Qf=EJiP#D#r7}~>hD=06^n%3wL-1C(v>TWl_;6Hv0@{jAfO@<9(FvsN y8B#qztjkzTJ&!1_VmHFvEYP^%t4o4=YyKCrcF`uEk-EVE0000Px%V@X6oRCt{2n?Y8>Fc5|(r3ZkmoI>sZ$AEMAp3jBP_dG{E2Hv3_!Bv$VUI500 z21A<+p-d)~g9o$%G6F0SW*B1+a&-C;$LJ8z50q)}E20sVi*i3c1?-JG7|X zc8$C3+9}Yt9VcQzps6byO%{r)9T#E-n9f$p$Gv^qaS_}ArkLq$Kl^KSG0X}#VS>}uBsEf^887|##a5D@_pv8gMx!S)2u z6)254z(*dSlu`fy>KF6<{o^y+L;Eakq1OMlckjPm5AVq!`1Ekc8jXDfjwTBw=`AH? zoe*e&E{_P22${=j+qmM(;3ZWHOmdCexQF z)h9zLd2v;r1m6u#XDb!!EAKY8GYOFb3Ez{R&>mwubRiAEaYB6VNlyrmp{h?h2H+Zn zOG;iOi=;|`zmZl-shis+{9IdN`<~Q8aYG%BmH@}%KHgpq|A2_tS2)$F4awEQ{F0=M z(P<3ykvuuQ+VekT!4$<{Dn&VpCA5%pMR9w~*+%6a1=A2*pUKfb=>goMAYBJMsQ#(y z5URa+{~=s7_FjPMzcU3wxk#Vs#AUQ%JnuK1WAETD>EBxVYE;1LSFuD$8Z(2nWwiS5 zBuMLN)8$cQiCOE% P00000NkvXXu0mjfqJuWG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_4.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_4.png new file mode 100644 index 0000000000000000000000000000000000000000..9d7be84d55b3371dd452b5237998d0706ce94638 GIT binary patch literal 436 zcmV;l0ZaagP)Px$Zb?KzRCt{2o57L7FbqZIKm(l9MT($}G_t3?Y#p?bB4~jV!`@Os)_XEzAT|kD zQi%S$F=ix7mNfQAah|9mB6383WQ&T3h=K!*V%c^8003YyoR0_3EuUM*(+#L8kMs|H z=ZC)Y4~yCxOH?8A7l;6{3e1W?N2H9f00000000005XM56I!m^PUr6?(KXRPH6q%_WJ}0BS zL5^90R5wVQWOGz{RzNHF%?}H2;~$z8IM>7HL@Wa4)|Aqn;@LH=bP)`)w1%)!`m+&G z`V=_EUp_{EZaQT3`nBf|bNa=K;GA^gIHlR?Z2D0G!0UW{|9n*Hn12fZ0PNNQPgDit e%{d`_HUAIhLM4)YIHn2!0000Px$EJ;K`RCt{2+f5RJFboCY$Ik`06op=N2>D zfL7UyB;aUp&->%-p?vA3ZnPJiwW%S_<;uV0K0qQOqB`tu$zJ#Duz_c5@tHXdYN;{- zm+S4EO7%PiN-eo|d4cSZP?^ zs&s@jj;5ugSJ@K#m1@63d;XVfR=~dp?78Dq1@#J49{>?mCG46Z8F;8~f@_KiP(L~f z*{uNYzp0s<0@4*{E&+gnGlSKW+Zl=#p#BtyNQ%jwKtclA9DKMW6B#syoi Q#Q*>R07*qoM6N<$g4m&;TmS$7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Effects/music.rsi/notes_6.png b/Resources/Textures/_CP14/Effects/music.rsi/notes_6.png new file mode 100644 index 0000000000000000000000000000000000000000..f6f63e7a9de69788b188a177338697d250de341b GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|@;qG}Ln`LH zy?s!yL4k+mz~q10n>4ipYCe8@x*%nHQ%u5%=9AYZPg995S~_i-iX^Ybs-iN6hJK6w zz310G3_Z=x(okO^b27~gXcPm(mB;l7hL`zEsu&NfuQ2|>a9w~QBJw8dqj_5d_r(Yw ayY`1yDNyxJ;_g0>%?zHdelF{r5}E)a974PR literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3dbf136f467bccbf3a853e0194786ebc162afd06 GIT binary patch literal 430 zcmV;f0a5;mP)Px$Xh}ptR9J=Wm$6R5Kpe(@9Ig%y=->?|c4%?J$%cWr(6~zC-i>GA75V~9J^+)O z2|j?hNF2nNsEc7?pr#%M20W*ZLR;Fh^tUy+-1mKVU;k-K8U#QIe#sXBKxkk~Y*V|S zAO||Fy6Cj(E1SNPmAGvhV*35Fc3md#p(Uj_KRE!P+aKmT;B3>-p6lqVvudPpsa}ES zI@%8uexT?LMv;=2(h#;yLwu?E65wcm7odFm_!7xLDjm4AkC%;VC47u5o{9lWO6>=V zX|RYb4jXpBa~%!vKAzAUj1paEVgq6Fx3QmC91@l=Z2P9-iLgyWTT<$aQ%k3@UpdZV z&vmp?GbX`;``3?rlY6eCEh%-oSxY5(EIO^a$Vz9d&sd*OK>uEP@!jiK1b}z`Bt(8oJ2*qBb?J1Kv&D4MPk~TM-!&M_MQGZ z_oe^O$anTCp7$(2pSzj(dh_*lhcfpYzK^jzJHLPTo9wMx?Q6~7&+&b{;g_O_rBK!X zA8%A%{(QOd#Jqss%C|->v&;;DMuUJuYu#*>@X37tT}?fUJkP3~>{gasry)6wYsq16 zmBX5B*7D`ArGC__9=>d`=KC+7mnjxU6Y|&V=Po<1$p*AKbARUg%9p>NMQlFH%rL=! mGk=HgtLM*VOCS1^^^aTnP}Z5$l?o{!dpuqJT-G@yGywo8iIrCX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4f14fbdd006313197fd14656292f323c579db998 GIT binary patch literal 382 zcmV-^0fGLBP)Px$I7vi7RCt{2+A&VUFcb#hKSp9^V|i>HYM9!IsuN4C&Xw4`^$fj&55y7Jx*`@1 zz=BkTfrZDE1*w8Yahmx3-;yCpWIx$SoZpoK4gf0P8@4zAKvMvtEccy=h=_=YN|0jE z#dM;lURTU&=;Ki1;qDqKhLel%FWGL~q4nIW7f~-V__k)_MRdEGbyt8CgYGs^H;NsYc6oc0FC*BWVcz%7W`fSwMr5LpHxiluGJ5NMJWJ@ti;x^o`qd86i znEvE5zCVD7h=_>jn6|0wSp2yT$ey~6LCMh=jRjNcOeuA%pCP-=Qu}%+rWo|*>Jk9( zw0{{!O5JQl$^Cj9bV}_-^zr^S>qr=E=NsGAOua~N(_xUBBAmM&L_|c?irH{f0cUo9 cK$D990AW#X%}#N9zyJUM07*qoM6N<$f}uvO#{d8T literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/meta.json new file mode 100644 index 0000000000..16961c328f --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Fun/Instruments/flute.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/equipped-BELT2.png new file mode 100644 index 0000000000000000000000000000000000000000..1b50cce58bf6ed0a41674216388ec30925eb977c GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z^*vo2Ln`LH zy=~}yI6$KH;p9hA?#s1z+!T?y7nQ^ru&w!%WJw19jJNk749a&cJ2KSv;O5XKP}BWS$?kU&MuXg-+u1BQN}$f zMJL-1Y#W#m4g2aWyz)HzpHw;jx5;LgPyY=Kto#@I&f56-u literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/icon.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..aad29c7febb702a6f5c1d9724e7421433012f0fb GIT binary patch literal 429 zcmV;e0aE^nP)Px$XGugsR9J=Wm%VBNK@i9PD-lE@93iI3krcV&PK#i9l~wdPOyvvY4J-s-;JQ?4 zgb+v*Vkaq-h)9|{14f9sG%>_O4+#jFRF_5(=7?Uizj9`Gc6R4u89_h{00i)Z?Ggh3 z1P(+*lxIsM5=jVZr6SczMdIq#AvlW-Ri%6;jn~ibCEf9U0!@1i$8}jY*%+!yR<%My zr%TP7D;hdovZ@s_RF!>u0NCLyUiZZ3XITJQy12Y&y#V_+>NsyK`M)_}>KaX^KI(0I z*QRfcV&kq2A$6H`B^~0C}z^H;C$?};rtVU0mx<*Pe4sX6d zt3MFsLXMjD7yww6z)BcX*XZ;pg_FaBCEd&W2cAYVwE6>LPRL;_;L;ahhin96?v XXoiAQc}Hpd00000NkvXXu0mjf6H&1N literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c819ea1e665155a0959fc5729378bc481a4347d4 GIT binary patch literal 724 zcmV;_0xSKAP)Px%j!8s8RCt{2o3U#eaTLeDCk+H?z?QU2uFc>LULA^s4mV{|>6-sQC;x#iokIw9 zFHY@Jmx6JWwv&Wli`bH(o&isqL>E)4M3F$CuY;V4mrBb0?njh+pY5Lhp1TQ%U+)hGyC45k+LMuBx>0 z()pTcanh5RoBx~fucXNy{9jmpJ5<#x76SJj2cJ|Orsluacm9gkkK zr{hu253h1DFD0nLkAqe7kO;L>)F zjEF{+M$?mXV7stCU+0Ogs-&wbWfCz0#sPWpOeX-yBw}QLe!H{08KI~e5sjWcUO{;6 z;gsF#ba8MzfLGZE#zD<}`tErZxZVN)P-!%k{_uL1W&8ym91py7H$f->0ARM;O6cw~ zg@Q`}fd1&h^TlTpF}lAJM5WR6(k%eNEdX3j?kc|rBgiOMhG7_nVHk#C7=~dOhGFIx zUv!6^*o_eY_}Lx!qdV-RT+CC;tV!((Ijc)Vk09I^m_<4s#mjeXDZbx+{xMZ;R;P<{ z{Zz_txuRv(q$)(5ngo$*lcJU`yncn=*$_rVlM)1{CP74xAY}{eRxI>~=Qn@RBdX>J zp6icXjg=CBO(Trmisfl{*v8f+^r|Hk4)=uh2%ZNZlZcVk=}M~r+wXQ^U$GaQNyMo5 z^~jY!DH#d{mr(jLQJxY{XRUzHGaqLq70000Px%sYygZRCt{2nm=e0Q5?s=7c7L3KonbtKC9A$-Zeu>wwr=N5`u&1>Xc3y1b62m z#q83_sa=E`a4FR(gTy~n>0mEHT4;@niUt!(q2SM@2oDE8a9GR`=aq(e8>eoRP zg3{BY*#5rP5x;UVjLOD0=#56-F@_#h2wIq*qe^*+w)8bxn4cq6h@r1OVBt1YD&%N3 zljw=hW)i+UXe#9;TRB;}4!+YrTZ;LC)y2oQ`ky06RS3E|7CZdD@?IZo-e%qaFRP>qL0kG7 z*%dymU`ZF~=E=*CNKcOOVFX`KN zUElhSZh~f>0k5iLDAdc39(Xdoqa6So_ycZCxtWSN&GsJ3Z?+MShCLbI_5zrB238l_ zhiz`F#d@P5X^KpDv`JKJbvK80Mz?3c@C$h96)@&A=5!NB)iU!8JgaVc>J`YRRBG<- zyFQ1bGr-I<&}{D=*ZtHSRj2Jp-&Q!)K$;>`JTd|=D)YZ^oOHKmfc*jt!!Qgplmu2B hB_I@7e}JKi{{fi675ZZu!bt!C002ovPDHLkV1ifRSZe?P literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/meta.json b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/meta.json new file mode 100644 index 0000000000..1a5c7004b7 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Fun/Instruments/lira.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by Max Gab (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}