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

a little better feedback for bull/flies mixup.

Browse Source
This commit is contained in:
Bryce Covert
2016-06-15 18:22:51 -07:00
parent ea0a30540c
commit 82c8c93858
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,6 +317,13 @@
(utils/remove-interaction :wares)
add-note-if-necessary))
(defn feed-bull [entities]
(actions/walk-to entities :ego [168 150] :face :right)
(actions/play-animation entities :ego :reach)
(actions/remove-item entities :grass)
(actions/talk entities :ego "Eww! He slobbered on my hand.")
(actions/give entities :slobber))
(defn make [screen]
(let [peddler-sheet (texture! (utils/get-texture "outside-castle/peddler-talk.png" ) :split 18 36)
peddler-talk (animation 0.18 (for [i (flatten [2 3 2 3 2 3 6 1 0 1 0 1 0 1 0 1 2 3 2 3 2 3 6 4 5 4 5 4 5 4 5])]
@@ -424,12 +431,7 @@
:ego "Farmer Doug feeds him a wild high-protein grass diet to keep him in tiptop shape."
:ego "Phew! His stench has attracted a lot of flies."))
:scripts #(condp = %
:grass (actions/get-script entities
(actions/walk-to entities :ego [168 150] :face :right)
(actions/play-animation entities :ego :reach)
(actions/remove-item entities :grass)
(actions/talk entities :ego "Eww! He slobbered on my hand.")
(actions/give entities :slobber))
:grass (actions/get-script entities (feed-bull entities))
:carrot (actions/get-script entities
(actions/walk-to entities :ego [168 150] :face :right)
(actions/do-dialogue entities
@@ -440,7 +442,7 @@
(actions/walk-to entities :ego [168 150] :face :right)
(actions/do-dialogue entities
:ego "I don't thing Angus is interested."
:ego "Farmer Doug only feeds him a wild high-protein grass."))
:ego "Those flies sure seem to like the stench!"))
:flask-1-strength (actions/get-script entities
(actions/do-dialogue entities
:ego "He's buff enough as it is!"
@@ -468,7 +470,8 @@
:anim flies-stand
:anim-start 0
:baseline 240
:scripts {:sack-lunch (actions/get-script entities
:scripts {:grass (actions/get-script entities (feed-bull entities))
:sack-lunch (actions/get-script entities
(actions/walk-to entities :ego [168 150] :face :right)
(actions/talk entities :ego "Maybe I can catch some of these flies.")
(actions/remove-item entities :sack-lunch)