From ce3e5e9e380ec4190e5b1edb7f143bb297d4edf4 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 19 Nov 2014 12:48:54 -0800 Subject: [PATCH] added guard for ladder. --- .../inside-cafeteria/ladder-guard.png | Bin 19771 -> 20311 bytes .../advent/screens/rooms/inside_cafeteria.clj | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/desktop/resources/inside-cafeteria/ladder-guard.png b/desktop/resources/inside-cafeteria/ladder-guard.png index a9dc981affc286349d533d35f55e700a7f04df23..413c53ae395d7b4d737cd8e2b0c344657dec0f36 100644 GIT binary patch delta 2276 zcma)8c{Ce{6ApDNQX%R-s-ZLyNeJqwJ4mhjzJf$uMF~+Vtx{U02v!<(#?=-T$5N`+ zRY%b}i`7zBl|>yzEjIgp$KU(M%zX1^zV~M4&6_tZPgo}NS!5qrS(@_ki17db06sH} zkqy(DGsTgMgQ-h$M^Ux1;XEw+b=f>u&#S#0`30G57M^d`^jX8Xf2t2`?0u*qU#}VLolsD1`s;RE- z3q`@bkx*}S0uJh}riN4X@h14<&_0w5fzSUgQBv^ge=4h+0?M%byMq4Dp-cf2C=x&( z%9h{|g+~BF2^SWk6bkXyRe%=Gu%c0QsUj6BZ1YaM`xH%67@3o7W~6UNnqJTQ1>WOg9wSQ$qt7njp`2wmJ)+OlX?tX*zB^qcehJ3GxD0Dv~KCE1T4 z0=iw9-OmVjFh=@EjY&5Y000=jXn&{C#jc2Fp7nV0_e%JodeQa59F9`0zXmNdH})=^ z@<@qAO9KFr1#bJ6({ZB{%afm3p%A@|p4u;-+@2e{&HUPm8ILU81Ce1a_rkE7uaWJq z(-zin${2gq59MrSIX&6Ak~f^1 zIQjFjbc{b-R#K5QjCFh_@|r_9v^HSn{)v#kV(!N%@?_Dar5N3>pS zgo`TzqQ@;%llr1kp#hRVa!aL+>sUV&&`frFJmS}*S|o3^c#e&;=P8L8&Ko~hn0ilv z84XNgZ;f+w$CM^Be4{WPVibUU!qii9I72rIN% zyZ?G)CTIfJU$|uy*lRu-_5`i;4XB!75C^<%S+9Z4}Gx z1iSeQ;x4|xf4L_PAU;kEhGbo|bJ%%BsFV6>k;&M~cT^gf|2#<0v3?RCQAjc{%=i($ zFiWL#F||~)borU4pxqc`*fN>vd+-59t*l+-YeWymY*_OJcMf&0tFO)LO!-+J8l{*8 zd_9-CxO3a>ywn(TX$agaZ=<9dh&dHVs%1ZHo*shHvM9vYoF0S`Cg`p#PsKMU2;2DE ztPj8l-69f^>z;`u##%d*v#*!QmV?OK#ylft*RI=)gw`5ugUM&Nik%8_th7z2vDV!( zT>M$f_CW}=l@efaaXk>W)+fSJJDS)N2Q=8O zM$?G7;+yvq$0bP(j#oDp19*cqJHNoyI{E z)sAQ8ABdBeI`%{CCL3-)RL1HmJTk$5l&mAZf(-^FiDU!-T;lrKAsg>gXrtZsqNYQC zCdPS{GGcASZs=q_42E=tKM7l|VlZm0-9>WJ@siEK5TR1d4|a);9)0F+UIs6gd$F;E zt=^J`cI9^;M#z7i2RlT0MSOFiFWVneEU>zPpSsBNv(=XuG=ggDm2x#G7gxkY~u?H(*%u|^WK#{Rga=l4}|TjUiFOCE~G)*D6|K14=S!H z+r_k+DYevOR-v2Q6PSajFLChE!_;?euu@dcG}cRcMV`=Ev+jQ+WIhYcl+%p?X)Q9) z3gn_ZSTOxk88s_#Imoy9cusTw)Z%^8YOBKYAw+kA;92$!{)TyPvt0eReXfS=p&6IH z6CA-Z(1JxV%KKtc5w#jT4HU;>I`Up?1Wz$hzwSdj-iy=GWm-dQlt!co^)6@)TtX&8@#%DUj#`8`)<)7eU|8wuv1rJV>L7iwB>92qHEuhH&{08KEJ89d zdT7L?{G)Fsqe3yM4`iD*i=y1T1w?~>%a+RZ5+n*ic#{znTfs)8u7+>oDtULm#O7;7 z?**V-ITiPP=%23a_I+p-q0?Rl#arUYz)NuP*+TAMRa!pilrr%*eo`{Z&}9|y(eR{FqR zSH9Em%F!c+cC|YXiMALyV-Q0=VTU0uLGO%|k4LW^ z?4pV%)Dn*B^c;g8areFJ4Rpu5&HfSKS`BHLCK<%Z6cbO-WQx*Ve@MYLd&YoXiS3d) zU&bHwDxLm@s^d}1<_Y^BQnPQKFBIhAwprRQyov0bS<=%~O)cT^-St=>s1dmTc8z&w z)_bD0wTOc)(K{B-u$5fk(g6T4x4IF@2|O}{AI5r)rEg(qsG)+Uu0@=Lq}TFF$W`W* vMULJ9CZEW&Lir+tT8bJfysU>*kI{fn!NN$lJQE4#+X65%wlu0X@QVK%i$fA} delta 1814 zcma)-c`)0F8^*sRN)uNd#iG9?Y~5^8ide0xYuR;|vSxnA-#hcZ@AJ&O?=$oH@0~2<`8k*8VzRTNl@R1R2mk;= zHr5s{r>c6|HwDg|&O~zR+q#Pp5T1Mv6JiSDL+W8r2J~qmv;R6p;r}_3u#pPNP!DZj z7(jrL^bK$@lpbCeW~hq{fRRunA`*=x5Rq^Ky<6Cl{zhDl4i_<2Ib9%h5d<`hWT<-@ zFvQ_uXp|lj28Y7~kR${VVTeG`X(HTzcPKAr`X4OLl&B)lzoYqohCU^lM3)nV&^N_~ zI5HB0ATZM4iVl5LN|JLTMbiO$j=0Oy8CKd_5))7Nma$(H9!FHDz% zq0J2wN$)TmMq3kPck>F0yZ?EyErv?Us+s4%NPpWupwqq)+rDu)C(B~|;uaJ4?GBSV z*Sdp=oQF)Gu-I#PI~!k^gq0EzEmo?I4h2LYy(=W(LYft8iE__B-*s^jyV z`wLP2@8$UbmRK-5I^En!cqqWEwAU^lkDbd@cR) z&~iN(2-_P1Cl?%U_Ut5H4|`E}$dtT>n3QSG;3vnSRppSBx)MEcqE;}Hsu~cq{aCj3 z!HE_PFbJrkj0gZ0IU7X@B8CtEjwA;Z+;1>Vn+q$BSg}g)+>q=DE}KXt7wD_E;*NJ2 z;m?aT*G<<=25$fgS6&Kvk2g+OKHK7ZAD3H_53SVbNSl3@a>-YwDK=2a1Y3Z;3jQt9 zs$uqZW1M4uncygm2X90DlK*wSMftSMt}k&tM+&eCyQ{I+5&q!5t!cA(4n|cY@UK|8 z;d(|8>nA&zF<#bA;+g1MM&NX6FJ3NC3DooFH7Ozo&lAgzn)tkQ{!p`UE$y7gyQa{4 zsi}Tz9(AQcRX%;0uht_p@Q+>}tzU-ZCQrSO^SJbC%ra#?Bb^#{kC;$DXr^S3BhDWN z9&PK3^(UJPcZ}--4?W|2? zxrF?psr;yr>)k5>wa(^0ko_Yt+b#PBeWmkUuvodo>{Ji0ckY8TOfT_c^343+;f`@h zll@r>r}6<~8|u{Fuz4?gHOU-gs`*0B^Pn1k)LtZmIU5jM-4f$@AqP%vMl;}tJC}reasfW9Vv+S#9c-JoU*}Ouoa7fC$7nD(1 zQCaj(WhCG>#!n!ZmvFf%L0SN-zY~?8>kE~b;Ht&<9KMqHRkp=3+t$8ixrtSw-bCm1 zA7p5CM7DfRur_y<%w(uknBEA5M`r2uQLSbiN=|0Buwyk)x6EGHHp4#WMZzBEZ`W*j zX{S)1KNhTgn#0%xz;nU-?zq;EA4V`3EvB7Jy&sp3=zRFJ$Q#_ne`&i4JWA<1no-(6 zmf?Wo#HM@%?ZteeRKk~x^W^Oa_z$DZ1eK65&2j=l5zm9KQgAcp9>-{vhw4)W9i+$W zW_Ch&)T?B_fQYu;SyinL;e7D2elZB!Uf8+1_P0FTcQ?h24!((SNQ~J?sT#@J}T30A0K%+l*>P|`Hnr&C|0r+J@TSAoLDN?y zL%|ruYq@D7KbqcoO3Rdt_FMb9S2L-0wr9yblFpT8aiE%?Iuo4+W}f_sHo>g%BpG=R zfW#3u#pT2UGafr@6g{Y}-eXZlSUz6`fI2Fx-+lOR(f+5}*b_k@F*7so6-H_K^w9w} MmW~!L%>5t!16IK@wEzGB diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index 0fac27b6..da4515eb 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -59,7 +59,11 @@ (defn make [screen] (let [warriors-stand-sheet (texture! (texture "inside-cafeteria/warriors-stand.png") :split 66 126) warriors-stand (animation 0.2 (for [i [0 0 0 0 0 0 1 1 0 0 1 1 1 0 0 2 2 2 2 3 3 3 0 0 0 2 2 2 ]] - (aget warriors-stand-sheet 0 i)))] + (aget warriors-stand-sheet 0 i))) + ladder-guard-sheet (texture! (texture "inside-cafeteria/ladder-guard.png") :split 37 87) + ladder-guard-stand (animation 0.1 [(aget ladder-guard-sheet 0 0)]) + ladder-guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]] + (aget ladder-guard-sheet 0 i)))] (rooms/make :music :town-1 :interactions {:right-dir {:box [300 0 320 120] @@ -81,6 +85,15 @@ :script (actions/get-script entities (do-warrior-dialogue entities) )) - :stand) } + :stand) + :ladder-guard (actions/start-animation screen (assoc (animation->texture screen ladder-guard-stand) :x 202 :y 85 :baseline 155 + :stand ladder-guard-stand + :talk ladder-guard-talk + :script (actions/get-script entities + (actions/talk entities :ladder-guard "Moveth along, young sire."))) + :stand) + :ladder (assoc (texture "inside-cafeteria/ladder.png") :x 250 :y 85 :baseline 155 + :script (actions/get-script entities + (actions/talk entities :ladder-guard "Do not toucheth, young sire.")))} :collision "inside-cafeteria/collision.png" :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50))))