diff --git a/desktop/asset-work/inside-antique/antique-sigh.png b/desktop/asset-work/inside-antique/antique-sigh.png index 5eef87a9..4425e473 100644 Binary files a/desktop/asset-work/inside-antique/antique-sigh.png and b/desktop/asset-work/inside-antique/antique-sigh.png differ diff --git a/desktop/asset-work/inside-antique/antique-sigh.pxa/0.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/0.pxi index 13418e55..7969384b 100644 Binary files a/desktop/asset-work/inside-antique/antique-sigh.pxa/0.pxi and b/desktop/asset-work/inside-antique/antique-sigh.pxa/0.pxi differ diff --git a/desktop/asset-work/inside-antique/antique-sigh.pxa/1.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/1.pxi index b42000b7..dde1f16a 100644 Binary files a/desktop/asset-work/inside-antique/antique-sigh.pxa/1.pxi and b/desktop/asset-work/inside-antique/antique-sigh.pxa/1.pxi differ diff --git a/desktop/asset-work/inside-antique/antique-sigh.pxa/2.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/2.pxi index b05f7847..b210e821 100644 Binary files a/desktop/asset-work/inside-antique/antique-sigh.pxa/2.pxi and b/desktop/asset-work/inside-antique/antique-sigh.pxa/2.pxi differ diff --git a/desktop/asset-work/inside-antique/antique-sigh.pxa/3.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/3.pxi index 345fcd3c..95b61c8d 100644 Binary files a/desktop/asset-work/inside-antique/antique-sigh.pxa/3.pxi and b/desktop/asset-work/inside-antique/antique-sigh.pxa/3.pxi differ diff --git a/desktop/asset-work/inside-antique/antique-sigh.pxa/4.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/4.pxi index fc45792e..65463cd9 100644 Binary files a/desktop/asset-work/inside-antique/antique-sigh.pxa/4.pxi and b/desktop/asset-work/inside-antique/antique-sigh.pxa/4.pxi differ diff --git a/desktop/asset-work/inside-antique/antique-sigh.pxa/5.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/5.pxi index 808f1d90..f4ebe823 100644 Binary files a/desktop/asset-work/inside-antique/antique-sigh.pxa/5.pxi and b/desktop/asset-work/inside-antique/antique-sigh.pxa/5.pxi differ diff --git a/desktop/asset-work/inside-antique/antique-sigh.pxa/6.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/6.pxi index 7f1dd1fb..821ddaa1 100644 Binary files a/desktop/asset-work/inside-antique/antique-sigh.pxa/6.pxi and b/desktop/asset-work/inside-antique/antique-sigh.pxa/6.pxi differ diff --git a/desktop/asset-work/inside-antique/antique-sigh.pxa/7.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/7.pxi index 645f58cf..f843ccf8 100644 Binary files a/desktop/asset-work/inside-antique/antique-sigh.pxa/7.pxi and b/desktop/asset-work/inside-antique/antique-sigh.pxa/7.pxi differ diff --git a/desktop/asset-work/inside-antique/antique-sigh.pxa/8.pxi b/desktop/asset-work/inside-antique/antique-sigh.pxa/8.pxi index cd2beda3..0c1e0815 100644 Binary files a/desktop/asset-work/inside-antique/antique-sigh.pxa/8.pxi and b/desktop/asset-work/inside-antique/antique-sigh.pxa/8.pxi differ diff --git a/desktop/asset-work/wizard/talk-angry.png b/desktop/asset-work/wizard/talk-angry.png index cb64bcd4..e2cfab37 100644 Binary files a/desktop/asset-work/wizard/talk-angry.png and b/desktop/asset-work/wizard/talk-angry.png differ diff --git a/desktop/last-release b/desktop/last-release index e1617e84..8c61d23e 100644 --- a/desktop/last-release +++ b/desktop/last-release @@ -1 +1 @@ -57 +58 diff --git a/desktop/resources/outsidehouse/collision.png b/desktop/resources/outsidehouse/collision.png index 0da4bed7..265e3de2 100644 Binary files a/desktop/resources/outsidehouse/collision.png and b/desktop/resources/outsidehouse/collision.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 1992d1d1..fb2b01b2 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -153,7 +153,7 @@ cat-tree/cat index: -1 cat-tree/cat-stand rotate: false - xy: 1414, 6 + xy: 1432, 6 size: 198, 11 orig: 198, 11 offset: 0, 0 @@ -293,14 +293,14 @@ close index: -1 cloud rotate: false - xy: 1661, 2 + xy: 1679, 2 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 space/cloud rotate: false - xy: 1661, 2 + xy: 1679, 2 size: 15, 15 orig: 15, 15 offset: 0, 0 @@ -637,8 +637,8 @@ outside-jail/dot inside-antique/antique-sigh rotate: false xy: 1104, 10 - size: 198, 21 - orig: 198, 21 + size: 216, 21 + orig: 216, 21 offset: 0, 0 index: -1 inside-antique/background @@ -895,7 +895,7 @@ inside-house/background index: -1 inside-house/candle-aura rotate: false - xy: 1304, 4 + xy: 1322, 4 size: 108, 27 orig: 108, 27 offset: 0, 0 @@ -1000,7 +1000,7 @@ outside-castle/bird index: -1 outside-castle/flies rotate: false - xy: 1614, 2 + xy: 1632, 2 size: 45, 15 orig: 45, 15 offset: 0, 0 @@ -1014,7 +1014,7 @@ outside-jail/Untitled index: -1 outside-jail/alarm-clock rotate: false - xy: 1414, 20 + xy: 1432, 20 size: 16, 11 orig: 16, 11 offset: 0, 0 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index 5752aba9..8e2e852c 100644 Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ diff --git a/desktop/resources/packed/pack3.png b/desktop/resources/packed/pack3.png index 993711c5..f4a08b8f 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_antique.clj b/desktop/src-common/advent/screens/rooms/inside_antique.clj index 65cf5457..67921537 100644 --- a/desktop/src-common/advent/screens/rooms/inside_antique.clj +++ b/desktop/src-common/advent/screens/rooms/inside_antique.clj @@ -197,7 +197,7 @@ (aget shopkeep-sheet 0 i))) shopkeep-talk (animation 0.15 (for [i [0 2 0 2 0 3 1 0]] (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]) teddy (assoc (utils/get-texture "inside-antique/teddy.png")