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

larger safe screen

Browse Source
This commit is contained in:
Bryce Covert
2016-12-13 08:40:59 -08:00
parent cae0d35bed
commit fdb88e1b4d
6 changed files with 477 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/inside-house/safe-screen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB

946
desktop/resources/packed/pack.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
desktop/resources/packed/pack.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 673 KiB

After

Width:  |  Height:  |  Size: 679 KiB

BIN
desktop/resources/packed/pack2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 610 KiB

After

Width:  |  Height:  |  Size: 603 KiB

BIN
desktop/resources/packed/pack3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 418 KiB

After

Width:  |  Height:  |  Size: 409 KiB

22
desktop/src-common/advent/screens/safe.clj
View File

@@ -15,7 +15,7 @@
InputMultiplexer InputProcessor Net Preferences Screen])) InputMultiplexer InputProcessor Net Preferences Screen]))
(def start-x 60) (def start-x 35)
(def start-y 83) (def start-y 83)
(defn close [entities] (defn close [entities]
@@ -27,17 +27,17 @@
(assoc :start-showing? false))) (assoc :start-showing? false)))
(defn button-box [x y] (defn button-box [x y]
(zone/box (+ start-x x) (+ start-y y) (+ start-x x 16) (+ start-y y 20))) (zone/box (+ start-x x) (+ start-y y) (+ start-x x 30) (+ start-y y 36)))
(defn get-button [[x y]] (defn get-button [[x y]]
(first (filter (fn [{:keys [in?] :as button}] (first (filter (fn [{:keys [in?] :as button}]
(when (in? x y) (when (in? x y)
button)) button))
[{:in? (button-box 9 13) :sound (utils/load-sound "inside-house/safe-1.ogg") :id 1 } [{:in? (button-box 6 16) :sound (utils/load-sound "inside-house/safe-1.ogg") :id 1 }
{:in? (button-box 29 13) :sound (utils/load-sound "inside-house/safe-2.ogg") :id 2} {:in? (button-box 43 16) :sound (utils/load-sound "inside-house/safe-2.ogg") :id 2}
{:in? (button-box 49 13) :sound (utils/load-sound "inside-house/safe-3.ogg") :id 3} {:in? (button-box 76 16) :sound (utils/load-sound "inside-house/safe-3.ogg") :id 3}
{:in? (button-box 70 13) :sound (utils/load-sound "inside-house/safe-4.ogg") :id 4} {:in? (button-box 118 16) :sound (utils/load-sound "inside-house/safe-4.ogg") :id 4}
{:in? (button-box 91 13) :sound (utils/load-sound "inside-house/safe-5.ogg") :id 5}]))) {:in? (button-box 155 16) :sound (utils/load-sound "inside-house/safe-5.ogg") :id 5}])))
(defscreen safe-screen (defscreen safe-screen
:on-show :on-show
@@ -54,8 +54,8 @@
:safe (assoc (utils/get-texture "inside-house/safe-screen.png") :x start-x :y start-y) :safe (assoc (utils/get-texture "inside-house/safe-screen.png") :x start-x :y start-y)
:entered-keys (doall (for [i (range 5)] :entered-keys (doall (for [i (range 5)]
(assoc inputed-key (assoc inputed-key
:x (+ start-x 10 (* i 12)) :x (+ start-x 12 (* i 12))
:y (+ start-y 56)))) :y (+ start-y 68))))
:shown? false})) :shown? false}))
@@ -98,9 +98,9 @@
:else :else
new-state))) new-state)))
(if (or (< x start-x) (if (or (< x start-x)
(> x (+ start-x 200)) (> x (+ start-x 250))
(< y start-y) (< y start-y)
(> y (+ start-y 75))) (> y (+ start-y 100)))
(do (do
(sound! (utils/load-sound "inside-house/close-safe.ogg") :play (utils/current-sound-volume 0.3)) (sound! (utils/load-sound "inside-house/close-safe.ogg") :play (utils/current-sound-volume 0.3))
(close entities))))))) (close entities)))))))