diff --git a/desktop/resources/inside-antique/background.psd b/desktop/resources/inside-antique/background.psd index 2a10f151..5c435821 100644 Binary files a/desktop/resources/inside-antique/background.psd and b/desktop/resources/inside-antique/background.psd differ diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj new file mode 100644 index 00000000..dc23081a --- /dev/null +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -0,0 +1,26 @@ +(ns advent.screens.rooms.inside-antique + (:require [advent.screens.rooms :as rooms] + [advent.actions :as actions] + [advent.screens.items :as items] + [advent.utils :as utils] + [clojure.zip :as zip] + [play-clj.core :refer :all] + [play-clj.ui :refer :all] + [play-clj.utils :refer :all] + [play-clj.g2d :refer :all])) + + + + +(defn make [screen] + (rooms/make :music :town-1 + :interactions + {:down {:box [60 0 290 25] + :cursor :down + :script (actions/get-script entities + (actions/walk-to entities :ego [222 3]) + (actions/transition-background entities :inside-castle [182 90]))}} + :layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0)] + :entities {} + :collision "inside-antique/collision.png" + :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.20))) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 04ce1a76..fe5ca411 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -100,6 +100,12 @@ (actions/walk-to entities :ego [284 145]) (actions/transition-background entities :outside-castle [82 180]) (actions/walk-to entities :ego [129 148]))} + :antique-door {:box [154 90 189 150] + :cursor :up + :script (actions/get-script entities + (actions/walk-to entities :ego [182 90] :face :left) + (actions/play-animation entities :ego :reach) + (actions/transition-background entities :inside-antique [222 15]))} :sword {:box [0 130 39 165] :script (actions/get-script entities (actions/talk entities :ego "That's the coolest sword I've ever seen!!") diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 9f2ee1ff..b8ed97e0 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -15,6 +15,7 @@ [advent.screens.rooms.outside-house :as rooms.outside-house] [advent.screens.rooms.inside-house :as rooms.inside-house] [advent.screens.rooms.inside-castle :as rooms.inside-castle] + [advent.screens.rooms.inside-antique :as rooms.inside-antique] [advent.screens.rooms.behind-house :as rooms.behind-house] [advent.screens.rooms.outside-castle :as rooms.outside-castle] [advent.screens.rooms.cat-tree :as rooms.cat-tree] @@ -171,6 +172,7 @@ :behind-house (rooms.behind-house/make screen) :cat-tree (rooms.cat-tree/make screen) :inside-castle (rooms.inside-castle/make screen) + :inside-antique (rooms.inside-antique/make screen) :outside-castle (rooms.outside-castle/make screen)}] {:rooms rooms :musics {:object nil