Merge branch 'main' into deploy

davwheat · Jun 7, 2024 · 00071f3 · 00071f3
2 parents 87b1a86 + 2977af3
commit 00071f3
Show file tree

Hide file tree

Showing 47 changed files with 13 additions and 13 deletions.
diff --git a/...a/e/should join the front ten coaches.mp3 → ...ia/e/should join the front 10 coaches.mp3 b/...a/e/should join the front ten coaches.mp3 → ...ia/e/should join the front 10 coaches.mp3
diff --git a/.../should join the front eleven coaches.mp3 → ...ia/e/should join the front 11 coaches.mp3 b/.../should join the front eleven coaches.mp3 → ...ia/e/should join the front 11 coaches.mp3
diff --git a/.../should join the front twelve coaches.mp3 → ...ia/e/should join the front 12 coaches.mp3 b/.../should join the front twelve coaches.mp3 → ...ia/e/should join the front 12 coaches.mp3
diff --git a/...a/e/should join the front two coaches.mp3 → ...lia/e/should join the front 2 coaches.mp3 b/...a/e/should join the front two coaches.mp3 → ...lia/e/should join the front 2 coaches.mp3
diff --git a/...e/should join the front three coaches.mp3 → ...lia/e/should join the front 3 coaches.mp3 b/...e/should join the front three coaches.mp3 → ...lia/e/should join the front 3 coaches.mp3
diff --git a/.../e/should join the front four coaches.mp3 → ...lia/e/should join the front 4 coaches.mp3 b/.../e/should join the front four coaches.mp3 → ...lia/e/should join the front 4 coaches.mp3
diff --git a/.../e/should join the front five coaches.mp3 → ...lia/e/should join the front 5 coaches.mp3 b/.../e/should join the front five coaches.mp3 → ...lia/e/should join the front 5 coaches.mp3
diff --git a/...a/e/should join the front six coaches.mp3 → ...lia/e/should join the front 6 coaches.mp3 b/...a/e/should join the front six coaches.mp3 → ...lia/e/should join the front 6 coaches.mp3
diff --git a/...e/should join the front seven coaches.mp3 → ...lia/e/should join the front 7 coaches.mp3 b/...e/should join the front seven coaches.mp3 → ...lia/e/should join the front 7 coaches.mp3
diff --git a/...e/should join the front eight coaches.mp3 → ...lia/e/should join the front 8 coaches.mp3 b/...e/should join the front eight coaches.mp3 → ...lia/e/should join the front 8 coaches.mp3
diff --git a/.../e/should join the front nine coaches.mp3 → ...lia/e/should join the front 9 coaches.mp3 b/.../e/should join the front nine coaches.mp3 → ...lia/e/should join the front 9 coaches.mp3
diff --git a/...ia/e/should join the rear ten coaches.mp3 → ...lia/e/should join the rear 10 coaches.mp3 b/...ia/e/should join the rear ten coaches.mp3 → ...lia/e/should join the rear 10 coaches.mp3
diff --git a/...e/should join the rear eleven coaches.mp3 → ...lia/e/should join the rear 11 coaches.mp3 b/...e/should join the rear eleven coaches.mp3 → ...lia/e/should join the rear 11 coaches.mp3
diff --git a/...e/should join the rear twelve coaches.mp3 → ...lia/e/should join the rear 12 coaches.mp3 b/...e/should join the rear twelve coaches.mp3 → ...lia/e/should join the rear 12 coaches.mp3
diff --git a/...ia/e/should join the rear two coaches.mp3 → ...elia/e/should join the rear 2 coaches.mp3 b/...ia/e/should join the rear two coaches.mp3 → ...elia/e/should join the rear 2 coaches.mp3
diff --git a/.../e/should join the rear three coaches.mp3 → ...elia/e/should join the rear 3 coaches.mp3 b/.../e/should join the rear three coaches.mp3 → ...elia/e/should join the rear 3 coaches.mp3
diff --git a/...a/e/should join the rear four coaches.mp3 → ...elia/e/should join the rear 4 coaches.mp3 b/...a/e/should join the rear four coaches.mp3 → ...elia/e/should join the rear 4 coaches.mp3
diff --git a/...a/e/should join the rear five coaches.mp3 → ...elia/e/should join the rear 5 coaches.mp3 b/...a/e/should join the rear five coaches.mp3 → ...elia/e/should join the rear 5 coaches.mp3
diff --git a/...ia/e/should join the rear six coaches.mp3 → ...elia/e/should join the rear 6 coaches.mp3 b/...ia/e/should join the rear six coaches.mp3 → ...elia/e/should join the rear 6 coaches.mp3
diff --git a/.../e/should join the rear seven coaches.mp3 → ...elia/e/should join the rear 7 coaches.mp3 b/.../e/should join the rear seven coaches.mp3 → ...elia/e/should join the rear 7 coaches.mp3
diff --git a/.../e/should join the rear eight coaches.mp3 → ...elia/e/should join the rear 8 coaches.mp3 b/.../e/should join the rear eight coaches.mp3 → ...elia/e/should join the rear 8 coaches.mp3
diff --git a/...a/e/should join the rear nine coaches.mp3 → ...elia/e/should join the rear 9 coaches.mp3 b/...a/e/should join the rear nine coaches.mp3 → ...elia/e/should join the rear 9 coaches.mp3
diff --git a/audio/station/ketech/celia/sfx - fanfare.mp3 b/audio/station/ketech/celia/sfx - fanfare.mp3
diff --git a/...l/e/should join the front ten coaches.mp3 → ...il/e/should join the front 10 coaches.mp3 b/...l/e/should join the front ten coaches.mp3 → ...il/e/should join the front 10 coaches.mp3
diff --git a/.../should join the front eleven coaches.mp3 → ...il/e/should join the front 11 coaches.mp3 b/.../should join the front eleven coaches.mp3 → ...il/e/should join the front 11 coaches.mp3
diff --git a/.../should join the front twelve coaches.mp3 → ...il/e/should join the front 12 coaches.mp3 b/.../should join the front twelve coaches.mp3 → ...il/e/should join the front 12 coaches.mp3
diff --git a/...l/e/should join the front two coaches.mp3 → ...hil/e/should join the front 2 coaches.mp3 b/...l/e/should join the front two coaches.mp3 → ...hil/e/should join the front 2 coaches.mp3
diff --git a/...e/should join the front three coaches.mp3 → ...hil/e/should join the front 3 coaches.mp3 b/...e/should join the front three coaches.mp3 → ...hil/e/should join the front 3 coaches.mp3
diff --git a/.../e/should join the front four coaches.mp3 → ...hil/e/should join the front 4 coaches.mp3 b/.../e/should join the front four coaches.mp3 → ...hil/e/should join the front 4 coaches.mp3
diff --git a/.../e/should join the front five coaches.mp3 → ...hil/e/should join the front 5 coaches.mp3 b/.../e/should join the front five coaches.mp3 → ...hil/e/should join the front 5 coaches.mp3
diff --git a/...l/e/should join the front six coaches.mp3 → ...hil/e/should join the front 6 coaches.mp3 b/...l/e/should join the front six coaches.mp3 → ...hil/e/should join the front 6 coaches.mp3
diff --git a/...e/should join the front seven coaches.mp3 → ...hil/e/should join the front 7 coaches.mp3 b/...e/should join the front seven coaches.mp3 → ...hil/e/should join the front 7 coaches.mp3
diff --git a/...e/should join the front eight coaches.mp3 → ...hil/e/should join the front 8 coaches.mp3 b/...e/should join the front eight coaches.mp3 → ...hil/e/should join the front 8 coaches.mp3
diff --git a/.../e/should join the front nine coaches.mp3 → ...hil/e/should join the front 9 coaches.mp3 b/.../e/should join the front nine coaches.mp3 → ...hil/e/should join the front 9 coaches.mp3
diff --git a/...il/e/should join the rear ten coaches.mp3 → ...hil/e/should join the rear 10 coaches.mp3 b/...il/e/should join the rear ten coaches.mp3 → ...hil/e/should join the rear 10 coaches.mp3
diff --git a/...e/should join the rear eleven coaches.mp3 → ...hil/e/should join the rear 11 coaches.mp3 b/...e/should join the rear eleven coaches.mp3 → ...hil/e/should join the rear 11 coaches.mp3
diff --git a/...e/should join the rear twelve coaches.mp3 → ...hil/e/should join the rear 12 coaches.mp3 b/...e/should join the rear twelve coaches.mp3 → ...hil/e/should join the rear 12 coaches.mp3
diff --git a/...il/e/should join the rear two coaches.mp3 → ...phil/e/should join the rear 2 coaches.mp3 b/...il/e/should join the rear two coaches.mp3 → ...phil/e/should join the rear 2 coaches.mp3
diff --git a/.../e/should join the rear three coaches.mp3 → ...phil/e/should join the rear 3 coaches.mp3 b/.../e/should join the rear three coaches.mp3 → ...phil/e/should join the rear 3 coaches.mp3
diff --git a/...l/e/should join the rear four coaches.mp3 → ...phil/e/should join the rear 4 coaches.mp3 b/...l/e/should join the rear four coaches.mp3 → ...phil/e/should join the rear 4 coaches.mp3
diff --git a/...l/e/should join the rear five coaches.mp3 → ...phil/e/should join the rear 5 coaches.mp3 b/...l/e/should join the rear five coaches.mp3 → ...phil/e/should join the rear 5 coaches.mp3
diff --git a/...il/e/should join the rear six coaches.mp3 → ...phil/e/should join the rear 6 coaches.mp3 b/...il/e/should join the rear six coaches.mp3 → ...phil/e/should join the rear 6 coaches.mp3
diff --git a/.../e/should join the rear seven coaches.mp3 → ...phil/e/should join the rear 7 coaches.mp3 b/.../e/should join the rear seven coaches.mp3 → ...phil/e/should join the rear 7 coaches.mp3
diff --git a/.../e/should join the rear eight coaches.mp3 → ...phil/e/should join the rear 8 coaches.mp3 b/.../e/should join the rear eight coaches.mp3 → ...phil/e/should join the rear 8 coaches.mp3
diff --git a/...l/e/should join the rear nine coaches.mp3 → ...phil/e/should join the rear 9 coaches.mp3 b/...l/e/should join the rear nine coaches.mp3 → ...phil/e/should join the rear 9 coaches.mp3
diff --git a/audio/station/ketech/phil/sfx - fanfare.mp3 b/audio/station/ketech/phil/sfx - fanfare.mp3
diff --git a/src/announcement-data/systems/stations/AmeyPhil.tsx b/src/announcement-data/systems/stations/AmeyPhil.tsx
@@ -3926,22 +3926,22 @@ export default class AmeyPhil extends StationAnnouncementSystem {
 
       if (stopData.position === 'any' || stopData.position === pos) {
         if (len === 1) {
-          files.push(`e.should travel in the ${pos} coach of the train`)
+          files.push(`e.should join the ${pos} coach only`)
         } else {
-          files.push(`m.should travel in the ${pos}`, `platform.s.${len}`, 'e.coaches of the train')
+          files.push(`e.should join the ${pos} ${len} coaches`)
         }
       } else {
-        if (len === 1) {
-          files.push(`m.should travel in the ${pos}`, 'm.coach')
-        } else {
-          files.push(`m.should travel in the ${pos}`, `platform.s.${len}`, 'm.coaches')
-        }
-
-        if (stopData.length === 1) {
-          files.push('m.of', 'm.the', `m.${stopData.position}`, 'e.coach of this train')
-        } else {
-          files.push('m.of', 'm.the', `m.${stopData.position}`, `platform.s.${stopData.length}`, 'e.coaches of the train')
-        }
+        // No short platforms are announced post-split. All this code I've written going to waste!
+        // if (len === 1) {
+        //   files.push(`m.should join the ${pos} coach only`)
+        // } else {
+        //   files.push(`e.should join the ${pos} ${len} coaches`)
+        // }
+        // if (stopData.length === 1) {
+        //   files.push('m.of', 'm.the', `m.${stopData.position}`, 'e.coach')
+        // } else {
+        //   files.push('m.of', 'm.the', `m.${stopData.position}`, `platform.s.${stopData.length}`, 'e.coaches')
+        // }
       }
 
       return files