From 526ea9848b0c1fb0957a8e55454887a8f9ed4f91 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sat, 22 Nov 2014 15:32:59 -0800 Subject: [PATCH] addded portrait back. --- .../advent/screens/rooms/inside_antique.clj | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 20621e8b..1602e959 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -83,7 +83,17 @@ shopkeep-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 1 (repeat 50 0) 1 0 1 0 1])] (aget shopkeep-sheet 0 i))) shopkeep-talk (animation 0.15 (for [i [0 2 0 2 0 3 1 0]] - (aget shopkeep-sheet 0 i)))] + (aget shopkeep-sheet 0 i))) + portrait (rooms/make-entity :portrait (assoc (texture "inside-antique/portrait.png") + :x 109 + :y 120 + :baseline 120 + :script (actions/get-script entities + (actions/walk-to entities :ego [136 80] :face :left) + (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 :portrait))))] (rooms/make :music :inside-antique :interactions {:down {:box [60 0 290 25] @@ -94,6 +104,7 @@ (actions/talk entities :shopkeep "Excuse me sonny. Please return my belongings before you leave.") (actions/walk-to entities :ego [136 80] :face :left) (actions/play-animation entities :ego :reach) + (actions/add-entity entities :portrait portrait) (actions/remove-item entities :portrait)) (actions/walk-to entities :ego [222 3]) (actions/transition-background entities :inside-castle [182 90]))} @@ -112,16 +123,7 @@ :script (actions/get-script entities (do-antique-dialogue entities)) ) :stand) - :portrait (assoc (texture "inside-antique/portrait.png") - :x 109 - :y 120 - :baseline 120 - :script (actions/get-script entities - (actions/walk-to entities :ego [136 80] :face :left) - (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 :portrait))) + :portrait portrait :bowl (assoc (texture "inside-antique/bowl.png") :x 155 :y 125