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

pack not used on first room.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-28 06:41:36 -07:00
parent ad38708873
commit 36b83cd1e8
6 changed files with 167 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/project.clj
View File

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

171
desktop/resources/packed/title.atlas
View File

@@ -1,76 +1,223 @@
title.png
size: 1024,512
format: RGBA8888
size: 1024,1024
format: RGBA4444
filter: Nearest,Nearest
repeat: none
background
rotate: false
xy: 2, 55
xy: 2, 733
size: 320, 240
orig: 320, 240
offset: 0, 0
index: -1
balloon
rotate: false
xy: 544, 309
xy: 648, 943
size: 60, 30
orig: 60, 30
offset: 0, 0
index: -1
banner
rotate: false
xy: 2, 11
xy: 544, 975
size: 171, 42
orig: 171, 42
offset: 0, 0
index: -1
banner-back
rotate: false
xy: 2, 297
xy: 2, 975
size: 540, 42
orig: 540, 42
offset: 0, 0
index: -1
clouds
rotate: false
xy: 324, 55
xy: 2, 491
size: 320, 240
orig: 320, 240
offset: 0, 0
index: -1
dot
rotate: false
xy: 175, 52
xy: 2, 2
size: 1, 1
orig: 1, 1
offset: 0, 0
index: -1
logo
rotate: false
xy: 646, 99
xy: 2, 249
size: 320, 240
orig: 320, 240
offset: 0, 0
index: -1
quill
rotate: false
xy: 646, 58
xy: 324, 324
size: 33, 39
orig: 33, 39
offset: 0, 0
index: -1
save-indicator
rotate: false
xy: 968, 332
xy: 879, 1010
size: 7, 7
orig: 7, 7
offset: 0, 0
index: -1
save-indicator-active
rotate: false
xy: 2, 2
xy: 810, 766
size: 7, 7
orig: 7, 7
offset: 0, 0
index: -1
screenshots/behind-house-day
rotate: false
xy: 324, 853
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/behind-house-night
rotate: false
xy: 2, 127
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/cafeteria
rotate: false
xy: 324, 731
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/castle-gate
rotate: false
xy: 2, 5
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/cat-tree-day
rotate: false
xy: 324, 609
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/cat-tree-night
rotate: false
xy: 324, 487
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/dream
rotate: false
xy: 324, 365
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/duel
rotate: false
xy: 164, 127
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/fountain-day
rotate: false
xy: 164, 5
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/fountain-night
rotate: false
xy: 486, 853
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/held
rotate: false
xy: 486, 731
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/inside-antique
rotate: false
xy: 486, 609
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/inside-castle-day
rotate: false
xy: 486, 487
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/inside-castle-night
rotate: false
xy: 486, 365
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/inside-house
rotate: false
xy: 717, 897
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/inside-jail
rotate: false
xy: 648, 775
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/inside-stash
rotate: false
xy: 648, 653
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/outside-castle-day
rotate: false
xy: 648, 531
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/outside-castle-night
rotate: false
xy: 648, 409
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/outside-house-day
rotate: false
xy: 648, 287
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1
screenshots/outside-house-night
rotate: false
xy: 810, 775
size: 160, 120
orig: 160, 120
offset: 0, 0
index: -1

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 858 KiB

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

@@ -614,6 +614,7 @@
sheep-2 (utils/make-anim atlas "sheep-2" [33 21] 0.15 (flatten [(repeat 10 0) 1 2 3 4 5 6 7 4 5 6 7 8 2 1 (repeat 25 0) (repeat 15 9)]))
sheep-3 (utils/make-anim atlas "sheep-3" [33 21] 0.15 (flatten [(repeat 10 0) 1 2 3 4 5 6 7 4 5 6 7 8 2 1 (repeat 25 0) (repeat 15 9)]))
door (utils/make-anim atlas "door" [24 58] 0.15 (flatten [(range 4) 3 3 3 3 3 3 3]))
door-closed (utils/make-anim atlas "door" [24 58] 0.15 [0])
sheep-walk (animation 0.05 (for [i (range 6)]
(aget sheep-walk-sheet 0 i)))
butterfly-stand (utils/make-anim atlas "butterfly" [7 7] 0.1 [0 1])
@@ -791,7 +792,7 @@
:x 153
:y 105
:baseline 238)
:door (assoc (animation->texture screen door)
:door (assoc (animation->texture screen door-closed)
:x 252 :y 88 :baseline 123
:open door
:door-sound (utils/load-sound "door.ogg")

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

@@ -376,8 +376,8 @@
(let [font (utils/get-font "ego/font.fnt")
music (utils/make-music "music/intro.ogg")
balloon (utils/make-anim "title/balloon.png" [15 30] 0.45 (range 4))
banner-back (utils/make-anim "title/banner-back.png" [180 42] 0.2 [0 1 2 1 0 1 2 1])]
balloon (utils/make-anim title-atlas "balloon" [15 30] 0.45 (range 4))
banner-back (utils/make-anim title-atlas "banner-back" [180 42] 0.2 [0 1 2 1 0 1 2 1])]
(graphics! :set-cursor (utils/cursor "cursor.png" :hourglass))
@@ -426,7 +426,7 @@
:main-menu (->> (main-menu screen)
(utils/add-actor-to-stage screen))
:saves-list (utils/snapshot-screenshots)
:saves-list (utils/snapshot-screenshots title-atlas)
:save-index 0
:font font
:music music

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

@@ -190,13 +190,13 @@
(Long/MIN_VALUE)
(- (Long/parseLong (:id s))))))))
(defn snapshot-screenshots []
(defn snapshot-screenshots [atlas]
(doall (for [snapshot (snapshot-list)]
(assoc-in snapshot [:screenshot]
(try (let [bytes (steam/get-bytes (:screenshot snapshot))]
(texture (Pixmap. ^bytes bytes 0 (count bytes))))
(catch Exception e
(get-texture (saves/default-screenshot (:state snapshot)))))))))
(atlas->texture atlas (saves/default-screenshot (:state snapshot)))))))))
(defn save-chapter [entities chapter]
(let [prefs (.getPreferences (Gdx/app) "ticks-tales-saves")