From bb9b7b82deb66971a2a64d120e65b796c5383153 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Fri, 31 Jul 2015 07:56:04 -0700 Subject: [PATCH] gandarf turns you into a frog --- desktop/resources/ego/frog.png | Bin 0 -> 1354 bytes desktop/resources/ego/frog.pxa/0.pxi | Bin 0 -> 264179 bytes desktop/resources/ego/frog.pxa/1.pxi | Bin 0 -> 264179 bytes desktop/resources/ego/frog.pxa/CelData.plist | 14 + desktop/resources/inside-house/magic-frog | 278 ++++++++++++++++++ desktop/resources/wizard/magic-hands.png | Bin 0 -> 2063 bytes .../resources/wizard/magic-hands.pxa/0.pxi | Bin 0 -> 264135 bytes .../resources/wizard/magic-hands.pxa/1.pxi | Bin 0 -> 264135 bytes .../wizard/magic-hands.pxa/CelData.plist | 14 + .../advent/screens/rooms/common.clj | 5 +- .../advent/screens/rooms/inside_house.clj | 3 + .../advent/screens/rooms/outside_house.clj | 57 +++- desktop/src-common/advent/screens/scene.clj | 6 + 13 files changed, 372 insertions(+), 5 deletions(-) create mode 100644 desktop/resources/ego/frog.png create mode 100644 desktop/resources/ego/frog.pxa/0.pxi create mode 100644 desktop/resources/ego/frog.pxa/1.pxi create mode 100644 desktop/resources/ego/frog.pxa/CelData.plist create mode 100644 desktop/resources/inside-house/magic-frog create mode 100644 desktop/resources/wizard/magic-hands.png create mode 100644 desktop/resources/wizard/magic-hands.pxa/0.pxi create mode 100644 desktop/resources/wizard/magic-hands.pxa/1.pxi create mode 100644 desktop/resources/wizard/magic-hands.pxa/CelData.plist diff --git a/desktop/resources/ego/frog.png b/desktop/resources/ego/frog.png new file mode 100644 index 0000000000000000000000000000000000000000..9f2dfa0f64c590ada917c305cb9e83bdb1ee3628 GIT binary patch literal 1354 zcmV-Q1-1H#P)4Tx062|}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 zN5Q z6hDFBLr^FZ6qcza1UoT2!4Q&>-qPgSb&N5$bf(u{-|OqU0oZ2_m;>g3IbaT$1LlA^ zU=DQIf%Sfvzh8NdJ5p@CZyOREI$F$}2#nhBo>rt94&MeDjF)prPZt-nbNm%USd57G zb3E@>cZO$)Y}N=g5{aW+!%G1JYQ{(a*>p`Fep}_a4u9M{OAD6@^j2Y%xk3JLjX*wXPId|$GVO~uCi zmc;QY&zjkc^Z0lAKtTgM@p=l}o! M07*qoM6N<$f+z-#pa1{> literal 0 HcmV?d00001 diff --git a/desktop/resources/ego/frog.pxa/0.pxi b/desktop/resources/ego/frog.pxa/0.pxi new file mode 100644 index 0000000000000000000000000000000000000000..6dff6e091a7fd6e9f96262dae85f6bb5e4e2538f GIT binary patch literal 264179 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 + + + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/inside-house/magic-frog b/desktop/resources/inside-house/magic-frog new file mode 100644 index 00000000..cd1e0898 --- /dev/null +++ b/desktop/resources/inside-house/magic-frog @@ -0,0 +1,278 @@ +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 200.0 +highMax: 200.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.6164383 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 1000.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.3 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.66 +timeline2: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: line +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 5.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 300.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 80.0 +highMax: 100.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 0.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.5 +timeline2: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.6392157 +colors1: 0.76862746 +colors2: 0.03529412 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 0.75 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.8 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +dot.png + + +Untitled +- Delay - +active: false +- Duration - +lowMin: 1000.0 +lowMax: 1000.0 +- Count - +min: 0 +max: 500 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 200.0 +highMax: 200.0 +relative: false +scalingCount: 2 +scaling0: 1.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 0.6164383 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 500.0 +highMax: 1000.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.3 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.66 +timeline2: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: line +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 20.0 +highMax: 20.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 0.0 +highMax: 0.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 5.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: true +lowMin: 0.0 +lowMax: 0.0 +highMin: 30.0 +highMax: 300.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 60.0 +highMax: 120.0 +relative: false +scalingCount: 4 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 1.0 +scaling3: 1.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.4178082 +timeline2: 0.5753425 +timeline3: 0.96575344 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 3 +colors0: 0.03529412 +colors1: 0.76862746 +colors2: 0.5882353 +timelineCount: 1 +timeline0: 0.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.0 +scaling1: 1.0 +scaling2: 0.75 +scaling3: 0.0 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.2 +timeline2: 0.8 +timeline3: 1.0 +- Options - +attached: false +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +dot.png diff --git a/desktop/resources/wizard/magic-hands.png b/desktop/resources/wizard/magic-hands.png new file mode 100644 index 0000000000000000000000000000000000000000..c2cac19845e105fd882a4e62b54fd5d9d7708942 GIT binary patch literal 2063 zcmV+q2=MobP)4Tx062|}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 zV|)NTZ^ULqt%A_K=4ns6c{{qLOw&gp?@hP;7!FVTeJe3Kh2f zk3Hivv+u{u?0P61c=vtgnP+~_e?E6th^6u$%|L#pE&opp=lHLDd4&dzJjhp;*(tmF z2vyFxY)4ITnM@{clf)(l;{eYbPlf3~9l+}~6{-y#$HvA)B9V~cutz(Oi01ouL|0dr zjN^SUfQsq?)!)n!#G@GScz+H4_4(!e>_ApjwWTOte5y_g2;v1o$=AMdN;TE*KBb9r z;q|qqdG6p1>X)lCbjCQ8n7)dolZ+lv}KkN zkdiXXro^|DE0wwA1NAHOdwfC-`JS6V**T@!b^LTF4=(*3A z7b+0&GpX;Qa(%1#IWZ`5y&GgcZigKnE{xkgydr^onP1NCReW4G^eCr=Q7W%UAkT?q z!J&XKl!m8Q2WdRaV@3r0tJ!)h{Quz1ph8Z%*TgS6l(SM;YA9htaMsUq15jBcHvnGeAV|>Y5YmeZVL0V?`_#Hex6c|~^}hrn)H+oJyXpw4HH zZ+f)Z6jxsC&n+b7qHILO#klZd1-5UUDdZbeIdkvFMbnl>S@L~m;qch<&3$|}pUaUad#ETUddk<1#K6BircGov& zaNCt5zl+W5Vbi*^+V`^y6s&UcWbTdwIZe>&6*XGjMId6!%@d{|v+gR;>~GdN&-;)> tL3sjOyCfbumjp0WmYZkbm#W$f`~dnhKMm(>a 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 K{aLu+;{OAkBOD6= literal 0 HcmV?d00001 diff --git a/desktop/resources/wizard/magic-hands.pxa/CelData.plist b/desktop/resources/wizard/magic-hands.pxa/CelData.plist new file mode 100644 index 00000000..490cc590 --- /dev/null +++ b/desktop/resources/wizard/magic-hands.pxa/CelData.plist @@ -0,0 +1,14 @@ + + + + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 93b249da..71f7839d 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -25,6 +25,7 @@ wizard-stand (animation 0.2 (for [i (flatten [(repeat 10 0) 1])] (aget wizard-sheet 0 i))) wizard-talk-angry (utils/make-anim "wizard/talk-angry.png" [20 50] 0.2 [0 2 0 2 1 2 0 3 0 2 0 1 0 2]) + wizard-magic-hands (utils/make-anim "wizard/magic-hands.png" [20 50] 0.2 (range 2)) wizard-disappear (utils/make-anim "wizard/disappear.png" [20 46] 0.075 (range 19)) wizard-talk (animation 0.2 (for [i [0 2 0 2 1 2 0 3 0 2 0 1 0 2]] (aget wizard-sheet 0 i)))] @@ -33,12 +34,14 @@ :stand (utils/flip wizard-stand) :disappear (utils/flip wizard-disappear) + :magic-hands (utils/flip wizard-magic-hands) :talk-angry (utils/flip wizard-talk-angry) } :right {:talk wizard-talk :stand wizard-stand :disappear wizard-disappear - :talk-angry (utils/flip wizard-talk-angry) + :talk-angry wizard-talk-angry + :magic-hands wizard-magic-hands } :night-profile :sprite :origin-x 0 diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 0e30fb2c..de44a86f 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -181,6 +181,9 @@ :candle-smoke (doto (assoc (particle-effect "inside-house/candle") :x 172 :y 112 :baseline 200) (particle-effect! :set-position 172 112)) + :magic-frog-particle (doto (assoc (particle-effect "inside-house/magic-frog") :x 230 :y 0 + :baseline 241) + (particle-effect! :set-position 237 0)) :flask (assoc (texture "inside-house/flask.png") :x 265 :y 80 :baseline 240 :script (actions/get-script entities diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj index 014ef709..ec564e91 100644 --- a/desktop/src-common/advent/screens/rooms/outside_house.clj +++ b/desktop/src-common/advent/screens/rooms/outside_house.clj @@ -147,7 +147,24 @@ (actions/talk entities :ego "I don't want to put something in there unless I'm sure I need to.")))) (defn wizard-dialogue [entities] - (actions/do-dialogue entities :ego "Hello there Gandarf!" :wizard "Oh no, not you again!") + (if (get-in @entities [:state :has-met-gandarf?]) + (do (actions/do-dialogue entities :ego "Hello again Gandarf!" + :wizard "Not you again!") + (actions/talk entities :wizard "I command you, leave at once!" :anim :talk-angry :stop? false) + (actions/talk entities :wizard "Don't make me use my powers against you!" :anim :talk-angry :stop? false) + (actions/talk entities :wizard "Leave now, or else!" :anim :talk-angry :stop? false) + (actions/begin-animation entities :wizard :magic-hands)) + (do (actions/do-dialogue entities :ego "Hello there Gandarf!" + :wizard "Oh no, not you!" + :ego "What do you mean, 'not you!'?" + :wizard "I mean, you've wrecked my life!" + :wizard "I never want to see the likes of you again!" + :wizard "Leave!" + :ego "But...") + (actions/talk entities :wizard "I command you, by all the power I can muster..." :anim :talk-angry :stop? false) + (actions/talk entities :wizard "Leave now, or else!" :anim :talk-angry :stop? false) + (actions/begin-animation entities :wizard :magic-hands))) + (actions/update-state entities (fn [s] (assoc s :has-met-gandarf? true))) (actions/present-choices entities {:choices ["What do you mean, \"Not you again?\"" {:run #(actions/respond entities % :wizard "I mean, you've wrecked my life and I never want to see you again.") @@ -236,9 +253,41 @@ "You're not happy to see me, Gandarf?" {:run #(actions/respond entities % :wizard "Of course not, you little brat. You've made my life a living hell!") :choices #(-> % zip/left)} - "Goodbye, Gandarf!" + "Or else what?" + {:run #(do (actions/talk entities :ego %) + (actions/talk entities :wizard "Or else I'll turn you into a frog!" :anim :talk-angry :stop? false) + (actions/begin-animation entities :wizard :magic-hands)) + :choices ["You don't scare me." + {:run + #(do + (actions/talk entities :ego %) + (actions/talk entities :wizard "You asked for it, boy." :anim :talk-angry :stop? false) + (actions/talk entities :wizard "Grenouille KALA!!!" :anim :talk-angry :stop? false) + (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :reset) + (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :start) + (actions/begin-animation entities :ego :frog) + (Thread/sleep 2000) + (actions/begin-animation entities :wizard :stand) + (Thread/sleep 1000) + (actions/do-dialogue entities + :wizard "I warned you, Tick." + :wizard "Now, I will return you to your true state if you leave me in peace." + :wizard "Do you promise?") + (actions/play-animation entities :ego :frog-nod :stop? false) + (actions/talk entities :wizard "Frustatium DISPOSIUM!!!" :anim :talk-angry :stop? false) + (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :reset) + (particle-effect! (get-in @entities [:room :entities :magic-frog-particle]) :start) + (Thread/sleep 1500) + (actions/transition-background entities :outside-house [257 90] :face :left))} + "Okay, okay, I'm leaving." + {:run + #(do + (actions/talk entities :ego %) + (actions/transition-background entities :outside-house [257 90] :face :left))}]} + "Okay, okay, I'm leaving." {:run #(do - (actions/respond entities % :wizard "Now scram!") + (actions/talk entities :ego %) + (actions/talk entities :wizard "Okay, okay, I'm leaving." :anim :talk-angry) (actions/transition-background entities :outside-house [257 90] :face :left))}]})) @@ -342,7 +391,7 @@ :interactions {:door {:box [250 100 281 160] :script - (actions/get-unsaved-script + (actions/get-script entities (actions/walk-to entities :ego [257 90] :face :right) (actions/talk entities :ego (str "Anyone home?")) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 38bcbc3a..b19c5f6e 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -339,6 +339,8 @@ void main() (texture (aget fire-sheet 0 i)))) grow (animation 0.1 (for [i [0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 3 0 0 0 0 3 0 0 0 3 3 0 0 0 2 2 0 0 2 0 0 2 0 2 0 2 0 2 0 2 0 2 3 2 3 2 3 2 3 2 4 3 4 3 4 3 4]] (texture (aget grow-sheet 0 i)))) + frog (utils/make-anim "ego/frog.png" [16 36] 0.1 [0]) + frog-nod (utils/make-anim "ego/frog.png" [16 36] 0.2 [0 1 0 1 0 1 0 1]) hold-up-to-window (utils/make-anim "ego/hold-up-to-window.png" [18 36] 0.1 [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 1 0 0 0 0 0 0]) jump (utils/make-anim "ego/swing.png" [36 75] 0.2 (flatten [[1 2]])) swing (utils/make-anim "ego/swing.png" [36 75] 0.145 (flatten [[3 4 5 6 7 ]])) @@ -403,6 +405,8 @@ void main() :burnt burnt :passed-out passed-out :scared scared + :frog frog + :frog-nod frog-nod :scared-talk scared-talk :scared-walk scared-walk :sigh sigh @@ -452,6 +456,8 @@ void main() :milk (utils/flip milk) :throw (utils/flip throw) :swing-shovel (utils/flip swing-shovel) + :frog (utils/flip frog) + :frog-nod (utils/flip frog-nod) :love (utils/flip love) :idea (utils/flip idea) :axe (utils/flip axe)