From 6f19fc4a833d52c8bc76d73c96fb76308acb83af Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@brycecovertoperations.com>
Date: Sun, 26 Jul 2015 16:55:41 -0700
Subject: [PATCH] antique layer.

---
 desktop/resources/inside-antique/desk.png        | Bin 0 -> 2987 bytes
 .../advent/screens/rooms/inside_antique.clj      |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 desktop/resources/inside-antique/desk.png

diff --git a/desktop/resources/inside-antique/desk.png b/desktop/resources/inside-antique/desk.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd012de8b52ad75c1ad50a815687a016309c8c65
GIT binary patch
literal 2987
zcmb_edpuO@8eS%()XpVJH_ISo#>^VVSi@8p#5T&UoMdavEKJPB%rN6pY!&6cPrK}*
zY;~H_IY%nxGDM`&>DZa<D3sEc<X*y|bk<Zl=a0_*<FwZw-}=69z3=lr@AJOz@3#(b
z^YK`^c-3M60G4`gq5A=V+Gcb=rlpClG5Fdj^kpP=3ljVD!^IM&5CNRo{4fOc<T4`=
zKZMDSkGYLF0l)$&Cm={1#PFuF_*@&N%Em^@6`<Y#;Iv69V6vhRF&KtKaCkKAsJspf
za@aKN4l;wt5V#_doGl4L#6Q6&fRzx%g4x(j8$l;26$RiTVkRi%M)O2eDGmDpmx}IH
z*90v1!9*NI!+s<c#MlP9@`VUUwjtwLL=ps2U>k@`rcg*YkVJ&+2t<eg+2SFXYG+3!
z62VUo7L6ukhg1FN?w?|zCmJ?VEEZ4+1c^jqBeAvN3nK^+48sH>i9jOZQ472%o+oBX
z@jQ{~JOUjNv4k9fn8W9RDnw=&KUPe`qD()gz!fkUpMiOzPeP%R5u{830kR<yxLj3U
zAFM@UKjc3&zGy89h!-FPKSacj6|&HJgqzMgquTv`AeAA?hPqYAL5sqSrt?{`T!bg~
zq|>nI7aKN*jY@=&5twa{hlt_!csmwM#yha>VLSzfi4=rPazKdo^EhAfw{vlDcP9~T
zNv;qHg51b3o$l`7Y!AE8T}VU+3N-KQ$rFj0JQgw^n}f#w<V*TpU#hDRVT$>}06sr@
zz6-WR^2K~nBwql!x_+oSXvtu*I6T#*m8wu5^QI$0P8`B^7xKB_2c@Z;FR(yZBnMjv
zf$=b#Xp6UF6Ulg(L=3~Tm@JAN<iHGLhf}bh{MrAnf&`QlLDeq*)jsoAXiuuPpN9cG
zd>$u+ht7}?9Tt(I-5LNE-u9$B2S_`I9<^kwaRchd*WOMaYS6<#X>@gcOjX80!i*+-
zc=QL4aoWuz{GV4W>kZ7K>*!-OU9`+rE-DW$2sqE3JyU%yQ5N-lYCqEPXk_@3?dzTk
zBd3lB1_mw!W+Tm0QUHt=_|*%TGKu+m6cvp>fD8(QvHW8boBfR@-~F%aH6qi*s%}Kh
zw7zNP<&~}9oT{0gdXgS$+-XESB8s~qY%!`kQor4#j9+o(as`C>%S4GVw(mv5KnKKQ
z^pbo#E}J(&^xA=0;}A#5SpTz*g+1@y%3DoS9PI;3@1-!-*3TrEtasM(D$gz}Zz{D;
z8NZhN`W@fp5O8c`XQuBS?I4<%Gjy-0Pm?%3(f;)KbgYrytwagGsLJ#j*VH}wg%CdA
z3s_ku!7+EpW~m|Hw><Lcs^(M*T^(2WhpVxjl~EaYe-bcsuM`f)xh3ROPG-Nom1S7a
zuIsMG4(}kWP1}0EB`QDB^b$|~S-Jf>>(%=8*Pdm-CWAZeYZ(lMamRg1U@2cdHw_=R
zmtR>7+NzKJbCY+lmLlgznN~#4HF<;KzIMa0nep4D!{u&{lw*4b`#0tsDDy5|fV;V0
zv9%z%Rp(Z>WgNa^g~Ft*>$)<GCUtG>w(}a&-c>!6_uy>Z;BbPh5z~CS!9f`rb5e;|
z-MhmQHl|w<gHJ5ZH8|Jm?}qnbv~hSnSJSH$OV0?RNi%(Oca+H>Z!+u8BEsJn?W=y@
zG0=apu97)po${kzy=-Nv?aXQtV{Kx~(_dd!oEa`_=&#u5q%U7@lF~CbO-wS}tj2DG
zvUD?-^_HH$x^7dnR_}v|!`=q6Lf`(N5a&C(4bzhv8@5l4Jl;38R}GiXO3{d)80xz)
zFf^7|Pd*5RyuWec`v-K(E|>Q5caSo(II1)5U6ryoLcLj&9J2gTT%q-j(9IIx2ccXA
zu`6fCEoD(+u`Z}hCZ=8V*=S>r4-H%1rcdi~YTp9aVC{CRH-A_CfO6tx0qLUcn_r-&
z$kHgUOu(<Q%Cx*>`2Lw+#kVApm1(D#KFL#eR`5${PEOP{6LO+PxTd6ZUGC1&+im^l
zjA!@w6W$yI{9JS<9n#<%-|mkW-!St8toBfy>;&>8Bkzu;wwR2rvsAvBWy(;tPNNKL
zXZ@g`%k>UP_eL5o)iT~DtLC}+6)O3_DstMzS@+PG3B&x%2u|CZhN%XRcapxsn=6H<
z8_jJoTD3O@Gj>w@mV{O?oaOrzve3VoWD_vWnEN&&qg@9e3!mqDu5GckJqqJpGojJ5
zIsJWwFG~2M<FAvmFdBIc(ZAiEfh}~>aQ>mZ)t5?o(xMcja>^p`AY5nNHeh1HU3KZO
z5vH=v|7mvaw5+@RrxH<CVaWze^W%Y4YN^1;!^pDAu5Mf5;B5RFH7Y9;7?C*>dO}`i
zf=l++^;*el25;q);$@OzQ@M41uE$0BgzxTO<jn`aWu7>e+oP?pp3O0ja~saBE2_F;
zq;|Pdsq~!g?9HFU?K^4Hb(L3C__H_kO550EBje(Y70K%s9Cg1iM@@zDs!UrF=!1g=
z+qFTBtZyWJxUp7l%bUlIA`fFVb)C(!wMz{p1r}6YW_1QYO7N-~j$q*4;L4`d4L2{&
z?yMf<MJ<02Yv^$5d?Z!7P-IBKb;M;6BHj(=uQA3wx^Q7bVzCZd)4OxIvEuQTqrOl7
zWFX2>XGvdLINlpQ7vuF_K5)PzVX|^q-79!V7}{XHxBF(qNvDM824^+$PHI2t?!;6M
z4ClbllJx2%{!BGofp#(ctm&^ES3CrZMw^t9)jpH1hjs<7HgMFmOes5MUZd+<vvgdf
zmCQIg=PR9Ce@F`qE~l=XPI_`S2UD^3dfJoNVUc>ChTGWg5uK4Rb;r{k6X|CuNjdKq
zfwqV9gTzkF_IeGeXYA?bNti7UO&hK+oP1FkEi`lRZIyK<pSDQBG0j%4S+-2MCj*rE
z?zBh?KGd~S=?Xj?R`xytpWhTX7wgm1^Wsx0TU!^c!!)y%=MAL=yY;?X!Ynovx9%ms
zVm*4ZqgOE`;oa5HL?s4PI)B}wR=(ov0OlF|4<7#*F9H?-JC7X~zcMhiQ2jo8y7|yc
IU3RDb8^UK}z5oCK

literal 0
HcmV?d00001

diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj
index eb197419..071baefd 100644
--- a/desktop/src-common/advent/screens/rooms/inside_antique.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj
@@ -167,6 +167,7 @@
                                                                          :ego "He's the town of Remington's mascot."))}
                  }
                 :layers [(assoc (texture "inside-antique/background.png") :x 0 :y 0 :baseline 0)
+                         (assoc (texture "inside-antique/desk.png") :x 0 :y 0 :baseline 113)
                          (assoc (texture "inside-antique/fg.png") :x 0 :y 0 :baseline 320 :parallax 1.5)
                          (assoc (texture "inside-antique/glow.png") :x 0 :y 0 :baseline 240 :additive? true :opacity 0.3)]
                 :entities {:shopkeep (actions/start-animation screen (assoc (animation->texture screen shopkeep-stand) :x 148 :y 122 :baseline 112