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

progress

Browse Source
This commit is contained in:
Bryce Covert
2017-05-31 20:00:33 -07:00
parent 6580bbb52b
commit 67cbac3dbd
42 changed files with 398 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -983,7 +983,7 @@
([entities]
(play-safe entities true))
([entities whistle?]
(let [safe-song-anim (utils/make-anim-seq "safe-song/safe-song" [100 35] 0.05
(let [safe-song-anim (utils/make-anim-seq (texture-atlas "packed/global.atlas") "safe-song/safe-song" [100 35] 0.05
(flatten
[
[1 2 3]
@@ -1005,7 +1005,7 @@
(wait entities 400)
(add-entity entities :safe-song
(rooms/make-entity :safe-song
(assoc (utils/get-texture "safe-song/safe-song-1")
(assoc (utils/atlas->texture (texture-atlas "packed/global.atlas") "safe-song/safe-song" 0)
:x 110
:y 120
:baseline 241

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

@@ -13,8 +13,7 @@
:mouse-in? (fn [entities x y]
(let [e (utils/get-entity entities id)]
(if-let [[bx1 by1 bx2 by2] (:box e)]
(do (println "checking 1" id)
(zone/within bx1 by1 bx2 by2 x y))
(zone/within bx1 by1 bx2 by2 x y)
(let [{^float entity-x :x ^float entity-y :y width :width scale-x :scale-x scale-y :scale-y origin-x :origin-x origin-y :origin-y height :height region :object} (-> entities :room :entities id)
width (or width (if (instance? TextureRegion region ) (.getRegionWidth ^TextureRegion region) 0))

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

@@ -265,7 +265,7 @@
(actions/talk entities :ladder-guard "Do not toucheth, young sire.")))}
:collision "inside-cafeteria/collision.png"
:fight (make-fight-entity global-atlas)
:hands-fight (assoc (animation->texture screen hands-fight-win)
:hands-fight (assoc (utils/atlas->texture atlas "fight-new-assets/fight" 0)
:origin-x 128
:origin-y 96
:x 150

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

@@ -474,14 +474,14 @@
#_(actions/in-love entities))}}
:layers {:day [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/atlas->texture atlas "way-back-tree") :x 0 :y 0 :baseline 97)
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 238 :parallax 1.5)
(assoc (utils/atlas->texture atlas "bookstack") :x 244 :y 67 :baseline 190 :origin-x 0 :origin-y 0)]
:night [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/atlas->texture atlas "way-back-tree") :x 0 :y 0 :baseline 97)
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 238 :parallax 1.5)]
:sunrise [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/atlas->texture atlas "way-back-tree") :x 0 :y 0 :baseline 97)
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 240 :parallax 1.5)]}
(assoc (utils/atlas->texture atlas "roof") :x (- 320 57) :y 0 :baseline 238 :parallax 1.5)]}
:blackout (assoc (utils/atlas->texture global-atlas "black")
:x -10 :y -10
:width 340
@@ -524,12 +524,12 @@
:sign (assoc (animation->texture screen sign )
:anim sign
:anim-start 0
:x 125 :y 138 :baseline 239)
:x 125 :y 138 :baseline 237)
:bird-2 (utils/make-bird screen global-atlas (as-> [[220 225] [195 235] [210 230] [250 225]] p
(concat p (reverse p))))
:outside-particles (common/make-outside-particles)
:door (assoc (animation->texture screen door)
:door (assoc (animation->texture (assoc screen :total-time 0) door)
:x 160 :y 97 :baseline 99
:open door
:door-sound (utils/load-sound "door.ogg")

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

@@ -699,7 +699,6 @@
(get-in ego [:right :talk] ) {2 [:blink 0.15]}
(get-in ego [:left :grow] ) {1 [:grow-sound 0.75]}
(get-in ego [:right :grow] ) {1 [:grow-sound 0.75]}
(get-in ego [:left :crowbar] ) {3 [:crowbar-sound 0.5]}
(get-in ego [:right :crowbar] ) {3 [:crowbar-sound 0.5]}
(get-in ego [:right :shoot] ) {14 [:shoot-sound 0.75]}
(get-in ego [:left :shoot] ) {14 [:shoot-sound 0.75]}
@@ -859,7 +858,6 @@
(get-looped-animation-point anim last-animated-time)
last-animated-time))]
(if (and (= current-frame-index (:current-frame-index entity) (:previous-frame-index entity))
(not (:force-rerender entity)))
entity
@@ -1356,6 +1354,7 @@
:pinch-stop
(fn [screen entities options]
(println "stopped pinching")
(when (get-in entities [:state :active?])
(-> entities
(remove-cam-tweens))))
@@ -1427,15 +1426,37 @@
interacting-entity (get-interacting-entity entities x y)]
(-> entities
(assoc-in [:cursor :depressed?] true)
(update-in [:cursor :counter] #(inc (or % 0)))
(update-in [:cursor :max-counter] #(inc (or % 0)))
(assoc-in [:cursor :down-target] (or (:id interacting-entity ) (:id interaction) nil)))))))
:on-touch-up (fn [screen entities options]
(println (input! :is-touched))
(println "touch up")
(log/info "touch up")
(handle-touch-up screen entities options))
(let [currently-pressed (dec (get-in entities [:cursor :counter]))
max-pressed (get-in entities [:cursor :max-counter])]
(println "touched up" currently-pressed max-pressed)
(cond
(and (<= currently-pressed 0)
(<= max-pressed 1))
(handle-touch-up screen
(-> entities
(assoc-in [:cursor :counter] 0)
(assoc-in [:cursor :max-counter] 0))
options)
(= currently-pressed 0)
(-> entities
(assoc-in [:cursor :counter] 0)
(assoc-in [:cursor :max-counter] 0))
(get-in entities [:state :active?])
(update-in entities [:cursor :counter] #(max 0 (dec %)))
:else
entities
)))
:on-tap (fn [screen entities options]
(println "tapping")
(when utils/mobile?
(handle-touch-up screen entities options)))
@@ -1982,6 +2003,8 @@
(assoc-in [:already-saved?] false)))
:on-reactivate
(fn [screen entities {:keys [script-started? item]}]
(let [selected-item? (and (:value item)
@@ -2031,7 +2054,7 @@
entities))))
:on-touch-up
:on-tap
(fn [screen entities options]
(if (= (button-code :left) (:button options))
(let [[x y] (utils/unproject screen options)]

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

@@ -569,7 +569,7 @@
(utils/remove-save (:id (:selected-save entities)))
(as-> entities entities
(utils/remove-actor-from-stage entities :confirm-delete)
(assoc entities :saves-list (utils/snapshot-screenshots))
(assoc entities :saves-list (utils/snapshot-screenshots (-> screen :resources :default second)))
(assoc entities :save-menu (->> (saves-menu entities (:renderer screen))
(utils/add-actor-to-stage screen)))))