From c62f42f4f640edb2681712b70a4e3fda07668700 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Fri, 26 Jan 2024 22:40:42 +0100 Subject: [PATCH] feat: mechero en silla --- .../items/inventory/assets/bombona-inv.png | Bin 1685 -> 0 bytes .../items/inventory/assets/cafetera-inv.png | Bin 1765 -> 0 bytes gymkhana/items/inventory/assets/cafetera.png | Bin 7030 -> 0 bytes .../inventory/assets/caja-herramientas.png | Bin 7283 -> 0 bytes .../assets/caja_herramientas-inv.png | Bin 1760 -> 0 bytes gymkhana/items/inventory/assets/wrench.png | Bin 420 -> 0 bytes .../items/inventory/turno_cocina_mechero.esc | 18 ++++++++- .../items/inventory/turno_cocina_mechero.tscn | 11 +++--- gymkhana/items/inventory/wrench.esc | 10 ----- gymkhana/items/inventory/wrench.tscn | 36 ------------------ .../cocina_detras/cocina_detras.tscn | 16 ++++++-- 11 files changed, 35 insertions(+), 56 deletions(-) delete mode 100644 gymkhana/items/inventory/assets/bombona-inv.png delete mode 100644 gymkhana/items/inventory/assets/cafetera-inv.png delete mode 100644 gymkhana/items/inventory/assets/cafetera.png delete mode 100644 gymkhana/items/inventory/assets/caja-herramientas.png delete mode 100644 gymkhana/items/inventory/assets/caja_herramientas-inv.png delete mode 100644 gymkhana/items/inventory/assets/wrench.png delete mode 100755 gymkhana/items/inventory/wrench.esc delete mode 100644 gymkhana/items/inventory/wrench.tscn diff --git a/gymkhana/items/inventory/assets/bombona-inv.png b/gymkhana/items/inventory/assets/bombona-inv.png deleted file mode 100644 index 39495da931b41e34099f334285c3a505620bbdb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1685 zcmV;G25R|pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11|msB zK~#90?VD+AR8bG4TV^CPrYC)IdcUuf?*gR084;9z|OL=vcF7q$npA_`@58o>&TGB>__rBkQCDPU1{)YggjEhltr|qBnWJL z20YM<<16^NC=E7;>vOk@jbjs%XZw*afO1(vz1Yr=gK)V^2~F_dMsxqF?FIsH18IO8 zNdg*|Fgb(98KzLpbv7bd)sM{8!21I$A@~Z(rUA&=kbEl*jt8GRfKCJwNfY1$YD)2( zyoob65pU}N`p(lg98W}JxErGa`uE4 z_cd(Ep%EbzJxojvhpPzZovz22%)O!uLD)kxoDz*OCUdVyK%-K=&a}{q9wj6QSwazl zts~1VDoiDgL!oDe0FcGZK=28$cvPrGk2A!vNNmFcAY?JK5S*az;WpNBj1HEH3feRT z<%~ZC02YwIm$DRH1166)n;~E&*C>g}?}-tGAbI>NAra$W3DB&dgauYYSV0NX3fsvN zD`5$nu!MKA#5rLJn-CM*Y0SU^D`5#2YYD?P(R81Q@R^Vplf>8Xp(_9vn&5&5&Uv89 z1LtnR^SR8{f4WM1;rH;63!ct|r!rt}I?Qs94q2ZGb**qdNc6l1{%nN5n;;YF5d1tg3GBnP`C5G7H=(}m4$-RM3|BX+x=2ye%za|% zR9X+#4<7A^kAuh4Vg6*86c6ow=rW^oC#KBA#%ydJ6TYYE5vqP_0OYPZP|`u`R4)%}9Wi)6@sRYr?5UwNj@VmEk$(seVS(*riF3jdC$=RF+Y;N!5{5nDV#f+BVH1|{PL?<)g4-!fzsr16~Y&hRU zmQE&Ti$10GL<7#k94MLrOYR44lohIJfrIsmcxAnc2j@EB<>@L$yl{$&_X3M`uCn=^ zIXHJ*hOe(c#U&M~elZu;!KVO5L)v&upEnA)w3UeSqSJ7-;fISY9f}v=aL;cM;L08$NIH9895Wc;;*X@WF zUvQh$!hu?7>{Rv3v(;=b%LdorSF$REEa4+08$xTmrdq~b)oO;?{m>auDXrVy$Y;1e zBs+#E)IV$<7N9Xvz(J|4&-P^KjO6ZCKuK9H*5WOa}`Ba%Fs9<+~&Tp!A zpz?SDsmj~^kYt0USt@fo1SIN+d%rN4(mT_aFeD;FL83;CZat15tfRyjJ>nvUC04?r z16u(PPz(&sPmCOH0tXQ6!%k(-R+8&UCcxU@nUOzw{QAWeU>}mbWbunAr6;rA_p)Fq z8dq6@#s(yX;o6K4I)TFo4q>uelykAah656m2D6cDK=2X}KS0wqU?}H!cYi;U-+}#f fQYk8Ei=^}azYE(Y9qP2O00000NkvXXu0mjfMj8a* diff --git a/gymkhana/items/inventory/assets/cafetera-inv.png b/gymkhana/items/inventory/assets/cafetera-inv.png deleted file mode 100644 index 45934b22df8d19900e95f03f3f129a35e0f1c4c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1765 zcmVpF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H1269P6 zK~#90?VMX|6jd0yb&}cHbSBVG}cSxL7z0y2je9^_~g4r z9}HrQF^DhTz^D&aO?c2~01*s{x>2w(id)L1?UvS5V7u+k_;7aHVcD78nc1D`6o1Ld zPUoA`{my^BbIzR0te}4AKsT_Wn63aifXe_4Xf9sY3N!(tXai7zmNL5?CNNPvJ_DQt zegM7&_5=U=Er?rg1HJ-|0fnN2VWw%|0Pr$!H*>-|B7mon>Q4dZEVlE&5#Xrhd>pt6 z=mj1FHrDbbA(97v1iou;Z~u6FeEe6t3*Vr+!sn5pHy`e{r_|fq`%Pb8-;I?7P=Ia4 z!a1P>?ZxXOiLUEQOw;V|>+8F`+@>Jw^XI|46)f?1yct+-n&zIZTemK;+DdnJTkviL zi=rrP#ltnZTyFP<4IARKw&Lf0;85V61&9#BdiOWCwY9xn`XgpBOac!F=2d_QA?WGp zQIWl2iCb5#T4f9j4D7X@RDgrPxg0XLOgD5?G500WS6p_P*ru( z#w1MB++N=09RNOTuup-b>-t#-^XW?c{tLiA4e}=xbY0Imm@}0`7zSQykUycI>-w~v z%{0x5A^>a$es7FR!K3TC(-ZNaod|j0*#`I%3YwHV7;_*1hiQJ12Lbwv)Fz{P_+zJ*=vuh5( zFpNQPH(j>NuR~#=suhC(a32XEt3>2Rm`)-fdp}nqWPp8s914R)ix!R9*%U=_9SIP@ zVRmO{r|q<%X`08uy$GKWttv5@OeT-n*v9(%`zOJ@2;<15uBfmx7K<&mv1LjJUKUgG z-uwxi0`Mks^{f(urGtem!l%Grz%P}IrfFUhk+2Ow2vJc4E`dnc$J}C4nhK41=|Kq= zt_ZWk|6&htQ4e7iAzp5*f%z`NAHWyZ6GDicrfFU)gg66aP1799<#I>;e92GDgZ%~$ z=_$7bT4>eb4Dg=YObbnfw*aTrriv^i5vGtLxW;wE*xlWIT2T~+hliP%n5dp1I6eYS zdC4fMUveR-RH`+ZOlDhJTC`j)$LQ!N*=&|c5xD9Y?{aq^U=Cb_0EIy$;5olZaMwJcs9mH?QUnHd2*iJ&M7 znx;8Ug1Vvj5ab!p`w~Y+MyBRV!)O@BX+QbBM#7VsOy+4b0);{W!!SI33LyrTEnBuWold)cQuM-=zzM=1 zAX!re=<-`IHx1)6z(t#*LuLj!`5PEV2>;GkN-s9D&{nPss6bxQSzx)J!qr+G?)UR0 z4W=2nk)+}5CHy$ zii8dtJR)l_b%}&~h{k})j=G3&UmY9?6W`TA12)&km(Z|%^UaQO5jFyL+hC)D>#AHX zLX>-j622lq5dHQ5e2Q>0a+N9S_^J+9*U^zM@f8WKGtX0ei4fTzk}AVjb@)FLkjvaZ zBd4yTjIT&Ih}?vc1Req2#qwfAglI@auR$(*qgX3)i_ZJVJMZi5l@k8}9ab*W#BJ=v00000NkvXX Hu0mjf);&7X diff --git a/gymkhana/items/inventory/assets/cafetera.png b/gymkhana/items/inventory/assets/cafetera.png deleted file mode 100644 index a1c31bfa58a28ac82a21adb081f1c27337f1ef2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7030 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

