From eb033e01baec28fa41a0950acd1384f210f14c97 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Sun, 26 Jul 2015 20:57:15 -0700 Subject: [PATCH] jail candle. --- desktop/gametodos.txt | 1 - desktop/resources/inside-jail/candle | 218 ++++++++++++++++++ desktop/resources/inside-jail/candle.png | Bin 0 -> 1524 bytes .../resources/inside-jail/candle.pxa/0.pxi | Bin 0 -> 264078 bytes .../resources/inside-jail/candle.pxa/1.pxi | Bin 0 -> 264078 bytes .../resources/inside-jail/candle.pxa/2.pxi | Bin 0 -> 264078 bytes .../resources/inside-jail/candle.pxa/3.pxi | Bin 0 -> 264078 bytes .../inside-jail/candle.pxa/CelData.plist | 22 ++ desktop/resources/inside-jail/dot.png | Bin 0 -> 1140 bytes .../advent/screens/rooms/inside_house.clj | 8 +- .../advent/screens/rooms/inside_jail.clj | 18 +- desktop/src-common/advent/utils.clj | 8 + 12 files changed, 267 insertions(+), 8 deletions(-) create mode 100644 desktop/resources/inside-jail/candle create mode 100644 desktop/resources/inside-jail/candle.png create mode 100644 desktop/resources/inside-jail/candle.pxa/0.pxi create mode 100644 desktop/resources/inside-jail/candle.pxa/1.pxi create mode 100644 desktop/resources/inside-jail/candle.pxa/2.pxi create mode 100644 desktop/resources/inside-jail/candle.pxa/3.pxi create mode 100644 desktop/resources/inside-jail/candle.pxa/CelData.plist create mode 100644 desktop/resources/inside-jail/dot.png diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 9a74a7d1..265363b3 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -17,5 +17,4 @@ + wrong timing for potions + secret lever + shopkeep sigh -+ underground candle + bent bars outside diff --git a/desktop/resources/inside-jail/candle b/desktop/resources/inside-jail/candle new file mode 100644 index 00000000..1815c9ca --- /dev/null +++ b/desktop/resources/inside-jail/candle @@ -0,0 +1,218 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 10000.0 +lowMax: 10000.0 +- Count - +min: 0 +max: 1000 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 7 +scaling0: 0.97959185 +scaling1: 0.0 +scaling2: 0.97959185 +scaling3: 0.0 +scaling4: 1.0 +scaling5: 0.0 +scaling6: 0.0 +timelineCount: 7 +timeline0: 0.0 +timeline1: 0.13013698 +timeline2: 0.32876712 +timeline3: 0.45890412 +timeline4: 0.63013697 +timeline5: 0.74657536 +timeline6: 0.93835616 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20000.0 +highMax: 20000.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life Offset - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- X Offset - +active: true +lowMin: -2.0 +lowMax: 2.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Y Offset - +active: true +lowMin: -2.0 +lowMax: 2.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Shape - +shape: point +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 1.0 +lowMax: 1.0 +highMin: 3.0 +highMax: 8.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Velocity - +active: true +lowMin: 7.0 +lowMax: 7.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Angle - +active: true +lowMin: 180.0 +lowMax: 170.0 +highMin: -120.0 +highMax: -100.0 +relative: true +scalingCount: 10 +scaling0: 0.0 +scaling1: 0.0 +scaling2: 1.0 +scaling3: 0.08163265 +scaling4: 0.8979592 +scaling5: 0.1632653 +scaling6: 0.75510204 +scaling7: 0.24489796 +scaling8: 0.6938776 +scaling9: 0.4489796 +timelineCount: 10 +timeline0: 0.0 +timeline1: 0.001 +timeline2: 0.14383562 +timeline3: 0.30136988 +timeline4: 0.42465752 +timeline5: 0.55479455 +timeline6: 0.65068495 +timeline7: 0.7328767 +timeline8: 0.84931505 +timeline9: 1.0 +- Rotation - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 180.0 +highMax: -180.0 +relative: false +scalingCount: 2 +scaling0: 0.06122449 +scaling1: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Wind - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 2.0 +relative: false +scalingCount: 6 +scaling0: 0.0 +scaling1: 0.5510204 +scaling2: 0.2244898 +scaling3: 0.14285715 +scaling4: 0.46938777 +scaling5: 0.2857143 +timelineCount: 6 +timeline0: 0.0 +timeline1: 0.14383562 +timeline2: 0.34246576 +timeline3: 0.45890412 +timeline4: 0.70547944 +timeline5: 0.9589041 +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.8156863 +colors1: 0.8117647 +colors2: 0.7372549 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 0.14035088 +scaling2: 0.0877193 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.23972602 +timeline2: 0.65753424 +timeline3: 1.0 +- Options - +attached: false +continuous: true +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +/Users/bryce/dev/playground/advent/desktop/resources/ego/dot.png diff --git a/desktop/resources/inside-jail/candle.png b/desktop/resources/inside-jail/candle.png new file mode 100644 index 0000000000000000000000000000000000000000..1a1409ab72c791f0369c6955adbf32c05bf04da8 GIT binary patch literal 1524 zcmVX1^@s6rbej=000CeX+uL$Nkc;* zP;zf(X>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)UmlaER0004tNklYI^zu( zzc?O9S!F^4&w@NnHTS_nkPLU?4!}o@Fk`7gQ{A&vb{{PDk?Kwse4!)lCCUKH%J|d~ zlmmJeWY*Jdufa+|DO$pEJ;gCZHTS_h0CFd^H$EQUc5LJjjk zc2LuO$mTHs15zS<9p12k`4MjlbjkYwQ%5lka*&RxBV}bNnk%U3K9JEc^RArUPgLN6 z^x!T7L9(NOU-0000@$@s=2)#9K^ENRSOC@W=M~j7Ot+VrBb4zR6amVi)&vxugD%C={lc);-B|lP# z)$2QI<9*RAPu{Wj z?k{}tkuN>o*HPM0EdFxFNhi0Ta_Y>?tl4wsZYbu);u6`x;Z^0**23`3qm^W5A=%Yi z*qviXeIVW|JeK+=}Lu%s{7yb-uI=)rN^fy?7wiyMd^uYCY_be?yD7wNwsfRVW>8;VI(OGkJRGg%jfU= zU^*k6SwF?4AGv(|Lmy60N>3i2by*DXl=ReWv7FD<0&o3Lu9n+yd*_lxoqN{JZfa}t zB0zuu0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+z%e24!ocN+j){qw1OWom7I^JvH+uf3t>yp%$A*CC|Jb;X zWdoFMdu*Um;yI$Df{`qF>jqw6F6!C&;L;qIst)(74ZBw z?5#6!0!J+{`TYAofTN~#0s;*u@ZZn>wx^QpEF`<8Hg4G-SDN~8ATzJN;w`(SP4RD0dV0F> zVEf?0{7|xWc;jGPVO6=AP`-X$LZy?%oZ7wyIpJ zRm#O;Qn|Ui_ok#eS}qMGl>_;O?MeEnnETo3IRlxQR~K`&HxBpHcMfFU_A*c1^_kDs zhx@i0|KAwG;d7s#nCjF}V}x4^!{hfHCV2DugZJKdfBWJG9(-uaaHTNRJ5t_J99mt; z?b=xXaN<^Mt}peK3bo$C?qo)KUb;B#sNb81i`&;_GM!5=?mYZjzNmBQC2@nYw=Y|< zWYMw}dtxw;KDMDJ+ZD%;f4S?(Qmp;TSF=6YRk_m6Ty^}3uGg2tsk`_3WGoq4S;>zS zb|#fy?0<57rChG1&GFfOVl*pS5G{@_iY|^Wjc$pyM%8F{v^TmhdN_J4+8;d?Jsmw0 zeLZ?MdM^4_^nCQg=*Q7dqZgxJMXyG`js6h*G5T}#m*{WN-=lvuH8rEpg43d!o2z%R|w_(Ie5L(Z1-J=sVGOqZmU=jG^U6(a)n7qJz)lU2pS|FO6BjM%d|%h9i`QK7;Vai(b=og;o?=0^rm3}_wq?0>NIdyJ!-uwj%x0LeZaf;l~$ht~-XL01_v1+on znC$B-?oYOK7E1YAZSzRAI6UyiMAEkOw6r5VKRq|w{_<%Zr!U^t)3@@Cxg9(sZBOUE za%RU_OV2)M*}3N}AE=Dw3&r|)e{pwyB-vcf?@k8x7Hh?!Qj#uA7p0kW!JNbApVo1~ zdshy`VQx*vYlq(T?)Rj}rN^fy9J+ADMd^uYHl3Hw@2?k2Nv(fhakxIZWi%;{jMn4i zs}~=9e>x|f+c?CfAG&84ccUesEl=ReGsZz+-18?(izMkK5d)JC(T?aPJ zZ^^V+2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0!=IM;^5^+n|AUhPJqCy1YZBijh_Em2^vhG zc?CTG&3o_6oWN`ZUVrwcqmAd^?*Ow=G?qYf3N)VmshaZ&%$fj!nF>sO?{9qnZ>-Ps zIK~km(0l@uKmW(?08`Ju_kiZRhh|J*HUd-c0iONYC>l$kc?DKnvi4}B=Dh+lCqQ7P z0-pbw${9zX`2{@x&3_MF0fCtc+_wpz`PAG-GX?tz}Z$@T2Q?BaOMrryEqf;V3^eW*j5Hgs>> zm@k%>-H;zos>`q3dQ2pSZ0;ZE%}s8d*wQ_<`butV$F`fdZ{IO^OB^s?swdTQzMfo_ zFWfp(t?Vfe4`!FVxwW^N>@6nyrg!ex9cP;UbTGT9vEe^nmbS#7W$EeZ(jy&1OAEuv z&XKJ{afWr3Ql;8oX#Aa?m7bBFnJzh8+|_YwX?I-hz-Y0a1k>b;`o{8wII+4i(? z^_8)B!Q_sKN_S&OwX}O<*UB|h%cU*p;=%0vzF;3shL=sxFvjlP7khehll#V}_dN5_ z@%^`d>_GQB?hKmV-1^q+3>AOGm>Be;5ap(V< zLpXfqvy+!PJ=K`u&f>_#y~haNzWvC3_dn3F{K1DF-Z4@w4)={#_LPR#SM&R}Ha?xa z726wY{pDi4ued*%lb)9@Pdgj;=8@9wP1$VM%8R>>EvuJxt-K^|Q113sYgQ~L*oap4}lqlxex*%E< zogOWY&WX;CRz$0!)zKwU%)j-DXl=AE+7Mk6T^HRD^+W^F_NdU3X)Q+OXgs z&e;~{Y`Zs#bGAJkJrX?{Jr*5|o{hd0eLIRdw8b3Seh~dMdNDc@{VMuR^!MnWEt&QO z(V0@$@s=2)#9K^ENRSOC@W=M~j7Ot+VrBb4zR6amVi)&vxugD%C={lc);-B|lP# z)$2QI<9*RAPu{Wj z?k{}tkuN>o*HPM0EdFxFNhi0Ta_Y>?tl4wsZYbu);u6`x;Z^0**23`3qm^W5A=%Yi z*qviXeIVW|JeK+=}Lu%s{7yb-uI=)rN^fy?7wiyMd^uYCY_be?yD7wNwsfRVW>8;VI(OGkJRGg%jfU= zU^*k6SwF?4AGv(|Lmy60N>3i2by*DXl=ReWv7FD<0&o3Lu9n+yd*_lxoqN{JZfa}t zB0zuu0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7 z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+z%e24!ocN+j){qw1OWom7I^JvH+uf3t>yp%$A*CC|Jb;X zWdoFMdu*Um;yI$Df{`qF>jqw6F6!C&;L;qIst)(74ZBw z?5#6!0!J+{`TYAofTN~#0s;*u@ZZn>wx^QpEF`<8Hg4G-SDN~8ATzJN;w`(SP4RD0dV0F> zVEf?0{7|xWc;jGPVO6=AP`-X$LZy?%oZ7wyIpJ zRm#O;Qn|Ui_ok#eS}qMGl>_;O?MeEnnETo3IRlxQR~K`&HxBpHcMfFU_A*c1^_kDs zhx@i0|KAwG;d7s#nCjF}V}x4^!{hfHCV2DugZJKdfBWJG9(-uaaHTNRJ5t_J99mt; z?b=xXaN<^Mt}peK3bo$C?qo)KUb;B#sNb81i`&;_GM!5=?mYZjzNmBQC2@nYw=Y|< zWYMw}dtxw;KDMDJ+ZD%;f4S?(Qmp;TSF=6YRk_m6Ty^}3uGg2tsk`_3WGoq4S;>zS zb|#fy?0<57rChG1&GFfOVl*pS5G{@_iY|^Wjc$pyM%8F{v^TmhdN_J4+8;d?Jsmw0 zeLZ?MdM^4_^nCQg=*Q7dqZgxJMXyG`js6h*G5T}#m*{WN-=lvuH8rEpg43d!o2z%R|w_(Ie5L(Z1-J=sVGOqZmU=jG^U6(a)n7qJzS? zO!Mo`o-^+`@B5rNdufNpO2t~etLso}TYKiXg(6{+;C&xKz_7*Ykk)z zZolL1&wt^OFFxMiS>9DD{bJThCwH9kuG!f+bLY+9RLYOXDRM(2YbxdK#gUuFs>$wR zvZt@OH`&x#DCKLljU(0K@W9cDq;2V`X-9fqdQP_erBgdjTezjCZ~4)=?LR$jPiMb; zM#q_p&pLa_Ip;1NsEp+c#rk-Eac6!c*;vl+Oa^urYsH~blFm;Tq?vTytb^yB+HwB- zmJh^XZb`;#2j2aj_om0C$EPP8xM10Z>4|AJos-V(uNO;6t$$B(xIVgRG%1dZ*5l+W z7w-Q+IxC&sIK(9%zHH)yA4*S3Po9`_X-x2x^j*19rI4=&-p1j4J-_L;u4PNQ_HCHk zl4U4fYsATUz_ z_y0`gj3dze0`C9jzlK&oV5R~$Y^(VBf2MfG5omG&_kWXLK+`913hQ3ytHQRx~sNy7E1YAt(@PPT|YFm5y))ou(Vx^p~j!&%X&h_+d7}}8( z>M`P)Yq$0Et>0D850#SD)oOnHz%|!(5A^g+KF`k2E{xY~=pD??d;L|@hdQufUH6vt z`C@s=_4)Cny7Y?8M?_-C#{Plc+~n4YP2E#ZU(Rjr*mBd>t=k4~jsxaP^`u(P*OM#r zg&4(nSZ0J34MD?Tpn9j27!jFipOwZ!BL(u3XWQZBHAk zuZ+bDCU;C!x*J2PrJd`$mam$6T+)&*9L&z`3--}uc**n(W9;rdv8OjTxo>=W&(j|p z-+SA~_jSMR&YDhzX*;keF^*2xVQ+Ez#-}W?5-Sz3uG^YEuJO9@l z!r`-@n_TMjRAYwQiz5^F93gn?_CxpHcYnvy2OfNA+eo!I+&5a;RT^Gf&F|UV_;m78 zY;8R2FBj{5#l6X_^xSl5+S#}^50`ds$Y#5iU(|Kvv2sb*@{8jF~GWPkgES=(E`R<*(#=b8GVD-TB(Y6Wy;r52v2K>yq(gcy+ZfTHKvfe}3S} zjnzt}p0>uj{lsWav?y8{T^L;yT@u|KZI5cv-sq0#zUblTvFJebRP=Q8O!T$r+330G zo6+;p527DMKZ#z9ei^+Q{U-W-^oQtA(VwHgMt_U`+0xS59-R=)icXGBiDI6u^P&aO zY0<*y?C88`S+pWr8C@L3{97-NR!3{1b!-;KT(JsTg;*DhtbcX7otPaucO~a|A_w8l4+k8 zoe_0KS4AI + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/inside-jail/dot.png b/desktop/resources/inside-jail/dot.png new file mode 100644 index 0000000000000000000000000000000000000000..8802f8e036c6a9fb2087205859f6aff9bc78156f GIT binary patch literal 1140 zcmV-)1dIELP)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)UmlaER0000BNkl entities entities (if (actions/has-obtained? entities :flask-1) diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 1a0889c8..da118d8a 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -190,7 +190,10 @@ warden-fall-asleep (animation 0.1 (for [i (flatten [(repeat 5 0) 2 2 (repeat 10 0) 2 2 2 2 2 2 2 (repeat 10 0) 2 2 2])] (aget warden-sheet 0 i))) warden-sleep (animation 0.5 (for [i (flatten [ 3 3 2 2 2])] - (aget warden-sheet 0 i)))] + (aget warden-sheet 0 i))) + candle (utils/make-anim "inside-jail/candle.png" [20 25] 0.1 (range 4)) + candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] ) + ] (rooms/make :music :inside-antique :interactions { :lock {:box [178 102 184 124] @@ -313,6 +316,18 @@ :moveable-bars (assoc (texture "inside-jail/moveable-bars.png") :night-profile :none :x 132 :y 77 :baseline 163) + :candle (assoc (animation->texture screen candle) + :x 207 :y 118 :baseline 2 + :anim candle + :anim-start 0 + :night-profile :none) + :candle-aura (assoc (animation->texture screen candle-aura) :x 215 :y 130 :baseline 2 + :additive? true :origin-x 13 :origin-y 13 :opacity 0.5 :anim candle-aura :anim-start 0 :night-profile :none + :script (actions/get-script entities (actions/talk entities :ego "Just a candle.")) + :scripts {:default (actions/get-script entities (actions/talk entities :ego "I might catch the place on fire."))}) + :candle-smoke (doto (assoc (particle-effect "inside-jail/candle") :x 215 :y 130 + :baseline 200) + (particle-effect! :set-position 215 130)) :crowbar (assoc (texture "inside-jail/crowbar.png") :x 304 :y 65 :baseline 175 :night-profile :none @@ -332,6 +347,7 @@ :scale-fn (utils/scaler-fn-with-baseline 0 0.50 1.5) :start-pos [130 85] :apply-state (fn [_ entities] + (utils/fast-forward-particle (get-in entities [:room :entities :candle-smoke])) (as-> entities entities (if (actions/has-obtained? entities :ball-n-chain) (update-in entities [:room :entities] #(dissoc % :ball-n-chain)) diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 20c776f1..598ea935 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -253,3 +253,11 @@ 175.0))) (* (or scale 1.0)) (clamp-volume))) + +(defn fast-forward-particle [p] + (particle-effect! p :reset) + (particle-effect! p :start) + + (particle-effect! p :update 10.0) + (dotimes [_ 160] + (particle-effect! p :update 0.2)))