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

adding rope.

Browse Source
This commit is contained in:
Bryce Covert
2014-12-27 15:46:47 -08:00
parent 6d4a232c0d
commit e0f4dcf607
5 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/resources/cursor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

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

@@ -496,7 +496,8 @@
:scale-x 20
:scale-y 20
:baseline 9500
:opacity 0.1))))
:opacity 0.1))
(assoc-in [:cursor :current] :main)))
(continue [this screen entities]
(when music-changed?

1
desktop/src-common/advent/screens/items.clj
View File

@@ -113,4 +113,5 @@
:scripts {:flask-1-slobber (make-strength-potion) }}
:ball-n-chain {:name "Ball-n-chain" :value :ball-n-chain :cursor :ball-n-chain}
:key {:name "Jail key" :value :key :cursor :key}
:rope {:name "Rope" :value :rope :cursor :rope}
})

18
desktop/src-common/advent/screens/rooms/inside_jail.clj
View File

@@ -45,6 +45,7 @@
(assoc :inventory (concat (:inventory %) (:chest-contents %)))
(assoc :chest-contents [])))
(when (not (actions/has-obtained? entities :rope))
(actions/give entities :rope)
(actions/do-dialogue entities :ego "Looks like there's some rope in here too.")))
:else
@@ -111,6 +112,17 @@
:ego "I get to just take the key and leave?"
:ego "Seems like a pretty sorry excuse for a puzzle."))))
(defn tie-up-warden [entities]
(actions/do-dialogue entities
:ego "Good thinking!"
:ego "I'll tie him up.")
(actions/walk-to entities :ego [91 61] :face :left)
(actions/play-animation entities :ego :reach)
(actions/do-dialogue entities
:warden "Hey! What do you think you're doing?"
:warden "Back in the slammer you go.")
(common/go-to-jail entities))
(defn search-hay [entities]
(actions/walk-to entities :ego [144 86] :face :right)
(let [hay-searches (get-in @entities [:state :hay-searches] 0)]
@@ -224,7 +236,11 @@
(actions/update-state entities #(assoc % :warden-fast-asleep? true)))
:else (do (actions/walk-to entities :ego [103 82])
(do-warden-dialogue entities)))))
(do-warden-dialogue entities))))
:scripts {:sword (actions/get-script entities (actions/do-dialogue entities
:ego "That's pretty gruesome."
:ego "I can't kill him just for doing his job."))
:rope (actions/get-script entities (tie-up-warden entities))})
:ball-n-chain (assoc (texture "inside-jail/ball-n-chain.png")
:x 80 :y 80 :baseline 160
:script (actions/get-script entities

2
desktop/src-common/advent/utils.clj
View File

@@ -14,7 +14,7 @@
(let [{:keys [x y]} (input->screen screen {:x (:input-x screen) :y (:input-y screen)})]
(println (:input-x screen) (:input-y screen) "->" x y)))
(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key])
(def +all-cursors+ [:main :wool :mushrooms :carrot :right :down :left :up :flask :flask-with-contents :trophy :ladder :stick :cat-toy :balloon :frog-legs :teddy :portrait :recipe :glass-eye :motivational-tapes :used-earplugs :grass :slobber :flask-with-strength :medal :kiss :sword :hourglass :mandrake :ball-n-chain :key :rope])
(defn cursor [filename which]
(let [scale 2