diff --git a/data/base/messages/brief1-1.json b/data/base/messages/brief1-1.json index 7bb5986635d..3c9c0fd3415 100644 --- a/data/base/messages/brief1-1.json +++ b/data/base/messages/brief1-1.json @@ -2,21 +2,21 @@ "video0000": { "name": "FLIGHT", "sequences": [ - { "audio": "", "loop": 0, "subtitles": "INFLIGHT_MSG1", "video": "inflight.ogg" } + { "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" } + { "loop": 0, "subtitles": ["P1-1_MSG1", "P1-1_MSG2", "P1-1_MSG3"], "video": "cam1/sub1_1p.ogg" }, + { "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" } + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "loop": 0, "subtitles": ["CAM1_B2_MSG", "CAM1_B2_MSG2", "CAM1_B2_MSG3"], "video": "cam1/cam1bpow.ogg" } ] } } diff --git a/data/base/messages/brief1-2.json b/data/base/messages/brief1-2.json index 1e560fb7ece..32e4bef6d5c 100644 --- a/data/base/messages/brief1-2.json +++ b/data/base/messages/brief1-2.json @@ -2,15 +2,15 @@ "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" } + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "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" } + { "loop": 1, "subtitles": "SUB1_4A_MSG4", "video": "incomtns.ogg" }, + { "loop": 0, "subtitles": ["SUB1_2_MSG4", "SUB1_2_MSG5", "SUB1_2_MSG6"], "video": "cam1/sub12pt2.ogg" } ] } } diff --git a/data/base/messages/brief1-3.json b/data/base/messages/brief1-3.json index ca3e32258c8..843b3bc373e 100644 --- a/data/base/messages/brief1-3.json +++ b/data/base/messages/brief1-3.json @@ -2,31 +2,31 @@ "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" } + { "loop": 0, "subtitles": "P1-3A_MSG1", "video": "cam1/sub1_3p1.ogg" }, + { "loop": 0, "subtitles": ["BETA1_MSG1", "BETA1_MSG2", "BETA1_MSG3"], "video": "cam1/sub13bet.ogg" }, + { "loop": 0, "subtitles": ["GAMMA_MSG1", "GAMMA_MSG2", "GAMMA_MSG3"], "video": "cam1/sub13gam.ogg" }, + { "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" } + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "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" } + { "loop": 0, "subtitles": "NP_MSG1", "video": "cam1/sub13np1.ogg" }, + { "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" } + { "loop": 0, "subtitles": "NP_MSG1", "video": "cam1/sub13np2.ogg" }, + { "loop": 0, "subtitles": "NP_MSG2", "video": "npend.ogg" } ] } } diff --git a/data/base/messages/brief1-4a.json b/data/base/messages/brief1-4a.json index 92116dc7fbb..4f4d4393ec2 100644 --- a/data/base/messages/brief1-4a.json +++ b/data/base/messages/brief1-4a.json @@ -2,19 +2,19 @@ "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" } + { "loop": 1, "subtitles": ["SUB1_4A_MSG4", "SUB1_4A_MSG5", "SUB1_4A_MSG6"], "video": "cam1/sub1_4pl.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam1/sub14anp.ogg" }, + { "loop": 0, "subtitles": "NP_MSG2", "video": "npend.ogg" }, + { "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" } + { "loop": 1, "subtitles": ["TRANS_MSG1", "SUB1_4B_MSG2", "SUB1_4B_MSG3"], "video": "cam1/sub14bpl.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam1/sub1_4bn.ogg" }, + { "loop": 0, "subtitles": "NP_MSG2", "video": "nexend.ogg" }, + { "loop": 0, "subtitles": ["SUB1_4B_MSG4", "SUB1_4B_MSG5", "SUB1_4B_MSG6"], "video": "cam1/sub1_4b.ogg" } ] } } diff --git a/data/base/messages/brief1-5.json b/data/base/messages/brief1-5.json index 9c00d90db7d..daeb52f59d8 100644 --- a/data/base/messages/brief1-5.json +++ b/data/base/messages/brief1-5.json @@ -2,8 +2,8 @@ "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" } + { "loop": 0, "subtitles": "TRANS_MSG1", "video": "cam1/sub1_5pl.ogg" }, + { "loop": 0, "subtitles": ["SUB1_5_MSG1", "SUB1_5_MSG2", "SUB1_5_MSG3"], "video": "cam1/sub1_5.ogg" } ] } } diff --git a/data/base/messages/brief1-7.json b/data/base/messages/brief1-7.json index 682c0938437..40c405880b5 100644 --- a/data/base/messages/brief1-7.json +++ b/data/base/messages/brief1-7.json @@ -2,20 +2,20 @@ "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" } + { "loop": 1, "subtitles": ["TRANS_MSG1", "SUB1_7_MSG5", "SUB1_7_MSG6"], "video": "cam1/sub1_7pl.ogg" }, + { "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" } + { "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" } + { "loop": 0, "subtitles": ["SUB1_7_MSG1", "SUB1_7_MSG2", "SUB1_7_MSG3"], "video": "cam1/sub1_7b.ogg" } ] } } diff --git a/data/base/messages/brief1a-c.json b/data/base/messages/brief1a-c.json index 9c1ee0a5228..e38a9d05a56 100644 --- a/data/base/messages/brief1a-c.json +++ b/data/base/messages/brief1a-c.json @@ -2,15 +2,15 @@ "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" } + { "loop": 0, "subtitles": ["TRANS_MSG1", "CAM1A-C_MSG5", "CAM1A-C_MSG6"], "video": "cam1/cam1acp.ogg" }, + { "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" } + { "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "loop": 0, "subtitles": ["CAM1A-C_MSG1", "CAM1A-C_MSG2", "CAM1A-C_MSG3"], "video": "cam1/cam1ac.ogg" } ] } } diff --git a/data/base/messages/brief1a.json b/data/base/messages/brief1a.json index 17cc87dc322..a374a9b1701 100644 --- a/data/base/messages/brief1a.json +++ b/data/base/messages/brief1a.json @@ -2,14 +2,14 @@ "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" } + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM1_MSG1", "CAM1_MSG2", "CAM1_MSG3"], "video": "cam1/cam1.ogg" } ] } } diff --git a/data/base/messages/brief1b.json b/data/base/messages/brief1b.json index 83360c01c05..68bb978d16d 100644 --- a/data/base/messages/brief1b.json +++ b/data/base/messages/brief1b.json @@ -2,8 +2,8 @@ "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" } + { "loop": 1, "subtitles": ["P1B_MSG1", "P1B_MSG2", "P1B_MSG3"], "video": "cam1/cam1b_p.ogg" }, + { "loop": 0, "subtitles": ["CAM1B_MSG1", "CAM1B_MSG2", "CAM1B_MSG3"], "video": "cam1/cam1b.ogg" } ] } } diff --git a/data/base/messages/brief1c.json b/data/base/messages/brief1c.json index 34004092532..d9194bd47a2 100644 --- a/data/base/messages/brief1c.json +++ b/data/base/messages/brief1c.json @@ -2,31 +2,31 @@ "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" } + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "loop": 0, "subtitles": ["CAM1C_MSG1", "CAM1C_MSG2", "CAM1C_MSG3"], "video": "cam1/map1cexp.ogg" }, + { "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" } + { "loop": 1, "subtitles": "NP_MSG1", "video": "incomtns.ogg" }, + { "loop": 0, "subtitles": "NP_MSG2", "video": "cam1/cam1cnp.ogg" }, + { "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" } + { "loop": 1, "subtitles": "P1-3A_MSG1", "video": "prjupdat.ogg" }, + { "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" } + { "loop": 1, "subtitles": "P1-3A_MSG1", "video": "prjupdat.ogg" }, + { "loop": 0, "subtitles": ["CAM1C_MSG10", "CAM1C_MSG11"], "video": "cam1/cam1clz.ogg" } ] } } diff --git a/data/base/messages/brief1ca.json b/data/base/messages/brief1ca.json index bbcf4faeee4..8d3703522ae 100644 --- a/data/base/messages/brief1ca.json +++ b/data/base/messages/brief1ca.json @@ -2,9 +2,9 @@ "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" } + { "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "loop": 0, "subtitles": ["CAM1CA_MSG1", "CAM1CA_MSG2", "CAM1CA_MSG3"], "video": "cam1/cam1ca.ogg" }, + { "loop": 1, "subtitles": ["SUP_MSG1", "SUP_MSG2", "SUP_MSG3"], "video": "cam1/cam1capl.ogg" } ] } } diff --git a/data/base/messages/brief1d.json b/data/base/messages/brief1d.json index 48bf6278c29..a0af9ab0391 100644 --- a/data/base/messages/brief1d.json +++ b/data/base/messages/brief1d.json @@ -2,16 +2,16 @@ "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" } + { "loop": 1, "subtitles": ["CAM1D_MSG1", "CAM1D_MSG4", "CAM1D_MSG5"], "video": "cam1/cam1dp1.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam1/cam1dnp.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM1D_MSG1", "CAM1D_MSG2", "CAM1D_MSG3"], "video": "cam1/cam1d.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam1/cam1dp2.ogg" } ] } } diff --git a/data/base/messages/brief2-1.json b/data/base/messages/brief2-1.json index 1682fa52498..ecbe3f59590 100644 --- a/data/base/messages/brief2-1.json +++ b/data/base/messages/brief2-1.json @@ -2,13 +2,13 @@ "video0000": { "name": "MB2_1_MSG", "sequences": [ - { "audio": "", "loop": 0, "subtitles": ["CAM2_1_MSG1", "CAM2_1_MSG2"], "video": "brfcom4s.ogg" } + { "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" } + { "loop": 0, "subtitles": ["CAM2_1_MSG3", "CAM2_1_MSG4", "CAM2_1_MSG5"], "video": "cam2/cam2_1.ogg" } ] } } diff --git a/data/base/messages/brief2-2.json b/data/base/messages/brief2-2.json index 652822f50c9..de83fabc133 100644 --- a/data/base/messages/brief2-2.json +++ b/data/base/messages/brief2-2.json @@ -2,24 +2,24 @@ "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" } + { "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "loop": 0, "subtitles": ["CAM2_2_MSG", "CAM2_2_MSG2", "CAM2_2_MSG3"], "video": "cam2/cam22pl1.ogg" }, + { "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" } + { "loop": 0, "subtitles": "CAM2_2_MSG7", "video": "cam2/cam22pl2.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam2/cam22fmv.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam2/cam2_2n2.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM2_2_MSG4", "CAM2_2_MSG5", "CAM2_2_MSG6"], "video": "cam2/cam2_2.ogg" } ] } } diff --git a/data/base/messages/brief2-5.json b/data/base/messages/brief2-5.json index daa4f34e447..bdaae794f6f 100644 --- a/data/base/messages/brief2-5.json +++ b/data/base/messages/brief2-5.json @@ -2,14 +2,14 @@ "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" } + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM2_5_MSG4", "CAM2_5_MSG5", "CAM2_5_MSG6"], "video": "cam2/cam2_5.ogg" } ] } } diff --git a/data/base/messages/brief2-6.json b/data/base/messages/brief2-6.json index a9a20a34215..ab51491557b 100644 --- a/data/base/messages/brief2-6.json +++ b/data/base/messages/brief2-6.json @@ -2,22 +2,22 @@ "video0000": { "name": "MB2_6_MSG", "sequences": [ - { "audio": "", "loop": 0, "subtitles": "CAM2_6_MSG", "video": "cam2/cam26pl1.ogg" } + { "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" } + { "loop": 0, "subtitles": "", "video": "cam2/cam26afm.ogg" }, + { "loop": 1, "subtitles": ["CAM2_6_MSG", "CAM2_6_MSG2", "CAM2_6_MSG3"], "video": "cam2/cam26pl2.ogg" }, + { "loop": 0, "subtitles": ["CAM2_6_MSG4", "CAM2_6_MSG5", "CAM2_6_MSG6"], "video": "cam2/cam2_6a.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM2_6_MSG7", "CAM2_6_MSG8", "CAM2_6_MSG9"], "video": "cam2/cam2_6b.ogg" } ] } } diff --git a/data/base/messages/brief2-7.json b/data/base/messages/brief2-7.json index 592e18a5f09..70cc19e1760 100644 --- a/data/base/messages/brief2-7.json +++ b/data/base/messages/brief2-7.json @@ -2,14 +2,14 @@ "video0000": { "name": "MB2_7_MSG", "sequences": [ - { "audio": "", "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, - { "audio": "", "loop": 0, "subtitles": "", "video": "cam2/cam27fmv.ogg" } + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM2_7_MSG", "CAM2_7_MSG2", "CAM2_7_MSG3"], "video": "cam2/cam2_7.ogg" } ] } } diff --git a/data/base/messages/brief2-8.json b/data/base/messages/brief2-8.json index 1b3911b9652..a45fb9ea838 100644 --- a/data/base/messages/brief2-8.json +++ b/data/base/messages/brief2-8.json @@ -2,14 +2,14 @@ "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" } + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM2_8_MSG4", "CAM2_8_MSG5", "CAM2_8_MSG6"], "video": "cam2/cam2_8a.ogg" } ] } } diff --git a/data/base/messages/brief2-c.json b/data/base/messages/brief2-c.json index 90db62d823a..db14d611be9 100644 --- a/data/base/messages/brief2-c.json +++ b/data/base/messages/brief2-c.json @@ -2,16 +2,16 @@ "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" } + { "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "loop": 0, "subtitles": ["CAM2_C_MSG1", "CAM2_C_MSG2"], "video": "cam2/cam2capl.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM2_C_MSG6", "CAM2_C_MSG7", "CAM2_C_MSG8"], "video": "cam2/cam2cbpl.ogg" }, + { "loop": 0, "subtitles": ["CAM2_C_MSG9", "CAM2_C_MSG10", "CAM2_C_MSG11"], "video": "cam2/cam2cb.ogg" } ] } } diff --git a/data/base/messages/brief2-di.json b/data/base/messages/brief2-di.json index 27c6385773c..338b069ce21 100644 --- a/data/base/messages/brief2-di.json +++ b/data/base/messages/brief2-di.json @@ -2,15 +2,15 @@ "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" } + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "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" } + { "loop": 0, "subtitles": "CAM2_B_MSG3", "video": "cam2/cam2dipl.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam2/cam2dico.ogg" } ] } } diff --git a/data/base/messages/brief2-dii.json b/data/base/messages/brief2-dii.json index ae2891901e3..34b7e5096e8 100644 --- a/data/base/messages/brief2-dii.json +++ b/data/base/messages/brief2-dii.json @@ -2,23 +2,23 @@ "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" } + { "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom4s.ogg" }, + { "loop": 0, "subtitles": ["CAM2_DII_MSG1", "CAM2_DII_MSG2", "CAM2_DII_MSG9"], "video": "cam2/cam2diif.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM2_DII_MSG3", "CAM2_DII_MSG4", "CAM2_DII_MSG5"], "video": "cam2/cam2diib.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam2/cam2diin.ogg" }, + { "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" } + { "loop": 0, "subtitles": "", "video": "cam2/cam2out.ogg" } ] } } diff --git a/data/base/messages/brief2a.json b/data/base/messages/brief2a.json index e9ce351744c..974bf6f9241 100644 --- a/data/base/messages/brief2a.json +++ b/data/base/messages/brief2a.json @@ -2,14 +2,14 @@ "video0000": { "name": "MB2A_MSG", "sequences": [ - { "audio": "", "loop": 0, "subtitles": ["CAM2A_MSG1", "CAM2A_MSG2", "CAM2A_MSG3"], "video": "cam2/c002.ogg" } + { "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" } + { "loop": 0, "subtitles": ["NP_MSG1", "CAM2A_MSG7", "CAM2A_MSG8"], "video": "cam2/cam2ap.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam2/cam2acol.ogg" } ] } } diff --git a/data/base/messages/brief2b.json b/data/base/messages/brief2b.json index 0f9ab0325d1..d614087f467 100644 --- a/data/base/messages/brief2b.json +++ b/data/base/messages/brief2b.json @@ -2,14 +2,14 @@ "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" } + { "loop": 0, "subtitles": ["CAM2_B_MSG1", "CAM2_B_MSG2", "CAM2_B_MSG3"], "video": "cam2/cam2bpl.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM2_B_MSG7", "CAM2_B_MSG8", "CAM2_B_MSG9"], "video": "cam2/cam2b.ogg" } ] } } diff --git a/data/base/messages/brief3-1a.json b/data/base/messages/brief3-1a.json index c6cbbf9089a..80a05c9a586 100644 --- a/data/base/messages/brief3-1a.json +++ b/data/base/messages/brief3-1a.json @@ -2,15 +2,15 @@ "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" } + { "loop": 0, "subtitles": "CAM3_1A_MSG", "video": "incomint.ogg" }, + { "loop": 0, "subtitles": ["CAM3_1A_MSG1", "CAM3_1A_MSG2", "CAM3_1A_MSG3"], "video": "cam3/cam31gam.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM3_1A_MSG6", "CAM3_1A_MSG7", "CAM3_1A_MSG8"], "video": "cam3/cam3_1.ogg" } ] } } diff --git a/data/base/messages/brief3-1b.json b/data/base/messages/brief3-1b.json index fe168b2031d..0feaf4f8eb1 100644 --- a/data/base/messages/brief3-1b.json +++ b/data/base/messages/brief3-1b.json @@ -2,15 +2,15 @@ "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" } + { "loop": 0, "subtitles": "NP_MSG1", "video": "incomint.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam3/cam3_1bn.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM3_1B_MSG4", "CAM3_1B_MSG5", "CAM3_1B_MSG6"], "video": "cam3/cam3_1b.ogg" } ] } } diff --git a/data/base/messages/brief3-2.json b/data/base/messages/brief3-2.json index 41d48206379..00c52a644f0 100644 --- a/data/base/messages/brief3-2.json +++ b/data/base/messages/brief3-2.json @@ -2,28 +2,28 @@ "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" } + { "loop": 0, "subtitles": ["CAM3_2_MSG1", "CAM3_2_MSG2", "CAM3_2_MSG3"], "video": "cam3/cam32pl.ogg" }, + { "loop": 0, "subtitles": "CAM3_2_MSG4", "video": "cam3/cam32alp.ogg" }, + { "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" } + { "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" } + { "loop": 0, "subtitles": "NP_MSG1", "video": "incomtns.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam3/cam32a2.ogg" } ] }, "video0003": { "name": "MB3_2_MSG4", "sequences": [ - { "audio": "", "loop": 0, "subtitles": "CAM3_2_MSG9", "video": "cam3/cam32pl3.ogg" } + { "loop": 0, "subtitles": "CAM3_2_MSG9", "video": "cam3/cam32pl3.ogg" } ] } } diff --git a/data/base/messages/brief3-4.json b/data/base/messages/brief3-4.json index 0b0342e04d2..210e088f226 100644 --- a/data/base/messages/brief3-4.json +++ b/data/base/messages/brief3-4.json @@ -2,32 +2,32 @@ "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" } + { "loop": 0, "subtitles": "CAM3_4_MSG1", "video": "brfcom.ogg" }, + { "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" } + { "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" } + { "loop": 0, "subtitles": "", "video": "cam3/cam34fmv.ogg" } ] }, "video0003": { "name": "MB3_4_MSG4", "sequences": [ - { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam34mu1.ogg" } + { "loop": 0, "subtitles": "", "video": "cam3/cam34mu1.ogg" } ] }, "video0004": { "name": "MB3_4_MSG5", "sequences": [ - { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam34mu2.ogg" } + { "loop": 0, "subtitles": "", "video": "cam3/cam34mu2.ogg" } ] } } diff --git a/data/base/messages/brief3-a.json b/data/base/messages/brief3-a.json index 71f21382ab9..046febbcbaa 100644 --- a/data/base/messages/brief3-a.json +++ b/data/base/messages/brief3-a.json @@ -2,14 +2,14 @@ "video0000": { "name": "MB3A_MSG", "sequences": [ - { "audio": "", "loop": 0, "subtitles": ["CAM3_MSG1", "CAM3_MSG2", "CAM3_MSG3"], "video": "cam3/cam3intp.ogg" }, - { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/cam3int.ogg" } + { "loop": 0, "subtitles": ["CAM3_MSG1", "CAM3_MSG2", "CAM3_MSG3"], "video": "cam3/cam3intp.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam3/cam3int.ogg" } ] }, "video0001": { "name": "MB3A_MSG2", "sequences": [ - { "audio": "", "loop": 0, "subtitles": ["CAM3A_MSG1", "CAM3A_MSG2", "CAM3A_MSG3"], "video": "cam3/cam3intb.ogg" } + { "loop": 0, "subtitles": ["CAM3A_MSG1", "CAM3A_MSG2", "CAM3A_MSG3"], "video": "cam3/cam3intb.ogg" } ] } } diff --git a/data/base/messages/brief3-b.json b/data/base/messages/brief3-b.json index c7585f83771..2bafc0b7947 100644 --- a/data/base/messages/brief3-b.json +++ b/data/base/messages/brief3-b.json @@ -2,21 +2,21 @@ "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" } + { "loop": 0, "subtitles": ["CAM3_B_MSG1", "CAM3_B_MSG2", "CAM3_B_MSG3"], "video": "cam3/cam3bpl.ogg" }, + { "loop": 0, "subtitles": "INCOM_INT", "video": "incomint.ogg" }, + { "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" } + { "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" } + { "loop": 0, "subtitles": "", "video": "cam3/cam3_bn.ogg" } ] } } diff --git a/data/base/messages/brief3-c.json b/data/base/messages/brief3-c.json index 7a32a3fbe74..ff9c98e49ec 100644 --- a/data/base/messages/brief3-c.json +++ b/data/base/messages/brief3-c.json @@ -2,19 +2,19 @@ "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" } + { "loop": 0, "subtitles": ["CAM3_C_MSG1", "CAM3_C_MSG2"], "video": "cam3/cam3cpl1.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam3/cam3_cn.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam3/c3c.ogg" }, + { "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" } + { "loop": 0, "subtitles": ["CAM3_C_MSG5", "CAM3_C_MSG6", "CAM3_C_MSG7"], "video": "cam3/cam3cbet.ogg" }, + { "loop": 0, "subtitles": ["CAM3_C_MSG8", "CAM3_C_MSG9"], "video": "cam3/cam3cpl3.ogg" }, + { "loop": 0, "subtitles": "CAM3_C_MSG10", "video": "incomtns.ogg" }, + { "loop": 0, "subtitles": ["CAM3_C_MSG11", "CAM3_C_MSG12", "CAM3_C_MSG13"], "video": "cam3/cam3_cg.ogg" } ] } } diff --git a/data/base/messages/brief3a-b.json b/data/base/messages/brief3a-b.json index 0be44af98b8..5971e9ca81d 100644 --- a/data/base/messages/brief3a-b.json +++ b/data/base/messages/brief3a-b.json @@ -2,21 +2,21 @@ "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" } + { "loop": 0, "subtitles": ["CAM3_AB_MSG1", "CAM3_AB_MSG2"], "video": "brfcom4s.ogg" }, + { "loop": 0, "subtitles": ["CAM3_AB_MSG3", "CAM3_AB_MSG4"], "video": "cam3/cam3aba.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam3/cam3abf.ogg" } ] }, "video0001": { "name": "MB3_AB_MSG2", "sequences": [ - { "audio": "", "loop": 0, "subtitles": "CAM3_AB_MSG1", "video": "cam3/cam3abpl.ogg" } + { "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" } + { "loop": 0, "subtitles": ["CAM3_AB_MSG5", "CAM3_AB_MSG6", "CAM3_AB_MSG7"], "video": "cam3/cam3ab.ogg" } ] } } diff --git a/data/base/messages/brief3a-d1.json b/data/base/messages/brief3a-d1.json index 56f48207b7c..28e359a5066 100644 --- a/data/base/messages/brief3a-d1.json +++ b/data/base/messages/brief3a-d1.json @@ -2,27 +2,27 @@ "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" } + { "loop": 0, "subtitles": ["CAM3A_D1_MSG1", "CAM3A_D1_MSG2", "CAM3A_D1_MSG3"], "video": "cam3/c3ad1pl1.ogg" }, + { "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" } + { "loop": 0, "subtitles": "CAM3A_D1_MSG6", "video": "cam3/c3ad1pl2.ogg" }, + { "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" } + { "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" } + { "loop": 0, "subtitles": "CAM3A_D1_MSG12", "video": "cam3/c3ad1pl3.ogg" } ] } } diff --git a/data/base/messages/brief3a-d2.json b/data/base/messages/brief3a-d2.json index 10530df35bf..96b44e396fc 100644 --- a/data/base/messages/brief3a-d2.json +++ b/data/base/messages/brief3a-d2.json @@ -2,41 +2,41 @@ "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" } + { "loop": 0, "subtitles": ["CAM3A_D2_MSG1", "CAM3A_D2_MSG2", "CAM3A_D2_MSG3"], "video": "cam3/c3ad2pl1.ogg" }, + { "loop": 0, "subtitles": ["CAM3A_D2_MSG4", "CAM3A_D2_MSG5", "CAM3A_D2_MSG6"], "video": "cam3/c3ad2pl2.ogg" }, + { "loop": 0, "subtitles": "CAM3A_D2_MSG7", "video": "cam3/c3ad2pl3.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam3/cam3ad2n.ogg" } ] }, "video0001": { "name": "MB3_AD2_MSG2", "sequences": [ - { "audio": "", "loop": 0, "subtitles": "", "video": "cam3/c3ad2n2.ogg" } + { "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" } + { "loop": 1, "subtitles": ["CAM3A_D2_MSG8", "CAM3A_D2_MSG9", "CAM3A_D2_MSG10"], "video": "cam3/c3ad2pl4.ogg" }, + { "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" } + { "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" } + { "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" } + { "loop": 0, "subtitles": ["CAM3A_D2_MSG20", "CAM3A_D2_MSG21"], "video": "cam3/c3ad2_16.ogg" } ] } } diff --git a/data/base/messages/briefdemo.json b/data/base/messages/briefdemo.json index e768c186273..02a2b2f2736 100644 --- a/data/base/messages/briefdemo.json +++ b/data/base/messages/briefdemo.json @@ -2,8 +2,8 @@ "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" } + { "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "loop": 0, "subtitles": ["CAM1A_MSG1", "CAM1A_MSG2", "CAM1A_MSG3"], "video": "fastplay.ogg" } ] } } diff --git a/data/base/messages/brieftut.json b/data/base/messages/brieftut.json index 2264328b4c7..9439314cdfa 100644 --- a/data/base/messages/brieftut.json +++ b/data/base/messages/brieftut.json @@ -2,7 +2,7 @@ "video0000": { "name": "FACTORYVIPER", "sequences": [ - { "audio": "", "loop": 0, "subtitles": "", "video": "factory.ogg" } + { "loop": 0, "subtitles": "", "video": "factory.ogg" } ] } } diff --git a/data/base/messages/cam1-outro.json b/data/base/messages/cam1-outro.json index 4315334277e..82fe0fe6895 100644 --- a/data/base/messages/cam1-outro.json +++ b/data/base/messages/cam1-outro.json @@ -2,23 +2,23 @@ "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" } + { "loop": 0, "subtitles": ["CAM1OUT_MSG1", "CAM1OUT_MSG2", "CAM1OUT_MSG3"], "video": "cam1/cam1out1.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam1/cam1out2.ogg" }, + { "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" } + { "loop": 0, "subtitles": "", "video": "cam1/cam1out4.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam1/cam1out5.ogg" }, + { "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" } + { "loop": 0, "subtitles": "CAM1OUT_MSG6", "video": "cam1/c001end.ogg" } ] } } diff --git a/data/base/messages/genmessages.json b/data/base/messages/genmessages.json index 553d6846610..6a6d3baea0f 100644 --- a/data/base/messages/genmessages.json +++ b/data/base/messages/genmessages.json @@ -2,13 +2,13 @@ "video0000": { "name": "END", "sequences": [ - { "audio": "", "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } + { "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } ] }, "video0001": { "name": "WIN", "sequences": [ - { "audio": "", "loop": 0, "subtitles": "WIN_MSG1", "video": "victory.ogg" } + { "loop": 0, "subtitles": "WIN_MSG1", "video": "victory.ogg" } ] } } diff --git a/doc/BriefAndProximityFormat.md b/doc/BriefAndProximityFormat.md index f8ec1feef30..3ae5a0e72b2 100644 --- a/doc/BriefAndProximityFormat.md +++ b/doc/BriefAndProximityFormat.md @@ -32,8 +32,8 @@ Example: "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" } + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "loop": 0, "subtitles": ["CAM1A_MSG1", "CAM1A_MSG2", "CAM1A_MSG3"], "video": "cam1/cam1ascv.ogg" } ] } } @@ -43,7 +43,6 @@ Each video sequence should start with something simple like "video..." or someth 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/". diff --git a/src/message.cpp b/src/message.cpp index b81cbb572f1..1ce6400b508 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -770,8 +770,6 @@ WzString *loadFlicViewData(const char *fileName) { 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.