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

goon leaves.

Browse Source
This commit is contained in:
Bryce Covert
2015-08-14 17:23:48 -07:00
parent 9908c3b2bb
commit 5e992d7791
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,6 +198,7 @@
(defn attempt-walking-through-gate [entities]
(actions/walk-to entities :ego [157 83] :skip-type :end)
(actions/transition-background entities :inside-castle [280 145])
(actions/update-state entities #(assoc % :bubba-gone? false))
(actions/walk-to entities :ego [245 90] :skip-type :end))
(defn flip-coin [screen entities]
@@ -226,6 +227,7 @@
(actions/walk-to entities :ego [301 46] :face :right :skip-type :end)
(actions/walk-straight-to entities :ego [340 40])
(actions/transition-background entities :outside-castle [82 180])
(actions/update-state entities #(assoc % :bubba-gone? false))
(actions/walk-to entities :ego [129 148] :skip-type :end))
:cursor :right}
:left-dir {:box [105 93 169 212]
@@ -282,6 +284,7 @@
(assoc-in entities [:room :entities :walkie-talkies]
(get-in entities [:room :walkie-talkies]))
entities)
(if (and (not (actions/has-obtained? entities :money))
(get-in entities [:state :has-dropped-coin?]))
(do
@@ -289,5 +292,9 @@
entities)
(if (actions/has-obtained? entities :money)
(update-in entities [:room :entities] dissoc :coin-flip)
entities)))
entities)
(if (get-in entities [:state :bubba-gone?])
(update-in entities [:room :entities] dissoc :coin-flip :goon-2)
entities
)))
:start-pos [300 45])))

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

@@ -221,8 +221,8 @@
(frankie-comment-on-item entities)
(actions/do-dialogue entities
:frankie "Bubba, put this stuff in the secret stash."
:goon-2 "You got it boss"
)
:goon-2 "You got it boss.")
(actions/remove-entity entities :coin-flip)
(actions/walk-straight-to entities :goon-2 [0 100])
(actions/do-dialogue entities
:frankie "Now move along."
@@ -233,6 +233,7 @@
(actions/remove-item entities :medal)
(actions/remove-item entities :trophy)
(actions/remove-item entities :slingshot)
(actions/update-state entities #(assoc % :bubba-gone? true))
(actions/walk-to entities :ego [181 79])
(actions/do-dialogue entities