diff --git a/desktop/resources/ego/axe-wood.png b/desktop/resources/ego/axe-wood.png index aa965be6..8007d0e7 100644 Binary files a/desktop/resources/ego/axe-wood.png and b/desktop/resources/ego/axe-wood.png differ diff --git a/desktop/resources/outside-jail/axe-wood.pxa/10.pxi b/desktop/resources/outside-jail/axe-wood.pxa/10.pxi index 7937c51a..abe0785c 100644 Binary files a/desktop/resources/outside-jail/axe-wood.pxa/10.pxi and b/desktop/resources/outside-jail/axe-wood.pxa/10.pxi differ diff --git a/desktop/resources/outside-jail/axe-wood.pxa/4.pxi b/desktop/resources/outside-jail/axe-wood.pxa/4.pxi index e5ba7d8d..971d00e1 100644 Binary files a/desktop/resources/outside-jail/axe-wood.pxa/4.pxi and b/desktop/resources/outside-jail/axe-wood.pxa/4.pxi differ diff --git a/desktop/resources/outside-jail/axe-wood.pxa/5.pxi b/desktop/resources/outside-jail/axe-wood.pxa/5.pxi index 3719c46b..47c461d2 100644 Binary files a/desktop/resources/outside-jail/axe-wood.pxa/5.pxi and b/desktop/resources/outside-jail/axe-wood.pxa/5.pxi differ diff --git a/desktop/resources/outside-jail/axe-wood.pxa/6.pxi b/desktop/resources/outside-jail/axe-wood.pxa/6.pxi index a1a1b2df..dc619dd9 100644 Binary files a/desktop/resources/outside-jail/axe-wood.pxa/6.pxi and b/desktop/resources/outside-jail/axe-wood.pxa/6.pxi differ diff --git a/desktop/resources/outside-jail/axe-wood.pxa/7.pxi b/desktop/resources/outside-jail/axe-wood.pxa/7.pxi index 6804e0ab..61bf425a 100644 Binary files a/desktop/resources/outside-jail/axe-wood.pxa/7.pxi and b/desktop/resources/outside-jail/axe-wood.pxa/7.pxi differ diff --git a/desktop/resources/outside-jail/axe-wood.pxa/8.pxi b/desktop/resources/outside-jail/axe-wood.pxa/8.pxi index 67739ef3..739a1d10 100644 Binary files a/desktop/resources/outside-jail/axe-wood.pxa/8.pxi and b/desktop/resources/outside-jail/axe-wood.pxa/8.pxi differ diff --git a/desktop/resources/outside-jail/axe-wood.pxa/9.pxi b/desktop/resources/outside-jail/axe-wood.pxa/9.pxi index bdd3ce73..841f94d6 100644 Binary files a/desktop/resources/outside-jail/axe-wood.pxa/9.pxi and b/desktop/resources/outside-jail/axe-wood.pxa/9.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 3675639b..7f5d16a0 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -31,13 +31,13 @@ (defn present-frankie-choices [entities] (actions/present-choices entities {:choices ["Please, Frankie. Give me my stuff back!" {:run #(do (actions/respond entities % - :frankie "Not a chance, Faceplant." + :frankie "Not a chance, Dipstick." :frankie "Burglers like us gotta eat too, you know." :ego "But it's a matter of life and death! Georgia McGorgeous is counting on me!" ) (actions/in-love entities) (actions/respond entities % - :frankie "Georgia's going steady with me now, Faceplant.") + :frankie "Georgia's going steady with me now, Dipstick.") (actions/play-animation entities :frankie :laugh) (actions/do-dialogue entities :frankie "You'd be better off if you just packed your bags and left town." :frankie "Ain't that right boys?") @@ -46,7 +46,7 @@ "You guys are nothing but a bunch of crooks!" {:run #(do (actions/respond entities % - :frankie "Oh please, Faceplant." + :frankie "Oh please." :frankie "Like you're so different." :frankie "Am I right boys?") (actions/play-animation entities :frankie :glance) @@ -57,7 +57,7 @@ :choices actions/previous-choices} "Where is your secret stash?" - {:run #(do (actions/respond entities % :frankie "Like I'd ever tell you, Faceplant.") + {:run #(do (actions/respond entities % :frankie "Like I'd ever tell you, Dipstick.") (actions/play-animation entities :frankie :laugh) (actions/do-dialogue entities :frankie "That's only for people in the 'Super secret cool club'!")) :choices actions/previous-choices} diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index ea5c9265..7ee15177 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -71,7 +71,7 @@ (defn listen-1 [entities] - (actions/talk entities :ego "Did you see the look on Faceplant's face when we took his stuff?" :animate? false :stop? false) + (actions/talk entities :ego "Did you see the look on Tick's face when we took his stuff?" :animate? false :stop? false) (actions/talk entities :ego "It looked like he was about to pee his pants." :animate? false :stop? false) (actions/talk entities :ego "Am I right boys?" :animate? false :stop? false)) diff --git a/desktop/src-common/advent/screens/rooms/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index c5f19d47..6044e3b6 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -134,7 +134,7 @@ :frankie "And how about that? A glass eye." :frankie "And not only that, it's the choicest of glass eyes!" :frankie "It must be made of the choicest glass, from across the sea!" - :frankie "This'll be perfect for when I punch your eye out Faceplant." + :frankie "This'll be perfect for when I punch your eye out, Dipstick." :frankie "Or, I could fetch some real good dough for this." :frankie "What would you say boys?") (actions/play-animation entities :frankie :glance) @@ -144,7 +144,7 @@ (actions/do-dialogue entities :frankie "And how about that? Some used earplugs." :frankie "Wow! These are the choicest of earplugs!" - :frankie "They're great for tuning out your voice, Faceplant!" + :frankie "They're great for tuning out your voice, Dipstick!" :frankie "But, I could fetch some real good dough for them." :frankie "What would you say boys? ") (actions/play-animation entities :frankie :glance) @@ -154,7 +154,7 @@ (actions/do-dialogue entities :frankie "And how about that? Some used earplugs." :frankie "Wow! These are the choicest of earplugs!" - :frankie "They're great for tuning out your voice, Faceplant!" + :frankie "They're great for tuning out your voice, Dipstick!" :frankie "But, I could fetch some real good dough for them." :frankie "What would you say boys? ") (actions/play-animation entities :frankie :glance) @@ -167,23 +167,24 @@ (do (actions/do-dialogue entities :frankie "Well, well, well. What have we here boys?" - :frankie "It's good ol' Faceplant again.") + :frankie "It's good ol' Dipstick again.") (actions/play-animation entities :frankie :laugh)) (do (actions/do-dialogue entities :frankie "Well, well, well. What have we here boys?") (actions/play-animation entities :frankie :glance) - (actions/do-dialogue entities :frankie "It's good ol' Faceplant.") + (actions/do-dialogue entities :frankie "It's good ol' Dipstick.") (actions/play-animation entities :frankie :laugh) (actions/do-dialogue entities :ego "Uh, oh. Frankie Rockfist!" :ego "Listen, I don't want any trouble." - :frankie "Well you found it tonight, Faceplant." + :frankie "Well you found it tonight, Dipstick." :frankie "Am I right boys?") (actions/play-animation entities :frankie :glance) - (actions/do-dialogue entities :frankie "You looking for another beat down Faceplant?") + (actions/do-dialogue entities :frankie "You looking for another beat down Dipstick?") (actions/play-animation entities :frankie :laugh) (actions/do-dialogue entities - :ego "I'm just passing through..." + :ego "The name's \"Tick\"..." + :ego "... and I'm just passing through..." :frankie "Not tonight you're not." :frankie "Unless, of course, you can pay the toll." :frankie "Come here, faceplant." @@ -192,7 +193,7 @@ :frankie "Now.") (actions/walk-straight-to entities :ego [254 80]) (actions/do-dialogue entities - :frankie "Now what have we got to give us today, Faceplant?" + :frankie "Now what have we got to give us today, Dipstick?" :frankie "A strength potion, oh very nice!" :frankie "And some gold..." :frankie "And what's this?" @@ -202,9 +203,9 @@ (frankie-comment-on-item entities) (actions/give entities :money) (actions/do-dialogue entities - :frankie "Here's a little tip for your troubles, Faceplant." + :frankie "Here's a little tip for your troubles, Dipstick." :frankie "Bubba, put this stuff in the secret stash." - :frankie "Now move along, Faceplant." + :frankie "Now move along." :frankie "Before we decide to take all of your stuff." :ego "But I need that slingshot!" :frankie "Too bad. Move along.") diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 7f8af738..19f6b5e2 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -207,8 +207,8 @@ throw (utils/make-anim "ego/throw.png" [18 36] 0.04 (flatten [[(repeat 5 0) (repeat 10 1)] (repeat 3 [2 2 2 3 3 3 4 4 4 5 5 5]) (repeat 5 [2 2 3 3 4 4 5 5]) (repeat 10 [2 3 4 5]) [2 3 3] (repeat 15 6)])) swing-shovel (utils/make-anim "ego/swing-shovel.png" [70 70] 0.1 (range 9)) love (utils/make-anim "ego/love.png" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 21 21 21 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0])) - axe (utils/make-anim "ego/axe.png" [60 70] 0.15 (range 5)) - axe-wood (utils/make-anim "ego/axe-wood.png" [60 70] 0.15 (range 11)) + axe (utils/make-anim "ego/axe.png" [60 70] 0.10 (range 5)) + axe-wood (utils/make-anim "ego/axe-wood.png" [60 70] 0.10 (range 11)) ego {:right {:walk walk-right :stand stand-anim