diff --git a/desktop/resources/inside-house/disappear.ogg b/desktop/resources/inside-house/disappear.ogg new file mode 100644 index 00000000..d37b2919 Binary files /dev/null and b/desktop/resources/inside-house/disappear.ogg differ diff --git a/desktop/resources/inside-house/disappear.wav b/desktop/resources/inside-house/disappear.wav new file mode 100644 index 00000000..18b66311 Binary files /dev/null and b/desktop/resources/inside-house/disappear.wav differ diff --git a/desktop/resources/wizard/disappear.png b/desktop/resources/wizard/disappear.png new file mode 100644 index 00000000..4bff03a0 Binary files /dev/null and b/desktop/resources/wizard/disappear.png differ diff --git a/desktop/resources/wizard/disappear.pxa/0.pxi b/desktop/resources/wizard/disappear.pxa/0.pxi new file mode 100644 index 00000000..e448325b Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/0.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/1.pxi b/desktop/resources/wizard/disappear.pxa/1.pxi new file mode 100644 index 00000000..de0c5a9a Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/1.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/10.pxi b/desktop/resources/wizard/disappear.pxa/10.pxi new file mode 100644 index 00000000..1a3c31ba Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/10.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/11.pxi b/desktop/resources/wizard/disappear.pxa/11.pxi new file mode 100644 index 00000000..30f1669a Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/11.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/12.pxi b/desktop/resources/wizard/disappear.pxa/12.pxi new file mode 100644 index 00000000..bdef4374 Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/12.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/13.pxi b/desktop/resources/wizard/disappear.pxa/13.pxi new file mode 100644 index 00000000..2f74e20d Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/13.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/14.pxi b/desktop/resources/wizard/disappear.pxa/14.pxi new file mode 100644 index 00000000..f8b2ff6b Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/14.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/15.pxi b/desktop/resources/wizard/disappear.pxa/15.pxi new file mode 100644 index 00000000..d006014c Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/15.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/16.pxi b/desktop/resources/wizard/disappear.pxa/16.pxi new file mode 100644 index 00000000..006460e7 Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/16.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/17.pxi b/desktop/resources/wizard/disappear.pxa/17.pxi new file mode 100644 index 00000000..7cc14d81 Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/17.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/18.pxi b/desktop/resources/wizard/disappear.pxa/18.pxi new file mode 100644 index 00000000..1624933b Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/18.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/2.pxi b/desktop/resources/wizard/disappear.pxa/2.pxi new file mode 100644 index 00000000..68e1761e Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/2.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/3.pxi b/desktop/resources/wizard/disappear.pxa/3.pxi new file mode 100644 index 00000000..ad3caeff Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/3.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/4.pxi b/desktop/resources/wizard/disappear.pxa/4.pxi new file mode 100644 index 00000000..a100a167 Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/4.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/5.pxi b/desktop/resources/wizard/disappear.pxa/5.pxi new file mode 100644 index 00000000..2acd4a77 Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/5.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/6.pxi b/desktop/resources/wizard/disappear.pxa/6.pxi new file mode 100644 index 00000000..ed538b91 Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/6.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/7.pxi b/desktop/resources/wizard/disappear.pxa/7.pxi new file mode 100644 index 00000000..90b6aaed Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/7.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/8.pxi b/desktop/resources/wizard/disappear.pxa/8.pxi new file mode 100644 index 00000000..4d2a2306 Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/8.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/9.pxi b/desktop/resources/wizard/disappear.pxa/9.pxi new file mode 100644 index 00000000..db4aed94 Binary files /dev/null and b/desktop/resources/wizard/disappear.pxa/9.pxi differ diff --git a/desktop/resources/wizard/disappear.pxa/CelData.plist b/desktop/resources/wizard/disappear.pxa/CelData.plist new file mode 100644 index 00000000..b0a4961c --- /dev/null +++ b/desktop/resources/wizard/disappear.pxa/CelData.plist @@ -0,0 +1,82 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 1488eba3..b39b0f9a 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -75,6 +75,8 @@ :wizard "Already?" :wizard "Ok, I'll deliver them myself. Don't touch anything while I'm gone.") (actions/update-state entities (fn [s] (assoc s :mints-eaten 0))) + (sound! (sound "inside-house/disappear.ogg") :play) + (actions/play-animation entities :wizard :disappear :stop? false) (actions/remove-entity entities :wizard))} "Nevermind." {:run #(actions/do-dialogue entities :ego %)}]})) @@ -83,6 +85,7 @@ (let [wizard-sheet (texture! (texture "wizard/talk.png") :split 20 46) wizard-stand (animation 0.2 (for [i (flatten [(repeat 10 0) 1])] (aget wizard-sheet 0 i))) + 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))) safelock-sheet (texture! (texture "inside-house/safe-lock.png") :split 9 2) @@ -106,9 +109,11 @@ (assoc (texture "inside-house/sillhoute.png") :x 0 :y 0 :baseline 240)] :entities {:wizard (actions/start-animation screen (assoc (animation->texture screen wizard-stand) :x 228 :y 80 :baseline 160 :scale-x 1.75 :scale-y 1.75 :left {:talk (utils/flip wizard-talk) - :stand (utils/flip wizard-stand)} + :stand (utils/flip wizard-stand) + :disappear (utils/flip wizard-disappear)} :right {:talk wizard-talk - :stand wizard-stand} + :stand wizard-stand + :disappear wizard-disappear} :facing :left :script (actions/get-script entities (do-wizard-dialogue entities))) :stand) @@ -128,5 +133,6 @@ (as-> entities entities (if (actions/has-one-of? entities [:flask-1 :flask-1-with-cream-of-mushroom :flask-1-strength :flask-1-with-mushrooms :flask-1-with-milk]) (update-in entities [:room :entities] #(dissoc % :flask)) - entities))) + entities) + (assoc-in entities [:state :mints-eaten] 3))) :start-pos [237 0])))