diff --git a/desktop/resources/ending-castle/ending-castle b/desktop/resources/ending-castle/ending-castle new file mode 100644 index 00000000..47eda79c Binary files /dev/null and b/desktop/resources/ending-castle/ending-castle differ diff --git a/desktop/resources/ending-castle/ending-castle2.psd b/desktop/resources/ending-castle/ending-castle2.psd new file mode 100644 index 00000000..db0a6d8e Binary files /dev/null and b/desktop/resources/ending-castle/ending-castle2.psd differ diff --git a/desktop/resources/ending-castle/night.ogg b/desktop/resources/ending-castle/night.ogg new file mode 100644 index 00000000..8346d3bc Binary files /dev/null and b/desktop/resources/ending-castle/night.ogg differ diff --git a/desktop/resources/inside-castle/books.png b/desktop/resources/inside-castle/books.png new file mode 100644 index 00000000..cd2679c4 Binary files /dev/null and b/desktop/resources/inside-castle/books.png differ diff --git a/desktop/resources/inside-castle/bookstack.png b/desktop/resources/inside-castle/bookstack.png new file mode 100644 index 00000000..09b6dc6f Binary files /dev/null and b/desktop/resources/inside-castle/bookstack.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 bcf87fe4..f3a45d14 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -354,7 +354,8 @@ (actions/in-love entities))}} :layers {:day [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) (assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) - (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)] + (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5) + (assoc (texture "inside-castle/bookstack.png") :x 244 :y 67 :baseline 190 :origin-x 0 :origin-y 0)] :night [(assoc (texture "inside-castle/background.png") :x 0 :y 0 :baseline 0) (assoc (texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97) (assoc (texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)] @@ -427,7 +428,7 @@ (actions/play-animation entities :ego :end-squat))) :trophy (assoc (animation->texture screen trophy) - :x 233 :y 69 :baseline 191 + :x 230 :y 69 :baseline 191 :anim trophy :anim-start 0 :script (actions/get-script entities @@ -438,6 +439,11 @@ (actions/present-choices entities {:choices choices})) (actions/do-dialogue entities :ego "Can't you give me your trophy of wisdom?" :game-player "If you want my trophy, you'll have to help me with my riddles.")))) + :books (assoc (texture "inside-castle/books.png") + :x 230 :y 30 :baseline 191 + :script (actions/get-script entities + (walk-to-player entities) + (actions/talk entities :game-player "Don't touch my books!"))) :game-player (assoc (texture "inside-castle/gameplayer.png") :x 266 :y 49 :baseline 191 :talk-color (color 1.0 0.3 0.2 1.0) :script (actions/get-script entities (do-game-player-dialogue entities))