From 9740b37f38caa47b4e63327cfa7de16e0abeacb7 Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@brycecovertoperations.com>
Date: Sat, 5 Sep 2015 12:24:49 -0700
Subject: [PATCH] altered antique dialogue.

---
 desktop/resources/inside-antique/desk.png     | Bin 2987 -> 17368 bytes
 .../advent/screens/rooms/inside_antique.clj   |  32 +++++++++++++-----
 desktop/src-common/advent/screens/scene.clj   |   2 +-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/desktop/resources/inside-antique/desk.png b/desktop/resources/inside-antique/desk.png
index fd012de8b52ad75c1ad50a815687a016309c8c65..431bab29ea5ad3740a0a2332fa7b02ab0dbfccd2 100644
GIT binary patch
literal 17368
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
T;uZ(K*#Rz&9^C8|UvBvi>Y`#;

delta 2161
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
Bo%{d*

diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj
index c8547340..534e958b 100644
--- a/desktop/src-common/advent/screens/rooms/inside_antique.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj
@@ -40,17 +40,27 @@
                      "Something else."
                      {:choices actions/something-else}]]
     (actions/present-choices entities
-                             {:choices ["I can barely see anything!"
+                             {:choices [(when-not (get-in @entities [:state :opened-blinds?])
+                                          "I can barely see anything!")
                                         {:run #(actions/respond entities %
                                                                 :shopkeep "Sorry about that, sonny."
                                                                 :shopkeep "My son will be back any minute with some candles.")
                                          :choices son-choices}
+                                        (when (get-in @entities [:state :opened-blinds?])
+                                          "I let some light in. Will you open up shop?")
+                                        {:run #(actions/respond entities %
+                                                                :shopkeep "It's still too dark in here."
+                                                                :shopkeep "Don't worry."
+                                                                :shopkeep "My son will be back any minute with those candles.")
+                                         :choices son-choices}
+
                                         "What do you have for sale here?"
                                         {:run #(actions/respond entities %
                                                                 :shopkeep "We're not open for business right now."
                                                                 :shopkeep "Can't you see the lights are out?"
                                                                 :shopkeep "We'll be open again when my son comes back with some candles.")
-                                         :choices ["Why don't you just open the curtains?"
+                                         :choices [(when-not (get-in @entities [:state :opened-blinds?])
+                                                     "Why don't you just open the curtains?")
                                                    {:run #(actions/respond entities %
                                                                            :shopkeep "That window doesn't let much light in anyhow."
                                                                            :shopkeep "Plus, my son should be back any minute now.")
@@ -59,12 +69,14 @@
                                                    {:run #(actions/respond entities %
                                                                            :shopkeep "No, not until my son returns.")
                                                     :choices #(-> % zip/left zip/left)}
-                                                   "If I get some light in here, will you open up shop?"
+                                                   (if (get-in @entities [:state :opened-blinds?])
+                                                     "Since I got some light in here, will you open up shop?"
+                                                     "If I get some light in here, will you open up shop?")
                                                    {:run #(actions/respond entities %
                                                                            :shopkeep "No."
                                                                            :shopkeep "I need my son to help around the shop anyways."
                                                                            :shopkeep "And there's a lot to fix up before we're ready to open shop again.")
-                                                    :choices #(-> % zip/left zip/left zip/left zip/left)}
+                                                    :choices son-choices}
                                                    "Something else."
                                                    {:choices actions/something-else}]}
                                         "Are those lava mints on the desk?"
@@ -229,10 +241,14 @@
                                                                                                           (tween/tween :fade-glow-out screen [:room :entities :glow :opacity] 0.3 0.0 0.75 :ease tween/ease-out-quadratic)))))
                                                                                :use-screen? true))
                           :scripts {:portrait (actions/get-script entities
-                                                                  (actions/walk-to entities :ego [142 49] :face :left)
-                                                                  (actions/play-animation entities :ego :hold-up-to-window)
-                                                                  (actions/talk entities :ego "The portrait says 'Herb' on the back.")
-                                                                  (actions/update-state entities (fn [state] (update-in state [:clues] #(conj % :name)) )))}}
+                                                                  (if (get-in @entities [:state :opened-blinds?])
+                                                                    (do (actions/walk-to entities :ego [142 49] :face :left)
+                                                                        (actions/play-animation entities :ego :hold-up-to-window)
+                                                                        (actions/talk entities :ego "The portrait says 'Herb' on the back.")
+                                                                        (actions/update-state entities (fn [state] (update-in state [:clues] #(conj % :name)) )))
+                                                                    (do (actions/walk-to entities :ego [142 49] :face :left)
+                                                                        (actions/play-animation entities :ego :hold-up-to-window)
+                                                                        (actions/talk entities :ego "It's just too dim."))))}}
                  :grandfather-clock {:box [55 70 103 185]
                                      :script (actions/get-script entities
                                                                  (actions/do-dialogue entities :ego "Cool grandfather clock!"
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index d005d354..2ffa653f 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -1145,7 +1145,7 @@ void main()
   :on-render
   (fn [{:keys [^FitViewport viewport] :as screen} [entities]]
     (.apply viewport)
-    #_(render! screen [(:label entities)])
+    (render! screen [(:label entities)])
     entities)
 
   :on-resize