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

outside jail too.

Browse Source
This commit is contained in:
Bryce Covert
2017-05-28 10:49:05 -07:00
parent 9168319b9a
commit c61a672344
4 changed files with 26 additions and 18 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"] (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 ",")])
["global"] ["outside-jail"]
#_["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" ])))

11
desktop/resources/packed/outside-jail.atlas
View File

@@ -34,14 +34,14 @@ background
index: -1 index: -1
bent-bar-window bent-bar-window
rotate: false rotate: false
xy: 866, 430 xy: 866, 368
size: 17, 33 size: 17, 33
orig: 17, 33 orig: 17, 33
offset: 0, 0 offset: 0, 0
index: -1 index: -1
candle candle
rotate: false rotate: false
xy: 866, 465 xy: 942, 465
size: 80, 25 size: 80, 25
orig: 80, 25 orig: 80, 25
offset: 0, 0 offset: 0, 0
@@ -81,6 +81,13 @@ fountain
orig: 320, 240 orig: 320, 240
offset: 0, 0 offset: 0, 0
index: -1 index: -1
guard
rotate: false
xy: 866, 403
size: 74, 87
orig: 74, 87
offset: 0, 0
index: -1
guard-sleep guard-sleep
rotate: false rotate: false
xy: 294, 77 xy: 294, 77

BIN
desktop/resources/packed/outside-jail.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 106 KiB

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

@@ -94,14 +94,15 @@
(actions/talk entities :ego "This must be Frankie Rockfist's secret stash!"))) (actions/talk entities :ego "This must be Frankie Rockfist's secret stash!")))
(defn make [screen] (defn make [screen]
(let [guard-sheet (texture! (utils/get-texture "inside-cafeteria/ladder-guard.png") :split 37 87) (let [[screen atlas] (utils/acquire-atlas screen "packed/outside-jail.atlas")
guard-sheet (texture! (utils/atlas->texture atlas "guard") :split 37 87)
guard-stand (animation 0.1 [(aget guard-sheet 0 0)]) guard-stand (animation 0.1 [(aget guard-sheet 0 0)])
guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]] (aget guard-sheet 0 i))) guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]] (aget guard-sheet 0 i)))
guard-sleep (utils/make-anim "outside-jail/guard-sleep.png" [43 67] 0.1 (range 4)) guard-sleep (utils/make-anim atlas "guard-sleep" [43 67] 0.1 (range 4))
open-stash (utils/make-anim "outside-jail/open-stash.png" [58 41] 0.075 (reverse (range 5))) open-stash (utils/make-anim atlas "open-stash" [58 41] 0.075 (reverse (range 5)))
close-stash (utils/make-anim "outside-jail/open-stash.png" [58 41] 0.075 (range 5)) close-stash (utils/make-anim atlas "open-stash" [58 41] 0.075 (range 5))
candle-flame (utils/make-anim "outside-jail/candle.png" [20 25] 0.075 (range 4)) candle-flame (utils/make-anim atlas "candle" [20 25] 0.075 (range 4))
candle-aura (utils/make-anim "outside-jail/candle-aura2.png" [135 135] 0.3 [0 1 2 1] )] candle-aura (utils/make-anim atlas "candle-aura2" [135 135] 0.3 [0 1 2 1] )]
(rooms/make :music {:day :town-1 :night :night} (rooms/make :music {:day :town-1 :night :night}
:name "Fountain" :name "Fountain"
:interactions {:down-dir {:box [30 0 227 40] :interactions {:down-dir {:box [30 0 227 40]
@@ -235,10 +236,10 @@
(actions/remove-item entities :flask-2 :quiet? true) (actions/remove-item entities :flask-2 :quiet? true)
(actions/give entities :flask-water) (actions/give entities :flask-water)
(actions/talk entities :ego "Filled up with water, just as Gandarf wanted."))}}} (actions/talk entities :ego "Filled up with water, just as Gandarf wanted."))}}}
:layers {:day [(assoc (utils/get-texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) :layers {:day [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)] (assoc (utils/atlas->texture atlas "fountain") :x 0 :y 0 :baseline 114)]
:night [(assoc (utils/get-texture "outside-jail/background.png") :x 0 :y 0 :baseline 0) :night [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)
(assoc (utils/get-texture "outside-jail/fountain.png") :x 0 :y 0 :baseline 114)]} (assoc (utils/atlas->texture atlas "fountain") :x 0 :y 0 :baseline 114)]}
:entities {:warden {:object nil :entities {:warden {:object nil
:x 36 :x 36
:y 86 :y 86
@@ -260,8 +261,8 @@
:x 172 :x 172
:y 140 :y 140
:baseline 114) :baseline 114)
:axe (assoc (utils/get-texture "outside-jail/axe.png") :x 213 :y 63 :baseline 176 :night-profile :sprite) :axe (assoc (utils/atlas->texture atlas "axe") :x 213 :y 63 :baseline 176 :night-profile :sprite)
:bent-bar-window (assoc (utils/get-texture "outside-jail/bent-bar-window.png") :bent-bar-window (assoc (utils/atlas->texture atlas "bent-bar-window")
:x 69 :y (- 240 63) :baseline 2) :x 69 :y (- 240 63) :baseline 2)
:outside-particles (common/make-outside-particles)} :outside-particles (common/make-outside-particles)}
:fountain-sound {:sound (utils/load-sound "outside-jail/fountain-2.ogg") :fountain-sound {:sound (utils/load-sound "outside-jail/fountain-2.ogg")
@@ -280,15 +281,15 @@
:cursor :hand :cursor :hand
:script (actions/get-script entities (search-guard entities)) :script (actions/get-script entities (search-guard entities))
:night-profile :sprite)) :night-profile :sprite))
:rope (rooms/make-entity :rope (assoc (utils/get-texture "outside-jail/rope.png") :rope (rooms/make-entity :rope (assoc (utils/atlas->texture atlas "rope")
:x 14 :y 20 :baseline 1 :night-profile :sprite)) :x 14 :y 20 :baseline 1 :night-profile :sprite))
:spear (rooms/make-entity :spear (assoc (utils/get-texture "outside-jail/spear.png") :spear (rooms/make-entity :spear (assoc (utils/atlas->texture atlas "spear")
:night-profile :none :night-profile :none
:x 60 :y 65 :baseline 180 :x 60 :y 65 :baseline 180
:label "Spear" :label "Spear"
:cursor :hand :cursor :hand
:script (actions/get-script entities (grab-spear entities)))) :script (actions/get-script entities (grab-spear entities))))
:alarm-clock (rooms/make-entity :alarm-clock (assoc (utils/get-texture "outside-jail/alarm-clock.png") :alarm-clock (rooms/make-entity :alarm-clock (assoc (utils/atlas->texture atlas "alarm-clock")
:x 217 :y 83 :baseline 160 :x 217 :y 83 :baseline 160
:label "Broken clock" :label "Broken clock"
:cursor :hand :cursor :hand