From a0846f3618eedb79d1487a5376cfc2702dfcd571 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 8 Nov 2015 09:12:19 -0800 Subject: [PATCH] new cursors and tweaks for chapter save. --- desktop/resources/cursor_light.png | Bin 5913 -> 5185 bytes desktop/src-common/advent/utils.clj | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/desktop/resources/cursor_light.png b/desktop/resources/cursor_light.png index eede0d201e97f6476272b026aba6d514203f4528..d59f07e823b7b6902a8015f2b51e9b6f383d042f 100644 GIT binary patch literal 5185 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 A$p8QV literal 5913 zcmZ{Ic|6qL_y2j#j4j(BYpUrj6e(*-Vl0JsNRf9^mMoDy#?HJ-LiUoqsL0NsvNJ{6 zBSKP4mdL(^Ec5!#=g;3Czx%k4yFKnXk8{s?-gC~qF=nO)yxSzU0RXR&q5fF_0&56F zPCTn^xv+H<06*cXr)TEs-~gZ=AAjzL*MP-#?HI3%c_P}ml?i;pu@&dct?PD3l(n-P z-Oc~4D^d6Ht6bh&il>Bm-{I%o9_Mmaa9%uXc(jURS5ly^1W(&a)eQ2~$XrLbXK&td zzi(uhyDK+}y~``i8!oliCRb38jt6MXeO4pC{x5SR-ALSSaPg8_PI6*Sdg?LDJzO0+ zvdiRxCn2Ww7Z2hNwnrNDw%YD_F?fXI+Z5(Yu`DXU?|q=_{@?MiT??*gO3|@$e$wE{ zzw`TtbiOZW4(~iD6Mf!3Fm>cWtBT}qes%N7eV0>X^ZK624NJFesVMz*=UI}x@l5Kp z!lXp~hu|~*Gnw{X=j%_KVI68-hc7GyFZ^EoC6hSZkl14r@cIjpTJBb7)OJX!`PZ7b z3{`lcsr{mKeBdGSVn$|2-pjvlkBCf}&yfaWYOk(E7MV4>d`yw4^|%)FNvrr)wp;y? z+s7kB1%`^db(6=X$oHImOKqb=rs69*TNGy%jDKAS7nyo2J!{}S)ZP9*I)q4__%=!C zusZ+5*=CFxDW71==S%EWsJ0l@iqUV%Z70w66|~nX9A%8`xn`|=NhM*sF7u89dv$bO z@{*@s+0E=7nOX0BwMVs{$vy1&QeK?u)U;DSR4hSSHP^0{XIA4p4N)#kisEVB>3zl= zk2g*+`*Jo#ET+Jo&uJ!T3~lvkOXn@^%TPP%+VN9h_NHW(pHSrV>v7WlJ9>`kaj5a& zUa#cVy|G;a*Sx!*OU8Cw{?Wg@q@~&^Ke998L*0Xuw%g}QL%KREsLQJ&ZX3zjuJSp7 z9Q0Pcr|I~G^@@XAH2K9!-GhxG)l-v##+pSfMFT~DzHFN%uQ%}!IrFzAU3wTpD;Xs`z1@&qV zrk-2ZsauBj17G;6tvr?5veSjTNwFcX1bhr7uhiblspX(Z)s8yZW-|pw*Fo`u*?>H~!p>XNJ8|0mIcf$VK(sBi|$EKb_ti zj?7=(SY4oA5^v1%RLkO@Z=PHu*o}-hFXfCm`;MGiZejO+yD4e~K7lFQTI5()pX6Y8 z)&w9}1^~SYu+CaSCjcml0F!nA8tDL{-r4nMGy!nNX2upLtgNi;BI+EcrfOt>g$&2)m4+>Me%3V#nH58n$^r7tkO4Pg8rzhtE(vX_MJpD)!((NCe#1= z<=7_dXA`X;|ITW$SA?Hi1jW52H9WP#7(pYSp-n?z;sd-uL^YZDnp3aV#&}$fml}7F|WdUx#-&s?0 z__a0RN}i}s?`)&fhktGL_iy#z9;Ocu)0<{je-3QS&i-6o*jO6)#a5gY!6HH~pEA&I zz3q~q%bIZb8JV2m7~ni56zjDf?su-K8w6mGqOoJTXyJ3d{fd zKKN7J+%c8+cg`>BHFF>Ho%=BT>BH=*Z^!Y~gATScOl7)oDksnJg>y0`dWe)oZ$v?~;I^ScMjE;T&2+R(1=9ME49NmH=( z%(0LYW}e;g)Bb>UXiaHPS#j|@12pq0u~io6GF{Fo-+pqH8#|w}ukoAeE#sc4`oxZg zH4Ts>o4TLR4~+i3x(KB9Z=+X3LOeq3y=;;mkr~9n0;Rxpy z?t7ZlJeLq|Fd7xgfA*1qIa}SnkdScAO0D;p{?zoM@-IMt~Rmu=r9+L+rgi@}ujbk$aKDSM7at zz#FqBs7Ig8pUg~~xGq}5wKep2@jW{zNAc}^$It^3{&n->J1=!yu!j!tvP}i z)JvBJhP;~ILTK{c14cu?NU!$ga=g+kX)Y+ZqAg4Q{!hfRHW3vUAcu~d28&blw!@^* zpFajUrKJ_4O`we=_$&xFE~+&z7y`>w2j%`wSS>9SGo4VI z=4f2mTxyBZqMOS`aFI3>$6KBf44W9lTnbGX4=IH@*xX<|bnYQnFKT
    *}1=k4L; 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 W|35)&NjA%o02rMx)i2kzyYYW@DbYm$ diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 854a415f..a5f7d9ac 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -83,7 +83,9 @@ chapters (if (.contains prefs "chapters") (edn/read-string (.getString prefs "chapters")) saves/chapters) - chapters (assoc chapters chapter {:state (entities :state)})] + chapters (assoc chapters chapter {:state (assoc (entities :state) + :x (get-in entities [:room :entities :ego :x]) + :y (get-in entities [:room :entities :ego :y]))})] (.putString prefs "chapters" (pr-str chapters)) (.flush prefs)))