notid/gitea-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blergh can appear.

Browse Source
This commit is contained in:
Remington Covert
2014-12-20 18:55:32 -08:00
parent 0876b70c99
commit c58f548ca2
15 changed files with 61 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/src-common/advent/actions.clj
View File

@@ -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)

6
desktop/src-common/advent/screens/rooms/space.clj
View File

@@ -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)

9
desktop/src-common/advent/screens/scene.clj
View File

@@ -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)