From ef05405ecf1e78d72cc439fc3388b4d3d3426480 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 3 Aug 2015 21:37:19 -0700 Subject: [PATCH] continueable quest. --- desktop/src-common/advent/screens/rooms/inside_antique.clj | 2 +- desktop/src-common/advent/screens/title.clj | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 78463864..00d07250 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -224,7 +224,7 @@ (if (= 3 (get-in @entities [:state :mints-eaten])) (do (actions/walk-to entities :ego [159 62] :face :right) - #_(actions/update-state entities (fn [s] (assoc s :mints-eaten 0)) + #_(actions/update-state entities (fn [s] (assoc s :mints-eaten 0))) (actions/do-dialogue entities :ego "She's all out." :shopkeep "That's right I'm all out." diff --git a/desktop/src-common/advent/screens/title.clj b/desktop/src-common/advent/screens/title.clj index e8582200..5707f851 100644 --- a/desktop/src-common/advent/screens/title.clj +++ b/desktop/src-common/advent/screens/title.clj @@ -66,6 +66,11 @@ (texture! flipped :flip true false) flipped)) +(defn quest-label [] + (if (:seen-intro? (scene/get-state)) + "Continue quest" + "Begin quest")) + (defscreen title-screen :on-show (fn [screen entities] @@ -73,7 +78,7 @@ (utils/setup-viewport screen 1280 960) (utils/load-settings!) (let [font (utils/get-font "ego/font.fnt") - start-playing (assoc (label "Begin quest" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 280 :height 32 :origin-x 0 :origin-y 0) + start-playing (assoc (label (quest-label) (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 280 :height 32 :origin-x 0 :origin-y 0) start-playing (center start-playing) copyright (assoc (label "DEMO - Copyright Bryce Covert - Not for distribution" (style :label font (color 0.6 1.0 1.0 1.0))) :x 0 :y 0 :height 32 :origin-x 0 :origin-y 0) copyright (center copyright)