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

tweaked logic for bubba leaving. can't leave if you've got the slingshot.

Browse Source
This commit is contained in:
Bryce Covert
2016-06-28 08:49:46 -07:00
parent bd797e60be
commit 0c5617d500
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,20 +156,29 @@
:ego "Vote 'Yea' by signing below to pardon him of his crime." :ego "Vote 'Yea' by signing below to pardon him of his crime."
:ego "And vote 'Nay' to exact due justice.\"" :ego "And vote 'Nay' to exact due justice.\""
:ego "Let's see..." :ego "Let's see..."
:ego "It looks like it's perfect tie! 34 to 34!"))) :ego "It looks like it's perfect tie! 34 to 34!"))
(actions/update-state entities #(assoc % :has-read-voting-sheet? true)))
(defn sign-note [entities] (defn sign-note [entities]
(actions/walk-to entities :ego [126 65] :face :left) (actions/walk-to entities :ego [126 65] :face :left)
(if (get-in @entities [:state :has-voted?]) (cond
(actions/do-dialogue entities :ego "Looks like I've already voted.") (not (get-in @entities [:state :has-read-voting-sheet?]))
(do (do
(actions/do-dialogue entities (actions/do-dialogue entities :ego "Let me read it first.")
:ego "It'd be a shame to have Took punished on my account!" (look-at-note entities)
:ego "I'll vote to give him a pardon.") (recur entities))
(actions/play-animation entities :ego :reach)
(actions/do-dialogue entities :ego "There, now the vote is 35 to 34!") (get-in @entities [:state :has-voted?])
(actions/update-state entities #(assoc % :has-voted? true)) (actions/do-dialogue entities :ego "Looks like I've already voted.")
(steam/set-achievement "PARDON")))) :else
(do
(actions/do-dialogue entities
:ego "It'd be a shame to have Took punished on my account!"
:ego "I'll vote to give him a pardon.")
(actions/play-animation entities :ego :reach)
(actions/do-dialogue entities :ego "There, now the vote is 35 to 34!")
(actions/update-state entities #(assoc % :has-voted? true))
(steam/set-achievement "PARDON"))))
(defn make-note [] (defn make-note []
{:box [97 102 111 132] {:box [97 102 111 132]

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

@@ -277,7 +277,8 @@
(actions/do-dialogue entities :frankie "That's only for people in the 'Super secret cool club'!")) (actions/do-dialogue entities :frankie "That's only for people in the 'Super secret cool club'!"))
:choices actions/previous-choices} :choices actions/previous-choices}
(when-not (get-in @entities [:state :bubba-gone?]) (when (and (not (get-in @entities [:state :bubba-gone?]))
(not (actions/has-item? entities :slingshot)))
"I found your secret stash!") "I found your secret stash!")
{:run #(do (actions/respond entities % {:run #(do (actions/respond entities %
:frankie "What?!" :frankie "What?!"