From de24910ed0ff011335874179450337580e76433d Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Mon, 6 Oct 2014 12:49:36 -0700
Subject: [PATCH] adding flask item.

---
 desktop/resources/cursor.png                  | Bin 2271 -> 2458 bytes
 desktop/resources/inside-house/flask.png      | Bin 0 -> 1372 bytes
 .../advent/screens/rooms/inside_house.clj     |   8 +++++++-
 .../advent/screens/rooms/outside_house.clj    |   1 +
 desktop/src-common/advent/screens/scene.clj   |   2 +-
 desktop/src-common/advent/utils.clj           |   2 +-
 6 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 desktop/resources/inside-house/flask.png

diff --git a/desktop/resources/cursor.png b/desktop/resources/cursor.png
index 92337a7336cd9094471fd032daeff200c596976a..ea3b850d835b2575b6ff0da8a01abada7dd68bb0 100644
GIT binary patch
delta 1404
zcmV-?1%vwE5t<VriBL{Q4GJ0x0000DNk~Le000310000G2nGNE0Qu9QNwFa^1b+oF
zNkl<ZcmeHNO=wj|6rLMID^`jHY2YC?RkLZkDg<g46{)_Bh*b;HRf*cB2yVI+B%m9?
zO+gIC20;)*ZI#l^Q&GE!h0v~Q5uzoQ@@T-)f+AHHncnaEzVW<yGxs+tdCtIN&YU^t
z%-lo1Z_b??rCyTu?ntl3kB@7QseccB$iT~#fd~()=jL?O)04>a`SAMjZ5=IMJ8yA6
zsJ*T?zPZ9|@!;g|xnfJ;-@X1otz5q>iSg^f*;M~pt)`pJW~z<Z%rg?I?4gRU*80!*
zk&<LbQS|CFdb|+!1!rIp*RM(f66}yo+?Fhf;KZ>n^=JEzdVzKE)3=R3<A0z(eCaQB
z<<7rSm0Jez(FlHyvjUU>5qx}cix5g$9AA9u;oE35RJ~p=O=19kOavzxGxXh;0Yd=m
z`ui(a0tEip*m1RY_s1q%V_$!x<Xjr~>GadBhZIeZ)1L&;ss!|p&40W^0>|F^@(wWO
z1wZ`Df(U+gi@|8Cykh}iuYZkig1(q9yMJHopzp2>7y`g!RVIPCzmx0$`~W>$LI#}M
z`-O@LfKwekPJaph_t(9W*hn1|B!Z3r4g~>^)1UHe<9-`)_)goInVC``f*)F6U!S7v
z*qT#C0MpO4H(w<oeYtiZ0cV<nGR{C70U#q)NC2QG`0Wb7=wkv%YkxM-VJmew`ES0_
zn}j&~-DDex?YIX9`}7~p{}T13+5<26={Gt$O0lgkO9E{{at<Vb;o{oU@bIuRn(a%Y
z=ed8b8Ty5hfgaa3Ndm4pmk#gr&>N7qDgY3Iixg<@iUl1{eaI6080T&G4!o7@Y4vMM
z6PHcRWeTUhee&mxM}H8xPUE~Wvg~{S&ho>2mT!^$w=Mw9vf&=Uq@wGDjtW3NVV;XY
zyxZfQUpAKitO7WeHt>@dgPg<7{)k%B@!l@ycWr<AIgfhT1N_r>AE|BcD0Sh+;$-Ud
zjr1FT7@=g&YQAzhFEL0vS;iB<dG{gr$(X!j$f_D(FV~i_0Du1Y@^2M&vAhQ|NPsfu
zLcj1c&_)2arl*rv0Q7l33j)NOKYULU>_`bKfwc5U@Q)0x(el*aeCoGo*Y-g}0(Ply
zkL5Z9KXgUF5BrIU33RD#e0*HFzylqCH8eD&1_lP4F#yb|sVU`(0e{@s!@p>g`ym;)
zVn{pJybXS71Ap)b5|A0`4%rX@L61|PuK;;T;Ns<9qWYG7dgn(Q4ESvlkYoER050^d
z+)+w?<NstsuR3#WwosM{{{EFq)RC)N9h#g;y(6%L`+y5OA8=(104xS~LR_v`SuyCJ
zMj}`b1d`UU4x5yzbM+GZQkJ%X1Y|b4LpB6Ju%ibF6n}X<ywjgMe@)>BpyL-4f(g<1
z;aDP*1W+-6G-!ZNdH5$Ed9%ND|F_ZiU+vH!0rVKt-qjQQPfq>f;73f?<r+_9*QxE=
z2SF_72*NxuZ2v5<%XNYrGEg)F2>}rNbhgLT`+A<}05*V+N`Rn;5AFa!4$#w9#sa`G
z2H0hJPk$1Swl29H{HpNDkC*_S9h>EJ9^gt}f|%rixgs%af7jmRdO;2uD4T(fKl-wP
z;K%>)0}<G90Dh2wJo#bc1Hbf7s{nrf{K<da@qNE&*)P|zWfDMH0Ky;d{irO;#3-{q
zee7q!IBO5S(x0)y9RM>C`cfGHF}TQ~RIrv4zESn#S0#qeHw{caA6s8FMpb`%KUrgt
zfXfEpcj<#}VP{}oD}aTaim-cTzy<d336R+deaJw_K*&IsWZ-{TEHk#@IJ)ux0000<
KMNUMnLSTaaw5u}!

delta 1216
zcmV;x1V8(l6W<XbiBL{Q4GJ0x0000DNk~Le0001h0000G2nGNE0Nz-4h_N9u1b+l}
zNkl<ZXa((9O=wd=5Z)B2iijwPfgCjc^rD`Gg7%<@nu~~51@R=6YDMtkwNMIr5xfXu
zu~-B_EdC;1Vx{V#3Pn#=gjPvC1Ph9SBK{ou%(wP?PBy!n&3k&X3(4%x&dg5s`)2pO
zDD|JT^}X2$AO2i(O#S~RGx)*L^nY}eX=>8_zqtX?&(~3=dG%k5yE(Tc+PY$KoMO+&
zo1oYd`1en~s->G2=ol}0ro8^STrMh?%U+u}nSaztlS7E_9Oj*t1QKlY<G3?@Nra2%
zPew<MpLK5R{X=VGf5w44J@ifuPkxfB;68vyBlsNG3lOr2W(@e4I*uD5lz%S{<GCb!
zi^ZZU6bfDv#{^i@(vtclAn^VD7gXor{c&#nm#!;0=L4TkPba>!8%tC_2{3aKM32iK
zokW6Twy>}Uj8O35AF_$CGaLNORsq9QImZG(r;TfZzL>9<e@p-vrzXMl2ZYh!19Ub`
z2F`UJQxyVmsz##vCHNcH%zx81QU?WzP!qtSAmFHe_NR(ps)*yNwo<87cM~m3D)^!0
z^ZB@Mv$N?4AY<5abDbp8muve-P(=VFlZFHU9bi-P$8oG>g#f;00u5WKL*>6(menDy
z-5RL^(Tv;OmXF?+ziIVQ?yD1g`t|kov0EjRlAtO`;6MTh7h6tUU4LEHXr?cXeEB!g
zNJ^4G>U@3N>6n+`18jbz9(J@x-_}_5n3Le!Y+bs~-79rY%NNbpCfmyk6sq2=e3!qe
z=O)^!(X>rEb^#a?ub!_f|C$p(E*A1&h`SwkzH9&<O&|Rg$+1?>e8EpX7;+9z_PuIV
z&Alz>548Vzough#fPX*!{)gJVPN_R%&3fv}nE#0%MmRF-HP>+(N(^Zyk8uJRnupAj
zG5L&9@6>=j*RCSK#Q3<r0w6<Q3jyMeZ5twjjl@{-GD)*9!S8Kb70IgKartHDKzmzE
z0`sUh$1*m-hprLuVLv!H2;pr50|SbiCk>&)#&&dcsMgk2Ie!)R0nF&=sItX?Kc3j(
z-)NKhkPNmM(vI^n0SG#(o>xF93GP35o+<1+9_`z+B?jLlfgGD}0eGMro>WS{;~(6T
zRaYNPG0z}L@LQJ7Rc9VX>eNWd`;1@)bpZ!E7jQBLHn;+=Cax`3y%_ZOkqGO7K)!}`
z*kqqNDfI@KM}IxWFbX9A?(`eCAL+Qod*`*R5JF3QQHMUR1K5Hz7_;F|9`^ZaclX@h
z2qXX*cAdCcWlvj5g3qdN6nt0Zup(_$%e76(lK^@Ufgps&kp3>PZPkqRq;JUD`UEh6
zHpd9;YpiHo1ppo=fem!%X)EIaXp8~2Jl+91=cK*aPk#$O;@LKoqzDC$dC5wqu8|m~
zzb!Y$O)I@s)o5`3!v`Xmz5w4=`2^SmU;4wwbpkv)`uktEq?Iq%G5aJyQUKtOdmpcD
zNn#{fpFZYq!8l0{wm6A(Acl<`i33&~@ve_gniwu$-)6deOnurIY5mQ7X2-KTFuMb@
eJMd=*eiZ@Qu=OWm0b*|e0000<MNUMnLSTY$20;w~

diff --git a/desktop/resources/inside-house/flask.png b/desktop/resources/inside-house/flask.png
new file mode 100644
index 0000000000000000000000000000000000000000..19f3f736175efae48de60019513d6a4033146d88
GIT binary patch
literal 1372
zcmV-i1*7_jP)<h;3K|Lk000e1NJLTq000mG000#T1^@s6Pd;wa000CeX+uL$Nkc;*
zP;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH
z<T^KrsT&8|>9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK
zVkc9?T=n|PIo~<wJLg{8L_J?=wVD}Kh?c9aozEndlcyGxo=u9<v(!ri)T`-EEs@L3
z5-!0N_s;9#9f}Cc?UC;OPWB_edW+oAi6T$HZWSGU8TbrQ%+zbPOBBBc`}k?M2Hf);
z@Y6N~0;>X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm
zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1
zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni
zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX<gx$-tTA9oOBadXir_JPm2Y^4ct-PoO&C)tI
zGolvqOIK@duBk!Vu9{g<3;i;gJ6?~-DQ&xz!jvD&4!U-s8Os(*#?k2}f30SEXA#=i
z1-qUX+K`{!((H5w7<t$~ygD!D1{~X6)KX%$qrgY#L_{M_7A<1csY*MfP@XcB#Jxr~
zJS8&7goVS)VKE|4(h_Xlc{z{c$ApZs7riZ_QKdV_uW-M~u~<J-*#Z0?VzcZp8)p-w
zus7J7><CN2I>8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS
zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#<s%v*srlI
z{B2SKJ79W>mZ8e<cESmGBON_l0n;T7>u=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7
zqW-CFs9&fT)ZaU5gc&=gBz-D<EBz>aCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E
zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaE<h}6h3HHql{T;m+bPBU-O|^S1
z@dOw&4<!bj2G_<^#e}PL7FpY$lcrKO$i~?8Bd2y;oaL5^csibnCrF9!i%-PI;xhub
zp1k;8_$IKX1NHus6EHeD;B72SCCD@4ojP$=Mf3`Eo6yZ&eg@wTqDiZE);7u&SJ|(s
zuPF(9%D6IJ)klXF%`_Fy<tR3HxV^%Qqa?nAB97=m-uu2qcHInZ?ps8M|H3=#R%lzO
z6MgLv^}ib0hVV{&<};#;2lcwW;^(7C<OY#bI<VjS9qCKr-E_Cnc!2j+&nHAXA2%BR
zt~VMxUn2h&(Pi^LSpac(Y#S>R0002<Nkl<ZI1yuDpb#+Q(r@Ju`2QaxQv)*#lfaK}
zUw7hChgBS;8CgO=M7$rFkIZI5<{-1B6}7;I;L{9JkJEss_pdR64EgZpWg)V`=xnS8
zym|E)tPW%dx(0MURs+6%|HeS97tjra^I-<?u(RU~K#*drE`XZ?WU%lGAagO;SPg*L
z4pYs^&4<?&Fm+%WJq^Gli82J2W}*y1b~ZkP&|Lx#18z<(m_;Pfa08Ha!4eX(7%nze
z18!YALofxx41^m1N_`Xq<bcFx7<vF=Qv=Tf=#scJWA&?uq$0dP`TFVY1dw6hzkb4-
et<fzcnhyX1Mn3djNvX8}0000<MNUMnLSTYf)`<K7

literal 0
HcmV?d00001

diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj
index 7b198fc5..14e63c76 100644
--- a/desktop/src-common/advent/screens/rooms/inside_house.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_house.clj
@@ -29,6 +29,12 @@
                                                                           :right {:talk wizard-talk
                                                                                   :stand wizard-stand}
                                                                           :facing :left)
-                                                            :stand)}
+                                                            :stand)
+                           :flask (assoc (texture "inside-house/flask.png")
+                                    :x 265 :y 80 :baseline 240
+                                    :script (actions/get-script entities
+                                                                (actions/give entities :flask)
+                                                                (actions/do-dialogue entities :ego "Hey you think I could have this flask?"
+                                                                                     :wizard "Sure.")))}
                 :collision "inside-house/collision.png"
                 :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.75))))
diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj
index fc3dc26d..5b72f249 100644
--- a/desktop/src-common/advent/screens/rooms/outside_house.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_house.clj
@@ -144,6 +144,7 @@
                             :cursor :left}}
                 :layers [(assoc (texture "bg5.png") :x 0 :y 0 :baseline 0)
                          (assoc (texture "house.png") :x 0 :y 0 :baseline 122)
+                         (assoc (texture "outsidehouse/fence.png") :x 0 :y 0 :baseline 95)
                          (assoc (texture "overdirt.png") :x 0 :y 0 :baseline 240)
                          (assoc (texture "background-trees.png") :x 0 :y 0 :baseline 44)]
                 :entities {:sheep (actions/start-animation screen
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 22da29e4..e21aa86c 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -133,7 +133,7 @@
     (update! screen :renderer (stage) :camera (orthographic))
     (let [_ (input! :set-cursor-image (utils/cursor "cursor.png" :main) 0 0)
           music (sound "town-music.mp3")
-          _ (sound! music :loop 0.20)
+          _ (sound! music :loop 0.80)
           rooms {:inside-house (rooms.inside-house/make screen)
                  :outside-house (rooms.outside-house/make screen)
                  :behind-house (rooms.behind-house/make screen)
diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj
index 937a4135..3f98f421 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])
+(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask])
 
 (defn cursor [filename which]
   (let [scale 2