From 3364d2febbb87b846c25751db36be3364d168548 Mon Sep 17 00:00:00 2001 From: Remington Covert Date: Sat, 13 Dec 2014 13:48:56 -0800 Subject: [PATCH] more progress on detail. --- desktop/resources/ego/squat.png | Bin 2199 -> 2513 bytes desktop/resources/ego/squat.pxa/4.pxi | Bin 0 -> 264078 bytes desktop/resources/ego/squat.pxa/CelData.plist | 4 +++ .../resources/inside-house/inputed-key.png | Bin 0 -> 1169 bytes desktop/src-common/advent/screens/safe.clj | 24 ++++++++++++------ desktop/src-common/advent/screens/scene.clj | 4 +-- 6 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 desktop/resources/ego/squat.pxa/4.pxi create mode 100644 desktop/resources/inside-house/inputed-key.png diff --git a/desktop/resources/ego/squat.png b/desktop/resources/ego/squat.png index d19f6a8dda68be83611d9595eab9a70168dda581..e6934087b58ecb6695f561f7ecd354957a486a49 100644 GIT binary patch delta 1460 zcmV;l1xxyu5z!MNiBL{Q4GJ0x0000DNk~Le000150000a2nGNE011FCv#}vE1b+o+ zNklNP-&H|gk7TchoZ6@C8Aj&&)oZ*bMMT&tJHm|O$IKVT7Ouo&6(Bqtm=KH*ZuaifZQVohkQa3eUPx3i+-p} zbS#L2MKlNinaf{jRg% zk5|HQPv1Go`GxgrcUV%qK^llgklOqDQ>wmkL3lo@sbh-~V>y%!_kUW##NdLz3C|X-P5?_W37^0}SktG*U}D z4D)8<`OJci1Y?Xk>{2Qz7_}h7>rW4;J0pF8&+QZ6D_m(sC#)QVBr#EJ(_oniI}n6s zNf@6y*kKS90rdblLOK8L3jKBP^{q{l~E`K}(N%jNJE>XB3 zwCPUFpCTs=%Wj%>T@#DeR}7*VgmVuSiAn~!yqaJ8$~e>MA8w17u$CRYv1^y4yL_EQ zgSd5*ztjAIa9r~bo(uDt*e_bbuu~!O_(&vS)WMmhH@|Ky{W9>EdVJ2500(`@v97NRr_IqCxQa-S4R7pYGKfwx^1>Qf5H5Zqi5}>EEbs?G zc}NiwhF!$M0VmMeM;o=vB8k59aOL3#FcJhktrRU`a{VM&+Nk5<%?CJa7SXPwp_+;= zLc+qNkxaDmL4Pl~yW#Yws58N z3DdHp*RW^lAYmw@!c0AYS@J=|xKzkAbN5#@SCB3;#dzuD>_F*mg9%Fmr0j8 z$)R6di-c|7_q^d!&734q5>9MIOQ34?tmH)9m(>EI(^fVy<(z0slQ_os;EZcUb7E+- zEJ(&vC*kZTwJuVUVqD{CamIz{w3BizjJ7CG4QCNB5I46?T$jN4nXIvgQd0=2ZdEszv_uDaI;6L5Q(*BlO${PRx O00{s|MNUMnLSTZGhs4PM delta 1143 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 Th+CX<=Pmp7wd>a2{__6-{Oaer literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/squat.pxa/CelData.plist b/desktop/resources/ego/squat.pxa/CelData.plist index f0b74d60..1ff35422 100644 --- a/desktop/resources/ego/squat.pxa/CelData.plist +++ b/desktop/resources/ego/squat.pxa/CelData.plist @@ -18,5 +18,9 @@ duration 1 + + duration + 1 + diff --git a/desktop/resources/inside-house/inputed-key.png b/desktop/resources/inside-house/inputed-key.png new file mode 100644 index 0000000000000000000000000000000000000000..875e09e2694174344671da5d39b147cd139f0d91 GIT binary patch literal 1169 zcmV;C1aA9@P)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~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@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER0000eNkl @(resolve 'advent.screens.scene/scene) :entities diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 73075c25..a5b1a66e 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -99,9 +99,9 @@ (texture (aget stand-sheet 0 i)))) talk-anim (animation 0.2 (for [i (range 8)] (texture (aget talk-sheet 0 i)))) - start-squat (animation 0.05 (for [i [0 1 2 3]] + start-squat (animation 0.05 (for [i [0 1 2 3 4]] (texture (aget squat-sheet 0 i)))) - end-squat (animation 0.05 (for [i [3 2 1 0]] + end-squat (animation 0.05 (for [i [4 3 2 1 0]] (texture (aget squat-sheet 0 i)))) squat-anim (animation 0.05 (for [i [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 2 1] ] (texture (aget squat-sheet 0 i))))