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

inside castle.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-28 10:44:02 -07:00
parent 8ea91c039d
commit 0770ac6f0b
8 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/outside-castle/bird.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

2
desktop/project.clj
View File

@@ -2,7 +2,7 @@
(def packs (into ["do"] (def packs (into ["do"]
(mapcat (fn [directory] (mapcat (fn [directory]
["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" (str "asset-work/" directory) "resources/packed/" (str directory ",")]) ["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" (str "asset-work/" directory) "resources/packed/" (str directory ",")])
["inside-castle"] ["global"]
#_["behindhouse" "dream" "georgia" "inside-cafeteria" "inside-jail" "outsidehouse" "safe-song" "title" #_["behindhouse" "dream" "georgia" "inside-cafeteria" "inside-jail" "outsidehouse" "safe-song" "title"
"castle-gate" "ego" "held" "inside-castle" "inside-stash" "outside-castle" "screenshots" "wizard" "castle-gate" "ego" "held" "inside-castle" "inside-stash" "outside-castle" "screenshots" "wizard"
"cat-tree" "ending-castle" "inside-antique" "inside-house" "outside-jail" "space" ]))) "cat-tree" "ending-castle" "inside-antique" "inside-house" "outside-jail" "space" ])))

7
desktop/resources/packed/global.atlas
View File

@@ -4,6 +4,13 @@ size: 1024,1024
format: RGBA4444 format: RGBA4444
filter: Nearest,Nearest filter: Nearest,Nearest
repeat: none repeat: none
bird
rotate: false
xy: 466, 630
size: 2, 2
orig: 2, 2
offset: 0, 0
index: -1
black black
rotate: false rotate: false
xy: 94, 17 xy: 94, 17

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 164 KiB

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

@@ -29,7 +29,9 @@
(fn [state] (assoc state :safe-listen-count (inc (:safe-listen-count state 0)))))) (fn [state] (assoc state :safe-listen-count (inc (:safe-listen-count state 0))))))
(defn make [screen] (defn make [screen]
(let [[screet atlas] (utils/acquire-atlas screen "packed/behindhouse.atlas")] (let [[screet atlas] (utils/acquire-atlas screen "packed/behindhouse.atlas")
[screet global-atlas] (utils/acquire-atlas screen "packed/global.atlas")]
(rooms/make :music {:day :town-2 :night :night} (rooms/make :music {:day :town-2 :night :night}
:name "Behind house" :name "Behind house"
:interactions :interactions
@@ -157,7 +159,7 @@
(actions/do-dialogue entities (actions/do-dialogue entities
:ego "I should be careful with this sword." :ego "I should be careful with this sword."
:ego "It's sharp!"))}) :ego "It's sharp!"))})
:bird (utils/make-bird screen [[50 235] [80 220] [100 239] [180 235] [85 225]]) :bird (utils/make-bird screen global-atlas [[50 235] [80 220] [100 239] [180 235] [85 225]])
:outside-particles (common/make-outside-particles)} :outside-particles (common/make-outside-particles)}
:collision "behindhouse/collision.png" :collision "behindhouse/collision.png"
:scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00) :scale-fn (utils/scaler-fn-with-baseline 110 0.10 1.00)

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

@@ -521,14 +521,14 @@
(particle-effect! magic :allow-completion) (particle-effect! magic :allow-completion)
entities) entities)
entities))}] entities))}]
:entities {:bird-1 (utils/make-bird screen (as-> [[185 235] :entities {:bird-1 (utils/make-bird screen global-atlas (as-> [[185 235]
[220 225] [210 230] [250 235]] p [220 225] [210 230] [250 235]] p
(concat p (reverse p)))) (concat p (reverse p))))
:sign (assoc (animation->texture screen sign ) :sign (assoc (animation->texture screen sign )
:anim sign :anim sign
:anim-start 0 :anim-start 0
:x 125 :y 138 :baseline 239) :x 125 :y 138 :baseline 239)
:bird-2 (utils/make-bird screen (as-> [[220 225] [195 235] [210 230] [250 225]] p :bird-2 (utils/make-bird screen global-atlas (as-> [[220 225] [195 235] [210 230] [250 225]] p
(concat p (reverse p)))) (concat p (reverse p))))
:outside-particles (common/make-outside-particles) :outside-particles (common/make-outside-particles)

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

@@ -328,6 +328,7 @@
(defn make [screen] (defn make [screen]
(let [[screen atlas] (utils/acquire-atlas screen "packed/outside-castle.atlas") (let [[screen atlas] (utils/acquire-atlas screen "packed/outside-castle.atlas")
[screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas")
peddler-sheet (texture! (utils/atlas->texture atlas "peddler-talk" ) :split 18 36) peddler-sheet (texture! (utils/atlas->texture atlas "peddler-talk" ) :split 18 36)
peddler-talk (animation 0.18 (for [i (flatten [2 3 2 3 2 3 6 1 0 1 0 1 0 1 0 1 2 3 2 3 2 3 6 4 5 4 5 4 5 4 5])] peddler-talk (animation 0.18 (for [i (flatten [2 3 2 3 2 3 6 1 0 1 0 1 0 1 0 1 2 3 2 3 2 3 6 4 5 4 5 4 5 4 5])]
(aget peddler-sheet 0 i))) (aget peddler-sheet 0 i)))
@@ -473,7 +474,7 @@
:script (actions/get-script entities :script (actions/get-script entities
(actions/talk entities :ego "Those look like the choicest of balloons."))) (actions/talk entities :ego "Those look like the choicest of balloons.")))
:stand) :stand)
:bird (utils/make-bird screen (as-> [[82 235] [134 215] [185 235] [165 238] :bird (utils/make-bird screen global-atlas (as-> [[82 235] [134 215] [185 235] [165 238]
[220 225] [210 230] [250 235]] p [220 225] [210 230] [250 235]] p
(concat p (reverse p)))) (concat p (reverse p))))

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

@@ -393,8 +393,8 @@
(animation speed (split-texture atlas file [w h] frames)))) (animation speed (split-texture atlas file [w h] frames))))
(defn make-bird [screen p] (defn make-bird [screen global-atlas p]
(let [bird-sheet (texture! (get-texture "outside-castle/bird.png") :split 1 2) (let [bird-sheet (texture! (atlas->texture global-atlas "bird") :split 1 2)
bird-stand (animation 0.15 (for [i [0 1]] bird-stand (animation 0.15 (for [i [0 1]]
(aget bird-sheet 0 i)))] (aget bird-sheet 0 i)))]
(assoc (animation->texture screen bird-stand) (assoc (animation->texture screen bird-stand)