From 2a61ec26ca656e8f2ac288bc3aaf14d2709d8ad2 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 13:36:07 -0500 Subject: [PATCH 01/86] Create JSON Proximity file reader To eventually replace the CSV files with JSON variants that are much easier to understand. --- src/data.cpp | 14 ++++++++ src/message.cpp | 89 ++++++++++++++++++++++++++++++++++++++++++++++++- src/message.h | 1 + 3 files changed, 103 insertions(+), 1 deletion(-) diff --git a/src/data.cpp b/src/data.cpp index 30730781fe7..e3ce00a93e9 100644 --- a/src/data.cpp +++ b/src/data.cpp @@ -477,6 +477,19 @@ static bool dataResearchMsgLoad(const char *fileName, void **ppData) return true; } +static bool dataProximityMsgLoad(const char *fileName, void **ppData) +{ + WzString *ptr = loadProximityViewData(fileName); + if (!ptr) + { + return false; + } + + // set the pointer so the release function gets called with it + *ppData = (void *)ptr; + return true; +} + // release the message viewdata static void dataSMSGRelease(void *pData) { @@ -682,6 +695,7 @@ static const RES_TYPE_MIN_FILE FileResourceTypes[] = {"JAVASCRIPT", jsLoad, nullptr}, {"SSTRUCT", bufferSSTRUCTLoad, dataSSTRUCTRelease}, //structure stats and associated files {"RESCH", bufferRESCHLoad, dataRESCHRelease}, //research stats files + {"PROX", dataProximityMsgLoad, dataSMSGRelease }, }; /* Pass all the data loading functions to the framework library */ diff --git a/src/message.cpp b/src/message.cpp index 8bd3344fb17..30e03a1b82c 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -659,6 +659,90 @@ WzString *loadResearchViewData(const char *fileName) return new WzString(fileName); // so that cleanup function will be called on right data } +WzString *loadProximityViewData(const char *fileName) +{ + ASSERT_OR_RETURN(nullptr, PHYSFS_exists(fileName), "%s not found", fileName); + WzConfig ini(fileName, WzConfig::ReadOnlyAndRequired); + std::vector list = ini.childGroups(); + for (size_t i = 0; i < list.size(); ++i) + { + // Proximity viewdata init + VIEWDATA *v = new VIEWDATA; + VIEW_PROXIMITY *r = new VIEW_PROXIMITY; + v->pData = r; + v->name = list[i]; + v->fileName = fileName; + v->type = VIEW_PROX; + + ini.beginGroup(list[i]); + + // Set the message string when this Proximity blip gets clicked on + if (ini.contains("message")) + { + nlohmann::json array = ini.json("message"); + if (!array.is_null() && array.is_array()) + { + for(auto &a : array) + { + std::string msg = a.get(); + const char *str = strresGetString(psStringRes, msg.c_str()); + ASSERT(str, "Cannot find the view data string with id \"%s\"", msg.c_str()); + v->textMsg.push_back(WzString::fromUtf8(str)); + } + } + else + { + std::string msg = ini.value("message").toWzString().toUtf8(); + const char *str = strresGetString(psStringRes, msg.c_str()); + ASSERT(str, "Cannot find the view data string with id \"%s\"", msg.c_str()); + v->textMsg.push_back(WzString::fromUtf8(str)); + } + } + + // Read in the rest of the Proximity data + if (ini.contains("x")) { r->x = ini.value("x").toUInt(); } + if (ini.contains("y")) { r->y = ini.value("y").toUInt(); } + if (ini.contains("z")) { r->z = ini.value("z").toUInt(); } + if (ini.contains("type")) + { + unsigned int proxType = ini.value("type").toUInt(); + if (proxType > PROX_TYPES) + { + ASSERT(false, "Invalid proximity message sub type - %s", v->name.toUtf8().c_str()); + return nullptr; + } + r->proxType = static_cast(proxType); + } + if (ini.contains("audio")) + { + int audioID = 0; + std::string audioName = ini.value("audio").toWzString().toUtf8(); + if (strcmp(audioName.c_str(), "0") == 0) + { + audioID = NO_SOUND; + } + else + { + if ((audioID = audio_GetIDFromStr(audioName.c_str())) == NO_SOUND) + { + ASSERT(false, "couldn't get ID %d for weapon sound %s", audioID, audioName.c_str()); + return nullptr; + } + if ((audioID < 0 || audioID > ID_MAX_SOUND) && audioID != NO_SOUND) + { + ASSERT(false, "Invalid Weapon Sound ID - %d for weapon %s", audioID, audioName.c_str()); + return nullptr; + } + } + r->audioID = audioID; + } + + ini.endGroup(); + apsViewData[v->name] = v; + } + return new WzString(fileName); // so that cleanup function will be called on right data +} + /* Get the view data identified by the name */ VIEWDATA *getViewData(const WzString &name) { @@ -810,7 +894,10 @@ void displayProximityMessage(PROXIMITY_DISPLAY *psProxDisp) //display text - if any if (!psViewData->textMsg.empty() && psViewData->type != VIEW_BEACON) { - addConsoleMessage(psViewData->textMsg[0].toUtf8().c_str(), DEFAULT_JUSTIFY, SYSTEM_MESSAGE); + for (size_t i = 0; i < psViewData->textMsg.size(); ++i) + { + addConsoleMessage(psViewData->textMsg[i].toUtf8().c_str(), DEFAULT_JUSTIFY, SYSTEM_MESSAGE); + } } //play message - if any diff --git a/src/message.h b/src/message.h index 5b69e07ac58..34082806f17 100644 --- a/src/message.h +++ b/src/message.h @@ -73,6 +73,7 @@ void releaseAllProxDisp(); /** Load the view data for the messages from the file exported from the world editor. */ WzString *loadViewData(const char *pViewMsgData, UDWORD bufferSize); WzString *loadResearchViewData(const char *fileName); +WzString *loadProximityViewData(const char *fileName); /** Get the view data identified by the name */ VIEWDATA *getViewData(const WzString &name); From eb0c87de315e640442085f506f910ac50e532fbb Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 14:15:03 -0500 Subject: [PATCH 02/86] Convert prox1a --- data/base/messages/prox1a.json | 7 +++++++ data/base/messages/prox1a.txt | 5 ----- data/base/wrf/cam1/cam1a.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/prox1a.json delete mode 100644 data/base/messages/prox1a.txt diff --git a/data/base/messages/prox1a.json b/data/base/messages/prox1a.json new file mode 100644 index 00000000000..2568ae55379 --- /dev/null +++ b/data/base/messages/prox1a.json @@ -0,0 +1,7 @@ +{ + "C1A_BASE0": { "audio": "pcv390.ogg", "message": "BARBASE_MSG", "type": 0, "x": 3904, "y": 4672, "z": 0 }, + "C1A_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 5002, "y": 2154, "z": 135 }, + "C1A_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 1600, "y": 1728, "z": 0 }, + "C1A_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 2112, "y": 4544, "z": 0 }, + "C1A_OBJ1": { "audio": "pcv373.ogg", "message": "RUINS_MSG", "type": 0, "x": 4928, "y": 6592, "z": 0 } +} diff --git a/data/base/messages/prox1a.txt b/data/base/messages/prox1a.txt deleted file mode 100644 index 6a803b19c14..00000000000 --- a/data/base/messages/prox1a.txt +++ /dev/null @@ -1,5 +0,0 @@ -C1A_BASE0,1,BARBASE_MSG,2,3904,4672,0,pcv390.ogg,0 -C1A_BASE1,1,BARBASE_MSG,2,5002,2154,135,pcv389.ogg,0 -C1A_BASE2,1,BARBASE_MSG,2,1600,1728,0,pcv389.ogg,0 -C1A_BASE3,1,BARBASE_MSG,2,2112,4544,0,pcv389.ogg,0 -C1A_OBJ1,1,RUINS_MSG,2,4928,6592,0,pcv373.ogg,0 diff --git a/data/base/wrf/cam1/cam1a.wrf b/data/base/wrf/cam1/cam1a.wrf index 839c5e7199a..277aadecbb5 100644 --- a/data/base/wrf/cam1/cam1a.wrf +++ b/data/base/wrf/cam1/cam1a.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1a.txt" -file SMSG "prox1a.txt" +file PROX "prox1a.json" directory "script" file JAVASCRIPT "rules.js" From 452657c8136e23f27d67925761d64201fb1182a7 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 14:29:51 -0500 Subject: [PATCH 03/86] Convert prox1b --- data/base/messages/prox1b.json | 6 ++++++ data/base/messages/prox1b.txt | 4 ---- data/base/wrf/cam1/cam1b.wrf | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 data/base/messages/prox1b.json delete mode 100644 data/base/messages/prox1b.txt diff --git a/data/base/messages/prox1b.json b/data/base/messages/prox1b.json new file mode 100644 index 00000000000..c45f2c6839a --- /dev/null +++ b/data/base/messages/prox1b.json @@ -0,0 +1,6 @@ +{ + "C1B_BASE0": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 2112, "y": 9280, "z": 0 }, + "C1B_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 4370, "y": 9872, "z": 0 }, + "C1B_BASE2": { "audio": "pcv448.ogg", "message": "POWSURGE_MSG", "type": 0, "x": 3193, "y": 13806, "z": 0 }, + "C1B_OBJ1": { "audio": "pcv390.ogg", "message": "RUINS_MSG", "type": 0, "x": 3776, "y": 11328, "z": 0 } +} diff --git a/data/base/messages/prox1b.txt b/data/base/messages/prox1b.txt deleted file mode 100644 index 750724b386c..00000000000 --- a/data/base/messages/prox1b.txt +++ /dev/null @@ -1,4 +0,0 @@ -C1B_BASE0,1,BARBASE_MSG,2,2112,9280,0,pcv389.ogg,0 -C1B_BASE1,1,BARBASE_MSG,2,4370,9872,0,pcv389.ogg,0 -C1B_BASE2,1,POWSURGE_MSG,2,3193,13806,0,pcv448.ogg,0 -C1B_OBJ1,1,RUINS_MSG,2,3776,11328,0,pcv390.ogg,0 diff --git a/data/base/wrf/cam1/cam1b.wrf b/data/base/wrf/cam1/cam1b.wrf index 4258ade6163..f8304428f2f 100644 --- a/data/base/wrf/cam1/cam1b.wrf +++ b/data/base/wrf/cam1/cam1b.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1b.txt" -file SMSG "prox1b.txt" +file PROX "prox1b.json" directory "script" file JAVASCRIPT "rules.js" From c7d4fa79e91c24603842d945a31cbb4dfc0bbfb8 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 15:06:36 -0500 Subject: [PATCH 04/86] Convert prox1-1 --- data/base/messages/prox1-1.json | 4 ++++ data/base/messages/prox1-1.txt | 2 -- data/base/wrf/cam1/sub1-1.wrf | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/prox1-1.json delete mode 100644 data/base/messages/prox1-1.txt diff --git a/data/base/messages/prox1-1.json b/data/base/messages/prox1-1.json new file mode 100644 index 00000000000..211ba4225e9 --- /dev/null +++ b/data/base/messages/prox1-1.json @@ -0,0 +1,4 @@ +{ + "C1-1_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 2240, "y": 1600, "z": 0 }, + "C1-1_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 1216, "y": 10816, "z": 0 } +} diff --git a/data/base/messages/prox1-1.txt b/data/base/messages/prox1-1.txt deleted file mode 100644 index 50830a47a0e..00000000000 --- a/data/base/messages/prox1-1.txt +++ /dev/null @@ -1,2 +0,0 @@ -C1-1_OBJ1,1,RUINS_MSG,2,2240,1600,0,pcv448.ogg,0 -C1-1_LZ,1,LZ_MSG,2,1216,10816,0,pcv427.ogg,2 diff --git a/data/base/wrf/cam1/sub1-1.wrf b/data/base/wrf/cam1/sub1-1.wrf index 40e185ae965..66a38d086e3 100644 --- a/data/base/wrf/cam1/sub1-1.wrf +++ b/data/base/wrf/cam1/sub1-1.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1-1.txt" -file SMSG "prox1-1.txt" +file PROX "prox1-1.json" directory "script" file JAVASCRIPT "rules.js" From eb455ff6cccb92b0323643cfecb03e1db9d46516 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 15:13:48 -0500 Subject: [PATCH 05/86] Convert prox1-2 --- data/base/messages/prox1-2.json | 8 ++++++++ data/base/messages/prox1-2.txt | 6 ------ data/base/wrf/cam1/sub1-2.wrf | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 data/base/messages/prox1-2.json delete mode 100644 data/base/messages/prox1-2.txt diff --git a/data/base/messages/prox1-2.json b/data/base/messages/prox1-2.json new file mode 100644 index 00000000000..0dfb4206c7d --- /dev/null +++ b/data/base/messages/prox1-2.json @@ -0,0 +1,8 @@ +{ + "C1-2_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 4160, "y": 2112, "z": 0 }, + "C1-2_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 1984, "y": 7000, "z": 0 }, + "C1-2_GUARD1": { "audio": "pcv390.ogg", "message": "BARBASE_MSG", "type": 0, "x": 2880, "y": 5824, "z": 0 }, + "C1-2_GUARD2": { "audio": "pcv390.ogg", "message": "BARBASE_MSG", "type": 0, "x": 5312, "y": 4160, "z": 0 }, + "C1-2_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 6848, "y": 7104, "z": 0 }, + "C1-2_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG2", "type": 0, "x": 2752, "y": 3904, "z": 0 } +} diff --git a/data/base/messages/prox1-2.txt b/data/base/messages/prox1-2.txt deleted file mode 100644 index 1dc8b5ccd6f..00000000000 --- a/data/base/messages/prox1-2.txt +++ /dev/null @@ -1,6 +0,0 @@ -C1-2_BASE1,1,BARBASE_MSG,2,4160,2112,0,pcv389.ogg,0 -C1-2_BASE2,1,BARBASE_MSG,2,1984,7000,0,pcv389.ogg,0 -C1-2_GUARD1,1,BARBASE_MSG,2,2880,5824,0,pcv390.ogg,0 -C1-2_GUARD2,1,BARBASE_MSG,2,5312,4160,0,pcv390.ogg,0 -C1-2_LZ,1,LZ_MSG,2,6848,7104,0,pcv427.ogg,2 -C1-2_OBJ1,1,RUINS_MSG2,2,2752,3904,0,pcv448.ogg,0 diff --git a/data/base/wrf/cam1/sub1-2.wrf b/data/base/wrf/cam1/sub1-2.wrf index 5bfb4b0e3bc..32758854e25 100644 --- a/data/base/wrf/cam1/sub1-2.wrf +++ b/data/base/wrf/cam1/sub1-2.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1-2.txt" -file SMSG "prox1-2.txt" +file PROX "prox1-2.json" directory "script" file JAVASCRIPT "rules.js" From 6b1eb4ff2b8dc5f0b81679d0ca708a436b9bfb76 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 15:22:14 -0500 Subject: [PATCH 06/86] Convert prox1-3 --- data/base/messages/prox1-3.json | 9 +++++++++ data/base/messages/prox1-3.txt | 7 ------- data/base/wrf/cam1/sub1-3.wrf | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 data/base/messages/prox1-3.json delete mode 100644 data/base/messages/prox1-3.txt diff --git a/data/base/messages/prox1-3.json b/data/base/messages/prox1-3.json new file mode 100644 index 00000000000..9919c4fb71d --- /dev/null +++ b/data/base/messages/prox1-3.json @@ -0,0 +1,9 @@ +{ + "C1-3_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 5376, "y": 4544, "z": 0 }, + "C1-3_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 1856, "z": 0 }, + "C1-3_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 704, "y": 704, "z": 0 }, + "C1-3_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 448, "y": 6592, "z": 0 }, + "C1-3_OBJ2": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 7616, "y": 7744, "z": 0 }, + "C1-3_OBJ3": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 5312, "y": 704, "z": 0 }, + "C1-3_OBJ4": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 6848, "y": 3008, "z": 0 } +} diff --git a/data/base/messages/prox1-3.txt b/data/base/messages/prox1-3.txt deleted file mode 100644 index f997c4fa8dd..00000000000 --- a/data/base/messages/prox1-3.txt +++ /dev/null @@ -1,7 +0,0 @@ -C1-3_BASE1,1,BARBASE_MSG,2,5376,4544,0,pcv389.ogg,0 -C1-3_BASE2,1,ENEMYBASE_MSG,2,6592,1856,0,pcv393.ogg,0 -C1-3_LZ,1,LZ_MSG,2,704,704,0,pcv427.ogg,2 -C1-3_OBJ1,1,RUINS_MSG,2,448,6592,0,pcv448.ogg,0 -C1-3_OBJ2,1,RUINS_MSG,2,7616,7744,0,pcv448.ogg,0 -C1-3_OBJ3,1,RUINS_MSG,2,5312,704,0,pcv448.ogg,0 -C1-3_OBJ4,1,RUINS_MSG,2,6848,3008,0,pcv448.ogg,0 diff --git a/data/base/wrf/cam1/sub1-3.wrf b/data/base/wrf/cam1/sub1-3.wrf index c4f4e8c2dc9..8cb20cbd3de 100644 --- a/data/base/wrf/cam1/sub1-3.wrf +++ b/data/base/wrf/cam1/sub1-3.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1-3.txt" -file SMSG "prox1-3.txt" +file PROX "prox1-3.json" directory "script" file JAVASCRIPT "rules.js" From 0780ced39afdfef242e167d89ac78c3446f4cd3a Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 15:31:16 -0500 Subject: [PATCH 07/86] Convert prox1c --- data/base/messages/prox1c.json | 15 +++++++++++++++ data/base/messages/prox1c.txt | 13 ------------- data/base/wrf/cam1/cam1c.wrf | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 data/base/messages/prox1c.json delete mode 100644 data/base/messages/prox1c.txt diff --git a/data/base/messages/prox1c.json b/data/base/messages/prox1c.json new file mode 100644 index 00000000000..0d06358fdf1 --- /dev/null +++ b/data/base/messages/prox1c.json @@ -0,0 +1,15 @@ +{ + "C1C_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 10304, "y": 15424, "z": 0 }, + "C1C_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 12736, "y": 14016, "z": 0 }, + "C1C_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 8512, "y": 704, "z": 0 }, + "C1C_BASE4": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 9024, "y": 3648, "z": 0 }, + "C1C_BASE5": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 8512, "y": 6976, "z": 0 }, + "C1C_BASE6": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 13376, "y": 13504, "z": 0 }, + "C1C_BASE7": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 11840, "y": 9792, "z": 0 }, + "C1C_BASE8": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 14272, "y": 3264, "z": 0 }, + "C1C_BASE9": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 11712, "y": 2752, "z": 0 }, + "C1C_BASE10": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 9408, "y": 7104, "z": 0 }, + "C1C_OBJ1": { "audio": "pcv378.ogg", "message": "RUINS_MSG", "type": 0, "x": 6848, "y": 13888, "z": 0 }, + "C1C_LZ1": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 13632, "y": 5056, "z": 0 }, + "C1C_LZ2": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 8768, "y": 10048, "z": 0 } +} diff --git a/data/base/messages/prox1c.txt b/data/base/messages/prox1c.txt deleted file mode 100644 index ed3c1c5a148..00000000000 --- a/data/base/messages/prox1c.txt +++ /dev/null @@ -1,13 +0,0 @@ -C1C_BASE1,1,BARBASE_MSG,2,10304,15424,0,pcv389.ogg,0 -C1C_BASE2,1,BARBASE_MSG,2,12736,14016,0,pcv389.ogg,0 -C1C_BASE3,1,BARBASE_MSG,2,8512,704,0,pcv389.ogg,0 -C1C_BASE4,1,BARBASE_MSG,2,9024,3648,0,pcv389.ogg,0 -C1C_BASE5,1,BARBASE_MSG,2,8512,6976,0,pcv389.ogg,0 -C1C_BASE6,1,ENEMYBASE_MSG,2,13376,13504,0,pcv393.ogg,0 -C1C_BASE7,1,ENEMYBASE_MSG,2,11840,9792,0,pcv393.ogg,0 -C1C_BASE8,1,ENEMYBASE_MSG,2,14272,3264,0,pcv393.ogg,0 -C1C_BASE9,1,ENEMYBASE_MSG,2,11712,2752,0,pcv393.ogg,0 -C1C_BASE10,1,ENEMYBASE_MSG,2,9408,7104,0,pcv393.ogg,0 -C1C_OBJ1,1,RUINS_MSG,2,6848,13888,0,pcv378.ogg,0 -C1C_LZ1,1,LZ_MSG3,2,13632,5056,0,pcv396.ogg,0 -C1C_LZ2,1,LZ_MSG3,2,8768,10048,0,pcv396.ogg,0 diff --git a/data/base/wrf/cam1/cam1c.wrf b/data/base/wrf/cam1/cam1c.wrf index c17910a73a1..d6eae638bfa 100644 --- a/data/base/wrf/cam1/cam1c.wrf +++ b/data/base/wrf/cam1/cam1c.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1c.txt" -file SMSG "prox1c.txt" +file PROX "prox1c.json" directory "script" file JAVASCRIPT "rules.js" From da79a30c01be79b8cdf3fc16d2825b8e40b78dad Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 17:57:30 -0500 Subject: [PATCH 08/86] Convert prox1ca --- data/base/messages/prox1ca.json | 8 ++++++++ data/base/messages/prox1ca.txt | 6 ------ data/base/wrf/cam1/cam1ca.wrf | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 data/base/messages/prox1ca.json delete mode 100644 data/base/messages/prox1ca.txt diff --git a/data/base/messages/prox1ca.json b/data/base/messages/prox1ca.json new file mode 100644 index 00000000000..efce177c076 --- /dev/null +++ b/data/base/messages/prox1ca.json @@ -0,0 +1,8 @@ +{ + "C1CA_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 2, "x": 9408, "y": 6848, "z": 0 }, + "C1CA_LZ1": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 10560, "y": 8384, "z": 0 }, + "C1CA_LZ2": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 7232, "y": 6336, "z": 0 }, + "C1CA_LZ3": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 6208, "y": 6848, "z": 0 }, + "C1CA_LZ4": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 7872, "y": 4672, "z": 0 }, + "C1CA_LZ5": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 6848, "y": 3520, "z": 0 } +} diff --git a/data/base/messages/prox1ca.txt b/data/base/messages/prox1ca.txt deleted file mode 100644 index 67647b1acae..00000000000 --- a/data/base/messages/prox1ca.txt +++ /dev/null @@ -1,6 +0,0 @@ -C1CA_OBJ1,1,RUINS_MSG,2,9408,6848,0,pcv448.ogg,2 -C1CA_LZ1,1,LZ_MSG3,2,10560,8384,0,pcv396.ogg,0 -C1CA_LZ2,1,LZ_MSG3,2,7232,6336,0,pcv396.ogg,0 -C1CA_LZ3,1,LZ_MSG3,2,6208,6848,0,pcv396.ogg,0 -C1CA_LZ4,1,LZ_MSG3,2,7872,4672,0,pcv396.ogg,0 -C1CA_LZ5,1,LZ_MSG3,2,6848,3520,0,pcv396.ogg,0 diff --git a/data/base/wrf/cam1/cam1ca.wrf b/data/base/wrf/cam1/cam1ca.wrf index df790c272b5..edf12038028 100644 --- a/data/base/wrf/cam1/cam1ca.wrf +++ b/data/base/wrf/cam1/cam1ca.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1ca.txt" -file SMSG "prox1ca.txt" +file PROX "prox1ca.json" directory "script" file JAVASCRIPT "rules.js" From 4d004f81bfa0baa16939643b0f17f8c7fe935c7d Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 18:03:05 -0500 Subject: [PATCH 09/86] Convert prox1-4a --- data/base/messages/prox1-4a.json | 7 +++++++ data/base/messages/prox1-4a.txt | 5 ----- data/base/wrf/cam1/sub1-4a.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/prox1-4a.json delete mode 100644 data/base/messages/prox1-4a.txt diff --git a/data/base/messages/prox1-4a.json b/data/base/messages/prox1-4a.json new file mode 100644 index 00000000000..60a705f0517 --- /dev/null +++ b/data/base/messages/prox1-4a.json @@ -0,0 +1,7 @@ +{ + "C1-4_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 2624, "y": 7488, "z": 0 }, + "C1-4_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 3648, "y": 2240, "z": 0 }, + "C1-4_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 7104, "y": 2496, "z": 0 }, + "C1-4_LZ": { "audio": "pcv398.ogg", "message": "LZ_MSG", "type": 2, "x": 7488, "y": 4672, "z": 0 }, + "C1-4_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 4160, "y": 3904, "z": 0 } +} diff --git a/data/base/messages/prox1-4a.txt b/data/base/messages/prox1-4a.txt deleted file mode 100644 index a458222f319..00000000000 --- a/data/base/messages/prox1-4a.txt +++ /dev/null @@ -1,5 +0,0 @@ -C1-4_BASE1,1,BARBASE_MSG,2,2624,7488,0,pcv389.ogg,0 -C1-4_BASE2,1,BARBASE_MSG,2,3648,2240,0,pcv389.ogg,0 -C1-4_BASE3,1,BARBASE_MSG,2,7104,2496,0,pcv389.ogg,0 -C1-4_LZ,1,LZ_MSG,2,7488,4672,0,pcv398.ogg,2 -C1-4_OBJ1,1,RUINS_MSG,2,4160,3904,0,pcv448.ogg,0 diff --git a/data/base/wrf/cam1/sub1-4a.wrf b/data/base/wrf/cam1/sub1-4a.wrf index 3a0975cfcc1..b464e7961f7 100644 --- a/data/base/wrf/cam1/sub1-4a.wrf +++ b/data/base/wrf/cam1/sub1-4a.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1-4a.txt" -file SMSG "prox1-4a.txt" +file PROX "prox1-4a.json" directory "script" file JAVASCRIPT "rules.js" From 51d66f87df7f931e2ca8392a4cc4547b79d8ddda Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 18:10:14 -0500 Subject: [PATCH 10/86] Convert prox1-5 --- data/base/messages/prox1-5.json | 7 +++++++ data/base/messages/prox1-5.txt | 5 ----- data/base/wrf/cam1/sub1-5.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/prox1-5.json delete mode 100644 data/base/messages/prox1-5.txt diff --git a/data/base/messages/prox1-5.json b/data/base/messages/prox1-5.json new file mode 100644 index 00000000000..01f334837f0 --- /dev/null +++ b/data/base/messages/prox1-5.json @@ -0,0 +1,7 @@ +{ + "C1-5_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 3264, "y": 704, "z": 0 }, + "C1-5_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 4160, "y": 7616, "z": 0 }, + "C1-5_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 5696, "y": 7488, "z": 0 }, + "C1-5_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 832, "y": 7232, "z": 0 }, + "C1-5_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 5440, "y": 2752, "z": 0 } +} diff --git a/data/base/messages/prox1-5.txt b/data/base/messages/prox1-5.txt deleted file mode 100644 index 7c423d7be54..00000000000 --- a/data/base/messages/prox1-5.txt +++ /dev/null @@ -1,5 +0,0 @@ -C1-5_BASE1,1,BARBASE_MSG,2,3264,704,0,pcv389.ogg,0 -C1-5_BASE2,1,BARBASE_MSG,2,4160,7616,0,pcv389.ogg,0 -C1-5_BASE3,1,BARBASE_MSG,2,5696,7488,0,pcv389.ogg,0 -C1-5_LZ,1,LZ_MSG,2,832,7232,0,pcv427.ogg,2 -C1-5_OBJ1,1,RUINS_MSG,2,5440,2752,0,pcv448.ogg,0 diff --git a/data/base/wrf/cam1/sub1-5.wrf b/data/base/wrf/cam1/sub1-5.wrf index a40e0827991..1b9186d2ca9 100644 --- a/data/base/wrf/cam1/sub1-5.wrf +++ b/data/base/wrf/cam1/sub1-5.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1-5.txt" -file SMSG "prox1-5.txt" +file PROX "prox1-5.json" directory "script" file JAVASCRIPT "rules.js" From 2fa70bc9e3a0025bd9826af8d331b72b138156a2 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 21:27:22 -0500 Subject: [PATCH 11/86] Convert prox1a-c --- data/base/messages/prox1a-c.json | 7 +++++++ data/base/messages/prox1a-c.txt | 5 ----- data/base/wrf/cam1/cam1a-c.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/prox1a-c.json delete mode 100644 data/base/messages/prox1a-c.txt diff --git a/data/base/messages/prox1a-c.json b/data/base/messages/prox1a-c.json new file mode 100644 index 00000000000..a58eaa5919d --- /dev/null +++ b/data/base/messages/prox1a-c.json @@ -0,0 +1,7 @@ +{ + "C1A-C_LZ1": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 15424, "y": 15424, "z": 0 }, + "C1A-C_LZ2": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 12736, "y": 1312, "z": 0 }, + "C1A-C_LZ3": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 8768, "y": 15424, "z": 0 }, + "C1A-C_LZ4": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 1344, "y": 8896, "z": 0 }, + "C1A-C_LZ5": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 5056, "y": 3264, "z": 0 } +} diff --git a/data/base/messages/prox1a-c.txt b/data/base/messages/prox1a-c.txt deleted file mode 100644 index b54bf5ea24b..00000000000 --- a/data/base/messages/prox1a-c.txt +++ /dev/null @@ -1,5 +0,0 @@ -C1A-C_LZ1,1,LZ_MSG3,2,15424,15424,0,pcv396.ogg,0 -C1A-C_LZ2,1,LZ_MSG3,2,12736,1312,0,pcv396.ogg,0 -C1A-C_LZ3,1,LZ_MSG3,2,8768,15424,0,pcv396.ogg,0 -C1A-C_LZ4,1,LZ_MSG3,2,1344,8896,0,pcv396.ogg,0 -C1A-C_LZ5,1,LZ_MSG3,2,5056,3264,0,pcv396.ogg,0 diff --git a/data/base/wrf/cam1/cam1a-c.wrf b/data/base/wrf/cam1/cam1a-c.wrf index cb1454d9a32..5f66eea085c 100644 --- a/data/base/wrf/cam1/cam1a-c.wrf +++ b/data/base/wrf/cam1/cam1a-c.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1a-c.txt" -file SMSG "prox1a-c.txt" +file PROX "prox1a-c.json" directory "script" file JAVASCRIPT "rules.js" From 10cdab8fafb798f4e8c2391d92e56cfae269464d Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 21:33:24 -0500 Subject: [PATCH 12/86] Convert prox1-7 --- data/base/messages/prox1-7.json | 8 ++++++++ data/base/messages/prox1-7.txt | 6 ------ data/base/wrf/cam1/sub1-7.wrf | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 data/base/messages/prox1-7.json delete mode 100644 data/base/messages/prox1-7.txt diff --git a/data/base/messages/prox1-7.json b/data/base/messages/prox1-7.json new file mode 100644 index 00000000000..de66f817c75 --- /dev/null +++ b/data/base/messages/prox1-7.json @@ -0,0 +1,8 @@ +{ + "C1-7_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 4288, "y": 4928, "z": 0 }, + "C1-7_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 7232, "y": 7104, "z": 0 }, + "C1-7_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 7616, "y": 576, "z": 0 }, + "C1-7_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 960, "y": 7232, "z": 0 }, + "C1-7_LZ2": { "audio": 0, "message": "LZ_MSG", "type": 2, "x": 1728, "y": 1472, "z": 0 }, + "C1-7_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 3136, "y": 3904, "z": 0 } +} diff --git a/data/base/messages/prox1-7.txt b/data/base/messages/prox1-7.txt deleted file mode 100644 index 1dce4fe54fb..00000000000 --- a/data/base/messages/prox1-7.txt +++ /dev/null @@ -1,6 +0,0 @@ -C1-7_BASE1,1,BARBASE_MSG,2,4288,4928,0,pcv389.ogg,0 -C1-7_BASE2,1,BARBASE_MSG,2,7232,7104,0,pcv389.ogg,0 -C1-7_BASE3,1,BARBASE_MSG,2,7616,576,0,pcv389.ogg,0 -C1-7_LZ,1,LZ_MSG,2,960,7232,0,pcv427.ogg,2 -C1-7_LZ2,1,LZ_MSG,2,1728,1472,0,0,2 -C1-7_OBJ1,1,RUINS_MSG,2,3136,3904,0,pcv448.ogg,0 diff --git a/data/base/wrf/cam1/sub1-7.wrf b/data/base/wrf/cam1/sub1-7.wrf index 4c9d48d5193..ad6e33260d4 100644 --- a/data/base/wrf/cam1/sub1-7.wrf +++ b/data/base/wrf/cam1/sub1-7.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1-7.txt" -file SMSG "prox1-7.txt" +file PROX "prox1-7.json" directory "script" file JAVASCRIPT "rules.js" From 104c5b0cfb56ff24edc1a8604f217bb7cf334dd1 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 21:37:29 -0500 Subject: [PATCH 13/86] Convert prox1d --- data/base/messages/prox1d.json | 8 ++++++++ data/base/messages/prox1d.txt | 6 ------ data/base/wrf/cam1/sub1-d.wrf | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 data/base/messages/prox1d.json delete mode 100644 data/base/messages/prox1d.txt diff --git a/data/base/messages/prox1d.json b/data/base/messages/prox1d.json new file mode 100644 index 00000000000..32d6d10e196 --- /dev/null +++ b/data/base/messages/prox1d.json @@ -0,0 +1,8 @@ +{ + "C1D_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 5184, "y": 15040, "z": 0 }, + "C1D_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 4800, "y": 4288, "z": 0 }, + "C1D_BASE3": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 8512, "y": 2240, "z": 0 }, + "C1D_LZ": { "audio": "pcv397.ogg", "message": "LZ_MSG", "type": 2, "x": 704, "y": 15552, "z": 0 }, + "C1D_LZ2": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 7488, "y": 5952, "z": 0 }, + "C1D_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 8512, "y": 2112, "z": 0 } +} diff --git a/data/base/messages/prox1d.txt b/data/base/messages/prox1d.txt deleted file mode 100644 index 80bcf78c43f..00000000000 --- a/data/base/messages/prox1d.txt +++ /dev/null @@ -1,6 +0,0 @@ -C1D_BASE1,1,ENEMYBASE_MSG,2,5184,15040,0,pcv393.ogg,0 -C1D_BASE2,1,ENEMYBASE_MSG,2,4800,4288,0,pcv393.ogg,0 -C1D_BASE3,1,ENEMYBASE_MSG,2,8512,2240,0,pcv393.ogg,0 -C1D_LZ,1,LZ_MSG,2,704,15552,0,pcv397.ogg,2 -C1D_LZ2,1,LZ_MSG3,2,7488,5952,0,pcv396.ogg,0 -C1D_OBJ1,1,RUINS_MSG,2,8512,2112,0,pcv448.ogg,0 diff --git a/data/base/wrf/cam1/sub1-d.wrf b/data/base/wrf/cam1/sub1-d.wrf index c4b489859be..e1badaed277 100644 --- a/data/base/wrf/cam1/sub1-d.wrf +++ b/data/base/wrf/cam1/sub1-d.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief1d.txt" -file SMSG "prox1d.txt" +file PROX "prox1d.json" directory "script" file JAVASCRIPT "rules.js" From 77a47128dd3f96dc535965e86e949aca18da6368 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Fri, 6 Sep 2024 23:58:41 -0500 Subject: [PATCH 14/86] Convert prox2a --- data/base/messages/prox2a.json | 4 ++++ data/base/messages/prox2a.txt | 2 -- data/base/wrf/cam2/cam2a.wrf | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/prox2a.json delete mode 100644 data/base/messages/prox2a.txt diff --git a/data/base/messages/prox2a.json b/data/base/messages/prox2a.json new file mode 100644 index 00000000000..815c4245701 --- /dev/null +++ b/data/base/messages/prox2a.json @@ -0,0 +1,4 @@ +{ + "C2A_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 13120, "y": 9792, "z": 256 }, + "C2A_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 10816, "y": 9920, "z": 64 } +} diff --git a/data/base/messages/prox2a.txt b/data/base/messages/prox2a.txt deleted file mode 100644 index e71c27894e9..00000000000 --- a/data/base/messages/prox2a.txt +++ /dev/null @@ -1,2 +0,0 @@ -C2A_BASE1,1,ENEMYBASE_MSG,2,13120,9792,256,pcv393.ogg,0 -C2A_BASE2,1,ENEMYBASE_MSG,2,10816,9920,64,pcv393.ogg,0 diff --git a/data/base/wrf/cam2/cam2a.wrf b/data/base/wrf/cam2/cam2a.wrf index c344d4a5015..27ced0f32aa 100644 --- a/data/base/wrf/cam2/cam2a.wrf +++ b/data/base/wrf/cam2/cam2a.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief2a.txt" -file SMSG "prox2a.txt" +file PROX "prox2a.json" directory "script" file JAVASCRIPT "rules.js" From 4c773c16641fb55254572c231372c0f2aa7f2995 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 00:02:16 -0500 Subject: [PATCH 15/86] Convert prox2-1 --- data/base/messages/prox2-1.json | 7 +++++++ data/base/messages/prox2-1.txt | 5 ----- data/base/wrf/cam2/sub2-1.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/prox2-1.json delete mode 100644 data/base/messages/prox2-1.txt diff --git a/data/base/messages/prox2-1.json b/data/base/messages/prox2-1.json new file mode 100644 index 00000000000..f9c92475218 --- /dev/null +++ b/data/base/messages/prox2-1.json @@ -0,0 +1,7 @@ +{ + "C21_OBJECTIVE": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 2, "x": 6464, "y": 1728, "z": 0 }, + "C21_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 3008, "y": 4928, "z": 0 }, + "C21_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6528, "y": 6912, "z": 0 }, + "C21_BASE3": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1344, "y": 1216, "z": 0 }, + "C21_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 960, "y": 7488, "z": 0 } +} diff --git a/data/base/messages/prox2-1.txt b/data/base/messages/prox2-1.txt deleted file mode 100644 index ac038c6a316..00000000000 --- a/data/base/messages/prox2-1.txt +++ /dev/null @@ -1,5 +0,0 @@ -C21_OBJECTIVE,1,RUINS_MSG,2,6464,1728,0,pcv448.ogg,2 -C21_BASE1,1,ENEMYBASE_MSG,2,3008,4928,0,pcv393.ogg,0 -C21_BASE2,1,ENEMYBASE_MSG,2,6528,6912,0,pcv393.ogg,0 -C21_BASE3,1,ENEMYBASE_MSG,2,1344,1216,0,pcv393.ogg,0 -C21_LZ,1,LZ_MSG,2,960,7488,0,pcv427.ogg,2 diff --git a/data/base/wrf/cam2/sub2-1.wrf b/data/base/wrf/cam2/sub2-1.wrf index 1750b120a27..37de473d518 100644 --- a/data/base/wrf/cam2/sub2-1.wrf +++ b/data/base/wrf/cam2/sub2-1.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief2-1.txt" -file SMSG "prox2-1.txt" +file PROX "prox2-1.json" directory "script" file JAVASCRIPT "rules.js" From 1f466ff4b4723ef05408b1bcc982f954b21bc05d Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 10:42:18 -0500 Subject: [PATCH 16/86] Convert prox2b --- data/base/messages/prox2b.json | 7 +++++++ data/base/messages/prox2b.txt | 5 ----- data/base/wrf/cam2/cam2b.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/prox2b.json delete mode 100644 data/base/messages/prox2b.txt diff --git a/data/base/messages/prox2b.json b/data/base/messages/prox2b.json new file mode 100644 index 00000000000..8c6e9557b2c --- /dev/null +++ b/data/base/messages/prox2b.json @@ -0,0 +1,7 @@ +{ + "C2B_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 12096, "y": 8512, "z": 0 }, + "C2B_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 10432, "y": 1856, "z": 0 }, + "C2B_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 12992, "y": 2880, "z": 0 }, + "C2B_BASE3": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 12352, "y": 4160, "z": 0 }, + "C2B_BASE4": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 12224, "y": 6720, "z": 0 } +} diff --git a/data/base/messages/prox2b.txt b/data/base/messages/prox2b.txt deleted file mode 100644 index e9afd3a1c00..00000000000 --- a/data/base/messages/prox2b.txt +++ /dev/null @@ -1,5 +0,0 @@ -C2B_OBJ1,1,RUINS_MSG,2,12096,8512,0,pcv448.ogg,0 -C2B_BASE1,1,ENEMYBASE_MSG,2,10432,1856,0,pcv393.ogg,0 -C2B_BASE2,1,ENEMYBASE_MSG,2,12992,2880,0,pcv393.ogg,0 -C2B_BASE3,1,ENEMYBASE_MSG,2,12352,4160,0,pcv393.ogg,0 -C2B_BASE4,1,ENEMYBASE_MSG,2,12224,6720,0,pcv393.ogg,0 diff --git a/data/base/wrf/cam2/cam2b.wrf b/data/base/wrf/cam2/cam2b.wrf index ca0814e7157..f5a2199cc62 100644 --- a/data/base/wrf/cam2/cam2b.wrf +++ b/data/base/wrf/cam2/cam2b.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief2b.txt" -file SMSG "prox2b.txt" +file PROX "prox2b.json" directory "script" file JAVASCRIPT "rules.js" From 49b6bfb0c86d0b7c8c732f34eba569fbeb1b39a7 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 11:05:10 -0500 Subject: [PATCH 17/86] Convert prox2-2 --- data/base/messages/prox2-2.json | 6 ++++++ data/base/messages/prox2-2.txt | 4 ---- data/base/wrf/cam2/sub2-2.wrf | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 data/base/messages/prox2-2.json delete mode 100644 data/base/messages/prox2-2.txt diff --git a/data/base/messages/prox2-2.json b/data/base/messages/prox2-2.json new file mode 100644 index 00000000000..b1604909ebf --- /dev/null +++ b/data/base/messages/prox2-2.json @@ -0,0 +1,6 @@ +{ + "C22_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 5440, "y": 1344, "z": 0 }, + "C22_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 5952, "y": 1344, "z": 0 }, + "C22_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1088, "y": 1216, "z": 0 }, + "C22_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 5696, "y": 7232, "z": 0 } +} diff --git a/data/base/messages/prox2-2.txt b/data/base/messages/prox2-2.txt deleted file mode 100644 index d0579fe9345..00000000000 --- a/data/base/messages/prox2-2.txt +++ /dev/null @@ -1,4 +0,0 @@ -C22_OBJ1,1,RUINS_MSG,2,5440,1344,0,pcv448.ogg,0 -C22_BASE1,1,ENEMYBASE_MSG,2,5952,1344,0,pcv393.ogg,0 -C22_BASE2,1,ENEMYBASE_MSG,2,1088,1216,0,pcv393.ogg,0 -C22_LZ,1,LZ_MSG,2,5696,7232,0,pcv427.ogg,2 diff --git a/data/base/wrf/cam2/sub2-2.wrf b/data/base/wrf/cam2/sub2-2.wrf index fa62e65fdb6..e8582334d90 100644 --- a/data/base/wrf/cam2/sub2-2.wrf +++ b/data/base/wrf/cam2/sub2-2.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief2-2.txt" -file SMSG "prox2-2.txt" +file PROX "prox2-2.json" directory "script" file JAVASCRIPT "rules.js" From 1646de030024f7b44dd8076e8ef94ad929eef931 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 11:07:40 -0500 Subject: [PATCH 18/86] Convert prox2c --- data/base/messages/prox2c.json | 7 +++++++ data/base/messages/prox2c.txt | 5 ----- data/base/wrf/cam2/cam2c.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/prox2c.json delete mode 100644 data/base/messages/prox2c.txt diff --git a/data/base/messages/prox2c.json b/data/base/messages/prox2c.json new file mode 100644 index 00000000000..30c164193c3 --- /dev/null +++ b/data/base/messages/prox2c.json @@ -0,0 +1,7 @@ +{ + "C2C_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 4928, "y": 4160, "z": 0 }, + "C2C_OBJ2": { "audio": "pcv396.ogg", "message": "RUINS_MSG", "type": 0, "x": 5696, "y": 11072, "z": 0 }, + "C2C_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 2752, "y": 2368, "z": 0 }, + "C2C_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 7488, "y": 7744, "z": 0 }, + "C2C_BASE3": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6464, "y": 10816, "z": 0 } +} diff --git a/data/base/messages/prox2c.txt b/data/base/messages/prox2c.txt deleted file mode 100644 index 734946f13e8..00000000000 --- a/data/base/messages/prox2c.txt +++ /dev/null @@ -1,5 +0,0 @@ -C2C_OBJ1,1,RUINS_MSG,2,4928,4160,0,pcv448.ogg,0 -C2C_OBJ2,1,RUINS_MSG,2,5696,11072,0,pcv396.ogg,0 -C2C_BASE1,1,ENEMYBASE_MSG,2,2752,2368,0,pcv393.ogg,0 -C2C_BASE2,1,ENEMYBASE_MSG,2,7488,7744,0,pcv393.ogg,0 -C2C_BASE3,1,ENEMYBASE_MSG,2,6464,10816,0,pcv393.ogg,0 diff --git a/data/base/wrf/cam2/cam2c.wrf b/data/base/wrf/cam2/cam2c.wrf index aefd81e9b15..78f04bfc257 100644 --- a/data/base/wrf/cam2/cam2c.wrf +++ b/data/base/wrf/cam2/cam2c.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief2-c.txt" -file SMSG "prox2c.txt" +file PROX "prox2c.json" directory "script" file JAVASCRIPT "rules.js" From 267083799a2df9bf6890171f99674fca1720c0c2 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 11:25:56 -0500 Subject: [PATCH 19/86] Convert prox2-5 --- data/base/messages/prox2-5.json | 6 ++++++ data/base/messages/prox2-5.txt | 4 ---- data/base/wrf/cam2/sub2-5.wrf | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 data/base/messages/prox2-5.json delete mode 100644 data/base/messages/prox2-5.txt diff --git a/data/base/messages/prox2-5.json b/data/base/messages/prox2-5.json new file mode 100644 index 00000000000..b7eee085905 --- /dev/null +++ b/data/base/messages/prox2-5.json @@ -0,0 +1,6 @@ +{ + "C25_OBJ1": { "audio": "pcv654.ogg", "message": "ADD_MSG42", "type": 0, "x": 6720, "y": 1856, "z": 0 }, + "C25_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 832, "z": 0 }, + "C25_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 5888, "y": 5120, "z": 0 }, + "C25_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 1344, "y": 6848, "z": 0 } +} diff --git a/data/base/messages/prox2-5.txt b/data/base/messages/prox2-5.txt deleted file mode 100644 index 5e188e69c3d..00000000000 --- a/data/base/messages/prox2-5.txt +++ /dev/null @@ -1,4 +0,0 @@ -C25_OBJ1,1,ADD_MSG42,2,6720,1856,0,pcv654.ogg,0 -C25_BASE1,1,ENEMYBASE_MSG,2,6592,832,0,pcv393.ogg,0 -C25_BASE2,1,ENEMYBASE_MSG,2,5888,5120,0,pcv393.ogg,0 -C25_LZ,1,LZ_MSG,2,1344,6848,0,pcv427.ogg,2 diff --git a/data/base/wrf/cam2/sub2-5.wrf b/data/base/wrf/cam2/sub2-5.wrf index 5ca3b426a31..593345ec6d6 100644 --- a/data/base/wrf/cam2/sub2-5.wrf +++ b/data/base/wrf/cam2/sub2-5.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief2-5.txt" -file SMSG "prox2-5.txt" +file PROX "prox2-5.json" directory "script" file JAVASCRIPT "rules.js" From 12bc8cc6a39930bf7ab4f75e1741bd8b7bc565a7 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 11:28:23 -0500 Subject: [PATCH 20/86] Convert prox2d --- data/base/messages/prox2d.json | 6 ++++++ data/base/messages/prox2d.txt | 4 ---- data/base/wrf/cam2/sub2-d.wrf | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 data/base/messages/prox2d.json delete mode 100644 data/base/messages/prox2d.txt diff --git a/data/base/messages/prox2d.json b/data/base/messages/prox2d.json new file mode 100644 index 00000000000..6d29f1e7cde --- /dev/null +++ b/data/base/messages/prox2d.json @@ -0,0 +1,6 @@ +{ + "C2D_OBJ1": { "audio": "pcv653.ogg", "message": "RUINS_MSG", "type": 2, "x": 4160, "y": 4544, "z": 0 }, + "C2D_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 5312, "y": 4032, "z": 0 }, + "C2D_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 5824, "y": 1344, "z": 0 }, + "C2D_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 704, "y": 704, "z": 0 } +} diff --git a/data/base/messages/prox2d.txt b/data/base/messages/prox2d.txt deleted file mode 100644 index d129598cf5f..00000000000 --- a/data/base/messages/prox2d.txt +++ /dev/null @@ -1,4 +0,0 @@ -C2D_OBJ1,1,RUINS_MSG,2,4160,4544,0,pcv653.ogg,2 -C2D_BASE1,1,ENEMYBASE_MSG,2,5312,4032,0,pcv393.ogg,0 -C2D_BASE2,1,ENEMYBASE_MSG,2,5824,1344,0,pcv393.ogg,0 -C2D_LZ,1,LZ_MSG,2,704,704,0,pcv427.ogg,2 diff --git a/data/base/wrf/cam2/sub2-d.wrf b/data/base/wrf/cam2/sub2-d.wrf index 0b02c799541..c6d5755e658 100644 --- a/data/base/wrf/cam2/sub2-d.wrf +++ b/data/base/wrf/cam2/sub2-d.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief2-di.txt" -file SMSG "prox2d.txt" +file PROX "prox2d.json" directory "script" file JAVASCRIPT "rules.js" From 5b539f078de8f420169e2be7915c5ce14afc285d Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 11:50:20 -0500 Subject: [PATCH 21/86] Convert prox2-6 --- data/base/messages/prox2-6.json | 7 +++++++ data/base/messages/prox2-6.txt | 5 ----- data/base/wrf/cam2/sub2-6.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/prox2-6.json delete mode 100644 data/base/messages/prox2-6.txt diff --git a/data/base/messages/prox2-6.json b/data/base/messages/prox2-6.json new file mode 100644 index 00000000000..2fa83e28604 --- /dev/null +++ b/data/base/messages/prox2-6.json @@ -0,0 +1,7 @@ +{ + "C26_OBJ1": { "audio": "pcv652.ogg", "message": "RUINS_MSG", "type": 0, "x": 1600, "y": 1984, "z": 0 }, + "C26_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1216, "y": 1088, "z": 0 }, + "C26_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 3008, "y": 4672, "z": 0 }, + "C26_BASE3": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 7360, "y": 1344, "z": 0 }, + "C26_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 2752, "y": 7488, "z": 0 } +} diff --git a/data/base/messages/prox2-6.txt b/data/base/messages/prox2-6.txt deleted file mode 100644 index 7fd6ca6d167..00000000000 --- a/data/base/messages/prox2-6.txt +++ /dev/null @@ -1,5 +0,0 @@ -C26_OBJ1,1,RUINS_MSG,2,1600,1984,0,pcv652.ogg,0 -C26_BASE1,1,ENEMYBASE_MSG,2,1216,1088,0,pcv393.ogg,0 -C26_BASE2,1,ENEMYBASE_MSG,2,3008,4672,0,pcv393.ogg,0 -C26_BASE3,1,ENEMYBASE_MSG,2,7360,1344,0,pcv393.ogg,0 -C26_LZ,1,LZ_MSG,2,2752,7488,0,pcv427.ogg,2 diff --git a/data/base/wrf/cam2/sub2-6.wrf b/data/base/wrf/cam2/sub2-6.wrf index 7427c2ecf17..76b840ba537 100644 --- a/data/base/wrf/cam2/sub2-6.wrf +++ b/data/base/wrf/cam2/sub2-6.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief2-6.txt" -file SMSG "prox2-6.txt" +file PROX "prox2-6.json" directory "script" file JAVASCRIPT "rules.js" From cc5ec0e99abd92450f14ddeb6377ebcf035060c6 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 11:54:54 -0500 Subject: [PATCH 22/86] Convert prox2-7 --- data/base/messages/prox2-7.json | 11 +++++++++++ data/base/messages/prox2-7.txt | 9 --------- data/base/wrf/cam2/sub2-7.wrf | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 data/base/messages/prox2-7.json delete mode 100644 data/base/messages/prox2-7.txt diff --git a/data/base/messages/prox2-7.json b/data/base/messages/prox2-7.json new file mode 100644 index 00000000000..5289b5ecfe5 --- /dev/null +++ b/data/base/messages/prox2-7.json @@ -0,0 +1,11 @@ +{ + "C27_OBJECTIVE1": { "audio": "pcv655.ogg", "message": "RUINS_MSG", "type": 0, "x": 2624, "y": 6208, "z": 0 }, + "C27_OBJECTIVE2": { "audio": "pcv655.ogg", "message": "RUINS_MSG", "type": 0, "x": 5568, "y": 5824, "z": 0 }, + "C27_OBJECTIVE3": { "audio": "pcv655.ogg", "message": "RUINS_MSG", "type": 0, "x": 5184, "y": 1792, "z": 0 }, + "C27_OBJECTIVE4": { "audio": "pcv655.ogg", "message": "RUINS_MSG", "type": 0, "x": 2368, "y": 1344, "z": 0 }, + "C27_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 3136, "y": 6208, "z": 0 }, + "C27_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 4928, "z": 0 }, + "C27_BASE3": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 4928, "y": 1088, "z": 0 }, + "C27_BASE4": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1728, "y": 1344, "z": 0 }, + "C27_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 704, "y": 6592, "z": 0 } +} diff --git a/data/base/messages/prox2-7.txt b/data/base/messages/prox2-7.txt deleted file mode 100644 index a2ba6ad23ce..00000000000 --- a/data/base/messages/prox2-7.txt +++ /dev/null @@ -1,9 +0,0 @@ -C27_OBJECTIVE1,1,RUINS_MSG,2,2624,6208,0,pcv655.ogg,0 -C27_OBJECTIVE2,1,RUINS_MSG,2,5568,5824,0,pcv655.ogg,0 -C27_OBJECTIVE3,1,RUINS_MSG,2,5184,1792,0,pcv655.ogg,0 -C27_OBJECTIVE4,1,RUINS_MSG,2,2368,1344,0,pcv655.ogg,0 -C27_BASE1,1,ENEMYBASE_MSG,2,3136,6208,0,pcv393.ogg,0 -C27_BASE2,1,ENEMYBASE_MSG,2,6592,4928,0,pcv393.ogg,0 -C27_BASE3,1,ENEMYBASE_MSG,2,4928,1088,0,pcv393.ogg,0 -C27_BASE4,1,ENEMYBASE_MSG,2,1728,1344,0,pcv393.ogg,0 -C27_LZ,1,LZ_MSG,2,704,6592,0,pcv427.ogg,2 diff --git a/data/base/wrf/cam2/sub2-7.wrf b/data/base/wrf/cam2/sub2-7.wrf index 06b6643b6c4..13feaed864d 100644 --- a/data/base/wrf/cam2/sub2-7.wrf +++ b/data/base/wrf/cam2/sub2-7.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief2-7.txt" -file SMSG "prox2-7.txt" +file PROX "prox2-7.json" directory "script" file JAVASCRIPT "rules.js" From 2d5f03bb960aa4c0855b58d301ef094597a33d98 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 11:57:06 -0500 Subject: [PATCH 23/86] Convert prox2-8 --- data/base/messages/prox2-8.json | 5 +++++ data/base/messages/prox2-8.txt | 3 --- data/base/wrf/cam2/sub2-8.wrf | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/prox2-8.json delete mode 100644 data/base/messages/prox2-8.txt diff --git a/data/base/messages/prox2-8.json b/data/base/messages/prox2-8.json new file mode 100644 index 00000000000..8b347b2085e --- /dev/null +++ b/data/base/messages/prox2-8.json @@ -0,0 +1,5 @@ +{ + "C28_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 4160, "y": 4032, "z": 0 }, + "C28_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 4032, "y": 1856, "z": 0 }, + "C28_BASE3": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 7232, "y": 1600, "z": 0 } +} diff --git a/data/base/messages/prox2-8.txt b/data/base/messages/prox2-8.txt deleted file mode 100644 index 79cb7ee7395..00000000000 --- a/data/base/messages/prox2-8.txt +++ /dev/null @@ -1,3 +0,0 @@ -C28_BASE1,1,ENEMYBASE_MSG,2,4160,4032,0,pcv393.ogg,0 -C28_BASE2,1,ENEMYBASE_MSG,2,4032,1856,0,pcv393.ogg,0 -C28_BASE3,1,ENEMYBASE_MSG,2,7232,1600,0,pcv393.ogg,0 diff --git a/data/base/wrf/cam2/sub2-8.wrf b/data/base/wrf/cam2/sub2-8.wrf index eebae343bff..c7522d48a6b 100644 --- a/data/base/wrf/cam2/sub2-8.wrf +++ b/data/base/wrf/cam2/sub2-8.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief2-8.txt" -file SMSG "prox2-8.txt" +file PROX "prox2-8.json" directory "script" file JAVASCRIPT "rules.js" From 370a204c10bf84156f9514511a95bfbb6ae1a792 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:02:34 -0500 Subject: [PATCH 24/86] Convert prox3a --- data/base/messages/prox3a.json | 6 ++++++ data/base/messages/prox3a.txt | 4 ---- data/base/wrf/cam3/cam3a.wrf | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 data/base/messages/prox3a.json delete mode 100644 data/base/messages/prox3a.txt diff --git a/data/base/messages/prox3a.json b/data/base/messages/prox3a.json new file mode 100644 index 00000000000..29e2f531337 --- /dev/null +++ b/data/base/messages/prox3a.json @@ -0,0 +1,6 @@ +{ + "CM3A_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 2240, "y": 12608, "z": 0 }, + "CM3A_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1984, "y": 14912, "z": 0 }, + "CM3A_BASE3": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6464, "y": 8896, "z": 0 }, + "CM3A_BASE4": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1600, "y": 8896, "z": 0 } +} diff --git a/data/base/messages/prox3a.txt b/data/base/messages/prox3a.txt deleted file mode 100644 index 936bee16b14..00000000000 --- a/data/base/messages/prox3a.txt +++ /dev/null @@ -1,4 +0,0 @@ -CM3A_BASE1,1,ENEMYBASE_MSG,2,2240,12608,0,pcv393.ogg,0 -CM3A_BASE2,1,ENEMYBASE_MSG,2,1984,14912,0,pcv393.ogg,0 -CM3A_BASE3,1,ENEMYBASE_MSG,2,6464,8896,0,pcv393.ogg,0 -CM3A_BASE4,1,ENEMYBASE_MSG,2,1600,8896,0,pcv393.ogg,0 diff --git a/data/base/wrf/cam3/cam3a.wrf b/data/base/wrf/cam3/cam3a.wrf index 3638ea72e81..f75a1f572e7 100644 --- a/data/base/wrf/cam3/cam3a.wrf +++ b/data/base/wrf/cam3/cam3a.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief3-a.txt" file SMSG "brief3intro.txt" -file SMSG "prox3a.txt" +file PROX "prox3a.json" directory "script" file JAVASCRIPT "rules.js" From c53fff21d5d5729e64821a5c702899bd4721bde6 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:04:23 -0500 Subject: [PATCH 25/86] Convert prox3-1 --- data/base/messages/prox3-1.json | 5 +++++ data/base/messages/prox3-1.txt | 3 --- data/base/wrf/cam3/sub3-1.wrf | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/prox3-1.json delete mode 100644 data/base/messages/prox3-1.txt diff --git a/data/base/messages/prox3-1.json b/data/base/messages/prox3-1.json new file mode 100644 index 00000000000..c0dc4feb196 --- /dev/null +++ b/data/base/messages/prox3-1.json @@ -0,0 +1,5 @@ +{ + "CM31_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1856, "y": 6848, "z": 0 }, + "CM31_TAR_UPLINK": { "audio": "pcv448.ogg", "message": "MISSIONTARGET_MSG", "type": 0, "x": 768, "y": 6848, "z": 0 }, + "CM31_HIDE_LOC": { "audio": "pcv448.ogg", "message": "MISSIONTARGET_MSG", "type": 2, "x": 6464, "y": 1600, "z": 0 } +} diff --git a/data/base/messages/prox3-1.txt b/data/base/messages/prox3-1.txt deleted file mode 100644 index b213b349b95..00000000000 --- a/data/base/messages/prox3-1.txt +++ /dev/null @@ -1,3 +0,0 @@ -CM31_BASE1,1,ENEMYBASE_MSG,2,1856,6848,0,pcv393.ogg,0 -CM31_TAR_UPLINK,1,MISSIONTARGET_MSG,2,768,6848,0,pcv448.ogg,0 -CM31_HIDE_LOC,1,MISSIONTARGET_MSG,2,6464,1600,64,pcv448.ogg,2 diff --git a/data/base/wrf/cam3/sub3-1.wrf b/data/base/wrf/cam3/sub3-1.wrf index 88d84d8a6da..65a59d4ba97 100644 --- a/data/base/wrf/cam3/sub3-1.wrf +++ b/data/base/wrf/cam3/sub3-1.wrf @@ -40,7 +40,7 @@ file WAV "fdetseq.ogg" directory "messages" file SMSG "brief3-1a.txt" file SMSG "brief3-1b.txt" -file SMSG "prox3-1.txt" +file PROX "prox3-1.json" directory "script" file JAVASCRIPT "rules.js" From 022fd32d89b0894c0a63275a208f56370d69afc2 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:06:41 -0500 Subject: [PATCH 26/86] Convert prox3b --- data/base/messages/prox3b.json | 7 +++++++ data/base/messages/prox3b.txt | 5 ----- data/base/wrf/cam3/cam3b.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/prox3b.json delete mode 100644 data/base/messages/prox3b.txt diff --git a/data/base/messages/prox3b.json b/data/base/messages/prox3b.json new file mode 100644 index 00000000000..9c15909ef6a --- /dev/null +++ b/data/base/messages/prox3b.json @@ -0,0 +1,7 @@ +{ + "CM3B_BASE4": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 6720, "z": 0 }, + "CM3B_BASE6": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1024, "y": 6528, "z": 0 }, + "CM3B_TRANS1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6208, "y": 6592, "z": 0 }, + "CM3B_TRANS2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1088, "y": 6848, "z": 0 }, + "CM3B_GAMMABASE": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 2, "x": 1728, "y": 1728, "z": 200 } +} diff --git a/data/base/messages/prox3b.txt b/data/base/messages/prox3b.txt deleted file mode 100644 index 0f0deff45c3..00000000000 --- a/data/base/messages/prox3b.txt +++ /dev/null @@ -1,5 +0,0 @@ -CM3B_BASE4,1,ENEMYBASE_MSG,2,6592,6720,0,pcv393.ogg,0 -CM3B_BASE6,1,ENEMYBASE_MSG,2,1024,6528,0,pcv393.ogg,0 -CM3B_TRANS1,1,ENEMYBASE_MSG,2,6208,6592,0,pcv393.ogg,0 -CM3B_TRANS2,1,ENEMYBASE_MSG,2,1088,6848,0,pcv393.ogg,0 -CM3B_GAMMABASE,1,RUINS_MSG,2,1728,1728,200,pcv448.ogg,2 diff --git a/data/base/wrf/cam3/cam3b.wrf b/data/base/wrf/cam3/cam3b.wrf index 92836cd27ae..42311756fb5 100644 --- a/data/base/wrf/cam3/cam3b.wrf +++ b/data/base/wrf/cam3/cam3b.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief3-b.txt" -file SMSG "prox3b.txt" +file PROX "prox3b.json" directory "script" file JAVASCRIPT "rules.js" From 2e271fb0510886a16c59fdb7fed2597e0be01c56 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:08:49 -0500 Subject: [PATCH 27/86] Convert prox3-2 --- data/base/messages/prox3-2.json | 4 ++++ data/base/messages/prox3-2.txt | 2 -- data/base/wrf/cam3/sub3-2.wrf | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/prox3-2.json delete mode 100644 data/base/messages/prox3-2.txt diff --git a/data/base/messages/prox3-2.json b/data/base/messages/prox3-2.json new file mode 100644 index 00000000000..4be054ab8fe --- /dev/null +++ b/data/base/messages/prox3-2.json @@ -0,0 +1,4 @@ +{ + "C3-2_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 2, "x": 4544, "y": 8896, "z": 0 }, + "C32_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 1728, "y": 832, "z": 0 } +} diff --git a/data/base/messages/prox3-2.txt b/data/base/messages/prox3-2.txt deleted file mode 100644 index 344d5cdf18d..00000000000 --- a/data/base/messages/prox3-2.txt +++ /dev/null @@ -1,2 +0,0 @@ -C3-2_OBJ1,1,RUINS_MSG,2,4544,8896,0,pcv448.ogg,2 -C32_LZ,1,LZ_MSG,2,1728,832,0,pcv427.ogg,2 diff --git a/data/base/wrf/cam3/sub3-2.wrf b/data/base/wrf/cam3/sub3-2.wrf index baf0738c9a2..10a508d8325 100644 --- a/data/base/wrf/cam3/sub3-2.wrf +++ b/data/base/wrf/cam3/sub3-2.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief3-2.txt" -file SMSG "prox3-2.txt" +file PROX "prox3-2.json" directory "script" file JAVASCRIPT "rules.js" From e941ccd226fea0d8134408491a4a15da5d8e20df Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:12:14 -0500 Subject: [PATCH 28/86] Convert prox3c --- data/base/messages/prox3c.json | 7 +++++++ data/base/messages/prox3c.txt | 5 ----- data/base/wrf/cam3/cam3c.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/prox3c.json delete mode 100644 data/base/messages/prox3c.txt diff --git a/data/base/messages/prox3c.json b/data/base/messages/prox3c.json new file mode 100644 index 00000000000..327f6d54b7c --- /dev/null +++ b/data/base/messages/prox3c.json @@ -0,0 +1,7 @@ +{ + "CM3C_BETATEAM": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 2, "x": 960, "y": 17344, "z": 0 }, + "CM3C_GAMMABASE": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 2, "x": 1600, "y": 23104, "z": 0 }, + "CM3C_BASE1": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 0, "x": 3776, "y": 17344, "z": 0 }, + "CM3C_BASE2": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 0, "x": 4800, "y": 21568, "z": 0 }, + "CM3C_BASE3": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 22592, "z": 0 } +} diff --git a/data/base/messages/prox3c.txt b/data/base/messages/prox3c.txt deleted file mode 100644 index 1e1d8b5f699..00000000000 --- a/data/base/messages/prox3c.txt +++ /dev/null @@ -1,5 +0,0 @@ -CM3C_BETATEAM,1,ENEMYBASE_MSG,2,960,17344,0,0,2 -CM3C_GAMMABASE,1,ENEMYBASE_MSG,2,1600,23104,0,0,2 -CM3C_BASE1,1,ENEMYBASE_MSG,2,3776,17344,0,0,0 -CM3C_BASE2,1,ENEMYBASE_MSG,2,4800,21568,0,0,0 -CM3C_BASE3,1,ENEMYBASE_MSG,2,6592,22592,0,0,0 diff --git a/data/base/wrf/cam3/cam3c.wrf b/data/base/wrf/cam3/cam3c.wrf index d08ab0da9c9..19461c7efd4 100644 --- a/data/base/wrf/cam3/cam3c.wrf +++ b/data/base/wrf/cam3/cam3c.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief3-c.txt" -file SMSG "prox3c.txt" +file PROX "prox3c.json" directory "script" file JAVASCRIPT "rules.js" From 5d197a22c2a717783de66b7114ed131a9018dbbd Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:15:34 -0500 Subject: [PATCH 29/86] Convert prox3a-d1 --- data/base/messages/prox3a-d1.json | 7 +++++++ data/base/messages/prox3a-d1.txt | 5 ----- data/base/wrf/cam3/cam3ad1.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/prox3a-d1.json delete mode 100644 data/base/messages/prox3a-d1.txt diff --git a/data/base/messages/prox3a-d1.json b/data/base/messages/prox3a-d1.json new file mode 100644 index 00000000000..65782f080a3 --- /dev/null +++ b/data/base/messages/prox3a-d1.json @@ -0,0 +1,7 @@ +{ + "CM3D1_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 5696, "y": 30400, "z": 0 }, + "CM3D1_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1088, "y": 30528, "z": 0 }, + "CM3D1_BASE3": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 4032, "y": 25152, "z": 0 }, + "CM3D1_BASE4": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6336, "y": 26816, "z": 0 }, + "CM3D1_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 2, "x": 5696, "y": 31552, "z": 0 } +} diff --git a/data/base/messages/prox3a-d1.txt b/data/base/messages/prox3a-d1.txt deleted file mode 100644 index 4529d97dba5..00000000000 --- a/data/base/messages/prox3a-d1.txt +++ /dev/null @@ -1,5 +0,0 @@ -CM3D1_BASE1,1,ENEMYBASE_MSG,2,5696,30400,0,pcv393.ogg,0 -CM3D1_BASE2,1,ENEMYBASE_MSG,2,1088,30528,0,pcv393.ogg,0 -CM3D1_BASE3,1,ENEMYBASE_MSG,2,4032,25152,0,pcv393.ogg,0 -CM3D1_BASE4,1,ENEMYBASE_MSG,2,6336,26816,0,pcv393.ogg,0 -CM3D1_OBJ1,1,RUINS_MSG,2,5696,31552,0,pcv448.ogg,2 diff --git a/data/base/wrf/cam3/cam3ad1.wrf b/data/base/wrf/cam3/cam3ad1.wrf index 251ab9d5170..aee7cfa3222 100644 --- a/data/base/wrf/cam3/cam3ad1.wrf +++ b/data/base/wrf/cam3/cam3ad1.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief3a-d1.txt" file SMSG "brief3a-d2.txt" -file SMSG "prox3a-d1.txt" +file PROX "prox3a-d1.json" directory "script" file JAVASCRIPT "rules.js" From b975e90258de4c2e3762baabce9e7265eb262bd5 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:16:50 -0500 Subject: [PATCH 30/86] Update Gamma 8 WRF To point to the correct proximity file. Not that it needs to include it... --- data/base/wrf/cam3/cam3ad2.wrf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/base/wrf/cam3/cam3ad2.wrf b/data/base/wrf/cam3/cam3ad2.wrf index f5c2ed79efa..10bd2bb9f84 100644 --- a/data/base/wrf/cam3/cam3ad2.wrf +++ b/data/base/wrf/cam3/cam3ad2.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "brief3a-d1.txt" file SMSG "brief3a-d2.txt" -file SMSG "prox3a-d1.txt" +file PROX "prox3a-d1.json" directory "script" file JAVASCRIPT "rules.js" From 7383198c036ae60bd11a1ffba9200e25047bceee Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:21:02 -0500 Subject: [PATCH 31/86] Convert prox3-4 --- data/base/messages/prox3-4.json | 11 +++++++++++ data/base/messages/prox3-4.txt | 9 --------- data/base/wrf/cam3/sub3-4.wrf | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 data/base/messages/prox3-4.json delete mode 100644 data/base/messages/prox3-4.txt diff --git a/data/base/messages/prox3-4.json b/data/base/messages/prox3-4.json new file mode 100644 index 00000000000..bd5a75c3014 --- /dev/null +++ b/data/base/messages/prox3-4.json @@ -0,0 +1,11 @@ +{ + "CM34_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 1984, "y": 10688, "z": 0 }, + "CM34_OBJ2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 3392, "y": 8768, "z": 0 }, + "CM34_BASEA": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 2000, "y": 2500, "z": 0 }, + "CM34_BASEB": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 8768, "y": 4032, "z": 0 }, + "CM34_BASEC": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 8256, "y": 1344, "z": 0 }, + "CM34_BASED": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 10816, "y": 10816, "z": 0 }, + "CM34_BASEE": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6976, "y": 10560, "z": 0 }, + "CM34_BASEF": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 2880, "y": 9408, "z": 0 }, + "CM34_BASEG": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 11328, "y": 7360, "z": 0 } +} diff --git a/data/base/messages/prox3-4.txt b/data/base/messages/prox3-4.txt deleted file mode 100644 index 9ba8ace4860..00000000000 --- a/data/base/messages/prox3-4.txt +++ /dev/null @@ -1,9 +0,0 @@ -CM34_OBJ1,1,RUINS_MSG,2,1984,10688,0,pcv448.ogg,0 -CM34_OBJ2,1,ENEMYBASE_MSG,2,3392,8768,0,pcv393.ogg,0 -CM34_BASEA,1,ENEMYBASE_MSG,2,2000,2500,0,pcv393.ogg,0 -CM34_BASEB,1,ENEMYBASE_MSG,2,8768,4032,0,pcv393.ogg,0 -CM34_BASEC,1,ENEMYBASE_MSG,2,8256,1344,0,pcv393.ogg,0 -CM34_BASED,1,ENEMYBASE_MSG,2,10816,10816,0,pcv393.ogg,0 -CM34_BASEE,1,ENEMYBASE_MSG,2,6976,10560,0,pcv393.ogg,0 -CM34_BASEF,1,ENEMYBASE_MSG,2,2880,9408,0,pcv393.ogg,0 -CM34_BASEG,1,ENEMYBASE_MSG,2,11328,7360,0,pcv393.ogg,0 diff --git a/data/base/wrf/cam3/sub3-4.wrf b/data/base/wrf/cam3/sub3-4.wrf index 793fce78e2d..f334fb0fc58 100644 --- a/data/base/wrf/cam3/sub3-4.wrf +++ b/data/base/wrf/cam3/sub3-4.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief3-4.txt" -file SMSG "prox3-4.txt" +file PROX "prox3-4.json" directory "script" file JAVASCRIPT "rules.js" From 03a44ed87ffa1175ab3593d3f569fab25c4e5224 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:23:00 -0500 Subject: [PATCH 32/86] Convert prox3-3 Note: not used as this mission doesn't exist. --- data/base/messages/prox3-3.json | 3 +++ data/base/messages/prox3-3.txt | 1 - data/base/wrf/cam3/sub3-3.wrf | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 data/base/messages/prox3-3.json delete mode 100644 data/base/messages/prox3-3.txt diff --git a/data/base/messages/prox3-3.json b/data/base/messages/prox3-3.json new file mode 100644 index 00000000000..01a26b5c3c2 --- /dev/null +++ b/data/base/messages/prox3-3.json @@ -0,0 +1,3 @@ +{ + "DELETE_ME": { "audio": 0, "message": "RUINS_MSG", "type": 2, "x": 6848, "y": 7104, "z": 0 } +} diff --git a/data/base/messages/prox3-3.txt b/data/base/messages/prox3-3.txt deleted file mode 100644 index f7267faa205..00000000000 --- a/data/base/messages/prox3-3.txt +++ /dev/null @@ -1 +0,0 @@ -DELETE_ME,1,RUINS_MSG,2,6848,7104,0,0,2 diff --git a/data/base/wrf/cam3/sub3-3.wrf b/data/base/wrf/cam3/sub3-3.wrf index b050014fee4..f53933e3523 100644 --- a/data/base/wrf/cam3/sub3-3.wrf +++ b/data/base/wrf/cam3/sub3-3.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "prox3-3.txt" +file PROX "prox3-3.json" directory "script" file JAVASCRIPT "rules.js" From d9f74e767dcd9ba90bd8170c751681fd34737960 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:26:24 -0500 Subject: [PATCH 33/86] Convert proxdemo --- data/base/messages/proxdemo.json | 7 +++++++ data/base/messages/proxdemo.txt | 5 ----- data/base/wrf/fastplay/fastdemo.wrf | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/proxdemo.json delete mode 100644 data/base/messages/proxdemo.txt diff --git a/data/base/messages/proxdemo.json b/data/base/messages/proxdemo.json new file mode 100644 index 00000000000..6a4c3678529 --- /dev/null +++ b/data/base/messages/proxdemo.json @@ -0,0 +1,7 @@ +{ + "FAST_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 3136, "y": 960, "z": 0 }, + "FAST_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 5500, "y": 2000, "z": 0 }, + "FAST_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 5184, "y": 6592, "z": 0 }, + "FAST_BASE4": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 4400, "y": 2800, "z": 0 }, + "FAST_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 1728, "y": 1216, "z": 0 } +} diff --git a/data/base/messages/proxdemo.txt b/data/base/messages/proxdemo.txt deleted file mode 100644 index fa511e36d0f..00000000000 --- a/data/base/messages/proxdemo.txt +++ /dev/null @@ -1,5 +0,0 @@ -FAST_BASE1,1,BARBASE_MSG,2,3136,960,0,pcv389.ogg,0 -FAST_BASE2,1,BARBASE_MSG,2,5500,2000,0,pcv389.ogg,0 -FAST_BASE3,1,BARBASE_MSG,2,5184,6592,0,pcv389.ogg,0 -FAST_BASE4,1,BARBASE_MSG,2,4400,2800,0,pcv389.ogg,0 -FAST_OBJ1,1,RUINS_MSG,2,1728,1216,0,pcv448.ogg,0 diff --git a/data/base/wrf/fastplay/fastdemo.wrf b/data/base/wrf/fastplay/fastdemo.wrf index f4422520e41..3df2afb47d6 100644 --- a/data/base/wrf/fastplay/fastdemo.wrf +++ b/data/base/wrf/fastplay/fastdemo.wrf @@ -7,7 +7,7 @@ directory "messages" file SMSG "briefdemo.txt" -file SMSG "proxdemo.txt" +file PROX "proxdemo.json" directory "script" file JAVASCRIPT "rules.js" From 677ee98ad7fef677f57934bd6290c10f327653df Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:28:46 -0500 Subject: [PATCH 34/86] Convert proxtut --- data/base/messages/proxtut.json | 4 ++++ data/base/messages/proxtut.txt | 2 -- data/base/wrf/tutorial/newtut.wrf | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/proxtut.json delete mode 100644 data/base/messages/proxtut.txt diff --git a/data/base/messages/proxtut.json b/data/base/messages/proxtut.json new file mode 100644 index 00000000000..f62ab2232c0 --- /dev/null +++ b/data/base/messages/proxtut.json @@ -0,0 +1,4 @@ +{ + "TUT_RES1": { "audio": "pcv376.ogg", "message": "POWRES_MSG", "type": 1, "x": 1216, "y": 1472, "z": 0 }, + "TUT_ART1": { "audio": 0, "message": "ART_MSG", "type": 2, "x": 448, "y": 2752, "z": 0 } +} diff --git a/data/base/messages/proxtut.txt b/data/base/messages/proxtut.txt deleted file mode 100644 index afe57bed70c..00000000000 --- a/data/base/messages/proxtut.txt +++ /dev/null @@ -1,2 +0,0 @@ -TUT_RES1,1,POWRES_MSG,2,1216,1472,0,pcv376.ogg,1 -TUT_ART1,1,ART_MSG,2,448,2752,0,0,2 diff --git a/data/base/wrf/tutorial/newtut.wrf b/data/base/wrf/tutorial/newtut.wrf index 115ad739f69..cf9a11b3aac 100644 --- a/data/base/wrf/tutorial/newtut.wrf +++ b/data/base/wrf/tutorial/newtut.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brieftut.txt" -file SMSG "proxtut.txt" +file PROX "proxtut.json" /* Directory for javascript files*/ directory "script" From 67b86e320bfa87f0393d7ee50167299ff16686b6 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:31:33 -0500 Subject: [PATCH 35/86] Remove proxfast Not used anywhere. --- data/base/messages/proxfast.txt | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 data/base/messages/proxfast.txt diff --git a/data/base/messages/proxfast.txt b/data/base/messages/proxfast.txt deleted file mode 100644 index f27855c25a8..00000000000 --- a/data/base/messages/proxfast.txt +++ /dev/null @@ -1,4 +0,0 @@ -FAST_BASE1,1,BARBASE_MSG,2,3136,960,0,pcv389.ogg,0 -FAST_BASE2,1,BARBASE_MSG,2,5500,2000,0,pcv389.ogg,0 -FAST_BASE3,1,BARBASE_MSG,2,4672,5824,0,pcv389.ogg,0 -FAST_OBJ1,1,RUINS_MSG,2,1728,1216,0,pcv448.ogg,0 From 32d4dff107e3ce958a25b1396671474e9cc33f1c Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Sat, 7 Sep 2024 13:58:16 -0500 Subject: [PATCH 36/86] Add documentation for Brief/Proximity files --- doc/BriefAndProximityFormat.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/BriefAndProximityFormat.md diff --git a/doc/BriefAndProximityFormat.md b/doc/BriefAndProximityFormat.md new file mode 100644 index 00000000000..5d647e69bd5 --- /dev/null +++ b/doc/BriefAndProximityFormat.md @@ -0,0 +1,25 @@ +# Briefing and Proximity file formats + +In releases beyond the 4.5 series, the campaign brief and Proximity files are now in a more readable format. + +# Proximity + +Example: +```json +{ + "C1A_BASE0": { + "audio": "pcv390.ogg", + "message": "BARBASE_MSG", + "type": 0, + "x": 3904, + "y": 4672, + "z": 0 + } +} +``` + +Each Proximity message must have a unique ID. This ID will be what can be referenced in scripts. Various key-value pairs in one contain: +- audio: The audio file associated with this Proximity blip when it gets clicked. Either a string to an audio file, or 0 to not use a sound. +- message: A translated string reference that will print a message when the Proximity blip is clicked on. An array of references is supported. +- type: What type of Proximity blip this is (0 - ENEMY|RED, 1 - RESOURCE|BLUE, 2 - ARTIFACT|GREEN). +- x, y, z: Coordinates in World Units (128 World Units = 1 Tile) where the Proximity blip will appear. From 9764d42f0c34f4ee56a85e729c184659be8e93c9 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 10:50:29 -0500 Subject: [PATCH 37/86] Create JSON Briefing file reader To eventually replace the CSV files with JSON variants. --- src/data.cpp | 14 +++++++++++ src/message.cpp | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ src/message.h | 1 + 3 files changed, 82 insertions(+) diff --git a/src/data.cpp b/src/data.cpp index e3ce00a93e9..c3053679390 100644 --- a/src/data.cpp +++ b/src/data.cpp @@ -490,6 +490,19 @@ static bool dataProximityMsgLoad(const char *fileName, void **ppData) return true; } +static bool dataFlicMsgLoad(const char *fileName, void **ppData) +{ + WzString *ptr = loadFlicViewData(fileName); + if (!ptr) + { + return false; + } + + // set the pointer so the release function gets called with it + *ppData = (void *)ptr; + return true; +} + // release the message viewdata static void dataSMSGRelease(void *pData) { @@ -696,6 +709,7 @@ static const RES_TYPE_MIN_FILE FileResourceTypes[] = {"SSTRUCT", bufferSSTRUCTLoad, dataSSTRUCTRelease}, //structure stats and associated files {"RESCH", bufferRESCHLoad, dataRESCHRelease}, //research stats files {"PROX", dataProximityMsgLoad, dataSMSGRelease }, + {"FLIC", dataFlicMsgLoad, dataSMSGRelease }, }; /* Pass all the data loading functions to the framework library */ diff --git a/src/message.cpp b/src/message.cpp index 30e03a1b82c..b81cbb572f1 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -743,6 +743,73 @@ WzString *loadProximityViewData(const char *fileName) return new WzString(fileName); // so that cleanup function will be called on right data } +WzString *loadFlicViewData(const char *fileName) +{ + ASSERT_OR_RETURN(nullptr, PHYSFS_exists(fileName), "%s not found", fileName); + WzConfig ini(fileName, WzConfig::ReadOnlyAndRequired); + std::vector list = ini.childGroups(); + for (size_t i = 0; i < list.size(); ++i) + { + // Replay viewdata init + unsigned int j = 0; + VIEWDATA *v = new VIEWDATA; + VIEW_REPLAY *r = new VIEW_REPLAY; + v->pData = r; + v->fileName = fileName; + v->type = VIEW_RPL; + debug(LOG_WZ, "Sequence video set: %s", list[i].toUtf8().c_str()); + + ini.beginGroup(list[i]); + v->name = WzString::fromUtf8(ini.json("name").get()); + debug(LOG_WZ, "Sequence viewdata name: %s", v->name.toUtf8().c_str()); + nlohmann::json element = ini.json("sequences"); + r->seqList.resize(element.size()); + debug(LOG_WZ, "Sequence list size: %d", (int)r->seqList.size()); + + for (auto& videoIdx : element) + { + r->seqList[j].sequenceName = WzString::fromUtf8(videoIdx["video"].get()); + debug(LOG_WZ, "Sequence name: %s", r->seqList[j].sequenceName.toUtf8().c_str()); + r->seqList[j].audio = WzString::fromUtf8(videoIdx["audio"].get()); + debug(LOG_WZ, "Sequence audio: %s", r->seqList[j].audio.toUtf8().c_str()); + r->seqList[j].flag = videoIdx["loop"].get(); + debug(LOG_WZ, "Sequence loop: %d", r->seqList[j].flag); + // Set the subtitle string for the sequence. + nlohmann::json array = videoIdx["subtitles"]; + if (!array.is_null() && array.is_array()) + { + for (auto &a : array) + { + std::string msg = a.get(); + if (msg.length() != 0) + { + const char *str = strresGetString(psStringRes, msg.c_str()); + ASSERT(str, "Cannot find the view data string with id \"%s\"", msg.c_str()); + r->seqList[j].textMsg.push_back(WzString::fromUtf8(str)); + debug(LOG_WZ, "Sequence subtitle array: %s", msg.c_str()); + } + } + } + else + { + std::string msg = videoIdx["subtitles"].get(); + if (msg.length() != 0) + { + const char *str = strresGetString(psStringRes, msg.c_str()); + ASSERT(str, "Cannot find the view data string with id \"%s\"", msg.c_str()); + r->seqList[j].textMsg.push_back(WzString::fromUtf8(str)); + debug(LOG_WZ, "Sequence subtitle string: %s", msg.c_str()); + } + } + ++j; + } + + ini.endGroup(); + apsViewData[v->name] = v; + } + return new WzString(fileName); // so that cleanup function will be called on right data +} + /* Get the view data identified by the name */ VIEWDATA *getViewData(const WzString &name) { diff --git a/src/message.h b/src/message.h index 34082806f17..414116457d0 100644 --- a/src/message.h +++ b/src/message.h @@ -74,6 +74,7 @@ void releaseAllProxDisp(); WzString *loadViewData(const char *pViewMsgData, UDWORD bufferSize); WzString *loadResearchViewData(const char *fileName); WzString *loadProximityViewData(const char *fileName); +WzString *loadFlicViewData(const char *fileName); /** Get the view data identified by the name */ VIEWDATA *getViewData(const WzString &name); From 402008ec2eac2b3b8ab392287a426b66d3fd515f Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 11:20:42 -0500 Subject: [PATCH 38/86] Add Briefing file format documentation --- doc/BriefAndProximityFormat.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/doc/BriefAndProximityFormat.md b/doc/BriefAndProximityFormat.md index 5d647e69bd5..f8ec1feef30 100644 --- a/doc/BriefAndProximityFormat.md +++ b/doc/BriefAndProximityFormat.md @@ -23,3 +23,27 @@ Each Proximity message must have a unique ID. This ID will be what can be refere - message: A translated string reference that will print a message when the Proximity blip is clicked on. An array of references is supported. - type: What type of Proximity blip this is (0 - ENEMY|RED, 1 - RESOURCE|BLUE, 2 - ARTIFACT|GREEN). - x, y, z: Coordinates in World Units (128 World Units = 1 Tile) where the Proximity blip will appear. + +# Briefing + +Example: +```json +{ + "video0000": { + "name": "MB1A_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM1A_MSG1", "CAM1A_MSG2", "CAM1A_MSG3"], "video": "cam1/cam1ascv.ogg" } + ] + } +} +``` + +Each video sequence should start with something simple like "video..." or something else at your discretion. Order here does not matter. +Within each sequence, there will be two values: +- name: The unique view data name ID. This will be used as a reference for scripts to invoke to start a video subset. +- sequences: an array of objects (order matters!) containing variables about each sub-video: + - audio: An audio file string that will play before the video starts. + - loop: An integer between 0-1 to loop the entire video until its audio stops playing. Will always display subtitles every frame if set to 1. + - subtitles: Either a string or array of string translation references that will be used in this video. + - video: The actual video file to display. Note the directory starts at "data/[base|mp]/sequences/". From 337111633e6ff0774c794f03839764749103c26b Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 13:00:50 -0500 Subject: [PATCH 39/86] Convert brief1a --- data/base/messages/brief1a.json | 9 +++++++++ data/base/messages/brief1a.txt | 1 - data/base/wrf/cam1/cam1a.wrf | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 data/base/messages/brief1a.json delete mode 100644 data/base/messages/brief1a.txt diff --git a/data/base/messages/brief1a.json b/data/base/messages/brief1a.json new file mode 100644 index 00000000000..1a7795f6a79 --- /dev/null +++ b/data/base/messages/brief1a.json @@ -0,0 +1,9 @@ +{ + "video0000": { + "name": "MB1A_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM1A_MSG1", "CAM1A_MSG2", "CAM1A_MSG3"], "video": "cam1/cam1ascv.ogg" } + ] + } +} diff --git a/data/base/messages/brief1a.txt b/data/base/messages/brief1a.txt deleted file mode 100644 index fbbcee7314f..00000000000 --- a/data/base/messages/brief1a.txt +++ /dev/null @@ -1 +0,0 @@ -MB1A_MSG,0,3,2,brfcom.ogg,1,1,TRANS_MSG1,0,0000,cam1/cam1ascv.ogg,0,3,CAM1A_MSG1,CAM1A_MSG2,CAM1A_MSG3,0,0000 diff --git a/data/base/wrf/cam1/cam1a.wrf b/data/base/wrf/cam1/cam1a.wrf index 277aadecbb5..dfccd723fdd 100644 --- a/data/base/wrf/cam1/cam1a.wrf +++ b/data/base/wrf/cam1/cam1a.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1a.txt" +file FLIC "brief1a.json" file PROX "prox1a.json" directory "script" From 7ed948acaa9e26fbd3f569dbb379ac4eec35b906 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 13:22:54 -0500 Subject: [PATCH 40/86] Convert brief1b --- data/base/messages/brief1b.json | 9 +++++++++ data/base/messages/brief1b.txt | 1 - data/base/wrf/cam1/cam1b.wrf | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 data/base/messages/brief1b.json delete mode 100644 data/base/messages/brief1b.txt diff --git a/data/base/messages/brief1b.json b/data/base/messages/brief1b.json new file mode 100644 index 00000000000..83360c01c05 --- /dev/null +++ b/data/base/messages/brief1b.json @@ -0,0 +1,9 @@ +{ + "video0000": { + "name": "MB1B_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": ["P1B_MSG1", "P1B_MSG2", "P1B_MSG3"], "video": "cam1/cam1b_p.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM1B_MSG1", "CAM1B_MSG2", "CAM1B_MSG3"], "video": "cam1/cam1b.ogg" } + ] + } +} diff --git a/data/base/messages/brief1b.txt b/data/base/messages/brief1b.txt deleted file mode 100644 index 3e02a1c84ae..00000000000 --- a/data/base/messages/brief1b.txt +++ /dev/null @@ -1 +0,0 @@ -MB1B_MSG,0,3,2,cam1/cam1b_p.ogg,1,3,P1B_MSG1,P1B_MSG2,P1B_MSG3,0,0000,cam1/cam1b.ogg,0,3,CAM1B_MSG1,CAM1B_MSG2,CAM1B_MSG3,0,0000 diff --git a/data/base/wrf/cam1/cam1b.wrf b/data/base/wrf/cam1/cam1b.wrf index f8304428f2f..2717c18f546 100644 --- a/data/base/wrf/cam1/cam1b.wrf +++ b/data/base/wrf/cam1/cam1b.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1b.txt" +file FLIC "brief1b.json" file PROX "prox1b.json" directory "script" From d74e592373fc9c7b6f80a33f7e1ac9a005637672 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 13:54:03 -0500 Subject: [PATCH 41/86] Convert brief1-1 --- data/base/messages/brief1-1.json | 22 ++++++++++++++++++++++ data/base/messages/brief1-1.txt | 3 --- data/base/wrf/cam1/sub1-1.wrf | 2 +- data/base/wrf/cam1/sub1-1s.wrf | 2 +- 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 data/base/messages/brief1-1.json delete mode 100644 data/base/messages/brief1-1.txt diff --git a/data/base/messages/brief1-1.json b/data/base/messages/brief1-1.json new file mode 100644 index 00000000000..7bb5986635d --- /dev/null +++ b/data/base/messages/brief1-1.json @@ -0,0 +1,22 @@ +{ + "video0000": { + "name": "FLIGHT", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "INFLIGHT_MSG1", "video": "inflight.ogg" } + ] + }, + "video0001": { + "name": "SB1_1_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["P1-1_MSG1", "P1-1_MSG2", "P1-1_MSG3"], "video": "cam1/sub1_1p.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["SUB1_1_MSG1", "SUB1_1_MSG2", "SUB1_1_MSG3"], "video": "cam1/sub1_1.ogg" } + ] + }, + "video0002": { + "name": "MB1_B2_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM1_B2_MSG", "CAM1_B2_MSG2", "CAM1_B2_MSG3"], "video": "cam1/cam1bpow.ogg" } + ] + } +} diff --git a/data/base/messages/brief1-1.txt b/data/base/messages/brief1-1.txt deleted file mode 100644 index 5bc1be38ac9..00000000000 --- a/data/base/messages/brief1-1.txt +++ /dev/null @@ -1,3 +0,0 @@ -FLIGHT,0,1,1,inflight.ogg,1,INFLIGHT_MSG1,0,0000 -SB1_1_MSG,0,1,2,cam1/sub1_1p.ogg,3,P1-1_MSG1,P1-1_MSG2,P1-1_MSG3,0,0000,cam1/sub1_1.ogg,3,SUB1_1_MSG1,SUB1_1_MSG2,SUB1_1_MSG3,0,0000 -MB1_B2_MSG,0,3,2,brfcom.ogg,1,1,TRANS_MSG1,0,0000,cam1/cam1bpow.ogg,0,3,CAM1_B2_MSG,CAM1_B2_MSG2,CAM1_B2_MSG3,0,0000 diff --git a/data/base/wrf/cam1/sub1-1.wrf b/data/base/wrf/cam1/sub1-1.wrf index 66a38d086e3..7b25184b01d 100644 --- a/data/base/wrf/cam1/sub1-1.wrf +++ b/data/base/wrf/cam1/sub1-1.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-1.txt" +file FLIC "brief1-1.json" file PROX "prox1-1.json" directory "script" diff --git a/data/base/wrf/cam1/sub1-1s.wrf b/data/base/wrf/cam1/sub1-1s.wrf index 93e9bd1a415..55a37df159b 100644 --- a/data/base/wrf/cam1/sub1-1s.wrf +++ b/data/base/wrf/cam1/sub1-1s.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-1.txt" +file FLIC "brief1-1.json" directory "script" file JAVASCRIPT "rules.js" From 07cd6f32739cbbf7e1a8baaa472100446c33cd38 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 14:20:45 -0500 Subject: [PATCH 42/86] Convert brief1-2 --- data/base/messages/brief1-2.json | 16 ++++++++++++++++ data/base/messages/brief1-2.txt | 2 -- data/base/wrf/cam1/sub1-2.wrf | 2 +- data/base/wrf/cam1/sub1-2s.wrf | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief1-2.json delete mode 100644 data/base/messages/brief1-2.txt diff --git a/data/base/messages/brief1-2.json b/data/base/messages/brief1-2.json new file mode 100644 index 00000000000..1e560fb7ece --- /dev/null +++ b/data/base/messages/brief1-2.json @@ -0,0 +1,16 @@ +{ + "video0000": { + "name": "SB1_2_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["SUB1_2_MSG1", "SUB1_2_MSG2", "SUB1_2_MSG3"], "video": "cam1/sub1_2.ogg" } + ] + }, + "video0001": { + "name": "SB1_2_MSG2", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "SUB1_4A_MSG4", "video": "incomtns.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["SUB1_2_MSG4", "SUB1_2_MSG5", "SUB1_2_MSG6"], "video": "cam1/sub12pt2.ogg" } + ] + } +} diff --git a/data/base/messages/brief1-2.txt b/data/base/messages/brief1-2.txt deleted file mode 100644 index f4305a91e61..00000000000 --- a/data/base/messages/brief1-2.txt +++ /dev/null @@ -1,2 +0,0 @@ -SB1_2_MSG,0,3,2,brfcom.ogg,1,1,TRANS_MSG1,0,0000,cam1/sub1_2.ogg,0,3,SUB1_2_MSG1,SUB1_2_MSG2,SUB1_2_MSG3,0,0000 -SB1_2_MSG2,0,3,2,incomtns.ogg,1,1,SUB1_4A_MSG4,0,0000,cam1/sub12pt2.ogg,0,3,SUB1_2_MSG4,SUB1_2_MSG5,SUB1_2_MSG6,0,0000 diff --git a/data/base/wrf/cam1/sub1-2.wrf b/data/base/wrf/cam1/sub1-2.wrf index 32758854e25..7ad12c23af8 100644 --- a/data/base/wrf/cam1/sub1-2.wrf +++ b/data/base/wrf/cam1/sub1-2.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-2.txt" +file FLIC "brief1-2.json" file PROX "prox1-2.json" directory "script" diff --git a/data/base/wrf/cam1/sub1-2s.wrf b/data/base/wrf/cam1/sub1-2s.wrf index 29c4e9161e7..43da2b88066 100644 --- a/data/base/wrf/cam1/sub1-2s.wrf +++ b/data/base/wrf/cam1/sub1-2s.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-2.txt" +file FLIC "brief1-2.json" directory "script" file JAVASCRIPT "rules.js" From e1f24335f25a3e3a13c1083b209528b9cab08776 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 15:10:43 -0500 Subject: [PATCH 43/86] Convert brief1-3 --- data/base/messages/brief1-3.json | 32 ++++++++++++++++++++++++++++++++ data/base/messages/brief1-3.txt | 4 ---- data/base/wrf/cam1/sub1-3.wrf | 2 +- data/base/wrf/cam1/sub1-3s.wrf | 2 +- 4 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/brief1-3.json delete mode 100644 data/base/messages/brief1-3.txt diff --git a/data/base/messages/brief1-3.json b/data/base/messages/brief1-3.json new file mode 100644 index 00000000000..ca3e32258c8 --- /dev/null +++ b/data/base/messages/brief1-3.json @@ -0,0 +1,32 @@ +{ + "video0000": { + "name": "SB1_3_UPDATE", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "P1-3A_MSG1", "video": "cam1/sub1_3p1.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["BETA1_MSG1", "BETA1_MSG2", "BETA1_MSG3"], "video": "cam1/sub13bet.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["GAMMA_MSG1", "GAMMA_MSG2", "GAMMA_MSG3"], "video": "cam1/sub13gam.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["SUB1_3_MSG1", "SUB1_3_MSG2", "SUB1_3_MSG3"], "video": "cam1/sub1_3.ogg" } + ] + }, + "video0001": { + "name": "SB1_3_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["SUB1_3_MSG1", "SUB1_3_MSG2", "SUB1_3_MSG3"], "video": "cam1/sub1_3.ogg" } + ] + }, + "video0002": { + "name": "SB1_3_MSG3", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "NP_MSG1", "video": "cam1/sub13np1.ogg" }, + { "audio": "", "loop": 0, "subtitles": "NP_MSG2", "video": "npend.ogg" } + ] + }, + "video0003": { + "name": "SB1_3_MSG4", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "NP_MSG1", "video": "cam1/sub13np2.ogg" }, + { "audio": "", "loop": 0, "subtitles": "NP_MSG2", "video": "npend.ogg" } + ] + } +} diff --git a/data/base/messages/brief1-3.txt b/data/base/messages/brief1-3.txt deleted file mode 100644 index 669082e4b13..00000000000 --- a/data/base/messages/brief1-3.txt +++ /dev/null @@ -1,4 +0,0 @@ -SB1_3_UPDATE,0,1,4,cam1/sub1_3p1.ogg,1,P1-3A_MSG1,0,0000,cam1/sub13bet.ogg,3,BETA1_MSG1,BETA1_MSG2,BETA1_MSG3,0,0000,cam1/sub13gam.ogg,3,GAMMA_MSG1,GAMMA_MSG2,GAMMA_MSG3,0,0000,cam1/sub1_3.ogg,3,SUB1_3_MSG1,SUB1_3_MSG2,SUB1_3_MSG3,0,0000 -SB1_3_MSG,0,3,2,brfcom.ogg,1,1,TRANS_MSG1,0,0000,cam1/sub1_3.ogg,0,3,SUB1_3_MSG1,SUB1_3_MSG2,SUB1_3_MSG3,0,0000 -SB1_3_MSG3,0,1,2,cam1/sub13np1.ogg,1,NP_MSG1,0,0000,npend.ogg,1,NP_MSG2,0,0000 -SB1_3_MSG4,0,1,2,cam1/sub13np2.ogg,1,NP_MSG1,0,0000,npend.ogg,1,NP_MSG2,0,0000 diff --git a/data/base/wrf/cam1/sub1-3.wrf b/data/base/wrf/cam1/sub1-3.wrf index 8cb20cbd3de..9899400f22e 100644 --- a/data/base/wrf/cam1/sub1-3.wrf +++ b/data/base/wrf/cam1/sub1-3.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-3.txt" +file FLIC "brief1-3.json" file PROX "prox1-3.json" directory "script" diff --git a/data/base/wrf/cam1/sub1-3s.wrf b/data/base/wrf/cam1/sub1-3s.wrf index bb9aac15daa..4e8ac14fc11 100644 --- a/data/base/wrf/cam1/sub1-3s.wrf +++ b/data/base/wrf/cam1/sub1-3s.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-3.txt" +file FLIC "brief1-3.json" directory "script" file JAVASCRIPT "rules.js" From 8c03bed00c9333e7db14d1e29a3678c42cd84f97 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 18:43:33 -0500 Subject: [PATCH 44/86] Convert brief1c --- data/base/messages/brief1c.json | 32 ++++++++++++++++++++++++++++++++ data/base/messages/brief1c.txt | 4 ---- data/base/wrf/cam1/cam1c.wrf | 2 +- 3 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 data/base/messages/brief1c.json delete mode 100644 data/base/messages/brief1c.txt diff --git a/data/base/messages/brief1c.json b/data/base/messages/brief1c.json new file mode 100644 index 00000000000..34004092532 --- /dev/null +++ b/data/base/messages/brief1c.json @@ -0,0 +1,32 @@ +{ + "video0000": { + "name": "MB1C_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM1C_MSG1", "CAM1C_MSG2", "CAM1C_MSG3"], "video": "cam1/map1cexp.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam1/cam1ccom.ogg" } + ] + }, + "video0001": { + "name": "MB1C2_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "NP_MSG1", "video": "incomtns.ogg" }, + { "audio": "", "loop": 0, "subtitles": "NP_MSG2", "video": "cam1/cam1cnp.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM1C_MSG4", "CAM1C_MSG5", "CAM1C_MSG6"], "video": "cam1/map1c.ogg" } + ] + }, + "video0002": { + "name": "MB1C3_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "P1-3A_MSG1", "video": "prjupdat.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM1C_MSG7", "CAM1C_MSG8", "CAM1C_MSG9"], "video": "cam1/cam1ccf.ogg" } + ] + }, + "video0003": { + "name": "MB1C4_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "P1-3A_MSG1", "video": "prjupdat.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM1C_MSG10", "CAM1C_MSG11"], "video": "cam1/cam1clz.ogg" } + ] + } +} diff --git a/data/base/messages/brief1c.txt b/data/base/messages/brief1c.txt deleted file mode 100644 index 96879e9dad7..00000000000 --- a/data/base/messages/brief1c.txt +++ /dev/null @@ -1,4 +0,0 @@ -MB1C_MSG,0,3,3,brfcom.ogg,1,1,TRANS_MSG1,0,0000,cam1/map1cexp.ogg,0,3,CAM1C_MSG1,CAM1C_MSG2,CAM1C_MSG3,0,0000,cam1/cam1ccom.ogg,0,0,0,0000 -MB1C2_MSG,0,3,3,incomtns.ogg,1,1,NP_MSG1,0,0000,cam1/cam1cnp.ogg,0,1,NP_MSG2,0,0000,cam1/map1c.ogg,0,3,CAM1C_MSG4,CAM1C_MSG5,CAM1C_MSG6,0,0000 -MB1C3_MSG,0,3,2,prjupdat.ogg,1,1,P1-3A_MSG1,0,0000,cam1/cam1ccf.ogg,0,3,CAM1C_MSG7,CAM1C_MSG8,CAM1C_MSG9,0,0000 -MB1C4_MSG,0,3,2,prjupdat.ogg,1,1,P1-3A_MSG1,0,0000,cam1/cam1clz.ogg,0,2,CAM1C_MSG10,CAM1C_MSG11,0,0000 diff --git a/data/base/wrf/cam1/cam1c.wrf b/data/base/wrf/cam1/cam1c.wrf index d6eae638bfa..051fa8bfe6a 100644 --- a/data/base/wrf/cam1/cam1c.wrf +++ b/data/base/wrf/cam1/cam1c.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1c.txt" +file FLIC "brief1c.json" file PROX "prox1c.json" directory "script" From 9cc46c434a5b328722194695c9772aaf9e6a7362 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 18:46:57 -0500 Subject: [PATCH 45/86] Convert brief1ca --- data/base/messages/brief1ca.json | 10 ++++++++++ data/base/messages/brief1ca.txt | 1 - data/base/wrf/cam1/cam1ca.wrf | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 data/base/messages/brief1ca.json delete mode 100644 data/base/messages/brief1ca.txt diff --git a/data/base/messages/brief1ca.json b/data/base/messages/brief1ca.json new file mode 100644 index 00000000000..bbcf4faeee4 --- /dev/null +++ b/data/base/messages/brief1ca.json @@ -0,0 +1,10 @@ +{ + "video0000": { + "name": "MB1CA_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM1CA_MSG1", "CAM1CA_MSG2", "CAM1CA_MSG3"], "video": "cam1/cam1ca.ogg" }, + { "audio": "", "loop": 1, "subtitles": ["SUP_MSG1", "SUP_MSG2", "SUP_MSG3"], "video": "cam1/cam1capl.ogg" } + ] + } +} diff --git a/data/base/messages/brief1ca.txt b/data/base/messages/brief1ca.txt deleted file mode 100644 index 45e79cae88c..00000000000 --- a/data/base/messages/brief1ca.txt +++ /dev/null @@ -1 +0,0 @@ -MB1CA_MSG,0,3,3,brfcom.ogg,0,1,TRANS_MSG1,0,0000,cam1/cam1ca.ogg,0,3,CAM1CA_MSG1,CAM1CA_MSG2,CAM1CA_MSG3,0,0000,cam1/cam1capl.ogg,1,3,SUP_MSG1,SUP_MSG2,SUP_MSG3,0,0000 diff --git a/data/base/wrf/cam1/cam1ca.wrf b/data/base/wrf/cam1/cam1ca.wrf index edf12038028..a5d5c584793 100644 --- a/data/base/wrf/cam1/cam1ca.wrf +++ b/data/base/wrf/cam1/cam1ca.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1ca.txt" +file FLIC "brief1ca.json" file PROX "prox1ca.json" directory "script" From d7df176f91c8833e65a3e584d4deeb429b3c1720 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 19:20:24 -0500 Subject: [PATCH 46/86] Convert brief1-4a --- data/base/messages/brief1-4a.json | 20 ++++++++++++++++++++ data/base/messages/brief1-4a.txt | 2 -- data/base/wrf/cam1/sub1-4a.wrf | 2 +- data/base/wrf/cam1/sub1-4as.wrf | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief1-4a.json delete mode 100644 data/base/messages/brief1-4a.txt diff --git a/data/base/messages/brief1-4a.json b/data/base/messages/brief1-4a.json new file mode 100644 index 00000000000..92116dc7fbb --- /dev/null +++ b/data/base/messages/brief1-4a.json @@ -0,0 +1,20 @@ +{ + "video0000": { + "name": "SB1_4_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": ["SUB1_4A_MSG4", "SUB1_4A_MSG5", "SUB1_4A_MSG6"], "video": "cam1/sub1_4pl.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam1/sub14anp.ogg" }, + { "audio": "", "loop": 0, "subtitles": "NP_MSG2", "video": "npend.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["SUB1_4A_MSG1", "SUB1_4A_MSG2", "SUB1_4A_MSG3"], "video": "cam1/sub1_4.ogg" } + ] + }, + "video0001": { + "name": "SB1_4_B", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": ["TRANS_MSG1", "SUB1_4B_MSG2", "SUB1_4B_MSG3"], "video": "cam1/sub14bpl.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam1/sub1_4bn.ogg" }, + { "audio": "", "loop": 0, "subtitles": "NP_MSG2", "video": "nexend.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["SUB1_4B_MSG4", "SUB1_4B_MSG5", "SUB1_4B_MSG6"], "video": "cam1/sub1_4b.ogg" } + ] + } +} diff --git a/data/base/messages/brief1-4a.txt b/data/base/messages/brief1-4a.txt deleted file mode 100644 index d07bec62c13..00000000000 --- a/data/base/messages/brief1-4a.txt +++ /dev/null @@ -1,2 +0,0 @@ -SB1_4_MSG,0,3,4,cam1/sub1_4pl.ogg,1,3,SUB1_4A_MSG4,SUB1_4A_MSG5,SUB1_4A_MSG6,0,0000,cam1/sub14anp.ogg,0,0,0,0000,npend.ogg,0,1,NP_MSG2,0,0000,cam1/sub1_4.ogg,0,3,SUB1_4A_MSG1,SUB1_4A_MSG2,SUB1_4A_MSG3,0,0000 -SB1_4_B,0,3,4,cam1/sub14bpl.ogg,1,3,TRANS_MSG1,SUB1_4B_MSG2,SUB1_4B_MSG3,0,0000,cam1/sub1_4bn.ogg,0,0,0,0000,nexend.ogg,0,1,NP_MSG2,0,0000,cam1/sub1_4b.ogg,0,3,SUB1_4B_MSG4,SUB1_4B_MSG5,SUB1_4B_MSG6,0,0000 diff --git a/data/base/wrf/cam1/sub1-4a.wrf b/data/base/wrf/cam1/sub1-4a.wrf index b464e7961f7..22def0b5157 100644 --- a/data/base/wrf/cam1/sub1-4a.wrf +++ b/data/base/wrf/cam1/sub1-4a.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-4a.txt" +file FLIC "brief1-4a.json" file PROX "prox1-4a.json" directory "script" diff --git a/data/base/wrf/cam1/sub1-4as.wrf b/data/base/wrf/cam1/sub1-4as.wrf index 7ab79285480..c19d458a42c 100644 --- a/data/base/wrf/cam1/sub1-4as.wrf +++ b/data/base/wrf/cam1/sub1-4as.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-4a.txt" +file FLIC "brief1-4a.json" directory "script" file JAVASCRIPT "rules.js" From f2ba43c6eaf39d68dc27cc0425e560bd58c8e869 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 19:33:40 -0500 Subject: [PATCH 47/86] Convert brief1-5 --- data/base/messages/brief1-5.json | 9 +++++++++ data/base/messages/brief1-5.txt | 1 - data/base/wrf/cam1/sub1-5.wrf | 2 +- data/base/wrf/cam1/sub1-5s.wrf | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/brief1-5.json delete mode 100644 data/base/messages/brief1-5.txt diff --git a/data/base/messages/brief1-5.json b/data/base/messages/brief1-5.json new file mode 100644 index 00000000000..9c00d90db7d --- /dev/null +++ b/data/base/messages/brief1-5.json @@ -0,0 +1,9 @@ +{ + "video0000": { + "name": "SB1_5_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "TRANS_MSG1", "video": "cam1/sub1_5pl.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["SUB1_5_MSG1", "SUB1_5_MSG2", "SUB1_5_MSG3"], "video": "cam1/sub1_5.ogg" } + ] + } +} diff --git a/data/base/messages/brief1-5.txt b/data/base/messages/brief1-5.txt deleted file mode 100644 index 3bee39cff2f..00000000000 --- a/data/base/messages/brief1-5.txt +++ /dev/null @@ -1 +0,0 @@ -SB1_5_MSG,0,3,2,cam1/sub1_5pl.ogg,0,1,TRANS_MSG1,0,0000,cam1/sub1_5.ogg,0,3,SUB1_5_MSG1,SUB1_5_MSG2,SUB1_5_MSG3,0,0000 diff --git a/data/base/wrf/cam1/sub1-5.wrf b/data/base/wrf/cam1/sub1-5.wrf index 1b9186d2ca9..7968722523f 100644 --- a/data/base/wrf/cam1/sub1-5.wrf +++ b/data/base/wrf/cam1/sub1-5.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-5.txt" +file FLIC "brief1-5.json" file PROX "prox1-5.json" directory "script" diff --git a/data/base/wrf/cam1/sub1-5s.wrf b/data/base/wrf/cam1/sub1-5s.wrf index ada3acdbc6a..26ae9b09cf8 100644 --- a/data/base/wrf/cam1/sub1-5s.wrf +++ b/data/base/wrf/cam1/sub1-5s.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-5.txt" +file FLIC "brief1-5.json" directory "script" file JAVASCRIPT "rules.js" From f6a472fe9c66e3caf00ca31265ef2c7af2a667bf Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 19:37:20 -0500 Subject: [PATCH 48/86] Convert brief1a-c --- data/base/messages/brief1a-c.json | 16 ++++++++++++++++ data/base/messages/brief1a-c.txt | 2 -- data/base/wrf/cam1/cam1a-c.wrf | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/brief1a-c.json delete mode 100644 data/base/messages/brief1a-c.txt diff --git a/data/base/messages/brief1a-c.json b/data/base/messages/brief1a-c.json new file mode 100644 index 00000000000..9c1ee0a5228 --- /dev/null +++ b/data/base/messages/brief1a-c.json @@ -0,0 +1,16 @@ +{ + "video0000": { + "name": "MB1A-C_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["TRANS_MSG1", "CAM1A-C_MSG5", "CAM1A-C_MSG6"], "video": "cam1/cam1acp.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam1/map1a_c.ogg" } + ] + }, + "video0001": { + "name": "MB1A-C_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM1A-C_MSG1", "CAM1A-C_MSG2", "CAM1A-C_MSG3"], "video": "cam1/cam1ac.ogg" } + ] + } +} diff --git a/data/base/messages/brief1a-c.txt b/data/base/messages/brief1a-c.txt deleted file mode 100644 index fb722b4ec2f..00000000000 --- a/data/base/messages/brief1a-c.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB1A-C_MSG,0,1,2,cam1/cam1acp.ogg,3,TRANS_MSG1,CAM1A-C_MSG5,CAM1A-C_MSG6,0,0000,cam1/map1a_c.ogg,0,0,0000 -MB1A-C_MSG2,0,1,2,brfcom.ogg,1,TRANS_MSG1,0,0000,cam1/cam1ac.ogg,3,CAM1A-C_MSG1,CAM1A-C_MSG2,CAM1A-C_MSG3,0,0000 diff --git a/data/base/wrf/cam1/cam1a-c.wrf b/data/base/wrf/cam1/cam1a-c.wrf index 5f66eea085c..6117985c2ed 100644 --- a/data/base/wrf/cam1/cam1a-c.wrf +++ b/data/base/wrf/cam1/cam1a-c.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1a-c.txt" +file FLIC "brief1a-c.json" file PROX "prox1a-c.json" directory "script" From dee9687b0d0ab1240b8be6d30d688539aacd8327 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 19:41:57 -0500 Subject: [PATCH 49/86] Convert brief1-7 --- data/base/messages/brief1-7.json | 21 +++++++++++++++++++++ data/base/messages/brief1-7.txt | 3 --- data/base/wrf/cam1/sub1-7.wrf | 2 +- data/base/wrf/cam1/sub1-7s.wrf | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 data/base/messages/brief1-7.json delete mode 100644 data/base/messages/brief1-7.txt diff --git a/data/base/messages/brief1-7.json b/data/base/messages/brief1-7.json new file mode 100644 index 00000000000..682c0938437 --- /dev/null +++ b/data/base/messages/brief1-7.json @@ -0,0 +1,21 @@ +{ + "video0000": { + "name": "SB1_7_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": ["TRANS_MSG1", "SUB1_7_MSG5", "SUB1_7_MSG6"], "video": "cam1/sub1_7pl.ogg" }, + { "audio": "", "loop": 0, "subtitles": "SUB1_7_MSG4", "video": "cam1/sub17fmv.ogg" } + ] + }, + "video0001": { + "name": "SB1_7_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["SUB1_7_MSG1", "SUB1_7_MSG2", "SUB1_7_MSG3"], "video": "cam1/sub1_7.ogg" } + ] + }, + "video0002": { + "name": "SB1_7_MSG3", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["SUB1_7_MSG1", "SUB1_7_MSG2", "SUB1_7_MSG3"], "video": "cam1/sub1_7b.ogg" } + ] + } +} diff --git a/data/base/messages/brief1-7.txt b/data/base/messages/brief1-7.txt deleted file mode 100644 index 9d49e3f7119..00000000000 --- a/data/base/messages/brief1-7.txt +++ /dev/null @@ -1,3 +0,0 @@ -SB1_7_MSG,0,3,2,cam1/sub1_7pl.ogg,1,3,TRANS_MSG1,SUB1_7_MSG5,SUB1_7_MSG6,0,0000,cam1/sub17fmv.ogg,0,1,SUB1_7_MSG4,0,0000 -SB1_7_MSG2,0,1,1,cam1/sub1_7.ogg,3,SUB1_7_MSG1,SUB1_7_MSG2,SUB1_7_MSG3,0,0000 -SB1_7_MSG3,0,1,1,cam1/sub1_7b.ogg,3,SUB1_7_MSG1,SUB1_7_MSG2,SUB1_7_MSG3,0,0000 diff --git a/data/base/wrf/cam1/sub1-7.wrf b/data/base/wrf/cam1/sub1-7.wrf index ad6e33260d4..2b6dfebfb29 100644 --- a/data/base/wrf/cam1/sub1-7.wrf +++ b/data/base/wrf/cam1/sub1-7.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-7.txt" +file FLIC "brief1-7.json" file PROX "prox1-7.json" directory "script" diff --git a/data/base/wrf/cam1/sub1-7s.wrf b/data/base/wrf/cam1/sub1-7s.wrf index b6bc15609c2..7aa33bab665 100644 --- a/data/base/wrf/cam1/sub1-7s.wrf +++ b/data/base/wrf/cam1/sub1-7s.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1-7.txt" +file FLIC "brief1-7.json" directory "script" file JAVASCRIPT "rules.js" From eb0ccea4c58370d48d5bd8a304c9d5240bbc975f Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 19:45:28 -0500 Subject: [PATCH 50/86] Convert brief1d --- data/base/messages/brief1d.json | 17 +++++++++++++++++ data/base/messages/brief1d.txt | 2 -- data/base/wrf/cam1/sub1-d.wrf | 2 +- data/base/wrf/cam1/sub1-ds.wrf | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief1d.json delete mode 100644 data/base/messages/brief1d.txt diff --git a/data/base/messages/brief1d.json b/data/base/messages/brief1d.json new file mode 100644 index 00000000000..48bf6278c29 --- /dev/null +++ b/data/base/messages/brief1d.json @@ -0,0 +1,17 @@ +{ + "video0000": { + "name": "MB1D_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": ["CAM1D_MSG1", "CAM1D_MSG4", "CAM1D_MSG5"], "video": "cam1/cam1dp1.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam1/cam1dnp.ogg" }, + { "audio": "", "loop": 0, "subtitles": "NP_MSG2", "video": "npend.ogg" } + ] + }, + "video0001": { + "name": "MB1D_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM1D_MSG1", "CAM1D_MSG2", "CAM1D_MSG3"], "video": "cam1/cam1d.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam1/cam1dp2.ogg" } + ] + } +} diff --git a/data/base/messages/brief1d.txt b/data/base/messages/brief1d.txt deleted file mode 100644 index a7d9045de2f..00000000000 --- a/data/base/messages/brief1d.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB1D_MSG,0,3,3,cam1/cam1dp1.ogg,1,3,CAM1D_MSG1,CAM1D_MSG4,CAM1D_MSG5,0,0000,cam1/cam1dnp.ogg,0,0,0,0000,npend.ogg,0,1,NP_MSG2,0,0000 -MB1D_MSG2,0,1,2,cam1/cam1d.ogg,3,CAM1D_MSG1,CAM1D_MSG2,CAM1D_MSG3,0,0000,cam1/cam1dp2.ogg,0,0,0000 diff --git a/data/base/wrf/cam1/sub1-d.wrf b/data/base/wrf/cam1/sub1-d.wrf index e1badaed277..69bbfbadfac 100644 --- a/data/base/wrf/cam1/sub1-d.wrf +++ b/data/base/wrf/cam1/sub1-d.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1d.txt" +file FLIC "brief1d.json" file PROX "prox1d.json" directory "script" diff --git a/data/base/wrf/cam1/sub1-ds.wrf b/data/base/wrf/cam1/sub1-ds.wrf index 0718ba20865..20252472b82 100644 --- a/data/base/wrf/cam1/sub1-ds.wrf +++ b/data/base/wrf/cam1/sub1-ds.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief1d.txt" +file FLIC "brief1d.json" directory "script" file JAVASCRIPT "rules.js" From 3d52c811e794d88437edd468985af6432c9d3caa Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 19:49:21 -0500 Subject: [PATCH 51/86] Convert cam1-outro --- data/base/messages/cam1-outro.json | 24 ++++++++++++++++++++++++ data/base/messages/cam1-outro.txt | 3 --- data/base/wrf/cam1/cam1end.wrf | 2 +- 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/cam1-outro.json delete mode 100644 data/base/messages/cam1-outro.txt diff --git a/data/base/messages/cam1-outro.json b/data/base/messages/cam1-outro.json new file mode 100644 index 00000000000..4315334277e --- /dev/null +++ b/data/base/messages/cam1-outro.json @@ -0,0 +1,24 @@ +{ + "video0000": { + "name": "CAM1_OUT", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM1OUT_MSG1", "CAM1OUT_MSG2", "CAM1OUT_MSG3"], "video": "cam1/cam1out1.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam1/cam1out2.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam1/cam1out3.ogg" } + ] + }, + "video0001": { + "name": "CAM1_OUT2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "", "video": "cam1/cam1out4.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam1/cam1out5.ogg" }, + { "audio": "", "loop": 1, "subtitles": ["CAM1OUT_MSG4", "CAM1OUT_MSG5"], "video": "cam1/cam1out6.ogg" } + ] + }, + "video0002": { + "name": "CAM2_BRIEF", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "CAM1OUT_MSG6", "video": "cam1/c001end.ogg" } + ] + } +} diff --git a/data/base/messages/cam1-outro.txt b/data/base/messages/cam1-outro.txt deleted file mode 100644 index 02d1c91f516..00000000000 --- a/data/base/messages/cam1-outro.txt +++ /dev/null @@ -1,3 +0,0 @@ -CAM1_OUT,0,1,3,cam1/cam1out1.ogg,3,CAM1OUT_MSG1,CAM1OUT_MSG2,CAM1OUT_MSG3,0,0000,cam1/cam1out2.ogg,0,0,0000,cam1/cam1out3.ogg,0,0,0000 -CAM1_OUT2,0,3,3,cam1/cam1out4.ogg,0,0,0,0000,cam1/cam1out5.ogg,0,0,0,0000,cam1/cam1out6.ogg,1,2,CAM1OUT_MSG4,CAM1OUT_MSG5,0,0000 -CAM2_BRIEF,0,1,1,cam1/c001end.ogg,1,CAM1OUT_MSG6,0,0000 diff --git a/data/base/wrf/cam1/cam1end.wrf b/data/base/wrf/cam1/cam1end.wrf index 23a319c6241..6cdbe05d930 100644 --- a/data/base/wrf/cam1/cam1end.wrf +++ b/data/base/wrf/cam1/cam1end.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "cam1-outro.txt" +file FLIC "cam1-outro.json" directory "script" file JAVASCRIPT "rules.js" From 3ca616ae8bf1b24f7a450cdef64a24f3091a4efa Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 21:47:47 -0500 Subject: [PATCH 52/86] Convert brief2a First video line has a disabled video. Seems some additional work will be needed to restore missing subtitles. --- data/base/messages/brief2a.json | 15 +++++++++++++++ data/base/messages/brief2a.txt | 2 -- data/base/wrf/cam2/cam2a.wrf | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/brief2a.json delete mode 100644 data/base/messages/brief2a.txt diff --git a/data/base/messages/brief2a.json b/data/base/messages/brief2a.json new file mode 100644 index 00000000000..e9ce351744c --- /dev/null +++ b/data/base/messages/brief2a.json @@ -0,0 +1,15 @@ +{ + "video0000": { + "name": "MB2A_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2A_MSG1", "CAM2A_MSG2", "CAM2A_MSG3"], "video": "cam2/c002.ogg" } + ] + }, + "video0001": { + "name": "MB2A_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["NP_MSG1", "CAM2A_MSG7", "CAM2A_MSG8"], "video": "cam2/cam2ap.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam2acol.ogg" } + ] + } +} diff --git a/data/base/messages/brief2a.txt b/data/base/messages/brief2a.txt deleted file mode 100644 index 8cd1eb4f538..00000000000 --- a/data/base/messages/brief2a.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB2A_MSG,0,1,1,cam2/c002.ogg,3,CAM2A_MSG1,CAM2A_MSG2,CAM2A_MSG3,0,0000,cam2/cam2intb.ogg,3,CAM2A_MSG4,CAM2A_MSG5,CAM2A_MSG6,0,0000 -MB2A_MSG2,0,1,2,cam2/cam2ap.ogg,3,NP_MSG1,CAM2A_MSG7,CAM2A_MSG8,0,0000,cam2/cam2acol.ogg,0,0,0000 diff --git a/data/base/wrf/cam2/cam2a.wrf b/data/base/wrf/cam2/cam2a.wrf index 27ced0f32aa..ed05a19498c 100644 --- a/data/base/wrf/cam2/cam2a.wrf +++ b/data/base/wrf/cam2/cam2a.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2a.txt" +file FLIC "brief2a.json" file PROX "prox2a.json" directory "script" From 12e315dd88c1e8ecd22cf089eaf6125aa2fb5ef1 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 21:52:02 -0500 Subject: [PATCH 53/86] Convert brief2-1 --- data/base/messages/brief2-1.json | 14 ++++++++++++++ data/base/messages/brief2-1.txt | 2 -- data/base/wrf/cam2/sub2-1.wrf | 2 +- data/base/wrf/cam2/sub2-1s.wrf | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief2-1.json delete mode 100644 data/base/messages/brief2-1.txt diff --git a/data/base/messages/brief2-1.json b/data/base/messages/brief2-1.json new file mode 100644 index 00000000000..1682fa52498 --- /dev/null +++ b/data/base/messages/brief2-1.json @@ -0,0 +1,14 @@ +{ + "video0000": { + "name": "MB2_1_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2_1_MSG1", "CAM2_1_MSG2"], "video": "brfcom4s.ogg" } + ] + }, + "video0001": { + "name": "MB2_1_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2_1_MSG3", "CAM2_1_MSG4", "CAM2_1_MSG5"], "video": "cam2/cam2_1.ogg" } + ] + } +} diff --git a/data/base/messages/brief2-1.txt b/data/base/messages/brief2-1.txt deleted file mode 100644 index 2ace418e9a0..00000000000 --- a/data/base/messages/brief2-1.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB2_1_MSG,0,1,1,brfcom4s.ogg,2,CAM2_1_MSG1,CAM2_1_MSG2,0,0000 -MB2_1_MSG2,0,1,1,cam2/cam2_1.ogg,3,CAM2_1_MSG3,CAM2_1_MSG4,CAM2_1_MSG5,0,0000 diff --git a/data/base/wrf/cam2/sub2-1.wrf b/data/base/wrf/cam2/sub2-1.wrf index 37de473d518..51f698eb49b 100644 --- a/data/base/wrf/cam2/sub2-1.wrf +++ b/data/base/wrf/cam2/sub2-1.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-1.txt" +file FLIC "brief2-1.json" file PROX "prox2-1.json" directory "script" diff --git a/data/base/wrf/cam2/sub2-1s.wrf b/data/base/wrf/cam2/sub2-1s.wrf index 1a05e4815c7..b277d83b408 100644 --- a/data/base/wrf/cam2/sub2-1s.wrf +++ b/data/base/wrf/cam2/sub2-1s.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-1.txt" +file FLIC "brief2-1.json" directory "script" file JAVASCRIPT "rules.js" From 23bfce2c61ed2d77b8f720b41d8b1cbca6c6b30d Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 23:13:35 -0500 Subject: [PATCH 54/86] Convert brief2b --- data/base/messages/brief2b.json | 15 +++++++++++++++ data/base/messages/brief2b.txt | 2 -- data/base/wrf/cam2/cam2b.wrf | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/brief2b.json delete mode 100644 data/base/messages/brief2b.txt diff --git a/data/base/messages/brief2b.json b/data/base/messages/brief2b.json new file mode 100644 index 00000000000..0f9ab0325d1 --- /dev/null +++ b/data/base/messages/brief2b.json @@ -0,0 +1,15 @@ +{ + "video0000": { + "name": "MB2_B_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2_B_MSG1", "CAM2_B_MSG2", "CAM2_B_MSG3"], "video": "cam2/cam2bpl.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam2bcol.ogg" } + ] + }, + "video0001": { + "name": "MB2_B_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2_B_MSG7", "CAM2_B_MSG8", "CAM2_B_MSG9"], "video": "cam2/cam2b.ogg" } + ] + } +} diff --git a/data/base/messages/brief2b.txt b/data/base/messages/brief2b.txt deleted file mode 100644 index 85bb7ecb5a9..00000000000 --- a/data/base/messages/brief2b.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB2_B_MSG,0,1,2,cam2/cam2bpl.ogg,3,CAM2_B_MSG1,CAM2_B_MSG2,CAM2_B_MSG3,0,0000,cam2/cam2bcol.ogg,0,0,0000 -MB2_B_MSG2,0,1,1,cam2/cam2b.ogg,3,CAM2_B_MSG7,CAM2_B_MSG8,CAM2_B_MSG9,0,0000 diff --git a/data/base/wrf/cam2/cam2b.wrf b/data/base/wrf/cam2/cam2b.wrf index f5a2199cc62..f1aba2ade9a 100644 --- a/data/base/wrf/cam2/cam2b.wrf +++ b/data/base/wrf/cam2/cam2b.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2b.txt" +file FLIC "brief2b.json" file PROX "prox2b.json" directory "script" From ee5472ed0a431c2a9fa0bbb2e3dcf23b67376388 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 23:19:54 -0500 Subject: [PATCH 55/86] Convert brief2-2 --- data/base/messages/brief2-2.json | 25 +++++++++++++++++++++++++ data/base/messages/brief2-2.txt | 3 --- data/base/wrf/cam2/sub2-2.wrf | 2 +- data/base/wrf/cam2/sub2-2s.wrf | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 data/base/messages/brief2-2.json delete mode 100644 data/base/messages/brief2-2.txt diff --git a/data/base/messages/brief2-2.json b/data/base/messages/brief2-2.json new file mode 100644 index 00000000000..652822f50c9 --- /dev/null +++ b/data/base/messages/brief2-2.json @@ -0,0 +1,25 @@ +{ + "video0000": { + "name": "MB2_2_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM2_2_MSG", "CAM2_2_MSG2", "CAM2_2_MSG3"], "video": "cam2/cam22pl1.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam2_2n.ogg" } + ] + }, + "video0001": { + "name": "MB2_2_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "CAM2_2_MSG7", "video": "cam2/cam22pl2.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam22fmv.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam2_2n2.ogg" }, + { "audio": "", "loop": 0, "subtitles": "CAM2_2_MSG", "video": "cam2/cam22pl3.ogg" } + ] + }, + "video0002": { + "name": "MB2_2_MSG3", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2_2_MSG4", "CAM2_2_MSG5", "CAM2_2_MSG6"], "video": "cam2/cam2_2.ogg" } + ] + } +} diff --git a/data/base/messages/brief2-2.txt b/data/base/messages/brief2-2.txt deleted file mode 100644 index bc49ee85475..00000000000 --- a/data/base/messages/brief2-2.txt +++ /dev/null @@ -1,3 +0,0 @@ -MB2_2_MSG,0,1,3,brfcom.ogg,1,TRANS_MSG1,0,0000,cam2/cam22pl1.ogg,3,CAM2_2_MSG,CAM2_2_MSG2,CAM2_2_MSG3,0,0000,cam2/cam2_2n.ogg,0,0,0000 -MB2_2_MSG2,0,1,4,cam2/cam22pl2.ogg,1,CAM2_2_MSG7,0,0000,cam2/cam22fmv.ogg,0,0,0000,cam2/cam2_2n2.ogg,0,0,0000,cam2/cam22pl3.ogg,1,CAM2_2_MSG,0,0000 -MB2_2_MSG3,0,1,1,cam2/cam2_2.ogg,3,CAM2_2_MSG4,CAM2_2_MSG5,CAM2_2_MSG6,0,0000 diff --git a/data/base/wrf/cam2/sub2-2.wrf b/data/base/wrf/cam2/sub2-2.wrf index e8582334d90..1014e432e1a 100644 --- a/data/base/wrf/cam2/sub2-2.wrf +++ b/data/base/wrf/cam2/sub2-2.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-2.txt" +file FLIC "brief2-2.json" file PROX "prox2-2.json" directory "script" diff --git a/data/base/wrf/cam2/sub2-2s.wrf b/data/base/wrf/cam2/sub2-2s.wrf index 65c8d3a85dd..68d3ea15895 100644 --- a/data/base/wrf/cam2/sub2-2s.wrf +++ b/data/base/wrf/cam2/sub2-2s.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-2.txt" +file FLIC "brief2-2.json" directory "script" file JAVASCRIPT "rules.js" From cee3e300a426c3d7ee0b1b83b361cdd3e38f529a Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 23:24:43 -0500 Subject: [PATCH 56/86] Convert brief2-c --- data/base/messages/brief2-c.json | 17 +++++++++++++++++ data/base/messages/brief2-c.txt | 2 -- data/base/wrf/cam2/cam2c.wrf | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/brief2-c.json delete mode 100644 data/base/messages/brief2-c.txt diff --git a/data/base/messages/brief2-c.json b/data/base/messages/brief2-c.json new file mode 100644 index 00000000000..90db62d823a --- /dev/null +++ b/data/base/messages/brief2-c.json @@ -0,0 +1,17 @@ +{ + "video0000": { + "name": "MB2_C_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM2_C_MSG1", "CAM2_C_MSG2"], "video": "cam2/cam2capl.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM2_C_MSG3", "CAM2_C_MSG4", "CAM2_C_MSG5"], "video": "cam2/cam2ca.ogg" } + ] + }, + "video0001": { + "name": "MB2_C_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2_C_MSG6", "CAM2_C_MSG7", "CAM2_C_MSG8"], "video": "cam2/cam2cbpl.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM2_C_MSG9", "CAM2_C_MSG10", "CAM2_C_MSG11"], "video": "cam2/cam2cb.ogg" } + ] + } +} diff --git a/data/base/messages/brief2-c.txt b/data/base/messages/brief2-c.txt deleted file mode 100644 index 1496d8cd652..00000000000 --- a/data/base/messages/brief2-c.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB2_C_MSG,0,1,3,brfcom.ogg,1,TRANS_MSG1,0,0000,cam2/cam2capl.ogg,2,CAM2_C_MSG1,CAM2_C_MSG2,0,0000,cam2/cam2ca.ogg,3,CAM2_C_MSG3,CAM2_C_MSG4,CAM2_C_MSG5,0,0000 -MB2_C_MSG2,0,1,2,cam2/cam2cbpl.ogg,3,CAM2_C_MSG6,CAM2_C_MSG7,CAM2_C_MSG8,0,0000,cam2/cam2cb.ogg,3,CAM2_C_MSG9,CAM2_C_MSG10,CAM2_C_MSG11,0,0000 diff --git a/data/base/wrf/cam2/cam2c.wrf b/data/base/wrf/cam2/cam2c.wrf index 78f04bfc257..b0ebc101c87 100644 --- a/data/base/wrf/cam2/cam2c.wrf +++ b/data/base/wrf/cam2/cam2c.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-c.txt" +file FLIC "brief2-c.json" file PROX "prox2c.json" directory "script" From 075c964437cfe075cc2337334e8db058272f0057 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 23:28:20 -0500 Subject: [PATCH 57/86] Convert brief2-5 --- data/base/messages/brief2-5.json | 15 +++++++++++++++ data/base/messages/brief2-5.txt | 2 -- data/base/wrf/cam2/sub2-5.wrf | 2 +- data/base/wrf/cam2/sub2-5s.wrf | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief2-5.json delete mode 100644 data/base/messages/brief2-5.txt diff --git a/data/base/messages/brief2-5.json b/data/base/messages/brief2-5.json new file mode 100644 index 00000000000..daa4f34e447 --- /dev/null +++ b/data/base/messages/brief2-5.json @@ -0,0 +1,15 @@ +{ + "video0000": { + "name": "MB2_5_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 1, "subtitles": ["CAM2_5_MSG", "CAM2_5_MSG2", "CAM2_5_MSG3"], "video": "cam2/cam2_5pl.ogg" } + ] + }, + "video0001": { + "name": "MB2_5_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2_5_MSG4", "CAM2_5_MSG5", "CAM2_5_MSG6"], "video": "cam2/cam2_5.ogg" } + ] + } +} diff --git a/data/base/messages/brief2-5.txt b/data/base/messages/brief2-5.txt deleted file mode 100644 index 04194f17f50..00000000000 --- a/data/base/messages/brief2-5.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB2_5_MSG,0,3,2,brfcom.ogg,1,1,TRANS_MSG1,0,0000,cam2/cam2_5pl.ogg,1,3,CAM2_5_MSG,CAM2_5_MSG2,CAM2_5_MSG3,0,0000 -MB2_5_MSG2,0,1,1,cam2/cam2_5.ogg,3,CAM2_5_MSG4,CAM2_5_MSG5,CAM2_5_MSG6,0,0000 diff --git a/data/base/wrf/cam2/sub2-5.wrf b/data/base/wrf/cam2/sub2-5.wrf index 593345ec6d6..d22d49467aa 100644 --- a/data/base/wrf/cam2/sub2-5.wrf +++ b/data/base/wrf/cam2/sub2-5.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-5.txt" +file FLIC "brief2-5.json" file PROX "prox2-5.json" directory "script" diff --git a/data/base/wrf/cam2/sub2-5s.wrf b/data/base/wrf/cam2/sub2-5s.wrf index 7d369358f44..02665dad95e 100644 --- a/data/base/wrf/cam2/sub2-5s.wrf +++ b/data/base/wrf/cam2/sub2-5s.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-5.txt" +file FLIC "brief2-5.json" directory "script" file JAVASCRIPT "rules.js" From 161009ecdb28554dce47a4b34b65a3e8a2d88f16 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 23:42:58 -0500 Subject: [PATCH 58/86] Convert brief2-di --- data/base/messages/brief2-di.json | 16 ++++++++++++++++ data/base/messages/brief2-di.txt | 2 -- data/base/wrf/cam2/sub2-d.wrf | 2 +- data/base/wrf/cam2/sub2-ds.wrf | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief2-di.json delete mode 100644 data/base/messages/brief2-di.txt diff --git a/data/base/messages/brief2-di.json b/data/base/messages/brief2-di.json new file mode 100644 index 00000000000..27c6385773c --- /dev/null +++ b/data/base/messages/brief2-di.json @@ -0,0 +1,16 @@ +{ + "video0000": { + "name": "MB2_DI_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 1, "subtitles": ["CAM2_DI_MSG3", "CAM2_DI_MSG4", "CAM2_DI_MSG5"], "video": "cam2/cam2_di.ogg" } + ] + }, + "video0001": { + "name": "MB2_DI_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "CAM2_B_MSG3", "video": "cam2/cam2dipl.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam2dico.ogg" } + ] + } +} diff --git a/data/base/messages/brief2-di.txt b/data/base/messages/brief2-di.txt deleted file mode 100644 index 0e9118daab3..00000000000 --- a/data/base/messages/brief2-di.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB2_DI_MSG,0,3,2,brfcom.ogg,1,1,TRANS_MSG1,0,0000,cam2/cam2_di.ogg,1,3,CAM2_DI_MSG3,CAM2_DI_MSG4,CAM2_DI_MSG5,0,0000 -MB2_DI_MSG2,0,1,2,cam2/cam2dipl.ogg,1,CAM2_B_MSG3,0,0000,cam2/cam2dico.ogg,0,0,0000 diff --git a/data/base/wrf/cam2/sub2-d.wrf b/data/base/wrf/cam2/sub2-d.wrf index c6d5755e658..b26bc95b310 100644 --- a/data/base/wrf/cam2/sub2-d.wrf +++ b/data/base/wrf/cam2/sub2-d.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-di.txt" +file FLIC "brief2-di.json" file PROX "prox2d.json" directory "script" diff --git a/data/base/wrf/cam2/sub2-ds.wrf b/data/base/wrf/cam2/sub2-ds.wrf index 252a6303fa2..e993b962942 100644 --- a/data/base/wrf/cam2/sub2-ds.wrf +++ b/data/base/wrf/cam2/sub2-ds.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-di.txt" +file FLIC "brief2-di.json" directory "script" file JAVASCRIPT "rules.js" From 0ae577b5e67db48502476331f0881aef944b9962 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 23:48:22 -0500 Subject: [PATCH 59/86] Convert brief2-6 --- data/base/messages/brief2-6.json | 23 +++++++++++++++++++++++ data/base/messages/brief2-6.txt | 3 --- data/base/wrf/cam2/sub2-6.wrf | 2 +- data/base/wrf/cam2/sub2-6s.wrf | 2 +- 4 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 data/base/messages/brief2-6.json delete mode 100644 data/base/messages/brief2-6.txt diff --git a/data/base/messages/brief2-6.json b/data/base/messages/brief2-6.json new file mode 100644 index 00000000000..a9a20a34215 --- /dev/null +++ b/data/base/messages/brief2-6.json @@ -0,0 +1,23 @@ +{ + "video0000": { + "name": "MB2_6_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "CAM2_6_MSG", "video": "cam2/cam26pl1.ogg" } + ] + }, + "video0001": { + "name": "MB2_6_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam26afm.ogg" }, + { "audio": "", "loop": 1, "subtitles": ["CAM2_6_MSG", "CAM2_6_MSG2", "CAM2_6_MSG3"], "video": "cam2/cam26pl2.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM2_6_MSG4", "CAM2_6_MSG5", "CAM2_6_MSG6"], "video": "cam2/cam2_6a.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam26bfm.ogg" } + ] + }, + "video0002": { + "name": "MB2_6_MSG3", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2_6_MSG7", "CAM2_6_MSG8", "CAM2_6_MSG9"], "video": "cam2/cam2_6b.ogg" } + ] + } +} diff --git a/data/base/messages/brief2-6.txt b/data/base/messages/brief2-6.txt deleted file mode 100644 index 0fc843567bf..00000000000 --- a/data/base/messages/brief2-6.txt +++ /dev/null @@ -1,3 +0,0 @@ -MB2_6_MSG,0,1,1,cam2/cam26pl1.ogg,1,CAM2_6_MSG,0,0000 -MB2_6_MSG2,0,3,4,cam2/cam26afm.ogg,0,0,0,0000,cam2/cam26pl2.ogg,1,3,CAM2_6_MSG,CAM2_6_MSG2,CAM2_6_MSG3,0,0000,cam2/cam2_6a.ogg,0,3,CAM2_6_MSG4,CAM2_6_MSG5,CAM2_6_MSG6,0,0000,cam2/cam26bfm.ogg,0,0,0,0000 -MB2_6_MSG3,0,1,1,cam2/cam2_6b.ogg,3,CAM2_6_MSG7,CAM2_6_MSG8,CAM2_6_MSG9,0,0000 diff --git a/data/base/wrf/cam2/sub2-6.wrf b/data/base/wrf/cam2/sub2-6.wrf index 76b840ba537..4ef352de20f 100644 --- a/data/base/wrf/cam2/sub2-6.wrf +++ b/data/base/wrf/cam2/sub2-6.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-6.txt" +file FLIC "brief2-6.json" file PROX "prox2-6.json" directory "script" diff --git a/data/base/wrf/cam2/sub2-6s.wrf b/data/base/wrf/cam2/sub2-6s.wrf index 094a7529e6b..5d2d9179bc2 100644 --- a/data/base/wrf/cam2/sub2-6s.wrf +++ b/data/base/wrf/cam2/sub2-6s.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-6.txt" +file FLIC "brief2-6.json" directory "script" file JAVASCRIPT "rules.js" From 8618b706d2817d5f645d0d6949e33ba30bc08630 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 23:51:43 -0500 Subject: [PATCH 60/86] Convert brief2-7 --- data/base/messages/brief2-7.json | 15 +++++++++++++++ data/base/messages/brief2-7.txt | 2 -- data/base/wrf/cam2/sub2-7.wrf | 2 +- data/base/wrf/cam2/sub2-7s.wrf | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief2-7.json delete mode 100644 data/base/messages/brief2-7.txt diff --git a/data/base/messages/brief2-7.json b/data/base/messages/brief2-7.json new file mode 100644 index 00000000000..592e18a5f09 --- /dev/null +++ b/data/base/messages/brief2-7.json @@ -0,0 +1,15 @@ +{ + "video0000": { + "name": "MB2_7_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam27fmv.ogg" } + ] + }, + "video0001": { + "name": "MB2_7_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2_7_MSG", "CAM2_7_MSG2", "CAM2_7_MSG3"], "video": "cam2/cam2_7.ogg" } + ] + } +} diff --git a/data/base/messages/brief2-7.txt b/data/base/messages/brief2-7.txt deleted file mode 100644 index 213a1ef2abf..00000000000 --- a/data/base/messages/brief2-7.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB2_7_MSG,0,3,2,brfcom.ogg,1,1,TRANS_MSG1,0,0000,cam2/cam27fmv.ogg,0,0,0,0000 -MB2_7_MSG2,0,1,1,cam2/cam2_7.ogg,3,CAM2_7_MSG,CAM2_7_MSG2,CAM2_7_MSG3,0,0000 diff --git a/data/base/wrf/cam2/sub2-7.wrf b/data/base/wrf/cam2/sub2-7.wrf index 13feaed864d..85df655b629 100644 --- a/data/base/wrf/cam2/sub2-7.wrf +++ b/data/base/wrf/cam2/sub2-7.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-7.txt" +file FLIC "brief2-7.json" file PROX "prox2-7.json" directory "script" diff --git a/data/base/wrf/cam2/sub2-7s.wrf b/data/base/wrf/cam2/sub2-7s.wrf index dd83c895d7f..09c4db2f32e 100644 --- a/data/base/wrf/cam2/sub2-7s.wrf +++ b/data/base/wrf/cam2/sub2-7s.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-7.txt" +file FLIC "brief2-7.json" directory "script" file JAVASCRIPT "rules.js" From 4541b990a5fd07527ead37a727245dc65fb628ff Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 9 Sep 2024 23:54:59 -0500 Subject: [PATCH 61/86] Convert brief2-8 --- data/base/messages/brief2-8.json | 15 +++++++++++++++ data/base/messages/brief2-8.txt | 2 -- data/base/wrf/cam2/sub2-8.wrf | 2 +- data/base/wrf/cam2/sub2-8s.wrf | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief2-8.json delete mode 100644 data/base/messages/brief2-8.txt diff --git a/data/base/messages/brief2-8.json b/data/base/messages/brief2-8.json new file mode 100644 index 00000000000..1b3911b9652 --- /dev/null +++ b/data/base/messages/brief2-8.json @@ -0,0 +1,15 @@ +{ + "video0000": { + "name": "MB2_8_MSG", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 1, "subtitles": ["CAM2_8_MSG", "CAM2_8_MSG2", "CAM2_8_MSG3"], "video": "cam2/cam28apl.ogg" } + ] + }, + "video0001": { + "name": "MB2_8_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2_8_MSG4", "CAM2_8_MSG5", "CAM2_8_MSG6"], "video": "cam2/cam2_8a.ogg" } + ] + } +} diff --git a/data/base/messages/brief2-8.txt b/data/base/messages/brief2-8.txt deleted file mode 100644 index 1b47d9fab92..00000000000 --- a/data/base/messages/brief2-8.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB2_8_MSG,0,3,2,brfcom.ogg,1,1,TRANS_MSG1,0,0000,cam2/cam28apl.ogg,1,3,CAM2_8_MSG,CAM2_8_MSG2,CAM2_8_MSG3,0,0000 -MB2_8_MSG2,0,1,1,cam2/cam2_8a.ogg,3,CAM2_8_MSG4,CAM2_8_MSG5,CAM2_8_MSG6,0,0000 diff --git a/data/base/wrf/cam2/sub2-8.wrf b/data/base/wrf/cam2/sub2-8.wrf index c7522d48a6b..57782eedb25 100644 --- a/data/base/wrf/cam2/sub2-8.wrf +++ b/data/base/wrf/cam2/sub2-8.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-8.txt" +file FLIC "brief2-8.json" file PROX "prox2-8.json" directory "script" diff --git a/data/base/wrf/cam2/sub2-8s.wrf b/data/base/wrf/cam2/sub2-8s.wrf index 212042be8a4..57959916901 100644 --- a/data/base/wrf/cam2/sub2-8s.wrf +++ b/data/base/wrf/cam2/sub2-8s.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-8.txt" +file FLIC "brief2-8.json" directory "script" file JAVASCRIPT "rules.js" From 6370f3880f4492b1201b000b921bfb9121c6c5f9 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 00:00:10 -0500 Subject: [PATCH 62/86] Convert brief2-dii --- data/base/messages/brief2-dii.json | 24 ++++++++++++++++++++++++ data/base/messages/brief2-dii.txt | 3 --- data/base/wrf/cam2/cam2end.wrf | 2 +- 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief2-dii.json delete mode 100644 data/base/messages/brief2-dii.txt diff --git a/data/base/messages/brief2-dii.json b/data/base/messages/brief2-dii.json new file mode 100644 index 00000000000..ae2891901e3 --- /dev/null +++ b/data/base/messages/brief2-dii.json @@ -0,0 +1,24 @@ +{ + "video0000": { + "name": "MB2_DII_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom4s.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM2_DII_MSG1", "CAM2_DII_MSG2", "CAM2_DII_MSG9"], "video": "cam2/cam2diif.ogg" }, + { "audio": "", "loop": 0, "subtitles": "CAM2_DII_MSG1", "video": "cam2/c2diif2.ogg" } + ] + }, + "video0001": { + "name": "MB2_DII_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM2_DII_MSG3", "CAM2_DII_MSG4", "CAM2_DII_MSG5"], "video": "cam2/cam2diib.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam2diin.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM2_DII_MSG6", "CAM2_DII_MSG7", "CAM2_DII_MSG8"], "video": "cam2/cam2diip.ogg" } + ] + }, + "video0002": { + "name": "CAM2_OUT", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam2out.ogg" } + ] + } +} diff --git a/data/base/messages/brief2-dii.txt b/data/base/messages/brief2-dii.txt deleted file mode 100644 index dc59d807309..00000000000 --- a/data/base/messages/brief2-dii.txt +++ /dev/null @@ -1,3 +0,0 @@ -MB2_DII_MSG,0,1,3,brfcom4s.ogg,1,TRANS_MSG1,0,0000,cam2/cam2diif.ogg,3,CAM2_DII_MSG1,CAM2_DII_MSG2,CAM2_DII_MSG9,0,0000,cam2/c2diif2.ogg,1,CAM2_DII_MSG1,0,0000 -MB2_DII_MSG2,0,1,3,cam2/cam2diib.ogg,3,CAM2_DII_MSG3,CAM2_DII_MSG4,CAM2_DII_MSG5,0,0000,cam2/cam2diin.ogg,0,0,0000,cam2/cam2diip.ogg,3,CAM2_DII_MSG6,CAM2_DII_MSG7,CAM2_DII_MSG8,0,0000 -CAM2_OUT,0,1,1,cam2/cam2out.ogg,0,0,0000 diff --git a/data/base/wrf/cam2/cam2end.wrf b/data/base/wrf/cam2/cam2end.wrf index 3aec9f6aa79..a600e2a551c 100644 --- a/data/base/wrf/cam2/cam2end.wrf +++ b/data/base/wrf/cam2/cam2end.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief2-dii.txt" +file FLIC "brief2-dii.json" directory "script" file JAVASCRIPT "rules.js" From a72af580d935cae8008eeb54665fedd32b0fa6c0 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 10:02:48 -0500 Subject: [PATCH 63/86] Remove brief2intro Not used. --- data/base/messages/brief2intro.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 data/base/messages/brief2intro.txt diff --git a/data/base/messages/brief2intro.txt b/data/base/messages/brief2intro.txt deleted file mode 100644 index 12c2d347305..00000000000 --- a/data/base/messages/brief2intro.txt +++ /dev/null @@ -1,2 +0,0 @@ -CAM2_INT,0,1,2,cam2/cam2int1.ogg,0,0,0000,cam2/cam2inta.ogg,0,0,0000 -CAM2_INT2,0,1,2,cam2/cam2int2.ogg,0,0,0000,cam2/cam2intb.ogg,0,0,0000 From 6e31f34682477b8a3bfba46e12dcd4a15bd3cdb7 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 10:04:30 -0500 Subject: [PATCH 64/86] Remove cam2-outro Not used (this one is inside brief2-dii). --- data/base/messages/cam2-outro.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 data/base/messages/cam2-outro.txt diff --git a/data/base/messages/cam2-outro.txt b/data/base/messages/cam2-outro.txt deleted file mode 100644 index 5bf96b99a33..00000000000 --- a/data/base/messages/cam2-outro.txt +++ /dev/null @@ -1 +0,0 @@ -CAM2_OUT,0,1,1,cam2/cam2out.ogg,0,0,0000 From bebcc77209a4e05d524e74d9d0c65edabd127516 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 10:11:59 -0500 Subject: [PATCH 65/86] Convert brief3intro --- data/base/messages/brief3intro.json | 16 ++++++++++++++++ data/base/messages/brief3intro.txt | 2 -- data/base/wrf/cam3/cam3a.wrf | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/brief3intro.json delete mode 100644 data/base/messages/brief3intro.txt diff --git a/data/base/messages/brief3intro.json b/data/base/messages/brief3intro.json new file mode 100644 index 00000000000..c1b40b12842 --- /dev/null +++ b/data/base/messages/brief3intro.json @@ -0,0 +1,16 @@ +{ + "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/messages/brief3intro.txt b/data/base/messages/brief3intro.txt deleted file mode 100644 index 7fd2b76b2f9..00000000000 --- a/data/base/messages/brief3intro.txt +++ /dev/null @@ -1,2 +0,0 @@ -CAM3_INT,0,1,2,cam3/cam3intp.ogg,3,CAM3_MSG1,CAM3_MSG2,CAM3_MSG3,0,0000,cam3/cam3int.ogg,0,0,0000 -CAM3_INT2,0,1,2,brfcom.ogg,1,TRANS_MSG1,0,0000,cam3/cam3intb.ogg,3,CAM3_MSG4,CAM3_MSG5,CAM3_MSG6,0,0000 diff --git a/data/base/wrf/cam3/cam3a.wrf b/data/base/wrf/cam3/cam3a.wrf index f75a1f572e7..81e45ae1928 100644 --- a/data/base/wrf/cam3/cam3a.wrf +++ b/data/base/wrf/cam3/cam3a.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file SMSG "brief3-a.txt" -file SMSG "brief3intro.txt" +file FLIC "brief3intro.json" file PROX "prox3a.json" directory "script" From 9cc58f63a15786a931cab9e3afcf791285cf28f2 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 10:15:29 -0500 Subject: [PATCH 66/86] Convert brief3-a --- data/base/messages/brief3-a.json | 15 +++++++++++++++ data/base/messages/brief3-a.txt | 2 -- data/base/wrf/cam3/cam3a.wrf | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/brief3-a.json delete mode 100644 data/base/messages/brief3-a.txt diff --git a/data/base/messages/brief3-a.json b/data/base/messages/brief3-a.json new file mode 100644 index 00000000000..bb6c43071e2 --- /dev/null +++ b/data/base/messages/brief3-a.json @@ -0,0 +1,15 @@ +{ + "video0000": { + "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" } + ] + }, + "video0001": { + "name": "MB3A_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3A_MSG1", "CAM3A_MSG2", "CAM3A_MSG3"], "video": "cam3/cam3intb.ogg" } + ] + } +} diff --git a/data/base/messages/brief3-a.txt b/data/base/messages/brief3-a.txt deleted file mode 100644 index a733cfeea81..00000000000 --- a/data/base/messages/brief3-a.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB3A_MSG,0,1,2,cam3/cam3intp.ogg,3,CAM3_MSG1,CAM3_MSG2,CAM3_MSG3,0,0000,brfcom.ogg,1,TRANS_MSG1,0,0000 -MB3A_MSG2,0,1,1,cam3/cam3intb.ogg,3,CAM3A_MSG1,CAM3A_MSG2,CAM3A_MSG3,0,0000 diff --git a/data/base/wrf/cam3/cam3a.wrf b/data/base/wrf/cam3/cam3a.wrf index 81e45ae1928..b36f98f5100 100644 --- a/data/base/wrf/cam3/cam3a.wrf +++ b/data/base/wrf/cam3/cam3a.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3-a.txt" +file FLIC "brief3-a.json" file FLIC "brief3intro.json" file PROX "prox3a.json" From a0294367837c5a34192a914d0cf8adff9350cff7 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 10:35:29 -0500 Subject: [PATCH 67/86] Convert brief3-1a --- data/base/messages/brief3-1a.json | 16 ++++++++++++++++ data/base/messages/brief3-1a.txt | 2 -- data/base/wrf/cam3/sub3-1s.wrf | 3 +-- 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief3-1a.json delete mode 100644 data/base/messages/brief3-1a.txt diff --git a/data/base/messages/brief3-1a.json b/data/base/messages/brief3-1a.json new file mode 100644 index 00000000000..c6cbbf9089a --- /dev/null +++ b/data/base/messages/brief3-1a.json @@ -0,0 +1,16 @@ +{ + "video0000": { + "name": "MB3_1A_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "CAM3_1A_MSG", "video": "incomint.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3_1A_MSG1", "CAM3_1A_MSG2", "CAM3_1A_MSG3"], "video": "cam3/cam31gam.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3_1A_MSG4", "CAM3_1A_MSG5"], "video": "cam3/cam31g2.ogg" } + ] + }, + "video0001": { + "name": "MB3_1A_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3_1A_MSG6", "CAM3_1A_MSG7", "CAM3_1A_MSG8"], "video": "cam3/cam3_1.ogg" } + ] + } +} diff --git a/data/base/messages/brief3-1a.txt b/data/base/messages/brief3-1a.txt deleted file mode 100644 index 1b502f949c0..00000000000 --- a/data/base/messages/brief3-1a.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB3_1A_MSG,0,1,3,incomint.ogg,1,CAM3_1A_MSG,0,0000,cam3/cam31gam.ogg,3,CAM3_1A_MSG1,CAM3_1A_MSG2,CAM3_1A_MSG3,0,0000,cam3/cam31g2.ogg,2,CAM3_1A_MSG4,CAM3_1A_MSG5,0,0000 -MB3_1A_MSG2,0,1,1,cam3/cam3_1.ogg,3,CAM3_1A_MSG6,CAM3_1A_MSG7,CAM3_1A_MSG8,0,0000 diff --git a/data/base/wrf/cam3/sub3-1s.wrf b/data/base/wrf/cam3/sub3-1s.wrf index e53ddb8ab12..aebac06bc72 100644 --- a/data/base/wrf/cam3/sub3-1s.wrf +++ b/data/base/wrf/cam3/sub3-1s.wrf @@ -5,8 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3-1a.txt" -file SMSG "prox3-1.txt" +file FLIC "brief3-1a.json" directory "script" file JAVASCRIPT "rules.js" From 4fe4c5d4f49aed82ff04d29a9a92bdd6d837361f Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 10:38:00 -0500 Subject: [PATCH 68/86] Convert brief3-1b --- data/base/messages/brief3-1b.json | 16 ++++++++++++++++ data/base/messages/brief3-1b.txt | 2 -- data/base/wrf/cam3/sub3-1.wrf | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief3-1b.json delete mode 100644 data/base/messages/brief3-1b.txt diff --git a/data/base/messages/brief3-1b.json b/data/base/messages/brief3-1b.json new file mode 100644 index 00000000000..fe168b2031d --- /dev/null +++ b/data/base/messages/brief3-1b.json @@ -0,0 +1,16 @@ +{ + "video0000": { + "name": "MB3_1B_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "NP_MSG1", "video": "incomint.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam3_1bn.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3_1B_MSG1", "CAM3_1B_MSG2", "CAM3_1B_MSG3"], "video": "cam3/cam31bpl.ogg" } + ] + }, + "video0001": { + "name": "MB3_1B_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3_1B_MSG4", "CAM3_1B_MSG5", "CAM3_1B_MSG6"], "video": "cam3/cam3_1b.ogg" } + ] + } +} diff --git a/data/base/messages/brief3-1b.txt b/data/base/messages/brief3-1b.txt deleted file mode 100644 index 4c98a587798..00000000000 --- a/data/base/messages/brief3-1b.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB3_1B_MSG,0,1,3,incomint.ogg,1,NP_MSG1,0,0000,cam3/cam3_1bn.ogg,0,0,0000,cam3/cam31bpl.ogg,3,CAM3_1B_MSG1,CAM3_1B_MSG2,CAM3_1B_MSG3,0,0000 -MB3_1B_MSG2,0,1,1,cam3/cam3_1b.ogg,3,CAM3_1B_MSG4,CAM3_1B_MSG5,CAM3_1B_MSG6,0,0000 diff --git a/data/base/wrf/cam3/sub3-1.wrf b/data/base/wrf/cam3/sub3-1.wrf index 65a59d4ba97..4096d241351 100644 --- a/data/base/wrf/cam3/sub3-1.wrf +++ b/data/base/wrf/cam3/sub3-1.wrf @@ -38,8 +38,8 @@ file WAV "fdetseq.ogg" /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3-1a.txt" -file SMSG "brief3-1b.txt" +file FLIC "brief3-1a.json" +file FLIC "brief3-1b.json" file PROX "prox3-1.json" directory "script" From e9d196a061e71f43fd9da4bc86e1fa4ba41227fa Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 10:41:06 -0500 Subject: [PATCH 69/86] Convert brief3-b --- data/base/messages/brief3-b.json | 22 ++++++++++++++++++++++ data/base/messages/brief3-b.txt | 3 --- data/base/wrf/cam3/cam3b.wrf | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief3-b.json delete mode 100644 data/base/messages/brief3-b.txt diff --git a/data/base/messages/brief3-b.json b/data/base/messages/brief3-b.json new file mode 100644 index 00000000000..c7585f83771 --- /dev/null +++ b/data/base/messages/brief3-b.json @@ -0,0 +1,22 @@ +{ + "video0000": { + "name": "MB3_B_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3_B_MSG1", "CAM3_B_MSG2", "CAM3_B_MSG3"], "video": "cam3/cam3bpl.ogg" }, + { "audio": "", "loop": 0, "subtitles": "INCOM_INT", "video": "incomint.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam3bg.ogg" } + ] + }, + "video0001": { + "name": "MB3_B_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3_B_MSG4", "CAM3_B_MSG5", "CAM3_B_MSG6"], "video": "cam3/cam3b.ogg" } + ] + }, + "video0002": { + "name": "MB3_B_MSG3", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam3_bn.ogg" } + ] + } +} diff --git a/data/base/messages/brief3-b.txt b/data/base/messages/brief3-b.txt deleted file mode 100644 index c20e4786b1f..00000000000 --- a/data/base/messages/brief3-b.txt +++ /dev/null @@ -1,3 +0,0 @@ -MB3_B_MSG,0,1,3,cam3/cam3bpl.ogg,3,CAM3_B_MSG1,CAM3_B_MSG2,CAM3_B_MSG3,0,0000,incomint.ogg,1,INCOM_INT,0,0000,cam3/cam3bg.ogg,0,0,0000 -MB3_B_MSG2,0,1,1,cam3/cam3b.ogg,3,CAM3_B_MSG4,CAM3_B_MSG5,CAM3_B_MSG6,0,0000 -MB3_B_MSG3,0,1,1,cam3/cam3_bn.ogg,0,0,0000 diff --git a/data/base/wrf/cam3/cam3b.wrf b/data/base/wrf/cam3/cam3b.wrf index 42311756fb5..a77a7ff21d8 100644 --- a/data/base/wrf/cam3/cam3b.wrf +++ b/data/base/wrf/cam3/cam3b.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3-b.txt" +file FLIC "brief3-b.json" file PROX "prox3b.json" directory "script" From 7157bcddab0e0895af5b8782b94a4edb7571dfb0 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 10:44:43 -0500 Subject: [PATCH 70/86] Convert brief3-2 --- data/base/messages/brief3-2.json | 29 +++++++++++++++++++++++++++++ data/base/messages/brief3-2.txt | 4 ---- data/base/wrf/cam3/sub3-2.wrf | 2 +- data/base/wrf/cam3/sub3-2s.wrf | 3 +-- 4 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 data/base/messages/brief3-2.json delete mode 100644 data/base/messages/brief3-2.txt diff --git a/data/base/messages/brief3-2.json b/data/base/messages/brief3-2.json new file mode 100644 index 00000000000..41d48206379 --- /dev/null +++ b/data/base/messages/brief3-2.json @@ -0,0 +1,29 @@ +{ + "video0000": { + "name": "MB3_2_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3_2_MSG1", "CAM3_2_MSG2", "CAM3_2_MSG3"], "video": "cam3/cam32pl.ogg" }, + { "audio": "", "loop": 0, "subtitles": "CAM3_2_MSG4", "video": "cam3/cam32alp.ogg" }, + { "audio": "", "loop": 0, "subtitles": "CAM3_2_MSG5", "video": "cam3/cam32pl2.ogg" } + ] + }, + "video0001": { + "name": "MB3_2_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3_2_MSG6", "CAM3_2_MSG7", "CAM3_2_MSG8"], "video": "cam3/cam3_2b.ogg" } + ] + }, + "video0002": { + "name": "MB3_2_MSG3", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "NP_MSG1", "video": "incomtns.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam32a2.ogg" } + ] + }, + "video0003": { + "name": "MB3_2_MSG4", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "CAM3_2_MSG9", "video": "cam3/cam32pl3.ogg" } + ] + } +} diff --git a/data/base/messages/brief3-2.txt b/data/base/messages/brief3-2.txt deleted file mode 100644 index f507f56c6d6..00000000000 --- a/data/base/messages/brief3-2.txt +++ /dev/null @@ -1,4 +0,0 @@ -MB3_2_MSG,0,1,3,cam3/cam32pl.ogg,3,CAM3_2_MSG1,CAM3_2_MSG2,CAM3_2_MSG3,0,0000,cam3/cam32alp.ogg,1,CAM3_2_MSG4,0,0000,cam3/cam32pl2.ogg,1,CAM3_2_MSG5,0,0000 -MB3_2_MSG2,0,1,1,cam3/cam3_2b.ogg,3,CAM3_2_MSG6,CAM3_2_MSG7,CAM3_2_MSG8,0,0000 -MB3_2_MSG3,0,1,2,incomtns.ogg,1,NP_MSG1,0,0000,cam3/cam32a2.ogg,0,0,0000 -MB3_2_MSG4,0,1,1,cam3/cam32pl3.ogg,1,CAM3_2_MSG9,0,0000 diff --git a/data/base/wrf/cam3/sub3-2.wrf b/data/base/wrf/cam3/sub3-2.wrf index 10a508d8325..427a0b8ea7d 100644 --- a/data/base/wrf/cam3/sub3-2.wrf +++ b/data/base/wrf/cam3/sub3-2.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3-2.txt" +file FLIC "brief3-2.json" file PROX "prox3-2.json" directory "script" diff --git a/data/base/wrf/cam3/sub3-2s.wrf b/data/base/wrf/cam3/sub3-2s.wrf index ddcce09b203..ed589899258 100644 --- a/data/base/wrf/cam3/sub3-2s.wrf +++ b/data/base/wrf/cam3/sub3-2s.wrf @@ -5,8 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3-2.txt" -file SMSG "prox3-2.txt" +file FLIC "brief3-2.json" directory "script" file JAVASCRIPT "rules.js" From 8a2ed79e0d668919de14e2ca2048ef3ae275d37f Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 10:48:05 -0500 Subject: [PATCH 71/86] Convert brief3a-b --- data/base/messages/brief3a-b.json | 22 ++++++++++++++++++++++ data/base/messages/brief3a-b.txt | 3 --- data/base/wrf/cam3/cam3ab.wrf | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/brief3a-b.json delete mode 100644 data/base/messages/brief3a-b.txt diff --git a/data/base/messages/brief3a-b.json b/data/base/messages/brief3a-b.json new file mode 100644 index 00000000000..0be44af98b8 --- /dev/null +++ b/data/base/messages/brief3a-b.json @@ -0,0 +1,22 @@ +{ + "video0000": { + "name": "MB3_AB_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3_AB_MSG1", "CAM3_AB_MSG2"], "video": "brfcom4s.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3_AB_MSG3", "CAM3_AB_MSG4"], "video": "cam3/cam3aba.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam3abf.ogg" } + ] + }, + "video0001": { + "name": "MB3_AB_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "CAM3_AB_MSG1", "video": "cam3/cam3abpl.ogg" } + ] + }, + "video0002": { + "name": "MB3_AB_MSG3", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3_AB_MSG5", "CAM3_AB_MSG6", "CAM3_AB_MSG7"], "video": "cam3/cam3ab.ogg" } + ] + } +} diff --git a/data/base/messages/brief3a-b.txt b/data/base/messages/brief3a-b.txt deleted file mode 100644 index 35340883152..00000000000 --- a/data/base/messages/brief3a-b.txt +++ /dev/null @@ -1,3 +0,0 @@ -MB3_AB_MSG,0,1,3,brfcom4s.ogg,2,CAM3_AB_MSG1,CAM3_AB_MSG2,0,0000,cam3/cam3aba.ogg,2,CAM3_AB_MSG3,CAM3_AB_MSG4,0,0000,cam3/cam3abf.ogg,0,0,0000 -MB3_AB_MSG2,0,1,1,cam3/cam3abpl.ogg,1,CAM3_AB_MSG1,0,0000 -MB3_AB_MSG3,0,1,1,cam3/cam3ab.ogg,3,CAM3_AB_MSG5,CAM3_AB_MSG6,CAM3_AB_MSG7,0,0000 diff --git a/data/base/wrf/cam3/cam3ab.wrf b/data/base/wrf/cam3/cam3ab.wrf index 25366dbaf16..5c76b239a27 100644 --- a/data/base/wrf/cam3/cam3ab.wrf +++ b/data/base/wrf/cam3/cam3ab.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3a-b.txt" +file FLIC "brief3a-b.json" directory "script" file JAVASCRIPT "rules.js" From f6cca953af1d1d48ad70be8dd8e70ae0c8b3ae37 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 10:52:29 -0500 Subject: [PATCH 72/86] Convert brief3-c --- data/base/messages/brief3-c.json | 20 ++++++++++++++++++++ data/base/messages/brief3-c.txt | 2 -- data/base/wrf/cam3/cam3c.wrf | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 data/base/messages/brief3-c.json delete mode 100644 data/base/messages/brief3-c.txt diff --git a/data/base/messages/brief3-c.json b/data/base/messages/brief3-c.json new file mode 100644 index 00000000000..7a32a3fbe74 --- /dev/null +++ b/data/base/messages/brief3-c.json @@ -0,0 +1,20 @@ +{ + "video0000": { + "name": "MB3_C_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3_C_MSG1", "CAM3_C_MSG2"], "video": "cam3/cam3cpl1.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam3_cn.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/c3c.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3_C_MSG3", "CAM3_C_MSG4"], "video": "cam3/cam3cpl2.ogg" } + ] + }, + "video0001": { + "name": "MB3_C_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3_C_MSG5", "CAM3_C_MSG6", "CAM3_C_MSG7"], "video": "cam3/cam3cbet.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3_C_MSG8", "CAM3_C_MSG9"], "video": "cam3/cam3cpl3.ogg" }, + { "audio": "", "loop": 0, "subtitles": "CAM3_C_MSG10", "video": "incomtns.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3_C_MSG11", "CAM3_C_MSG12", "CAM3_C_MSG13"], "video": "cam3/cam3_cg.ogg" } + ] + } +} diff --git a/data/base/messages/brief3-c.txt b/data/base/messages/brief3-c.txt deleted file mode 100644 index 35888258742..00000000000 --- a/data/base/messages/brief3-c.txt +++ /dev/null @@ -1,2 +0,0 @@ -MB3_C_MSG,0,1,4,cam3/cam3cpl1.ogg,2,CAM3_C_MSG1,CAM3_C_MSG2,0,0000,cam3/cam3_cn.ogg,0,0,0000,cam3/c3c.ogg,0,0,0000,cam3/cam3cpl2.ogg,2,CAM3_C_MSG3,CAM3_C_MSG4,0,0000 -MB3_C_MSG2,0,1,4,cam3/cam3cbet.ogg,3,CAM3_C_MSG5,CAM3_C_MSG6,CAM3_C_MSG7,0,0000,cam3/cam3cpl3.ogg,2,CAM3_C_MSG8,CAM3_C_MSG9,0,0000,incomtns.ogg,1,CAM3_C_MSG10,0,0000,cam3/cam3_cg.ogg,3,CAM3_C_MSG11,CAM3_C_MSG12,CAM3_C_MSG13,0,0000 diff --git a/data/base/wrf/cam3/cam3c.wrf b/data/base/wrf/cam3/cam3c.wrf index 19461c7efd4..1d55cc631a3 100644 --- a/data/base/wrf/cam3/cam3c.wrf +++ b/data/base/wrf/cam3/cam3c.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3-c.txt" +file FLIC "brief3-c.json" file PROX "prox3c.json" directory "script" From 1c9e5535824455c00987556db255f8791033fc22 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 10:56:52 -0500 Subject: [PATCH 73/86] Convert brief3a-d1 --- data/base/messages/brief3a-d1.json | 28 ++++++++++++++++++++++++++++ data/base/messages/brief3a-d1.txt | 4 ---- data/base/wrf/cam3/cam3ad1.wrf | 2 +- data/base/wrf/cam3/cam3ad2.wrf | 2 +- 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/brief3a-d1.json delete mode 100644 data/base/messages/brief3a-d1.txt diff --git a/data/base/messages/brief3a-d1.json b/data/base/messages/brief3a-d1.json new file mode 100644 index 00000000000..56f48207b7c --- /dev/null +++ b/data/base/messages/brief3a-d1.json @@ -0,0 +1,28 @@ +{ + "video0000": { + "name": "MB3_AD1_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3A_D1_MSG1", "CAM3A_D1_MSG2", "CAM3A_D1_MSG3"], "video": "cam3/c3ad1pl1.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3A_D1_MSG4", "CAM3A_D1_MSG5"], "video": "cam3/c3_d1_a.ogg" } + ] + }, + "video0001": { + "name": "MB3_AD1_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "CAM3A_D1_MSG6", "video": "cam3/c3ad1pl2.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3A_D1_MSG7", "CAM3A_D1_MSG8"], "video": "cam3/c3_d1_b.ogg" } + ] + }, + "video0002": { + "name": "MB3_AD1_MSG3", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3A_D1_MSG9", "CAM3A_D1_MSG10", "CAM3A_D1_MSG11"], "video": "cam3/cam3ad1b.ogg" } + ] + }, + "video0003": { + "name": "MB3_AD1_MSG4", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "CAM3A_D1_MSG12", "video": "cam3/c3ad1pl3.ogg" } + ] + } +} diff --git a/data/base/messages/brief3a-d1.txt b/data/base/messages/brief3a-d1.txt deleted file mode 100644 index 4c4b23a2395..00000000000 --- a/data/base/messages/brief3a-d1.txt +++ /dev/null @@ -1,4 +0,0 @@ -MB3_AD1_MSG,0,1,2,cam3/c3ad1pl1.ogg,3,CAM3A_D1_MSG1,CAM3A_D1_MSG2,CAM3A_D1_MSG3,0,0000,cam3/c3_d1_a.ogg,2,CAM3A_D1_MSG4,CAM3A_D1_MSG5,0,0000 -MB3_AD1_MSG2,0,1,2,cam3/c3ad1pl2.ogg,1,CAM3A_D1_MSG6,0,0000,cam3/c3_d1_b.ogg,2,CAM3A_D1_MSG7,CAM3A_D1_MSG8,0,0000 -MB3_AD1_MSG3,0,1,1,cam3/cam3ad1b.ogg,3,CAM3A_D1_MSG9,CAM3A_D1_MSG10,CAM3A_D1_MSG11,0,0000 -MB3_AD1_MSG4,0,1,1,cam3/c3ad1pl3.ogg,1,CAM3A_D1_MSG12,0,0000 diff --git a/data/base/wrf/cam3/cam3ad1.wrf b/data/base/wrf/cam3/cam3ad1.wrf index aee7cfa3222..0304ae240ad 100644 --- a/data/base/wrf/cam3/cam3ad1.wrf +++ b/data/base/wrf/cam3/cam3ad1.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3a-d1.txt" +file FLIC "brief3a-d1.json" file SMSG "brief3a-d2.txt" file PROX "prox3a-d1.json" diff --git a/data/base/wrf/cam3/cam3ad2.wrf b/data/base/wrf/cam3/cam3ad2.wrf index 10bd2bb9f84..2ff38e7d682 100644 --- a/data/base/wrf/cam3/cam3ad2.wrf +++ b/data/base/wrf/cam3/cam3ad2.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3a-d1.txt" +file FLIC "brief3a-d1.json" file SMSG "brief3a-d2.txt" file PROX "prox3a-d1.json" From d9808885d4578aa6176e2a84b9b21374cf2be70c Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 11:03:39 -0500 Subject: [PATCH 74/86] Convert brief3a-d2 --- data/base/messages/brief3a-d2.json | 42 ++++++++++++++++++++++++++++++ data/base/messages/brief3a-d2.txt | 6 ----- data/base/wrf/cam3/cam3ad1.wrf | 2 +- data/base/wrf/cam3/cam3ad2.wrf | 2 +- 4 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 data/base/messages/brief3a-d2.json delete mode 100644 data/base/messages/brief3a-d2.txt diff --git a/data/base/messages/brief3a-d2.json b/data/base/messages/brief3a-d2.json new file mode 100644 index 00000000000..10530df35bf --- /dev/null +++ b/data/base/messages/brief3a-d2.json @@ -0,0 +1,42 @@ +{ + "video0000": { + "name": "MB3_AD2_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3A_D2_MSG1", "CAM3A_D2_MSG2", "CAM3A_D2_MSG3"], "video": "cam3/c3ad2pl1.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3A_D2_MSG4", "CAM3A_D2_MSG5", "CAM3A_D2_MSG6"], "video": "cam3/c3ad2pl2.ogg" }, + { "audio": "", "loop": 0, "subtitles": "CAM3A_D2_MSG7", "video": "cam3/c3ad2pl3.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam3ad2n.ogg" } + ] + }, + "video0001": { + "name": "MB3_AD2_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/c3ad2n2.ogg" } + ] + }, + "video0002": { + "name": "MB3_AD2_MSG3", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": ["CAM3A_D2_MSG8", "CAM3A_D2_MSG9", "CAM3A_D2_MSG10"], "video": "cam3/c3ad2pl4.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3A_D2_MSG11", "CAM3A_D2_MSG12", "CAM3A_D2_MSG13"], "video": "cam3/c3ad2_09.ogg" } + ] + }, + "video0003": { + "name": "MB3_AD2_MSG4", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3A_D2_MSG14", "CAM3A_D2_MSG15", "CAM3A_D2_MSG16"], "video": "cam3/c3ad2_12.ogg" } + ] + }, + "video0004": { + "name": "MB3_AD2_MSG5", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3A_D2_MSG17", "CAM3A_D2_MSG18", "CAM3A_D2_MSG19"], "video": "cam3/c3ad2_14.ogg" } + ] + }, + "video0005": { + "name": "MB3_AD2_MSG6", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3A_D2_MSG20", "CAM3A_D2_MSG21"], "video": "cam3/c3ad2_16.ogg" } + ] + } +} diff --git a/data/base/messages/brief3a-d2.txt b/data/base/messages/brief3a-d2.txt deleted file mode 100644 index 6cd1f5c194e..00000000000 --- a/data/base/messages/brief3a-d2.txt +++ /dev/null @@ -1,6 +0,0 @@ -MB3_AD2_MSG,0,1,4,cam3/c3ad2pl1.ogg,3,CAM3A_D2_MSG1,CAM3A_D2_MSG2,CAM3A_D2_MSG3,0,0000,cam3/c3ad2pl2.ogg,3,CAM3A_D2_MSG4,CAM3A_D2_MSG5,CAM3A_D2_MSG6,0,0000,cam3/c3ad2pl3.ogg,1,CAM3A_D2_MSG7,0,0000,cam3/cam3ad2n.ogg,0,0,0000 -MB3_AD2_MSG2,0,1,1,cam3/c3ad2n2.ogg,0,0,0000 -MB3_AD2_MSG3,0,3,2,cam3/c3ad2pl4.ogg,1,3,CAM3A_D2_MSG8,CAM3A_D2_MSG9,CAM3A_D2_MSG10,0,0000,cam3/c3ad2_09.ogg,0,3,CAM3A_D2_MSG11,CAM3A_D2_MSG12,CAM3A_D2_MSG13,0,0000 -MB3_AD2_MSG4,0,1,1,cam3/c3ad2_12.ogg,3,CAM3A_D2_MSG14,CAM3A_D2_MSG15,CAM3A_D2_MSG16,0,0000 -MB3_AD2_MSG5,0,1,1,cam3/c3ad2_14.ogg,3,CAM3A_D2_MSG17,CAM3A_D2_MSG18,CAM3A_D2_MSG19,0,0000 -MB3_AD2_MSG6,0,1,1,cam3/c3ad2_16.ogg,2,CAM3A_D2_MSG20,CAM3A_D2_MSG21,0,0000 diff --git a/data/base/wrf/cam3/cam3ad1.wrf b/data/base/wrf/cam3/cam3ad1.wrf index 0304ae240ad..4a1fb5c9a90 100644 --- a/data/base/wrf/cam3/cam3ad1.wrf +++ b/data/base/wrf/cam3/cam3ad1.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file FLIC "brief3a-d1.json" -file SMSG "brief3a-d2.txt" +file FLIC "brief3a-d2.json" file PROX "prox3a-d1.json" directory "script" diff --git a/data/base/wrf/cam3/cam3ad2.wrf b/data/base/wrf/cam3/cam3ad2.wrf index 2ff38e7d682..79c22076063 100644 --- a/data/base/wrf/cam3/cam3ad2.wrf +++ b/data/base/wrf/cam3/cam3ad2.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" file FLIC "brief3a-d1.json" -file SMSG "brief3a-d2.txt" +file FLIC "brief3a-d2.json" file PROX "prox3a-d1.json" directory "script" From a48350aae3a1e266146814069ae03576f693072f Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 11:08:52 -0500 Subject: [PATCH 75/86] Convert brief3-4 --- data/base/messages/brief3-4.json | 39 ++++++++++++++++++++++++++++++++ data/base/messages/brief3-4.txt | 6 ----- data/base/wrf/cam3/sub3-4.wrf | 2 +- data/base/wrf/cam3/sub3-4s.wrf | 3 +-- 4 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 data/base/messages/brief3-4.json delete mode 100644 data/base/messages/brief3-4.txt diff --git a/data/base/messages/brief3-4.json b/data/base/messages/brief3-4.json new file mode 100644 index 00000000000..c34a10a967e --- /dev/null +++ b/data/base/messages/brief3-4.json @@ -0,0 +1,39 @@ +{ + "video0000": { + "name": "MB3_4_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "CAM3_4_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM3_4_MSG2", "CAM3_4_MSG3", "CAM3_4_MSG4"], "video": "cam3/cam3_4a.ogg" } + ] + }, + "video0001": { + "name": "MB3_4_MSG2", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM3_4_MSG5", "CAM3_4_MSG6"], "video": "cam3/cam3_4b.ogg" } + ] + }, + "video0002": { + "name": "MB3_4_MSG3", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam34fmv.ogg" } + ] + }, + "video0003": { + "name": "MB3_4_MSG4", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam34mu1.ogg" } + ] + }, + "video0004": { + "name": "MB3_4_MSG5", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam34mu2.ogg" } + ] + }, + "video0005": { + "name": "MB3_4_OUTRO", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "", "video": "outro.ogg" } + ] + } +} diff --git a/data/base/messages/brief3-4.txt b/data/base/messages/brief3-4.txt deleted file mode 100644 index fb6dd720bf3..00000000000 --- a/data/base/messages/brief3-4.txt +++ /dev/null @@ -1,6 +0,0 @@ -MB3_4_MSG,0,1,2,brfcom.ogg,1,CAM3_4_MSG1,0,0000,cam3/cam3_4a.ogg,3,CAM3_4_MSG2,CAM3_4_MSG3,CAM3_4_MSG4,0,0000 -MB3_4_MSG2,0,1,1,cam3/cam3_4b.ogg,2,CAM3_4_MSG5,CAM3_4_MSG6,0,0000 -MB3_4_MSG3,0,1,1,cam3/cam34fmv.ogg,0,0,0000 -MB3_4_MSG4,0,1,1,cam3/cam34mu1.ogg,0,0,0000 -MB3_4_MSG5,0,1,1,cam3/cam34mu2.ogg,0,0,0000 -MB3_4_OUTRO,0,1,1,outro.ogg,0,0,0000 diff --git a/data/base/wrf/cam3/sub3-4.wrf b/data/base/wrf/cam3/sub3-4.wrf index f334fb0fc58..e4a3f979ce2 100644 --- a/data/base/wrf/cam3/sub3-4.wrf +++ b/data/base/wrf/cam3/sub3-4.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3-4.txt" +file FLIC "brief3-4.json" file PROX "prox3-4.json" directory "script" diff --git a/data/base/wrf/cam3/sub3-4s.wrf b/data/base/wrf/cam3/sub3-4s.wrf index b394e42bbe5..a1a59ac8c9c 100644 --- a/data/base/wrf/cam3/sub3-4s.wrf +++ b/data/base/wrf/cam3/sub3-4s.wrf @@ -5,8 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3-4.txt" -file SMSG "prox3-4.txt" +file FLIC "brief3-4.json" directory "script" file JAVASCRIPT "rules.js" From 81c495f6109a0ff2a1c0bc6a90c2826d0de1966a Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 11:11:35 -0500 Subject: [PATCH 76/86] Convert briefdemo --- data/base/messages/briefdemo.json | 21 +++++++++++++++++++++ data/base/messages/briefdemo.txt | 3 --- data/base/wrf/fastplay/fastdemo.wrf | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/briefdemo.json delete mode 100644 data/base/messages/briefdemo.txt diff --git a/data/base/messages/briefdemo.json b/data/base/messages/briefdemo.json new file mode 100644 index 00000000000..3329f8b2f7c --- /dev/null +++ b/data/base/messages/briefdemo.json @@ -0,0 +1,21 @@ +{ + "video0000": { + "name": "MBDEMO_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM1A_MSG1", "CAM1A_MSG2", "CAM1A_MSG3"], "video": "fastplay.ogg" } + ] + }, + "video0001": { + "name": "END", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } + ] + }, + "video0002": { + "name": "WIN", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "WIN_MSG1", "video": "victory.ogg" } + ] + } +} diff --git a/data/base/messages/briefdemo.txt b/data/base/messages/briefdemo.txt deleted file mode 100644 index 210f582ed11..00000000000 --- a/data/base/messages/briefdemo.txt +++ /dev/null @@ -1,3 +0,0 @@ -MBDEMO_MSG,0,1,2,brfcom.ogg,1,TRANS_MSG1,0,0000,fastplay.ogg,3,CAM1A_MSG1,CAM1A_MSG2,CAM1A_MSG3,0,0000 -END,0,1,1,end.ogg,1,END_MSG1,0,0000 -WIN,0,1,1,victory.ogg,1,WIN_MSG1,0,0000 diff --git a/data/base/wrf/fastplay/fastdemo.wrf b/data/base/wrf/fastplay/fastdemo.wrf index 3df2afb47d6..ff25d23ab44 100644 --- a/data/base/wrf/fastplay/fastdemo.wrf +++ b/data/base/wrf/fastplay/fastdemo.wrf @@ -6,7 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "briefdemo.txt" +file FLIC "briefdemo.json" file PROX "proxdemo.json" directory "script" From 5ce1e0a7c58af5a6c53ea35274eec284cb5765d9 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 11:12:54 -0500 Subject: [PATCH 77/86] Convert brieftut --- data/base/messages/brieftut.json | 8 ++++++++ data/base/messages/brieftut.txt | 1 - data/base/wrf/tutorial/newtut.wrf | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 data/base/messages/brieftut.json delete mode 100644 data/base/messages/brieftut.txt diff --git a/data/base/messages/brieftut.json b/data/base/messages/brieftut.json new file mode 100644 index 00000000000..2264328b4c7 --- /dev/null +++ b/data/base/messages/brieftut.json @@ -0,0 +1,8 @@ +{ + "video0000": { + "name": "FACTORYVIPER", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "", "video": "factory.ogg" } + ] + } +} diff --git a/data/base/messages/brieftut.txt b/data/base/messages/brieftut.txt deleted file mode 100644 index 27f62615ad6..00000000000 --- a/data/base/messages/brieftut.txt +++ /dev/null @@ -1 +0,0 @@ -FACTORYVIPER,0,1,1,factory.ogg,0,0,0000 diff --git a/data/base/wrf/tutorial/newtut.wrf b/data/base/wrf/tutorial/newtut.wrf index cf9a11b3aac..f4cc065939a 100644 --- a/data/base/wrf/tutorial/newtut.wrf +++ b/data/base/wrf/tutorial/newtut.wrf @@ -5,7 +5,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brieftut.txt" +file FLIC "brieftut.json" file PROX "proxtut.json" /* Directory for javascript files*/ From 751a1ce7d27a7aee647bdfae23836ae38aa50575 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 11:15:23 -0500 Subject: [PATCH 78/86] Convert cam1messages --- data/base/messages/cam1messages.json | 14 ++++++++++++++ data/base/messages/cam1messages.txt | 2 -- data/base/wrf/cam1.wrf | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 data/base/messages/cam1messages.json delete mode 100644 data/base/messages/cam1messages.txt diff --git a/data/base/messages/cam1messages.json b/data/base/messages/cam1messages.json new file mode 100644 index 00000000000..334c1a045b0 --- /dev/null +++ b/data/base/messages/cam1messages.json @@ -0,0 +1,14 @@ +{ + "video0000": { + "name": "CMB1_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM1_MSG1", "CAM1_MSG2", "CAM1_MSG3"], "video": "cam1/cam1.ogg" } + ] + }, + "video0001": { + "name": "END", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } + ] + } +} diff --git a/data/base/messages/cam1messages.txt b/data/base/messages/cam1messages.txt deleted file mode 100644 index 16efa5a9579..00000000000 --- a/data/base/messages/cam1messages.txt +++ /dev/null @@ -1,2 +0,0 @@ -CMB1_MSG,0,1,1,cam1/cam1.ogg,3,CAM1_MSG1,CAM1_MSG2,CAM1_MSG3,0,0000 -END,0,1,1,end.ogg,1,END_MSG1,0,0000 diff --git a/data/base/wrf/cam1.wrf b/data/base/wrf/cam1.wrf index 22db5d6b22a..2fb9246f78a 100644 --- a/data/base/wrf/cam1.wrf +++ b/data/base/wrf/cam1.wrf @@ -1,5 +1,5 @@ /***********************************************************/ -/* You may have to modify this file for it to be correct! */ +/* You may have to modify this file for it to be correct! */ /******************* wrf\Cam1.wrf *******************/ @@ -11,6 +11,6 @@ file STR_RES "cam3strings.txt" file STR_RES "resstrings.txt" file STR_RES "scrstrings.txt" directory "messages" -file SMSG "cam1messages.txt" +file FLIC "cam1messages.json" file SMSG "cam2messages.txt" file SMSG "cam3messages.txt" From 21c6330357baf882aa180abd49fcfc42256dbd91 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 11:19:26 -0500 Subject: [PATCH 79/86] Convert cam2messages --- data/base/messages/cam2messages.json | 29 ++++++++++++++++++++++++++++ data/base/messages/cam2messages.txt | 4 ---- data/base/wrf/cam1.wrf | 2 +- data/base/wrf/cam2.wrf | 4 ++-- 4 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 data/base/messages/cam2messages.json delete mode 100644 data/base/messages/cam2messages.txt diff --git a/data/base/messages/cam2messages.json b/data/base/messages/cam2messages.json new file mode 100644 index 00000000000..3b38616980f --- /dev/null +++ b/data/base/messages/cam2messages.json @@ -0,0 +1,29 @@ +{ + "video0000": { + "name": "CMB2_MSG1", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM2_INT_MSG1", "CAM2_INT_MSG2", "CAM2_INT_MSG3"], "video": "cam2/cam2inta.ogg" } + ] + }, + "video0001": { + "name": "CMB2_MSG2", + "sequences": [ + { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "audio": "", "loop": 0, "subtitles": ["CAM2_INT_MSG4", "CAM2_INT_MSG5", "CAM2_INT_MSG6"], "video": "cam2/cam2intb.ogg" } + ] + }, + "video0002": { + "name": "CMBFULL2_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam2int1.ogg" }, + { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam2int2.ogg" } + ] + }, + "video0003": { + "name": "END", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } + ] + } +} diff --git a/data/base/messages/cam2messages.txt b/data/base/messages/cam2messages.txt deleted file mode 100644 index 852c390a0da..00000000000 --- a/data/base/messages/cam2messages.txt +++ /dev/null @@ -1,4 +0,0 @@ -CMB2_MSG1,0,3,2,brfcom.ogg,1,1,TRANS_MSG1,0,0000,cam2/cam2inta.ogg,0,3,CAM2_INT_MSG1,CAM2_INT_MSG2,CAM2_INT_MSG3,0,0000 -CMB2_MSG2,0,3,2,brfcom.ogg,1,1,TRANS_MSG1,0,0000,cam2/cam2intb.ogg,0,3,CAM2_INT_MSG4,CAM2_INT_MSG5,CAM2_INT_MSG6,0,0000 -CMBFULL2_MSG,0,1,2,cam2/cam2int1.ogg,0,0,0000,cam2/cam2int2.ogg,0,0,0000 -END,0,1,1,end.ogg,1,END_MSG1,0,0000 diff --git a/data/base/wrf/cam1.wrf b/data/base/wrf/cam1.wrf index 2fb9246f78a..f577b779208 100644 --- a/data/base/wrf/cam1.wrf +++ b/data/base/wrf/cam1.wrf @@ -12,5 +12,5 @@ file STR_RES "resstrings.txt" file STR_RES "scrstrings.txt" directory "messages" file FLIC "cam1messages.json" -file SMSG "cam2messages.txt" +file FLIC "cam2messages.json" file SMSG "cam3messages.txt" diff --git a/data/base/wrf/cam2.wrf b/data/base/wrf/cam2.wrf index 0928492440f..afb5bd6d821 100644 --- a/data/base/wrf/cam2.wrf +++ b/data/base/wrf/cam2.wrf @@ -1,5 +1,5 @@ /***********************************************************/ -/* You may have to modify this file for it to be correct! */ +/* You may have to modify this file for it to be correct! */ /******************* wrf\Cam2.wrf *******************/ @@ -10,5 +10,5 @@ file STR_RES "cam3strings.txt" file STR_RES "resstrings.txt" file STR_RES "scrstrings.txt" directory "messages" -file SMSG "cam2messages.txt" +file FLIC "cam2messages.json" file SMSG "cam3messages.txt" From bd5991487474d910ef041d1460b7248659bf77ed Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 11:21:22 -0500 Subject: [PATCH 80/86] Convert cam3messages --- data/base/messages/cam3messages.json | 8 ++++++++ data/base/messages/cam3messages.txt | 2 -- data/base/wrf/cam1.wrf | 2 +- data/base/wrf/cam2.wrf | 2 +- data/base/wrf/cam3.wrf | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 data/base/messages/cam3messages.json delete mode 100644 data/base/messages/cam3messages.txt diff --git a/data/base/messages/cam3messages.json b/data/base/messages/cam3messages.json new file mode 100644 index 00000000000..3698f1de723 --- /dev/null +++ b/data/base/messages/cam3messages.json @@ -0,0 +1,8 @@ +{ + "video0000": { + "name": "END", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } + ] + } +} diff --git a/data/base/messages/cam3messages.txt b/data/base/messages/cam3messages.txt deleted file mode 100644 index 85a10dbf11c..00000000000 --- a/data/base/messages/cam3messages.txt +++ /dev/null @@ -1,2 +0,0 @@ -DELETE_ME,0,1,2,cam2intro1.ogg,0,0,0000,cam2intro2.ogg,0,0,0000 -END,0,1,1,end.ogg,1,END_MSG1,0,0000 diff --git a/data/base/wrf/cam1.wrf b/data/base/wrf/cam1.wrf index f577b779208..83defed0dd3 100644 --- a/data/base/wrf/cam1.wrf +++ b/data/base/wrf/cam1.wrf @@ -13,4 +13,4 @@ file STR_RES "scrstrings.txt" directory "messages" file FLIC "cam1messages.json" file FLIC "cam2messages.json" -file SMSG "cam3messages.txt" +file FLIC "cam3messages.json" diff --git a/data/base/wrf/cam2.wrf b/data/base/wrf/cam2.wrf index afb5bd6d821..b5930ff5da8 100644 --- a/data/base/wrf/cam2.wrf +++ b/data/base/wrf/cam2.wrf @@ -11,4 +11,4 @@ file STR_RES "resstrings.txt" file STR_RES "scrstrings.txt" directory "messages" file FLIC "cam2messages.json" -file SMSG "cam3messages.txt" +file FLIC "cam3messages.json" diff --git a/data/base/wrf/cam3.wrf b/data/base/wrf/cam3.wrf index 7e2f4254bdd..a2448a78584 100644 --- a/data/base/wrf/cam3.wrf +++ b/data/base/wrf/cam3.wrf @@ -1,5 +1,5 @@ /***********************************************************/ -/* You may have to modify this file for it to be correct! */ +/* You may have to modify this file for it to be correct! */ /******************* WRF\Cam3.wrf *******************/ @@ -9,4 +9,4 @@ file STR_RES "cam3strings.txt" file STR_RES "resstrings.txt" file STR_RES "scrstrings.txt" directory "messages" -file SMSG "cam3messages.txt" +file FLIC "cam3messages.json" From bf75468be95b44d46b2ff4ce4e1a8be5a45ff0d6 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 11:24:00 -0500 Subject: [PATCH 81/86] Convert genmessages Just turns it into a placeholder for the WIN and END messages. --- data/base/messages/genmessages.json | 14 ++++++++++++++ data/base/messages/genmessages.txt | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 data/base/messages/genmessages.json delete mode 100644 data/base/messages/genmessages.txt diff --git a/data/base/messages/genmessages.json b/data/base/messages/genmessages.json new file mode 100644 index 00000000000..553d6846610 --- /dev/null +++ b/data/base/messages/genmessages.json @@ -0,0 +1,14 @@ +{ + "video0000": { + "name": "END", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } + ] + }, + "video0001": { + "name": "WIN", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": "WIN_MSG1", "video": "victory.ogg" } + ] + } +} diff --git a/data/base/messages/genmessages.txt b/data/base/messages/genmessages.txt deleted file mode 100644 index 3fd8398d1da..00000000000 --- a/data/base/messages/genmessages.txt +++ /dev/null @@ -1 +0,0 @@ -END,0,1,1,end.ogg,1,END_MSG1,0,0000 From 55e738050b65567a00daeef82d9a44f543c9affb Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 11:26:05 -0500 Subject: [PATCH 82/86] Update sub3-3s wrf Not used, just removing any remnants of SMSG. --- data/base/wrf/cam3/sub3-3s.wrf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/base/wrf/cam3/sub3-3s.wrf b/data/base/wrf/cam3/sub3-3s.wrf index 4727bec40bf..0fa19335d7f 100644 --- a/data/base/wrf/cam3/sub3-3s.wrf +++ b/data/base/wrf/cam3/sub3-3s.wrf @@ -5,8 +5,8 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" -file SMSG "brief3-3.txt" -file SMSG "prox3-3.txt" +file FLIC "brief3-3.json" +file PROX "prox3-3.json" directory "script" file JAVASCRIPT "rules.js" From 98cc2b175550dff0fc0323f2db97a6d068700c5c Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 18:08:45 -0500 Subject: [PATCH 83/86] Cleanup camXmessages files Moved a message in cam1messages to brief1a. The other files had unused IDs or repeated inclusions for END. camX.wrf files now point to the previously unused genmessages file which will hold WIN/END to reduce duplication. --- data/base/messages/brief1a.json | 6 ++++++ data/base/messages/cam1messages.json | 14 -------------- data/base/messages/cam2messages.json | 29 ---------------------------- data/base/messages/cam3messages.json | 8 -------- data/base/wrf/cam1.wrf | 4 +--- data/base/wrf/cam2.wrf | 3 +-- data/base/wrf/cam3.wrf | 2 +- 7 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 data/base/messages/cam1messages.json delete mode 100644 data/base/messages/cam2messages.json delete mode 100644 data/base/messages/cam3messages.json diff --git a/data/base/messages/brief1a.json b/data/base/messages/brief1a.json index 1a7795f6a79..17cc87dc322 100644 --- a/data/base/messages/brief1a.json +++ b/data/base/messages/brief1a.json @@ -5,5 +5,11 @@ { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, { "audio": "", "loop": 0, "subtitles": ["CAM1A_MSG1", "CAM1A_MSG2", "CAM1A_MSG3"], "video": "cam1/cam1ascv.ogg" } ] + }, + "video0001": { + "name": "CMB1_MSG", + "sequences": [ + { "audio": "", "loop": 0, "subtitles": ["CAM1_MSG1", "CAM1_MSG2", "CAM1_MSG3"], "video": "cam1/cam1.ogg" } + ] } } diff --git a/data/base/messages/cam1messages.json b/data/base/messages/cam1messages.json deleted file mode 100644 index 334c1a045b0..00000000000 --- a/data/base/messages/cam1messages.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "video0000": { - "name": "CMB1_MSG", - "sequences": [ - { "audio": "", "loop": 0, "subtitles": ["CAM1_MSG1", "CAM1_MSG2", "CAM1_MSG3"], "video": "cam1/cam1.ogg" } - ] - }, - "video0001": { - "name": "END", - "sequences": [ - { "audio": "", "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } - ] - } -} diff --git a/data/base/messages/cam2messages.json b/data/base/messages/cam2messages.json deleted file mode 100644 index 3b38616980f..00000000000 --- a/data/base/messages/cam2messages.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "video0000": { - "name": "CMB2_MSG1", - "sequences": [ - { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, - { "audio": "", "loop": 0, "subtitles": ["CAM2_INT_MSG1", "CAM2_INT_MSG2", "CAM2_INT_MSG3"], "video": "cam2/cam2inta.ogg" } - ] - }, - "video0001": { - "name": "CMB2_MSG2", - "sequences": [ - { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, - { "audio": "", "loop": 0, "subtitles": ["CAM2_INT_MSG4", "CAM2_INT_MSG5", "CAM2_INT_MSG6"], "video": "cam2/cam2intb.ogg" } - ] - }, - "video0002": { - "name": "CMBFULL2_MSG", - "sequences": [ - { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam2int1.ogg" }, - { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam2int2.ogg" } - ] - }, - "video0003": { - "name": "END", - "sequences": [ - { "audio": "", "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } - ] - } -} diff --git a/data/base/messages/cam3messages.json b/data/base/messages/cam3messages.json deleted file mode 100644 index 3698f1de723..00000000000 --- a/data/base/messages/cam3messages.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "video0000": { - "name": "END", - "sequences": [ - { "audio": "", "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } - ] - } -} diff --git a/data/base/wrf/cam1.wrf b/data/base/wrf/cam1.wrf index 83defed0dd3..ed9eca38ab3 100644 --- a/data/base/wrf/cam1.wrf +++ b/data/base/wrf/cam1.wrf @@ -11,6 +11,4 @@ file STR_RES "cam3strings.txt" file STR_RES "resstrings.txt" file STR_RES "scrstrings.txt" directory "messages" -file FLIC "cam1messages.json" -file FLIC "cam2messages.json" -file FLIC "cam3messages.json" +file FLIC "genmessages.json" diff --git a/data/base/wrf/cam2.wrf b/data/base/wrf/cam2.wrf index b5930ff5da8..9860ef400c2 100644 --- a/data/base/wrf/cam2.wrf +++ b/data/base/wrf/cam2.wrf @@ -10,5 +10,4 @@ file STR_RES "cam3strings.txt" file STR_RES "resstrings.txt" file STR_RES "scrstrings.txt" directory "messages" -file FLIC "cam2messages.json" -file FLIC "cam3messages.json" +file FLIC "genmessages.json" diff --git a/data/base/wrf/cam3.wrf b/data/base/wrf/cam3.wrf index a2448a78584..7efea08c239 100644 --- a/data/base/wrf/cam3.wrf +++ b/data/base/wrf/cam3.wrf @@ -9,4 +9,4 @@ file STR_RES "cam3strings.txt" file STR_RES "resstrings.txt" file STR_RES "scrstrings.txt" directory "messages" -file FLIC "cam3messages.json" +file FLIC "genmessages.json" From fa084623413fc3ea9bd2f22e4ada4d788f6f8674 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 18:16:46 -0500 Subject: [PATCH 84/86] More END/WIN duplication removal Add genmessages to the fastplay WRF file. --- data/base/messages/briefdemo.json | 12 ------------ data/base/wrf/fastplay/fastdemo.wrf | 1 + 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/data/base/messages/briefdemo.json b/data/base/messages/briefdemo.json index 3329f8b2f7c..e768c186273 100644 --- a/data/base/messages/briefdemo.json +++ b/data/base/messages/briefdemo.json @@ -5,17 +5,5 @@ { "audio": "", "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, { "audio": "", "loop": 0, "subtitles": ["CAM1A_MSG1", "CAM1A_MSG2", "CAM1A_MSG3"], "video": "fastplay.ogg" } ] - }, - "video0001": { - "name": "END", - "sequences": [ - { "audio": "", "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } - ] - }, - "video0002": { - "name": "WIN", - "sequences": [ - { "audio": "", "loop": 0, "subtitles": "WIN_MSG1", "video": "victory.ogg" } - ] } } diff --git a/data/base/wrf/fastplay/fastdemo.wrf b/data/base/wrf/fastplay/fastdemo.wrf index ff25d23ab44..a3269e4b9d5 100644 --- a/data/base/wrf/fastplay/fastdemo.wrf +++ b/data/base/wrf/fastplay/fastdemo.wrf @@ -6,6 +6,7 @@ /* Directory for Proximity messages and mission briefs */ directory "messages" +file FLIC "genmessages.json" file FLIC "briefdemo.json" file PROX "proxdemo.json" From 76a992f5013034e170645d5ef93062da6d239f55 Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Tue, 10 Sep 2024 23:43:04 -0500 Subject: [PATCH 85/86] 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" From 4bfb84d23836cdb5bdcc402e57747dcf319941ee Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Wed, 11 Sep 2024 12:08:11 -0500 Subject: [PATCH 86/86] Fix various proximity blip errors Original game wrong messages, wrong sound file, missing sound file, and bad locations. --- data/base/messages/prox1-3.json | 1 + data/base/messages/prox1-4a.json | 2 +- data/base/messages/prox1-7.json | 2 +- data/base/messages/prox1b.json | 2 +- data/base/messages/prox1c.json | 6 +++--- data/base/messages/prox3-4.json | 2 +- data/base/messages/prox3b.json | 4 ++-- data/base/messages/prox3c.json | 10 +++++----- data/base/script/campaign/cam1-3.js | 2 +- data/base/script/campaign/cam1b.js | 2 +- 10 files changed, 17 insertions(+), 16 deletions(-) diff --git a/data/base/messages/prox1-3.json b/data/base/messages/prox1-3.json index 9919c4fb71d..566f3107881 100644 --- a/data/base/messages/prox1-3.json +++ b/data/base/messages/prox1-3.json @@ -1,6 +1,7 @@ { "C1-3_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 5376, "y": 4544, "z": 0 }, "C1-3_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 1856, "z": 0 }, + "C1-3_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 7168, "y": 7296, "z": 0 }, "C1-3_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 704, "y": 704, "z": 0 }, "C1-3_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 448, "y": 6592, "z": 0 }, "C1-3_OBJ2": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 7616, "y": 7744, "z": 0 }, diff --git a/data/base/messages/prox1-4a.json b/data/base/messages/prox1-4a.json index 60a705f0517..fd82bcccfdd 100644 --- a/data/base/messages/prox1-4a.json +++ b/data/base/messages/prox1-4a.json @@ -1,6 +1,6 @@ { "C1-4_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 2624, "y": 7488, "z": 0 }, - "C1-4_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 3648, "y": 2240, "z": 0 }, + "C1-4_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 3648, "y": 2240, "z": 0 }, "C1-4_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 7104, "y": 2496, "z": 0 }, "C1-4_LZ": { "audio": "pcv398.ogg", "message": "LZ_MSG", "type": 2, "x": 7488, "y": 4672, "z": 0 }, "C1-4_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 4160, "y": 3904, "z": 0 } diff --git a/data/base/messages/prox1-7.json b/data/base/messages/prox1-7.json index de66f817c75..01928e89f9d 100644 --- a/data/base/messages/prox1-7.json +++ b/data/base/messages/prox1-7.json @@ -3,6 +3,6 @@ "C1-7_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 7232, "y": 7104, "z": 0 }, "C1-7_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 7616, "y": 576, "z": 0 }, "C1-7_LZ": { "audio": "pcv427.ogg", "message": "LZ_MSG", "type": 2, "x": 960, "y": 7232, "z": 0 }, - "C1-7_LZ2": { "audio": 0, "message": "LZ_MSG", "type": 2, "x": 1728, "y": 1472, "z": 0 }, + "C1-7_LZ2": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 2, "x": 1728, "y": 1472, "z": 0 }, "C1-7_OBJ1": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 0, "x": 3136, "y": 3904, "z": 0 } } diff --git a/data/base/messages/prox1b.json b/data/base/messages/prox1b.json index c45f2c6839a..800f56c19fd 100644 --- a/data/base/messages/prox1b.json +++ b/data/base/messages/prox1b.json @@ -2,5 +2,5 @@ "C1B_BASE0": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 2112, "y": 9280, "z": 0 }, "C1B_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 4370, "y": 9872, "z": 0 }, "C1B_BASE2": { "audio": "pcv448.ogg", "message": "POWSURGE_MSG", "type": 0, "x": 3193, "y": 13806, "z": 0 }, - "C1B_OBJ1": { "audio": "pcv390.ogg", "message": "RUINS_MSG", "type": 0, "x": 3776, "y": 11328, "z": 0 } + "C1B_BASE3": { "audio": "pcv390.ogg", "message": "BARBASE_MSG", "type": 0, "x": 3776, "y": 11328, "z": 0 } } diff --git a/data/base/messages/prox1c.json b/data/base/messages/prox1c.json index 0d06358fdf1..a1f70c151b1 100644 --- a/data/base/messages/prox1c.json +++ b/data/base/messages/prox1c.json @@ -1,10 +1,10 @@ { - "C1C_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 10304, "y": 15424, "z": 0 }, + "C1C_BASE1": { "audio": "pcv390.ogg", "message": "BARBASE_MSG", "type": 0, "x": 10304, "y": 15424, "z": 0 }, "C1C_BASE2": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 12736, "y": 14016, "z": 0 }, "C1C_BASE3": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 8512, "y": 704, "z": 0 }, - "C1C_BASE4": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 9024, "y": 3648, "z": 0 }, + "C1C_BASE4": { "audio": "pcv390.ogg", "message": "BARBASE_MSG", "type": 0, "x": 9024, "y": 3648, "z": 0 }, "C1C_BASE5": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 8512, "y": 6976, "z": 0 }, - "C1C_BASE6": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 13376, "y": 13504, "z": 0 }, + "C1C_BASE6": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 13376, "y": 13504, "z": 0 }, "C1C_BASE7": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 11840, "y": 9792, "z": 0 }, "C1C_BASE8": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 14272, "y": 3264, "z": 0 }, "C1C_BASE9": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 11712, "y": 2752, "z": 0 }, diff --git a/data/base/messages/prox3-4.json b/data/base/messages/prox3-4.json index bd5a75c3014..41c547056ef 100644 --- a/data/base/messages/prox3-4.json +++ b/data/base/messages/prox3-4.json @@ -5,7 +5,7 @@ "CM34_BASEB": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 8768, "y": 4032, "z": 0 }, "CM34_BASEC": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 8256, "y": 1344, "z": 0 }, "CM34_BASED": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 10816, "y": 10816, "z": 0 }, - "CM34_BASEE": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6976, "y": 10560, "z": 0 }, + "CM34_BASEE": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6976, "y": 10624, "z": 0 }, "CM34_BASEF": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 2880, "y": 9408, "z": 0 }, "CM34_BASEG": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 11328, "y": 7360, "z": 0 } } diff --git a/data/base/messages/prox3b.json b/data/base/messages/prox3b.json index 9c15909ef6a..d76ea090b82 100644 --- a/data/base/messages/prox3b.json +++ b/data/base/messages/prox3b.json @@ -1,7 +1,7 @@ { "CM3B_BASE4": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 6720, "z": 0 }, "CM3B_BASE6": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1024, "y": 6528, "z": 0 }, - "CM3B_TRANS1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6208, "y": 6592, "z": 0 }, - "CM3B_TRANS2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 1088, "y": 6848, "z": 0 }, + "CM3B_TRANS1": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 6208, "y": 6592, "z": 0 }, + "CM3B_TRANS2": { "audio": "pcv396.ogg", "message": "LZ_MSG3", "type": 0, "x": 1088, "y": 6848, "z": 0 }, "CM3B_GAMMABASE": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 2, "x": 1728, "y": 1728, "z": 200 } } diff --git a/data/base/messages/prox3c.json b/data/base/messages/prox3c.json index 327f6d54b7c..d174cf694e7 100644 --- a/data/base/messages/prox3c.json +++ b/data/base/messages/prox3c.json @@ -1,7 +1,7 @@ { - "CM3C_BETATEAM": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 2, "x": 960, "y": 17344, "z": 0 }, - "CM3C_GAMMABASE": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 2, "x": 1600, "y": 23104, "z": 0 }, - "CM3C_BASE1": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 0, "x": 3776, "y": 17344, "z": 0 }, - "CM3C_BASE2": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 0, "x": 4800, "y": 21568, "z": 0 }, - "CM3C_BASE3": { "audio": 0, "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 22592, "z": 0 } + "CM3C_BETATEAM": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 2, "x": 960, "y": 17344, "z": 0 }, + "CM3C_GAMMABASE": { "audio": "pcv448.ogg", "message": "RUINS_MSG", "type": 2, "x": 1600, "y": 23104, "z": 0 }, + "CM3C_BASE1": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 3776, "y": 17344, "z": 0 }, + "CM3C_BASE2": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 4800, "y": 21568, "z": 0 }, + "CM3C_BASE3": { "audio": "pcv393.ogg", "message": "ENEMYBASE_MSG", "type": 0, "x": 6592, "y": 22592, "z": 0 } } diff --git a/data/base/script/campaign/cam1-3.js b/data/base/script/campaign/cam1-3.js index 9e295720522..4272782616c 100644 --- a/data/base/script/campaign/cam1-3.js +++ b/data/base/script/campaign/cam1-3.js @@ -313,7 +313,7 @@ function eventStartLevel() }, "ScavBaseGroupSouth": { cleanup: "SouthScavBase", - detectMsg: "C1-3_OBJ2", + detectMsg: "C1-3_BASE3", detectSnd: cam_sounds.baseDetection.scavengerBaseDetected, eliminateSnd: cam_sounds.baseElimination.scavengerBaseEradicated }, diff --git a/data/base/script/campaign/cam1b.js b/data/base/script/campaign/cam1b.js index 7c1785d0a8b..64eacc01670 100644 --- a/data/base/script/campaign/cam1b.js +++ b/data/base/script/campaign/cam1b.js @@ -134,7 +134,7 @@ function eventStartLevel() }, "base3group": { cleanup: "enemybase3", - detectMsg: "C1B_OBJ1", + detectMsg: "C1B_BASE3", detectSnd: cam_sounds.baseDetection.scavengerOutpostDetected, eliminateSnd: cam_sounds.baseElimination.scavengerOutpostEradicated, },