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

minor dialogue tweaks.

Browse Source
This commit is contained in:
Bryce Covert
2016-02-15 22:52:57 -08:00
parent 8a05f8c32a
commit bdf44b8760
3 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
desktop/src-common/advent/screens/rooms/cat_tree.clj
View File

@@ -369,7 +369,13 @@
(actions/do-dialogue entities :ego "A kiss for an inventory item?" (actions/do-dialogue entities :ego "A kiss for an inventory item?"
:ego "Sounds like the game designer was running out of good ideas.") :ego "Sounds like the game designer was running out of good ideas.")
(steam/set-achievement "KITTY_KISS")) (steam/set-achievement "KITTY_KISS"))
(actions/talk entities :ego "I guess I'm too far away."))) (actions/talk entities :ego "I can't get his attention from way down here.")))
:stick (actions/get-script entities
(if (get-in @entities [:room :entities :ladder])
(actions/do-dialogue entities
:ego "He's still too far for me to poke him."
:ego "Maybe I can encourage him to come down on his own.")
(actions/talk entities :ego "I can't poke him from way down here.")))
:default (actions/get-script entities (actions/talk entities :ego "Kitty seems disinterested in it."))}) :default (actions/get-script entities (actions/talk entities :ego "Kitty seems disinterested in it."))})
cat-stand) cat-stand)
:grandma (let [gma (assoc (animation->texture screen grandma-stand) :grandma (let [gma (assoc (animation->texture screen grandma-stand)

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

@@ -472,7 +472,11 @@
(actions/talk entities :ego "I think it's working!") (actions/talk entities :ego "I think it's working!")
(actions/play-animation entities :ego :squat) (actions/play-animation entities :ego :squat)
(actions/give entities :flies) (actions/give entities :flies)
(actions/talk entities :ego "Hopefully, they won't fly out of my backpack."))} (actions/talk entities :ego "Hopefully, they won't fly out of my backpack."))
:frog-legs (actions/get-script entities
(actions/do-dialogue entities
:ego "It's a little late for a last meal."
:ego "Plus, these are just legs. This frog doesn't even have a mouth."))}
)} )}
:note (rooms/make-entity :note (assoc (utils/get-texture "outside-castle/note.png") :note (rooms/make-entity :note (assoc (utils/get-texture "outside-castle/note.png")
:x 198 :y 66 :baseline 174 :x 198 :y 66 :baseline 174

46
desktop/src-common/advent/screens/rooms/outside_house.clj
View File

@@ -699,29 +699,31 @@
:script (actions/get-script :script (actions/get-script
entities entities
(if (actions/has-item? entities :wool) (if (= 3 (get-in @entities [:state :wool-count]))
(actions/talk entities :ego "Maybe I should use the wool I have before taking any more.") (actions/talk entities :ego "Do you think she feels sheepish without any clothes?")
(if (is-sheep-close? @entities)
(do (walk-to-sheep entities)
(actions/play-animation entities :ego :reach)
(actions/update-state entities #(assoc % :wool-count (inc (or (:wool-count %) 0))))
(when (= 3 (get-in @entities [:state :wool-count]))
(steam/set-achievement "SHEEP_HORDER"))
(actions/update-entities entities #(update-in (if (actions/has-item? entities :wool)
% [:room :entities :sheep] (actions/talk entities :ego "Maybe I should use the wool I have before taking any more.")
(fn [s] (if (is-sheep-close? @entities)
(let [which (get-in % [:state :wool-count])] (do (walk-to-sheep entities)
(assoc s :anim (get s [:stand which])))))) (actions/play-animation entities :ego :reach)
(actions/give entities :wool) (actions/update-state entities #(assoc % :wool-count (inc (or (:wool-count %) 0))))
(actions/talk entities :ego "I guess her wool is shedding.") (when (= 3 (get-in @entities [:state :wool-count]))
) (steam/set-achievement "SHEEP_HORDER"))
(do
(walk-to-sheep entities) (actions/update-entities entities #(update-in
(actions/talk entities :ego "Come here, mama sheep!") % [:room :entities :sheep]
(actions/play-animation entities :ego :sigh) (fn [s]
(actions/talk entities :ego "She's too far away for me to pet her.") (let [which (get-in % [:state :wool-count])]
)))) (assoc s :anim (get s [:stand which]))))))
(actions/give entities :wool)
(actions/talk entities :ego "I guess her wool is shedding."))
(do
(walk-to-sheep entities)
(actions/talk entities :ego "Come here, mama sheep!")
(actions/play-animation entities :ego :sigh)
(actions/talk entities :ego "She's too far away for me to pet her.")
)))))
:scripts #(condp = % :scripts #(condp = %
:wool (actions/get-script entities :wool (actions/get-script entities
(actions/talk entities :ego "She doesn't need it back.")) (actions/talk entities :ego "She doesn't need it back."))