diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 265363b3..642dea6c 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -17,4 +17,3 @@ + wrong timing for potions + secret lever + shopkeep sigh -+ bent bars outside diff --git a/desktop/resources/outside-jail/bent-bar-window.png b/desktop/resources/outside-jail/bent-bar-window.png new file mode 100644 index 00000000..199eac7b Binary files /dev/null and b/desktop/resources/outside-jail/bent-bar-window.png differ diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 9c443821..cd502b05 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -196,11 +196,15 @@ :x 172 :y 140 :baseline 114) - :axe (assoc (texture "outside-jail/axe.png") :x 213 :y 63 :baseline 176 :night-profile :sprite)} + :axe (assoc (texture "outside-jail/axe.png") :x 213 :y 63 :baseline 176 :night-profile :sprite) + :bent-bar-window (assoc (texture "outside-jail/bent-bar-window.png") + :x 69 :y (- 240 63) :baseline 2)} :fountain-sound {:sound (sound "outside-jail/fountain-2.ogg") :id nil} + + :guard (rooms/make-entity :guard (assoc (animation->texture screen guard-stand) :x 70 :y 55 :baseline 185 @@ -251,4 +255,4 @@ entities) (if (get-in entities [:state :dropped-ball?]) (update-in entities [:room :entities :guard] #(actions/start-animation % :sleep)) - entities)))))) + (update-in entities [:room :entities] dissoc :bent-bar-window )))))))