From 5093182c4ed52d54a7e7a43ac184698e56095157 Mon Sep 17 00:00:00 2001 From: Stan Date: Tue, 12 Jan 2021 23:02:57 +0000 Subject: [PATCH] Improved foraging leaves sound (when gathering fruit). Actually enable the sound. Fix naming. Patch by: @Samulis This was SVN commit r24574. --- .../variants/biped/female_gather_fruit.xml | 2 +- .../art/variants/biped/gather_fruit.xml | 2 +- .../audio/resource/foraging/forage_leaves.xml | 24 ++++++++++--------- .../audio/resource/foraging/leaves_01.ogg | 3 +++ .../audio/resource/foraging/leaves_02.ogg | 3 +++ .../audio/resource/foraging/leaves_03.ogg | 3 +++ .../audio/resource/foraging/leaves_04.ogg | 3 +++ .../audio/resource/foraging/leaves_05.ogg | 3 +++ .../audio/resource/foraging/leaves_06.ogg | 3 +++ .../audio/resource/foraging/leaves_07.ogg | 3 +++ .../audio/resource/foraging/leaves_08.ogg | 3 +++ .../audio/resource/foraging/leaves_09.ogg | 3 +++ .../audio/resource/foraging/leaves_10.ogg | 4 ++-- .../audio/resource/foraging/leaves_11.ogg | 4 ++-- .../audio/resource/foraging/leaves_12.ogg | 3 --- .../audio/resource/foraging/leaves_13.ogg | 3 --- .../audio/resource/foraging/leaves_14.ogg | 3 --- .../audio/resource/foraging/leaves_15.ogg | 3 --- .../audio/resource/foraging/leaves_16.ogg | 3 --- .../audio/resource/foraging/leaves_17.ogg | 3 --- .../audio/resource/foraging/leaves_18.ogg | 3 --- .../audio/resource/foraging/leaves_19.ogg | 3 --- .../audio/resource/foraging/leaves_1a.ogg | 3 --- 23 files changed, 46 insertions(+), 44 deletions(-) create mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_01.ogg create mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_02.ogg create mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_03.ogg create mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_04.ogg create mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_05.ogg create mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_06.ogg create mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_07.ogg create mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_08.ogg create mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_09.ogg delete mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_12.ogg delete mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_13.ogg delete mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_14.ogg delete mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_15.ogg delete mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_16.ogg delete mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_17.ogg delete mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_18.ogg delete mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_19.ogg delete mode 100644 binaries/data/mods/public/audio/resource/foraging/leaves_1a.ogg diff --git a/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml b/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml index 3c27cccdf1..f95383a158 100644 --- a/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml +++ b/binaries/data/mods/public/art/variants/biped/female_gather_fruit.xml @@ -1,7 +1,7 @@ - + diff --git a/binaries/data/mods/public/art/variants/biped/gather_fruit.xml b/binaries/data/mods/public/art/variants/biped/gather_fruit.xml index c044d380a8..fbc1c5365e 100644 --- a/binaries/data/mods/public/art/variants/biped/gather_fruit.xml +++ b/binaries/data/mods/public/art/variants/biped/gather_fruit.xml @@ -1,7 +1,7 @@ - + diff --git a/binaries/data/mods/public/audio/resource/foraging/forage_leaves.xml b/binaries/data/mods/public/audio/resource/foraging/forage_leaves.xml index 69cf7e2a52..fcbb7db3b8 100644 --- a/binaries/data/mods/public/audio/resource/foraging/forage_leaves.xml +++ b/binaries/data/mods/public/audio/resource/foraging/forage_leaves.xml @@ -1,22 +1,24 @@ - 1 + 0.3 1 - 0 + 1 1 1 + 0.3 + 0.2 0 10 audio/resource/foraging/ - leaves_19.ogg - leaves_1a.ogg + leaves_01.ogg + leaves_02.ogg + leaves_03.ogg + leaves_04.ogg + leaves_05.ogg + leaves_06.ogg + leaves_07.ogg + leaves_08.ogg + leaves_09.ogg leaves_10.ogg leaves_11.ogg - leaves_12.ogg - leaves_13.ogg - leaves_14.ogg - leaves_15.ogg - leaves_16.ogg - leaves_17.ogg - leaves_18.ogg diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_01.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_01.ogg new file mode 100644 index 0000000000..54b04a6470 --- /dev/null +++ b/binaries/data/mods/public/audio/resource/foraging/leaves_01.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23dbcea3534324e82773332aaf4012387282146be34c2837ceb804671a0aa38d +size 116443 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_02.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_02.ogg new file mode 100644 index 0000000000..80b6562219 --- /dev/null +++ b/binaries/data/mods/public/audio/resource/foraging/leaves_02.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9144c4e61dfb1c89c891bb3dda510238794a44d79aaad03e68eef1e92a48de3c +size 134219 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_03.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_03.ogg new file mode 100644 index 0000000000..ded241fddd --- /dev/null +++ b/binaries/data/mods/public/audio/resource/foraging/leaves_03.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d075ce88c339db6a581dcb16373657e04c1979ae60e3a950c97542e6fb2849f +size 119912 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_04.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_04.ogg new file mode 100644 index 0000000000..54d990b620 --- /dev/null +++ b/binaries/data/mods/public/audio/resource/foraging/leaves_04.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b453befd081972fec65d1faaf57f018d3cd2b336faf566e6c70177bcb6da817 +size 122829 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_05.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_05.ogg new file mode 100644 index 0000000000..1015cf0fd0 --- /dev/null +++ b/binaries/data/mods/public/audio/resource/foraging/leaves_05.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d806516e46ede085eb5ee64468b1629a5062882988f61f3bd09b25238a028d54 +size 134230 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_06.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_06.ogg new file mode 100644 index 0000000000..f036e0b1f1 --- /dev/null +++ b/binaries/data/mods/public/audio/resource/foraging/leaves_06.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b70c21c09862ebe95024ef6984cee858e75dfa446a47a8a32f39b3747b70ee7c +size 107170 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_07.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_07.ogg new file mode 100644 index 0000000000..3dcb708e66 --- /dev/null +++ b/binaries/data/mods/public/audio/resource/foraging/leaves_07.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:950e4fc273be613a3ea32c3446f8a4329f40ed5fc51cf68b24ebec43c3d3c703 +size 114916 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_08.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_08.ogg new file mode 100644 index 0000000000..d9e0908f5d --- /dev/null +++ b/binaries/data/mods/public/audio/resource/foraging/leaves_08.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92d7668c041f6a2e9a554407443996b1bd4a93b31ba2f5beb2fd7cfe20f71dcf +size 104805 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_09.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_09.ogg new file mode 100644 index 0000000000..3de36d9ed3 --- /dev/null +++ b/binaries/data/mods/public/audio/resource/foraging/leaves_09.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe5a2de2061af38baeeac13b35a24ba894e1fae5d23869deebe6a9f04e55cff2 +size 110554 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_10.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_10.ogg index 3a5edaa0c3..90758ed73c 100644 --- a/binaries/data/mods/public/audio/resource/foraging/leaves_10.ogg +++ b/binaries/data/mods/public/audio/resource/foraging/leaves_10.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aef537afa5bb0533e224e8a37847477593798527ae9f486fd4550b437fb5581d -size 33684 +oid sha256:77530900c74c9128a75be71c1dbd9ed37df20e2b6cfae1f51db0e14f10de4324 +size 112226 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_11.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_11.ogg index a2973f8c83..4b6f138e18 100644 --- a/binaries/data/mods/public/audio/resource/foraging/leaves_11.ogg +++ b/binaries/data/mods/public/audio/resource/foraging/leaves_11.ogg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32f4da6e37a9a3e27b10a675236b0f0eaa2ffddfdd86be53e37edf46d061f994 -size 21672 +oid sha256:35615749852b38eb6606244ae4d111b8719271af4096d6f5b001078ae01d8cd7 +size 119643 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_12.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_12.ogg deleted file mode 100644 index 7650a8ef0a..0000000000 --- a/binaries/data/mods/public/audio/resource/foraging/leaves_12.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89d25cdba0de0714ce9536e7f3d315aac1e8771d76c3e5993ecbafdc88baf007 -size 29384 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_13.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_13.ogg deleted file mode 100644 index 8a00f264c3..0000000000 --- a/binaries/data/mods/public/audio/resource/foraging/leaves_13.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9646f4351f46bc21baf1564d107739fa64b3d44f3bdc059561f599caaae3113e -size 19593 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_14.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_14.ogg deleted file mode 100644 index 4b31dcdf91..0000000000 --- a/binaries/data/mods/public/audio/resource/foraging/leaves_14.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5015a2f23603b52d04812125a75f6e4c9671df2b4bdf5672eebe09d856a98614 -size 22635 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_15.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_15.ogg deleted file mode 100644 index 4d4a9940fc..0000000000 --- a/binaries/data/mods/public/audio/resource/foraging/leaves_15.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb608452b078656d33d601cb74ad8bdd8a8ade1fabe9b89457fb8933f7a94106 -size 12600 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_16.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_16.ogg deleted file mode 100644 index 3eb0df7f75..0000000000 --- a/binaries/data/mods/public/audio/resource/foraging/leaves_16.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1fa3f51075145f4e5b09d7d4c96c50f7d415eb512d0c6ddfeda6f981072fdae -size 15216 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_17.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_17.ogg deleted file mode 100644 index 7309f0e43e..0000000000 --- a/binaries/data/mods/public/audio/resource/foraging/leaves_17.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edd715a52dc4b043859013d7a319ba5920d41ff50b0fe53c17737e66fce568e9 -size 17982 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_18.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_18.ogg deleted file mode 100644 index 97f13f5423..0000000000 --- a/binaries/data/mods/public/audio/resource/foraging/leaves_18.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73d46e3a1cb5454605460f674a386e984be387128a73a7b56271d32dfd309a78 -size 17201 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_19.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_19.ogg deleted file mode 100644 index 652c8245a9..0000000000 --- a/binaries/data/mods/public/audio/resource/foraging/leaves_19.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2a51c814b6dafc45b9e6aa649d7325045af3cd48394f788db97c9c8889fd3b8 -size 41867 diff --git a/binaries/data/mods/public/audio/resource/foraging/leaves_1a.ogg b/binaries/data/mods/public/audio/resource/foraging/leaves_1a.ogg deleted file mode 100644 index af7693f014..0000000000 --- a/binaries/data/mods/public/audio/resource/foraging/leaves_1a.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f68154569deef9c3e93a0b0537a2ee0eb19a2dffd45d5d980228f349048bb106 -size 26350