diff --git a/desktop/resources/space/blergh-appear.png b/desktop/resources/space/blergh-appear.png new file mode 100644 index 00000000..09f9694b Binary files /dev/null and b/desktop/resources/space/blergh-appear.png differ diff --git a/desktop/resources/space/blergh-appear.pxa/0.pxi b/desktop/resources/space/blergh-appear.pxa/0.pxi new file mode 100644 index 00000000..fc15f813 Binary files /dev/null and b/desktop/resources/space/blergh-appear.pxa/0.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/1.pxi b/desktop/resources/space/blergh-appear.pxa/1.pxi new file mode 100644 index 00000000..2c2af843 Binary files /dev/null and b/desktop/resources/space/blergh-appear.pxa/1.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/2.pxi b/desktop/resources/space/blergh-appear.pxa/2.pxi new file mode 100644 index 00000000..bcb073ee Binary files /dev/null and b/desktop/resources/space/blergh-appear.pxa/2.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/3.pxi b/desktop/resources/space/blergh-appear.pxa/3.pxi new file mode 100644 index 00000000..bee56c84 Binary files /dev/null and b/desktop/resources/space/blergh-appear.pxa/3.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/4.pxi b/desktop/resources/space/blergh-appear.pxa/4.pxi new file mode 100644 index 00000000..43b9fd98 Binary files /dev/null and b/desktop/resources/space/blergh-appear.pxa/4.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/5.pxi b/desktop/resources/space/blergh-appear.pxa/5.pxi new file mode 100644 index 00000000..e652fcc8 Binary files /dev/null and b/desktop/resources/space/blergh-appear.pxa/5.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/6.pxi b/desktop/resources/space/blergh-appear.pxa/6.pxi new file mode 100644 index 00000000..e45f698d Binary files /dev/null and b/desktop/resources/space/blergh-appear.pxa/6.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/7.pxi b/desktop/resources/space/blergh-appear.pxa/7.pxi new file mode 100644 index 00000000..cdb00286 Binary files /dev/null and b/desktop/resources/space/blergh-appear.pxa/7.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/8.pxi b/desktop/resources/space/blergh-appear.pxa/8.pxi new file mode 100644 index 00000000..999c9404 Binary files /dev/null and b/desktop/resources/space/blergh-appear.pxa/8.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/9.pxi b/desktop/resources/space/blergh-appear.pxa/9.pxi new file mode 100644 index 00000000..a26685da Binary files /dev/null and b/desktop/resources/space/blergh-appear.pxa/9.pxi differ diff --git a/desktop/resources/space/blergh-appear.pxa/CelData.plist b/desktop/resources/space/blergh-appear.pxa/CelData.plist new file mode 100644 index 00000000..222d28b8 --- /dev/null +++ b/desktop/resources/space/blergh-appear.pxa/CelData.plist @@ -0,0 +1,46 @@ + + + + + + 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/actions.clj b/desktop/src-common/advent/actions.clj index 4d672fd5..d38fe4ae 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -310,7 +310,9 @@ (begin [this screen entities] (screen! dialogue/choice-screen :on-present-choices :choices dialogue-choices :callback #(reset! selected-index %)) (screen! @(resolve 'advent.screens.scene/scene) :on-deactivate) - (assoc-in entities [:cursor :override] nil)) + (-> entities + (assoc-in [:cursor :override] nil) + (assoc-in [:cursor :current] :main))) (continue [this screen entities] entities) diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index 80fab397..12c96b35 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -27,7 +27,8 @@ blergh-flex (texture "space/blergh-flex.png") blergh-talk-anim (animation 0.3 [blergh-talk blergh-stand]) blergh-stand-anim (animation 0.7 [blergh-flex blergh-stand]) - blergh-swing (utils/make-anim "space/blergh-swing.png" [106 165] 0.1 [0 0 1 2 3 4 ])] + blergh-swing (utils/make-anim "space/blergh-swing.png" [106 165] 0.1 [0 0 1 2 3 4 ]) + blergh-appear (utils/make-anim "space/blergh-appear.png" [106 165] 0.05 (flatten [(range 10) 9 9 9 9 9 9 9 9 9 ]))] (rooms/make :music :town-1 :interactions {} @@ -39,7 +40,8 @@ :anim blergh-stand-anim :anim-start 0 :stand blergh-stand-anim :talk blergh-talk-anim :swing blergh-swing - :script (actions/get-script entities (actions/do-dialogue entities :blergh "Come on! Try and hit me!")) + :appear blergh-appear + :script (actions/get-script entities (actions/play-animation entities :blergh :appear :stop? false) (actions/do-dialogue entities :blergh "Come on! Try and hit me!")) :scripts {:sword (actions/get-script entities (actions/walk-straight-to entities :ego [205 45]) (actions/play-animation entities :ego :swing) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 7dfbffc1..4be6e4e7 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -94,7 +94,14 @@ :blergh "You're still no match for me." :blergh "Give it to me, or I'll make you regret it!") (actions/present-choices entities {:choices ["Ok." - {:run #(do (actions/respond entities % :ego "Here you go."))} + {:run #(do (actions/respond entities % + :ego "Here you go." + :blergh "Yes! Now I can drink this whole thing and can become powerful enough to rule the world!" + :blergh "[GREEN]*gulp*[]" + :blergh "What's this? What's happening?") + (actions/walk-straight-to entities :ego [100 45] :face :right) + (actions/do-dialogue entities :ego "TODO: explosion" + :ego "You win!"))} "No way!" {:run #(do (actions/respond entities % :blergh "Then take this!") (actions/play-animation entities :blergh :swing)