g18z>qH7Fb%9g(Mm zIfN*Tn=O}@sVQfLf|F9_YBLcK&Q1d+kvkXXtYSbzhlGF^$2FpT#Be4vl;et7YceQ~ znS(Vq4HF@N#)v!hGlb9uLI{l3#G%-+jw=Ec?J5=3AzyG;&bhprKqlV!=(bN%!hU;5IQxpnI$o_OMMo_youjCo{y_=SpSt@Lt#wgZr(F?0dB zNWAot^2@*a@e%>9ot`j_BNK^;&uV=Ga`SO6?%w0#_8m-xhaY>CczMLF@7g({`;w02#FE(8Yv})*pbr6=IV;K zy!j~}d+ag3@rPgIJGWlt@h2bWo$q`nuin1RAAaR|q6XgfmZyp9jxYYNFQBR%UpwXO z#tjIt8Lx0L*6TGmr?pE{%k-+x zXrr-OOeS(yTM_OVDbvo_W=7XVPETrs_QpeJJod;bH?9w?IvBLC+JVs0phQZEK6ad+ zpYxqRzRT6+%S>ZWzbaha`yMarhDXi@rtQe){6)5xSDc>0(X~?^UT0$8as680+BJ|M zY^G|=^>M^gZ6uUZIZ(t2vdb=3vf8rOk*2s^~3F2$^Ak>n9yYU2P-j9GpVUN!=sc?G|4-Z+Q5Kd-q=A8{fE#s&ez; zHDkKsm6yKF$!g%ShmROf0>LksuC_e&_zjMak2yX*ZkuRuylUN^g2}p4v$QHOu(YTE zM%^_m!a{Sqrt@mMs$4HMC>A%e?5bme;$do~dEoS9XblF#$sDf+f({6_cub5d%#0}| zRFA8nb+5{GshWuiB^R=RqBSdNMP4+sXVEI|WY4G>M@MU}ogVS<*)iApK&L{dwXf*v zq*617O@v3TAM-;`+~m%kJEW3XtyW;Lokk=Ct{)$xR)zg6PNr}zcC1z_LTCyaLWmvi zg)~ltesy2kIp@Qz9M(f&OKTKezT-h#HP~7K24ogNi3msCfVI>Q7gS?Q-!fJN+z_cl zLI5S#Cc!GK@zTVn0;UzY1#0z+(DjOUj$|VQVTd(ji(^V3!7{E@ln;GJ6s6NZ)Ib-N zl}4g8e#ELMqr&mfBLp_n$c=}t)5W0%EGyg?9&WO%khUB87)hSdVNJ9uWoC1t214j+ zk>i0Fdx}iE0;$;21qp3PrkmQxf#|XU;yX=Y)1`$&>xLDA7sQ)nnmaV~NT}~wYZ;0< zXhcFJrG!(^7?+--yC5OZ#ahY~O7+T?^H(uAU@~EDh!w2l1}KQpeq17cuB7LFBa&(D`0ZJ=vI zKh=}=Yj5ye=t9J$&G#iE;%FD~07(m)_teEIbD|Pkg(^sN+)C5P1=J9wayzwAEqy>F zQd-m51)|hmk7)q&DyX(*i-~~>34@{(%dAA}G0ikFrF1bXbsDsxN9cl7u2dz;UJub^ znYWR>cF=x~*~J|PE}e`@s8#h1@pUW3xqRLYbsXv&^&SdYp+wLD+_m-*3us~4AoW=% zsZ#J#ZOSZq&6Rwp;#a%2>?wu&^Mt#38Ns!VO1wthoI%kErBP6K=HLB>@BT6Kdk+$^9<&)z1IY`Qt-BrE>9ezP z7-Cm@j=rx(vNSdn!BmzW~<0=lPEP1)489 z%>12^ExtbG_@OrtPai^ZCf|M;zj&2W#@BR+?w4m>?4WbQo|t5F3vEW}o~AMbVu>fM z1zY>w`+d~5_ZmwFhMJYY{i$C+ z@W6Rfsw}bRod^25E<;Om;Ztd(lqY5BkVjNw6x5plx^StVEr!$W|!D=>Q1<)N4;}AH{NC z!+?SitFS+#dv>pV@%{lQemxEQeyO$h9@}gZON21gA)E)C+qL#N zb&sd_4Q;MCjy4Tt?o+BN2W<}jKF@5p(uS^<=~geZW)j2AI;>cS5$m8gOxZ|NA*s>F zSUV#k7zHtXFi*GXAa5GVf$hZRS)PL(-|t8IUIX9&-5dt0E_aNZ4O9LO)8z|vqJ&b2 zUS~ES?>2XjU-vg1I}F;b&$OWXelYQXz`c+59c9$bA!~!|9V+u7!*fL{RJNR(k>_$MBUZHrMhFuUXea(xhV`4Qc%>)W@9;XmN-LX;)E}=C%8qzCWw$Zg^ z$h67`*{gszPR500wzIKgjF{(okb6zlN&&0A!oH6L&r1U|gs}AI@LltE7i~BQNUDnM zbuE`%bRO4bFaO#@u^(gv^ZOM!)z4y^&9-GS%Ug3$=Mi7q@8r}f)7{ZwcfT%zS+0+i z7$5};vNt|=C>1zf5xhSpj9>~r&zTg#bM4}r2CUN;XKmz%fiD}5c~$E@C2~rXDN$Ae zUa(xJ^MlrAl*``8Sqow!jx8SNOBY^UaQ0|L4h_kJ0;V|rS^`H!$X3;~od~o$vANTA zy0oSChW*<(Gk6-otp>|hXv@-ORiq8#>?UF7^-06i{D$wP4lLcFvKf(_nM!7}z2GuW zUjm4q`t)bM^1+{c|2vD7=gsOg=PGt|t-|tLAV7@zn!;m0HDaG%y(}C!7ZsIuY}ZL& zvYVx7-!uNM!OY>XL)}1~7utpy*`qRnoQ&eBHkdRp+osYGMA`;f?IkYV_<6P^7t*+) zj8m<8n_3vVfzb8y;2dUEILqT$iXlu4?07CrmZpZ)Ex{^a|9>_geg zrwoT;geGmyfv!%KDsBdQ4|6FFs4%H(Wx zUC;XXnAk^3@yYMp5GO{_L zlkHKu+zy>uE+ywu(v(sTB10}^a^aRCn_v93|MtG``y8Yq{~(C|)HrQ!-oAaC7l(;* zt!D^=W#jDV1ZhE3*ku}RV0tl#hQ{ko3oMRwbr{C1MekDo)esKKb8w2)&8=>4?1olq zdgbPnRLE1V$jXIj%uJ~;6=N0aB)Xe3r8>j7KI$pphNj}OF-SQj^_;_)i)Yu1Ot@7% zOg{9tLX2M>)wjR!FF)}w{;xgZ`x8I@-c^|H{@0r~)_?Klb>-2sHAeyRCUI@G=Ek)% zR#8!b(uONT>}sLX&>CXEijk*6P7|dV!@4JS9mNYJ8&(PqbVHA-P;zd_Or&wFy7e%i zF)UM|(`ICvwv5>sN8@TUk+b6($iQgIs4|_#Scag*LU*gg)mOu6{l#DW=qLX95BfR% z*L`;VufFfk9o;w%-ILc>SHJv;&nAFh`8)6F`q*6?`u@7&z0LJ>j21M4V7U~>i8!&8 z!ZejMrK}S4#`>s#lc>DCr2O(Y*(Zm-d*RyYn(cP_(QM@%#rV96+(V=bs_*H8ytgPf z-R1WjKK@UB^|xN$zsFzt$A4YUH~9mT`Lo06wJ-nDNB`}o`TzLm{{YYZl#*{`hl~IK N002ovPDHLkV1lcUB+38) diff --git a/gymkhana/items/inventory/assets/caja_herramientas-inv.png b/gymkhana/items/inventory/assets/caja_herramientas-inv.png deleted file mode 100644 index 5a63773891bbf4da4ad7a693a2a6e828a1736651..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1760 zcmV<61|Ru}P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H125m`1 zK~!jg?V3%D97h$$fA3ZG*Nk^(cVl~PV#GRN5ikc!iG&alUlJS;H)KU1aRYM5$!9J` zLL9hp-~tkdSV$Ny5fWT-2$6^oN;rTBpT^!08Cf`FcV}mIzPjsi=$YA>-Lbtp_O9(^ ze$uGBtGcJ(``4@LuGb|TGM6u3j;qz`(;^Z9nVF?PVrCUp^}w8&39!(=q$VORgs?DD zpZ2dk*8iUc5piZ#17bkD_fKBBbZLF({VzU6Ey_`VPRb&H7AQ~y2nF6LbN$ofphOb* z_0O-fu~#2u8et}J@eEm{qyWLldRe(oAX6j7$OO_8Pd|Hl<+IPf^q}rL5i@)9N8efv zMK6WE9Z;ndd>T5yD`vd3w8YCl{5`$9oxDrbiz{3}`2mphi{>zVf4_#5tqf%=?-%tE z&wk^((_Fe|*5CdMfB)5w59;r4i}6ztu3Wv&8%I1VC0=vxfcSV*I|A2&urdWJxCV@{8iwpC|9mt z*hY2i=;D4p$ZvP927=+fnua*rVeF7!F*9Vt51xc*=1%0#b|$LINB^s8Wu_OB3!p z+!|$cwgcY>-W-a0tHsCPYtucR@pdid+=KIaNE@hA4*FeS3+M?HCUh|ZhV@+rLl7JR z6~P;%2p%J*eBdO&;$9su$BmJ?J3XTB7>8S##+2&^hrGK_rO^hEo3N$v7`J^ML7#)=#%$2Ia;@sQ)}eZ zl0h8b$?4IuojkCYwZ{iDJ^=kuChqPYOT%GXbOaE}NL7H`bA0Cs;Zg5uk0LT6s=yOF z>t~`)LHVE(1qkep)S0GJk$vSXCreR_-BZpm8&szv7-!4wFJ*>itn%>fIT93(6$P;E zG}{oH_5bM@L~4*>{%}Zf_~sl5#0HTXc8hAW{y!bk7nO4EJjP7ZsX6Nb+68}zg!4Vy z&Ws-gQC*avQH=93F3Hd+MtzKn6MQ^=?BbMvz5WYAe%GY_kR)>T*lR2HzMUq1D~WtJ zb*`5te#-;&0?R;19Je|}Ic0rZyZ?v2@HJ{@&f$`5-`9R5zwz5FZ+0W6lBSVMyo;TR zb1IQjt)LPslBlo*%=dpgDMb}nHb^@Kr@ZoyB5>}0H9dXd)A+QCMhT)iEcZ#qXtu?V zIDh@spV4isn%6qWkomh5(#jH#Ne>8-;y=!no% zS4W&$EKxnAgWKqv7WX;32=O`dpQ<2FFCzfm3Z2CV17Nnu!4w1S%Km6=B zV;>0CR1r>0s;s5)zTPosl$c0Eg~^dxN&Hj`(Ei^Mv!-%~#b}Y6EcT4MVFtML&ym1H8VbC#v*J`O+s7Pp#wfwGsk!5e!0Kql`xmp; z!!hacM>RC`Z}0MN3O9FGHa);wb*`O%f-hmb3RI8J9r+jkI^_rB zwf?qFxmdViNL!$VSreg)P#3epkafWdLpFe(h&6&~8)%uxmP+V|*=B9NzB&}|t^e}I z#};|s;N|%=+Vyqy5NHFfNn1nK1X^IjGQnCwN~griauI6>(>0(aT9#=DZGl!Nirc2r zdM^FVhFm__PjF)q`KL90`OyWwnMLl~jJIMJhReTO<-T+c>Vg%5t(i$M?YE*?L!@-d zkfxb*32chDyim8Uy-?(--;iMWbKiS?^B^6382k^xTVI|QI_h5l0000yt!3-orSR^`u6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(Ko&cW^*Mx+G|Ns9VIB)m(H; z-OdA3{;4>Bmo=MKEcZl|OWBptZenccvAYR{i`H;E1Ww+4VDoOL!0yk9LM|I?O}d?w zh0h);n6NZQZ@(&=*~w6rt~IV4o2E#you2iAqj_g&&5nt)>f2ASCOmRJU-{up&5PZ} zdv++7)Wxf^TUb|hy>_rp$=Kg?r`SodahmDEMyLRz3k{1)2O9*d_wq(Pi7ljZUug;wJ+_KKPQ@Lase1(44$rj JF6*2UngBRUr?LP5 diff --git a/gymkhana/items/inventory/turno_cocina_mechero.esc b/gymkhana/items/inventory/turno_cocina_mechero.esc index db47f32c..8a812a97 100644 --- a/gymkhana/items/inventory/turno_cocina_mechero.esc +++ b/gymkhana/items/inventory/turno_cocina_mechero.esc @@ -1,6 +1,20 @@ :action1 -say player "Que cosa tan curiosa" +set_angle player 270 +say player "Mi mechero, que bien!!" +set_angle player 270 +say player "Ayer lo dejé un segundo encima de la mesa y desapareció." :action2 -say player "No lo quiero coger" +set_angle player 270 +say current_player "A la saca!" +set_active turno_cocina_mechero false +inventory_add turno_cocina_mechero +:action3 +say player "Parece que no tiene gas." +say player "Eso explica que lo hayan abandonado." +set_angle player 180 +say player "Si vienes a Uli vigila tu mechero." + +:action4 turno_cocina_carton +say player "Fuego!" diff --git a/gymkhana/items/inventory/turno_cocina_mechero.tscn b/gymkhana/items/inventory/turno_cocina_mechero.tscn index 892c16c6..f8d0bfe3 100644 --- a/gymkhana/items/inventory/turno_cocina_mechero.tscn +++ b/gymkhana/items/inventory/turno_cocina_mechero.tscn @@ -15,11 +15,12 @@ esc_script = "res://gymkhana/items/inventory/turno_cocina_mechero.esc" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) tooltips = { - "action1": "¿Que es esto?", - "action2": "Coger", - "action3": "Mirar", - "action4": "Usar" +"action1": "Mirar", +"action2": "Coger", +"action3": "Mirar", +"action4": "Usar" } +combine_when_selected_action_is_in = [ "action4" ] animations = null [node name="Sprite" type="Sprite" parent="."] @@ -33,4 +34,4 @@ shape = SubResource( 1 ) [node name="ESCLocation" type="Position2D" parent="."] position = Vector2( -51, 69 ) -script = ExtResource( 3 ) \ No newline at end of file +script = ExtResource( 3 ) diff --git a/gymkhana/items/inventory/wrench.esc b/gymkhana/items/inventory/wrench.esc deleted file mode 100755 index 1ff103f7..00000000 --- a/gymkhana/items/inventory/wrench.esc +++ /dev/null @@ -1,10 +0,0 @@ -:action1 -say player "That's a wrench on the floor." -stop - -:action2 -set_active wrench false -inventory_add wrench - -:action3 -say player "It seems even more useful now that I picked it up." diff --git a/gymkhana/items/inventory/wrench.tscn b/gymkhana/items/inventory/wrench.tscn deleted file mode 100644 index e11e0c06..00000000 --- a/gymkhana/items/inventory/wrench.tscn +++ /dev/null @@ -1,36 +0,0 @@ -[gd_scene load_steps=5 format=2] - -[ext_resource path="res://gymkhana/items/inventory/assets/wrench.png" type="Texture" id=1] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=2] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=3] - -[sub_resource type="RectangleShape2D" id=2] -extents = Vector2( 37, 33.5 ) - -[node name="wrench" type="Area2D"] -pause_mode = 1 -script = ExtResource( 3 ) -global_id = "wrench" -esc_script = "res://gymkhana/items/inventory/wrench.esc" -tooltips = { - "action1": "¿Que es esto?", - "action2": "Coger", - "action3": "¿Que es esto?", - "action4": "Usar" -} -combine_when_selected_action_is_in = [ "action4" ] -inventory_texture = ExtResource( 1 ) -dialog_color = Color( 1, 1, 1, 1 ) -animations = null - -[node name="Sprite" type="Sprite" parent="."] -position = Vector2( 0, 0 ) -texture = ExtResource( 1 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 0, 0 ) -shape = SubResource( 2 ) - -[node name="ESCLocation" type="Position2D" parent="."] -position = Vector2( 0, 0 ) -script = ExtResource( 2 ) diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn index 8b3328fa..b2424f38 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] @@ -9,7 +9,8 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" type="Texture" id=7] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/columna.png" type="Texture" id=8] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_olla_vacia.tscn" type="PackedScene" id=9] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" type="PackedScene" id=10] +[ext_resource path="res://gymkhana/items/inventory/turno_cocina_mechero.tscn" type="PackedScene" id=10] +[ext_resource path="res://gymkhana/items/inventory/turno_cocina_romero.tscn" type="PackedScene" id=11] [sub_resource type="NavigationPolygon" id=1] vertices = PoolVector2Array( -1104, 183, -1146, 112, -1013, 114, -864, 131, -787, 150, -717, 189, 44, 171, 37, 137, 169, 158, 177, 170, 184, 248, 169, 316, 246, 170, 246, 233, -236, 229, -1093, 316, -598, 200, -852, 111, -790, 115, -519, 186, -392, 198 ) @@ -109,7 +110,16 @@ scale = Vector2( 0.5, 0.5 ) position = Vector2( 1, 96 ) script = ExtResource( 5 ) -[node name="turno_cocina_romero" parent="." instance=ExtResource( 10 )] +[node name="turno_cocina_mechero" parent="." instance=ExtResource( 10 )] +position = Vector2( 108, 438 ) +rotation = 1.44513 +scale = Vector2( 0.4, 0.4 ) + +[node name="ESCLocation" type="Position2D" parent="turno_cocina_mechero"] +position = Vector2( 296.645, -154.035 ) +script = ExtResource( 5 ) + +[node name="turno_cocina_romero" parent="." instance=ExtResource( 11 )] position = Vector2( 61, 341 ) [node name="ESCLocation" type="Position2D" parent="turno_cocina_romero"]