squat talk

This commit is contained in:
Bryce Covert
2016-02-17 22:25:24 -08:00
parent c59cfc5f92
commit 93910187ab
19 changed files with 1125 additions and 1077 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
<dict>
<key>duration</key>
<real>1</real>
</dict>
</array>
</plist>

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 KiB

After

Width:  |  Height:  |  Size: 244 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 83 KiB

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 298 KiB

After

Width:  |  Height:  |  Size: 247 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 148 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 KiB

After

Width:  |  Height:  |  Size: 153 KiB

View File

@@ -957,3 +957,10 @@
(constantly (get-in @entities [:cam :zoom]))
nil
(* 0.01 (inc n)))))
(defn squat-talk [entities & msgs]
(when (seq msgs)
(do
(actions/talk entities :ego (first msgs) :anim :squat-talk :stop? false)
(Thread/sleep 200)
(recur entities (rest msgs)))))

View File

@@ -84,17 +84,21 @@
(actions/do-stop entities :ego :face :left)
(actions/do-stop entities :ego :face :right)))
(defn read-sword-plaque [entities]
(actions/walk-to entities :ego [168 76] :face :left)
(if-not (get-in @entities [:state :plaques-read :sword])
(do
(actions/talk entities :ego "There's a plaque here.")
(actions/play-animation entities :ego :squat)
(actions/play-animation entities :ego :start-squat-2 :stop? false)
(actions/squat-talk entities
"\"A noble choice to be a knight.\nStrength and valor guard thee from fright."
"Theres no need to shove\nTo find thy true love,"
"'Cause maidens swoon for guys with might.\"")
(actions/play-animation entities :ego :end-squat)
(actions/do-dialogue entities
:ego "\"A noble choice to be a knight.\nStrength and valor guard thee from fright."
:ego "Theres no need to shove\nTo find thy true love,"
:ego "'Cause maidens swoon for guys with might.\""
:ego "Awesome!"
:ego "If I become a knight, maybe Georgia McGorgeous will love me!")
(actions/in-love entities))
@@ -112,14 +116,17 @@
:fairy-godfather "And you're just not cut out for it!"))
(actions/update-state entities #(update-in % [:plaques-read] conj :sword)))
(defn read-broom-plaque [entities]
(actions/walk-to entities :ego [267 70] :face :right)
(actions/talk entities :ego "There's a plaque here.")
(actions/play-animation entities :ego :squat)
(actions/do-dialogue entities
:ego "\"Grab thy broom, son, and sweep that dirt!\nSweep and mop till thy armpits hurt."
:ego "Thou smell like a hog,\nWith stench like a fog,"
:ego "So with thou no cute babes wouldst flirt.\"")
(actions/play-animation entities :ego :start-squat-2 :stop? false)
(actions/squat-talk entities
"\"Grab thy broom, son, and sweep that dirt!\nSweep and mop till thy armpits hurt."
"Thou smell like a hog,\nWith stench like a fog,"
"So with thou no cute babes wouldst flirt.\"")
(actions/play-animation entities :ego :end-squat)
(actions/play-animation entities :ego :sigh)
(when-not (get-in @entities [:room :entities :fairy-godfather :distracted?])
@@ -136,11 +143,12 @@
(defn read-shovel-plaque [entities]
(actions/walk-to entities :ego [61 72] :face :left)
(actions/talk entities :ego "There's a plaque here.")
(actions/play-animation entities :ego :squat)
(actions/do-dialogue entities
:ego "\"With thy shovel thou will enroll\nFor the dead man a resting hole."
:ego "Thou doth own the night\nBut beware the plight:"
:ego "Thou will not wed, if twas thy goal.\"")
(actions/play-animation entities :ego :start-squat-2 :stop? false)
(actions/squat-talk entities
"\"With thy shovel thou will enroll\nFor the dead man a resting hole."
"Thou doth own the night\nBut beware the plight:"
"Thou will not wed, if twas thy goal.\"")
(actions/play-animation entities :ego :end-squat)
(actions/play-animation entities :ego :sigh)
(when-not (get-in @entities [:room :entities :fairy-godfather :distracted?])
(face-fairy entities)

View File

@@ -314,11 +314,12 @@
(actions/do-dialogue entities
:ego "I can't pull it out!"
:ego "It looks like there's an inscription here.")
(actions/play-animation entities :ego :squat)
(actions/do-dialogue entities
:ego "\"In the day when I shall be pulled,\nWith much strength a knight will take hold."
:ego "Courage will he need,\nWisdom he shall heed."
:ego "A final test remains, behold!\"")
(actions/play-animation entities :ego :start-squat-2 :stop? false)
(actions/squat-talk entities
"\"In the day when I shall be pulled,\nWith much strength a knight will take hold."
"Courage will he need,\nWisdom he shall heed."
"A final test remains, behold!\"")
(actions/play-animation entities :ego :end-squat)
(if (= 3 (count missing-items))
(do
(actions/walk-to entities :ego [115 54])

View File

@@ -513,6 +513,7 @@ void main ()
(texture (aget fire-sheet 0 i))))
grow (animation 0.1 (for [i [0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 3 0 0 0 0 3 0 0 0 3 3 0 0 0 2 2 0 0 2 0 0 2 0 2 0 2 0 2 0 2 0 2 3 2 3 2 3 2 3 2 4 3 4 3 4 3 4]]
(texture (aget grow-sheet 0 i))))
squat-talk (utils/make-anim "ego/squat-talk.png" [18 36] 0.2 [0 1 0 2 1 0 3])
frog (utils/make-anim "ego/frog.png" [16 36] 0.1 [0])
frog-nod (utils/make-anim "ego/frog.png" [16 36] 0.2 [0 1 0 1 0 1 0 1])
hold-up-to-window (utils/make-anim "ego/hold-up-to-window.png" [18 36] 0.1 [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 1 0 0 0 0 0 0])
@@ -563,6 +564,7 @@ void main ()
:stand stand-anim
:talk talk-anim
:squat squat-anim
:squat-talk squat-talk
:start-squat start-squat
:start-squat-2 start-squat-2
:end-squat end-squat
@@ -621,6 +623,7 @@ void main ()
:left {:walk (utils/flip walk-right)
:stand (utils/flip stand-anim)
:talk (utils/flip talk-anim)
:squat-talk (utils/flip squat-talk)
:start-squat (utils/flip start-squat)
:start-squat-2 (utils/flip start-squat-2)
:end-squat (utils/flip end-squat)