diff --git a/assets/mods/basegame/audio/effects/mining/DIRT.1.wav b/assets/mods/basegame/audio/effects/mining/DIRT.1.wav new file mode 100644 index 000000000..5fe74c814 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/DIRT.1.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/DIRT.2.wav b/assets/mods/basegame/audio/effects/mining/DIRT.2.wav new file mode 100644 index 000000000..dc786fafc Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/DIRT.2.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/DIRT.3.wav b/assets/mods/basegame/audio/effects/mining/DIRT.3.wav new file mode 100644 index 000000000..53cd876be Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/DIRT.3.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/GRSS.1.wav b/assets/mods/basegame/audio/effects/mining/GRSS.1.wav new file mode 100644 index 000000000..f90c00fac Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/GRSS.1.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/GRSS.2.wav b/assets/mods/basegame/audio/effects/mining/GRSS.2.wav new file mode 100644 index 000000000..709470490 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/GRSS.2.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/GRSS.3.wav b/assets/mods/basegame/audio/effects/mining/GRSS.3.wav new file mode 100644 index 000000000..8f5546884 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/GRSS.3.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/GRVL.1.wav b/assets/mods/basegame/audio/effects/mining/GRVL.1.wav new file mode 100644 index 000000000..f0d0af1a4 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/GRVL.1.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/GRVL.2.wav b/assets/mods/basegame/audio/effects/mining/GRVL.2.wav new file mode 100644 index 000000000..4520bce73 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/GRVL.2.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/GRVL.3.wav b/assets/mods/basegame/audio/effects/mining/GRVL.3.wav new file mode 100644 index 000000000..08bf824a4 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/GRVL.3.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/GRVL.4.wav b/assets/mods/basegame/audio/effects/mining/GRVL.4.wav new file mode 100644 index 000000000..410329c70 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/GRVL.4.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/ROCK.1.wav b/assets/mods/basegame/audio/effects/mining/ROCK.1.wav new file mode 100644 index 000000000..7671cf7bf Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/ROCK.1.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/ROCK.2.wav b/assets/mods/basegame/audio/effects/mining/ROCK.2.wav new file mode 100644 index 000000000..fd67ef8a9 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/ROCK.2.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/ROCK.3.wav b/assets/mods/basegame/audio/effects/mining/ROCK.3.wav new file mode 100644 index 000000000..bbf841849 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/ROCK.3.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/ROCK.4.wav b/assets/mods/basegame/audio/effects/mining/ROCK.4.wav new file mode 100644 index 000000000..2515dabed Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/ROCK.4.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/ROCK.5.wav b/assets/mods/basegame/audio/effects/mining/ROCK.5.wav new file mode 100644 index 000000000..3fd84e054 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/ROCK.5.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/ROCK.6.wav b/assets/mods/basegame/audio/effects/mining/ROCK.6.wav new file mode 100644 index 000000000..d8c3511d8 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/ROCK.6.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/ROCK.7.wav b/assets/mods/basegame/audio/effects/mining/ROCK.7.wav new file mode 100644 index 000000000..bced28758 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/ROCK.7.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/ROCK.8.wav b/assets/mods/basegame/audio/effects/mining/ROCK.8.wav new file mode 100644 index 000000000..20715bf98 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/ROCK.8.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/ROCK.9.wav b/assets/mods/basegame/audio/effects/mining/ROCK.9.wav new file mode 100644 index 000000000..b810257fe Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/ROCK.9.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/SAND.1.wav b/assets/mods/basegame/audio/effects/mining/SAND.1.wav new file mode 100644 index 000000000..5fe74c814 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/SAND.1.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/SAND.2.wav b/assets/mods/basegame/audio/effects/mining/SAND.2.wav new file mode 100644 index 000000000..dc786fafc Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/SAND.2.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/SAND.3.wav b/assets/mods/basegame/audio/effects/mining/SAND.3.wav new file mode 100644 index 000000000..53cd876be Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/SAND.3.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/WOOD.1.wav b/assets/mods/basegame/audio/effects/mining/WOOD.1.wav new file mode 100644 index 000000000..ba0a4c0d8 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/WOOD.1.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/WOOD.2.wav b/assets/mods/basegame/audio/effects/mining/WOOD.2.wav new file mode 100644 index 000000000..546403f47 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/WOOD.2.wav differ diff --git a/assets/mods/basegame/audio/effects/mining/WOOD.3.wav b/assets/mods/basegame/audio/effects/mining/WOOD.3.wav new file mode 100644 index 000000000..7c89c11f8 Binary files /dev/null and b/assets/mods/basegame/audio/effects/mining/WOOD.3.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/DIRT.1.ogg b/assets/mods/basegame/audio/effects/steps/DIRT.1.ogg deleted file mode 100644 index 72dbc17bc..000000000 --- a/assets/mods/basegame/audio/effects/steps/DIRT.1.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2aa9dc7a5f98f82ec75919c13d884ee76b67ad1a332cdb58209dc7bb10dd0c6d -size 6464 diff --git a/assets/mods/basegame/audio/effects/steps/DIRT.1.wav b/assets/mods/basegame/audio/effects/steps/DIRT.1.wav new file mode 100644 index 000000000..7ecd5cf17 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/DIRT.1.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/DIRT.2.ogg b/assets/mods/basegame/audio/effects/steps/DIRT.2.ogg deleted file mode 100644 index 67ef64c58..000000000 --- a/assets/mods/basegame/audio/effects/steps/DIRT.2.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87cad60616d289ea394acebc200d89e936ebecc397634c97b0333875f8222c65 -size 6562 diff --git a/assets/mods/basegame/audio/effects/steps/DIRT.2.wav b/assets/mods/basegame/audio/effects/steps/DIRT.2.wav new file mode 100644 index 000000000..7a1f71bfb Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/DIRT.2.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/DIRT.3.ogg b/assets/mods/basegame/audio/effects/steps/DIRT.3.ogg deleted file mode 100644 index 258171970..000000000 --- a/assets/mods/basegame/audio/effects/steps/DIRT.3.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fea9b2822eec23db834c9524ba90940859910345145617e1b8a3632f8f7fa609 -size 6086 diff --git a/assets/mods/basegame/audio/effects/steps/DIRT.3.wav b/assets/mods/basegame/audio/effects/steps/DIRT.3.wav new file mode 100644 index 000000000..7f209f078 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/DIRT.3.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/DIRT.4.ogg b/assets/mods/basegame/audio/effects/steps/DIRT.4.ogg deleted file mode 100644 index 8470f7050..000000000 --- a/assets/mods/basegame/audio/effects/steps/DIRT.4.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f00647579756573ea343b6df49ca723d97a44ec377e4d6f48da8b519a110f6a -size 6989 diff --git a/assets/mods/basegame/audio/effects/steps/DIRT.4.wav b/assets/mods/basegame/audio/effects/steps/DIRT.4.wav new file mode 100644 index 000000000..3d7658363 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/DIRT.4.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.1.ogg b/assets/mods/basegame/audio/effects/steps/GRSS.1.ogg deleted file mode 100644 index 73a01aa3b..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRSS.1.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d39e145317d148c5f04c500a4920ba620bdea689ae60e96369b02fe59cc88b9 -size 6087 diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.1.wav b/assets/mods/basegame/audio/effects/steps/GRSS.1.wav new file mode 100644 index 000000000..3e3bc24d3 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRSS.1.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.2.ogg b/assets/mods/basegame/audio/effects/steps/GRSS.2.ogg deleted file mode 100644 index 6bc6878fb..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRSS.2.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acf029acc7d5b8f277363313a48e55b7d3eec88ed9ea89272406698eb8faa1fb -size 6923 diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.2.wav b/assets/mods/basegame/audio/effects/steps/GRSS.2.wav new file mode 100644 index 000000000..edafd158f Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRSS.2.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.3.ogg b/assets/mods/basegame/audio/effects/steps/GRSS.3.ogg deleted file mode 100644 index 7eaa51ac5..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRSS.3.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cfd2cc1f0767047d970a365474e62c09e3d1233e0192639fada49d0051fa5e6 -size 6414 diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.3.wav b/assets/mods/basegame/audio/effects/steps/GRSS.3.wav new file mode 100644 index 000000000..a80d45ca1 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRSS.3.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.4.ogg b/assets/mods/basegame/audio/effects/steps/GRSS.4.ogg deleted file mode 100644 index 780ec9090..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRSS.4.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c4f9eefec9b7c4eaa6c6704015f027728d78a332f6d65eee4bff9871436c543 -size 5840 diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.4.wav b/assets/mods/basegame/audio/effects/steps/GRSS.4.wav new file mode 100644 index 000000000..18b22e4d2 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRSS.4.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.5.ogg b/assets/mods/basegame/audio/effects/steps/GRSS.5.ogg deleted file mode 100644 index 89bb16952..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRSS.5.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:914250b066b5e239dbc2d656bccbe57d45922a68863dd199fd398fa602bddd10 -size 6015 diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.5.wav b/assets/mods/basegame/audio/effects/steps/GRSS.5.wav new file mode 100644 index 000000000..231e1c91a Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRSS.5.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.6.ogg b/assets/mods/basegame/audio/effects/steps/GRSS.6.ogg deleted file mode 100644 index 8ce14b9b9..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRSS.6.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8da875d6fd313ded105ca48d5f412195e9be47c41b66d1b8f7b52230ed521210 -size 6868 diff --git a/assets/mods/basegame/audio/effects/steps/GRSS.6.wav b/assets/mods/basegame/audio/effects/steps/GRSS.6.wav new file mode 100644 index 000000000..d9e8b10f3 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRSS.6.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.1.ogg b/assets/mods/basegame/audio/effects/steps/GRVL.1.ogg deleted file mode 100644 index d113a4bf7..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRVL.1.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed38c6f597d43604eba88bd64e99a5fd32cdddb7db9eb093503c51736e6b7593 -size 9868 diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.1.wav b/assets/mods/basegame/audio/effects/steps/GRVL.1.wav new file mode 100644 index 000000000..33756028d Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRVL.1.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.2.ogg b/assets/mods/basegame/audio/effects/steps/GRVL.2.ogg deleted file mode 100644 index c9eff945d..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRVL.2.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:309d9ad7659c42448502daf30a650d664102e5022416636cf6492dfca2e8dbfc -size 8607 diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.2.wav b/assets/mods/basegame/audio/effects/steps/GRVL.2.wav new file mode 100644 index 000000000..020add717 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRVL.2.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.3.ogg b/assets/mods/basegame/audio/effects/steps/GRVL.3.ogg deleted file mode 100644 index 95aa1acde..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRVL.3.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a6441fca5c4848585374dba6c81106706bd8ba6aef35d2e828d0cccefc7a5e2 -size 7363 diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.3.wav b/assets/mods/basegame/audio/effects/steps/GRVL.3.wav new file mode 100644 index 000000000..00b054972 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRVL.3.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.4.ogg b/assets/mods/basegame/audio/effects/steps/GRVL.4.ogg deleted file mode 100644 index fb226d406..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRVL.4.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a31bf0a707f5500017698abb137e08907b075baba749f7feaea95c63e638c08f -size 7313 diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.4.wav b/assets/mods/basegame/audio/effects/steps/GRVL.4.wav new file mode 100644 index 000000000..b7ac38294 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRVL.4.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.5.ogg b/assets/mods/basegame/audio/effects/steps/GRVL.5.ogg deleted file mode 100644 index 2fe3c6891..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRVL.5.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3850d88355eb8bf03d5b4a9f76198a59d19971dbdbe377ba42e05f1ca30985a8 -size 10740 diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.5.wav b/assets/mods/basegame/audio/effects/steps/GRVL.5.wav new file mode 100644 index 000000000..29e0fc16d Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRVL.5.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.6.ogg b/assets/mods/basegame/audio/effects/steps/GRVL.6.ogg deleted file mode 100644 index 1e55c3676..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRVL.6.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70ce28e3551743c7bc382b4e7459f9079dc0d1a6c51a0185a14a1bcd6c5a2036 -size 8255 diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.6.wav b/assets/mods/basegame/audio/effects/steps/GRVL.6.wav new file mode 100644 index 000000000..54f0bcaa7 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRVL.6.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.7.ogg b/assets/mods/basegame/audio/effects/steps/GRVL.7.ogg deleted file mode 100644 index acf2ade73..000000000 --- a/assets/mods/basegame/audio/effects/steps/GRVL.7.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74cb117770960c9030b18076cbc1b09dff9f7096754d86f27b8f89055db17b1d -size 8256 diff --git a/assets/mods/basegame/audio/effects/steps/GRVL.7.wav b/assets/mods/basegame/audio/effects/steps/GRVL.7.wav new file mode 100644 index 000000000..70243d2d2 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/GRVL.7.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.1.ogg b/assets/mods/basegame/audio/effects/steps/ROCK.1.ogg deleted file mode 100644 index 85f8e2d7b..000000000 --- a/assets/mods/basegame/audio/effects/steps/ROCK.1.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb94dcc9b50cbd524d09e0235fefb1f13f90ce8f0145faaffa0aad737a6bb969 -size 6439 diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.1.wav b/assets/mods/basegame/audio/effects/steps/ROCK.1.wav new file mode 100644 index 000000000..9599e1454 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/ROCK.1.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.2.ogg b/assets/mods/basegame/audio/effects/steps/ROCK.2.ogg deleted file mode 100644 index 3e82c46fe..000000000 --- a/assets/mods/basegame/audio/effects/steps/ROCK.2.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7452ee7892751c2c4b12800bbcafd13fbf2abaf7fcc6892201c38ebcc250853 -size 6016 diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.2.wav b/assets/mods/basegame/audio/effects/steps/ROCK.2.wav new file mode 100644 index 000000000..6568693d0 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/ROCK.2.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.3.ogg b/assets/mods/basegame/audio/effects/steps/ROCK.3.ogg deleted file mode 100644 index d3c8fc0c3..000000000 --- a/assets/mods/basegame/audio/effects/steps/ROCK.3.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5189c7f9ccc0dfddc00636b22ed1a1e8ac745e1870ba1905484fb4a691723b55 -size 6486 diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.3.wav b/assets/mods/basegame/audio/effects/steps/ROCK.3.wav new file mode 100644 index 000000000..2e143827a Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/ROCK.3.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.4.ogg b/assets/mods/basegame/audio/effects/steps/ROCK.4.ogg deleted file mode 100644 index 45f1989d6..000000000 --- a/assets/mods/basegame/audio/effects/steps/ROCK.4.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:797918f888bd8b41fce6b681c44427c41e27de6befa976c1995fbfb7f3adaf63 -size 6242 diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.4.wav b/assets/mods/basegame/audio/effects/steps/ROCK.4.wav new file mode 100644 index 000000000..b5bbb646f Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/ROCK.4.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.5.ogg b/assets/mods/basegame/audio/effects/steps/ROCK.5.ogg deleted file mode 100644 index 5c0c82aa3..000000000 --- a/assets/mods/basegame/audio/effects/steps/ROCK.5.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6482ba34302f0ca880c73bcb6ea68345c241416160a711daa5aef9db23ffbccb -size 6382 diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.5.wav b/assets/mods/basegame/audio/effects/steps/ROCK.5.wav new file mode 100644 index 000000000..690e8b53e Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/ROCK.5.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.6.ogg b/assets/mods/basegame/audio/effects/steps/ROCK.6.ogg deleted file mode 100644 index ea5bee7ac..000000000 --- a/assets/mods/basegame/audio/effects/steps/ROCK.6.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4856743d4ac68bda2dac681533349399edd2d0aa8fb4ddbab0cd8b57d95adb44 -size 6591 diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.6.wav b/assets/mods/basegame/audio/effects/steps/ROCK.6.wav new file mode 100644 index 000000000..4db70a6fc Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/ROCK.6.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.7.ogg b/assets/mods/basegame/audio/effects/steps/ROCK.7.ogg deleted file mode 100644 index 0342554d0..000000000 --- a/assets/mods/basegame/audio/effects/steps/ROCK.7.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a0f2fbd9094a9df05af709cf4671646b3a158dae0db2ad3420b32c233be51d7 -size 6766 diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.8.ogg b/assets/mods/basegame/audio/effects/steps/ROCK.8.ogg deleted file mode 100644 index 98e86129b..000000000 --- a/assets/mods/basegame/audio/effects/steps/ROCK.8.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae6b4480c031e85015fd1420c163428ca7ef335fc8c9b157a2877f13ed64615a -size 6004 diff --git a/assets/mods/basegame/audio/effects/steps/ROCK.9.ogg b/assets/mods/basegame/audio/effects/steps/ROCK.9.ogg deleted file mode 100644 index 08ca9d4db..000000000 --- a/assets/mods/basegame/audio/effects/steps/ROCK.9.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cef3b1833df0271962ef636282733024cbce2266b6e894dcdf368c23052f8069 -size 6683 diff --git a/assets/mods/basegame/audio/effects/steps/SAND.1.ogg b/assets/mods/basegame/audio/effects/steps/SAND.1.ogg deleted file mode 100644 index 72dbc17bc..000000000 --- a/assets/mods/basegame/audio/effects/steps/SAND.1.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2aa9dc7a5f98f82ec75919c13d884ee76b67ad1a332cdb58209dc7bb10dd0c6d -size 6464 diff --git a/assets/mods/basegame/audio/effects/steps/SAND.1.wav b/assets/mods/basegame/audio/effects/steps/SAND.1.wav new file mode 100644 index 000000000..7ecd5cf17 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/SAND.1.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/SAND.2.ogg b/assets/mods/basegame/audio/effects/steps/SAND.2.ogg deleted file mode 100644 index 67ef64c58..000000000 --- a/assets/mods/basegame/audio/effects/steps/SAND.2.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87cad60616d289ea394acebc200d89e936ebecc397634c97b0333875f8222c65 -size 6562 diff --git a/assets/mods/basegame/audio/effects/steps/SAND.2.wav b/assets/mods/basegame/audio/effects/steps/SAND.2.wav new file mode 100644 index 000000000..7a1f71bfb Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/SAND.2.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/SAND.3.ogg b/assets/mods/basegame/audio/effects/steps/SAND.3.ogg deleted file mode 100644 index 258171970..000000000 --- a/assets/mods/basegame/audio/effects/steps/SAND.3.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fea9b2822eec23db834c9524ba90940859910345145617e1b8a3632f8f7fa609 -size 6086 diff --git a/assets/mods/basegame/audio/effects/steps/SAND.3.wav b/assets/mods/basegame/audio/effects/steps/SAND.3.wav new file mode 100644 index 000000000..7f209f078 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/SAND.3.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/SAND.4.ogg b/assets/mods/basegame/audio/effects/steps/SAND.4.ogg deleted file mode 100644 index 8470f7050..000000000 --- a/assets/mods/basegame/audio/effects/steps/SAND.4.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f00647579756573ea343b6df49ca723d97a44ec377e4d6f48da8b519a110f6a -size 6989 diff --git a/assets/mods/basegame/audio/effects/steps/SAND.4.wav b/assets/mods/basegame/audio/effects/steps/SAND.4.wav new file mode 100644 index 000000000..3d7658363 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/SAND.4.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/WOOD.1.ogg b/assets/mods/basegame/audio/effects/steps/WOOD.1.ogg deleted file mode 100644 index 113f45d60..000000000 --- a/assets/mods/basegame/audio/effects/steps/WOOD.1.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e68fb553d6ebb59a616c2c6c1a19fc4abb59e6439336f28fc600dfa5a2cf6906 -size 6967 diff --git a/assets/mods/basegame/audio/effects/steps/WOOD.1.wav b/assets/mods/basegame/audio/effects/steps/WOOD.1.wav new file mode 100644 index 000000000..c2f63c668 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/WOOD.1.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/WOOD.2.ogg b/assets/mods/basegame/audio/effects/steps/WOOD.2.ogg deleted file mode 100644 index 99976fc1f..000000000 --- a/assets/mods/basegame/audio/effects/steps/WOOD.2.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e972f0d43e7adc91c5e6199c8e4c9384a4f054ebf7de39ba42dbf375bda7fbc6 -size 6416 diff --git a/assets/mods/basegame/audio/effects/steps/WOOD.2.wav b/assets/mods/basegame/audio/effects/steps/WOOD.2.wav new file mode 100644 index 000000000..4875737b9 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/WOOD.2.wav differ diff --git a/assets/mods/basegame/audio/effects/steps/WOOD.3.ogg b/assets/mods/basegame/audio/effects/steps/WOOD.3.ogg deleted file mode 100644 index 15a8642ea..000000000 --- a/assets/mods/basegame/audio/effects/steps/WOOD.3.ogg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8ab9ef3c68a2bc7e921e17515203c89ead0fceff827704d32ee04afe37e2298 -size 6363 diff --git a/assets/mods/basegame/audio/effects/steps/WOOD.3.wav b/assets/mods/basegame/audio/effects/steps/WOOD.3.wav new file mode 100644 index 000000000..d4cfb1b07 Binary files /dev/null and b/assets/mods/basegame/audio/effects/steps/WOOD.3.wav differ diff --git a/src/net/torvald/terrarum/audio/AudioCodex.kt b/src/net/torvald/terrarum/audio/AudioCodex.kt index 1c8f0eec5..c900247b0 100644 --- a/src/net/torvald/terrarum/audio/AudioCodex.kt +++ b/src/net/torvald/terrarum/audio/AudioCodex.kt @@ -24,6 +24,7 @@ class AudioCodex { } fun getRandomFootstep(materialID: String) = getRandomAudio("effects.steps.$materialID") + fun getRandomMining(materialID: String) = getRandomAudio("effects.mining.$materialID") /** * @param identifier diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt index e44ce13d2..5188eac90 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureBase.kt @@ -9,7 +9,6 @@ import net.torvald.terrarum.gameactors.* import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.gameworld.fmod import net.torvald.terrarum.modulebasegame.gameitems.PickaxeCore -import net.torvald.terrarum.realestate.LandUtil import net.torvald.terrarum.ui.UICanvas import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack import org.dyn4j.geometry.Vector2 @@ -371,8 +370,8 @@ open class FixtureBase : ActorWithBody, CuedByTerrainChange { } when (soundSource) { - 1 -> PickaxeCore.makeNoise(this, wallTile) - 0 -> PickaxeCore.makeNoise(this, terrTile) + 1 -> PickaxeCore.makeNoiseTileBurst(this, wallTile) + 0 -> PickaxeCore.makeNoiseTileBurst(this, terrTile) } // make some dust diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSwingingDoorBase.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSwingingDoorBase.kt index 124efc1bc..2f928f298 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSwingingDoorBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/FixtureSwingingDoorBase.kt @@ -168,8 +168,8 @@ open class FixtureSwingingDoorBase : FixtureBase { } when (soundSource) { - 1 -> PickaxeCore.makeNoise(this, wallTile) - 0 -> PickaxeCore.makeNoise(this, terrTile) + 1 -> PickaxeCore.makeNoiseTileBurst(this, wallTile) + 0 -> PickaxeCore.makeNoiseTileBurst(this, terrTile) } // make some dust diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt index f3be4bf10..b6adf2f6b 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/AxeCore.kt @@ -1,25 +1,17 @@ package net.torvald.terrarum.modulebasegame.gameitems -import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.g2d.TextureRegion import net.torvald.terrarum.* -import net.torvald.terrarum.App.printdbg import net.torvald.terrarum.blockproperties.Block -import net.torvald.terrarum.blockproperties.BlockCodex import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameitems.GameItem import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.gameitems.mouseInInteractableRangeTools -import net.torvald.terrarum.gameparticles.createRandomBlockParticle import net.torvald.terrarum.itemproperties.Calculate import net.torvald.terrarum.itemproperties.Item -import net.torvald.terrarum.modulebasegame.TerrarumIngame -import net.torvald.terrarum.modulebasegame.gameactors.DroppedItem import net.torvald.terrarum.modulebasegame.gameitems.AxeCore.BASE_MASS_AND_SIZE import net.torvald.terrarum.modulebasegame.gameitems.AxeCore.TOOL_DURABILITY_BASE -import net.torvald.terrarum.worlddrawer.CreateTileAtlas -import org.dyn4j.geometry.Vector2 import kotlin.math.roundToInt /** @@ -77,6 +69,10 @@ object AxeCore { val actionInterval = actorvalue.getAsDouble(AVKey.ACTION_INTERVAL)!! val swingDmgToFrameDmg = delta.toDouble() / actionInterval + if (INGAME.WORLD_UPDATE_TIMER % 11 == (Math.random() * 3).toInt()) { + PickaxeCore.makeNoiseTileTouching(actor, tile) + } + INGAME.world.inflictTerrainDamage( x, y, Calculate.hatchetPower(actor, item?.material) * swingDmgToFrameDmg, @@ -99,6 +95,10 @@ object AxeCore { val actionInterval = actorvalue.getAsDouble(AVKey.ACTION_INTERVAL)!! val swingDmgToFrameDmg = delta.toDouble() / actionInterval + if (INGAME.WORLD_UPDATE_TIMER % 11 == (Math.random() * 3).toInt()) { + PickaxeCore.makeNoiseTileTouching(actor, tile) + } + INGAME.world.inflictTerrainDamage( x, y, Calculate.hatchetPower(actor, item?.material) * swingDmgToFrameDmg, @@ -110,7 +110,7 @@ object AxeCore { PickaxeCore.dropItem(drop, x, y) PickaxeCore.makeDust(tile, x, y, 9) - PickaxeCore.makeNoise(actor, tile) + PickaxeCore.makeNoiseTileBurst(actor, tile) } // tile not busted if (Math.random() < actionInterval) { @@ -125,6 +125,10 @@ object AxeCore { val actionInterval = actorvalue.getAsDouble(AVKey.ACTION_INTERVAL)!! val swingDmgToFrameDmg = delta.toDouble() / actionInterval + if (INGAME.WORLD_UPDATE_TIMER % 11 == (Math.random() * 3).toInt()) { + PickaxeCore.makeNoiseTileTouching(actor, tile) + } + INGAME.world.inflictTerrainDamage( x, y, Calculate.hatchetPower(actor, item?.material) * swingDmgToFrameDmg, @@ -207,7 +211,7 @@ object AxeCore { // drop the item under cursor PickaxeCore.dropItem(BlockCodex[tileBroken].drop, x, y) // todo use log item if applicable PickaxeCore.makeDust(tile, x, y, 9) - PickaxeCore.makeNoise(actor, tile) + PickaxeCore.makeNoiseTileBurst(actor, tile) } // tile not busted if (Math.random() < actionInterval) { diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/BlockBase.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/BlockBase.kt index 44515b55a..fb813475c 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/BlockBase.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/BlockBase.kt @@ -70,7 +70,7 @@ object BlockBase { false ) } - PickaxeCore.makeNoise(actor, itemID) + PickaxeCore.makeNoiseTileBurst(actor, itemID) 1L } diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt index ced2933ab..2faceab25 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt @@ -3,7 +3,6 @@ package net.torvald.terrarum.modulebasegame.gameitems import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.g2d.TextureRegion import net.torvald.terrarum.* -import net.torvald.terrarum.App.printdbg import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED import net.torvald.terrarum.blockproperties.Block @@ -91,6 +90,10 @@ object PickaxeCore { val actionInterval = actorvalue.getAsDouble(AVKey.ACTION_INTERVAL)!! val swingDmgToFrameDmg = delta.toDouble() / actionInterval + if (INGAME.WORLD_UPDATE_TIMER % 11 == (Math.random() * 3).toInt()) { + makeNoiseTileTouching(actor, tile) + } + INGAME.world.inflictTerrainDamage( x, y, Calculate.pickaxePower(actor, item?.material) * swingDmgToFrameDmg, @@ -125,9 +128,9 @@ object PickaxeCore { // make dust if (tileBroken != null || oreBroken != null) { makeDust(tile, x, y, 9) - makeNoise(actor, tile) + makeNoiseTileBurst(actor, tile) } - else { + else if (Math.random() < actionInterval) { makeDust(tile, x, y, 1) } } @@ -196,7 +199,13 @@ object PickaxeCore { } } - fun makeNoise(actor: ActorWithBody, tile: ItemID) { + fun makeNoiseTileTouching(actor: ActorWithBody, tile: ItemID) { + Terrarum.audioCodex.getRandomMining(BlockCodex[tile].material)?.let { + actor.startAudio(it, 1.0) + } + } + + fun makeNoiseTileBurst(actor: ActorWithBody, tile: ItemID) { Terrarum.audioCodex.getRandomFootstep(BlockCodex[tile].material)?.let { actor.startAudio(it, 2.0) } diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt index 8ce764e45..66b5b0be5 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameitems/SledgehammerCore.kt @@ -2,23 +2,16 @@ package net.torvald.terrarum.modulebasegame.gameitems import com.badlogic.gdx.graphics.g2d.TextureRegion import net.torvald.terrarum.* -import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE -import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZED import net.torvald.terrarum.blockproperties.Block import net.torvald.terrarum.gameactors.AVKey import net.torvald.terrarum.gameactors.ActorWithBody import net.torvald.terrarum.gameitems.GameItem import net.torvald.terrarum.gameitems.ItemID import net.torvald.terrarum.gameitems.mouseInInteractableRangeTools -import net.torvald.terrarum.gameparticles.createRandomBlockParticle import net.torvald.terrarum.itemproperties.Calculate -import net.torvald.terrarum.modulebasegame.TerrarumIngame -import net.torvald.terrarum.modulebasegame.gameactors.DroppedItem import net.torvald.terrarum.modulebasegame.gameitems.SledgehammerCore.BASE_MASS_AND_SIZE import net.torvald.terrarum.modulebasegame.gameitems.SledgehammerCore.TOOL_DURABILITY_BASE -import net.torvald.terrarum.worlddrawer.CreateTileAtlas import net.torvald.terrarum.worlddrawer.CreateTileAtlas.Companion.WALL_OVERLAY_COLOUR -import org.dyn4j.geometry.Vector2 import kotlin.math.roundToInt /** @@ -51,13 +44,10 @@ object SledgehammerCore { var usageStatus = false - - for (oy in 0 until mh) for (ox in 0 until mw) { val x = mx + xoff + ox val y = my + yoff + oy - val mousePoint = Point2d(x.toDouble(), y.toDouble()) val actorvalue = actor.actorValue val wall = INGAME.world.getTileFromWall(x, y) val tileTerrain = INGAME.world.getTileFromTerrain(x, y) @@ -92,6 +82,10 @@ object SledgehammerCore { val actionInterval = actorvalue.getAsDouble(AVKey.ACTION_INTERVAL)!! val swingDmgToFrameDmg = delta.toDouble() / actionInterval + if (INGAME.WORLD_UPDATE_TIMER % 11 == (Math.random() * 3).toInt()) { + PickaxeCore.makeNoiseTileTouching(actor, wall) + } + INGAME.world.inflictWallDamage( x, y, Calculate.pickaxePower(actor, item?.material) * swingDmgToFrameDmg, @@ -104,7 +98,7 @@ object SledgehammerCore { PickaxeCore.dropItem("wall@$drop", x, y) PickaxeCore.makeDust(wall, x, y, 9, WALL_OVERLAY_COLOUR) - PickaxeCore.makeNoise(actor, wall) + PickaxeCore.makeNoiseTileBurst(actor, wall) } } // tile not busted