From 3f76bba33c16fae6ca7a685bd945735a023994db Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 22 Apr 2015 20:09:58 -0700 Subject: [PATCH] better fountain! --- desktop/resources/dream/fountain.png | Bin 0 -> 2424 bytes .../resources/outside-jail/fountain-dark.png | Bin 0 -> 2233 bytes desktop/resources/outside-jail/fountain.png | Bin 3900 -> 2424 bytes .../advent/screens/rooms/outside_jail.clj | 40 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 desktop/resources/dream/fountain.png create mode 100644 desktop/resources/outside-jail/fountain-dark.png diff --git a/desktop/resources/dream/fountain.png b/desktop/resources/dream/fountain.png new file mode 100644 index 0000000000000000000000000000000000000000..c79c082641bfd20e2f13cf65650984ad5f50025e GIT binary patch literal 2424 zcmcguYfuwc6kaes>eMOJRvSgSvvjD{Cc7K*+=f6PptJ^<00n#$lk5f}B%8-#f(lxz ztq%~U9noUd+O&>n1+mo#L1HVd7Q`1FWK=*zMHJM4MT`-;L9m^U(;wC8{y2O0?)kp+ z-SgPl_3^QDCQY0+5deTmF>_@K0PqQ?*Y_rjqpgv3G?TtDsi+hxfz(hIrHKHfIH@AQ z7@abmP!LKy$M_o|27obEZDI%QP(`F`^`X#R zhZ6#|cqo+2lOu9NB$1(=yUau+EQ?K4FUwSma41Xyimez;pd%XYsEEcvUgiV^#VN@g%!3YQDa9Fel%bcU9lvbAB z95l)xBg|@()<9`VJ?Ldrs>p0A6rz)en@18wrwq0#4KT_^V4co;u3>L8 zr6B&2@l0=XVvd1;6@;10HmT`)Xo5z;bngB=kk^q`gT1H_=i>;Eg$f8Ei%SUj zEFniFVxejciidFdAzWMpjo|VBnn9Qr1$*1&Z|yU>Mfaq4`E(fQho|F2=;;|U(Zj-g zU0e?UV~b;C(nRaU?#uGbg-HR&+ReWtWz6dOHDxL@!as9%b^@e0*;Ej*=!mf+*)?Xs z#{(?-eeK#RBOe&K)*~&Et@;jYvHxL7O;fA$ z#|oEaTT|bMVv#Uo_tfO&+PCHECrFDvNdphV3sbp453e2ffx^ zdaJ6RePECO;u$u3K=t|4r}IK`I~wd$2Iotf2a%qZ%59Q|-M4Cc*L4^eGgn8iGF0ia z7U}jq=(zKkE1cKmZis6)wbSsOuaUbUf;E&zatH^8k|xtukDM z_{pt3hx$-=Rqmsx?z(%Me=0fTao&-D{elX0S^E9=_Y9EaE5!WxA&=4V8c(phVtM)y& zugW#X2j6v7btB-ok-D+NI#Zq6>NHgf{P#C!vkO_jx|=0Uo!7T(TM9xL=^y8me!6Rk z>b19nOxJqXujgbef8cJo|C24xk=56GlTkNlOYb?D@}~XBO4o{V(T;&%w%F>^dbz6w z!g+t(d$`xr^QvEXF*N?JHC|pY#bK){3fiiGANMa`N&Sph*W}~mkZLQ4FB-r?{^$Qa+cWbo-H3J11-O!$AtCo-1AKFb(zB~VmnvYUf bzJvhH!N#~;}@1Y#xgVph$HP z98f!*5v$@TSj>!65bKmjRp>+G3$;arLPe2MQBo1o4k8r0LD0^Wai*pF!%D?+Ui;7)%4Am3QwjINF`;$3vV@7XdVz!Qe;t3;}Wl+%lQ2I>=)3tkZB8MZ*Mi6UI(M`cJC8Q!tLujceiI7RZ zVdE-XfCph{5RMWo1(!A)rIN#v<0#JJ;Xz6)2!R6wF=85Lrg&70a(F>vNjMTDLXdEd zh{r)h;k*b~B;l`t#Szo7QCcH~X%)nDZWWz-Dpvf)Sb^9;U=(RcB+1O_DOi_5Qlv41 z)PZ90WY@tJF_=Q7b!@J5H0tHKC4@n>g}@^Wqz0USLIQ~(7KaGr zv4T)JpM@xt2p+)U1#oaab1EMHuN8!7QjlX@{x&|-Tl7pimaoJ>KfIC?p`|rspvCfY zRrd=3aA}W{h!V}6wyv%Ze6YpMJ#qdC?kx9j=PTzuuK1K)Ffo4Y+UZ94jQ4&YrE1G* zCa-(9X{>C^o?}^p;F~SiZP%Y%WrkiLFWfDcS`wVb_w91=@(Kf-TxM-tZdm{Zm=8G5 z+RPq-rjQS~fitst>duxO92|SAzP2`nw2tgcDx4p?zD9Ox1NnCp|< zwu91=Zq!_9iT!Zkw~mh6%`f&I>@~La78bWP*e!L!rO3H$>NuCVUU@YI1?s!ozexA@ zZ!0t%J^53^=;Mjumglu!KCHge6}(j9;kUIf*XHY6y|*RW6j|7FY0rT3iu|X!?+XnT z0m4678H07*N!E1b$;!%kt3#GoB)jUpq-DVygtC;XktA8j!cZrlFjw#9j?&f}^_E4& zK7E&U_Le)%JCoiHb@?Rih#Pb-_qILt5@NZG$TPd4Rg2)f6RE(;z6xt+XXCSF`Da7X z%;INpoxOhdWy^DZ53u>&kKG+teTz3@M2Jke%=9?5dt-@Rzpd=1^_r&ZxHS6X^3ta9 zqKic(sqE3_a*(B7A%k{>Ed=qr&evGyYm4jjMA*tB)DadhIuH#F46 znk7T~{pyE@(7fy>Xh&&lM^UPM^-jIkFg#{IJmf9Psb#EDJK4Bx8fkWJTDyN)i<)^1 z`6zQ&+kx^0VH?~xC+u2r)2gpgA8zN0>syUu=igy~+qWgo_56o?W-lj)9_beTFVdtH xe$;tpG5lM(&RX1)0Q4xo{!lbG^;ZFNfUoX*-ZS;f7dw6?qQa$;>NT5p`~^PN*$e;x literal 0 HcmV?d00001 diff --git a/desktop/resources/outside-jail/fountain.png b/desktop/resources/outside-jail/fountain.png index 125f9a71cac0fa7808ce9127f3e6c36e94e6f2b2..d28bce59726271d30426b461343a7f800747337b 100644 GIT binary patch literal 2424 zcmcguX;2eq7+x?{+o@CNp+%8ymkzboWOqZ(Ed&DLY7H;}3V0Ng>;@tvn`1FS1g+K9 z1B9_7TC7@|))6frS{orqJg~JOUO3290TC5Zum&t*jL;2&?R1>}s809CyWf8MKF|An z@3FIM<710C@nYFKi&56i64(P#h&3Nh>C%1nX+6-2sP8w~w! zvqPX74~CMtQbei?CoV9E|9YYIGbQ9xwPS^R2-%PXX8vBE>Ot@D8lE>hp9};2@MN3_Ej>d9dRQU_ zpS}$MFO<>aNSHoZV1RRIE z>*nsMsd(*3>b+7c;1vpZFrL{wJHulM&n#q=fN^#{Fd19{c>cq(#ibW#hV*eSRaEZCTwY<5)}>X{iVnYu|3~MKdi{-`ex1Pv-~bbv0S14$l*{4kLYS)mudmdT-VDuj$e;X041|p{vnm zE!6D2-*x8^M=-a?*%a4&+G;8#F74>>U9AhUuX!_asG)mk*!Hl;88xHt<~|=EXoc=K zh?m^ncW?l8*5o~m=xw;W>1gRem;IKg#j)ee)}HpmpSem4hI>6Py>R2+;ep|U*cb5n zFJIGd{MOgUZ*T{EFFT7QV^5j7?*EZ&b?s+(#Rjhsak#`2G-`#?{gutG++UBdBq~}(aabYI`5ZYvCAq<@-I_W91m zir3%uH(cvqyOy1id*9h~@2Dl;mNn3SlhH72N$=aA@|N|`a>uet;r5{un=OrL{hXD2 z!Q4OYKG@^xd(|tn1e)}_IbK>g)n=(H_TM6d9}VU%r;g#Zbp`lf^PO|`%U0=it>pHL zH(&9<%N&i~4gOZ`?i%s?pQUJ<3p*O-ZDW;dIF?^39J9O_#n;!goefazwQQLpv-_ND zO7QD$+rd=Bx zP3zJ`?a3RiK!&Qkf}wT4#FYs;FBhhX8Q!5KKWsmQq!36g-bf_j*1f>J|E2zB~Vmnom-f bzlZ>>0s6R|QRmLM|Ak^AVkH$}i&p*#gh4ll literal 3900 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 screen fountain) - :x 150 :y 126 :baseline 114 - :script (actions/get-script entities - (actions/walk-to entities :ego [151 119] :face :right) - (actions/play-animation entities :ego :reach) - (actions/do-dialogue entities :ego "Ahh, life-giving water." - :ego "I feel strength." - :ego "And renewal!")) - :scripts {:flask-2 (actions/get-script entities - (actions/walk-to entities :ego [151 119] :face :right) - (actions/play-animation entities :ego :reach) - (actions/remove-item entities :flask-2) - (actions/give entities :flask-water) - (actions/talk entities :ego "Filled up with water, just as Gandarf wanted."))}) - :warden {:object nil + :script (actions/get-script entities (try-to-go-in-stash entities))} + :fountain {:box [150 126 193 147] + :script (actions/get-script entities + (actions/walk-to entities :ego [151 119] :face :right) + (actions/play-animation entities :ego :reach) + (actions/do-dialogue entities :ego "Ahh, life-giving water." + :ego "I feel strength." + :ego "And renewal!")) + :scripts {:flask-2 (actions/get-script entities + (actions/walk-to entities :ego [151 119] :face :right) + (actions/play-animation entities :ego :reach) + (actions/remove-item entities :flask-2) + (actions/give entities :flask-water) + (actions/talk entities :ego "Filled up with water, just as Gandarf wanted."))}}} + :layers {:day [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) + (assoc (texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)] + :night [(assoc (texture "outside-jail/background-dark.png") :x 0 :y 0 :baseline 0) + (assoc (texture "outside-jail/fountain-dark.png") :x 0 :y 0 :baseline 114)]} + :entities {:warden {:object nil :x 36 :y 86 :width 10