From 8c20ead7fc021a55b5715f3c11e33915ddea601d Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 22 Feb 2016 16:41:12 -0800 Subject: [PATCH] different credits based on situationn. --- desktop/src-common/advent/screens/credits.clj | 12 ++++++++++-- desktop/src-common/advent/screens/rooms/common.clj | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/desktop/src-common/advent/screens/credits.clj b/desktop/src-common/advent/screens/credits.clj index 3569105e..cb722126 100644 --- a/desktop/src-common/advent/screens/credits.clj +++ b/desktop/src-common/advent/screens/credits.clj @@ -27,8 +27,10 @@ "Jana Covert"] ["Motivational Tapes" "Eriq Chang"] + ["In Honor Of" + "Took, son of Luke, son of Puke (1125 - present)"] ["In Loving Memory Of" - "Took, son of Luke, son of Puke"]]) + "Took, son of Luke, son of Puke (1125 - 1151)"]]) (defn get-role-style [entities opacity] (style :label (:font entities) (color 1.0 1.0 1.0 opacity))) @@ -64,6 +66,8 @@ :finish (fn [e] (assoc-in e [:tweens [:fade id :pause]] pause)))] fade-in)) +(def saved-took? (atom false)) + (defn start-message-if-necessary [screen entities] (if (and (not (get-in entities [:role])) (= 0.0 (get-in entities [:fade :opacity]))) @@ -92,7 +96,11 @@ :opacity 0.0 :origin-x 0 :origin-y 0) - :remaining-messages credit-messages + :remaining-messages (filter (fn [[credit _]] + (if @saved-took? + (not= credit "In Loving Memory Of") + (not= credit "In Honor Of"))) + credit-messages) :the-end (assoc (utils/get-texture "the-end.png") :x 0 :y 0 :scale-x 4 :scale-y 4 :origin-x 0 :origin-y 0) :tweens {:fade-in (tween/tween :fade-in screen [:fade :opacity] 1.0 0.0 5.0 :ease tween/ease-out-cubic)}})) diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 8bf1268a..54d58192 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -569,7 +569,8 @@ (actions/play-animation entities :ego :hand-hold :stop? false) (Thread/sleep 500) (fade-out entities) - (on-gl (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.credits/credits)))) + (on-gl (reset! @(resolve 'advent.screens.credits/saved-took?) (get-in @entities [:state :has-voted?])) + (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.credits/credits)))) (defn win [] (actions/get-script entities (do-win entities)))