From f4dcf19b53b2fe24a53ce403aa565ddc4661696c Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 7 May 2015 22:19:23 -0700 Subject: [PATCH] progress on throwing. --- .../resources/castle-gate/throw-walkie.png | Bin 8241 -> 9524 bytes .../castle-gate/throw-walkie.pxa/2.pxi | Bin 526470 -> 526470 bytes .../castle-gate/throw-walkie.pxa/3.pxi | Bin 526470 -> 526470 bytes .../castle-gate/throw-walkie.pxa/4.pxi | Bin 526470 -> 526470 bytes .../castle-gate/throw-walkie.pxa/5.pxi | Bin 526470 -> 526470 bytes .../castle-gate/throw-walkie.pxa/6.pxi | Bin 526470 -> 526470 bytes .../castle-gate/throw-walkie.pxa/7.pxi | Bin 526470 -> 526470 bytes .../castle-gate/throw-walkie.pxa/8.pxi | Bin 526470 -> 526470 bytes desktop/settings.edn | 2 +- .../advent/screens/rooms/castle_gate.clj | 46 ++++++++++-------- .../advent/screens/rooms/inside_castle.clj | 1 + 11 files changed, 29 insertions(+), 20 deletions(-) diff --git a/desktop/resources/castle-gate/throw-walkie.png b/desktop/resources/castle-gate/throw-walkie.png index 50e84f01c89f975696dea99f17f308598e1b9d0d..563b412e93950a6754060c256a9e9bd920aa6fbb 100644 GIT binary patch delta 6628 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

)oBfHppr|8de4y00s44eGA zHA3vxGM^+T#SGffzgq~hdg=_!WnP*}PPrLcC|~$W)Mf{17I}$}ScBSN3Jlfl3yZKm Q%mDv%wT({X9k&ntAJf^2-T(jq diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/2.pxi b/desktop/resources/castle-gate/throw-walkie.pxa/2.pxi index 364324e24f8edb9b781f3a231cf37999396d91a2..3f0befa980559b4c1d76fae0907bc9b8c54a3232 100644 GIT binary patch delta 489 zcmZphsL(c1p`nGbg{g(Pg{6gc3){~p9G+&1|3P>=<5RXj%q+N>n+qAC^3y+ZuSf(<|hZx{H>_Lf-$Sq8)g;q8K~>~EN*VNy^Ha07ti z+s?8*WtNAjhtV(_pnR|*1$0R?MNt32y^HV-#N!l5V1yjpEHtBu;esPzxuPgL3sO{I eGY}M7+d=9$w*URWCcv_}mXT-W_FN_oNj3l+>81Su delta 496 zcmZphsL(c1p`nGbg{g(Pg{6gc3){~plN%U0rt|(}n3B+B*2xF)L rdjQ#CKak!06Pfdu8SWf71IaurYPTDFWMk#n+`uTZcY7`qha?*S*z%=H delta 256 zcmZphsL(c1p`nGbg{g(Pg{6gc3){m3+rJ)R`@%fAfl-8|EZE@x_Jb{K0xWPrf$blU zu>Al@3oJj|!Nvk)u)rDHZ|-4ZK^20_!5JV$94y=KZeaTZGKK}64_63hYzJ8c)B!Ra nM($u^;XpD2sNxSd&@>K^S}+UARj5Ln8yF?_ZqH@nkYob@kojXC diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/4.pxi b/desktop/resources/castle-gate/throw-walkie.pxa/4.pxi index 347741b1d27617155fb768da4db08eb428ff5140..ecf7a2d7fc231e280aacfdeec6fb1e72fcea27e1 100644 GIT binary patch delta 1036 zcmZphsL(c1p`nGbg{g(Pg{6gc3){*FZcj7C|4_Vrfe%|H^K{)9wib3Ip;Dkw0$T@M zXo3e@Ay}w~2TAk)&4r8^K;aCwDa=6O?LbwDKyC`#l*tW@9Q?>CLDCm;*uF9gpo#w9 zeldeBf_eH}AGSFdI)IJ~gc~Tr0@AwuVFz0XP%MH?VESASwiz5S^R|Cn!uAK#c%T!1 zFvArsE@Wf@8v_*ngAm5TgId-CG!x8R{;-7&Nh`t-B!zHmz~&LF1kGezhF}rj4s;XD zc|hMooCgtvt48B4N2mjb7n(YVXRyhjDa6G^_#DY`7)-csTmg?T249RJLKtq~_K!WV zAVHXcU}3lfXY8Swr~pc43`n3X*Z`J?z%(fNJz!P=DFaD?R3a+@@!=^I7;SeTN?}4U d8l(&cKw=o~g*yx3C;Tj6_|4s(%func1_0&*h!_9> delta 825 zcmZphsL(c1p`nGbg{g(Pg{6gc3){+w$qkGg(``f8ayBAD$gQ-B(8Fo9Xfs=fe)AR1+0X1xIlMX(7>pXYxVCfvW?`LiOTcL3JSPKv9Pwi*Nx#9eyzsSq$@l zrXbvmkVUW%uE!8Vn2ccIcNIbw!NR5&n=F2HKplA8hcJ&AmdJEp4>pPIYXjIOFauMX n2gqce=@Wrsu(u<4YDi diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/5.pxi b/desktop/resources/castle-gate/throw-walkie.pxa/5.pxi index 915ffdd1e2974e67e696751634ccdcfff1d11866..7978709e65ae99569fcb82fdf097164a43313ce4 100644 GIT binary patch delta 1310 zcmbu8KS;ws6vj78T55B72q6t0q{?*bFYGqaw^u< zNPXee0GGkN+U)nUwY|DDRM$gZtAhJzvz#d~A_v^d46{{KBvew7O~@JLxlf)~iR0ZB zISzgI=)|?9Vt*{QGTxj|(sAu@)lH2J-%p_WPcJ{KzaTZ#RGDp;U1 zKPs{awI$+T6_x<^WQ%nq!-xjS`V!sdH6jB^P}J8szD+|D$$L8gykVxMY6g)&lPmck z)(6uJ;W_}?VS+f~-8&X`J=_NE07fIktT1{!NK7%onUuWS5R-ZLUTi(wsv$zD3^_KM zGH$GfLMx8bpHLAi+Y#qtGh^k5w>8~^zK`j$*r=c!750BZ`L|u$JQ(`R|M7w)Dse~J Ufq7A>ckHyscKStrsGE!I5ASjFzW@LL delta 1009 zcmZphsL(c1p`nGbg=q_Oe#vzG9%h^Et4o*!Bm<7ym4HLHa`mm*drRIR75}2p+7O<_^Uh2RW09Ez3 z9>@nuxghvkQ0(_%nhumcfg)xDbraBu7eJa-pqhdF8z8<6*vc0mrU;n%0mS4%sConR zCJRW611$Xm#dHy{jek(Ycn~&%^a_CV{$Sb;3MfXHSqqqftOOKoBFrF#SR@1x5-D&c z_*n^9)FH&Mu@L4VWU+~%x>*1zm^K5wif}2y6k=IeZG-y*VG6P8&|QkxC~SrziQ$SU agc4#|*!+ReOOz}ypbJ{J=Q43fvH<|2Glw$( diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/6.pxi b/desktop/resources/castle-gate/throw-walkie.pxa/6.pxi index f9195b36cecf540ac845f9568ab2053df39f02aa..a760bc71bf32c839ab62499791b881e67cd64240 100644 GIT binary patch delta 973 zcmZphsL(c1p`nGbg{g(Pg{6gc3!7~RyQi7re;}T2(7`6U-8Yf_0Q2;_i`jUl*G^#* z(11$*X8-~i8ymgdF_C=@SYrq`lKl374z{_>)93DBOW;8g{=dC&3fmuM5o944dvhUU z0m20h97y6R2=N{ik0_FZN!-cW%u&7!-aRnPh_jVu)zjhLh z#^L}}6R{$aI}JA_zN@GgyldJSis>}7Hj}Y z0{T3z`@SJW9gjnABKUh_`oax&oPp#% zB#Tg#Ah{G_3JZ#oB}m~63@WTTaOp)>jAAIV1U4Um6oVo?1rd_qAm#zZ{1;I4fa4n; bfdtG$c%Nt%$OQ=7P~-Q=ob9Kvx+y>HkiFfs$J0$G{~=1*Z{hg!XT!W*DY zc<=xn5CS%T1tSYc1(5Fp=5Js`R^tE`+k+6>zVHW|4N$O<{Q%r5Mi!W*f0^Odf#V3- zs6S|Os47u;sQSRBgToxI3Tq6Y#S+*Ba2-J2Pt-WW6akw06Ej_b?GizcK@fj?U?KY- zR70^k3`=4KCm4(*4AzYy3ib##QAQSI@1Z40ur3~CX9MH-4{F-6bj|?9{1;}p_dp^r i43-gq@nAGi^aC?C(J#zAFf||=sE(s^doB})BpU#!fOW|L delta 642 zcmZphsL(c1p`nGbg{g(Pg{6gc3)|c6+a(XMePEv4z^JhO?q)Utmg$_g*+izx9$@3x z9(w^IBLI@&U;(OOnGR&}pvv+fWRX~J-?1%V+}yyJ!L%LB1Zw^R*1VnfHd_oM$SjcR z31I0OMi9FJ%m5nFRZf5%f@(2suF)jVu JbD20K*#O_;6RQ9K diff --git a/desktop/resources/castle-gate/throw-walkie.pxa/8.pxi b/desktop/resources/castle-gate/throw-walkie.pxa/8.pxi index f77268c28fcdc83016ac1a54a22340b4e94936b5..002ca0fcb65e8e9914e75343cd79315e832e8214 100644 GIT binary patch delta 1236 zcma)5F-QY36eY=-6g;75LB+wkRq4=4>Za(R;$YFSiy+d$4nlEK=x}yc6uNfPQBcUD zE)_bsbm-VZ1&0n6DkwO#)Suj4%+)(}2)X~?`|tfE{|aZ(!dWzLAq!i?GOVFn+J0hd z^D})|yi=h)5*#7J5X{S+O=g6g8awjVm@X#vn*-D(KQmHEVoJ%E*}}YCpceWL~y*yYz2 zGIdG@^W$}P;ZRVGrZI<0D}CE=NUqAuitzg!(~;B)7^*vi>6w*kHSbFZfi4+#9}jkW z&^*s&lm1Hij)-<=%YQpWqbH2}>3mb1WQLSkCnKau0HeZ?WL^N@VxHVnIC7yt{N4;ifrN iNg_x=RHHyvpkDKlk^K6Zs95b delta 726 zcmZphsL(c1p`nGbg{g(Pg{6gc3)|b%lN%U0w%=7_k73;0z_@}5&RoN^os*kg10;Hf zY5CjZY%E}vFtHmrR3d4@#sq4EnQ(@2JJ3`CM!3KUFcV4O2;=s@LhKR<6??z}3J8HM zU;z~r0kHXSL)Sp%fR1N@3oZd`vtZoL%gwF=^5GnyTjbas5a!H4Xp?|zn*dhjgHY81 z_Cg3kpoS3=e(+GV0jnrLs7L?{R3HRmpiH0xL*O<6jRb~G2SSw#texture screen walkie-base) - :x 104 :y 88 - :baseline 130 - - :throw-walkie throw-walkie - :stand walkie-base - :anim-start 0 - :anim walkie-base)} + } + :walkie-talkies (rooms/make-entity :walkie-talkies + (assoc (animation->texture screen walkie-visible) + :x 104 :y 88 + :baseline 130 + :night-profile :sprite + :throw-walkie throw-walkie + :stand walkie-visible + :walkie-invisible walkie-invisible + :anim-start 0 + :anim walkie-visible)) :collision "castle-gate/collision.png" :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.30) @@ -175,5 +178,10 @@ (as-> entities entities (if (= :night (get-in entities [:state :time])) (make-night entities) + entities) + (if (and (not (actions/has-item? entities :walkie-talkies)) + (actions/has-obtained? entities :walkie-talkies)) + (assoc-in entities [:room :entities :walkie-talkies] + (get-in entities [:room :walkie-talkies])) entities))) :start-pos [300 45]))) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 6520c791..551ff1c1 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -374,6 +374,7 @@ :x 257 :y 135 :baseline 0 + :night-profile :sprite :script (actions/get-script entities (actions/talk entities :ego "Let's give it a listen.") (actions/walk-to entities :ego [272 136] :face :left)