adding jail background.
This commit is contained in:
1
desktop/.nrepl-port
Normal file
1
desktop/.nrepl-port
Normal file
@@ -0,0 +1 @@
|
|||||||
|
2000
|
||||||
BIN
desktop/resources/outside-jail/background.png
Normal file
BIN
desktop/resources/outside-jail/background.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 36 KiB |
BIN
desktop/resources/outside-jail/collision.png
Normal file
BIN
desktop/resources/outside-jail/collision.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.6 KiB |
@@ -205,7 +205,9 @@
|
|||||||
:background-houses {:box [84 145 126 180]
|
:background-houses {:box [84 145 126 180]
|
||||||
:script (actions/get-script entities
|
:script (actions/get-script entities
|
||||||
(actions/walk-to entities :ego [79 145] :face :right)
|
(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]
|
:mid-house {:box [217 125 250 180]
|
||||||
:script (actions/get-script entities
|
:script (actions/get-script entities
|
||||||
(actions/do-dialogue entities
|
(actions/do-dialogue entities
|
||||||
|
|||||||
27
desktop/src-common/advent/screens/rooms/outside_jail.clj
Normal file
27
desktop/src-common/advent/screens/rooms/outside_jail.clj
Normal file
@@ -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]))
|
||||||
@@ -18,6 +18,7 @@
|
|||||||
[advent.screens.rooms.inside-house :as rooms.inside-house]
|
[advent.screens.rooms.inside-house :as rooms.inside-house]
|
||||||
[advent.screens.rooms.inside-castle :as rooms.inside-castle]
|
[advent.screens.rooms.inside-castle :as rooms.inside-castle]
|
||||||
[advent.screens.rooms.inside-jail :as rooms.inside-jail]
|
[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-cafeteria :as rooms.inside-cafeteria]
|
||||||
[advent.screens.rooms.inside-antique :as rooms.inside-antique]
|
[advent.screens.rooms.inside-antique :as rooms.inside-antique]
|
||||||
[advent.screens.rooms.behind-house :as rooms.behind-house]
|
[advent.screens.rooms.behind-house :as rooms.behind-house]
|
||||||
@@ -307,6 +308,7 @@
|
|||||||
:inside-cafeteria (rooms.inside-cafeteria/make screen)
|
:inside-cafeteria (rooms.inside-cafeteria/make screen)
|
||||||
:inside-antique (rooms.inside-antique/make screen)
|
:inside-antique (rooms.inside-antique/make screen)
|
||||||
:inside-jail (rooms.inside-jail/make screen)
|
:inside-jail (rooms.inside-jail/make screen)
|
||||||
|
:outside-jail (rooms.outside-jail/make screen)
|
||||||
:outside-castle (rooms.outside-castle/make screen)}
|
:outside-castle (rooms.outside-castle/make screen)}
|
||||||
entities {:rooms rooms
|
entities {:rooms rooms
|
||||||
:musics {:object nil
|
:musics {:object nil
|
||||||
|
|||||||
Reference in New Issue
Block a user