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

readded georgia.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-28 07:05:26 -07:00
parent 0263bb7223
commit cae423f2f0
1 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1044,10 +1044,10 @@
(assoc room :current-layers (map (partial get-rendered entities) layers)) (assoc room :current-layers (map (partial get-rendered entities) layers))
)))) ))))
(defn add-georgia-to-all-rooms [screen rooms] (defn add-georgia [room screen global-atlas]
(let [georgia-talk (utils/make-anim "ego/georgia.png" [30 30] 0.15 [0 1 0 1 0 0 1 0 1 2]) (let [georgia-talk (utils/make-anim global-atlas "ego/georgia" [30 30] 0.15 [0 1 0 1 0 0 1 0 1 2])
georgia-stand (utils/make-anim "ego/georgia.png" [30 30] 0.3 [0 0 0 0 0 0 0 2 0 0 0 0 2]) georgia-stand (utils/make-anim global-atlas "ego/georgia" [30 30] 0.3 [0 0 0 0 0 0 0 2 0 0 0 0 2])
georgia-love (utils/make-anim "ego/in-love.png" [30 30] 0.1 [0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 4 5 6 7 8 9 10 11 12 13 14 14 14 15 15 15 14 14 14 14 14 14 14 14 15 15 15 15 15 14 14 14 14 15 15 15 15 15 15 14 14 14 14 14]) georgia-love (utils/make-anim global-atlas "ego/in-love" [30 30] 0.1 [0 0 0 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 16 17 18 17 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 4 5 6 7 8 9 10 11 12 13 14 14 14 15 15 15 14 14 14 14 14 14 14 14 15 15 15 15 15 14 14 14 14 15 15 15 15 15 15 14 14 14 14 14])
georgia-face (rooms/make-entity :georgia-face georgia-face (rooms/make-entity :georgia-face
(assoc (animation->texture screen georgia-stand) (assoc (animation->texture screen georgia-stand)
@@ -1061,13 +1061,9 @@
:x 100 :y 100 :baseline 242 :origin-x 15 :origin-y 15 :x 100 :y 100 :baseline 242 :origin-x 15 :origin-y 15
:opacity 0.0)) :opacity 0.0))
georgia-cloud (assoc (particle-effect "particles/cloud-georgia") :x 100 :y 100 :baseline 241 :opacity 0.0)] georgia-cloud (assoc (particle-effect "particles/cloud-georgia") :x 100 :y 100 :baseline 241 :opacity 0.0)]
(reduce (fn [rooms room-key] (-> room
(update-in rooms [room-key :entities] (assoc-in [:entities :georgia-face ] georgia-face)
assoc (assoc-in [:entities :georgia-cloud] georgia-cloud))))
:georgia-face georgia-face
:georgia-cloud georgia-cloud))
rooms
(keys rooms))))
(defn remove-cam-tweens [entities] (defn remove-cam-tweens [entities]
(update-in entities [:tweens] dissoc :cam-x :cam-y :cam-zoom)) (update-in entities [:tweens] dissoc :cam-x :cam-y :cam-zoom))
@@ -1208,24 +1204,26 @@
_ (update! screen :shader shader) _ (update! screen :shader shader)
log-assets (fn [r] r) log-assets (fn [r] r)
rooms {:inside-house rooms.inside-house/make wrap (fn [maker]
:inside-stash rooms.inside-stash/make (fn [screen]
:outside-house rooms.outside-house/make (-> (maker screen)
:behind-house rooms.behind-house/make (add-georgia screen global-atlas))))
:cat-tree rooms.cat-tree/make rooms {:inside-house (wrap rooms.inside-house/make)
:inside-castle rooms.inside-castle/make :inside-stash (wrap rooms.inside-stash/make)
:space rooms.space/make :outside-house (wrap rooms.outside-house/make)
:held rooms.held/make :behind-house (wrap rooms.behind-house/make)
:inside-cafeteria rooms.inside-cafeteria/make :cat-tree (wrap rooms.cat-tree/make)
:inside-antique rooms.inside-antique/make :inside-castle (wrap rooms.inside-castle/make)
:inside-jail rooms.inside-jail/make :space (wrap rooms.space/make)
:dream rooms.dream/make :held (wrap rooms.held/make)
:ending rooms.ending/make :inside-cafeteria (wrap rooms.inside-cafeteria/make)
:castle-gate rooms.castle-gate/make :inside-antique (wrap rooms.inside-antique/make)
:outside-jail rooms.outside-jail/make :inside-jail (wrap rooms.inside-jail/make)
:outside-castle rooms.outside-castle/make } :dream (wrap rooms.dream/make)
;; TODO RE ADD :ending (wrap rooms.ending/make)
#_#_rooms (add-georgia-to-all-rooms screen rooms) :castle-gate (wrap rooms.castle-gate/make)
:outside-jail (wrap rooms.outside-jail/make)
:outside-castle (wrap rooms.outside-castle/make) }
entities {:rooms rooms entities {:rooms rooms
:step-particles (assoc (particle-effect "particles/step") :x 100 :y 100 :baseline 241) :step-particles (assoc (particle-effect "particles/step") :x 100 :y 100 :baseline 241)
:cam {:zoom utils/min-zoom :cam {:zoom utils/min-zoom