diff --git a/desktop/resources/castle-gate/goon-2-walk.png b/desktop/resources/castle-gate/goon-2-walk.png new file mode 100644 index 00000000..d2ec7a8e Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-walk.png differ diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/0.pxi b/desktop/resources/castle-gate/goon-2-walk.pxa/0.pxi new file mode 100644 index 00000000..8f2dcccb Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-walk.pxa/0.pxi differ diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/1.pxi b/desktop/resources/castle-gate/goon-2-walk.pxa/1.pxi new file mode 100644 index 00000000..f7cc5748 Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-walk.pxa/1.pxi differ diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/2.pxi b/desktop/resources/castle-gate/goon-2-walk.pxa/2.pxi new file mode 100644 index 00000000..05fa40f0 Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-walk.pxa/2.pxi differ diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/3.pxi b/desktop/resources/castle-gate/goon-2-walk.pxa/3.pxi new file mode 100644 index 00000000..602542d3 Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-walk.pxa/3.pxi differ diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/4.pxi b/desktop/resources/castle-gate/goon-2-walk.pxa/4.pxi new file mode 100644 index 00000000..7a92829f Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-walk.pxa/4.pxi differ diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/5.pxi b/desktop/resources/castle-gate/goon-2-walk.pxa/5.pxi new file mode 100644 index 00000000..b444dd26 Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-walk.pxa/5.pxi differ diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/6.pxi b/desktop/resources/castle-gate/goon-2-walk.pxa/6.pxi new file mode 100644 index 00000000..ab267c52 Binary files /dev/null and b/desktop/resources/castle-gate/goon-2-walk.pxa/6.pxi differ diff --git a/desktop/resources/castle-gate/goon-2-walk.pxa/CelData.plist b/desktop/resources/castle-gate/goon-2-walk.pxa/CelData.plist new file mode 100644 index 00000000..8f638e26 --- /dev/null +++ b/desktop/resources/castle-gate/goon-2-walk.pxa/CelData.plist @@ -0,0 +1,34 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/goon-2-walk.png b/desktop/resources/goon-2-walk.png new file mode 100644 index 00000000..d2ec7a8e Binary files /dev/null and b/desktop/resources/goon-2-walk.png differ diff --git a/desktop/resources/left.pxa/0.pxi b/desktop/resources/left.pxa/0.pxi index c90bb7ff..d4689616 100644 Binary files a/desktop/resources/left.pxa/0.pxi and b/desktop/resources/left.pxa/0.pxi differ diff --git a/desktop/resources/left.pxa/1.pxi b/desktop/resources/left.pxa/1.pxi index cd9d2910..424e420e 100644 Binary files a/desktop/resources/left.pxa/1.pxi and b/desktop/resources/left.pxa/1.pxi differ diff --git a/desktop/resources/left.pxa/2.pxi b/desktop/resources/left.pxa/2.pxi index c0a4db46..8c9d614d 100644 Binary files a/desktop/resources/left.pxa/2.pxi and b/desktop/resources/left.pxa/2.pxi differ diff --git a/desktop/resources/left.pxa/3.pxi b/desktop/resources/left.pxa/3.pxi index e1fa5995..bc1ad795 100644 Binary files a/desktop/resources/left.pxa/3.pxi and b/desktop/resources/left.pxa/3.pxi differ diff --git a/desktop/resources/left.pxa/4.pxi b/desktop/resources/left.pxa/4.pxi index 8091cbc2..1c5c25fe 100644 Binary files a/desktop/resources/left.pxa/4.pxi and b/desktop/resources/left.pxa/4.pxi differ diff --git a/desktop/resources/left.pxa/5.pxi b/desktop/resources/left.pxa/5.pxi index ae9168db..b8e5b806 100644 Binary files a/desktop/resources/left.pxa/5.pxi and b/desktop/resources/left.pxa/5.pxi differ diff --git a/desktop/resources/left.pxa/6.pxi b/desktop/resources/left.pxa/6.pxi index 9e825771..0d46d44c 100644 Binary files a/desktop/resources/left.pxa/6.pxi and b/desktop/resources/left.pxa/6.pxi differ diff --git a/desktop/resources/left.pxa/7.pxi b/desktop/resources/left.pxa/7.pxi index 9ae651c5..455d5f79 100644 Binary files a/desktop/resources/left.pxa/7.pxi and b/desktop/resources/left.pxa/7.pxi differ diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index 9ad32868..71ec80c5 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -138,7 +138,8 @@ (let [stand (utils/make-anim "castle-gate/goon-2.png" [12 32] 0.175 [0 0 0 0 0 0 0 0 0 0 0 0 0 1]) talk (utils/make-anim "castle-gate/goon-2-talk.png" [12 32] 0.175 (range 2)) flip (utils/make-anim "castle-gate/goon-2-flip.png" [12 32] 0.05 [1 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ]) - search (utils/make-anim "castle-gate/goon-2-search.png" [24 32] 0.3 [0 1 2 3 2 3 2 1 4 5 6 5 6 7 6 7 6 7 6 1 0])] + search (utils/make-anim "castle-gate/goon-2-search.png" [24 32] 0.3 [0 1 2 3 2 3 2 1 4 5 6 5 6 7 6 7 6 7 6 1 0]) + walk (utils/flip (utils/make-anim "castle-gate/goon-2-walk.png" [24 34] 0.075 (range 7)))] (assoc (animation->texture screen stand) :x 214 :y 102 :baseline 151 :scale-x 1.4 @@ -148,10 +149,12 @@ :anim stand :talk talk :flip flip + :walk walk :search search - :anim-merges {search {:origin-x 12} - talk {:origin-x 6} - :default {:origin-x 6}} + :anim-merges {search {:origin-x 12 :origin-y 0} + talk {:origin-x 6 :origin-y 0} + walk {:origin-x 12 :origin-y 3} + :default {:origin-x 6 :origin-y 0}} :update-fn (fn [s es e] (if (and (= (:flip e) (:anim e)) (animation! (:flip e) @@ -184,8 +187,9 @@ (actions/update-state entities (fn [s] (assoc s :has-dropped-coin? true))) (actions/talk entities :goon-2 "You made me lose my coin, Dipstick!" :anim :search) (actions/talk entities :ego "Umm, sorry!")) - (actions/do-dialogue entities :ego "Hey Bubba!" - :goon-2 "Beat it, Dipstick."))) + (do + (actions/do-dialogue entities :ego "Hey Bubba!" + :goon-2 "Beat it, Dipstick.")))) :night-profile :sprite :anim-start 0 :stand stand))) diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 21478a90..32a1824a 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -221,6 +221,10 @@ (frankie-comment-on-item entities) (actions/do-dialogue entities :frankie "Bubba, put this stuff in the secret stash." + :goon-2 "You got it boss" + ) + (actions/walk-straight-to entities :goon-2 [0 100]) + (actions/do-dialogue entities :frankie "Now move along." :frankie "Before we decide to take all of your stuff." :ego "But I need that slingshot!"