From 364a4152ac783cd7ed4b44c223683980fcce7832 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 18 Feb 2020 16:36:22 +0100 Subject: [PATCH] Change fallback armor (un)equip sounds --- mods/ITEMS/mcl_armor/README.txt | 4 ++++ mods/ITEMS/mcl_armor/armor.lua | 2 +- mods/ITEMS/mcl_armor/init.lua | 16 ++++++++++++++++ .../sounds/mcl_armor_equip_generic.ogg | Bin 0 -> 5623 bytes .../sounds/mcl_armor_unequip_generic.ogg | Bin 0 -> 6630 bytes 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 mods/ITEMS/mcl_armor/sounds/mcl_armor_equip_generic.ogg create mode 100644 mods/ITEMS/mcl_armor/sounds/mcl_armor_unequip_generic.ogg diff --git a/mods/ITEMS/mcl_armor/README.txt b/mods/ITEMS/mcl_armor/README.txt index 6e9268c25..5e68b5746 100644 --- a/mods/ITEMS/mcl_armor/README.txt +++ b/mods/ITEMS/mcl_armor/README.txt @@ -20,6 +20,10 @@ Source: Licensed CC0, by Freesound.org user mtchanary. Source: +* mcl_armor_equip_generic.ogg +* mcl_armor_unequip_generic.ogg +Licensed (CC BY-SA 3.0) by Mito551 + All other sounds licensed CC0 by OpenGameArt.org user artisticdude. Source: diff --git a/mods/ITEMS/mcl_armor/armor.lua b/mods/ITEMS/mcl_armor/armor.lua index d06d5444d..f7c20d0d3 100644 --- a/mods/ITEMS/mcl_armor/armor.lua +++ b/mods/ITEMS/mcl_armor/armor.lua @@ -232,7 +232,7 @@ armor.play_equip_sound = function(self, player, stack, unequip) local snd = def.sounds and def.sounds["_mcl_armor_"..estr] if not snd then -- Fallback sound - snd = { name = "mcl_armor_"..estr.."_iron" } + snd = { name = "mcl_armor_"..estr.."_generic" } end if snd then minetest.sound_play(snd, {object=player, gain=0.5, max_hear_distance=8}) diff --git a/mods/ITEMS/mcl_armor/init.lua b/mods/ITEMS/mcl_armor/init.lua index 42ad8f240..9d4646d99 100644 --- a/mods/ITEMS/mcl_armor/init.lua +++ b/mods/ITEMS/mcl_armor/init.lua @@ -41,6 +41,10 @@ minetest.register_tool("mcl_armor:helmet_gold", { inventory_image = "mcl_armor_inv_helmet_gold.png", groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=78}, _repair_material = "mcl_core:gold_ingot", + sounds = { + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", + }, }) minetest.register_tool("mcl_armor:helmet_diamond",{ @@ -104,6 +108,10 @@ minetest.register_tool("mcl_armor:chestplate_gold", { inventory_image = "mcl_armor_inv_chestplate_gold.png", groups = {armor_torso=1, mcl_armor_points=5, mcl_armor_uses=113}, _repair_material = "mcl_core:gold_ingot", + sounds = { + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", + }, }) minetest.register_tool("mcl_armor:chestplate_diamond",{ @@ -167,6 +175,10 @@ minetest.register_tool("mcl_armor:leggings_gold", { inventory_image = "mcl_armor_inv_leggings_gold.png", groups = {armor_legs=1, mcl_armor_points=3, mcl_armor_uses=106}, _repair_material = "mcl_core:gold_ingot", + sounds = { + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", + }, }) minetest.register_tool("mcl_armor:leggings_diamond",{ @@ -229,6 +241,10 @@ minetest.register_tool("mcl_armor:boots_gold", { inventory_image = "mcl_armor_inv_boots_gold.png", groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=92}, _repair_material = "mcl_core:gold_ingot", + sounds = { + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", + }, }) minetest.register_tool("mcl_armor:boots_diamond",{ diff --git a/mods/ITEMS/mcl_armor/sounds/mcl_armor_equip_generic.ogg b/mods/ITEMS/mcl_armor/sounds/mcl_armor_equip_generic.ogg new file mode 100644 index 0000000000000000000000000000000000000000..1d3b3de2c78ba8d796f5178313ba273c26209943 GIT binary patch literal 5623 zcmai130zZ0x4!{o2P2!IMjH?$7eNVv8Z4DnNC1&QKtPHF0)zlcSZq}kB_JRohKOt` zTYw-zSyk$SV#2-{AfSl2u_#(?Rn!lcH#gYU*Y|$?<~NzloilUJoOAx?+;iQ-!aN}v z=xZ|~Uc@3(IYM(iY6U7`7mLP-MHWyFHOL=mdr;E9ODK2bEIwLcoS$ZBfU5E+JB#8bTa26rjKyN4suas3bMT+PnhGC4dSj9xf){T`o zg$$1eM5UW=R|Q8`G*&R9`(Q&wHQz-Lu$+yvUWyh48E9#GsTeRE!LmB^DvMak##P0K zmCZYF$*$&4%X79`J*_IsvU-MZ9I#U{Z4{GT3B%sOwO8c>_Q&=Sr;EN0N>V*=;4XIZ zx*=#gMTC7CT#?5DtQOS5K}kSO$mxU@sZOiA4%>U%!2J&s4^7M4>l{73+^C?%2lyn= zM-t*k5)ys$Qv5F^`d&)$A595(mlA|Y{o3CrPP{|9RCOE*Dqcyg5SSrg- zt&xF35R>4PIQlTBj8qXCQOhW74nNl%)m?AWU9T$L0-?Ybq!lv?D*jIo_06UK_ihv3 zVGP*-Teinw+hYtIDF*E<69uV-I{>608;XgLW#JTS(H{E)=uUACom|)6H?E8SbOPdb z2(lqyg)!JpU=51tAj{Gx)_Nq?Z3LJCvBDlR13R$f;cB&m6_d^xLr$qh>{;OC!t$}d&^N92TOROV$=re#d0W#Q9v8R-SpmrEnNYG+&iYyT^9 zoLB~+gUE4Y8GI8ttpuz+h^BfIx7Q0gTHgi+jdNW3tpgyaHCxq1nnye+ro$A=VTvi$ z%lh9V22h7B+y*UxVNXJkE(EOvPG+MsSlM>b*4q^cQwEDli1H=3Fzib7I#r^Yeq6S# zk@Y1Gu}$^$0}5W-!8Q4q;f5@n+Rcg`q{)qnAnnOP9uSm7=pfv}u=+@y#SVQ0rPJIF zq7g4gOoB~wG3#K%3XR~$MP*`AXE_(+l5x6RBRE|E4nYdwr&2PIt&OtLf*_hIMHx=v zQu^SjY)Thl5=$WyD~mk)h>FYET?F~l$!M5|_3VS&vFsk($)e-|TRa5eT2bIE`yvi>m2J z)us;Sx>1{=`Yq^pyr|LW>X0aQ=7JK9ugGxg5fC~9uv!#HYy5B<(Ns;|xg|B;l3 zbBPZz2H>UqHNUz!s=8L-UpiA=THRG2R$W`uRe%0m zZR9MV)>c*5n^aeuoU5;yuQr)&uBvVkbk$!dtUWi|{8FXOWVU5@b#3jr`sWC>MKCLh znQbxKUjcVloO{;7Z)u61ZHeh=j>48zKf7k!ee*(B{ma>wwTb9C$ zI}d7Nz)AYVh5+BC(Gwf8{6~(JRzGVo?!E>D5$=h0VShEl28^u-gwyo`mBiqVcS`-t zF;UFC)#JJNvh%7+?Z*K&PzW|OyKGAIR?8%9L_zX;(^{TrV<9dMO?ieZ_aeya#cm}F zvD|Is2tDqQu?XjtMd~QZ(IAJzTrowVgtv{%Ea6Hh%({vp+6!E{4w+%f75hc-MMHj> zOM=nn)8!$3Bqd%WLIA9$i_6vR$h>kb7qY2$4*+tR*w&d}uHi}IHvv|>avc{kp;^m6 znjpb~6XhEIBv_>78D%OeSSi8*R-K4&sf@`yE?||P%psEnCpna!q8x-(au%5cH*?6Y z;8tXET?)l7k{~IfL|TGd0ahGxq^Zcy-?b?o?WZEWm7vL+86gk>;f6en3%RaIhZ#+n z`i{&HAj0`V9sevK+>>cpA&Ec;{!!MFf>^RZGDJBB2*FWThYR+-{8MvUgsDhE6ClEk z>rQfj@Tt3gnMAIb23T<@nc#$fLxIh>C_h9T#I$ zp*ItTffk^oES83?yj!{urL5+w1UY~x7U4kNk=Ny6k_Ry5TES?29tQY@rxgrri-}dY zGu936v&F;gZDeCO1x+Ry@<0i!3`$Lz$N}zlEV$4@9@(i%QzfM0;=Ig_m#|&QM*Ks- zqJnq;1)i|SFGA2bYNIGfk(j#}0w{zEZsqx{hM?!*LeHgn#1P6>fNU^jKrS&1P3s}f zU@bsq#In_mMMcT#c8c2I8sJ^kLj(ib4iG@SSCR|{9#@PIDCDO&umoJl4slyJAeA{>`P0pfs4e3mM(ozNR0aQ&X+05l>k6VL!w zB0qbwK)9V*tH+bjYAiN+jWc88Zo~ zTC@zpbdkLxEX)HnP6Y-jJ-|yAsXsCS0X&KTfjEsthN9T4zYCMUXG;H%5`0i+E%63# zYY}Fd;zCuvMML@+9Qn0K&s%u>re^=UdjGeXKT`l8_w4}LTvt|rz9=m7cG?Jkr(%NW zh*k%MURxfxvHWs&Dm+up2JR`bClm3803|RC-~%F>>qpLyrBI9wdAUgH81f^V0^SOS zJP9QNNU>7nH4Y)7Ms1y8p2Y8{DF`_-c%)@orc%Hb;V7+!P%fr`_{0R)fB^Dif~zx4 z;U)%z`vp=oQDP%?;4b#!N4A!e9M;AweMm@`GROb_?d z!DK>P4cD8DKXF*hs%c8-0iTFCMaT@Tx9*S)N(<8g1hM5{sQ5zb0AYum+!GCRWmV;N zcC45o3!&K^swdL6t7>RgA1b9;LECri>`+KjJ$9_|sLG6a>!N^r@i;b4PA^S}(#lRs z){Or7k(&FZ8%kD=JoSZ7WE8Xlf;eh8ef0J5=Ek|0uKt?{H5iymo56LPSop0;B z(bF^3e(zJyBK%UBs@P51i;8p1p8qQQ-R!3Wl%@m6>gn5Iov9wCmu9%?IC_v-j>p#SzGse&HM#dayZ^yLtZ(%fO%1bUw*W1pI&X1)#WJWt4-GJ{nfAKD3?sMaYz>cMz!t?s0 z9q%6JX?`}+=>BdnD(uJFCl=0EjSmzuE(n}hzvmESv|^7gY4~_}Y9;0e($e?Jn+iU^ zj1UR}9~y7GbDwcd1~s6y${AYWdnG0e8!DUEziQUY5@j98yl&UEHy71&h`*;&rCt7J z?|9hWeWYu&hP>eK2RA32-MV*p`&FvF@J!Y^jZoJeSsA?-H{O{)ts_jR`J{ZoVYSuL z;C-8Y)H?iK*q(xOrzmnmKk2mCm!eyGw<};zem|c9PwR>nes4x%FC~MS2lgA@Zgc8V4qc_E}b`b^*Hp`38s$blX=WNp;IS66AvaFw;F=Uq7~# zj_#)Ik=wZywPFi4-Rf-;9-6Ptw1%RL9cwcDd^vD){<)5)pRdvfU#y*Kcj|sWeH^s| zKiBV_UjCT><|V$SZ}&9kS>4*vDrSX>@R8E3l2>}G2To=_b5H!@qF?Czim=5Cin_2W z;@}}Q*HJ-#S-8r`h8vvyhWESlGS9TKH~n!u^+wM`@1+q>!%3OrPZq@uG@MVr$gihy zH@RuYxE@)Yv-m%^ym0inMUgLte(X5UFP16J-L<%Nd$)M}MJ|74iH?HBrl*aoaL|w5 zMW^;I-D-h;c5|;&FHfoJ4;P*M)$*TV)s?_VK`zjjL3j{K-(eBw#wn&gWHnbgG! zmoH_URg^olsUWvwSAO<^?}h9W>t{6d8;Re?>5csUq3E{%t2K{4qAE_FT&&T%Y#kFz zzvi-Gaq93mL*;m>+F02ay=eD)ADVtxetx}}u{nh@vqf3`1wr}pR+m*JOZGTkT7UO) z!w&~Kejbn5mRPH5aI^8Cgh&mE2q|PFpE{Mw#Lm==4q=Kh{%3%3V&v~?s!D3*!D`arQk_@!PUesv2o%Qkw6I#agB^kNchyA81_D%Dz-ooT~e@^kOv*X?B z;botS=ISX=nO$V6c-6X7*pmGFRh?A>OFYlCT@jC6Su@|;$~vkfx3%!+ZP9OVZQHa< zXI|JIT6xI5s4#nU>ul%uFZA{Iy<$Wh>gCrcYMMR`?`D<7Uuxj0)Y+uRZTRiOhM3Ca zwa|UXqPaH;B~YGvkKBN0JC!ALAlSnfe{!7)?Wz<%&)fR(=QG#kv!WNDv%YAsao<(< z^HDxmazZNSeD1m%%O)PJXfgUB!EcJ`Vz7Mkox<*wc4Ga5iofO^FoC0-_V#rO%E#{Z z^z6Qdzj}S|BCE~UR}FG@oLJwmTCCo-c6HF3TeHG(nfTy)oG~wR-rf`bNA}x&>}K6e z%=j>_7Li-1ek)LBEU@qF=zl_u!aW?uPO2K3S>y3(Ey1>F>#yFN*6pCkH{4&nWBG{K zs{2wY(eaDQ5d#hA8vRPZvm-q=t!V6;Ahpb3;vFK9B*(*vT6V)9=N*4LYdRlTSzA9J z_<7HjK(pWaYwC0ICpni6cIOH?9^ zeX@?EB7{<@RPs{&?~Hf*zyJT|_q(4vckXk~z31F>&i9<>JeEE_HV`}XM`NVBW0_OY z_^NkoyV)W`!f<|g<^tQXD&`+(XV_SOciAkNC;w{9lT6Bu0fHvX<>&uuy&PMNQ~=$< z@3ilJ%P=2!pdZeT#U5@7S5rl*B0+~M*m(H5M|gV$NBH=7g(H{@rNPhWgrVgzBaE)T zX9&(q0fT_+M|k>$`-KF9IUCm&bA*AR9UH_8b|cN+>)L! z170TkL_}Fm7+|%f795HNYC^};MNMl(`)j2Khh;54DO-zZ4yzm4*jivgi*T`z^qPo_ zn23yV%t>&*8{>F4!TCvo%UXiF#N|Kwx0vZQW@o7mXM>9NqO#`@C3~bwW>F;^gv(Xz zkSEh5aK4N^h>TLxGH?HCzr04@%EqAnI_3U4LDm+C4QyeyBEQ_S|I@u4v%UU%*YoXB zg!F(dyF;bBLuHLHvfW|IJS+?MK)|PZ80D@ojpKNYZv0`;kB1-YC7KU@HsAiI6PRv? zAU&jXSEzI^um(nDG)&VTuRDRam;k0=TI4^sI2K-jA~FTu+5WM->S^vQv%~_n62-iR zf?JZnhQ#7|cL5xe_f-)^G;g&1s%@TpGbJaF<-tI@z7`jweORR>*rxuyeV zD2N0oR@MY4zSgi%h_6PO1dtmTPD*4V28|$ZMHFx<+%rv|Tapzdmvh4U5al2${^__6 zvX6J{8vaLr{88FkSPt}IH5D6mU92tEJ~GJhw}`2x1eYff(-Se%6W31ta{1rD`YUoE z5HtiC5Zh%|LYsuFhZ-#EzNAUz0nO3g7mq?4;={EnblJI3a5YibeJyJ0-&CroBbS=t#Z- zVh>85oH=5OP|221N63{4d(7pRj+pk6h!SQ=1tejQt5k3Z;sHN_;-NG#Ha$@Y!UCdIJWM(pI5AZ&Kb%W$lVz1QR#)=~U| z^F+eSuQ4wrn4BlZBLLN%;pN^GF|FX2>*rr`t0GsSqJmP<7*tVBbuL+|D5>bH^Qow= z>Z`k5Ssl0xsMWVB>Xa)glq>71HY${t8*f##Q2Xj?@~SJB8&?E6l$TphS5#M5*1cs? zTd2#l(B&4@=rTlqS>>A+N=r-da!cqyV~})d#hX^e{zo-^bt}s)2kIkatg#W#i7s>Y zK#!nPX9}Iy66%6<9#S{@0E3ZlsK+7F&EVLb;GJNNwyJd0T`QIBlM8NILCveET&@dN z>Zn>au*Sx?WO+>=a&i16c=}MP^Tf51iZ?Ba{jER{@)<2e`ktz^%hW+YD5#?f#CY_q z@jVWhqJ?f~&wY(3y)DSseH~zfjfoABKD}ZYCH7b?Hi%nhQPc*e*aZ)VVcx(=wn%On z{0VfIG|>v}FGCztq`_@dO?&b)h0(qU;s}PPm~4d(C?+y60kvggxOZ@pINDEzIO60_ zp^Z7E?C^l8Es{LxrhMdjCIPToEFuXRpvfdrGqj4`00467h`tGhBy3|!X#lLqBylq| zvQgAI7|D&;*6K-P)nfb?Sdyo#79gc-K_i5R-6A1rJDrO0P6fRd+#nHwMw*a3ZBxdu84f#_nO zc;(3AW{N6Zb^!|^-m<9)Vhg*^?5kDkB67_)XAxi+i zkVQR!Z6)wR28xm%bbSQ`!3wR2NPwYD<;b7}<_D!Fd*Be!K^k0WE04Gd;slYG;o-Jw ziaQAAXn9H;uqZVGK!Myf;N(xOf1<}rO<<^*$pI*MQ#*54N%h^BTq1XRnA8MrFV2>{}Th1>u%AOs9HL(nrW9;k+6r_n)q2|h&) zPnHs~aA3w1(o z$+Oe$xE4Z6K$)o{Ob8Tu9Xa5}+`9;u5lbWja8I!z8l@lyP=Y`J_<)EeI-zgiF&ITT zayBz{j5(oI0B;^SG6Uleq-gV!>&KX)p6Ht($PA}s6%cZ0@Q6#%yo>=`x}M;wkfad| zh))TRDiApN3*hYCrM{yv1M*u?v7q zfi;r@Grp|?js-@7Fev4Sfb-TGQ5eWzm3Kr86Oq6)Oacq4tQnsS(_F00GFxYvwIF~f z2Qv%rU6L*B+Y_kq@)3uXZx0%Z6@;MBC;rO_Mi0CzpO9@vNDG7E_V2(Xp^n#jnMig? zj1!S$Q5#IaQa&!l+Oog{jqIo*+MyNFFO7s%HAD`8PeeE`qzaQ!kJDolmFNM22%HG0 zsHSZQd6JWJURaG^kiVONAMxXWV1ypQ^h5_iVUdcs5}Y>VaMG=ZCsy#Ts`3|I}x|(X;gLZm*N8do-K!5Lju7q(~RR4VDT&q9(>m=2>OdF%Xg4@@5 z8|h1(?J&a_WeEj@c2T|W6EWw)^`BIT^T&`)RN=eTPbh^$A*Y~MvvUcXK@cYH%OZy;M_6T|2sda)m<>!9W@Ql^jy=B73l1Roc zb5XM2)=n(%?u>h}ml7w7dGe@rzn+kGzsk1|Rc?Ad?Zc6#L(MBoVTA%xZ8?puJ!|=2Y45MzeT-ukMY71X%BcyjDKW|m)PY8tw?LxO&L%{WQjD~00!bKcb?IyTt`xSB;*C@!UuHMCl|_puC8f*7L&~R)#3IjZUgj(TzcDV zs*-Qo0WooM!R=rN=p}&?+;9Uk##4&Ma@>dZ|BR1v3>bR%`OD3bp)Q+GJ-o4de#*rv z8)lr=bI#Lq-!8R&YcW;4Ejq|e8F@az#3^e}5$x#UCw7*D;g1()7hnN*UJTR^7?GnV zvk#opb`Hvf)t-?wn2D}+FAc18n}J^3wrW%2gsR`*WPb;Eq?roYfrQi+u3^msO!Wk)x zX}^gfktky`$g{=h7sUlL<(TFMbnNLzk0Qr3G9}~h#oP?|cID0Hb6Xy>dHZ04rp7?N zn5WHG-r(P_F)B~H3ci}Avllu__sbc>YlP-yf9cMH)h}g&wJgUD_8rUm2w2XeE^v_Ho#qE-{#;a%UN*h6i2rE@bFgp#|5A zQtt7%Z&L2K4X=pd@T7CHOAh<(SIn-O-xN=n?|8$V1x=nbd|6PfaJUB9SRDo*L|exn z{k~myI43D<%%>#VG-Q7gk>B;I`JC>p*oSeV502PxCKjncOZWHb?L&1LJLp9}NLJf+ zi9VHb_PK{i=gIRwbIdmnPmB>8-WcyG)lpH~u~WK*X44b1nDj`S+}Qc+oN=XH*24Zg zcEyB%te!kj5}SS5$7L#c;@shPnd!}O+Vz;7H+#{i=Tu&(uq&P2S7~lVz5nvPw^XQ{ zTl+;97n7~Z_=1_^ot#~lv;GoFl|q%eQ^GJC4=rg7_-@eIrZ>D zh}MT6pF}K!`6j={G~U!H^ig7W8GS3LmFb`}{`I$7gZuvBJ3pSE`!?#}b5atL-QH%j z>mu$68h`&l=4ijd4HL+1sbZCFQ1#I#7t!Uz#3sqGmgx23Ctjb6JO<`uH+5t^vDl7) zTRIn$J_f?8lW5iv-*`o+g+sCdD%XCZ1%^`;a+A-Op8oM{$NS;mhdr#C@q9T_;?MCV)|&&Awy#3+>De9;f_GS09^|hKPF+KS)|L zy+s|GXM9~kHHbds_O|DDS~o7Iwk|f^=M)cppv6%l{EIFJe01IHU6|St>x#r;OR3w| zoL-_|ULC=__}$#0bsC5H2|i#YB|Y}T0;+2h)^>3o3j`daixS!ah%fX?8$ z(4A?{nm#|D#4%pvCz+$JY*s}z$3}x{^#)AbqgGzaI+9)L5UG*|+OIl4YP-owuHO1+ z8rW+YgpWZ;I+aX`-$IeMt5jQ6aagM!DULQRzWnrErqi76F%26LtkZ!L5x?~0*jluN z$Tbj?A4+}j9<^}7P6X?EHky3lpZdHiG%1im(kQC76zml@v<)<$c5J#^^(_fZSyrlt8m3qCIH z+vZCHELwNfnVdhqA=$d94BcPrJo9`nTL6CY^+En#4b=gE!jI;XLwQ&ETpjKQ%A4GG zlRvvceHcreZVC$i*KIR!;q@`>-zIWB+@KlJ(KwCtJdT zDy!s6?Go#&I&`wHN1oQAC=(B&Mu#cmBOlqg)}W@`I)`UpPgXihuNzuC4hg-s zTO>4ADCR^4jQJ2zCmY%u@bOza@(1dd$UO8sPi>ey7&PDJA+xpg+k_4vv2TxZ#4 zT7P(Rzk&3ypXbrCgt`G=_aoaZUsOguo?Gd-Lp!y(Ha&5BA>3a&dVa`?^rL%v^uVkA zE$y?Up@{e@?ZY zZJL|Pu}Sc50#d@&)4<7+)-~a#s literal 0 HcmV?d00001