diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index da8d3692..4cabfe1c 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -19,3 +19,4 @@ + secret lever + shopkeep sigh + underground candle ++ bent bars outside diff --git a/desktop/resources/inside-castle/door.png b/desktop/resources/inside-castle/door.png new file mode 100644 index 00000000..83319940 Binary files /dev/null and b/desktop/resources/inside-castle/door.png differ diff --git a/desktop/resources/inside-castle/door.pxa/0.pxi b/desktop/resources/inside-castle/door.pxa/0.pxi new file mode 100644 index 00000000..d6043520 Binary files /dev/null and b/desktop/resources/inside-castle/door.pxa/0.pxi differ diff --git a/desktop/resources/inside-castle/door.pxa/1.pxi b/desktop/resources/inside-castle/door.pxa/1.pxi new file mode 100644 index 00000000..83225a9b Binary files /dev/null and b/desktop/resources/inside-castle/door.pxa/1.pxi differ diff --git a/desktop/resources/inside-castle/door.pxa/2.pxi b/desktop/resources/inside-castle/door.pxa/2.pxi new file mode 100644 index 00000000..008b3d99 Binary files /dev/null and b/desktop/resources/inside-castle/door.pxa/2.pxi differ diff --git a/desktop/resources/inside-castle/door.pxa/3.pxi b/desktop/resources/inside-castle/door.pxa/3.pxi new file mode 100644 index 00000000..7afce50d Binary files /dev/null and b/desktop/resources/inside-castle/door.pxa/3.pxi differ diff --git a/desktop/resources/inside-castle/door.pxa/CelData.plist b/desktop/resources/inside-castle/door.pxa/CelData.plist new file mode 100644 index 00000000..f0b74d60 --- /dev/null +++ b/desktop/resources/inside-castle/door.pxa/CelData.plist @@ -0,0 +1,22 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/title.psd b/desktop/resources/title.psd index 052be723..4c197e10 100644 Binary files a/desktop/resources/title.psd and b/desktop/resources/title.psd differ diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 2b31d620..7d1c3100 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -243,7 +243,9 @@ (aget game-player-talk-sheet 0 i))) trophy (utils/make-anim "inside-castle/trophy.png" [16 16] 0.1 (flatten [(repeat 50 0) 1 2 3 3 3 3 2 1])) pull-sword-anim (utils/make-anim "inside-castle/pull-sword.png" [95 190] 0.10 (flatten [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 2 2 2 2 2 2 3 2 3 2 3 3 2 3 2 2 3 3 2 3 2 3 2 3 2 3 2 3 2 2 3 3 3 2 3 2 3 3 2 3 2 3 2 2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 ])) - monocle (utils/make-anim "inside-castle/monocle.png" [7 7] 0.05 (flatten [(repeat 70 0) 1 2 3 3 3 2 1]))] + monocle (utils/make-anim "inside-castle/monocle.png" [7 7] 0.05 (flatten [(repeat 70 0) 1 2 3 3 3 2 1])) + door (utils/make-anim "inside-castle/door.png" [21 49] 0.15 (flatten [(range 4) 3 3 3 3 3 3 3])) + ] (rooms/make :music {:day :town-1 :night :night :sunrise :night} :interactions {:right-door {:box [286 140 306 160] @@ -266,11 +268,13 @@ :cursor :up :script (actions/get-script entities (actions/walk-to entities :ego [182 90] :face :left) - (sound! (sound "door.ogg") :play (utils/current-sound-volume)) + (actions/play-animation entities :ego :reach) (if (= :night (get-in @entities [:state :time])) (actions/talk entities :ego "It's locked.") - (do (actions/transition-background entities :inside-antique [325 -30]) + (do + (actions/play-animation entities :door :open) + (actions/transition-background entities :inside-antique [325 -30]) (actions/walk-straight-to entities :ego [235 15] :face :left) (if (get-in @entities [:state :allowed-to-keep-teddy?]) (actions/do-dialogue entities :shopkeep "Hello there, sonny." @@ -366,6 +370,12 @@ (concat p (reverse p)))) :bird-2 (utils/make-bird screen (as-> [[220 225] [195 235] [210 230] [250 225]] p (concat p (reverse p)))) + :door (assoc (animation->texture screen door) + :x 160 :y 97 :baseline 99 + :open door + :door-sound (sound "door.ogg") + :anim-sound-frames {door {1 [:door-sound 1.0]}} + ) :sword (assoc (texture "inside-castle/sword.png") :x 22 :y 110