From 151421da6ab95effe21e24aa18d2600bc028ea4a Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Mon, 27 Jul 2015 19:08:40 -0700 Subject: [PATCH] Small visual bug. --- desktop/backup.edn | 2 +- desktop/src-common/advent/screens/rooms/outside_jail.clj | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop/backup.edn b/desktop/backup.edn index d6d9e782..7bc761c0 100644 --- a/desktop/backup.edn +++ b/desktop/backup.edn @@ -1 +1 @@ -{:active? true, :coaxed-sheep? true, :convinced-wizard? true, :time :day, :inventory (:mandrake :recipe :frog-legs :flask-1 :ladder :trophy), :seen-intro? true, :wizard-left? false, :clues #{}, :hud-active? false, :current-riddle :done, :last-room :outside-house, :wants-toy true, :mints-eaten 0, :object nil, :obtained-items #{:recipe :frog-legs :flask-1 :mandrake :ladder :carrot :trophy}} \ No newline at end of file +{:active? true, :coaxed-sheep? true, :seen-bloodclot? true, :seen-frankie? true, :plaques-read #{:shovel}, :convinced-wizard? true, :time :night, :opened-bars? true, :inventory (:walkie-talkies :camera :alarm-clock :note-1 :money :flask-2 :key :rope :crowbar :sword :recipe :kiss :ladder :cat-toy), :seen-intro? true, :wizard-left? false, :dropped-ball? true, :hay-searches 1, :clues #{:name}, :hud-active? false, :allowed-to-keep-teddy? true, :warden-sleeping? true, :current-riddle :done, :warden-fast-asleep? true, :last-room :outside-jail, :wants-toy true, :bent-bars? true, :chest-contents [], :mints-eaten 0, :object nil, :talked-to-owl? true, :obtained-items #{:balloon :money :flask-2 :flask-1-with-cream-of-mushroom :key :slingshot :teddy :recipe :mushrooms :rope :flask-1-with-milk :kiss :wool :portrait :slobber :medal :sword :frog-legs :flask-1 :flask-1-strength :dream-sword :mandrake :walkie-talkies :shovel :cat-toy :grass :camera :stick :motivational-tapes :ladder :carrot :trophy :alarm-clock :crowbar :note-1 :flask-1-slobber :ball-n-chain}} \ No newline at end of file diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 1deec9af..b240a8fa 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -148,8 +148,9 @@ (actions/play-animation entities :ego :reach) (actions/remove-item entities :alarm-clock) (actions/add-entity entities :alarm-clock (get-in @entities [:room :alarm-clock])) - (actions/play-animation entities :ego :axe) (actions/update-entities entities #(assoc-in % [:room :entities :axe :opacity] 0.0)) + (actions/play-animation entities :ego :axe) + (actions/talk entities :ego "It's split right down the middle!") (actions/play-animation entities :ego :reach) (actions/remove-entity entities :alarm-clock)