From f238d9ebf65e23dbdbb484724bae5096991cfd3a Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 30 Jul 2015 18:03:04 -0700 Subject: [PATCH] flexing frankie. --- desktop/resources/castle-gate/frankie.png | Bin 2627 -> 3015 bytes .../resources/castle-gate/frankie.pxa/10.pxi | Bin 0 -> 264100 bytes .../resources/castle-gate/frankie.pxa/11.pxi | Bin 0 -> 264100 bytes .../resources/castle-gate/frankie.pxa/12.pxi | Bin 0 -> 264100 bytes .../castle-gate/frankie.pxa/CelData.plist | 12 ++++++++++++ .../advent/screens/rooms/castle_gate.clj | 4 +++- .../advent/screens/rooms/outside_castle.clj | 4 +++- 7 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 desktop/resources/castle-gate/frankie.pxa/10.pxi create mode 100644 desktop/resources/castle-gate/frankie.pxa/11.pxi create mode 100644 desktop/resources/castle-gate/frankie.pxa/12.pxi diff --git a/desktop/resources/castle-gate/frankie.png b/desktop/resources/castle-gate/frankie.png index bcdb9451aafcf94d6fff5acc2c4d31b07ede77c4..94ef6267f7405ee6cfccc1b2ca92cc7fed2130fe 100644 GIT binary patch delta 2018 zcmV<82Oaps6vr1KiBL{Q4GJ0x0000DNk~Le0003v0000Z2nGNE000>lhOr_31AhmS zNklPB=W2qGBVxXDU%VHO5O2vsQtiKW@N2!twHwT<^Vx6i%r%$b?~(CN#22*`8?0O z=Qr=XXYNOPD65%{PE72|Oa8ij`+tzE$Cgz;OfWSc=(*NV&g1G2Tj}qWx)>FsEwy5F z{MHtGboTgujbt=`jiJJ9s^Px3O*LfWFH?@`bD)VvJ zFXxZF7qvgjCM8f=E`uY-HYuxqnA%?9({z)yZNHD6J?~z%-?r0tKTX?Jzkg588{j0^ zAFe!|-FxD^Y|6_IKfhFHYto?lVQOvj;p}prf408M9=-Tg@PyCn%5vx;(TAXoa;*O# zcwr;|_}Lq|K6Oz!`@%bUTZ%uDi`0v?pIWL<67D>P&tbRZu$9gU=V3xw*4f@9SN$-x zw)t>&+ld&A*xxj#uGB+0m4E**xWT@Zy1d`E`KvxjyYpB+!2l$ftznCv>+>*myltzEX?=3&?Caw!3GO34h3jYb| ze*f~5HLWcUr~PgFkLnlMqlNr!f4A%ItNX3N00$waFW-DAFXG9|GJpG;=G4D$VLrnP z3Hq|$R2$b(A7$FyMf)X>lzhMiPQ)Y`t-Sacn;YkC^M_%u8BAD4{`bmiUXT6Lw*9If zULo>{@&90ed*Y*S2hKxNQayR0r~0Jo&fDgLS?NS5Gf<>j<5AcTyJ;`&mm328O;g+U ztA2Q8QtL1&jvj%K44Dn%)=`FUg~26*A#0l*Vun` zc@Op5@*imdZDycDU+k9*ZQFlP^_P~GcJY$y=PJASU>tqb=l`~T>9=IZr>Azmx$yYl zEhLTUeS=hbEysrPQR)*8p73qhpHd%O!0p^4=d$?3a54 zLDSav1~`bzi(N*iu1B70?j*@q+EVA%<-s{PRC-r&B#9Mt!I$v{J74k3y$m;JG2)%O#`;>iV6{zX<@ z@*h6L#yZEvbeZd zI0<$24xJ}B-c0I~19h3JK1sOq5TDu8r!zXF`+w^4){uVr)#W2pznl?9*l)e6T~$5` zKjjJ~`*gLuyqw`xHMPFJCH7ab(;47mf8SO%vFe8jNj?Z-mo8s+UQovwrGV6z?WxN9 zO~17OWPLM^wZ;qcrA$uykKD9PtTav_HD+Y!|_a26`$gO14~GlhQT z-}^E22>dhay_K8HhW|{F3z3R{NIzH#d-6;*n{Y%1F^<6RE0_8-*`BkS>TCGv0LJcgd~H*gdxCHxEH>o&Bc4}ZUq zK|%&Lm`MMrYc9tR^zYiATA%YUkI}F7862WMpIn$cdV}!}?&hj*0kNt!AFDgMYU}Iz znn*{@$DBRBX4@aHXe!wHP5sArT@!t8fU_roc*>;uVVcTkfAg{LF7^IW{XPM2fU^N< zT?r_G(Gjp8aHE@ff6b%;uA}Rz8-Jjq3#VpRB9O|zHNaKEJ)S{WWG*zztdGYcoi!DK zuCHU)?KjqOdires|C6!t)TyV8I@_D(svjn&e3Va^K)ClH`;VUB!oH!sNULWU16xb=O`6Kb~5wos* zOdeWO0!ly$C;=s)1eAahPy$Lo2`B+2Fa`qu1G;J^c;j6=djJ3c07*qoM6N<$f_qXM AwEzGB delta 1627 zcmV-h2Bi7N7sC`GiBL{Q4GJ0x0000DNk~Le0002+0000Z2nGNE0IL6o6R{!w1Ahh% zNklJ7eoS~>a$DH2NwA8>dfFUzd&lbU{-+R%JByLKW58{7M))RlV3m+~J5 zFYGI+%k>V;KUY5)z!Lt-`G4=ZCWpM-kh-B`hWa-*t~7--FnaQhb9Ix<*OeVJ`A0iiJKml45A8oW`pE#6LG{^d&s8hL z$;tfqlDpMV|F)H7hZipB%W^kGzc=+!OPgoWe#xUGA8>(_@{)|!o_~Fa)xFc9`NJ^S z3?|GY{c~--D(C(f+Wr#y$pC)j!>?*Mgi-3`gr4b>YB(L54`!84#6T#u$CI!hYoNWf zUmkd9?|Thxe+m6)0Q2b`;1CQ>HlA**>kG&9)8s;Yz?|Hfrd8st)JG5QDfU|KaeQ=h z3-yQcA87$?W+0<2_kSVQ(Ds+oZ+yzQusA>Z^7O;?EiS=rKY?o;%f6{}lKOO1oX|tq zUs4}j!0qJyC*6Awjw=3A|I~}`S6H`xy_U5PljJY`pcMa~K6%yqVi6hP-Hkya=k1!G zc0S3?rxPvQa@2jga#y|f(`%RA*56lM3Fm?6r1TNExSl%m(SIQJm(&M)aN!01QvcXJ zcUMhctgk2ckmEz?e%oKJaaR4akNwHb#|Gma;Fryxsa>UXo{b+jvVz$3J*-|q2e8-p zUjh4&8^E@|A+kGld+DETV=EfKLpzY^ryU2a@*Q~Vw`=u)g*)b}d`$$xM_=oQfZE_>T4 zfTaUr^4RI24QpFA{kEib`Wb(p*R1)E-apvSHEdkC;4dyx3I?z~9lD$dk$Jpo)Aw*R z7L31-Xx9D5UrpZKR4{<`1XeZzMqoM#Bm=ng$*&QZzJDg-ms5Q1JAT}~@bXLkfR3e< zen+Wbche7I8LPx?b6-}$0M7kG($~+PRXui!tE;QQ`ld>$-_*BH z`+n2U39uAD8MK%KdyN-=4^E9`TQGpxm`Y2$1DJk_z)l;2G!&?pHh*w<4RzW6`ebp4 z$~&G?e1GtTC|+`}V}~~TGHv{Wej5G3JMUIwy>K z?y4WpTvxZ$^wYey`GhX=Z?nOn@pYZ?uTcau4g7;+x>Od>@ANw`P92^+uru3%)M8Cv z0Z~QGM>S^`wZ84Ik95*}{Mo~$XaMWYgYhLV(@)bhKKq-GUR~e#iUzQrz{*Cz2uzNE zK7YVtGg|=1$V_>C+YO%bWte%H1kw+&GR19p9svgF;-VWd55=QPZtO2v@@BHplO}-u z)ZghI%!b9q6Q08?Ej{Lyb0;?aG(qEId}0Lb7CJ`8>W#pDA)x<{3(C4KXRTVx^nIGf z$LFC-#zzxT<v~&Of002ovPDHLkV1g7!PjdhO diff --git a/desktop/resources/castle-gate/frankie.pxa/10.pxi b/desktop/resources/castle-gate/frankie.pxa/10.pxi new file mode 100644 index 0000000000000000000000000000000000000000..a2afa1df1f3acd739013372c49b7bad7a56047b0 GIT binary patch literal 264100 zcmeI)d5oN89l-HD1}L!5p+G66$d)dkQtB44j$X@{~2@sH_L{4Du) z-g#&CeV+I8?lUtRpc}W8iet6j-sjspIx`0yyz|jq&$dE!tXL`MdMX>QDGb%d*7oG9 zL!-smy{e~H*)pT8{pN?il0EH^X~)j)d0X$oGZ(${!iz4xvy^5Zc^ZsW+3N_kUpIVCwYnVao=c4pUc$6wVquweJ(9+{PN zCevRyp=-{GZ#t=a?#c7kRJP=Yina08#m)JV!m4t9b79T4;#hHGsgN9#9Ghg4qYr)V zl$l+pzIDNxILx($@v)t!z4e?~Gb$tFi7GgjA%rNY?i?Zx5R=-_Cf zI5Jv`!OuGWk+YLSlj-Rp7N7TyiF3|P4oeQ7IRApAD>))LGFPe$%Rx2p9kun3DSK{9NM7?5I6t?X3RWd&zf(1|33hxW(oudG*KX3`)NHV%$a-* zsK5WG_tX7N9NM7?5NNSLy2dX$|NP1IpRW0O>Ap0t0WH2jh9}S@f%^M?ea%mGo4y7# zX?TYvK%j*JQ?36Q)2F|ZmcACGx7L3PFOZ=LG*Mux^hMAW&cb_0Ir}@AdWV^fsMJ zeeI{Wixw@KY(GrV5CjM`NnqdgpRVo3bw7FEzyEKNzQYn|t$_94T7RPxXr(~o`cJp( zzt=Z@)=&4ha*oC(K%hAS`>y}`@AWfhp8iTb>%Tenj!NJ_5NLc2sIU3@?cBNN_-}s? zgo|Vj1ezo;)%vgRv;Lce?yv+75P|wyPjA!r{l@#&{{eE5OoKp^1RB@7_1`39hb3@; z3RwRK=!G#Y0{cP0`ri-8h9K}iAdr6kZ=7cO`+wto+XM)_aRsdZH}17{W&~bOApLuQ z8=q7EyTKdx*(N~XjVWNgzcH_?vm!u%009C72oNAZfB=F2AAx6=EWPxyt9ph?`LVHb zesdwWYqK!6u5Vyzai~_Tl=Ic`iA$H|`UX~RyrwWzi|<(e?)7~GE4J418%u?YtJVDY z&gGXcThli%xt*Profpqp*}oxs^qyz!J=D&XmoB?%MZQ?>z9K(fsLs1+?Jn&2mQ}0Q z^yen`P7E%qZ@!RQ+jZ5|>(;H`@V+=;zEmqz%lTU2lKjxMBh|{*^6-Z2>^*z?tA%aF z!uGunuHPIZ?Y+Apdu+PnHBU?0;-Bv1xa7p=yEdLUG+fv;vUX#Pu%uF|R96qBe?B|NtbX{B89A~>`v{)+y)8vx|w&aHjmn>|{b|%NisZ_Sa6DA*+cz-H0xtV_J zSZVW$-Uac0RPOp(+?E`_Av4V~Ck`0z)<;7!R%8?w_cE9Gmip6*9)-jJPgn8!Z$@lT}Fo$|rgn?pF(0AAbNBj@YH@gAw6e7{ytJC%zBau(c^%fJTdT{( z+CcI8!nEY%WM0yfUYmPLn^$JDy$jCl-Su@=ckhC?#|0YPv2cF(!W&{L_dhV$pIa8+ zJ@MeO-CKh@dgpidrVl>+NUlG(BwyZ^ADft1wr4xA`UWm9j2DJ4t`3bBw-u_-Jofmi zYNb+3+T%xmT69!2JDL}r5uF(=j`Gn+REu^*H$`_u_e2jwk4BG2pO2o5z8HNudMf%x z^mO#S=m*h{qGzICL@!6biT)VZV*XZxjKcauPwY6uWm|Oc{QCDPJGV|Lsf-4op#-5*UvPe$L0z8%FJI${nT-;aJA{VaMh`c?FY=ud5#&W`Ai zXin4*%wf^=D2|mmExI7O zG+Gs{kFJeMQ8|ip%)~in#-m%K+oL$A%zaTCb5T^~A25-G62>zxxjiN5Itp literal 0 HcmV?d00001 diff --git a/desktop/resources/castle-gate/frankie.pxa/11.pxi b/desktop/resources/castle-gate/frankie.pxa/11.pxi new file mode 100644 index 0000000000000000000000000000000000000000..ace74201605675df2566d3cc3a12df45a09db975 GIT binary patch literal 264100 zcmeI)d5oN89S86|hI^qyDTM-sEnPsR)a9_83O%4Abi1?q#w*4n`iDvVy<6UPDT5^>n`Y~0n(w~v zJkLAt^E{t-fAh{J+g-o0QXXk^cR%0S)}GsM|80*Jx;B^UBjsAP&{bQ1O=+Mpvbw8S z9~dr2^NOxUZR7No)|(&xYW|c14m|RhuD5ree#U}#U3k&LMen|RSXCHS5ZrzWJ|A?vbOD z_GH=%$95by`}h+&=bSiqRc&K&pxhW;S>8|_Dy^s%HOZahEZKWN_I#3tc3J`i_Od`){}b=~bIv|$ z=lwt1-^)`pJOKieB#_qsi-YIwtoe!e{%n7ehIU#41opDP#Lxd(z3;x=%TqKw0RodK zkiG|`HJ|+)kbWM>J`<#E&4#|^mRq)`Y1XHW0D-9`Fn#8sJ8OR8{r~k=v0%Z1?P*@G zUpoN;Q$rxF{WM+29yk6Tklp{&=V^PhRiu4sn)PWTKw#AO zY$e%o&HA(vATTuqvip8k&&{^Y-W#&xrp7AGk^q5b0?q1w`m|}=)1)>;Xn5nfgvn4=aPXbwO|F8RgcFdm6rJn$SsU?urc3S`G ze)c>4>F0nf*)daVWoAo&z@7xM+Ro}f`O0+LHJ@$g z%sFTLb3xiS^;Txa1PJU&pjrKAZCU;A=^XkA5SW?*S*@qr^u9mwx%!`)*VL>DyitLP z^{)QksG8#l>>C2=f8V%{Rzcv+3S{pA?*DIA(CY|HeSx(8C$1v>`G4Yb`veH=y8`Ne z-@Ue0Mqp0@>E8jKcue-U!6&xaCqQ7|6j1N`=5@6y0t5&UAV7cs0RjXF5cvNQcy{rU zi!ZsdYoJmb8L1XGlnOg`OCxJ~`j(Uj8s%EGSRWm`cxj=hZ~6LbN&}5}#ij3A+tasf zQ=_=PQd(HA7e}{UdfC!dJ$>W*`J?l5+(nJJZjgewk^MS>6OchjZBun{ zUH+Jzt-bZq=5lGvuFka^Vx(P9*X55)8(wo*(h~nVlcSQ^&v&e!Juq0hdT90f7-4a( zQmd~VNWUh>B}XU6CdWKizNX{a%7$3&s^M~@6inj>^=&K;lop-dl5bCD#Zqb;22pQe$);MPR(%!GjNZbsT6MSPHNAyhr(KuN_w@A#-r`!dQLj}hrTSGp zeOHu5HrA?xrTTLNvpY&3`Dhp%pPaBRKkbrAvGMBZe(dIT`KH4>_VG`AGM#SI&OOZ` z9B#RFe5t#p8Z*4QJT!LO4uaj=pa1k7pXs>suFu}RcBoz+>>I9asthiv7q_fVpN?OL zHR;~UYPr!@zP@x|a$+(!=}NE7J(Ug1^ZD-iXLRp)oY~nu{~d9G`nR4wuk-X9Vk-AP z(BE5F8m}IEaOo?1{ad@|b#|wn4?j}qEi5ipHy207#+L5f53HWP%SxlA!G-mK;qvBE z{h7xeUs12s8cAz>>mL|7JaSBAZsfGc8IiLi#mG>k5!o8KDRM{Tp2!1{MxqcKey!C+ad=k1?OpC<1a;HQth+G_55m_6#Hd2XHBeBL@tT8tlxixZoB-WI>FA|oy tM4GA literal 0 HcmV?d00001 diff --git a/desktop/resources/castle-gate/frankie.pxa/12.pxi b/desktop/resources/castle-gate/frankie.pxa/12.pxi new file mode 100644 index 0000000000000000000000000000000000000000..6eda8c8fd7b7a0edfacb284c638e003c954faba9 GIT binary patch literal 264100 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 1 + + duration + 1 + + + duration + 1 + + + duration + 1 + diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index 7f33d52e..13cc9caf 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -79,7 +79,8 @@ talk (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0]) laugh (utils/make-anim "castle-gate/frankie.png" [24 35] 0.1 [1 3 4 3 4 3 4 3 4 3 4 3 4 1 0]) glance (utils/make-anim "castle-gate/frankie.png" [24 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ]) - reach (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 8 9 9 9 9 8])] + reach (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 8 9 9 9 9 8]) + flex (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 10 11 12 12 12 12 11 10])] (assoc (animation->texture screen stand) :x 235 :y 90 :baseline 150 :origin-x 12 @@ -91,6 +92,7 @@ :scale-y 1.4 :talk-color (color 0.6 0.2 0.6 1.0) :talk talk + :flex flex :stand stand :laugh laugh :glance glance diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 0975c5af..09e960e7 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -190,7 +190,9 @@ :ego "Uh, oh. Frankie Rockfist!" :ego "Listen, I don't want any trouble." :frankie "Well you found it tonight, Dipstick." - :frankie "Am I right boys?") + ) + (actions/play-animation entities :frankie :flex) + (actions/talk entities :frankie "Am I right boys?") (actions/play-animation entities :frankie :glance) (actions/do-dialogue entities :frankie "You looking for another beat down Dipstick?") (actions/play-animation entities :frankie :laugh)