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

ending progress.

Browse Source
This commit is contained in:
Bryce Covert
2015-11-15 16:11:28 -08:00
parent 4400e79388
commit a41d06ae84
10 changed files with 408 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
desktop/asset-work/ending-castle/crowd-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
desktop/asset-work/ending-castle/crowd-left.pxi Normal file
View File

Binary file not shown.

BIN
desktop/asset-work/ending-castle/guard-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

758
desktop/resources/packed/pack.atlas
View File

File diff suppressed because it is too large Load Diff

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 KiB

After

Width:  |  Height:  |  Size: 212 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 189 KiB

After

Width:  |  Height:  |  Size: 189 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 149 KiB

After

Width:  |  Height:  |  Size: 135 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 159 KiB

After

Width:  |  Height:  |  Size: 195 KiB

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

@@ -541,7 +541,7 @@
:georgia "My hero!" :georgia "My hero!"
:frankie "Wait a hot second!") :frankie "Wait a hot second!")
(Thread/sleep 500) (Thread/sleep 500)
(actions/walk-straight-to entities :frankie [85 24] :anim :stand) (actions/walk-straight-to entities :frankie [95 23] :anim :stand)
(actions/do-dialogue entities (actions/do-dialogue entities
:frankie "Come along, Georgia." :frankie "Come along, Georgia."
:frankie "No sense in thanking Dipstick.") :frankie "No sense in thanking Dipstick.")

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

@@ -43,7 +43,7 @@
15 16 17 18 19 (repeat 10 0)])) 15 16 17 18 19 (repeat 10 0)]))
frankie-fall (utils/make-anim-seq "ending-castle/frankie-fall" [40 35] 0.1 (flatten [(range 8) (repeat 20 7) 8 9 10 11 7])) frankie-fall (utils/make-anim-seq "ending-castle/frankie-fall" [40 35] 0.1 (flatten [(range 8) (repeat 20 7) 8 9 10 11 7]))
frankie-down (utils/make-anim-seq "ending-castle/frankie-fall" [40 35] 0.1 [0]) frankie-down (utils/make-anim-seq "ending-castle/frankie-fall" [40 35] 0.1 [0])
scaler (utils/scaler-fn-with-baseline 20 0.01 1.20)] scaler (utils/scaler-fn-with-baseline 20 1.2 1.20)]
(rooms/make :music :dream (rooms/make :music :dream
:name "Ending" :name "Ending"
:interactions {} :interactions {}
@@ -52,7 +52,7 @@
:apply-state (fn [screen e] :apply-state (fn [screen e]
(update-in e [:room :entities :ego] dissoc :talk-override )) (update-in e [:room :entities :ego] dissoc :talk-override ))
:georgia (rooms/make-entity :georgia (assoc (animation->texture screen georgia-stand) :georgia (rooms/make-entity :georgia (assoc (animation->texture screen georgia-stand)
:x 101 :y 23 :baseline 217 :x 111 :y 22 :baseline 218
:scale-x 1.2 :scale-x 1.2
:scale-y 1.2 :scale-y 1.2
:talk-color (Color/valueOf "ffabe0ff") :talk-color (Color/valueOf "ffabe0ff")
@@ -69,12 +69,7 @@
:anim peddler-stand :anim peddler-stand
:anim-start 0 :anim-start 0
:scaled true) :scaled true)
:warden (assoc (animation->texture screen warden-stand)
:x 40 :y 50 :baseline (- 240 50)
:anim warden-stand
:anim-start 0
:scale-x 1.1
:scale-y 1.1)
:frankie (assoc (common/make-frankie screen) :frankie (assoc (common/make-frankie screen)
:x 28 :y 21 :baseline 200 :x 28 :y 21 :baseline 200
:fall frankie-fall :fall frankie-fall
@@ -93,6 +88,8 @@
(particle-effect! :set-position 215 130)) (particle-effect! :set-position 215 130))
:duke (assoc (animation->texture screen duke-stand) :duke (assoc (animation->texture screen duke-stand)
:x 117 :y 50 :baseline (- 240 50) :x 117 :y 50 :baseline (- 240 50)
:scale-x 1.2
:scale-y 1.2
:anim duke-stand :anim duke-stand
:anim-start 0 :anim-start 0
:talk-color (color 0.4 0.5 0.94 1.0) :talk-color (color 0.4 0.5 0.94 1.0)
@@ -101,23 +98,11 @@
:reach duke-reach :reach duke-reach
:reach-talk duke-reach-talk :reach-talk duke-reach-talk
:knight duke-knight) :knight duke-knight)
:magic-frog-particle (doto (assoc (particle-effect "particles/magic-frog") :x 91 :y 23 :magic-frog-particle (doto (assoc (particle-effect "particles/magic-frog") :x 101 :y 23
:baseline 241) :baseline 241)
(particle-effect! :set-position 91 23)) (particle-effect! :set-position 101 23))
:ladder-guard-1 (assoc (animation->texture screen ladder-guard-stand-1)
:x 75 :y 69 :baseline (- 240 69)
:anim ladder-guard-stand-1
:anim-start 0
:scaled true
:scale-x (scaler [71 150])
:scale-y (scaler [71 150]))
:ladder-guard-2 (assoc (animation->texture screen ladder-guard-stand-2)
:x 179 :y 69 :baseline (- 240 69)
:anim ladder-guard-stand-2
:anim-start 0
:scaled true
:scale-x (scaler [179 150])
:scale-y (scaler [179 150]))
:game-player (assoc (animation->texture screen game-player-stand) :game-player (assoc (animation->texture screen game-player-stand)
:x 216 :y 69 :baseline (- 240 69) :x 216 :y 69 :baseline (- 240 69)
:anim game-player-stand :anim game-player-stand
@@ -125,20 +110,24 @@
:scale-x (scaler [179 69]) :scale-x (scaler [179 69])
:scale-y (scaler [179 69]) :scale-y (scaler [179 69])
:scaled true) :scaled true)
:grandma (assoc (animation->texture screen grandma-stand)
:x 56 :y 77 :baseline (- 240 77)
:anim grandma-stand
:anim-start 0
:scale-x (scaler [56 77])
:scale-y (scaler [56 77])
:scaled true)
:cat (assoc (animation->texture screen cat-stand) :cat (assoc (animation->texture screen cat-stand)
:x 73 :y 194 :baseline (- 240 195) :x 73 :y 194 :baseline (- 240 195)
:anim cat-stand :anim cat-stand
:anim-start 0 :anim-start 0
:scale-x 0.65 :scale-x 0.65
:scale-y 0.65 :scale-y 0.65
:scaled true)} :scaled true)
:crowd (assoc (utils/get-texture "ending-castle/crowd-left.png")
:x 0 :y 0
:scale-x 1.2
:scale-y 1.2
:baseline 239)
:guard-1 (assoc (utils/get-texture "ending-castle/guard-1.png")
:x 91 :y 73
:scale-x 0.9
:scale-y 0.9
:baseline 140)}
:collision "ending-castle/ending-castle2-assets/collision.png" :collision "ending-castle/ending-castle2-assets/collision.png"
:scale-fn scaler :scale-fn scaler
:start-pos [165 49]))) :start-pos [165 49])))