From 2ed7e71d5353497f12f7c8bab0fcd0f39e32745f Mon Sep 17 00:00:00 2001 From: Louis <35883445+louist103@users.noreply.github.com> Date: Sun, 22 Sep 2024 14:30:05 -0400 Subject: [PATCH 01/10] Name samples Fix FileName FIx Revert "FIx" This reverts commit 510dcd8c03242f49d88173357c36fd0cc8911945. Fix --- assets/xml/audio/samplebanks/SampleBank_0.xml | 1348 ++++++++--------- 1 file changed, 674 insertions(+), 674 deletions(-) diff --git a/assets/xml/audio/samplebanks/SampleBank_0.xml b/assets/xml/audio/samplebanks/SampleBank_0.xml index df880d5433..d36e5b9314 100644 --- a/assets/xml/audio/samplebanks/SampleBank_0.xml +++ b/assets/xml/audio/samplebanks/SampleBank_0.xml @@ -1,676 +1,676 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 58c10aed0743035034b66890cd8057e124dbe7be Mon Sep 17 00:00:00 2001 From: Louis <35883445+louist103@users.noreply.github.com> Date: Sun, 22 Sep 2024 17:01:20 -0400 Subject: [PATCH 02/10] Formatting fixes --- assets/xml/audio/samplebanks/SampleBank_0.xml | 1352 ++++++++--------- 1 file changed, 676 insertions(+), 676 deletions(-) diff --git a/assets/xml/audio/samplebanks/SampleBank_0.xml b/assets/xml/audio/samplebanks/SampleBank_0.xml index d36e5b9314..0ef8e6410c 100644 --- a/assets/xml/audio/samplebanks/SampleBank_0.xml +++ b/assets/xml/audio/samplebanks/SampleBank_0.xml @@ -1,676 +1,676 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 5906b43722b1feb197e20f761340b7a81c21edef Mon Sep 17 00:00:00 2001 From: Louis <35883445+louist103@users.noreply.github.com> Date: Sun, 22 Sep 2024 17:02:25 -0400 Subject: [PATCH 03/10] fix --- assets/xml/audio/samplebanks/SampleBank_0.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/xml/audio/samplebanks/SampleBank_0.xml b/assets/xml/audio/samplebanks/SampleBank_0.xml index 0ef8e6410c..8d8f847484 100644 --- a/assets/xml/audio/samplebanks/SampleBank_0.xml +++ b/assets/xml/audio/samplebanks/SampleBank_0.xml @@ -1,5 +1,5 @@ - + From b4685e4074a64b20431d106d578e7b68f3190882 Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Sun, 22 Sep 2024 20:59:23 -0400 Subject: [PATCH 04/10] \n --- assets/xml/audio/samplebanks/SampleBank_0.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/xml/audio/samplebanks/SampleBank_0.xml b/assets/xml/audio/samplebanks/SampleBank_0.xml index 8d8f847484..9e6a64b4e7 100644 --- a/assets/xml/audio/samplebanks/SampleBank_0.xml +++ b/assets/xml/audio/samplebanks/SampleBank_0.xml @@ -673,4 +673,4 @@ - \ No newline at end of file + From 65e1d939c70d7fdb108df1188749d8adf72c6f7d Mon Sep 17 00:00:00 2001 From: louis <35883445+louist103@users.noreply.github.com> Date: Fri, 29 Nov 2024 17:38:18 -0500 Subject: [PATCH 05/10] snake case --- assets/xml/audio/samplebanks/SampleBank_0.xml | 486 +++++++++--------- 1 file changed, 243 insertions(+), 243 deletions(-) diff --git a/assets/xml/audio/samplebanks/SampleBank_0.xml b/assets/xml/audio/samplebanks/SampleBank_0.xml index 9e6a64b4e7..7f9f5102d4 100644 --- a/assets/xml/audio/samplebanks/SampleBank_0.xml +++ b/assets/xml/audio/samplebanks/SampleBank_0.xml @@ -1,120 +1,119 @@ - - - + + - - - - + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - + + + - - + + - - - + + + - - - + + + @@ -138,30 +137,30 @@ - - - - - - - + + + + + + + - - + + - + - + - + - + - - - + + + - + @@ -179,9 +178,9 @@ - + - + @@ -199,8 +198,8 @@ - - + + @@ -215,36 +214,36 @@ - - + + - + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + @@ -373,58 +372,58 @@ - - - - - + + + + + - - + + - + - + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -438,21 +437,21 @@ - - - - - - - - - + + + + + + + + + - - - - - + + + + + @@ -461,13 +460,13 @@ - - + + - + @@ -485,7 +484,7 @@ - + @@ -575,45 +574,45 @@ - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -623,8 +622,8 @@ - - + + @@ -639,38 +638,39 @@ - - - - - - - - + + + + + + + + - + - + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file From f6205055b68112823aa2469330d74f1c3c0eb00c Mon Sep 17 00:00:00 2001 From: louis <35883445+louist103@users.noreply.github.com> Date: Fri, 29 Nov 2024 17:41:46 -0500 Subject: [PATCH 06/10] format --- assets/xml/audio/samplebanks/SampleBank_0.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/xml/audio/samplebanks/SampleBank_0.xml b/assets/xml/audio/samplebanks/SampleBank_0.xml index 7f9f5102d4..be8fb2f5b8 100644 --- a/assets/xml/audio/samplebanks/SampleBank_0.xml +++ b/assets/xml/audio/samplebanks/SampleBank_0.xml @@ -673,4 +673,4 @@ - \ No newline at end of file + From 75741414ce99db1a6923186869428edc731a9e85 Mon Sep 17 00:00:00 2001 From: louis <35883445+louist103@users.noreply.github.com> Date: Fri, 29 Nov 2024 18:01:49 -0500 Subject: [PATCH 07/10] Bank 2 --- assets/xml/audio/samplebanks/SampleBank_0.xml | 1 - assets/xml/audio/samplebanks/SampleBank_2.xml | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/assets/xml/audio/samplebanks/SampleBank_0.xml b/assets/xml/audio/samplebanks/SampleBank_0.xml index be8fb2f5b8..6dd9461ee0 100644 --- a/assets/xml/audio/samplebanks/SampleBank_0.xml +++ b/assets/xml/audio/samplebanks/SampleBank_0.xml @@ -673,4 +673,3 @@ - diff --git a/assets/xml/audio/samplebanks/SampleBank_2.xml b/assets/xml/audio/samplebanks/SampleBank_2.xml index 5d211590b0..3fbeefd97f 100644 --- a/assets/xml/audio/samplebanks/SampleBank_2.xml +++ b/assets/xml/audio/samplebanks/SampleBank_2.xml @@ -1,9 +1,9 @@ - - - - - - + + + + + + From 5733be2d448096a674b0a830693d49253919e115 Mon Sep 17 00:00:00 2001 From: louis <35883445+louist103@users.noreply.github.com> Date: Fri, 29 Nov 2024 18:24:33 -0500 Subject: [PATCH 08/10] Fix extract assets --- tools/extract_assets.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/extract_assets.py b/tools/extract_assets.py index 64ce99aa7b..848b71c6da 100755 --- a/tools/extract_assets.py +++ b/tools/extract_assets.py @@ -152,7 +152,8 @@ def main(): for currentPath, _, files in os.walk(os.path.join("assets", "xml")): for file in files: fullPath = os.path.join(currentPath, file) - if file.endswith(".xml"): + # ZAPD can't handle audio, skip those XMLs. + if file.endswith(".xml") and (fullPath.find("audio") == -1): xmlFiles.append(fullPath) try: From 7cd364fef90d280666fa58b665b067270da26625 Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Fri, 29 Nov 2024 19:40:06 -0500 Subject: [PATCH 09/10] Update SampleBank_0.xml --- assets/xml/audio/samplebanks/SampleBank_0.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/xml/audio/samplebanks/SampleBank_0.xml b/assets/xml/audio/samplebanks/SampleBank_0.xml index 6dd9461ee0..6bfed55a3e 100644 --- a/assets/xml/audio/samplebanks/SampleBank_0.xml +++ b/assets/xml/audio/samplebanks/SampleBank_0.xml @@ -1,3 +1,4 @@ + From e131dfc7d5ffb03a2b4df42f6cf25bca0c28014d Mon Sep 17 00:00:00 2001 From: louis <35883445+louist103@users.noreply.github.com> Date: Sat, 30 Nov 2024 09:59:59 -0500 Subject: [PATCH 10/10] Fix copy errors --- assets/xml/audio/samplebanks/SampleBank_0.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/xml/audio/samplebanks/SampleBank_0.xml b/assets/xml/audio/samplebanks/SampleBank_0.xml index 6bfed55a3e..07e4c7a06f 100644 --- a/assets/xml/audio/samplebanks/SampleBank_0.xml +++ b/assets/xml/audio/samplebanks/SampleBank_0.xml @@ -373,7 +373,7 @@ - + @@ -442,8 +442,8 @@ - - + + @@ -641,7 +641,7 @@ - +