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

couple bugfixes.

Browse Source
This commit is contained in:
Remington Covert
2015-02-04 07:30:12 -08:00
parent ae7b3356b9
commit 41e75513f5
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/project.clj
View File

@@ -14,7 +14,7 @@
:classifier "natives-desktop"] :classifier "natives-desktop"]
[org.clojure/clojure "1.6.0"] [org.clojure/clojure "1.6.0"]
[org.clojure/tools.nrepl "0.2.7"] [org.clojure/tools.nrepl "0.2.7"]
[play-clj "0.4.2"] [play-clj "0.4.2-SNAPSHOT"]
[org.clojure/data.priority-map "0.0.5"] [org.clojure/data.priority-map "0.0.5"]
[org.clojure/core.async "0.1.338.0-5c5012-alpha"]] [org.clojure/core.async "0.1.338.0-5c5012-alpha"]]
:source-paths ["src" "src-common"] :source-paths ["src" "src-common"]

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

@@ -331,6 +331,6 @@
entities) entities)
(if (= :night (get-in entities [:state :time])) (if (= :night (get-in entities [:state :time]))
(make-night entities) (make-night entities)
(utils/remove-interaction :rock) (utils/remove-interaction entities :rock)
))) )))
:start-pos [203 1]))) :start-pos [203 1])))

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

@@ -116,6 +116,8 @@
(actions/do-dialogue entities :ego "That was weird." (actions/do-dialogue entities :ego "That was weird."
:ego "I have to go show my friends!") :ego "I have to go show my friends!")
(walk-to-blergh entities)
(actions/add-entity entities :blergh (get-in @entities [:room :blergh])) (actions/add-entity entities :blergh (get-in @entities [:room :blergh]))

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

@@ -122,7 +122,7 @@
:else (do-initial-peddler-conversation entities))) :else (do-initial-peddler-conversation entities)))
(defn should-block? [entities] (defn should-block? [entities]
(and (:night (get-in @entities [:state :time])) (and (= :night (get-in @entities [:state :time]))
(actions/has-obtained? entities :flask-2) (actions/has-obtained? entities :flask-2)
(not (actions/has-item? entities :magic-slingshot)))) (not (actions/has-item? entities :magic-slingshot))))

4
desktop/src-common/advent/screens/scene.clj
View File

@@ -341,7 +341,7 @@
(utils/load) (utils/load)
{:object nil {:object nil
:active? true :active? true
:last-room :dream :last-room :outside-house
:time :day :time :day
:obtained-items #{} :obtained-items #{}
:inventory [] :inventory []
@@ -404,7 +404,7 @@
(doseq [[k [start time fn]] (get-in entities [:room :timers])] (doseq [[k [start time fn]] (get-in entities [:room :timers])]
(add-timer! screen k start time)) (add-timer! screen k start time))
(when (not (get-in entities [:state :seen-intro?])) #_(when (not (get-in entities [:state :seen-intro?]))
((actions/get-script entities (rooms.dream/do-intro entities)) entities)) ((actions/get-script entities (rooms.dream/do-intro entities)) entities))
(if-let [apply-state (get-in entities [:room :apply-state])] (if-let [apply-state (get-in entities [:room :apply-state])]
(apply-state entities) (apply-state entities)