From eee1bd601d634a8ced7a2b868fa1baebfb9e0379 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Thu, 9 Oct 2014 19:32:34 -0700 Subject: [PATCH] screen transitions --- desktop/src-common/advent/screens/rooms/inside_castle.clj | 8 +++++++- .../src-common/advent/screens/rooms/outside_castle.clj | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 64bf97ad..1a5ed03f 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -10,7 +10,13 @@ (defn make [screen] (rooms/make :interactions - {} + {:right-door {:box [286 140 306 160] + :cursor :right + :script (actions/get-script entities + (actions/walk-to entities :ego [284 145]) + (actions/transition-background entities :outside-castle [82 180]) + (actions/walk-to entities :ego [129 148])) + }} :layers [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) (assoc (texture "inside-castle/pedestal-overlay.png") :x 0 :y 0 :baseline 135)] :entities {} diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index a0e7a79f..6583af54 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -25,7 +25,9 @@ :script (actions/get-script entities (actions/walk-to entities :ego [82 180]) - (actions/transition-background entities :inside-castle [280 145]))} + (actions/transition-background entities :inside-castle [280 145]) + (actions/walk-to entities :ego [245 90])) + :cursor :left} :garden {:box [103 170 178 200] :script (actions/get-script entities