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

better love.

Browse Source
This commit is contained in:
Bryce Covert
2015-10-10 12:04:56 -07:00
parent 48cde82d75
commit e830e62421
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -836,8 +836,11 @@
:none)))
(defn georgia-say [entities msg]
(transition-music entities :love :duration 0.5)
(Thread/sleep 1000)
(fade-in-georgia entities)
(actions/talk entities :georgia-face msg)
(Thread/sleep 1000)
(fade-out-georgia entities)
(transition-music entities nil :duration 1.0))

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

@@ -427,8 +427,8 @@
(actions/do-dialogue entities
:ego "That's Georgia McGorgeous' house."
:ego "One day, when I'm a knight, she'll say...")
#_(actions/georgia-say entities "Kiss me, brave Sir Tick!")
(actions/in-love entities))}}
(actions/georgia-say entities "Kiss me, brave Sir Tick!")
#_(actions/in-love entities))}}
:layers {:day [(assoc (utils/get-texture "inside-castle/background.png") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "inside-castle/way-back-tree.png") :x 0 :y 0 :baseline 97)
(assoc (utils/get-texture "inside-castle/roof.png") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)

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

@@ -927,7 +927,7 @@ void main()
(utils/update-override screen (assoc-in entities [:cursor :last-pos] [input-x input-y])))
(defn add-georgia-to-all-rooms [screen rooms]
(let [georgia-talk (utils/make-anim "ego/georgia.png" [30 30] 0.2 [0 1 0 1 0 0 1 0 1 2])
(let [georgia-talk (utils/make-anim "ego/georgia.png" [30 30] 0.15 [0 1 0 1 0 0 1 0 1 2])
georgia-stand (utils/make-anim "ego/georgia.png" [30 30] 0.3 [0 0 0 0 0 0 0 2 0 0 0 0 2])
georgia-love (utils/make-anim "ego/in-love.png" [30 30] 0.1 [0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 4 5 6 7 8 9 10 11 12 13 14 14 14 15 15 15 14 14 14 14 14 14 14 14 15 15 15 15 15 14 14 14 14 15 15 15 15 15 15 14 14 14 14 14])