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

I can see the fear in your eyes.

Browse Source
This commit is contained in:
Remington Covert
2015-02-18 15:53:41 -08:00
parent 0876119e3e
commit 4789df90f9
12 changed files with 186 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
desktop/src-common/advent/screens/rooms/inside_castle.clj
View File

@@ -145,21 +145,24 @@
(actions/add-entity entities :blergh (get-in @entities [:room :blergh]))
(actions/do-dialogue entities :ego "Who are you?!"
(actions/talk entities :ego "Who are you?!" :anim :scared-talk)
(actions/begin-animation entities :ego :scared)
(actions/do-dialogue entities
:bloodclot-head "I am Bloodclot, the Scottish goblin!"
:bloodclot-head "I've spent last 100 years training for this day."
:bloodclot-head "The day when I must best the worthiest of knights in battle."
:bloodclot-head "But I had never expected my foe to be so..."
:bloodclot-head "... appetizing."
:bloodclot-head "You're no hero. You're just a morsel."
:bloodclot-head "Come here, and I promise I will spare you much pain."
:ego "Wait a second. I'm just a kid.")
:bloodclot-head "Come here, and I promise I will spare you much pain.")
(actions/talk entities :ego "Wait a second. I'm just a kid." :anim :scared-talk)
(actions/walk-straight-to entities :ego [115 45] :override-dir :right)
(actions/do-dialogue entities :ego "I'm just trying to impress Georgia McGorgeous.")
(actions/talk entities :ego "I'm just trying to impress Georgia McGorgeous." :anim :scared-talk)
(actions/walk-straight-to entities :ego [75 45] :override-dir :right)
(actions/do-dialogue entities :ego "I just... accidentally pulled the sword!")
(actions/talk entities :ego "I just... accidentally pulled the sword!":anim :scared-talk)
(actions/walk-straight-to entities :ego [35 45] :override-dir :right)
(actions/do-dialogue entities :ego "I wouldn't taste very good anyhow!")
(actions/talk entities :ego "I wouldn't taste very good anyhow!" :anim :scared-talk)
(actions/begin-animation entities :ego :scared)
(actions/do-dialogue entities
:bloodclot-head "'Fight he must for one more test,\nHe will die if not the best.'"
:bloodclot-head "Ring any bells?"

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

@@ -188,6 +188,8 @@
shock (utils/make-anim "ego/shock.png" [40 48] 0.075 (flatten (repeat 2 [(repeat 5 [0 1 2]) (repeat 5 [3 4 5]) (repeat 5 [6 7 8])])))
burnt (utils/make-anim "ego/burnt.png" [40 46] 0.12 [1 2 3 2 1 2 3 2 1 0 2 0 4 5 6 7 8 9 10 11 10 9 10 11])
passed-out (utils/make-anim "ego/burnt.png" [40 46] 0.12 [9 10 11 10])
scared (utils/make-anim "ego/scared.png" [18 36] 0.05 [0 1])
scared-talk (utils/make-anim "ego/scared.png" [18 36] 0.05 [0 1 0 1 0 1 0 1 2 3 2 3 2 3 2 3])
ego {:right {:walk walk-right
:stand stand-anim
@@ -218,7 +220,9 @@
:pant pant
:shock shock
:burnt burnt
:passed-out passed-out}
:passed-out passed-out
:scared scared
:scared-talk scared-talk}
:left {:walk (utils/flip walk-right)
:stand (utils/flip stand-anim)
:talk (utils/flip talk-anim)
@@ -447,7 +451,7 @@
:inventory (assoc (texture "inventory.png") :x 278 :y 0 :baseline 9000
:mouse-in? (zone/box 278 0 320 42))
:fps (assoc (label "0" (color :white) ) :x 5 :baseline 0)}]
(music! (utils/get-current-music entities) :set-volume (get-in entities [:volume :value]))
(music! (utils/get-current-music entities) :set-volume 0.0 #_(get-in entities [:volume :value]))
(utils/play-sound (get-in entities [:musics (actions/get-music (get-in entities [:room :music]) (get-in entities [:state :time]))]))
@@ -486,7 +490,7 @@
(play-key-sounds (get-in entities [:room :entities]))
(doseq [m (vals (get-in entities [:musics]))]
(when m
(music! m :set-volume (get-in entities [:volume :value]) )))
(music! m :set-volume 0.0 #_(get-in entities [:volume :value]) )))
(label! (:fps entities) :set-text (str (game :fps)))