diff --git a/desktop/resources/ego/axe-wood.png b/desktop/resources/ego/axe-wood.png
new file mode 100644
index 00000000..aa965be6
Binary files /dev/null and b/desktop/resources/ego/axe-wood.png differ
diff --git a/desktop/resources/ego/axe.png b/desktop/resources/ego/axe.png
new file mode 100644
index 00000000..93688271
Binary files /dev/null and b/desktop/resources/ego/axe.png differ
diff --git a/desktop/resources/outside-jail/Untitled.png b/desktop/resources/outside-jail/Untitled.png
new file mode 100644
index 00000000..b555a5d5
Binary files /dev/null and b/desktop/resources/outside-jail/Untitled.png differ
diff --git a/desktop/resources/outside-jail/axe-wood.pxa/0.pxi b/desktop/resources/outside-jail/axe-wood.pxa/0.pxi
new file mode 100644
index 00000000..716d71b0
Binary files /dev/null and b/desktop/resources/outside-jail/axe-wood.pxa/0.pxi differ
diff --git a/desktop/resources/outside-jail/axe-wood.pxa/1.pxi b/desktop/resources/outside-jail/axe-wood.pxa/1.pxi
new file mode 100644
index 00000000..b0cccc7d
Binary files /dev/null and b/desktop/resources/outside-jail/axe-wood.pxa/1.pxi differ
diff --git a/desktop/resources/outside-jail/axe-wood.pxa/10.pxi b/desktop/resources/outside-jail/axe-wood.pxa/10.pxi
new file mode 100644
index 00000000..7937c51a
Binary files /dev/null and b/desktop/resources/outside-jail/axe-wood.pxa/10.pxi differ
diff --git a/desktop/resources/outside-jail/axe-wood.pxa/2.pxi b/desktop/resources/outside-jail/axe-wood.pxa/2.pxi
new file mode 100644
index 00000000..abcb4f7f
Binary files /dev/null and b/desktop/resources/outside-jail/axe-wood.pxa/2.pxi differ
diff --git a/desktop/resources/outside-jail/axe-wood.pxa/3.pxi b/desktop/resources/outside-jail/axe-wood.pxa/3.pxi
new file mode 100644
index 00000000..f03b33ca
Binary files /dev/null and b/desktop/resources/outside-jail/axe-wood.pxa/3.pxi differ
diff --git a/desktop/resources/outside-jail/axe-wood.pxa/4.pxi b/desktop/resources/outside-jail/axe-wood.pxa/4.pxi
new file mode 100644
index 00000000..e5ba7d8d
Binary files /dev/null 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
new file mode 100644
index 00000000..3719c46b
Binary files /dev/null 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
new file mode 100644
index 00000000..a1a1b2df
Binary files /dev/null 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
new file mode 100644
index 00000000..6804e0ab
Binary files /dev/null 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
new file mode 100644
index 00000000..67739ef3
Binary files /dev/null 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
new file mode 100644
index 00000000..bdd3ce73
Binary files /dev/null and b/desktop/resources/outside-jail/axe-wood.pxa/9.pxi differ
diff --git a/desktop/resources/outside-jail/axe-wood.pxa/CelData.plist b/desktop/resources/outside-jail/axe-wood.pxa/CelData.plist
new file mode 100644
index 00000000..53e79e6e
--- /dev/null
+++ b/desktop/resources/outside-jail/axe-wood.pxa/CelData.plist
@@ -0,0 +1,50 @@
+
+
+
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+
diff --git a/desktop/resources/outside-jail/axe.pxa/0.pxi b/desktop/resources/outside-jail/axe.pxa/0.pxi
new file mode 100644
index 00000000..d6b19718
Binary files /dev/null and b/desktop/resources/outside-jail/axe.pxa/0.pxi differ
diff --git a/desktop/resources/outside-jail/axe.pxa/1.pxi b/desktop/resources/outside-jail/axe.pxa/1.pxi
new file mode 100644
index 00000000..6e6a1d53
Binary files /dev/null and b/desktop/resources/outside-jail/axe.pxa/1.pxi differ
diff --git a/desktop/resources/outside-jail/axe.pxa/2.pxi b/desktop/resources/outside-jail/axe.pxa/2.pxi
new file mode 100644
index 00000000..683f1d4f
Binary files /dev/null and b/desktop/resources/outside-jail/axe.pxa/2.pxi differ
diff --git a/desktop/resources/outside-jail/axe.pxa/3.pxi b/desktop/resources/outside-jail/axe.pxa/3.pxi
new file mode 100644
index 00000000..db79ff5d
Binary files /dev/null and b/desktop/resources/outside-jail/axe.pxa/3.pxi differ
diff --git a/desktop/resources/outside-jail/axe.pxa/4.pxi b/desktop/resources/outside-jail/axe.pxa/4.pxi
new file mode 100644
index 00000000..5ec7fabd
Binary files /dev/null and b/desktop/resources/outside-jail/axe.pxa/4.pxi differ
diff --git a/desktop/resources/outside-jail/axe.pxa/CelData.plist b/desktop/resources/outside-jail/axe.pxa/CelData.plist
new file mode 100644
index 00000000..1ff35422
--- /dev/null
+++ b/desktop/resources/outside-jail/axe.pxa/CelData.plist
@@ -0,0 +1,26 @@
+
+
+
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+
diff --git a/desktop/resources/outside-jail/axe2.pxi b/desktop/resources/outside-jail/axe2.pxi
new file mode 100644
index 00000000..2509afa8
Binary files /dev/null and b/desktop/resources/outside-jail/axe2.pxi differ
diff --git a/desktop/resources/outside-jail/background.png b/desktop/resources/outside-jail/background.png
index 6116d2ab..748fb837 100644
Binary files a/desktop/resources/outside-jail/background.png and b/desktop/resources/outside-jail/background.png differ
diff --git a/desktop/src-common/advent/screens/rooms/outside_house.clj b/desktop/src-common/advent/screens/rooms/outside_house.clj
index b9de7d34..0a1718e2 100644
--- a/desktop/src-common/advent/screens/rooms/outside_house.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_house.clj
@@ -468,7 +468,7 @@
:wizard (rooms/make-entity :wizard (common/make-wizard screen {:x 190 :y 78 :baseline 162 :scale-x 1.2 :scale-y 1.2
:script (actions/get-script entities (talk-to-gandarf-outside entities))}))
:note (rooms/make-entity :note (assoc (texture "outsidehouse/note.png")
- :x 286 :y 80 :baseline 160
+ :x 277 :y 74 :baseline 160
:script (actions/get-script entities
(actions/walk-to entities :ego [280 80] :face :right)
(actions/play-animation entities :ego :squat)
diff --git a/desktop/src-common/advent/screens/rooms/outside_jail.clj b/desktop/src-common/advent/screens/rooms/outside_jail.clj
index 7fa62cd2..a4f42b16 100644
--- a/desktop/src-common/advent/screens/rooms/outside_jail.clj
+++ b/desktop/src-common/advent/screens/rooms/outside_jail.clj
@@ -131,7 +131,11 @@
))}
:stump {:box [205 68 251 89]
:script (actions/get-script entities
- (actions/do-dialogue entities :ego "It's a stump."))
+ (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/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/play-animation entities :ego :reach)
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 57a03a9a..7f8af738 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -207,6 +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))
ego {:right {:walk walk-right
:stand stand-anim
@@ -248,6 +250,8 @@
:swing-shovel swing-shovel
:love love
:idea idea
+ :axe axe
+ :axe-wood axe-wood
}
:left {:walk (utils/flip walk-right)
:stand (utils/flip stand-anim)
@@ -279,7 +283,9 @@
:throw (utils/flip throw)
:swing-shovel (utils/flip swing-shovel)
:love (utils/flip love)
- :idea (utils/flip idea)}
+ :idea (utils/flip idea)
+ :axe (utils/flip axe)
+ :axe-wood (utils/flip axe-wood)}
:baseline (- 240 (last start-pos))
:facing :right
:origin-x 9
@@ -367,6 +373,8 @@
:anim-merges {(get-in ego [:right :shock]) {:origin-x 15}
(get-in ego [:left :swing-shovel]) {:origin-x 26}
(get-in ego [:right :swing-shovel]) {:origin-x 26}
+ (get-in ego [:right :axe]) {:origin-x 17}
+ (get-in ego [:right :axe-wood]) {:origin-x 17}
(get-in ego [:left :love]) {:origin-x 36}
:default {:origin-x 9}})]
(actions/start-animation screen