From 8a8a9fe2702d1e8ba7050120154d5244e01a0d77 Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Sun, 9 Nov 2014 10:14:25 -0800
Subject: [PATCH] fire mints.

---
 desktop/resources/inside-antique/bowl.png     | Bin 0 -> 1226 bytes
 .../advent/screens/rooms/inside_antique.clj   |  20 +++++++++++++++++-
 desktop/src-common/advent/screens/scene.clj   |   3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 desktop/resources/inside-antique/bowl.png

diff --git a/desktop/resources/inside-antique/bowl.png b/desktop/resources/inside-antique/bowl.png
new file mode 100644
index 0000000000000000000000000000000000000000..94969b562dd0ef34689c7008d4d818144f2c6bb2
GIT binary patch
literal 1226
zcmV;*1U37KP)<h;3K|Lk000e1NJLTq000aC000LF1^@s6JhH4L000CeX+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>R0001CNkl<Z7#U+=AQ3Ra)F&*v^dH8?MlXoc1FL0$
zDLglG4mNdgF_=2AE*J+ci-Q5Og#{!BGF?j97Kbv3@Uy#z!3?+`^z8Hg<I)6DeCgmM
ouv)kVkamzJh<T_aOfg6l0C!j)!3-$evH$=807*qoM6N<$f<F^RNdN!<

literal 0
HcmV?d00001

diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj
index 5a59a1cd..c4f50c18 100644
--- a/desktop/src-common/advent/screens/rooms/inside_antique.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj
@@ -120,6 +120,24 @@
                                                                         (actions/play-animation entities :ego :reach)
                                                                         (actions/talk entities :ego "It's a portrait. There's something on the back but I can't read it.")
                                                                         (actions/remove-entity entities :portrait)
-                                                                        (actions/give entities items/portrait)))}
+                                                                        (actions/give entities items/portrait)))
+                           :bowl (assoc (texture "inside-antique/bowl.png")
+                                   :x 155
+                                   :y 125
+                                   :baseline 125
+                                   :script (actions/get-script entities
+                                                               (if (= 3 (get-in @entities [:state :mints-eaten]))
+                                                                 (do (actions/walk-to entities :ego [145 80] :face :right)
+                                                                     (actions/do-dialogue entities
+                                                                                          :ego "She's all out."
+                                                                                          :ego "Maybe Gandarf can brew her up another batch."))
+                                                                 (do (actions/walk-to entities :ego [145 80] :face :right)
+                                                                     (actions/talk entities :ego "I'll just try one of these mints.")
+                                                                     (actions/play-animation entities :ego :reach)
+                                                                     (actions/update-state entities (fn [s] (assoc s :mints-eaten (inc (s :mints-eaten)))))
+                                                                     (actions/talk entities :ego "WOWZA! Those are hot.")
+                                                                     (when (= 3 (get-in @entities [:state :mints-eaten]))
+                                                                       (actions/talk entities :shopkeep "You brat! You ate the last mint.")
+                                                                       (actions/talk entities :shopkeep "Since you ate the last one, you have to go tell Gandarf to bring me some more."))))))}
                 :collision "inside-antique/collision.png"
                 :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50))))
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 43dba2fd..5ccefa55 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -183,7 +183,8 @@
          :state {:object nil
                  :active? true
                  :inventory []
-                 :clues #{}}
+                 :clues #{}
+                 :mints-eaten 0}
          :actions {:object nil
                    :channel (chan)
                    :current nil