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

bubba leaves.

Browse Source
This commit is contained in:
Bryce Covert
2015-08-14 13:23:27 -07:00
parent 7b6e58cddf
commit 9908c3b2bb
20 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
desktop/src-common/advent/screens/rooms/castle_gate.clj
View File

@@ -138,7 +138,8 @@
(let [stand (utils/make-anim "castle-gate/goon-2.png" [12 32] 0.175 [0 0 0 0 0 0 0 0 0 0 0 0 0 1])
talk (utils/make-anim "castle-gate/goon-2-talk.png" [12 32] 0.175 (range 2))
flip (utils/make-anim "castle-gate/goon-2-flip.png" [12 32] 0.05 [1 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ])
search (utils/make-anim "castle-gate/goon-2-search.png" [24 32] 0.3 [0 1 2 3 2 3 2 1 4 5 6 5 6 7 6 7 6 7 6 1 0])]
search (utils/make-anim "castle-gate/goon-2-search.png" [24 32] 0.3 [0 1 2 3 2 3 2 1 4 5 6 5 6 7 6 7 6 7 6 1 0])
walk (utils/flip (utils/make-anim "castle-gate/goon-2-walk.png" [24 34] 0.075 (range 7)))]
(assoc (animation->texture screen stand)
:x 214 :y 102 :baseline 151
:scale-x 1.4
@@ -148,10 +149,12 @@
:anim stand
:talk talk
:flip flip
:walk walk
:search search
:anim-merges {search {:origin-x 12}
talk {:origin-x 6}
:default {:origin-x 6}}
:anim-merges {search {:origin-x 12 :origin-y 0}
talk {:origin-x 6 :origin-y 0}
walk {:origin-x 12 :origin-y 3}
:default {:origin-x 6 :origin-y 0}}
:update-fn (fn [s es e]
(if (and (= (:flip e) (:anim e))
(animation! (:flip e)
@@ -184,8 +187,9 @@
(actions/update-state entities (fn [s] (assoc s :has-dropped-coin? true)))
(actions/talk entities :goon-2 "You made me lose my coin, Dipstick!" :anim :search)
(actions/talk entities :ego "Umm, sorry!"))
(actions/do-dialogue entities :ego "Hey Bubba!"
:goon-2 "Beat it, Dipstick.")))
(do
(actions/do-dialogue entities :ego "Hey Bubba!"
:goon-2 "Beat it, Dipstick."))))
:night-profile :sprite
:anim-start 0
:stand stand)))

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

@@ -221,6 +221,10 @@
(frankie-comment-on-item entities)
(actions/do-dialogue entities
:frankie "Bubba, put this stuff in the secret stash."
:goon-2 "You got it boss"
)
(actions/walk-straight-to entities :goon-2 [0 100])
(actions/do-dialogue entities
:frankie "Now move along."
:frankie "Before we decide to take all of your stuff."
:ego "But I need that slingshot!"