From 53215ae96f5f12d8d53bcc219974996b5f9cc563 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Tue, 28 Jul 2015 17:36:49 -0700 Subject: [PATCH] a step in the right direction for intro beefup. --- desktop/resources/ego/base.png | Bin 1652 -> 1600 bytes .../src-common/advent/screens/rooms/dream.clj | 24 ++++++++++++------ desktop/src-common/advent/screens/scene.clj | 3 +++ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/desktop/resources/ego/base.png b/desktop/resources/ego/base.png index 7a7446788132a284225ae109d1010904eb69e382..45e56cd88f0bb682706c542c9222ebe29a7d0b21 100644 GIT binary patch delta 1038 zcmV+p1o8Xy48RPKBYy+%X+uL$Nkc;*P;zf(X>4Tx062|}Ro!pfR1`mnZ(O7nKcKOW z4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj z_Ok5(v`JGz71bo9J#^YYXp{DWs&KBaQ@dTpxRI}aIp=pi?|;!XK*v{_pO}_ARv`(`K_~P;r>1*Ox?C;-F2;pN*27;R!QM9q+Ux&wbylgT10KeMtdQo=mnqksdx=&F5&oys0TJd`E>GI|#kK((J)n0eU)DVBJ zYq?3pFC)I@_!%aD74f~sTqTWoFF^8{ntPr?L_-if$s_=TxZzG%&qCb(^K zdCoqnhMa4x{ z6hi)zV+ON`xsmg3L#>3I8=9NTb3f!hwJM>{)UK+QWxX9ld>D=;G@xL^4DLEuumLit zkcSMu9e;39Qv(A`lu*=Clo*MpVGd>OdF6n^am1Jntk;<}MrqIC5$=Q>n{*R}?8oOI zDUw5En2dl--Xw34!z7E+5pr%d2c?H4INKjdmEV*< zl@;X+<-BrtTbJ8*N%&OwR`^l)PWWE<8D!y-a9Q|CxFUQbT#TL7ym&1JoWQ-+)%LMCuYy_wP6ZWs zL5D3kvu*xEYtl=GNMYO54zpQqF~pph71JP#d&LoPNE~Olm7ll=btAavwoIM=mAd9q7A z>MqdgAh7QszoH+g!S^k(^Lixn-v&7J7v5PnBH45U;A;<{`?W~chj-$$p8;Grpf}uw z@Xk*pegW`m`}gsGT^YQaZZ(?^@V@H!1YqOiX7iurW^?09^uGph$@~{t0C9K{wF2RW Ivrz;i0>jP=i~s-t delta 1090 zcmV-I1ikyf4D<|;BYy-WX+uL$Nkc;*P;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR IvmFE@0?hUrbpQYW diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 584ddb1e..1bc34b62 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -144,11 +144,17 @@ (defn do-intro [entities] (Thread/sleep 2000) - (actions/do-dialogue entities - :ego "What's going on?" - :ego "Who turned out the lights?" - :ego "I must be dreaming.") + (actions/talk entities :fairy-godfather "... Tick ...") + (actions/walk-straight-to entities :ego [160 60]) + (actions/do-dialogue entities :ego "What the?") + (actions/walk-straight-to entities :ego [120 50]) + (actions/do-dialogue entities :ego "Who turned out the lights?" + :ego "What's going on?") + (actions/talk entities :fairy-godfather "... Tiiiiiiccckkkk ...") + (actions/do-dialogue entities :ego "Who is that?") + (actions/walk-straight-to entities :ego [140 55] :face :right) +(actions/do-dialogue entities :ego "Show yourself!") (Thread/sleep 500) (actions/talk entities :fairy-godfather "Taaaaaaaaaaaaaaaaaa-") (sound! (sound "dream/appear.ogg") :play (utils/current-sound-volume)) @@ -159,9 +165,11 @@ (Thread/sleep 100) (actions/talk entities :fairy-godfather "-daaaaaaaaaaaaa!") (Thread/sleep 2500) - (actions/do-dialogue entities :ego "Umm... What was that all about?" - :fairy-godfather "Welcome, young Tick, to the pit of fate." - :ego "Err, who are you?" + (actions/do-dialogue entities :fairy-godfather "Welcome, young Tick, to the pit of fate!") + (actions/talk entities :ego "Pit of fate? I'm too young to die!" :anim :frustrated-talk) + (actions/do-dialogue entities + :fairy-godfather "Relax, Tick. You're dreaming!" + :ego "Who are you?" :ego "And how do you know my name?" :fairy-godfather "Why, I'm your fairy godfather of course!" :fairy-godfather "I've brought you here, Tick, to help choose your destiny." @@ -174,7 +182,7 @@ (fade-in-tools entities) (Thread/sleep 2500) - (actions/do-dialogue entities :ego "What are these things?" + (actions/do-dialogue entities :fairy-godfather "These, young Tick, represent the potential destinies for your life." :fairy-godfather "They have been selected since the dawn of time." :fairy-godfather "These destinies are never mistaken." diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 4d808cf5..db60f9a3 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -359,6 +359,7 @@ void main() milk (utils/make-anim "ego/squat.png" [18 36] 0.05 [0 1 2 2 3 3 3 3 3 3 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 6 5 3 3 3 3 3 3 3 3 3 3 3 2 1 0]) idea (utils/make-anim "ego/idea.png" [18 70] 0.3 [2 0 0 0 0 0 0 2]) throw (utils/make-anim "ego/throw.png" [18 36] 0.04 (flatten [[(repeat 5 0) (repeat 10 1)] (repeat 3 [2 2 2 3 3 3 4 4 4 5 5 5]) (repeat 5 [2 2 3 3 4 4 5 5]) (repeat 10 [2 3 4 5]) [2 3 3] (repeat 33 6)])) + frustrated-talk (utils/make-anim "ego/frustrated-talk.png" [16 36] 0.2 (flatten (range 6))) swing-shovel (utils/make-anim "ego/swing-shovel.png" [70 70] 0.1 (range 9)) love (utils/make-anim "ego/love.png" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 21 21 21 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0])) axe (utils/make-anim "ego/axe.png" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 7)])) @@ -419,6 +420,7 @@ void main() :crawl-stand crawl-stand :crawl-hide crawl-hide :standup standup + :frustrated-talk frustrated-talk } :left {:walk (utils/flip walk-right) :stand (utils/flip stand-anim) @@ -460,6 +462,7 @@ void main() :crawl-stand (utils/flip crawl-stand) :crawl-hide (utils/flip crawl-hide) :standup (utils/flip standup) + :frustrated-talk (utils/flip frustrated-talk) } :baseline (- 240 (last start-pos)) :facing :right