From d724080220fc131ff231135ff35b215b14a30773 Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Mon, 6 Oct 2014 13:00:25 -0700
Subject: [PATCH] You can fill a flask.

---
 desktop/resources/cursor.png                  | Bin 2458 -> 2604 bytes
 .../advent/screens/rooms/outside_house.clj    |   5 ++++-
 desktop/src-common/advent/utils.clj           |   2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png
index ea3b850d835b2575b6ff0da8a01abada7dd68bb0..8ded96a282fd812b3123df94e8af707856c99400 100644
GIT binary patch
delta 1515
zcmV<H1r++46RZ@lR0My+Nkl<ZcmeHNU1(fI6rK%ImHH3Cz#<xJ^P)ag0yT)WX!k`#
zt3vTfqHR+OzW7=w0sA8OA{0}jK~RdpU&NPfB}OC)A@#+IkhY{!76U0NmEg}q#`{h3
zjb~?P?%!^<(aeQq&YU^t%-pm4eRJ;IRce!5_mB2ze0aNVpZb5;#tdwx3{-HldSyjd
zdU}l9$(z@IpVyTw_jD}o!`0jL?z?WaOFTMrAy;e({H1S}RqumaO^ol4E~ffdt5w}-
zG*WHsV%AA$XASN6YOOCNw`7uCsZ?$#dVBay(Puq=TZ|ps_A+n{-P<Jr33kXf?wTx#
z;LYPN>jQ^h3j%-Z)bsaRf5t(3?DWrS>f*0bm0JezaS{CNX9Xw&BKU;j79o_hIHCB|
z!?#|qt6HsAn#2J7gb3bZ%%UxTpZJdz^^5l1%YY?-?E?dCR{{k7`1l)Y{|nFByBL4_
z10~1Oz)z=d&;3c!w%Gki0Be<i{;KgykVxRzSG%zVjCp^-5C5_tf}eXOV02Z%z5sC0
zCNw}_jF(-1D0bBUzcOG60JqgP39MW;*#Y<gdR~SMIJW<gN(g{MEiHC`3I3hiuQN7M
z2L*|sC4fgkz+?BPyjcIei8w;L?ZU!BDG<RASAT!MqU>3kS49BR&$qTvB_Vw|cO(IC
znxitwKofrfAS3ON06<UhyA^=dCj^joxj=`l)M4lU@%BCw;{A_jnn3KvJu=j<e`@?;
z)TgV<LGaUWY|LM+mL&nkEz(K=!_T*-k&zK^NY|G}-CRHCjO~9T13kWFk_3EXJ{_Lv
zp|>Dks{lX<K2o5)FBWv%^&v~}qo4P>a^!BaraOOczTUVz*4V1B>$^LD-gpF&Z#T{x
zBg-xX;4D9kXZaRc|Jnhdown#XfII+1ka!MYQ@P=UmI^?wFwemtp6&6>FE5t=tOD4V
zHt>@NgB-)j{;1m4^4u=R_wD`nbsqJy1^DNe{!&lgr_`rsx0s=K&!(UF!w4mF))gwJ
z^Adl9w3B5#0i1Uoa-EFHGls0H0rqlk84KV~4*%|;E|Fh^3=*KsF<<NcW)dG$u7Ct6
z`~0Hr>SUma0M5<Nn@0e&d0*WC#Csmyp$T@}1}lNITaw@(9onYluD|D<A1eFy4p|a#
zOMSO5=OOr^D*}GlPfkvvNxdc}CX^36&;fr~!^6XBaB$EY1Hhb}omIXV@W+Wg{EJ?4
zJtPBP3~A>Zcfl`h0RAizaKZ2Rk3<rX8QB=JB>;jRUm_m?@{+)*FV0kIj~~|0JhjV$
z-z5Rrci#fwKyT`zQt}=DbG!P~$?3&HSt9rcdaqTleyP<fGYhF_1a9yUaA6k$u8e;H
zfF<BI#N~^X6@&h1B!c-sAZZuo;U#72e60k(l%;JN2}tlu+3}AgAQQ3yWJ>@9yLoq;
zkU){O;hFx!Po@<<06IPiA=nW0&yO3KB!G$mq(K9`%EO<0<jMXMFMU+`?DeNLNB}MR
zwD+|H|LU$^9Q=ssJ6z+A?Ax_{>mYxK<rqPjCx+{v1$H@4lw$^pX21{t!B1zmPkpH6
zjt*c0_^1R3didZB0OSBYZDlL~9DRUYmiHt9Y3q}l!LJJM{D=wQxv^PJ=K-$tC5TBL
z7%LLP_4ln!&eu&DRX}LI^K<X%rIoME@Z8i1ealU&|G0#%x91_FPyAc*9EyJz_3NL3
zj(!>ZhaZT*T{^%I5|BGTY(n6d{%IA!+`-j<-SK(9XxT64ab*%fSpdQx&;6(@%ETx$
zKYiSLK|gB^q0*nRlJV4oK$QL$zB_5m3HslzEGrNJ+8vJ^IFaDr{|=Lr#I~y$=qLeX
zt(?T*l0cSU+Bn|zW4x2V=X_%TQx<4w8*1B)(XM}JT_JrI355Kp2ML^+9%t9K59~hJ
z)!&+(I0~s5h+j%-dN$`Ec6#^D(@KBWHt}!yM^)VU-7Lj^%s|XQ%)nL7z&~V?jzF{-
R&D8(^002ovPDHLkV1j%w_@e*-

delta 1368
zcmV-e1*iI~6q*yTR0Mx9Nkl<ZcmeHNO=wj|6rLMID^`jHY2YC?RkLZkDg<g46{)_B
zh*b;HRf*cB2yVI+B%m9?O+gIC20;)*ZI#l^Q&GE!h0v~Q5uzoQ@@T-)f+AHHncnaE
zzVW<yGxs+tdCtIN&YU^t%-lo1Z_b??rCyTu?ntl3kB@7QsSkgB$iT~#fd~()=jL?O
z)04>a`SAMjZ5=IMJ8yA6sJ*T?zPZ9|@!;g|xnfJ;-@X1otz5q>iSg^f*;M~pt)`pJ
zW~z<Z%rg?I?4gRU*80!*k&<LbQS|CFdb|+!1!rIp*RM(f66}yo+?Fhf;KZ>n^=JEz
zdVzKE)3=R3<Dh>(eCaQB<<7rSm0Jez(FlHyvjUU>5qx}cix5g$9AA9u;oE35RJ~p=
zO=19kOavzxGxXh;0Yd=m`ui(a0tEip*m1RY_s1q%V_$!x<Xjr~>GadBhZIeZ)1L&;
zss!|p&40W^0>|F^@(wWO1wZ`Df(U+gi@|8Cykh}iuZ@3ig1(q9yMJHopzp2>7y`g!
zRVIPCzmx0$`~W>$LI#}M`-O@LfKwekPJaph_t(9W*hn1|B!Z3r4g~>^)1UHe<9-`)
z_)goInVC``f*)F6U!S7v*qT#C0MpO4H(w<oeYtiZ0cV<nGR{C70U#q)NC2QG`0Wb7
z=wkv%Yc_w-VJmew`ES0_n}j&~-DDex?YIX9`}7~p{}T13+5<26={Gt$O0lgkO9E{{
zat<Vb;o{oU@bIuRn(a%Y=ed8b8Ty5hfgaa3Ndm4pmk#gr&>N7qDgY3Iixg<@iUl1{
zeaI6080T&G4!o7@Y4vMM6PHcRWeTUhee&mxM-YFxPUE~Wvg~{S&ho>2mT!^$w=Mw9
zvf&=Uq@wGDjtW3NVV;XYyxZfQUpAKitO7WeHt>@dgPg<7{)k%B@!l@ycWr<AIgfhT
z1N_r>AE|BcD0Sh+;$-Udjr1FT7@=g&YQAzhFEL0vS;iB<dG{gr$(X!j$f_D(FV~i_
z0RDgY@^2M&vAhQ|NPsfuLcj1c&_)2arl*rv0Q7l33j)NOKYULU>_`bKfwc5U@Q)0x
z(el*aeCoGo*Y-g}0(PlykL5Z9KXgUF5BrIU33RD#e0*HFzylqCH8eD&1_lP4F#yb|
zsVU`(0e{@s!@p>g`ym;)Vn{pJybXS71Mq(b5|A0`4%rX@L61|PuK;;T;Ns<9qWYG7
zdgn(Q4ESvlkYoER050^d+)+w?<NstsuR3#WwosM{{{EFq)RC)N9h#g;y(6%L`+y5O
zA8=(104xS~LR_v`SuyCJMj}`b1d`UU4x5yzbM+GZQkJ%X1Y|b4LpB6Ju%ibF6nTF<
zywjgMe@)>BpyL-4f(g<1;aDP*1W+-6G-!ZNdH5$Ed9%ND|F_ZiU+vH!0rVKt-qjQQ
zPfq>f;73f?<r+_9*QxE=2SF_72*NxuZ2v5<%XNYrGEg)F2>}rNbhgLT`+A<}05*V+
zN`Rn;5AFa!4$#w9#sa`G2H0hJPZEESwl29H{HpNDkC*_S9h>EJ9^gt}f|%rixgs%a
zf7jmRdO;2uD4T(fKl-wP;K%>)0}<G90Dh2wJo#bc1Hbf7s{nrf{K<da@qNE&*)P|z
zWfDMH0Ky;d{irO;#3-{qee7q!IBO5S(x0)y9RM>C`cfGHF}TQ~RIrv4zV%S!S0#qe
zHw{caA6s8FMpb`%KUrgtfXfEpcj<#}VP{}oD}aTaim-cTzy<d336R+deaJw_K*&Is
aWZ-{TEHk#@IJ)ux0000<MNUMnLSTY8W2Gtp

diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj
index 5b72f249..81657eef 100644
--- a/desktop/src-common/advent/screens/rooms/outside_house.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_house.clj
@@ -161,7 +161,10 @@
                                                                             :carrot (actions/get-script entities
                                                                                                         (actions/walk-to entities :ego [132 140])
                                                                                                         (actions/talk entities :ego "Come on girl, get the carrot!")
-                                                                                                        (actions/walk-straight-to entities :sheep [95 150]))}
+                                                                                                        (actions/walk-straight-to entities :sheep [95 150]))
+                                                                            :flask (actions/get-script entities
+                                                                                                       (actions/give entities :flask-with-contents)
+                                                                                                       (actions/talk entities :ego "Sheeps milk."))}
                                                                   :left {:walk (utils/flip sheep-walk)
                                                                          :stand (utils/flip sheep-stand)}
                                                                   :right {:walk sheep-walk
diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj
index 3f98f421..bac04070 100644
--- a/desktop/src-common/advent/utils.clj
+++ b/desktop/src-common/advent/utils.clj
@@ -11,7 +11,7 @@
   (let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})]
     (println (:input-x screen) (:input-y screen) "->" x y)))
 
-(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask])
+(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents])
 
 (defn cursor [filename which]
   (let [scale 2