fixed images -- and collision!

This commit is contained in:
Bryce Covert
2016-04-30 21:36:57 -07:00
parent c66866391a
commit 219c0094e5
17 changed files with 10 additions and 10 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -1 +1 @@
57 58

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -153,7 +153,7 @@ cat-tree/cat
index: -1 index: -1
cat-tree/cat-stand cat-tree/cat-stand
rotate: false rotate: false
xy: 1414, 6 xy: 1432, 6
size: 198, 11 size: 198, 11
orig: 198, 11 orig: 198, 11
offset: 0, 0 offset: 0, 0
@@ -293,14 +293,14 @@ close
index: -1 index: -1
cloud cloud
rotate: false rotate: false
xy: 1661, 2 xy: 1679, 2
size: 15, 15 size: 15, 15
orig: 15, 15 orig: 15, 15
offset: 0, 0 offset: 0, 0
index: -1 index: -1
space/cloud space/cloud
rotate: false rotate: false
xy: 1661, 2 xy: 1679, 2
size: 15, 15 size: 15, 15
orig: 15, 15 orig: 15, 15
offset: 0, 0 offset: 0, 0
@@ -637,8 +637,8 @@ outside-jail/dot
inside-antique/antique-sigh inside-antique/antique-sigh
rotate: false rotate: false
xy: 1104, 10 xy: 1104, 10
size: 198, 21 size: 216, 21
orig: 198, 21 orig: 216, 21
offset: 0, 0 offset: 0, 0
index: -1 index: -1
inside-antique/background inside-antique/background
@@ -895,7 +895,7 @@ inside-house/background
index: -1 index: -1
inside-house/candle-aura inside-house/candle-aura
rotate: false rotate: false
xy: 1304, 4 xy: 1322, 4
size: 108, 27 size: 108, 27
orig: 108, 27 orig: 108, 27
offset: 0, 0 offset: 0, 0
@@ -1000,7 +1000,7 @@ outside-castle/bird
index: -1 index: -1
outside-castle/flies outside-castle/flies
rotate: false rotate: false
xy: 1614, 2 xy: 1632, 2
size: 45, 15 size: 45, 15
orig: 45, 15 orig: 45, 15
offset: 0, 0 offset: 0, 0
@@ -1014,7 +1014,7 @@ outside-jail/Untitled
index: -1 index: -1
outside-jail/alarm-clock outside-jail/alarm-clock
rotate: false rotate: false
xy: 1414, 20 xy: 1432, 20
size: 16, 11 size: 16, 11
orig: 16, 11 orig: 16, 11
offset: 0, 0 offset: 0, 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 674 KiB

After

Width:  |  Height:  |  Size: 674 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 371 KiB

After

Width:  |  Height:  |  Size: 371 KiB

View File

@@ -197,7 +197,7 @@
(aget shopkeep-sheet 0 i))) (aget shopkeep-sheet 0 i)))
shopkeep-talk (animation 0.15 (for [i [0 2 0 2 0 3 1 0]] shopkeep-talk (animation 0.15 (for [i [0 2 0 2 0 3 1 0]]
(aget shopkeep-sheet 0 i))) (aget shopkeep-sheet 0 i)))
shopkeep-sigh (utils/make-anim "inside-antique/antique-sigh.png" [22 21] 0.12 (flatten [ (range 9) 0 0 ])) shopkeep-sigh (utils/make-anim "inside-antique/antique-sigh.png" [24 21] 0.12 (flatten [ (range 9) 0 0 ]))
beard (utils/make-anim "inside-antique/beard.png" [28 54] 0.5 [0 1 0 2]) beard (utils/make-anim "inside-antique/beard.png" [28 54] 0.5 [0 1 0 2])
teddy (assoc (utils/get-texture "inside-antique/teddy.png") teddy (assoc (utils/get-texture "inside-antique/teddy.png")