diff --git a/desktop/resources/ego/axe.png b/desktop/resources/ego/axe.png index 93688271..e5ec4d1e 100644 Binary files a/desktop/resources/ego/axe.png and b/desktop/resources/ego/axe.png differ diff --git a/desktop/resources/ego/axe.pxa/0.pxi b/desktop/resources/ego/axe.pxa/0.pxi new file mode 100644 index 00000000..d6b19718 Binary files /dev/null and b/desktop/resources/ego/axe.pxa/0.pxi differ diff --git a/desktop/resources/ego/axe.pxa/1.pxi b/desktop/resources/ego/axe.pxa/1.pxi new file mode 100644 index 00000000..6e6a1d53 Binary files /dev/null and b/desktop/resources/ego/axe.pxa/1.pxi differ diff --git a/desktop/resources/ego/axe.pxa/2.pxi b/desktop/resources/ego/axe.pxa/2.pxi new file mode 100644 index 00000000..ab3d3dc1 Binary files /dev/null and b/desktop/resources/ego/axe.pxa/2.pxi differ diff --git a/desktop/resources/ego/axe.pxa/3.pxi b/desktop/resources/ego/axe.pxa/3.pxi new file mode 100644 index 00000000..510359a6 Binary files /dev/null and b/desktop/resources/ego/axe.pxa/3.pxi differ diff --git a/desktop/resources/ego/axe.pxa/4.pxi b/desktop/resources/ego/axe.pxa/4.pxi new file mode 100644 index 00000000..8d050621 Binary files /dev/null and b/desktop/resources/ego/axe.pxa/4.pxi differ diff --git a/desktop/resources/ego/axe.pxa/5.pxi b/desktop/resources/ego/axe.pxa/5.pxi new file mode 100644 index 00000000..3021c6ca Binary files /dev/null and b/desktop/resources/ego/axe.pxa/5.pxi differ diff --git a/desktop/resources/ego/axe.pxa/6.pxi b/desktop/resources/ego/axe.pxa/6.pxi new file mode 100644 index 00000000..8a78cd62 Binary files /dev/null and b/desktop/resources/ego/axe.pxa/6.pxi differ diff --git a/desktop/resources/ego/axe.pxa/CelData.plist b/desktop/resources/ego/axe.pxa/CelData.plist new file mode 100644 index 00000000..8f638e26 --- /dev/null +++ b/desktop/resources/ego/axe.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/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj index a4f42b16..82fc73d0 100644 --- a/desktop/src-common/advent/screens/rooms/outside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj @@ -137,20 +137,18 @@ (actions/play-animation entities :ego :axe-wood) (actions/walk-straight-to entities :ego [170 71])) :scripts {:alarm-clock (actions/get-script entities - (actions/walk-to entities :ego [189 65] :face :right) + (actions/walk-to entities :ego [170 71] :face :right) + (actions/walk-straight-to entities :ego [188 71] :face :right) (actions/play-animation entities :ego :reach) (actions/remove-item entities :alarm-clock) - (actions/add-entity entities :alarm-clock (get-in @entities [:room :alarm-clock]))) - :sword (actions/get-script entities - (when (get-in @entities [:room :entities :alarm-clock]) - (actions/walk-to entities :ego [129 65] :face :right) - (actions/talk entities :ego "I'll take a big swing!") - (actions/walk-straight-to entities :ego [189 65] :face :right :speed 3.5) - (actions/play-animation entities :ego :swing) - (actions/talk entities :ego "It's split right down the middle!") - (actions/play-animation entities :ego :reach) - (actions/remove-entity entities :alarm-clock) - (actions/give entities :broken-clock)))}} + (actions/add-entity entities :alarm-clock (get-in @entities [:room :alarm-clock])) + (actions/play-animation entities :ego :axe) + (actions/talk entities :ego "It's split right down the middle!") + (actions/play-animation entities :ego :reach) + (actions/remove-entity entities :alarm-clock) + (actions/give entities :broken-clock) + (actions/walk-straight-to entities :ego [170 71])) + :sword (actions/get-script entities (actions/talk entities :ego "I can just use the axe."))}} :lever {:box [10 72 17 85] :script (actions/get-script entities (interact-with-lever entities)) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 19f6b5e2..bc98522b 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -207,7 +207,7 @@ 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.10 (range 5)) + axe (utils/make-anim "ego/axe.png" [60 70] 0.10 (range 7)) axe-wood (utils/make-anim "ego/axe-wood.png" [60 70] 0.10 (range 11)) ego {:right {:walk walk-right