From 274d5b0b263686069ac879ea7ac85568cec0e39f Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Thu, 6 Aug 2015 20:14:35 -0700 Subject: [PATCH] Nice little tweaks for writing Brian. --- .../resources/inside-castle/brian-working.png | Bin 0 -> 2351 bytes .../inside-castle/brian-working.pxa/0.pxi | Bin 0 -> 526506 bytes .../inside-castle/brian-working.pxa/1.pxi | Bin 0 -> 526506 bytes .../inside-castle/brian-working.pxa/2.pxi | Bin 0 -> 526506 bytes .../inside-castle/brian-working.pxa/3.pxi | Bin 0 -> 526506 bytes .../brian-working.pxa/CelData.plist | 22 ++++++ .../advent/screens/rooms/inside_castle.clj | 64 ++++++++++++++---- 7 files changed, 73 insertions(+), 13 deletions(-) create mode 100644 desktop/resources/inside-castle/brian-working.png create mode 100644 desktop/resources/inside-castle/brian-working.pxa/0.pxi create mode 100644 desktop/resources/inside-castle/brian-working.pxa/1.pxi create mode 100644 desktop/resources/inside-castle/brian-working.pxa/2.pxi create mode 100644 desktop/resources/inside-castle/brian-working.pxa/3.pxi create mode 100644 desktop/resources/inside-castle/brian-working.pxa/CelData.plist diff --git a/desktop/resources/inside-castle/brian-working.png b/desktop/resources/inside-castle/brian-working.png new file mode 100644 index 0000000000000000000000000000000000000000..14bb7f4e50498e332481080e2bb1c6b398858e14 GIT binary patch literal 2351 zcmV+~3DEY5P)001lq1^@s6;=Qwu000B4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p zI(7{Es{=n@HKhC&2Uh!MR* z1}X%JT|7vIw@zLY%IH!=5JAu-=nv+xLv{0_hv*L|2<~18jf|umLu}2G{@_U;}J` z4Y)9HvU{)$9~XUZmOg#==M!I(ZO|#?%)(TIt)0ubkBpSbr5jt{Ccg6Wh0ui4(0)I+ z@eU;*!d)D`CGI`CCa(dK&n2KuB*uZYQp(d4`(-sxf!KMqt+v&#yZCmNkHsd&3rnLzK9S$(^=-a-b zrS%Z70VlF*4WB=32|XWbhZFBw6Hoy;2DDuveN=EM(8Px`vpnXZzYw1#@qqos{F>?V zQjJ-cVAYFbK*dq1z|5@f-XJzT{#tLM_VW;^IIn$WXcD5swEfxNf`yRD0$`@n z@ue#gw!uNep5|t8uD#8=Oh>+~MxY{4iZeBJ%@;6v?XTi2#JDy+E8s&5o%ymD-^eo{ z?L4TLu;*m7S|^uT)@( zdvN`jC@=m|hqm>dkadJp2Z9O$QaD(0p}@=s1^1zzbSVZtc*deEzVU&-roG1%5(lkd~xvt>xW zIAyEyS(jj#{ni#|1r9WwZERv;Db|xsZ<{pv@cWR*M?Q21tjvcaX5JcSKy%ajqx~<- z@_FLSrNfbgOe+EFr-`;?zNnKpku?3Knt%wVUrg(8y9&8XK;~1!u%Sv8{!&Rm0Q-LT zP2{3>j~M>PV>S3^*Z!&&;XJ_FWZ3LS<7GbLC5==xF|YV2T#`I1S` z(qG~PG~FE#gGBKli(Cy&#>hbr z0?e0e5K{M-<`SGbTryXYvzafVBv!z8f3Yrx8?ym6zy{a=8(;%$fDNz#Hn2qv`~%B% V%4o59?g#(?002ovPDHLkV1g1Oi1q*g literal 0 HcmV?d00001 diff --git a/desktop/resources/inside-castle/brian-working.pxa/0.pxi b/desktop/resources/inside-castle/brian-working.pxa/0.pxi new file mode 100644 index 0000000000000000000000000000000000000000..7bdcaedc9ab48a4c0b7b16aaa3e8eec936f4a844 GIT binary patch literal 526506 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 Hv-bZ#$Q^ky literal 0 HcmV?d00001 diff --git a/desktop/resources/inside-castle/brian-working.pxa/1.pxi b/desktop/resources/inside-castle/brian-working.pxa/1.pxi new file mode 100644 index 0000000000000000000000000000000000000000..7622c0e0bb6f27d6c92d79e682874d84c7131963 GIT binary patch literal 526506 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 F{~z^cf`R}5 literal 0 HcmV?d00001 diff --git a/desktop/resources/inside-castle/brian-working.pxa/2.pxi b/desktop/resources/inside-castle/brian-working.pxa/2.pxi new file mode 100644 index 0000000000000000000000000000000000000000..cdeccd5eba70c0cd08901a82d16ce632d98a324c GIT binary patch literal 526506 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 literal 0 HcmV?d00001 diff --git a/desktop/resources/inside-castle/brian-working.pxa/3.pxi b/desktop/resources/inside-castle/brian-working.pxa/3.pxi new file mode 100644 index 0000000000000000000000000000000000000000..dd15b7a08db616e7625c74254da34079ff3ebde9 GIT binary patch literal 526506 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 + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index e4a65590..bcf87fe4 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -12,6 +12,30 @@ [play-clj.ui :refer :all] [play-clj.utils :refer :all] [play-clj.g2d :refer :all])) + +(defn brian [screen entities] + (when (and (not (get-in entities [:actions :script-running?])) + (get-in entities [:state :active?]) + (get-in entities [:room :entities :game-player])) + ((actions/get-script entities + ((rand-nth [#(actions/do-dialogue entities :game-player "2 to the power of pi." + :game-player "No, that's not right.") + #(actions/do-dialogue entities :game-player "Eureka!" + :game-player "It's been staring at me in the face!" + :game-player "It's E=mc2!") + #(actions/do-dialogue entities :game-player "Now, according to Croutonian physics..." + :game-player "There are three states of matter." + :game-player "Solid, liquid, and ..." + :game-player "What was that last one?" + :game-player "Oh yeah, jelly." + :game-player "Brian, you're a genius!") + #(actions/do-dialogue entities :game-player "Considering the inverse square law..." + :game-player "I estimate our planet's escape velocity to be..." + :game-player "No, that can't be right.")])) + ) + entities)) + nil) + (defn get-chorus-volume [entities] (let [ego (get-in entities [:room :entities :ego])] (cond (> (:y ego) 112) @@ -93,9 +117,11 @@ (defn do-game-player-dialogue [entities] (walk-to-player entities) - (actions/do-dialogue entities :ego "You there!" - :game-player "... Oh, hello Tick. " - :game-player "What is it?") + (actions/do-dialogue entities :ego "You there!") + (actions/talk entities :game-player "What is it? I'm busy!" :anim :talk-down) + (Thread/sleep 200) + (actions/do-stop entities :game-player :face :right) + (actions/talk entities :game-player "Oh, it's you Tick.") (actions/present-choices entities {:choices ["Do you know anything about the sword in the stone up there?" {:run #(actions/respond entities % @@ -138,7 +164,8 @@ :game-player "'Hippity-hop, I'd jump so high,\nWithout these springs, can't harm a fly.'") :choices actions/previous-choices} "Nevermind." - {:run #(actions/respond entities % :game-player "See you around.")}]})) + {:run #(actions/respond entities % :game-player "See you around.")}]}) + (actions/do-stop entities :game-player :face :left)) (defn walk-to-blergh [entities] (actions/walk-to entities :ego [85 145] :face :right) @@ -236,11 +263,13 @@ (defn make [screen] (let [game-player-talk-sheet (texture! (texture "inside-castle/game-player-talk.png") :split 40 44) - game-player-talk (animation 0.15 (for [i [0 2 0 2 0 2 0 3 0 2 0 1 0 0 0 0 2 0 2 0 3 0 1 0 1 0 0 1 0 2 0 3 0]] + game-player-talk-up (animation 0.15 (for [i [0 2 0 2 0 2 0 3 0 2 0 1 0 0 0 0 2 0 2 0 3 0 1 0 1 0 0 1 0 2 0 3 0]] (aget game-player-talk-sheet 0 i))) - game-player-stand (animation 0.15 (for [i [0 0 0 0 0 0 0 0 0 0 0 1]] + game-player-stand-up (animation 0.15 (for [i [0 0 0 0 0 0 0 0 0 0 0 1]] (aget game-player-talk-sheet 0 i))) + game-player-stand-down (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.1 [0 1 1 2 0 2 2 1 0 2 2 2 2 2 1 1 ]) + game-player-talk-down (utils/make-anim "inside-castle/brian-working.png" [40 44] 0.2 [2 3 2 2 3 2 3 2]) game-player-flex (animation 0.075 (for [i [0 0 4 4 5 5 5 5 5 5 5 6 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 6 5 5 5 5 5 5 5 5 5 5 4 4 0 0 0 0]] (aget game-player-talk-sheet 0 i))) trophy (utils/make-anim "inside-castle/trophy.png" [16 16] 0.1 (flatten [(repeat 50 0) 1 2 3 3 3 3 2 1])) @@ -249,6 +278,7 @@ door (utils/make-anim "inside-castle/door.png" [21 49] 0.15 (flatten [(range 4) 3 3 3 3 3 3 3])) ] (rooms/make :music {:day :town-1 :night :night :sunrise :night} + :timers {:brian [10.0 20.0 brian]} :interactions {:right-door {:box [286 140 306 160] :cursor :right @@ -397,7 +427,7 @@ (actions/play-animation entities :ego :end-squat))) :trophy (assoc (animation->texture screen trophy) - :x 253 :y 69 :baseline 191 + :x 233 :y 69 :baseline 191 :anim trophy :anim-start 0 :script (actions/get-script entities @@ -409,8 +439,9 @@ (actions/do-dialogue entities :ego "Can't you give me your trophy of wisdom?" :game-player "If you want my trophy, you'll have to help me with my riddles.")))) :game-player (assoc (texture "inside-castle/gameplayer.png") :x 266 :y 49 :baseline 191 - `:talk-color (color 1.0 0.3 0.2 1.0) + :talk-color (color 1.0 0.3 0.2 1.0) :script (actions/get-script entities (do-game-player-dialogue entities)) + :facing :left :scripts #(condp = % :wool (actions/get-script entities (walk-to-player entities) @@ -463,12 +494,19 @@ :done (actions/do-dialogue entities :game-player "I've gotten all the help I need with riddles today.") nil (actions/do-dialogue entities :game-player "Why are you offering me this?") (actions/do-dialogue entities :ego "What about this?" :game-player "No, that's not the solution. Keep looking.")))) - :anim game-player-stand + :anim game-player-stand-down :anim-start 0 - :stand game-player-stand - :anim-sound-frames {game-player-stand {11 [:blink 0.3] }} - :flex game-player-flex - :talk game-player-talk)} + :anim-merges {game-player-stand-down {:origin-x 8} + game-player-stand-up {:origin-x 3} + game-player-talk-up {:origin-x 3} + game-player-talk-down {:origin-x 8} + game-player-flex {:origin-x 3}} + :left {:stand game-player-stand-down + :talk game-player-talk-down} + :right {:stand game-player-stand-up + :talk game-player-talk-up} + :anim-sound-frames {game-player-stand-up {11 [:blink 0.3] }} + :flex game-player-flex)} :monocle (rooms/make-entity :monocle (assoc (animation->texture screen monocle) :x 209 :y 160 :baseline 240 :anim monocle