diff --git a/desktop/.nrepl-port b/desktop/.nrepl-port new file mode 100644 index 00000000..9463411b --- /dev/null +++ b/desktop/.nrepl-port @@ -0,0 +1 @@ +2000 \ No newline at end of file diff --git a/desktop/resources/outside-jail/background.png b/desktop/resources/outside-jail/background.png new file mode 100644 index 00000000..e8fc765a Binary files /dev/null and b/desktop/resources/outside-jail/background.png differ diff --git a/desktop/resources/outside-jail/collision.png b/desktop/resources/outside-jail/collision.png new file mode 100644 index 00000000..056ff066 Binary files /dev/null and b/desktop/resources/outside-jail/collision.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index b596dccc..1a993716 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -205,7 +205,9 @@ :background-houses {:box [84 145 126 180] :script (actions/get-script entities (actions/walk-to entities :ego [79 145] :face :right) - (actions/talk entities :ego "Those are just a bunch of townsfolk houses."))} + (actions/transition-background entities :outside-jail [159 -20]) + (actions/walk-straight-to entities :ego [159 20])) + :cursor :right} :mid-house {:box [217 125 250 180] :script (actions/get-script entities (actions/do-dialogue entities diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj new file mode 100644 index 00000000..f4cb0966 --- /dev/null +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -0,0 +1,27 @@ +(ns advent.screens.rooms.outside-jail + (: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-2 + :interactions {:down-dir {:box [30 0 227 20] + :script (actions/get-script entities + (actions/walk-to entities :ego [159 5]) + (actions/walk-straight-to entities :ego [159 -20]) + (actions/transition-background entities :inside-castle [79 145] + ) + (actions/walk-to entities :ego [159 74])) + :cursor :down}} + :layers [(assoc (texture "outside-jail/background.png") :x 0 :y 0 :baseline 0)] + :entities {} + :collision "outside-jail/collision.png" + :scale-fn (utils/scaler-fn-with-baseline 40 0.001 1.3) + :start-pos [145 15])) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index bbafefaa..00b8021c 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -18,6 +18,7 @@ [advent.screens.rooms.inside-house :as rooms.inside-house] [advent.screens.rooms.inside-castle :as rooms.inside-castle] [advent.screens.rooms.inside-jail :as rooms.inside-jail] + [advent.screens.rooms.outside-jail :as rooms.outside-jail] [advent.screens.rooms.inside-cafeteria :as rooms.inside-cafeteria] [advent.screens.rooms.inside-antique :as rooms.inside-antique] [advent.screens.rooms.behind-house :as rooms.behind-house] @@ -307,6 +308,7 @@ :inside-cafeteria (rooms.inside-cafeteria/make screen) :inside-antique (rooms.inside-antique/make screen) :inside-jail (rooms.inside-jail/make screen) + :outside-jail (rooms.outside-jail/make screen) :outside-castle (rooms.outside-castle/make screen)} entities {:rooms rooms :musics {:object nil