diff --git a/desktop/resources/inside-castle/Untitled.png b/desktop/resources/inside-castle/Untitled.png
index 0d21ce9d..05893777 100644
Binary files a/desktop/resources/inside-castle/Untitled.png and b/desktop/resources/inside-castle/Untitled.png differ
diff --git a/desktop/resources/inside-castle/game-player-talk.png b/desktop/resources/inside-castle/game-player-talk.png
index d4c88beb..af433d04 100644
Binary files a/desktop/resources/inside-castle/game-player-talk.png and b/desktop/resources/inside-castle/game-player-talk.png differ
diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/0.pxi b/desktop/resources/inside-castle/game-player-talk.pxa/0.pxi
index da062ca1..d52948b9 100644
Binary files a/desktop/resources/inside-castle/game-player-talk.pxa/0.pxi and b/desktop/resources/inside-castle/game-player-talk.pxa/0.pxi differ
diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/1.pxi b/desktop/resources/inside-castle/game-player-talk.pxa/1.pxi
index e10ecd68..e466e036 100644
Binary files a/desktop/resources/inside-castle/game-player-talk.pxa/1.pxi and b/desktop/resources/inside-castle/game-player-talk.pxa/1.pxi differ
diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/2.pxi b/desktop/resources/inside-castle/game-player-talk.pxa/2.pxi
index 3297d2d9..7c9f6636 100644
Binary files a/desktop/resources/inside-castle/game-player-talk.pxa/2.pxi and b/desktop/resources/inside-castle/game-player-talk.pxa/2.pxi differ
diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/3.pxi b/desktop/resources/inside-castle/game-player-talk.pxa/3.pxi
index d0554cfd..4039bc9c 100644
Binary files a/desktop/resources/inside-castle/game-player-talk.pxa/3.pxi and b/desktop/resources/inside-castle/game-player-talk.pxa/3.pxi differ
diff --git a/desktop/resources/inside-castle/game-player-talk.pxa/CelData.plist b/desktop/resources/inside-castle/game-player-talk.pxa/CelData.plist
index f0b74d60..222d28b8 100644
--- a/desktop/resources/inside-castle/game-player-talk.pxa/CelData.plist
+++ b/desktop/resources/inside-castle/game-player-talk.pxa/CelData.plist
@@ -18,5 +18,29 @@
duration
1
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
+
+ duration
+ 1
+
diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj
index 2cdae64c..0114cafb 100644
--- a/desktop/src-common/advent/screens/rooms/inside_castle.clj
+++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj
@@ -59,11 +59,14 @@
:game-player "'Worthy in wisdom, courage, and might,\nonly then with sword he'll fight.'"
:game-player "I've often dreamed of pulling the sword myself.")
:choices ["Why don't you?"
- {:run #(actions/respond entities %
- :game-player "I, of course, have the wisdom required for the task."
- :game-player "But I'm not much of a warrior. I don't have the might required for the task."
- :game-player "The knights of Remington have muscles the size of tree trunks."
- :game-player "I'd never be able to prove my strength.")
+ {:run #(do (actions/respond entities %
+ :game-player "I, of course, have the wisdom to do such a deed."
+ :game-player "But I'm not much of a hero."
+ :game-player "I don't have the might or courage required to pull the sword and fulfill the prophecy. "
+ :game-player "The knights of Remington have muscles the size of tree trunks."
+ :game-player "But me...")
+ (actions/play-animation entities :game-player :flex)
+ (actions/do-dialogue entities :game-player "I'd never be able to prove my strength."))
:choices actions/previous-choices}
"Something else."
{:choices actions/something-else}]}
@@ -123,6 +126,8 @@
(aget game-player-talk-sheet 0 i)))
game-player-stand (animation 0.15 (for [i [0 0 0 0 0 0 0 0 0 0 0 1]]
+ (aget game-player-talk-sheet 0 i)))
+ game-player-flex (animation 0.075 (for [i [0 0 4 4 5 5 5 5 5 5 5 6 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 7 8 7 9 6 5 5 4 4 0 0 0 0]]
(aget game-player-talk-sheet 0 i)))
trophy (utils/make-anim "inside-castle/trophy.png" [16 16] 0.1 (flatten [(repeat 50 0) 1 2 3 3 3 3 2 1]))]
(rooms/make :music :town-1
@@ -158,8 +163,7 @@
obtained-items (set/intersection #{:trophy :medal :kiss} (get-in @entities [:state :obtained-items]))]
(if (= #{} missing-items)
(pull-sword entities)
- (try-to-pull-sword entities missing-items obtained-items)))))
- )}
+ (try-to-pull-sword entities missing-items obtained-items))))))}
:sign {:box [125 140 165 155]
:script (actions/get-script entities
(actions/talk entities :ego "Ye Ol' Antique Shoppe."))}
@@ -256,6 +260,7 @@
:anim game-player-stand
:anim-start 0
:stand game-player-stand
+ :flex game-player-flex
:talk game-player-talk)}
:collision "inside-castle/collision.png"
:scale-fn (utils/scaler-fn-from-image "inside-castle/scale.png" 0.25 1.00)