Merge pull request #36 from karst/consistency

Update folder naming consistency

Author: karst

build.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import fs from 'fs';
-import path from 'path';
 import { spawn } from 'child_process';
+import fs from 'fs';
 import { platform } from 'os';
+import path from 'path';
 
 const verbose = process.argv.indexOf('--verbose') != -1;
 
@@ -48,12 +48,14 @@ async function createAssetPack(filename) {
     for (let obj of root.objects) {
         for (let i = 0; i < obj.samples.length; i++) {
             const sample = obj.samples[i];
-            const newFilename = `${sampleIndex}.ogg`;
-            const srcPath = path.join(dir, sample);
-            const dstPath = path.join(workDir, newFilename);
-            await encodeMusicTrack(dstPath, srcPath);
-            obj.samples[i] = newFilename;
-            sampleIndex++;
+            if (sample != "" && !sample.startsWith('$')) {
+                const newFilename = `${sampleIndex}.ogg`;
+                const srcPath = path.join(dir, sample);
+                const dstPath = path.join(workDir, newFilename);
+                await encodeMusicTrack(dstPath, srcPath);
+                obj.samples[i] = newFilename;
+                sampleIndex++;
+            }
         }
     }
 

cover/openrct2.music.fairground/README.md cover/rct2.music.fairground/README.mdcover/openrct2.music.fairground/README.md renamed to cover/rct2.music.fairground/README.md

@@ -5,14 +5,17 @@
         {
             "id": "rct2.music.ragtime",
             "samples": [
-                "cover/ragtime/searchlight_rag.flac"
+                "cover/rct2.music.ragtime/searchlight_rag.flac"
             ]
         },
         {
         	"id": "rct2.music.fairground",
             "samples": [
-                "cover/openrct2.music.fairground/das_alpenhorn.flac",
-                "cover/openrct2.music.fairground/slavonic_dance.flac"
+                "$[0..4]",
+                "cover/rct2.music.fairground/slavonic_dance.flac",
+                "$[0..0]",
+                "cover/rct2.music.fairground/das_alpenhorn.flac",
+                "$[0..4]"
             ]
         }
     ],