diff --git a/desktop/resources/blink-other.ogg.mp3 b/desktop/resources/blink-other.ogg.mp3 index 761eb068..17f8d008 100644 Binary files a/desktop/resources/blink-other.ogg.mp3 and b/desktop/resources/blink-other.ogg.mp3 differ diff --git a/desktop/resources/blink.ogg.mp3 b/desktop/resources/blink.ogg.mp3 index 291751f2..04b76ea1 100644 Binary files a/desktop/resources/blink.ogg.mp3 and b/desktop/resources/blink.ogg.mp3 differ diff --git a/desktop/resources/castle-gate/flip.ogg.mp3 b/desktop/resources/castle-gate/flip.ogg.mp3 index b707fb7e..4e615686 100644 Binary files a/desktop/resources/castle-gate/flip.ogg.mp3 and b/desktop/resources/castle-gate/flip.ogg.mp3 differ diff --git a/desktop/resources/cat-tree/cat.ogg.mp3 b/desktop/resources/cat-tree/cat.ogg.mp3 index 9871e687..24db7d29 100644 Binary files a/desktop/resources/cat-tree/cat.ogg.mp3 and b/desktop/resources/cat-tree/cat.ogg.mp3 differ diff --git a/desktop/resources/cat-tree/cry.ogg.mp3 b/desktop/resources/cat-tree/cry.ogg.mp3 index e34ed678..287883fb 100644 Binary files a/desktop/resources/cat-tree/cry.ogg.mp3 and b/desktop/resources/cat-tree/cry.ogg.mp3 differ diff --git a/desktop/resources/cat-tree/kiss.ogg.mp3 b/desktop/resources/cat-tree/kiss.ogg.mp3 index 49818208..038c4ff4 100644 Binary files a/desktop/resources/cat-tree/kiss.ogg.mp3 and b/desktop/resources/cat-tree/kiss.ogg.mp3 differ diff --git a/desktop/resources/cat-tree/ladder-break.ogg.mp3 b/desktop/resources/cat-tree/ladder-break.ogg.mp3 index affc1317..1d8b8e01 100644 Binary files a/desktop/resources/cat-tree/ladder-break.ogg.mp3 and b/desktop/resources/cat-tree/ladder-break.ogg.mp3 differ diff --git a/desktop/resources/cat-tree/owl-puke.ogg.mp3 b/desktop/resources/cat-tree/owl-puke.ogg.mp3 index dd0b79b8..857d3566 100644 Binary files a/desktop/resources/cat-tree/owl-puke.ogg.mp3 and b/desktop/resources/cat-tree/owl-puke.ogg.mp3 differ diff --git a/desktop/resources/door.ogg.mp3 b/desktop/resources/door.ogg.mp3 index 00eb6a02..a5fc098e 100644 Binary files a/desktop/resources/door.ogg.mp3 and b/desktop/resources/door.ogg.mp3 differ diff --git a/desktop/resources/dream/SUCCESS CHEERS Win Cute Vocal Chime 03.ogg.mp3 b/desktop/resources/dream/SUCCESS CHEERS Win Cute Vocal Chime 03.ogg.mp3 index 779bb851..cb819fd9 100644 Binary files a/desktop/resources/dream/SUCCESS CHEERS Win Cute Vocal Chime 03.ogg.mp3 and b/desktop/resources/dream/SUCCESS CHEERS Win Cute Vocal Chime 03.ogg.mp3 differ diff --git a/desktop/resources/dream/appear.ogg.mp3 b/desktop/resources/dream/appear.ogg.mp3 index 779bb851..60703aa4 100644 Binary files a/desktop/resources/dream/appear.ogg.mp3 and b/desktop/resources/dream/appear.ogg.mp3 differ diff --git a/desktop/resources/dream/music.ogg.mp3 b/desktop/resources/dream/music.ogg.mp3 index 3dbcb128..4762ccbc 100644 Binary files a/desktop/resources/dream/music.ogg.mp3 and b/desktop/resources/dream/music.ogg.mp3 differ diff --git a/desktop/resources/ego/axe.ogg.mp3 b/desktop/resources/ego/axe.ogg.mp3 index 30b8b8ec..1977e71d 100644 Binary files a/desktop/resources/ego/axe.ogg.mp3 and b/desktop/resources/ego/axe.ogg.mp3 differ diff --git a/desktop/resources/ego/blink2.ogg.mp3 b/desktop/resources/ego/blink2.ogg.mp3 index 3887b47e..cd03b86c 100644 Binary files a/desktop/resources/ego/blink2.ogg.mp3 and b/desktop/resources/ego/blink2.ogg.mp3 differ diff --git a/desktop/resources/ego/breakglass.ogg.mp3 b/desktop/resources/ego/breakglass.ogg.mp3 index 20c44303..50ab87a9 100644 Binary files a/desktop/resources/ego/breakglass.ogg.mp3 and b/desktop/resources/ego/breakglass.ogg.mp3 differ diff --git a/desktop/resources/ego/crowbar.ogg.mp3 b/desktop/resources/ego/crowbar.ogg.mp3 index 63ebc383..e8770d3c 100644 Binary files a/desktop/resources/ego/crowbar.ogg.mp3 and b/desktop/resources/ego/crowbar.ogg.mp3 differ diff --git a/desktop/resources/ego/drop.ogg.mp3 b/desktop/resources/ego/drop.ogg.mp3 index 8d007ea8..a1ab8e91 100644 Binary files a/desktop/resources/ego/drop.ogg.mp3 and b/desktop/resources/ego/drop.ogg.mp3 differ diff --git a/desktop/resources/ego/get-sick.ogg.mp3 b/desktop/resources/ego/get-sick.ogg.mp3 index 8b3cafd6..28167d50 100644 Binary files a/desktop/resources/ego/get-sick.ogg.mp3 and b/desktop/resources/ego/get-sick.ogg.mp3 differ diff --git a/desktop/resources/ego/glad.ogg.mp3 b/desktop/resources/ego/glad.ogg.mp3 index ca4fd62b..d7d2185a 100644 Binary files a/desktop/resources/ego/glad.ogg.mp3 and b/desktop/resources/ego/glad.ogg.mp3 differ diff --git a/desktop/resources/ego/idea.ogg.mp3 b/desktop/resources/ego/idea.ogg.mp3 index 8f64369c..92c8d2f1 100644 Binary files a/desktop/resources/ego/idea.ogg.mp3 and b/desktop/resources/ego/idea.ogg.mp3 differ diff --git a/desktop/resources/ego/inside-step-1.ogg.mp3 b/desktop/resources/ego/inside-step-1.ogg.mp3 index 5ddec78f..86dafc8a 100644 Binary files a/desktop/resources/ego/inside-step-1.ogg.mp3 and b/desktop/resources/ego/inside-step-1.ogg.mp3 differ diff --git a/desktop/resources/ego/inside-step-2.ogg.mp3 b/desktop/resources/ego/inside-step-2.ogg.mp3 index 184b02d1..4765ef6e 100644 Binary files a/desktop/resources/ego/inside-step-2.ogg.mp3 and b/desktop/resources/ego/inside-step-2.ogg.mp3 differ diff --git a/desktop/resources/ego/inside-step-3.ogg.mp3 b/desktop/resources/ego/inside-step-3.ogg.mp3 index 11b0dc50..28d26270 100644 Binary files a/desktop/resources/ego/inside-step-3.ogg.mp3 and b/desktop/resources/ego/inside-step-3.ogg.mp3 differ diff --git a/desktop/resources/ego/inside-step-4.ogg.mp3 b/desktop/resources/ego/inside-step-4.ogg.mp3 index 4e06c7e9..4a1138af 100644 Binary files a/desktop/resources/ego/inside-step-4.ogg.mp3 and b/desktop/resources/ego/inside-step-4.ogg.mp3 differ diff --git a/desktop/resources/ego/potion.ogg.mp3 b/desktop/resources/ego/potion.ogg.mp3 index 350b14bb..ec7040fe 100644 Binary files a/desktop/resources/ego/potion.ogg.mp3 and b/desktop/resources/ego/potion.ogg.mp3 differ diff --git a/desktop/resources/ego/scared-step.ogg.mp3 b/desktop/resources/ego/scared-step.ogg.mp3 index afe81c73..06f5d680 100644 Binary files a/desktop/resources/ego/scared-step.ogg.mp3 and b/desktop/resources/ego/scared-step.ogg.mp3 differ diff --git a/desktop/resources/ego/scratch.ogg.mp3 b/desktop/resources/ego/scratch.ogg.mp3 index d51f8803..03328eb4 100644 Binary files a/desktop/resources/ego/scratch.ogg.mp3 and b/desktop/resources/ego/scratch.ogg.mp3 differ diff --git a/desktop/resources/ego/sigh.ogg.mp3 b/desktop/resources/ego/sigh.ogg.mp3 index 4975cbfc..b24a985b 100644 Binary files a/desktop/resources/ego/sigh.ogg.mp3 and b/desktop/resources/ego/sigh.ogg.mp3 differ diff --git a/desktop/resources/ego/slingshot.ogg.mp3 b/desktop/resources/ego/slingshot.ogg.mp3 index 55a033f1..f5378416 100644 Binary files a/desktop/resources/ego/slingshot.ogg.mp3 and b/desktop/resources/ego/slingshot.ogg.mp3 differ diff --git a/desktop/resources/ego/step-1.ogg.mp3 b/desktop/resources/ego/step-1.ogg.mp3 index b6eeb94e..9f63a44a 100644 Binary files a/desktop/resources/ego/step-1.ogg.mp3 and b/desktop/resources/ego/step-1.ogg.mp3 differ diff --git a/desktop/resources/ego/step-2.ogg.mp3 b/desktop/resources/ego/step-2.ogg.mp3 index 2142924e..0b378aef 100644 Binary files a/desktop/resources/ego/step-2.ogg.mp3 and b/desktop/resources/ego/step-2.ogg.mp3 differ diff --git a/desktop/resources/ego/step-3.ogg.mp3 b/desktop/resources/ego/step-3.ogg.mp3 index 6616f561..d247a445 100644 Binary files a/desktop/resources/ego/step-3.ogg.mp3 and b/desktop/resources/ego/step-3.ogg.mp3 differ diff --git a/desktop/resources/ego/step-4.ogg.mp3 b/desktop/resources/ego/step-4.ogg.mp3 index 7fd9a612..9b1db5b2 100644 Binary files a/desktop/resources/ego/step-4.ogg.mp3 and b/desktop/resources/ego/step-4.ogg.mp3 differ diff --git a/desktop/resources/ego/step.ogg.mp3 b/desktop/resources/ego/step.ogg.mp3 index 94b273c1..1d096741 100644 Binary files a/desktop/resources/ego/step.ogg.mp3 and b/desktop/resources/ego/step.ogg.mp3 differ diff --git a/desktop/resources/ending-castle/cloud.ogg.mp3 b/desktop/resources/ending-castle/cloud.ogg.mp3 index e627ada8..5e367e53 100644 Binary files a/desktop/resources/ending-castle/cloud.ogg.mp3 and b/desktop/resources/ending-castle/cloud.ogg.mp3 differ diff --git a/desktop/resources/ending-castle/fall.ogg.mp3 b/desktop/resources/ending-castle/fall.ogg.mp3 index fdc29a5c..76af75f2 100644 Binary files a/desktop/resources/ending-castle/fall.ogg.mp3 and b/desktop/resources/ending-castle/fall.ogg.mp3 differ diff --git a/desktop/resources/ending-castle/georgia-appear.ogg.mp3 b/desktop/resources/ending-castle/georgia-appear.ogg.mp3 index d1f0cfd5..6c0ea9b4 100644 Binary files a/desktop/resources/ending-castle/georgia-appear.ogg.mp3 and b/desktop/resources/ending-castle/georgia-appear.ogg.mp3 differ diff --git a/desktop/resources/georgia/kick.ogg.mp3 b/desktop/resources/georgia/kick.ogg.mp3 index 20993768..17528f15 100644 Binary files a/desktop/resources/georgia/kick.ogg.mp3 and b/desktop/resources/georgia/kick.ogg.mp3 differ diff --git a/desktop/resources/inside-antique/fire-1.ogg.mp3 b/desktop/resources/inside-antique/fire-1.ogg.mp3 index fa43625a..6883cbbc 100644 Binary files a/desktop/resources/inside-antique/fire-1.ogg.mp3 and b/desktop/resources/inside-antique/fire-1.ogg.mp3 differ diff --git a/desktop/resources/inside-antique/fire-2.ogg.mp3 b/desktop/resources/inside-antique/fire-2.ogg.mp3 index 528202b9..c29da0ba 100644 Binary files a/desktop/resources/inside-antique/fire-2.ogg.mp3 and b/desktop/resources/inside-antique/fire-2.ogg.mp3 differ diff --git a/desktop/resources/inside-antique/fire-3.ogg.mp3 b/desktop/resources/inside-antique/fire-3.ogg.mp3 index cfd168f8..d7d7f72b 100644 Binary files a/desktop/resources/inside-antique/fire-3.ogg.mp3 and b/desktop/resources/inside-antique/fire-3.ogg.mp3 differ diff --git a/desktop/resources/inside-antique/shopkeep-sigh.ogg.mp3 b/desktop/resources/inside-antique/shopkeep-sigh.ogg.mp3 index c4048a4e..c84c1feb 100644 Binary files a/desktop/resources/inside-antique/shopkeep-sigh.ogg.mp3 and b/desktop/resources/inside-antique/shopkeep-sigh.ogg.mp3 differ diff --git a/desktop/resources/inside-castle/chorus.ogg.mp3 b/desktop/resources/inside-castle/chorus.ogg.mp3 index 49e8211e..2246cf10 100644 Binary files a/desktop/resources/inside-castle/chorus.ogg.mp3 and b/desktop/resources/inside-castle/chorus.ogg.mp3 differ diff --git a/desktop/resources/inside-castle/flex.ogg.mp3 b/desktop/resources/inside-castle/flex.ogg.mp3 index d967361b..e884bbe6 100644 Binary files a/desktop/resources/inside-castle/flex.ogg.mp3 and b/desktop/resources/inside-castle/flex.ogg.mp3 differ diff --git a/desktop/resources/inside-castle/writing.ogg.mp3 b/desktop/resources/inside-castle/writing.ogg.mp3 index a7061e26..2eeffe5a 100644 Binary files a/desktop/resources/inside-castle/writing.ogg.mp3 and b/desktop/resources/inside-castle/writing.ogg.mp3 differ diff --git a/desktop/resources/inside-house/close-safe.ogg.mp3 b/desktop/resources/inside-house/close-safe.ogg.mp3 index fc72fced..ae7ebff5 100644 Binary files a/desktop/resources/inside-house/close-safe.ogg.mp3 and b/desktop/resources/inside-house/close-safe.ogg.mp3 differ diff --git a/desktop/resources/inside-house/disappear.ogg.mp3 b/desktop/resources/inside-house/disappear.ogg.mp3 index 3c7fc1eb..655d30d9 100644 Binary files a/desktop/resources/inside-house/disappear.ogg.mp3 and b/desktop/resources/inside-house/disappear.ogg.mp3 differ diff --git a/desktop/resources/inside-house/open-safe.ogg.mp3 b/desktop/resources/inside-house/open-safe.ogg.mp3 index 03f84279..4bb92a69 100644 Binary files a/desktop/resources/inside-house/open-safe.ogg.mp3 and b/desktop/resources/inside-house/open-safe.ogg.mp3 differ diff --git a/desktop/resources/inside-house/safe-1.ogg.mp3 b/desktop/resources/inside-house/safe-1.ogg.mp3 index 4390dccf..cbb482fe 100644 Binary files a/desktop/resources/inside-house/safe-1.ogg.mp3 and b/desktop/resources/inside-house/safe-1.ogg.mp3 differ diff --git a/desktop/resources/inside-house/safe-2.ogg.mp3 b/desktop/resources/inside-house/safe-2.ogg.mp3 index 688939dd..f4a8b719 100644 Binary files a/desktop/resources/inside-house/safe-2.ogg.mp3 and b/desktop/resources/inside-house/safe-2.ogg.mp3 differ diff --git a/desktop/resources/inside-house/safe-3.ogg.mp3 b/desktop/resources/inside-house/safe-3.ogg.mp3 index 4c2751b1..41bc6502 100644 Binary files a/desktop/resources/inside-house/safe-3.ogg.mp3 and b/desktop/resources/inside-house/safe-3.ogg.mp3 differ diff --git a/desktop/resources/inside-house/safe-4.ogg.mp3 b/desktop/resources/inside-house/safe-4.ogg.mp3 index a916662b..4ad9d452 100644 Binary files a/desktop/resources/inside-house/safe-4.ogg.mp3 and b/desktop/resources/inside-house/safe-4.ogg.mp3 differ diff --git a/desktop/resources/inside-house/safe-5.ogg.mp3 b/desktop/resources/inside-house/safe-5.ogg.mp3 index a5475f84..eee89f60 100644 Binary files a/desktop/resources/inside-house/safe-5.ogg.mp3 and b/desktop/resources/inside-house/safe-5.ogg.mp3 differ diff --git a/desktop/resources/inside-jail/exhale.ogg.mp3 b/desktop/resources/inside-jail/exhale.ogg.mp3 index 086009a8..adc8dae1 100644 Binary files a/desktop/resources/inside-jail/exhale.ogg.mp3 and b/desktop/resources/inside-jail/exhale.ogg.mp3 differ diff --git a/desktop/resources/inside-jail/guard-crash.ogg.mp3 b/desktop/resources/inside-jail/guard-crash.ogg.mp3 index b5a83725..7f2230a6 100644 Binary files a/desktop/resources/inside-jail/guard-crash.ogg.mp3 and b/desktop/resources/inside-jail/guard-crash.ogg.mp3 differ diff --git a/desktop/resources/inside-jail/inhale.ogg.mp3 b/desktop/resources/inside-jail/inhale.ogg.mp3 index f7ab04a9..927ae4a6 100644 Binary files a/desktop/resources/inside-jail/inhale.ogg.mp3 and b/desktop/resources/inside-jail/inhale.ogg.mp3 differ diff --git a/desktop/resources/inside-jail/open-door.ogg.mp3 b/desktop/resources/inside-jail/open-door.ogg.mp3 index 563fa5d9..2709e6b2 100644 Binary files a/desktop/resources/inside-jail/open-door.ogg.mp3 and b/desktop/resources/inside-jail/open-door.ogg.mp3 differ diff --git a/desktop/resources/inside-jail/squeak.ogg.mp3 b/desktop/resources/inside-jail/squeak.ogg.mp3 index 42180584..b7d754ae 100644 Binary files a/desktop/resources/inside-jail/squeak.ogg.mp3 and b/desktop/resources/inside-jail/squeak.ogg.mp3 differ diff --git a/desktop/resources/music/POPPixelLogo2Audiomix_mixdown.ogg.mp3 b/desktop/resources/music/POPPixelLogo2Audiomix_mixdown.ogg.mp3 index 9f94a24b..af4bbf30 100644 Binary files a/desktop/resources/music/POPPixelLogo2Audiomix_mixdown.ogg.mp3 and b/desktop/resources/music/POPPixelLogo2Audiomix_mixdown.ogg.mp3 differ diff --git a/desktop/resources/music/forest.ogg.mp3 b/desktop/resources/music/forest.ogg.mp3 index 0f6b445b..2da457ff 100644 Binary files a/desktop/resources/music/forest.ogg.mp3 and b/desktop/resources/music/forest.ogg.mp3 differ diff --git a/desktop/resources/music/inside-antique.ogg.mp3 b/desktop/resources/music/inside-antique.ogg.mp3 index 7399d079..aa1f3d71 100644 Binary files a/desktop/resources/music/inside-antique.ogg.mp3 and b/desktop/resources/music/inside-antique.ogg.mp3 differ diff --git a/desktop/resources/music/inside-fangald.ogg.mp3 b/desktop/resources/music/inside-fangald.ogg.mp3 index 99937d85..4608a44a 100644 Binary files a/desktop/resources/music/inside-fangald.ogg.mp3 and b/desktop/resources/music/inside-fangald.ogg.mp3 differ diff --git a/desktop/resources/music/intro.ogg.mp3 b/desktop/resources/music/intro.ogg.mp3 index c9cb4980..c3769184 100644 Binary files a/desktop/resources/music/intro.ogg.mp3 and b/desktop/resources/music/intro.ogg.mp3 differ diff --git a/desktop/resources/music/love.ogg.mp3 b/desktop/resources/music/love.ogg.mp3 index e89545eb..ba91b38a 100644 Binary files a/desktop/resources/music/love.ogg.mp3 and b/desktop/resources/music/love.ogg.mp3 differ diff --git a/desktop/resources/music/pull-sword.ogg.mp3 b/desktop/resources/music/pull-sword.ogg.mp3 index e5a15214..e22becf2 100644 Binary files a/desktop/resources/music/pull-sword.ogg.mp3 and b/desktop/resources/music/pull-sword.ogg.mp3 differ diff --git a/desktop/resources/music/secret-hideout.ogg.mp3 b/desktop/resources/music/secret-hideout.ogg.mp3 index 9bc3332c..e597f854 100644 Binary files a/desktop/resources/music/secret-hideout.ogg.mp3 and b/desktop/resources/music/secret-hideout.ogg.mp3 differ diff --git a/desktop/resources/music/town-music-1.ogg.mp3 b/desktop/resources/music/town-music-1.ogg.mp3 index 0fee8992..55854b3f 100644 Binary files a/desktop/resources/music/town-music-1.ogg.mp3 and b/desktop/resources/music/town-music-1.ogg.mp3 differ diff --git a/desktop/resources/music/town-music-2.ogg.mp3 b/desktop/resources/music/town-music-2.ogg.mp3 index 266ee236..a08c4a05 100644 Binary files a/desktop/resources/music/town-music-2.ogg.mp3 and b/desktop/resources/music/town-music-2.ogg.mp3 differ diff --git a/desktop/resources/music/town-music.ogg.mp3 b/desktop/resources/music/town-music.ogg.mp3 index d38ec333..a585a36a 100644 Binary files a/desktop/resources/music/town-music.ogg.mp3 and b/desktop/resources/music/town-music.ogg.mp3 differ diff --git a/desktop/resources/music/wind.ogg.mp3 b/desktop/resources/music/wind.ogg.mp3 index d785c554..3075439b 100644 Binary files a/desktop/resources/music/wind.ogg.mp3 and b/desktop/resources/music/wind.ogg.mp3 differ diff --git a/desktop/resources/outside-castle/flies.ogg.mp3 b/desktop/resources/outside-castle/flies.ogg.mp3 index c028424d..27e7f019 100644 Binary files a/desktop/resources/outside-castle/flies.ogg.mp3 and b/desktop/resources/outside-castle/flies.ogg.mp3 differ diff --git a/desktop/resources/outside-castle/flies2.ogg.mp3 b/desktop/resources/outside-castle/flies2.ogg.mp3 index 192f5df2..a6384eb1 100644 Binary files a/desktop/resources/outside-castle/flies2.ogg.mp3 and b/desktop/resources/outside-castle/flies2.ogg.mp3 differ diff --git a/desktop/resources/outside-castle/moo.ogg.mp3 b/desktop/resources/outside-castle/moo.ogg.mp3 index e067f2c0..2744420e 100644 Binary files a/desktop/resources/outside-castle/moo.ogg.mp3 and b/desktop/resources/outside-castle/moo.ogg.mp3 differ diff --git a/desktop/resources/outside-castle/scratch.ogg.mp3 b/desktop/resources/outside-castle/scratch.ogg.mp3 index bd565ef5..d976b23a 100644 Binary files a/desktop/resources/outside-castle/scratch.ogg.mp3 and b/desktop/resources/outside-castle/scratch.ogg.mp3 differ diff --git a/desktop/resources/outside-jail/fountain-2.ogg.mp3 b/desktop/resources/outside-jail/fountain-2.ogg.mp3 index 9f045878..ce6413ef 100644 Binary files a/desktop/resources/outside-jail/fountain-2.ogg.mp3 and b/desktop/resources/outside-jail/fountain-2.ogg.mp3 differ diff --git a/desktop/resources/outsidehouse/cauldron-done.ogg.mp3 b/desktop/resources/outsidehouse/cauldron-done.ogg.mp3 index 28cbc7f8..63c43179 100644 Binary files a/desktop/resources/outsidehouse/cauldron-done.ogg.mp3 and b/desktop/resources/outsidehouse/cauldron-done.ogg.mp3 differ diff --git a/desktop/resources/outsidehouse/cauldron.ogg.mp3 b/desktop/resources/outsidehouse/cauldron.ogg.mp3 index 9c1fdd6b..c33f7b49 100644 Binary files a/desktop/resources/outsidehouse/cauldron.ogg.mp3 and b/desktop/resources/outsidehouse/cauldron.ogg.mp3 differ diff --git a/desktop/resources/outsidehouse/drop.ogg.mp3 b/desktop/resources/outsidehouse/drop.ogg.mp3 index 811df4b0..fc6f8fa0 100644 Binary files a/desktop/resources/outsidehouse/drop.ogg.mp3 and b/desktop/resources/outsidehouse/drop.ogg.mp3 differ diff --git a/desktop/resources/outsidehouse/milk.ogg.mp3 b/desktop/resources/outsidehouse/milk.ogg.mp3 index d136c900..97ea16f2 100644 Binary files a/desktop/resources/outsidehouse/milk.ogg.mp3 and b/desktop/resources/outsidehouse/milk.ogg.mp3 differ diff --git a/desktop/resources/outsidehouse/sheep-bleet.ogg.mp3 b/desktop/resources/outsidehouse/sheep-bleet.ogg.mp3 index 6a65b1b3..bca7e966 100644 Binary files a/desktop/resources/outsidehouse/sheep-bleet.ogg.mp3 and b/desktop/resources/outsidehouse/sheep-bleet.ogg.mp3 differ diff --git a/desktop/resources/outsidehouse/sheep-eat.ogg.mp3 b/desktop/resources/outsidehouse/sheep-eat.ogg.mp3 index e799decf..533ae287 100644 Binary files a/desktop/resources/outsidehouse/sheep-eat.ogg.mp3 and b/desktop/resources/outsidehouse/sheep-eat.ogg.mp3 differ diff --git a/desktop/resources/safe-sound.ogg.mp3 b/desktop/resources/safe-sound.ogg.mp3 index 55a6fb0e..7f003b43 100644 Binary files a/desktop/resources/safe-sound.ogg.mp3 and b/desktop/resources/safe-sound.ogg.mp3 differ diff --git a/desktop/resources/scratch.ogg.mp3 b/desktop/resources/scratch.ogg.mp3 index cca952f4..8622b73d 100644 Binary files a/desktop/resources/scratch.ogg.mp3 and b/desktop/resources/scratch.ogg.mp3 differ diff --git a/desktop/resources/space/bloodclot-exhale.ogg.mp3 b/desktop/resources/space/bloodclot-exhale.ogg.mp3 index 034821fd..b51a0ccd 100644 Binary files a/desktop/resources/space/bloodclot-exhale.ogg.mp3 and b/desktop/resources/space/bloodclot-exhale.ogg.mp3 differ diff --git a/desktop/resources/space/bloodclot-explode.ogg.mp3 b/desktop/resources/space/bloodclot-explode.ogg.mp3 index 1f7c4edc..21e3688b 100644 Binary files a/desktop/resources/space/bloodclot-explode.ogg.mp3 and b/desktop/resources/space/bloodclot-explode.ogg.mp3 differ diff --git a/desktop/resources/space/bloodclot-inhale.ogg.mp3 b/desktop/resources/space/bloodclot-inhale.ogg.mp3 index 4bbdfc70..a1295e48 100644 Binary files a/desktop/resources/space/bloodclot-inhale.ogg.mp3 and b/desktop/resources/space/bloodclot-inhale.ogg.mp3 differ diff --git a/desktop/resources/space/jump.ogg.mp3 b/desktop/resources/space/jump.ogg.mp3 index 4bc5742c..b0eff998 100644 Binary files a/desktop/resources/space/jump.ogg.mp3 and b/desktop/resources/space/jump.ogg.mp3 differ diff --git a/desktop/resources/space/shock-short.ogg.mp3 b/desktop/resources/space/shock-short.ogg.mp3 index a959633e..36afa87a 100644 Binary files a/desktop/resources/space/shock-short.ogg.mp3 and b/desktop/resources/space/shock-short.ogg.mp3 differ diff --git a/desktop/resources/space/shock.ogg.mp3 b/desktop/resources/space/shock.ogg.mp3 index 488d6081..326e9886 100644 Binary files a/desktop/resources/space/shock.ogg.mp3 and b/desktop/resources/space/shock.ogg.mp3 differ diff --git a/desktop/resources/space/swingsword.ogg.mp3 b/desktop/resources/space/swingsword.ogg.mp3 index 12ce2b55..d2f41cb0 100644 Binary files a/desktop/resources/space/swingsword.ogg.mp3 and b/desktop/resources/space/swingsword.ogg.mp3 differ diff --git a/desktop/resources/wizard/drip.ogg.mp3 b/desktop/resources/wizard/drip.ogg.mp3 index 47e25824..0bffb43d 100644 Binary files a/desktop/resources/wizard/drip.ogg.mp3 and b/desktop/resources/wizard/drip.ogg.mp3 differ diff --git a/desktop/resources/wizard/explode.ogg.mp3 b/desktop/resources/wizard/explode.ogg.mp3 index 717aa9e5..bea57cec 100644 Binary files a/desktop/resources/wizard/explode.ogg.mp3 and b/desktop/resources/wizard/explode.ogg.mp3 differ diff --git a/desktop/resources/wizard/snap.ogg.mp3 b/desktop/resources/wizard/snap.ogg.mp3 index 0907aa5c..8cc4a89d 100644 Binary files a/desktop/resources/wizard/snap.ogg.mp3 and b/desktop/resources/wizard/snap.ogg.mp3 differ diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index ca9df125..3f2eb9dd 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -415,12 +415,15 @@ (music! snd :stop)) (defn make-music [r] + (log/info "making music from" r) (try (if mobile? (doto (music (str r ".mp3")) (music! :set-looping true)) (doto (music r) (music! :set-looping true))) - (catch Exception _ + (catch Exception x + (log/warn "music making error" x) + (doto (music (str r ".mp3")) (music! :set-looping true))))) (defn load-sound [f] diff --git a/desktop/src-common/advent/version.clj b/desktop/src-common/advent/version.clj index 25dd2922..bb7a0bb2 100644 --- a/desktop/src-common/advent/version.clj +++ b/desktop/src-common/advent/version.clj @@ -1,5 +1,7 @@ (ns advent.version (:gen-class)) +(def version-override nil) + (defn version [] - (-> (eval 'advent.version) .getPackage .getImplementationVersion)) + (or version-override (-> (eval 'advent.version) .getPackage .getImplementationVersion))) diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index 307cc6d5..2e582016 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0.5 + 2.0.6 CFBundleSignature ???? CFBundleVersion - 116 + 119 MinimumOSVersion 8.0 LSRequiresIPhoneOS diff --git a/ios/project.clj b/ios/project.clj index 547ea71b..78cd52b1 100644 --- a/ios/project.clj +++ b/ios/project.clj @@ -14,7 +14,7 @@ :java-source-paths ["src/java"] :plugins [[lein-fruit "0.2.4-SNAPSHOT"]] :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"] - :jvm-opts [] + :jvm-opts ["-Dno-steam=true"] :ios {:robovm-opts ["-config" "robovm.xml"] :robovm-path "/Users/brycecovert/.robovm-sdks/robovm-2.2.1-SNAPSHOT" :version 2.1} diff --git a/ios/src/java/advent/core/IOSLauncher.java b/ios/src/java/advent/core/IOSLauncher.java index 5f9f62ae..bba0f756 100644 --- a/ios/src/java/advent/core/IOSLauncher.java +++ b/ios/src/java/advent/core/IOSLauncher.java @@ -22,6 +22,9 @@ public class IOSLauncher extends IOSApplication.Delegate { RT.var("clojure.core", "require").invoke(Symbol.intern("advent.core")); try { + NSDictionary infoDictionary = NSBundle.getMainBundle().getInfoDictionary(); + String version = infoDictionary.get(new NSString("CFBundleShortVersionString")).toString(); + RT.var("advent.version", "version-override").bindRoot(version); Game game = (Game) RT.var("advent.core", "advent").deref(); return new IOSApplication(game, config); } catch (Exception e) {