From 8e0fd913a2b5a6efac9743a7bfc80e93efb30020 Mon Sep 17 00:00:00 2001
From: Remington Covert <bryce@brycecovertoperations.com>
Date: Sun, 9 Nov 2014 18:58:01 -0800
Subject: [PATCH] animation

---
 desktop/resources/inside-house/safe-lock.png     | Bin 0 -> 1339 bytes
 .../advent/screens/rooms/inside_house.clj        |   8 +++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 desktop/resources/inside-house/safe-lock.png

diff --git a/desktop/resources/inside-house/safe-lock.png b/desktop/resources/inside-house/safe-lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a94bc3dc243ecc1d3c27c0144032a910f093b61
GIT binary patch
literal 1339
zcmV-B1;qM^P)<h;3K|Lk000e1NJLTq0071S0006A1^@s61LC9q000CeX+uL$Nkc;*
zP;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH
z<T^KrsT&8|>9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK
zVkc9?T=n|PIo~<wJLg{8L_J?=wVD}Kh?c9aozEndlcyGxo=u9<v(!ri)T`-EEs@L3
z5-!0N_s;9#9f}Cc?UC;OPWB_edW+oAi6T$HZWSGU8TbrQ%+zbPOBBBc`}k?M2Hf);
z@Y6N~0;>X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm
zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1
zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni
zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX<gx$-tTA9oOBadXir_JPm2Y^4ct-PoO&C)tI
zGolvqOIK@duBk!Vu9{g<3;i;gJ6?~-DQ&xz!jvD&4!U-s8Os(*#?k2}f30SEXA#=i
z1-qUX+K`{!((H5w7<t$~ygD!D1{~X6)KX%$qrgY#L_{M_7A<1csY*MfP@XcB#Jxr~
zJS8&7goVS)VKE|4(h_Xlc{z{c$ApZs7riZ_QKdV_uW-M~u~<J-*#Z0?VzcZp8)p-w
zus7J7><CN2I>8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS
zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#<s%v*srlI
z{B2SKJ79W>mZ8e<cESmGBON_l0n;T7>u=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7
zqW-CFs9&fT)ZaU5gc&=gBz-D<EBz>aCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E
zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaE<h}6h3HHql{T;m+bPBU-O|^S1
z@dOw&4<!bj2G_<^#e}PL7FpY$lcrKO$i~?8Bd2y;oaL5^csibnCrF9!i%-PI;xhub
zp1k;8_$IKX1NHus6EHeD;B72SCCD@4ojP$=Mf3`Eo6yZ&eg@wTqDiZE);7u&SJ|(s
zuPF(9%D6IJ)klXF%`_Fy<tR3HxV^%Qqa?nAB97=m-uu2qcHInZ?ps8M|H3=#R%lzO
z6MgLv^}ib0hVV{&<};#;2lcwW;^(7C<OY#bI<VjS9qCKr-E_Cnc!2j+&nHAXA2%BR
zt~VMxUn2h&(Pi^LSpac(Y#S>R0002eNkl<ZI1%lWF$%&!5Jg9@35ZoJypMNC5G>Pr
z7_T7MdI9f~A}Irw>KA?-XJ<BumEbg+`TsFHlii)wRdbU}bbTwUaxK@xQHuTUjig3~
zCUxdmJx%-gwsoveW^uYCy=WG7z#weT<TMj;mhm``v0TJxF2|6YV!#dC%{V*qf24n)
zS)NnTD07pCDKD75;MAU%@bPHqQAaUqIIyC8<<Umq5xR!QvaaWSs!i>MdcVR9(vIUt
xJ?jS+F+7K8cI|tN^)2K1nu&ZeIUmfoaR)_3c%E0D$cz90002ovPDHLkV1i+=i1z>h

literal 0
HcmV?d00001

diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj
index 3d46942d..c39592b6 100644
--- a/desktop/src-common/advent/screens/rooms/inside_house.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_house.clj
@@ -27,7 +27,10 @@
         wizard-stand (animation 0.2 (for [i (flatten [(repeat 10 0) 1])]
                                       (aget wizard-sheet 0 i)))
         wizard-talk (animation 0.2 (for [i [0 2 0 2 1 2 0 3 0 2 0 1 0 2]]
-                                     (aget wizard-sheet 0 i)))]
+                                     (aget wizard-sheet 0 i)))
+        safelock-sheet (texture! (texture "inside-house/safe-lock.png") :split 9 2)
+        safe-lock (animation 0.1 (for [i (flatten [(repeat 20 0) 1 2 1 2 1 2 1 2 1 2 1 1 2 1 2 1 2 1 2 1 2 1 (range 3 20) 20 20 20 20 21 21 21 21 21 20 20 21 21 21 21 21 20 20 20 ])]
+                                   (aget safelock-sheet 0 i)))]
     (rooms/make :music :inside-fangald
                 :interactions {:down-dir {:box [151 0 320 20]
                                           :script (actions/get-script entities
@@ -55,6 +58,9 @@
                                                                           :facing :left
                                                                           :script (actions/get-script entities (do-wizard-dialogue entities)))
                                                             :stand)
+                           :safe-lock (actions/start-animation screen (assoc (animation->texture screen safe-lock) :x 51 :y 95 :baseline 145 
+                                                                             :stand safe-lock)
+                                                            :stand)
                            :flask (assoc (texture "inside-house/flask.png")
                                     :x 265 :y 80 :baseline 240
                                     :script (actions/get-script entities