diff --git a/desktop/asset-work/inside-house/safe-lock.png b/desktop/asset-work/inside-house/safe-lock.png index 04958009..54db0ae2 100644 Binary files a/desktop/asset-work/inside-house/safe-lock.png and b/desktop/asset-work/inside-house/safe-lock.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index cff01c47..d926464e 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -102,6 +102,13 @@ cat-tree/dot orig: 1, 1 offset: 0, 0 index: -1 +wizard/dot + rotate: false + xy: 846, 784 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 ego/dot rotate: false xy: 846, 784 @@ -109,7 +116,7 @@ ego/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-house/dot +outsidehouse/dot rotate: false xy: 846, 784 size: 1, 1 @@ -123,13 +130,6 @@ dream/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-jail/dot - rotate: false - xy: 846, 784 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 title/dot rotate: false xy: 846, 784 @@ -137,13 +137,6 @@ title/dot orig: 1, 1 offset: 0, 0 index: -1 -wizard/dot - rotate: false - xy: 846, 784 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 inside-antique/dot rotate: false xy: 846, 784 @@ -151,7 +144,14 @@ inside-antique/dot orig: 1, 1 offset: 0, 0 index: -1 -outsidehouse/dot +inside-jail/dot + rotate: false + xy: 846, 784 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-house/dot rotate: false xy: 846, 784 size: 1, 1 @@ -284,14 +284,14 @@ held/dot orig: 1, 1 offset: 0, 0 index: -1 -outside-jail/dot +space/dot rotate: false xy: 849, 784 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -space/dot +outside-jail/dot rotate: false xy: 849, 784 size: 1, 1 @@ -957,9 +957,9 @@ inside-castle/sign-1 index: -1 inside-house/safe-lock rotate: false - xy: 646, 90 - size: 243, 6 - orig: 243, 6 + xy: 646, 88 + size: 243, 8 + orig: 243, 8 offset: 0, 0 index: -1 inside-jail/moveable-bars diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index 14485b3f..5d9d5ae5 100644 Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_house.clj b/desktop/src-common/advent/screens/rooms/inside_house.clj index 3b27d4f2..d93a91f8 100644 --- a/desktop/src-common/advent/screens/rooms/inside_house.clj +++ b/desktop/src-common/advent/screens/rooms/inside_house.clj @@ -132,9 +132,8 @@ {:run #(actions/do-dialogue entities :ego %)}]})) (defn make [screen] - (let [safelock-sheet (texture! (utils/get-texture "inside-house/safe-lock.png") :split 11 6) - safe-lock (animation 0.1 (for [i (flatten [(repeat 20 0) 1 2 1 2 1 2 1 2 1 2 1 1 2 1 2 1 2 1 2 1 2 1 (range 3 20) 20 20 20 20 21 21 21 21 21 20 20 21 21 21 21 21 20 20 20 ])] - (aget safelock-sheet 0 i))) + (let [ + safe-lock (utils/make-anim "inside-house/safe-lock.png" [11 8] 0.1 (flatten [(repeat 20 0) 1 2 1 2 1 2 1 2 1 2 1 1 2 1 2 1 2 1 2 1 2 1 (range 3 20) 20 20 20 20 21 21 21 21 21 20 20 21 21 21 21 21 20 20 20 ])) candle (utils/make-anim "inside-house/candle.png" [34 32] 0.2 [1 0 1 2]) candle-aura (utils/make-anim "inside-house/candle-aura.png" [27 27] 0.2 [0 1 2 3 2 1] ) experiment-left (utils/flip (utils/make-anim-seq "wizard/experiment" [45 55] 0.075 [0 0 0 0 0 0 0 0 0 0 1 1 2 2 2 2 3 3 3 4 4 5 5 6 6 6 6 6 6 7 8 9 9 10 10 11 11 12 12 12 12 12 12 12 12 12 12 12 13 13 14 14 14 14 14 15 15 16 16 17 17 18 18 18 18 19 20 21 21 21 21 21 21 22 23 22 23 22 23 22 23 23 23 23 23 23 23 23 24 24 24 24 24 24 24 24 24 25 26 27 37 38 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 29 29 29 28 28 28 28 29 29 28 28 28 28 28 28 28 28 30 30 30 30 31 32 33 31 31 31 31 31 31 31 31 34 35 36 36 36 36 36 36 36 36 36] ))] @@ -197,7 +196,7 @@ (actions/get-script entities (actions/do-dialogue entities :wizard "No thank you.")))}) - :safe-lock (actions/start-animation screen (assoc (animation->texture screen safe-lock) :x 50 :y 93 :baseline 145 + :safe-lock (actions/start-animation screen (assoc (animation->texture screen safe-lock) :x 50 :y 92 :baseline 145 :stand safe-lock) :stand) :candle (assoc (animation->texture screen candle)