From 2b7e957f2880de3b7976f60fb39c26dfde9a3687 Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Sun, 2 Nov 2014 08:03:33 -0800
Subject: [PATCH] more minor bug fixes.

---
 desktop/resources/outside-castle/steer.png    | Bin 2129 -> 2128 bytes
 desktop/src-common/advent/screens/items.clj   |  10 +++++++---
 .../advent/screens/rooms/outside_house.clj    |   2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/desktop/resources/outside-castle/steer.png b/desktop/resources/outside-castle/steer.png
index 2888b8fb830620c2827b64942dc0520f807a25c3..d5f1b880f0ea22707d8eb38a2ab5aaee2343ddbd 100644
GIT binary patch
delta 1036
zcmV+n1oQjR5YP~?R0MzLNkl<ZSPAWyJ!@1!6ozm7K#>rz@GBOsT54gHU@fUEECPaU
zaBckwqTmm(^aEQVy;XjIB$a}eiLo&1S_nZTA|c*)HqY$2$C<l#v%4aafxBnsoHOUV
z@0^*rcZ*`b?XST2SK#f+-JS7g8Bc}-qX_#iEWn{*i9Ee?CRBg%{#+}_>GMB}_LEN&
z!^RzS{+=r$0+8@Yb9(PL%JINNAh7ZNNTKKI?VAD5yUvdwrBnOcWGY*Ly?%M-QAHn+
z?SccSbn_2y1k;1|iy-xL>EyA{*A`2)Cfm*~LKA=GsXZeKNFeng@pA2Rz&LM^u7BSQ
zqq*6GQM<If9f^OTv>?%uLu2gZVr+ewXJuvOsfZk2JzET0$2!|pW=k#HdK_Ka*N%ri
zAVm23h11b)JH$$nwSMa3tA379vLY!G3L=0uXb8LuUVtDVeZMAu8t02K+mkVIl{;6V
zN<}nLj!Yzwmz)jhMLM^tRKx<cAO*}4B9GmkDJ*s|sZf8swL}261k6c$xIGCAIyJwa
z9iob>N1%C#Cvu)(tjM_&hj(VDyL)_j<6E(C<!s@TlEkiv4e0&309un%U<lI2@fDFx
z@x5LXnP-FDTUrksDrZClXdaaGJze*T)z;AgPbHPV2#AaxPbS=aYh54t(sCrQ=VYvi
zbx?H}+bVxa$5?#<tRo^HHBUriHA~L==#1nRCrm7VR2?nG%Ia3&kR@UPGZ_gGjlXPe
zM{?*rK>48?#7FaJem;7LRJInzI?48fXlt_T&HfcoJtUR{JaMsEeM*PFr1jO91zah%
zG^~HK2an8;C*<8c8QCou+xIqswC&VX?`uJNZ<l{ASrOe>zV!}z@0^H?9;%}`wgLjH
zq#g()u%&=0mf|Wte$wSyl86P(L~WhtuRj(azWypzz1z)_z_*{Y!0DH9!+EtA4T}UB
z;>vgC;?Z~^NgrQ`IOSw{UyFp2g@hsi2_;hFoUq>kDI0yHbc)BLv2Dbbj$EZL7~*Zk
zoMeAR7T<J&y<D9j6`*YKhU*6G6xf54`C;pz0z6XSvE`&<STZ?3^hqM6QHgeT3E*pG
z08-jxc~!CU?{4KlYeEyyHn9BJHmbDF7ZtXCzF)Vs1lB%&uErCp3J;$PGO+sU588M)
zFwa*Qy_I!DtY5b8SKR*p@V0D_8iOZgUG;wjz=!V8L~LOC!&HM9gUYcG5r|P#qY0Tm
z{*N@7)Wj$C4r(&5p-;GE@P&lNLsz6c=<((vfn-i^eR6$nE&oN3^Ort%{npK?*v7Gi
z>JE4%xfxVSW%PUM`YMcqB-Ih1I)X!QEf|lR1bO~@`5SX?9<6U>QJw$*002ovPDBK*
GLSTY{4*7Hd

delta 1037
zcmV+o1oHdP5YZ5@R0MzMNkl<ZSPAWyJ!@4#5Qfk714Tl>!mn6()lv(q1ZzoUVG$5)
zgR%7|h=M=B(hqEf^j7%+l2i&>=EK6M*Fp#)5ef0Ud-H7O%-uaXH}_r<$-=pFc4l_w
zeRpOzCq;2E4t8MlJMez#{`Tmzj3&dOVTAn`HsHvhM4sO}7pi~waJn7j#Km95+_TTE
zLF4wje%}=l0Z90yIlcEA=Dcqr5LjP5R_M8Y_jbVZq4P6H=`{W}nMw=L>sKeARP+Ja
z4mf~HH}m*bFg==k6{LQyoIVlW)ncj9r0wh`H1SuS+B2en1kyVsUax!!7-tO9wI3T{
zHa&GXY8Mu_A~Am{RW%C|M{;P6U27GKx%FY4m6e^RB64{1V!rS|>@L$%vv;1xcyl*S
zhIdQ&=B2aIZeNJybKpa(YHl|tM<`hlk<g$`!le8WKmecvyZ}J}Tb-0Y!-7U<bFZ&<
zwaT5VQ01`eY(OFhN_wh6(%i0M7f>E_0%~^}y`&|fb!>m0a)V2RAf+{th&RZX8}@K}
z5~<y_arUx{oFy$%fG3XTwxZI<Gjie7(e0^;ZjUdne=laQoeu$7EXhu>L(<tK9wZk)
zdu&{;ao9K>5LNPe#Y&yG2McR~L*<N!0K<cleplDMVs(4zjQFI)5CH+u<H>}ZZ>8wb
zv(`($-rIj;YkmCoyTv0Xk+Q_>+?L)4^z#$|u5W9jdbv$eT=KG^#E~twmL?3_X6URW
zsdQgAwhCGjeF`ADetc|BzaHDt@@8*qVXTu>3GnT)t~Y%zpn6Cw33%dSv-*?{e@W}B
zIUBfCY-(Enmpyo7emo)X=E=xz!Ps|i6G%JGjPHMbElBU}(p3(-6dJm*{GczTry86a
z=Caue2&|HNAdtY80!AL?z)!l|ND{H2S*X@|`Sw#$UI?XX_ja=+@ZC#V;JoXi(K?+^
z){BJVLk7KkCodn5e$vNV3#Xhc?`x4zvXD>-AfZGWoD=#Tkh1ZPluq$@G`EA;(vhq5
z1w((qA!kjpBJ=M$!Cvl8kP1+aKtM0ufF13gragn!!2o!qz+=lv#js>@e&~}#N~02O
z?-0P($^fLa$MULT<-fa?1FZ#3K-<9br)^Yeoi8eE{rr1fYYD7<{94UhstOOE3o@|#
zdhd7mw(%8C#j7Kd^6%049k<^@-qy3Yfx>^2vP<+`#uxCwL~LN*2dM@z`jsOgA`ru<
zMiVmp$2fE%slP!@05$Xpmkhp;(0pJb<w1`(7YQVDdh3&W=hpIH1UY}{bJuU(nu=`{
zEmU{FE6L5IQYxe0*Q>9>Fi27z0jeW7aBIPM)FjCB-^)M16E~{Qxy~g30000<MNS1o
Hu0mjfM2rLc

diff --git a/desktop/src-common/advent/screens/items.clj b/desktop/src-common/advent/screens/items.clj
index 9e3a28cc..6e26d8d7 100644
--- a/desktop/src-common/advent/screens/items.clj
+++ b/desktop/src-common/advent/screens/items.clj
@@ -5,6 +5,7 @@
 (declare stick)
 (declare wool)
 (declare cat-toy)
+(declare flask-1-with-milk)
 (def make-cat-toy
   (actions/get-script entities
                       (actions/remove-item entities stick)
@@ -20,19 +21,22 @@
 (def flask-1-with-cream-of-mushroom {:name "Flask with cream of mushrooms soup" :value :flask-1-with-cream-of-mushroom :cursor :flask-with-contents}) 
 
 
-(defn make-cream-of-mushroom-from [from]
+(defn make-cream-of-mushroom []
   (actions/get-script entities
-                      (actions/remove-item entities from)
+                      (actions/remove-item entities flask-1-with-mushrooms)
+                      (actions/remove-item entities flask-1-with-milk)
+                      (actions/remove-item entities mushrooms)
                       (actions/give entities flask-1-with-cream-of-mushroom)
                       (actions/talk entities :ego "It's just like cream of mushroom soup.")))
 
 (def flask-1-with-milk {:name "Flask with milk" :value :flask-1-with-milk :cursor :flask-with-contents
-                        :scripts {:mushrooms (make-cream-of-mushroom-from flask-1-with-milk)}}) 
+                        :scripts {:mushrooms (make-cream-of-mushroom)}}) 
 
 (def flask-1-strength {:name "Strength potion" :value :flask-1-strength :cursor :flask-with-contents}) 
 (def flask-1 {:name "Flask" :value :flask-1 :cursor :flask
               :scripts {:mushrooms (actions/get-script entities
                                                       (actions/remove-item entities flask-1)
+                                                      (actions/remove-item entities mushrooms)
                                                       (actions/give entities flask-1-with-mushrooms)
                                                       (actions/talk entities :ego "I'll just put a few of these in here."))}})
 
diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj
index 102e2bfc..46df2de5 100644
--- a/desktop/src-common/advent/screens/rooms/outside_house.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_house.clj
@@ -187,7 +187,7 @@
                                                                                                              (actions/give entities items/flask-1-with-milk)
                                                                                                              (actions/talk entities :ego "Sheeps milk."))
                                                                                                          (actions/talk entities :ego "She's too far away.")))
-                                                                            items/flask-1-with-mushrooms (items/make-cream-of-mushroom-from items/flask-1-with-mushrooms)}
+                                                                            items/flask-1-with-mushrooms (items/make-cream-of-mushroom)}
                                                                   :left {:walk (utils/flip sheep-walk)
                                                                          :stand (utils/flip sheep-stand)}
                                                                   :right {:walk sheep-walk