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

fixed walking through coutner

Browse Source
This commit is contained in:
Bryce Covert
2016-02-15 08:18:24 -08:00
parent 7e8af55d3a
commit e16f9d5deb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/inside-antique/collision.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

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

@@ -156,7 +156,7 @@
) }]}))) ) }]})))
(defn return-portrait [ entities] (defn return-portrait [ entities]
(actions/walk-to entities :ego [143 64] :face :left) (actions/walk-to entities :ego [143 58] :face :left)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)
(actions/add-entity entities :portrait (get-in @entities [:room :portrait])) (actions/add-entity entities :portrait (get-in @entities [:room :portrait]))
(actions/remove-item entities :portrait)) (actions/remove-item entities :portrait))
@@ -356,7 +356,7 @@
:baseline 125 :baseline 125
:script (actions/get-script entities :script (actions/get-script entities
(if (= 3 (get-in @entities [:state :mints-eaten])) (if (= 3 (get-in @entities [:state :mints-eaten]))
(do (actions/walk-to entities :ego [159 62] :face :right) (do (actions/walk-to entities :ego [159 58] :face :right)
#_(actions/update-state entities (fn [s] (assoc s :mints-eaten 0))) #_(actions/update-state entities (fn [s] (assoc s :mints-eaten 0)))
(actions/do-dialogue entities (actions/do-dialogue entities
@@ -364,7 +364,7 @@
:shopkeep "That's right, I'm all out." :shopkeep "That's right, I'm all out."
:shopkeep "Go tell Gandarf that I need some more brewed up." :shopkeep "Go tell Gandarf that I need some more brewed up."
:shopkeep "Pronto!")) :shopkeep "Pronto!"))
(do (actions/walk-to entities :ego [159 62] :face :right) (do (actions/walk-to entities :ego [159 58] :face :right)
(if (= 0 (get-in @entities [:state :mints-eaten])) (if (= 0 (get-in @entities [:state :mints-eaten]))
(actions/talk entities :ego "I'll just try one of these mints.") (actions/talk entities :ego "I'll just try one of these mints.")
(actions/talk entities :ego "I'll just try another one of these mints.")) (actions/talk entities :ego "I'll just try another one of these mints."))
@@ -393,7 +393,7 @@
:y 114 :y 114
:baseline 120 :baseline 120
:script (actions/get-script entities :script (actions/get-script entities
(actions/walk-to entities :ego [140 61] :face :left) (actions/walk-to entities :ego [140 58] :face :left)
(actions/play-animation entities :ego :reach) (actions/play-animation entities :ego :reach)
(actions/remove-entity entities :portrait) (actions/remove-entity entities :portrait)
(actions/give entities :portrait) (actions/give entities :portrait)