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

antique refinements.

Browse Source
This commit is contained in:
Remington Covert
2014-12-14 18:48:39 -08:00
parent 3ca729d2f7
commit 94884b68fa
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
desktop/src-common/advent/actions.clj
View File

@@ -110,9 +110,6 @@
(defn stop [screen entities target-id & {:keys [face]}] (defn stop [screen entities target-id & {:keys [face]}]
(update-in entities [:room :entities target-id] (comp #(start-animation screen % :stand) (if face #(assoc % :facing face) identity)))) (update-in entities [:room :entities target-id] (comp #(start-animation screen % :stand) (if face #(assoc % :facing face) identity))))
(defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face speed]}] (defn walk-straight-to [entities target-id [final-x final-y] & {:keys [update-baseline? face speed]}]
(let [{start-x :x start-y :y} (get-in @entities [:room :entities target-id]) (let [{start-x :x start-y :y} (get-in @entities [:room :entities target-id])
final-x (int final-x) final-x (int final-x)

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

@@ -136,7 +136,8 @@
(actions/remove-item entities :teddy))) (actions/remove-item entities :teddy)))
(actions/walk-to entities :ego [222 3]) (actions/walk-to entities :ego [222 3])
(actions/transition-background entities :inside-castle [182 90]))} (actions/transition-background entities :inside-castle [182 90])
(actions/walk-to entities :ego [187 75]))}
:window {:box [212 130 256 180] :window {:box [212 130 256 180]
:script (actions/get-script entities :script (actions/get-script entities
(actions/talk entities :ego "It's a nice, big window.")) (actions/talk entities :ego "It's a nice, big window."))
@@ -207,6 +208,9 @@
(if (or (actions/has-item? entities :teddy) (if (or (actions/has-item? entities :teddy)
(actions/has-obtained? entities :balloon)) (actions/has-obtained? entities :balloon))
(update-in entities [:room :entities] #(dissoc % :teddy)) (update-in entities [:room :entities] #(dissoc % :teddy))
entities)
(if (actions/has-item? entities :portrait )
(update-in entities [:room :entities] #(dissoc % :portrait))
entities))) entities)))
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50) :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.50)
:start-pos [222 3]))) :start-pos [222 3])))