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

made gate bi-directional.

Browse Source
This commit is contained in:
Bryce Covert
2016-01-07 22:14:09 -08:00
parent 3020bdcd81
commit b8b323fc06
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@
[advent.actions :as actions] [advent.actions :as actions]
[advent.saves :as saves] [advent.saves :as saves]
[advent.screens.rooms.common :as common] [advent.screens.rooms.common :as common]
[advent.screens.rooms.outside-castle :as outside-castle]
[advent.screens.items :as items] [advent.screens.items :as items]
[advent.utils :as utils] [advent.utils :as utils]
[advent.steam :as steam] [advent.steam :as steam]
@@ -383,9 +384,14 @@
:script (actions/get-script entities :script (actions/get-script entities
(actions/walk-to entities :ego [284 145] :skip-type :end) (actions/walk-to entities :ego [284 145] :skip-type :end)
(actions/walk-straight-to entities :ego [295 145]) (actions/walk-straight-to entities :ego [295 145])
(actions/transition-background entities :outside-castle [61 182]) (if (outside-castle/should-block? entities)
(actions/walk-straight-to entities :ego [82 180]) (do
(actions/walk-to entities :ego [129 148] :skip-type :end))} (actions/transition-background entities :castle-gate [100 83])
(actions/walk-straight-to entities :ego [157 83] :skip-type :end))
(do
(actions/transition-background entities :outside-castle [61 182])
(actions/walk-straight-to entities :ego [82 180])
(actions/walk-to entities :ego [129 148] :skip-type :end))))}
:up-door {:box [50 150 70 170] :up-door {:box [50 150 70 170]
:script (actions/get-script entities :script (actions/get-script entities
(actions/walk-to entities :ego [65 155] :skip-type :end) (actions/walk-to entities :ego [65 155] :skip-type :end)

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

@@ -215,7 +215,7 @@
(actions/do-dialogue entities :frankie "3 easy payments of 29.99 sheckles?")))) (actions/do-dialogue entities :frankie "3 easy payments of 29.99 sheckles?"))))
(defn block-entrance [entities] (defn block-entrance [entities]
(actions/update-state entities #(assoc % :bubba-gone? false))
(actions/transition-background entities :castle-gate [340 40]) (actions/transition-background entities :castle-gate [340 40])
(actions/walk-straight-to entities :ego [300 45]) (actions/walk-straight-to entities :ego [300 45])
(if (get-in @entities [:state :seen-frankie?]) (if (get-in @entities [:state :seen-frankie?])