From 4328db3303d6a837f039e531702fdf9ff0cb1e45 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Fri, 6 Nov 2015 08:03:04 -0800 Subject: [PATCH] behind direction better. --- desktop/resources/behindhouse/collision.png | Bin 6517 -> 3307 bytes .../advent/screens/rooms/behind_house.clj | 23 ++++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/desktop/resources/behindhouse/collision.png b/desktop/resources/behindhouse/collision.png index 2170857e5fb3c3cab431568265467281bf2a6333..8c822993a622eac6198d7a04f5d166ab896ec988 100644 GIT binary patch literal 3307 zcmb_ec|6qX8aLz+Nz$>Unuc~`7PB){wlg^>hbY7tgK3x!5&m^8iNQCS5!m5G*2SL z5p4~(W|>lbXg>tAsXqnV*i(Y(6uc+I#29SEBLDz?R4y6J^YdkJ2s|R>3oZfJuZv+2 z@D~*>oe23Fl#}&Iuql&G1*7%RPzoH00Aum`2s9dtMe2c(a0ChlN5BvUPz0WULJ{C_ z@V5^Fcw>8d5$wz?zWD-9M2HWU%Ob#Ffq{Ygfd=|awl@rc$KzpeBn*j!0vb?G5Q9tR zK^YvK4FoePhr*_@xHKjMypBlrU7TDDEOVz;#t;rM`V_kS?y-;6yn^D=c3sg@FHq#IMCDR1j zUqpe2qfi(FfHE10T+aX+4aFG%r8h9Z!;zjC3LJ~4LcZC1{wafBI~9-sOjsKM5m0bA z8jBv>^gIbbb5BXaI*lhKtGo zCW;M=&b@*eT`4K~6_VL8dtTqvp!LtXjv)SrY24oZ6@u@mN!nfVZCAH#kG%!{?eHB% z{Y#)zNw;`TY?6^IEci$Ln=T_){GznQ+jw{u!Kvxhsiy4P3RI#a>qAV&tlP@?ghwd%J zR&XXpF3Xt&*ebh))Z9BweHCd`gc4b8X48 zdMP1I<=N<%Dprj+jyR$TQpT-z&AZ&39*VX?jO%c2Yuusxoa1v#2Sv$=#4IL6A8L+W zjkdlsIA5!7e1{BrL;W;3|3`+Y2Jh9>kkT{XYEgh~^a9~ymG9&VD zJMmGokriUS6D>m5%Cdbl$NCDP$Y}INm1$DZZJg%f8sZaA7MU{Tsx)D1@lAZ z=$$M+5z!wF^#Z|&f;6zHA4}mkXKHhhD*d*HvBF3};I6{Zl8?jw%SqzZzTp;m-%VGF z`cD_aPN=cY5Ao(&$kkEWhbKir7Lk=OxxuRHc-aiENWbv&%UC^unUFZ; z@0B5<#2=XyMrhBn)Y6MCjuYB%Xk!d7?iBk zTHx)~ROH!My$YFBditScJgYsV+GuKL+k(kKQBA6>QDU(2OXBC?ng?mxF+Fb`_Vd~| zC)P_}sT|6|7-H`0`qt-S^aMQ1K}(alU#Auq`>!aMdgYNps;-q2b=nU{=e5*W+==LX zZ0BWB<6U)LmNn?5lX%<2)|7c%iksq*oAJApwUaE3!`&`~2ydj<4?H5wZcWvQRMieI z=GtZ&VFt>x-_O{~kwKPcnOi2N6#`bu0*0O#is;9rl@xg+!OC*aUI=sxWt-`V`J-pN z^#lz0@mO^lZ{vgY3w`msHSvwWRS!xojtIZ#LC z;OFG=an%cjND!>AMlzf)oEa_Z>~cZ(fr^x1TL}YAM7DB%_;Byj!-7+j`2)p=1uhOt z`&n0$@O}7@NSQ|$56qa|FZP}v_UtPgFY5_d6WYJqG2<&#LJDd_M;4O0D`lJhHBpjw zCNN<4`D}$dTR*keDW>nq#)q_+-834!sCXk!#TL|n(wV7anz)9pKDA95uj_Uzt6F;7 z29vlyR4U~gaots>k6G`T6nRX_3|**cmV{I+IGgP89KRk)X)2+)S}hNpIDOvnfzqBmCF7O0UJtpB#eJWB`Vt)atx%-t{HF|O8%}eM z)--+-mR+7awb|%RWciqT{pmO7&%HEwe!;WOy}vZQqh|<8GG$60;*Al$Y_a(>V5*k7G;aJ=?B* zW~Ar(nmn0}pjYXx6gID(!0d^5ZwveWW1JvPZglwm{DA@e5Nzn65Op z(5@6Z&x(&ud}XM2*?v!GP0af!;n>yw(I7|TY-7&R_s7k$gZ5=n%XCY7zbkw6;ryDq zGfj*2B4VL31R0QJo+b`5IVn=?9lSGV4BzZ>c*4Eg=*a`uxBZv_)=0;ex_eO|IYMj) zE+nv-tD=*jn7ONCRkWflIBoDEp7pRTD<(@0PZSQtr$3MDU)p{SbRhg%oNL@Oj9p&M znG?ymUi%d*p5cC{C9LS_Cc*{WPZQT)omrr?E!{XUul2UGq&1l|CH#k+(tTz|diSMl z$J}s#Y)R~ENj&~t#9NJX92CW z?ubfMBx9i=Lz;1oJ02zzLc(r#DwW68 zzgU4?%~J>2zFE~6{S=KF{+B%qm&p$)hIPvyH#6>){I@X_ujFJ z*i@|$eEbdHU%&5P?s=W(p7T1d`#R5k&V8O6X`rupn~IGJ007+9)`A-X03<5cc%Opo zdUY3TbOHcC{0{2s2HNWC+y)-5FC1Rk0RVEe;l>NDvrib5BV7%1nPA+enh{a$7-J(O zmYuD%gG@UyZ%2nIZ(~Y?e??w4vWT60cB8r&;U6MPMkG<0zCo>}$a9;_#((;_rBd4{ zLZnz*%YVI%n&-|Asqs?1kBy*FoB7dMFLVKlSHN4&!j(`CRcWlo?^8<3G6(sS6APG< zvK~c^RE+7~7%SP(7mM%hrxX9hcrviH#1Tc&yA!{AsejDZ{3d#CIFc99;=;&*W<9<2 zxNppGQxSV~0ex7)vP{$P^o22#iyl8|iiAy8 z9YXeX%TXAtwsjEcY24XJ0MM7~@nKN{+G`%Ki9(e!%#+QN`VYGm+mpORP z=wAsY4~A8iHWZTfkI2j3&tW>yed^>=R-`&pmiFxN&5L`f3YKwQ!p`-{tw~(H;5whL zti4P+9m5-Uf=XY!v8SDxBCXG2p81%K8`<_EWAU4UHONb>kwIoH#tdz$zqM$t!{L1T zOky_UMLG((23hx#+8Q6qC<@%`3Jd?;Yc0i#7@>QG^Ml6y=?shc$=oQG^EgkT6XVw0 z{lgSyG)+R}vZ>gXWVff!Etj22-=@(0CI1UdO6B1!&nPmA7CQRZfbf38B(HC9KvY2s zy?;C~y~lReA9wjKtz1|1kPk5=^#Hj;&rMGM(pz>!xxmQ@whdP7A*(+f*lBWd@*=wb z`+$pf?vyEa>8Nf!ox=POBRU%b6|CMwrF`w#_i3f{<>OE?Cm9vEz2&<2Y-q-C=Et|Z zO+v^J-<@BuF6F)v?9x#2WzJ=hOChR|d2B(!F^p9qpC2uP7QGNc3!)`1^rF0;)$v~N zTO>Edi<3g@_ZqVWru;D|YkFLi#mjN0Y-vFw{T}}n=G7!(1M#OKdpQFZ#hF;J(zw4( zdE9^Nf}@eei>ku$QI)^gUl7X!Y5}rLvdNAo?O`QeOwVSs6Y~vax;mx~`3ii@Ggecg zeC4yE1hpdfq7iMK%lCmbSq-O_r+3QpZya4F(o4$AFFN1V6X?3XoGI^aqH##&l|IyO z5lFTG&e1OMnULvWd^(LO#t2ge^wi$77}tzo?0>*GxGE&`y0)=3`Wt^!C~xe#>il_= zh7azR^DYt|an-7@W%3ePNRQs3IcjE`dAF}0uy#Kun*6A)aT)(jYlSS{NWOgGoMS_G z8Ru0q>>GSyJSYfP;F4v#DwAbXK=EEN4cq;LJp;J=zG4@p2LKpvX~R{Y_>$~o>K58* zGOD-=ax6=vQP14zX#30phtmjv=x>3;3av7PQ{~-O41T5FSB;2;tV^!zk*c~eNb%;d z7QWAh6XA(MgfBKp4;&T(CC+_tI>wpu__4BzL8UEKd_b||WLeeTGm8`4qy*ll9+#I0 z3s40BlR=zkI1IvH*%x0gqB+zr8saG!$)kc9=aHaLX-R5f%pax%lUze763}|BTrL?2 z#T1=NaCJcBbyV(7Fo1(OVvHL=f&@|wrAQ3(07yDPG++KKe`Eu3Tj>HwW)1}8LEMX< z0YEQvh+!xI^oo*O1=$3T0DvI$D#5YQ>W(zQ!D1w!m%X3XuaWIFkGs3pZ6Hm#Krq0W zK*s^3anl2k$cuxEuH{x=lZ&Bp)B(WQYo5+_9_edoDF9&Qs;<|6BL8#p|8q{_Iq(l1 z=_vyUiCjXlL}E>#`Ktn2Ad)8-P-D1ZmHCxB-Wu?3w4YY)_0MJ9bmS4OxLnfA*ecKO zq7{}J6W}&r(hM5fU>nH`ztI)ur2!zR6N$h)SL5MTM^*8p%Yb}u&b|AS^H}Zikse6+ zIJe)N2{c7wW`NV`Gic~?t$DWgE-_Y%h~2E_Dk~gBh57ByGpriH2{hJ*N)G3NiHsz z#w@Hv+_b~ABsF6Et3WhXV!~%1?(B~b&dI*%8w$?2MY}`;oiV!Jh@v`4qaEV-O7^Pi zK0Hh(=??@*;RaUfh`qzD1`++0vF(vq!QL0Y6nI_fI^eZ30yMi65pX$^0BjqrP3)}` zT5e288Ay#}vrU~hDbUmI^jl}v#708r-X-zx3fhHJmLw3oU%OQwHC{BQ!#gIkgEaem zoUAN;k+;yf@VXvC)=aa?on!26MP6I%Q3{(L14~*O3zgS8Z+i>1e6?7dn##L;{}bMc zU!l7g_mBxyB1rXUqr`5AFLXY5oZk6a(iX>?wqg1`r)A*4^5L;G}mcX zFkC#3V055;ggDy5#zH-LTA_#FPTm%EPV+`RmDd4OaGyZo_?P}0F9p(z2wG((&}6yF zSL$z_Ut0RntwlSl(XN_Ov>haRXEyr^V-;z;jWKmUPX(dnzxt!E&<-99tfGFHqpe~b z0q2?>;8MC#-<^&K!6n(CBky9P+3L@ASIwg0H}~??4tT~Q7J~k5aCJxG77u&&nSABz zzd=%GF1pn)^=DC|N8-Zo63RW=3;Sgm>wR9i?9QLiF8MBR13K@|j=eWo)}_oB=*qKW z#JENV9EOT?hcASfo^0BXn|32NM$Y#MyU7ZCLdUL{vLYy_L%l#(+o8N)1?||XOe>J# z+6sKXf6qGb*4n-3{>)XMKq_8=x28-pHJ!tbyJPbH-y@(Yf-PV-0^8jL)&8ptA-z5w zh~GJV#58&%ENweF z=h)2pGNU>0l3qC8PrhJXO3T_^>H31~bA)1Ev=eAO=T^1$cZ&e1yeFLdUe5<=jpVJw z-lDZYmgfBC;~!lbwp+t$VZ1H-y@|I7407N5$Oe!w_|or;D30oy4h7lj7{uy#zm%EW z!8w9=R@xr}acL>Xvo7jKNUic0y8>tBH_YF@DS(!~4zx`fHe#|p7-_Nvje3aLu8o_Q z#?>{Ma3zE(s37WLOI_fhv++s;qCp@h*U#|s=LO>tO>H{o&qFgFBz1i1aQ@n#P7H$r z6#-pPCWh%CYdlW)8-;vJ|ceUn6yo?x!?}_ zi(i3O=DTHmZNeTiNqPLJaa;Jai>T#m;qyDnTaop4FyiuwpBnp7+r=v=6 z(Kzs@A!w>;9>-UmfVvrnhri-Iy>QfhxnRS}|!(Y;Fi3cV*9 zG==h9jt<^ERSP-o*}uykZ{{594hviVk<*zvx&hvg?97_g-6z*sokZ3UAEE*njW#h+TSuIgvi;r z7Lyf0ID)j$)qnNIN3Qw(vE7iMg-ZX^l!D{7y>ritGB?=z3jc{DemBBaYydf+pqZZ# z5#yQ~M~X4;tD=x#@~+JqVbl53%94S}Zt+XbzN<0F)pS{u*(KTV`i<0InC$#z%4j@7 z`EoLpV!;o$a6HM2lScO^PtN^yvZ;cXsnfALqIm7swh@aBQTq8zBps7RhEeTI(FmI! z@V^<{G`V=eq~J(q-RKy^NMdtj;ZQ#In*^{({;X%e_UH77gvtle*ZWE>NyH8v?Ue!r z?NmLVME98e9q$Z-%{P5F{`N-)$$!4O#32#tJ!k@zr$VFqLAD&Mu{q`2!LyQW>8q-J z<$T4OyRf1^qROP;XoX{Ehr6&3d2fqovyaDrczj2z*bp3IlBTL2#TEHgIrq2=;e~&) zMG5;&v^{DsVwDY7chD1wGYp!Up_{5BhOPYqOLmB=l_Xo8R?9Nt59cfF#fmIU6<-W^ zYy0L^e}y8I%By~+-ph^^?&ooyK}-I1E@ zY&E^;#;5gLNrcv#ae2#sEb@-xGkcdoS?Fd143gsyxneBxUki2nd)onQS+^kbf(W9& z$OoU(EGGB~KXifJ8VZP5+nBcOEwk6x9rP~0k%WrkMv15~hV91Y7Gg6~#Q7Og=S!gA zZqcMNs(VSOeu(Z7txF!c&dgzm@DWnvO6uRH{BynDD&G&%@A?hVw5TlNwU^_M?1Y>} z;7|mm=s4$m?}xt^PAUo6px&cc z!c(df$hUlys@HPv`swjTTEip*;ZAn zKb--bzJscrZ^t^_oEqK!_uUzFm2LwMN#NB{&~yarX8oS2oP%&g>x1z}2aCr84l!fJ z%m*HwdHl7NfOr&6)b1*D$n$xwYo_s+dsXwJ5A-pis0NV}^`#Bsh{T-trZ3cy3;OBD zk}uYtkbFkV9&au5%M>C_ty(;oBquiMBA}`}ygHGc<|!<^=JCp%Yw6K9QzEoQGPg@m zAj3ds1jWy?%dIZ_?r*CnqovTJ#)6Awzm-4{uAOWJ$BdCFL}s%$Op%yn9~;tSw?M6v zkqiH{UcFvw+TfX}-EHsEC(wbQ&G&AkwM>7iW)dtym732VZAvAt-?5I>G044>z)tu4 zF05PC_Vy~@4i+ONwY(>l!ZJo7+1GuxG=z2JN|2&H{h{@U)lVtKQSJ7O@y?uf;l&BS z$Qlu7?YQYPuEZGIV<5nLa+K92#gr90s$J>oTZ*@hWqbOM<$m>8jY)80TLE^0%HZ7d zP?MX9=fDa1O_gLqPcY$0QQny@Qs3(@I{67iFv;p}xtrb`Q^#;%p0f4T%)bNxQkS}D z++@}FtOyj3I#1&yLKesN;{q2S|C z-%@l3LkT=h!bz+*LYhEn*RQEu^EbMg33{8Ba@o}p2RCPtkp^p#tFM;^oP1ux-aL}S zT?S|cS8>Vh*IaT63(~yQ|I!V1(=*A#<+Mc#(4*o~MR(H^Oy>k&bF6*Mrfc3`kH+qH zpKD1(hNsh*#;Cj|Su;taw=E8;jb@PA5SJXE+?@Z|SE)ptyi2|PE@(?yLAfM~mKliQ zAG#3R7d0|n(-#_+3^mPP8bF+fqnA+(U(qWpJ&3)nlUqUm7Mp$c0@e>^?b`~%-h?KNbeO=hKul#6vPb(ak=hnWXJSCBow}U!GK2N uuz>%9{~7XsN`~tRBLH|kzLE~Px>2Z4$$7W)DEs<51)!~=4=+=*diy^hE}TsO diff --git a/desktop/src-common/advent/screens/rooms/behind_house.clj b/desktop/src-common/advent/screens/rooms/behind_house.clj index e584dae6..2da2c3ea 100644 --- a/desktop/src-common/advent/screens/rooms/behind_house.clj +++ b/desktop/src-common/advent/screens/rooms/behind_house.clj @@ -13,17 +13,24 @@ (defn make-night [entities] (assoc-in entities [:room :entities :peeling :opacity] 0)) +(defn make-left-dir [box] + {:box box + :script (actions/get-script + entities + (actions/walk-to entities :ego [122 140] :skip-type :end) + (actions/transition-background entities :outside-house [244 150]) + (actions/walk-to entities :ego [158 110])) + :cursor :left}) + (defn make [screen] (rooms/make :music {:day :town-2 :night :night} :name "Behind house" :interactions - {:left-dir {:box [0 131 154 224] - :script (actions/get-script - entities - (actions/walk-to entities :ego [122 140] :skip-type :end) - (actions/transition-background entities :outside-house [244 150]) - (actions/walk-to entities :ego [158 110])) - :cursor :left} + {:left-dir-1 (make-left-dir [0 48 20 240]) + :left-dir-2 (make-left-dir [0 160 148 217]) + :left-dir-3 (make-left-dir [130 120 154 160]) + + #_:crack #_{:box [68 100 73 114] :script (actions/get-script entities @@ -38,7 +45,7 @@ (actions/play-animation entities :ego :squat) (actions/give entities :mushrooms) (actions/talk entities :ego "Perfectly ripe mushrooms!"))))} - :window {:box [103 100 130 140] + :window {:box [109 100 130 153] :script (actions/get-script entities (actions/walk-to entities :ego [128 100])