diff --git a/desktop/asset-work/inside-castle/background.png b/desktop/asset-work/inside-castle/background.png index 7e60d526..b690905c 100644 Binary files a/desktop/asset-work/inside-castle/background.png and b/desktop/asset-work/inside-castle/background.png differ diff --git a/desktop/asset-work/inside-castle/way-back-tree.png b/desktop/asset-work/inside-castle/way-back-tree.png index 0ca53f6a..409193bf 100644 Binary files a/desktop/asset-work/inside-castle/way-back-tree.png and b/desktop/asset-work/inside-castle/way-back-tree.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index f932d07f..29746c61 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -174,7 +174,7 @@ cat-tree/monocle index: -1 cloudy rotate: false - xy: 732, 2 + xy: 824, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -375,13 +375,6 @@ outside-jail/dot orig: 1, 1 offset: 0, 0 index: -1 -held/flesh - rotate: false - xy: 754, 2 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 inside-antique/bowl rotate: false xy: 823, 546 @@ -438,13 +431,6 @@ inside-cafeteria/warriors-stand orig: 264, 126 offset: 0, 0 index: -1 -inside-castle/books - rotate: false - xy: 798, 3 - size: 34, 19 - orig: 34, 19 - offset: 0, 0 - index: -1 inside-castle/bookstack rotate: false xy: 950, 229 @@ -459,13 +445,6 @@ inside-castle/hands-fight orig: 728, 104 offset: 0, 0 index: -1 -inside-castle/magic - rotate: false - xy: 776, 2 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 inside-castle/monocle rotate: false xy: 992, 830 @@ -480,6 +459,34 @@ inside-castle/pull-sword orig: 380, 190 offset: 0, 0 index: -1 +inside-castle/sign1 + rotate: false + xy: 732, 2 + size: 44, 20 + orig: 44, 20 + offset: 0, 0 + index: -1 +inside-castle/sign-1 + rotate: false + xy: 732, 2 + size: 44, 20 + orig: 44, 20 + offset: 0, 0 + index: -1 +inside-castle/sign2 + rotate: false + xy: 778, 2 + size: 44, 20 + orig: 44, 20 + offset: 0, 0 + index: -1 +inside-castle/sign-2 + rotate: false + xy: 778, 2 + size: 44, 20 + orig: 44, 20 + offset: 0, 0 + index: -1 inside-castle/watch rotate: false xy: 533, 462 @@ -613,6 +620,13 @@ outside-jail/spear orig: 11, 51 offset: 0, 0 index: -1 +outsidehouse/charcoal-1 + rotate: false + xy: 846, 4 + size: 18, 18 + orig: 18, 18 + offset: 0, 0 + index: -1 outsidehouse/door rotate: false xy: 926, 481 @@ -620,13 +634,6 @@ outsidehouse/door orig: 96, 58 offset: 0, 0 index: -1 -outsidehouse/lamb - rotate: false - xy: 834, 3 - size: 26, 19 - orig: 26, 19 - offset: 0, 0 - index: -1 outsidehouse/sheep rotate: false xy: 926, 382 @@ -752,13 +759,6 @@ castle-gate/background orig: 320, 240 offset: 0, 0 index: -1 -castle-gate/frankie-walk-1 - rotate: false - xy: 923, 249 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 castle-gate/goon-2-talk rotate: false xy: 985, 2 @@ -962,6 +962,13 @@ held/background orig: 320, 240 offset: 0, 0 index: -1 +held/flesh + rotate: false + xy: 1002, 649 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 inside-antique/background rotate: false xy: 324, 62 @@ -976,13 +983,6 @@ inside-antique/beard orig: 78, 52 offset: 0, 0 index: -1 -inside-antique/shopkeep - rotate: false - xy: 1002, 648 - size: 18, 21 - orig: 18, 21 - offset: 0, 0 - index: -1 inside-cafeteria/background rotate: false xy: 646, 6 @@ -1032,6 +1032,13 @@ inside-castle/door orig: 84, 49 offset: 0, 0 index: -1 +inside-castle/magic + rotate: false + xy: 902, 384 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 inside-castle/roof rotate: false xy: 960, 478 @@ -1060,6 +1067,13 @@ inside-house/candle-aura orig: 108, 27 offset: 0, 0 index: -1 +inside-house/frog-legs + rotate: false + xy: 296, 62 + size: 17, 16 + orig: 17, 16 + offset: 0, 0 + index: -1 inside-jail/ball-n-chain rotate: false xy: 983, 929 @@ -1090,7 +1104,7 @@ outside-castle/balloons index: -1 outside-castle/peddler rotate: false - xy: 296, 63 + xy: 923, 248 size: 18, 36 orig: 18, 36 offset: 0, 0 @@ -1116,11 +1130,11 @@ outside-jail/closed-stash orig: 52, 30 offset: 0, 0 index: -1 -outsidehouse/charcoal-1 +outsidehouse/lamb rotate: false - xy: 902, 386 - size: 18, 18 - orig: 18, 18 + xy: 296, 80 + size: 26, 19 + orig: 26, 19 offset: 0, 0 index: -1 outsidehouse/lamb-walk @@ -1171,7 +1185,7 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -castle-gate/frankie-walk-2 +castle-gate/frankie-walk-1 rotate: false xy: 998, 85 size: 24, 35 @@ -1194,14 +1208,14 @@ cat-tree/tree-r index: -1 close rotate: false - xy: 390, 53 + xy: 371, 53 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cursorr rotate: false - xy: 408, 53 + xy: 389, 53 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1278,7 +1292,7 @@ ego/reach index: -1 inside-antique/portrait rotate: false - xy: 480, 53 + xy: 461, 53 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1290,6 +1304,13 @@ inside-antique/shopkeep-talk orig: 72, 21 offset: 0, 0 index: -1 +inside-antique/teddy + rotate: false + xy: 497, 53 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 inside-cafeteria/doorway rotate: false xy: 998, 236 @@ -1325,13 +1346,6 @@ inside-house/background orig: 320, 240 offset: 0, 0 index: -1 -inside-house/frog-legs - rotate: false - xy: 371, 53 - size: 17, 16 - orig: 17, 16 - offset: 0, 0 - index: -1 inside-jail/background rotate: false xy: 646, 779 @@ -1369,7 +1383,7 @@ outside-castle/flies index: -1 outside-castle/note rotate: false - xy: 426, 53 + xy: 407, 53 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1411,21 +1425,21 @@ outsidehouse/fgtest index: -1 outsidehouse/note rotate: false - xy: 444, 53 + xy: 425, 53 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pathfind-test rotate: false - xy: 462, 53 + xy: 443, 53 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 save rotate: false - xy: 498, 53 + xy: 479, 53 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1627,21 +1641,21 @@ cat-tree/grandma-cry-1 index: -1 cloud rotate: false - xy: 352, 3 + xy: 885, 6 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 space/cloud rotate: false - xy: 352, 3 + xy: 885, 6 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 dream/case rotate: false - xy: 626, 817 + xy: 626, 834 size: 15, 38 orig: 15, 38 offset: 0, 0 @@ -1793,11 +1807,11 @@ inside-antique/darken orig: 320, 240 offset: 0, 0 index: -1 -inside-antique/teddy +inside-antique/shopkeep rotate: false - xy: 334, 2 - size: 16, 16 - orig: 16, 16 + xy: 1002, 1001 + size: 18, 21 + orig: 18, 21 offset: 0, 0 index: -1 inside-cafeteria/knights-stand @@ -1807,9 +1821,30 @@ inside-cafeteria/knights-stand orig: 490, 80 offset: 0, 0 index: -1 +inside-castle/books + rotate: false + xy: 849, 2 + size: 34, 19 + orig: 34, 19 + offset: 0, 0 + index: -1 +inside-castle/sign3 + rotate: false + xy: 544, 875 + size: 44, 20 + orig: 44, 20 + offset: 0, 0 + index: -1 +inside-castle/sign-3 + rotate: false + xy: 544, 875 + size: 44, 20 + orig: 44, 20 + offset: 0, 0 + index: -1 inside-house/flask rotate: false - xy: 1002, 1001 + xy: 624, 874 size: 16, 21 orig: 16, 21 offset: 0, 0 @@ -1865,14 +1900,14 @@ outsidehouse/cauldron index: -1 outsidehouse/charcoal-3 rotate: false - xy: 626, 877 + xy: 626, 814 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 outsidehouse/charcoal-4 rotate: false - xy: 626, 857 + xy: 626, 794 size: 18, 18 orig: 18, 18 offset: 0, 0 @@ -1914,7 +1949,7 @@ title/clouds index: -1 white rotate: false - xy: 544, 871 + xy: 590, 871 size: 32, 24 orig: 32, 24 offset: 0, 0 @@ -1946,21 +1981,21 @@ outsidehouse/fg orig: 320, 240 offset: 0, 0 index: -1 -castle-gate/frankie-walk-3 +castle-gate/frankie-walk-2 rotate: false xy: 862, 78 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 -castle-gate/frankie-walk-4 +castle-gate/frankie-walk-3 rotate: false xy: 862, 41 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 -castle-gate/frankie-walk-5 +castle-gate/frankie-walk-4 rotate: false xy: 862, 4 size: 24, 35 @@ -2944,27 +2979,34 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -castle-gate/frankie-walk-6 +castle-gate/frankie-walk-5 rotate: false xy: 916, 820 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 -castle-gate/frankie-walk-7 +castle-gate/frankie-walk-6 rotate: false xy: 994, 987 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 -castle-gate/frankie-walk-8 +castle-gate/frankie-walk-7 rotate: false xy: 994, 950 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 +castle-gate/frankie-walk-8 + rotate: false + xy: 994, 913 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 castle-gate/throw-walkie-4 rotate: false xy: 2, 886 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index 58afe3bf..944c2215 100644 Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index b52cfddd..401436e9 100644 Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ diff --git a/desktop/resources/packed/pack3.png b/desktop/resources/packed/pack3.png index 2738619e..9b60de52 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/resources/packed/pack4.png b/desktop/resources/packed/pack4.png index 3b648a9f..9de16858 100644 Binary files a/desktop/resources/packed/pack4.png and b/desktop/resources/packed/pack4.png differ diff --git a/desktop/resources/packed/pack5.png b/desktop/resources/packed/pack5.png index 55a9c38e..e5913437 100644 Binary files a/desktop/resources/packed/pack5.png and b/desktop/resources/packed/pack5.png differ diff --git a/desktop/resources/packed/pack7.png b/desktop/resources/packed/pack7.png index 2d95ae9e..afe708a5 100644 Binary files a/desktop/resources/packed/pack7.png and b/desktop/resources/packed/pack7.png differ diff --git a/desktop/resources/packed/pack8.png b/desktop/resources/packed/pack8.png index be158387..f1b619cf 100644 Binary files a/desktop/resources/packed/pack8.png and b/desktop/resources/packed/pack8.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index c373b655..8a17ba89 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -34,8 +34,7 @@ :game-player "Brian, you're a genius!") #(actions/do-dialogue entities :game-player "Considering the inverse square law..." :game-player "I estimate our planet's escape velocity to be..." - :game-player "No, that can't be right.")])) - ) + :game-player "No, that can't be right.")]))) entities)) nil) @@ -347,7 +346,8 @@ add-monocle-if-necessary)) (defn make [screen] - (let [game-player-talk-sheet (texture! (utils/get-texture "inside-castle/game-player-talk.png") :split 40 44) + (let [sign (utils/make-anim-seq "inside-castle/sign" [44 20] 0.3 (flatten [(repeat 20 0) 1 0 2 0 1 0 2 0 1 0 2 0 1])) + game-player-talk-sheet (texture! (utils/get-texture "inside-castle/game-player-talk.png") :split 40 44) game-player-talk-up (animation 0.15 (for [i [0 2 0 2 0 2 0 3 0 2 0 1 0 0 0 0 2 0 2 0 3 0 1 0 1 0 0 1 0 2 0 3 0]] (aget game-player-talk-sheet 0 i))) @@ -491,6 +491,10 @@ :entities {:bird-1 (utils/make-bird screen (as-> [[185 235] [220 225] [210 230] [250 235]] p (concat p (reverse p)))) + :sign (assoc (animation->texture screen sign ) + :anim sign + :anim-start 0 + :x 125 :y 138 :baseline 239) :bird-2 (utils/make-bird screen (as-> [[220 225] [195 235] [210 230] [250 225]] p (concat p (reverse p)))) diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index 08679633..cf8acf49 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -169,8 +169,7 @@ (actions/update-entities entities #(assoc-in % [:room :entities :axe :opacity] 1.0)) (actions/give entities :broken-clock) (actions/walk-straight-to entities :ego [170 71])) - (actions/talk entities :ego "No reason to chop that!")) - ) + (actions/talk entities :ego "No reason to chop that!"))) :sword (actions/get-script entities (actions/talk entities :ego "I can just use the axe.")) :default (actions/get-script entities (actions/talk entities :ego "No reason to chop that!")) :frog-legs (actions/get-script entities (actions/talk entities :ego "They're already chopped up!"))