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

more grandma refinement.

Browse Source
This commit is contained in:
Remington Covert
2014-12-13 10:35:48 -08:00
parent 3572a09227
commit cbc1497f74
16 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@
(actions/talk entities :ego "I got it! I will become the greatest knight Remington has ever known!"))
(defn try-to-pull-sword [entities missing-items obtained-items]
(let [item->proof {:trophy "wisdom" :medal "strength" :certificate "courage"}]
(let [item->proof {:trophy "wisdom" :medal "strength" :kiss "courage"}]
(actions/play-animation entities :ego :reach)
(actions/do-dialogue entities
:ego "I can't pull it out!"
@@ -159,8 +159,8 @@
(do (actions/talk entities :ego "That's the coolest sword I've ever seen!!")
(actions/walk-to entities :ego [37 134] :face :left)
(actions/talk entities :ego "If I pull it out I can become a great knight!")
(let [missing-items (set/difference #{:trophy :medal :certificate} (get-in @entities [:state :obtained-items]))
obtained-items (set/intersection #{:trophy :medal :certificate} (get-in @entities [:state :obtained-items]))]
(let [missing-items (set/difference #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))
obtained-items (set/intersection #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))]
(if (= #{} missing-items)
(pull-sword entities)
(try-to-pull-sword entities missing-items obtained-items)))))
@@ -203,9 +203,6 @@
:anim trophy
:anim-start 0
:script (actions/get-script entities
(actions/give entities :trophy)
(actions/give entities :certificate)
(actions/give entities :medal)
(walk-to-player entities)
(if (= nil (get-in @entities [:state :current-riddle]))
(let [{:keys [run choices]} (nice-trophy-dialogue entities)]