From 2b20ae66854c8603477e3d437998ebe945ded4ee Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 26 Jul 2015 21:08:58 -0700 Subject: [PATCH] bendable bars. --- desktop/gametodos.txt | 1 - .../resources/outside-jail/bent-bar-window.png | Bin 0 -> 1292 bytes .../advent/screens/rooms/outside_jail.clj | 8 ++++++-- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 desktop/resources/outside-jail/bent-bar-window.png 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 0000000000000000000000000000000000000000..199eac7bc8d6597daf697f166e7fd35e4ab63528 GIT binary patch literal 1292 zcmeAS@N?(olHy`uVBq!ia0vp^fv4 zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL` zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTcwn`Gu2HtFfvpyx70H< zH8nRk(orxnFf`FOFw{3R)-|-WGBL3-Fi?O3C7^9ZDQQ+gE^bh}fIM5JjFOT9D}DX) z@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal z@=Hr>m4GgVcp3AFK49ejWX~~~>Bo|(0&Ne9S$!1EKD>Ns+xFAC?@#)n^x&L) z(ad`XS;fS+Kb-RWxN1WtN7bwY&rJoYi%;`}IA7pZxTYo-DOv~Ao zJ7O4(MPlc5HgYv|UWquUcFra5mck363AyU?_p>E$;#FKCIpt2FRFk*yuGJSl3m?3p zc+5M3cjl%w^A~ha;5}}jqP|LCy<^2;mPn>F0Yio*{P{ByihZNY^_)XrrfiVua4Y2W zU|7-+ab02e9J5OHyQU}NoTf1|7JCNzI49H{Vc)PaQBm#7#+!X1QbwB^R&`&MHcK{T zcvh2=uOPbkLmJ!T7EA8`!UcB9RS^rA8yJ`w!tSqsvv%@~FQD?t)78&qol`;+0L)Rf Az5oCK literal 0 HcmV?d00001 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 )))))))