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

tweaks!

Browse Source
This commit is contained in:
Bryce Covert
2015-07-26 15:53:45 -07:00
parent 060dd49fd5
commit 59ef2e4a45
9 changed files with 31 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,6 +144,7 @@
:script (actions/get-script entities
(actions/talk entities :ego "That's a big window!"))
:scripts {:walkie-talkies (actions/get-script entities
(actions/play-animation entities :ego :idea)
(actions/walk-to entities :ego [285 71])
(actions/walk-straight-to entities :ego [308 105] :face :left)
(actions/add-entity entities :walkie-talkies (actions/start-animation (get-in @entities [:room :walkie-talkies])

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

@@ -239,7 +239,9 @@
(do
(actions/walk-to entities :ego [60 100] :face :left)
(actions/play-animation entities :ego :reach)
(actions/give entities :grass))
(actions/give entities :grass)
(actions/do-dialogue entities :ego "Grass."
:ego "It's a high protein variety."))
(actions/talk entities :ego "I don't really need any more grass.")))}
:grandma {:box [109 33 132 98]
:script (actions/get-script entities (do-grandma-dialogue entities))

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

@@ -60,7 +60,7 @@
:ego "'And please hurry, because we're being forced into a karaoke competition.'"
:ego "'I'm about at my witt's end.'"
:ego "'P.S., Guard that slingshot with your life!'"
:ego "'P.P.S., If anything goes wrong, you can look for my secret stash of helpful stuff behind a nearby r...'"
:ego "'P.P.S., You can look for my secret stash of helpful stuff behind a nearby r...'"
:ego "It just cuts off there."))
(defn read-note-2 [entities]

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

@@ -46,7 +46,7 @@
:shopkeep "Why?"
:shopkeep "It belonged to my long lost son."
:shopkeep "Why should I give it to you?")
:choices ["I just need it ok?"
:choices ["Because it's the choicest toy I've ever seen!"
{:run #(actions/respond entities %
:shopkeep "I'm sorry, it's not for sale.")
:choices actions/something-else}
@@ -97,7 +97,7 @@
:script (actions/get-script entities
(actions/walk-to entities :ego [140 61] :face :left)
(actions/play-animation entities :ego :reach)
(actions/talk entities :ego "It's a portrait. There's something on the back but I can't read it.")
(actions/talk entities :ego "It's a portrait. There's something on the back but it's too dim to read.")
(actions/remove-entity entities :portrait)
(actions/give entities :portrait))))
beard (utils/make-anim "inside-antique/beard.png" [26 52] 0.5 [0 1 0 2])

3
desktop/src-common/advent/screens/rooms/inside_cafeteria.clj
View File

@@ -67,7 +67,8 @@
(actions/do-dialogue entities
:warriors "Congratulations young master. Thou art worthy in might."
:warriors "Take thy servant's medal of strength.")
(actions/give entities :medal))
(actions/give entities :medal)
(actions/glad entities))
(do
(play-battle entities :lose)
(actions/do-dialogue entities

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

@@ -36,7 +36,9 @@
:peddler "Well I'm afraid you won't have the choicest of earplugs."
:ego "Can't I give you something else for them?"
:peddler "I'll tell you what, I don't have any thing for the kids that come to my stand."
:peddler "If you can bring me the choicest of toys, and I mean the choicest of toys, I will give you the earplugs."))}
:peddler "If you can bring me the choicest of toys..."
:peddler "... and I mean the choicest of toys... "
:peddler "I will give you the earplugs."))}
"I'm interested in a glass eye."
{:run #(do (actions/update-state entities (fn [state] (assoc state :wants-toy true)))
(actions/respond entities %
@@ -48,7 +50,10 @@
:peddler "Well I'm afraid you won't have the choicest of glass eyes."
:ego "Can't I give you something else for them?"
:peddler "I'll tell you what, I don't have any thing for the kids that come to my stand."
:peddler "If you can bring me the choicest of toys, I will give you the glass eye."))}
:peddler "If you can bring me the choicest of toys..."
:peddler "... and I mean the choicest of toys... "
:peddler "Then I'll give you the glass eye."
))}
"I'm interested in the motivational tapes."
{:run #(do (actions/update-state entities (fn [state] (assoc state :wants-toy true)))
(actions/respond entities %
@@ -60,7 +65,10 @@
:peddler "Well I'm afraid you won't have the choicest of motivational tapes."
:ego "Is there anything else you'd take instead?"
:peddler "I'll tell you what, I don't have any thing for the kids that come to my stand."
:peddler "If you can bring me the choicest of kid's toys, I will give you the tapes."))}
:peddler "If you can bring me the choicest of toys..."
:peddler "... and I mean the choicest of toys... "
:peddler "Then I'll give you the motivational tapes."
))}
"Nevermind." {:run #(actions/respond entities % :peddler "Goodbye, sir.")}]}))
(defn give-teddy [entities]
@@ -351,6 +359,12 @@
(actions/do-dialogue entities
:ego "I don't thing Angus is interested."
:ego "Farmer Doug only feeds him a wild high-protein grass."))
:sack-lunch (actions/get-script entities
(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."))
nil))
:stand)
:balloons (actions/start-animation screen