diff --git a/desktop/asset-work/castle-gate/background.png b/desktop/asset-work/castle-gate/background.png index 02cd0339..912cd078 100644 Binary files a/desktop/asset-work/castle-gate/background.png and b/desktop/asset-work/castle-gate/background.png differ diff --git a/desktop/asset-work/castle-gate/castle-door.psd b/desktop/asset-work/castle-gate/castle-door.psd index 85c66bb9..9e0d5e5a 100644 Binary files a/desktop/asset-work/castle-gate/castle-door.psd and b/desktop/asset-work/castle-gate/castle-door.psd differ diff --git a/desktop/asset-work/castle-gate/overlay.png b/desktop/asset-work/castle-gate/overlay.png index 640d701a..41792abb 100644 Binary files a/desktop/asset-work/castle-gate/overlay.png and b/desktop/asset-work/castle-gate/overlay.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 61a23180..abb76072 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -109,6 +109,27 @@ 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 +inside-house/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 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 outsidehouse/dot rotate: false xy: 846, 784 @@ -116,7 +137,7 @@ outsidehouse/dot orig: 1, 1 offset: 0, 0 index: -1 -wizard/dot +dream/dot rotate: false xy: 846, 784 size: 1, 1 @@ -137,20 +158,6 @@ inside-jail/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-antique/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 - orig: 1, 1 - offset: 0, 0 - index: -1 title/dot rotate: false xy: 846, 784 @@ -158,13 +165,6 @@ title/dot orig: 1, 1 offset: 0, 0 index: -1 -dream/dot - rotate: false - xy: 846, 784 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 cat-tree/monocle rotate: false xy: 992, 839 @@ -361,14 +361,14 @@ held/dot orig: 1, 1 offset: 0, 0 index: -1 -space/dot +outside-jail/dot rotate: false xy: 849, 784 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -outside-jail/dot +space/dot rotate: false xy: 849, 784 size: 1, 1 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index 377bf407..58afe3bf 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 49e93557..d9864d6c 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/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index 9e279a48..18963d0c 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -149,6 +149,39 @@ (update-in [:room :entities :goon-2] (fn [g] (-> (actions/start-animation screen g :flip))))) entities)) +(defn look-at-note [entities] + (actions/walk-to entities :ego [126 65] :face :left) + (if (get-in @entities [:state :has-voted?]) + (actions/do-dialogue entities + :ego "It's a notice for a town vote." + :ego "Let's see..." + :ego "It looks like Took's going to get a pardon! 35 to 34!") + (actions/do-dialogue entities :ego "It's a notice for a town vote." + :ego "\"Took, son of Luke, son of Puke abandoned his post and duties," + :ego "... and let a hoodlum steal the Duke's ladder." + :ego "Vote 'Yea' by signing below to pardon him of his crime." + :ego "And vote 'Nay' to exact due justice.\"" + :ego "Let's see..." + :ego "It looks like it's perfect tie! 34 to 34!"))) + +(defn sign-note [entities] + (actions/walk-to entities :ego [126 65] :face :left) + (if (get-in @entities [:state :has-voted?]) + (actions/do-dialogue entities :ego "Looks like I've already voted.") + (do + (actions/do-dialogue entities + :ego "It'd be a shame to have Took punished on my account!" + :ego "I'll vote to give him a pardon.") + (actions/play-animation entities :ego :reach) + (actions/do-dialogue entities :ego "There, now the vote is 35 to 34!") + (actions/update-state entities #(assoc % :has-voted? true))))) + +(defn make-note [] + {:box [97 102 111 132] + :script (actions/get-script entities + (look-at-note entities)) + :scripts {:charcoal (actions/get-script entities + (sign-note entities))}}) (defn make [screen] (let [throw-walkie (utils/make-anim-seq "castle-gate/throw-walkie" [205 136] 0.1 (flatten [(repeat 55 0) (range 9) (repeat 55 8)])) @@ -165,7 +198,7 @@ (actions/update-state entities #(assoc % :bubba-gone? false)) (actions/walk-to entities :ego [129 148] :skip-type :end)) :cursor :right} - :left-dir {:box [105 93 169 212] + :left-dir {:box [115 93 169 212] :script (actions/get-script entities (attempt-walking-through-gate entities)) :cursor :left} @@ -183,7 +216,8 @@ (actions/remove-item entities :walkie-talkies) (actions/begin-animation entities :walkie-talkies :stand) (Thread/sleep 2000) - (actions/walk-straight-to entities :ego [285 71]))}}} + (actions/walk-straight-to entities :ego [285 71]))}} + :note (make-note)} :layers {:day [(assoc (utils/get-texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) (assoc (utils/get-texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)]