diff --git a/data/base/messages/brief1-1.json b/data/base/messages/brief1-1.json index 3c9c0fd3415..0603025ff73 100644 --- a/data/base/messages/brief1-1.json +++ b/data/base/messages/brief1-1.json @@ -1,22 +1,22 @@ { - "video0000": { - "name": "FLIGHT", - "sequences": [ - { "loop": 0, "subtitles": "INFLIGHT_MSG1", "video": "inflight.ogg" } - ] - }, - "video0001": { - "name": "SB1_1_MSG", - "sequences": [ - { "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": [ - { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, - { "loop": 0, "subtitles": ["CAM1_B2_MSG", "CAM1_B2_MSG2", "CAM1_B2_MSG3"], "video": "cam1/cam1bpow.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "FLIGHT": { + "sequences": [ + { "loop": 0, "subtitles": "INFLIGHT_MSG1", "video": "inflight.ogg" } + ] + }, + "SB1_1_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB1_B2_MSG": { + "sequences": [ + { "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 32e4bef6d5c..bb214219e20 100644 --- a/data/base/messages/brief1-2.json +++ b/data/base/messages/brief1-2.json @@ -1,16 +1,17 @@ { - "video0000": { - "name": "SB1_2_MSG", - "sequences": [ - { "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": [ - { "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" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "SB1_2_MSG": { + "sequences": [ + { "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" } + ] + }, + "SB1_2_MSG2": { + "sequences": [ + { "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 843b3bc373e..6cffcbc7e90 100644 --- a/data/base/messages/brief1-3.json +++ b/data/base/messages/brief1-3.json @@ -1,32 +1,31 @@ { - "video0000": { - "name": "SB1_3_UPDATE", - "sequences": [ - { "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": [ - { "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": [ - { "loop": 0, "subtitles": "NP_MSG1", "video": "cam1/sub13np1.ogg" }, - { "loop": 0, "subtitles": "NP_MSG2", "video": "npend.ogg" } - ] - }, - "video0003": { - "name": "SB1_3_MSG4", - "sequences": [ - { "loop": 0, "subtitles": "NP_MSG1", "video": "cam1/sub13np2.ogg" }, - { "loop": 0, "subtitles": "NP_MSG2", "video": "npend.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "SB1_3_UPDATE": { + "sequences": [ + { "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" } + ] + }, + "SB1_3_MSG": { + "sequences": [ + { "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" } + ] + }, + "SB1_3_MSG3": { + "sequences": [ + { "loop": 0, "subtitles": "NP_MSG1", "video": "cam1/sub13np1.ogg" }, + { "loop": 0, "subtitles": "NP_MSG2", "video": "npend.ogg" } + ] + }, + "SB1_3_MSG4": { + "sequences": [ + { "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 4f4d4393ec2..3c71977f3fe 100644 --- a/data/base/messages/brief1-4a.json +++ b/data/base/messages/brief1-4a.json @@ -1,20 +1,21 @@ { - "video0000": { - "name": "SB1_4_MSG", - "sequences": [ - { "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": [ - { "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" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "SB1_4_MSG": { + "sequences": [ + { "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" } + ] + }, + "SB1_4_B": { + "sequences": [ + { "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 daeb52f59d8..3143894b6e5 100644 --- a/data/base/messages/brief1-5.json +++ b/data/base/messages/brief1-5.json @@ -1,9 +1,11 @@ { - "video0000": { - "name": "SB1_5_MSG", - "sequences": [ - { "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" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "SB1_5_MSG": { + "sequences": [ + { "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 40c405880b5..92895c4309b 100644 --- a/data/base/messages/brief1-7.json +++ b/data/base/messages/brief1-7.json @@ -1,21 +1,21 @@ { - "video0000": { - "name": "SB1_7_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["SUB1_7_MSG1", "SUB1_7_MSG2", "SUB1_7_MSG3"], "video": "cam1/sub1_7.ogg" } - ] - }, - "video0002": { - "name": "SB1_7_MSG3", - "sequences": [ - { "loop": 0, "subtitles": ["SUB1_7_MSG1", "SUB1_7_MSG2", "SUB1_7_MSG3"], "video": "cam1/sub1_7b.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "SB1_7_MSG": { + "sequences": [ + { "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" } + ] + }, + "SB1_7_MSG2": { + "sequences": [ + { "loop": 0, "subtitles": ["SUB1_7_MSG1", "SUB1_7_MSG2", "SUB1_7_MSG3"], "video": "cam1/sub1_7.ogg" } + ] + }, + "SB1_7_MSG3": { + "sequences": [ + { "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 e38a9d05a56..360182df863 100644 --- a/data/base/messages/brief1a-c.json +++ b/data/base/messages/brief1a-c.json @@ -1,16 +1,17 @@ { - "video0000": { - "name": "MB1A-C_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, - { "loop": 0, "subtitles": ["CAM1A-C_MSG1", "CAM1A-C_MSG2", "CAM1A-C_MSG3"], "video": "cam1/cam1ac.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB1A-C_MSG": { + "sequences": [ + { "loop": 0, "subtitles": ["TRANS_MSG1", "CAM1A-C_MSG5", "CAM1A-C_MSG6"], "video": "cam1/cam1acp.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam1/map1a_c.ogg" } + ] + }, + "MB1A-C_MSG2": { + "sequences": [ + { "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 a374a9b1701..dc39636b94f 100644 --- a/data/base/messages/brief1a.json +++ b/data/base/messages/brief1a.json @@ -1,15 +1,16 @@ { - "video0000": { - "name": "MB1A_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM1_MSG1", "CAM1_MSG2", "CAM1_MSG3"], "video": "cam1/cam1.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB1A_MSG": { + "sequences": [ + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "loop": 0, "subtitles": ["CAM1A_MSG1", "CAM1A_MSG2", "CAM1A_MSG3"], "video": "cam1/cam1ascv.ogg" } + ] + }, + "CMB1_MSG": { + "sequences": [ + { "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 68bb978d16d..2be9f4e8cd9 100644 --- a/data/base/messages/brief1b.json +++ b/data/base/messages/brief1b.json @@ -1,9 +1,11 @@ { - "video0000": { - "name": "MB1B_MSG", - "sequences": [ - { "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" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB1B_MSG": { + "sequences": [ + { "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 d9194bd47a2..2fd7c000488 100644 --- a/data/base/messages/brief1c.json +++ b/data/base/messages/brief1c.json @@ -1,32 +1,31 @@ { - "video0000": { - "name": "MB1C_MSG", - "sequences": [ - { "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": [ - { "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": [ - { "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": [ - { "loop": 1, "subtitles": "P1-3A_MSG1", "video": "prjupdat.ogg" }, - { "loop": 0, "subtitles": ["CAM1C_MSG10", "CAM1C_MSG11"], "video": "cam1/cam1clz.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB1C_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB1C2_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB1C3_MSG": { + "sequences": [ + { "loop": 1, "subtitles": "P1-3A_MSG1", "video": "prjupdat.ogg" }, + { "loop": 0, "subtitles": ["CAM1C_MSG7", "CAM1C_MSG8", "CAM1C_MSG9"], "video": "cam1/cam1ccf.ogg" } + ] + }, + "MB1C4_MSG": { + "sequences": [ + { "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 8d3703522ae..ee269b4346e 100644 --- a/data/base/messages/brief1ca.json +++ b/data/base/messages/brief1ca.json @@ -1,10 +1,12 @@ { - "video0000": { - "name": "MB1CA_MSG", - "sequences": [ - { "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" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB1CA_MSG": { + "sequences": [ + { "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 a0af9ab0391..6e8cc3823ac 100644 --- a/data/base/messages/brief1d.json +++ b/data/base/messages/brief1d.json @@ -1,17 +1,18 @@ { - "video0000": { - "name": "MB1D_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM1D_MSG1", "CAM1D_MSG2", "CAM1D_MSG3"], "video": "cam1/cam1d.ogg" }, - { "loop": 0, "subtitles": "", "video": "cam1/cam1dp2.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB1D_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB1D_MSG2": { + "sequences": [ + { "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 ecbe3f59590..0d2064cf098 100644 --- a/data/base/messages/brief2-1.json +++ b/data/base/messages/brief2-1.json @@ -1,14 +1,15 @@ { - "video0000": { - "name": "MB2_1_MSG", - "sequences": [ - { "loop": 0, "subtitles": ["CAM2_1_MSG1", "CAM2_1_MSG2"], "video": "brfcom4s.ogg" } - ] - }, - "video0001": { - "name": "MB2_1_MSG2", - "sequences": [ - { "loop": 0, "subtitles": ["CAM2_1_MSG3", "CAM2_1_MSG4", "CAM2_1_MSG5"], "video": "cam2/cam2_1.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB2_1_MSG": { + "sequences": [ + { "loop": 0, "subtitles": ["CAM2_1_MSG1", "CAM2_1_MSG2"], "video": "brfcom4s.ogg" } + ] + }, + "MB2_1_MSG2": { + "sequences": [ + { "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 de83fabc133..5511eb3e0e1 100644 --- a/data/base/messages/brief2-2.json +++ b/data/base/messages/brief2-2.json @@ -1,25 +1,25 @@ { - "video0000": { - "name": "MB2_2_MSG", - "sequences": [ - { "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": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM2_2_MSG4", "CAM2_2_MSG5", "CAM2_2_MSG6"], "video": "cam2/cam2_2.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB2_2_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB2_2_MSG2": { + "sequences": [ + { "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" } + ] + }, + "MB2_2_MSG3": { + "sequences": [ + { "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 bdaae794f6f..f26ec23abce 100644 --- a/data/base/messages/brief2-5.json +++ b/data/base/messages/brief2-5.json @@ -1,15 +1,16 @@ { - "video0000": { - "name": "MB2_5_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM2_5_MSG4", "CAM2_5_MSG5", "CAM2_5_MSG6"], "video": "cam2/cam2_5.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB2_5_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB2_5_MSG2": { + "sequences": [ + { "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 ab51491557b..b23445af980 100644 --- a/data/base/messages/brief2-6.json +++ b/data/base/messages/brief2-6.json @@ -1,23 +1,23 @@ { - "video0000": { - "name": "MB2_6_MSG", - "sequences": [ - { "loop": 0, "subtitles": "CAM2_6_MSG", "video": "cam2/cam26pl1.ogg" } - ] - }, - "video0001": { - "name": "MB2_6_MSG2", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM2_6_MSG7", "CAM2_6_MSG8", "CAM2_6_MSG9"], "video": "cam2/cam2_6b.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB2_6_MSG": { + "sequences": [ + { "loop": 0, "subtitles": "CAM2_6_MSG", "video": "cam2/cam26pl1.ogg" } + ] + }, + "MB2_6_MSG2": { + "sequences": [ + { "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" } + ] + }, + "MB2_6_MSG3": { + "sequences": [ + { "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 70cc19e1760..8be948a233d 100644 --- a/data/base/messages/brief2-7.json +++ b/data/base/messages/brief2-7.json @@ -1,15 +1,16 @@ { - "video0000": { - "name": "MB2_7_MSG", - "sequences": [ - { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, - { "loop": 0, "subtitles": "", "video": "cam2/cam27fmv.ogg" } - ] - }, - "video0001": { - "name": "MB2_7_MSG2", - "sequences": [ - { "loop": 0, "subtitles": ["CAM2_7_MSG", "CAM2_7_MSG2", "CAM2_7_MSG3"], "video": "cam2/cam2_7.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB2_7_MSG": { + "sequences": [ + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam2/cam27fmv.ogg" } + ] + }, + "MB2_7_MSG2": { + "sequences": [ + { "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 a45fb9ea838..5601f8e8cdb 100644 --- a/data/base/messages/brief2-8.json +++ b/data/base/messages/brief2-8.json @@ -1,15 +1,16 @@ { - "video0000": { - "name": "MB2_8_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM2_8_MSG4", "CAM2_8_MSG5", "CAM2_8_MSG6"], "video": "cam2/cam2_8a.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB2_8_MSG": { + "sequences": [ + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "loop": 1, "subtitles": ["CAM2_8_MSG", "CAM2_8_MSG2", "CAM2_8_MSG3"], "video": "cam2/cam28apl.ogg" } + ] + }, + "MB2_8_MSG2": { + "sequences": [ + { "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 db14d611be9..b153540a06c 100644 --- a/data/base/messages/brief2-c.json +++ b/data/base/messages/brief2-c.json @@ -1,17 +1,18 @@ { - "video0000": { - "name": "MB2_C_MSG", - "sequences": [ - { "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": [ - { "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" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB2_C_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB2_C_MSG2": { + "sequences": [ + { "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 338b069ce21..ba2b776e648 100644 --- a/data/base/messages/brief2-di.json +++ b/data/base/messages/brief2-di.json @@ -1,16 +1,17 @@ { - "video0000": { - "name": "MB2_DI_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": "CAM2_B_MSG3", "video": "cam2/cam2dipl.ogg" }, - { "loop": 0, "subtitles": "", "video": "cam2/cam2dico.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB2_DI_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB2_DI_MSG2": { + "sequences": [ + { "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 34b7e5096e8..b48d2d13c5d 100644 --- a/data/base/messages/brief2-dii.json +++ b/data/base/messages/brief2-dii.json @@ -1,24 +1,24 @@ { - "video0000": { - "name": "MB2_DII_MSG", - "sequences": [ - { "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": [ - { "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": [ - { "loop": 0, "subtitles": "", "video": "cam2/cam2out.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB2_DII_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB2_DII_MSG2": { + "sequences": [ + { "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" } + ] + }, + "CAM2_OUT": { + "sequences": [ + { "loop": 0, "subtitles": "", "video": "cam2/cam2out.ogg" } + ] + } } } diff --git a/data/base/messages/brief2a.json b/data/base/messages/brief2a.json index 974bf6f9241..18a19f6be9d 100644 --- a/data/base/messages/brief2a.json +++ b/data/base/messages/brief2a.json @@ -1,15 +1,16 @@ { - "video0000": { - "name": "MB2A_MSG", - "sequences": [ - { "loop": 0, "subtitles": ["CAM2A_MSG1", "CAM2A_MSG2", "CAM2A_MSG3"], "video": "cam2/c002.ogg" } - ] - }, - "video0001": { - "name": "MB2A_MSG2", - "sequences": [ - { "loop": 0, "subtitles": ["NP_MSG1", "CAM2A_MSG7", "CAM2A_MSG8"], "video": "cam2/cam2ap.ogg" }, - { "loop": 0, "subtitles": "", "video": "cam2/cam2acol.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB2A_MSG": { + "sequences": [ + { "loop": 0, "subtitles": ["CAM2A_MSG1", "CAM2A_MSG2", "CAM2A_MSG3"], "video": "cam2/c002.ogg" } + ] + }, + "MB2A_MSG2": { + "sequences": [ + { "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 d614087f467..ccd212869d4 100644 --- a/data/base/messages/brief2b.json +++ b/data/base/messages/brief2b.json @@ -1,15 +1,16 @@ { - "video0000": { - "name": "MB2_B_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM2_B_MSG7", "CAM2_B_MSG8", "CAM2_B_MSG9"], "video": "cam2/cam2b.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB2_B_MSG": { + "sequences": [ + { "loop": 0, "subtitles": ["CAM2_B_MSG1", "CAM2_B_MSG2", "CAM2_B_MSG3"], "video": "cam2/cam2bpl.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam2/cam2bcol.ogg" } + ] + }, + "MB2_B_MSG2": { + "sequences": [ + { "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 80a05c9a586..33cfb7765b1 100644 --- a/data/base/messages/brief3-1a.json +++ b/data/base/messages/brief3-1a.json @@ -1,16 +1,17 @@ { - "video0000": { - "name": "MB3_1A_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM3_1A_MSG6", "CAM3_1A_MSG7", "CAM3_1A_MSG8"], "video": "cam3/cam3_1.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB3_1A_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB3_1A_MSG2": { + "sequences": [ + { "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 0feaf4f8eb1..ab85fb1dacf 100644 --- a/data/base/messages/brief3-1b.json +++ b/data/base/messages/brief3-1b.json @@ -1,16 +1,17 @@ { - "video0000": { - "name": "MB3_1B_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM3_1B_MSG4", "CAM3_1B_MSG5", "CAM3_1B_MSG6"], "video": "cam3/cam3_1b.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB3_1B_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB3_1B_MSG2": { + "sequences": [ + { "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 00c52a644f0..13579e34391 100644 --- a/data/base/messages/brief3-2.json +++ b/data/base/messages/brief3-2.json @@ -1,29 +1,28 @@ { - "video0000": { - "name": "MB3_2_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM3_2_MSG6", "CAM3_2_MSG7", "CAM3_2_MSG8"], "video": "cam3/cam3_2b.ogg" } - ] - }, - "video0002": { - "name": "MB3_2_MSG3", - "sequences": [ - { "loop": 0, "subtitles": "NP_MSG1", "video": "incomtns.ogg" }, - { "loop": 0, "subtitles": "", "video": "cam3/cam32a2.ogg" } - ] - }, - "video0003": { - "name": "MB3_2_MSG4", - "sequences": [ - { "loop": 0, "subtitles": "CAM3_2_MSG9", "video": "cam3/cam32pl3.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB3_2_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB3_2_MSG2": { + "sequences": [ + { "loop": 0, "subtitles": ["CAM3_2_MSG6", "CAM3_2_MSG7", "CAM3_2_MSG8"], "video": "cam3/cam3_2b.ogg" } + ] + }, + "MB3_2_MSG3": { + "sequences": [ + { "loop": 0, "subtitles": "NP_MSG1", "video": "incomtns.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam3/cam32a2.ogg" } + ] + }, + "MB3_2_MSG4": { + "sequences": [ + { "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 210e088f226..dfbdd071272 100644 --- a/data/base/messages/brief3-4.json +++ b/data/base/messages/brief3-4.json @@ -1,33 +1,31 @@ { - "video0000": { - "name": "MB3_4_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM3_4_MSG5", "CAM3_4_MSG6"], "video": "cam3/cam3_4b.ogg" } - ] - }, - "video0002": { - "name": "MB3_4_MSG3", - "sequences": [ - { "loop": 0, "subtitles": "", "video": "cam3/cam34fmv.ogg" } - ] - }, - "video0003": { - "name": "MB3_4_MSG4", - "sequences": [ - { "loop": 0, "subtitles": "", "video": "cam3/cam34mu1.ogg" } - ] - }, - "video0004": { - "name": "MB3_4_MSG5", - "sequences": [ - { "loop": 0, "subtitles": "", "video": "cam3/cam34mu2.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB3_4_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB3_4_MSG2": { + "sequences": [ + { "loop": 0, "subtitles": ["CAM3_4_MSG5", "CAM3_4_MSG6"], "video": "cam3/cam3_4b.ogg" } + ] + }, + "MB3_4_MSG3": { + "sequences": [ + { "loop": 0, "subtitles": "", "video": "cam3/cam34fmv.ogg" } + ] + }, + "MB3_4_MSG4": { + "sequences": [ + { "loop": 0, "subtitles": "", "video": "cam3/cam34mu1.ogg" } + ] + }, + "MB3_4_MSG5": { + "sequences": [ + { "loop": 0, "subtitles": "", "video": "cam3/cam34mu2.ogg" } + ] + } } } diff --git a/data/base/messages/brief3-a.json b/data/base/messages/brief3-a.json index 046febbcbaa..6f9ea19062c 100644 --- a/data/base/messages/brief3-a.json +++ b/data/base/messages/brief3-a.json @@ -1,15 +1,16 @@ { - "video0000": { - "name": "MB3A_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM3A_MSG1", "CAM3A_MSG2", "CAM3A_MSG3"], "video": "cam3/cam3intb.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB3A_MSG": { + "sequences": [ + { "loop": 0, "subtitles": ["CAM3_MSG1", "CAM3_MSG2", "CAM3_MSG3"], "video": "cam3/cam3intp.ogg" }, + { "loop": 0, "subtitles": "", "video": "cam3/cam3int.ogg" } + ] + }, + "MB3A_MSG2": { + "sequences": [ + { "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 2bafc0b7947..ee7dd68e509 100644 --- a/data/base/messages/brief3-b.json +++ b/data/base/messages/brief3-b.json @@ -1,22 +1,22 @@ { - "video0000": { - "name": "MB3_B_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM3_B_MSG4", "CAM3_B_MSG5", "CAM3_B_MSG6"], "video": "cam3/cam3b.ogg" } - ] - }, - "video0002": { - "name": "MB3_B_MSG3", - "sequences": [ - { "loop": 0, "subtitles": "", "video": "cam3/cam3_bn.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB3_B_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB3_B_MSG2": { + "sequences": [ + { "loop": 0, "subtitles": ["CAM3_B_MSG4", "CAM3_B_MSG5", "CAM3_B_MSG6"], "video": "cam3/cam3b.ogg" } + ] + }, + "MB3_B_MSG3": { + "sequences": [ + { "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 ff9c98e49ec..4a8100127e2 100644 --- a/data/base/messages/brief3-c.json +++ b/data/base/messages/brief3-c.json @@ -1,20 +1,21 @@ { - "video0000": { - "name": "MB3_C_MSG", - "sequences": [ - { "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": [ - { "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" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB3_C_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB3_C_MSG2": { + "sequences": [ + { "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 5971e9ca81d..3d61ec83ad0 100644 --- a/data/base/messages/brief3a-b.json +++ b/data/base/messages/brief3a-b.json @@ -1,22 +1,22 @@ { - "video0000": { - "name": "MB3_AB_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": "CAM3_AB_MSG1", "video": "cam3/cam3abpl.ogg" } - ] - }, - "video0002": { - "name": "MB3_AB_MSG3", - "sequences": [ - { "loop": 0, "subtitles": ["CAM3_AB_MSG5", "CAM3_AB_MSG6", "CAM3_AB_MSG7"], "video": "cam3/cam3ab.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB3_AB_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB3_AB_MSG2": { + "sequences": [ + { "loop": 0, "subtitles": "CAM3_AB_MSG1", "video": "cam3/cam3abpl.ogg" } + ] + }, + "MB3_AB_MSG3": { + "sequences": [ + { "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 28e359a5066..de0524a2b0b 100644 --- a/data/base/messages/brief3a-d1.json +++ b/data/base/messages/brief3a-d1.json @@ -1,28 +1,27 @@ { - "video0000": { - "name": "MB3_AD1_MSG", - "sequences": [ - { "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": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM3A_D1_MSG9", "CAM3A_D1_MSG10", "CAM3A_D1_MSG11"], "video": "cam3/cam3ad1b.ogg" } - ] - }, - "video0003": { - "name": "MB3_AD1_MSG4", - "sequences": [ - { "loop": 0, "subtitles": "CAM3A_D1_MSG12", "video": "cam3/c3ad1pl3.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB3_AD1_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB3_AD1_MSG2": { + "sequences": [ + { "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" } + ] + }, + "MB3_AD1_MSG3": { + "sequences": [ + { "loop": 0, "subtitles": ["CAM3A_D1_MSG9", "CAM3A_D1_MSG10", "CAM3A_D1_MSG11"], "video": "cam3/cam3ad1b.ogg" } + ] + }, + "MB3_AD1_MSG4": { + "sequences": [ + { "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 96b44e396fc..32020641bed 100644 --- a/data/base/messages/brief3a-d2.json +++ b/data/base/messages/brief3a-d2.json @@ -1,42 +1,39 @@ { - "video0000": { - "name": "MB3_AD2_MSG", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": "", "video": "cam3/c3ad2n2.ogg" } - ] - }, - "video0002": { - "name": "MB3_AD2_MSG3", - "sequences": [ - { "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": [ - { "loop": 0, "subtitles": ["CAM3A_D2_MSG14", "CAM3A_D2_MSG15", "CAM3A_D2_MSG16"], "video": "cam3/c3ad2_12.ogg" } - ] - }, - "video0004": { - "name": "MB3_AD2_MSG5", - "sequences": [ - { "loop": 0, "subtitles": ["CAM3A_D2_MSG17", "CAM3A_D2_MSG18", "CAM3A_D2_MSG19"], "video": "cam3/c3ad2_14.ogg" } - ] - }, - "video0005": { - "name": "MB3_AD2_MSG6", - "sequences": [ - { "loop": 0, "subtitles": ["CAM3A_D2_MSG20", "CAM3A_D2_MSG21"], "video": "cam3/c3ad2_16.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB3_AD2_MSG": { + "sequences": [ + { "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" } + ] + }, + "MB3_AD2_MSG2": { + "sequences": [ + { "loop": 0, "subtitles": "", "video": "cam3/c3ad2n2.ogg" } + ] + }, + "MB3_AD2_MSG3": { + "sequences": [ + { "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" } + ] + }, + "MB3_AD2_MSG4": { + "sequences": [ + { "loop": 0, "subtitles": ["CAM3A_D2_MSG14", "CAM3A_D2_MSG15", "CAM3A_D2_MSG16"], "video": "cam3/c3ad2_12.ogg" } + ] + }, + "MB3_AD2_MSG5": { + "sequences": [ + { "loop": 0, "subtitles": ["CAM3A_D2_MSG17", "CAM3A_D2_MSG18", "CAM3A_D2_MSG19"], "video": "cam3/c3ad2_14.ogg" } + ] + }, + "MB3_AD2_MSG6": { + "sequences": [ + { "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 02a2b2f2736..a1f15fe73a8 100644 --- a/data/base/messages/briefdemo.json +++ b/data/base/messages/briefdemo.json @@ -1,9 +1,11 @@ { - "video0000": { - "name": "MBDEMO_MSG", - "sequences": [ - { "loop": 0, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, - { "loop": 0, "subtitles": ["CAM1A_MSG1", "CAM1A_MSG2", "CAM1A_MSG3"], "video": "fastplay.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MBDEMO_MSG": { + "sequences": [ + { "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 9439314cdfa..01b5d88d41a 100644 --- a/data/base/messages/brieftut.json +++ b/data/base/messages/brieftut.json @@ -1,8 +1,10 @@ { - "video0000": { - "name": "FACTORYVIPER", - "sequences": [ - { "loop": 0, "subtitles": "", "video": "factory.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "FACTORYVIPER": { + "sequences": [ + { "loop": 0, "subtitles": "", "video": "factory.ogg" } + ] + } } } diff --git a/data/base/messages/cam1-outro.json b/data/base/messages/cam1-outro.json index 82fe0fe6895..bf586b6cc5b 100644 --- a/data/base/messages/cam1-outro.json +++ b/data/base/messages/cam1-outro.json @@ -1,24 +1,24 @@ { - "video0000": { - "name": "CAM1_OUT", - "sequences": [ - { "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": [ - { "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": [ - { "loop": 0, "subtitles": "CAM1OUT_MSG6", "video": "cam1/c001end.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "CAM1_OUT": { + "sequences": [ + { "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" } + ] + }, + "CAM1_OUT2": { + "sequences": [ + { "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" } + ] + }, + "CAM2_BRIEF": { + "sequences": [ + { "loop": 0, "subtitles": "CAM1OUT_MSG6", "video": "cam1/c001end.ogg" } + ] + } } } diff --git a/data/base/messages/genmessages.json b/data/base/messages/genmessages.json index 6a6d3baea0f..87302b0ceb1 100644 --- a/data/base/messages/genmessages.json +++ b/data/base/messages/genmessages.json @@ -1,14 +1,15 @@ { - "video0000": { - "name": "END", - "sequences": [ - { "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } - ] - }, - "video0001": { - "name": "WIN", - "sequences": [ - { "loop": 0, "subtitles": "WIN_MSG1", "video": "victory.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "END": { + "sequences": [ + { "loop": 0, "subtitles": "END_MSG1", "video": "end.ogg" } + ] + }, + "WIN": { + "sequences": [ + { "loop": 0, "subtitles": "WIN_MSG1", "video": "victory.ogg" } + ] + } } } diff --git a/data/base/messages/prox1-1.json b/data/base/messages/prox1-1.json index 211ba4225e9..025a51ca9f0 100644 --- a/data/base/messages/prox1-1.json +++ b/data/base/messages/prox1-1.json @@ -1,4 +1,7 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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-2.json b/data/base/messages/prox1-2.json index 0dfb4206c7d..9366ca46e4b 100644 --- a/data/base/messages/prox1-2.json +++ b/data/base/messages/prox1-2.json @@ -1,8 +1,11 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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-3.json b/data/base/messages/prox1-3.json index 566f3107881..0aaa96fe6a2 100644 --- a/data/base/messages/prox1-3.json +++ b/data/base/messages/prox1-3.json @@ -1,10 +1,13 @@ { - "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 }, - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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 }, + "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-4a.json b/data/base/messages/prox1-4a.json index fd82bcccfdd..45754156da0 100644 --- a/data/base/messages/prox1-4a.json +++ b/data/base/messages/prox1-4a.json @@ -1,7 +1,10 @@ { - "C1-4_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 2624, "y": 7488, "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "C1-4_BASE1": { "audio": "pcv389.ogg", "message": "BARBASE_MSG", "type": 0, "x": 2624, "y": 7488, "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-5.json b/data/base/messages/prox1-5.json index 01f334837f0..5559870f362 100644 --- a/data/base/messages/prox1-5.json +++ b/data/base/messages/prox1-5.json @@ -1,7 +1,10 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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-7.json b/data/base/messages/prox1-7.json index 01928e89f9d..4170e15099e 100644 --- a/data/base/messages/prox1-7.json +++ b/data/base/messages/prox1-7.json @@ -1,8 +1,11 @@ { - "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": "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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": "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/prox1a-c.json b/data/base/messages/prox1a-c.json index a58eaa5919d..24a4f57363e 100644 --- a/data/base/messages/prox1a-c.json +++ b/data/base/messages/prox1a-c.json @@ -1,7 +1,10 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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.json b/data/base/messages/prox1a.json index 2568ae55379..a114eb0fad8 100644 --- a/data/base/messages/prox1a.json +++ b/data/base/messages/prox1a.json @@ -1,7 +1,10 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/prox1b.json b/data/base/messages/prox1b.json index 800f56c19fd..629a4575c75 100644 --- a/data/base/messages/prox1b.json +++ b/data/base/messages/prox1b.json @@ -1,6 +1,9 @@ { - "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_BASE3": { "audio": "pcv390.ogg", "message": "BARBASE_MSG", "type": 0, "x": 3776, "y": 11328, "z": 0 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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_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 a1f70c151b1..b7487bef7f4 100644 --- a/data/base/messages/prox1c.json +++ b/data/base/messages/prox1c.json @@ -1,15 +1,18 @@ { - "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": "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": "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 }, - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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": "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": "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 }, + "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/prox1ca.json b/data/base/messages/prox1ca.json index efce177c076..36abb89b031 100644 --- a/data/base/messages/prox1ca.json +++ b/data/base/messages/prox1ca.json @@ -1,8 +1,11 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/prox1d.json b/data/base/messages/prox1d.json index 32d6d10e196..608d461cba4 100644 --- a/data/base/messages/prox1d.json +++ b/data/base/messages/prox1d.json @@ -1,8 +1,11 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/prox2-1.json b/data/base/messages/prox2-1.json index f9c92475218..a13beb6007b 100644 --- a/data/base/messages/prox2-1.json +++ b/data/base/messages/prox2-1.json @@ -1,7 +1,10 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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-2.json b/data/base/messages/prox2-2.json index b1604909ebf..51f15daee33 100644 --- a/data/base/messages/prox2-2.json +++ b/data/base/messages/prox2-2.json @@ -1,6 +1,9 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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-5.json b/data/base/messages/prox2-5.json index b7eee085905..128da6729ad 100644 --- a/data/base/messages/prox2-5.json +++ b/data/base/messages/prox2-5.json @@ -1,6 +1,9 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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-6.json b/data/base/messages/prox2-6.json index 2fa83e28604..3b85927e776 100644 --- a/data/base/messages/prox2-6.json +++ b/data/base/messages/prox2-6.json @@ -1,7 +1,10 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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-7.json b/data/base/messages/prox2-7.json index 5289b5ecfe5..bfaffa5fe37 100644 --- a/data/base/messages/prox2-7.json +++ b/data/base/messages/prox2-7.json @@ -1,11 +1,14 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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-8.json b/data/base/messages/prox2-8.json index 8b347b2085e..d9d213fe9b1 100644 --- a/data/base/messages/prox2-8.json +++ b/data/base/messages/prox2-8.json @@ -1,5 +1,8 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/prox2a.json b/data/base/messages/prox2a.json index 815c4245701..bce7a99ce02 100644 --- a/data/base/messages/prox2a.json +++ b/data/base/messages/prox2a.json @@ -1,4 +1,7 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/prox2b.json b/data/base/messages/prox2b.json index 8c6e9557b2c..5dce66d15c9 100644 --- a/data/base/messages/prox2b.json +++ b/data/base/messages/prox2b.json @@ -1,7 +1,10 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/prox2c.json b/data/base/messages/prox2c.json index 30c164193c3..4f3818e593c 100644 --- a/data/base/messages/prox2c.json +++ b/data/base/messages/prox2c.json @@ -1,7 +1,10 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/prox2d.json b/data/base/messages/prox2d.json index 6d29f1e7cde..8a31e2d711c 100644 --- a/data/base/messages/prox2d.json +++ b/data/base/messages/prox2d.json @@ -1,6 +1,9 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/prox3-1.json b/data/base/messages/prox3-1.json index c0dc4feb196..19262383e71 100644 --- a/data/base/messages/prox3-1.json +++ b/data/base/messages/prox3-1.json @@ -1,5 +1,8 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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-2.json b/data/base/messages/prox3-2.json index 4be054ab8fe..96fa7439525 100644 --- a/data/base/messages/prox3-2.json +++ b/data/base/messages/prox3-2.json @@ -1,4 +1,7 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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-4.json b/data/base/messages/prox3-4.json index 41c547056ef..9c47bb491db 100644 --- a/data/base/messages/prox3-4.json +++ b/data/base/messages/prox3-4.json @@ -1,11 +1,14 @@ { - "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": 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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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": 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/prox3a-d1.json b/data/base/messages/prox3a-d1.json index 65782f080a3..13e3cbffe6d 100644 --- a/data/base/messages/prox3a-d1.json +++ b/data/base/messages/prox3a-d1.json @@ -1,7 +1,10 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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.json b/data/base/messages/prox3a.json index 29e2f531337..652b55ddd82 100644 --- a/data/base/messages/prox3a.json +++ b/data/base/messages/prox3a.json @@ -1,6 +1,9 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/prox3b.json b/data/base/messages/prox3b.json index d76ea090b82..e42e92141de 100644 --- a/data/base/messages/prox3b.json +++ b/data/base/messages/prox3b.json @@ -1,7 +1,10 @@ { - "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": "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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": "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 d174cf694e7..dbb31428711 100644 --- a/data/base/messages/prox3c.json +++ b/data/base/messages/prox3c.json @@ -1,7 +1,10 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/messages/proxdemo.json b/data/base/messages/proxdemo.json index 6a4c3678529..7e8b2556f66 100644 --- a/data/base/messages/proxdemo.json +++ b/data/base/messages/proxdemo.json @@ -1,7 +1,10 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/proxtut.json b/data/base/messages/proxtut.json index f62ab2232c0..31c3b909e85 100644 --- a/data/base/messages/proxtut.json +++ b/data/base/messages/proxtut.json @@ -1,4 +1,7 @@ { - "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 } + "type": "wz2100.proxmsgs.v1", + "msgs": { + "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/doc/BriefAndProximityFormat.md b/doc/BriefAndProximityFormat.md index 4399c90080d..8d76e382f26 100644 --- a/doc/BriefAndProximityFormat.md +++ b/doc/BriefAndProximityFormat.md @@ -7,13 +7,16 @@ In releases beyond the 4.5 series, the campaign brief and Proximity files are no Example: ```json { - "C1A_BASE0": { - "audio": "pcv390.ogg", - "message": "BARBASE_MSG", - "type": 0, - "x": 3904, - "y": 4672, - "z": 0 + "type": "wz2100.proxmsgs.v1", + "msgs": { + "C1A_BASE0": { + "audio": "pcv390.ogg", + "message": "BARBASE_MSG", + "type": 0, + "x": 3904, + "y": 4672, + "z": 0 + } } } ``` @@ -29,19 +32,21 @@ Each Proximity message must have a unique ID. This ID will be what can be refere Example: ```json { - "video0000": { - "name": "MB1A_MSG", - "sequences": [ - { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, - { "loop": 0, "subtitles": ["CAM1A_MSG1", "CAM1A_MSG2", "CAM1A_MSG3"], "video": "cam1/cam1ascv.ogg" } - ] + "type": "wz2100.briefs.v1", + "briefs": { + "MB1A_MSG": { + "sequences": [ + { "loop": 1, "subtitles": "TRANS_MSG1", "video": "brfcom.ogg" }, + { "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. +Each briefing must have a unique ID. This will be used as a reference for scripts to invoke to start a video subset. + +Within each briefing, there will be: - sequences: an array of objects (order matters!) containing variables about each sub-video: - 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: String or array of string translation references for the video. These are added to the Intel menu icon text messages. diff --git a/po/scripts/parseJson.py b/po/scripts/parseJson.py index f0a74c28f58..27c933d993d 100644 --- a/po/scripts/parseJson.py +++ b/po/scripts/parseJson.py @@ -1,25 +1,37 @@ import json, sys, re +IGNORED_WZ_JSON_FILE_TYPES = {'wz2100.proxmsgs.v1', 'wz2100.briefs.v1'} + def printString(s, begin, end, filename, jsonPath): if not re.match(r'^(\*.*\*|CAM[0-9] .*|Z ?NULL.*)$', s): sys.stdout.write('{}{}) // SRC: {}: {}{}'.format(begin, json.dumps(s, ensure_ascii=False), filename, jsonPath, end)) -def parse(obj, filename, jsonPath="$"): +def parse(obj, filename): + def _parse(obj, filename, jsonPath="$"): + if isinstance(obj, dict): + for k, v in obj.items(): + _parse(v, filename, jsonPath + "." + k) + if k in ['name', 'tip', 'easy_tip', 'medium_tip', 'hard_tip', 'insane_tip'] and isinstance(v, str): + printString(v, '_(', '\n', filename, jsonPath + "." + k) + elif k in ['text', 'ranks'] and isinstance(v, list): + for idx, s in enumerate(v): + itemPath = jsonPath + "." + k + "[" + str(idx) + "]" + if isinstance(s, str): + if k == 'text': + printString(s, '_(', '\n', filename, itemPath) + elif k == 'ranks': + printString(s, 'NP_("rank", ', '\n', filename, itemPath) + elif isinstance(obj, list): + for idx, v in enumerate(obj): + _parse(v, filename, jsonPath + "[" + str(idx) + "]") + if isinstance(obj, dict): - for k, v in obj.items(): - parse(v, filename, jsonPath + "." + k) - if k in ['name', 'tip', 'easy_tip', 'medium_tip', 'hard_tip', 'insane_tip'] and isinstance(v, str): - printString(v, '_(', '\n', filename, jsonPath + "." + k) - elif k in ['text', 'ranks'] and isinstance(v, list): - for idx, s in enumerate(v): - itemPath = jsonPath + "." + k + "[" + str(idx) + "]" - if isinstance(s, str): - if k == 'text': - printString(s, '_(', '\n', filename, itemPath) - elif k == 'ranks': - printString(s, 'NP_("rank", ', '\n', filename, itemPath) - elif isinstance(obj, list): - for idx, v in enumerate(obj): - parse(v, filename, jsonPath + "[" + str(idx) + "]") + # check for json format types that should be ignored + if 'type' in obj: + if obj['type'] in IGNORED_WZ_JSON_FILE_TYPES: + #sys.stderr.write('// IGNORING: {}\n'.format(filename)) + return + + _parse(obj, filename); parse(json.load(open(sys.argv[1], 'r')), sys.argv[1]) diff --git a/src/message.cpp b/src/message.cpp index 1ce6400b508..d12dacb5f4c 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -39,6 +39,7 @@ #include "stats.h" #include "text.h" #include "qtscript.h" +#include "wzjsonhelpers.h" static std::map apsViewData; @@ -663,6 +664,30 @@ WzString *loadProximityViewData(const char *fileName) { ASSERT_OR_RETURN(nullptr, PHYSFS_exists(fileName), "%s not found", fileName); WzConfig ini(fileName, WzConfig::ReadOnlyAndRequired); + + // "type": "wz2100.proxmsgs.v1" + if (!ini.contains("type")) + { + debug(LOG_ERROR, "Missing required \"type\" key: %s", fileName); + return nullptr; + } + if (ini.value("type").toWzString() != "wz2100.proxmsgs.v1") + { + debug(LOG_ERROR, "Unexpected \"type\" - expecting \"wz2100.proxmsgs.v1\": %s", fileName); + return nullptr; + } + + // msgs + if (!ini.contains("msgs")) + { + debug(LOG_ERROR, "Missing required \"msgs\" key: %s", fileName); + return nullptr; + } + if (!ini.beginGroup("msgs")) + { + debug(LOG_ERROR, "Missing valid \"msgs\" value: %s", fileName); + return nullptr; + } std::vector list = ini.childGroups(); for (size_t i = 0; i < list.size(); ++i) { @@ -684,6 +709,11 @@ WzString *loadProximityViewData(const char *fileName) { for(auto &a : array) { + if (!a.is_string()) + { + debug(LOG_ERROR, "\"message\" value is not a string: %s", fileName); + continue; + } 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()); @@ -740,74 +770,142 @@ WzString *loadProximityViewData(const char *fileName) ini.endGroup(); apsViewData[v->name] = v; } + ini.endGroup(); // "msgs" + return new WzString(fileName); // so that cleanup function will be called on right data } +inline void from_json(const nlohmann::json& j, SEQ_DISPLAY& v) +{ + v.sequenceName = WzString::fromUtf8(j["video"].get()); + debug(LOG_WZ, "Sequence name: %s", v.sequenceName.toUtf8().c_str()); + v.flag = j["loop"].get(); + debug(LOG_WZ, "Sequence loop: %d", v.flag); + // Set the subtitle string for the sequence. + const nlohmann::json& subtitles = j["subtitles"]; + if (!subtitles.is_null() && subtitles.is_array()) + { + for (auto &a : subtitles) + { + 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()); + v.textMsg.push_back(WzString::fromUtf8(str)); + debug(LOG_WZ, "Sequence subtitle array: %s", msg.c_str()); + } + } + } + else + { + std::string msg = 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()); + v.textMsg.push_back(WzString::fromUtf8(str)); + debug(LOG_WZ, "Sequence subtitle string: %s", msg.c_str()); + } + } +} + +#if defined(WZ_CC_GNU) && !defined(WZ_CC_INTEL) && !defined(WZ_CC_CLANG) && (7 <= __GNUC__) && (__GNUC__ < 10) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wnull-dereference" // GCC < 10 warning is buggy +#endif + 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) + + auto jsonObjOpt = wzLoadJsonObjectFromFile(fileName); + if (!jsonObjOpt.has_value()) + { + debug(LOG_ERROR, "Failed to load JSON: %s", fileName); + return nullptr; + } + const auto& jsonObj = jsonObjOpt.value(); + + // "type": "wz2100.briefs.v1" + auto it = jsonObj.find("type"); + if (it == jsonObj.end()) { + debug(LOG_ERROR, "Missing required \"type\" key: %s", fileName); + return nullptr; + } + if (!it.value().is_string() || it.value().get() != "wz2100.briefs.v1") + { + debug(LOG_ERROR, "Unexpected \"type\" - expecting \"wz2100.briefs.v1\": %s", fileName); + return nullptr; + } + + // "briefs" + it = jsonObj.find("briefs"); + if (it == jsonObj.end()) + { + debug(LOG_ERROR, "Missing required \"briefs\" key: %s", fileName); + return nullptr; + } + if (!it.value().is_object()) + { + debug(LOG_ERROR, "\"briefs\" value is not an object: %s", fileName); + return nullptr; + } + const auto& briefsObj = it.value(); + + for (auto brief : briefsObj.items()) + { + debug(LOG_WZ, "Sequence video set: %s", brief.key().c_str()); + + const auto& briefObj = brief.value(); + if (!briefObj.is_object()) + { + debug(LOG_ERROR, "\"briefs\"[%s] value is not an object: %s", brief.key().c_str(), fileName); + continue; + } + + auto briefIt = briefObj.find("sequences"); + if (briefIt == briefObj.end()) + { + debug(LOG_ERROR, "\"briefs\"[%s] lacks a \"sequences\" property: %s", brief.key().c_str(), fileName); + continue; + } + if (!briefIt.value().is_array()) + { + debug(LOG_ERROR, "\"briefs\"[%s] \"sequences\" property must have an array value: %s", brief.key().c_str(), fileName); + continue; + } + std::vector seqList; + try { + seqList = briefObj["sequences"].get>(); + } + catch (const std::exception&) + { + debug(LOG_ERROR, "Failed to parse \"briefs\"[%s] \"sequences\" property value: %s", brief.key().c_str(), fileName); + continue; + } + debug(LOG_WZ, "Sequence list size: %zu", seqList.size()); + // 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()); + v->name = WzString::fromUtf8(brief.key()); + r->seqList = std::move(seqList); - 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].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 } +#if defined(WZ_CC_GNU) && !defined(WZ_CC_INTEL) && !defined(WZ_CC_CLANG) && (7 <= __GNUC__) && (__GNUC__ < 10) +# pragma GCC diagnostic pop +#endif + /* Get the view data identified by the name */ VIEWDATA *getViewData(const WzString &name) {