From ff8149fabb4b4f9272547b1534c69b9454afa5e8 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 5 Aug 2015 08:30:42 -0700 Subject: [PATCH] minor improvements. --- desktop/resources/inside-jail/warden.png | Bin 3519 -> 4117 bytes .../resources/inside-jail/warden.pxa/0.pxi | Bin 264076 -> 264100 bytes .../resources/inside-jail/warden.pxa/1.pxi | Bin 264076 -> 264100 bytes .../resources/inside-jail/warden.pxa/2.pxi | Bin 264076 -> 264100 bytes .../resources/inside-jail/warden.pxa/3.pxi | Bin 264076 -> 264100 bytes .../inside-jail/warden.pxa/CelData.plist | 8 ++++++++ desktop/src-common/advent/actions.clj | 10 +++++++--- .../advent/screens/rooms/inside_jail.clj | 16 ++++++++++++---- 8 files changed, 27 insertions(+), 7 deletions(-) diff --git a/desktop/resources/inside-jail/warden.png b/desktop/resources/inside-jail/warden.png index 4426e184a748544890e29e861e4779d936f7fe1c..287ee90d1096d45494282e9467ac6fcc69469845 100644 GIT binary patch literal 4117 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 diff --git a/desktop/resources/inside-jail/warden.pxa/0.pxi b/desktop/resources/inside-jail/warden.pxa/0.pxi index cac1a42bb1cdea0984f6439837a289ead7045aee..cd4d66ba2fdbce8a8c650f0ccc528f90fce27434 100644 GIT binary patch delta 1113 zcmYk)duS9_6u{w`IY$j0ZY37L`_YM8{@9oJnEXR ztH$`KiOCxEVjk6O*C=Ww*2h9=i?p>+v_ez_5fz~nsaEU@6}0vj6N>}iJ!kIB+;h)m z8k^mTW_S8W>ni+J)gI3^+Yuc!`13?8eX2br_D<%oP)%*Le(R^Z_aA8c>|kugLYcfN zJ9fO?o>T9&w|nhAPSR^j;cDq_+mSrvm*>)-trc5M!vqipRbG=gZw`OO`Gw4VRX@7h1X6Ut1dLJ=|@2RkNeTmSvTp8gedF`U3j^x!Pc<2(F-AJK~&xPxEt01xp9f8uZagJ+gyt7S#)6q2EEVK_!$ zBr-4>naDym-o#s&iCLJ9xtNFfcprIKgvH2*4@D@k)GkL58&HoHE2?%YNe8;ngEROV z-{L$j;3n?iH~fVsmO2&$smQ=|5!^9LMqJdH$nyEZvf75EXI6^`Z^ZghoQuZk&xq?F-jxtKFj2-EM2k+EPU+ zYaM;)Qo1xH2;$fXBCa=rI2sX>CXP2ENRfyL^x0(BrK?uB zJmsmWZMq?(Q>b7mCy3i2nr z^NL&*1@4DOj+!r&8Xj1pY1%S)P=y)<(SR_HparcsjuSYA(>RZ7xQ?5+jR$y&cD%w{ zyu$}{;1fRMo2KcaX#qW+&<#D%6N%`9BqXCB24NV+APr+N9_g5b$;d<&?3j+3n2q^Z zfILmg6mYPP=i`wLpq!Y10|I z7`48-HMX&HhrXuGvMRpld@L}g$fo|YIjD}o5EVg0eBoYfg0B14RxfBGCaX?xwX`POd)hwRYv!rWw2cX!iGMA1EC@y;3wbDn59<*^9qO?G6m=--#6eAGFHDS~ z9i2$x5YqS-9Kzuc&JXwzKjT+i#a-ODR2*br5?;m}EWsMoVh8qs8bS@}#y)(FZxFl4 za2a$a|5&P{kO?-^>6nMN@d1`&9jXujT`FB_1kKnDy3!7Co0`I590yG)x2ZIvKj9i~ XSo)IQ;%DGdduX-}49`Q8>h1pl9C!fE delta 1122 zcmYk)eN0Vp9LMo<&hMv2mu?cHshKga$SFzy)LKakr4-K2DH4=%17Ng`dh z(!upqv@}|phdaY84}Y*R(ahLv9{w@IJZxsh^}ZGQZLf1a=lk35e9!NEWR|Y!W z;-1hQZjl%nDh-zZPJI^9Ln@(a|4g@A^oYhvRqEx{A~ANb{C7HNOU>=i6Gz1by6xh! z(2IP+sGn#N2ED#kjENYsAkbMW;$7jzrYH6SgF}Cz$r*9w6Q z!BJdRl-s_=wRPKew?0|OQmt~QeniMvZFjZ4OvrIzZF_3=x=o=xYuMxT1^f2vky4J; z>P(?~%<#T???HpFp|MHNkTO|q)+?l(ly=m=%3?J+?76MSOoNHFCr(-|)^uA@xy{*n z%JeU186%gjSe)m|%boAY$+ws1IeJf@(O*e9)w51fl=X08E2`i{GyFJ>HngJy=g^5R zT*6KC;5P2!5uV{C-rzkx;1fRME56~UqNqYqJZd;$I3h3-QHVwi#$i0-F$IZ8Mha3f z3-d4^>BxW?i?9Ssk%`sFQKV`|5nR{>ui}wv1Hq3|=)y%@!wuZT9X!WNyu%lKM^KTP zh7pKC0?f!nF-qV>87e?ijiy>1=&3cK*~8^9j-mw}xPq(TBQ!ojyM_CBfIhs&Tl~Op zMT%&|A_)tz1_f}V76(B?K||4uv*-jH6CPeHUg4u6rHU}{G8u;y%*A4?L^e1^nTHMF rIOS$kp&IN=`oM;yAFXJ|1#qhJIv%1IPx%KJ6KFaxLO;xz7vE}1s+S|T$;8c};Lrkbta)sM?XSVcCj&tSB;&Yhd(u4lvj-QGfPezCu{xH=Z|yo{H+ zQs*t0TN*AcnHgNM%2!(&>_5gjN`Iq6fV=gu^(BX6iF205MGFcF45=s*mI5yyE@ghLU|6?}v1_yKqDD}J+791KGy zUdL3-$4XRVGj@U;LJsM|KAgZ=M80FV1v-;|EY;yi1)J#vOvigzh$5^;1^l2(rArN? u2|GYn+73=rdvF9NK~u_UD$VG(xQm}GeNFH4GjOT>e6|h_&d(>+2hRYV93M6S delta 1146 zcmY+?ZEQ?g7{Kv+?{l<^p;JwXw{Ao#>*Yg5nrLs47L}eT`k>igCJgRHi)q6%Vu|@yNw8m#LE}i?25ODY*zg*wc;edd!BpFea>^v z$vv8IHYc2!%hpr|!Zmq$y}BW4Kw5i8GV>FCLUQ^jM|Dl)n@tT(JHOq3pf%}pi=#d_ zc|4_OHn{bzZrx^BZe6}yYJERWewDrT`bTEeFHBWe|b@;Y-J$o z5A_^5YTi|9LVT&FY0DADIy4}G7Nl?lo#;Y0j^PAO;w&!X3Vy;hT*pn^!F~LNzwro< z@f6SSucqmuX>mQBU?2u#2r`j{Y>dE2e2iR7!Bk8`0SYk_MJPrI+?b2cFdwD(3T2wo z0|=rHn~>1rO5a0}!eN}m8C<|6T*lA1g*$kNCwPHAO&JCTAsdt7Mk%ULjW8mp1w{>t z8qJ`lu@5bA9{X_+?dZmN{0KH-unFTTe!*|(#XUU0OT5yQWMMS&Fb7|w0x>jUHz+6+ zlotGe6X0MHXJNUEe>A0Zq=Cg$4yIuS=3x<*fooKLtN_=k)}R56;AAQZ4y01(Ko?Gd aTU8hFJ9=<~e}FcMqHml1lf7?B-Fyv3eU6u|NK-aTk2or<(gX;MOokPJaAO{9v^h-zY+FVrwqQ|*jS7eGHO3?d@7FP5Z;Lus&|w!}rti#=uK zcKbuqQqraCq1JHX5OZ*Nd}>dBMP;aF{nqV!_BQU@A6__34O*KKKHg+bsBxH^9A=Ca zb(pGXX>?1Px}kJMiOTFuOR|(rZzxsvXkD7RtaQl?6{iCgYDlubXu+?4T%+B;V%i!v zM-TK@7g?7TTNh9Rb#RVKiEX~XWKd-${M*wRqwS@C*0-qmXs}x4RwtA?=H<@H_7(g5 z4?IQjW%|A)L#-7n^-oKZx&~HNtq!iysY=SN>UFw7NndNjMtxFAN|#NWx2$o*(quhf zNqWEg*^{@`=G%JbIVZUmFDvx>D!lG&pLdC;FjA+}M3Up`8^ZBBcJA7(Get(2T6;zM z=QK6X&2u{Z9(Sb0(V5MyvJXqQ2RZP-L1&&b+vTlvl|>?s|9QSGA$QjFfg%fEQ3 zr?SA`akx!)h-8FZhG7(<993A4252;+6>T_*V>p3RXvaBR#Wmc(Ep*^9p5rCn;R8P6 z6TaXpei()+h7mI3NV+2)z0ezdkc1SZA{`kRj*%FJF&K-9n1sogiX2SG49tWR^Wiqc zEP@ZKP=f{|B<4<%W*kI2&f+qz;3{t737+E(KI6L~mH~wxNWw7Wz=`GXqa2l335r@2 zwdz1kYd3U=VK15x!7)T}30%VB64rIx#yvd3Q@q7{LzIPX=!bzAhnZM{GHk>SP(x8e zwO~I^<2*ul86JSn)Hg$&FYf3AQ;|yp@ ecuk=hxr1kTVaNb^#m~Se=HF->>5PAa$m`#IyYU(T delta 1052 zcmYMyX-HI26u|NK-o0vz<(OEMWJDQl9}E+rBrvlXT1<*+J`^_Ulw&sLj7wupqnX-b zO{3;hr*%qf6N{Fiji~HHLD3=+1%lO=h>8}72%7#=QWt*jo)72UbI;+P^cotyhS`S7U2UYJ*7) z(}E^d6cq*oNupQi6`Mr*U}(<}2ED#iB#ZGQ6N4A5;;PW?OT`eqs$5J>m^*t$D0OUF zX!*32Axmn(ALNAwb1##d5zcjq$%5QqXN|ZonyXc*+ub5vKT{(N!E0_YsxGR;_{>%m z?a*Ioa(ZG#Wv*dVj(J6~#aZZ@Z^_@d!BJ9fFX-Chs@l5EtxpoNOslTZ+l5TfcGl_3 zgd7vuS>LeBZ4Ae05l=H0?AfcwNI6<-G=}&1p?&+k2cmsV%`JMCl(W=Uy;91F^E>>j za?D1Dtsrp7I2iHok)!4ubEd^!VQ~hI8UMw(hM4RXi>)qeL53s0&{kn}JUMYvACPj2 zXPu%b>)}KdYT-pI{5XM5bm274q8mN9gj=|cySRtPc!7Sr!FznbCw#_Ne8W#gQH7#- z)F^_X7>*H$MI7QW24gV+NtlUQNI@#nFb^5XL>5d~geAzvYOF!NB2^pgaA60$ibtwV z1b!St4=&<5ZsHbt@e=)bhcEb!kRmk=!w`=dFkv-HPzoo?Q3;A_6xA9*O|1p39zJd8 zz;T?$6)F6mdvEG8SSjir~g>8~_Cc1w|`Pp&K+NJRB?r z@KKRcMI<;(CL#stSd5j(17nm{Yyjhwn^B88(3$jshNK?>bm2Uhs=R?mc!KA=0oFK* N{$1fm_J2wF;x`g6-wOZ$ diff --git a/desktop/resources/inside-jail/warden.pxa/CelData.plist b/desktop/resources/inside-jail/warden.pxa/CelData.plist index f0b74d60..245204bc 100644 --- a/desktop/resources/inside-jail/warden.pxa/CelData.plist +++ b/desktop/resources/inside-jail/warden.pxa/CelData.plist @@ -18,5 +18,13 @@ duration 1 + + duration + 1 + + + duration + 1 + diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index cd73316e..ba21fb87 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -764,6 +764,10 @@ (defn in-love [entities] - (transition-music entities :love :duration 1.0) - (play-animation entities :ego :love) - (transition-music entities nil :duration 1.0)) + (let [seen-love (get-in @entities [:state :has-seen-love?])] + (when (or (not seen-love) + (< (rand-int 10) 3)) + (transition-music entities :love :duration 1.0) + (play-animation entities :ego :love) + (actions/update-state entities (fn [s] (assoc s :has-seen-love? true))) + (transition-music entities nil :duration 1.0)))) diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index 3d3af7dd..3a68d112 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -201,13 +201,12 @@ (aget warden-sheet 0 i))) warden-stand (animation 0.1 (for [i (flatten [(repeat 30 0) 2 (repeat 20 0) 2])] (aget warden-sheet 0 i))) - 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])] + warden-fall-asleep (animation 0.1 (for [i (flatten [(repeat 5 0) 2 2 (repeat 10 0) 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])] + warden-sleep (animation 0.25 (for [i (flatten [ 3 4 3 4 3 4 3 4 3 4 5 5 2 2 2 2 2 2])] (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] ) - ] + 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 [172 102 190 124] @@ -239,6 +238,15 @@ (actions/update-state entities #(assoc % :dropped-ball? true)) (actions/do-dialogue entities :ego "Geronimo!!" :ego "*crash*!") + (Thread/sleep 200) + (actions/begin-animation entities :warden :stand) + (Thread/sleep 300) + (actions/do-dialogue entities + :warden "Charlie, is that you chap?" + :warden "What're you doing digging through my trash can?") + (Thread/sleep 300) + (actions/play-animation entities :warden :fall-asleep :stop? false) + (actions/begin-animation entities :warden :sleep) (actions/remove-item entities :ball-n-chain)) (actions/do-dialogue entities :ego "I don't know what to do with that."))) :sword (actions/get-script entities (actions/talk entities :ego "I wouldn't want to accidentally break the Sword of Blergh."))