From 76a992f5013034e170645d5ef93062da6d239f55 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 23:43:04 -0500 Subject: [PATCH] Remove brief3intro Weird situation where 1 video in both brief3intro and brief3-a got used. We can use 1 file instead. --- data/base/messages/brief3-a.json | 2 +- data/base/messages/brief3intro.json | 16 ---------------- data/base/script/campaign/cam3-a.js | 2 +- data/base/wrf/cam3/cam3a.wrf | 1 - 4 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 data/base/messages/brief3intro.json diff --git a/data/base/messages/brief3-a.json b/data/base/messages/brief3-a.json index bb6c43071e2..71f21382ab9 100644 --- a/data/base/messages/brief3-a.json +++ b/data/base/messages/brief3-a.json @@ -3,7 +3,7 @@ "name": "MB3A_MSG", "sequences": [ { "audio": "", "loop": 0, "subtitles": ["CAM3_MSG1", "CAM3_MSG2", "CAM3_MSG3"], "video": "cam3/cam3intp.ogg" }, - { "audio": "", "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" } + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam3int.ogg" } ] }, "video0001": { diff --git a/data/base/messages/brief3intro.json b/data/base/messages/brief3intro.json deleted file mode 100644 index c1b40b12842..00000000000 --- a/data/base/messages/brief3intro.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "video0000": { - "name": "CAM3_INT", - "sequences": [ - { "audio": "", "loop": 0, "subtitles": ["CAM3_MSG1", "CAM3_MSG2", "CAM3_MSG3"], "video": "cam3/cam3intp.ogg" }, - { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam3int.ogg" } - ] - }, - "video0001": { - "name": "CAM3_INT2", - "sequences": [ - { "audio": "", "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, - { "audio": "", "loop": 0, "subtitles": ["CAM3_MSG4", "CAM3_MSG5", "CAM3_MSG6"], "video": "cam3/cam3intb.ogg" } - ] - } -} diff --git a/data/base/script/campaign/cam3-a.js b/data/base/script/campaign/cam3-a.js index 1a38133351f..9f9847466b3 100644 --- a/data/base/script/campaign/cam3-a.js +++ b/data/base/script/campaign/cam3-a.js @@ -500,7 +500,7 @@ function eventStartLevel() setTimer("truckDefense", camChangeOnDiff(camMinutesToMilliseconds(4.5))); } - camPlayVideos([{video: "CAM3_INT", type: CAMP_MSG}, {video: "MB3A_MSG2", type: MISS_MSG}]); + camPlayVideos([{video: "MB3A_MSG", type: CAMP_MSG}, {video: "MB3A_MSG2", type: MISS_MSG}]); startedFromMenu = false; truckLocCounter = 0; diff --git a/data/base/wrf/cam3/cam3a.wrf b/data/base/wrf/cam3/cam3a.wrf index b36f98f5100..1ffe62e943a 100644 --- a/data/base/wrf/cam3/cam3a.wrf +++ b/data/base/wrf/cam3/cam3a.wrf @@ -6,7 +6,6 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file FLIC "brief3-a.json" -file FLIC "brief3intro.json" file PROX "prox3a.json" directory "script"