diff --git a/desktop/asset-work/inside-jail/exhale.ogg b/desktop/asset-work/inside-jail/exhale.ogg new file mode 100644 index 00000000..559fed29 Binary files /dev/null and b/desktop/asset-work/inside-jail/exhale.ogg differ diff --git a/desktop/asset-work/inside-jail/exhale.wav b/desktop/asset-work/inside-jail/exhale.wav index 60cc8c8a..98a03b17 100644 Binary files a/desktop/asset-work/inside-jail/exhale.wav and b/desktop/asset-work/inside-jail/exhale.wav differ diff --git a/desktop/asset-work/inside-jail/inhale.ogg b/desktop/asset-work/inside-jail/inhale.ogg new file mode 100644 index 00000000..a9004aeb Binary files /dev/null and b/desktop/asset-work/inside-jail/inhale.ogg differ diff --git a/desktop/asset-work/inside-jail/inhale.wav b/desktop/asset-work/inside-jail/inhale.wav index 277cf79f..66aed641 100644 Binary files a/desktop/asset-work/inside-jail/inhale.wav and b/desktop/asset-work/inside-jail/inhale.wav differ diff --git a/desktop/asset-work/inside-jail/squeak.ogg b/desktop/asset-work/inside-jail/squeak.ogg new file mode 100644 index 00000000..37f8d026 Binary files /dev/null and b/desktop/asset-work/inside-jail/squeak.ogg differ diff --git a/desktop/asset-work/inside-jail/squeak.wav b/desktop/asset-work/inside-jail/squeak.wav new file mode 100644 index 00000000..f66e4990 Binary files /dev/null and b/desktop/asset-work/inside-jail/squeak.wav differ diff --git a/desktop/gametodos.txt b/desktop/gametodos.txt index 70c98746..7b2961ac 100644 --- a/desktop/gametodos.txt +++ b/desktop/gametodos.txt @@ -26,7 +26,6 @@ AUDIO + metal clanking + jail door sliding open + jail creak - + jail crash + pit go down + ladder break + eavesdrop diff --git a/desktop/resources/inside-jail/exhale.ogg b/desktop/resources/inside-jail/exhale.ogg index efa71264..559fed29 100644 Binary files a/desktop/resources/inside-jail/exhale.ogg and b/desktop/resources/inside-jail/exhale.ogg differ diff --git a/desktop/resources/inside-jail/inhale.ogg b/desktop/resources/inside-jail/inhale.ogg index f8945a9b..a9004aeb 100644 Binary files a/desktop/resources/inside-jail/inhale.ogg and b/desktop/resources/inside-jail/inhale.ogg differ diff --git a/desktop/resources/inside-jail/squeak.ogg b/desktop/resources/inside-jail/squeak.ogg new file mode 100644 index 00000000..37f8d026 Binary files /dev/null and b/desktop/resources/inside-jail/squeak.ogg differ diff --git a/desktop/src-common/advent/screens/rooms/inside_jail.clj b/desktop/src-common/advent/screens/rooms/inside_jail.clj index cc009f3c..33f1bf7b 100644 --- a/desktop/src-common/advent/screens/rooms/inside_jail.clj +++ b/desktop/src-common/advent/screens/rooms/inside_jail.clj @@ -327,11 +327,11 @@ (update-in [:room :entities :ego] #(actions/start-animation screen % :stand)))] ((actions/get-script entities (actions/stop-walking entities :ego) - (actions/do-dialogue entities - :ego "*creak*" + (actions/play-sound entities "inside-jail/squeak.ogg" 0.3) + (actions/do-dialogue entities :ego "Oops!" :warden "Hey! What are you doing?" - :warden "Get back in jail.") + :warden "Trying to escape, are ye chap?") (common/go-to-jail entities) (actions/do-dialogue entities :warden "Now don't let me catch you trying to escape again.") (actions/play-animation entities :warden :fall-asleep :stop? false) @@ -355,8 +355,8 @@ warden-talk {10 [:blink 0.15]} warden-fall-asleep {7 [:blink 0.15] 18 [:blink 0.15]} - warden-sleep {0 [:inhale 1.0] - 2 [:exhale 1.0]}} + warden-sleep {0 [:inhale 0.1] + 10 [:exhale 0.1]}} :script (actions/get-script entities (cond (actions/has-item? entities :key) (actions/talk entities :ego "Shh! It's best not to wake him now.")