diff --git a/desktop/resources/wizard/experiment.png b/desktop/resources/wizard/experiment.png new file mode 100644 index 00000000..19bff487 Binary files /dev/null and b/desktop/resources/wizard/experiment.png differ diff --git a/desktop/resources/wizard/experiment.pxa/0.pxi b/desktop/resources/wizard/experiment.pxa/0.pxi new file mode 100644 index 00000000..ac521b25 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/0.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/1.pxi b/desktop/resources/wizard/experiment.pxa/1.pxi new file mode 100644 index 00000000..f2fffd9f Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/1.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/10.pxi b/desktop/resources/wizard/experiment.pxa/10.pxi new file mode 100644 index 00000000..d3fde7e3 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/10.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/11.pxi b/desktop/resources/wizard/experiment.pxa/11.pxi new file mode 100644 index 00000000..8e0270ca Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/11.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/12.pxi b/desktop/resources/wizard/experiment.pxa/12.pxi new file mode 100644 index 00000000..e703e3be Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/12.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/13.pxi b/desktop/resources/wizard/experiment.pxa/13.pxi new file mode 100644 index 00000000..f3c7d1c6 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/13.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/14.pxi b/desktop/resources/wizard/experiment.pxa/14.pxi new file mode 100644 index 00000000..001d317b Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/14.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/15.pxi b/desktop/resources/wizard/experiment.pxa/15.pxi new file mode 100644 index 00000000..ce190e40 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/15.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/16.pxi b/desktop/resources/wizard/experiment.pxa/16.pxi new file mode 100644 index 00000000..6e78747d Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/16.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/17.pxi b/desktop/resources/wizard/experiment.pxa/17.pxi new file mode 100644 index 00000000..09451fec Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/17.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/18.pxi b/desktop/resources/wizard/experiment.pxa/18.pxi new file mode 100644 index 00000000..d2e07bc5 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/18.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/19.pxi b/desktop/resources/wizard/experiment.pxa/19.pxi new file mode 100644 index 00000000..1750f37d Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/19.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/2.pxi b/desktop/resources/wizard/experiment.pxa/2.pxi new file mode 100644 index 00000000..0d182649 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/2.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/20.pxi b/desktop/resources/wizard/experiment.pxa/20.pxi new file mode 100644 index 00000000..26083297 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/20.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/21.pxi b/desktop/resources/wizard/experiment.pxa/21.pxi new file mode 100644 index 00000000..3245acc2 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/21.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/22.pxi b/desktop/resources/wizard/experiment.pxa/22.pxi new file mode 100644 index 00000000..4eb1484e Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/22.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/23.pxi b/desktop/resources/wizard/experiment.pxa/23.pxi new file mode 100644 index 00000000..34089c5b Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/23.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/24.pxi b/desktop/resources/wizard/experiment.pxa/24.pxi new file mode 100644 index 00000000..e68db4d8 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/24.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/25.pxi b/desktop/resources/wizard/experiment.pxa/25.pxi new file mode 100644 index 00000000..42a913f9 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/25.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/26.pxi b/desktop/resources/wizard/experiment.pxa/26.pxi new file mode 100644 index 00000000..2a695b52 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/26.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/27.pxi b/desktop/resources/wizard/experiment.pxa/27.pxi new file mode 100644 index 00000000..6b952016 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/27.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/28.pxi b/desktop/resources/wizard/experiment.pxa/28.pxi new file mode 100644 index 00000000..e97e8f30 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/28.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/29.pxi b/desktop/resources/wizard/experiment.pxa/29.pxi new file mode 100644 index 00000000..c89136df Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/29.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/3.pxi b/desktop/resources/wizard/experiment.pxa/3.pxi new file mode 100644 index 00000000..36abdc0b Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/3.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/30.pxi b/desktop/resources/wizard/experiment.pxa/30.pxi new file mode 100644 index 00000000..ef654b44 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/30.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/31.pxi b/desktop/resources/wizard/experiment.pxa/31.pxi new file mode 100644 index 00000000..bbd25668 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/31.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/32.pxi b/desktop/resources/wizard/experiment.pxa/32.pxi new file mode 100644 index 00000000..7ad9eab5 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/32.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/33.pxi b/desktop/resources/wizard/experiment.pxa/33.pxi new file mode 100644 index 00000000..62ecc29d Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/33.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/34.pxi b/desktop/resources/wizard/experiment.pxa/34.pxi new file mode 100644 index 00000000..de8404c9 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/34.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/35.pxi b/desktop/resources/wizard/experiment.pxa/35.pxi new file mode 100644 index 00000000..1dfe26a9 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/35.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/36.pxi b/desktop/resources/wizard/experiment.pxa/36.pxi new file mode 100644 index 00000000..9711c824 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/36.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/4.pxi b/desktop/resources/wizard/experiment.pxa/4.pxi new file mode 100644 index 00000000..b1d36d95 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/4.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/5.pxi b/desktop/resources/wizard/experiment.pxa/5.pxi new file mode 100644 index 00000000..a2e74683 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/5.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/6.pxi b/desktop/resources/wizard/experiment.pxa/6.pxi new file mode 100644 index 00000000..fcda9421 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/6.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/7.pxi b/desktop/resources/wizard/experiment.pxa/7.pxi new file mode 100644 index 00000000..cce363e7 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/7.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/8.pxi b/desktop/resources/wizard/experiment.pxa/8.pxi new file mode 100644 index 00000000..51698d90 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/8.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/9.pxi b/desktop/resources/wizard/experiment.pxa/9.pxi new file mode 100644 index 00000000..7ea2d7c6 Binary files /dev/null and b/desktop/resources/wizard/experiment.pxa/9.pxi differ diff --git a/desktop/resources/wizard/experiment.pxa/CelData.plist b/desktop/resources/wizard/experiment.pxa/CelData.plist new file mode 100644 index 00000000..34937242 --- /dev/null +++ b/desktop/resources/wizard/experiment.pxa/CelData.plist @@ -0,0 +1,154 @@ + + + + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + duration + 0.20000000298023224 + + + 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 95cbc095..646fbcff 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -28,10 +28,14 @@ (actions/start-animation screen (merge (assoc (animation->texture screen wizard-stand) :left {:talk (utils/flip wizard-talk) :stand (utils/flip wizard-stand) - :disappear (utils/flip wizard-disappear)} + :disappear (utils/flip wizard-disappear) + } :right {:talk wizard-talk :stand wizard-stand - :disappear wizard-disappear} + :disappear wizard-disappear + } + :origin-x 0 + :origin-y 0 :talk-color (color 0.95 0.3 1.0 1.0) :facing :left) wizard-spec) :stand))) diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index d1774f30..3bb49259 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -37,6 +37,7 @@ (actions/update-state entities #(assoc % :active? false))) (defn do-wizard-dialogue [entities] + (actions/play-animation entities :wizard :experiment) (actions/do-dialogue entities :wizard "What can I do for you boy?") (actions/present-choices entities {:choices ["What's with the safe?" @@ -106,7 +107,8 @@ safe-lock (animation 0.1 (for [i (flatten [(repeat 20 0) 1 2 1 2 1 2 1 2 1 2 1 1 2 1 2 1 2 1 2 1 2 1 (range 3 20) 20 20 20 20 21 21 21 21 21 20 20 21 21 21 21 21 20 20 20 ])] (aget safelock-sheet 0 i))) candle (utils/make-anim (texture "inside-house/candle.png") [34 32] 0.2 [1 0 1 2]) - candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] )] + candle-aura (utils/make-anim (texture "inside-house/candle-aura.png") [27 27] 0.2 [0 1 2 3 2 1] ) + experiment-left (utils/flip (utils/make-anim (texture "wizard/experiment.png" ) [45 55] 0.075 [0 0 0 0 0 0 0 0 0 0 1 1 2 2 2 2 3 3 3 4 4 5 5 6 6 6 6 6 6 7 8 9 9 10 10 11 11 12 12 12 12 12 12 12 12 12 12 12 13 13 14 14 14 14 14 15 15 16 16 17 17 18 18 18 18 19 20 21 21 21 21 21 21 22 23 22 23 22 23 22 23 23 23 23 23 23 23 23 24 24 24 24 24 24 24 24 24 25 26 27 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 29 29 28 28 28 28 29 29 28 28 28 28 28 28 28 28 30 30 30 30 31 32 33 31 31 31 31 31 31 31 31 34 35 36 36 36 36 36 36 36 36 36] ))] (rooms/make :music :inside-fangald :interactions {:down-dir {:box [151 0 320 20] :script (actions/get-script entities @@ -134,7 +136,13 @@ (assoc (texture "inside-house/desk.png") :x 0 :y 0 :baseline 200) (assoc (texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240 :parallax 2.0) (assoc (texture "inside-house/glow.png") :x 0 :y 0 :baseline 199 :additive? true)] - :entities {:wizard (common/make-wizard screen {:x 228 :y 60 :baseline 160 :scale-x 1.75 :scale-y 1.75 :origin-x 0 :origin-y 0 + :entities {:experiment (assoc (animation->texture screen experiment-left) + :x 228 :y 60 :scale-x 1.75 :scale-y 1.75 :origin-x 7.43 :origin-y 0 + :anim experiment-left + :stand experiment-left + :anim-start 0 + :baseline 225) + :wizard (common/make-wizard screen {:x 228 :y 60 :baseline 160 :scale-x 1.75 :scale-y 1.75 :origin-x 0 :origin-y 0 :script (actions/get-script entities (do-wizard-dialogue entities)) :scripts #(condp = % :kiss (actions/get-script entities