diff --git a/Example DBs/mist_DBs_MEgroupsById.lua b/Example DBs/mist_DBs_MEgroupsById.lua index 387f53c..575c69f 100644 --- a/Example DBs/mist_DBs_MEgroupsById.lua +++ b/Example DBs/mist_DBs_MEgroupsById.lua @@ -382,11 +382,17 @@ MEgroupsById = ["onboard_num"] = "52", ["category"] = "plane", ["unitName"] = "A-10C Client #1_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, ["groupId"] = 6, ["groupName"] = "A-10C Client #1", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -318142.85714286, ["callsign"] = { [1] = 3, @@ -394,13 +400,10 @@ MEgroupsById = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -318142.85714286, - ["skill"] = "Client", ["heading"] = -0.67060113146646, ["unitId"] = 11, ["y"] = 636428.57142857, - ["coalition"] = "blue", + ["countryId"] = 2, ["speed"] = 138.88888888889, }, -- end of [1] }, -- end of ["units"] @@ -435,11 +438,17 @@ MEgroupsById = ["onboard_num"] = "52", ["category"] = "plane", ["unitName"] = "A-10C Client #2_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, ["groupId"] = 7, ["groupName"] = "A-10C Client #2", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -315857.14285714, ["callsign"] = { [1] = 3, @@ -447,13 +456,10 @@ MEgroupsById = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -315857.14285714, - ["skill"] = "Client", ["heading"] = -0.66079849060746, ["unitId"] = 12, ["y"] = 644428.57142857, - ["coalition"] = "blue", + ["countryId"] = 2, ["speed"] = 138.88888888889, }, -- end of [1] }, -- end of ["units"] @@ -1408,25 +1414,25 @@ MEgroupsById = [1] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] + ["unitId"] = 45, ["groupId"] = 31, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cargoBob", ["x"] = -292007.14285714, - ["y"] = 675199.99999999, + ["coalition"] = "blue", ["mass"] = 371, - ["unitId"] = 45, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", + ["y"] = 675199.99999999, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of [1] }, -- end of ["units"] }, -- end of [31] @@ -1443,25 +1449,25 @@ MEgroupsById = [1] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] + ["unitId"] = 46, ["groupId"] = 32, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["y"] = 674842.85714285, + ["coalition"] = "blue", ["mass"] = 1337, - ["unitId"] = 46, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", + ["y"] = 674842.85714285, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of [1] }, -- end of ["units"] }, -- end of [32] @@ -1826,25 +1832,25 @@ MEgroupsById = { [1] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 41, + ["country"] = "usa", + ["unitId"] = 64, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["country"] = "usa", - ["coalition"] = "blue", + ["heading"] = 0, + ["countryId"] = 2, ["x"] = -355322.27295572, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["unitId"] = 64, + ["groupId"] = 41, + ["coalition"] = "blue", ["y"] = 443849.03844635, - ["countryId"] = 2, }, -- end of [1] }, -- end of ["units"] }, -- end of [41] @@ -1899,8 +1905,8 @@ MEgroupsById = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -1909,7 +1915,7 @@ MEgroupsById = ["unitName"] = "Rotary-1-1", ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["groupId"] = 45, ["groupName"] = "nH", ["callsign"] = @@ -1920,11 +1926,11 @@ MEgroupsById = ["name"] = "Springfield11", }, -- end of ["callsign"] ["countryId"] = 21, - ["x"] = -155967.80633993, + ["x"] = -158700.87914814, ["skill"] = "High", - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["unitId"] = 68, - ["y"] = 405888.85058741, + ["y"] = 404406.46136648, ["coalition"] = "neutral", ["speed"] = 44.444444444444, }, -- end of [1] @@ -1938,6 +1944,43 @@ MEgroupsById = ["task"] = "Transport", ["uncontrolled"] = false, }, -- end of [45] + [47] = + { + ["country"] = "usa", + ["groupName"] = "poly", + ["units"] = + { + [1] = + { + ["type"] = "AAV7", + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["groupId"] = 47, + ["skill"] = "Average", + ["country"] = "usa", + ["groupName"] = "poly", + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["heading"] = 2.3261877017598, + ["countryId"] = 2, + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["hidden"] = false, + ["category"] = "vehicle", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Nothing", + ["groupId"] = 47, + }, -- end of [47] [34] = { ["modulation"] = 0, @@ -2070,25 +2113,25 @@ MEgroupsById = { [1] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 40, + ["country"] = "usa", + ["unitId"] = 63, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["country"] = "usa", - ["coalition"] = "blue", + ["heading"] = 0, + ["countryId"] = 2, ["x"] = -355322.45423175, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1", - ["unitId"] = 63, + ["groupId"] = 40, + ["coalition"] = "blue", ["y"] = 443856.28948724, - ["countryId"] = 2, }, -- end of [1] }, -- end of ["units"] }, -- end of [40] diff --git a/Example DBs/mist_DBs_MEgroupsByName.lua b/Example DBs/mist_DBs_MEgroupsByName.lua index 2427d70..fc9196d 100644 --- a/Example DBs/mist_DBs_MEgroupsByName.lua +++ b/Example DBs/mist_DBs_MEgroupsByName.lua @@ -259,40 +259,62 @@ MEgroupsByName = ["task"] = "Ground Nothing", ["groupId"] = 35, }, -- end of ["teleGroup"] - ["Static Cafe-1"] = + ["A-10C Client #1"] = { - ["coalition"] = "neutral", - ["country"] = "australia", - ["groupId"] = 46, - ["countryId"] = 21, - ["category"] = "static", - ["groupName"] = "Static Cafe-1", + ["modulation"] = 0, + ["groupId"] = 6, + ["frequency"] = 251, + ["country"] = "usa", + ["groupName"] = "A-10C Client #1", ["units"] = { [1] = { - ["shape_name"] = "stolovaya", - ["type"] = "Cafe", + ["alt"] = 2000, ["point"] = { - ["y"] = 464123.689023, - ["x"] = -115514.59796101, + ["y"] = 636428.57142857, + ["x"] = -318142.85714286, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["country"] = "australia", - ["groupName"] = "Static Cafe-1", - ["heading"] = 0, - ["y"] = 464123.689023, - ["x"] = -115514.59796101, - ["unitId"] = 69, - ["category"] = "static", - ["unitName"] = "Static Cafe-1", - ["groupId"] = 46, - ["countryId"] = 21, - ["coalition"] = "neutral", + ["alt_type"] = "BARO", + ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", + ["onboard_num"] = "52", + ["category"] = "plane", + ["unitName"] = "A-10C Client #1_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] + ["type"] = "A-10C", + ["country"] = "usa", + ["psi"] = 0.67060113146646, + ["groupId"] = 6, + ["groupName"] = "A-10C Client #1", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -318142.85714286, + ["callsign"] = + { + [1] = 3, + [2] = 1, + [3] = 1, + ["name"] = "Uzi11", + }, -- end of ["callsign"] + ["heading"] = -0.67060113146646, + ["unitId"] = 11, + ["y"] = 636428.57142857, + ["countryId"] = 2, + ["speed"] = 138.88888888889, }, -- end of [1] }, -- end of ["units"] - }, -- end of ["Static Cafe-1"] + ["countryId"] = 2, + ["radioSet"] = false, + ["hidden"] = false, + ["category"] = "plane", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "CAS", + ["uncontrolled"] = false, + }, -- end of ["A-10C Client #1"] ["cloneNeut"] = { ["modulation"] = 0, @@ -466,25 +488,25 @@ MEgroupsByName = [1] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] + ["unitId"] = 46, ["groupId"] = 32, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["y"] = 674842.85714285, + ["coalition"] = "blue", ["mass"] = 1337, - ["unitId"] = 46, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", + ["y"] = 674842.85714285, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of [1] }, -- end of ["units"] }, -- end of ["cloneCargoBase"] @@ -524,6 +546,43 @@ MEgroupsByName = ["countryId"] = 21, ["hidden"] = false, }, -- end of ["perry"] + ["poly"] = + { + ["country"] = "usa", + ["groupName"] = "poly", + ["units"] = + { + [1] = + { + ["type"] = "AAV7", + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["groupId"] = 47, + ["skill"] = "Average", + ["country"] = "usa", + ["groupName"] = "poly", + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["heading"] = 2.3261877017598, + ["countryId"] = 2, + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["hidden"] = false, + ["category"] = "vehicle", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Nothing", + ["groupId"] = 47, + }, -- end of ["poly"] ["nH"] = { ["modulation"] = 0, @@ -538,8 +597,8 @@ MEgroupsByName = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -548,7 +607,7 @@ MEgroupsByName = ["unitName"] = "Rotary-1-1", ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["groupId"] = 45, ["groupName"] = "nH", ["callsign"] = @@ -559,11 +618,11 @@ MEgroupsByName = ["name"] = "Springfield11", }, -- end of ["callsign"] ["countryId"] = 21, - ["x"] = -155967.80633993, + ["x"] = -158700.87914814, ["skill"] = "High", - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["unitId"] = 68, - ["y"] = 405888.85058741, + ["y"] = 404406.46136648, ["coalition"] = "neutral", ["speed"] = 44.444444444444, }, -- end of [1] @@ -993,25 +1052,25 @@ MEgroupsByName = { [1] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 41, + ["country"] = "usa", + ["unitId"] = 64, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["country"] = "usa", - ["coalition"] = "blue", + ["heading"] = 0, + ["countryId"] = 2, ["x"] = -355322.27295572, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["unitId"] = 64, + ["groupId"] = 41, + ["coalition"] = "blue", ["y"] = 443849.03844635, - ["countryId"] = 2, }, -- end of [1] }, -- end of ["units"] }, -- end of ["static_on_ship1 #001"] @@ -1027,25 +1086,25 @@ MEgroupsByName = { [1] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 40, + ["country"] = "usa", + ["unitId"] = 63, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["country"] = "usa", - ["coalition"] = "blue", + ["heading"] = 0, + ["countryId"] = 2, ["x"] = -355322.45423175, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1", - ["unitId"] = 63, + ["groupId"] = 40, + ["coalition"] = "blue", ["y"] = 443856.28948724, - ["countryId"] = 2, }, -- end of [1] }, -- end of ["units"] }, -- end of ["static_on_ship1"] @@ -1062,25 +1121,25 @@ MEgroupsByName = [1] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] + ["unitId"] = 45, ["groupId"] = 31, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cargoBob", ["x"] = -292007.14285714, - ["y"] = 675199.99999999, + ["coalition"] = "blue", ["mass"] = 371, - ["unitId"] = 45, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", + ["y"] = 675199.99999999, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of [1] }, -- end of ["units"] }, -- end of ["cargoBob"] @@ -1525,59 +1584,6 @@ MEgroupsByName = }, -- end of [1] }, -- end of ["units"] }, -- end of ["tent #001"] - ["A-10C Client #2"] = - { - ["modulation"] = 0, - ["groupId"] = 7, - ["frequency"] = 251, - ["country"] = "usa", - ["groupName"] = "A-10C Client #2", - ["units"] = - { - [1] = - { - ["alt"] = 2000, - ["point"] = - { - ["y"] = 644428.57142857, - ["x"] = -315857.14285714, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", - ["onboard_num"] = "52", - ["category"] = "plane", - ["unitName"] = "A-10C Client #2_unit", - ["type"] = "A-10C", - ["country"] = "usa", - ["psi"] = 0.66079849060746, - ["groupId"] = 7, - ["groupName"] = "A-10C Client #2", - ["callsign"] = - { - [1] = 3, - [2] = 1, - [3] = 1, - ["name"] = "Uzi11", - }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -315857.14285714, - ["skill"] = "Client", - ["heading"] = -0.66079849060746, - ["unitId"] = 12, - ["y"] = 644428.57142857, - ["coalition"] = "blue", - ["speed"] = 138.88888888889, - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["radioSet"] = false, - ["hidden"] = false, - ["category"] = "plane", - ["coalition"] = "blue", - ["startTime"] = 0, - ["task"] = "CAS", - ["uncontrolled"] = false, - }, -- end of ["A-10C Client #2"] ["RuTent2"] = { ["coalition"] = "red", @@ -1612,6 +1618,62 @@ MEgroupsByName = }, -- end of [1] }, -- end of ["units"] }, -- end of ["RuTent2"] + ["A-10C Client #2"] = + { + ["modulation"] = 0, + ["groupId"] = 7, + ["frequency"] = 251, + ["country"] = "usa", + ["groupName"] = "A-10C Client #2", + ["units"] = + { + [1] = + { + ["alt"] = 2000, + ["point"] = + { + ["y"] = 644428.57142857, + ["x"] = -315857.14285714, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", + ["onboard_num"] = "52", + ["category"] = "plane", + ["unitName"] = "A-10C Client #2_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] + ["type"] = "A-10C", + ["country"] = "usa", + ["psi"] = 0.66079849060746, + ["groupId"] = 7, + ["groupName"] = "A-10C Client #2", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -315857.14285714, + ["callsign"] = + { + [1] = 3, + [2] = 1, + [3] = 1, + ["name"] = "Uzi11", + }, -- end of ["callsign"] + ["heading"] = -0.66079849060746, + ["unitId"] = 12, + ["y"] = 644428.57142857, + ["countryId"] = 2, + ["speed"] = 138.88888888889, + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["radioSet"] = false, + ["hidden"] = false, + ["category"] = "plane", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "CAS", + ["uncontrolled"] = false, + }, -- end of ["A-10C Client #2"] ["Rus Ships #1"] = { ["groupId"] = 9, @@ -1668,6 +1730,40 @@ MEgroupsByName = ["countryId"] = 0, ["hidden"] = false, }, -- end of ["Rus Ships #1"] + ["Static Cafe-1"] = + { + ["coalition"] = "neutral", + ["country"] = "australia", + ["groupId"] = 46, + ["countryId"] = 21, + ["category"] = "static", + ["groupName"] = "Static Cafe-1", + ["units"] = + { + [1] = + { + ["shape_name"] = "stolovaya", + ["type"] = "Cafe", + ["point"] = + { + ["y"] = 464123.689023, + ["x"] = -115514.59796101, + }, -- end of ["point"] + ["categoryStatic"] = "Fortifications", + ["country"] = "australia", + ["groupName"] = "Static Cafe-1", + ["heading"] = 0, + ["y"] = 464123.689023, + ["x"] = -115514.59796101, + ["unitId"] = 69, + ["category"] = "static", + ["unitName"] = "Static Cafe-1", + ["groupId"] = 46, + ["countryId"] = 21, + ["coalition"] = "neutral", + }, -- end of [1] + }, -- end of ["units"] + }, -- end of ["Static Cafe-1"] ["F-15C Client #2"] = { ["modulation"] = 0, @@ -1755,59 +1851,6 @@ MEgroupsByName = }, -- end of [1] }, -- end of ["units"] }, -- end of ["tent"] - ["A-10C Client #1"] = - { - ["modulation"] = 0, - ["groupId"] = 6, - ["frequency"] = 251, - ["country"] = "usa", - ["groupName"] = "A-10C Client #1", - ["units"] = - { - [1] = - { - ["alt"] = 2000, - ["point"] = - { - ["y"] = 636428.57142857, - ["x"] = -318142.85714286, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", - ["onboard_num"] = "52", - ["category"] = "plane", - ["unitName"] = "A-10C Client #1_unit", - ["type"] = "A-10C", - ["country"] = "usa", - ["psi"] = 0.67060113146646, - ["groupId"] = 6, - ["groupName"] = "A-10C Client #1", - ["callsign"] = - { - [1] = 3, - [2] = 1, - [3] = 1, - ["name"] = "Uzi11", - }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -318142.85714286, - ["skill"] = "Client", - ["heading"] = -0.67060113146646, - ["unitId"] = 11, - ["y"] = 636428.57142857, - ["coalition"] = "blue", - ["speed"] = 138.88888888889, - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["radioSet"] = false, - ["hidden"] = false, - ["category"] = "plane", - ["coalition"] = "blue", - ["startTime"] = 0, - ["task"] = "CAS", - ["uncontrolled"] = false, - }, -- end of ["A-10C Client #1"] ["USTanks1"] = { ["country"] = "usa", @@ -1911,39 +1954,6 @@ MEgroupsByName = ["task"] = "Ground Nothing", ["groupId"] = 11, }, -- end of ["USTanks1"] - ["tent #002"] = - { - ["coalition"] = "red", - ["country"] = "russia", - ["groupId"] = 39, - ["countryId"] = 0, - ["category"] = "static", - ["groupName"] = "tent #002", - ["units"] = - { - [1] = - { - ["shape_name"] = "elektrowoz", - ["type"] = "Electric locomotive", - ["point"] = - { - ["y"] = 652535.98623348, - ["x"] = -296017.9062429, - }, -- end of ["point"] - ["groupId"] = 39, - ["groupName"] = "tent #002", - ["unitId"] = 62, - ["countryId"] = 0, - ["x"] = -296017.9062429, - ["heading"] = 0, - ["category"] = "static", - ["unitName"] = "tent #002", - ["country"] = "russia", - ["y"] = 652535.98623348, - ["coalition"] = "red", - }, -- end of [1] - }, -- end of ["units"] - }, -- end of ["tent #002"] ["tent2"] = { ["coalition"] = "blue", @@ -1978,6 +1988,39 @@ MEgroupsByName = }, -- end of [1] }, -- end of ["units"] }, -- end of ["tent2"] + ["tent #002"] = + { + ["coalition"] = "red", + ["country"] = "russia", + ["groupId"] = 39, + ["countryId"] = 0, + ["category"] = "static", + ["groupName"] = "tent #002", + ["units"] = + { + [1] = + { + ["shape_name"] = "elektrowoz", + ["type"] = "Electric locomotive", + ["point"] = + { + ["y"] = 652535.98623348, + ["x"] = -296017.9062429, + }, -- end of ["point"] + ["groupId"] = 39, + ["groupName"] = "tent #002", + ["unitId"] = 62, + ["countryId"] = 0, + ["x"] = -296017.9062429, + ["heading"] = 0, + ["category"] = "static", + ["unitName"] = "tent #002", + ["country"] = "russia", + ["y"] = 652535.98623348, + ["coalition"] = "red", + }, -- end of [1] + }, -- end of ["units"] + }, -- end of ["tent #002"] ["RuTanks"] = { ["country"] = "russia", diff --git a/Example DBs/mist_DBs_MEunits.lua b/Example DBs/mist_DBs_MEunits.lua index 900d783..695c718 100644 --- a/Example DBs/mist_DBs_MEunits.lua +++ b/Example DBs/mist_DBs_MEunits.lua @@ -60,8 +60,8 @@ MEunits = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -70,15 +70,15 @@ MEunits = ["speed"] = 44.444444444444, ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["unitName"] = "Rotary-1-1", ["groupName"] = "nH", ["coalition"] = "neutral", ["countryId"] = 21, - ["x"] = -155967.80633993, - ["y"] = 405888.85058741, + ["x"] = -158700.87914814, + ["y"] = 404406.46136648, ["unitId"] = 68, - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["skill"] = "High", ["callsign"] = { @@ -829,6 +829,43 @@ MEunits = ["task"] = "Ground Nothing", ["hidden"] = false, }, -- end of [4] + [5] = + { + ["country"] = "usa", + ["groupName"] = "poly", + ["units"] = + { + [1] = + { + ["heading"] = 2.3261877017598, + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["groupId"] = 47, + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["groupName"] = "poly", + ["type"] = "AAV7", + ["countryId"] = 2, + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["country"] = "usa", + ["skill"] = "Average", + }, -- end of [1] + }, -- end of ["units"] + ["coalition"] = "blue", + ["groupId"] = 47, + ["category"] = "vehicle", + ["countryId"] = 2, + ["startTime"] = 0, + ["task"] = "Ground Nothing", + ["hidden"] = false, + }, -- end of [5] }, -- end of ["vehicle"] ["plane"] = { @@ -960,6 +997,9 @@ MEunits = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, @@ -971,7 +1011,6 @@ MEunits = ["y"] = 636428.57142857, ["unitId"] = 11, ["heading"] = -0.67060113146646, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -979,6 +1018,7 @@ MEunits = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 6, }, -- end of [1] }, -- end of ["units"] @@ -1013,6 +1053,9 @@ MEunits = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, @@ -1024,7 +1067,6 @@ MEunits = ["y"] = 644428.57142857, ["unitId"] = 12, ["heading"] = -0.66079849060746, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -1032,6 +1074,7 @@ MEunits = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 7, }, -- end of [1] }, -- end of ["units"] @@ -1268,25 +1311,25 @@ MEunits = [1] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 675199.99999999, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cargoBob", - ["groupId"] = 31, - ["countryId"] = 2, - ["mass"] = 371, ["unitId"] = 45, + ["groupName"] = "cargoBob", + ["countryId"] = 2, + ["y"] = 675199.99999999, + ["mass"] = 371, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", ["x"] = -292007.14285714, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 31, }, -- end of [1] }, -- end of ["units"] }, -- end of [4] @@ -1303,25 +1346,25 @@ MEunits = [1] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 674842.85714285, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cloneCargoBase", - ["groupId"] = 32, - ["countryId"] = 2, - ["mass"] = 1337, ["unitId"] = 46, + ["groupName"] = "cloneCargoBase", + ["countryId"] = 2, + ["y"] = 674842.85714285, + ["mass"] = 1337, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 32, }, -- end of [1] }, -- end of ["units"] }, -- end of [5] @@ -1337,25 +1380,25 @@ MEunits = { [1] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443856.28948724, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443856.28948724, ["x"] = -355322.45423175, - ["unitId"] = 63, + ["groupId"] = 40, ["category"] = "static", ["unitName"] = "static_on_ship1", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 40, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 63, }, -- end of [1] }, -- end of ["units"] }, -- end of [6] @@ -1371,25 +1414,25 @@ MEunits = { [1] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443849.03844635, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443849.03844635, ["x"] = -355322.27295572, - ["unitId"] = 64, + ["groupId"] = 41, ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 41, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 64, }, -- end of [1] }, -- end of ["units"] }, -- end of [7] diff --git a/Example DBs/mist_DBs_MEunitsByCat.lua b/Example DBs/mist_DBs_MEunitsByCat.lua index e7a508b..598e45f 100644 --- a/Example DBs/mist_DBs_MEunitsByCat.lua +++ b/Example DBs/mist_DBs_MEunitsByCat.lua @@ -7,8 +7,8 @@ MEunitsByCat = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -17,7 +17,7 @@ MEunitsByCat = ["unitName"] = "Rotary-1-1", ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["groupId"] = 45, ["groupName"] = "nH", ["callsign"] = @@ -28,11 +28,11 @@ MEunitsByCat = ["name"] = "Springfield11", }, -- end of ["callsign"] ["countryId"] = 21, - ["x"] = -155967.80633993, + ["x"] = -158700.87914814, ["skill"] = "High", - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["unitId"] = 68, - ["y"] = 405888.85058741, + ["y"] = 404406.46136648, ["coalition"] = "neutral", ["speed"] = 44.444444444444, }, -- end of [1] @@ -477,92 +477,92 @@ MEunitsByCat = [5] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] + ["unitId"] = 45, ["groupId"] = 31, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cargoBob", ["x"] = -292007.14285714, - ["y"] = 675199.99999999, + ["coalition"] = "blue", ["mass"] = 371, - ["unitId"] = 45, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", + ["y"] = 675199.99999999, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of [5] [6] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] + ["unitId"] = 46, ["groupId"] = 32, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["y"] = 674842.85714285, + ["coalition"] = "blue", ["mass"] = 1337, - ["unitId"] = 46, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", + ["y"] = 674842.85714285, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of [6] [7] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 40, + ["country"] = "usa", + ["unitId"] = 63, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["country"] = "usa", - ["coalition"] = "blue", + ["heading"] = 0, + ["countryId"] = 2, ["x"] = -355322.45423175, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1", - ["unitId"] = 63, + ["groupId"] = 40, + ["coalition"] = "blue", ["y"] = 443856.28948724, - ["countryId"] = 2, }, -- end of [7] [8] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 41, + ["country"] = "usa", + ["unitId"] = 64, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["country"] = "usa", - ["coalition"] = "blue", + ["heading"] = 0, + ["countryId"] = 2, ["x"] = -355322.27295572, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["unitId"] = 64, + ["groupId"] = 41, + ["coalition"] = "blue", ["y"] = 443849.03844635, - ["countryId"] = 2, }, -- end of [8] [9] = { @@ -814,11 +814,17 @@ MEunitsByCat = ["onboard_num"] = "52", ["category"] = "plane", ["unitName"] = "A-10C Client #1_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, ["groupId"] = 6, ["groupName"] = "A-10C Client #1", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -318142.85714286, ["callsign"] = { [1] = 3, @@ -826,13 +832,10 @@ MEunitsByCat = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -318142.85714286, - ["skill"] = "Client", ["heading"] = -0.67060113146646, ["unitId"] = 11, ["y"] = 636428.57142857, - ["coalition"] = "blue", + ["countryId"] = 2, ["speed"] = 138.88888888889, }, -- end of [4] [5] = @@ -848,11 +851,17 @@ MEunitsByCat = ["onboard_num"] = "52", ["category"] = "plane", ["unitName"] = "A-10C Client #2_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, ["groupId"] = 7, ["groupName"] = "A-10C Client #2", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -315857.14285714, ["callsign"] = { [1] = 3, @@ -860,13 +869,10 @@ MEunitsByCat = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -315857.14285714, - ["skill"] = "Client", ["heading"] = -0.66079849060746, ["unitId"] = 12, ["y"] = 644428.57142857, - ["coalition"] = "blue", + ["countryId"] = 2, ["speed"] = 138.88888888889, }, -- end of [5] [6] = @@ -1422,6 +1428,28 @@ MEunitsByCat = ["countryId"] = 2, }, -- end of [18] [19] = + { + ["type"] = "AAV7", + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["groupId"] = 47, + ["skill"] = "Average", + ["country"] = "usa", + ["groupName"] = "poly", + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["heading"] = 2.3261877017598, + ["countryId"] = 2, + }, -- end of [19] + [20] = { ["type"] = "BTR-80", ["point"] = @@ -1442,8 +1470,8 @@ MEunitsByCat = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [19] - [20] = + }, -- end of [20] + [21] = { ["type"] = "BTR-80", ["point"] = @@ -1464,8 +1492,8 @@ MEunitsByCat = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [20] - [21] = + }, -- end of [21] + [22] = { ["type"] = "BTR-80", ["point"] = @@ -1486,8 +1514,8 @@ MEunitsByCat = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [21] - [22] = + }, -- end of [22] + [23] = { ["type"] = "BTR-80", ["point"] = @@ -1508,8 +1536,8 @@ MEunitsByCat = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [22] - [23] = + }, -- end of [23] + [24] = { ["type"] = "BTR-80", ["point"] = @@ -1530,8 +1558,8 @@ MEunitsByCat = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [23] - [24] = + }, -- end of [24] + [25] = { ["type"] = "BTR-80", ["point"] = @@ -1552,8 +1580,8 @@ MEunitsByCat = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [24] - [25] = + }, -- end of [25] + [26] = { ["type"] = "T-55", ["point"] = @@ -1574,8 +1602,8 @@ MEunitsByCat = ["playerCanDrive"] = true, ["heading"] = 0, ["countryId"] = 0, - }, -- end of [25] - [26] = + }, -- end of [26] + [27] = { ["type"] = "T-55", ["point"] = @@ -1596,8 +1624,8 @@ MEunitsByCat = ["playerCanDrive"] = true, ["heading"] = 0, ["countryId"] = 0, - }, -- end of [26] - [27] = + }, -- end of [27] + [28] = { ["type"] = "T-55", ["point"] = @@ -1618,8 +1646,8 @@ MEunitsByCat = ["playerCanDrive"] = true, ["heading"] = 0, ["countryId"] = 0, - }, -- end of [27] - [28] = + }, -- end of [28] + [29] = { ["type"] = "T-55", ["point"] = @@ -1640,6 +1668,6 @@ MEunitsByCat = ["playerCanDrive"] = true, ["heading"] = 0, ["countryId"] = 0, - }, -- end of [28] + }, -- end of [29] }, -- end of ["vehicle"] } -- end of MEunitsByCat diff --git a/Example DBs/mist_DBs_MEunitsById.lua b/Example DBs/mist_DBs_MEunitsById.lua index 742c57f..50a85d5 100644 --- a/Example DBs/mist_DBs_MEunitsById.lua +++ b/Example DBs/mist_DBs_MEunitsById.lua @@ -278,11 +278,17 @@ MEunitsById = ["onboard_num"] = "52", ["category"] = "plane", ["unitName"] = "A-10C Client #1_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, ["groupId"] = 6, ["groupName"] = "A-10C Client #1", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -318142.85714286, ["callsign"] = { [1] = 3, @@ -290,13 +296,10 @@ MEunitsById = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -318142.85714286, - ["skill"] = "Client", ["heading"] = -0.67060113146646, ["unitId"] = 11, ["y"] = 636428.57142857, - ["coalition"] = "blue", + ["countryId"] = 2, ["speed"] = 138.88888888889, }, -- end of [11] [12] = @@ -312,11 +315,17 @@ MEunitsById = ["onboard_num"] = "52", ["category"] = "plane", ["unitName"] = "A-10C Client #2_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, ["groupId"] = 7, ["groupName"] = "A-10C Client #2", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -315857.14285714, ["callsign"] = { [1] = 3, @@ -324,13 +333,10 @@ MEunitsById = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -315857.14285714, - ["skill"] = "Client", ["heading"] = -0.66079849060746, ["unitId"] = 12, ["y"] = 644428.57142857, - ["coalition"] = "blue", + ["countryId"] = 2, ["speed"] = 138.88888888889, }, -- end of [12] [13] = @@ -1016,48 +1022,48 @@ MEunitsById = [45] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] + ["unitId"] = 45, ["groupId"] = 31, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cargoBob", ["x"] = -292007.14285714, - ["y"] = 675199.99999999, + ["coalition"] = "blue", ["mass"] = 371, - ["unitId"] = 45, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", + ["y"] = 675199.99999999, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of [45] [46] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] + ["unitId"] = 46, ["groupId"] = 32, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["y"] = 674842.85714285, + ["coalition"] = "blue", ["mass"] = 1337, - ["unitId"] = 46, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", + ["y"] = 674842.85714285, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of [46] [47] = { @@ -1448,47 +1454,47 @@ MEunitsById = }, -- end of [62] [63] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 40, + ["country"] = "usa", + ["unitId"] = 63, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["country"] = "usa", - ["coalition"] = "blue", + ["heading"] = 0, + ["countryId"] = 2, ["x"] = -355322.45423175, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1", - ["unitId"] = 63, + ["groupId"] = 40, + ["coalition"] = "blue", ["y"] = 443856.28948724, - ["countryId"] = 2, }, -- end of [63] [64] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 41, + ["country"] = "usa", + ["unitId"] = 64, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["country"] = "usa", - ["coalition"] = "blue", + ["heading"] = 0, + ["countryId"] = 2, ["x"] = -355322.27295572, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["unitId"] = 64, + ["groupId"] = 41, + ["coalition"] = "blue", ["y"] = 443849.03844635, - ["countryId"] = 2, }, -- end of [64] [65] = { @@ -1576,8 +1582,8 @@ MEunitsById = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -1586,7 +1592,7 @@ MEunitsById = ["unitName"] = "Rotary-1-1", ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["groupId"] = 45, ["groupName"] = "nH", ["callsign"] = @@ -1597,11 +1603,11 @@ MEunitsById = ["name"] = "Springfield11", }, -- end of ["callsign"] ["countryId"] = 21, - ["x"] = -155967.80633993, + ["x"] = -158700.87914814, ["skill"] = "High", - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["unitId"] = 68, - ["y"] = 405888.85058741, + ["y"] = 404406.46136648, ["coalition"] = "neutral", ["speed"] = 44.444444444444, }, -- end of [68] @@ -1627,4 +1633,26 @@ MEunitsById = ["countryId"] = 21, ["coalition"] = "neutral", }, -- end of [69] + [70] = + { + ["type"] = "AAV7", + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["groupId"] = 47, + ["skill"] = "Average", + ["country"] = "usa", + ["groupName"] = "poly", + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["heading"] = 2.3261877017598, + ["countryId"] = 2, + }, -- end of [70] } -- end of MEunitsById diff --git a/Example DBs/mist_DBs_MEunitsByName.lua b/Example DBs/mist_DBs_MEunitsByName.lua index 9debb55..e4013f5 100644 --- a/Example DBs/mist_DBs_MEunitsByName.lua +++ b/Example DBs/mist_DBs_MEunitsByName.lua @@ -141,6 +141,12 @@ MEunitsByName = ["type"] = "Cafe", ["point"] = { + [1] = + { + ["y"] = 0, + ["x"] = -115514.59796101, + ["z"] = 464123.689023, + }, -- end of [1] ["y"] = 464123.689023, ["x"] = -115514.59796101, }, -- end of ["point"] @@ -359,25 +365,25 @@ MEunitsByName = ["cloneCargoBase"] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] + ["unitId"] = 46, ["groupId"] = 32, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["y"] = 674842.85714285, + ["coalition"] = "blue", ["mass"] = 1337, - ["unitId"] = 46, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", + ["y"] = 674842.85714285, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of ["cloneCargoBase"] ["USTanks2_1"] = { @@ -414,11 +420,17 @@ MEunitsByName = ["onboard_num"] = "52", ["category"] = "plane", ["unitName"] = "A-10C Client #2_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, ["groupId"] = 7, ["groupName"] = "A-10C Client #2", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -315857.14285714, ["callsign"] = { [1] = 3, @@ -426,13 +438,10 @@ MEunitsByName = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -315857.14285714, - ["skill"] = "Client", ["heading"] = -0.66079849060746, ["unitId"] = 12, ["y"] = 644428.57142857, - ["coalition"] = "blue", + ["countryId"] = 2, ["speed"] = 138.88888888889, }, -- end of ["A-10C Client #2_unit"] ["USTanks1_3"] = @@ -457,28 +466,28 @@ MEunitsByName = ["heading"] = 0, ["countryId"] = 2, }, -- end of ["USTanks1_3"] - ["static_on_ship1 #001"] = + ["RuTent2"] = { - ["heading"] = 0, + ["shape_name"] = "PalatkaB", + ["type"] = "FARP Tent", ["point"] = { - ["y"] = 443849.03844635, - ["x"] = -355322.27295572, + ["y"] = 617319.42857142, + ["x"] = -259804, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 41, - ["livery_id"] = "USA Marines", - ["groupName"] = "static_on_ship1 #001", - ["country"] = "usa", - ["coalition"] = "blue", - ["x"] = -355322.27295572, - ["type"] = "AH-1W", + ["categoryStatic"] = "Fortifications", + ["country"] = "russia", + ["groupName"] = "RuTent2", + ["heading"] = 0, + ["y"] = 617319.42857142, + ["x"] = -259804, + ["unitId"] = 41, ["category"] = "static", - ["unitName"] = "static_on_ship1 #001", - ["unitId"] = 64, - ["y"] = 443849.03844635, - ["countryId"] = 2, - }, -- end of ["static_on_ship1 #001"] + ["unitName"] = "RuTent2", + ["groupId"] = 19, + ["countryId"] = 0, + ["coalition"] = "red", + }, -- end of ["RuTent2"] ["Unit #006"] = { ["type"] = "Hawk ln", @@ -501,28 +510,28 @@ MEunitsByName = ["heading"] = 0, ["countryId"] = 2, }, -- end of ["Unit #006"] - ["Naval-1-1"] = + ["static_on_ship1"] = { - ["type"] = "PERRY", + ["type"] = "AH-1W", ["point"] = { - ["y"] = 342754.30716193, - ["x"] = -153426.17965693, + ["y"] = 443856.28948724, + ["x"] = -355322.45423175, }, -- end of ["point"] - ["groupId"] = 44, - ["groupName"] = "perry", - ["livery_id"] = "ReubenJames", - ["skill"] = "Average", - ["country"] = "australia", - ["coalition"] = "neutral", - ["x"] = -153426.17965693, + ["country"] = "usa", + ["unitId"] = 63, + ["livery_id"] = "USA Marines", + ["groupName"] = "static_on_ship1", ["heading"] = 0, - ["category"] = "ship", - ["unitName"] = "Naval-1-1", - ["unitId"] = 67, - ["y"] = 342754.30716193, - ["countryId"] = 21, - }, -- end of ["Naval-1-1"] + ["countryId"] = 2, + ["x"] = -355322.45423175, + ["categoryStatic"] = "Helicopters", + ["category"] = "static", + ["unitName"] = "static_on_ship1", + ["groupId"] = 40, + ["coalition"] = "blue", + ["y"] = 443856.28948724, + }, -- end of ["static_on_ship1"] ["tent"] = { ["shape_name"] = "PalatkaB", @@ -685,11 +694,17 @@ MEunitsByName = ["onboard_num"] = "52", ["category"] = "plane", ["unitName"] = "A-10C Client #1_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, ["groupId"] = 6, ["groupName"] = "A-10C Client #1", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -318142.85714286, ["callsign"] = { [1] = 3, @@ -697,13 +712,10 @@ MEunitsByName = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -318142.85714286, - ["skill"] = "Client", ["heading"] = -0.67060113146646, ["unitId"] = 11, ["y"] = 636428.57142857, - ["coalition"] = "blue", + ["countryId"] = 2, ["speed"] = 138.88888888889, }, -- end of ["A-10C Client #1_unit"] ["Su-33 Client #2Unit"] = @@ -950,50 +962,70 @@ MEunitsByName = ["y"] = 684605.71428571, ["countryId"] = 2, }, -- end of ["static"] - ["Unit #008"] = + ["tent #001"] = { - ["type"] = "Hawk cwar", + ["shape_name"] = "teplowoz", + ["type"] = "Locomotive", ["point"] = { - ["y"] = 681535.14285714, - ["x"] = -287156.85714286, + ["y"] = 652535.98623348, + ["x"] = -295992.90575084, }, -- end of ["point"] - ["groupId"] = 35, - ["skill"] = "Average", - ["country"] = "usa", - ["groupName"] = "teleGroup", - ["y"] = 681535.14285714, - ["coalition"] = "blue", - ["x"] = -287156.85714286, - ["unitId"] = 58, - ["category"] = "vehicle", - ["unitName"] = "Unit #008", - ["playerCanDrive"] = true, + ["groupId"] = 38, + ["groupName"] = "tent #001", + ["unitId"] = 61, + ["countryId"] = 0, + ["x"] = -295992.90575084, ["heading"] = 0, - ["countryId"] = 2, - }, -- end of ["Unit #008"] - ["USTanks1_2"] = + ["category"] = "static", + ["unitName"] = "tent #001", + ["country"] = "russia", + ["y"] = 652535.98623348, + ["coalition"] = "red", + }, -- end of ["tent #001"] + ["Aerial-1-1"] = { - ["type"] = "M-1 Abrams", + ["alt"] = 2000, ["point"] = { - ["y"] = 639840, - ["x"] = -294725.71428571, + [1] = + { + ["y"] = 0, + ["x"] = -198551.02959497, + ["z"] = 319582.08692347, + }, -- end of [1] + ["y"] = 319582.08692347, + ["x"] = -198551.02959497, }, -- end of ["point"] - ["groupId"] = 11, - ["skill"] = "Average", - ["country"] = "usa", - ["groupName"] = "USTanks1", - ["y"] = 639840, - ["coalition"] = "blue", - ["x"] = -294725.71428571, - ["unitId"] = 20, - ["category"] = "vehicle", - ["unitName"] = "USTanks1_2", - ["playerCanDrive"] = true, - ["heading"] = 0, - ["countryId"] = 2, - }, -- end of ["USTanks1_2"] + ["alt_type"] = "BARO", + ["livery_id"] = "Australian 75th Squadron", + ["onboard_num"] = "010", + ["category"] = "plane", + ["unitName"] = "Aerial-1-1", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] + ["type"] = "FA-18C_hornet", + ["country"] = "australia", + ["psi"] = -2.1995926132104, + ["groupId"] = 42, + ["groupName"] = "cloneNeut", + ["skill"] = "High", + ["coalition"] = "neutral", + ["x"] = -198551.02959497, + ["callsign"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + ["name"] = "Enfield11", + }, -- end of ["callsign"] + ["heading"] = 2.1995926132104, + ["unitId"] = 65, + ["y"] = 319582.08692347, + ["countryId"] = 21, + ["speed"] = 180.55555555556, + }, -- end of ["Aerial-1-1"] ["Pilot #001"] = { ["alt"] = 2000, @@ -1169,6 +1201,12 @@ MEunitsByName = ["type"] = "M-113", ["point"] = { + [1] = + { + ["y"] = 0, + ["x"] = -146108.63642373, + ["z"] = 445199.91242668, + }, -- end of [1] ["y"] = 445199.91242668, ["x"] = -146108.63642373, }, -- end of ["point"] @@ -1186,6 +1224,28 @@ MEunitsByName = ["heading"] = 0, ["countryId"] = 21, }, -- end of ["Ground-1-1"] + ["static_on_ship1 #001"] = + { + ["type"] = "AH-1W", + ["point"] = + { + ["y"] = 443849.03844635, + ["x"] = -355322.27295572, + }, -- end of ["point"] + ["country"] = "usa", + ["unitId"] = 64, + ["livery_id"] = "USA Marines", + ["groupName"] = "static_on_ship1 #001", + ["heading"] = 0, + ["countryId"] = 2, + ["x"] = -355322.27295572, + ["categoryStatic"] = "Helicopters", + ["category"] = "static", + ["unitName"] = "static_on_ship1 #001", + ["groupId"] = 41, + ["coalition"] = "blue", + ["y"] = 443849.03844635, + }, -- end of ["static_on_ship1 #001"] ["RuTent1"] = { ["shape_name"] = "PalatkaB", @@ -1208,50 +1268,6 @@ MEunitsByName = ["countryId"] = 0, ["coalition"] = "red", }, -- end of ["RuTent1"] - ["RuTent2"] = - { - ["shape_name"] = "PalatkaB", - ["type"] = "FARP Tent", - ["point"] = - { - ["y"] = 617319.42857142, - ["x"] = -259804, - }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["country"] = "russia", - ["groupName"] = "RuTent2", - ["heading"] = 0, - ["y"] = 617319.42857142, - ["x"] = -259804, - ["unitId"] = 41, - ["category"] = "static", - ["unitName"] = "RuTent2", - ["groupId"] = 19, - ["countryId"] = 0, - ["coalition"] = "red", - }, -- end of ["RuTent2"] - ["USTanks1_4"] = - { - ["type"] = "M-1 Abrams", - ["point"] = - { - ["y"] = 639920, - ["x"] = -294805.71428571, - }, -- end of ["point"] - ["groupId"] = 11, - ["skill"] = "Average", - ["country"] = "usa", - ["groupName"] = "USTanks1", - ["y"] = 639920, - ["coalition"] = "blue", - ["x"] = -294805.71428571, - ["unitId"] = 22, - ["category"] = "vehicle", - ["unitName"] = "USTanks1_4", - ["playerCanDrive"] = true, - ["heading"] = 0, - ["countryId"] = 2, - }, -- end of ["USTanks1_4"] ["RuBTRs4"] = { ["type"] = "BTR-80", @@ -1274,6 +1290,49 @@ MEunitsByName = ["heading"] = -1.7994767003775, ["countryId"] = 0, }, -- end of ["RuBTRs4"] + ["USTanks1_4"] = + { + ["type"] = "M-1 Abrams", + ["point"] = + { + ["y"] = 639920, + ["x"] = -294805.71428571, + }, -- end of ["point"] + ["groupId"] = 11, + ["skill"] = "Average", + ["country"] = "usa", + ["groupName"] = "USTanks1", + ["y"] = 639920, + ["coalition"] = "blue", + ["x"] = -294805.71428571, + ["unitId"] = 22, + ["category"] = "vehicle", + ["unitName"] = "USTanks1_4", + ["playerCanDrive"] = true, + ["heading"] = 0, + ["countryId"] = 2, + }, -- end of ["USTanks1_4"] + ["2ship2"] = + { + ["type"] = "MOSCOW", + ["point"] = + { + ["y"] = 74371.428571428, + ["x"] = -87228.571428571, + }, -- end of ["point"] + ["groupId"] = 10, + ["groupName"] = "Rus Ships #2", + ["skill"] = "Average", + ["country"] = "russia", + ["coalition"] = "red", + ["x"] = -87228.571428571, + ["heading"] = 1.1755995276042, + ["category"] = "ship", + ["unitName"] = "2ship2", + ["unitId"] = 18, + ["y"] = 74371.428571428, + ["countryId"] = 0, + }, -- end of ["2ship2"] ["Mi-8s_1_1"] = { ["alt"] = 500, @@ -1310,49 +1369,28 @@ MEunitsByName = ["countryId"] = 0, ["speed"] = 55.555555555556, }, -- end of ["Mi-8s_1_1"] - ["RuTanks1"] = + ["Ground-2-1"] = { - ["type"] = "T-55", + ["type"] = "AAV7", ["point"] = { - ["y"] = 628677.14285714, - ["x"] = -273442.85714286, + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, }, -- end of ["point"] - ["groupId"] = 14, - ["skill"] = "Excellent", - ["country"] = "russia", - ["groupName"] = "RuTanks", - ["y"] = 628677.14285714, - ["coalition"] = "red", - ["x"] = -273442.85714286, - ["unitId"] = 33, - ["category"] = "vehicle", - ["unitName"] = "RuTanks1", - ["playerCanDrive"] = true, - ["heading"] = 0, - ["countryId"] = 0, - }, -- end of ["RuTanks1"] - ["2ship2"] = - { - ["type"] = "MOSCOW", - ["point"] = - { - ["y"] = 74371.428571428, - ["x"] = -87228.571428571, - }, -- end of ["point"] - ["groupId"] = 10, - ["groupName"] = "Rus Ships #2", + ["groupId"] = 47, ["skill"] = "Average", - ["country"] = "russia", - ["coalition"] = "red", - ["x"] = -87228.571428571, - ["heading"] = 1.1755995276042, - ["category"] = "ship", - ["unitName"] = "2ship2", - ["unitId"] = 18, - ["y"] = 74371.428571428, - ["countryId"] = 0, - }, -- end of ["2ship2"] + ["country"] = "usa", + ["groupName"] = "poly", + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["heading"] = 2.3261877017598, + ["countryId"] = 2, + }, -- end of ["Ground-2-1"] ["Unit #003"] = { ["type"] = "Hawk sr", @@ -1375,6 +1413,28 @@ MEunitsByName = ["heading"] = 0, ["countryId"] = 2, }, -- end of ["Unit #003"] + ["RuBTRs6"] = + { + ["type"] = "BTR-80", + ["point"] = + { + ["y"] = 654745.71428571, + ["x"] = -293042.85714286, + }, -- end of ["point"] + ["groupId"] = 13, + ["skill"] = "Average", + ["country"] = "russia", + ["groupName"] = "RuBTRs", + ["y"] = 654745.71428571, + ["coalition"] = "red", + ["x"] = -293042.85714286, + ["unitId"] = 32, + ["category"] = "vehicle", + ["unitName"] = "RuBTRs6", + ["playerCanDrive"] = true, + ["heading"] = -1.7994767003775, + ["countryId"] = 0, + }, -- end of ["RuBTRs6"] ["2ship1"] = { ["type"] = "MOSCOW", @@ -1424,93 +1484,85 @@ MEunitsByName = ["coalition"] = "red", ["speed"] = 138.88888888889, }, -- end of ["Su-33 Client #1Unit"] - ["RuBTRs6"] = + ["RuTanks1"] = { - ["type"] = "BTR-80", + ["type"] = "T-55", ["point"] = { - ["y"] = 654745.71428571, - ["x"] = -293042.85714286, + ["y"] = 628677.14285714, + ["x"] = -273442.85714286, }, -- end of ["point"] - ["groupId"] = 13, - ["skill"] = "Average", + ["groupId"] = 14, + ["skill"] = "Excellent", ["country"] = "russia", - ["groupName"] = "RuBTRs", - ["y"] = 654745.71428571, + ["groupName"] = "RuTanks", + ["y"] = 628677.14285714, ["coalition"] = "red", - ["x"] = -293042.85714286, - ["unitId"] = 32, + ["x"] = -273442.85714286, + ["unitId"] = 33, ["category"] = "vehicle", - ["unitName"] = "RuBTRs6", + ["unitName"] = "RuTanks1", ["playerCanDrive"] = true, - ["heading"] = -1.7994767003775, - ["countryId"] = 0, - }, -- end of ["RuBTRs6"] - ["Aerial-1-1"] = - { - ["alt"] = 2000, - ["point"] = - { - ["y"] = 319582.08692347, - ["x"] = -198551.02959497, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["livery_id"] = "Australian 75th Squadron", - ["onboard_num"] = "010", - ["category"] = "plane", - ["unitName"] = "Aerial-1-1", - ["AddPropAircraft"] = - { - }, -- end of ["AddPropAircraft"] - ["type"] = "FA-18C_hornet", - ["country"] = "australia", - ["psi"] = -2.1995926132104, - ["groupId"] = 42, - ["groupName"] = "cloneNeut", - ["skill"] = "High", - ["coalition"] = "neutral", - ["x"] = -198551.02959497, - ["callsign"] = - { - [1] = 1, - [2] = 1, - [3] = 1, - ["name"] = "Enfield11", - }, -- end of ["callsign"] - ["heading"] = 2.1995926132104, - ["unitId"] = 65, - ["y"] = 319582.08692347, - ["countryId"] = 21, - ["speed"] = 180.55555555556, - }, -- end of ["Aerial-1-1"] - ["tent #001"] = - { - ["shape_name"] = "teplowoz", - ["type"] = "Locomotive", - ["point"] = - { - ["y"] = 652535.98623348, - ["x"] = -295992.90575084, - }, -- end of ["point"] - ["groupId"] = 38, - ["groupName"] = "tent #001", - ["unitId"] = 61, - ["countryId"] = 0, - ["x"] = -295992.90575084, ["heading"] = 0, - ["category"] = "static", - ["unitName"] = "tent #001", - ["country"] = "russia", - ["y"] = 652535.98623348, - ["coalition"] = "red", - }, -- end of ["tent #001"] + ["countryId"] = 0, + }, -- end of ["RuTanks1"] + ["Unit #008"] = + { + ["type"] = "Hawk cwar", + ["point"] = + { + ["y"] = 681535.14285714, + ["x"] = -287156.85714286, + }, -- end of ["point"] + ["groupId"] = 35, + ["skill"] = "Average", + ["country"] = "usa", + ["groupName"] = "teleGroup", + ["y"] = 681535.14285714, + ["coalition"] = "blue", + ["x"] = -287156.85714286, + ["unitId"] = 58, + ["category"] = "vehicle", + ["unitName"] = "Unit #008", + ["playerCanDrive"] = true, + ["heading"] = 0, + ["countryId"] = 2, + }, -- end of ["Unit #008"] + ["USTanks1_2"] = + { + ["type"] = "M-1 Abrams", + ["point"] = + { + ["y"] = 639840, + ["x"] = -294725.71428571, + }, -- end of ["point"] + ["groupId"] = 11, + ["skill"] = "Average", + ["country"] = "usa", + ["groupName"] = "USTanks1", + ["y"] = 639840, + ["coalition"] = "blue", + ["x"] = -294725.71428571, + ["unitId"] = 20, + ["category"] = "vehicle", + ["unitName"] = "USTanks1_2", + ["playerCanDrive"] = true, + ["heading"] = 0, + ["countryId"] = 2, + }, -- end of ["USTanks1_2"] ["Rotary-1-1"] = { ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + [1] = + { + ["y"] = 0, + ["x"] = -158700.87914814, + ["z"] = 404406.46136648, + }, -- end of [1] + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -1519,7 +1571,7 @@ MEunitsByName = ["unitName"] = "Rotary-1-1", ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["groupId"] = 45, ["groupName"] = "nH", ["callsign"] = @@ -1530,58 +1582,86 @@ MEunitsByName = ["name"] = "Springfield11", }, -- end of ["callsign"] ["countryId"] = 21, - ["x"] = -155967.80633993, + ["x"] = -158700.87914814, ["skill"] = "High", - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["unitId"] = 68, - ["y"] = 405888.85058741, + ["y"] = 404406.46136648, ["coalition"] = "neutral", ["speed"] = 44.444444444444, }, -- end of ["Rotary-1-1"] - ["static_on_ship1"] = + ["RuBTRs1"] = { - ["heading"] = 0, + ["type"] = "BTR-80", ["point"] = { - ["y"] = 443856.28948724, - ["x"] = -355322.45423175, + ["y"] = 654545.71428571, + ["x"] = -292842.85714286, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 40, - ["livery_id"] = "USA Marines", - ["groupName"] = "static_on_ship1", - ["country"] = "usa", - ["coalition"] = "blue", - ["x"] = -355322.45423175, - ["type"] = "AH-1W", - ["category"] = "static", - ["unitName"] = "static_on_ship1", - ["unitId"] = 63, - ["y"] = 443856.28948724, - ["countryId"] = 2, - }, -- end of ["static_on_ship1"] + ["groupId"] = 13, + ["skill"] = "Average", + ["country"] = "russia", + ["groupName"] = "RuBTRs", + ["y"] = 654545.71428571, + ["coalition"] = "red", + ["x"] = -292842.85714286, + ["unitId"] = 27, + ["category"] = "vehicle", + ["unitName"] = "RuBTRs1", + ["playerCanDrive"] = true, + ["heading"] = -1.7994767003775, + ["countryId"] = 0, + }, -- end of ["RuBTRs1"] + ["Naval-1-1"] = + { + ["type"] = "PERRY", + ["point"] = + { + [1] = + { + ["y"] = 0, + ["x"] = -153426.17965693, + ["z"] = 342754.30716193, + }, -- end of [1] + ["y"] = 342754.30716193, + ["x"] = -153426.17965693, + }, -- end of ["point"] + ["groupId"] = 44, + ["groupName"] = "perry", + ["livery_id"] = "ReubenJames", + ["skill"] = "Average", + ["country"] = "australia", + ["coalition"] = "neutral", + ["x"] = -153426.17965693, + ["heading"] = 0, + ["category"] = "ship", + ["unitName"] = "Naval-1-1", + ["unitId"] = 67, + ["y"] = 342754.30716193, + ["countryId"] = 21, + }, -- end of ["Naval-1-1"] ["cargoBob"] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] + ["unitId"] = 45, ["groupId"] = 31, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cargoBob", ["x"] = -292007.14285714, - ["y"] = 675199.99999999, + ["coalition"] = "blue", ["mass"] = 371, - ["unitId"] = 45, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", + ["y"] = 675199.99999999, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of ["cargoBob"] ["USTanks2_4"] = { @@ -1605,26 +1685,4 @@ MEunitsByName = ["heading"] = 1.4977557614926, ["countryId"] = 2, }, -- end of ["USTanks2_4"] - ["RuBTRs1"] = - { - ["type"] = "BTR-80", - ["point"] = - { - ["y"] = 654545.71428571, - ["x"] = -292842.85714286, - }, -- end of ["point"] - ["groupId"] = 13, - ["skill"] = "Average", - ["country"] = "russia", - ["groupName"] = "RuBTRs", - ["y"] = 654545.71428571, - ["coalition"] = "red", - ["x"] = -292842.85714286, - ["unitId"] = 27, - ["category"] = "vehicle", - ["unitName"] = "RuBTRs1", - ["playerCanDrive"] = true, - ["heading"] = -1.7994767003775, - ["countryId"] = 0, - }, -- end of ["RuBTRs1"] } -- end of MEunitsByName diff --git a/Example DBs/mist_DBs_MEunitsByNum.lua b/Example DBs/mist_DBs_MEunitsByNum.lua index 2edae05..43f92ad 100644 --- a/Example DBs/mist_DBs_MEunitsByNum.lua +++ b/Example DBs/mist_DBs_MEunitsByNum.lua @@ -108,8 +108,8 @@ MEunitsByNum = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -118,7 +118,7 @@ MEunitsByNum = ["unitName"] = "Rotary-1-1", ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["groupId"] = 45, ["groupName"] = "nH", ["callsign"] = @@ -129,11 +129,11 @@ MEunitsByNum = ["name"] = "Springfield11", }, -- end of ["callsign"] ["countryId"] = 21, - ["x"] = -155967.80633993, + ["x"] = -158700.87914814, ["skill"] = "High", - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["unitId"] = 68, - ["y"] = 405888.85058741, + ["y"] = 404406.46136648, ["coalition"] = "neutral", ["speed"] = 44.444444444444, }, -- end of [5] @@ -247,92 +247,92 @@ MEunitsByNum = [11] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] + ["unitId"] = 45, ["groupId"] = 31, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cargoBob", ["x"] = -292007.14285714, - ["y"] = 675199.99999999, + ["coalition"] = "blue", ["mass"] = 371, - ["unitId"] = 45, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", + ["y"] = 675199.99999999, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of [11] [12] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] + ["unitId"] = 46, ["groupId"] = 32, - ["country"] = "usa", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["groupName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["y"] = 674842.85714285, + ["coalition"] = "blue", ["mass"] = 1337, - ["unitId"] = 46, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", + ["y"] = 674842.85714285, + ["country"] = "usa", ["countryId"] = 2, - ["categoryStatic"] = "Cargos", - ["coalition"] = "blue", }, -- end of [12] [13] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 40, + ["country"] = "usa", + ["unitId"] = 63, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["country"] = "usa", - ["coalition"] = "blue", + ["heading"] = 0, + ["countryId"] = 2, ["x"] = -355322.45423175, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1", - ["unitId"] = 63, + ["groupId"] = 40, + ["coalition"] = "blue", ["y"] = 443856.28948724, - ["countryId"] = 2, }, -- end of [13] [14] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["groupId"] = 41, + ["country"] = "usa", + ["unitId"] = 64, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["country"] = "usa", - ["coalition"] = "blue", + ["heading"] = 0, + ["countryId"] = 2, ["x"] = -355322.27295572, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["unitId"] = 64, + ["groupId"] = 41, + ["coalition"] = "blue", ["y"] = 443849.03844635, - ["countryId"] = 2, }, -- end of [14] [15] = { @@ -709,6 +709,28 @@ MEunitsByNum = ["countryId"] = 2, }, -- end of [31] [32] = + { + ["type"] = "AAV7", + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["groupId"] = 47, + ["skill"] = "Average", + ["country"] = "usa", + ["groupName"] = "poly", + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["heading"] = 2.3261877017598, + ["countryId"] = 2, + }, -- end of [32] + [33] = { ["alt"] = 2000, ["point"] = @@ -741,8 +763,8 @@ MEunitsByNum = ["y"] = 662142.85714286, ["coalition"] = "blue", ["speed"] = 138.88888888889, - }, -- end of [32] - [33] = + }, -- end of [33] + [34] = { ["alt"] = 2000, ["point"] = @@ -775,8 +797,8 @@ MEunitsByNum = ["y"] = 668428.57142857, ["coalition"] = "blue", ["speed"] = 138.88888888889, - }, -- end of [33] - [34] = + }, -- end of [34] + [35] = { ["alt"] = 2000, ["point"] = @@ -789,11 +811,17 @@ MEunitsByNum = ["onboard_num"] = "52", ["category"] = "plane", ["unitName"] = "A-10C Client #1_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, ["groupId"] = 6, ["groupName"] = "A-10C Client #1", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -318142.85714286, ["callsign"] = { [1] = 3, @@ -801,16 +829,13 @@ MEunitsByNum = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -318142.85714286, - ["skill"] = "Client", ["heading"] = -0.67060113146646, ["unitId"] = 11, ["y"] = 636428.57142857, - ["coalition"] = "blue", + ["countryId"] = 2, ["speed"] = 138.88888888889, - }, -- end of [34] - [35] = + }, -- end of [35] + [36] = { ["alt"] = 2000, ["point"] = @@ -823,11 +848,17 @@ MEunitsByNum = ["onboard_num"] = "52", ["category"] = "plane", ["unitName"] = "A-10C Client #2_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, ["groupId"] = 7, ["groupName"] = "A-10C Client #2", + ["skill"] = "Client", + ["coalition"] = "blue", + ["x"] = -315857.14285714, ["callsign"] = { [1] = 3, @@ -835,16 +866,13 @@ MEunitsByNum = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] - ["countryId"] = 2, - ["x"] = -315857.14285714, - ["skill"] = "Client", ["heading"] = -0.66079849060746, ["unitId"] = 12, ["y"] = 644428.57142857, - ["coalition"] = "blue", + ["countryId"] = 2, ["speed"] = 138.88888888889, - }, -- end of [35] - [36] = + }, -- end of [36] + [37] = { ["alt"] = 2000, ["point"] = @@ -877,8 +905,8 @@ MEunitsByNum = ["y"] = 682714.28571429, ["coalition"] = "blue", ["speed"] = 138.88888888889, - }, -- end of [36] - [37] = + }, -- end of [37] + [38] = { ["alt"] = 2000, ["hardpoint_racks"] = true, @@ -912,8 +940,8 @@ MEunitsByNum = ["countryId"] = 2, ["coalition"] = "blue", ["speed"] = 138.88888888889, - }, -- end of [37] - [38] = + }, -- end of [38] + [39] = { ["alt"] = 500, ["hardpoint_racks"] = true, @@ -947,8 +975,8 @@ MEunitsByNum = ["countryId"] = 2, ["coalition"] = "blue", ["speed"] = 55.555555555556, - }, -- end of [38] - [39] = + }, -- end of [39] + [40] = { ["alt"] = 500, ["point"] = @@ -981,8 +1009,8 @@ MEunitsByNum = ["y"] = 631695.14285713, ["coalition"] = "blue", ["speed"] = 55.555555555556, - }, -- end of [39] - [40] = + }, -- end of [40] + [41] = { ["type"] = "MOSCOW", ["point"] = @@ -1002,8 +1030,8 @@ MEunitsByNum = ["unitId"] = 15, ["y"] = 200000, ["countryId"] = 0, - }, -- end of [40] - [41] = + }, -- end of [41] + [42] = { ["type"] = "MOSCOW", ["point"] = @@ -1023,8 +1051,8 @@ MEunitsByNum = ["unitId"] = 16, ["y"] = 200800, ["countryId"] = 0, - }, -- end of [41] - [42] = + }, -- end of [42] + [43] = { ["type"] = "MOSCOW", ["point"] = @@ -1044,8 +1072,8 @@ MEunitsByNum = ["unitId"] = 17, ["y"] = 73571.428571428, ["countryId"] = 0, - }, -- end of [42] - [43] = + }, -- end of [43] + [44] = { ["type"] = "MOSCOW", ["point"] = @@ -1065,8 +1093,8 @@ MEunitsByNum = ["unitId"] = 18, ["y"] = 74371.428571428, ["countryId"] = 0, - }, -- end of [43] - [44] = + }, -- end of [44] + [45] = { ["type"] = "FARP", ["point"] = @@ -1086,8 +1114,8 @@ MEunitsByNum = ["groupId"] = 17, ["y"] = 617591.42857143, ["countryId"] = 0, - }, -- end of [44] - [45] = + }, -- end of [45] + [46] = { ["shape_name"] = "PalatkaB", ["type"] = "FARP Tent", @@ -1108,8 +1136,8 @@ MEunitsByNum = ["groupId"] = 18, ["countryId"] = 0, ["coalition"] = "red", - }, -- end of [45] - [46] = + }, -- end of [46] + [47] = { ["shape_name"] = "PalatkaB", ["type"] = "FARP Tent", @@ -1130,8 +1158,8 @@ MEunitsByNum = ["groupId"] = 19, ["countryId"] = 0, ["coalition"] = "red", - }, -- end of [46] - [47] = + }, -- end of [47] + [48] = { ["shape_name"] = "PalatkaB", ["type"] = "FARP Tent", @@ -1152,8 +1180,8 @@ MEunitsByNum = ["groupId"] = 36, ["countryId"] = 0, ["coalition"] = "red", - }, -- end of [47] - [48] = + }, -- end of [48] + [49] = { ["shape_name"] = "teplowoz", ["type"] = "Locomotive", @@ -1173,8 +1201,8 @@ MEunitsByNum = ["country"] = "russia", ["y"] = 652535.98623348, ["coalition"] = "red", - }, -- end of [48] - [49] = + }, -- end of [49] + [50] = { ["shape_name"] = "elektrowoz", ["type"] = "Electric locomotive", @@ -1194,8 +1222,8 @@ MEunitsByNum = ["country"] = "russia", ["y"] = 652535.98623348, ["coalition"] = "red", - }, -- end of [49] - [50] = + }, -- end of [50] + [51] = { ["type"] = "BTR-80", ["point"] = @@ -1216,8 +1244,8 @@ MEunitsByNum = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [50] - [51] = + }, -- end of [51] + [52] = { ["type"] = "BTR-80", ["point"] = @@ -1238,8 +1266,8 @@ MEunitsByNum = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [51] - [52] = + }, -- end of [52] + [53] = { ["type"] = "BTR-80", ["point"] = @@ -1260,8 +1288,8 @@ MEunitsByNum = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [52] - [53] = + }, -- end of [53] + [54] = { ["type"] = "BTR-80", ["point"] = @@ -1282,8 +1310,8 @@ MEunitsByNum = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [53] - [54] = + }, -- end of [54] + [55] = { ["type"] = "BTR-80", ["point"] = @@ -1304,8 +1332,8 @@ MEunitsByNum = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [54] - [55] = + }, -- end of [55] + [56] = { ["type"] = "BTR-80", ["point"] = @@ -1326,8 +1354,8 @@ MEunitsByNum = ["playerCanDrive"] = true, ["heading"] = -1.7994767003775, ["countryId"] = 0, - }, -- end of [55] - [56] = + }, -- end of [56] + [57] = { ["type"] = "T-55", ["point"] = @@ -1348,8 +1376,8 @@ MEunitsByNum = ["playerCanDrive"] = true, ["heading"] = 0, ["countryId"] = 0, - }, -- end of [56] - [57] = + }, -- end of [57] + [58] = { ["type"] = "T-55", ["point"] = @@ -1370,8 +1398,8 @@ MEunitsByNum = ["playerCanDrive"] = true, ["heading"] = 0, ["countryId"] = 0, - }, -- end of [57] - [58] = + }, -- end of [58] + [59] = { ["type"] = "T-55", ["point"] = @@ -1392,8 +1420,8 @@ MEunitsByNum = ["playerCanDrive"] = true, ["heading"] = 0, ["countryId"] = 0, - }, -- end of [58] - [59] = + }, -- end of [59] + [60] = { ["type"] = "T-55", ["point"] = @@ -1414,8 +1442,8 @@ MEunitsByNum = ["playerCanDrive"] = true, ["heading"] = 0, ["countryId"] = 0, - }, -- end of [59] - [60] = + }, -- end of [60] + [61] = { ["alt"] = 2000, ["point"] = @@ -1442,8 +1470,8 @@ MEunitsByNum = ["y"] = 590391.42857142, ["coalition"] = "red", ["speed"] = 138.88888888889, - }, -- end of [60] - [61] = + }, -- end of [61] + [62] = { ["alt"] = 2000, ["point"] = @@ -1470,8 +1498,8 @@ MEunitsByNum = ["y"] = 590431.42857142, ["coalition"] = "red", ["speed"] = 138.88888888889, - }, -- end of [61] - [62] = + }, -- end of [62] + [63] = { ["alt"] = 2000, ["point"] = @@ -1498,8 +1526,8 @@ MEunitsByNum = ["y"] = 590471.42857142, ["coalition"] = "red", ["speed"] = 138.88888888889, - }, -- end of [62] - [63] = + }, -- end of [63] + [64] = { ["alt"] = 500, ["point"] = @@ -1526,8 +1554,8 @@ MEunitsByNum = ["y"] = 615000, ["coalition"] = "red", ["speed"] = 55.555555555556, - }, -- end of [63] - [64] = + }, -- end of [64] + [65] = { ["alt"] = 500, ["point"] = @@ -1554,8 +1582,8 @@ MEunitsByNum = ["y"] = 615040, ["coalition"] = "red", ["speed"] = 55.555555555556, - }, -- end of [64] - [65] = + }, -- end of [65] + [66] = { ["alt"] = 500, ["point"] = @@ -1590,8 +1618,8 @@ MEunitsByNum = ["y"] = 603285.71428571, ["countryId"] = 0, ["speed"] = 55.555555555556, - }, -- end of [65] - [66] = + }, -- end of [66] + [67] = { ["alt"] = 500, ["point"] = @@ -1626,5 +1654,5 @@ MEunitsByNum = ["y"] = 603325.71428571, ["countryId"] = 0, ["speed"] = 55.555555555556, - }, -- end of [66] + }, -- end of [67] } -- end of MEunitsByNum diff --git a/Example DBs/mist_DBs_aliveUnits.lua b/Example DBs/mist_DBs_aliveUnits.lua index 88c5dd8..b846438 100644 --- a/Example DBs/mist_DBs_aliveUnits.lua +++ b/Example DBs/mist_DBs_aliveUnits.lua @@ -72,9 +72,9 @@ aliveUnits = ["countryId"] = 0, ["pos"] = { - ["y"] = 500.37903099767, - ["x"] = -244706.43852308, - ["z"] = 604117.46587221, + ["y"] = 500.3788887943, + ["x"] = -244713.7312031, + ["z"] = 604121.73495853, }, -- end of ["pos"] }, -- end of [16782080] [16784128] = @@ -104,7 +104,7 @@ aliveUnits = ["y"] = 628677.14285714, ["pos"] = { - ["y"] = 10.095517860365, + ["y"] = 10.066674498182, ["x"] = -273442.84374994, ["z"] = 628677.125, }, -- end of ["pos"] @@ -168,18 +168,18 @@ aliveUnits = ["y"] = 686871.42857143, ["pos"] = { - ["y"] = 47.898649326901, + ["y"] = 47.951910044284, ["x"] = -286407.15625, ["z"] = 686871.4375, }, -- end of ["pos"] }, -- end of [16788224] [16792320] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692311, - ["x"] = -287237, + ["y"] = 694877, + ["x"] = -285009, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -193,132 +193,21 @@ aliveUnits = ["country"] = "usa", ["groupName"] = "teleGroup", ["countryId"] = 2, - ["y"] = 692311, - ["x"] = -287237, + ["y"] = 694877, + ["x"] = -285009, ["coalition"] = "blue", - ["type"] = "Hawk cwar", + ["type"] = "Hawk ln", ["groupId"] = 35, - ["unitId"] = 58, - ["unitName"] = "Unit #008", + ["unitId"] = 57, + ["unitName"] = "Unit #007", ["pos"] = { - ["y"] = 59.343688964844, - ["x"] = -287236.5625, - ["z"] = 692310.625, + ["y"] = 74.050750732422, + ["x"] = -285008.96875, + ["z"] = 694877.4375, }, -- end of ["pos"] }, -- end of [16792320] [16794368] = - { - ["alt"] = 48, - ["point"] = - { - ["y"] = 686871, - ["x"] = -286447, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["unit"] = - { - ["id_"] = 16794368, - }, -- end of ["unit"] - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-113", - ["groupId"] = 1000061, - ["groupName"] = "USA gnd 2", - ["unitName"] = "USA gnd 2 unit2", - ["countryId"] = 2, - ["x"] = -286447, - ["country"] = "usa", - ["heading"] = 0, - ["unitId"] = 7008, - ["y"] = 686871, - ["coalition"] = "blue", - ["pos"] = - { - ["y"] = 47.876458812809, - ["x"] = -286447.15625, - ["z"] = 686871.4375, - }, -- end of ["pos"] - }, -- end of [16794368] - [16798464] = - { - ["alt"] = 56, - ["point"] = - { - ["y"] = 692623, - ["x"] = -288844, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["unit"] = - { - ["id_"] = 16798464, - }, -- end of ["unit"] - ["category"] = "vehicle", - ["speed"] = 0, - ["heading"] = 1.4977557660227, - ["country"] = "usa", - ["groupName"] = "USA gnd 5", - ["countryId"] = 2, - ["y"] = 692623, - ["x"] = -288844, - ["coalition"] = "blue", - ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, - ["unitId"] = 7024, - ["unitName"] = "USA gnd 5 unit2", - ["pos"] = - { - ["y"] = 55.516570478325, - ["x"] = -288844.125, - ["z"] = 692622.625, - }, -- end of ["pos"] - }, -- end of [16798464] - [16800512] = - { - ["alt"] = 1997, - ["point"] = - { - ["y"] = 319610, - ["x"] = -198571, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["coalitionId"] = 0, - ["livery_id"] = "Australian 75th Squadron", - ["skill"] = "High", - ["unit"] = - { - ["id_"] = 16800512, - }, -- end of ["unit"] - ["category"] = "plane", - ["speed"] = 180.44764340673, - ["heading"] = 2.1995924685911, - ["groupId"] = 1000077, - ["unitName"] = "AUSTRALIA air 6 unit1", - ["groupName"] = "AUSTRALIA air 6", - ["callsign"] = - { - [1] = 1, - [2] = 1, - [3] = 1, - ["name"] = "Enfield11", - }, -- end of ["callsign"] - ["coalition"] = "neutral", - ["x"] = -198571, - ["unitId"] = 7032, - ["type"] = "FA-18C_hornet", - ["country"] = "australia", - ["y"] = 319610, - ["countryId"] = 21, - ["pos"] = - { - ["y"] = 1982.5736193491, - ["x"] = -199218.08789438, - ["z"] = 320499.17966247, - }, -- end of ["pos"] - }, -- end of [16800512] - [16802560] = { ["alt"] = 48, ["point"] = @@ -330,28 +219,139 @@ aliveUnits = ["skill"] = "Average", ["unit"] = { - ["id_"] = 16802560, + ["id_"] = 16794368, }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, - ["groupName"] = "USA gnd 8", - ["unitName"] = "USA gnd 8 unit1", + ["groupId"] = 7004, + ["groupName"] = "USA gnd 2", + ["unitName"] = "USA gnd 2 unit1", ["countryId"] = 2, ["x"] = -286407, ["country"] = "usa", ["heading"] = 0, - ["unitId"] = 7040, + ["unitId"] = 7007, ["y"] = 686871, ["coalition"] = "blue", ["pos"] = { - ["y"] = 47.898649326901, + ["y"] = 47.951913858982, ["x"] = -286407.15625, ["z"] = 686871.4375, }, -- end of ["pos"] - }, -- end of [16802560] + }, -- end of [16794368] + [16796416] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 690314, + ["x"] = -284956, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["unit"] = + { + ["id_"] = 16796416, + }, -- end of ["unit"] + ["category"] = "vehicle", + ["speed"] = 0, + ["heading"] = 1.497755755511, + ["country"] = "usa", + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["y"] = 690314, + ["x"] = -284956, + ["coalition"] = "blue", + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["unitId"] = 7015, + ["unitName"] = "USA gnd 3 unit4", + ["pos"] = + { + ["y"] = 62.104196563333, + ["x"] = -284955.8128938, + ["z"] = 690313.50394304, + }, -- end of ["pos"] + }, -- end of [16796416] + [16798464] = + { + ["alt"] = 73, + ["point"] = + { + ["y"] = 691751, + ["x"] = -283221, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["unit"] = + { + ["id_"] = 16798464, + }, -- end of ["unit"] + ["category"] = "vehicle", + ["speed"] = 0, + ["heading"] = 1.4977557703725, + ["country"] = "usa", + ["groupName"] = "USA gnd 5", + ["countryId"] = 2, + ["y"] = 691751, + ["x"] = -283221, + ["coalition"] = "blue", + ["type"] = "M-1 Abrams", + ["groupId"] = 7015, + ["unitId"] = 7023, + ["unitName"] = "USA gnd 5 unit1", + ["pos"] = + { + ["y"] = 73.060448716327, + ["x"] = -283223.65801962, + ["z"] = 691751.91357136, + }, -- end of ["pos"] + }, -- end of [16798464] + [16800512] = + { + ["alt"] = 1997, + ["point"] = + { + ["y"] = 682727, + ["x"] = -288608, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["coalitionId"] = 2, + ["livery_id"] = "usaf standard", + ["skill"] = "High", + ["unit"] = + { + ["id_"] = 16800512, + }, -- end of ["unit"] + ["category"] = "plane", + ["speed"] = 138.85196364465, + ["heading"] = 1.6162179734619, + ["groupId"] = 7019, + ["unitName"] = "USA air 5 unit1", + ["groupName"] = "USA air 5", + ["callsign"] = + { + [1] = 4, + [2] = 1, + [3] = 1, + ["name"] = "Colt11", + }, -- end of ["callsign"] + ["coalition"] = "blue", + ["x"] = -288608, + ["unitId"] = 7031, + ["type"] = "B-52H", + ["country"] = "usa", + ["y"] = 682727, + ["countryId"] = 2, + ["pos"] = + { + ["y"] = 1987.3907815825, + ["x"] = -288648.02914749, + ["z"] = 683613.54764354, + }, -- end of ["pos"] + }, -- end of [16800512] [16778240] = { ["country"] = "russia", @@ -379,7 +379,7 @@ aliveUnits = ["pos"] = { ["y"] = 0, - ["x"] = -35022.383171048, + ["x"] = -35022.938607417, ["z"] = 200800, }, -- end of ["pos"] }, -- end of [16778240] @@ -424,9 +424,9 @@ aliveUnits = ["countryId"] = 0, ["pos"] = { - ["y"] = 505.77128309592, - ["x"] = -244650.95231236, - ["z"] = 604142.23039996, + ["y"] = 508.23984253819, + ["x"] = -244656.30510529, + ["z"] = 604145.48703791, }, -- end of ["pos"] }, -- end of [16782336] [16784384] = @@ -456,7 +456,7 @@ aliveUnits = ["y"] = 628717.14285714, ["pos"] = { - ["y"] = 10.150873671384, + ["y"] = 10.15087317505, ["x"] = -273482.84374994, ["z"] = 628717.125, }, -- end of ["pos"] @@ -520,62 +520,50 @@ aliveUnits = ["y"] = 686871.42857143, ["pos"] = { - ["y"] = 47.876458812809, + ["y"] = 47.876790870956, ["x"] = -286447.15625, ["z"] = 686871.4375, }, -- end of ["pos"] }, -- end of [16788480] [16790528] = { - ["alt"] = 2000, ["point"] = { - ["y"] = 636428.57142857, - ["x"] = -318142.85714286, + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, }, -- end of ["point"] - ["alt_type"] = "BARO", - ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", - ["onboard_num"] = "52", + ["skill"] = "Average", ["unit"] = { ["id_"] = 16790528, }, -- end of ["unit"] - ["category"] = "plane", - ["unitName"] = "A-10C Client #1_unit", - ["type"] = "A-10C", - ["speed"] = 138.88888888889, - ["country"] = "usa", - ["psi"] = 0.67060113146646, - ["groupId"] = 6, - ["groupName"] = "A-10C Client #1", - ["callsign"] = - { - [1] = 3, - [2] = 1, - [3] = 1, - ["name"] = "Uzi11", - }, -- end of ["callsign"] + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["heading"] = 2.3261877017598, + ["unitId"] = 70, + ["groupName"] = "poly", ["countryId"] = 2, - ["x"] = -318142.85714286, - ["skill"] = "Client", - ["heading"] = -0.67060113146646, - ["unitId"] = 11, - ["y"] = 636428.57142857, ["coalition"] = "blue", + ["x"] = -244729.2581753, + ["type"] = "AAV7", + ["groupId"] = 47, + ["country"] = "usa", + ["playerCanDrive"] = true, + ["y"] = 185783.38833846, ["pos"] = { - ["y"] = 1993.5936315369, - ["x"] = -314712.0686114, - ["z"] = 633704.21854011, + ["y"] = -2.0082261562347, + ["x"] = -244762.02599275, + ["z"] = 185818.17850341, }, -- end of ["pos"] }, -- end of [16790528] [16792576] = { - ["alt"] = 62, + ["alt"] = 74, ["point"] = { - ["y"] = 692663, - ["x"] = -286548, + ["y"] = 694952, + ["x"] = -284964, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -585,136 +573,25 @@ aliveUnits = }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, - ["heading"] = 1.4977557600419, + ["heading"] = 0, ["country"] = "usa", - ["groupName"] = "USA gnd 1", + ["groupName"] = "teleGroup", ["countryId"] = 2, - ["y"] = 692663, - ["x"] = -286548, + ["y"] = 694952, + ["x"] = -284964, ["coalition"] = "blue", - ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, - ["unitId"] = 7001, - ["unitName"] = "USA gnd 1 unit1", + ["type"] = "Hawk cwar", + ["groupId"] = 35, + ["unitId"] = 58, + ["unitName"] = "Unit #008", ["pos"] = { - ["y"] = 62.132940042538, - ["x"] = -286547.625, - ["z"] = 692663.0625, + ["y"] = 74.311630249023, + ["x"] = -284964.125, + ["z"] = 694951.5, }, -- end of ["pos"] }, -- end of [16792576] [16794624] = - { - ["alt"] = 1996, - ["point"] = - { - ["y"] = 682741, - ["x"] = -288608, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["coalitionId"] = 2, - ["livery_id"] = "usaf standard", - ["skill"] = "High", - ["unit"] = - { - ["id_"] = 16794624, - }, -- end of ["unit"] - ["category"] = "plane", - ["speed"] = 138.82033106075, - ["heading"] = 1.6162179835615, - ["groupId"] = 1000062, - ["unitName"] = "USA air 1 unit1", - ["groupName"] = "USA air 1", - ["callsign"] = - { - [1] = 4, - [2] = 1, - [3] = 1, - ["name"] = "Colt11", - }, -- end of ["callsign"] - ["coalition"] = "blue", - ["x"] = -288608, - ["unitId"] = 7009, - ["type"] = "B-52H", - ["country"] = "usa", - ["y"] = 682741, - ["countryId"] = 2, - ["pos"] = - { - ["y"] = 1996.6071599354, - ["x"] = -288664.12396781, - ["z"] = 683967.64735556, - }, -- end of ["pos"] - }, -- end of [16794624] - [16798720] = - { - ["alt"] = 55, - ["point"] = - { - ["y"] = 692459, - ["x"] = -288865, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["unit"] = - { - ["id_"] = 16798720, - }, -- end of ["unit"] - ["category"] = "vehicle", - ["speed"] = 0, - ["heading"] = 1.4977557638479, - ["country"] = "usa", - ["groupName"] = "USA gnd 5", - ["countryId"] = 2, - ["y"] = 692459, - ["x"] = -288865, - ["coalition"] = "blue", - ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, - ["unitId"] = 7025, - ["unitName"] = "USA gnd 5 unit3", - ["pos"] = - { - ["y"] = 55.147941787021, - ["x"] = -288864.96875, - ["z"] = 692458.75, - }, -- end of ["pos"] - }, -- end of [16798720] - [16800768] = - { - ["alt"] = 0, - ["point"] = - { - ["y"] = 267963, - ["x"] = -165895, - }, -- end of ["point"] - ["coalitionId"] = 0, - ["skill"] = "Average", - ["unit"] = - { - ["id_"] = 16800768, - }, -- end of ["unit"] - ["category"] = "ship", - ["speed"] = 0, - ["heading"] = 0, - ["country"] = "australia", - ["groupName"] = "AUSTRALIA shp 3", - ["countryId"] = 21, - ["y"] = 267963, - ["x"] = -165895, - ["coalition"] = "neutral", - ["type"] = "PERRY", - ["groupId"] = 1000078, - ["unitId"] = 7033, - ["unitName"] = "AUSTRALIA shp 3 unit1", - ["pos"] = - { - ["y"] = 0, - ["x"] = -165895.203125, - ["z"] = 267962.75, - }, -- end of ["pos"] - }, -- end of [16800768] - [16802816] = { ["alt"] = 48, ["point"] = @@ -725,26 +602,137 @@ aliveUnits = ["coalitionId"] = 2, ["skill"] = "Average", ["unit"] = + { + ["id_"] = 16794624, + }, -- end of ["unit"] + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-113", + ["groupId"] = 7004, + ["groupName"] = "USA gnd 2", + ["unitName"] = "USA gnd 2 unit2", + ["countryId"] = 2, + ["x"] = -286447, + ["country"] = "usa", + ["heading"] = 0, + ["unitId"] = 7008, + ["y"] = 686871, + ["coalition"] = "blue", + ["pos"] = + { + ["y"] = 47.876796607959, + ["x"] = -286447.15625, + ["z"] = 686871.4375, + }, -- end of ["pos"] + }, -- end of [16794624] + [16798720] = + { + ["alt"] = 74, + ["point"] = + { + ["y"] = 691898, + ["x"] = -283194, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["unit"] = + { + ["id_"] = 16798720, + }, -- end of ["unit"] + ["category"] = "vehicle", + ["speed"] = 0, + ["heading"] = 1.4977557634854, + ["country"] = "usa", + ["groupName"] = "USA gnd 5", + ["countryId"] = 2, + ["y"] = 691898, + ["x"] = -283194, + ["coalition"] = "blue", + ["type"] = "M-1 Abrams", + ["groupId"] = 7015, + ["unitId"] = 7024, + ["unitName"] = "USA gnd 5 unit2", + ["pos"] = + { + ["y"] = 73.602359921368, + ["x"] = -283198.99441689, + ["z"] = 691897.7610464, + }, -- end of ["pos"] + }, -- end of [16798720] + [16800768] = + { + ["alt"] = 1998, + ["point"] = + { + ["y"] = 319595, + ["x"] = -198560, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["coalitionId"] = 0, + ["livery_id"] = "Australian 75th Squadron", + ["skill"] = "High", + ["unit"] = + { + ["id_"] = 16800768, + }, -- end of ["unit"] + ["category"] = "plane", + ["speed"] = 180.49294253728, + ["heading"] = 2.1995924992708, + ["groupId"] = 7020, + ["unitName"] = "AUSTRALIA air 6 unit1", + ["groupName"] = "AUSTRALIA air 6", + ["callsign"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + ["name"] = "Enfield11", + }, -- end of ["callsign"] + ["coalition"] = "neutral", + ["x"] = -198560, + ["unitId"] = 7032, + ["type"] = "FA-18C_hornet", + ["country"] = "australia", + ["y"] = 319595, + ["countryId"] = 21, + ["pos"] = + { + ["y"] = 1982.9801268833, + ["x"] = -199243.67266703, + ["z"] = 320534.47014546, + }, -- end of ["pos"] + }, -- end of [16800768] + [16802816] = + { + ["alt"] = 48, + ["point"] = + { + ["y"] = 686871, + ["x"] = -286407, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["unit"] = { ["id_"] = 16802816, }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["groupName"] = "USA gnd 8", - ["unitName"] = "USA gnd 8 unit2", + ["unitName"] = "USA gnd 8 unit1", ["countryId"] = 2, - ["x"] = -286447, + ["x"] = -286407, ["country"] = "usa", ["heading"] = 0, - ["unitId"] = 7041, + ["unitId"] = 7040, ["y"] = 686871, ["coalition"] = "blue", ["pos"] = { - ["y"] = 47.876458812809, - ["x"] = -286447.15625, + ["y"] = 47.951913858982, + ["x"] = -286407.15625, ["z"] = 686871.4375, }, -- end of ["pos"] }, -- end of [16802816] @@ -845,45 +833,58 @@ aliveUnits = }, -- end of [16786688] [16790784] = { - ["alt"] = 60, + ["alt"] = 2000, ["point"] = { - ["y"] = 692389, - ["x"] = -287110, + ["y"] = 636428.57142857, + ["x"] = -318142.85714286, }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", + ["alt_type"] = "BARO", + ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", + ["onboard_num"] = "52", ["unit"] = { ["id_"] = 16790784, }, -- end of ["unit"] - ["category"] = "vehicle", - ["speed"] = 0, - ["heading"] = 0, + ["category"] = "plane", + ["unitName"] = "A-10C Client #1_unit", + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] + ["type"] = "A-10C", + ["speed"] = 138.88888888889, ["country"] = "usa", - ["groupName"] = "teleGroup", - ["countryId"] = 2, - ["y"] = 692389, - ["x"] = -287110, + ["psi"] = 0.67060113146646, + ["groupId"] = 6, + ["groupName"] = "A-10C Client #1", + ["skill"] = "Client", ["coalition"] = "blue", - ["type"] = "Hawk tr", - ["groupId"] = 35, - ["unitId"] = 52, - ["unitName"] = "Unit #002", + ["x"] = -318142.85714286, + ["callsign"] = + { + [1] = 3, + [2] = 1, + [3] = 1, + ["name"] = "Uzi11", + }, -- end of ["callsign"] + ["heading"] = -0.67060113146646, + ["unitId"] = 11, + ["y"] = 636428.57142857, + ["countryId"] = 2, ["pos"] = { - ["y"] = 60.204387664795, - ["x"] = -287109.75, - ["z"] = 692389.375, + ["y"] = 1912.3736665438, + ["x"] = -314625.75359652, + ["z"] = 633651.41337382, }, -- end of ["pos"] }, -- end of [16790784] [16792832] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692678, - ["x"] = -286576, + ["y"] = 692292, + ["x"] = -284982, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -893,22 +894,22 @@ aliveUnits = }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, - ["heading"] = 1.4977557629417, + ["heading"] = 1.4977557593169, ["country"] = "usa", ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["y"] = 692678, - ["x"] = -286576, + ["y"] = 692292, + ["x"] = -284982, ["coalition"] = "blue", ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, - ["unitId"] = 7002, - ["unitName"] = "USA gnd 1 unit2", + ["groupId"] = 7001, + ["unitId"] = 7001, + ["unitName"] = "USA gnd 1 unit1", ["pos"] = { - ["y"] = 62.153499450007, - ["x"] = -286576.375, - ["z"] = 692678.3125, + ["y"] = 67.288836055423, + ["x"] = -284973.22177254, + ["z"] = 692290.16685181, }, -- end of ["pos"] }, -- end of [16792832] [16794880] = @@ -916,152 +917,7 @@ aliveUnits = ["alt"] = 1997, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["coalitionId"] = 0, - ["livery_id"] = "Australian 75th Squadron", - ["skill"] = "High", - ["unit"] = - { - ["id_"] = 16794880, - }, -- end of ["unit"] - ["category"] = "plane", - ["speed"] = 180.44764340673, - ["heading"] = 2.1995924685911, - ["groupId"] = 1000063, - ["unitName"] = "AUSTRALIA air 2 unit1", - ["groupName"] = "AUSTRALIA air 2", - ["callsign"] = - { - [1] = 1, - [2] = 1, - [3] = 1, - ["name"] = "Enfield11", - }, -- end of ["callsign"] - ["coalition"] = "neutral", - ["x"] = -198571, - ["unitId"] = 7010, - ["type"] = "FA-18C_hornet", - ["country"] = "australia", - ["y"] = 319610, - ["countryId"] = 21, - ["pos"] = - { - ["y"] = 1987.7386604726, - ["x"] = -199510.01413918, - ["z"] = 320900.68619704, - }, -- end of ["pos"] - }, -- end of [16794880] - [16796928] = - { - ["alt"] = 48, - ["point"] = - { - ["y"] = 686871, - ["x"] = -286407, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["unit"] = - { - ["id_"] = 16796928, - }, -- end of ["unit"] - ["category"] = "vehicle", - ["speed"] = 0, - ["heading"] = 0, - ["country"] = "usa", - ["groupName"] = "USA gnd 4", - ["countryId"] = 2, - ["y"] = 686871, - ["x"] = -286407, - ["coalition"] = "blue", - ["type"] = "M-113", - ["groupId"] = 1000068, - ["unitId"] = 7018, - ["unitName"] = "USA gnd 4 unit1", - ["pos"] = - { - ["y"] = 47.898649326901, - ["x"] = -286407.15625, - ["z"] = 686871.4375, - }, -- end of ["pos"] - }, -- end of [16796928] - [16798976] = - { - ["alt"] = 55, - ["point"] = - { - ["y"] = 692675, - ["x"] = -289069, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["unit"] = - { - ["id_"] = 16798976, - }, -- end of ["unit"] - ["category"] = "vehicle", - ["speed"] = 0, - ["heading"] = 1.4977557685601, - ["country"] = "usa", - ["groupName"] = "USA gnd 5", - ["countryId"] = 2, - ["y"] = 692675, - ["x"] = -289069, - ["coalition"] = "blue", - ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, - ["unitId"] = 7026, - ["unitName"] = "USA gnd 5 unit4", - ["pos"] = - { - ["y"] = 55.268961351506, - ["x"] = -289069.1875, - ["z"] = 692675.1875, - }, -- end of ["pos"] - }, -- end of [16798976] - [16801024] = - { - ["alt"] = 61, - ["point"] = - { - ["y"] = 692747, - ["x"] = -287036, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["unit"] = - { - ["id_"] = 16801024, - }, -- end of ["unit"] - ["category"] = "vehicle", - ["speed"] = 0, - ["heading"] = 1.4977557703724, - ["country"] = "usa", - ["groupName"] = "USA gnd 7", - ["countryId"] = 2, - ["y"] = 692747, - ["x"] = -287036, - ["coalition"] = "blue", - ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, - ["unitId"] = 7034, - ["unitName"] = "USA gnd 7 unit1", - ["pos"] = - { - ["y"] = 60.582493593272, - ["x"] = -287036.46875, - ["z"] = 692746.6875, - }, -- end of ["pos"] - }, -- end of [16801024] - [16803072] = - { - ["alt"] = 1996, - ["point"] = - { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1070,14 +926,14 @@ aliveUnits = ["skill"] = "High", ["unit"] = { - ["id_"] = 16803072, + ["id_"] = 16794880, }, -- end of ["unit"] ["category"] = "plane", - ["speed"] = 138.82033106075, - ["heading"] = 1.6162179835615, - ["groupId"] = 1000083, - ["unitName"] = "USA air 7 unit1", - ["groupName"] = "USA air 7", + ["speed"] = 138.85196364465, + ["heading"] = 1.6162179734619, + ["groupId"] = 7005, + ["unitName"] = "USA air 1 unit1", + ["groupName"] = "USA air 1", ["callsign"] = { [1] = 4, @@ -1087,16 +943,119 @@ aliveUnits = }, -- end of ["callsign"] ["coalition"] = "blue", ["x"] = -288608, - ["unitId"] = 7042, + ["unitId"] = 7009, ["type"] = "B-52H", ["country"] = "usa", - ["y"] = 682741, + ["y"] = 682727, ["countryId"] = 2, ["pos"] = { - ["y"] = 1993.8119255802, - ["x"] = -288640.49392301, - ["z"] = 683447.76689601, + ["y"] = 1991.4670941319, + ["x"] = -288665.65259277, + ["z"] = 684001.27794778, + }, -- end of ["pos"] + }, -- end of [16794880] + [16798976] = + { + ["alt"] = 72, + ["point"] = + { + ["y"] = 691826, + ["x"] = -283357, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["unit"] = + { + ["id_"] = 16798976, + }, -- end of ["unit"] + ["category"] = "vehicle", + ["speed"] = 0, + ["heading"] = 1.4977557538798, + ["country"] = "usa", + ["groupName"] = "USA gnd 5", + ["countryId"] = 2, + ["y"] = 691826, + ["x"] = -283357, + ["coalition"] = "blue", + ["type"] = "M-1 Abrams", + ["groupId"] = 7015, + ["unitId"] = 7025, + ["unitName"] = "USA gnd 5 unit3", + ["pos"] = + { + ["y"] = 72.12411776751, + ["x"] = -283357.17133258, + ["z"] = 691826.36193748, + }, -- end of ["pos"] + }, -- end of [16798976] + [16801024] = + { + ["alt"] = 0, + ["point"] = + { + ["y"] = 268107, + ["x"] = -163693, + }, -- end of ["point"] + ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", + ["skill"] = "Average", + ["unit"] = + { + ["id_"] = 16801024, + }, -- end of ["unit"] + ["category"] = "ship", + ["speed"] = 0, + ["type"] = "PERRY", + ["groupId"] = 7021, + ["groupName"] = "AUSTRALIA shp 3", + ["unitName"] = "AUSTRALIA shp 3 unit1", + ["coalition"] = "neutral", + ["x"] = -163693, + ["country"] = "australia", + ["y"] = 268107, + ["heading"] = 0, + ["unitId"] = 7033, + ["countryId"] = 21, + ["pos"] = + { + ["y"] = 0, + ["x"] = -163693.34375, + ["z"] = 268106.96875, + }, -- end of ["pos"] + }, -- end of [16801024] + [16803072] = + { + ["alt"] = 48, + ["point"] = + { + ["y"] = 686871, + ["x"] = -286447, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["unit"] = + { + ["id_"] = 16803072, + }, -- end of ["unit"] + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-113", + ["groupId"] = 7025, + ["groupName"] = "USA gnd 8", + ["unitName"] = "USA gnd 8 unit2", + ["countryId"] = 2, + ["x"] = -286447, + ["country"] = "usa", + ["heading"] = 0, + ["unitId"] = 7041, + ["y"] = 686871, + ["coalition"] = "blue", + ["pos"] = + { + ["y"] = 47.876796607959, + ["x"] = -286447.15625, + ["z"] = 686871.4375, }, -- end of ["pos"] }, -- end of [16803072] [16778752] = @@ -1126,8 +1085,8 @@ aliveUnits = ["pos"] = { ["y"] = 0, - ["x"] = -87204.40210409, - ["z"] = 74429.367184101, + ["x"] = -87203.760480064, + ["z"] = 74430.905392154, }, -- end of ["pos"] }, -- end of [16778752] [16780800] = @@ -1172,9 +1131,9 @@ aliveUnits = ["countryId"] = 21, ["pos"] = { - ["y"] = 1999.8866664847, - ["x"] = -201654.90095115, - ["z"] = 323850.09747815, + ["y"] = 1999.8908905735, + ["x"] = -201670.06422198, + ["z"] = 323870.94374406, }, -- end of ["pos"] }, -- end of [16780800] [16784896] = @@ -1204,7 +1163,7 @@ aliveUnits = ["y"] = 628797.14285714, ["pos"] = { - ["y"] = 10.188644519894, + ["y"] = 10.18864402356, ["x"] = -273562.84374994, ["z"] = 628797.125, }, -- end of ["pos"] @@ -1243,11 +1202,11 @@ aliveUnits = }, -- end of [16786944] [16791040] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692345, - ["x"] = -286935, + ["y"] = 694968, + ["x"] = -285046, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1261,27 +1220,27 @@ aliveUnits = ["country"] = "usa", ["groupName"] = "teleGroup", ["countryId"] = 2, - ["y"] = 692345, - ["x"] = -286935, + ["y"] = 694968, + ["x"] = -285046, ["coalition"] = "blue", - ["type"] = "Hawk sr", + ["type"] = "Hawk tr", ["groupId"] = 35, - ["unitId"] = 53, - ["unitName"] = "Unit #003", + ["unitId"] = 52, + ["unitName"] = "Unit #002", ["pos"] = { - ["y"] = 60.477199554443, - ["x"] = -286935.375, - ["z"] = 692344.5, + ["y"] = 73.912696838379, + ["x"] = -285046.125, + ["z"] = 694968, }, -- end of ["pos"] }, -- end of [16791040] [16793088] = { - ["alt"] = 63, + ["alt"] = 67, ["point"] = { - ["y"] = 692774, - ["x"] = -286539, + ["y"] = 692208, + ["x"] = -284870, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1291,56 +1250,65 @@ aliveUnits = }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, - ["heading"] = 1.497755762398, + ["heading"] = 1.4977557696476, ["country"] = "usa", ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["y"] = 692774, - ["x"] = -286539, + ["y"] = 692208, + ["x"] = -284870, ["coalition"] = "blue", ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, - ["unitId"] = 7003, - ["unitName"] = "USA gnd 1 unit3", + ["groupId"] = 7001, + ["unitId"] = 7002, + ["unitName"] = "USA gnd 1 unit2", ["pos"] = { - ["y"] = 62.580954381356, - ["x"] = -286538.78125, - ["z"] = 692773.75, + ["y"] = 67.240456886011, + ["x"] = -284870.4375, + ["z"] = 692207.9375, }, -- end of ["pos"] }, -- end of [16793088] [16795136] = { - ["alt"] = 0, + ["alt"] = 1998, ["point"] = { - ["y"] = 266228, - ["x"] = -161996, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] + ["alt_type"] = "BARO", ["coalitionId"] = 0, - ["skill"] = "Average", + ["livery_id"] = "Australian 75th Squadron", + ["skill"] = "High", ["unit"] = { ["id_"] = 16795136, }, -- end of ["unit"] - ["category"] = "ship", - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000064, - ["groupName"] = "AUSTRALIA shp 1", - ["unitName"] = "AUSTRALIA shp 1 unit1", - ["countryId"] = 21, - ["x"] = -161996, - ["country"] = "australia", - ["heading"] = 0, - ["unitId"] = 7011, - ["y"] = 266228, + ["category"] = "plane", + ["speed"] = 180.49294253728, + ["heading"] = 2.1995924992708, + ["groupId"] = 7006, + ["unitName"] = "AUSTRALIA air 2 unit1", + ["groupName"] = "AUSTRALIA air 2", + ["callsign"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + ["name"] = "Enfield11", + }, -- end of ["callsign"] ["coalition"] = "neutral", + ["x"] = -198560, + ["unitId"] = 7010, + ["type"] = "FA-18C_hornet", + ["country"] = "australia", + ["y"] = 319595, + ["countryId"] = 21, ["pos"] = { - ["y"] = 0, - ["x"] = -161996.171875, - ["z"] = 266228.0625, + ["y"] = 1988.2813909589, + ["x"] = -199535.70144928, + ["z"] = 320936.00557625, }, -- end of ["pos"] }, -- end of [16795136] [16797184] = @@ -1349,7 +1317,7 @@ aliveUnits = ["point"] = { ["y"] = 686871, - ["x"] = -286447, + ["x"] = -286407, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1364,26 +1332,60 @@ aliveUnits = ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["y"] = 686871, - ["x"] = -286447, + ["x"] = -286407, ["coalition"] = "blue", ["type"] = "M-113", - ["groupId"] = 1000068, - ["unitId"] = 7019, - ["unitName"] = "USA gnd 4 unit2", + ["groupId"] = 7011, + ["unitId"] = 7018, + ["unitName"] = "USA gnd 4 unit1", ["pos"] = { - ["y"] = 47.876458812809, - ["x"] = -286447.15625, + ["y"] = 47.951913858982, + ["x"] = -286407.15625, ["z"] = 686871.4375, }, -- end of ["pos"] }, -- end of [16797184] - [16801280] = + [16799232] = { - ["alt"] = 61, + ["alt"] = 72, ["point"] = { - ["y"] = 692716, - ["x"] = -286920, + ["y"] = 691852, + ["x"] = -283362, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["unit"] = + { + ["id_"] = 16799232, + }, -- end of ["unit"] + ["category"] = "vehicle", + ["speed"] = 0, + ["heading"] = 1.4977557720036, + ["country"] = "usa", + ["groupName"] = "USA gnd 5", + ["countryId"] = 2, + ["y"] = 691852, + ["x"] = -283362, + ["coalition"] = "blue", + ["type"] = "M-1 Abrams", + ["groupId"] = 7015, + ["unitId"] = 7026, + ["unitName"] = "USA gnd 5 unit4", + ["pos"] = + { + ["y"] = 72.166241925805, + ["x"] = -283361.7937593, + ["z"] = 691852.30478528, + }, -- end of ["pos"] + }, -- end of [16799232] + [16801280] = + { + ["alt"] = 59, + ["point"] = + { + ["y"] = 692769, + ["x"] = -287355, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1393,22 +1395,22 @@ aliveUnits = }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, - ["heading"] = 1.4977557703724, + ["heading"] = 1.4977557591357, ["country"] = "usa", ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["y"] = 692716, - ["x"] = -286920, + ["y"] = 692769, + ["x"] = -287355, ["coalition"] = "blue", ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, - ["unitId"] = 7035, - ["unitName"] = "USA gnd 7 unit2", + ["groupId"] = 7022, + ["unitId"] = 7034, + ["unitName"] = "USA gnd 7 unit1", ["pos"] = { - ["y"] = 61.440749131396, - ["x"] = -286920.125, - ["z"] = 692715.75, + ["y"] = 59.238122595386, + ["x"] = -287358.35658634, + ["z"] = 692769.94557295, }, -- end of ["pos"] }, -- end of [16801280] [16803328] = @@ -1416,42 +1418,42 @@ aliveUnits = ["alt"] = 1997, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 682727, + ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", - ["coalitionId"] = 0, - ["livery_id"] = "Australian 75th Squadron", + ["coalitionId"] = 2, + ["livery_id"] = "usaf standard", ["skill"] = "High", ["unit"] = { ["id_"] = 16803328, }, -- end of ["unit"] ["category"] = "plane", - ["speed"] = 180.44764340673, - ["heading"] = 2.1995924685911, - ["groupId"] = 1000084, - ["unitName"] = "AUSTRALIA air 8 unit1", - ["groupName"] = "AUSTRALIA air 8", + ["speed"] = 138.85196364465, + ["heading"] = 1.6162179734619, + ["groupId"] = 7026, + ["unitName"] = "USA air 7 unit1", + ["groupName"] = "USA air 7", ["callsign"] = { - [1] = 1, + [1] = 4, [2] = 1, [3] = 1, - ["name"] = "Enfield11", + ["name"] = "Colt11", }, -- end of ["callsign"] - ["coalition"] = "neutral", - ["x"] = -198571, - ["unitId"] = 7043, - ["type"] = "FA-18C_hornet", - ["country"] = "australia", - ["y"] = 319610, - ["countryId"] = 21, + ["coalition"] = "blue", + ["x"] = -288608, + ["unitId"] = 7042, + ["type"] = "B-52H", + ["country"] = "usa", + ["y"] = 682727, + ["countryId"] = 2, ["pos"] = { - ["y"] = 1981.7122548331, - ["x"] = -199117.12610459, - ["z"] = 320360.47047424, + ["y"] = 1986.5427819389, + ["x"] = -288642.36046096, + ["z"] = 683488.83206213, }, -- end of ["pos"] }, -- end of [16803328] [16779008] = @@ -1490,8 +1492,8 @@ aliveUnits = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -1505,7 +1507,7 @@ aliveUnits = ["type"] = "CH-47D", ["speed"] = 44.444444444444, ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["groupId"] = 45, ["groupName"] = "nH", ["callsign"] = @@ -1516,17 +1518,17 @@ aliveUnits = ["name"] = "Springfield11", }, -- end of ["callsign"] ["countryId"] = 21, - ["x"] = -155967.80633993, + ["x"] = -158700.87914814, ["skill"] = "High", - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["unitId"] = 68, - ["y"] = 405888.85058741, + ["y"] = 404406.46136648, ["coalition"] = "neutral", ["pos"] = { - ["y"] = 500.64671873889, - ["x"] = -157073.53157174, - ["z"] = 406486.38049955, + ["y"] = 500.64525308704, + ["x"] = -159785.02332676, + ["z"] = 405055.47811674, }, -- end of ["pos"] }, -- end of [16781056] [16785152] = @@ -1568,9 +1570,9 @@ aliveUnits = ["coalition"] = "blue", ["pos"] = { - ["y"] = 1999.973248024, - ["x"] = -288792.93014965, - ["z"] = 686803.9330616, + ["y"] = 1999.9268965107, + ["x"] = -288794.09031268, + ["z"] = 686828.94806039, }, -- end of ["pos"] }, -- end of [16785152] [16787200] = @@ -1600,18 +1602,18 @@ aliveUnits = ["y"] = 653171.42857143, ["pos"] = { - ["y"] = 10.572537613604, - ["x"] = -293144.68248471, - ["z"] = 653217.51526008, + ["y"] = 10.573285658245, + ["x"] = -293125.28492283, + ["z"] = 653221.89168815, }, -- end of ["pos"] }, -- end of [16787200] [16791296] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692308, - ["x"] = -287213, + ["y"] = 695126, + ["x"] = -285098, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1625,27 +1627,27 @@ aliveUnits = ["country"] = "usa", ["groupName"] = "teleGroup", ["countryId"] = 2, - ["y"] = 692308, - ["x"] = -287213, + ["y"] = 695126, + ["x"] = -285098, ["coalition"] = "blue", - ["type"] = "Hawk pcp", + ["type"] = "Hawk sr", ["groupId"] = 35, - ["unitId"] = 54, - ["unitName"] = "Unit #004", + ["unitId"] = 53, + ["unitName"] = "Unit #003", ["pos"] = { - ["y"] = 59.278907775879, - ["x"] = -287213.125, - ["z"] = 692308.25, + ["y"] = 73.909408569336, + ["x"] = -285097.78125, + ["z"] = 695126.4375, }, -- end of ["pos"] }, -- end of [16791296] [16793344] = { - ["alt"] = 62, + ["alt"] = 68, ["point"] = { - ["y"] = 692553, - ["x"] = -286525, + ["y"] = 692374, + ["x"] = -284971, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1655,108 +1657,100 @@ aliveUnits = }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, - ["heading"] = 1.4977557625792, + ["heading"] = 1.4977557676538, ["country"] = "usa", ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["y"] = 692553, - ["x"] = -286525, + ["y"] = 692374, + ["x"] = -284971, ["coalition"] = "blue", ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, - ["unitId"] = 7004, - ["unitName"] = "USA gnd 1 unit4", + ["groupId"] = 7001, + ["unitId"] = 7003, + ["unitName"] = "USA gnd 1 unit3", ["pos"] = { - ["y"] = 61.802860325044, - ["x"] = -286525.1875, - ["z"] = 692553.1875, + ["y"] = 67.619678071864, + ["x"] = -284962.54069446, + ["z"] = 692372.41661837, }, -- end of ["pos"] }, -- end of [16793344] [16795392] = { - ["alt"] = 60, + ["alt"] = 0, ["point"] = { - ["y"] = 692171, - ["x"] = -286749, + ["y"] = 267081, + ["x"] = -164471, }, -- end of ["point"] - ["coalitionId"] = 2, + ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["unit"] = { ["id_"] = 16795392, }, -- end of ["unit"] - ["category"] = "vehicle", + ["category"] = "ship", ["speed"] = 0, - ["heading"] = 1.4977557591357, - ["country"] = "usa", - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["y"] = 692171, - ["x"] = -286749, - ["coalition"] = "blue", - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["unitId"] = 7012, - ["unitName"] = "USA gnd 3 unit1", + ["type"] = "PERRY", + ["groupId"] = 7007, + ["groupName"] = "AUSTRALIA shp 1", + ["unitName"] = "AUSTRALIA shp 1 unit1", + ["coalition"] = "neutral", + ["x"] = -164471, + ["country"] = "australia", + ["y"] = 267081, + ["heading"] = 0, + ["unitId"] = 7011, + ["countryId"] = 21, ["pos"] = { - ["y"] = 60.223228220636, - ["x"] = -286748.875, - ["z"] = 692170.6875, + ["y"] = 0, + ["x"] = -164470.953125, + ["z"] = 267080.75, }, -- end of ["pos"] }, -- end of [16795392] [16797440] = { - ["alt"] = 1996, + ["alt"] = 48, ["point"] = { - ["y"] = 682741, - ["x"] = -288608, + ["y"] = 686871, + ["x"] = -286447, }, -- end of ["point"] - ["alt_type"] = "BARO", ["coalitionId"] = 2, - ["livery_id"] = "usaf standard", - ["skill"] = "High", + ["skill"] = "Average", ["unit"] = { ["id_"] = 16797440, }, -- end of ["unit"] - ["category"] = "plane", - ["speed"] = 138.82033106075, - ["heading"] = 1.6162179835615, - ["groupId"] = 1000069, - ["unitName"] = "USA air 3 unit1", - ["groupName"] = "USA air 3", - ["callsign"] = - { - [1] = 4, - [2] = 1, - [3] = 1, - ["name"] = "Colt11", - }, -- end of ["callsign"] - ["coalition"] = "blue", - ["x"] = -288608, - ["unitId"] = 7020, - ["type"] = "B-52H", + ["category"] = "vehicle", + ["speed"] = 0, + ["heading"] = 0, ["country"] = "usa", - ["y"] = 682741, + ["groupName"] = "USA gnd 4", ["countryId"] = 2, + ["y"] = 686871, + ["x"] = -286447, + ["coalition"] = "blue", + ["type"] = "M-113", + ["groupId"] = 7011, + ["unitId"] = 7019, + ["unitName"] = "USA gnd 4 unit2", ["pos"] = { - ["y"] = 1995.9301841161, - ["x"] = -288658.13927969, - ["z"] = 683835.97909582, + ["y"] = 47.876796607959, + ["x"] = -286447.15625, + ["z"] = 686871.4375, }, -- end of ["pos"] }, -- end of [16797440] [16801536] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692580, - ["x"] = -287056, + ["y"] = 692754, + ["x"] = -287476, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1766,56 +1760,65 @@ aliveUnits = }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, - ["heading"] = 1.4977557642103, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["y"] = 692580, - ["x"] = -287056, + ["y"] = 692754, + ["x"] = -287476, ["coalition"] = "blue", ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, - ["unitId"] = 7036, - ["unitName"] = "USA gnd 7 unit3", + ["groupId"] = 7022, + ["unitId"] = 7035, + ["unitName"] = "USA gnd 7 unit2", ["pos"] = { - ["y"] = 60.660094632592, - ["x"] = -287056.09375, - ["z"] = 692580.1875, + ["y"] = 59.222299098578, + ["x"] = -287476.21777116, + ["z"] = 692753.69256042, }, -- end of ["pos"] }, -- end of [16801536] [16803584] = { - ["alt"] = 0, + ["alt"] = 1998, ["point"] = { - ["y"] = 268804, - ["x"] = -165342, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] + ["alt_type"] = "BARO", ["coalitionId"] = 0, - ["skill"] = "Average", + ["livery_id"] = "Australian 75th Squadron", + ["skill"] = "High", ["unit"] = { ["id_"] = 16803584, }, -- end of ["unit"] - ["category"] = "ship", - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000085, - ["groupName"] = "AUSTRALIA shp 4", - ["unitName"] = "AUSTRALIA shp 4 unit1", - ["countryId"] = 21, - ["x"] = -165342, - ["country"] = "australia", - ["heading"] = 0, - ["unitId"] = 7044, - ["y"] = 268804, + ["category"] = "plane", + ["speed"] = 180.49294253728, + ["heading"] = 2.1995924992708, + ["groupId"] = 7027, + ["unitName"] = "AUSTRALIA air 8 unit1", + ["groupName"] = "AUSTRALIA air 8", + ["callsign"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + ["name"] = "Enfield11", + }, -- end of ["callsign"] ["coalition"] = "neutral", + ["x"] = -198560, + ["unitId"] = 7043, + ["type"] = "FA-18C_hornet", + ["country"] = "australia", + ["y"] = 319595, + ["countryId"] = 21, ["pos"] = { - ["y"] = 0, - ["x"] = -165341.6875, - ["z"] = 268803.59375, + ["y"] = 1981.902511151, + ["x"] = -199142.78627169, + ["z"] = 320395.75279009, }, -- end of ["pos"] }, -- end of [16803584] [16779264] = @@ -1845,7 +1848,7 @@ aliveUnits = ["pos"] = { ["y"] = 0, - ["x"] = -356011.33163927, + ["x"] = -356010.2612211, ["z"] = 444653.03125, }, -- end of ["pos"] }, -- end of [16779264] @@ -1881,6 +1884,38 @@ aliveUnits = ["z"] = 445199.90625, }, -- end of ["pos"] }, -- end of [16781312] + [16783360] = + { + ["point"] = + { + ["y"] = 654665.71428571, + ["x"] = -292962.85714286, + }, -- end of ["point"] + ["skill"] = "Average", + ["unit"] = + { + ["id_"] = 16783360, + }, -- end of ["unit"] + ["category"] = "vehicle", + ["unitName"] = "RuBTRs4", + ["heading"] = -1.7994767003775, + ["unitId"] = 30, + ["groupName"] = "RuBTRs", + ["countryId"] = 0, + ["coalition"] = "red", + ["x"] = -292962.85714286, + ["type"] = "BTR-80", + ["groupId"] = 13, + ["country"] = "russia", + ["playerCanDrive"] = true, + ["y"] = 654665.71428571, + ["pos"] = + { + ["y"] = 11.950934404379, + ["x"] = -293001.18163074, + ["z"] = 654663.33660475, + }, -- end of ["pos"] + }, -- end of [16783360] [16785408] = { ["alt"] = 2000, @@ -1921,9 +1956,9 @@ aliveUnits = ["coalition"] = "blue", ["pos"] = { - ["y"] = 1987.9387593046, - ["x"] = -277034.63646201, - ["z"] = 663246.40874413, + ["y"] = 1987.9862179962, + ["x"] = -277039.54944886, + ["z"] = 663219.26272566, }, -- end of ["pos"] }, -- end of [16785408] [16787456] = @@ -1953,18 +1988,18 @@ aliveUnits = ["y"] = 653211.42857143, ["pos"] = { - ["y"] = 10.578834078627, - ["x"] = -293125.71890831, - ["z"] = 653211.4445169, + ["y"] = 10.578737878163, + ["x"] = -293125.46162944, + ["z"] = 653211.70008691, }, -- end of ["pos"] }, -- end of [16787456] [16791552] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692321, - ["x"] = -286989, + ["y"] = 694892, + ["x"] = -285039, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1978,27 +2013,61 @@ aliveUnits = ["country"] = "usa", ["groupName"] = "teleGroup", ["countryId"] = 2, - ["y"] = 692321, - ["x"] = -286989, + ["y"] = 694892, + ["x"] = -285039, ["coalition"] = "blue", - ["type"] = "Hawk ln", + ["type"] = "Hawk pcp", ["groupId"] = 35, - ["unitId"] = 55, - ["unitName"] = "Unit #005", + ["unitId"] = 54, + ["unitName"] = "Unit #004", ["pos"] = { - ["y"] = 60.256237030029, - ["x"] = -286989.21875, - ["z"] = 692320.625, + ["y"] = 73.954246520996, + ["x"] = -285038.8125, + ["z"] = 694892.4375, }, -- end of ["pos"] }, -- end of [16791552] - [16795648] = + [16793600] = { - ["alt"] = 61, + ["alt"] = 68, ["point"] = { - ["y"] = 692204, - ["x"] = -286580, + ["y"] = 692388, + ["x"] = -284932, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["unit"] = + { + ["id_"] = 16793600, + }, -- end of ["unit"] + ["category"] = "vehicle", + ["speed"] = 0, + ["heading"] = 1.4977557602231, + ["country"] = "usa", + ["groupName"] = "USA gnd 1", + ["countryId"] = 2, + ["y"] = 692388, + ["x"] = -284932, + ["coalition"] = "blue", + ["type"] = "M-1 Abrams", + ["groupId"] = 7001, + ["unitId"] = 7004, + ["unitName"] = "USA gnd 1 unit4", + ["pos"] = + { + ["y"] = 67.771455646655, + ["x"] = -284932.00965646, + ["z"] = 692388.36656636, + }, -- end of ["pos"] + }, -- end of [16793600] + [16795648] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 690419, + ["x"] = -284972, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2008,22 +2077,22 @@ aliveUnits = }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, - ["heading"] = 1.4977557614918, + ["heading"] = 1.4977557640291, ["country"] = "usa", ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["y"] = 692204, - ["x"] = -286580, + ["y"] = 690419, + ["x"] = -284972, ["coalition"] = "blue", ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["unitId"] = 7013, - ["unitName"] = "USA gnd 3 unit2", + ["groupId"] = 7008, + ["unitId"] = 7012, + ["unitName"] = "USA gnd 3 unit1", ["pos"] = { - ["y"] = 61.010461009831, - ["x"] = -286580.125, - ["z"] = 692204.3125, + ["y"] = 61.94913810018, + ["x"] = -284968.89655888, + ["z"] = 690416.83778872, }, -- end of ["pos"] }, -- end of [16795648] [16797696] = @@ -2031,85 +2100,51 @@ aliveUnits = ["alt"] = 1997, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 682727, + ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", - ["coalitionId"] = 0, - ["livery_id"] = "Australian 75th Squadron", + ["coalitionId"] = 2, + ["livery_id"] = "usaf standard", ["skill"] = "High", ["unit"] = { ["id_"] = 16797696, }, -- end of ["unit"] ["category"] = "plane", - ["speed"] = 180.44764340673, - ["heading"] = 2.1995924685911, - ["groupId"] = 1000070, - ["unitName"] = "AUSTRALIA air 4 unit1", - ["groupName"] = "AUSTRALIA air 4", + ["speed"] = 138.85196364465, + ["heading"] = 1.6162179734619, + ["groupId"] = 7012, + ["unitName"] = "USA air 3 unit1", + ["groupName"] = "USA air 3", ["callsign"] = { - [1] = 1, + [1] = 4, [2] = 1, [3] = 1, - ["name"] = "Enfield11", + ["name"] = "Colt11", }, -- end of ["callsign"] - ["coalition"] = "neutral", - ["x"] = -198571, - ["unitId"] = 7021, - ["type"] = "FA-18C_hornet", - ["country"] = "australia", - ["y"] = 319610, - ["countryId"] = 21, + ["coalition"] = "blue", + ["x"] = -288608, + ["unitId"] = 7020, + ["type"] = "B-52H", + ["country"] = "usa", + ["y"] = 682727, + ["countryId"] = 2, ["pos"] = { - ["y"] = 1985.7807881899, - ["x"] = -199409.15463692, - ["z"] = 320762.00574708, + ["y"] = 1988.5854966465, + ["x"] = -288653.69584605, + ["z"] = 683738.21954942, }, -- end of ["pos"] }, -- end of [16797696] - [16799744] = - { - ["alt"] = 48, - ["point"] = - { - ["y"] = 686871, - ["x"] = -286407, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["unit"] = - { - ["id_"] = 16799744, - }, -- end of ["unit"] - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-113", - ["groupId"] = 1000075, - ["groupName"] = "USA gnd 6", - ["unitName"] = "USA gnd 6 unit1", - ["countryId"] = 2, - ["x"] = -286407, - ["country"] = "usa", - ["heading"] = 0, - ["unitId"] = 7029, - ["y"] = 686871, - ["coalition"] = "blue", - ["pos"] = - { - ["y"] = 47.898649326901, - ["x"] = -286407.15625, - ["z"] = 686871.4375, - }, -- end of ["pos"] - }, -- end of [16799744] [16801792] = { - ["alt"] = 60, + ["alt"] = 59, ["point"] = { - ["y"] = 692752, - ["x"] = -287189, + ["y"] = 692726, + ["x"] = -287538, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2119,24 +2154,59 @@ aliveUnits = }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, - ["heading"] = 1.4977557678351, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["y"] = 692752, - ["x"] = -287189, + ["y"] = 692726, + ["x"] = -287538, ["coalition"] = "blue", ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, - ["unitId"] = 7037, - ["unitName"] = "USA gnd 7 unit4", + ["groupId"] = 7022, + ["unitId"] = 7036, + ["unitName"] = "USA gnd 7 unit3", ["pos"] = { - ["y"] = 59.767864148883, - ["x"] = -287189, - ["z"] = 692752.125, + ["y"] = 59.030057380211, + ["x"] = -287538.03020083, + ["z"] = 692726.00406844, }, -- end of ["pos"] }, -- end of [16801792] + [16803840] = + { + ["alt"] = 0, + ["point"] = + { + ["y"] = 265427, + ["x"] = -164284, + }, -- end of ["point"] + ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", + ["skill"] = "Average", + ["unit"] = + { + ["id_"] = 16803840, + }, -- end of ["unit"] + ["category"] = "ship", + ["speed"] = 0, + ["type"] = "PERRY", + ["groupId"] = 7028, + ["groupName"] = "AUSTRALIA shp 4", + ["unitName"] = "AUSTRALIA shp 4 unit1", + ["coalition"] = "neutral", + ["x"] = -164284, + ["country"] = "australia", + ["y"] = 265427, + ["heading"] = 0, + ["unitId"] = 7044, + ["countryId"] = 21, + ["pos"] = + { + ["y"] = 0, + ["x"] = -164283.859375, + ["z"] = 265426.875, + }, -- end of ["pos"] + }, -- end of [16803840] [16781568] = { ["alt"] = 500, @@ -2170,43 +2240,11 @@ aliveUnits = ["coalition"] = "red", ["pos"] = { - ["y"] = 499.8747028694, - ["x"] = -238949.20024268, - ["z"] = 615837.57975198, + ["y"] = 499.87455623693, + ["x"] = -238956.2788112, + ["z"] = 615841.88237501, }, -- end of ["pos"] }, -- end of [16781568] - [16783616] = - { - ["point"] = - { - ["y"] = 654705.71428571, - ["x"] = -293002.85714286, - }, -- end of ["point"] - ["skill"] = "Average", - ["unit"] = - { - ["id_"] = 16783616, - }, -- end of ["unit"] - ["category"] = "vehicle", - ["unitName"] = "RuBTRs5", - ["heading"] = -1.7994767003775, - ["unitId"] = 31, - ["groupName"] = "RuBTRs", - ["countryId"] = 0, - ["coalition"] = "red", - ["x"] = -293002.85714286, - ["type"] = "BTR-80", - ["groupId"] = 13, - ["country"] = "russia", - ["playerCanDrive"] = true, - ["y"] = 654705.71428571, - ["pos"] = - { - ["y"] = 12.121318842345, - ["x"] = -293053.87250888, - ["z"] = 654685.48309245, - }, -- end of ["pos"] - }, -- end of [16783616] [16785664] = { ["alt"] = 500, @@ -2247,9 +2285,9 @@ aliveUnits = ["coalition"] = "blue", ["pos"] = { - ["y"] = 1008.3250117132, - ["x"] = -297374.29690418, - ["z"] = 630621.14467261, + ["y"] = 906.91984020786, + ["x"] = -297283.57892094, + ["z"] = 630594.05424481, }, -- end of ["pos"] }, -- end of [16785664] [16787712] = @@ -2279,18 +2317,18 @@ aliveUnits = ["y"] = 653251.42857143, ["pos"] = { - ["y"] = 10.550925677546, - ["x"] = -293165.71913937, - ["z"] = 653251.45406541, + ["y"] = 10.550834639592, + ["x"] = -293165.46162943, + ["z"] = 653251.70008691, }, -- end of ["pos"] }, -- end of [16787712] [16791808] = { - ["alt"] = 59, + ["alt"] = 75, ["point"] = { - ["y"] = 692297, - ["x"] = -287225, + ["y"] = 695084, + ["x"] = -284914, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2304,27 +2342,27 @@ aliveUnits = ["country"] = "usa", ["groupName"] = "teleGroup", ["countryId"] = 2, - ["y"] = 692297, - ["x"] = -287225, + ["y"] = 695084, + ["x"] = -284914, ["coalition"] = "blue", ["type"] = "Hawk ln", ["groupId"] = 35, - ["unitId"] = 56, - ["unitName"] = "Unit #006", + ["unitId"] = 55, + ["unitName"] = "Unit #005", ["pos"] = { - ["y"] = 59.320571899414, - ["x"] = -287224.9375, - ["z"] = 692297, + ["y"] = 74.842834472656, + ["x"] = -284914, + ["z"] = 695083.5625, }, -- end of ["pos"] }, -- end of [16791808] [16795904] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 692150, - ["x"] = -286560, + ["y"] = 690558, + ["x"] = -284846, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2334,56 +2372,65 @@ aliveUnits = }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, - ["heading"] = 1.4977557614918, + ["heading"] = 1.4977557580482, ["country"] = "usa", ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["y"] = 692150, - ["x"] = -286560, + ["y"] = 690558, + ["x"] = -284846, ["coalition"] = "blue", ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["unitId"] = 7014, - ["unitName"] = "USA gnd 3 unit3", + ["groupId"] = 7008, + ["unitId"] = 7013, + ["unitName"] = "USA gnd 3 unit2", ["pos"] = { - ["y"] = 61.029124264432, - ["x"] = -286560.4375, - ["z"] = 692149.75, + ["y"] = 62.854867766404, + ["x"] = -284846.46341879, + ["z"] = 690558.47076276, }, -- end of ["pos"] }, -- end of [16795904] [16797952] = { - ["alt"] = 0, + ["alt"] = 1998, ["point"] = { - ["y"] = 266588, - ["x"] = -163302, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] + ["alt_type"] = "BARO", ["coalitionId"] = 0, - ["skill"] = "Average", + ["livery_id"] = "Australian 75th Squadron", + ["skill"] = "High", ["unit"] = { ["id_"] = 16797952, }, -- end of ["unit"] - ["category"] = "ship", - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000071, - ["groupName"] = "AUSTRALIA shp 2", - ["unitName"] = "AUSTRALIA shp 2 unit1", - ["countryId"] = 21, - ["x"] = -163302, - ["country"] = "australia", - ["heading"] = 0, - ["unitId"] = 7022, - ["y"] = 266588, + ["category"] = "plane", + ["speed"] = 180.49294253728, + ["heading"] = 2.1995924992708, + ["groupId"] = 7013, + ["unitName"] = "AUSTRALIA air 4 unit1", + ["groupName"] = "AUSTRALIA air 4", + ["callsign"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + ["name"] = "Enfield11", + }, -- end of ["callsign"] ["coalition"] = "neutral", + ["x"] = -198560, + ["unitId"] = 7021, + ["type"] = "FA-18C_hornet", + ["country"] = "australia", + ["y"] = 319595, + ["countryId"] = 21, ["pos"] = { - ["y"] = 0, - ["x"] = -163301.53125, - ["z"] = 266587.84375, + ["y"] = 1984.4381141247, + ["x"] = -199333.93720144, + ["z"] = 320658.58260143, }, -- end of ["pos"] }, -- end of [16797952] [16800000] = @@ -2392,7 +2439,7 @@ aliveUnits = ["point"] = { ["y"] = 686871, - ["x"] = -286447, + ["x"] = -286407, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2403,23 +2450,57 @@ aliveUnits = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["groupName"] = "USA gnd 6", - ["unitName"] = "USA gnd 6 unit2", + ["unitName"] = "USA gnd 6 unit1", ["countryId"] = 2, - ["x"] = -286447, + ["x"] = -286407, ["country"] = "usa", ["heading"] = 0, - ["unitId"] = 7030, + ["unitId"] = 7029, ["y"] = 686871, ["coalition"] = "blue", ["pos"] = { - ["y"] = 47.876458812809, - ["x"] = -286447.15625, + ["y"] = 47.951913858982, + ["x"] = -286407.15625, ["z"] = 686871.4375, }, -- end of ["pos"] }, -- end of [16800000] + [16802048] = + { + ["alt"] = 59, + ["point"] = + { + ["y"] = 692766, + ["x"] = -287511, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["unit"] = + { + ["id_"] = 16802048, + }, -- end of ["unit"] + ["category"] = "vehicle", + ["speed"] = 0, + ["heading"] = 1.4977557605856, + ["country"] = "usa", + ["groupName"] = "USA gnd 7", + ["countryId"] = 2, + ["y"] = 692766, + ["x"] = -287511, + ["coalition"] = "blue", + ["type"] = "M-1 Abrams", + ["groupId"] = 7022, + ["unitId"] = 7037, + ["unitName"] = "USA gnd 7 unit4", + ["pos"] = + { + ["y"] = 59.194805123349, + ["x"] = -287511.05258727, + ["z"] = 692766.47421955, + }, -- end of ["pos"] + }, -- end of [16802048] [16777728] = { ["point"] = @@ -2485,9 +2566,9 @@ aliveUnits = ["coalition"] = "red", ["pos"] = { - ["y"] = 504.75249923986, - ["x"] = -238883.82861758, - ["z"] = 615855.50953259, + ["y"] = 506.90896808275, + ["x"] = -238890.09765484, + ["z"] = 615859.43884751, }, -- end of ["pos"] }, -- end of [16781824] [16783872] = @@ -2517,9 +2598,9 @@ aliveUnits = ["y"] = 654745.71428571, ["pos"] = { - ["y"] = 12.086855628276, - ["x"] = -293050.72967002, - ["z"] = 654713.35180124, + ["y"] = 12.092081669295, + ["x"] = -293045.32029431, + ["z"] = 654735.67442175, }, -- end of ["pos"] }, -- end of [16783872] [16785920] = @@ -2561,9 +2642,9 @@ aliveUnits = ["coalition"] = "blue", ["pos"] = { - ["y"] = 1011.7621737228, - ["x"] = -297465.37068742, - ["z"] = 630731.8628239, + ["y"] = 803.26614010437, + ["x"] = -297356.80664321, + ["z"] = 630659.45639512, }, -- end of ["pos"] }, -- end of [16785920] [16787968] = @@ -2593,18 +2674,18 @@ aliveUnits = ["y"] = 653291.42857143, ["pos"] = { - ["y"] = 10.50932051217, - ["x"] = -293205.71484427, - ["z"] = 653291.45528884, + ["y"] = 10.508593796065, + ["x"] = -293205.47520804, + ["z"] = 653291.70292073, }, -- end of ["pos"] }, -- end of [16787968] [16792064] = { - ["alt"] = 61, + ["alt"] = 73, ["point"] = { - ["y"] = 692445, - ["x"] = -287012, + ["y"] = 694985, + ["x"] = -285104, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2618,61 +2699,27 @@ aliveUnits = ["country"] = "usa", ["groupName"] = "teleGroup", ["countryId"] = 2, - ["y"] = 692445, - ["x"] = -287012, + ["y"] = 694985, + ["x"] = -285104, ["coalition"] = "blue", ["type"] = "Hawk ln", ["groupId"] = 35, - ["unitId"] = 57, - ["unitName"] = "Unit #007", + ["unitId"] = 56, + ["unitName"] = "Unit #006", ["pos"] = { - ["y"] = 60.971343994141, - ["x"] = -287012, - ["z"] = 692445.375, + ["y"] = 73.475082397461, + ["x"] = -285103.90625, + ["z"] = 694984.875, }, -- end of ["pos"] }, -- end of [16792064] - [16794112] = - { - ["alt"] = 48, - ["point"] = - { - ["y"] = 686871, - ["x"] = -286407, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["unit"] = - { - ["id_"] = 16794112, - }, -- end of ["unit"] - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-113", - ["groupId"] = 1000061, - ["groupName"] = "USA gnd 2", - ["unitName"] = "USA gnd 2 unit1", - ["countryId"] = 2, - ["x"] = -286407, - ["country"] = "usa", - ["heading"] = 0, - ["unitId"] = 7007, - ["y"] = 686871, - ["coalition"] = "blue", - ["pos"] = - { - ["y"] = 47.898649326901, - ["x"] = -286407.15625, - ["z"] = 686871.4375, - }, -- end of ["pos"] - }, -- end of [16794112] [16796160] = { - ["alt"] = 60, + ["alt"] = 62, ["point"] = { - ["y"] = 691995, - ["x"] = -286713, + ["y"] = 690360, + ["x"] = -285032, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2682,99 +2729,91 @@ aliveUnits = }, -- end of ["unit"] ["category"] = "vehicle", ["speed"] = 0, - ["heading"] = 1.4977557627604, + ["heading"] = 1.4977557565984, ["country"] = "usa", ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["y"] = 691995, - ["x"] = -286713, + ["y"] = 690360, + ["x"] = -285032, ["coalition"] = "blue", ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["unitId"] = 7015, - ["unitName"] = "USA gnd 3 unit4", + ["groupId"] = 7008, + ["unitId"] = 7014, + ["unitName"] = "USA gnd 3 unit3", ["pos"] = { - ["y"] = 60.180648050549, - ["x"] = -286712.65625, - ["z"] = 691995.1875, + ["y"] = 61.763868858352, + ["x"] = -285032.15427946, + ["z"] = 690360.06593797, }, -- end of ["pos"] }, -- end of [16796160] [16798208] = { - ["alt"] = 55, + ["alt"] = 0, ["point"] = { - ["y"] = 692563, - ["x"] = -288904, + ["y"] = 267810, + ["x"] = -162283, }, -- end of ["point"] - ["coalitionId"] = 2, + ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["unit"] = { ["id_"] = 16798208, }, -- end of ["unit"] - ["category"] = "vehicle", + ["category"] = "ship", ["speed"] = 0, - ["heading"] = 1.4977557725472, - ["country"] = "usa", - ["groupName"] = "USA gnd 5", - ["countryId"] = 2, - ["y"] = 692563, - ["x"] = -288904, - ["coalition"] = "blue", - ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, - ["unitId"] = 7023, - ["unitName"] = "USA gnd 5 unit1", + ["type"] = "PERRY", + ["groupId"] = 7014, + ["groupName"] = "AUSTRALIA shp 2", + ["unitName"] = "AUSTRALIA shp 2 unit1", + ["coalition"] = "neutral", + ["x"] = -162283, + ["country"] = "australia", + ["y"] = 267810, + ["heading"] = 0, + ["unitId"] = 7022, + ["countryId"] = 21, ["pos"] = { - ["y"] = 55.241109533523, - ["x"] = -288904.3125, - ["z"] = 692562.6875, + ["y"] = 0, + ["x"] = -162282.96875, + ["z"] = 267810.09375, }, -- end of ["pos"] }, -- end of [16798208] [16800256] = { - ["alt"] = 1996, + ["alt"] = 48, ["point"] = { - ["y"] = 682741, - ["x"] = -288608, + ["y"] = 686871, + ["x"] = -286447, }, -- end of ["point"] - ["alt_type"] = "BARO", ["coalitionId"] = 2, - ["livery_id"] = "usaf standard", - ["skill"] = "High", + ["skill"] = "Average", ["unit"] = { ["id_"] = 16800256, }, -- end of ["unit"] - ["category"] = "plane", - ["speed"] = 138.82033106075, - ["heading"] = 1.6162179835615, - ["groupId"] = 1000076, - ["unitName"] = "USA air 5 unit1", - ["groupName"] = "USA air 5", - ["callsign"] = - { - [1] = 4, - [2] = 1, - [3] = 1, - ["name"] = "Colt11", - }, -- end of ["callsign"] - ["coalition"] = "blue", - ["x"] = -288608, - ["unitId"] = 7031, - ["type"] = "B-52H", - ["country"] = "usa", - ["y"] = 682741, + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-113", + ["groupId"] = 7018, + ["groupName"] = "USA gnd 6", + ["unitName"] = "USA gnd 6 unit2", ["countryId"] = 2, + ["x"] = -286447, + ["country"] = "usa", + ["heading"] = 0, + ["unitId"] = 7030, + ["y"] = 686871, + ["coalition"] = "blue", ["pos"] = { - ["y"] = 1995.2387619438, - ["x"] = -288652.46873993, - ["z"] = 683711.22252834, + ["y"] = 47.876796607959, + ["x"] = -286447.15625, + ["z"] = 686871.4375, }, -- end of ["pos"] }, -- end of [16800256] } -- end of aliveUnits diff --git a/Example DBs/mist_DBs_const.lua b/Example DBs/mist_DBs_const.lua index 63376da..54c3551 100644 --- a/Example DBs/mist_DBs_const.lua +++ b/Example DBs/mist_DBs_const.lua @@ -8,67 +8,101 @@ const = ["Barracks 2"] = "kazarma2", ["Small house 2C"] = "dom2c", ["Military staff"] = "aviashtab", + ["Container 20ft"] = "container_20ft", + ["Tanker Elnya 160"] = "elnya", + ["Pipes big"] = "pipes_big_cargo", ["Tech hangar A"] = "ceh_ang_a", ["Oil derrick"] = "neftevyshka", ["Tech combine"] = "kombinat", ["Garage B"] = "garage_b", + ["Pilot standing"] = "pilot_parashut", ["Airshow_Crowd"] = "Crowd1", + ["Airshow_Cone"] = "Comp_cone", ["Hangar A"] = "angar_a", + ["Road outpost"] = "block-onroad", ["Repair workshop"] = "tech", ["Subsidiary structure D"] = "saray-d", + ["Outpost"] = "block", ["FARP Ammo Dump Coating"] = "SetkaKP", ["Small house 1C area"] = "dom2c-all", ["Tank 2"] = "airbase_tbilisi_tank_01", ["Boiler-house A"] = "kotelnaya_a", + ["Parachute"] = "parash", ["Workshop A"] = "tec_a", + ["Downed pilot"] = "cadaver", ["Small werehouse 1"] = "s1", + ["Bulk Cargo Ship Ivanov"] = "barge-1", + ["Fueltank"] = "fueltank_cargo", ["Garage small B"] = "garagh-small-b", ["Small werehouse 4"] = "s4", + ["Oiltank"] = "oiltank_cargo", + ["Container 40ft"] = "container_40ft", ["Shop"] = "magazin", + ["Bunker 2"] = "dot2", ["Subsidiary structure B"] = "saray-b", - ["FARP Fuel Depot"] = "GSM Rus", + ["FARP Fuel Depot"] = "gsm rus", + ["White_Flag"] = "H-Flag_W", ["Coach cargo"] = "wagon-gruz", + ["Oil rig"] = "oil_platform", + ["Helipad Single"] = "farp", ["Electric power box"] = "tr_budka", ["Tank 3"] = "airbase_tbilisi_tank_02", ["Red_Flag"] = "H-flag_R", + ["Gas platform"] = "gas_platform", ["Container red 3"] = "konteiner_red3", ["Garage A"] = "garage_a", ["Hangar B"] = "angar_b", + ["Trunks small"] = "trunks_small_cargo", ["Black_Tyre"] = "H-tyre_B", ["Cafe"] = "stolovaya", ["Restaurant 1"] = "restoran1", + ["Trunks long"] = "trunks_long_cargo", ["Subsidiary structure A"] = "saray-a", + ["Tetrapod"] = "tetrapod_cargo", ["Container white"] = "konteiner_white", ["Warehouse"] = "sklad", ["Tank"] = "bak", + ["Oil platform"] = "plavbaza", + ["Pipes small"] = "pipes_small_cargo", + ["Watch Tower Armed"] = "ohr-vyshka", + ["FARP Command Post"] = "kp-ug", ["Railway crossing B"] = "pereezd_small", + ["Railway crossing A"] = "pereezd_big", ["Subsidiary structure F"] = "saray-f", + ["Gate"] = "gate", ["Farm A"] = "ferma_a", + ["FARP"] = "farps", ["Small werehouse 3"] = "s3", + ["Passenger boat"] = "zwezdny", ["Water tower A"] = "wodokachka_a", + ["F-shape barrier"] = "f_bar_cargo", ["Railway station"] = "r_vok_sd", ["Coach a tank blue"] = "wagon-cisterna_blue", + ["Bunker 1"] = "dot", + ["Tech Hangar A"] = "ceh_ang_a", ["Supermarket A"] = "uniwersam_a", ["Coach a platform"] = "wagon-platforma", ["Garage small A"] = "garagh-small-a", + ["Container brown"] = "konteiner_brown", ["TV tower"] = "tele_bash", - ["Airshow_Cone"] = "Comp_cone", + ["Bulk Cargo Ship Yakushev"] = "barge-2", + ["Pilot F15 Parachute"] = "pilot_f15_parachute", ["Farm B"] = "ferma_b", ["GeneratorF"] = "GeneratorF", - ["White_Flag"] = "H-Flag_W", + ["Passenger liner"] = "yastrebow", ["Container red 2"] = "konteiner_red2", ["Coach a passenger"] = "wagon-pass", ["WC"] = "WC", ["Black_Tyre_WF"] = "H-tyre_B_WF", ["Electric locomotive"] = "elektrowoz", - ["Railway crossing A"] = "pereezd_big", + ["Armed house"] = "home1_a", ["Coach a tank yellow"] = "wagon-cisterna_yellow", ["Subsidiary structure 2"] = "hozdomik2", [".Ammunition depot"] = "SkladC", ["Small werehouse 2"] = "s2", ["Windsock"] = "H-Windsock_RW", ["Small house 1B"] = "domik1b", - ["Container brown"] = "konteiner_brown", + ["Container camo"] = "bw_container_cargo", ["Locomotive"] = "teplowoz", ["Subsidiary structure 1"] = "hozdomik1", ["Pump station"] = "nasos", @@ -82,7 +116,7 @@ const = ["Black_Tyre_RF"] = "H-tyre_B_RF", ["Comms tower M"] = "tele_bash_m", [".Command Center"] = "ComCenter", - ["Fuel tank"] = "toplivo-bak", + ["Fuel tank"] = "toplivo", ["Cargo1"] = "ab-212_cargo", ["Shelter B"] = "ukrytie_b", ["Chemical tank A"] = "him_bak_a", @@ -107,58 +141,166 @@ const = { ["groupLimit"] = 9, }, -- end of ["rules"] - ["aircraft"] = + ["TRANSPORT"] = { - ["Uzi"] = 3, - ["Pontiac"] = 8, - ["Chevy"] = 7, - ["Dodge"] = 5, - ["Ford"] = 6, - ["Enfield"] = 1, - ["Colt"] = 4, - ["Springfield"] = 2, - }, -- end of ["aircraft"] - ["unique"] = - { - ["A10"] = + ["unique"] = { - ["Boar"] = 10, - ["Pig"] = 11, - ["rules"] = + ["b52"] = { - ["canUseAircraft"] = true, - ["appliesTo"] = + ["rules"] = { - [1] = "A-10C", - [2] = "A-10A", - }, -- end of ["appliesTo"] - }, -- end of ["rules"] - ["Tusk"] = 12, - ["Hawg"] = 9, - }, -- end of ["A10"] - }, -- end of ["unique"] - ["JTAC"] = - { - ["Ferret"] = 10, - ["Finger"] = 8, - ["Deathstar"] = 15, - ["Pointer"] = 4, - ["Anvil"] = 16, - ["Darknight"] = 2, - ["Whiplash"] = 7, - ["Warrior"] = 3, - ["Eyeball"] = 5, - ["Mantis"] = 18, - ["Playboy"] = 12, - ["Axeman"] = 1, - ["Moonbeam"] = 6, - ["Hammer"] = 13, - ["Shaba"] = 11, - ["Badger"] = 19, - ["Jaguar"] = 14, - ["Firefly"] = 17, - ["Pinpoint"] = 9, - }, -- end of ["JTAC"] + ["canUseAircraft"] = true, + ["appliesTo"] = + { + [1] = "B-52H", + }, -- end of ["appliesTo"] + }, -- end of ["rules"] + ["Dump"] = 10, + ["Kenworth"] = 11, + ["Buff"] = 9, + }, -- end of ["b52"] + ["f15e"] = + { + ["Rage"] = 17, + ["rules"] = + { + ["canUseAircraft"] = true, + ["appliesTo"] = + { + [1] = "F-15E", + }, -- end of ["appliesTo"] + }, -- end of ["rules"] + ["Trek"] = 12, + ["Thud"] = 10, + ["Sled"] = 14, + ["Gunny"] = 11, + ["Dude"] = 9, + ["Tahoe"] = 18, + ["Jazz"] = 16, + ["Best"] = 15, + ["Sniper"] = 13, + }, -- end of ["f15e"] + ["A10"] = + { + ["Boar"] = 10, + ["Pig"] = 11, + ["rules"] = + { + ["canUseAircraft"] = true, + ["appliesTo"] = + { + [1] = "A-10C_2", + [2] = "A-10C", + [3] = "A-10A", + }, -- end of ["appliesTo"] + }, -- end of ["rules"] + ["Tusk"] = 12, + ["Hawg"] = 9, + }, -- end of ["A10"] + ["f16"] = + { + ["rules"] = + { + ["canUseAircraft"] = true, + ["appliesTo"] = + { + [1] = "F-16C_50", + [2] = "F-16C bl.52d", + [3] = "F-16C bl.50", + [4] = "F-16A MLU", + [5] = "F-16A", + }, -- end of ["appliesTo"] + }, -- end of ["rules"] + ["Panther"] = 15, + ["Weasel"] = 17, + ["Viper"] = 9, + ["Lobo"] = 11, + ["Jedi"] = 20, + ["Ninja"] = 19, + ["Python"] = 13, + ["Wild"] = 18, + ["Rattler"] = 14, + ["Wolf"] = 16, + ["Cowboy"] = 12, + ["Venom"] = 10, + }, -- end of ["f16"] + ["b1"] = + { + ["Dark"] = 10, + ["rules"] = + { + ["canUseAircraft"] = true, + ["appliesTo"] = + { + [1] = "B-1B", + }, -- end of ["appliesTo"] + }, -- end of ["rules"] + ["Vader"] = 11, + ["Bone"] = 9, + }, -- end of ["b1"] + ["f18"] = + { + ["Jury"] = 14, + ["rules"] = + { + ["canUseAircraft"] = true, + ["appliesTo"] = + { + [1] = "FA-18C_hornet", + [2] = "F/A-18C", + }, -- end of ["appliesTo"] + }, -- end of ["rules"] + ["Ram"] = 16, + ["Roman"] = 12, + ["Hornet"] = 9, + ["Squid"] = 10, + ["Snake"] = 20, + ["Hawk"] = 17, + ["Devil"] = 18, + ["Check"] = 19, + ["Ragin"] = 11, + ["Jokey"] = 15, + ["Sting"] = 13, + }, -- end of ["f18"] + }, -- end of ["unique"] + ["Trash"] = 10, + ["aircraft"] = + { + ["Uzi"] = 3, + ["Pontiac"] = 8, + ["Chevy"] = 7, + ["Dodge"] = 5, + ["Ford"] = 6, + ["Enfield"] = 1, + ["Colt"] = 4, + ["Springfield"] = 2, + }, -- end of ["aircraft"] + ["JTAC"] = + { + ["Ferret"] = 10, + ["Finger"] = 8, + ["Deathstar"] = 15, + ["Pointer"] = 4, + ["Anvil"] = 16, + ["Darknight"] = 2, + ["Whiplash"] = 7, + ["Warrior"] = 3, + ["Eyeball"] = 5, + ["Mantis"] = 18, + ["Playboy"] = 12, + ["Axeman"] = 1, + ["Moonbeam"] = 6, + ["Hammer"] = 13, + ["Shaba"] = 11, + ["Badger"] = 19, + ["Jaguar"] = 14, + ["Firefly"] = 17, + ["Pinpoint"] = 9, + }, -- end of ["JTAC"] + ["Ascot"] = 12, + ["Cargo"] = 11, + ["Heavy"] = 9, + }, -- end of ["TRANSPORT"] ["TANKER"] = { ["Texaco"] = 1, diff --git a/Example DBs/mist_DBs_deadObjects.lua b/Example DBs/mist_DBs_deadObjects.lua index 0823136..f8de8f4 100644 --- a/Example DBs/mist_DBs_deadObjects.lua +++ b/Example DBs/mist_DBs_deadObjects.lua @@ -4,9 +4,9 @@ deadObjects = { ["objectPos"] = { - ["y"] = 11.730595023771, - ["x"] = -292856.66347804, - ["z"] = 654539.58489607, + ["y"] = 11.75361563721, + ["x"] = -292856.39553252, + ["z"] = 654542.61205442, }, -- end of ["objectPos"] ["objectType"] = "vehicle", ["objectData"] = @@ -36,9 +36,9 @@ deadObjects = ["country"] = "russia", ["pos"] = { - ["y"] = 11.73456417819, - ["x"] = -292855.65589344, - ["z"] = 654539.4776362, + ["y"] = 11.754341371009, + ["x"] = -292856.19491841, + ["z"] = 654542.5822736, }, -- end of ["pos"] }, -- end of ["objectData"] ["object"] = @@ -50,9 +50,9 @@ deadObjects = { ["objectPos"] = { - ["y"] = 11.73993894825, - ["x"] = -292922.02212464, - ["z"] = 654583.90753159, + ["y"] = 11.829393615855, + ["x"] = -292900.70531913, + ["z"] = 654582.31756955, }, -- end of ["objectPos"] ["objectType"] = "vehicle", ["objectData"] = @@ -82,9 +82,9 @@ deadObjects = ["country"] = "russia", ["pos"] = { - ["y"] = 11.750775044011, - ["x"] = -292918.85355006, - ["z"] = 654583.32898538, + ["y"] = 11.835539878247, + ["x"] = -292898.99755273, + ["z"] = 654582.04906262, }, -- end of ["pos"] }, -- end of ["objectData"] ["object"] = @@ -96,9 +96,9 @@ deadObjects = { ["objectPos"] = { - ["y"] = 11.787782375471, - ["x"] = -292989.15632544, - ["z"] = 654627.05222202, + ["y"] = 11.923311694265, + ["x"] = -292943.35378497, + ["z"] = 654623.45115955, }, -- end of ["objectPos"] ["objectType"] = "vehicle", ["objectData"] = @@ -128,9 +128,9 @@ deadObjects = ["country"] = "russia", ["pos"] = { - ["y"] = 11.784134667198, - ["x"] = -292988.34774035, - ["z"] = 654626.95184203, + ["y"] = 11.931074299111, + ["x"] = -292941.20047403, + ["z"] = 654623.11353253, }, -- end of ["pos"] }, -- end of ["objectData"] ["object"] = @@ -138,50 +138,50 @@ deadObjects = ["id_"] = 16783104, }, -- end of ["object"] }, -- end of [16783104] - [16783360] = + [16783616] = { ["objectPos"] = { - ["y"] = 12.117786843734, - ["x"] = -293044.08971735, - ["z"] = 654661.12095178, + ["y"] = 12.057971873824, + ["x"] = -293013.37808746, + ["z"] = 654700.95592945, }, -- end of ["objectPos"] ["objectType"] = "vehicle", ["objectData"] = { ["point"] = { - ["y"] = 654665.71428571, - ["x"] = -292962.85714286, + ["y"] = 654705.71428571, + ["x"] = -293002.85714286, }, -- end of ["point"] ["skill"] = "Average", ["unit"] = { - ["id_"] = 16783360, + ["id_"] = 16783616, }, -- end of ["unit"] ["category"] = "vehicle", - ["unitName"] = "RuBTRs4", + ["unitName"] = "RuBTRs5", ["type"] = "BTR-80", ["groupId"] = 13, ["groupName"] = "RuBTRs", ["countryId"] = 0, ["coalition"] = "red", - ["x"] = -292962.85714286, - ["y"] = 654665.71428571, + ["x"] = -293002.85714286, + ["y"] = 654705.71428571, ["heading"] = -1.7994767003775, - ["unitId"] = 30, + ["unitId"] = 31, ["playerCanDrive"] = true, ["country"] = "russia", ["pos"] = { - ["y"] = 12.104105100501, - ["x"] = -293040.29557322, - ["z"] = 654661.78361224, + ["y"] = 12.057955079325, + ["x"] = -293012.83464525, + ["z"] = 654701.02104299, }, -- end of ["pos"] }, -- end of ["objectData"] ["object"] = { - ["id_"] = 16783360, + ["id_"] = 16783616, }, -- end of ["object"] - }, -- end of [16783360] + }, -- end of [16783616] } -- end of deadObjects diff --git a/Example DBs/mist_DBs_drawingByName.lua b/Example DBs/mist_DBs_drawingByName.lua new file mode 100644 index 0000000..62b9170 --- /dev/null +++ b/Example DBs/mist_DBs_drawingByName.lua @@ -0,0 +1,232 @@ +drawingByName = +{ + ["Blue Line"] = + { + ["visible"] = true, + ["mapY"] = 653204.31828899, + ["primitiveType"] = "Line", + ["layer"] = "Author", + ["closed"] = false, + ["thickness"] = 8, + ["lineMode"] = "segments", + ["style"] = "solid", + ["layerName"] = "Author", + ["name"] = "Blue Line", + ["points"] = + { + [1] = + { + ["y"] = 653204.31828899, + ["x"] = -91302.340018104, + }, -- end of [1] + [2] = + { + ["y"] = 723491.4290735, + ["x"] = -90143.761268909, + }, -- end of [2] + [3] = + { + ["y"] = 725036.2007391, + ["x"] = -129921.63165795, + }, -- end of [3] + [4] = + { + ["y"] = 669810.61369412, + ["x"] = -127604.47415956, + }, -- end of [4] + [5] = + { + ["y"] = 707271.32658477, + ["x"] = -161203.25788622, + }, -- end of [5] + }, -- end of ["points"] + ["mapX"] = -91302.340018104, + ["colorString"] = "0x0000ffff", + }, -- end of ["Blue Line"] + ["Text Box 1"] = + { + ["visible"] = true, + ["fontSize"] = 24, + ["mapY"] = 821584.42983871, + ["primitiveType"] = "TextBox", + ["layer"] = "Author", + ["font"] = "DejaVuLGCSansCondensed.ttf", + ["mapX"] = -217973.61659679, + ["colorString"] = "0x004040ff", + ["name"] = "Text Box 1", + ["angle"] = 0, + ["text"] = "Objective HERE", + ["fillColorString"] = "0x00000080", + ["borderThickness"] = 4, + ["layerName"] = "Author", + }, -- end of ["Text Box 1"] + ["Red Line"] = + { + ["visible"] = true, + ["mapY"] = 624626.04247551, + ["primitiveType"] = "Line", + ["layer"] = "Author", + ["closed"] = false, + ["thickness"] = 8, + ["lineMode"] = "segment", + ["style"] = "solid", + ["layerName"] = "Author", + ["name"] = "Red Line", + ["points"] = + { + [1] = + { + ["y"] = 624626.04247551, + ["x"] = -35304.367140331, + }, -- end of [1] + [2] = + { + ["y"] = 650887.1607906, + ["x"] = -87440.410854119, + }, -- end of [2] + }, -- end of ["points"] + ["mapX"] = -35304.367140331, + ["colorString"] = "0xff0000ff", + }, -- end of ["Red Line"] + ["ellipse"] = + { + ["visible"] = true, + ["points"] = + { + [1] = + { + ["y"] = 830250.78116076, + ["x"] = 11345.221862616, + }, -- end of [1] + [2] = + { + ["y"] = 830744.08029641, + ["x"] = 5911.6635979767, + }, -- end of [2] + [3] = + { + ["y"] = 829981.52257348, + ["x"] = -2199.1070035738, + }, -- end of [3] + [4] = + { + ["y"] = 828015.0750406, + ["x"] = -12434.354329222, + }, -- end of [4] + [5] = + { + ["y"] = 824978.74784743, + ["x"] = -24096.563188272, + }, -- end of [5] + [6] = + { + ["y"] = 821079.46167442, + ["x"] = -36390.973319689, + }, -- end of [6] + [7] = + { + ["y"] = 816582.94643038, + ["x"] = -48479.740990492, + }, -- end of [7] + [8] = + { + ["y"] = 811795.63219835, + ["x"] = -59539.036661549, + }, -- end of [8] + [9] = + { + ["y"] = 807043.76653182, + ["x"] = -68815.187609226, + }, -- end of [9] + [10] = + { + ["y"] = 802651.18122316, + ["x"] = -75676.039476005, + }, -- end of [10] + [11] = + { + ["y"] = 798917.22370205, + ["x"] = -79654.036545258, + }, -- end of [11] + [12] = + { + ["y"] = 796096.35700289, + ["x"] = -80478.084890666, + }, -- end of [12] + [13] = + { + ["y"] = 794380.81852954, + ["x"] = -78092.026979294, + }, -- end of [13] + [14] = + { + ["y"] = 793887.51939389, + ["x"] = -72658.468714655, + }, -- end of [14] + [15] = + { + ["y"] = 794650.07711682, + ["x"] = -64547.698113104, + }, -- end of [15] + [16] = + { + ["y"] = 796616.5246497, + ["x"] = -54312.450787456, + }, -- end of [16] + [17] = + { + ["y"] = 799652.85184287, + ["x"] = -42650.241928406, + }, -- end of [17] + [18] = + { + ["y"] = 803552.13801588, + ["x"] = -30355.831796989, + }, -- end of [18] + [19] = + { + ["y"] = 808048.65325992, + ["x"] = -18267.064126186, + }, -- end of [19] + [20] = + { + ["y"] = 812835.96749195, + ["x"] = -7207.7684551292, + }, -- end of [20] + [21] = + { + ["y"] = 817587.83315848, + ["x"] = 2068.3824925484, + }, -- end of [21] + [22] = + { + ["y"] = 821980.41846714, + ["x"] = 8929.234359327, + }, -- end of [22] + [23] = + { + ["y"] = 825714.37598825, + ["x"] = 12907.23142858, + }, -- end of [23] + [24] = + { + ["y"] = 828535.24268741, + ["x"] = 13731.279773988, + }, -- end of [24] + }, -- end of ["points"] + ["layer"] = "Author", + ["r1"] = 49818.886215397, + ["mapY"] = 812315.79984515, + ["layerName"] = "Author", + ["name"] = "ellipse", + ["fillColorString"] = "0xffffff80", + ["thickness"] = 8, + ["polygonMode"] = "oval", + ["style"] = "solid", + ["colorString"] = "0x008000ff", + ["mapX"] = -33373.402558339, + ["angle"] = 19, + ["r2"] = 9268.6299935624, + ["primitiveType"] = "Polygon", + }, -- end of ["ellipse"] +} -- end of drawingByName diff --git a/Example DBs/mist_DBs_drawingIndexed.lua b/Example DBs/mist_DBs_drawingIndexed.lua new file mode 100644 index 0000000..8fbeb07 --- /dev/null +++ b/Example DBs/mist_DBs_drawingIndexed.lua @@ -0,0 +1,266 @@ +drawingIndexed = +{ + [1] = + { + ["visible"] = true, + ["hiddenOnPlanner"] = false, + ["mapY"] = 687961.68076485, + ["primitiveType"] = "Line", + ["layer"] = "Author", + ["closed"] = false, + ["thickness"] = 8, + ["colorString"] = "0xff0000ff", + ["style"] = "solid", + ["layerName"] = "Author", + ["name"] = "Red Line", + ["points"] = + { + [1] = + { + ["y"] = 687961.68076485, + ["x"] = -129535.43874155, + }, -- end of [1] + [2] = + { + ["y"] = 687961.68076485, + ["x"] = -129535.43874155, + }, -- end of [2] + [3] = + { + ["y"] = 686803.10201565, + ["x"] = -126832.08832676, + }, -- end of [3] + }, -- end of ["points"] + ["mapX"] = -129535.43874155, + ["lineMode"] = "segments", + }, -- end of [1] + [2] = + { + ["visible"] = true, + ["mapY"] = 624626.04247551, + ["primitiveType"] = "Line", + ["layer"] = "Author", + ["closed"] = false, + ["thickness"] = 8, + ["lineMode"] = "segment", + ["style"] = "solid", + ["layerName"] = "Author", + ["name"] = "Red Line", + ["points"] = + { + [1] = + { + ["y"] = 624626.04247551, + ["x"] = -35304.367140331, + }, -- end of [1] + [2] = + { + ["y"] = 650887.1607906, + ["x"] = -87440.410854119, + }, -- end of [2] + }, -- end of ["points"] + ["mapX"] = -35304.367140331, + ["colorString"] = "0xff0000ff", + }, -- end of [2] + [3] = + { + ["visible"] = true, + ["mapY"] = 653204.31828899, + ["primitiveType"] = "Line", + ["layer"] = "Author", + ["closed"] = false, + ["thickness"] = 8, + ["lineMode"] = "segments", + ["style"] = "solid", + ["layerName"] = "Author", + ["name"] = "Blue Line", + ["points"] = + { + [1] = + { + ["y"] = 653204.31828899, + ["x"] = -91302.340018104, + }, -- end of [1] + [2] = + { + ["y"] = 723491.4290735, + ["x"] = -90143.761268909, + }, -- end of [2] + [3] = + { + ["y"] = 725036.2007391, + ["x"] = -129921.63165795, + }, -- end of [3] + [4] = + { + ["y"] = 669810.61369412, + ["x"] = -127604.47415956, + }, -- end of [4] + [5] = + { + ["y"] = 707271.32658477, + ["x"] = -161203.25788622, + }, -- end of [5] + }, -- end of ["points"] + ["mapX"] = -91302.340018104, + ["colorString"] = "0x0000ffff", + }, -- end of [3] + [4] = + { + ["visible"] = true, + ["points"] = + { + [1] = + { + ["y"] = 830250.78116076, + ["x"] = 11345.221862616, + }, -- end of [1] + [2] = + { + ["y"] = 830744.08029641, + ["x"] = 5911.6635979767, + }, -- end of [2] + [3] = + { + ["y"] = 829981.52257348, + ["x"] = -2199.1070035738, + }, -- end of [3] + [4] = + { + ["y"] = 828015.0750406, + ["x"] = -12434.354329222, + }, -- end of [4] + [5] = + { + ["y"] = 824978.74784743, + ["x"] = -24096.563188272, + }, -- end of [5] + [6] = + { + ["y"] = 821079.46167442, + ["x"] = -36390.973319689, + }, -- end of [6] + [7] = + { + ["y"] = 816582.94643038, + ["x"] = -48479.740990492, + }, -- end of [7] + [8] = + { + ["y"] = 811795.63219835, + ["x"] = -59539.036661549, + }, -- end of [8] + [9] = + { + ["y"] = 807043.76653182, + ["x"] = -68815.187609226, + }, -- end of [9] + [10] = + { + ["y"] = 802651.18122316, + ["x"] = -75676.039476005, + }, -- end of [10] + [11] = + { + ["y"] = 798917.22370205, + ["x"] = -79654.036545258, + }, -- end of [11] + [12] = + { + ["y"] = 796096.35700289, + ["x"] = -80478.084890666, + }, -- end of [12] + [13] = + { + ["y"] = 794380.81852954, + ["x"] = -78092.026979294, + }, -- end of [13] + [14] = + { + ["y"] = 793887.51939389, + ["x"] = -72658.468714655, + }, -- end of [14] + [15] = + { + ["y"] = 794650.07711682, + ["x"] = -64547.698113104, + }, -- end of [15] + [16] = + { + ["y"] = 796616.5246497, + ["x"] = -54312.450787456, + }, -- end of [16] + [17] = + { + ["y"] = 799652.85184287, + ["x"] = -42650.241928406, + }, -- end of [17] + [18] = + { + ["y"] = 803552.13801588, + ["x"] = -30355.831796989, + }, -- end of [18] + [19] = + { + ["y"] = 808048.65325992, + ["x"] = -18267.064126186, + }, -- end of [19] + [20] = + { + ["y"] = 812835.96749195, + ["x"] = -7207.7684551292, + }, -- end of [20] + [21] = + { + ["y"] = 817587.83315848, + ["x"] = 2068.3824925484, + }, -- end of [21] + [22] = + { + ["y"] = 821980.41846714, + ["x"] = 8929.234359327, + }, -- end of [22] + [23] = + { + ["y"] = 825714.37598825, + ["x"] = 12907.23142858, + }, -- end of [23] + [24] = + { + ["y"] = 828535.24268741, + ["x"] = 13731.279773988, + }, -- end of [24] + }, -- end of ["points"] + ["layer"] = "Author", + ["r1"] = 49818.886215397, + ["mapY"] = 812315.79984515, + ["layerName"] = "Author", + ["name"] = "ellipse", + ["fillColorString"] = "0xffffff80", + ["thickness"] = 8, + ["polygonMode"] = "oval", + ["style"] = "solid", + ["colorString"] = "0x008000ff", + ["mapX"] = -33373.402558339, + ["angle"] = 19, + ["r2"] = 9268.6299935624, + ["primitiveType"] = "Polygon", + }, -- end of [4] + [5] = + { + ["visible"] = true, + ["fontSize"] = 24, + ["mapY"] = 821584.42983871, + ["primitiveType"] = "TextBox", + ["layer"] = "Author", + ["font"] = "DejaVuLGCSansCondensed.ttf", + ["mapX"] = -217973.61659679, + ["colorString"] = "0x004040ff", + ["name"] = "Text Box 1", + ["angle"] = 0, + ["text"] = "Objective HERE", + ["fillColorString"] = "0x00000080", + ["borderThickness"] = 4, + ["layerName"] = "Author", + }, -- end of [5] +} -- end of drawingIndexed diff --git a/Example DBs/mist_DBs_dynGroupsAdded.lua b/Example DBs/mist_DBs_dynGroupsAdded.lua index c674dd9..2652bdf 100644 --- a/Example DBs/mist_DBs_dynGroupsAdded.lua +++ b/Example DBs/mist_DBs_dynGroupsAdded.lua @@ -9,11 +9,11 @@ dynGroupsAdded = { [1] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692389, - ["x"] = -287110, + ["y"] = 694968, + ["x"] = -285046, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -23,8 +23,8 @@ dynGroupsAdded = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287110, - ["y"] = 692389, + ["x"] = -285046, + ["y"] = 694968, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #002", @@ -33,11 +33,11 @@ dynGroupsAdded = }, -- end of [1] [2] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692345, - ["x"] = -286935, + ["y"] = 695126, + ["x"] = -285098, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -47,8 +47,8 @@ dynGroupsAdded = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286935, - ["y"] = 692345, + ["x"] = -285098, + ["y"] = 695126, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #003", @@ -57,11 +57,11 @@ dynGroupsAdded = }, -- end of [2] [3] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692308, - ["x"] = -287213, + ["y"] = 694892, + ["x"] = -285039, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -71,8 +71,8 @@ dynGroupsAdded = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287213, - ["y"] = 692308, + ["x"] = -285039, + ["y"] = 694892, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #004", @@ -81,11 +81,11 @@ dynGroupsAdded = }, -- end of [3] [4] = { - ["alt"] = 60, + ["alt"] = 75, ["point"] = { - ["y"] = 692321, - ["x"] = -286989, + ["y"] = 695084, + ["x"] = -284914, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -95,8 +95,8 @@ dynGroupsAdded = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286989, - ["y"] = 692321, + ["x"] = -284914, + ["y"] = 695084, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #005", @@ -105,11 +105,11 @@ dynGroupsAdded = }, -- end of [4] [5] = { - ["alt"] = 59, + ["alt"] = 73, ["point"] = { - ["y"] = 692297, - ["x"] = -287225, + ["y"] = 694985, + ["x"] = -285104, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -119,8 +119,8 @@ dynGroupsAdded = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287225, - ["y"] = 692297, + ["x"] = -285104, + ["y"] = 694985, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #006", @@ -129,11 +129,11 @@ dynGroupsAdded = }, -- end of [5] [6] = { - ["alt"] = 61, + ["alt"] = 74, ["point"] = { - ["y"] = 692445, - ["x"] = -287012, + ["y"] = 694877, + ["x"] = -285009, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -143,8 +143,8 @@ dynGroupsAdded = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287012, - ["y"] = 692445, + ["x"] = -285009, + ["y"] = 694877, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #007", @@ -153,11 +153,11 @@ dynGroupsAdded = }, -- end of [6] [7] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692311, - ["x"] = -287237, + ["y"] = 694952, + ["x"] = -284964, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -167,8 +167,8 @@ dynGroupsAdded = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287237, - ["y"] = 692311, + ["x"] = -284964, + ["y"] = 694952, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #008", @@ -197,10 +197,11 @@ dynGroupsAdded = ["alt"] = 0, ["point"] = { - ["y"] = 266228, - ["x"] = -161996, + ["y"] = 267081, + ["x"] = -164471, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 1 unit1", @@ -208,22 +209,22 @@ dynGroupsAdded = ["unitId"] = 7011, ["groupName"] = "AUSTRALIA shp 1", ["countryId"] = 21, - ["x"] = -161996, + ["x"] = -164471, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000064, ["coalition"] = "neutral", - ["y"] = 266228, + ["type"] = "PERRY", + ["groupId"] = 7007, + ["y"] = 267081, ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 1", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000064, + ["groupId"] = 7007, ["groupName"] = "AUSTRALIA shp 1", }, -- end of [2] [3] = @@ -236,31 +237,31 @@ dynGroupsAdded = { [1] = { - ["alt"] = 61, + ["alt"] = 62, ["type"] = "Sandbox", ["point"] = { - ["y"] = 690788, - ["x"] = -285547, + ["y"] = 693698, + ["x"] = -287512, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 690788, - ["groupName"] = "USA static 1", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285547, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 1", + ["unitId"] = 7005, + ["y"] = 693698, + ["x"] = -287512, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 1", - ["unitId"] = 7005, - ["heading"] = 0, ["groupId"] = 7005, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -271,29 +272,29 @@ dynGroupsAdded = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000058, + ["groupId"] = 7001, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692663, - ["x"] = -286548, + ["y"] = 692292, + ["x"] = -284982, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286548, - ["y"] = 692663, - ["heading"] = 1.4977557600419, + ["x"] = -284982, + ["y"] = 692292, + ["heading"] = 1.4977557593169, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit1", ["unitId"] = 7001, @@ -301,23 +302,23 @@ dynGroupsAdded = }, -- end of [1] [2] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692678, - ["x"] = -286576, + ["y"] = 692208, + ["x"] = -284870, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286576, - ["y"] = 692678, - ["heading"] = 1.4977557629417, + ["x"] = -284870, + ["y"] = 692208, + ["heading"] = 1.4977557696476, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit2", ["unitId"] = 7002, @@ -325,23 +326,23 @@ dynGroupsAdded = }, -- end of [2] [3] = { - ["alt"] = 63, + ["alt"] = 68, ["point"] = { - ["y"] = 692774, - ["x"] = -286539, + ["y"] = 692374, + ["x"] = -284971, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286539, - ["y"] = 692774, - ["heading"] = 1.497755762398, + ["x"] = -284971, + ["y"] = 692374, + ["heading"] = 1.4977557676538, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit3", ["unitId"] = 7003, @@ -349,23 +350,23 @@ dynGroupsAdded = }, -- end of [3] [4] = { - ["alt"] = 62, + ["alt"] = 68, ["point"] = { - ["y"] = 692553, - ["x"] = -286525, + ["y"] = 692388, + ["x"] = -284932, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286525, - ["y"] = 692553, - ["heading"] = 1.4977557625792, + ["x"] = -284932, + ["y"] = 692388, + ["heading"] = 1.4977557602231, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit4", ["unitId"] = 7004, @@ -374,7 +375,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 1", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -386,7 +387,7 @@ dynGroupsAdded = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 2", ["modulation"] = 0, - ["groupId"] = 1000063, + ["groupId"] = 7006, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 2", ["hidden"] = false, @@ -394,11 +395,11 @@ dynGroupsAdded = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -406,14 +407,14 @@ dynGroupsAdded = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 2 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000063, + ["heading"] = 2.1995924992708, + ["groupId"] = 7006, ["groupName"] = "AUSTRALIA air 2", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7010, @@ -428,7 +429,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -440,7 +441,7 @@ dynGroupsAdded = ["country"] = "usa", ["groupName"] = "USA air 1", ["modulation"] = 0, - ["groupId"] = 1000062, + ["groupId"] = 7005, ["coalitionId"] = 2, ["name"] = "USA air 1", ["hidden"] = false, @@ -448,10 +449,10 @@ dynGroupsAdded = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -460,14 +461,14 @@ dynGroupsAdded = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 1 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000062, + ["heading"] = 1.6162179734619, + ["groupId"] = 7005, ["groupName"] = "USA air 1", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7009, @@ -482,7 +483,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, @@ -493,7 +494,7 @@ dynGroupsAdded = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000061, + ["groupId"] = 7004, ["hidden"] = false, ["units"] = { @@ -516,7 +517,7 @@ dynGroupsAdded = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -540,7 +541,7 @@ dynGroupsAdded = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -548,7 +549,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 2", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -565,11 +566,11 @@ dynGroupsAdded = { [1] = { - ["alt"] = 72, + ["alt"] = 57, ["point"] = { - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -580,8 +581,8 @@ dynGroupsAdded = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 2", - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, ["coalition"] = "blue", ["unitId"] = 7006, ["heading"] = 0, @@ -591,7 +592,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -608,11 +609,11 @@ dynGroupsAdded = { [1] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -623,8 +624,8 @@ dynGroupsAdded = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 4", - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, ["coalition"] = "blue", ["unitId"] = 7017, ["heading"] = 0, @@ -634,7 +635,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -646,7 +647,7 @@ dynGroupsAdded = ["country"] = "usa", ["groupName"] = "USA air 3", ["modulation"] = 0, - ["groupId"] = 1000069, + ["groupId"] = 7012, ["coalitionId"] = 2, ["name"] = "USA air 3", ["hidden"] = false, @@ -654,10 +655,10 @@ dynGroupsAdded = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -666,14 +667,14 @@ dynGroupsAdded = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 3 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000069, + ["heading"] = 1.6162179734619, + ["groupId"] = 7012, ["groupName"] = "USA air 3", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7020, @@ -688,7 +689,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, @@ -705,31 +706,31 @@ dynGroupsAdded = { [1] = { - ["alt"] = 60, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 691139, - ["x"] = -286038, + ["y"] = 692858, + ["x"] = -286636, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 691139, - ["groupName"] = "USA static 3", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -286038, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 3", + ["unitId"] = 7016, + ["y"] = 692858, + ["x"] = -286636, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 3", - ["unitId"] = 7016, - ["heading"] = 0, ["groupId"] = 7016, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -741,7 +742,7 @@ dynGroupsAdded = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 4", ["modulation"] = 0, - ["groupId"] = 1000070, + ["groupId"] = 7013, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 4", ["hidden"] = false, @@ -749,11 +750,11 @@ dynGroupsAdded = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -761,14 +762,14 @@ dynGroupsAdded = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 4 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000070, + ["heading"] = 2.1995924992708, + ["groupId"] = 7013, ["groupName"] = "AUSTRALIA air 4", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7021, @@ -783,7 +784,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -802,10 +803,11 @@ dynGroupsAdded = ["alt"] = 0, ["point"] = { - ["y"] = 266588, - ["x"] = -163302, + ["y"] = 267810, + ["x"] = -162283, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 2 unit1", @@ -813,51 +815,51 @@ dynGroupsAdded = ["unitId"] = 7022, ["groupName"] = "AUSTRALIA shp 2", ["countryId"] = 21, - ["x"] = -163302, + ["x"] = -162283, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000071, ["coalition"] = "neutral", - ["y"] = 266588, + ["type"] = "PERRY", + ["groupId"] = 7014, + ["y"] = 267810, ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 2", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000071, + ["groupId"] = 7014, ["groupName"] = "AUSTRALIA shp 2", }, -- end of [13] [14] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000065, + ["groupId"] = 7008, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 60, + ["alt"] = 62, ["point"] = { - ["y"] = 692171, - ["x"] = -286749, + ["y"] = 690419, + ["x"] = -284972, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286749, - ["y"] = 692171, - ["heading"] = 1.4977557591357, + ["x"] = -284972, + ["y"] = 690419, + ["heading"] = 1.4977557640291, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit1", ["unitId"] = 7012, @@ -865,23 +867,23 @@ dynGroupsAdded = }, -- end of [1] [2] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 692204, - ["x"] = -286580, + ["y"] = 690558, + ["x"] = -284846, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286580, - ["y"] = 692204, - ["heading"] = 1.4977557614918, + ["x"] = -284846, + ["y"] = 690558, + ["heading"] = 1.4977557580482, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit2", ["unitId"] = 7013, @@ -889,23 +891,23 @@ dynGroupsAdded = }, -- end of [2] [3] = { - ["alt"] = 61, + ["alt"] = 62, ["point"] = { - ["y"] = 692150, - ["x"] = -286560, + ["y"] = 690360, + ["x"] = -285032, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286560, - ["y"] = 692150, - ["heading"] = 1.4977557614918, + ["x"] = -285032, + ["y"] = 690360, + ["heading"] = 1.4977557565984, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit3", ["unitId"] = 7014, @@ -913,23 +915,23 @@ dynGroupsAdded = }, -- end of [3] [4] = { - ["alt"] = 60, + ["alt"] = 62, ["point"] = { - ["y"] = 691995, - ["x"] = -286713, + ["y"] = 690314, + ["x"] = -284956, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286713, - ["y"] = 691995, - ["heading"] = 1.4977557627604, + ["x"] = -284956, + ["y"] = 690314, + ["heading"] = 1.497755755511, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit4", ["unitId"] = 7015, @@ -938,7 +940,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 3", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -949,7 +951,7 @@ dynGroupsAdded = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000068, + ["groupId"] = 7011, ["hidden"] = false, ["units"] = { @@ -966,7 +968,7 @@ dynGroupsAdded = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286407, @@ -990,7 +992,7 @@ dynGroupsAdded = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286447, @@ -1004,7 +1006,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 4", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -1015,29 +1017,29 @@ dynGroupsAdded = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000072, + ["groupId"] = 7015, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 55, + ["alt"] = 73, ["point"] = { - ["y"] = 692563, - ["x"] = -288904, + ["y"] = 691751, + ["x"] = -283221, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288904, - ["y"] = 692563, - ["heading"] = 1.4977557725472, + ["x"] = -283221, + ["y"] = 691751, + ["heading"] = 1.4977557703725, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit1", ["unitId"] = 7023, @@ -1045,23 +1047,23 @@ dynGroupsAdded = }, -- end of [1] [2] = { - ["alt"] = 56, + ["alt"] = 74, ["point"] = { - ["y"] = 692623, - ["x"] = -288844, + ["y"] = 691898, + ["x"] = -283194, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288844, - ["y"] = 692623, - ["heading"] = 1.4977557660227, + ["x"] = -283194, + ["y"] = 691898, + ["heading"] = 1.4977557634854, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit2", ["unitId"] = 7024, @@ -1069,23 +1071,23 @@ dynGroupsAdded = }, -- end of [2] [3] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692459, - ["x"] = -288865, + ["y"] = 691826, + ["x"] = -283357, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288865, - ["y"] = 692459, - ["heading"] = 1.4977557638479, + ["x"] = -283357, + ["y"] = 691826, + ["heading"] = 1.4977557538798, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit3", ["unitId"] = 7025, @@ -1093,23 +1095,23 @@ dynGroupsAdded = }, -- end of [3] [4] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692675, - ["x"] = -289069, + ["y"] = 691852, + ["x"] = -283362, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -289069, - ["y"] = 692675, - ["heading"] = 1.4977557685601, + ["x"] = -283362, + ["y"] = 691852, + ["heading"] = 1.4977557720036, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit4", ["unitId"] = 7026, @@ -1118,7 +1120,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 5", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -1130,7 +1132,7 @@ dynGroupsAdded = ["country"] = "usa", ["groupName"] = "USA air 5", ["modulation"] = 0, - ["groupId"] = 1000076, + ["groupId"] = 7019, ["coalitionId"] = 2, ["name"] = "USA air 5", ["hidden"] = false, @@ -1138,10 +1140,10 @@ dynGroupsAdded = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1150,14 +1152,14 @@ dynGroupsAdded = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 5 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000076, + ["heading"] = 1.6162179734619, + ["groupId"] = 7019, ["groupName"] = "USA air 5", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7031, @@ -1172,7 +1174,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, @@ -1183,7 +1185,7 @@ dynGroupsAdded = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000075, + ["groupId"] = 7018, ["hidden"] = false, ["units"] = { @@ -1206,7 +1208,7 @@ dynGroupsAdded = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -1230,7 +1232,7 @@ dynGroupsAdded = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -1238,7 +1240,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 6", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -1255,11 +1257,11 @@ dynGroupsAdded = { [1] = { - ["alt"] = 73, + ["alt"] = 62, ["point"] = { - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -1270,8 +1272,8 @@ dynGroupsAdded = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 6", - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, ["coalition"] = "blue", ["unitId"] = 7028, ["heading"] = 0, @@ -1281,7 +1283,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1293,7 +1295,7 @@ dynGroupsAdded = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 6", ["modulation"] = 0, - ["groupId"] = 1000077, + ["groupId"] = 7020, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 6", ["hidden"] = false, @@ -1301,11 +1303,11 @@ dynGroupsAdded = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -1313,14 +1315,14 @@ dynGroupsAdded = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 6 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000077, + ["heading"] = 2.1995924992708, + ["groupId"] = 7020, ["groupName"] = "AUSTRALIA air 6", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7032, @@ -1335,7 +1337,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -1352,31 +1354,31 @@ dynGroupsAdded = { [1] = { - ["alt"] = 69, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693432, - ["x"] = -285294, + ["y"] = 692897, + ["x"] = -286503, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693432, - ["groupName"] = "USA static 5", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285294, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 5", + ["unitId"] = 7027, + ["y"] = 692897, + ["x"] = -286503, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 5", - ["unitId"] = 7027, - ["heading"] = 0, ["groupId"] = 7027, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1395,40 +1397,41 @@ dynGroupsAdded = ["alt"] = 0, ["point"] = { - ["y"] = 267963, - ["x"] = -165895, + ["y"] = 268107, + ["x"] = -163693, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000078, + ["unitName"] = "AUSTRALIA shp 3 unit1", + ["heading"] = 0, + ["unitId"] = 7033, ["groupName"] = "AUSTRALIA shp 3", ["countryId"] = 21, - ["x"] = -165895, - ["y"] = 267963, - ["heading"] = 0, - ["country"] = "australia", - ["unitName"] = "AUSTRALIA shp 3 unit1", - ["unitId"] = 7033, + ["x"] = -163693, + ["speed"] = 0, ["coalition"] = "neutral", + ["type"] = "PERRY", + ["groupId"] = 7021, + ["y"] = 268107, + ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 3", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000078, + ["groupId"] = 7021, ["groupName"] = "AUSTRALIA shp 3", }, -- end of [22] [23] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000082, + ["groupId"] = 7025, ["hidden"] = false, ["units"] = { @@ -1451,7 +1454,7 @@ dynGroupsAdded = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -1475,7 +1478,7 @@ dynGroupsAdded = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -1483,7 +1486,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 8", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -1495,7 +1498,7 @@ dynGroupsAdded = ["country"] = "usa", ["groupName"] = "USA air 7", ["modulation"] = 0, - ["groupId"] = 1000083, + ["groupId"] = 7026, ["coalitionId"] = 2, ["name"] = "USA air 7", ["hidden"] = false, @@ -1503,10 +1506,10 @@ dynGroupsAdded = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1515,14 +1518,14 @@ dynGroupsAdded = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 7 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000083, + ["heading"] = 1.6162179734619, + ["groupId"] = 7026, ["groupName"] = "USA air 7", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7042, @@ -1537,7 +1540,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, @@ -1548,29 +1551,29 @@ dynGroupsAdded = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000079, + ["groupId"] = 7022, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692747, - ["x"] = -287036, + ["y"] = 692769, + ["x"] = -287355, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287036, - ["y"] = 692747, - ["heading"] = 1.4977557703724, + ["x"] = -287355, + ["y"] = 692769, + ["heading"] = 1.4977557591357, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit1", ["unitId"] = 7034, @@ -1578,23 +1581,23 @@ dynGroupsAdded = }, -- end of [1] [2] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692716, - ["x"] = -286920, + ["y"] = 692754, + ["x"] = -287476, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -286920, - ["y"] = 692716, - ["heading"] = 1.4977557703724, + ["x"] = -287476, + ["y"] = 692754, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit2", ["unitId"] = 7035, @@ -1602,23 +1605,23 @@ dynGroupsAdded = }, -- end of [2] [3] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692580, - ["x"] = -287056, + ["y"] = 692726, + ["x"] = -287538, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287056, - ["y"] = 692580, - ["heading"] = 1.4977557642103, + ["x"] = -287538, + ["y"] = 692726, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit3", ["unitId"] = 7036, @@ -1626,23 +1629,23 @@ dynGroupsAdded = }, -- end of [3] [4] = { - ["alt"] = 60, + ["alt"] = 59, ["point"] = { - ["y"] = 692752, - ["x"] = -287189, + ["y"] = 692766, + ["x"] = -287511, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287189, - ["y"] = 692752, - ["heading"] = 1.4977557678351, + ["x"] = -287511, + ["y"] = 692766, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit4", ["unitId"] = 7037, @@ -1651,7 +1654,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 7", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -1663,7 +1666,7 @@ dynGroupsAdded = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 8", ["modulation"] = 0, - ["groupId"] = 1000084, + ["groupId"] = 7027, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 8", ["hidden"] = false, @@ -1671,11 +1674,11 @@ dynGroupsAdded = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -1683,14 +1686,14 @@ dynGroupsAdded = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 8 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000084, + ["heading"] = 2.1995924992708, + ["groupId"] = 7027, ["groupName"] = "AUSTRALIA air 8", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7043, @@ -1705,7 +1708,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -1724,10 +1727,11 @@ dynGroupsAdded = ["alt"] = 0, ["point"] = { - ["y"] = 268804, - ["x"] = -165342, + ["y"] = 265427, + ["x"] = -164284, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 4 unit1", @@ -1735,22 +1739,22 @@ dynGroupsAdded = ["unitId"] = 7044, ["groupName"] = "AUSTRALIA shp 4", ["countryId"] = 21, - ["x"] = -165342, + ["x"] = -164284, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000085, ["coalition"] = "neutral", - ["y"] = 268804, + ["type"] = "PERRY", + ["groupId"] = 7028, + ["y"] = 265427, ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 4", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000085, + ["groupId"] = 7028, ["groupName"] = "AUSTRALIA shp 4", }, -- end of [27] [28] = @@ -1763,11 +1767,11 @@ dynGroupsAdded = { [1] = { - ["alt"] = 67, + ["alt"] = 63, ["point"] = { - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -1778,8 +1782,8 @@ dynGroupsAdded = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 8", - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, ["coalition"] = "blue", ["unitId"] = 7039, ["heading"] = 0, @@ -1789,7 +1793,7 @@ dynGroupsAdded = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1806,31 +1810,31 @@ dynGroupsAdded = { [1] = { - ["alt"] = 61, + ["alt"] = 56, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693155, - ["x"] = -287187, + ["y"] = 691971, + ["x"] = -288088, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693155, - ["groupName"] = "USA static 7", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -287187, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 7", + ["unitId"] = 7038, + ["y"] = 691971, + ["x"] = -288088, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 7", - ["unitId"] = 7038, - ["heading"] = 0, ["groupId"] = 7038, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, diff --git a/Example DBs/mist_DBs_groupsById.lua b/Example DBs/mist_DBs_groupsById.lua index 12eb7f6..f9e473a 100644 --- a/Example DBs/mist_DBs_groupsById.lua +++ b/Example DBs/mist_DBs_groupsById.lua @@ -382,6 +382,9 @@ groupsById = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, @@ -393,7 +396,6 @@ groupsById = ["y"] = 636428.57142857, ["unitId"] = 11, ["heading"] = -0.67060113146646, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -401,6 +403,7 @@ groupsById = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 6, }, -- end of [1] }, -- end of ["units"] @@ -435,6 +438,9 @@ groupsById = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, @@ -446,7 +452,6 @@ groupsById = ["y"] = 644428.57142857, ["unitId"] = 12, ["heading"] = -0.66079849060746, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -454,6 +459,7 @@ groupsById = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 7, }, -- end of [1] }, -- end of ["units"] @@ -1408,25 +1414,25 @@ groupsById = [1] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 675199.99999999, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cargoBob", - ["groupId"] = 31, - ["countryId"] = 2, - ["mass"] = 371, ["unitId"] = 45, + ["groupName"] = "cargoBob", + ["countryId"] = 2, + ["y"] = 675199.99999999, + ["mass"] = 371, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", ["x"] = -292007.14285714, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 31, }, -- end of [1] }, -- end of ["units"] }, -- end of [31] @@ -1443,25 +1449,25 @@ groupsById = [1] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 674842.85714285, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cloneCargoBase", - ["groupId"] = 32, - ["countryId"] = 2, - ["mass"] = 1337, ["unitId"] = 46, + ["groupName"] = "cloneCargoBase", + ["countryId"] = 2, + ["y"] = 674842.85714285, + ["mass"] = 1337, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 32, }, -- end of [1] }, -- end of ["units"] }, -- end of [32] @@ -1586,11 +1592,11 @@ groupsById = { [1] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692389, - ["x"] = -287110, + ["y"] = 694968, + ["x"] = -285046, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1600,8 +1606,8 @@ groupsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287110, - ["y"] = 692389, + ["x"] = -285046, + ["y"] = 694968, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #002", @@ -1610,11 +1616,11 @@ groupsById = }, -- end of [1] [2] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692345, - ["x"] = -286935, + ["y"] = 695126, + ["x"] = -285098, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1624,8 +1630,8 @@ groupsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286935, - ["y"] = 692345, + ["x"] = -285098, + ["y"] = 695126, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #003", @@ -1634,11 +1640,11 @@ groupsById = }, -- end of [2] [3] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692308, - ["x"] = -287213, + ["y"] = 694892, + ["x"] = -285039, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1648,8 +1654,8 @@ groupsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287213, - ["y"] = 692308, + ["x"] = -285039, + ["y"] = 694892, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #004", @@ -1658,11 +1664,11 @@ groupsById = }, -- end of [3] [4] = { - ["alt"] = 60, + ["alt"] = 75, ["point"] = { - ["y"] = 692321, - ["x"] = -286989, + ["y"] = 695084, + ["x"] = -284914, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1672,8 +1678,8 @@ groupsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286989, - ["y"] = 692321, + ["x"] = -284914, + ["y"] = 695084, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #005", @@ -1682,11 +1688,11 @@ groupsById = }, -- end of [4] [5] = { - ["alt"] = 59, + ["alt"] = 73, ["point"] = { - ["y"] = 692297, - ["x"] = -287225, + ["y"] = 694985, + ["x"] = -285104, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1696,8 +1702,8 @@ groupsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287225, - ["y"] = 692297, + ["x"] = -285104, + ["y"] = 694985, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #006", @@ -1706,11 +1712,11 @@ groupsById = }, -- end of [5] [6] = { - ["alt"] = 61, + ["alt"] = 74, ["point"] = { - ["y"] = 692445, - ["x"] = -287012, + ["y"] = 694877, + ["x"] = -285009, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1720,8 +1726,8 @@ groupsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287012, - ["y"] = 692445, + ["x"] = -285009, + ["y"] = 694877, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #007", @@ -1730,11 +1736,11 @@ groupsById = }, -- end of [6] [7] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692311, - ["x"] = -287237, + ["y"] = 694952, + ["x"] = -284964, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1744,8 +1750,8 @@ groupsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287237, - ["y"] = 692311, + ["x"] = -284964, + ["y"] = 694952, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #008", @@ -1928,25 +1934,25 @@ groupsById = { [1] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443856.28948724, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443856.28948724, ["x"] = -355322.45423175, - ["unitId"] = 63, + ["groupId"] = 40, ["category"] = "static", ["unitName"] = "static_on_ship1", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 40, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 63, }, -- end of [1] }, -- end of ["units"] }, -- end of [40] @@ -1962,25 +1968,25 @@ groupsById = { [1] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443849.03844635, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443849.03844635, ["x"] = -355322.27295572, - ["unitId"] = 64, + ["groupId"] = 41, ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 41, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 64, }, -- end of [1] }, -- end of ["units"] }, -- end of [41] @@ -2127,8 +2133,8 @@ groupsById = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -2137,15 +2143,15 @@ groupsById = ["speed"] = 44.444444444444, ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["unitName"] = "Rotary-1-1", ["groupName"] = "nH", ["coalition"] = "neutral", ["countryId"] = 21, - ["x"] = -155967.80633993, - ["y"] = 405888.85058741, + ["x"] = -158700.87914814, + ["y"] = 404406.46136648, ["unitId"] = 68, - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["skill"] = "High", ["callsign"] = { @@ -2200,11 +2206,397 @@ groupsById = }, -- end of [1] }, -- end of ["units"] }, -- end of [46] - [1000082] = + [47] = + { + ["country"] = "usa", + ["groupName"] = "poly", + ["units"] = + { + [1] = + { + ["heading"] = 2.3261877017598, + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["groupId"] = 47, + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["groupName"] = "poly", + ["type"] = "AAV7", + ["countryId"] = 2, + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["country"] = "usa", + ["skill"] = "Average", + }, -- end of [1] + }, -- end of ["units"] + ["coalition"] = "blue", + ["groupId"] = 47, + ["category"] = "vehicle", + ["countryId"] = 2, + ["startTime"] = 0, + ["task"] = "Ground Nothing", + ["hidden"] = false, + }, -- end of [47] + [7028] = + { + ["country"] = "australia", + ["coalitionId"] = 0, + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 0, + ["point"] = + { + ["y"] = 265427, + ["x"] = -164284, + }, -- end of ["point"] + ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", + ["skill"] = "Average", + ["category"] = "ship", + ["unitName"] = "AUSTRALIA shp 4 unit1", + ["heading"] = 0, + ["unitId"] = 7044, + ["groupName"] = "AUSTRALIA shp 4", + ["countryId"] = 21, + ["x"] = -164284, + ["speed"] = 0, + ["coalition"] = "neutral", + ["type"] = "PERRY", + ["groupId"] = 7028, + ["y"] = 265427, + ["country"] = "australia", + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 21, + ["name"] = "AUSTRALIA shp 4", + ["timeAdded"] = 43223.79, + ["category"] = "ship", + ["coalition"] = "neutral", + ["startTime"] = 0, + ["groupId"] = 7028, + ["groupName"] = "AUSTRALIA shp 4", + }, -- end of [7028] + [7001] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000082, + ["groupId"] = 7001, + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 67, + ["point"] = + { + ["y"] = 692292, + ["x"] = -284982, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7001, + ["groupName"] = "USA gnd 1", + ["countryId"] = 2, + ["x"] = -284982, + ["y"] = 692292, + ["heading"] = 1.4977557593169, + ["country"] = "usa", + ["unitName"] = "USA gnd 1 unit1", + ["unitId"] = 7001, + ["coalition"] = "blue", + }, -- end of [1] + [2] = + { + ["alt"] = 67, + ["point"] = + { + ["y"] = 692208, + ["x"] = -284870, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7001, + ["groupName"] = "USA gnd 1", + ["countryId"] = 2, + ["x"] = -284870, + ["y"] = 692208, + ["heading"] = 1.4977557696476, + ["country"] = "usa", + ["unitName"] = "USA gnd 1 unit2", + ["unitId"] = 7002, + ["coalition"] = "blue", + }, -- end of [2] + [3] = + { + ["alt"] = 68, + ["point"] = + { + ["y"] = 692374, + ["x"] = -284971, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7001, + ["groupName"] = "USA gnd 1", + ["countryId"] = 2, + ["x"] = -284971, + ["y"] = 692374, + ["heading"] = 1.4977557676538, + ["country"] = "usa", + ["unitName"] = "USA gnd 1 unit3", + ["unitId"] = 7003, + ["coalition"] = "blue", + }, -- end of [3] + [4] = + { + ["alt"] = 68, + ["point"] = + { + ["y"] = 692388, + ["x"] = -284932, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7001, + ["groupName"] = "USA gnd 1", + ["countryId"] = 2, + ["x"] = -284932, + ["y"] = 692388, + ["heading"] = 1.4977557602231, + ["country"] = "usa", + ["unitName"] = "USA gnd 1 unit4", + ["unitId"] = 7004, + ["coalition"] = "blue", + }, -- end of [4] + }, -- end of ["units"] + ["countryId"] = 2, + ["name"] = "USA gnd 1", + ["timeAdded"] = 43220.79, + ["category"] = "vehicle", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Nothing", + ["groupName"] = "USA gnd 1", + }, -- end of [7001] + [7005] = + { + ["country"] = "usa", + ["groupName"] = "USA air 1", + ["modulation"] = 0, + ["groupId"] = 7005, + ["coalitionId"] = 2, + ["name"] = "USA air 1", + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 1997, + ["point"] = + { + ["y"] = 682727, + ["x"] = -288608, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["coalitionId"] = 2, + ["livery_id"] = "usaf standard", + ["skill"] = "High", + ["category"] = "plane", + ["unitName"] = "USA air 1 unit1", + ["heading"] = 1.6162179734619, + ["groupId"] = 7005, + ["groupName"] = "USA air 1", + ["speed"] = 138.85196364465, + ["countryId"] = 2, + ["x"] = -288608, + ["coalition"] = "blue", + ["y"] = 682727, + ["country"] = "usa", + ["type"] = "B-52H", + ["unitId"] = 7009, + ["callsign"] = + { + [1] = 4, + [2] = 1, + [3] = 1, + ["name"] = "Colt11", + }, -- end of ["callsign"] + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["radioSet"] = false, + ["timeAdded"] = 43220.79, + ["category"] = "plane", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Attack", + ["uncontrolled"] = false, + }, -- end of [7005] + [7013] = + { + ["country"] = "australia", + ["groupName"] = "AUSTRALIA air 4", + ["modulation"] = 0, + ["groupId"] = 7013, + ["coalitionId"] = 0, + ["name"] = "AUSTRALIA air 4", + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 1998, + ["point"] = + { + ["y"] = 319595, + ["x"] = -198560, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["coalitionId"] = 0, + ["livery_id"] = "Australian 75th Squadron", + ["skill"] = "High", + ["category"] = "plane", + ["unitName"] = "AUSTRALIA air 4 unit1", + ["heading"] = 2.1995924992708, + ["groupId"] = 7013, + ["groupName"] = "AUSTRALIA air 4", + ["speed"] = 180.49294253728, + ["countryId"] = 21, + ["x"] = -198560, + ["coalition"] = "neutral", + ["y"] = 319595, + ["country"] = "australia", + ["type"] = "FA-18C_hornet", + ["unitId"] = 7021, + ["callsign"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + ["name"] = "Enfield11", + }, -- end of ["callsign"] + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 21, + ["radioSet"] = false, + ["timeAdded"] = 43221.79, + ["category"] = "plane", + ["coalition"] = "neutral", + ["startTime"] = 0, + ["task"] = "CAP", + ["uncontrolled"] = false, + }, -- end of [7013] + [7017] = + { + ["groupId"] = 7017, + ["coalitionId"] = 2, + ["hidden"] = false, + ["groupName"] = "USA static 4", + ["units"] = + { + [1] = + { + ["alt"] = 63, + ["point"] = + { + ["y"] = 694197, + ["x"] = -287544, + }, -- end of ["point"] + ["categoryStatic"] = "Cargos", + ["coalitionId"] = 2, + ["mass"] = 1337, + ["category"] = "static", + ["unitName"] = "USA static 4", + ["shape_name"] = "ab-212_cargo", + ["type"] = "uh1h_cargo", + ["country"] = "usa", + ["groupName"] = "USA static 4", + ["y"] = 694197, + ["x"] = -287544, + ["coalition"] = "blue", + ["unitId"] = 7017, + ["heading"] = 0, + ["countryId"] = 2, + ["groupId"] = 7017, + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["coalition"] = "blue", + ["timeAdded"] = 43221.79, + ["category"] = "static", + ["country"] = "usa", + ["startTime"] = 0, + ["name"] = "USA static 4", + ["uncontrolled"] = false, + }, -- end of [7017] + [7021] = + { + ["country"] = "australia", + ["coalitionId"] = 0, + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 0, + ["point"] = + { + ["y"] = 268107, + ["x"] = -163693, + }, -- end of ["point"] + ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", + ["skill"] = "Average", + ["category"] = "ship", + ["unitName"] = "AUSTRALIA shp 3 unit1", + ["heading"] = 0, + ["unitId"] = 7033, + ["groupName"] = "AUSTRALIA shp 3", + ["countryId"] = 21, + ["x"] = -163693, + ["speed"] = 0, + ["coalition"] = "neutral", + ["type"] = "PERRY", + ["groupId"] = 7021, + ["y"] = 268107, + ["country"] = "australia", + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 21, + ["name"] = "AUSTRALIA shp 3", + ["timeAdded"] = 43222.79, + ["category"] = "ship", + ["coalition"] = "neutral", + ["startTime"] = 0, + ["groupId"] = 7021, + ["groupName"] = "AUSTRALIA shp 3", + }, -- end of [7021] + [7025] = + { + ["country"] = "usa", + ["coalitionId"] = 2, + ["groupId"] = 7025, ["hidden"] = false, ["units"] = { @@ -2227,7 +2619,7 @@ groupsById = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2251,7 +2643,7 @@ groupsById = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2259,357 +2651,57 @@ groupsById = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 8", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 8", - }, -- end of [1000082] - [7028] = + }, -- end of [7025] + [7006] = { - ["groupId"] = 7028, + ["groupId"] = 7006, ["coalitionId"] = 2, ["hidden"] = false, - ["groupName"] = "USA static 6", + ["groupName"] = "USA static 2", ["units"] = { [1] = { - ["alt"] = 73, + ["alt"] = 57, ["point"] = { - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691173, + ["x"] = -286924, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, ["mass"] = 1337, ["category"] = "static", - ["unitName"] = "USA static 6", + ["unitName"] = "USA static 2", ["shape_name"] = "ab-212_cargo", ["type"] = "uh1h_cargo", ["country"] = "usa", - ["groupName"] = "USA static 6", - ["y"] = 694850, - ["x"] = -285204, + ["groupName"] = "USA static 2", + ["y"] = 691173, + ["x"] = -286924, ["coalition"] = "blue", - ["unitId"] = 7028, + ["unitId"] = 7006, ["heading"] = 0, ["countryId"] = 2, - ["groupId"] = 7028, + ["groupId"] = 7006, }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43220.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, - ["name"] = "USA static 6", + ["name"] = "USA static 2", ["uncontrolled"] = false, - }, -- end of [7028] - [1000083] = - { - ["country"] = "usa", - ["groupName"] = "USA air 7", - ["modulation"] = 0, - ["groupId"] = 1000083, - ["coalitionId"] = 2, - ["name"] = "USA air 7", - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 1996, - ["point"] = - { - ["y"] = 682741, - ["x"] = -288608, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["coalitionId"] = 2, - ["livery_id"] = "usaf standard", - ["skill"] = "High", - ["category"] = "plane", - ["unitName"] = "USA air 7 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000083, - ["groupName"] = "USA air 7", - ["speed"] = 138.82033106075, - ["countryId"] = 2, - ["x"] = -288608, - ["coalition"] = "blue", - ["y"] = 682741, - ["country"] = "usa", - ["type"] = "B-52H", - ["unitId"] = 7042, - ["callsign"] = - { - [1] = 4, - [2] = 1, - [3] = 1, - ["name"] = "Colt11", - }, -- end of ["callsign"] - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["radioSet"] = false, - ["timeAdded"] = 43223.99, - ["category"] = "plane", - ["coalition"] = "blue", - ["startTime"] = 0, - ["task"] = "Ground Attack", - ["uncontrolled"] = false, - }, -- end of [1000083] - [7005] = - { - ["groupId"] = 7005, - ["coalitionId"] = 2, - ["hidden"] = false, - ["groupName"] = "USA static 1", - ["units"] = - { - [1] = - { - ["alt"] = 61, - ["type"] = "Sandbox", - ["point"] = - { - ["y"] = 690788, - ["x"] = -285547, - }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 690788, - ["groupName"] = "USA static 1", - ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285547, - ["coalition"] = "blue", - ["category"] = "static", - ["unitName"] = "USA static 1", - ["unitId"] = 7005, - ["heading"] = 0, - ["groupId"] = 7005, - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["coalition"] = "blue", - ["timeAdded"] = 43220.99, - ["category"] = "static", - ["country"] = "usa", - ["startTime"] = 0, - ["name"] = "USA static 1", - ["uncontrolled"] = false, - }, -- end of [7005] - [1000084] = - { - ["country"] = "australia", - ["groupName"] = "AUSTRALIA air 8", - ["modulation"] = 0, - ["groupId"] = 1000084, - ["coalitionId"] = 0, - ["name"] = "AUSTRALIA air 8", - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 1997, - ["point"] = - { - ["y"] = 319610, - ["x"] = -198571, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["coalitionId"] = 0, - ["livery_id"] = "Australian 75th Squadron", - ["skill"] = "High", - ["category"] = "plane", - ["unitName"] = "AUSTRALIA air 8 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000084, - ["groupName"] = "AUSTRALIA air 8", - ["speed"] = 180.44764340673, - ["countryId"] = 21, - ["x"] = -198571, - ["coalition"] = "neutral", - ["y"] = 319610, - ["country"] = "australia", - ["type"] = "FA-18C_hornet", - ["unitId"] = 7043, - ["callsign"] = - { - [1] = 1, - [2] = 1, - [3] = 1, - ["name"] = "Enfield11", - }, -- end of ["callsign"] - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 21, - ["radioSet"] = false, - ["timeAdded"] = 43223.99, - ["category"] = "plane", - ["coalition"] = "neutral", - ["startTime"] = 0, - ["task"] = "CAP", - ["uncontrolled"] = false, - }, -- end of [1000084] - [1000069] = - { - ["country"] = "usa", - ["groupName"] = "USA air 3", - ["modulation"] = 0, - ["groupId"] = 1000069, - ["coalitionId"] = 2, - ["name"] = "USA air 3", - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 1996, - ["point"] = - { - ["y"] = 682741, - ["x"] = -288608, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["coalitionId"] = 2, - ["livery_id"] = "usaf standard", - ["skill"] = "High", - ["category"] = "plane", - ["unitName"] = "USA air 3 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000069, - ["groupName"] = "USA air 3", - ["speed"] = 138.82033106075, - ["countryId"] = 2, - ["x"] = -288608, - ["coalition"] = "blue", - ["y"] = 682741, - ["country"] = "usa", - ["type"] = "B-52H", - ["unitId"] = 7020, - ["callsign"] = - { - [1] = 4, - [2] = 1, - [3] = 1, - ["name"] = "Colt11", - }, -- end of ["callsign"] - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["radioSet"] = false, - ["timeAdded"] = 43221.99, - ["category"] = "plane", - ["coalition"] = "blue", - ["startTime"] = 0, - ["task"] = "Ground Attack", - ["uncontrolled"] = false, - }, -- end of [1000069] - [7017] = - { - ["groupId"] = 7017, - ["coalitionId"] = 2, - ["hidden"] = false, - ["groupName"] = "USA static 4", - ["units"] = - { - [1] = - { - ["alt"] = 61, - ["point"] = - { - ["y"] = 693989, - ["x"] = -288108, - }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["coalitionId"] = 2, - ["mass"] = 1337, - ["category"] = "static", - ["unitName"] = "USA static 4", - ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", - ["country"] = "usa", - ["groupName"] = "USA static 4", - ["y"] = 693989, - ["x"] = -288108, - ["coalition"] = "blue", - ["unitId"] = 7017, - ["heading"] = 0, - ["countryId"] = 2, - ["groupId"] = 7017, - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["coalition"] = "blue", - ["timeAdded"] = 43221.99, - ["category"] = "static", - ["country"] = "usa", - ["startTime"] = 0, - ["name"] = "USA static 4", - ["uncontrolled"] = false, - }, -- end of [7017] - [1000070] = - { - ["country"] = "australia", - ["groupName"] = "AUSTRALIA air 4", - ["modulation"] = 0, - ["groupId"] = 1000070, - ["coalitionId"] = 0, - ["name"] = "AUSTRALIA air 4", - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 1997, - ["point"] = - { - ["y"] = 319610, - ["x"] = -198571, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["coalitionId"] = 0, - ["livery_id"] = "Australian 75th Squadron", - ["skill"] = "High", - ["category"] = "plane", - ["unitName"] = "AUSTRALIA air 4 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000070, - ["groupName"] = "AUSTRALIA air 4", - ["speed"] = 180.44764340673, - ["countryId"] = 21, - ["x"] = -198571, - ["coalition"] = "neutral", - ["y"] = 319610, - ["country"] = "australia", - ["type"] = "FA-18C_hornet", - ["unitId"] = 7021, - ["callsign"] = - { - [1] = 1, - [2] = 1, - [3] = 1, - ["name"] = "Enfield11", - }, -- end of ["callsign"] - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 21, - ["radioSet"] = false, - ["timeAdded"] = 43221.99, - ["category"] = "plane", - ["coalition"] = "neutral", - ["startTime"] = 0, - ["task"] = "CAP", - ["uncontrolled"] = false, - }, -- end of [1000070] - [1000071] = + }, -- end of [7006] + [7014] = { ["country"] = "australia", ["coalitionId"] = 0, @@ -2621,10 +2713,11 @@ groupsById = ["alt"] = 0, ["point"] = { - ["y"] = 266588, - ["x"] = -163302, + ["y"] = 267810, + ["x"] = -162283, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 2 unit1", @@ -2632,268 +2725,29 @@ groupsById = ["unitId"] = 7022, ["groupName"] = "AUSTRALIA shp 2", ["countryId"] = 21, - ["x"] = -163302, + ["x"] = -162283, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000071, ["coalition"] = "neutral", - ["y"] = 266588, + ["type"] = "PERRY", + ["groupId"] = 7014, + ["y"] = 267810, ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 2", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000071, + ["groupId"] = 7014, ["groupName"] = "AUSTRALIA shp 2", - }, -- end of [1000071] - [7006] = - { - ["groupId"] = 7006, - ["coalitionId"] = 2, - ["hidden"] = false, - ["groupName"] = "USA static 2", - ["units"] = - { - [1] = - { - ["alt"] = 72, - ["point"] = - { - ["y"] = 694712, - ["x"] = -286007, - }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["coalitionId"] = 2, - ["mass"] = 1337, - ["category"] = "static", - ["unitName"] = "USA static 2", - ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", - ["country"] = "usa", - ["groupName"] = "USA static 2", - ["y"] = 694712, - ["x"] = -286007, - ["coalition"] = "blue", - ["unitId"] = 7006, - ["heading"] = 0, - ["countryId"] = 2, - ["groupId"] = 7006, - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["coalition"] = "blue", - ["timeAdded"] = 43220.99, - ["category"] = "static", - ["country"] = "usa", - ["startTime"] = 0, - ["name"] = "USA static 2", - ["uncontrolled"] = false, - }, -- end of [7006] - [1000058] = + }, -- end of [7014] + [7018] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000058, - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 62, - ["point"] = - { - ["y"] = 692663, - ["x"] = -286548, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, - ["groupName"] = "USA gnd 1", - ["countryId"] = 2, - ["x"] = -286548, - ["y"] = 692663, - ["heading"] = 1.4977557600419, - ["country"] = "usa", - ["unitName"] = "USA gnd 1 unit1", - ["unitId"] = 7001, - ["coalition"] = "blue", - }, -- end of [1] - [2] = - { - ["alt"] = 62, - ["point"] = - { - ["y"] = 692678, - ["x"] = -286576, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, - ["groupName"] = "USA gnd 1", - ["countryId"] = 2, - ["x"] = -286576, - ["y"] = 692678, - ["heading"] = 1.4977557629417, - ["country"] = "usa", - ["unitName"] = "USA gnd 1 unit2", - ["unitId"] = 7002, - ["coalition"] = "blue", - }, -- end of [2] - [3] = - { - ["alt"] = 63, - ["point"] = - { - ["y"] = 692774, - ["x"] = -286539, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, - ["groupName"] = "USA gnd 1", - ["countryId"] = 2, - ["x"] = -286539, - ["y"] = 692774, - ["heading"] = 1.497755762398, - ["country"] = "usa", - ["unitName"] = "USA gnd 1 unit3", - ["unitId"] = 7003, - ["coalition"] = "blue", - }, -- end of [3] - [4] = - { - ["alt"] = 62, - ["point"] = - { - ["y"] = 692553, - ["x"] = -286525, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, - ["groupName"] = "USA gnd 1", - ["countryId"] = 2, - ["x"] = -286525, - ["y"] = 692553, - ["heading"] = 1.4977557625792, - ["country"] = "usa", - ["unitName"] = "USA gnd 1 unit4", - ["unitId"] = 7004, - ["coalition"] = "blue", - }, -- end of [4] - }, -- end of ["units"] - ["countryId"] = 2, - ["name"] = "USA gnd 1", - ["timeAdded"] = 43220.99, - ["category"] = "vehicle", - ["coalition"] = "blue", - ["startTime"] = 0, - ["task"] = "Ground Nothing", - ["groupName"] = "USA gnd 1", - }, -- end of [1000058] - [7038] = - { - ["groupId"] = 7038, - ["coalitionId"] = 2, - ["hidden"] = false, - ["groupName"] = "USA static 7", - ["units"] = - { - [1] = - { - ["alt"] = 61, - ["type"] = "Sandbox", - ["point"] = - { - ["y"] = 693155, - ["x"] = -287187, - }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693155, - ["groupName"] = "USA static 7", - ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -287187, - ["coalition"] = "blue", - ["category"] = "static", - ["unitName"] = "USA static 7", - ["unitId"] = 7038, - ["heading"] = 0, - ["groupId"] = 7038, - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["coalition"] = "blue", - ["timeAdded"] = 43223.99, - ["category"] = "static", - ["country"] = "usa", - ["startTime"] = 0, - ["name"] = "USA static 7", - ["uncontrolled"] = false, - }, -- end of [7038] - [7027] = - { - ["groupId"] = 7027, - ["coalitionId"] = 2, - ["hidden"] = false, - ["groupName"] = "USA static 5", - ["units"] = - { - [1] = - { - ["alt"] = 69, - ["type"] = "Sandbox", - ["point"] = - { - ["y"] = 693432, - ["x"] = -285294, - }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693432, - ["groupName"] = "USA static 5", - ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285294, - ["coalition"] = "blue", - ["category"] = "static", - ["unitName"] = "USA static 5", - ["unitId"] = 7027, - ["heading"] = 0, - ["groupId"] = 7027, - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["coalition"] = "blue", - ["timeAdded"] = 43222.99, - ["category"] = "static", - ["country"] = "usa", - ["startTime"] = 0, - ["name"] = "USA static 5", - ["uncontrolled"] = false, - }, -- end of [7027] - [1000075] = - { - ["country"] = "usa", - ["coalitionId"] = 2, - ["groupId"] = 1000075, + ["groupId"] = 7018, ["hidden"] = false, ["units"] = { @@ -2916,7 +2770,7 @@ groupsById = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2940,7 +2794,7 @@ groupsById = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2948,404 +2802,40 @@ groupsById = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 6", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 6", - }, -- end of [1000075] - [1000085] = - { - ["country"] = "australia", - ["coalitionId"] = 0, - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 0, - ["point"] = - { - ["y"] = 268804, - ["x"] = -165342, - }, -- end of ["point"] - ["coalitionId"] = 0, - ["skill"] = "Average", - ["category"] = "ship", - ["unitName"] = "AUSTRALIA shp 4 unit1", - ["heading"] = 0, - ["unitId"] = 7044, - ["groupName"] = "AUSTRALIA shp 4", - ["countryId"] = 21, - ["x"] = -165342, - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000085, - ["coalition"] = "neutral", - ["y"] = 268804, - ["country"] = "australia", - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 21, - ["name"] = "AUSTRALIA shp 4", - ["timeAdded"] = 43223.99, - ["category"] = "ship", - ["coalition"] = "neutral", - ["startTime"] = 0, - ["groupId"] = 1000085, - ["groupName"] = "AUSTRALIA shp 4", - }, -- end of [1000085] - [1000076] = - { - ["country"] = "usa", - ["groupName"] = "USA air 5", - ["modulation"] = 0, - ["groupId"] = 1000076, - ["coalitionId"] = 2, - ["name"] = "USA air 5", - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 1996, - ["point"] = - { - ["y"] = 682741, - ["x"] = -288608, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["coalitionId"] = 2, - ["livery_id"] = "usaf standard", - ["skill"] = "High", - ["category"] = "plane", - ["unitName"] = "USA air 5 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000076, - ["groupName"] = "USA air 5", - ["speed"] = 138.82033106075, - ["countryId"] = 2, - ["x"] = -288608, - ["coalition"] = "blue", - ["y"] = 682741, - ["country"] = "usa", - ["type"] = "B-52H", - ["unitId"] = 7031, - ["callsign"] = - { - [1] = 4, - [2] = 1, - [3] = 1, - ["name"] = "Colt11", - }, -- end of ["callsign"] - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["radioSet"] = false, - ["timeAdded"] = 43222.99, - ["category"] = "plane", - ["coalition"] = "blue", - ["startTime"] = 0, - ["task"] = "Ground Attack", - ["uncontrolled"] = false, - }, -- end of [1000076] - [1000061] = + }, -- end of [7018] + [7022] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000061, + ["groupId"] = 7022, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 48, + ["alt"] = 59, ["point"] = { - ["y"] = 686871, - ["x"] = -286407, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["unitName"] = "USA gnd 2 unit1", - ["heading"] = 0, - ["unitId"] = 7007, - ["groupName"] = "USA gnd 2", - ["countryId"] = 2, - ["x"] = -286407, - ["speed"] = 0, - ["type"] = "M-113", - ["groupId"] = 1000061, - ["coalition"] = "blue", - ["y"] = 686871, - ["country"] = "usa", - }, -- end of [1] - [2] = - { - ["alt"] = 48, - ["point"] = - { - ["y"] = 686871, - ["x"] = -286447, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["unitName"] = "USA gnd 2 unit2", - ["heading"] = 0, - ["unitId"] = 7008, - ["groupName"] = "USA gnd 2", - ["countryId"] = 2, - ["x"] = -286447, - ["speed"] = 0, - ["type"] = "M-113", - ["groupId"] = 1000061, - ["coalition"] = "blue", - ["y"] = 686871, - ["country"] = "usa", - }, -- end of [2] - }, -- end of ["units"] - ["countryId"] = 2, - ["name"] = "USA gnd 2", - ["timeAdded"] = 43220.99, - ["category"] = "vehicle", - ["coalition"] = "blue", - ["startTime"] = 0, - ["task"] = "Ground Nothing", - ["groupName"] = "USA gnd 2", - }, -- end of [1000061] - [1000077] = - { - ["country"] = "australia", - ["groupName"] = "AUSTRALIA air 6", - ["modulation"] = 0, - ["groupId"] = 1000077, - ["coalitionId"] = 0, - ["name"] = "AUSTRALIA air 6", - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 1997, - ["point"] = - { - ["y"] = 319610, - ["x"] = -198571, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["coalitionId"] = 0, - ["livery_id"] = "Australian 75th Squadron", - ["skill"] = "High", - ["category"] = "plane", - ["unitName"] = "AUSTRALIA air 6 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000077, - ["groupName"] = "AUSTRALIA air 6", - ["speed"] = 180.44764340673, - ["countryId"] = 21, - ["x"] = -198571, - ["coalition"] = "neutral", - ["y"] = 319610, - ["country"] = "australia", - ["type"] = "FA-18C_hornet", - ["unitId"] = 7032, - ["callsign"] = - { - [1] = 1, - [2] = 1, - [3] = 1, - ["name"] = "Enfield11", - }, -- end of ["callsign"] - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 21, - ["radioSet"] = false, - ["timeAdded"] = 43222.99, - ["category"] = "plane", - ["coalition"] = "neutral", - ["startTime"] = 0, - ["task"] = "CAP", - ["uncontrolled"] = false, - }, -- end of [1000077] - [1000062] = - { - ["country"] = "usa", - ["groupName"] = "USA air 1", - ["modulation"] = 0, - ["groupId"] = 1000062, - ["coalitionId"] = 2, - ["name"] = "USA air 1", - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 1996, - ["point"] = - { - ["y"] = 682741, - ["x"] = -288608, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["coalitionId"] = 2, - ["livery_id"] = "usaf standard", - ["skill"] = "High", - ["category"] = "plane", - ["unitName"] = "USA air 1 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000062, - ["groupName"] = "USA air 1", - ["speed"] = 138.82033106075, - ["countryId"] = 2, - ["x"] = -288608, - ["coalition"] = "blue", - ["y"] = 682741, - ["country"] = "usa", - ["type"] = "B-52H", - ["unitId"] = 7009, - ["callsign"] = - { - [1] = 4, - [2] = 1, - [3] = 1, - ["name"] = "Colt11", - }, -- end of ["callsign"] - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["radioSet"] = false, - ["timeAdded"] = 43220.99, - ["category"] = "plane", - ["coalition"] = "blue", - ["startTime"] = 0, - ["task"] = "Ground Attack", - ["uncontrolled"] = false, - }, -- end of [1000062] - [1000078] = - { - ["country"] = "australia", - ["coalitionId"] = 0, - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 0, - ["point"] = - { - ["y"] = 267963, - ["x"] = -165895, - }, -- end of ["point"] - ["coalitionId"] = 0, - ["skill"] = "Average", - ["category"] = "ship", - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000078, - ["groupName"] = "AUSTRALIA shp 3", - ["countryId"] = 21, - ["x"] = -165895, - ["y"] = 267963, - ["heading"] = 0, - ["country"] = "australia", - ["unitName"] = "AUSTRALIA shp 3 unit1", - ["unitId"] = 7033, - ["coalition"] = "neutral", - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 21, - ["name"] = "AUSTRALIA shp 3", - ["timeAdded"] = 43222.99, - ["category"] = "ship", - ["coalition"] = "neutral", - ["startTime"] = 0, - ["groupId"] = 1000078, - ["groupName"] = "AUSTRALIA shp 3", - }, -- end of [1000078] - [1000063] = - { - ["country"] = "australia", - ["groupName"] = "AUSTRALIA air 2", - ["modulation"] = 0, - ["groupId"] = 1000063, - ["coalitionId"] = 0, - ["name"] = "AUSTRALIA air 2", - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 1997, - ["point"] = - { - ["y"] = 319610, - ["x"] = -198571, - }, -- end of ["point"] - ["alt_type"] = "BARO", - ["coalitionId"] = 0, - ["livery_id"] = "Australian 75th Squadron", - ["skill"] = "High", - ["category"] = "plane", - ["unitName"] = "AUSTRALIA air 2 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000063, - ["groupName"] = "AUSTRALIA air 2", - ["speed"] = 180.44764340673, - ["countryId"] = 21, - ["x"] = -198571, - ["coalition"] = "neutral", - ["y"] = 319610, - ["country"] = "australia", - ["type"] = "FA-18C_hornet", - ["unitId"] = 7010, - ["callsign"] = - { - [1] = 1, - [2] = 1, - [3] = 1, - ["name"] = "Enfield11", - }, -- end of ["callsign"] - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 21, - ["radioSet"] = false, - ["timeAdded"] = 43220.99, - ["category"] = "plane", - ["coalition"] = "neutral", - ["startTime"] = 0, - ["task"] = "CAP", - ["uncontrolled"] = false, - }, -- end of [1000063] - [1000079] = - { - ["country"] = "usa", - ["coalitionId"] = 2, - ["groupId"] = 1000079, - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 61, - ["point"] = - { - ["y"] = 692747, - ["x"] = -287036, + ["y"] = 692769, + ["x"] = -287355, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287036, - ["y"] = 692747, - ["heading"] = 1.4977557703724, + ["x"] = -287355, + ["y"] = 692769, + ["heading"] = 1.4977557591357, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit1", ["unitId"] = 7034, @@ -3353,23 +2843,23 @@ groupsById = }, -- end of [1] [2] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692716, - ["x"] = -286920, + ["y"] = 692754, + ["x"] = -287476, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -286920, - ["y"] = 692716, - ["heading"] = 1.4977557703724, + ["x"] = -287476, + ["y"] = 692754, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit2", ["unitId"] = 7035, @@ -3377,23 +2867,23 @@ groupsById = }, -- end of [2] [3] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692580, - ["x"] = -287056, + ["y"] = 692726, + ["x"] = -287538, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287056, - ["y"] = 692580, - ["heading"] = 1.4977557642103, + ["x"] = -287538, + ["y"] = 692726, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit3", ["unitId"] = 7036, @@ -3401,23 +2891,23 @@ groupsById = }, -- end of [3] [4] = { - ["alt"] = 60, + ["alt"] = 59, ["point"] = { - ["y"] = 692752, - ["x"] = -287189, + ["y"] = 692766, + ["x"] = -287511, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287189, - ["y"] = 692752, - ["heading"] = 1.4977557678351, + ["x"] = -287511, + ["y"] = 692766, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit4", ["unitId"] = 7037, @@ -3426,14 +2916,68 @@ groupsById = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 7", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 7", - }, -- end of [1000079] - [1000064] = + }, -- end of [7022] + [7026] = + { + ["country"] = "usa", + ["groupName"] = "USA air 7", + ["modulation"] = 0, + ["groupId"] = 7026, + ["coalitionId"] = 2, + ["name"] = "USA air 7", + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 1997, + ["point"] = + { + ["y"] = 682727, + ["x"] = -288608, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["coalitionId"] = 2, + ["livery_id"] = "usaf standard", + ["skill"] = "High", + ["category"] = "plane", + ["unitName"] = "USA air 7 unit1", + ["heading"] = 1.6162179734619, + ["groupId"] = 7026, + ["groupName"] = "USA air 7", + ["speed"] = 138.85196364465, + ["countryId"] = 2, + ["x"] = -288608, + ["coalition"] = "blue", + ["y"] = 682727, + ["country"] = "usa", + ["type"] = "B-52H", + ["unitId"] = 7042, + ["callsign"] = + { + [1] = 4, + [2] = 1, + [3] = 1, + ["name"] = "Colt11", + }, -- end of ["callsign"] + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["radioSet"] = false, + ["timeAdded"] = 43223.79, + ["category"] = "plane", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Attack", + ["uncontrolled"] = false, + }, -- end of [7026] + [7007] = { ["country"] = "australia", ["coalitionId"] = 0, @@ -3445,10 +2989,11 @@ groupsById = ["alt"] = 0, ["point"] = { - ["y"] = 266228, - ["x"] = -161996, + ["y"] = 267081, + ["x"] = -164471, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 1 unit1", @@ -3456,341 +3001,29 @@ groupsById = ["unitId"] = 7011, ["groupName"] = "AUSTRALIA shp 1", ["countryId"] = 21, - ["x"] = -161996, + ["x"] = -164471, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000064, ["coalition"] = "neutral", - ["y"] = 266228, + ["type"] = "PERRY", + ["groupId"] = 7007, + ["y"] = 267081, ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 1", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000064, + ["groupId"] = 7007, ["groupName"] = "AUSTRALIA shp 1", - }, -- end of [1000064] - [7039] = - { - ["groupId"] = 7039, - ["coalitionId"] = 2, - ["hidden"] = false, - ["groupName"] = "USA static 8", - ["units"] = - { - [1] = - { - ["alt"] = 67, - ["point"] = - { - ["y"] = 691664, - ["x"] = -284503, - }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["coalitionId"] = 2, - ["mass"] = 1337, - ["category"] = "static", - ["unitName"] = "USA static 8", - ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", - ["country"] = "usa", - ["groupName"] = "USA static 8", - ["y"] = 691664, - ["x"] = -284503, - ["coalition"] = "blue", - ["unitId"] = 7039, - ["heading"] = 0, - ["countryId"] = 2, - ["groupId"] = 7039, - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["coalition"] = "blue", - ["timeAdded"] = 43223.99, - ["category"] = "static", - ["country"] = "usa", - ["startTime"] = 0, - ["name"] = "USA static 8", - ["uncontrolled"] = false, - }, -- end of [7039] - [1000065] = + }, -- end of [7007] + [7011] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000065, - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 60, - ["point"] = - { - ["y"] = 692171, - ["x"] = -286749, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286749, - ["y"] = 692171, - ["heading"] = 1.4977557591357, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit1", - ["unitId"] = 7012, - ["coalition"] = "blue", - }, -- end of [1] - [2] = - { - ["alt"] = 61, - ["point"] = - { - ["y"] = 692204, - ["x"] = -286580, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286580, - ["y"] = 692204, - ["heading"] = 1.4977557614918, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit2", - ["unitId"] = 7013, - ["coalition"] = "blue", - }, -- end of [2] - [3] = - { - ["alt"] = 61, - ["point"] = - { - ["y"] = 692150, - ["x"] = -286560, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286560, - ["y"] = 692150, - ["heading"] = 1.4977557614918, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit3", - ["unitId"] = 7014, - ["coalition"] = "blue", - }, -- end of [3] - [4] = - { - ["alt"] = 60, - ["point"] = - { - ["y"] = 691995, - ["x"] = -286713, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286713, - ["y"] = 691995, - ["heading"] = 1.4977557627604, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit4", - ["unitId"] = 7015, - ["coalition"] = "blue", - }, -- end of [4] - }, -- end of ["units"] - ["countryId"] = 2, - ["name"] = "USA gnd 3", - ["timeAdded"] = 43221.99, - ["category"] = "vehicle", - ["coalition"] = "blue", - ["startTime"] = 0, - ["task"] = "Ground Nothing", - ["groupName"] = "USA gnd 3", - }, -- end of [1000065] - [7016] = - { - ["groupId"] = 7016, - ["coalitionId"] = 2, - ["hidden"] = false, - ["groupName"] = "USA static 3", - ["units"] = - { - [1] = - { - ["alt"] = 60, - ["type"] = "Sandbox", - ["point"] = - { - ["y"] = 691139, - ["x"] = -286038, - }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 691139, - ["groupName"] = "USA static 3", - ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -286038, - ["coalition"] = "blue", - ["category"] = "static", - ["unitName"] = "USA static 3", - ["unitId"] = 7016, - ["heading"] = 0, - ["groupId"] = 7016, - }, -- end of [1] - }, -- end of ["units"] - ["countryId"] = 2, - ["coalition"] = "blue", - ["timeAdded"] = 43221.99, - ["category"] = "static", - ["country"] = "usa", - ["startTime"] = 0, - ["name"] = "USA static 3", - ["uncontrolled"] = false, - }, -- end of [7016] - [1000072] = - { - ["country"] = "usa", - ["coalitionId"] = 2, - ["groupId"] = 1000072, - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 55, - ["point"] = - { - ["y"] = 692563, - ["x"] = -288904, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, - ["groupName"] = "USA gnd 5", - ["countryId"] = 2, - ["x"] = -288904, - ["y"] = 692563, - ["heading"] = 1.4977557725472, - ["country"] = "usa", - ["unitName"] = "USA gnd 5 unit1", - ["unitId"] = 7023, - ["coalition"] = "blue", - }, -- end of [1] - [2] = - { - ["alt"] = 56, - ["point"] = - { - ["y"] = 692623, - ["x"] = -288844, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, - ["groupName"] = "USA gnd 5", - ["countryId"] = 2, - ["x"] = -288844, - ["y"] = 692623, - ["heading"] = 1.4977557660227, - ["country"] = "usa", - ["unitName"] = "USA gnd 5 unit2", - ["unitId"] = 7024, - ["coalition"] = "blue", - }, -- end of [2] - [3] = - { - ["alt"] = 55, - ["point"] = - { - ["y"] = 692459, - ["x"] = -288865, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, - ["groupName"] = "USA gnd 5", - ["countryId"] = 2, - ["x"] = -288865, - ["y"] = 692459, - ["heading"] = 1.4977557638479, - ["country"] = "usa", - ["unitName"] = "USA gnd 5 unit3", - ["unitId"] = 7025, - ["coalition"] = "blue", - }, -- end of [3] - [4] = - { - ["alt"] = 55, - ["point"] = - { - ["y"] = 692675, - ["x"] = -289069, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, - ["groupName"] = "USA gnd 5", - ["countryId"] = 2, - ["x"] = -289069, - ["y"] = 692675, - ["heading"] = 1.4977557685601, - ["country"] = "usa", - ["unitName"] = "USA gnd 5 unit4", - ["unitId"] = 7026, - ["coalition"] = "blue", - }, -- end of [4] - }, -- end of ["units"] - ["countryId"] = 2, - ["name"] = "USA gnd 5", - ["timeAdded"] = 43222.99, - ["category"] = "vehicle", - ["coalition"] = "blue", - ["startTime"] = 0, - ["task"] = "Ground Nothing", - ["groupName"] = "USA gnd 5", - }, -- end of [1000072] - [1000068] = - { - ["country"] = "usa", - ["coalitionId"] = 2, - ["groupId"] = 1000068, + ["groupId"] = 7011, ["hidden"] = false, ["units"] = { @@ -3807,7 +3040,7 @@ groupsById = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286407, @@ -3831,7 +3064,7 @@ groupsById = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286447, @@ -3845,11 +3078,646 @@ groupsById = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 4", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 4", - }, -- end of [1000068] + }, -- end of [7011] + [7015] = + { + ["country"] = "usa", + ["coalitionId"] = 2, + ["groupId"] = 7015, + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 73, + ["point"] = + { + ["y"] = 691751, + ["x"] = -283221, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7015, + ["groupName"] = "USA gnd 5", + ["countryId"] = 2, + ["x"] = -283221, + ["y"] = 691751, + ["heading"] = 1.4977557703725, + ["country"] = "usa", + ["unitName"] = "USA gnd 5 unit1", + ["unitId"] = 7023, + ["coalition"] = "blue", + }, -- end of [1] + [2] = + { + ["alt"] = 74, + ["point"] = + { + ["y"] = 691898, + ["x"] = -283194, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7015, + ["groupName"] = "USA gnd 5", + ["countryId"] = 2, + ["x"] = -283194, + ["y"] = 691898, + ["heading"] = 1.4977557634854, + ["country"] = "usa", + ["unitName"] = "USA gnd 5 unit2", + ["unitId"] = 7024, + ["coalition"] = "blue", + }, -- end of [2] + [3] = + { + ["alt"] = 72, + ["point"] = + { + ["y"] = 691826, + ["x"] = -283357, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7015, + ["groupName"] = "USA gnd 5", + ["countryId"] = 2, + ["x"] = -283357, + ["y"] = 691826, + ["heading"] = 1.4977557538798, + ["country"] = "usa", + ["unitName"] = "USA gnd 5 unit3", + ["unitId"] = 7025, + ["coalition"] = "blue", + }, -- end of [3] + [4] = + { + ["alt"] = 72, + ["point"] = + { + ["y"] = 691852, + ["x"] = -283362, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7015, + ["groupName"] = "USA gnd 5", + ["countryId"] = 2, + ["x"] = -283362, + ["y"] = 691852, + ["heading"] = 1.4977557720036, + ["country"] = "usa", + ["unitName"] = "USA gnd 5 unit4", + ["unitId"] = 7026, + ["coalition"] = "blue", + }, -- end of [4] + }, -- end of ["units"] + ["countryId"] = 2, + ["name"] = "USA gnd 5", + ["timeAdded"] = 43222.79, + ["category"] = "vehicle", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Nothing", + ["groupName"] = "USA gnd 5", + }, -- end of [7015] + [7019] = + { + ["country"] = "usa", + ["groupName"] = "USA air 5", + ["modulation"] = 0, + ["groupId"] = 7019, + ["coalitionId"] = 2, + ["name"] = "USA air 5", + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 1997, + ["point"] = + { + ["y"] = 682727, + ["x"] = -288608, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["coalitionId"] = 2, + ["livery_id"] = "usaf standard", + ["skill"] = "High", + ["category"] = "plane", + ["unitName"] = "USA air 5 unit1", + ["heading"] = 1.6162179734619, + ["groupId"] = 7019, + ["groupName"] = "USA air 5", + ["speed"] = 138.85196364465, + ["countryId"] = 2, + ["x"] = -288608, + ["coalition"] = "blue", + ["y"] = 682727, + ["country"] = "usa", + ["type"] = "B-52H", + ["unitId"] = 7031, + ["callsign"] = + { + [1] = 4, + [2] = 1, + [3] = 1, + ["name"] = "Colt11", + }, -- end of ["callsign"] + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["radioSet"] = false, + ["timeAdded"] = 43222.79, + ["category"] = "plane", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Attack", + ["uncontrolled"] = false, + }, -- end of [7019] + [7027] = + { + ["country"] = "australia", + ["groupName"] = "AUSTRALIA air 8", + ["modulation"] = 0, + ["groupId"] = 7027, + ["coalitionId"] = 0, + ["name"] = "AUSTRALIA air 8", + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 1998, + ["point"] = + { + ["y"] = 319595, + ["x"] = -198560, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["coalitionId"] = 0, + ["livery_id"] = "Australian 75th Squadron", + ["skill"] = "High", + ["category"] = "plane", + ["unitName"] = "AUSTRALIA air 8 unit1", + ["heading"] = 2.1995924992708, + ["groupId"] = 7027, + ["groupName"] = "AUSTRALIA air 8", + ["speed"] = 180.49294253728, + ["countryId"] = 21, + ["x"] = -198560, + ["coalition"] = "neutral", + ["y"] = 319595, + ["country"] = "australia", + ["type"] = "FA-18C_hornet", + ["unitId"] = 7043, + ["callsign"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + ["name"] = "Enfield11", + }, -- end of ["callsign"] + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 21, + ["radioSet"] = false, + ["timeAdded"] = 43223.79, + ["category"] = "plane", + ["coalition"] = "neutral", + ["startTime"] = 0, + ["task"] = "CAP", + ["uncontrolled"] = false, + }, -- end of [7027] + [7038] = + { + ["groupId"] = 7038, + ["coalitionId"] = 2, + ["hidden"] = false, + ["groupName"] = "USA static 7", + ["units"] = + { + [1] = + { + ["alt"] = 56, + ["type"] = "Sandbox", + ["point"] = + { + ["y"] = 691971, + ["x"] = -288088, + }, -- end of ["point"] + ["country"] = "usa", + ["coalitionId"] = 2, + ["coalition"] = "blue", + ["groupName"] = "USA static 7", + ["unitId"] = 7038, + ["y"] = 691971, + ["x"] = -288088, + ["countryId"] = 2, + ["category"] = "static", + ["unitName"] = "USA static 7", + ["groupId"] = 7038, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["coalition"] = "blue", + ["timeAdded"] = 43223.79, + ["category"] = "static", + ["country"] = "usa", + ["startTime"] = 0, + ["name"] = "USA static 7", + ["uncontrolled"] = false, + }, -- end of [7038] + [7004] = + { + ["country"] = "usa", + ["coalitionId"] = 2, + ["groupId"] = 7004, + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 48, + ["point"] = + { + ["y"] = 686871, + ["x"] = -286407, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["unitName"] = "USA gnd 2 unit1", + ["heading"] = 0, + ["unitId"] = 7007, + ["groupName"] = "USA gnd 2", + ["countryId"] = 2, + ["x"] = -286407, + ["speed"] = 0, + ["type"] = "M-113", + ["groupId"] = 7004, + ["coalition"] = "blue", + ["y"] = 686871, + ["country"] = "usa", + }, -- end of [1] + [2] = + { + ["alt"] = 48, + ["point"] = + { + ["y"] = 686871, + ["x"] = -286447, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["unitName"] = "USA gnd 2 unit2", + ["heading"] = 0, + ["unitId"] = 7008, + ["groupName"] = "USA gnd 2", + ["countryId"] = 2, + ["x"] = -286447, + ["speed"] = 0, + ["type"] = "M-113", + ["groupId"] = 7004, + ["coalition"] = "blue", + ["y"] = 686871, + ["country"] = "usa", + }, -- end of [2] + }, -- end of ["units"] + ["countryId"] = 2, + ["name"] = "USA gnd 2", + ["timeAdded"] = 43220.79, + ["category"] = "vehicle", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Nothing", + ["groupName"] = "USA gnd 2", + }, -- end of [7004] + [7008] = + { + ["country"] = "usa", + ["coalitionId"] = 2, + ["groupId"] = 7008, + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 690419, + ["x"] = -284972, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -284972, + ["y"] = 690419, + ["heading"] = 1.4977557640291, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit1", + ["unitId"] = 7012, + ["coalition"] = "blue", + }, -- end of [1] + [2] = + { + ["alt"] = 63, + ["point"] = + { + ["y"] = 690558, + ["x"] = -284846, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -284846, + ["y"] = 690558, + ["heading"] = 1.4977557580482, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit2", + ["unitId"] = 7013, + ["coalition"] = "blue", + }, -- end of [2] + [3] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 690360, + ["x"] = -285032, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -285032, + ["y"] = 690360, + ["heading"] = 1.4977557565984, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit3", + ["unitId"] = 7014, + ["coalition"] = "blue", + }, -- end of [3] + [4] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 690314, + ["x"] = -284956, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -284956, + ["y"] = 690314, + ["heading"] = 1.497755755511, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit4", + ["unitId"] = 7015, + ["coalition"] = "blue", + }, -- end of [4] + }, -- end of ["units"] + ["countryId"] = 2, + ["name"] = "USA gnd 3", + ["timeAdded"] = 43221.79, + ["category"] = "vehicle", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Nothing", + ["groupName"] = "USA gnd 3", + }, -- end of [7008] + [7012] = + { + ["country"] = "usa", + ["groupName"] = "USA air 3", + ["modulation"] = 0, + ["groupId"] = 7012, + ["coalitionId"] = 2, + ["name"] = "USA air 3", + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 1997, + ["point"] = + { + ["y"] = 682727, + ["x"] = -288608, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["coalitionId"] = 2, + ["livery_id"] = "usaf standard", + ["skill"] = "High", + ["category"] = "plane", + ["unitName"] = "USA air 3 unit1", + ["heading"] = 1.6162179734619, + ["groupId"] = 7012, + ["groupName"] = "USA air 3", + ["speed"] = 138.85196364465, + ["countryId"] = 2, + ["x"] = -288608, + ["coalition"] = "blue", + ["y"] = 682727, + ["country"] = "usa", + ["type"] = "B-52H", + ["unitId"] = 7020, + ["callsign"] = + { + [1] = 4, + [2] = 1, + [3] = 1, + ["name"] = "Colt11", + }, -- end of ["callsign"] + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["radioSet"] = false, + ["timeAdded"] = 43221.79, + ["category"] = "plane", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Attack", + ["uncontrolled"] = false, + }, -- end of [7012] + [7016] = + { + ["groupId"] = 7016, + ["coalitionId"] = 2, + ["hidden"] = false, + ["groupName"] = "USA static 3", + ["units"] = + { + [1] = + { + ["alt"] = 63, + ["type"] = "Sandbox", + ["point"] = + { + ["y"] = 692858, + ["x"] = -286636, + }, -- end of ["point"] + ["country"] = "usa", + ["coalitionId"] = 2, + ["coalition"] = "blue", + ["groupName"] = "USA static 3", + ["unitId"] = 7016, + ["y"] = 692858, + ["x"] = -286636, + ["countryId"] = 2, + ["category"] = "static", + ["unitName"] = "USA static 3", + ["groupId"] = 7016, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["coalition"] = "blue", + ["timeAdded"] = 43221.79, + ["category"] = "static", + ["country"] = "usa", + ["startTime"] = 0, + ["name"] = "USA static 3", + ["uncontrolled"] = false, + }, -- end of [7016] + [7020] = + { + ["country"] = "australia", + ["groupName"] = "AUSTRALIA air 6", + ["modulation"] = 0, + ["groupId"] = 7020, + ["coalitionId"] = 0, + ["name"] = "AUSTRALIA air 6", + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 1998, + ["point"] = + { + ["y"] = 319595, + ["x"] = -198560, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["coalitionId"] = 0, + ["livery_id"] = "Australian 75th Squadron", + ["skill"] = "High", + ["category"] = "plane", + ["unitName"] = "AUSTRALIA air 6 unit1", + ["heading"] = 2.1995924992708, + ["groupId"] = 7020, + ["groupName"] = "AUSTRALIA air 6", + ["speed"] = 180.49294253728, + ["countryId"] = 21, + ["x"] = -198560, + ["coalition"] = "neutral", + ["y"] = 319595, + ["country"] = "australia", + ["type"] = "FA-18C_hornet", + ["unitId"] = 7032, + ["callsign"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + ["name"] = "Enfield11", + }, -- end of ["callsign"] + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 21, + ["radioSet"] = false, + ["timeAdded"] = 43222.79, + ["category"] = "plane", + ["coalition"] = "neutral", + ["startTime"] = 0, + ["task"] = "CAP", + ["uncontrolled"] = false, + }, -- end of [7020] + [7039] = + { + ["groupId"] = 7039, + ["coalitionId"] = 2, + ["hidden"] = false, + ["groupName"] = "USA static 8", + ["units"] = + { + [1] = + { + ["alt"] = 63, + ["point"] = + { + ["y"] = 693814, + ["x"] = -287262, + }, -- end of ["point"] + ["categoryStatic"] = "Cargos", + ["coalitionId"] = 2, + ["mass"] = 1337, + ["category"] = "static", + ["unitName"] = "USA static 8", + ["shape_name"] = "ab-212_cargo", + ["type"] = "uh1h_cargo", + ["country"] = "usa", + ["groupName"] = "USA static 8", + ["y"] = 693814, + ["x"] = -287262, + ["coalition"] = "blue", + ["unitId"] = 7039, + ["heading"] = 0, + ["countryId"] = 2, + ["groupId"] = 7039, + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["coalition"] = "blue", + ["timeAdded"] = 43223.79, + ["category"] = "static", + ["country"] = "usa", + ["startTime"] = 0, + ["name"] = "USA static 8", + ["uncontrolled"] = false, + }, -- end of [7039] } -- end of groupsById diff --git a/Example DBs/mist_DBs_groupsByName.lua b/Example DBs/mist_DBs_groupsByName.lua index 6c91512..3d35283 100644 --- a/Example DBs/mist_DBs_groupsByName.lua +++ b/Example DBs/mist_DBs_groupsByName.lua @@ -10,11 +10,11 @@ groupsByName = { [1] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -25,8 +25,8 @@ groupsByName = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 4", - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, ["coalition"] = "blue", ["unitId"] = 7017, ["heading"] = 0, @@ -36,7 +36,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -104,7 +104,7 @@ groupsByName = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 8", ["modulation"] = 0, - ["groupId"] = 1000084, + ["groupId"] = 7027, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 8", ["hidden"] = false, @@ -112,11 +112,11 @@ groupsByName = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -124,14 +124,14 @@ groupsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 8 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000084, + ["heading"] = 2.1995924992708, + ["groupId"] = 7027, ["groupName"] = "AUSTRALIA air 8", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7043, @@ -146,7 +146,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -248,7 +248,7 @@ groupsByName = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 2", ["modulation"] = 0, - ["groupId"] = 1000063, + ["groupId"] = 7006, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 2", ["hidden"] = false, @@ -256,11 +256,11 @@ groupsByName = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -268,14 +268,14 @@ groupsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 2 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000063, + ["heading"] = 2.1995924992708, + ["groupId"] = 7006, ["groupName"] = "AUSTRALIA air 2", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7010, @@ -290,7 +290,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -343,25 +343,25 @@ groupsByName = [1] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 674842.85714285, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cloneCargoBase", - ["groupId"] = 32, - ["countryId"] = 2, - ["mass"] = 1337, ["unitId"] = 46, + ["groupName"] = "cloneCargoBase", + ["countryId"] = 2, + ["y"] = 674842.85714285, + ["mass"] = 1337, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 32, }, -- end of [1] }, -- end of ["units"] }, -- end of ["cloneCargoBase"] @@ -473,7 +473,7 @@ groupsByName = ["country"] = "usa", ["groupName"] = "USA air 5", ["modulation"] = 0, - ["groupId"] = 1000076, + ["groupId"] = 7019, ["coalitionId"] = 2, ["name"] = "USA air 5", ["hidden"] = false, @@ -481,10 +481,10 @@ groupsByName = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -493,14 +493,14 @@ groupsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 5 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000076, + ["heading"] = 1.6162179734619, + ["groupId"] = 7019, ["groupName"] = "USA air 5", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7031, @@ -515,7 +515,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, @@ -618,7 +618,7 @@ groupsByName = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 6", ["modulation"] = 0, - ["groupId"] = 1000077, + ["groupId"] = 7020, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 6", ["hidden"] = false, @@ -626,11 +626,11 @@ groupsByName = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -638,14 +638,14 @@ groupsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 6 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000077, + ["heading"] = 2.1995924992708, + ["groupId"] = 7020, ["groupName"] = "AUSTRALIA air 6", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7032, @@ -660,7 +660,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -929,25 +929,25 @@ groupsByName = { [1] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443856.28948724, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443856.28948724, ["x"] = -355322.45423175, - ["unitId"] = 63, + ["groupId"] = 40, ["category"] = "static", ["unitName"] = "static_on_ship1", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 40, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 63, }, -- end of [1] }, -- end of ["units"] }, -- end of ["static_on_ship1"] @@ -989,7 +989,7 @@ groupsByName = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000061, + ["groupId"] = 7004, ["hidden"] = false, ["units"] = { @@ -1012,7 +1012,7 @@ groupsByName = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -1036,7 +1036,7 @@ groupsByName = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -1044,7 +1044,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 2", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -1056,7 +1056,7 @@ groupsByName = ["country"] = "usa", ["groupName"] = "USA air 1", ["modulation"] = 0, - ["groupId"] = 1000062, + ["groupId"] = 7005, ["coalitionId"] = 2, ["name"] = "USA air 1", ["hidden"] = false, @@ -1064,10 +1064,10 @@ groupsByName = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1076,14 +1076,14 @@ groupsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 1 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000062, + ["heading"] = 1.6162179734619, + ["groupId"] = 7005, ["groupName"] = "USA air 1", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7009, @@ -1098,7 +1098,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, @@ -1115,31 +1115,31 @@ groupsByName = { [1] = { - ["alt"] = 61, + ["alt"] = 62, ["type"] = "Sandbox", ["point"] = { - ["y"] = 690788, - ["x"] = -285547, + ["y"] = 693698, + ["x"] = -287512, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 690788, - ["groupName"] = "USA static 1", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285547, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 1", + ["unitId"] = 7005, + ["y"] = 693698, + ["x"] = -287512, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 1", - ["unitId"] = 7005, - ["heading"] = 0, ["groupId"] = 7005, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1212,31 +1212,31 @@ groupsByName = { [1] = { - ["alt"] = 60, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 691139, - ["x"] = -286038, + ["y"] = 692858, + ["x"] = -286636, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 691139, - ["groupName"] = "USA static 3", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -286038, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 3", + ["unitId"] = 7016, + ["y"] = 692858, + ["x"] = -286636, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 3", - ["unitId"] = 7016, - ["heading"] = 0, ["groupId"] = 7016, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1255,10 +1255,11 @@ groupsByName = ["alt"] = 0, ["point"] = { - ["y"] = 266588, - ["x"] = -163302, + ["y"] = 267810, + ["x"] = -162283, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 2 unit1", @@ -1266,22 +1267,22 @@ groupsByName = ["unitId"] = 7022, ["groupName"] = "AUSTRALIA shp 2", ["countryId"] = 21, - ["x"] = -163302, + ["x"] = -162283, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000071, ["coalition"] = "neutral", - ["y"] = 266588, + ["type"] = "PERRY", + ["groupId"] = 7014, + ["y"] = 267810, ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 2", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000071, + ["groupId"] = 7014, ["groupName"] = "AUSTRALIA shp 2", }, -- end of ["AUSTRALIA shp 2"] ["AUSTRALIA shp 4"] = @@ -1296,10 +1297,11 @@ groupsByName = ["alt"] = 0, ["point"] = { - ["y"] = 268804, - ["x"] = -165342, + ["y"] = 265427, + ["x"] = -164284, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 4 unit1", @@ -1307,22 +1309,22 @@ groupsByName = ["unitId"] = 7044, ["groupName"] = "AUSTRALIA shp 4", ["countryId"] = 21, - ["x"] = -165342, + ["x"] = -164284, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000085, ["coalition"] = "neutral", - ["y"] = 268804, + ["type"] = "PERRY", + ["groupId"] = 7028, + ["y"] = 265427, ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 4", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000085, + ["groupId"] = 7028, ["groupName"] = "AUSTRALIA shp 4", }, -- end of ["AUSTRALIA shp 4"] ["USA static 6"] = @@ -1335,11 +1337,11 @@ groupsByName = { [1] = { - ["alt"] = 73, + ["alt"] = 62, ["point"] = { - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -1350,8 +1352,8 @@ groupsByName = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 6", - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, ["coalition"] = "blue", ["unitId"] = 7028, ["heading"] = 0, @@ -1361,7 +1363,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1390,6 +1392,9 @@ groupsByName = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, @@ -1401,7 +1406,6 @@ groupsByName = ["y"] = 636428.57142857, ["unitId"] = 11, ["heading"] = -0.67060113146646, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -1409,6 +1413,7 @@ groupsByName = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 6, }, -- end of [1] }, -- end of ["units"] @@ -1558,6 +1563,43 @@ groupsByName = }, -- end of [1] }, -- end of ["units"] }, -- end of ["tent #001"] + ["poly"] = + { + ["country"] = "usa", + ["groupName"] = "poly", + ["units"] = + { + [1] = + { + ["heading"] = 2.3261877017598, + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["groupId"] = 47, + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["groupName"] = "poly", + ["type"] = "AAV7", + ["countryId"] = 2, + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["country"] = "usa", + ["skill"] = "Average", + }, -- end of [1] + }, -- end of ["units"] + ["coalition"] = "blue", + ["groupId"] = 47, + ["category"] = "vehicle", + ["countryId"] = 2, + ["startTime"] = 0, + ["task"] = "Ground Nothing", + ["hidden"] = false, + }, -- end of ["poly"] ["RU Farp"] = { ["countryId"] = 0, @@ -1655,71 +1697,72 @@ groupsByName = { [1] = { - ["alt"] = 61, + ["alt"] = 56, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693155, - ["x"] = -287187, + ["y"] = 691971, + ["x"] = -288088, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693155, - ["groupName"] = "USA static 7", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -287187, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 7", + ["unitId"] = 7038, + ["y"] = 691971, + ["x"] = -288088, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 7", - ["unitId"] = 7038, - ["heading"] = 0, ["groupId"] = 7038, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, ["name"] = "USA static 7", ["uncontrolled"] = false, }, -- end of ["USA static 7"] - ["RuTent1"] = + ["cargoBob"] = { - ["countryId"] = 0, - ["groupId"] = 18, - ["country"] = "russia", - ["coalition"] = "red", + ["countryId"] = 2, + ["groupId"] = 31, + ["country"] = "usa", + ["coalition"] = "blue", ["category"] = "static", - ["groupName"] = "RuTent1", + ["groupName"] = "cargoBob", ["units"] = { [1] = { - ["shape_name"] = "PalatkaB", - ["type"] = "FARP Tent", + ["shape_name"] = "ab-212_cargo", + ["heading"] = 0, ["point"] = { - ["y"] = 617976.57142856, - ["x"] = -258649.71428571, + ["y"] = 675199.99999999, + ["x"] = -292007.14285714, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["y"] = 617976.57142856, - ["groupName"] = "RuTent1", - ["coalition"] = "red", - ["countryId"] = 0, - ["x"] = -258649.71428571, - ["groupId"] = 18, + ["country"] = "usa", + ["coalition"] = "blue", + ["unitId"] = 45, + ["groupName"] = "cargoBob", + ["countryId"] = 2, + ["y"] = 675199.99999999, + ["mass"] = 371, + ["categoryStatic"] = "Cargos", ["category"] = "static", - ["unitName"] = "RuTent1", - ["unitId"] = 40, - ["heading"] = 0, - ["country"] = "russia", + ["unitName"] = "cargoBob", + ["x"] = -292007.14285714, + ["type"] = "uh1h_cargo", + ["groupId"] = 31, }, -- end of [1] }, -- end of ["units"] - }, -- end of ["RuTent1"] + }, -- end of ["cargoBob"] ["gavinstack"] = { ["country"] = "usa", @@ -1870,29 +1913,29 @@ groupsByName = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000058, + ["groupId"] = 7001, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692663, - ["x"] = -286548, + ["y"] = 692292, + ["x"] = -284982, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286548, - ["y"] = 692663, - ["heading"] = 1.4977557600419, + ["x"] = -284982, + ["y"] = 692292, + ["heading"] = 1.4977557593169, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit1", ["unitId"] = 7001, @@ -1900,23 +1943,23 @@ groupsByName = }, -- end of [1] [2] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692678, - ["x"] = -286576, + ["y"] = 692208, + ["x"] = -284870, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286576, - ["y"] = 692678, - ["heading"] = 1.4977557629417, + ["x"] = -284870, + ["y"] = 692208, + ["heading"] = 1.4977557696476, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit2", ["unitId"] = 7002, @@ -1924,23 +1967,23 @@ groupsByName = }, -- end of [2] [3] = { - ["alt"] = 63, + ["alt"] = 68, ["point"] = { - ["y"] = 692774, - ["x"] = -286539, + ["y"] = 692374, + ["x"] = -284971, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286539, - ["y"] = 692774, - ["heading"] = 1.497755762398, + ["x"] = -284971, + ["y"] = 692374, + ["heading"] = 1.4977557676538, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit3", ["unitId"] = 7003, @@ -1948,23 +1991,23 @@ groupsByName = }, -- end of [3] [4] = { - ["alt"] = 62, + ["alt"] = 68, ["point"] = { - ["y"] = 692553, - ["x"] = -286525, + ["y"] = 692388, + ["x"] = -284932, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286525, - ["y"] = 692553, - ["heading"] = 1.4977557625792, + ["x"] = -284932, + ["y"] = 692388, + ["heading"] = 1.4977557602231, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit4", ["unitId"] = 7004, @@ -1973,48 +2016,47 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 1", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 1", }, -- end of ["USA gnd 1"] - ["cargoBob"] = + ["RuTent1"] = { - ["countryId"] = 2, - ["groupId"] = 31, - ["country"] = "usa", - ["coalition"] = "blue", + ["countryId"] = 0, + ["groupId"] = 18, + ["country"] = "russia", + ["coalition"] = "red", ["category"] = "static", - ["groupName"] = "cargoBob", + ["groupName"] = "RuTent1", ["units"] = { [1] = { - ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["shape_name"] = "PalatkaB", + ["type"] = "FARP Tent", ["point"] = { - ["y"] = 675199.99999999, - ["x"] = -292007.14285714, + ["y"] = 617976.57142856, + ["x"] = -258649.71428571, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 675199.99999999, - ["coalition"] = "blue", - ["groupName"] = "cargoBob", - ["groupId"] = 31, - ["countryId"] = 2, - ["mass"] = 371, - ["unitId"] = 45, + ["categoryStatic"] = "Fortifications", + ["y"] = 617976.57142856, + ["groupName"] = "RuTent1", + ["coalition"] = "red", + ["countryId"] = 0, + ["x"] = -258649.71428571, + ["groupId"] = 18, ["category"] = "static", - ["unitName"] = "cargoBob", - ["x"] = -292007.14285714, + ["unitName"] = "RuTent1", + ["unitId"] = 40, ["heading"] = 0, - ["country"] = "usa", + ["country"] = "russia", }, -- end of [1] }, -- end of ["units"] - }, -- end of ["cargoBob"] + }, -- end of ["RuTent1"] ["teleGroup"] = { ["country"] = "usa", @@ -2024,11 +2066,11 @@ groupsByName = { [1] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692389, - ["x"] = -287110, + ["y"] = 694968, + ["x"] = -285046, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2038,8 +2080,8 @@ groupsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287110, - ["y"] = 692389, + ["x"] = -285046, + ["y"] = 694968, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #002", @@ -2048,11 +2090,11 @@ groupsByName = }, -- end of [1] [2] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692345, - ["x"] = -286935, + ["y"] = 695126, + ["x"] = -285098, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2062,8 +2104,8 @@ groupsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286935, - ["y"] = 692345, + ["x"] = -285098, + ["y"] = 695126, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #003", @@ -2072,11 +2114,11 @@ groupsByName = }, -- end of [2] [3] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692308, - ["x"] = -287213, + ["y"] = 694892, + ["x"] = -285039, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2086,8 +2128,8 @@ groupsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287213, - ["y"] = 692308, + ["x"] = -285039, + ["y"] = 694892, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #004", @@ -2096,11 +2138,11 @@ groupsByName = }, -- end of [3] [4] = { - ["alt"] = 60, + ["alt"] = 75, ["point"] = { - ["y"] = 692321, - ["x"] = -286989, + ["y"] = 695084, + ["x"] = -284914, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2110,8 +2152,8 @@ groupsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286989, - ["y"] = 692321, + ["x"] = -284914, + ["y"] = 695084, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #005", @@ -2120,11 +2162,11 @@ groupsByName = }, -- end of [4] [5] = { - ["alt"] = 59, + ["alt"] = 73, ["point"] = { - ["y"] = 692297, - ["x"] = -287225, + ["y"] = 694985, + ["x"] = -285104, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2134,8 +2176,8 @@ groupsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287225, - ["y"] = 692297, + ["x"] = -285104, + ["y"] = 694985, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #006", @@ -2144,11 +2186,11 @@ groupsByName = }, -- end of [5] [6] = { - ["alt"] = 61, + ["alt"] = 74, ["point"] = { - ["y"] = 692445, - ["x"] = -287012, + ["y"] = 694877, + ["x"] = -285009, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2158,8 +2200,8 @@ groupsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287012, - ["y"] = 692445, + ["x"] = -285009, + ["y"] = 694877, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #007", @@ -2168,11 +2210,11 @@ groupsByName = }, -- end of [6] [7] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692311, - ["x"] = -287237, + ["y"] = 694952, + ["x"] = -284964, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2182,8 +2224,8 @@ groupsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287237, - ["y"] = 692311, + ["x"] = -284964, + ["y"] = 694952, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #008", @@ -2268,33 +2310,34 @@ groupsByName = ["alt"] = 0, ["point"] = { - ["y"] = 267963, - ["x"] = -165895, + ["y"] = 268107, + ["x"] = -163693, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000078, + ["unitName"] = "AUSTRALIA shp 3 unit1", + ["heading"] = 0, + ["unitId"] = 7033, ["groupName"] = "AUSTRALIA shp 3", ["countryId"] = 21, - ["x"] = -165895, - ["y"] = 267963, - ["heading"] = 0, - ["country"] = "australia", - ["unitName"] = "AUSTRALIA shp 3 unit1", - ["unitId"] = 7033, + ["x"] = -163693, + ["speed"] = 0, ["coalition"] = "neutral", + ["type"] = "PERRY", + ["groupId"] = 7021, + ["y"] = 268107, + ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 3", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000078, + ["groupId"] = 7021, ["groupName"] = "AUSTRALIA shp 3", }, -- end of ["AUSTRALIA shp 3"] ["cloneAir"] = @@ -2355,7 +2398,7 @@ groupsByName = ["country"] = "usa", ["groupName"] = "USA air 3", ["modulation"] = 0, - ["groupId"] = 1000069, + ["groupId"] = 7012, ["coalitionId"] = 2, ["name"] = "USA air 3", ["hidden"] = false, @@ -2363,10 +2406,10 @@ groupsByName = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -2375,14 +2418,14 @@ groupsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 3 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000069, + ["heading"] = 1.6162179734619, + ["groupId"] = 7012, ["groupName"] = "USA air 3", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7020, @@ -2397,7 +2440,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, @@ -2408,29 +2451,29 @@ groupsByName = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000079, + ["groupId"] = 7022, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692747, - ["x"] = -287036, + ["y"] = 692769, + ["x"] = -287355, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287036, - ["y"] = 692747, - ["heading"] = 1.4977557703724, + ["x"] = -287355, + ["y"] = 692769, + ["heading"] = 1.4977557591357, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit1", ["unitId"] = 7034, @@ -2438,23 +2481,23 @@ groupsByName = }, -- end of [1] [2] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692716, - ["x"] = -286920, + ["y"] = 692754, + ["x"] = -287476, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -286920, - ["y"] = 692716, - ["heading"] = 1.4977557703724, + ["x"] = -287476, + ["y"] = 692754, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit2", ["unitId"] = 7035, @@ -2462,23 +2505,23 @@ groupsByName = }, -- end of [2] [3] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692580, - ["x"] = -287056, + ["y"] = 692726, + ["x"] = -287538, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287056, - ["y"] = 692580, - ["heading"] = 1.4977557642103, + ["x"] = -287538, + ["y"] = 692726, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit3", ["unitId"] = 7036, @@ -2486,23 +2529,23 @@ groupsByName = }, -- end of [3] [4] = { - ["alt"] = 60, + ["alt"] = 59, ["point"] = { - ["y"] = 692752, - ["x"] = -287189, + ["y"] = 692766, + ["x"] = -287511, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287189, - ["y"] = 692752, - ["heading"] = 1.4977557678351, + ["x"] = -287511, + ["y"] = 692766, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit4", ["unitId"] = 7037, @@ -2511,7 +2554,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 7", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -2625,7 +2668,7 @@ groupsByName = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000082, + ["groupId"] = 7025, ["hidden"] = false, ["units"] = { @@ -2648,7 +2691,7 @@ groupsByName = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2672,7 +2715,7 @@ groupsByName = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2680,7 +2723,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 8", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -2697,31 +2740,31 @@ groupsByName = { [1] = { - ["alt"] = 69, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693432, - ["x"] = -285294, + ["y"] = 692897, + ["x"] = -286503, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693432, - ["groupName"] = "USA static 5", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285294, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 5", + ["unitId"] = 7027, + ["y"] = 692897, + ["x"] = -286503, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 5", - ["unitId"] = 7027, - ["heading"] = 0, ["groupId"] = 7027, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -2733,7 +2776,7 @@ groupsByName = ["country"] = "usa", ["groupName"] = "USA air 7", ["modulation"] = 0, - ["groupId"] = 1000083, + ["groupId"] = 7026, ["coalitionId"] = 2, ["name"] = "USA air 7", ["hidden"] = false, @@ -2741,10 +2784,10 @@ groupsByName = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -2753,14 +2796,14 @@ groupsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 7 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000083, + ["heading"] = 1.6162179734619, + ["groupId"] = 7026, ["groupName"] = "USA air 7", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7042, @@ -2775,7 +2818,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, @@ -2787,7 +2830,7 @@ groupsByName = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 4", ["modulation"] = 0, - ["groupId"] = 1000070, + ["groupId"] = 7013, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 4", ["hidden"] = false, @@ -2795,11 +2838,11 @@ groupsByName = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -2807,14 +2850,14 @@ groupsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 4 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000070, + ["heading"] = 2.1995924992708, + ["groupId"] = 7013, ["groupName"] = "AUSTRALIA air 4", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7021, @@ -2829,7 +2872,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -2840,7 +2883,7 @@ groupsByName = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000075, + ["groupId"] = 7018, ["hidden"] = false, ["units"] = { @@ -2863,7 +2906,7 @@ groupsByName = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2887,7 +2930,7 @@ groupsByName = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2895,154 +2938,40 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 6", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 6", }, -- end of ["USA gnd 6"] - ["USA gnd 3"] = - { - ["country"] = "usa", - ["coalitionId"] = 2, - ["groupId"] = 1000065, - ["hidden"] = false, - ["units"] = - { - [1] = - { - ["alt"] = 60, - ["point"] = - { - ["y"] = 692171, - ["x"] = -286749, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286749, - ["y"] = 692171, - ["heading"] = 1.4977557591357, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit1", - ["unitId"] = 7012, - ["coalition"] = "blue", - }, -- end of [1] - [2] = - { - ["alt"] = 61, - ["point"] = - { - ["y"] = 692204, - ["x"] = -286580, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286580, - ["y"] = 692204, - ["heading"] = 1.4977557614918, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit2", - ["unitId"] = 7013, - ["coalition"] = "blue", - }, -- end of [2] - [3] = - { - ["alt"] = 61, - ["point"] = - { - ["y"] = 692150, - ["x"] = -286560, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286560, - ["y"] = 692150, - ["heading"] = 1.4977557614918, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit3", - ["unitId"] = 7014, - ["coalition"] = "blue", - }, -- end of [3] - [4] = - { - ["alt"] = 60, - ["point"] = - { - ["y"] = 691995, - ["x"] = -286713, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286713, - ["y"] = 691995, - ["heading"] = 1.4977557627604, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit4", - ["unitId"] = 7015, - ["coalition"] = "blue", - }, -- end of [4] - }, -- end of ["units"] - ["countryId"] = 2, - ["name"] = "USA gnd 3", - ["timeAdded"] = 43221.99, - ["category"] = "vehicle", - ["coalition"] = "blue", - ["startTime"] = 0, - ["task"] = "Ground Nothing", - ["groupName"] = "USA gnd 3", - }, -- end of ["USA gnd 3"] ["USA gnd 5"] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000072, + ["groupId"] = 7015, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 55, + ["alt"] = 73, ["point"] = { - ["y"] = 692563, - ["x"] = -288904, + ["y"] = 691751, + ["x"] = -283221, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288904, - ["y"] = 692563, - ["heading"] = 1.4977557725472, + ["x"] = -283221, + ["y"] = 691751, + ["heading"] = 1.4977557703725, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit1", ["unitId"] = 7023, @@ -3050,23 +2979,23 @@ groupsByName = }, -- end of [1] [2] = { - ["alt"] = 56, + ["alt"] = 74, ["point"] = { - ["y"] = 692623, - ["x"] = -288844, + ["y"] = 691898, + ["x"] = -283194, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288844, - ["y"] = 692623, - ["heading"] = 1.4977557660227, + ["x"] = -283194, + ["y"] = 691898, + ["heading"] = 1.4977557634854, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit2", ["unitId"] = 7024, @@ -3074,23 +3003,23 @@ groupsByName = }, -- end of [2] [3] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692459, - ["x"] = -288865, + ["y"] = 691826, + ["x"] = -283357, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288865, - ["y"] = 692459, - ["heading"] = 1.4977557638479, + ["x"] = -283357, + ["y"] = 691826, + ["heading"] = 1.4977557538798, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit3", ["unitId"] = 7025, @@ -3098,23 +3027,23 @@ groupsByName = }, -- end of [3] [4] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692675, - ["x"] = -289069, + ["y"] = 691852, + ["x"] = -283362, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -289069, - ["y"] = 692675, - ["heading"] = 1.4977557685601, + ["x"] = -283362, + ["y"] = 691852, + ["heading"] = 1.4977557720036, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit4", ["unitId"] = 7026, @@ -3123,7 +3052,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 5", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, @@ -3134,7 +3063,7 @@ groupsByName = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000068, + ["groupId"] = 7011, ["hidden"] = false, ["units"] = { @@ -3151,7 +3080,7 @@ groupsByName = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286407, @@ -3175,7 +3104,7 @@ groupsByName = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286447, @@ -3189,13 +3118,127 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 4", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 4", }, -- end of ["USA gnd 4"] + ["USA gnd 3"] = + { + ["country"] = "usa", + ["coalitionId"] = 2, + ["groupId"] = 7008, + ["hidden"] = false, + ["units"] = + { + [1] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 690419, + ["x"] = -284972, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -284972, + ["y"] = 690419, + ["heading"] = 1.4977557640291, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit1", + ["unitId"] = 7012, + ["coalition"] = "blue", + }, -- end of [1] + [2] = + { + ["alt"] = 63, + ["point"] = + { + ["y"] = 690558, + ["x"] = -284846, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -284846, + ["y"] = 690558, + ["heading"] = 1.4977557580482, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit2", + ["unitId"] = 7013, + ["coalition"] = "blue", + }, -- end of [2] + [3] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 690360, + ["x"] = -285032, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -285032, + ["y"] = 690360, + ["heading"] = 1.4977557565984, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit3", + ["unitId"] = 7014, + ["coalition"] = "blue", + }, -- end of [3] + [4] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 690314, + ["x"] = -284956, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -284956, + ["y"] = 690314, + ["heading"] = 1.497755755511, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit4", + ["unitId"] = 7015, + ["coalition"] = "blue", + }, -- end of [4] + }, -- end of ["units"] + ["countryId"] = 2, + ["name"] = "USA gnd 3", + ["timeAdded"] = 43221.79, + ["category"] = "vehicle", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Nothing", + ["groupName"] = "USA gnd 3", + }, -- end of ["USA gnd 3"] ["perry"] = { ["groupId"] = 44, @@ -3246,8 +3289,8 @@ groupsByName = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -3256,15 +3299,15 @@ groupsByName = ["speed"] = 44.444444444444, ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["unitName"] = "Rotary-1-1", ["groupName"] = "nH", ["coalition"] = "neutral", ["countryId"] = 21, - ["x"] = -155967.80633993, - ["y"] = 405888.85058741, + ["x"] = -158700.87914814, + ["y"] = 404406.46136648, ["unitId"] = 68, - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["skill"] = "High", ["callsign"] = { @@ -3395,6 +3438,9 @@ groupsByName = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, @@ -3406,7 +3452,6 @@ groupsByName = ["y"] = 644428.57142857, ["unitId"] = 12, ["heading"] = -0.66079849060746, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -3414,6 +3459,7 @@ groupsByName = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 7, }, -- end of [1] }, -- end of ["units"] @@ -3438,10 +3484,11 @@ groupsByName = ["alt"] = 0, ["point"] = { - ["y"] = 266228, - ["x"] = -161996, + ["y"] = 267081, + ["x"] = -164471, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 1 unit1", @@ -3449,22 +3496,22 @@ groupsByName = ["unitId"] = 7011, ["groupName"] = "AUSTRALIA shp 1", ["countryId"] = 21, - ["x"] = -161996, + ["x"] = -164471, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000064, ["coalition"] = "neutral", - ["y"] = 266228, + ["type"] = "PERRY", + ["groupId"] = 7007, + ["y"] = 267081, ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 1", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000064, + ["groupId"] = 7007, ["groupName"] = "AUSTRALIA shp 1", }, -- end of ["AUSTRALIA shp 1"] ["static_on_ship1 #001"] = @@ -3479,25 +3526,25 @@ groupsByName = { [1] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443849.03844635, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443849.03844635, ["x"] = -355322.27295572, - ["unitId"] = 64, + ["groupId"] = 41, ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 41, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 64, }, -- end of [1] }, -- end of ["units"] }, -- end of ["static_on_ship1 #001"] @@ -3776,11 +3823,11 @@ groupsByName = { [1] = { - ["alt"] = 67, + ["alt"] = 63, ["point"] = { - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -3791,8 +3838,8 @@ groupsByName = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 8", - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, ["coalition"] = "blue", ["unitId"] = 7039, ["heading"] = 0, @@ -3802,7 +3849,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -3819,11 +3866,11 @@ groupsByName = { [1] = { - ["alt"] = 72, + ["alt"] = 57, ["point"] = { - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -3834,8 +3881,8 @@ groupsByName = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 2", - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, ["coalition"] = "blue", ["unitId"] = 7006, ["heading"] = 0, @@ -3845,7 +3892,7 @@ groupsByName = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, diff --git a/Example DBs/mist_DBs_humansById.lua b/Example DBs/mist_DBs_humansById.lua index 9f2d7e3..cc85391 100644 --- a/Example DBs/mist_DBs_humansById.lua +++ b/Example DBs/mist_DBs_humansById.lua @@ -13,6 +13,9 @@ humansById = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, @@ -24,7 +27,6 @@ humansById = ["y"] = 636428.57142857, ["unitId"] = 11, ["heading"] = -0.67060113146646, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -32,6 +34,7 @@ humansById = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 6, }, -- end of [11] [8] = @@ -115,6 +118,9 @@ humansById = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, @@ -126,7 +132,6 @@ humansById = ["y"] = 644428.57142857, ["unitId"] = 12, ["heading"] = -0.66079849060746, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -134,6 +139,7 @@ humansById = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 7, }, -- end of [12] [48] = diff --git a/Example DBs/mist_DBs_humansByName.lua b/Example DBs/mist_DBs_humansByName.lua index f320134..38b061d 100644 --- a/Example DBs/mist_DBs_humansByName.lua +++ b/Example DBs/mist_DBs_humansByName.lua @@ -109,6 +109,9 @@ humansByName = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, @@ -120,7 +123,6 @@ humansByName = ["y"] = 636428.57142857, ["unitId"] = 11, ["heading"] = -0.67060113146646, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -128,6 +130,7 @@ humansByName = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 6, }, -- end of ["A-10C Client #1_unit"] ["Su-33 Client #2Unit"] = @@ -171,6 +174,9 @@ humansByName = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, @@ -182,7 +188,6 @@ humansByName = ["y"] = 644428.57142857, ["unitId"] = 12, ["heading"] = -0.66079849060746, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -190,6 +195,7 @@ humansByName = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 7, }, -- end of ["A-10C Client #2_unit"] ["Su-33 Client #1Unit"] = diff --git a/Example DBs/mist_DBs_markList.lua b/Example DBs/mist_DBs_markList.lua new file mode 100644 index 0000000..1c9641e --- /dev/null +++ b/Example DBs/mist_DBs_markList.lua @@ -0,0 +1,334 @@ +markList = +{ + [1000] = + { + ["markId"] = 1000, + ["radius"] = 500, + ["color"] = + { + [1] = 0.9, + [2] = 0.9, + [3] = 0.9, + [4] = 0.5, + }, -- end of ["color"] + ["text"] = "", + ["readOnly"] = true, + ["coa"] = -1, + ["time"] = 2.801, + ["markType"] = "freeform", + ["lineType"] = 2, + ["fillColor"] = + { + [1] = 0.1, + [2] = 0.1, + [3] = 0.1, + [4] = 0.5, + }, -- end of ["fillColor"] + ["pos"] = + { + [1] = + { + ["y"] = 0, + ["x"] = -244729.2581753, + ["z"] = 185783.38833846, + }, -- end of [1] + [2] = + { + ["y"] = 0, + ["x"] = -355273.20683008, + ["z"] = 303168.81915755, + }, -- end of [2] + [3] = + { + ["y"] = 0, + ["x"] = -307022.75367132, + ["z"] = 433877.1362966, + }, -- end of [3] + [4] = + { + ["y"] = 0, + ["x"] = -250850.5843223, + ["z"] = 521376.09239795, + }, -- end of [4] + [5] = + { + ["y"] = 0, + ["x"] = -208001.30129325, + ["z"] = 429196.12218418, + }, -- end of [5] + [6] = + { + ["y"] = 0, + ["x"] = -251930.81834825, + ["z"] = 344217.71214337, + }, -- end of [6] + [7] = + { + ["y"] = 0, + ["x"] = -172713.65644579, + ["z"] = 330534.74781476, + }, -- end of [7] + [8] = + { + ["y"] = 0, + ["x"] = -160471.00415178, + ["z"] = 230793.1394194, + }, -- end of [8] + }, -- end of ["pos"] + }, -- end of [1000] + [1002] = + { + ["markId"] = 1002, + ["radius"] = 3000, + ["color"] = + { + [1] = 0.9, + [2] = 0.9, + [3] = 0.9, + [4] = 0.5, + }, -- end of ["color"] + ["text"] = "", + ["readOnly"] = true, + ["coa"] = -1, + ["time"] = 2.801, + ["markType"] = "circle", + ["lineType"] = 2, + ["fillColor"] = + { + [1] = 0, + [2] = 0, + [3] = 1, + [4] = 0.5, + }, -- end of ["fillColor"] + ["pos"] = + { + ["y"] = 320.01031494141, + ["x"] = -52089.546875, + [1] = + { + ["y"] = 320.01031494141, + ["x"] = -52089.546875, + ["z"] = 707418.0625, + }, -- end of [1] + ["z"] = 707418.0625, + }, -- end of ["pos"] + }, -- end of [1002] + [1004] = + { + ["markId"] = 1004, + ["radius"] = 3000, + ["color"] = + { + [1] = 0.9, + [2] = 0.9, + [3] = 0.9, + [4] = 0.5, + }, -- end of ["color"] + ["text"] = "", + ["readOnly"] = true, + ["coa"] = -1, + ["time"] = 2.801, + ["markType"] = "circle", + ["lineType"] = 2, + ["fillColor"] = + { + [1] = 0, + [2] = 0, + [3] = 1, + [4] = 0.5, + }, -- end of ["fillColor"] + ["pos"] = + { + ["y"] = 0, + ["x"] = -355264.17692343, + [1] = + { + ["y"] = 0, + ["x"] = -355264.17692343, + ["z"] = 443853.03125, + }, -- end of [1] + ["z"] = 443853.03125, + }, -- end of ["pos"] + }, -- end of [1004] + [1006] = + { + ["markId"] = 1006, + ["time"] = 2.801, + ["markType"] = "panel", + ["text"] = "Neutral : Cafe", + ["markScope"] = "all", + ["pos"] = + { + ["y"] = 0, + ["x"] = -115514.59796101, + ["z"] = 464123.689023, + }, -- end of ["pos"] + }, -- end of [1006] + [1008] = + { + ["markId"] = 1008, + ["time"] = 2.801, + ["markType"] = "panel", + ["text"] = "Neutral : M-113", + ["markScope"] = "all", + ["pos"] = + { + ["y"] = 0, + ["x"] = -146108.63642373, + ["z"] = 445199.91242668, + }, -- end of ["pos"] + }, -- end of [1008] + [1010] = + { + ["markId"] = 1010, + ["time"] = 2.801, + ["markType"] = "panel", + ["text"] = "Neutral : PERRY", + ["markScope"] = "all", + ["pos"] = + { + ["y"] = 0, + ["x"] = -153426.17965693, + ["z"] = 342754.30716193, + }, -- end of ["pos"] + }, -- end of [1010] + [1001] = + { + ["markId"] = 1001, + ["radius"] = 3000, + ["color"] = + { + [1] = 0.9, + [2] = 0.9, + [3] = 0.9, + [4] = 0.5, + }, -- end of ["color"] + ["text"] = "", + ["readOnly"] = true, + ["coa"] = -1, + ["time"] = 2.801, + ["markType"] = "circle", + ["lineType"] = 2, + ["fillColor"] = + { + [1] = 0, + [2] = 0, + [3] = 1, + [4] = 0.5, + }, -- end of ["fillColor"] + ["pos"] = + { + ["y"] = 21.01003074646, + ["x"] = -195650.515625, + [1] = + { + ["y"] = 21.01003074646, + ["x"] = -195650.515625, + ["z"] = 515898.75, + }, -- end of [1] + ["z"] = 515898.75, + }, -- end of ["pos"] + }, -- end of [1001] + [1003] = + { + ["markId"] = 1003, + ["radius"] = 3000, + ["color"] = + { + [1] = 0.9, + [2] = 0.9, + [3] = 0.9, + [4] = 0.5, + }, -- end of ["color"] + ["text"] = "", + ["readOnly"] = true, + ["coa"] = -1, + ["time"] = 2.801, + ["markType"] = "circle", + ["lineType"] = 2, + ["fillColor"] = + { + [1] = 0, + [2] = 0, + [3] = 1, + [4] = 0.5, + }, -- end of ["fillColor"] + ["pos"] = + { + ["y"] = 154.61184692383, + ["x"] = -83329.7890625, + [1] = + { + ["y"] = 154.61184692383, + ["x"] = -83329.7890625, + ["z"] = 835634.6875, + }, -- end of [1] + ["z"] = 835634.6875, + }, -- end of ["pos"] + }, -- end of [1003] + [1005] = + { + ["markId"] = 1005, + ["radius"] = 3000, + ["color"] = + { + [1] = 0.9, + [2] = 0.9, + [3] = 0.9, + [4] = 0.5, + }, -- end of ["color"] + ["text"] = "", + ["readOnly"] = true, + ["coa"] = -1, + ["time"] = 2.801, + ["markType"] = "circle", + ["lineType"] = 2, + ["fillColor"] = + { + [1] = 0, + [2] = 0, + [3] = 1, + [4] = 0.5, + }, -- end of ["fillColor"] + ["pos"] = + { + ["y"] = 0, + ["x"] = -356063.91153006, + [1] = + { + ["y"] = 0, + ["x"] = -356063.91153006, + ["z"] = 444653.03125, + }, -- end of [1] + ["z"] = 444653.03125, + }, -- end of ["pos"] + }, -- end of [1005] + [1007] = + { + ["markId"] = 1007, + ["time"] = 2.801, + ["markType"] = "panel", + ["text"] = "Neutral : FA-18C_hornet", + ["markScope"] = "all", + ["pos"] = + { + ["y"] = 0, + ["x"] = -198551.02959497, + ["z"] = 319582.08692347, + }, -- end of ["pos"] + }, -- end of [1007] + [1009] = + { + ["markId"] = 1009, + ["time"] = 2.801, + ["markType"] = "panel", + ["text"] = "Neutral : CH-47D", + ["markScope"] = "all", + ["pos"] = + { + ["y"] = 0, + ["x"] = -158700.87914814, + ["z"] = 404406.46136648, + }, -- end of ["pos"] + }, -- end of [1009] +} -- end of markList diff --git a/Example DBs/mist_DBs_missionData.lua b/Example DBs/mist_DBs_missionData.lua index 2e48933..1623ebc 100644 --- a/Example DBs/mist_DBs_missionData.lua +++ b/Example DBs/mist_DBs_missionData.lua @@ -1,6 +1,6 @@ missionData = { - ["version"] = 18, + ["version"] = 20, ["files"] = { }, -- end of ["files"] diff --git a/Example DBs/mist_DBs_navPoints.lua b/Example DBs/mist_DBs_navPoints.lua index 49421d6..e6a8adf 100644 --- a/Example DBs/mist_DBs_navPoints.lua +++ b/Example DBs/mist_DBs_navPoints.lua @@ -29,8 +29,8 @@ navPoints = }, -- end of [1] [2] = { - ["y"] = 659819.99999999, - ["x"] = -257614.28571428, + ["y"] = 663781.15649176, + ["x"] = -260714.32122958, ["name"] = "KB1SE", ["callsignStr"] = "KB1SE", ["id"] = 4, @@ -45,8 +45,8 @@ navPoints = ["point"] = { ["y"] = 0, - ["x"] = -257614.28571428, - ["z"] = 659819.99999999, + ["x"] = -260714.32122958, + ["z"] = 663781.15649176, }, -- end of ["point"] }, -- end of [2] [3] = @@ -73,8 +73,8 @@ navPoints = }, -- end of [3] [4] = { - ["y"] = 659248.57142856, - ["x"] = -243614.28571428, + ["y"] = 660970.8133815, + ["x"] = -244130.95830016, ["name"] = "KB1NE", ["callsignStr"] = "KB1NE", ["id"] = 6, @@ -89,8 +89,8 @@ navPoints = ["point"] = { ["y"] = 0, - ["x"] = -243614.28571428, - ["z"] = 659248.57142856, + ["x"] = -244130.95830016, + ["z"] = 660970.8133815, }, -- end of ["point"] }, -- end of [4] [5] = @@ -118,8 +118,8 @@ navPoints = }, -- end of [5] [6] = { - ["y"] = 670391.42857142, - ["x"] = -260757.14285714, + ["y"] = 674352.58506319, + ["x"] = -267473.88647362, ["name"] = "DODGE", ["callsignStr"] = "DODGE", ["id"] = 8, @@ -134,8 +134,8 @@ navPoints = ["point"] = { ["y"] = 0, - ["x"] = -260757.14285714, - ["z"] = 670391.42857142, + ["x"] = -267473.88647362, + ["z"] = 674352.58506319, }, -- end of ["point"] ["callsign"] = 3, }, -- end of [6] diff --git a/Example DBs/mist_DBs_removedAliveUnits.lua b/Example DBs/mist_DBs_removedAliveUnits.lua index d3f4003..d36d74a 100644 --- a/Example DBs/mist_DBs_removedAliveUnits.lua +++ b/Example DBs/mist_DBs_removedAliveUnits.lua @@ -96,38 +96,38 @@ removedAliveUnits = ["z"] = 681535.125, }, -- end of ["pos"] }, -- end of [16790016] - [16790272] = + [16782592] = { ["point"] = { - ["y"] = 681535.14285714, - ["x"] = -287156.85714286, + ["y"] = 654545.71428571, + ["x"] = -292842.85714286, }, -- end of ["point"] ["skill"] = "Average", ["unit"] = { - ["id_"] = 16790272, + ["id_"] = 16782592, }, -- end of ["unit"] ["category"] = "vehicle", - ["unitName"] = "Unit #008", - ["heading"] = 0, - ["unitId"] = 58, - ["groupName"] = "teleGroup", - ["countryId"] = 2, - ["coalition"] = "blue", - ["x"] = -287156.85714286, - ["type"] = "Hawk cwar", - ["groupId"] = 35, - ["country"] = "usa", + ["unitName"] = "RuBTRs1", + ["heading"] = -1.7994767003775, + ["unitId"] = 27, + ["groupName"] = "RuBTRs", + ["countryId"] = 0, + ["coalition"] = "red", + ["x"] = -292842.85714286, + ["type"] = "BTR-80", + ["groupId"] = 13, + ["country"] = "russia", ["playerCanDrive"] = true, - ["y"] = 681535.14285714, + ["y"] = 654545.71428571, ["pos"] = { - ["y"] = 34.752384185791, - ["x"] = -287156.84375, - ["z"] = 681535.125, + ["y"] = 11.754341371009, + ["x"] = -292856.19491841, + ["z"] = 654542.5822736, }, -- end of ["pos"] - }, -- end of [16790272] + }, -- end of [16782592] [16782848] = { ["point"] = @@ -155,9 +155,9 @@ removedAliveUnits = ["y"] = 654585.71428571, ["pos"] = { - ["y"] = 11.750775044011, - ["x"] = -292918.85355006, - ["z"] = 654583.32898538, + ["y"] = 11.835539878247, + ["x"] = -292898.99755273, + ["z"] = 654582.04906262, }, -- end of ["pos"] }, -- end of [16782848] [16783104] = @@ -187,43 +187,43 @@ removedAliveUnits = ["y"] = 654625.71428571, ["pos"] = { - ["y"] = 11.784134667198, - ["x"] = -292988.34774035, - ["z"] = 654626.95184203, + ["y"] = 11.931074299111, + ["x"] = -292941.20047403, + ["z"] = 654623.11353253, }, -- end of ["pos"] }, -- end of [16783104] - [16783360] = + [16783616] = { ["point"] = { - ["y"] = 654665.71428571, - ["x"] = -292962.85714286, + ["y"] = 654705.71428571, + ["x"] = -293002.85714286, }, -- end of ["point"] ["skill"] = "Average", ["unit"] = { - ["id_"] = 16783360, + ["id_"] = 16783616, }, -- end of ["unit"] ["category"] = "vehicle", - ["unitName"] = "RuBTRs4", + ["unitName"] = "RuBTRs5", ["heading"] = -1.7994767003775, - ["unitId"] = 30, + ["unitId"] = 31, ["groupName"] = "RuBTRs", ["countryId"] = 0, ["coalition"] = "red", - ["x"] = -292962.85714286, + ["x"] = -293002.85714286, ["type"] = "BTR-80", ["groupId"] = 13, ["country"] = "russia", ["playerCanDrive"] = true, - ["y"] = 654665.71428571, + ["y"] = 654705.71428571, ["pos"] = { - ["y"] = 12.104105100501, - ["x"] = -293040.29557322, - ["z"] = 654661.78361224, + ["y"] = 12.057955079325, + ["x"] = -293012.83464525, + ["z"] = 654701.02104299, }, -- end of ["pos"] - }, -- end of [16783360] + }, -- end of [16783616] [16788736] = { ["point"] = @@ -320,36 +320,36 @@ removedAliveUnits = ["z"] = 681535.125, }, -- end of ["pos"] }, -- end of [16789248] - [16782592] = + [16790272] = { ["point"] = { - ["y"] = 654545.71428571, - ["x"] = -292842.85714286, + ["y"] = 681535.14285714, + ["x"] = -287156.85714286, }, -- end of ["point"] ["skill"] = "Average", ["unit"] = { - ["id_"] = 16782592, + ["id_"] = 16790272, }, -- end of ["unit"] ["category"] = "vehicle", - ["unitName"] = "RuBTRs1", - ["heading"] = -1.7994767003775, - ["unitId"] = 27, - ["groupName"] = "RuBTRs", - ["countryId"] = 0, - ["coalition"] = "red", - ["x"] = -292842.85714286, - ["type"] = "BTR-80", - ["groupId"] = 13, - ["country"] = "russia", + ["unitName"] = "Unit #008", + ["heading"] = 0, + ["unitId"] = 58, + ["groupName"] = "teleGroup", + ["countryId"] = 2, + ["coalition"] = "blue", + ["x"] = -287156.85714286, + ["type"] = "Hawk cwar", + ["groupId"] = 35, + ["country"] = "usa", ["playerCanDrive"] = true, - ["y"] = 654545.71428571, + ["y"] = 681535.14285714, ["pos"] = { - ["y"] = 11.73456417819, - ["x"] = -292855.65589344, - ["z"] = 654539.4776362, + ["y"] = 34.752384185791, + ["x"] = -287156.84375, + ["z"] = 681535.125, }, -- end of ["pos"] - }, -- end of [16782592] + }, -- end of [16790272] } -- end of removedAliveUnits diff --git a/Example DBs/mist_DBs_units.lua b/Example DBs/mist_DBs_units.lua index 76abb3e..cb722ce 100644 --- a/Example DBs/mist_DBs_units.lua +++ b/Example DBs/mist_DBs_units.lua @@ -55,10 +55,11 @@ units = ["alt"] = 0, ["point"] = { - ["y"] = 266228, - ["x"] = -161996, + ["y"] = 267081, + ["x"] = -164471, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 1 unit1", @@ -66,22 +67,22 @@ units = ["unitId"] = 7011, ["groupName"] = "AUSTRALIA shp 1", ["countryId"] = 21, - ["x"] = -161996, + ["x"] = -164471, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000064, ["coalition"] = "neutral", - ["y"] = 266228, + ["type"] = "PERRY", + ["groupId"] = 7007, + ["y"] = 267081, ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 1", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000064, + ["groupId"] = 7007, ["groupName"] = "AUSTRALIA shp 1", }, -- end of [2] [3] = @@ -96,10 +97,11 @@ units = ["alt"] = 0, ["point"] = { - ["y"] = 266588, - ["x"] = -163302, + ["y"] = 267810, + ["x"] = -162283, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 2 unit1", @@ -107,22 +109,22 @@ units = ["unitId"] = 7022, ["groupName"] = "AUSTRALIA shp 2", ["countryId"] = 21, - ["x"] = -163302, + ["x"] = -162283, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000071, ["coalition"] = "neutral", - ["y"] = 266588, + ["type"] = "PERRY", + ["groupId"] = 7014, + ["y"] = 267810, ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 2", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000071, + ["groupId"] = 7014, ["groupName"] = "AUSTRALIA shp 2", }, -- end of [3] [4] = @@ -137,33 +139,34 @@ units = ["alt"] = 0, ["point"] = { - ["y"] = 267963, - ["x"] = -165895, + ["y"] = 268107, + ["x"] = -163693, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000078, + ["unitName"] = "AUSTRALIA shp 3 unit1", + ["heading"] = 0, + ["unitId"] = 7033, ["groupName"] = "AUSTRALIA shp 3", ["countryId"] = 21, - ["x"] = -165895, - ["y"] = 267963, - ["heading"] = 0, - ["country"] = "australia", - ["unitName"] = "AUSTRALIA shp 3 unit1", - ["unitId"] = 7033, + ["x"] = -163693, + ["speed"] = 0, ["coalition"] = "neutral", + ["type"] = "PERRY", + ["groupId"] = 7021, + ["y"] = 268107, + ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 3", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000078, + ["groupId"] = 7021, ["groupName"] = "AUSTRALIA shp 3", }, -- end of [4] [5] = @@ -178,10 +181,11 @@ units = ["alt"] = 0, ["point"] = { - ["y"] = 268804, - ["x"] = -165342, + ["y"] = 265427, + ["x"] = -164284, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 4 unit1", @@ -189,22 +193,22 @@ units = ["unitId"] = 7044, ["groupName"] = "AUSTRALIA shp 4", ["countryId"] = 21, - ["x"] = -165342, + ["x"] = -164284, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000085, ["coalition"] = "neutral", - ["y"] = 268804, + ["type"] = "PERRY", + ["groupId"] = 7028, + ["y"] = 265427, ["country"] = "australia", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 21, ["name"] = "AUSTRALIA shp 4", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "ship", ["coalition"] = "neutral", ["startTime"] = 0, - ["groupId"] = 1000085, + ["groupId"] = 7028, ["groupName"] = "AUSTRALIA shp 4", }, -- end of [5] }, -- end of ["ship"] @@ -348,7 +352,7 @@ units = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 2", ["modulation"] = 0, - ["groupId"] = 1000063, + ["groupId"] = 7006, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 2", ["hidden"] = false, @@ -356,11 +360,11 @@ units = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -368,14 +372,14 @@ units = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 2 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000063, + ["heading"] = 2.1995924992708, + ["groupId"] = 7006, ["groupName"] = "AUSTRALIA air 2", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7010, @@ -390,7 +394,7 @@ units = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -402,7 +406,7 @@ units = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 4", ["modulation"] = 0, - ["groupId"] = 1000070, + ["groupId"] = 7013, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 4", ["hidden"] = false, @@ -410,11 +414,11 @@ units = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -422,14 +426,14 @@ units = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 4 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000070, + ["heading"] = 2.1995924992708, + ["groupId"] = 7013, ["groupName"] = "AUSTRALIA air 4", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7021, @@ -444,7 +448,7 @@ units = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -456,7 +460,7 @@ units = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 6", ["modulation"] = 0, - ["groupId"] = 1000077, + ["groupId"] = 7020, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 6", ["hidden"] = false, @@ -464,11 +468,11 @@ units = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -476,14 +480,14 @@ units = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 6 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000077, + ["heading"] = 2.1995924992708, + ["groupId"] = 7020, ["groupName"] = "AUSTRALIA air 6", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7032, @@ -498,7 +502,7 @@ units = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -510,7 +514,7 @@ units = ["country"] = "australia", ["groupName"] = "AUSTRALIA air 8", ["modulation"] = 0, - ["groupId"] = 1000084, + ["groupId"] = 7027, ["coalitionId"] = 0, ["name"] = "AUSTRALIA air 8", ["hidden"] = false, @@ -518,11 +522,11 @@ units = { [1] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -530,14 +534,14 @@ units = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 8 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000084, + ["heading"] = 2.1995924992708, + ["groupId"] = 7027, ["groupName"] = "AUSTRALIA air 8", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7043, @@ -552,7 +556,7 @@ units = }, -- end of ["units"] ["countryId"] = 21, ["radioSet"] = false, - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "plane", ["coalition"] = "neutral", ["startTime"] = 0, @@ -576,8 +580,8 @@ units = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -586,12 +590,12 @@ units = ["speed"] = 44.444444444444, ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["groupId"] = 45, ["groupName"] = "nH", ["onboard_num"] = "050", ["countryId"] = 21, - ["x"] = -155967.80633993, + ["x"] = -158700.87914814, ["callsign"] = { [1] = 2, @@ -599,9 +603,9 @@ units = ["name"] = "Springfield11", [3] = 1, }, -- end of ["callsign"] - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["unitId"] = 68, - ["y"] = 405888.85058741, + ["y"] = 404406.46136648, ["coalition"] = "neutral", ["unitName"] = "Rotary-1-1", }, -- end of [1] @@ -798,25 +802,25 @@ units = [1] = { ["shape_name"] = "ab-212_cargo", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] - ["country"] = "usa", + ["groupId"] = 31, ["mass"] = 371, - ["categoryStatic"] = "Cargos", + ["heading"] = 0, ["groupName"] = "cargoBob", - ["type"] = "uh1h_cargo", - ["countryId"] = 2, + ["country"] = "usa", + ["y"] = 675199.99999999, ["x"] = -292007.14285714, - ["unitId"] = 45, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", - ["groupId"] = 31, + ["countryId"] = 2, + ["unitId"] = 45, ["coalition"] = "blue", - ["y"] = 675199.99999999, }, -- end of [1] }, -- end of ["units"] }, -- end of [4] @@ -833,25 +837,25 @@ units = [1] = { ["shape_name"] = "ab-212_cargo", - ["heading"] = 0, + ["type"] = "uh1h_cargo", ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] - ["country"] = "usa", + ["groupId"] = 32, ["mass"] = 1337, - ["categoryStatic"] = "Cargos", + ["heading"] = 0, ["groupName"] = "cloneCargoBase", - ["type"] = "uh1h_cargo", - ["countryId"] = 2, + ["country"] = "usa", + ["y"] = 674842.85714285, ["x"] = -291678.57142856, - ["unitId"] = 46, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", - ["groupId"] = 32, + ["countryId"] = 2, + ["unitId"] = 46, ["coalition"] = "blue", - ["y"] = 674842.85714285, }, -- end of [1] }, -- end of ["units"] }, -- end of [5] @@ -868,24 +872,24 @@ units = [1] = { ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["country"] = "usa", - ["categoryStatic"] = "Helicopters", + ["unitId"] = 63, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["groupId"] = 40, - ["countryId"] = 2, + ["country"] = "usa", + ["y"] = 443856.28948724, ["x"] = -355322.45423175, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1", - ["unitId"] = 63, + ["groupId"] = 40, + ["countryId"] = 2, ["coalition"] = "blue", - ["y"] = 443856.28948724, }, -- end of [1] }, -- end of ["units"] }, -- end of [6] @@ -902,24 +906,24 @@ units = [1] = { ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["country"] = "usa", - ["categoryStatic"] = "Helicopters", + ["unitId"] = 64, ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["groupId"] = 41, - ["countryId"] = 2, + ["country"] = "usa", + ["y"] = 443849.03844635, ["x"] = -355322.27295572, - ["type"] = "AH-1W", + ["categoryStatic"] = "Helicopters", ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["unitId"] = 64, + ["groupId"] = 41, + ["countryId"] = 2, ["coalition"] = "blue", - ["y"] = 443849.03844635, }, -- end of [1] }, -- end of ["units"] }, -- end of [7] @@ -933,31 +937,31 @@ units = { [1] = { - ["alt"] = 61, + ["alt"] = 62, ["type"] = "Sandbox", ["point"] = { - ["y"] = 690788, - ["x"] = -285547, + ["y"] = 693698, + ["x"] = -287512, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 690788, - ["groupName"] = "USA static 1", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285547, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 1", + ["unitId"] = 7005, + ["y"] = 693698, + ["x"] = -287512, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 1", - ["unitId"] = 7005, - ["heading"] = 0, ["groupId"] = 7005, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -974,11 +978,11 @@ units = { [1] = { - ["alt"] = 72, + ["alt"] = 57, ["point"] = { - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -989,8 +993,8 @@ units = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 2", - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, ["coalition"] = "blue", ["unitId"] = 7006, ["heading"] = 0, @@ -1000,7 +1004,7 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1017,11 +1021,11 @@ units = { [1] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -1032,8 +1036,8 @@ units = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 4", - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, ["coalition"] = "blue", ["unitId"] = 7017, ["heading"] = 0, @@ -1043,7 +1047,7 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1060,31 +1064,31 @@ units = { [1] = { - ["alt"] = 60, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 691139, - ["x"] = -286038, + ["y"] = 692858, + ["x"] = -286636, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 691139, - ["groupName"] = "USA static 3", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -286038, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 3", + ["unitId"] = 7016, + ["y"] = 692858, + ["x"] = -286636, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 3", - ["unitId"] = 7016, - ["heading"] = 0, ["groupId"] = 7016, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1101,11 +1105,11 @@ units = { [1] = { - ["alt"] = 73, + ["alt"] = 62, ["point"] = { - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -1116,8 +1120,8 @@ units = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 6", - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, ["coalition"] = "blue", ["unitId"] = 7028, ["heading"] = 0, @@ -1127,7 +1131,7 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1144,31 +1148,31 @@ units = { [1] = { - ["alt"] = 69, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693432, - ["x"] = -285294, + ["y"] = 692897, + ["x"] = -286503, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693432, - ["groupName"] = "USA static 5", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285294, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 5", + ["unitId"] = 7027, + ["y"] = 692897, + ["x"] = -286503, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 5", - ["unitId"] = 7027, - ["heading"] = 0, ["groupId"] = 7027, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1185,11 +1189,11 @@ units = { [1] = { - ["alt"] = 67, + ["alt"] = 63, ["point"] = { - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -1200,8 +1204,8 @@ units = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 8", - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, ["coalition"] = "blue", ["unitId"] = 7039, ["heading"] = 0, @@ -1211,7 +1215,7 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1228,31 +1232,31 @@ units = { [1] = { - ["alt"] = 61, + ["alt"] = 56, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693155, - ["x"] = -287187, + ["y"] = 691971, + ["x"] = -288088, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693155, - ["groupName"] = "USA static 7", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -287187, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 7", + ["unitId"] = 7038, + ["y"] = 691971, + ["x"] = -288088, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 7", - ["unitId"] = 7038, - ["heading"] = 0, ["groupId"] = 7038, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [1] }, -- end of ["units"] ["countryId"] = 2, ["coalition"] = "blue", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "static", ["country"] = "usa", ["startTime"] = 0, @@ -1536,11 +1540,11 @@ units = { [1] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692389, - ["x"] = -287110, + ["y"] = 694968, + ["x"] = -285046, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1550,8 +1554,8 @@ units = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287110, - ["y"] = 692389, + ["x"] = -285046, + ["y"] = 694968, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #002", @@ -1560,11 +1564,11 @@ units = }, -- end of [1] [2] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692345, - ["x"] = -286935, + ["y"] = 695126, + ["x"] = -285098, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1574,8 +1578,8 @@ units = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286935, - ["y"] = 692345, + ["x"] = -285098, + ["y"] = 695126, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #003", @@ -1584,11 +1588,11 @@ units = }, -- end of [2] [3] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692308, - ["x"] = -287213, + ["y"] = 694892, + ["x"] = -285039, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1598,8 +1602,8 @@ units = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287213, - ["y"] = 692308, + ["x"] = -285039, + ["y"] = 694892, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #004", @@ -1608,11 +1612,11 @@ units = }, -- end of [3] [4] = { - ["alt"] = 60, + ["alt"] = 75, ["point"] = { - ["y"] = 692321, - ["x"] = -286989, + ["y"] = 695084, + ["x"] = -284914, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1622,8 +1626,8 @@ units = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286989, - ["y"] = 692321, + ["x"] = -284914, + ["y"] = 695084, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #005", @@ -1632,11 +1636,11 @@ units = }, -- end of [4] [5] = { - ["alt"] = 59, + ["alt"] = 73, ["point"] = { - ["y"] = 692297, - ["x"] = -287225, + ["y"] = 694985, + ["x"] = -285104, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1646,8 +1650,8 @@ units = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287225, - ["y"] = 692297, + ["x"] = -285104, + ["y"] = 694985, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #006", @@ -1656,11 +1660,11 @@ units = }, -- end of [5] [6] = { - ["alt"] = 61, + ["alt"] = 74, ["point"] = { - ["y"] = 692445, - ["x"] = -287012, + ["y"] = 694877, + ["x"] = -285009, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1670,8 +1674,8 @@ units = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287012, - ["y"] = 692445, + ["x"] = -285009, + ["y"] = 694877, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #007", @@ -1680,11 +1684,11 @@ units = }, -- end of [6] [7] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692311, - ["x"] = -287237, + ["y"] = 694952, + ["x"] = -284964, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1694,8 +1698,8 @@ units = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287237, - ["y"] = 692311, + ["x"] = -284964, + ["y"] = 694952, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #008", @@ -1713,32 +1717,69 @@ units = ["groupName"] = "teleGroup", }, -- end of [4] [5] = + { + ["groupId"] = 47, + ["country"] = "usa", + ["groupName"] = "poly", + ["units"] = + { + [1] = + { + ["type"] = "AAV7", + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["country"] = "usa", + ["groupId"] = 47, + ["groupName"] = "poly", + ["skill"] = "Average", + ["heading"] = 2.3261877017598, + ["countryId"] = 2, + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["coalition"] = "blue", + ["y"] = 185783.38833846, + }, -- end of [1] + }, -- end of ["units"] + ["countryId"] = 2, + ["hidden"] = false, + ["category"] = "vehicle", + ["coalition"] = "blue", + ["startTime"] = 0, + ["task"] = "Ground Nothing", + }, -- end of [5] + [6] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000058, + ["groupId"] = 7001, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692663, - ["x"] = -286548, + ["y"] = 692292, + ["x"] = -284982, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286548, - ["y"] = 692663, - ["heading"] = 1.4977557600419, + ["x"] = -284982, + ["y"] = 692292, + ["heading"] = 1.4977557593169, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit1", ["unitId"] = 7001, @@ -1746,23 +1787,23 @@ units = }, -- end of [1] [2] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692678, - ["x"] = -286576, + ["y"] = 692208, + ["x"] = -284870, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286576, - ["y"] = 692678, - ["heading"] = 1.4977557629417, + ["x"] = -284870, + ["y"] = 692208, + ["heading"] = 1.4977557696476, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit2", ["unitId"] = 7002, @@ -1770,23 +1811,23 @@ units = }, -- end of [2] [3] = { - ["alt"] = 63, + ["alt"] = 68, ["point"] = { - ["y"] = 692774, - ["x"] = -286539, + ["y"] = 692374, + ["x"] = -284971, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286539, - ["y"] = 692774, - ["heading"] = 1.497755762398, + ["x"] = -284971, + ["y"] = 692374, + ["heading"] = 1.4977557676538, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit3", ["unitId"] = 7003, @@ -1794,23 +1835,23 @@ units = }, -- end of [3] [4] = { - ["alt"] = 62, + ["alt"] = 68, ["point"] = { - ["y"] = 692553, - ["x"] = -286525, + ["y"] = 692388, + ["x"] = -284932, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286525, - ["y"] = 692553, - ["heading"] = 1.4977557625792, + ["x"] = -284932, + ["y"] = 692388, + ["heading"] = 1.4977557602231, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit4", ["unitId"] = 7004, @@ -1819,18 +1860,18 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 1", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 1", - }, -- end of [5] - [6] = + }, -- end of [6] + [7] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000061, + ["groupId"] = 7004, ["hidden"] = false, ["units"] = { @@ -1853,7 +1894,7 @@ units = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -1877,7 +1918,7 @@ units = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -1885,40 +1926,40 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 2", - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 2", - }, -- end of [6] - [7] = + }, -- end of [7] + [8] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000065, + ["groupId"] = 7008, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 60, + ["alt"] = 62, ["point"] = { - ["y"] = 692171, - ["x"] = -286749, + ["y"] = 690419, + ["x"] = -284972, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286749, - ["y"] = 692171, - ["heading"] = 1.4977557591357, + ["x"] = -284972, + ["y"] = 690419, + ["heading"] = 1.4977557640291, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit1", ["unitId"] = 7012, @@ -1926,23 +1967,23 @@ units = }, -- end of [1] [2] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 692204, - ["x"] = -286580, + ["y"] = 690558, + ["x"] = -284846, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286580, - ["y"] = 692204, - ["heading"] = 1.4977557614918, + ["x"] = -284846, + ["y"] = 690558, + ["heading"] = 1.4977557580482, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit2", ["unitId"] = 7013, @@ -1950,23 +1991,23 @@ units = }, -- end of [2] [3] = { - ["alt"] = 61, + ["alt"] = 62, ["point"] = { - ["y"] = 692150, - ["x"] = -286560, + ["y"] = 690360, + ["x"] = -285032, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286560, - ["y"] = 692150, - ["heading"] = 1.4977557614918, + ["x"] = -285032, + ["y"] = 690360, + ["heading"] = 1.4977557565984, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit3", ["unitId"] = 7014, @@ -1974,23 +2015,23 @@ units = }, -- end of [3] [4] = { - ["alt"] = 60, + ["alt"] = 62, ["point"] = { - ["y"] = 691995, - ["x"] = -286713, + ["y"] = 690314, + ["x"] = -284956, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286713, - ["y"] = 691995, - ["heading"] = 1.4977557627604, + ["x"] = -284956, + ["y"] = 690314, + ["heading"] = 1.497755755511, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit4", ["unitId"] = 7015, @@ -1999,18 +2040,18 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 3", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 3", - }, -- end of [7] - [8] = + }, -- end of [8] + [9] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000068, + ["groupId"] = 7011, ["hidden"] = false, ["units"] = { @@ -2027,7 +2068,7 @@ units = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286407, @@ -2051,7 +2092,7 @@ units = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286447, @@ -2065,40 +2106,40 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 4", - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 4", - }, -- end of [8] - [9] = + }, -- end of [9] + [10] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000072, + ["groupId"] = 7015, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 55, + ["alt"] = 73, ["point"] = { - ["y"] = 692563, - ["x"] = -288904, + ["y"] = 691751, + ["x"] = -283221, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288904, - ["y"] = 692563, - ["heading"] = 1.4977557725472, + ["x"] = -283221, + ["y"] = 691751, + ["heading"] = 1.4977557703725, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit1", ["unitId"] = 7023, @@ -2106,23 +2147,23 @@ units = }, -- end of [1] [2] = { - ["alt"] = 56, + ["alt"] = 74, ["point"] = { - ["y"] = 692623, - ["x"] = -288844, + ["y"] = 691898, + ["x"] = -283194, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288844, - ["y"] = 692623, - ["heading"] = 1.4977557660227, + ["x"] = -283194, + ["y"] = 691898, + ["heading"] = 1.4977557634854, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit2", ["unitId"] = 7024, @@ -2130,23 +2171,23 @@ units = }, -- end of [2] [3] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692459, - ["x"] = -288865, + ["y"] = 691826, + ["x"] = -283357, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288865, - ["y"] = 692459, - ["heading"] = 1.4977557638479, + ["x"] = -283357, + ["y"] = 691826, + ["heading"] = 1.4977557538798, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit3", ["unitId"] = 7025, @@ -2154,23 +2195,23 @@ units = }, -- end of [3] [4] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692675, - ["x"] = -289069, + ["y"] = 691852, + ["x"] = -283362, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -289069, - ["y"] = 692675, - ["heading"] = 1.4977557685601, + ["x"] = -283362, + ["y"] = 691852, + ["heading"] = 1.4977557720036, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit4", ["unitId"] = 7026, @@ -2179,18 +2220,18 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 5", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 5", - }, -- end of [9] - [10] = + }, -- end of [10] + [11] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000075, + ["groupId"] = 7018, ["hidden"] = false, ["units"] = { @@ -2213,7 +2254,7 @@ units = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2237,7 +2278,7 @@ units = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2245,18 +2286,18 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 6", - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 6", - }, -- end of [10] - [11] = + }, -- end of [11] + [12] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000082, + ["groupId"] = 7025, ["hidden"] = false, ["units"] = { @@ -2279,7 +2320,7 @@ units = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2303,7 +2344,7 @@ units = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2311,40 +2352,40 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 8", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 8", - }, -- end of [11] - [12] = + }, -- end of [12] + [13] = { ["country"] = "usa", ["coalitionId"] = 2, - ["groupId"] = 1000079, + ["groupId"] = 7022, ["hidden"] = false, ["units"] = { [1] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692747, - ["x"] = -287036, + ["y"] = 692769, + ["x"] = -287355, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287036, - ["y"] = 692747, - ["heading"] = 1.4977557703724, + ["x"] = -287355, + ["y"] = 692769, + ["heading"] = 1.4977557591357, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit1", ["unitId"] = 7034, @@ -2352,23 +2393,23 @@ units = }, -- end of [1] [2] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692716, - ["x"] = -286920, + ["y"] = 692754, + ["x"] = -287476, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -286920, - ["y"] = 692716, - ["heading"] = 1.4977557703724, + ["x"] = -287476, + ["y"] = 692754, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit2", ["unitId"] = 7035, @@ -2376,23 +2417,23 @@ units = }, -- end of [2] [3] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692580, - ["x"] = -287056, + ["y"] = 692726, + ["x"] = -287538, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287056, - ["y"] = 692580, - ["heading"] = 1.4977557642103, + ["x"] = -287538, + ["y"] = 692726, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit3", ["unitId"] = 7036, @@ -2400,23 +2441,23 @@ units = }, -- end of [3] [4] = { - ["alt"] = 60, + ["alt"] = 59, ["point"] = { - ["y"] = 692752, - ["x"] = -287189, + ["y"] = 692766, + ["x"] = -287511, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287189, - ["y"] = 692752, - ["heading"] = 1.4977557678351, + ["x"] = -287511, + ["y"] = 692766, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit4", ["unitId"] = 7037, @@ -2425,13 +2466,13 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["name"] = "USA gnd 7", - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "vehicle", ["coalition"] = "blue", ["startTime"] = 0, ["task"] = "Ground Nothing", ["groupName"] = "USA gnd 7", - }, -- end of [12] + }, -- end of [13] }, -- end of ["vehicle"] ["plane"] = { @@ -2563,6 +2604,9 @@ units = ["skill"] = "Client", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, @@ -2616,6 +2660,9 @@ units = ["skill"] = "Client", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, @@ -2759,7 +2806,7 @@ units = ["country"] = "usa", ["groupName"] = "USA air 1", ["modulation"] = 0, - ["groupId"] = 1000062, + ["groupId"] = 7005, ["coalitionId"] = 2, ["name"] = "USA air 1", ["hidden"] = false, @@ -2767,10 +2814,10 @@ units = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -2779,14 +2826,14 @@ units = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 1 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000062, + ["heading"] = 1.6162179734619, + ["groupId"] = 7005, ["groupName"] = "USA air 1", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7009, @@ -2801,7 +2848,7 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43220.99, + ["timeAdded"] = 43220.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, @@ -2813,7 +2860,7 @@ units = ["country"] = "usa", ["groupName"] = "USA air 3", ["modulation"] = 0, - ["groupId"] = 1000069, + ["groupId"] = 7012, ["coalitionId"] = 2, ["name"] = "USA air 3", ["hidden"] = false, @@ -2821,10 +2868,10 @@ units = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -2833,14 +2880,14 @@ units = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 3 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000069, + ["heading"] = 1.6162179734619, + ["groupId"] = 7012, ["groupName"] = "USA air 3", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7020, @@ -2855,7 +2902,7 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43221.99, + ["timeAdded"] = 43221.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, @@ -2867,7 +2914,7 @@ units = ["country"] = "usa", ["groupName"] = "USA air 5", ["modulation"] = 0, - ["groupId"] = 1000076, + ["groupId"] = 7019, ["coalitionId"] = 2, ["name"] = "USA air 5", ["hidden"] = false, @@ -2875,10 +2922,10 @@ units = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -2887,14 +2934,14 @@ units = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 5 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000076, + ["heading"] = 1.6162179734619, + ["groupId"] = 7019, ["groupName"] = "USA air 5", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7031, @@ -2909,7 +2956,7 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43222.99, + ["timeAdded"] = 43222.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, @@ -2921,7 +2968,7 @@ units = ["country"] = "usa", ["groupName"] = "USA air 7", ["modulation"] = 0, - ["groupId"] = 1000083, + ["groupId"] = 7026, ["coalitionId"] = 2, ["name"] = "USA air 7", ["hidden"] = false, @@ -2929,10 +2976,10 @@ units = { [1] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -2941,14 +2988,14 @@ units = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 7 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000083, + ["heading"] = 1.6162179734619, + ["groupId"] = 7026, ["groupName"] = "USA air 7", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7042, @@ -2963,7 +3010,7 @@ units = }, -- end of ["units"] ["countryId"] = 2, ["radioSet"] = false, - ["timeAdded"] = 43223.99, + ["timeAdded"] = 43223.79, ["category"] = "plane", ["coalition"] = "blue", ["startTime"] = 0, diff --git a/Example DBs/mist_DBs_unitsByCat.lua b/Example DBs/mist_DBs_unitsByCat.lua index 082b1ad..aff121c 100644 --- a/Example DBs/mist_DBs_unitsByCat.lua +++ b/Example DBs/mist_DBs_unitsByCat.lua @@ -7,8 +7,8 @@ unitsByCat = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -17,15 +17,15 @@ unitsByCat = ["speed"] = 44.444444444444, ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["unitName"] = "Rotary-1-1", ["groupName"] = "nH", ["coalition"] = "neutral", ["countryId"] = 21, - ["x"] = -155967.80633993, - ["y"] = 405888.85058741, + ["x"] = -158700.87914814, + ["y"] = 404406.46136648, ["unitId"] = 68, - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["skill"] = "High", ["callsign"] = { @@ -389,10 +389,11 @@ unitsByCat = ["alt"] = 0, ["point"] = { - ["y"] = 266228, - ["x"] = -161996, + ["y"] = 267081, + ["x"] = -164471, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 1 unit1", @@ -400,12 +401,12 @@ unitsByCat = ["unitId"] = 7011, ["groupName"] = "AUSTRALIA shp 1", ["countryId"] = 21, - ["x"] = -161996, + ["x"] = -164471, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000064, ["coalition"] = "neutral", - ["y"] = 266228, + ["type"] = "PERRY", + ["groupId"] = 7007, + ["y"] = 267081, ["country"] = "australia", }, -- end of [8] [9] = @@ -413,10 +414,11 @@ unitsByCat = ["alt"] = 0, ["point"] = { - ["y"] = 266588, - ["x"] = -163302, + ["y"] = 267810, + ["x"] = -162283, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 2 unit1", @@ -424,12 +426,12 @@ unitsByCat = ["unitId"] = 7022, ["groupName"] = "AUSTRALIA shp 2", ["countryId"] = 21, - ["x"] = -163302, + ["x"] = -162283, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000071, ["coalition"] = "neutral", - ["y"] = 266588, + ["type"] = "PERRY", + ["groupId"] = 7014, + ["y"] = 267810, ["country"] = "australia", }, -- end of [9] [10] = @@ -437,34 +439,36 @@ unitsByCat = ["alt"] = 0, ["point"] = { - ["y"] = 267963, - ["x"] = -165895, + ["y"] = 268107, + ["x"] = -163693, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000078, + ["unitName"] = "AUSTRALIA shp 3 unit1", + ["heading"] = 0, + ["unitId"] = 7033, ["groupName"] = "AUSTRALIA shp 3", ["countryId"] = 21, - ["x"] = -165895, - ["y"] = 267963, - ["heading"] = 0, - ["country"] = "australia", - ["unitName"] = "AUSTRALIA shp 3 unit1", - ["unitId"] = 7033, + ["x"] = -163693, + ["speed"] = 0, ["coalition"] = "neutral", + ["type"] = "PERRY", + ["groupId"] = 7021, + ["y"] = 268107, + ["country"] = "australia", }, -- end of [10] [11] = { ["alt"] = 0, ["point"] = { - ["y"] = 268804, - ["x"] = -165342, + ["y"] = 265427, + ["x"] = -164284, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 4 unit1", @@ -472,12 +476,12 @@ unitsByCat = ["unitId"] = 7044, ["groupName"] = "AUSTRALIA shp 4", ["countryId"] = 21, - ["x"] = -165342, + ["x"] = -164284, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000085, ["coalition"] = "neutral", - ["y"] = 268804, + ["type"] = "PERRY", + ["groupId"] = 7028, + ["y"] = 265427, ["country"] = "australia", }, -- end of [11] }, -- end of ["ship"] @@ -573,92 +577,92 @@ unitsByCat = [5] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 675199.99999999, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cargoBob", - ["groupId"] = 31, - ["countryId"] = 2, - ["mass"] = 371, ["unitId"] = 45, + ["groupName"] = "cargoBob", + ["countryId"] = 2, + ["y"] = 675199.99999999, + ["mass"] = 371, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", ["x"] = -292007.14285714, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 31, }, -- end of [5] [6] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 674842.85714285, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cloneCargoBase", - ["groupId"] = 32, - ["countryId"] = 2, - ["mass"] = 1337, ["unitId"] = 46, + ["groupName"] = "cloneCargoBase", + ["countryId"] = 2, + ["y"] = 674842.85714285, + ["mass"] = 1337, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 32, }, -- end of [6] [7] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443856.28948724, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443856.28948724, ["x"] = -355322.45423175, - ["unitId"] = 63, + ["groupId"] = 40, ["category"] = "static", ["unitName"] = "static_on_ship1", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 40, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 63, }, -- end of [7] [8] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443849.03844635, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443849.03844635, ["x"] = -355322.27295572, - ["unitId"] = 64, + ["groupId"] = 41, ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 41, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 64, }, -- end of [8] [9] = { @@ -791,34 +795,34 @@ unitsByCat = }, -- end of [14] [15] = { - ["alt"] = 61, + ["alt"] = 62, ["type"] = "Sandbox", ["point"] = { - ["y"] = 690788, - ["x"] = -285547, + ["y"] = 693698, + ["x"] = -287512, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 690788, - ["groupName"] = "USA static 1", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285547, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 1", + ["unitId"] = 7005, + ["y"] = 693698, + ["x"] = -287512, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 1", - ["unitId"] = 7005, - ["heading"] = 0, ["groupId"] = 7005, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [15] [16] = { - ["alt"] = 72, + ["alt"] = 57, ["point"] = { - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -829,8 +833,8 @@ unitsByCat = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 2", - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, ["coalition"] = "blue", ["unitId"] = 7006, ["heading"] = 0, @@ -839,11 +843,11 @@ unitsByCat = }, -- end of [16] [17] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -854,8 +858,8 @@ unitsByCat = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 4", - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, ["coalition"] = "blue", ["unitId"] = 7017, ["heading"] = 0, @@ -864,34 +868,34 @@ unitsByCat = }, -- end of [17] [18] = { - ["alt"] = 60, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 691139, - ["x"] = -286038, + ["y"] = 692858, + ["x"] = -286636, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 691139, - ["groupName"] = "USA static 3", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -286038, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 3", + ["unitId"] = 7016, + ["y"] = 692858, + ["x"] = -286636, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 3", - ["unitId"] = 7016, - ["heading"] = 0, ["groupId"] = 7016, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [18] [19] = { - ["alt"] = 73, + ["alt"] = 62, ["point"] = { - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -902,8 +906,8 @@ unitsByCat = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 6", - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, ["coalition"] = "blue", ["unitId"] = 7028, ["heading"] = 0, @@ -912,34 +916,34 @@ unitsByCat = }, -- end of [19] [20] = { - ["alt"] = 69, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693432, - ["x"] = -285294, + ["y"] = 692897, + ["x"] = -286503, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693432, - ["groupName"] = "USA static 5", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285294, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 5", + ["unitId"] = 7027, + ["y"] = 692897, + ["x"] = -286503, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 5", - ["unitId"] = 7027, - ["heading"] = 0, ["groupId"] = 7027, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [20] [21] = { - ["alt"] = 67, + ["alt"] = 63, ["point"] = { - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -950,8 +954,8 @@ unitsByCat = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 8", - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, ["coalition"] = "blue", ["unitId"] = 7039, ["heading"] = 0, @@ -960,26 +964,26 @@ unitsByCat = }, -- end of [21] [22] = { - ["alt"] = 61, + ["alt"] = 56, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693155, - ["x"] = -287187, + ["y"] = 691971, + ["x"] = -288088, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693155, - ["groupName"] = "USA static 7", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -287187, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 7", + ["unitId"] = 7038, + ["y"] = 691971, + ["x"] = -288088, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 7", - ["unitId"] = 7038, - ["heading"] = 0, ["groupId"] = 7038, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [22] }, -- end of ["static"] ["plane"] = @@ -1102,6 +1106,9 @@ unitsByCat = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, @@ -1113,7 +1120,6 @@ unitsByCat = ["y"] = 636428.57142857, ["unitId"] = 11, ["heading"] = -0.67060113146646, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -1121,6 +1127,7 @@ unitsByCat = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 6, }, -- end of [4] [5] = @@ -1136,6 +1143,9 @@ unitsByCat = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, @@ -1147,7 +1157,6 @@ unitsByCat = ["y"] = 644428.57142857, ["unitId"] = 12, ["heading"] = -0.66079849060746, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -1155,6 +1164,7 @@ unitsByCat = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 7, }, -- end of [5] [6] = @@ -1312,11 +1322,11 @@ unitsByCat = }, -- end of [10] [11] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -1324,14 +1334,14 @@ unitsByCat = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 2 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000063, + ["heading"] = 2.1995924992708, + ["groupId"] = 7006, ["groupName"] = "AUSTRALIA air 2", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7010, @@ -1345,10 +1355,10 @@ unitsByCat = }, -- end of [11] [12] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1357,14 +1367,14 @@ unitsByCat = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 1 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000062, + ["heading"] = 1.6162179734619, + ["groupId"] = 7005, ["groupName"] = "USA air 1", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7009, @@ -1378,10 +1388,10 @@ unitsByCat = }, -- end of [12] [13] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1390,14 +1400,14 @@ unitsByCat = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 3 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000069, + ["heading"] = 1.6162179734619, + ["groupId"] = 7012, ["groupName"] = "USA air 3", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7020, @@ -1411,11 +1421,11 @@ unitsByCat = }, -- end of [13] [14] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -1423,14 +1433,14 @@ unitsByCat = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 4 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000070, + ["heading"] = 2.1995924992708, + ["groupId"] = 7013, ["groupName"] = "AUSTRALIA air 4", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7021, @@ -1444,10 +1454,10 @@ unitsByCat = }, -- end of [14] [15] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1456,14 +1466,14 @@ unitsByCat = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 5 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000076, + ["heading"] = 1.6162179734619, + ["groupId"] = 7019, ["groupName"] = "USA air 5", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7031, @@ -1477,11 +1487,11 @@ unitsByCat = }, -- end of [15] [16] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -1489,14 +1499,14 @@ unitsByCat = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 6 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000077, + ["heading"] = 2.1995924992708, + ["groupId"] = 7020, ["groupName"] = "AUSTRALIA air 6", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7032, @@ -1510,10 +1520,10 @@ unitsByCat = }, -- end of [16] [17] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1522,14 +1532,14 @@ unitsByCat = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 7 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000083, + ["heading"] = 1.6162179734619, + ["groupId"] = 7026, ["groupName"] = "USA air 7", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7042, @@ -1543,11 +1553,11 @@ unitsByCat = }, -- end of [17] [18] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -1555,14 +1565,14 @@ unitsByCat = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 8 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000084, + ["heading"] = 2.1995924992708, + ["groupId"] = 7027, ["groupName"] = "AUSTRALIA air 8", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7043, @@ -1821,11 +1831,11 @@ unitsByCat = }, -- end of [11] [12] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692389, - ["x"] = -287110, + ["y"] = 694968, + ["x"] = -285046, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1835,8 +1845,8 @@ unitsByCat = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287110, - ["y"] = 692389, + ["x"] = -285046, + ["y"] = 694968, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #002", @@ -1845,11 +1855,11 @@ unitsByCat = }, -- end of [12] [13] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692345, - ["x"] = -286935, + ["y"] = 695126, + ["x"] = -285098, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1859,8 +1869,8 @@ unitsByCat = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286935, - ["y"] = 692345, + ["x"] = -285098, + ["y"] = 695126, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #003", @@ -1869,11 +1879,11 @@ unitsByCat = }, -- end of [13] [14] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692308, - ["x"] = -287213, + ["y"] = 694892, + ["x"] = -285039, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1883,8 +1893,8 @@ unitsByCat = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287213, - ["y"] = 692308, + ["x"] = -285039, + ["y"] = 694892, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #004", @@ -1893,11 +1903,11 @@ unitsByCat = }, -- end of [14] [15] = { - ["alt"] = 60, + ["alt"] = 75, ["point"] = { - ["y"] = 692321, - ["x"] = -286989, + ["y"] = 695084, + ["x"] = -284914, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1907,8 +1917,8 @@ unitsByCat = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286989, - ["y"] = 692321, + ["x"] = -284914, + ["y"] = 695084, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #005", @@ -1917,11 +1927,11 @@ unitsByCat = }, -- end of [15] [16] = { - ["alt"] = 59, + ["alt"] = 73, ["point"] = { - ["y"] = 692297, - ["x"] = -287225, + ["y"] = 694985, + ["x"] = -285104, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1931,8 +1941,8 @@ unitsByCat = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287225, - ["y"] = 692297, + ["x"] = -285104, + ["y"] = 694985, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #006", @@ -1941,11 +1951,11 @@ unitsByCat = }, -- end of [16] [17] = { - ["alt"] = 61, + ["alt"] = 74, ["point"] = { - ["y"] = 692445, - ["x"] = -287012, + ["y"] = 694877, + ["x"] = -285009, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1955,8 +1965,8 @@ unitsByCat = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287012, - ["y"] = 692445, + ["x"] = -285009, + ["y"] = 694877, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #007", @@ -1965,11 +1975,11 @@ unitsByCat = }, -- end of [17] [18] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692311, - ["x"] = -287237, + ["y"] = 694952, + ["x"] = -284964, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1979,8 +1989,8 @@ unitsByCat = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287237, - ["y"] = 692311, + ["x"] = -284964, + ["y"] = 694952, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #008", @@ -1988,6 +1998,28 @@ unitsByCat = ["coalition"] = "blue", }, -- end of [18] [19] = + { + ["heading"] = 2.3261877017598, + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["groupId"] = 47, + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["groupName"] = "poly", + ["type"] = "AAV7", + ["countryId"] = 2, + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["country"] = "usa", + ["skill"] = "Average", + }, -- end of [19] + [20] = { ["heading"] = -1.7994767003775, ["point"] = @@ -2008,8 +2040,8 @@ unitsByCat = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [19] - [20] = + }, -- end of [20] + [21] = { ["heading"] = -1.7994767003775, ["point"] = @@ -2030,8 +2062,8 @@ unitsByCat = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [20] - [21] = + }, -- end of [21] + [22] = { ["heading"] = -1.7994767003775, ["point"] = @@ -2052,8 +2084,8 @@ unitsByCat = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [21] - [22] = + }, -- end of [22] + [23] = { ["heading"] = -1.7994767003775, ["point"] = @@ -2074,8 +2106,8 @@ unitsByCat = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [22] - [23] = + }, -- end of [23] + [24] = { ["heading"] = -1.7994767003775, ["point"] = @@ -2096,8 +2128,8 @@ unitsByCat = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [23] - [24] = + }, -- end of [24] + [25] = { ["heading"] = -1.7994767003775, ["point"] = @@ -2118,8 +2150,8 @@ unitsByCat = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [24] - [25] = + }, -- end of [25] + [26] = { ["heading"] = 0, ["point"] = @@ -2140,8 +2172,8 @@ unitsByCat = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Excellent", - }, -- end of [25] - [26] = + }, -- end of [26] + [27] = { ["heading"] = 0, ["point"] = @@ -2162,8 +2194,8 @@ unitsByCat = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Excellent", - }, -- end of [26] - [27] = + }, -- end of [27] + [28] = { ["heading"] = 0, ["point"] = @@ -2184,8 +2216,8 @@ unitsByCat = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Excellent", - }, -- end of [27] - [28] = + }, -- end of [28] + [29] = { ["heading"] = 0, ["point"] = @@ -2206,104 +2238,104 @@ unitsByCat = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Excellent", - }, -- end of [28] - [29] = + }, -- end of [29] + [30] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692663, - ["x"] = -286548, + ["y"] = 692292, + ["x"] = -284982, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286548, - ["y"] = 692663, - ["heading"] = 1.4977557600419, + ["x"] = -284982, + ["y"] = 692292, + ["heading"] = 1.4977557593169, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit1", ["unitId"] = 7001, ["coalition"] = "blue", - }, -- end of [29] - [30] = + }, -- end of [30] + [31] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692678, - ["x"] = -286576, + ["y"] = 692208, + ["x"] = -284870, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286576, - ["y"] = 692678, - ["heading"] = 1.4977557629417, + ["x"] = -284870, + ["y"] = 692208, + ["heading"] = 1.4977557696476, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit2", ["unitId"] = 7002, ["coalition"] = "blue", - }, -- end of [30] - [31] = + }, -- end of [31] + [32] = { - ["alt"] = 63, + ["alt"] = 68, ["point"] = { - ["y"] = 692774, - ["x"] = -286539, + ["y"] = 692374, + ["x"] = -284971, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286539, - ["y"] = 692774, - ["heading"] = 1.497755762398, + ["x"] = -284971, + ["y"] = 692374, + ["heading"] = 1.4977557676538, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit3", ["unitId"] = 7003, ["coalition"] = "blue", - }, -- end of [31] - [32] = + }, -- end of [32] + [33] = { - ["alt"] = 62, + ["alt"] = 68, ["point"] = { - ["y"] = 692553, - ["x"] = -286525, + ["y"] = 692388, + ["x"] = -284932, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286525, - ["y"] = 692553, - ["heading"] = 1.4977557625792, + ["x"] = -284932, + ["y"] = 692388, + ["heading"] = 1.4977557602231, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit4", ["unitId"] = 7004, ["coalition"] = "blue", - }, -- end of [32] - [33] = + }, -- end of [33] + [34] = { ["alt"] = 48, ["point"] = @@ -2322,12 +2354,12 @@ unitsByCat = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [33] - [34] = + }, -- end of [34] + [35] = { ["alt"] = 48, ["point"] = @@ -2346,108 +2378,108 @@ unitsByCat = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [34] - [35] = + }, -- end of [35] + [36] = { - ["alt"] = 60, + ["alt"] = 62, ["point"] = { - ["y"] = 692171, - ["x"] = -286749, + ["y"] = 690419, + ["x"] = -284972, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286749, - ["y"] = 692171, - ["heading"] = 1.4977557591357, + ["x"] = -284972, + ["y"] = 690419, + ["heading"] = 1.4977557640291, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit1", ["unitId"] = 7012, ["coalition"] = "blue", - }, -- end of [35] - [36] = + }, -- end of [36] + [37] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 692204, - ["x"] = -286580, + ["y"] = 690558, + ["x"] = -284846, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286580, - ["y"] = 692204, - ["heading"] = 1.4977557614918, + ["x"] = -284846, + ["y"] = 690558, + ["heading"] = 1.4977557580482, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit2", ["unitId"] = 7013, ["coalition"] = "blue", - }, -- end of [36] - [37] = + }, -- end of [37] + [38] = { - ["alt"] = 61, + ["alt"] = 62, ["point"] = { - ["y"] = 692150, - ["x"] = -286560, + ["y"] = 690360, + ["x"] = -285032, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286560, - ["y"] = 692150, - ["heading"] = 1.4977557614918, + ["x"] = -285032, + ["y"] = 690360, + ["heading"] = 1.4977557565984, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit3", ["unitId"] = 7014, ["coalition"] = "blue", - }, -- end of [37] - [38] = + }, -- end of [38] + [39] = { - ["alt"] = 60, + ["alt"] = 62, ["point"] = { - ["y"] = 691995, - ["x"] = -286713, + ["y"] = 690314, + ["x"] = -284956, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286713, - ["y"] = 691995, - ["heading"] = 1.4977557627604, + ["x"] = -284956, + ["y"] = 690314, + ["heading"] = 1.497755755511, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit4", ["unitId"] = 7015, ["coalition"] = "blue", - }, -- end of [38] - [39] = + }, -- end of [39] + [40] = { ["alt"] = 48, ["point"] = @@ -2460,7 +2492,7 @@ unitsByCat = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286407, @@ -2470,8 +2502,8 @@ unitsByCat = ["unitName"] = "USA gnd 4 unit1", ["unitId"] = 7018, ["coalition"] = "blue", - }, -- end of [39] - [40] = + }, -- end of [40] + [41] = { ["alt"] = 48, ["point"] = @@ -2484,7 +2516,7 @@ unitsByCat = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286447, @@ -2494,104 +2526,104 @@ unitsByCat = ["unitName"] = "USA gnd 4 unit2", ["unitId"] = 7019, ["coalition"] = "blue", - }, -- end of [40] - [41] = + }, -- end of [41] + [42] = { - ["alt"] = 55, + ["alt"] = 73, ["point"] = { - ["y"] = 692563, - ["x"] = -288904, + ["y"] = 691751, + ["x"] = -283221, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288904, - ["y"] = 692563, - ["heading"] = 1.4977557725472, + ["x"] = -283221, + ["y"] = 691751, + ["heading"] = 1.4977557703725, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit1", ["unitId"] = 7023, ["coalition"] = "blue", - }, -- end of [41] - [42] = + }, -- end of [42] + [43] = { - ["alt"] = 56, + ["alt"] = 74, ["point"] = { - ["y"] = 692623, - ["x"] = -288844, + ["y"] = 691898, + ["x"] = -283194, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288844, - ["y"] = 692623, - ["heading"] = 1.4977557660227, + ["x"] = -283194, + ["y"] = 691898, + ["heading"] = 1.4977557634854, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit2", ["unitId"] = 7024, ["coalition"] = "blue", - }, -- end of [42] - [43] = + }, -- end of [43] + [44] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692459, - ["x"] = -288865, + ["y"] = 691826, + ["x"] = -283357, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288865, - ["y"] = 692459, - ["heading"] = 1.4977557638479, + ["x"] = -283357, + ["y"] = 691826, + ["heading"] = 1.4977557538798, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit3", ["unitId"] = 7025, ["coalition"] = "blue", - }, -- end of [43] - [44] = + }, -- end of [44] + [45] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692675, - ["x"] = -289069, + ["y"] = 691852, + ["x"] = -283362, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -289069, - ["y"] = 692675, - ["heading"] = 1.4977557685601, + ["x"] = -283362, + ["y"] = 691852, + ["heading"] = 1.4977557720036, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit4", ["unitId"] = 7026, ["coalition"] = "blue", - }, -- end of [44] - [45] = + }, -- end of [45] + [46] = { ["alt"] = 48, ["point"] = @@ -2610,12 +2642,12 @@ unitsByCat = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [45] - [46] = + }, -- end of [46] + [47] = { ["alt"] = 48, ["point"] = @@ -2634,12 +2666,12 @@ unitsByCat = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [46] - [47] = + }, -- end of [47] + [48] = { ["alt"] = 48, ["point"] = @@ -2658,12 +2690,12 @@ unitsByCat = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [47] - [48] = + }, -- end of [48] + [49] = { ["alt"] = 48, ["point"] = @@ -2682,106 +2714,106 @@ unitsByCat = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [48] - [49] = + }, -- end of [49] + [50] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692747, - ["x"] = -287036, + ["y"] = 692769, + ["x"] = -287355, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287036, - ["y"] = 692747, - ["heading"] = 1.4977557703724, + ["x"] = -287355, + ["y"] = 692769, + ["heading"] = 1.4977557591357, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit1", ["unitId"] = 7034, ["coalition"] = "blue", - }, -- end of [49] - [50] = + }, -- end of [50] + [51] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692716, - ["x"] = -286920, + ["y"] = 692754, + ["x"] = -287476, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -286920, - ["y"] = 692716, - ["heading"] = 1.4977557703724, + ["x"] = -287476, + ["y"] = 692754, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit2", ["unitId"] = 7035, ["coalition"] = "blue", - }, -- end of [50] - [51] = + }, -- end of [51] + [52] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692580, - ["x"] = -287056, + ["y"] = 692726, + ["x"] = -287538, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287056, - ["y"] = 692580, - ["heading"] = 1.4977557642103, + ["x"] = -287538, + ["y"] = 692726, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit3", ["unitId"] = 7036, ["coalition"] = "blue", - }, -- end of [51] - [52] = + }, -- end of [52] + [53] = { - ["alt"] = 60, + ["alt"] = 59, ["point"] = { - ["y"] = 692752, - ["x"] = -287189, + ["y"] = 692766, + ["x"] = -287511, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287189, - ["y"] = 692752, - ["heading"] = 1.4977557678351, + ["x"] = -287511, + ["y"] = 692766, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit4", ["unitId"] = 7037, ["coalition"] = "blue", - }, -- end of [52] + }, -- end of [53] }, -- end of ["vehicle"] } -- end of unitsByCat diff --git a/Example DBs/mist_DBs_unitsById.lua b/Example DBs/mist_DBs_unitsById.lua index d51cc8b..b46d4f7 100644 --- a/Example DBs/mist_DBs_unitsById.lua +++ b/Example DBs/mist_DBs_unitsById.lua @@ -278,6 +278,9 @@ unitsById = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, @@ -289,7 +292,6 @@ unitsById = ["y"] = 636428.57142857, ["unitId"] = 11, ["heading"] = -0.67060113146646, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -297,6 +299,7 @@ unitsById = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 6, }, -- end of [11] [12] = @@ -312,6 +315,9 @@ unitsById = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, @@ -323,7 +329,6 @@ unitsById = ["y"] = 644428.57142857, ["unitId"] = 12, ["heading"] = -0.66079849060746, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -331,6 +336,7 @@ unitsById = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 7, }, -- end of [12] [13] = @@ -1016,48 +1022,48 @@ unitsById = [45] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 675199.99999999, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cargoBob", - ["groupId"] = 31, - ["countryId"] = 2, - ["mass"] = 371, ["unitId"] = 45, + ["groupName"] = "cargoBob", + ["countryId"] = 2, + ["y"] = 675199.99999999, + ["mass"] = 371, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", ["x"] = -292007.14285714, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 31, }, -- end of [45] [46] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 674842.85714285, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cloneCargoBase", - ["groupId"] = 32, - ["countryId"] = 2, - ["mass"] = 1337, ["unitId"] = 46, + ["groupName"] = "cloneCargoBase", + ["countryId"] = 2, + ["y"] = 674842.85714285, + ["mass"] = 1337, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 32, }, -- end of [46] [47] = { @@ -1195,11 +1201,11 @@ unitsById = }, -- end of [51] [52] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692389, - ["x"] = -287110, + ["y"] = 694968, + ["x"] = -285046, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1209,8 +1215,8 @@ unitsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287110, - ["y"] = 692389, + ["x"] = -285046, + ["y"] = 694968, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #002", @@ -1219,11 +1225,11 @@ unitsById = }, -- end of [52] [53] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692345, - ["x"] = -286935, + ["y"] = 695126, + ["x"] = -285098, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1233,8 +1239,8 @@ unitsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286935, - ["y"] = 692345, + ["x"] = -285098, + ["y"] = 695126, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #003", @@ -1243,11 +1249,11 @@ unitsById = }, -- end of [53] [54] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692308, - ["x"] = -287213, + ["y"] = 694892, + ["x"] = -285039, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1257,8 +1263,8 @@ unitsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287213, - ["y"] = 692308, + ["x"] = -285039, + ["y"] = 694892, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #004", @@ -1267,11 +1273,11 @@ unitsById = }, -- end of [54] [55] = { - ["alt"] = 60, + ["alt"] = 75, ["point"] = { - ["y"] = 692321, - ["x"] = -286989, + ["y"] = 695084, + ["x"] = -284914, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1281,8 +1287,8 @@ unitsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286989, - ["y"] = 692321, + ["x"] = -284914, + ["y"] = 695084, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #005", @@ -1291,11 +1297,11 @@ unitsById = }, -- end of [55] [56] = { - ["alt"] = 59, + ["alt"] = 73, ["point"] = { - ["y"] = 692297, - ["x"] = -287225, + ["y"] = 694985, + ["x"] = -285104, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1305,8 +1311,8 @@ unitsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287225, - ["y"] = 692297, + ["x"] = -285104, + ["y"] = 694985, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #006", @@ -1315,11 +1321,11 @@ unitsById = }, -- end of [56] [57] = { - ["alt"] = 61, + ["alt"] = 74, ["point"] = { - ["y"] = 692445, - ["x"] = -287012, + ["y"] = 694877, + ["x"] = -285009, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1329,8 +1335,8 @@ unitsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287012, - ["y"] = 692445, + ["x"] = -285009, + ["y"] = 694877, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #007", @@ -1339,11 +1345,11 @@ unitsById = }, -- end of [57] [58] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692311, - ["x"] = -287237, + ["y"] = 694952, + ["x"] = -284964, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -1353,8 +1359,8 @@ unitsById = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287237, - ["y"] = 692311, + ["x"] = -284964, + ["y"] = 694952, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #008", @@ -1462,47 +1468,47 @@ unitsById = }, -- end of [62] [63] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443856.28948724, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443856.28948724, ["x"] = -355322.45423175, - ["unitId"] = 63, + ["groupId"] = 40, ["category"] = "static", ["unitName"] = "static_on_ship1", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 40, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 63, }, -- end of [63] [64] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443849.03844635, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443849.03844635, ["x"] = -355322.27295572, - ["unitId"] = 64, + ["groupId"] = 41, ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 41, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 64, }, -- end of [64] [65] = { @@ -1590,8 +1596,8 @@ unitsById = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -1600,15 +1606,15 @@ unitsById = ["speed"] = 44.444444444444, ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["unitName"] = "Rotary-1-1", ["groupName"] = "nH", ["coalition"] = "neutral", ["countryId"] = 21, - ["x"] = -155967.80633993, - ["y"] = 405888.85058741, + ["x"] = -158700.87914814, + ["y"] = 404406.46136648, ["unitId"] = 68, - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["skill"] = "High", ["callsign"] = { @@ -1641,6 +1647,28 @@ unitsById = ["heading"] = 0, ["country"] = "australia", }, -- end of [69] + [70] = + { + ["heading"] = 2.3261877017598, + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["groupId"] = 47, + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["groupName"] = "poly", + ["type"] = "AAV7", + ["countryId"] = 2, + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["country"] = "usa", + ["skill"] = "Average", + }, -- end of [70] [7030] = { ["alt"] = 48, @@ -1660,30 +1688,30 @@ unitsById = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", }, -- end of [7030] [7015] = { - ["alt"] = 60, + ["alt"] = 62, ["point"] = { - ["y"] = 691995, - ["x"] = -286713, + ["y"] = 690314, + ["x"] = -284956, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286713, - ["y"] = 691995, - ["heading"] = 1.4977557627604, + ["x"] = -284956, + ["y"] = 690314, + ["heading"] = 1.497755755511, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit4", ["unitId"] = 7015, @@ -1691,10 +1719,10 @@ unitsById = }, -- end of [7015] [7031] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1703,14 +1731,14 @@ unitsById = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 5 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000076, + ["heading"] = 1.6162179734619, + ["groupId"] = 7019, ["groupName"] = "USA air 5", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7031, @@ -1724,34 +1752,34 @@ unitsById = }, -- end of [7031] [7016] = { - ["alt"] = 60, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 691139, - ["x"] = -286038, + ["y"] = 692858, + ["x"] = -286636, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 691139, - ["groupName"] = "USA static 3", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -286038, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 3", + ["unitId"] = 7016, + ["y"] = 692858, + ["x"] = -286636, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 3", - ["unitId"] = 7016, - ["heading"] = 0, ["groupId"] = 7016, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [7016] [7032] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -1759,14 +1787,14 @@ unitsById = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 6 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000077, + ["heading"] = 2.1995924992708, + ["groupId"] = 7020, ["groupName"] = "AUSTRALIA air 6", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7032, @@ -1780,23 +1808,23 @@ unitsById = }, -- end of [7032] [7001] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692663, - ["x"] = -286548, + ["y"] = 692292, + ["x"] = -284982, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286548, - ["y"] = 692663, - ["heading"] = 1.4977557600419, + ["x"] = -284982, + ["y"] = 692292, + ["heading"] = 1.4977557593169, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit1", ["unitId"] = 7001, @@ -1804,11 +1832,11 @@ unitsById = }, -- end of [7001] [7017] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -1819,8 +1847,8 @@ unitsById = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 4", - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, ["coalition"] = "blue", ["unitId"] = 7017, ["heading"] = 0, @@ -1832,44 +1860,45 @@ unitsById = ["alt"] = 0, ["point"] = { - ["y"] = 267963, - ["x"] = -165895, + ["y"] = 268107, + ["x"] = -163693, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000078, + ["unitName"] = "AUSTRALIA shp 3 unit1", + ["heading"] = 0, + ["unitId"] = 7033, ["groupName"] = "AUSTRALIA shp 3", ["countryId"] = 21, - ["x"] = -165895, - ["y"] = 267963, - ["heading"] = 0, - ["country"] = "australia", - ["unitName"] = "AUSTRALIA shp 3 unit1", - ["unitId"] = 7033, + ["x"] = -163693, + ["speed"] = 0, ["coalition"] = "neutral", + ["type"] = "PERRY", + ["groupId"] = 7021, + ["y"] = 268107, + ["country"] = "australia", }, -- end of [7033] [7002] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692678, - ["x"] = -286576, + ["y"] = 692208, + ["x"] = -284870, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286576, - ["y"] = 692678, - ["heading"] = 1.4977557629417, + ["x"] = -284870, + ["y"] = 692208, + ["heading"] = 1.4977557696476, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit2", ["unitId"] = 7002, @@ -1888,7 +1917,7 @@ unitsById = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286407, @@ -1901,23 +1930,23 @@ unitsById = }, -- end of [7018] [7034] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692747, - ["x"] = -287036, + ["y"] = 692769, + ["x"] = -287355, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287036, - ["y"] = 692747, - ["heading"] = 1.4977557703724, + ["x"] = -287355, + ["y"] = 692769, + ["heading"] = 1.4977557591357, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit1", ["unitId"] = 7034, @@ -1925,23 +1954,23 @@ unitsById = }, -- end of [7034] [7003] = { - ["alt"] = 63, + ["alt"] = 68, ["point"] = { - ["y"] = 692774, - ["x"] = -286539, + ["y"] = 692374, + ["x"] = -284971, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286539, - ["y"] = 692774, - ["heading"] = 1.497755762398, + ["x"] = -284971, + ["y"] = 692374, + ["heading"] = 1.4977557676538, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit3", ["unitId"] = 7003, @@ -1960,7 +1989,7 @@ unitsById = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286447, @@ -1973,23 +2002,23 @@ unitsById = }, -- end of [7019] [7035] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692716, - ["x"] = -286920, + ["y"] = 692754, + ["x"] = -287476, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -286920, - ["y"] = 692716, - ["heading"] = 1.4977557703724, + ["x"] = -287476, + ["y"] = 692754, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit2", ["unitId"] = 7035, @@ -1997,23 +2026,23 @@ unitsById = }, -- end of [7035] [7004] = { - ["alt"] = 62, + ["alt"] = 68, ["point"] = { - ["y"] = 692553, - ["x"] = -286525, + ["y"] = 692388, + ["x"] = -284932, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286525, - ["y"] = 692553, - ["heading"] = 1.4977557625792, + ["x"] = -284932, + ["y"] = 692388, + ["heading"] = 1.4977557602231, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit4", ["unitId"] = 7004, @@ -2021,10 +2050,10 @@ unitsById = }, -- end of [7004] [7020] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -2033,14 +2062,14 @@ unitsById = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 3 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000069, + ["heading"] = 1.6162179734619, + ["groupId"] = 7012, ["groupName"] = "USA air 3", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7020, @@ -2054,23 +2083,23 @@ unitsById = }, -- end of [7020] [7036] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692580, - ["x"] = -287056, + ["y"] = 692726, + ["x"] = -287538, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287056, - ["y"] = 692580, - ["heading"] = 1.4977557642103, + ["x"] = -287538, + ["y"] = 692726, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit3", ["unitId"] = 7036, @@ -2078,34 +2107,34 @@ unitsById = }, -- end of [7036] [7005] = { - ["alt"] = 61, + ["alt"] = 62, ["type"] = "Sandbox", ["point"] = { - ["y"] = 690788, - ["x"] = -285547, + ["y"] = 693698, + ["x"] = -287512, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 690788, - ["groupName"] = "USA static 1", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285547, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 1", + ["unitId"] = 7005, + ["y"] = 693698, + ["x"] = -287512, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 1", - ["unitId"] = 7005, - ["heading"] = 0, ["groupId"] = 7005, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [7005] [7021] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -2113,14 +2142,14 @@ unitsById = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 4 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000070, + ["heading"] = 2.1995924992708, + ["groupId"] = 7013, ["groupName"] = "AUSTRALIA air 4", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7021, @@ -2134,23 +2163,23 @@ unitsById = }, -- end of [7021] [7037] = { - ["alt"] = 60, + ["alt"] = 59, ["point"] = { - ["y"] = 692752, - ["x"] = -287189, + ["y"] = 692766, + ["x"] = -287511, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287189, - ["y"] = 692752, - ["heading"] = 1.4977557678351, + ["x"] = -287511, + ["y"] = 692766, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit4", ["unitId"] = 7037, @@ -2158,11 +2187,11 @@ unitsById = }, -- end of [7037] [7006] = { - ["alt"] = 72, + ["alt"] = 57, ["point"] = { - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -2173,8 +2202,8 @@ unitsById = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 2", - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, ["coalition"] = "blue", ["unitId"] = 7006, ["heading"] = 0, @@ -2186,10 +2215,11 @@ unitsById = ["alt"] = 0, ["point"] = { - ["y"] = 266588, - ["x"] = -163302, + ["y"] = 267810, + ["x"] = -162283, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 2 unit1", @@ -2197,36 +2227,36 @@ unitsById = ["unitId"] = 7022, ["groupName"] = "AUSTRALIA shp 2", ["countryId"] = 21, - ["x"] = -163302, + ["x"] = -162283, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000071, ["coalition"] = "neutral", - ["y"] = 266588, + ["type"] = "PERRY", + ["groupId"] = 7014, + ["y"] = 267810, ["country"] = "australia", }, -- end of [7022] [7038] = { - ["alt"] = 61, + ["alt"] = 56, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693155, - ["x"] = -287187, + ["y"] = 691971, + ["x"] = -288088, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693155, - ["groupName"] = "USA static 7", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -287187, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 7", + ["unitId"] = 7038, + ["y"] = 691971, + ["x"] = -288088, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 7", - ["unitId"] = 7038, - ["heading"] = 0, ["groupId"] = 7038, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [7038] [7007] = { @@ -2247,30 +2277,30 @@ unitsById = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", }, -- end of [7007] [7023] = { - ["alt"] = 55, + ["alt"] = 73, ["point"] = { - ["y"] = 692563, - ["x"] = -288904, + ["y"] = 691751, + ["x"] = -283221, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288904, - ["y"] = 692563, - ["heading"] = 1.4977557725472, + ["x"] = -283221, + ["y"] = 691751, + ["heading"] = 1.4977557703725, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit1", ["unitId"] = 7023, @@ -2278,11 +2308,11 @@ unitsById = }, -- end of [7023] [7039] = { - ["alt"] = 67, + ["alt"] = 63, ["point"] = { - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -2293,8 +2323,8 @@ unitsById = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 8", - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, ["coalition"] = "blue", ["unitId"] = 7039, ["heading"] = 0, @@ -2320,30 +2350,30 @@ unitsById = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", }, -- end of [7008] [7024] = { - ["alt"] = 56, + ["alt"] = 74, ["point"] = { - ["y"] = 692623, - ["x"] = -288844, + ["y"] = 691898, + ["x"] = -283194, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288844, - ["y"] = 692623, - ["heading"] = 1.4977557660227, + ["x"] = -283194, + ["y"] = 691898, + ["heading"] = 1.4977557634854, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit2", ["unitId"] = 7024, @@ -2368,17 +2398,17 @@ unitsById = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", }, -- end of [7040] [7009] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -2387,14 +2417,14 @@ unitsById = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 1 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000062, + ["heading"] = 1.6162179734619, + ["groupId"] = 7005, ["groupName"] = "USA air 1", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7009, @@ -2408,23 +2438,23 @@ unitsById = }, -- end of [7009] [7025] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692459, - ["x"] = -288865, + ["y"] = 691826, + ["x"] = -283357, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288865, - ["y"] = 692459, - ["heading"] = 1.4977557638479, + ["x"] = -283357, + ["y"] = 691826, + ["heading"] = 1.4977557538798, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit3", ["unitId"] = 7025, @@ -2449,18 +2479,18 @@ unitsById = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", }, -- end of [7041] [7010] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -2468,14 +2498,14 @@ unitsById = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 2 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000063, + ["heading"] = 2.1995924992708, + ["groupId"] = 7006, ["groupName"] = "AUSTRALIA air 2", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7010, @@ -2489,23 +2519,23 @@ unitsById = }, -- end of [7010] [7026] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692675, - ["x"] = -289069, + ["y"] = 691852, + ["x"] = -283362, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -289069, - ["y"] = 692675, - ["heading"] = 1.4977557685601, + ["x"] = -283362, + ["y"] = 691852, + ["heading"] = 1.4977557720036, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit4", ["unitId"] = 7026, @@ -2513,10 +2543,10 @@ unitsById = }, -- end of [7026] [7042] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -2525,14 +2555,14 @@ unitsById = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 7 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000083, + ["heading"] = 1.6162179734619, + ["groupId"] = 7026, ["groupName"] = "USA air 7", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7042, @@ -2549,10 +2579,11 @@ unitsById = ["alt"] = 0, ["point"] = { - ["y"] = 266228, - ["x"] = -161996, + ["y"] = 267081, + ["x"] = -164471, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 1 unit1", @@ -2560,44 +2591,44 @@ unitsById = ["unitId"] = 7011, ["groupName"] = "AUSTRALIA shp 1", ["countryId"] = 21, - ["x"] = -161996, + ["x"] = -164471, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000064, ["coalition"] = "neutral", - ["y"] = 266228, + ["type"] = "PERRY", + ["groupId"] = 7007, + ["y"] = 267081, ["country"] = "australia", }, -- end of [7011] [7027] = { - ["alt"] = 69, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693432, - ["x"] = -285294, + ["y"] = 692897, + ["x"] = -286503, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693432, - ["groupName"] = "USA static 5", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285294, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 5", + ["unitId"] = 7027, + ["y"] = 692897, + ["x"] = -286503, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 5", - ["unitId"] = 7027, - ["heading"] = 0, ["groupId"] = 7027, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of [7027] [7043] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -2605,14 +2636,14 @@ unitsById = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 8 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000084, + ["heading"] = 2.1995924992708, + ["groupId"] = 7027, ["groupName"] = "AUSTRALIA air 8", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7043, @@ -2626,23 +2657,23 @@ unitsById = }, -- end of [7043] [7012] = { - ["alt"] = 60, + ["alt"] = 62, ["point"] = { - ["y"] = 692171, - ["x"] = -286749, + ["y"] = 690419, + ["x"] = -284972, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286749, - ["y"] = 692171, - ["heading"] = 1.4977557591357, + ["x"] = -284972, + ["y"] = 690419, + ["heading"] = 1.4977557640291, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit1", ["unitId"] = 7012, @@ -2650,11 +2681,11 @@ unitsById = }, -- end of [7012] [7028] = { - ["alt"] = 73, + ["alt"] = 62, ["point"] = { - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -2665,8 +2696,8 @@ unitsById = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 6", - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, ["coalition"] = "blue", ["unitId"] = 7028, ["heading"] = 0, @@ -2678,10 +2709,11 @@ unitsById = ["alt"] = 0, ["point"] = { - ["y"] = 268804, - ["x"] = -165342, + ["y"] = 265427, + ["x"] = -164284, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 4 unit1", @@ -2689,33 +2721,33 @@ unitsById = ["unitId"] = 7044, ["groupName"] = "AUSTRALIA shp 4", ["countryId"] = 21, - ["x"] = -165342, + ["x"] = -164284, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000085, ["coalition"] = "neutral", - ["y"] = 268804, + ["type"] = "PERRY", + ["groupId"] = 7028, + ["y"] = 265427, ["country"] = "australia", }, -- end of [7044] [7013] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 692204, - ["x"] = -286580, + ["y"] = 690558, + ["x"] = -284846, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286580, - ["y"] = 692204, - ["heading"] = 1.4977557614918, + ["x"] = -284846, + ["y"] = 690558, + ["heading"] = 1.4977557580482, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit2", ["unitId"] = 7013, @@ -2740,30 +2772,30 @@ unitsById = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", }, -- end of [7029] [7014] = { - ["alt"] = 61, + ["alt"] = 62, ["point"] = { - ["y"] = 692150, - ["x"] = -286560, + ["y"] = 690360, + ["x"] = -285032, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286560, - ["y"] = 692150, - ["heading"] = 1.4977557614918, + ["x"] = -285032, + ["y"] = 690360, + ["heading"] = 1.4977557565984, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit3", ["unitId"] = 7014, diff --git a/Example DBs/mist_DBs_unitsByName.lua b/Example DBs/mist_DBs_unitsByName.lua index 5329c71..41d2f6e 100644 --- a/Example DBs/mist_DBs_unitsByName.lua +++ b/Example DBs/mist_DBs_unitsByName.lua @@ -68,11 +68,11 @@ unitsByName = }, -- end of ["Unit #001"] ["AUSTRALIA air 8 unit1"] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -80,14 +80,14 @@ unitsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 8 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000084, + ["heading"] = 2.1995924992708, + ["groupId"] = 7027, ["groupName"] = "AUSTRALIA air 8", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7043, @@ -101,11 +101,11 @@ unitsByName = }, -- end of ["AUSTRALIA air 8 unit1"] ["Unit #007"] = { - ["alt"] = 61, + ["alt"] = 74, ["point"] = { - ["y"] = 692445, - ["x"] = -287012, + ["y"] = 694877, + ["x"] = -285009, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -115,8 +115,8 @@ unitsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287012, - ["y"] = 692445, + ["x"] = -285009, + ["y"] = 694877, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #007", @@ -181,23 +181,23 @@ unitsByName = }, -- end of ["2ship2"] ["USA gnd 7 unit3"] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692580, - ["x"] = -287056, + ["y"] = 692726, + ["x"] = -287538, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287056, - ["y"] = 692580, - ["heading"] = 1.4977557642103, + ["x"] = -287538, + ["y"] = 692726, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit3", ["unitId"] = 7036, @@ -268,11 +268,11 @@ unitsByName = }, -- end of ["1ship1"] ["Unit #005"] = { - ["alt"] = 60, + ["alt"] = 75, ["point"] = { - ["y"] = 692321, - ["x"] = -286989, + ["y"] = 695084, + ["x"] = -284914, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -282,8 +282,8 @@ unitsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286989, - ["y"] = 692321, + ["x"] = -284914, + ["y"] = 695084, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #005", @@ -314,23 +314,23 @@ unitsByName = }, -- end of ["RuBTRs2"] ["USA gnd 1 unit3"] = { - ["alt"] = 63, + ["alt"] = 68, ["point"] = { - ["y"] = 692774, - ["x"] = -286539, + ["y"] = 692374, + ["x"] = -284971, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286539, - ["y"] = 692774, - ["heading"] = 1.497755762398, + ["x"] = -284971, + ["y"] = 692374, + ["heading"] = 1.4977557676538, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit3", ["unitId"] = 7003, @@ -338,11 +338,11 @@ unitsByName = }, -- end of ["USA gnd 1 unit3"] ["Unit #004"] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692308, - ["x"] = -287213, + ["y"] = 694892, + ["x"] = -285039, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -352,8 +352,8 @@ unitsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287213, - ["y"] = 692308, + ["x"] = -285039, + ["y"] = 694892, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #004", @@ -419,10 +419,10 @@ unitsByName = }, -- end of ["tent #002"] ["USA air 3 unit1"] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -431,14 +431,14 @@ unitsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 3 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000069, + ["heading"] = 1.6162179734619, + ["groupId"] = 7012, ["groupName"] = "USA air 3", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7020, @@ -453,25 +453,25 @@ unitsByName = ["cloneCargoBase"] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 674842.85714285, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cloneCargoBase", - ["groupId"] = 32, - ["countryId"] = 2, - ["mass"] = 1337, ["unitId"] = 46, + ["groupName"] = "cloneCargoBase", + ["countryId"] = 2, + ["y"] = 674842.85714285, + ["mass"] = 1337, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 32, }, -- end of ["cloneCargoBase"] ["USTanks2_1"] = { @@ -497,11 +497,11 @@ unitsByName = }, -- end of ["USTanks2_1"] ["AUSTRALIA air 4 unit1"] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -509,14 +509,14 @@ unitsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 4 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000070, + ["heading"] = 2.1995924992708, + ["groupId"] = 7013, ["groupName"] = "AUSTRALIA air 4", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7021, @@ -541,6 +541,9 @@ unitsByName = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, @@ -552,7 +555,6 @@ unitsByName = ["y"] = 644428.57142857, ["unitId"] = 12, ["heading"] = -0.66079849060746, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -560,6 +562,7 @@ unitsByName = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 7, }, -- end of ["A-10C Client #2_unit"] ["USTanks1_3"] = @@ -584,35 +587,35 @@ unitsByName = ["country"] = "usa", ["skill"] = "Average", }, -- end of ["USTanks1_3"] - ["static_on_ship1 #001"] = + ["RuTent2"] = { - ["heading"] = 0, + ["shape_name"] = "PalatkaB", + ["type"] = "FARP Tent", ["point"] = { - ["y"] = 443849.03844635, - ["x"] = -355322.27295572, + ["y"] = 617319.42857142, + ["x"] = -259804, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443849.03844635, - ["livery_id"] = "USA Marines", - ["groupName"] = "static_on_ship1 #001", - ["coalition"] = "blue", - ["countryId"] = 2, - ["x"] = -355322.27295572, - ["unitId"] = 64, + ["categoryStatic"] = "Fortifications", + ["y"] = 617319.42857142, + ["groupName"] = "RuTent2", + ["coalition"] = "red", + ["countryId"] = 0, + ["x"] = -259804, + ["groupId"] = 19, ["category"] = "static", - ["unitName"] = "static_on_ship1 #001", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 41, - }, -- end of ["static_on_ship1 #001"] + ["unitName"] = "RuTent2", + ["unitId"] = 41, + ["heading"] = 0, + ["country"] = "russia", + }, -- end of ["RuTent2"] ["Unit #006"] = { - ["alt"] = 59, + ["alt"] = 73, ["point"] = { - ["y"] = 692297, - ["x"] = -287225, + ["y"] = 694985, + ["x"] = -285104, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -622,8 +625,8 @@ unitsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287225, - ["y"] = 692297, + ["x"] = -285104, + ["y"] = 694985, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #006", @@ -676,23 +679,23 @@ unitsByName = }, -- end of ["tent"] ["USA gnd 1 unit1"] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692663, - ["x"] = -286548, + ["y"] = 692292, + ["x"] = -284982, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286548, - ["y"] = 692663, - ["heading"] = 1.4977557600419, + ["x"] = -284982, + ["y"] = 692292, + ["heading"] = 1.4977557593169, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit1", ["unitId"] = 7001, @@ -750,50 +753,27 @@ unitsByName = }, -- end of ["Ka-50s_1_1"] ["USA static 7"] = { - ["alt"] = 61, + ["alt"] = 56, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693155, - ["x"] = -287187, + ["y"] = 691971, + ["x"] = -288088, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693155, - ["groupName"] = "USA static 7", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -287187, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 7", + ["unitId"] = 7038, + ["y"] = 691971, + ["x"] = -288088, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 7", - ["unitId"] = 7038, - ["heading"] = 0, ["groupId"] = 7038, - }, -- end of ["USA static 7"] - ["USA static 1"] = - { - ["alt"] = 61, - ["type"] = "Sandbox", - ["point"] = - { - ["y"] = 690788, - ["x"] = -285547, - }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 690788, - ["groupName"] = "USA static 1", - ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285547, - ["coalition"] = "blue", - ["category"] = "static", - ["unitName"] = "USA static 1", - ["unitId"] = 7005, ["heading"] = 0, - ["groupId"] = 7005, - }, -- end of ["USA static 1"] + ["categoryStatic"] = "Fortifications", + }, -- end of ["USA static 7"] ["Ground-1-1"] = { ["heading"] = 0, @@ -816,6 +796,54 @@ unitsByName = ["country"] = "australia", ["skill"] = "Average", }, -- end of ["Ground-1-1"] + ["USA static 1"] = + { + ["alt"] = 62, + ["type"] = "Sandbox", + ["point"] = + { + ["y"] = 693698, + ["x"] = -287512, + }, -- end of ["point"] + ["country"] = "usa", + ["coalitionId"] = 2, + ["coalition"] = "blue", + ["groupName"] = "USA static 1", + ["unitId"] = 7005, + ["y"] = 693698, + ["x"] = -287512, + ["countryId"] = 2, + ["category"] = "static", + ["unitName"] = "USA static 1", + ["groupId"] = 7005, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", + }, -- end of ["USA static 1"] + ["AUSTRALIA shp 4 unit1"] = + { + ["alt"] = 0, + ["point"] = + { + ["y"] = 265427, + ["x"] = -164284, + }, -- end of ["point"] + ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", + ["skill"] = "Average", + ["category"] = "ship", + ["unitName"] = "AUSTRALIA shp 4 unit1", + ["heading"] = 0, + ["unitId"] = 7044, + ["groupName"] = "AUSTRALIA shp 4", + ["countryId"] = 21, + ["x"] = -164284, + ["speed"] = 0, + ["coalition"] = "neutral", + ["type"] = "PERRY", + ["groupId"] = 7028, + ["y"] = 265427, + ["country"] = "australia", + }, -- end of ["AUSTRALIA shp 4 unit1"] ["US Ship #1"] = { ["type"] = "TICONDEROG", @@ -839,11 +867,11 @@ unitsByName = }, -- end of ["US Ship #1"] ["AUSTRALIA air 2 unit1"] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -851,14 +879,14 @@ unitsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 2 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000063, + ["heading"] = 2.1995924992708, + ["groupId"] = 7006, ["groupName"] = "AUSTRALIA air 2", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7010, @@ -889,7 +917,7 @@ unitsByName = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -899,10 +927,11 @@ unitsByName = ["alt"] = 0, ["point"] = { - ["y"] = 266228, - ["x"] = -161996, + ["y"] = 267081, + ["x"] = -164471, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 1 unit1", @@ -910,12 +939,12 @@ unitsByName = ["unitId"] = 7011, ["groupName"] = "AUSTRALIA shp 1", ["countryId"] = 21, - ["x"] = -161996, + ["x"] = -164471, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000064, ["coalition"] = "neutral", - ["y"] = 266228, + ["type"] = "PERRY", + ["groupId"] = 7007, + ["y"] = 267081, ["country"] = "australia", }, -- end of ["AUSTRALIA shp 1 unit1"] ["RuBTRs3"] = @@ -974,77 +1003,78 @@ unitsByName = }, -- end of ["callsign"] ["groupId"] = 4, }, -- end of ["F-15C Client #1_unit"] - ["AUSTRALIA shp 4 unit1"] = + ["AUSTRALIA shp 2 unit1"] = { ["alt"] = 0, ["point"] = { - ["y"] = 268804, - ["x"] = -165342, + ["y"] = 267810, + ["x"] = -162283, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", - ["unitName"] = "AUSTRALIA shp 4 unit1", + ["unitName"] = "AUSTRALIA shp 2 unit1", ["heading"] = 0, - ["unitId"] = 7044, - ["groupName"] = "AUSTRALIA shp 4", + ["unitId"] = 7022, + ["groupName"] = "AUSTRALIA shp 2", ["countryId"] = 21, - ["x"] = -165342, + ["x"] = -162283, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000085, ["coalition"] = "neutral", - ["y"] = 268804, + ["type"] = "PERRY", + ["groupId"] = 7014, + ["y"] = 267810, ["country"] = "australia", - }, -- end of ["AUSTRALIA shp 4 unit1"] + }, -- end of ["AUSTRALIA shp 2 unit1"] ["USA static 3"] = { - ["alt"] = 60, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 691139, - ["x"] = -286038, + ["y"] = 692858, + ["x"] = -286636, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 691139, - ["groupName"] = "USA static 3", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -286038, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 3", + ["unitId"] = 7016, + ["y"] = 692858, + ["x"] = -286636, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 3", - ["unitId"] = 7016, - ["heading"] = 0, ["groupId"] = 7016, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", }, -- end of ["USA static 3"] - ["USA gnd 7 unit1"] = + ["USA gnd 7 unit2"] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692747, - ["x"] = -287036, + ["y"] = 692754, + ["x"] = -287476, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287036, - ["y"] = 692747, - ["heading"] = 1.4977557703724, + ["x"] = -287476, + ["y"] = 692754, + ["heading"] = 1.4977557605856, ["country"] = "usa", - ["unitName"] = "USA gnd 7 unit1", - ["unitId"] = 7034, + ["unitName"] = "USA gnd 7 unit2", + ["unitId"] = 7035, ["coalition"] = "blue", - }, -- end of ["USA gnd 7 unit1"] + }, -- end of ["USA gnd 7 unit2"] ["A-10C Client #1_unit"] = { ["alt"] = 2000, @@ -1058,6 +1088,9 @@ unitsByName = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, @@ -1069,7 +1102,6 @@ unitsByName = ["y"] = 636428.57142857, ["unitId"] = 11, ["heading"] = -0.67060113146646, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -1077,6 +1109,7 @@ unitsByName = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 6, }, -- end of ["A-10C Client #1_unit"] ["Su-33 Client #2Unit"] = @@ -1107,102 +1140,54 @@ unitsByName = ["callsign"] = 105, ["groupId"] = 20, }, -- end of ["Su-33 Client #2Unit"] - ["USA gnd 7 unit2"] = + ["USA gnd 7 unit1"] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692716, - ["x"] = -286920, + ["y"] = 692769, + ["x"] = -287355, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -286920, - ["y"] = 692716, - ["heading"] = 1.4977557703724, + ["x"] = -287355, + ["y"] = 692769, + ["heading"] = 1.4977557591357, ["country"] = "usa", - ["unitName"] = "USA gnd 7 unit2", - ["unitId"] = 7035, + ["unitName"] = "USA gnd 7 unit1", + ["unitId"] = 7034, ["coalition"] = "blue", - }, -- end of ["USA gnd 7 unit2"] + }, -- end of ["USA gnd 7 unit1"] ["USA gnd 7 unit4"] = { - ["alt"] = 60, + ["alt"] = 59, ["point"] = { - ["y"] = 692752, - ["x"] = -287189, + ["y"] = 692766, + ["x"] = -287511, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287189, - ["y"] = 692752, - ["heading"] = 1.4977557678351, + ["x"] = -287511, + ["y"] = 692766, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit4", ["unitId"] = 7037, ["coalition"] = "blue", }, -- end of ["USA gnd 7 unit4"] - ["USA gnd 3 unit1"] = - { - ["alt"] = 60, - ["point"] = - { - ["y"] = 692171, - ["x"] = -286749, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286749, - ["y"] = 692171, - ["heading"] = 1.4977557591357, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit1", - ["unitId"] = 7012, - ["coalition"] = "blue", - }, -- end of ["USA gnd 3 unit1"] - ["USA gnd 4 unit1"] = - { - ["alt"] = 48, - ["point"] = - { - ["y"] = 686871, - ["x"] = -286407, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-113", - ["groupId"] = 1000068, - ["groupName"] = "USA gnd 4", - ["countryId"] = 2, - ["x"] = -286407, - ["y"] = 686871, - ["heading"] = 0, - ["country"] = "usa", - ["unitName"] = "USA gnd 4 unit1", - ["unitId"] = 7018, - ["coalition"] = "blue", - }, -- end of ["USA gnd 4 unit1"] ["USA gnd 8 unit2"] = { ["alt"] = 48, @@ -1222,11 +1207,59 @@ unitsByName = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", }, -- end of ["USA gnd 8 unit2"] + ["USA gnd 4 unit1"] = + { + ["alt"] = 48, + ["point"] = + { + ["y"] = 686871, + ["x"] = -286407, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-113", + ["groupId"] = 7011, + ["groupName"] = "USA gnd 4", + ["countryId"] = 2, + ["x"] = -286407, + ["y"] = 686871, + ["heading"] = 0, + ["country"] = "usa", + ["unitName"] = "USA gnd 4 unit1", + ["unitId"] = 7018, + ["coalition"] = "blue", + }, -- end of ["USA gnd 4 unit1"] + ["USA gnd 8 unit1"] = + { + ["alt"] = 48, + ["point"] = + { + ["y"] = 686871, + ["x"] = -286407, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["unitName"] = "USA gnd 8 unit1", + ["heading"] = 0, + ["unitId"] = 7040, + ["groupName"] = "USA gnd 8", + ["countryId"] = 2, + ["x"] = -286407, + ["speed"] = 0, + ["type"] = "M-113", + ["groupId"] = 7025, + ["coalition"] = "blue", + ["y"] = 686871, + ["country"] = "usa", + }, -- end of ["USA gnd 8 unit1"] ["Su-33 Client #3Unit"] = { ["alt"] = 2000, @@ -1255,30 +1288,31 @@ unitsByName = ["callsign"] = 106, ["groupId"] = 20, }, -- end of ["Su-33 Client #3Unit"] - ["USA gnd 8 unit1"] = + ["AUSTRALIA shp 3 unit1"] = { - ["alt"] = 48, + ["alt"] = 0, ["point"] = { - ["y"] = 686871, - ["x"] = -286407, + ["y"] = 268107, + ["x"] = -163693, }, -- end of ["point"] - ["coalitionId"] = 2, + ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", - ["category"] = "vehicle", - ["unitName"] = "USA gnd 8 unit1", + ["category"] = "ship", + ["unitName"] = "AUSTRALIA shp 3 unit1", ["heading"] = 0, - ["unitId"] = 7040, - ["groupName"] = "USA gnd 8", - ["countryId"] = 2, - ["x"] = -286407, + ["unitId"] = 7033, + ["groupName"] = "AUSTRALIA shp 3", + ["countryId"] = 21, + ["x"] = -163693, ["speed"] = 0, - ["type"] = "M-113", - ["groupId"] = 1000082, - ["coalition"] = "blue", - ["y"] = 686871, - ["country"] = "usa", - }, -- end of ["USA gnd 8 unit1"] + ["coalition"] = "neutral", + ["type"] = "PERRY", + ["groupId"] = 7021, + ["y"] = 268107, + ["country"] = "australia", + }, -- end of ["AUSTRALIA shp 3 unit1"] ["Unit #1"] = { ["heading"] = 0, @@ -1301,30 +1335,29 @@ unitsByName = ["country"] = "usa", ["skill"] = "Average", }, -- end of ["Unit #1"] - ["AUSTRALIA shp 3 unit1"] = + ["USA static 5"] = { - ["alt"] = 0, + ["alt"] = 63, + ["type"] = "Sandbox", ["point"] = { - ["y"] = 267963, - ["x"] = -165895, + ["y"] = 692897, + ["x"] = -286503, }, -- end of ["point"] - ["coalitionId"] = 0, - ["skill"] = "Average", - ["category"] = "ship", - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000078, - ["groupName"] = "AUSTRALIA shp 3", - ["countryId"] = 21, - ["x"] = -165895, - ["y"] = 267963, + ["country"] = "usa", + ["coalitionId"] = 2, + ["coalition"] = "blue", + ["groupName"] = "USA static 5", + ["unitId"] = 7027, + ["y"] = 692897, + ["x"] = -286503, + ["countryId"] = 2, + ["category"] = "static", + ["unitName"] = "USA static 5", + ["groupId"] = 7027, ["heading"] = 0, - ["country"] = "australia", - ["unitName"] = "AUSTRALIA shp 3 unit1", - ["unitId"] = 7033, - ["coalition"] = "neutral", - }, -- end of ["AUSTRALIA shp 3 unit1"] + ["categoryStatic"] = "Fortifications", + }, -- end of ["USA static 5"] ["RuTanks4"] = { ["heading"] = 0, @@ -1369,60 +1402,13 @@ unitsByName = ["country"] = "russia", ["skill"] = "Excellent", }, -- end of ["RuTanks2"] - ["USA static 5"] = - { - ["alt"] = 69, - ["type"] = "Sandbox", - ["point"] = - { - ["y"] = 693432, - ["x"] = -285294, - }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693432, - ["groupName"] = "USA static 5", - ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285294, - ["coalition"] = "blue", - ["category"] = "static", - ["unitName"] = "USA static 5", - ["unitId"] = 7027, - ["heading"] = 0, - ["groupId"] = 7027, - }, -- end of ["USA static 5"] - ["USA gnd 3 unit2"] = - { - ["alt"] = 61, - ["point"] = - { - ["y"] = 692204, - ["x"] = -286580, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286580, - ["y"] = 692204, - ["heading"] = 1.4977557614918, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit2", - ["unitId"] = 7013, - ["coalition"] = "blue", - }, -- end of ["USA gnd 3 unit2"] ["AUSTRALIA air 6 unit1"] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -1430,14 +1416,14 @@ unitsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 6 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000077, + ["heading"] = 2.1995924992708, + ["groupId"] = 7020, ["groupName"] = "AUSTRALIA air 6", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7032, @@ -1449,13 +1435,37 @@ unitsByName = ["name"] = "Enfield11", }, -- end of ["callsign"] }, -- end of ["AUSTRALIA air 6 unit1"] - ["USA static 6"] = + ["USA gnd 3 unit2"] = { - ["alt"] = 73, + ["alt"] = 63, ["point"] = { - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 690558, + ["x"] = -284846, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -284846, + ["y"] = 690558, + ["heading"] = 1.4977557580482, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit2", + ["unitId"] = 7013, + ["coalition"] = "blue", + }, -- end of ["USA gnd 3 unit2"] + ["USA static 6"] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 691602, + ["x"] = -285948, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -1466,8 +1476,8 @@ unitsByName = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 6", - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, ["coalition"] = "blue", ["unitId"] = 7028, ["heading"] = 0, @@ -1493,39 +1503,39 @@ unitsByName = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", }, -- end of ["USA gnd 6 unit2"] - ["USTanks2_4"] = + ["static_on_ship1"] = { - ["heading"] = 1.4977557614926, + ["type"] = "AH-1W", ["point"] = { - ["y"] = 653291.42857143, - ["x"] = -293205.71428571, + ["y"] = 443856.28948724, + ["x"] = -355322.45423175, }, -- end of ["point"] - ["groupId"] = 12, - ["y"] = 653291.42857143, - ["coalition"] = "blue", - ["groupName"] = "USTanks2", - ["type"] = "M-1 Abrams", - ["countryId"] = 2, - ["x"] = -293205.71428571, - ["unitId"] = 26, - ["category"] = "vehicle", - ["unitName"] = "USTanks2_4", - ["playerCanDrive"] = true, ["country"] = "usa", - ["skill"] = "Average", - }, -- end of ["USTanks2_4"] + ["coalition"] = "blue", + ["livery_id"] = "USA Marines", + ["groupName"] = "static_on_ship1", + ["countryId"] = 2, + ["y"] = 443856.28948724, + ["x"] = -355322.45423175, + ["groupId"] = 40, + ["category"] = "static", + ["unitName"] = "static_on_ship1", + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 63, + }, -- end of ["static_on_ship1"] ["USA air 5 unit1"] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1534,14 +1544,14 @@ unitsByName = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 5 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000076, + ["heading"] = 1.6162179734619, + ["groupId"] = 7019, ["groupName"] = "USA air 5", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7031, @@ -1553,6 +1563,30 @@ unitsByName = ["name"] = "Colt11", }, -- end of ["callsign"] }, -- end of ["USA air 5 unit1"] + ["USA gnd 5 unit4"] = + { + ["alt"] = 72, + ["point"] = + { + ["y"] = 691852, + ["x"] = -283362, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7015, + ["groupName"] = "USA gnd 5", + ["countryId"] = 2, + ["x"] = -283362, + ["y"] = 691852, + ["heading"] = 1.4977557720036, + ["country"] = "usa", + ["unitName"] = "USA gnd 5 unit4", + ["unitId"] = 7026, + ["coalition"] = "blue", + }, -- end of ["USA gnd 5 unit4"] ["RuBTRs5"] = { ["heading"] = -1.7994767003775, @@ -1575,30 +1609,30 @@ unitsByName = ["country"] = "russia", ["skill"] = "Average", }, -- end of ["RuBTRs5"] - ["USA gnd 5 unit4"] = + ["USA gnd 5 unit3"] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692675, - ["x"] = -289069, + ["y"] = 691826, + ["x"] = -283357, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -289069, - ["y"] = 692675, - ["heading"] = 1.4977557685601, + ["x"] = -283357, + ["y"] = 691826, + ["heading"] = 1.4977557538798, ["country"] = "usa", - ["unitName"] = "USA gnd 5 unit4", - ["unitId"] = 7026, + ["unitName"] = "USA gnd 5 unit3", + ["unitId"] = 7025, ["coalition"] = "blue", - }, -- end of ["USA gnd 5 unit4"] + }, -- end of ["USA gnd 5 unit3"] ["AH-1s_1_1"] = { ["alt"] = 500, @@ -1699,54 +1733,54 @@ unitsByName = ["heading"] = 0, ["country"] = "usa", }, -- end of ["static"] - ["USA gnd 5 unit3"] = - { - ["alt"] = 55, - ["point"] = - { - ["y"] = 692459, - ["x"] = -288865, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, - ["groupName"] = "USA gnd 5", - ["countryId"] = 2, - ["x"] = -288865, - ["y"] = 692459, - ["heading"] = 1.4977557638479, - ["country"] = "usa", - ["unitName"] = "USA gnd 5 unit3", - ["unitId"] = 7025, - ["coalition"] = "blue", - }, -- end of ["USA gnd 5 unit3"] ["USA gnd 5 unit2"] = { - ["alt"] = 56, + ["alt"] = 74, ["point"] = { - ["y"] = 692623, - ["x"] = -288844, + ["y"] = 691898, + ["x"] = -283194, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288844, - ["y"] = 692623, - ["heading"] = 1.4977557660227, + ["x"] = -283194, + ["y"] = 691898, + ["heading"] = 1.4977557634854, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit2", ["unitId"] = 7024, ["coalition"] = "blue", }, -- end of ["USA gnd 5 unit2"] + ["USA gnd 5 unit1"] = + { + ["alt"] = 73, + ["point"] = + { + ["y"] = 691751, + ["x"] = -283221, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7015, + ["groupName"] = "USA gnd 5", + ["countryId"] = 2, + ["x"] = -283221, + ["y"] = 691751, + ["heading"] = 1.4977557703725, + ["country"] = "usa", + ["unitName"] = "USA gnd 5 unit1", + ["unitId"] = 7023, + ["coalition"] = "blue", + }, -- end of ["USA gnd 5 unit1"] ["tent #001"] = { ["shape_name"] = "teplowoz", @@ -1768,30 +1802,28 @@ unitsByName = ["heading"] = 0, ["unitId"] = 61, }, -- end of ["tent #001"] - ["USA gnd 5 unit1"] = + ["RuBTRs1"] = { - ["alt"] = 55, + ["heading"] = -1.7994767003775, ["point"] = { - ["y"] = 692563, - ["x"] = -288904, + ["y"] = 654545.71428571, + ["x"] = -292842.85714286, }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", + ["groupId"] = 13, + ["y"] = 654545.71428571, + ["coalition"] = "red", + ["groupName"] = "RuBTRs", + ["type"] = "BTR-80", + ["countryId"] = 0, + ["x"] = -292842.85714286, + ["unitId"] = 27, ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, - ["groupName"] = "USA gnd 5", - ["countryId"] = 2, - ["x"] = -288904, - ["y"] = 692563, - ["heading"] = 1.4977557725472, - ["country"] = "usa", - ["unitName"] = "USA gnd 5 unit1", - ["unitId"] = 7023, - ["coalition"] = "blue", - }, -- end of ["USA gnd 5 unit1"] + ["unitName"] = "RuBTRs1", + ["playerCanDrive"] = true, + ["country"] = "russia", + ["skill"] = "Average", + }, -- end of ["RuBTRs1"] ["USTanks1_2"] = { ["heading"] = 0, @@ -1848,6 +1880,350 @@ unitsByName = }, -- end of ["callsign"] ["groupId"] = 34, }, -- end of ["Pilot #001"] + ["USA gnd 3 unit4"] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 690314, + ["x"] = -284956, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -284956, + ["y"] = 690314, + ["heading"] = 1.497755755511, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit4", + ["unitId"] = 7015, + ["coalition"] = "blue", + }, -- end of ["USA gnd 3 unit4"] + ["USA gnd 3 unit3"] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 690360, + ["x"] = -285032, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -285032, + ["y"] = 690360, + ["heading"] = 1.4977557565984, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit3", + ["unitId"] = 7014, + ["coalition"] = "blue", + }, -- end of ["USA gnd 3 unit3"] + ["USA gnd 3 unit1"] = + { + ["alt"] = 62, + ["point"] = + { + ["y"] = 690419, + ["x"] = -284972, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7008, + ["groupName"] = "USA gnd 3", + ["countryId"] = 2, + ["x"] = -284972, + ["y"] = 690419, + ["heading"] = 1.4977557640291, + ["country"] = "usa", + ["unitName"] = "USA gnd 3 unit1", + ["unitId"] = 7012, + ["coalition"] = "blue", + }, -- end of ["USA gnd 3 unit1"] + ["US Ship #2"] = + { + ["type"] = "TICONDEROG", + ["point"] = + { + ["y"] = 444653.03529495, + ["x"] = -356079.94684414, + }, -- end of ["point"] + ["groupId"] = 8, + ["y"] = 444653.03529495, + ["skill"] = "Average", + ["coalition"] = "blue", + ["countryId"] = 2, + ["x"] = -356079.94684414, + ["unitId"] = 14, + ["category"] = "ship", + ["unitName"] = "US Ship #2", + ["heading"] = 0, + ["country"] = "usa", + ["groupName"] = "US Ships", + }, -- end of ["US Ship #2"] + ["USA air 7 unit1"] = + { + ["alt"] = 1997, + ["point"] = + { + ["y"] = 682727, + ["x"] = -288608, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["coalitionId"] = 2, + ["livery_id"] = "usaf standard", + ["skill"] = "High", + ["category"] = "plane", + ["unitName"] = "USA air 7 unit1", + ["heading"] = 1.6162179734619, + ["groupId"] = 7026, + ["groupName"] = "USA air 7", + ["speed"] = 138.85196364465, + ["countryId"] = 2, + ["x"] = -288608, + ["coalition"] = "blue", + ["y"] = 682727, + ["country"] = "usa", + ["type"] = "B-52H", + ["unitId"] = 7042, + ["callsign"] = + { + [1] = 4, + [2] = 1, + [3] = 1, + ["name"] = "Colt11", + }, -- end of ["callsign"] + }, -- end of ["USA air 7 unit1"] + ["USA static 4"] = + { + ["alt"] = 63, + ["point"] = + { + ["y"] = 694197, + ["x"] = -287544, + }, -- end of ["point"] + ["categoryStatic"] = "Cargos", + ["coalitionId"] = 2, + ["mass"] = 1337, + ["category"] = "static", + ["unitName"] = "USA static 4", + ["shape_name"] = "ab-212_cargo", + ["type"] = "uh1h_cargo", + ["country"] = "usa", + ["groupName"] = "USA static 4", + ["y"] = 694197, + ["x"] = -287544, + ["coalition"] = "blue", + ["unitId"] = 7017, + ["heading"] = 0, + ["countryId"] = 2, + ["groupId"] = 7017, + }, -- end of ["USA static 4"] + ["tent2"] = + { + ["shape_name"] = "PalatkaB", + ["type"] = "FARP Tent", + ["point"] = + { + ["y"] = 638620, + ["x"] = -299814.28571429, + }, -- end of ["point"] + ["categoryStatic"] = "Fortifications", + ["y"] = 638620, + ["groupName"] = "tent2", + ["coalition"] = "blue", + ["countryId"] = 2, + ["x"] = -299814.28571429, + ["groupId"] = 16, + ["category"] = "static", + ["unitName"] = "tent2", + ["unitId"] = 38, + ["heading"] = 0, + ["country"] = "usa", + }, -- end of ["tent2"] + ["RU Farp"] = + { + ["type"] = "FARP", + ["point"] = + { + ["y"] = 617591.42857143, + ["x"] = -258442.85714286, + }, -- end of ["point"] + ["categoryStatic"] = "Heliports", + ["y"] = 617591.42857143, + ["groupName"] = "RU Farp", + ["coalition"] = "red", + ["countryId"] = 0, + ["x"] = -258442.85714286, + ["groupId"] = 17, + ["category"] = "static", + ["unitName"] = "RU Farp", + ["unitId"] = 39, + ["heading"] = 0, + ["country"] = "russia", + }, -- end of ["RU Farp"] + ["Unit #002"] = + { + ["alt"] = 74, + ["point"] = + { + ["y"] = 694968, + ["x"] = -285046, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "Hawk tr", + ["groupId"] = 35, + ["groupName"] = "teleGroup", + ["countryId"] = 2, + ["x"] = -285046, + ["y"] = 694968, + ["heading"] = 0, + ["country"] = "usa", + ["unitName"] = "Unit #002", + ["unitId"] = 52, + ["coalition"] = "blue", + }, -- end of ["Unit #002"] + ["USA gnd 2 unit2"] = + { + ["alt"] = 48, + ["point"] = + { + ["y"] = 686871, + ["x"] = -286447, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["unitName"] = "USA gnd 2 unit2", + ["heading"] = 0, + ["unitId"] = 7008, + ["groupName"] = "USA gnd 2", + ["countryId"] = 2, + ["x"] = -286447, + ["speed"] = 0, + ["type"] = "M-113", + ["groupId"] = 7004, + ["coalition"] = "blue", + ["y"] = 686871, + ["country"] = "usa", + }, -- end of ["USA gnd 2 unit2"] + ["cargoBob"] = + { + ["shape_name"] = "ab-212_cargo", + ["heading"] = 0, + ["point"] = + { + ["y"] = 675199.99999999, + ["x"] = -292007.14285714, + }, -- end of ["point"] + ["country"] = "usa", + ["coalition"] = "blue", + ["unitId"] = 45, + ["groupName"] = "cargoBob", + ["countryId"] = 2, + ["y"] = 675199.99999999, + ["mass"] = 371, + ["categoryStatic"] = "Cargos", + ["category"] = "static", + ["unitName"] = "cargoBob", + ["x"] = -292007.14285714, + ["type"] = "uh1h_cargo", + ["groupId"] = 31, + }, -- end of ["cargoBob"] + ["USA air 1 unit1"] = + { + ["alt"] = 1997, + ["point"] = + { + ["y"] = 682727, + ["x"] = -288608, + }, -- end of ["point"] + ["alt_type"] = "BARO", + ["coalitionId"] = 2, + ["livery_id"] = "usaf standard", + ["skill"] = "High", + ["category"] = "plane", + ["unitName"] = "USA air 1 unit1", + ["heading"] = 1.6162179734619, + ["groupId"] = 7005, + ["groupName"] = "USA air 1", + ["speed"] = 138.85196364465, + ["countryId"] = 2, + ["x"] = -288608, + ["coalition"] = "blue", + ["y"] = 682727, + ["country"] = "usa", + ["type"] = "B-52H", + ["unitId"] = 7009, + ["callsign"] = + { + [1] = 4, + [2] = 1, + [3] = 1, + ["name"] = "Colt11", + }, -- end of ["callsign"] + }, -- end of ["USA air 1 unit1"] + ["USA gnd 1 unit4"] = + { + ["alt"] = 68, + ["point"] = + { + ["y"] = 692388, + ["x"] = -284932, + }, -- end of ["point"] + ["coalitionId"] = 2, + ["skill"] = "Average", + ["category"] = "vehicle", + ["speed"] = 0, + ["type"] = "M-1 Abrams", + ["groupId"] = 7001, + ["groupName"] = "USA gnd 1", + ["countryId"] = 2, + ["x"] = -284932, + ["y"] = 692388, + ["heading"] = 1.4977557602231, + ["country"] = "usa", + ["unitName"] = "USA gnd 1 unit4", + ["unitId"] = 7004, + ["coalition"] = "blue", + }, -- end of ["USA gnd 1 unit4"] + ["RuTanks3"] = + { + ["heading"] = 0, + ["point"] = + { + ["y"] = 628757.14285714, + ["x"] = -273522.85714286, + }, -- end of ["point"] + ["groupId"] = 14, + ["y"] = 628757.14285714, + ["coalition"] = "red", + ["groupName"] = "RuTanks", + ["type"] = "T-55", + ["countryId"] = 0, + ["x"] = -273522.85714286, + ["unitId"] = 35, + ["category"] = "vehicle", + ["unitName"] = "RuTanks3", + ["playerCanDrive"] = true, + ["country"] = "russia", + ["skill"] = "Excellent", + }, -- end of ["RuTanks3"] ["AH-1s_1_2"] = { ["alt"] = 500, @@ -1882,394 +2258,71 @@ unitsByName = }, -- end of ["callsign"] ["groupId"] = 1, }, -- end of ["AH-1s_1_2"] - ["USA gnd 3 unit4"] = + ["Aerial-1-1"] = { - ["alt"] = 60, + ["alt"] = 2000, ["point"] = { - ["y"] = 691995, - ["x"] = -286713, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286713, - ["y"] = 691995, - ["heading"] = 1.4977557627604, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit4", - ["unitId"] = 7015, - ["coalition"] = "blue", - }, -- end of ["USA gnd 3 unit4"] - ["USA gnd 3 unit3"] = - { - ["alt"] = 61, - ["point"] = - { - ["y"] = 692150, - ["x"] = -286560, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, - ["groupName"] = "USA gnd 3", - ["countryId"] = 2, - ["x"] = -286560, - ["y"] = 692150, - ["heading"] = 1.4977557614918, - ["country"] = "usa", - ["unitName"] = "USA gnd 3 unit3", - ["unitId"] = 7014, - ["coalition"] = "blue", - }, -- end of ["USA gnd 3 unit3"] - ["US Ship #2"] = - { - ["type"] = "TICONDEROG", - ["point"] = - { - ["y"] = 444653.03529495, - ["x"] = -356079.94684414, - }, -- end of ["point"] - ["groupId"] = 8, - ["y"] = 444653.03529495, - ["skill"] = "Average", - ["coalition"] = "blue", - ["countryId"] = 2, - ["x"] = -356079.94684414, - ["unitId"] = 14, - ["category"] = "ship", - ["unitName"] = "US Ship #2", - ["heading"] = 0, - ["country"] = "usa", - ["groupName"] = "US Ships", - }, -- end of ["US Ship #2"] - ["USA air 7 unit1"] = - { - ["alt"] = 1996, - ["point"] = - { - ["y"] = 682741, - ["x"] = -288608, + ["y"] = 319582.08692347, + ["x"] = -198551.02959497, }, -- end of ["point"] ["alt_type"] = "BARO", - ["coalitionId"] = 2, - ["livery_id"] = "usaf standard", - ["skill"] = "High", + ["livery_id"] = "Australian 75th Squadron", + ["onboard_num"] = "010", ["category"] = "plane", - ["unitName"] = "USA air 7 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000083, - ["groupName"] = "USA air 7", - ["speed"] = 138.82033106075, - ["countryId"] = 2, - ["x"] = -288608, - ["coalition"] = "blue", - ["y"] = 682741, - ["country"] = "usa", - ["type"] = "B-52H", - ["unitId"] = 7042, + ["speed"] = 180.55555555556, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] + ["type"] = "FA-18C_hornet", + ["country"] = "australia", + ["psi"] = -2.1995926132104, + ["unitName"] = "Aerial-1-1", + ["groupName"] = "cloneNeut", + ["coalition"] = "neutral", + ["countryId"] = 21, + ["x"] = -198551.02959497, + ["y"] = 319582.08692347, + ["unitId"] = 65, + ["heading"] = 2.1995926132104, ["callsign"] = { - [1] = 4, + [1] = 1, [2] = 1, [3] = 1, - ["name"] = "Colt11", + ["name"] = "Enfield11", }, -- end of ["callsign"] - }, -- end of ["USA air 7 unit1"] - ["AUSTRALIA shp 2 unit1"] = + ["skill"] = "High", + ["groupId"] = 42, + }, -- end of ["Aerial-1-1"] + ["Ka-50s_1_2"] = { - ["alt"] = 0, + ["alt"] = 500, ["point"] = { - ["y"] = 266588, - ["x"] = -163302, - }, -- end of ["point"] - ["coalitionId"] = 0, - ["skill"] = "Average", - ["category"] = "ship", - ["unitName"] = "AUSTRALIA shp 2 unit1", - ["heading"] = 0, - ["unitId"] = 7022, - ["groupName"] = "AUSTRALIA shp 2", - ["countryId"] = 21, - ["x"] = -163302, - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000071, - ["coalition"] = "neutral", - ["y"] = 266588, - ["country"] = "australia", - }, -- end of ["AUSTRALIA shp 2 unit1"] - ["tent2"] = - { - ["shape_name"] = "PalatkaB", - ["type"] = "FARP Tent", - ["point"] = - { - ["y"] = 638620, - ["x"] = -299814.28571429, - }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["y"] = 638620, - ["groupName"] = "tent2", - ["coalition"] = "blue", - ["countryId"] = 2, - ["x"] = -299814.28571429, - ["groupId"] = 16, - ["category"] = "static", - ["unitName"] = "tent2", - ["unitId"] = 38, - ["heading"] = 0, - ["country"] = "usa", - }, -- end of ["tent2"] - ["USA static 4"] = - { - ["alt"] = 61, - ["point"] = - { - ["y"] = 693989, - ["x"] = -288108, - }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["coalitionId"] = 2, - ["mass"] = 1337, - ["category"] = "static", - ["unitName"] = "USA static 4", - ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", - ["country"] = "usa", - ["groupName"] = "USA static 4", - ["y"] = 693989, - ["x"] = -288108, - ["coalition"] = "blue", - ["unitId"] = 7017, - ["heading"] = 0, - ["countryId"] = 2, - ["groupId"] = 7017, - }, -- end of ["USA static 4"] - ["Unit #002"] = - { - ["alt"] = 60, - ["point"] = - { - ["y"] = 692389, - ["x"] = -287110, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "Hawk tr", - ["groupId"] = 35, - ["groupName"] = "teleGroup", - ["countryId"] = 2, - ["x"] = -287110, - ["y"] = 692389, - ["heading"] = 0, - ["country"] = "usa", - ["unitName"] = "Unit #002", - ["unitId"] = 52, - ["coalition"] = "blue", - }, -- end of ["Unit #002"] - ["RU Farp"] = - { - ["type"] = "FARP", - ["point"] = - { - ["y"] = 617591.42857143, - ["x"] = -258442.85714286, - }, -- end of ["point"] - ["categoryStatic"] = "Heliports", - ["y"] = 617591.42857143, - ["groupName"] = "RU Farp", - ["coalition"] = "red", - ["countryId"] = 0, - ["x"] = -258442.85714286, - ["groupId"] = 17, - ["category"] = "static", - ["unitName"] = "RU Farp", - ["unitId"] = 39, - ["heading"] = 0, - ["country"] = "russia", - }, -- end of ["RU Farp"] - ["cargoBob"] = - { - ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", - ["point"] = - { - ["y"] = 675199.99999999, - ["x"] = -292007.14285714, - }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 675199.99999999, - ["coalition"] = "blue", - ["groupName"] = "cargoBob", - ["groupId"] = 31, - ["countryId"] = 2, - ["mass"] = 371, - ["unitId"] = 45, - ["category"] = "static", - ["unitName"] = "cargoBob", - ["x"] = -292007.14285714, - ["heading"] = 0, - ["country"] = "usa", - }, -- end of ["cargoBob"] - ["USA gnd 2 unit2"] = - { - ["alt"] = 48, - ["point"] = - { - ["y"] = 686871, - ["x"] = -286447, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["unitName"] = "USA gnd 2 unit2", - ["heading"] = 0, - ["unitId"] = 7008, - ["groupName"] = "USA gnd 2", - ["countryId"] = 2, - ["x"] = -286447, - ["speed"] = 0, - ["type"] = "M-113", - ["groupId"] = 1000061, - ["coalition"] = "blue", - ["y"] = 686871, - ["country"] = "usa", - }, -- end of ["USA gnd 2 unit2"] - ["USA air 1 unit1"] = - { - ["alt"] = 1996, - ["point"] = - { - ["y"] = 682741, - ["x"] = -288608, + ["y"] = 615040, + ["x"] = -237611.42857143, }, -- end of ["point"] ["alt_type"] = "BARO", - ["coalitionId"] = 2, - ["livery_id"] = "usaf standard", - ["skill"] = "High", - ["category"] = "plane", - ["unitName"] = "USA air 1 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000062, - ["groupName"] = "USA air 1", - ["speed"] = 138.82033106075, - ["countryId"] = 2, - ["x"] = -288608, - ["coalition"] = "blue", - ["y"] = 682741, - ["country"] = "usa", - ["type"] = "B-52H", - ["unitId"] = 7009, - ["callsign"] = - { - [1] = 4, - [2] = 1, - [3] = 1, - ["name"] = "Colt11", - }, -- end of ["callsign"] - }, -- end of ["USA air 1 unit1"] - ["RuTanks3"] = - { - ["heading"] = 0, - ["point"] = - { - ["y"] = 628757.14285714, - ["x"] = -273522.85714286, - }, -- end of ["point"] - ["groupId"] = 14, - ["y"] = 628757.14285714, - ["coalition"] = "red", - ["groupName"] = "RuTanks", - ["type"] = "T-55", - ["countryId"] = 0, - ["x"] = -273522.85714286, - ["unitId"] = 35, - ["category"] = "vehicle", - ["unitName"] = "RuTanks3", - ["playerCanDrive"] = true, + ["livery_id"] = "Russia Demo #024", + ["onboard_num"] = "51", + ["category"] = "helicopter", + ["speed"] = 55.555555555556, + ["type"] = "Ka-50", ["country"] = "russia", - ["skill"] = "Excellent", - }, -- end of ["RuTanks3"] - ["USA gnd 1 unit4"] = - { - ["alt"] = 62, - ["point"] = - { - ["y"] = 692553, - ["x"] = -286525, - }, -- end of ["point"] - ["coalitionId"] = 2, - ["skill"] = "Average", - ["category"] = "vehicle", - ["speed"] = 0, - ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, - ["groupName"] = "USA gnd 1", - ["countryId"] = 2, - ["x"] = -286525, - ["y"] = 692553, - ["heading"] = 1.4977557625792, - ["country"] = "usa", - ["unitName"] = "USA gnd 1 unit4", - ["unitId"] = 7004, - ["coalition"] = "blue", - }, -- end of ["USA gnd 1 unit4"] - ["static_on_ship1"] = - { - ["heading"] = 0, - ["point"] = - { - ["y"] = 443856.28948724, - ["x"] = -355322.45423175, - }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443856.28948724, - ["livery_id"] = "USA Marines", - ["groupName"] = "static_on_ship1", - ["coalition"] = "blue", - ["countryId"] = 2, - ["x"] = -355322.45423175, - ["unitId"] = 63, - ["category"] = "static", - ["unitName"] = "static_on_ship1", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 40, - }, -- end of ["static_on_ship1"] - ["Static Cafe-1"] = - { - ["shape_name"] = "stolovaya", - ["type"] = "Cafe", - ["point"] = - { - ["y"] = 464123.689023, - ["x"] = -115514.59796101, - }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["y"] = 464123.689023, - ["groupName"] = "Static Cafe-1", - ["coalition"] = "neutral", - ["countryId"] = 21, - ["x"] = -115514.59796101, - ["groupId"] = 46, - ["category"] = "static", - ["unitName"] = "Static Cafe-1", - ["unitId"] = 69, - ["heading"] = 0, - ["country"] = "australia", - }, -- end of ["Static Cafe-1"] + ["psi"] = -2.5953630185698, + ["unitName"] = "Ka-50s_1_2", + ["groupName"] = "Ka-50s_1", + ["coalition"] = "red", + ["countryId"] = 0, + ["x"] = -237611.42857143, + ["y"] = 615040, + ["unitId"] = 4, + ["heading"] = 2.5953630185698, + ["skill"] = "High", + ["callsign"] = 101, + ["groupId"] = 2, + }, -- end of ["Ka-50s_1_2"] ["F-15C Client #2_unit"] = { ["alt"] = 2000, @@ -2304,56 +2357,50 @@ unitsByName = }, -- end of ["callsign"] ["groupId"] = 5, }, -- end of ["F-15C Client #2_unit"] - ["Ka-50s_1_2"] = + ["USTanks2_4"] = { - ["alt"] = 500, + ["heading"] = 1.4977557614926, ["point"] = { - ["y"] = 615040, - ["x"] = -237611.42857143, + ["y"] = 653291.42857143, + ["x"] = -293205.71428571, }, -- end of ["point"] - ["alt_type"] = "BARO", - ["livery_id"] = "Russia Demo #024", - ["onboard_num"] = "51", - ["category"] = "helicopter", - ["speed"] = 55.555555555556, - ["type"] = "Ka-50", - ["country"] = "russia", - ["psi"] = -2.5953630185698, - ["unitName"] = "Ka-50s_1_2", - ["groupName"] = "Ka-50s_1", - ["coalition"] = "red", - ["countryId"] = 0, - ["x"] = -237611.42857143, - ["y"] = 615040, - ["unitId"] = 4, - ["heading"] = 2.5953630185698, - ["skill"] = "High", - ["callsign"] = 101, - ["groupId"] = 2, - }, -- end of ["Ka-50s_1_2"] - ["RuBTRs1"] = - { - ["heading"] = -1.7994767003775, - ["point"] = - { - ["y"] = 654545.71428571, - ["x"] = -292842.85714286, - }, -- end of ["point"] - ["groupId"] = 13, - ["y"] = 654545.71428571, - ["coalition"] = "red", - ["groupName"] = "RuBTRs", - ["type"] = "BTR-80", - ["countryId"] = 0, - ["x"] = -292842.85714286, - ["unitId"] = 27, + ["groupId"] = 12, + ["y"] = 653291.42857143, + ["coalition"] = "blue", + ["groupName"] = "USTanks2", + ["type"] = "M-1 Abrams", + ["countryId"] = 2, + ["x"] = -293205.71428571, + ["unitId"] = 26, ["category"] = "vehicle", - ["unitName"] = "RuBTRs1", + ["unitName"] = "USTanks2_4", ["playerCanDrive"] = true, - ["country"] = "russia", + ["country"] = "usa", ["skill"] = "Average", - }, -- end of ["RuBTRs1"] + }, -- end of ["USTanks2_4"] + ["Static Cafe-1"] = + { + ["shape_name"] = "stolovaya", + ["type"] = "Cafe", + ["point"] = + { + ["y"] = 464123.689023, + ["x"] = -115514.59796101, + }, -- end of ["point"] + ["categoryStatic"] = "Fortifications", + ["y"] = 464123.689023, + ["groupName"] = "Static Cafe-1", + ["coalition"] = "neutral", + ["countryId"] = 21, + ["x"] = -115514.59796101, + ["groupId"] = 46, + ["category"] = "static", + ["unitName"] = "Static Cafe-1", + ["unitId"] = 69, + ["heading"] = 0, + ["country"] = "australia", + }, -- end of ["Static Cafe-1"] ["USTanks1_4"] = { ["heading"] = 0, @@ -2395,7 +2442,7 @@ unitsByName = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", @@ -2436,47 +2483,47 @@ unitsByName = ["skill"] = "Random", ["groupId"] = 3, }, -- end of ["Mi-8s_1_1"] - ["RuTanks1"] = + ["Ground-2-1"] = { - ["heading"] = 0, + ["heading"] = 2.3261877017598, ["point"] = { - ["y"] = 628677.14285714, - ["x"] = -273442.85714286, + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, }, -- end of ["point"] - ["groupId"] = 14, - ["y"] = 628677.14285714, - ["coalition"] = "red", - ["groupName"] = "RuTanks", - ["type"] = "T-55", - ["countryId"] = 0, - ["x"] = -273442.85714286, - ["unitId"] = 33, + ["groupId"] = 47, + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["groupName"] = "poly", + ["type"] = "AAV7", + ["countryId"] = 2, + ["x"] = -244729.2581753, + ["unitId"] = 70, ["category"] = "vehicle", - ["unitName"] = "RuTanks1", + ["unitName"] = "Ground-2-1", ["playerCanDrive"] = true, - ["country"] = "russia", - ["skill"] = "Excellent", - }, -- end of ["RuTanks1"] + ["country"] = "usa", + ["skill"] = "Average", + }, -- end of ["Ground-2-1"] ["USA gnd 1 unit2"] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692678, - ["x"] = -286576, + ["y"] = 692208, + ["x"] = -284870, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286576, - ["y"] = 692678, - ["heading"] = 1.4977557629417, + ["x"] = -284870, + ["y"] = 692208, + ["heading"] = 1.4977557696476, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit2", ["unitId"] = 7002, @@ -2495,7 +2542,7 @@ unitsByName = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286447, @@ -2508,11 +2555,11 @@ unitsByName = }, -- end of ["USA gnd 4 unit2"] ["Unit #008"] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692311, - ["x"] = -287237, + ["y"] = 694952, + ["x"] = -284964, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2522,8 +2569,8 @@ unitsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287237, - ["y"] = 692311, + ["x"] = -284964, + ["y"] = 694952, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #008", @@ -2558,43 +2605,28 @@ unitsByName = ["callsign"] = 104, ["groupId"] = 20, }, -- end of ["Su-33 Client #1Unit"] - ["Aerial-1-1"] = + ["RuTanks1"] = { - ["alt"] = 2000, + ["heading"] = 0, ["point"] = { - ["y"] = 319582.08692347, - ["x"] = -198551.02959497, + ["y"] = 628677.14285714, + ["x"] = -273442.85714286, }, -- end of ["point"] - ["alt_type"] = "BARO", - ["livery_id"] = "Australian 75th Squadron", - ["onboard_num"] = "010", - ["category"] = "plane", - ["speed"] = 180.55555555556, - ["AddPropAircraft"] = - { - }, -- end of ["AddPropAircraft"] - ["type"] = "FA-18C_hornet", - ["country"] = "australia", - ["psi"] = -2.1995926132104, - ["unitName"] = "Aerial-1-1", - ["groupName"] = "cloneNeut", - ["coalition"] = "neutral", - ["countryId"] = 21, - ["x"] = -198551.02959497, - ["y"] = 319582.08692347, - ["unitId"] = 65, - ["heading"] = 2.1995926132104, - ["callsign"] = - { - [1] = 1, - [2] = 1, - [3] = 1, - ["name"] = "Enfield11", - }, -- end of ["callsign"] - ["skill"] = "High", - ["groupId"] = 42, - }, -- end of ["Aerial-1-1"] + ["groupId"] = 14, + ["y"] = 628677.14285714, + ["coalition"] = "red", + ["groupName"] = "RuTanks", + ["type"] = "T-55", + ["countryId"] = 0, + ["x"] = -273442.85714286, + ["unitId"] = 33, + ["category"] = "vehicle", + ["unitName"] = "RuTanks1", + ["playerCanDrive"] = true, + ["country"] = "russia", + ["skill"] = "Excellent", + }, -- end of ["RuTanks1"] ["RuBTRs6"] = { ["heading"] = -1.7994767003775, @@ -2619,11 +2651,11 @@ unitsByName = }, -- end of ["RuBTRs6"] ["Unit #003"] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692345, - ["x"] = -286935, + ["y"] = 695126, + ["x"] = -285098, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -2633,8 +2665,8 @@ unitsByName = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286935, - ["y"] = 692345, + ["x"] = -285098, + ["y"] = 695126, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #003", @@ -2646,8 +2678,8 @@ unitsByName = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -2656,15 +2688,15 @@ unitsByName = ["speed"] = 44.444444444444, ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["unitName"] = "Rotary-1-1", ["groupName"] = "nH", ["coalition"] = "neutral", ["countryId"] = 21, - ["x"] = -155967.80633993, - ["y"] = 405888.85058741, + ["x"] = -158700.87914814, + ["y"] = 404406.46136648, ["unitId"] = 68, - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["skill"] = "High", ["callsign"] = { @@ -2697,35 +2729,35 @@ unitsByName = ["country"] = "russia", ["skill"] = "Average", }, -- end of ["RuBTRs4"] - ["RuTent2"] = + ["static_on_ship1 #001"] = { - ["shape_name"] = "PalatkaB", - ["type"] = "FARP Tent", + ["type"] = "AH-1W", ["point"] = { - ["y"] = 617319.42857142, - ["x"] = -259804, + ["y"] = 443849.03844635, + ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["y"] = 617319.42857142, - ["groupName"] = "RuTent2", - ["coalition"] = "red", - ["countryId"] = 0, - ["x"] = -259804, - ["groupId"] = 19, + ["country"] = "usa", + ["coalition"] = "blue", + ["livery_id"] = "USA Marines", + ["groupName"] = "static_on_ship1 #001", + ["countryId"] = 2, + ["y"] = 443849.03844635, + ["x"] = -355322.27295572, + ["groupId"] = 41, ["category"] = "static", - ["unitName"] = "RuTent2", - ["unitId"] = 41, + ["unitName"] = "static_on_ship1 #001", + ["categoryStatic"] = "Helicopters", ["heading"] = 0, - ["country"] = "russia", - }, -- end of ["RuTent2"] + ["unitId"] = 64, + }, -- end of ["static_on_ship1 #001"] ["USA static 8"] = { - ["alt"] = 67, + ["alt"] = 63, ["point"] = { - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -2736,8 +2768,8 @@ unitsByName = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 8", - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, ["coalition"] = "blue", ["unitId"] = 7039, ["heading"] = 0, @@ -2746,11 +2778,11 @@ unitsByName = }, -- end of ["USA static 8"] ["USA static 2"] = { - ["alt"] = 72, + ["alt"] = 57, ["point"] = { - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -2761,8 +2793,8 @@ unitsByName = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 2", - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, ["coalition"] = "blue", ["unitId"] = 7006, ["heading"] = 0, diff --git a/Example DBs/mist_DBs_unitsByNum.lua b/Example DBs/mist_DBs_unitsByNum.lua index 04780ab..11d7247 100644 --- a/Example DBs/mist_DBs_unitsByNum.lua +++ b/Example DBs/mist_DBs_unitsByNum.lua @@ -108,8 +108,8 @@ unitsByNum = ["alt"] = 500, ["point"] = { - ["y"] = 405888.85058741, - ["x"] = -155967.80633993, + ["y"] = 404406.46136648, + ["x"] = -158700.87914814, }, -- end of ["point"] ["alt_type"] = "BARO", ["livery_id"] = "Australia RAAF", @@ -118,15 +118,15 @@ unitsByNum = ["speed"] = 44.444444444444, ["type"] = "CH-47D", ["country"] = "australia", - ["psi"] = -2.6461357622286, + ["psi"] = -2.6021711998766, ["unitName"] = "Rotary-1-1", ["groupName"] = "nH", ["coalition"] = "neutral", ["countryId"] = 21, - ["x"] = -155967.80633993, - ["y"] = 405888.85058741, + ["x"] = -158700.87914814, + ["y"] = 404406.46136648, ["unitId"] = 68, - ["heading"] = 2.6461357622286, + ["heading"] = 2.6021711998766, ["skill"] = "High", ["callsign"] = { @@ -247,92 +247,92 @@ unitsByNum = [11] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 675199.99999999, ["x"] = -292007.14285714, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 675199.99999999, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cargoBob", - ["groupId"] = 31, - ["countryId"] = 2, - ["mass"] = 371, ["unitId"] = 45, + ["groupName"] = "cargoBob", + ["countryId"] = 2, + ["y"] = 675199.99999999, + ["mass"] = 371, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cargoBob", ["x"] = -292007.14285714, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 31, }, -- end of [11] [12] = { ["shape_name"] = "ab-212_cargo", - ["type"] = "uh1h_cargo", + ["heading"] = 0, ["point"] = { ["y"] = 674842.85714285, ["x"] = -291678.57142856, }, -- end of ["point"] - ["categoryStatic"] = "Cargos", - ["y"] = 674842.85714285, + ["country"] = "usa", ["coalition"] = "blue", - ["groupName"] = "cloneCargoBase", - ["groupId"] = 32, - ["countryId"] = 2, - ["mass"] = 1337, ["unitId"] = 46, + ["groupName"] = "cloneCargoBase", + ["countryId"] = 2, + ["y"] = 674842.85714285, + ["mass"] = 1337, + ["categoryStatic"] = "Cargos", ["category"] = "static", ["unitName"] = "cloneCargoBase", ["x"] = -291678.57142856, - ["heading"] = 0, - ["country"] = "usa", + ["type"] = "uh1h_cargo", + ["groupId"] = 32, }, -- end of [12] [13] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443856.28948724, ["x"] = -355322.45423175, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443856.28948724, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443856.28948724, ["x"] = -355322.45423175, - ["unitId"] = 63, + ["groupId"] = 40, ["category"] = "static", ["unitName"] = "static_on_ship1", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 40, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 63, }, -- end of [13] [14] = { - ["heading"] = 0, + ["type"] = "AH-1W", ["point"] = { ["y"] = 443849.03844635, ["x"] = -355322.27295572, }, -- end of ["point"] - ["categoryStatic"] = "Helicopters", - ["y"] = 443849.03844635, + ["country"] = "usa", + ["coalition"] = "blue", ["livery_id"] = "USA Marines", ["groupName"] = "static_on_ship1 #001", - ["coalition"] = "blue", ["countryId"] = 2, + ["y"] = 443849.03844635, ["x"] = -355322.27295572, - ["unitId"] = 64, + ["groupId"] = 41, ["category"] = "static", ["unitName"] = "static_on_ship1 #001", - ["type"] = "AH-1W", - ["country"] = "usa", - ["groupId"] = 41, + ["categoryStatic"] = "Helicopters", + ["heading"] = 0, + ["unitId"] = 64, }, -- end of [14] [15] = { @@ -556,11 +556,11 @@ unitsByNum = }, -- end of [24] [25] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692389, - ["x"] = -287110, + ["y"] = 694968, + ["x"] = -285046, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -570,8 +570,8 @@ unitsByNum = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287110, - ["y"] = 692389, + ["x"] = -285046, + ["y"] = 694968, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #002", @@ -580,11 +580,11 @@ unitsByNum = }, -- end of [25] [26] = { - ["alt"] = 60, + ["alt"] = 74, ["point"] = { - ["y"] = 692345, - ["x"] = -286935, + ["y"] = 695126, + ["x"] = -285098, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -594,8 +594,8 @@ unitsByNum = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286935, - ["y"] = 692345, + ["x"] = -285098, + ["y"] = 695126, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #003", @@ -604,11 +604,11 @@ unitsByNum = }, -- end of [26] [27] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692308, - ["x"] = -287213, + ["y"] = 694892, + ["x"] = -285039, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -618,8 +618,8 @@ unitsByNum = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287213, - ["y"] = 692308, + ["x"] = -285039, + ["y"] = 694892, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #004", @@ -628,11 +628,11 @@ unitsByNum = }, -- end of [27] [28] = { - ["alt"] = 60, + ["alt"] = 75, ["point"] = { - ["y"] = 692321, - ["x"] = -286989, + ["y"] = 695084, + ["x"] = -284914, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -642,8 +642,8 @@ unitsByNum = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -286989, - ["y"] = 692321, + ["x"] = -284914, + ["y"] = 695084, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #005", @@ -652,11 +652,11 @@ unitsByNum = }, -- end of [28] [29] = { - ["alt"] = 59, + ["alt"] = 73, ["point"] = { - ["y"] = 692297, - ["x"] = -287225, + ["y"] = 694985, + ["x"] = -285104, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -666,8 +666,8 @@ unitsByNum = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287225, - ["y"] = 692297, + ["x"] = -285104, + ["y"] = 694985, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #006", @@ -676,11 +676,11 @@ unitsByNum = }, -- end of [29] [30] = { - ["alt"] = 61, + ["alt"] = 74, ["point"] = { - ["y"] = 692445, - ["x"] = -287012, + ["y"] = 694877, + ["x"] = -285009, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -690,8 +690,8 @@ unitsByNum = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287012, - ["y"] = 692445, + ["x"] = -285009, + ["y"] = 694877, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #007", @@ -700,11 +700,11 @@ unitsByNum = }, -- end of [30] [31] = { - ["alt"] = 59, + ["alt"] = 74, ["point"] = { - ["y"] = 692311, - ["x"] = -287237, + ["y"] = 694952, + ["x"] = -284964, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", @@ -714,8 +714,8 @@ unitsByNum = ["groupId"] = 35, ["groupName"] = "teleGroup", ["countryId"] = 2, - ["x"] = -287237, - ["y"] = 692311, + ["x"] = -284964, + ["y"] = 694952, ["heading"] = 0, ["country"] = "usa", ["unitName"] = "Unit #008", @@ -723,6 +723,28 @@ unitsByNum = ["coalition"] = "blue", }, -- end of [31] [32] = + { + ["heading"] = 2.3261877017598, + ["point"] = + { + ["y"] = 185783.38833846, + ["x"] = -244729.2581753, + }, -- end of ["point"] + ["groupId"] = 47, + ["y"] = 185783.38833846, + ["coalition"] = "blue", + ["groupName"] = "poly", + ["type"] = "AAV7", + ["countryId"] = 2, + ["x"] = -244729.2581753, + ["unitId"] = 70, + ["category"] = "vehicle", + ["unitName"] = "Ground-2-1", + ["playerCanDrive"] = true, + ["country"] = "usa", + ["skill"] = "Average", + }, -- end of [32] + [33] = { ["alt"] = 2000, ["point"] = @@ -755,8 +777,8 @@ unitsByNum = ["name"] = "Springfield11", }, -- end of ["callsign"] ["groupId"] = 4, - }, -- end of [32] - [33] = + }, -- end of [33] + [34] = { ["alt"] = 2000, ["point"] = @@ -789,8 +811,8 @@ unitsByNum = ["name"] = "Springfield11", }, -- end of ["callsign"] ["groupId"] = 5, - }, -- end of [33] - [34] = + }, -- end of [34] + [35] = { ["alt"] = 2000, ["point"] = @@ -803,6 +825,9 @@ unitsByNum = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.67060113146646, @@ -814,7 +839,6 @@ unitsByNum = ["y"] = 636428.57142857, ["unitId"] = 11, ["heading"] = -0.67060113146646, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -822,9 +846,10 @@ unitsByNum = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 6, - }, -- end of [34] - [35] = + }, -- end of [35] + [36] = { ["alt"] = 2000, ["point"] = @@ -837,6 +862,9 @@ unitsByNum = ["onboard_num"] = "52", ["category"] = "plane", ["speed"] = 138.88888888889, + ["AddPropAircraft"] = + { + }, -- end of ["AddPropAircraft"] ["type"] = "A-10C", ["country"] = "usa", ["psi"] = 0.66079849060746, @@ -848,7 +876,6 @@ unitsByNum = ["y"] = 644428.57142857, ["unitId"] = 12, ["heading"] = -0.66079849060746, - ["skill"] = "Client", ["callsign"] = { [1] = 3, @@ -856,9 +883,10 @@ unitsByNum = [3] = 1, ["name"] = "Uzi11", }, -- end of ["callsign"] + ["skill"] = "Client", ["groupId"] = 7, - }, -- end of [35] - [36] = + }, -- end of [36] + [37] = { ["alt"] = 2000, ["point"] = @@ -891,8 +919,8 @@ unitsByNum = ["name"] = "Colt11", }, -- end of ["callsign"] ["groupId"] = 34, - }, -- end of [36] - [37] = + }, -- end of [37] + [38] = { ["alt"] = 2000, ["hardpoint_racks"] = true, @@ -926,8 +954,8 @@ unitsByNum = }, -- end of ["point"] ["skill"] = "High", ["country"] = "usa", - }, -- end of [37] - [38] = + }, -- end of [38] + [39] = { ["alt"] = 500, ["hardpoint_racks"] = true, @@ -961,8 +989,8 @@ unitsByNum = }, -- end of ["point"] ["skill"] = "High", ["country"] = "usa", - }, -- end of [38] - [39] = + }, -- end of [39] + [40] = { ["alt"] = 500, ["point"] = @@ -995,8 +1023,8 @@ unitsByNum = ["name"] = "Enfield12", }, -- end of ["callsign"] ["groupId"] = 1, - }, -- end of [39] - [40] = + }, -- end of [40] + [41] = { ["type"] = "MOSCOW", ["point"] = @@ -1016,8 +1044,8 @@ unitsByNum = ["heading"] = 0, ["country"] = "russia", ["groupName"] = "Rus Ships #1", - }, -- end of [40] - [41] = + }, -- end of [41] + [42] = { ["type"] = "MOSCOW", ["point"] = @@ -1037,8 +1065,8 @@ unitsByNum = ["heading"] = 0, ["country"] = "russia", ["groupName"] = "Rus Ships #1", - }, -- end of [41] - [42] = + }, -- end of [42] + [43] = { ["type"] = "MOSCOW", ["point"] = @@ -1058,8 +1086,8 @@ unitsByNum = ["heading"] = 1.1755995276042, ["country"] = "russia", ["groupName"] = "Rus Ships #2", - }, -- end of [42] - [43] = + }, -- end of [43] + [44] = { ["type"] = "MOSCOW", ["point"] = @@ -1079,8 +1107,8 @@ unitsByNum = ["heading"] = 1.1755995276042, ["country"] = "russia", ["groupName"] = "Rus Ships #2", - }, -- end of [43] - [44] = + }, -- end of [44] + [45] = { ["type"] = "FARP", ["point"] = @@ -1100,8 +1128,8 @@ unitsByNum = ["unitId"] = 39, ["heading"] = 0, ["country"] = "russia", - }, -- end of [44] - [45] = + }, -- end of [45] + [46] = { ["shape_name"] = "PalatkaB", ["type"] = "FARP Tent", @@ -1122,8 +1150,8 @@ unitsByNum = ["unitId"] = 40, ["heading"] = 0, ["country"] = "russia", - }, -- end of [45] - [46] = + }, -- end of [46] + [47] = { ["shape_name"] = "PalatkaB", ["type"] = "FARP Tent", @@ -1144,8 +1172,8 @@ unitsByNum = ["unitId"] = 41, ["heading"] = 0, ["country"] = "russia", - }, -- end of [46] - [47] = + }, -- end of [47] + [48] = { ["shape_name"] = "PalatkaB", ["type"] = "FARP Tent", @@ -1166,8 +1194,8 @@ unitsByNum = ["unitId"] = 59, ["heading"] = 0, ["country"] = "russia", - }, -- end of [47] - [48] = + }, -- end of [48] + [49] = { ["shape_name"] = "teplowoz", ["type"] = "Locomotive", @@ -1187,8 +1215,8 @@ unitsByNum = ["country"] = "russia", ["heading"] = 0, ["unitId"] = 61, - }, -- end of [48] - [49] = + }, -- end of [49] + [50] = { ["shape_name"] = "elektrowoz", ["type"] = "Electric locomotive", @@ -1208,8 +1236,8 @@ unitsByNum = ["country"] = "russia", ["heading"] = 0, ["unitId"] = 62, - }, -- end of [49] - [50] = + }, -- end of [50] + [51] = { ["heading"] = -1.7994767003775, ["point"] = @@ -1230,8 +1258,8 @@ unitsByNum = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [50] - [51] = + }, -- end of [51] + [52] = { ["heading"] = -1.7994767003775, ["point"] = @@ -1252,8 +1280,8 @@ unitsByNum = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [51] - [52] = + }, -- end of [52] + [53] = { ["heading"] = -1.7994767003775, ["point"] = @@ -1274,8 +1302,8 @@ unitsByNum = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [52] - [53] = + }, -- end of [53] + [54] = { ["heading"] = -1.7994767003775, ["point"] = @@ -1296,8 +1324,8 @@ unitsByNum = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [53] - [54] = + }, -- end of [54] + [55] = { ["heading"] = -1.7994767003775, ["point"] = @@ -1318,8 +1346,8 @@ unitsByNum = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [54] - [55] = + }, -- end of [55] + [56] = { ["heading"] = -1.7994767003775, ["point"] = @@ -1340,8 +1368,8 @@ unitsByNum = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Average", - }, -- end of [55] - [56] = + }, -- end of [56] + [57] = { ["heading"] = 0, ["point"] = @@ -1362,8 +1390,8 @@ unitsByNum = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Excellent", - }, -- end of [56] - [57] = + }, -- end of [57] + [58] = { ["heading"] = 0, ["point"] = @@ -1384,8 +1412,8 @@ unitsByNum = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Excellent", - }, -- end of [57] - [58] = + }, -- end of [58] + [59] = { ["heading"] = 0, ["point"] = @@ -1406,8 +1434,8 @@ unitsByNum = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Excellent", - }, -- end of [58] - [59] = + }, -- end of [59] + [60] = { ["heading"] = 0, ["point"] = @@ -1428,8 +1456,8 @@ unitsByNum = ["playerCanDrive"] = true, ["country"] = "russia", ["skill"] = "Excellent", - }, -- end of [59] - [60] = + }, -- end of [60] + [61] = { ["alt"] = 2000, ["point"] = @@ -1456,8 +1484,8 @@ unitsByNum = ["skill"] = "Client", ["callsign"] = 104, ["groupId"] = 20, - }, -- end of [60] - [61] = + }, -- end of [61] + [62] = { ["alt"] = 2000, ["point"] = @@ -1484,8 +1512,8 @@ unitsByNum = ["skill"] = "Client", ["callsign"] = 105, ["groupId"] = 20, - }, -- end of [61] - [62] = + }, -- end of [62] + [63] = { ["alt"] = 2000, ["point"] = @@ -1512,8 +1540,8 @@ unitsByNum = ["skill"] = "Client", ["callsign"] = 106, ["groupId"] = 20, - }, -- end of [62] - [63] = + }, -- end of [63] + [64] = { ["alt"] = 500, ["point"] = @@ -1540,8 +1568,8 @@ unitsByNum = ["skill"] = "High", ["callsign"] = 100, ["groupId"] = 2, - }, -- end of [63] - [64] = + }, -- end of [64] + [65] = { ["alt"] = 500, ["point"] = @@ -1568,8 +1596,8 @@ unitsByNum = ["skill"] = "High", ["callsign"] = 101, ["groupId"] = 2, - }, -- end of [64] - [65] = + }, -- end of [65] + [66] = { ["alt"] = 500, ["point"] = @@ -1604,8 +1632,8 @@ unitsByNum = ["callsign"] = 103, ["skill"] = "Random", ["groupId"] = 3, - }, -- end of [65] - [66] = + }, -- end of [66] + [67] = { ["alt"] = 500, ["point"] = @@ -1640,16 +1668,17 @@ unitsByNum = ["callsign"] = 102, ["skill"] = "Random", ["groupId"] = 3, - }, -- end of [66] - [67] = + }, -- end of [67] + [68] = { ["alt"] = 0, ["point"] = { - ["y"] = 266228, - ["x"] = -161996, + ["y"] = 267081, + ["x"] = -164471, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 1 unit1", @@ -1657,140 +1686,140 @@ unitsByNum = ["unitId"] = 7011, ["groupName"] = "AUSTRALIA shp 1", ["countryId"] = 21, - ["x"] = -161996, + ["x"] = -164471, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000064, ["coalition"] = "neutral", - ["y"] = 266228, + ["type"] = "PERRY", + ["groupId"] = 7007, + ["y"] = 267081, ["country"] = "australia", - }, -- end of [67] - [68] = - { - ["alt"] = 61, - ["type"] = "Sandbox", - ["point"] = - { - ["y"] = 690788, - ["x"] = -285547, - }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 690788, - ["groupName"] = "USA static 1", - ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285547, - ["coalition"] = "blue", - ["category"] = "static", - ["unitName"] = "USA static 1", - ["unitId"] = 7005, - ["heading"] = 0, - ["groupId"] = 7005, }, -- end of [68] [69] = { ["alt"] = 62, + ["type"] = "Sandbox", ["point"] = { - ["y"] = 692663, - ["x"] = -286548, + ["y"] = 693698, + ["x"] = -287512, + }, -- end of ["point"] + ["country"] = "usa", + ["coalitionId"] = 2, + ["coalition"] = "blue", + ["groupName"] = "USA static 1", + ["unitId"] = 7005, + ["y"] = 693698, + ["x"] = -287512, + ["countryId"] = 2, + ["category"] = "static", + ["unitName"] = "USA static 1", + ["groupId"] = 7005, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", + }, -- end of [69] + [70] = + { + ["alt"] = 67, + ["point"] = + { + ["y"] = 692292, + ["x"] = -284982, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286548, - ["y"] = 692663, - ["heading"] = 1.4977557600419, + ["x"] = -284982, + ["y"] = 692292, + ["heading"] = 1.4977557593169, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit1", ["unitId"] = 7001, ["coalition"] = "blue", - }, -- end of [69] - [70] = + }, -- end of [70] + [71] = { - ["alt"] = 62, + ["alt"] = 67, ["point"] = { - ["y"] = 692678, - ["x"] = -286576, + ["y"] = 692208, + ["x"] = -284870, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286576, - ["y"] = 692678, - ["heading"] = 1.4977557629417, + ["x"] = -284870, + ["y"] = 692208, + ["heading"] = 1.4977557696476, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit2", ["unitId"] = 7002, ["coalition"] = "blue", - }, -- end of [70] - [71] = + }, -- end of [71] + [72] = { - ["alt"] = 63, + ["alt"] = 68, ["point"] = { - ["y"] = 692774, - ["x"] = -286539, + ["y"] = 692374, + ["x"] = -284971, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286539, - ["y"] = 692774, - ["heading"] = 1.497755762398, + ["x"] = -284971, + ["y"] = 692374, + ["heading"] = 1.4977557676538, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit3", ["unitId"] = 7003, ["coalition"] = "blue", - }, -- end of [71] - [72] = + }, -- end of [72] + [73] = { - ["alt"] = 62, + ["alt"] = 68, ["point"] = { - ["y"] = 692553, - ["x"] = -286525, + ["y"] = 692388, + ["x"] = -284932, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000058, + ["groupId"] = 7001, ["groupName"] = "USA gnd 1", ["countryId"] = 2, - ["x"] = -286525, - ["y"] = 692553, - ["heading"] = 1.4977557625792, + ["x"] = -284932, + ["y"] = 692388, + ["heading"] = 1.4977557602231, ["country"] = "usa", ["unitName"] = "USA gnd 1 unit4", ["unitId"] = 7004, ["coalition"] = "blue", - }, -- end of [72] - [73] = + }, -- end of [73] + [74] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -1798,14 +1827,14 @@ unitsByNum = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 2 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000063, + ["heading"] = 2.1995924992708, + ["groupId"] = 7006, ["groupName"] = "AUSTRALIA air 2", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7010, @@ -1816,13 +1845,13 @@ unitsByNum = [3] = 1, ["name"] = "Enfield11", }, -- end of ["callsign"] - }, -- end of [73] - [74] = + }, -- end of [74] + [75] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1831,14 +1860,14 @@ unitsByNum = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 1 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000062, + ["heading"] = 1.6162179734619, + ["groupId"] = 7005, ["groupName"] = "USA air 1", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7009, @@ -1849,8 +1878,8 @@ unitsByNum = [3] = 1, ["name"] = "Colt11", }, -- end of ["callsign"] - }, -- end of [74] - [75] = + }, -- end of [75] + [76] = { ["alt"] = 48, ["point"] = @@ -1869,12 +1898,12 @@ unitsByNum = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [75] - [76] = + }, -- end of [76] + [77] = { ["alt"] = 48, ["point"] = @@ -1893,18 +1922,18 @@ unitsByNum = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000061, + ["groupId"] = 7004, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [76] - [77] = + }, -- end of [77] + [78] = { - ["alt"] = 72, + ["alt"] = 57, ["point"] = { - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -1915,21 +1944,21 @@ unitsByNum = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 2", - ["y"] = 694712, - ["x"] = -286007, + ["y"] = 691173, + ["x"] = -286924, ["coalition"] = "blue", ["unitId"] = 7006, ["heading"] = 0, ["countryId"] = 2, ["groupId"] = 7006, - }, -- end of [77] - [78] = + }, -- end of [78] + [79] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -1940,20 +1969,20 @@ unitsByNum = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 4", - ["y"] = 693989, - ["x"] = -288108, + ["y"] = 694197, + ["x"] = -287544, ["coalition"] = "blue", ["unitId"] = 7017, ["heading"] = 0, ["countryId"] = 2, ["groupId"] = 7017, - }, -- end of [78] - [79] = + }, -- end of [79] + [80] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -1962,14 +1991,14 @@ unitsByNum = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 3 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000069, + ["heading"] = 1.6162179734619, + ["groupId"] = 7012, ["groupName"] = "USA air 3", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7020, @@ -1980,37 +2009,37 @@ unitsByNum = [3] = 1, ["name"] = "Colt11", }, -- end of ["callsign"] - }, -- end of [79] - [80] = - { - ["alt"] = 60, - ["type"] = "Sandbox", - ["point"] = - { - ["y"] = 691139, - ["x"] = -286038, - }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 691139, - ["groupName"] = "USA static 3", - ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -286038, - ["coalition"] = "blue", - ["category"] = "static", - ["unitName"] = "USA static 3", - ["unitId"] = 7016, - ["heading"] = 0, - ["groupId"] = 7016, }, -- end of [80] [81] = { - ["alt"] = 1997, + ["alt"] = 63, + ["type"] = "Sandbox", ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 692858, + ["x"] = -286636, + }, -- end of ["point"] + ["country"] = "usa", + ["coalitionId"] = 2, + ["coalition"] = "blue", + ["groupName"] = "USA static 3", + ["unitId"] = 7016, + ["y"] = 692858, + ["x"] = -286636, + ["countryId"] = 2, + ["category"] = "static", + ["unitName"] = "USA static 3", + ["groupId"] = 7016, + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", + }, -- end of [81] + [82] = + { + ["alt"] = 1998, + ["point"] = + { + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -2018,14 +2047,14 @@ unitsByNum = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 4 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000070, + ["heading"] = 2.1995924992708, + ["groupId"] = 7013, ["groupName"] = "AUSTRALIA air 4", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7021, @@ -2036,16 +2065,17 @@ unitsByNum = [3] = 1, ["name"] = "Enfield11", }, -- end of ["callsign"] - }, -- end of [81] - [82] = + }, -- end of [82] + [83] = { ["alt"] = 0, ["point"] = { - ["y"] = 266588, - ["x"] = -163302, + ["y"] = 267810, + ["x"] = -162283, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 2 unit1", @@ -2053,111 +2083,111 @@ unitsByNum = ["unitId"] = 7022, ["groupName"] = "AUSTRALIA shp 2", ["countryId"] = 21, - ["x"] = -163302, + ["x"] = -162283, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000071, ["coalition"] = "neutral", - ["y"] = 266588, + ["type"] = "PERRY", + ["groupId"] = 7014, + ["y"] = 267810, ["country"] = "australia", - }, -- end of [82] - [83] = + }, -- end of [83] + [84] = { - ["alt"] = 60, + ["alt"] = 62, ["point"] = { - ["y"] = 692171, - ["x"] = -286749, + ["y"] = 690419, + ["x"] = -284972, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286749, - ["y"] = 692171, - ["heading"] = 1.4977557591357, + ["x"] = -284972, + ["y"] = 690419, + ["heading"] = 1.4977557640291, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit1", ["unitId"] = 7012, ["coalition"] = "blue", - }, -- end of [83] - [84] = + }, -- end of [84] + [85] = { - ["alt"] = 61, + ["alt"] = 63, ["point"] = { - ["y"] = 692204, - ["x"] = -286580, + ["y"] = 690558, + ["x"] = -284846, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286580, - ["y"] = 692204, - ["heading"] = 1.4977557614918, + ["x"] = -284846, + ["y"] = 690558, + ["heading"] = 1.4977557580482, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit2", ["unitId"] = 7013, ["coalition"] = "blue", - }, -- end of [84] - [85] = + }, -- end of [85] + [86] = { - ["alt"] = 61, + ["alt"] = 62, ["point"] = { - ["y"] = 692150, - ["x"] = -286560, + ["y"] = 690360, + ["x"] = -285032, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286560, - ["y"] = 692150, - ["heading"] = 1.4977557614918, + ["x"] = -285032, + ["y"] = 690360, + ["heading"] = 1.4977557565984, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit3", ["unitId"] = 7014, ["coalition"] = "blue", - }, -- end of [85] - [86] = + }, -- end of [86] + [87] = { - ["alt"] = 60, + ["alt"] = 62, ["point"] = { - ["y"] = 691995, - ["x"] = -286713, + ["y"] = 690314, + ["x"] = -284956, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000065, + ["groupId"] = 7008, ["groupName"] = "USA gnd 3", ["countryId"] = 2, - ["x"] = -286713, - ["y"] = 691995, - ["heading"] = 1.4977557627604, + ["x"] = -284956, + ["y"] = 690314, + ["heading"] = 1.497755755511, ["country"] = "usa", ["unitName"] = "USA gnd 3 unit4", ["unitId"] = 7015, ["coalition"] = "blue", - }, -- end of [86] - [87] = + }, -- end of [87] + [88] = { ["alt"] = 48, ["point"] = @@ -2170,7 +2200,7 @@ unitsByNum = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286407, @@ -2180,8 +2210,8 @@ unitsByNum = ["unitName"] = "USA gnd 4 unit1", ["unitId"] = 7018, ["coalition"] = "blue", - }, -- end of [87] - [88] = + }, -- end of [88] + [89] = { ["alt"] = 48, ["point"] = @@ -2194,7 +2224,7 @@ unitsByNum = ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000068, + ["groupId"] = 7011, ["groupName"] = "USA gnd 4", ["countryId"] = 2, ["x"] = -286447, @@ -2204,109 +2234,109 @@ unitsByNum = ["unitName"] = "USA gnd 4 unit2", ["unitId"] = 7019, ["coalition"] = "blue", - }, -- end of [88] - [89] = + }, -- end of [89] + [90] = { - ["alt"] = 55, + ["alt"] = 73, ["point"] = { - ["y"] = 692563, - ["x"] = -288904, + ["y"] = 691751, + ["x"] = -283221, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288904, - ["y"] = 692563, - ["heading"] = 1.4977557725472, + ["x"] = -283221, + ["y"] = 691751, + ["heading"] = 1.4977557703725, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit1", ["unitId"] = 7023, ["coalition"] = "blue", - }, -- end of [89] - [90] = + }, -- end of [90] + [91] = { - ["alt"] = 56, + ["alt"] = 74, ["point"] = { - ["y"] = 692623, - ["x"] = -288844, + ["y"] = 691898, + ["x"] = -283194, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288844, - ["y"] = 692623, - ["heading"] = 1.4977557660227, + ["x"] = -283194, + ["y"] = 691898, + ["heading"] = 1.4977557634854, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit2", ["unitId"] = 7024, ["coalition"] = "blue", - }, -- end of [90] - [91] = + }, -- end of [91] + [92] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692459, - ["x"] = -288865, + ["y"] = 691826, + ["x"] = -283357, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -288865, - ["y"] = 692459, - ["heading"] = 1.4977557638479, + ["x"] = -283357, + ["y"] = 691826, + ["heading"] = 1.4977557538798, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit3", ["unitId"] = 7025, ["coalition"] = "blue", - }, -- end of [91] - [92] = + }, -- end of [92] + [93] = { - ["alt"] = 55, + ["alt"] = 72, ["point"] = { - ["y"] = 692675, - ["x"] = -289069, + ["y"] = 691852, + ["x"] = -283362, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000072, + ["groupId"] = 7015, ["groupName"] = "USA gnd 5", ["countryId"] = 2, - ["x"] = -289069, - ["y"] = 692675, - ["heading"] = 1.4977557685601, + ["x"] = -283362, + ["y"] = 691852, + ["heading"] = 1.4977557720036, ["country"] = "usa", ["unitName"] = "USA gnd 5 unit4", ["unitId"] = 7026, ["coalition"] = "blue", - }, -- end of [92] - [93] = + }, -- end of [93] + [94] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -2315,14 +2345,14 @@ unitsByNum = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 5 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000076, + ["heading"] = 1.6162179734619, + ["groupId"] = 7019, ["groupName"] = "USA air 5", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7031, @@ -2333,8 +2363,8 @@ unitsByNum = [3] = 1, ["name"] = "Colt11", }, -- end of ["callsign"] - }, -- end of [93] - [94] = + }, -- end of [94] + [95] = { ["alt"] = 48, ["point"] = @@ -2353,12 +2383,12 @@ unitsByNum = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [94] - [95] = + }, -- end of [95] + [96] = { ["alt"] = 48, ["point"] = @@ -2377,18 +2407,18 @@ unitsByNum = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000075, + ["groupId"] = 7018, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [95] - [96] = + }, -- end of [96] + [97] = { - ["alt"] = 73, + ["alt"] = 62, ["point"] = { - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -2399,21 +2429,21 @@ unitsByNum = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 6", - ["y"] = 694850, - ["x"] = -285204, + ["y"] = 691602, + ["x"] = -285948, ["coalition"] = "blue", ["unitId"] = 7028, ["heading"] = 0, ["countryId"] = 2, ["groupId"] = 7028, - }, -- end of [96] - [97] = + }, -- end of [97] + [98] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -2421,14 +2451,14 @@ unitsByNum = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 6 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000077, + ["heading"] = 2.1995924992708, + ["groupId"] = 7020, ["groupName"] = "AUSTRALIA air 6", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7032, @@ -2439,55 +2469,56 @@ unitsByNum = [3] = 1, ["name"] = "Enfield11", }, -- end of ["callsign"] - }, -- end of [97] - [98] = + }, -- end of [98] + [99] = { - ["alt"] = 69, + ["alt"] = 63, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693432, - ["x"] = -285294, + ["y"] = 692897, + ["x"] = -286503, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693432, - ["groupName"] = "USA static 5", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -285294, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 5", + ["unitId"] = 7027, + ["y"] = 692897, + ["x"] = -286503, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 5", - ["unitId"] = 7027, - ["heading"] = 0, ["groupId"] = 7027, - }, -- end of [98] - [99] = + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", + }, -- end of [99] + [100] = { ["alt"] = 0, ["point"] = { - ["y"] = 267963, - ["x"] = -165895, + ["y"] = 268107, + ["x"] = -163693, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", - ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000078, + ["unitName"] = "AUSTRALIA shp 3 unit1", + ["heading"] = 0, + ["unitId"] = 7033, ["groupName"] = "AUSTRALIA shp 3", ["countryId"] = 21, - ["x"] = -165895, - ["y"] = 267963, - ["heading"] = 0, - ["country"] = "australia", - ["unitName"] = "AUSTRALIA shp 3 unit1", - ["unitId"] = 7033, + ["x"] = -163693, + ["speed"] = 0, ["coalition"] = "neutral", - }, -- end of [99] - [100] = + ["type"] = "PERRY", + ["groupId"] = 7021, + ["y"] = 268107, + ["country"] = "australia", + }, -- end of [100] + [101] = { ["alt"] = 48, ["point"] = @@ -2506,12 +2537,12 @@ unitsByNum = ["x"] = -286407, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [100] - [101] = + }, -- end of [101] + [102] = { ["alt"] = 48, ["point"] = @@ -2530,17 +2561,17 @@ unitsByNum = ["x"] = -286447, ["speed"] = 0, ["type"] = "M-113", - ["groupId"] = 1000082, + ["groupId"] = 7025, ["coalition"] = "blue", ["y"] = 686871, ["country"] = "usa", - }, -- end of [101] - [102] = + }, -- end of [102] + [103] = { - ["alt"] = 1996, + ["alt"] = 1997, ["point"] = { - ["y"] = 682741, + ["y"] = 682727, ["x"] = -288608, }, -- end of ["point"] ["alt_type"] = "BARO", @@ -2549,14 +2580,14 @@ unitsByNum = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "USA air 7 unit1", - ["heading"] = 1.6162179835615, - ["groupId"] = 1000083, + ["heading"] = 1.6162179734619, + ["groupId"] = 7026, ["groupName"] = "USA air 7", - ["speed"] = 138.82033106075, + ["speed"] = 138.85196364465, ["countryId"] = 2, ["x"] = -288608, ["coalition"] = "blue", - ["y"] = 682741, + ["y"] = 682727, ["country"] = "usa", ["type"] = "B-52H", ["unitId"] = 7042, @@ -2567,110 +2598,110 @@ unitsByNum = [3] = 1, ["name"] = "Colt11", }, -- end of ["callsign"] - }, -- end of [102] - [103] = + }, -- end of [103] + [104] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692747, - ["x"] = -287036, + ["y"] = 692769, + ["x"] = -287355, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287036, - ["y"] = 692747, - ["heading"] = 1.4977557703724, + ["x"] = -287355, + ["y"] = 692769, + ["heading"] = 1.4977557591357, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit1", ["unitId"] = 7034, ["coalition"] = "blue", - }, -- end of [103] - [104] = + }, -- end of [104] + [105] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692716, - ["x"] = -286920, + ["y"] = 692754, + ["x"] = -287476, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -286920, - ["y"] = 692716, - ["heading"] = 1.4977557703724, + ["x"] = -287476, + ["y"] = 692754, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit2", ["unitId"] = 7035, ["coalition"] = "blue", - }, -- end of [104] - [105] = + }, -- end of [105] + [106] = { - ["alt"] = 61, + ["alt"] = 59, ["point"] = { - ["y"] = 692580, - ["x"] = -287056, + ["y"] = 692726, + ["x"] = -287538, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287056, - ["y"] = 692580, - ["heading"] = 1.4977557642103, + ["x"] = -287538, + ["y"] = 692726, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit3", ["unitId"] = 7036, ["coalition"] = "blue", - }, -- end of [105] - [106] = + }, -- end of [106] + [107] = { - ["alt"] = 60, + ["alt"] = 59, ["point"] = { - ["y"] = 692752, - ["x"] = -287189, + ["y"] = 692766, + ["x"] = -287511, }, -- end of ["point"] ["coalitionId"] = 2, ["skill"] = "Average", ["category"] = "vehicle", ["speed"] = 0, ["type"] = "M-1 Abrams", - ["groupId"] = 1000079, + ["groupId"] = 7022, ["groupName"] = "USA gnd 7", ["countryId"] = 2, - ["x"] = -287189, - ["y"] = 692752, - ["heading"] = 1.4977557678351, + ["x"] = -287511, + ["y"] = 692766, + ["heading"] = 1.4977557605856, ["country"] = "usa", ["unitName"] = "USA gnd 7 unit4", ["unitId"] = 7037, ["coalition"] = "blue", - }, -- end of [106] - [107] = + }, -- end of [107] + [108] = { - ["alt"] = 1997, + ["alt"] = 1998, ["point"] = { - ["y"] = 319610, - ["x"] = -198571, + ["y"] = 319595, + ["x"] = -198560, }, -- end of ["point"] ["alt_type"] = "BARO", ["coalitionId"] = 0, @@ -2678,14 +2709,14 @@ unitsByNum = ["skill"] = "High", ["category"] = "plane", ["unitName"] = "AUSTRALIA air 8 unit1", - ["heading"] = 2.1995924685911, - ["groupId"] = 1000084, + ["heading"] = 2.1995924992708, + ["groupId"] = 7027, ["groupName"] = "AUSTRALIA air 8", - ["speed"] = 180.44764340673, + ["speed"] = 180.49294253728, ["countryId"] = 21, - ["x"] = -198571, + ["x"] = -198560, ["coalition"] = "neutral", - ["y"] = 319610, + ["y"] = 319595, ["country"] = "australia", ["type"] = "FA-18C_hornet", ["unitId"] = 7043, @@ -2696,16 +2727,17 @@ unitsByNum = [3] = 1, ["name"] = "Enfield11", }, -- end of ["callsign"] - }, -- end of [107] - [108] = + }, -- end of [108] + [109] = { ["alt"] = 0, ["point"] = { - ["y"] = 268804, - ["x"] = -165342, + ["y"] = 265427, + ["x"] = -164284, }, -- end of ["point"] ["coalitionId"] = 0, + ["livery_id"] = "ReubenJames", ["skill"] = "Average", ["category"] = "ship", ["unitName"] = "AUSTRALIA shp 4 unit1", @@ -2713,21 +2745,21 @@ unitsByNum = ["unitId"] = 7044, ["groupName"] = "AUSTRALIA shp 4", ["countryId"] = 21, - ["x"] = -165342, + ["x"] = -164284, ["speed"] = 0, - ["type"] = "PERRY", - ["groupId"] = 1000085, ["coalition"] = "neutral", - ["y"] = 268804, + ["type"] = "PERRY", + ["groupId"] = 7028, + ["y"] = 265427, ["country"] = "australia", - }, -- end of [108] - [109] = + }, -- end of [109] + [110] = { - ["alt"] = 67, + ["alt"] = 63, ["point"] = { - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, }, -- end of ["point"] ["categoryStatic"] = "Cargos", ["coalitionId"] = 2, @@ -2738,35 +2770,35 @@ unitsByNum = ["type"] = "uh1h_cargo", ["country"] = "usa", ["groupName"] = "USA static 8", - ["y"] = 691664, - ["x"] = -284503, + ["y"] = 693814, + ["x"] = -287262, ["coalition"] = "blue", ["unitId"] = 7039, ["heading"] = 0, ["countryId"] = 2, ["groupId"] = 7039, - }, -- end of [109] - [110] = + }, -- end of [110] + [111] = { - ["alt"] = 61, + ["alt"] = 56, ["type"] = "Sandbox", ["point"] = { - ["y"] = 693155, - ["x"] = -287187, + ["y"] = 691971, + ["x"] = -288088, }, -- end of ["point"] - ["categoryStatic"] = "Fortifications", - ["coalitionId"] = 2, - ["y"] = 693155, - ["groupName"] = "USA static 7", ["country"] = "usa", - ["countryId"] = 2, - ["x"] = -287187, + ["coalitionId"] = 2, ["coalition"] = "blue", + ["groupName"] = "USA static 7", + ["unitId"] = 7038, + ["y"] = 691971, + ["x"] = -288088, + ["countryId"] = 2, ["category"] = "static", ["unitName"] = "USA static 7", - ["unitId"] = 7038, - ["heading"] = 0, ["groupId"] = 7038, - }, -- end of [110] + ["heading"] = 0, + ["categoryStatic"] = "Fortifications", + }, -- end of [111] } -- end of unitsByNum diff --git a/Example DBs/mist_DBs_zonesByName.lua b/Example DBs/mist_DBs_zonesByName.lua index 0cf08c8..9bd17e6 100644 --- a/Example DBs/mist_DBs_zonesByName.lua +++ b/Example DBs/mist_DBs_zonesByName.lua @@ -1,71 +1,5 @@ zonesByName = { - ["LZ zone"] = - { - ["y"] = 614105.71428571, - ["radius"] = 3000, - ["zoneId"] = 2, - ["point"] = - { - ["y"] = 0, - ["x"] = -245328.57142857, - ["z"] = 614105.71428571, - }, -- end of ["point"] - ["color"] = - { - [1] = 1, - [2] = 1, - [3] = 1, - [4] = 0.14901960784314, - }, -- end of ["color"] - ["x"] = -245328.57142857, - ["hidden"] = false, - ["name"] = "LZ zone", - }, -- end of ["LZ zone"] - ["explosion zone"] = - { - ["y"] = 673819.99999999, - ["radius"] = 3000, - ["zoneId"] = 1, - ["point"] = - { - ["y"] = 0, - ["x"] = -271900, - ["z"] = 673819.99999999, - }, -- end of ["point"] - ["color"] = - { - [1] = 1, - [2] = 1, - [3] = 1, - [4] = 0.14901960784314, - }, -- end of ["color"] - ["x"] = -271900, - ["hidden"] = false, - ["name"] = "explosion zone", - }, -- end of ["explosion zone"] - ["cloneZone"] = - { - ["y"] = 692534.28571428, - ["radius"] = 3000, - ["zoneId"] = 3, - ["point"] = - { - ["y"] = 0, - ["x"] = -285971.42857143, - ["z"] = 692534.28571428, - }, -- end of ["point"] - ["color"] = - { - [1] = 1, - [2] = 1, - [3] = 1, - [4] = 0.14901960784314, - }, -- end of ["color"] - ["x"] = -285971.42857143, - ["hidden"] = false, - ["name"] = "cloneZone", - }, -- end of ["cloneZone"] ["shipZone"] = { ["radius"] = 3000, @@ -90,5 +24,135 @@ zonesByName = ["x"] = -163182.90396786, ["z"] = 267139.69375223, }, -- end of ["point"] + ["type"] = 0, }, -- end of ["shipZone"] + ["LZ zone"] = + { + ["radius"] = 3000, + ["zoneId"] = 2, + ["color"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + [4] = 0.14901960784314, + }, -- end of ["color"] + ["properties"] = + { + }, -- end of ["properties"] + ["hidden"] = false, + ["y"] = 614105.71428571, + ["x"] = -245328.57142857, + ["name"] = "LZ zone", + ["point"] = + { + ["y"] = 0, + ["x"] = -245328.57142857, + ["z"] = 614105.71428571, + }, -- end of ["point"] + ["type"] = 0, + }, -- end of ["LZ zone"] + ["quad"] = + { + ["radius"] = 13592.958647037, + ["zoneId"] = 339, + ["color"] = + { + [1] = 1, + [2] = 0, + [3] = 0, + [4] = 0.14901960784314, + }, -- end of ["color"] + ["properties"] = + { + ["Property Value "] = "Eyyyyyyyy", + ["Prop 2 is an"] = "empty string", + }, -- end of ["properties"] + ["hidden"] = false, + ["y"] = 590545.61946051, + ["x"] = -151821.41786062, + ["name"] = "quad", + ["point"] = + { + ["y"] = 0, + ["x"] = -151821.41786062, + ["z"] = 590545.61946051, + }, -- end of ["point"] + ["type"] = 2, + ["verticies"] = + { + [1] = + { + ["y"] = 583845.85427019, + ["x"] = -156926.00086276, + }, -- end of [1] + [2] = + { + ["y"] = 594153.18533222, + ["x"] = -161637.92363397, + }, -- end of [2] + [3] = + { + ["y"] = 601908.22489317, + ["x"] = -144360.87347286, + }, -- end of [3] + [4] = + { + ["y"] = 582275.21334645, + ["x"] = -144360.87347286, + }, -- end of [4] + }, -- end of ["verticies"] + }, -- end of ["quad"] + ["cloneZone"] = + { + ["radius"] = 3000, + ["zoneId"] = 3, + ["color"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + [4] = 0.14901960784314, + }, -- end of ["color"] + ["properties"] = + { + }, -- end of ["properties"] + ["hidden"] = false, + ["y"] = 692534.28571428, + ["x"] = -285971.42857143, + ["name"] = "cloneZone", + ["point"] = + { + ["y"] = 0, + ["x"] = -285971.42857143, + ["z"] = 692534.28571428, + }, -- end of ["point"] + ["type"] = 0, + }, -- end of ["cloneZone"] + ["explosion zone"] = + { + ["radius"] = 3000, + ["zoneId"] = 1, + ["color"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + [4] = 0.14901960784314, + }, -- end of ["color"] + ["properties"] = + { + }, -- end of ["properties"] + ["hidden"] = false, + ["y"] = 673819.99999999, + ["x"] = -271900, + ["name"] = "explosion zone", + ["point"] = + { + ["y"] = 0, + ["x"] = -271900, + ["z"] = 673819.99999999, + }, -- end of ["point"] + ["type"] = 0, + }, -- end of ["explosion zone"] } -- end of zonesByName diff --git a/Example DBs/mist_DBs_zonesByNum.lua b/Example DBs/mist_DBs_zonesByNum.lua index 317cdcf..f4a8699 100644 --- a/Example DBs/mist_DBs_zonesByNum.lua +++ b/Example DBs/mist_DBs_zonesByNum.lua @@ -2,15 +2,8 @@ zonesByNum = { [1] = { - ["y"] = 614105.71428571, ["radius"] = 3000, - ["point"] = - { - ["y"] = 0, - ["x"] = -245328.57142857, - ["z"] = 614105.71428571, - }, -- end of ["point"] - ["name"] = "LZ zone", + ["zoneId"] = 3, ["color"] = { [1] = 1, @@ -18,21 +11,25 @@ zonesByNum = [3] = 1, [4] = 0.14901960784314, }, -- end of ["color"] - ["x"] = -245328.57142857, + ["properties"] = + { + }, -- end of ["properties"] ["hidden"] = false, - ["zoneId"] = 2, - }, -- end of [1] - [2] = - { ["y"] = 692534.28571428, - ["radius"] = 3000, + ["x"] = -285971.42857143, + ["name"] = "cloneZone", + ["type"] = 0, ["point"] = { ["y"] = 0, ["x"] = -285971.42857143, ["z"] = 692534.28571428, }, -- end of ["point"] - ["name"] = "cloneZone", + }, -- end of [1] + [2] = + { + ["radius"] = 3000, + ["zoneId"] = 1, ["color"] = { [1] = 1, @@ -40,11 +37,48 @@ zonesByNum = [3] = 1, [4] = 0.14901960784314, }, -- end of ["color"] - ["x"] = -285971.42857143, + ["properties"] = + { + }, -- end of ["properties"] ["hidden"] = false, - ["zoneId"] = 3, + ["y"] = 673819.99999999, + ["x"] = -271900, + ["name"] = "explosion zone", + ["type"] = 0, + ["point"] = + { + ["y"] = 0, + ["x"] = -271900, + ["z"] = 673819.99999999, + }, -- end of ["point"] }, -- end of [2] [3] = + { + ["radius"] = 3000, + ["zoneId"] = 2, + ["color"] = + { + [1] = 1, + [2] = 1, + [3] = 1, + [4] = 0.14901960784314, + }, -- end of ["color"] + ["properties"] = + { + }, -- end of ["properties"] + ["hidden"] = false, + ["y"] = 614105.71428571, + ["x"] = -245328.57142857, + ["name"] = "LZ zone", + ["type"] = 0, + ["point"] = + { + ["y"] = 0, + ["x"] = -245328.57142857, + ["z"] = 614105.71428571, + }, -- end of ["point"] + }, -- end of [3] + [4] = { ["radius"] = 3000, ["zoneId"] = 174, @@ -62,33 +96,63 @@ zonesByNum = ["y"] = 267139.69375223, ["x"] = -163182.90396786, ["name"] = "shipZone", + ["type"] = 0, ["point"] = { ["y"] = 0, ["x"] = -163182.90396786, ["z"] = 267139.69375223, }, -- end of ["point"] - }, -- end of [3] - [4] = + }, -- end of [4] + [5] = { - ["y"] = 673819.99999999, - ["radius"] = 3000, - ["point"] = - { - ["y"] = 0, - ["x"] = -271900, - ["z"] = 673819.99999999, - }, -- end of ["point"] - ["name"] = "explosion zone", + ["radius"] = 13592.958647037, + ["zoneId"] = 339, ["color"] = { [1] = 1, - [2] = 1, - [3] = 1, + [2] = 0, + [3] = 0, [4] = 0.14901960784314, }, -- end of ["color"] - ["x"] = -271900, + ["properties"] = + { + ["Property Value "] = "Eyyyyyyyy", + ["Prop 2 is an"] = "empty string", + }, -- end of ["properties"] ["hidden"] = false, - ["zoneId"] = 1, - }, -- end of [4] + ["y"] = 590545.61946051, + ["x"] = -151821.41786062, + ["name"] = "quad", + ["point"] = + { + ["y"] = 0, + ["x"] = -151821.41786062, + ["z"] = 590545.61946051, + }, -- end of ["point"] + ["type"] = 2, + ["verticies"] = + { + [1] = + { + ["y"] = 583845.85427019, + ["x"] = -156926.00086276, + }, -- end of [1] + [2] = + { + ["y"] = 594153.18533222, + ["x"] = -161637.92363397, + }, -- end of [2] + [3] = + { + ["y"] = 601908.22489317, + ["x"] = -144360.87347286, + }, -- end of [3] + [4] = + { + ["y"] = 582275.21334645, + ["x"] = -144360.87347286, + }, -- end of [4] + }, -- end of ["verticies"] + }, -- end of [5] } -- end of zonesByNum diff --git a/mist.lua b/mist.lua index fbf4f6a..de1499c 100644 --- a/mist.lua +++ b/mist.lua @@ -34,17 +34,19 @@ mist = {} -- don't change these mist.majorVersion = 4 -mist.minorVersion = 4 -mist.build = 90 +mist.minorVersion = 5 +mist.build = 106 -- forward declaration of log shorthand local log - +local dbLog + local mistSettings = { errorPopup = false, -- errors printed by mist logger will create popup warning you warnPopup = false, infoPopup = false, logLevel = 'warn', + dbLog = 'warn', } do -- the main scope @@ -73,11 +75,11 @@ do -- the main scope mist.nextGroupId = 1 mist.nextUnitId = 1 - local dbLog + local function initDBs() -- mist.DBs scope mist.DBs = {} - + mist.DBs.markList = {} mist.DBs.missionData = {} if env.mission then @@ -106,6 +108,25 @@ do -- the main scope zone.point.x = zone_data.x zone.point.y = 0 zone.point.z = zone_data.y + zone.properties = {} + if zone_data.properties then + for propInd, prop in pairs(zone_data.properties) do + if prop.value and type(prop.value) == 'string' and prop.value ~= "" then + zone.properties[prop.key] = prop.value + end + end + end + if zone.verticies then -- trust but verify + local r = 0 + for i = 1, #zone.verticies do + local dist = mist.utils.get2DDist(zone.point, zone.verticies[i]) + if dist > r then + r = mist.utils.deepCopy(dist) + end + end + zone.radius = r + + end mist.DBs.zonesByName[zone_data.name] = zone mist.DBs.zonesByNum[#mist.DBs.zonesByNum + 1] = mist.utils.deepCopy(zone) --[[deepcopy so that the zone in zones_by_name and the zone in @@ -113,6 +134,85 @@ do -- the main scope end end end + + mist.DBs.drawingByName = {} + mist.DBs.drawingIndexed = {} + + if env.mission.drawings and env.mission.drawings.layers then + for i = 1, #env.mission.drawings.layers do + local l = env.mission.drawings.layers[i] + + for j = 1, #l.objects do + local copy = mist.utils.deepCopy(l.objects[j]) + --log:warn(copy) + local doOffset = false + copy.layer = l.name + + local theta = copy.angle or 0 + theta = math.rad(theta) + if copy.primitiveType == "Polygon" then + + if copy.polygonMode == 'rect' then + local h, w = copy.height, copy.width + copy.points = {} + copy.points[1] = {x = h/2, y = w/2} + copy.points[2] = {x = -h/2, y = w/2} + copy.points[3] = {x = -h/2, y = -w/2} + copy.points[4] = {x = h/2, y = -w/2} + doOffset = true + elseif copy.polygonMode == "circle" then + copy.points = {x = copy.mapX, y = copy.mapY} + elseif copy.polygonMode == 'oval' then + -- oval bugs. Scale and rotation are off. + copy.points = {} + local numPoints = 24 + local angleStep = (math.pi*2)/numPoints + doOffset = true + for v = 1, numPoints do + local pointAngle = v * angleStep + local x = copy.r1 * math.cos(pointAngle) + local y = copy.r2 * math.sin(pointAngle) + + table.insert(copy.points,{x=x,y=y}) + + end + elseif copy.polygonMode == "arrow" then + doOffset = true + end + + -- NOTE TO SELF. FIGURE OUT WHICH SHAPES NEED TO BE OFFSET. OVAL YES. + --log:warn('check offset') + if theta ~= 0 and copy.points and doOffset == true then + + --log:warn('offsetting Values') + for p = 1, #copy.points do + local offset = mist.vec.rotateVec2(copy.points[p], theta) + copy.points[p] = offset + end + --log:warn(copy.points[1]) + end + + end + if copy.points and #copy.points > 1 then + for u = 1, #copy.points do + copy.points[u].x = copy.points[u].x + copy.mapX + copy.points[u].y = copy.points[u].y + copy.mapY + end + + end + if mist.DBs.drawingByName[copy.name] then + log:warn("Drawing by the name of [ $1 ] already exists in DB. Failed to add to mist.DBs.drawingByName.", copy.name) + else + + mist.DBs.drawingByName[copy.name] = copy + end + table.insert(mist.DBs.drawingIndexed, copy) + end + + end + + end + mist.DBs.navPoints = {} mist.DBs.units = {} @@ -151,28 +251,31 @@ do -- the main scope for cntry_id, cntry_data in pairs(coa_data.country) do local countryName = string.lower(cntry_data.name) + if cntry_data.id and country.names[cntry_data.id] then + countryName = string.lower(country.names[cntry_data.id]) + end mist.DBs.units[coa_name][countryName] = {} mist.DBs.units[coa_name][countryName].countryId = cntry_data.id if type(cntry_data) == 'table' then --just making sure - for obj_type_name, obj_type_data in pairs(cntry_data) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do - if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then --should be an unncessary check + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then --should be an unncessary check - local category = obj_type_name + local category = obj_cat_name - if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group! + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! mist.DBs.units[coa_name][countryName][category] = {} - for group_num, group_data in pairs(obj_type_data.group) do + for group_num, group_data in pairs(obj_cat_data.group) do if group_data and group_data.units and type(group_data.units) == 'table' then --making sure again- this is a valid group mist.DBs.units[coa_name][countryName][category][group_num] = {} local groupName = group_data.name - if env.mission.version > 7 then + if env.mission.version > 7 and env.mission.version < 19 then groupName = env.getValueDictByKey(groupName) end mist.DBs.units[coa_name][countryName][category][group_num].groupName = groupName @@ -196,7 +299,7 @@ do -- the main scope local units_tbl = mist.DBs.units[coa_name][countryName][category][group_num].units --pointer to the units table for this group units_tbl[unit_num] = {} - if env.mission.version > 7 then + if env.mission.version > 7 and env.mission.version < 19 then units_tbl[unit_num].unitName = env.getValueDictByKey(unit_data.name) else units_tbl[unit_num].unitName = unit_data.name @@ -240,6 +343,7 @@ do -- the main scope if category == 'static' then units_tbl[unit_num].categoryStatic = unit_data.category units_tbl[unit_num].shape_name = unit_data.shape_name + units_tbl[unit_num].linkUnit = unit_data.linkUnit if unit_data.mass then units_tbl[unit_num].mass = unit_data.mass end @@ -251,10 +355,10 @@ do -- the main scope end --for unit_num, unit_data in pairs(group_data.units) do end --if group_data and group_data.units then - end --for group_num, group_data in pairs(obj_type_data.group) do - end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then - end --if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then - end --for obj_type_name, obj_type_data in pairs(cntry_data) do + end --for group_num, group_data in pairs(obj_cat_data.group) do + end --if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then + end --if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then + end --for obj_cat_name, obj_cat_data in pairs(cntry_data) do end --if type(cntry_data) == 'table' then end --for cntry_id, cntry_data in pairs(coa_data.country) do end --if coa_data.country then --there is a country table @@ -305,6 +409,11 @@ do -- the main scope ['Arco'] = 2, ['Shell'] = 3, }, + ['TRANSPORT'] = { + ['Heavy'] = 9, + ['Trash'] = 10, + ['Cargo'] = 11, + ['Ascot'] = 12, ['JTAC'] = { ['Axeman'] = 1, ['Darknight'] = 2, @@ -346,14 +455,105 @@ do -- the main scope ['rules'] = { ['canUseAircraft'] = true, ['appliesTo'] = { - 'A-10C', + 'A-10C_2', + 'A-10C', 'A-10A', }, }, - }, - }, - }, - } + }, + ['f16'] = { + Viper = 9, + Venom = 10, + Lobo = 11, + Cowboy = 12, + Python = 13, + Rattler =14, + Panther = 15, + Wolf = 16, + Weasel = 17, + Wild = 18, + Ninja = 19, + Jedi = 20, + rules = { + ['canUseAircraft'] = true, + ['appliesTo'] = { + 'F-16C_50', + 'F-16C bl.52d', + 'F-16C bl.50', + 'F-16A MLU', + 'F-16A', + }, + }, + + }, + ['f18'] = { + ['Hornet'] = 9, + ['Squid'] = 10, + ['Ragin'] = 11, + ['Roman'] = 12, + Sting = 13, + Jury =14, + Jokey = 15, + Ram = 16, + Hawk = 17, + Devil = 18, + Check = 19, + Snake = 20, + ['rules'] = { + ['canUseAircraft'] = true, + ['appliesTo'] = { + + "FA-18C_hornet", + 'F/A-18C', + }, + }, + }, + ['b1'] = { + ['Bone'] = 9, + ['Dark'] = 10, + ['Vader'] = 11, + ['rules'] = { + ['canUseAircraft'] = true, + ['appliesTo'] = { + 'B-1B', + }, + }, + }, + ['b52'] = { + ['Buff'] = 9, + ['Dump'] = 10, + ['Kenworth'] = 11, + ['rules'] = { + ['canUseAircraft'] = true, + ['appliesTo'] = { + 'B-52H', + }, + }, + }, + ['f15e'] = { + ['Dude'] = 9, + ['Thud'] = 10, + ['Gunny'] = 11, + ['Trek'] = 12, + Sniper = 13, + Sled =14, + Best = 15, + Jazz = 16, + Rage = 17, + Tahoe = 18, + ['rules'] = { + ['canUseAircraft'] = true, + ['appliesTo'] = { + 'F-15E', + --'F-15ERAZBAM', + }, + }, + }, + + }, + }, + }, + } mist.DBs.const.shapeNames = { ["Landmine"] = "landmine", ["FARP CP Blindage"] = "kp_ug", @@ -443,6 +643,42 @@ do -- the main scope ["Small house 1A area"] = "domik1a-all", ["White_Flag"] = "H-Flag_W", ["Airshow_Cone"] = "Comp_cone", + ["Bulk Cargo Ship Ivanov"] = "barge-1", + ["Bulk Cargo Ship Yakushev"] = "barge-2", + ["Outpost"]="block", + ["Road outpost"]="block-onroad", + ["Container camo"] = "bw_container_cargo", + ["Tech Hangar A"] = "ceh_ang_a", + ["Bunker 1"] = "dot", + ["Bunker 2"] = "dot2", + ["Tanker Elnya 160"] = "elnya", + ["F-shape barrier"] = "f_bar_cargo", + ["Helipad Single"] = "farp", + ["FARP"] = "farps", + ["Fueltank"] = "fueltank_cargo", + ["Gate"] = "gate", + ["FARP Fuel Depot"] = "gsm rus", + ["Armed house"] = "home1_a", + ["FARP Command Post"] = "kp-ug", + ["Watch Tower Armed"] = "ohr-vyshka", + ["Oiltank"] = "oiltank_cargo", + ["Pipes small"] = "pipes_small_cargo", + ["Pipes big"] = "pipes_big_cargo", + ["Oil platform"] = "plavbaza", + ["Tetrapod"] = "tetrapod_cargo", + ["Fuel tank"] = "toplivo", + ["Trunks long"] = "trunks_long_cargo", + ["Trunks small"] = "trunks_small_cargo", + ["Passenger liner"] = "yastrebow", + ["Passenger boat"] = "zwezdny", + ["Oil rig"] = "oil_platform", + ["Gas platform"] = "gas_platform", + ["Container 20ft"] = "container_20ft", + ["Container 40ft"] = "container_40ft", + ["Downed pilot"] = "cadaver", + ["Parachute"] = "parash", + ["Pilot F15 Parachute"] = "pilot_f15_parachute", + ["Pilot standing"] = "pilot_parashut", } @@ -504,8 +740,8 @@ do -- the main scope mist.DBs.MEgroupsById = mist.utils.deepCopy(mist.DBs.groupsById) mist.DBs.deadObjects = {} - - do + + do local mt = {} function mt.__newindex(t, key, val) @@ -649,9 +885,14 @@ do -- the main scope newTable.category = 'static' else unitOneRef = newObject:getUnits() - newTable.countryId = tonumber(unitOneRef[1]:getCountry()) - newTable.coalitionId = tonumber(unitOneRef[1]:getCoalition()) - newTable.category = tonumber(newObject:getCategory()) + if #unitOneRef > 0 and unitOneRef[1] and type(unitOneRef[1]) == 'table' then + newTable.countryId = tonumber(unitOneRef[1]:getCountry()) + newTable.coalitionId = tonumber(unitOneRef[1]:getCoalition()) + newTable.category = tonumber(newObject:getCategory()) + else + log:warn('getUnits failed to return on $1 ; Built Data: $2.', event, newTable) + return false + end end for countryData, countryId in pairs(country.id) do if newTable.country and string.upper(countryData) == string.upper(newTable.country) or countryId == newTable.countryId then @@ -782,6 +1023,8 @@ do -- the main scope newTable.units[1].canCargo = data.canCargo newTable.units[1].categoryStatic = data.categoryStatic newTable.units[1].type = data.type + newTable.units[1].linkUnit = data.linkUnit + mistAddedObjects[index] = nil break end @@ -818,6 +1061,7 @@ do -- the main scope --dbLog:info('iterate') for name, gData in pairs(tempSpawnedGroups) do --env.info(name) + --dbLog:info(gData) local updated = false local stillExists = false if not gData.checked then @@ -825,9 +1069,9 @@ do -- the main scope local _g = gData.gp or Group.getByName(name) if mist.DBs.groupsByName[name] then -- first check group level properties, groupId, countryId, coalition - -- dbLog:info('Found in DBs, check if updated') + --dbLog:info('Found in DBs, check if updated') local dbTable = mist.DBs.groupsByName[name] - -- dbLog:info(dbTable) + --dbLog:info(dbTable) if gData.type ~= 'static' then -- dbLog:info('Not static') @@ -848,11 +1092,11 @@ do -- the main scope end --dbLog:info('Updated: $1', updated) if updated == false and gData.type ~= 'static' then -- time to check units - --dbLog:info('No Group Mismatch, Check Units') + --dbLog:info('No Group Mismatch, Check Units') if _g and _g:isExist() == true then stillExists = true for index, uObject in pairs(_g:getUnits()) do - --dbLog:info(index) + --dbLog:info(index) if mist.DBs.unitsByName[uObject:getName()] then --dbLog:info('UnitByName table exists') local uTable = mist.DBs.unitsByName[uObject:getName()] @@ -870,8 +1114,10 @@ do -- the main scope if stillExists == true and (updated == true or not mist.DBs.groupsByName[name]) then --dbLog:info('Get Table') - writeGroups[#writeGroups+1] = {data = dbUpdate(name, gData.type), isUpdated = updated} - + local dbData = dbUpdate(name, gData.type) + if dbData and type(dbData) == 'table' then + writeGroups[#writeGroups+1] = {data = dbData, isUpdated = updated} + end end -- Work done, so remove end @@ -998,19 +1244,20 @@ do -- the main scope local function groupSpawned(event) -- dont need to add units spawned in at the start of the mission if mist is loaded in init line if event.id == world.event.S_EVENT_BIRTH and timer.getTime0() < timer.getAbsTime() then - --dbLog:info('unitSpawnEvent') - + --log:info('unitSpawnEvent') + --log:info(event) + --log:info(event.initiator:getTypeName()) --table.insert(tempSpawnedUnits,(event.initiator)) ------- -- New functionality below. ------- if Object.getCategory(event.initiator) == 1 and not Unit.getPlayerName(event.initiator) then -- simple player check, will need to later check to see if unit was spawned with a player in a flight - --dbLog:info('Object is a Unit') + --log:info('Object is a Unit') if Unit.getGroup(event.initiator) then - --dbLog:info(Unit.getGroup(event.initiator):getName()) + -- log:info(Unit.getGroup(event.initiator):getName()) local g = Unit.getGroup(event.initiator) if not tempSpawnedGroups[g:getName()] then - --dbLog:info('added') + --log:info('added') tempSpawnedGroups[g:getName()] = {type = 'group', gp = g} tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 end @@ -1018,7 +1265,7 @@ do -- the main scope log:error('Group not accessible by unit in event handler. This is a DCS bug') end elseif Object.getCategory(event.initiator) == 3 or Object.getCategory(event.initiator) == 6 then - --dbLog:info('Object is Static') + --log:info('Object is Static') tempSpawnedGroups[StaticObject.getName(event.initiator)] = {type = 'static'} tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 end @@ -1169,10 +1416,13 @@ do -- the main scope for i = 1, #st do local s = st[i] if StaticObject.isExist(s) then - if not mist.DBs.unitsByName[s:getName()] then - --env.info(StaticObject.getID(s) .. ' Not found in DB yet') - tempSpawnedGroups[s:getName()] = {type = 'static'} - tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 + local name = s:getName() + if not mist.DBs.unitsByName[name] then + dbLog:warn('$1 Not found in DB yet. ID: $2', name, StaticObject.getID(s)) + if string.len(name) > 0 then -- because in this mission someone sent the name was returning as an empty string. Gotta be careful. + tempSpawnedGroups[s:getName()] = {type = 'static'} + tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 + end end end end @@ -1180,6 +1430,7 @@ do -- the main scope end end + --- init function. -- creates logger, adds default event handler @@ -1284,8 +1535,9 @@ do -- the main scope --- Spawns a static object to the game world. -- @todo write good docs -- @tparam table staticObj table containing data needed for the object creation - function mist.dynAddStatic(newObj) - log:info(newObj) + function mist.dynAddStatic(n) + --log:info(newObj) + local newObj = mist.utils.deepCopy(n) if newObj.units and newObj.units[1] then -- if its mist format for entry, val in pairs(newObj.units[1]) do if newObj[entry] and newObj[entry] ~= val or not newObj[entry] then @@ -1379,8 +1631,10 @@ do -- the main scope -- Same as coalition.add function in SSE. checks the passed data to see if its valid. -- Will generate groupId, groupName, unitId, and unitName if needed -- @tparam table newGroup table containting values needed for spawning a group. - function mist.dynAdd(newGroup) - + function mist.dynAdd(ng) + + local newGroup = mist.utils.deepCopy(ng) + --log:warn(newGroup) --mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroupOrig.lua') local cntry = newGroup.country if newGroup.countryId then @@ -1452,7 +1706,11 @@ do -- the main scope end if newGroup.clone and mist.DBs.groupsByName[newGroup.name] or not newGroup.name then - newGroup.name = tostring(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName]) + --if newGroup.baseName then + -- idea of later. So custmozed naming can be created + -- else + newGroup.name = tostring(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName]) + --end end if not newGroup.hidden then @@ -1537,16 +1795,32 @@ do -- the main scope end end else -- if aircraft and no route assigned. make a quick and stupid route so AI doesnt RTB immediately - if newCat == 'AIRPLANE' or newCat == 'HELICOPTER' then + --if newCat == 'AIRPLANE' or newCat == 'HELICOPTER' then newGroup.route = {} newGroup.route.points = {} newGroup.route.points[1] = {} - end + --end end newGroup.country = newCountry - - --mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroup.lua') + -- update and verify any self tasks + if newGroup.route and newGroup.route.points then + for i, pData in pairs(newGroup.route.points) do + if pData.task and pData.task.params and pData.task.params.tasks and #pData.task.params.tasks > 0 then + for tIndex, tData in pairs(pData.task.params.tasks) do + if tData.params and tData.params.action then + if tData.params.action.id == "EPLRS" then + tData.params.action.params.groupId = newGroup.groupId + elseif tData.params.action.id == "ActivateBeacon" or tData.params.action.id == "ActivateICLS" then + tData.params.action.params.unitId = newGroup.units[1].unitId + end + end + end + end + + end + end + --mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroupPushedToAddGroup.lua') --log:warn(newGroup) -- sanitize table newGroup.groupName = nil @@ -1816,10 +2090,10 @@ do if type(coa_data) == 'table' then if coa_data.country then --there is a country table for cntry_id, cntry_data in pairs(coa_data.country) do - for obj_type_name, obj_type_data in pairs(cntry_data) do - if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points - if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group! - for group_num, group_data in pairs(obj_type_data.group) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do if group_data and group_data.groupId == gpId then -- this is the group we are looking for if group_data.route and group_data.route.points and #group_data.route.points > 0 then local points = {} @@ -1834,10 +2108,10 @@ do end return end --if group_data and group_data.name and group_data.name == 'groupname' - end --for group_num, group_data in pairs(obj_type_data.group) do - end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then - end --if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then - end --for obj_type_name, obj_type_data in pairs(cntry_data) do + end --for group_num, group_data in pairs(obj_cat_data.group) do + end --if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then + end --if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then + end --for obj_cat_name, obj_cat_data in pairs(cntry_data) do end --for cntry_id, cntry_data in pairs(coa_data.country) do end --if coa_data.country then --there is a country table end --if coa_name == 'red' or coa_name == 'blue' and type(coa_data) == 'table' then @@ -2214,9 +2488,25 @@ do --- Returns a table containing unit names. -- @tparam table tbl sequential strings -- @treturn table @{UnitNameTable} - function mist.makeUnitTable(tbl) + function mist.makeUnitTable(tbl, exclude) --Assumption: will be passed a table of strings, sequential --log:info(tbl) + + + local excludeType = {} + if exclude then + if type(exclude) == 'table' then + for x, y in pairs(exclude) do + excludeType[x] = true + excludeType[y] = true + end + else + excludeType[exclude] = true + end + + end + + local units_by_name = {} local l_munits = mist.DBs.units --local reference for faster execution @@ -2277,12 +2567,15 @@ do elseif unit:sub(4,12) == '[vehicle]' then category = 'vehicle' country_start = 13 + elseif unit:sub(4, 11) == '[static]' then + category = 'static' + country_start = 12 end for coa, coa_tbl in pairs(l_munits) do for country, country_table in pairs(coa_tbl) do if country == string.lower(unit:sub(country_start)) then -- match for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2310,12 +2603,15 @@ do elseif unit:sub(5,13) == '[vehicle]' then category = 'vehicle' country_start = 14 + elseif unit:sub(5, 12) == '[static]' then + category = 'static' + country_start = 13 end for coa, coa_tbl in pairs(l_munits) do for country, country_table in pairs(coa_tbl) do if country == string.lower(unit:sub(country_start)) then -- match for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2340,12 +2636,14 @@ do category = 'ship' elseif unit:sub(7) == '[vehicle]' then category = 'vehicle' - end + elseif unit:sub(7) == '[static]' then + category = 'static' + end for coa, coa_tbl in pairs(l_munits) do if coa == 'blue' then for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2368,12 +2666,14 @@ do category = 'ship' elseif unit:sub(8) == '[vehicle]' then category = 'vehicle' + elseif unit:sub(8) == '[static]' then + category = 'static' end for coa, coa_tbl in pairs(l_munits) do if coa == 'blue' then for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2398,12 +2698,14 @@ do category = 'ship' elseif unit:sub(6) == '[vehicle]' then category = 'vehicle' + elseif unit:sub(6) == '[static]' then + category = 'static' end for coa, coa_tbl in pairs(l_munits) do if coa == 'red' then for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2426,12 +2728,14 @@ do category = 'ship' elseif unit:sub(7) == '[vehicle]' then category = 'vehicle' + elseif unit:sub(7) == '[static]' then + category = 'static' end for coa, coa_tbl in pairs(l_munits) do if coa == 'red' then for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2456,11 +2760,13 @@ do category = 'ship' elseif unit:sub(6) == '[vehicle]' then category = 'vehicle' + elseif unit:sub(6) == '[static]' then + category = 'static' end for coa, coa_tbl in pairs(l_munits) do for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2482,11 +2788,13 @@ do category = 'ship' elseif unit:sub(7) == '[vehicle]' then category = 'vehicle' + elseif unit:sub(7) == '[static]' then + category = 'static' end for coa, coa_tbl in pairs(l_munits) do for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2517,6 +2825,126 @@ do return units_tbl end +function mist.getUnitsByAttribute(att, rnum, id) + local cEntry = {} + cEntry.typeName = att.type or att.typeName or att.typename + cEntry.country = att.country + cEntry.coalition = att.coalition + cEntry.skill = att.skill + cEntry.categry = att.category + + local num = rnum or 1 + + if cEntry.skill == 'human' then + cEntry.skill = {'Client', 'Player'} + end + + + local checkedVal = {} + local units = {} + for uName, uData in pairs(mist.DBs.unitsByName) do + local matched = 0 + for cName, cVal in pairs(cEntry) do + if type(cVal) == 'table' then + for sName, sVal in pairs(cVal) do + if (uData[cName] and uData[cName] == sVal) or (uData[cName] and uData[cName] == sName) then + matched = matched + 1 + end + end + else + if uData[cName] and uData[cName] == cVal then + matched = matched + 1 + end + end + end + if matched >= num then + if id then + units[uData.unitId] = true + else + + units[uName] = true + end + end + end + + local rtn = {} + for name, _ in pairs(units) do + table.insert(rtn, name) + end + return rtn + +end + +function mist.getGroupsByAttribute(att, rnum, id) + local cEntry = {} + cEntry.typeName = att.type or att.typeName or att.typename + cEntry.country = att.country + cEntry.coalition = att.coalition + cEntry.skill = att.skill + cEntry.categry = att.category + + local num = rnum or 1 + + if cEntry.skill == 'human' then + cEntry.skill = {'Client', 'Player'} + end + local groups = {} + for gName, gData in pairs(mist.DBs.groupsByName) do + local matched = 0 + for cName, cVal in pairs(cEntry) do + if type(cVal) == 'table' then + for sName, sVal in pairs(cVal) do + if cName == 'skill' or cName == 'typeName' then + local lMatch = 0 + for uId, uData in pairs(gData.units) do + if (uData[cName] and uData[cName] == sVal) or (gData[cName] and gData[cName] == sName) then + lMatch = lMatch + 1 + break + end + end + if lMatch > 0 then + matched = matched + 1 + end + end + if (gData[cName] and gData[cName] == sVal) or (gData[cName] and gData[cName] == sName) then + matched = matched + 1 + break + end + end + else + if cName == 'skill' or cName == 'typeName' then + local lMatch = 0 + for uId, uData in pairs(gData.units) do + if (uData[cName] and uData[cName] == sVal) then + lMatch = lMatch + 1 + break + end + end + if lMatch > 0 then + matched = matched + 1 + end + end + if gData[cName] and gData[cName] == cVal then + matched = matched + 1 + end + end + end + if matched >= num then + if id then + groups[gData.groupid] = true + else + groups[gName] = true + end + end + end + local rtn = {} + for name, _ in pairs(groups) do + table.insert(rtn, name) + end + return rtn + +end + function mist.getDeadMapObjsInZones(zone_names) -- zone_names: table of zone names -- returns: table of dead map objects (indexed numerically) @@ -2552,6 +2980,160 @@ function mist.getDeadMapObjsInPolygonZone(zone) end return map_objs end +mist.shape = {} +function mist.shape.insideShape(shape1, shape2, full) + if shape1.radius then -- probably a circle + if shape2.radius then + return mist.shape.circleInCircle(shape1, shape2, full) + elseif shape2[1] then + return mist.shape.circleInPoly(shape1, shape2, full) + end + + elseif shape1[1] then -- shape1 is probably a polygon + if shape2.radius then + return mist.shape.polyInCircle(shape1, shape2, full) + elseif shape2[1] then + return mist.shape.polyInPoly(shape1, shape2, full) + end + end + return false +end + +function mist.shape.circleInCircle(c1, c2, full) + if not full then -- quick partial check + if mist.utils.get2DDist(c1.point, c2.point) <= c2.radius then + return true + end + end + local theta = mist.utils.getHeadingPoints(c2.point, c1.point) -- heading from + if full then + return mist.utils.get2DDist(mist.projectPoint(c1.point, c1.radius, theta), c2.point) <= c2.radius + else + return mist.utils.get2DDist(mist.projectPoint(c1.point, c1.radius, theta + math.pi), c2.point) <= c2.radius + end + return false +end + + +function mist.shape.circleInPoly(circle, poly, full) + + if poly and type(poly) == 'table' and circle and type(circle) == 'table' and circle.radius and circle.point then + if not full then + for i = 1, #poly do + if mist.utils.get2DDist(circle.point, poly[i]) <= circle.radius then + return true + end + end + end + -- no point is inside of the zone, now check if any part is + local count = 0 + for i = 1, #poly do + local theta -- heading of each set of points + if i == #poly then + theta = mist.utils.getHeadingPoints(poly[i],poly[1]) + else + theta = mist.utils.getHeadingPoints(poly[i],poly[i+1]) + end + -- offset + local pPoint = mist.projectPoint(circle.point, circle.radius, theta - (math.pi/180)) + local oPoint = mist.projectPoint(circle.point, circle.radius, theta + (math.pi/180)) + + + if mist.pointInPolygon(pPoint, poly) == true then + if (full and mist.pointInPolygon(oPoint, poly) == true) or not full then + return true + + end + + end + end + + end + return false +end + + +function mist.shape.polyInPoly(p1, p2, full) + local count = 0 + for i = 1, #p1 do + + if mist.pointInPolygon(p1[i], p2) then + count = count + 1 + end + if (not full) and count > 0 then + return true + end + end + if count == #p1 then + return true + end + + return false +end + +function mist.shape.polyInCircle(poly, circle, full) + local count = 0 + for i = 1, #poly do + if mist.utils.get2DDist(circle.point, poly[i]) <= circle.radius then + if full then + count = count + 1 + else + return true + end + end + end + if count == #poly then + return true + end + + return false +end + +function mist.shape.getPointOnSegment(point, seg, isSeg) + local p = mist.utils.makeVec2(point) + local s1 = mist.utils.makeVec2(seg[1]) + local s2 = mist.utils.makeVec2(seg[2]) + + + local cx, cy = p.x - s1.x, p.y - s1.y + local dx, dy = s2.x - s1.x, s2.x - s1.y + local d = (dx*dx + dy*dy) + + if d == 0 then + return {x = s1.x, y = s1.y} + end + local u = (cx*dx + cy*dy)/d + if isSeg then + if u < 0 then + u = 0 + elseif u > 1 then + u = 1 + end + end + return {x = s1.x + u*dx, y = s1.y + u*dy} +end + + +function mist.shape.segmentIntersect(segA, segB) + local dx1, dy1 = segA[2].x - segA[1].x, segA[2] - segA[1].y + local dx2, dy2 = segB[2].x - segB[1].x, segB[2] - segB[1].y + local dx3, dy3 = segA[1].x - segB[1].x, segA[1].y - segB[1].y + local d = dx1*dy2 - dy1*dx2 + if d == 0 then + return false + end + local t1 = (dx2*dy3 - dy2*dx3)/d + if t1 < 0 or t1 > 1 then + return false + end + local t2 = (dx1*dy3 - dy1*dx3)/d + if t2 < 0 or t2 > 1 then + return false + end + -- point of intersection + return true, segA[1].x + t1*dx1, segA[1].y + t1*dy1 +end + function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon. Code from http://softsurfer.com/Archive/algorithm_0103/algorithm_0103.htm --[[local type_tbl = { @@ -2591,17 +3173,23 @@ function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon. end end +function mist.mapValue(val, inMin, inMax, outMin, outMax) + return (val - inMin) * (outMax - outMin) / (inMax - inMin) + outMin +end + function mist.getUnitsInPolygon(unit_names, polyZone, max_alt) local units = {} for i = 1, #unit_names do - units[#units + 1] = Unit.getByName(unit_names[i]) + units[#units + 1] = Unit.getByName(unit_names[i]) or StaticObject.getByName(unit_names[i]) end local inZoneUnits = {} for i =1, #units do - if units[i]:isActive() and mist.pointInPolygon(units[i]:getPosition().p, polyZone, max_alt) then - inZoneUnits[#inZoneUnits + 1] = units[i] + local lUnit = units[i] + local lCat = lUnit:getCategory() + if ((lCat == 1 and lUnit:isActive()) or lCat ~= 1) and mist.pointInPolygon(lUnit:getPosition().p, polyZone, max_alt) then + inZoneUnits[#inZoneUnits + 1] = lUnit end end @@ -2609,8 +3197,7 @@ function mist.getUnitsInPolygon(unit_names, polyZone, max_alt) end function mist.getUnitsInZones(unit_names, zone_names, zone_type) - - zone_type = zone_type or 'cylinder' + zone_type = zone_type or 'cylinder' if zone_type == 'c' or zone_type == 'cylindrical' or zone_type == 'C' then zone_type = 'cylinder' end @@ -2622,9 +3209,13 @@ function mist.getUnitsInZones(unit_names, zone_names, zone_type) local units = {} local zones = {} - + + if zone_names and type(zone_names) == 'string' then + zone_names = {zone_names} + end for k = 1, #unit_names do - local unit = Unit.getByName(unit_names[k]) + + local unit = Unit.getByName(unit_names[k]) or StaticObject.getByName(unit_names[k]) if unit then units[#units + 1] = unit end @@ -2632,31 +3223,40 @@ function mist.getUnitsInZones(unit_names, zone_names, zone_type) for k = 1, #zone_names do - local zone = trigger.misc.getZone(zone_names[k]) + local zone = mist.DBs.zonesByName[zone_names[k]] if zone then - zones[#zones + 1] = {radius = zone.radius, x = zone.point.x, y = zone.point.y, z = zone.point.z} + zones[#zones + 1] = {radius = zone.radius, x = zone.point.x, y = zone.point.y, z = zone.point.z, verts = zone.verticies} end end local in_zone_units = {} - for units_ind = 1, #units do - for zones_ind = 1, #zones do + local lUnit = units[units_ind] + local unit_pos = lUnit:getPosition().p + local lCat = lUnit:getCategory() + for zones_ind = 1, #zones do if zone_type == 'sphere' then --add land height value for sphere zone type local alt = land.getHeight({x = zones[zones_ind].x, y = zones[zones_ind].z}) if alt then zones[zones_ind].y = alt end end - local unit_pos = units[units_ind]:getPosition().p - if unit_pos and units[units_ind]:isActive() == true then - if zone_type == 'cylinder' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then - in_zone_units[#in_zone_units + 1] = units[units_ind] - break - elseif zone_type == 'sphere' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.y - zones[zones_ind].y)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then - in_zone_units[#in_zone_units + 1] = units[units_ind] - break - end + + if unit_pos and ((lCat == 1 and lUnit:isActive() == true) or lCat ~= 1) then -- it is a unit and is active or it is not a unit + if zones[zones_ind].verts then + if mist.pointInPolygon(unit_pos, zones[zones_ind].verts) then + in_zone_units[#in_zone_units + 1] = lUnit + end + + else + if zone_type == 'cylinder' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then + in_zone_units[#in_zone_units + 1] = lUnit + break + elseif zone_type == 'sphere' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.y - zones[zones_ind].y)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then + in_zone_units[#in_zone_units + 1] = lUnit + break + end + end end end end @@ -2679,14 +3279,14 @@ function mist.getUnitsInMovingZones(unit_names, zone_unit_names, radius, zone_ty local zone_units = {} for k = 1, #unit_names do - local unit = Unit.getByName(unit_names[k]) + local unit = Unit.getByName(unit_names[k]) or StaticObject.getByName(unit_names[k]) if unit then units[#units + 1] = unit end end for k = 1, #zone_unit_names do - local unit = Unit.getByName(zone_unit_names[k]) + local unit = Unit.getByName(zone_unit_names[k]) or StaticObject.getByName(zone_unit_names[k]) if unit then zone_units[#zone_units + 1] = unit end @@ -2695,15 +3295,18 @@ function mist.getUnitsInMovingZones(unit_names, zone_unit_names, radius, zone_ty local in_zone_units = {} for units_ind = 1, #units do + local lUnit = units[units_ind] + local lCat = lUnit:getCategory() + local unit_pos = lUnit:getPosition().p for zone_units_ind = 1, #zone_units do - local unit_pos = units[units_ind]:getPosition().p + local zone_unit_pos = zone_units[zone_units_ind]:getPosition().p - if unit_pos and zone_unit_pos and units[units_ind]:isActive() == true then + if unit_pos and zone_unit_pos and ((lCat == 1 and lUnit:isActive()) or lCat ~= 1) then if zone_type == 'cylinder' and (((unit_pos.x - zone_unit_pos.x)^2 + (unit_pos.z - zone_unit_pos.z)^2)^0.5 <= radius) then - in_zone_units[#in_zone_units + 1] = units[units_ind] + in_zone_units[#in_zone_units + 1] = lUnit break elseif zone_type == 'sphere' and (((unit_pos.x - zone_unit_pos.x)^2 + (unit_pos.y - zone_unit_pos.y)^2 + (unit_pos.z - zone_unit_pos.z)^2)^0.5 <= radius) then - in_zone_units[#in_zone_units + 1] = units[units_ind] + in_zone_units[#in_zone_units + 1] = lUnit break end end @@ -2721,7 +3324,8 @@ function mist.getUnitsLOS(unitset1, altoffset1, unitset2, altoffset2, radius) -- get the positions all in one step, saves execution time. for unitset1_ind = 1, #unitset1 do local unit1 = Unit.getByName(unitset1[unitset1_ind]) - if unit1 and unit1:isActive() == true then + local lCat = unit1:getCategory() + if unit1 and ((lCat == 1 and unit1:isActive()) or lCat ~= 1) then unit_info1[#unit_info1 + 1] = {} unit_info1[#unit_info1].unit = unit1 unit_info1[#unit_info1].pos = unit1:getPosition().p @@ -2730,7 +3334,8 @@ function mist.getUnitsLOS(unitset1, altoffset1, unitset2, altoffset2, radius) for unitset2_ind = 1, #unitset2 do local unit2 = Unit.getByName(unitset2[unitset2_ind]) - if unit2 and unit2:isActive() == true then + local lCat = unit2:getCategory() + if unit2 and ((lCat == 1 and unit2:isActive()) or lCat ~= 1) then unit_info2[#unit_info2 + 1] = {} unit_info2[#unit_info2].unit = unit2 unit_info2[#unit_info2].pos = unit2:getPosition().p @@ -2766,7 +3371,8 @@ end function mist.getAvgPoint(points) local avgX, avgY, avgZ, totNum = 0, 0, 0, 0 for i = 1, #points do - local nPoint = mist.utils.makeVec3(points[i]) + --log:warn(points[i]) + local nPoint = mist.utils.makeVec3(points[i]) if nPoint.z then avgX = avgX + nPoint.x avgY = avgY + nPoint.y @@ -2859,13 +3465,13 @@ function mist.getBRString(vars) local metric = vars.metric local avgPos = mist.getAvgPos(units) if avgPos then - local vec = {x = avgPos.x - ref.x, y = avgPos.y - ref.y, z = avgPos.z - ref.z} - local dir = mist.utils.getDir(vec, ref) - local dist = mist.utils.get2DDist(avgPos, ref) - if alt then - alt = avgPos.y - end - return mist.tostringBR(dir, dist, alt, metric) + local vec = {x = avgPos.x - ref.x, y = avgPos.y - ref.y, z = avgPos.z - ref.z} + local dir = mist.utils.getDir(vec, ref) + local dist = mist.utils.get2DDist(avgPos, ref) + if alt then + alt = avgPos.y + end + return mist.tostringBR(dir, dist, alt, metric) end end @@ -2891,10 +3497,11 @@ function mist.getLeadingPos(vars) unitPosTbl[#unitPosTbl + 1] = unit:getPosition().p end end + if #unitPosTbl > 0 then -- one more more units found. -- first, find the unit most in the heading direction local maxPos = -math.huge - + heading = heading * -1 -- rotated value appears to be opposite of what was expected local maxPosInd -- maxPos - the furthest in direction defined by heading; maxPosInd = for i = 1, #unitPosTbl do local rotatedVec2 = mist.vec.rotateVec2(mist.utils.makeVec2(unitPosTbl[i]), heading) @@ -2985,8 +3592,147 @@ function mist.getLeadingBRString(vars) end end +--[[getPathLength from GSH +-- Returns the length between the defined set of points. Can also return the point index before the cutoff was achieved +p - table of path points, vec2 or vec3 +cutoff - number distance after which to stop at +topo - boolean for if it should get the topographical distance + +]] + +function mist.getPathLength(p, cutoff, topo) + local l = 0 + local cut = 0 or cutOff + local path = {} + + for i = 1, #p do + if topo then + table.insert(path, mist.utils.makeVec3GL(p[i])) + else + table.insert(path, mist.utils.makeVec3(p[i])) + end + end + + for i = 1, #path do + if i + 1 <= #path then + if topo then + l = mist.utils.get3DDist(path[i], path[i+1]) + l + else + l = mist.utils.get2DDist(path[i], path[i+1]) + l + end + end + if cut ~= 0 and l > cut then + return l, i + end + end + return l end +--[[ +Return a series of points to simplify the input table. Best used in conjunction with findPathOnRoads to turn the massive table into a list of X points. +p - table of path points, can be vec2 or vec3 +num - number of segments. +exact - boolean for whether or not it returns the exact distance or uses the first WP to that distance. + + +]] + +function mist.getPathInSegments(p, num, exact) + local tot = mist.getPathLength(p) + local checkDist = tot/num + local typeUsed = 'vec2' + + local points = {[1] = p[1]} + local curDist = 0 + for i = 1, #p do + if i + 1 <= #p then + curDist = mist.utils.get2DDist(p[i], p[i+1]) + curDist + if curDist > checkDist then + curDist = 0 + if exact then + -- get avg point between the two + -- insert into point table + -- need to be accurate... maybe reassign the point for the value it is checking? + -- insert into p table? + else + table.insert(points, p[i]) + end + end + + end + + end + return points + +end + + +function mist.getPointAtDistanceOnPath(p, dist, r, rtn) + log:info('find distance: $1', dist) + local rType = r or 'roads' + local point = {x= 0, y = 0, z = 0} + local path = {} + local ret = rtn or 'vec2' + local l = 0 + if p[1] and #p == 2 then + path = land.findPathOnRoads(rType, p[1].x, p[1].y, p[2].x, p[2].y) + else + path = p + end + for i = 1, #path do + if i + 1 <= #path then + nextPoint = path[i+1] + if topo then + l = mist.utils.get3DDist(path[i], path[i+1]) + l + else + l = mist.utils.get2DDist(path[i], path[i+1]) + l + end + end + if l > dist then + local diff = dist + if i ~= 1 then -- get difference + diff = l - dist + end + local dir = mist.utils.getHeadingPoints(mist.utils.makeVec3(path[i]), mist.utils.makeVec3(path[i+1])) + local x, y + if r then + x, y = land.getClosestPointOnRoads(rType, mist.utils.round((math.cos(dir) * diff) + path[i].x,1), mist.utils.round((math.sin(dir) * diff) + path[i].y,1)) + else + x, y = mist.utils.round((math.cos(dir) * diff) + path[i].x,1), mist.utils.round((math.sin(dir) * diff) + path[i].y,1) + end + + if ret == 'vec2' then + return {x = x, y = y}, dir + elseif ret == 'vec3' then + return {x = x, y = 0, z = y}, dir + end + + return {x = x, y = y}, dir + end + end + log:warn('Find point at distance: $1, path distance $2', dist, l) + return false +end + + +function mist.projectPoint(point, dist, theta) + local newPoint = {} + if point.z then + newPoint.z = mist.utils.round(math.sin(theta) * dist + point.z, 3) + newPoint.y = mist.utils.deepCopy(point.y) + else + newPoint.y = mist.utils.round(math.sin(theta) * dist + point.y, 3) + end + newPoint.x = mist.utils.round(math.cos(theta) * dist + point.x, 3) + + return newPoint +end + +end + + + + --- Group functions. -- @section groups do -- group functions scope @@ -3037,6 +3783,9 @@ do -- group functions scope newData.units = {} local newUnits = newGroup:getUnits() + if #newUnits == 0 then + log:warn('getCurrentGroupData has returned no units for: $1', gpName) + end for unitNum, unitData in pairs(newGroup:getUnits()) do newData.units[unitNum] = {} local uName = unitData:getName() @@ -3074,7 +3823,7 @@ do -- group functions scope end - function mist.getGroupData(gpName) + function mist.getGroupData(gpName, route) local found = false local newData = {} if mist.DBs.groupsByName[gpName] then @@ -3115,14 +3864,17 @@ do -- group functions scope newData.units[unitNum].unitName = unitData.unitName newData.units[unitNum].heading = unitData.heading -- added to DBs newData.units[unitNum].playerCanDrive = unitData.playerCanDrive -- added to DBs - + newData.units[unitNum].livery_id = unitData.livery_id + newData.units[unitNum].AddPropAircraft = unitData.AddPropAircraft + newData.units[unitNum].AddPropVehicle = unitData.AddPropVehicle + if newData.category == 'plane' or newData.category == 'helicopter' then newData.units[unitNum].payload = payloads[unitNum] - newData.units[unitNum].livery_id = unitData.livery_id + newData.units[unitNum].onboard_num = unitData.onboard_num newData.units[unitNum].callsign = unitData.callsign - newData.units[unitNum].AddPropAircraft = unitData.AddPropAircraft + end if newData.category == 'static' then newData.units[unitNum].categoryStatic = unitData.categoryStatic @@ -3132,6 +3884,10 @@ do -- group functions scope end end --log:info(newData) + if route then + newData.route = mist.getGroupRoute(gpName, true) + end + return newData else log:error('$1 not found in MIST database', gpName) @@ -3156,10 +3912,10 @@ do -- group functions scope if (coa_name == 'red' or coa_name == 'blue') and type(coa_data) == 'table' then if coa_data.country then --there is a country table for cntry_id, cntry_data in pairs(coa_data.country) do - for obj_type_name, obj_type_data in pairs(cntry_data) do - if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points - if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group! - for group_num, group_data in pairs(obj_type_data.group) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do if group_data and group_data.groupId == gpId then for unitIndex, unitData in pairs(group_data.units) do --group index if unitData.unitId == unitId then @@ -3198,10 +3954,10 @@ do -- group functions scope if type(coa_data) == 'table' then if coa_data.country then --there is a country table for cntry_id, cntry_data in pairs(coa_data.country) do - for obj_type_name, obj_type_data in pairs(cntry_data) do - if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points - if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group! - for group_num, group_data in pairs(obj_type_data.group) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do if group_data and group_data.groupId == gpId then local payloads = {} for unitIndex, unitData in pairs(group_data.units) do --group index @@ -3223,16 +3979,53 @@ do -- group functions scope end log:warn("Couldn't find payload for group: $1", groupIdent) return - end + function mist.getGroupTable(groupIdent) + local gpId = groupIdent + if type(groupIdent) == 'string' and not tonumber(groupIdent) then + if mist.DBs.MEgroupsByName[groupIdent] then + gpId = mist.DBs.MEgroupsByName[groupIdent].groupId + else + log:error('$1 not found in mist.DBs.MEgroupsByName', groupIdent) + end + end + + if gpId then + for coa_name, coa_data in pairs(env.mission.coalition) do + if type(coa_data) == 'table' then + if coa_data.country then --there is a country table + for cntry_id, cntry_data in pairs(coa_data.country) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do + if group_data and group_data.groupId == gpId then + return group_data + end + end + end + end + end + end + end + end + end + else + log:error('Need string or number. Got: $1', type(groupIdent)) + return false + end + log:warn("Couldn't find table for group: $1", groupIdent) + + end + function mist.getValidRandomPoint(vars) end function mist.teleportToPoint(vars) -- main teleport function that all of teleport/respawn functions call - --log:info(vars) + --log:warn(vars) local point = vars.point local gpName if vars.gpName then @@ -3243,6 +4036,14 @@ do -- group functions scope log:error('Missing field groupName or gpName in variable table') end + --[[New vars to add, mostly for when called via inZone functions + anyTerrain + offsetWP1 + offsetRoute + initTasks + + ]] + local action = vars.action local disperse = vars.disperse or false @@ -3250,8 +4051,9 @@ do -- group functions scope local radius = vars.radius or 0 local innerRadius = vars.innerRadius - local route = vars.route local dbData = false + + local newGroupData if gpName and not vars.groupData then @@ -3272,18 +4074,33 @@ do -- group functions scope action = 'tele' newGroupData = vars.groupData end + + if vars.newGroupName then + newGroupData.groupName = vars.newGroupName + end + if #newGroupData.units == 0 then + log:warn('$1 has no units in group table', gpName) + return + end + --log:info('get Randomized Point') local diff = {x = 0, y = 0} local newCoord, origCoord local validTerrain = {'LAND', 'ROAD', 'SHALLOW_WATER', 'WATER', 'RUNWAY'} - if string.lower(newGroupData.category) == 'ship' then - validTerrain = {'SHALLOW_WATER' , 'WATER'} - elseif string.lower(newGroupData.category) == 'vehicle' then - validTerrain = {'LAND', 'ROAD'} + if vars.anyTerrain then + -- do nothing + elseif vars.validTerrain then + validTerrain = vars.validTerrain + else + if string.lower(newGroupData.category) == 'ship' then + validTerrain = {'SHALLOW_WATER' , 'WATER'} + elseif string.lower(newGroupData.category) == 'vehicle' then + validTerrain = {'LAND', 'ROAD'} + end end - local offsets = {} + if point and radius >= 0 then local valid = false -- new thoughts @@ -3303,7 +4120,7 @@ do -- group functions scope ---- old for i = 1, 100 do newCoord = mist.getRandPointInCircle(point, radius, innerRadius) - if mist.isTerrainValid(newCoord, validTerrain) then + if vars.anyTerrain or mist.isTerrainValid(newCoord, validTerrain) then origCoord = mist.utils.deepCopy(newCoord) diff = {x = (newCoord.x - newGroupData.units[1].x), y = (newCoord.y - newGroupData.units[1].y)} valid = true @@ -3381,10 +4198,36 @@ do -- group functions scope end - if route then - newGroupData.route = route - end - --log:info(newGroupData) + + local tempRoute + + if mist.DBs.MEgroupsByName[gpName] and not vars.route then + -- log:warn('getRoute') + tempRoute = mist.getGroupRoute(gpName, true) + elseif vars.route then + -- log:warn('routeExist') + tempRoute = mist.utils.deepCopy(vars.route) + end + -- log:warn(tempRoute) + if tempRoute then + if (vars.offsetRoute or vars.offsetWP1 or vars.initTasks) then + for i = 1, #tempRoute do + -- log:warn(i) + if (vars.offsetRoute) or (i == 1 and vars.offsetWP1) or (i == 1 and vars.initTasks) then + -- log:warn('update offset') + tempRoute[i].x = tempRoute[i].x + diff.x + tempRoute[i].y = tempRoute[i].y + diff.y + elseif vars.initTasks and i > 1 then + --log:warn('deleteWP') + tempRoute[i] = nil + end + end + end + newGroupData.route = tempRoute + end + + + --log:warn(newGroupData) --mist.debug.writeData(mist.utils.serialize,{'teleportToPoint', newGroupData}, 'newGroupData.lua') if string.lower(newGroupData.category) == 'static' then --log:info(newGroupData) @@ -3394,7 +4237,7 @@ do -- group functions scope end - function mist.respawnInZone(gpName, zone, disperse, maxDisp) + function mist.respawnInZone(gpName, zone, disperse, maxDisp, v) if type(gpName) == 'table' and gpName:getName() then gpName = gpName:getName() @@ -3405,9 +4248,9 @@ do -- group functions scope end if type(zone) == 'string' then - zone = trigger.misc.getZone(zone) - elseif type(zone) == 'table' and not zone.radius then - zone = trigger.misc.getZone(zone[math.random(1, #zone)]) + zone = mist.DBs.zonesByName[zone] + elseif type(zone) == 'table' and not zone.radius then + zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]] end local vars = {} vars.gpName = gpName @@ -3416,10 +4259,17 @@ do -- group functions scope vars.radius = zone.radius vars.disperse = disperse vars.maxDisp = maxDisp + + if v and type(v) == 'table' then + for index, val in pairs(v) do + vars[index] = val + end + end + return mist.teleportToPoint(vars) end - function mist.cloneInZone(gpName, zone, disperse, maxDisp) + function mist.cloneInZone(gpName, zone, disperse, maxDisp, v) --log:info('cloneInZone') if type(gpName) == 'table' then gpName = gpName:getName() @@ -3428,9 +4278,9 @@ do -- group functions scope end if type(zone) == 'string' then - zone = trigger.misc.getZone(zone) - elseif type(zone) == 'table' and not zone.radius then - zone = trigger.misc.getZone(zone[math.random(1, #zone)]) + zone = mist.DBs.zonesByName[zone] + elseif type(zone) == 'table' and not zone.radius then + zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]] end local vars = {} vars.gpName = gpName @@ -3440,10 +4290,15 @@ do -- group functions scope vars.disperse = disperse vars.maxDisp = maxDisp --log:info('do teleport') + if v and type(v) == 'table' then + for index, val in pairs(v) do + vars[index] = val + end + end return mist.teleportToPoint(vars) end - function mist.teleportInZone(gpName, zone, disperse, maxDisp) -- groupName, zoneName or table of Zone Names, keepForm is a boolean + function mist.teleportInZone(gpName, zone, disperse, maxDisp, v) -- groupName, zoneName or table of Zone Names, keepForm is a boolean if type(gpName) == 'table' and gpName:getName() then gpName = gpName:getName() else @@ -3451,9 +4306,9 @@ do -- group functions scope end if type(zone) == 'string' then - zone = trigger.misc.getZone(zone) - elseif type(zone) == 'table' and not zone.radius then - zone = trigger.misc.getZone(zone[math.random(1, #zone)]) + zone = mist.DBs.zonesByName[zone] + elseif type(zone) == 'table' and not zone.radius then + zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]] end local vars = {} @@ -3463,6 +4318,11 @@ do -- group functions scope vars.radius = zone.radius vars.disperse = disperse vars.maxDisp = maxDisp + if v and type(v) == 'table' then + for index, val in pairs(v) do + vars[index] = val + end + end return mist.teleportToPoint(vars) end @@ -3688,14 +4548,20 @@ do -- group functions scope end return choices[rtnVal] end + + function mist.stringCondense(s) + local exclude = {'%-', '%(', '%)', '%_', '%[', '%]', '%.', '%#', '% ', '%{', '%}', '%$', '%%', '%?', '%+', '%^'} + for i , str in pairs(exclude) do + s = string.gsub(s, str, '') + end + return s + end function mist.stringMatch(s1, s2, bool) - local exclude = {'%-', '%(', '%)', '%_', '%[', '%]', '%.', '%#', '% ', '%{', '%}', '%$', '%%', '%?', '%+', '%^'} + if type(s1) == 'string' and type(s2) == 'string' then - for i , str in pairs(exclude) do - s1 = string.gsub(s1, str, '') - s2 = string.gsub(s2, str, '') - end + s1 = mist.stringCondense(s1) + s2 = mist.stringCondense(s2) if not bool then s1 = string.lower(s1) s2 = string.lower(s2) @@ -3823,6 +4689,25 @@ do -- mist.util scope function mist.utils.celsiusToFahrenheit(c) return c*(9/5)+32 end + + function mist.utils.hexToRGB(hex, l) -- because for some reason the draw tools use hex when everything is rgba 0 - 1 + local int = 255 + if l then + int = 1 + end + if hex and type(hex) == 'string' then + local val = {} + hex = string.gsub(hex, '0x', '') + if string.len(hex) == 8 then + val[1] = tonumber("0x"..hex:sub(1,2)) / int + val[2] = tonumber("0x"..hex:sub(3,4)) / int + val[3] = tonumber("0x"..hex:sub(5,6)) / int + val[4] = tonumber("0x"..hex:sub(7,8)) / int + + return val + end + end + end function mist.utils.converter(t1, t2, val) if type(t1) == 'string' then @@ -4024,7 +4909,7 @@ do -- mist.util scope --- Returns the center of a zone as Vec3. -- @tparam string|table zone trigger zone name or table -- @treturn Vec3 center of the zone - function mist.utils.zoneToVec3(zone) + function mist.utils.zoneToVec3(zone, gl) local new = {} if type(zone) == 'table' then if zone.point then @@ -4032,7 +4917,7 @@ do -- mist.util scope new.y = zone.point.y new.z = zone.point.z elseif zone.x and zone.y and zone.z then - return zone + new = mist.utils.deepCopy(zone) end return new elseif type(zone) == 'string' then @@ -4041,11 +4926,21 @@ do -- mist.util scope new.x = zone.point.x new.y = zone.point.y new.z = zone.point.z - return new end end + if new.x and gl then + new.y = land.getHeight({x = new.x, y = new.z}) + end + return new end + function mist.utils.getHeadingPoints(point1, point2, north) -- sick of writing this out. + if north then + return mist.utils.getDir(mist.vec.sub(mist.utils.makeVec3(point2), mist.utils.makeVec3(point1)), (mist.utils.makeVec3(point1))) + else + return mist.utils.getDir(mist.vec.sub(mist.utils.makeVec3(point2), mist.utils.makeVec3(point1))) + end + end --- Returns heading-error corrected direction. -- True-north corrected direction from point along vector vec. -- @tparam Vec3 vec @@ -4067,6 +4962,12 @@ do -- mist.util scope -- @tparam Vec2|Vec3 point2 second point -- @treturn number distance between given points. function mist.utils.get2DDist(point1, point2) + if not point1 then + log:warn("mist.utils.get2DDist 1st input value is nil") + end + if not point2 then + log:warn("mist.utils.get2DDist 2nd input value is nil") + end point1 = mist.utils.makeVec3(point1) point2 = mist.utils.makeVec3(point2) return mist.vec.mag({x = point1.x - point2.x, y = 0, z = point1.z - point2.z}) @@ -4077,6 +4978,12 @@ do -- mist.util scope -- @tparam Vec3 point2 second point -- @treturn number distancen between given points in 3D space. function mist.utils.get3DDist(point1, point2) + if not point1 then + log:warn("mist.utils.get2DDist 1st input value is nil") + end + if not point2 then + log:warn("mist.utils.get2DDist 2nd input value is nil") + end return mist.vec.mag({x = point1.x - point2.x, y = point1.y - point2.y, z = point1.z - point2.z}) end @@ -4507,6 +5414,23 @@ end do -- mist.debug scope mist.debug = {} + function mist.debug.changeSetting(s) + if type(s) == 'table' then + for sName, sVal in pairs(s) do + if type(sVal) == 'string' or type(sVal) == 'number' then + if sName == 'log' then + mistSettings[sName] = sVal + mist.log:setLevel(sVal) + elseif sName == 'dbLog' then + mistSettings[sName] = sVal + dblog:setLevel(sVal) + end + else + mistSettings[sName] = sVal + end + end + end + end --- Dumps the global table _G. -- This dumps the global table _G to a file in -- the DCS\Logs directory. @@ -4514,11 +5438,24 @@ do -- mist.debug scope -- in $DCS_ROOT\Scripts\MissionScripting.lua to access lfs and io -- libraries. -- @param fname - function mist.debug.dump_G(fname) + function mist.debug.dump_G(fname, simp) if lfs and io then local fdir = lfs.writedir() .. [[Logs\]] .. fname local f = io.open(fdir, 'w') - f:write(mist.utils.tableShow(_G)) + if simp then + local g = mist.utils.deepCopy(_G) + g.mist = nil + g.slmod = nil + g.env.mission = nil + g.env.warehouses = nil + g.country.by_idx = nil + g.country.by_country = nil + + f:write(mist.utils.tableShow(g)) + else + + f:write(mist.utils.tableShow(_G)) + end f:close() log:info('Wrote debug data to $1', fdir) --trigger.action.outText(errmsg, 10) @@ -4562,6 +5499,141 @@ do -- mist.debug scope end end end + + -- write group table + function mist.debug.writeGroup(gName, data) + if gName and mist.DBs.groupsByName[gName] then + local dat + if data then + dat = mist.getGroupData(gName) + else + dat = mist.getGroupTable(gName) + end + if dat then + dat.route = {points = mist.getGroupRoute(gName, true)} + end + + if io and lfs and dat then + mist.debug.writeData(mist.utils.serialize, {gName, dat}, gName .. '_table.lua') + else + if dat then + trigger.action.outText('Error: insufficient libraries to run mist.debug.writeGroup, you must disable the sanitization of the io and lfs libraries in ./Scripts/MissionScripting.lua \nGroup table written to DCS.log file instead.', 10) + log:warn('$1 dataTable: $2', gName, dat) + else + trigger.action.outText('Unable to write group table for: ' .. gName .. '\n Error: insufficient libraries to run mist.debug.writeGroup, you must disable the sanitization of the io and lfs libraries in ./Scripts/MissionScripting.lua', 10) + end + end + end + end + + + + -- write all object types in mission. + function mist.debug.writeTypes(fName) + local wt = 'mistDebugWriteTypes.lua' + if fName and type(fName) == 'string' and string.find(fName, '.lua') then + wt = fName + end + local output = {units = {}, countries = {}} + for coa_name_miz, coa_data in pairs(env.mission.coalition) do + if type(coa_data) == 'table' then + if coa_data.country then --there is a country table + for cntry_id, cntry_data in pairs(coa_data.country) do + local countryName = string.lower(cntry_data.name) + if cntry_data.id and country.names[cntry_data.id] then + countryName = string.lower(country.names[cntry_data.id]) + end + output.countries[countryName] = {} + if type(cntry_data) == 'table' then --just making sure + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then --should be an unncessary check + local category = obj_cat_name + if not output.countries[countryName][category] then + -- log:warn('Create: $1', category) + output.countries[countryName][category] = {} + end + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do + if group_data and group_data.units and type(group_data.units) == 'table' then --making sure again- this is a valid group + for i = 1, #group_data.units do + if group_data.units[i] then + local u = group_data.units[i] + local liv = u.livery_id or 'default' + if not output.units[u.type] then -- create unit table + -- log:warn('Create: $1', u.type) + output.units[u.type] = {count = 0, livery_id = {}} + end + + if not output.countries[countryName][category][u.type] then + -- log:warn('Create country, category, unit: $1', u.type) + output.countries[countryName][category][u.type] = 0 + end + -- add to count + output.countries[countryName][category][u.type] = output.countries[countryName][category][u.type] + 1 + output.units[u.type].count = output.units[u.type].count + 1 + + if liv and not output.units[u.type].livery_id[countryName] then + -- log:warn('Create livery country: $1', countryName) + output.units[u.type].livery_id[countryName] = {} + end + if liv and not output.units[u.type].livery_id[countryName][liv] then + --log:warn('Create Livery: $1', liv) + output.units[u.type].livery_id[countryName][liv] = 0 + end + if liv then + output.units[u.type].livery_id[countryName][liv] = output.units[u.type].livery_id[countryName][liv] + 1 + end + if u.payload and u.payload.pylons then + if not output.units[u.type].CLSID then + output.units[u.type].CLSID = {} + output.units[u.type].pylons = {} + end + + for pyIndex, pData in pairs(u.payload.pylons) do + if not output.units[u.type].CLSID[pData.CLSID] then + output.units[u.type].CLSID[pData.CLSID] = 0 + end + output.units[u.type].CLSID[pData.CLSID] = output.units[u.type].CLSID[pData.CLSID] + 1 + + if not output.units[u.type].pylons[pyIndex] then + output.units[u.type].pylons[pyIndex] = {} + end + if not output.units[u.type].pylons[pyIndex][pData.CLSID] then + output.units[u.type].pylons[pyIndex][pData.CLSID] = 0 + end + output.units[u.type].pylons[pyIndex][pData.CLSID] = output.units[u.type].pylons[pyIndex][pData.CLSID] + 1 + end + + end + end + end + end + end + end + end + end + end + end + end + end + end + if io and lfs then + mist.debug.writeData(mist.utils.serialize, {'mistDebugWriteTypes', output}, wt) + else + trigger.action.outText('Error: insufficient libraries to run mist.debug.writeTypes, you must disable the sanitization of the io and lfs libraries in ./Scripts/MissionScripting.lua \n writeTypes table written to DCS.log file instead.', 10) + log:warn('mist.debug.writeTypes: $1', output) + end + return output + end + function mist.debug.writeWeapons(unit) + + end + + function mist.debug.mark(msg, coord) + + mist.marker.add({point = coord, text = msg}) + log:warn('debug.mark: $1 $2', msg, coord) + end end --- 3D Vector functions @@ -4633,6 +5705,13 @@ do -- mist.vec scope function mist.vec.rotateVec2(vec2, theta) return { x = vec2.x*math.cos(theta) - vec2.y*math.sin(theta), y = vec2.x*math.sin(theta) + vec2.y*math.cos(theta)} end + + function mist.vec.normalize(vec3) + local mag = mist.vec.mag(vec3) + if mag ~= 0 then + return mist.vec.scalar_mult(vec3, 1.0 / mag) + end + end end --- Flag functions. @@ -4826,7 +5905,7 @@ unitTableDef = table or nil if stopflag == -1 or (type(trigger.misc.getUserFlag(stopflag)) == 'number' and trigger.misc.getUserFlag(stopflag) == 0) or (type(trigger.misc.getUserFlag(stopflag)) == 'boolean' and trigger.misc.getUserFlag(stopflag) == 0) then local num_in_zone = 0 for i = 1, #units do - local unit = Unit.getByName(units[i]) + local unit = Unit.getByName(units[i]) or StaticObject.getByName(units[i]) if unit then local pos = unit:getPosition().p if mist.pointInPolygon(pos, zone, maxalt) then @@ -4913,7 +5992,13 @@ unitTableDef = table or nil end end - + --[[ + function mist.flagFunc.weapon_in_zones(vars) + -- borrow from suchoi surprise. While running enabled event handler that checks for weapons in zone. + -- Choice is weapon category or weapon strings. + + end +]] --- Sets a flag if unit(s) is/are inside a moving zone. -- @todo document function mist.flagFunc.units_in_moving_zones(vars) @@ -5282,13 +6367,15 @@ do -- mist.msg scope local caSlots = false local caMSGtoGroup = false + local anyUpdate = false + local lastMessageTime = nil if env.mission.groundControl then -- just to be sure? for index, value in pairs(env.mission.groundControl) do if type(value) == 'table' then for roleName, roleVal in pairs(value) do for rIndex, rVal in pairs(roleVal) do - if env.mission.groundControl[index][roleName][rIndex] > 0 then + if type(rVal) == 'number' and rVal > 0 then caSlots = true break end @@ -5303,11 +6390,123 @@ do -- mist.msg scope end local function mistdisplayV5() - --[[thoughts to improve upon - event handler based activeClients table. - display messages only when there is an update - possibly co-routine it. - ]] + --log:warn("mistdisplayV5: $1", timer.getTime()) + + local clearView = true + if #messageList > 0 then + --log:warn('Updates: $1', anyUpdate) + if anyUpdate == true then + local activeClients = {} + + for clientId, clientData in pairs(mist.DBs.humansById) do + if Unit.getByName(clientData.unitName) and Unit.getByName(clientData.unitName):isExist() == true then + activeClients[clientData.groupId] = clientData.groupName + end + end + anyUpdate = false + if displayActive == false then + displayActive = true + end + --mist.debug.writeData(mist.utils.serialize,{'msg', messageList}, 'messageList.lua') + local msgTableText = {} + local msgTableSound = {} + + for mInd, messageData in pairs(messageList) do + if messageData.displayedFor > messageData.displayTime then + messageData:remove() -- now using the remove/destroy function. + else + if messageData.displayedFor then + messageData.displayedFor = messageData.displayedFor + messageDisplayRate + end + local nextSound = 1000 + local soundIndex = 0 + + if messageData.multSound and #messageData.multSound > 0 then + for index, sData in pairs(messageData.multSound) do + if sData.time <= messageData.displayedFor and sData.played == false and sData.time < nextSound then -- find index of the next sound to be played + nextSound = sData.time + soundIndex = index + end + end + if soundIndex ~= 0 then + messageData.multSound[soundIndex].played = true + end + end + + for recIndex, recData in pairs(messageData.msgFor) do -- iterate recipiants + if recData == 'RED' or recData == 'BLUE' or activeClients[recData] then -- rec exists + if messageData.text then -- text + if not msgTableText[recData] then -- create table entry for text + msgTableText[recData] = {} + msgTableText[recData].text = {} + if recData == 'RED' or recData == 'BLUE' then + msgTableText[recData].text[1] = '-------Combined Arms Message-------- \n' + end + msgTableText[recData].text[#msgTableText[recData].text + 1] = messageData.text + msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor + else -- add to table entry and adjust display time if needed + if recData == 'RED' or recData == 'BLUE' then + msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- Combined Arms Message: \n' + else + msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- \n' + end + table.insert(msgTableText[recData].text, messageData.text) + if msgTableText[recData].displayTime < messageData.displayTime - messageData.displayedFor then + msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor + else + --msgTableText[recData].displayTime = 10 + end + end + end + if soundIndex ~= 0 then + msgTableSound[recData] = messageData.multSound[soundIndex].file + end + end + + end + messageData.update = nil + + end + + end + ------- new display + + if caSlots == true and caMSGtoGroup == false then + if msgTableText.RED then + trigger.action.outTextForCoalition(coalition.side.RED, table.concat(msgTableText.RED.text), msgTableText.RED.displayTime, clearView) + + end + if msgTableText.BLUE then + trigger.action.outTextForCoalition(coalition.side.BLUE, table.concat(msgTableText.BLUE.text), msgTableText.BLUE.displayTime, clearView) + end + end + + for index, msgData in pairs(msgTableText) do + if type(index) == 'number' then -- its a groupNumber + trigger.action.outTextForGroup(index, table.concat(msgData.text), msgData.displayTime, clearView) + end + end + --- new audio + if msgTableSound.RED then + trigger.action.outSoundForCoalition(coalition.side.RED, msgTableSound.RED) + end + if msgTableSound.BLUE then + trigger.action.outSoundForCoalition(coalition.side.BLUE, msgTableSound.BLUE) + end + + + for index, file in pairs(msgTableSound) do + if type(index) == 'number' then -- its a groupNumber + trigger.action.outSoundForGroup(index, file) + end + end + + end + + else + mist.removeFunction(displayFuncId) + displayActive = false + end end local function mistdisplayV4() @@ -5468,14 +6667,14 @@ end]] ]] - + local new = {} new.text = vars.text -- The actual message new.displayTime = vars.displayTime -- How long will the message appear for new.displayedFor = 0 -- how long the message has been displayed so far new.name = vars.name -- ID to overwrite the older message (if it exists) Basically it replaces a message that is displayed with new text. new.addedAt = timer.getTime() - new.update = true + --log:warn('New Message: $1', new.text) if vars.multSound and vars.multSound[1] then new.multSound = vars.multSound @@ -5566,13 +6765,14 @@ end]] messageList[i].text = new.text messageList[i].msgFor = new.msgFor messageList[i].multSound = new.multSound - messageList[i].update = true + anyUpdate = true + --log:warn('Message updated: $1', new.messageID) return messageList[i].messageID end end end end - + anyUpdate = true messageID = messageID + 1 new.messageID = messageID @@ -5586,7 +6786,7 @@ end]] if displayActive == false then displayActive = true - displayFuncId = mist.scheduleFunction(mistdisplayV4, {}, timer.getTime() + messageDisplayRate, messageDisplayRate) + displayFuncId = mist.scheduleFunction(mistdisplayV5, {}, timer.getTime() + messageDisplayRate, messageDisplayRate) end return messageID @@ -5597,6 +6797,7 @@ end]] for i, msgData in pairs(messageList) do if messageList[i] == self then table.remove(messageList, i) + anyUpdate = true return true --removal successful end end @@ -5607,6 +6808,7 @@ end]] for i, msgData in pairs(messageList) do if messageList[i].messageID == id then table.remove(messageList, i) + anyUpdate = true return true --removal successful end end @@ -6007,6 +7209,9 @@ do -- mist.demos scope end end + + + do --[[ stuff for marker panels marker.add() add marker. Point of these functions is to simplify process and to store all mark panels added. @@ -6026,98 +7231,364 @@ do If mark added to a group before a client joins slot is synced. Mark made for cliet A in Slot A. Client A leaves, Client B joins in slot A. What do they see? + May need to automate process... + + + Could release this. But things I might need to add/change before doing so. + - removing marks and re-adding in same sequence doesn't appear to work. May need to schedule adding mark if updating an entry. + - I really dont like the old message style code for which groups get the message. Perhaps change to unitsTable and create function for getting humanUnitsTable. + = Event Handler, and check it, for marks added via script or user to deconflict Ids. + - Full validation of passed values for a specific shape type. ]] - --[[ - local typeBase = { - ['Mi-8MT'] = {'Mi-8MTV2', 'Mi-8MTV', 'Mi-8'}, - ['MiG-21Bis'] = {'Mig-21'}, - ['MiG-15bis'] = {'Mig-15'}, - ['FW-190D9'] = {'FW-190'}, - ['Bf-109K-4'] = {'Bf-109'}, - } - - - local mId = 1337 + + local usedMarks = {} + + local mDefs = { + coa = { + ['red'] = {fillColor = {.8, 0 , 0, .5}, color = {.8, 0 , 0, .5}, lineType = 2, fontSize = 16}, + ['blue'] = {fillColor = {0, 0 , 0.8, .5}, color = {0, 0 , 0.8, .5}, lineType = 2, fontSize = 16}, + ['all'] = {fillColor = {.1, .1 , .1, .5}, color = {.9, .9 , .9, .5}, lineType = 2, fontSize = 16}, + ['neutral'] = {fillColor = {.1, .1 , .1, .5}, color = {.2, .2 , .2, .5}, lineType = 2, fontSize = 16}, + }, + } + + local userDefs = {['red'] = {},['blue'] = {},['all'] = {},['neutral'] = {}} + local mId = 1000 + + local tNames = {'line', 'circle','rect', 'arrow', 'text', 'quad', 'freeform'} + local tLines = {[0] = 'no line', [1] = 'solid', [2] = 'dashed',[3] = 'dotted', [4] = 'dot dash' ,[5] = 'long dash', [6] = 'two dash'} + local coas = {[-1] = 'all', [0] = 'neutral', [1] = 'red', [2] = 'blue'} + + local altNames = {['poly'] = 7, ['lines'] = 1, ['polygon'] = 7 } + + local function draw(s) + --log:warn(s) + if type(s) == 'table' then + local mType = s.markType + if mType == 'panel' then + if markScope == 'coa' then + trigger.action.markToCoalition(s.markId, s.text, s.pos, s.markFor, s.readOnly) + elseif markScope == 'group' then + trigger.action.markToGroup(s.markId, s.text, s.pos, s.markFor, s.readOnly) + else + trigger.action.markToAll(s.markId, s.text, s.pos, s.readOnly) + end + elseif mType == 'line' then + trigger.action.lineToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message) + elseif mType == 'circle' then + trigger.action.circleToAll(s.coa, s.markId, s.pos[1], s.radius, s.color, s.fillColor, s.lineType, s.readOnly, s.message) + elseif mType == 'rect' then + trigger.action.rectToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message) + elseif mType == 'arrow' then + trigger.action.arrowToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message) + elseif mType == 'text' then + trigger.action.textToAll(s.coa, s.markId, s.pos[1], s.color, s.fillColor, s.fontSize, s.readOnly, s.text) + elseif mType == 'quad' then + trigger.action.quadToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.pos[3], s.pos[4], s.color, s.fillColor, s.lineType, s.readOnly, s.message) + end + if s.name and not usedMarks[s.name] then + usedMarks[s.name] = s.markId + end + elseif type(s) == 'string' then + --log:warn(s) + mist.utils.dostring(s) + end + end + mist.marker = {} - mist.marker.list = {} + local function markSpamFilter(recList, spamBlockOn) for id, name in pairs(recList) do if name == spamBlockOn then - log:info('already on recList') + --log:info('already on recList') return recList end end - log:info('add to recList') + --log:info('add to recList') table.insert(recList, spamBlockOn) return recList end local function iterate() - mId = mId + 1 - return mId + while mId < 10000000 do + if usedMarks[mId] then + mId = mId + 1 + else + return mist.utils.deepCopy(mId) + end + end + return mist.utils.deepCopy(mId) end + + local function validateColor(val) + if type(val) == 'table' then + for i = 1, #val do + if type(val[i]) == 'number' and val[i] > 1 then + val[i] = val[i]/255 -- convert RGB values from 0-255 to 0-1 equivilent. + end + end + elseif type(val) == 'string' then + val = mist.utils.hexToRGB(val) + + end + return val + end + + local function checkDefs(vName, coa) + --log:warn('CheckDefs: $1 $2', vName, coa) + local coaName + if type(coa) == 'number' then + if coas[coa] then + coaName = coas[coa] + end + elseif type(coa) == 'string' then + coaName = coa + end + + -- log:warn(coaName) + if userDefs[coaName] and userDefs[coaName][vName] then + return userDefs[coaName][vName] + elseif mDefs.coa[coaName] and mDefs.coa[coaName][vName] then + return mDefs.coa[coaName][vName] + end + + end + + function mist.marker.getNextId() + return iterate() + end + + local handle = {} + function handle:onEvent(e) + if world.event.S_EVENT_MARK_ADDED == e.id and e.idx then + usedMarks[e.idx] = e.idx + if not mist.DBs.markList[e.idx] then + --log:info('create maker DB: $1', e.idx) + mist.DBs.markList[e.idx] = {time = e.time, pos = e.pos, groupId = e.groupId, mType = 'panel', text = e.text, markId = e.idx, coalition = e.coalition} + if e.unit then + mist.DBs.markList[e.idx].unit = e.initiaor:getName() + end + --log:info(mist.marker.list[e.idx]) + end + + elseif world.event.S_EVENT_MARK_CHANGE == e.id and e.idx then + if mist.DBs.markList[e.idx] then + mist.DBs.markList[e.idx].text = e.text + end + elseif world.event.S_EVENT_MARK_REMOVE == e.id and e.idx then + if mist.DBs.markList[e.idx] then + mist.DBs.markList[e.idx] = nil + end + end + + end + + local function removeMark(id) + --log:info("Removing Mark: $1", id + local removed = false + if type(id) == 'table' then + for ind, val in pairs(id) do + if type(val) == 'number' then + trigger.action.removeMark(val) + mist.DBs.markList[val] = nil + removed = true + end + end + else + trigger.action.removeMark(id) + mist.DBs.markList[id] = nil + removed = true + end + return removed + end + + world.addEventHandler(handle) + function mist.marker.setDefault(vars) + local anyChange = false + if vars and type(vars) == 'table' then + for l1, l1Data in pairs(vars) do + if type(l1Data) == 'table' then + if not userDefs[l1] then + userDefs[l1] = {} + end + + for l2, l2Data in pairs(l1Data) do + userDefs[l1][l2] = l2Data + anyChange = true + end + else + userDefs[l1] = l1Data + anyChange = true + end + end + + end + return anyChange + end - function mist.marker.add(pos, text, markFor, id) - log:warn('markerFunc') - log:info('Pos: $1, Text: $2, markFor: $3, id: $4', pos, text, markFor, id) - if not id then - - else + function mist.marker.add(vars) + --log:warn('markerFunc') + --log:warn(vars) + local pos = vars.point or vars.points or vars.pos + local text = vars.text or '' + local markFor = vars.markFor + local markForCoa = vars.markForCoa or vars.coa -- optional, can be used if you just want to mark to a specific coa/all + local id = vars.id or vars.markId or vars.markid + local mType = vars.mType or vars.markType or vars.type or 0 + local color = vars.color + local fillColor = vars.fillColor + local lineType = vars.lineType or 2 + local readOnly = vars.readOnly or true + local message = vars.message + local fontSize = vars.fontSize + local name = vars.name + local radius = vars.radius or 500 + + local coa = -1 + local usedId = 0 + + + if id then + if type(id) ~= 'number' then + name = id + usedId = iterate() + end + --log:info('checkIfIdExist: $1', id) + --[[ + Maybe it should treat id or name as the same thing/single value. + + If passed number it will use that as the first Id used and will delete/update any marks associated with that same value. + + + ]] + + local lId = id or name + if mist.DBs.markList[id] then ---------- NEED A BETTER WAY TO ASSOCIATE THE ID VALUE. CUrrnetly deleting from table and checking if that deleted entry exists which it wont. + --log:warn('active mark to be removed: $1', id) + name = mist.DBs.markList[id].name or id + removeMark(id) + elseif usedMarks[id] then + --log:info('exists in usedMarks: $1', id) + removeMark(usedMarks[id]) + elseif name and usedMarks[name] then + --log:info('exists in usedMarks: $1', name) + removeMark(usedMarks[name]) + end + usedId = iterate() + usedMarks[id] = usedId -- redefine the value used end - local markType = 'all' + if name then + usedMarks[name] = usedId + end + + if usedId == 0 then + usedId = iterate() + end + if mType then + if type(mType) == 'string' then + for i = 1, #tNames do + --log:warn(tNames[i]) + if mist.stringMatch(mType, tNames[i]) then + mType = i + break + end + end + elseif type(mType) == 'number' and mType > #tNames then + mType = 0 + end + end + --log:warn(mType) + local markScope = 'all' local markForTable = {} - if pos then - pos = mist.utils.makeVec3(pos) + + if pos then + if pos[1] then + for i = 1, #pos do + pos[i] = mist.utils.makeVec3(pos[i]) + end + + else + pos[1] = mist.utils.makeVec3(pos) + end + end if text and type(text) ~= string then text = tostring(text) - else - text = '' end - - if markFor then + + if markForCoa then + if type(markForCoa) == 'string' then + if tonumber(markForCoa) then + coa = coas[tonumber(markForCoa)] + markScope = 'coa' + else + for ind, cName in pairs(coas) do + if mist.stringMatch(cName, markForCoa) then + coa = ind + markScope = 'coa' + break + end + end + end + elseif type(markForCoa) == 'number' and markForCoa >=-1 and markForCoa <= #coas then + coa = markForCoa + markScore = 'coa' + end + + + + elseif markFor then if type(markFor) == 'number' then -- groupId if mist.DBs.groupsById[markFor] then - markType = 'group' + markScope = 'group' end elseif type(markFor) == 'string' then -- groupName if mist.DBs.groupsByName[markFor] then - markType = 'group' + markScope = 'group' markFor = mist.DBs.groupsByName[markFor].groupId end elseif type(markFor) == 'table' then -- multiple groupName, country, coalition, all - markType = 'table' - log:info(markFor) + markScope = 'table' + --log:warn(markFor) for forIndex, forData in pairs(markFor) do -- need to rethink this part and organization. Gotta be a more logical way to send messages to coa, groups, or all. - log:info(forIndex) - log:info(forData) for list, listData in pairs(forData) do - log:info(listData) + --log:warn(listData) forIndex = string.lower(forIndex) if type(listData) == 'string' then listData = string.lower(listData) end if listData == 'all' then - markType = 'all' + markScope = 'all' break elseif (forIndex == 'coa' or forIndex == 'ca') then -- mark for coa or CA. - for name, index in pairs (coalition.side) do + local matches = 0 + for name, index in pairs (coalition.side) do if listData == string.lower(name) then - markType = 'coalition' + markScope = 'coa' + markFor = index + coa = index + matches = matches + 1 end end - elseif (forIndex == 'countries' and string.lower(clientData.country) == listData) or (forIndex == 'units' and string.lower(clientData.unitName) == listData) then - markForTable = markSpamFilter(markForTable, clientData.groupId) + if matches > 1 then + markScope = 'all' + end + elseif forIndex == 'countries' then + for clienId, clientData in pairs(mist.DBs.humansById) do + if (string.lower(clientData.country) == listData) or (forIndex == 'units' and string.lower(clientData.unitName) == listData) then + markForTable = markSpamFilter(markForTable, clientData.groupId) + end + end elseif forIndex == 'unittypes' then -- mark to group -- iterate play units for clientId, clientData in pairs(mist.DBs.humansById) do for typeId, typeData in pairs(listData) do - log:info(typeData) + --log:warn(typeData) local found = false if list == 'all' or clientData.coalition and type(clientData.coalition) == 'string' and mist.stringMatch(clientData.coalition, list) then if mist.matchString(typeData, clientData.type) then @@ -6160,61 +7631,244 @@ do end end else - markType = 'all' + markScope = 'all' end + if mType == 0 then + local data = {markId = usedId, text = text, pos = pos[1], markScope = markScope, markFor = markFor, markType = 'panel', name = name, time = timer.getTime()} + if markScope ~= 'table' then + -- create marks + + mist.DBs.markList[usedId] = data-- add to the DB + + else + if #markForTable > 0 then + --log:info('iterate') + local list = {} + if id and not name then + name = id + end + for i = 1, #markForTable do + local newId = iterate() + local data = {markId = newId, text = text, pos = pos[i], markFor = markForTable[i], markType = 'panel', name = name, readOnly = readOnly, time = timer.getTime()} + mist.DBs.markList[newId] = data + table.insert(list, data) - + draw(data) + + end + return list + end + end - - - if markType ~= 'table' then - local newId = iterate() - local data = {markId = newId, text = text, pos = pos, markType = markType, markFor = markFor} + draw(data) + + return data + elseif mType > 0 then + local newId = iterate() + local fCal = {} + fCal[#fCal+1] = mType + fCal[#fCal+1] = coa + fCal[#fCal+1] = usedId + for i = 1, #pos do + fCal[#fCal+1] = pos[i] + end + + if radius and mType == 2 then + fCal[#fCal+1] = radius + end + + if not color then + color = checkDefs('color', coa) + else + color = validateColor(color) + end + fCal[#fCal+1] = color + + + if not fillColor then + fillColor = checkDefs('fillColor', coa) + else + fillColor = validateColor(fillColor) + end + fCal[#fCal+1] = fillColor + + if mType == 5 then -- text to all + if not fontSize then + fontSize = checkDefs('fontSize', coa) or 16 + end + fCal[#fCal+1] = fontSize + else + if not lineType then + lineType = checkDefs('lineType', coa) or 2 + end + end + fCal[#fCal+1] = lineType + if not readOnly then + readOnly = true + end + fCal[#fCal+1] = readOnly + if mType == 5 then + fCal[#fCal+1] = text + else + + fCal[#fCal+1] = message + end + local data = {coa = coa, markId = usedId, pos = pos, markFor = markFor, color = color, readOnly = readOnly, message = message, fillColor = fillColor, lineType = lineType, markType = tNames[mType], name = name, radius = radius, text = text, fontSize = fontSize, time = timer.getTime()} + mist.DBs.markList[usedId] = data + + if mType == 7 or mType == 1 then + local s = "trigger.action.markupToAll(" + + for i = 1, #fCal do + --log:warn(fCal[i]) + if type(fCal[i]) == 'table' or type(fCal[i]) == 'boolean' then + s = s .. mist.utils.oneLineSerialize(fCal[i]) + else + s = s .. fCal[i] + end + if i < #fCal then + s = s .. ',' + end + end + + s = s .. ')' + if name then + usedMarks[name] = usedId + end + draw(s) + + else - -- create marks - if markType == 'coa' then - trigger.action.markToCoalition(newId, text, pos, markFor) - elseif markType == 'group' then - trigger.action.markToGroup(newId, text, pos, markFor) - else - trigger.action.markToAll(iterate(), text, pos) - end - table.insert(mist.marker.list, data) -- add to the DB - else - if #markForTable > 0 then - log:info('iterate') - for i = 1, #markForTable do - local newId = iterate() - local data = {markId = newId, text = text, pos = pos, markFor = markFor} - log:info(data) - table.insert(mist.marker.list, data) - trigger.action.markToGroup(newId, text, pos, markForTable[i]) - end - end - end - + draw(data) + + end + return data + end end function mist.marker.remove(id) - for i, data in pairs(mist.marker.list) do - if id == data.markId then - trigger.action.removeMark(id) - end - end + return removeMark(id) end function mist.marker.get(id) - + if mist.DBs.markList[id] then + return mist.DBs.markList[id] + end + local names = {} + for markId, data in pairs(mist.DBs.markList) do + if data.name and data.name == id then + table.insert(names, data) + end + end + if #names > 1 then + return names + end end - function mist.marker.coords(pos, cType, markFor, id) -- wrapper function to just display coordinates of a specific format at location - - - end - ]] + function mist.marker.drawZone(name, v) + if mist.DBs.zonesByName[name] then + --log:warn(mist.DBs.zonesByName[name]) + local vars = v or {} + local ref = mist.utils.deepCopy(mist.DBs.zonesByName[name]) + + if ref.type == 2 then -- it is a quad, but use freeform cause it isnt as bugged + vars.mType = 6 + vars.point = ref.verticies + else + vars.mType = 2 + vars.radius = ref.radius + vars.point = ref.point + end + + + if not (vars.ignoreColor and vars.ignoreColor == true) and not vars.fillColor then + vars.fillColor = ref.color + end + + --log:warn(vars) + return mist.marker.add(vars) + end + end + + function mist.marker.drawShape(name, v) + if mist.DBs.drawingByName[name] then + + local d = v or {} + local o = mist.utils.deepCopy(mist.DBs.drawingByName[name]) + mist.marker.add({point = {x = o.mapX, z = o.mapY}, text = name}) + --log:warn(o) + d.points = o.points or {} + if o.primitiveType == "Polygon" then + d.mType = 7 + + if o.polygonMode == "rect" then + d.mType = 6 + elseif o.polygonMode == "circle" then + d.mType = 2 + d.points = {x = o.mapX, y = o.mapY} + d.radius = o.radius + end + elseif o.primitiveType == "TextBox" then + d.mType = 5 + d.points = {x = o.mapX, y = o.mapY} + d.text = o.text or d.text + d.fontSize = d.fontSize or o.fontSize + end + -- NOTE TO SELF. FIGURE OUT WHICH SHAPES NEED TO BE OFFSET. OVAL YES. + + if o.fillColorString and not d.fillColor then + d.fillColor = mist.utils.hexToRGB(o.fillColorString) + end + if o.colorString then + d.color = mist.utils.hexToRGB(o.colorString) + end + + + if o.thickness == 0 then + d.lineType = 0 + elseif o.style == 'solid' then + d.lineType = 1 + elseif o.style == 'dot' then + d.lineType = 2 + elseif o.style == 'dash' then + d.lineType = 3 + else + d.lineType = 1 + end + + + if o.primitiveType == "Line" and #d.points >= 2 then + d.mType = 1 + local rtn = {} + for i = 1, #d.points -1 do + local var = mist.utils.deepCopy(d) + var.points = {} + var.points[1] = d.points[i] + var.points[2] = d.points[i+1] + table.insert(rtn, mist.marker.add(var)) + end + return rtn + else + if d.mType then + --log:warn(d) + return mist.marker.add(d) + end + end + end + + + end + + + --[[ + function mist.marker.circle(v) + + + end +]] end --- Time conversion functions. -- @section mist.time @@ -6430,6 +8084,7 @@ do -- group tasks scope mist.air = {} mist.air.fixedWing = {} mist.air.heli = {} + mist.ship = {} --- Tasks group to follow a route. -- This sets the mission task for the given group. @@ -6453,7 +8108,7 @@ do -- group tasks scope if group then local groupCon = group:getController() if groupCon then - log:warn(misTask) + --log:warn(misTask) groupCon:setTask(misTask) return true end @@ -6475,17 +8130,17 @@ do -- group tasks scope if type(coa_data) == 'table' then if coa_data.country then --there is a country table for cntry_id, cntry_data in pairs(coa_data.country) do - for obj_type_name, obj_type_data in pairs(cntry_data) do - if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points - if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group! - for group_num, group_data in pairs(obj_type_data.group) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do if group_data and group_data.groupId == gpId then -- this is the group we are looking for if group_data.route and group_data.route.points and #group_data.route.points > 0 then local points = {} for point_num, point in pairs(group_data.route.points) do local routeData = {} - if env.mission.version > 7 then + if env.mission.version > 7 and env.mission.version < 19 then routeData.name = env.getValueDictByKey(point.name) else routeData.name = point.name @@ -6515,10 +8170,10 @@ do -- group tasks scope log:error('Group route not defined in mission editor for groupId: $1', gpId) return end --if group_data and group_data.name and group_data.name == 'groupname' - end --for group_num, group_data in pairs(obj_type_data.group) do - end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then - end --if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then - end --for obj_type_name, obj_type_data in pairs(cntry_data) do + end --for group_num, group_data in pairs(obj_cat_data.group) do + end --if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then + end --if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then + end --for obj_cat_name, obj_cat_data in pairs(cntry_data) do end --for cntry_id, cntry_data in pairs(coa_data.country) do end --if coa_data.country then --there is a country table end --if coa_name == 'red' or coa_name == 'blue' and type(coa_data) == 'table' then @@ -6822,14 +8477,19 @@ do -- group tasks scope end -- need to return a Vec3 or Vec2? - function mist.getRandPointInCircle(p, radius, innerRadius, maxA, minA) + function mist.getRandPointInCircle(p, r, innerRadius, maxA, minA) local point = mist.utils.makeVec3(p) local theta = 2*math.pi*math.random() + local radius = r or 1000 local minR = innerRadius or 0 if maxA and not minA then theta = math.rad(math.random(0, maxA - math.random())) - elseif maxA and minA and minA < maxA then - theta = math.rad(math.random(minA, maxA) - math.random()) + elseif maxA and minA then + if minA < maxA then + theta = math.rad(math.random(minA, maxA) - math.random()) + else + theta = math.rad(math.random(maxA, minA) - math.random()) + end end local rad = math.random() + math.random() if rad > 1 then @@ -6854,14 +8514,21 @@ do -- group tasks scope end function mist.getRandomPointInZone(zoneName, innerRadius, maxA, minA) - if type(zoneName) == 'string' and type(trigger.misc.getZone(zoneName)) == 'table' then - return mist.getRandPointInCircle(trigger.misc.getZone(zoneName).point, trigger.misc.getZone(zoneName).radius, innerRadius, maxA, minA) - end + if type(zoneName) == 'string' then + local zone = mist.DBs.zonesByName[zoneName] + if zone.type and zone.type == 2 then + return mist.getRandomPointInPoly(zone.verticies) + else + return mist.getRandPointInCircle(zone.point, zone.radius, innerRadius, maxA, minA) + end + end return false end function mist.getRandomPointInPoly(zone) - local avg = mist.getAvgPoint(zone) + --env.info('Zone Size: '.. #zone) + local avg = mist.getAvgPoint(zone) + --log:warn(avg) local radius = 0 local minR = math.huge local newCoord = {} @@ -6873,6 +8540,8 @@ do -- group tasks scope minR = mist.utils.get2DDist(avg, zone[i]) end end + --log:warn('Radius: $1', radius) + --log:warn('minR: $1', minR) local lSpawnPos = {} for j = 1, 100 do newCoord = mist.getRandPointInCircle(avg, radius) @@ -6886,6 +8555,19 @@ do -- group tasks scope end return newCoord end + + function mist.getWindBearingAndVel(p) + local point = mist.utils.makeVec3(o) + local gLevel = land.getHeight({x = point.x, y = point.z}) + if point.y <= gLevel then + point.y = gLevel + 10 + end + local t = atmosphere.getWind(point) + local bearing = math.tan(t.z/t.x) + local vel = math.sqrt(t.x^2 + t.z^2) + return bearing, vel + + end function mist.groupToRandomPoint(vars) local group = vars.group --Required @@ -6941,25 +8623,25 @@ do -- group tasks scope return end - function mist.groupRandomDistSelf(gpData, dist, form, heading, speed) + function mist.groupRandomDistSelf(gpData, dist, form, heading, speed, disableRoads) local pos = mist.getLeadPos(gpData) local fakeZone = {} fakeZone.radius = dist or math.random(300, 1000) fakeZone.point = {x = pos.x, y = pos.y, z = pos.z} - mist.groupToRandomZone(gpData, fakeZone, form, heading, speed) + mist.groupToRandomZone(gpData, fakeZone, form, heading, speed, disableRoads) return end - function mist.groupToRandomZone(gpData, zone, form, heading, speed) + function mist.groupToRandomZone(gpData, zone, form, heading, speed, disableRoads) if type(gpData) == 'string' then gpData = Group.getByName(gpData) end if type(zone) == 'string' then - zone = trigger.misc.getZone(zone) + zone = mist.DBs.zonesByName[zone] elseif type(zone) == 'table' and not zone.radius then - zone = trigger.misc.getZone(zone[math.random(1, #zone)]) + zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]] end if speed then @@ -6973,7 +8655,7 @@ do -- group tasks scope vars.headingDegrees = heading vars.speed = speed vars.point = mist.utils.zoneToVec3(zone) - + vars.disableRoads = disableRoads mist.groupToRandomPoint(vars) return @@ -7042,7 +8724,7 @@ do -- group tasks scope function mist.groupToPoint(gpData, point, form, heading, speed, useRoads) if type(point) == 'string' then - point = trigger.misc.getZone(point) + point = mist.DBs.zonesByName[point] end if speed then speed = mist.utils.kmphToMps(speed) @@ -7081,6 +8763,16 @@ do -- group tasks scope return leader:getPosition().p end end + + function mist.groupIsDead(groupName) -- copy more or less from on station + if Group.getByName(groupName) then + local gp = Group.getByName(groupName) + if #gp:getUnits() > 0 or gp:isExist() == true then + return false + end + end + return true + end end @@ -7200,7 +8892,7 @@ do -- mist.Logger scope -- @usage -- log everything --myLogger:setLevel(3) function mist.Logger:setLevel(level) - if not level then + if not level then self.level = 2 else if type(level) == 'string' then diff --git a/mist_4_4_90.lua b/mist_4_5_106.lua similarity index 74% rename from mist_4_4_90.lua rename to mist_4_5_106.lua index fbf4f6a..de1499c 100644 --- a/mist_4_4_90.lua +++ b/mist_4_5_106.lua @@ -34,17 +34,19 @@ mist = {} -- don't change these mist.majorVersion = 4 -mist.minorVersion = 4 -mist.build = 90 +mist.minorVersion = 5 +mist.build = 106 -- forward declaration of log shorthand local log - +local dbLog + local mistSettings = { errorPopup = false, -- errors printed by mist logger will create popup warning you warnPopup = false, infoPopup = false, logLevel = 'warn', + dbLog = 'warn', } do -- the main scope @@ -73,11 +75,11 @@ do -- the main scope mist.nextGroupId = 1 mist.nextUnitId = 1 - local dbLog + local function initDBs() -- mist.DBs scope mist.DBs = {} - + mist.DBs.markList = {} mist.DBs.missionData = {} if env.mission then @@ -106,6 +108,25 @@ do -- the main scope zone.point.x = zone_data.x zone.point.y = 0 zone.point.z = zone_data.y + zone.properties = {} + if zone_data.properties then + for propInd, prop in pairs(zone_data.properties) do + if prop.value and type(prop.value) == 'string' and prop.value ~= "" then + zone.properties[prop.key] = prop.value + end + end + end + if zone.verticies then -- trust but verify + local r = 0 + for i = 1, #zone.verticies do + local dist = mist.utils.get2DDist(zone.point, zone.verticies[i]) + if dist > r then + r = mist.utils.deepCopy(dist) + end + end + zone.radius = r + + end mist.DBs.zonesByName[zone_data.name] = zone mist.DBs.zonesByNum[#mist.DBs.zonesByNum + 1] = mist.utils.deepCopy(zone) --[[deepcopy so that the zone in zones_by_name and the zone in @@ -113,6 +134,85 @@ do -- the main scope end end end + + mist.DBs.drawingByName = {} + mist.DBs.drawingIndexed = {} + + if env.mission.drawings and env.mission.drawings.layers then + for i = 1, #env.mission.drawings.layers do + local l = env.mission.drawings.layers[i] + + for j = 1, #l.objects do + local copy = mist.utils.deepCopy(l.objects[j]) + --log:warn(copy) + local doOffset = false + copy.layer = l.name + + local theta = copy.angle or 0 + theta = math.rad(theta) + if copy.primitiveType == "Polygon" then + + if copy.polygonMode == 'rect' then + local h, w = copy.height, copy.width + copy.points = {} + copy.points[1] = {x = h/2, y = w/2} + copy.points[2] = {x = -h/2, y = w/2} + copy.points[3] = {x = -h/2, y = -w/2} + copy.points[4] = {x = h/2, y = -w/2} + doOffset = true + elseif copy.polygonMode == "circle" then + copy.points = {x = copy.mapX, y = copy.mapY} + elseif copy.polygonMode == 'oval' then + -- oval bugs. Scale and rotation are off. + copy.points = {} + local numPoints = 24 + local angleStep = (math.pi*2)/numPoints + doOffset = true + for v = 1, numPoints do + local pointAngle = v * angleStep + local x = copy.r1 * math.cos(pointAngle) + local y = copy.r2 * math.sin(pointAngle) + + table.insert(copy.points,{x=x,y=y}) + + end + elseif copy.polygonMode == "arrow" then + doOffset = true + end + + -- NOTE TO SELF. FIGURE OUT WHICH SHAPES NEED TO BE OFFSET. OVAL YES. + --log:warn('check offset') + if theta ~= 0 and copy.points and doOffset == true then + + --log:warn('offsetting Values') + for p = 1, #copy.points do + local offset = mist.vec.rotateVec2(copy.points[p], theta) + copy.points[p] = offset + end + --log:warn(copy.points[1]) + end + + end + if copy.points and #copy.points > 1 then + for u = 1, #copy.points do + copy.points[u].x = copy.points[u].x + copy.mapX + copy.points[u].y = copy.points[u].y + copy.mapY + end + + end + if mist.DBs.drawingByName[copy.name] then + log:warn("Drawing by the name of [ $1 ] already exists in DB. Failed to add to mist.DBs.drawingByName.", copy.name) + else + + mist.DBs.drawingByName[copy.name] = copy + end + table.insert(mist.DBs.drawingIndexed, copy) + end + + end + + end + mist.DBs.navPoints = {} mist.DBs.units = {} @@ -151,28 +251,31 @@ do -- the main scope for cntry_id, cntry_data in pairs(coa_data.country) do local countryName = string.lower(cntry_data.name) + if cntry_data.id and country.names[cntry_data.id] then + countryName = string.lower(country.names[cntry_data.id]) + end mist.DBs.units[coa_name][countryName] = {} mist.DBs.units[coa_name][countryName].countryId = cntry_data.id if type(cntry_data) == 'table' then --just making sure - for obj_type_name, obj_type_data in pairs(cntry_data) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do - if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then --should be an unncessary check + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then --should be an unncessary check - local category = obj_type_name + local category = obj_cat_name - if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group! + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! mist.DBs.units[coa_name][countryName][category] = {} - for group_num, group_data in pairs(obj_type_data.group) do + for group_num, group_data in pairs(obj_cat_data.group) do if group_data and group_data.units and type(group_data.units) == 'table' then --making sure again- this is a valid group mist.DBs.units[coa_name][countryName][category][group_num] = {} local groupName = group_data.name - if env.mission.version > 7 then + if env.mission.version > 7 and env.mission.version < 19 then groupName = env.getValueDictByKey(groupName) end mist.DBs.units[coa_name][countryName][category][group_num].groupName = groupName @@ -196,7 +299,7 @@ do -- the main scope local units_tbl = mist.DBs.units[coa_name][countryName][category][group_num].units --pointer to the units table for this group units_tbl[unit_num] = {} - if env.mission.version > 7 then + if env.mission.version > 7 and env.mission.version < 19 then units_tbl[unit_num].unitName = env.getValueDictByKey(unit_data.name) else units_tbl[unit_num].unitName = unit_data.name @@ -240,6 +343,7 @@ do -- the main scope if category == 'static' then units_tbl[unit_num].categoryStatic = unit_data.category units_tbl[unit_num].shape_name = unit_data.shape_name + units_tbl[unit_num].linkUnit = unit_data.linkUnit if unit_data.mass then units_tbl[unit_num].mass = unit_data.mass end @@ -251,10 +355,10 @@ do -- the main scope end --for unit_num, unit_data in pairs(group_data.units) do end --if group_data and group_data.units then - end --for group_num, group_data in pairs(obj_type_data.group) do - end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then - end --if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then - end --for obj_type_name, obj_type_data in pairs(cntry_data) do + end --for group_num, group_data in pairs(obj_cat_data.group) do + end --if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then + end --if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then + end --for obj_cat_name, obj_cat_data in pairs(cntry_data) do end --if type(cntry_data) == 'table' then end --for cntry_id, cntry_data in pairs(coa_data.country) do end --if coa_data.country then --there is a country table @@ -305,6 +409,11 @@ do -- the main scope ['Arco'] = 2, ['Shell'] = 3, }, + ['TRANSPORT'] = { + ['Heavy'] = 9, + ['Trash'] = 10, + ['Cargo'] = 11, + ['Ascot'] = 12, ['JTAC'] = { ['Axeman'] = 1, ['Darknight'] = 2, @@ -346,14 +455,105 @@ do -- the main scope ['rules'] = { ['canUseAircraft'] = true, ['appliesTo'] = { - 'A-10C', + 'A-10C_2', + 'A-10C', 'A-10A', }, }, - }, - }, - }, - } + }, + ['f16'] = { + Viper = 9, + Venom = 10, + Lobo = 11, + Cowboy = 12, + Python = 13, + Rattler =14, + Panther = 15, + Wolf = 16, + Weasel = 17, + Wild = 18, + Ninja = 19, + Jedi = 20, + rules = { + ['canUseAircraft'] = true, + ['appliesTo'] = { + 'F-16C_50', + 'F-16C bl.52d', + 'F-16C bl.50', + 'F-16A MLU', + 'F-16A', + }, + }, + + }, + ['f18'] = { + ['Hornet'] = 9, + ['Squid'] = 10, + ['Ragin'] = 11, + ['Roman'] = 12, + Sting = 13, + Jury =14, + Jokey = 15, + Ram = 16, + Hawk = 17, + Devil = 18, + Check = 19, + Snake = 20, + ['rules'] = { + ['canUseAircraft'] = true, + ['appliesTo'] = { + + "FA-18C_hornet", + 'F/A-18C', + }, + }, + }, + ['b1'] = { + ['Bone'] = 9, + ['Dark'] = 10, + ['Vader'] = 11, + ['rules'] = { + ['canUseAircraft'] = true, + ['appliesTo'] = { + 'B-1B', + }, + }, + }, + ['b52'] = { + ['Buff'] = 9, + ['Dump'] = 10, + ['Kenworth'] = 11, + ['rules'] = { + ['canUseAircraft'] = true, + ['appliesTo'] = { + 'B-52H', + }, + }, + }, + ['f15e'] = { + ['Dude'] = 9, + ['Thud'] = 10, + ['Gunny'] = 11, + ['Trek'] = 12, + Sniper = 13, + Sled =14, + Best = 15, + Jazz = 16, + Rage = 17, + Tahoe = 18, + ['rules'] = { + ['canUseAircraft'] = true, + ['appliesTo'] = { + 'F-15E', + --'F-15ERAZBAM', + }, + }, + }, + + }, + }, + }, + } mist.DBs.const.shapeNames = { ["Landmine"] = "landmine", ["FARP CP Blindage"] = "kp_ug", @@ -443,6 +643,42 @@ do -- the main scope ["Small house 1A area"] = "domik1a-all", ["White_Flag"] = "H-Flag_W", ["Airshow_Cone"] = "Comp_cone", + ["Bulk Cargo Ship Ivanov"] = "barge-1", + ["Bulk Cargo Ship Yakushev"] = "barge-2", + ["Outpost"]="block", + ["Road outpost"]="block-onroad", + ["Container camo"] = "bw_container_cargo", + ["Tech Hangar A"] = "ceh_ang_a", + ["Bunker 1"] = "dot", + ["Bunker 2"] = "dot2", + ["Tanker Elnya 160"] = "elnya", + ["F-shape barrier"] = "f_bar_cargo", + ["Helipad Single"] = "farp", + ["FARP"] = "farps", + ["Fueltank"] = "fueltank_cargo", + ["Gate"] = "gate", + ["FARP Fuel Depot"] = "gsm rus", + ["Armed house"] = "home1_a", + ["FARP Command Post"] = "kp-ug", + ["Watch Tower Armed"] = "ohr-vyshka", + ["Oiltank"] = "oiltank_cargo", + ["Pipes small"] = "pipes_small_cargo", + ["Pipes big"] = "pipes_big_cargo", + ["Oil platform"] = "plavbaza", + ["Tetrapod"] = "tetrapod_cargo", + ["Fuel tank"] = "toplivo", + ["Trunks long"] = "trunks_long_cargo", + ["Trunks small"] = "trunks_small_cargo", + ["Passenger liner"] = "yastrebow", + ["Passenger boat"] = "zwezdny", + ["Oil rig"] = "oil_platform", + ["Gas platform"] = "gas_platform", + ["Container 20ft"] = "container_20ft", + ["Container 40ft"] = "container_40ft", + ["Downed pilot"] = "cadaver", + ["Parachute"] = "parash", + ["Pilot F15 Parachute"] = "pilot_f15_parachute", + ["Pilot standing"] = "pilot_parashut", } @@ -504,8 +740,8 @@ do -- the main scope mist.DBs.MEgroupsById = mist.utils.deepCopy(mist.DBs.groupsById) mist.DBs.deadObjects = {} - - do + + do local mt = {} function mt.__newindex(t, key, val) @@ -649,9 +885,14 @@ do -- the main scope newTable.category = 'static' else unitOneRef = newObject:getUnits() - newTable.countryId = tonumber(unitOneRef[1]:getCountry()) - newTable.coalitionId = tonumber(unitOneRef[1]:getCoalition()) - newTable.category = tonumber(newObject:getCategory()) + if #unitOneRef > 0 and unitOneRef[1] and type(unitOneRef[1]) == 'table' then + newTable.countryId = tonumber(unitOneRef[1]:getCountry()) + newTable.coalitionId = tonumber(unitOneRef[1]:getCoalition()) + newTable.category = tonumber(newObject:getCategory()) + else + log:warn('getUnits failed to return on $1 ; Built Data: $2.', event, newTable) + return false + end end for countryData, countryId in pairs(country.id) do if newTable.country and string.upper(countryData) == string.upper(newTable.country) or countryId == newTable.countryId then @@ -782,6 +1023,8 @@ do -- the main scope newTable.units[1].canCargo = data.canCargo newTable.units[1].categoryStatic = data.categoryStatic newTable.units[1].type = data.type + newTable.units[1].linkUnit = data.linkUnit + mistAddedObjects[index] = nil break end @@ -818,6 +1061,7 @@ do -- the main scope --dbLog:info('iterate') for name, gData in pairs(tempSpawnedGroups) do --env.info(name) + --dbLog:info(gData) local updated = false local stillExists = false if not gData.checked then @@ -825,9 +1069,9 @@ do -- the main scope local _g = gData.gp or Group.getByName(name) if mist.DBs.groupsByName[name] then -- first check group level properties, groupId, countryId, coalition - -- dbLog:info('Found in DBs, check if updated') + --dbLog:info('Found in DBs, check if updated') local dbTable = mist.DBs.groupsByName[name] - -- dbLog:info(dbTable) + --dbLog:info(dbTable) if gData.type ~= 'static' then -- dbLog:info('Not static') @@ -848,11 +1092,11 @@ do -- the main scope end --dbLog:info('Updated: $1', updated) if updated == false and gData.type ~= 'static' then -- time to check units - --dbLog:info('No Group Mismatch, Check Units') + --dbLog:info('No Group Mismatch, Check Units') if _g and _g:isExist() == true then stillExists = true for index, uObject in pairs(_g:getUnits()) do - --dbLog:info(index) + --dbLog:info(index) if mist.DBs.unitsByName[uObject:getName()] then --dbLog:info('UnitByName table exists') local uTable = mist.DBs.unitsByName[uObject:getName()] @@ -870,8 +1114,10 @@ do -- the main scope if stillExists == true and (updated == true or not mist.DBs.groupsByName[name]) then --dbLog:info('Get Table') - writeGroups[#writeGroups+1] = {data = dbUpdate(name, gData.type), isUpdated = updated} - + local dbData = dbUpdate(name, gData.type) + if dbData and type(dbData) == 'table' then + writeGroups[#writeGroups+1] = {data = dbData, isUpdated = updated} + end end -- Work done, so remove end @@ -998,19 +1244,20 @@ do -- the main scope local function groupSpawned(event) -- dont need to add units spawned in at the start of the mission if mist is loaded in init line if event.id == world.event.S_EVENT_BIRTH and timer.getTime0() < timer.getAbsTime() then - --dbLog:info('unitSpawnEvent') - + --log:info('unitSpawnEvent') + --log:info(event) + --log:info(event.initiator:getTypeName()) --table.insert(tempSpawnedUnits,(event.initiator)) ------- -- New functionality below. ------- if Object.getCategory(event.initiator) == 1 and not Unit.getPlayerName(event.initiator) then -- simple player check, will need to later check to see if unit was spawned with a player in a flight - --dbLog:info('Object is a Unit') + --log:info('Object is a Unit') if Unit.getGroup(event.initiator) then - --dbLog:info(Unit.getGroup(event.initiator):getName()) + -- log:info(Unit.getGroup(event.initiator):getName()) local g = Unit.getGroup(event.initiator) if not tempSpawnedGroups[g:getName()] then - --dbLog:info('added') + --log:info('added') tempSpawnedGroups[g:getName()] = {type = 'group', gp = g} tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 end @@ -1018,7 +1265,7 @@ do -- the main scope log:error('Group not accessible by unit in event handler. This is a DCS bug') end elseif Object.getCategory(event.initiator) == 3 or Object.getCategory(event.initiator) == 6 then - --dbLog:info('Object is Static') + --log:info('Object is Static') tempSpawnedGroups[StaticObject.getName(event.initiator)] = {type = 'static'} tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 end @@ -1169,10 +1416,13 @@ do -- the main scope for i = 1, #st do local s = st[i] if StaticObject.isExist(s) then - if not mist.DBs.unitsByName[s:getName()] then - --env.info(StaticObject.getID(s) .. ' Not found in DB yet') - tempSpawnedGroups[s:getName()] = {type = 'static'} - tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 + local name = s:getName() + if not mist.DBs.unitsByName[name] then + dbLog:warn('$1 Not found in DB yet. ID: $2', name, StaticObject.getID(s)) + if string.len(name) > 0 then -- because in this mission someone sent the name was returning as an empty string. Gotta be careful. + tempSpawnedGroups[s:getName()] = {type = 'static'} + tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 + end end end end @@ -1180,6 +1430,7 @@ do -- the main scope end end + --- init function. -- creates logger, adds default event handler @@ -1284,8 +1535,9 @@ do -- the main scope --- Spawns a static object to the game world. -- @todo write good docs -- @tparam table staticObj table containing data needed for the object creation - function mist.dynAddStatic(newObj) - log:info(newObj) + function mist.dynAddStatic(n) + --log:info(newObj) + local newObj = mist.utils.deepCopy(n) if newObj.units and newObj.units[1] then -- if its mist format for entry, val in pairs(newObj.units[1]) do if newObj[entry] and newObj[entry] ~= val or not newObj[entry] then @@ -1379,8 +1631,10 @@ do -- the main scope -- Same as coalition.add function in SSE. checks the passed data to see if its valid. -- Will generate groupId, groupName, unitId, and unitName if needed -- @tparam table newGroup table containting values needed for spawning a group. - function mist.dynAdd(newGroup) - + function mist.dynAdd(ng) + + local newGroup = mist.utils.deepCopy(ng) + --log:warn(newGroup) --mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroupOrig.lua') local cntry = newGroup.country if newGroup.countryId then @@ -1452,7 +1706,11 @@ do -- the main scope end if newGroup.clone and mist.DBs.groupsByName[newGroup.name] or not newGroup.name then - newGroup.name = tostring(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName]) + --if newGroup.baseName then + -- idea of later. So custmozed naming can be created + -- else + newGroup.name = tostring(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName]) + --end end if not newGroup.hidden then @@ -1537,16 +1795,32 @@ do -- the main scope end end else -- if aircraft and no route assigned. make a quick and stupid route so AI doesnt RTB immediately - if newCat == 'AIRPLANE' or newCat == 'HELICOPTER' then + --if newCat == 'AIRPLANE' or newCat == 'HELICOPTER' then newGroup.route = {} newGroup.route.points = {} newGroup.route.points[1] = {} - end + --end end newGroup.country = newCountry - - --mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroup.lua') + -- update and verify any self tasks + if newGroup.route and newGroup.route.points then + for i, pData in pairs(newGroup.route.points) do + if pData.task and pData.task.params and pData.task.params.tasks and #pData.task.params.tasks > 0 then + for tIndex, tData in pairs(pData.task.params.tasks) do + if tData.params and tData.params.action then + if tData.params.action.id == "EPLRS" then + tData.params.action.params.groupId = newGroup.groupId + elseif tData.params.action.id == "ActivateBeacon" or tData.params.action.id == "ActivateICLS" then + tData.params.action.params.unitId = newGroup.units[1].unitId + end + end + end + end + + end + end + --mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroupPushedToAddGroup.lua') --log:warn(newGroup) -- sanitize table newGroup.groupName = nil @@ -1816,10 +2090,10 @@ do if type(coa_data) == 'table' then if coa_data.country then --there is a country table for cntry_id, cntry_data in pairs(coa_data.country) do - for obj_type_name, obj_type_data in pairs(cntry_data) do - if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points - if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group! - for group_num, group_data in pairs(obj_type_data.group) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do if group_data and group_data.groupId == gpId then -- this is the group we are looking for if group_data.route and group_data.route.points and #group_data.route.points > 0 then local points = {} @@ -1834,10 +2108,10 @@ do end return end --if group_data and group_data.name and group_data.name == 'groupname' - end --for group_num, group_data in pairs(obj_type_data.group) do - end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then - end --if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then - end --for obj_type_name, obj_type_data in pairs(cntry_data) do + end --for group_num, group_data in pairs(obj_cat_data.group) do + end --if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then + end --if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then + end --for obj_cat_name, obj_cat_data in pairs(cntry_data) do end --for cntry_id, cntry_data in pairs(coa_data.country) do end --if coa_data.country then --there is a country table end --if coa_name == 'red' or coa_name == 'blue' and type(coa_data) == 'table' then @@ -2214,9 +2488,25 @@ do --- Returns a table containing unit names. -- @tparam table tbl sequential strings -- @treturn table @{UnitNameTable} - function mist.makeUnitTable(tbl) + function mist.makeUnitTable(tbl, exclude) --Assumption: will be passed a table of strings, sequential --log:info(tbl) + + + local excludeType = {} + if exclude then + if type(exclude) == 'table' then + for x, y in pairs(exclude) do + excludeType[x] = true + excludeType[y] = true + end + else + excludeType[exclude] = true + end + + end + + local units_by_name = {} local l_munits = mist.DBs.units --local reference for faster execution @@ -2277,12 +2567,15 @@ do elseif unit:sub(4,12) == '[vehicle]' then category = 'vehicle' country_start = 13 + elseif unit:sub(4, 11) == '[static]' then + category = 'static' + country_start = 12 end for coa, coa_tbl in pairs(l_munits) do for country, country_table in pairs(coa_tbl) do if country == string.lower(unit:sub(country_start)) then -- match for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2310,12 +2603,15 @@ do elseif unit:sub(5,13) == '[vehicle]' then category = 'vehicle' country_start = 14 + elseif unit:sub(5, 12) == '[static]' then + category = 'static' + country_start = 13 end for coa, coa_tbl in pairs(l_munits) do for country, country_table in pairs(coa_tbl) do if country == string.lower(unit:sub(country_start)) then -- match for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2340,12 +2636,14 @@ do category = 'ship' elseif unit:sub(7) == '[vehicle]' then category = 'vehicle' - end + elseif unit:sub(7) == '[static]' then + category = 'static' + end for coa, coa_tbl in pairs(l_munits) do if coa == 'blue' then for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2368,12 +2666,14 @@ do category = 'ship' elseif unit:sub(8) == '[vehicle]' then category = 'vehicle' + elseif unit:sub(8) == '[static]' then + category = 'static' end for coa, coa_tbl in pairs(l_munits) do if coa == 'blue' then for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2398,12 +2698,14 @@ do category = 'ship' elseif unit:sub(6) == '[vehicle]' then category = 'vehicle' + elseif unit:sub(6) == '[static]' then + category = 'static' end for coa, coa_tbl in pairs(l_munits) do if coa == 'red' then for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2426,12 +2728,14 @@ do category = 'ship' elseif unit:sub(7) == '[vehicle]' then category = 'vehicle' + elseif unit:sub(7) == '[static]' then + category = 'static' end for coa, coa_tbl in pairs(l_munits) do if coa == 'red' then for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2456,11 +2760,13 @@ do category = 'ship' elseif unit:sub(6) == '[vehicle]' then category = 'vehicle' + elseif unit:sub(6) == '[static]' then + category = 'static' end for coa, coa_tbl in pairs(l_munits) do for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2482,11 +2788,13 @@ do category = 'ship' elseif unit:sub(7) == '[vehicle]' then category = 'vehicle' + elseif unit:sub(7) == '[static]' then + category = 'static' end for coa, coa_tbl in pairs(l_munits) do for country, country_table in pairs(coa_tbl) do for unit_type, unit_type_tbl in pairs(country_table) do - if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) then + if type(unit_type_tbl) == 'table' and (category == '' or unit_type == category) and not excludeType[unit_type] then for group_ind, group_tbl in pairs(unit_type_tbl) do if type(group_tbl) == 'table' then for unit_ind, unit in pairs(group_tbl.units) do @@ -2517,6 +2825,126 @@ do return units_tbl end +function mist.getUnitsByAttribute(att, rnum, id) + local cEntry = {} + cEntry.typeName = att.type or att.typeName or att.typename + cEntry.country = att.country + cEntry.coalition = att.coalition + cEntry.skill = att.skill + cEntry.categry = att.category + + local num = rnum or 1 + + if cEntry.skill == 'human' then + cEntry.skill = {'Client', 'Player'} + end + + + local checkedVal = {} + local units = {} + for uName, uData in pairs(mist.DBs.unitsByName) do + local matched = 0 + for cName, cVal in pairs(cEntry) do + if type(cVal) == 'table' then + for sName, sVal in pairs(cVal) do + if (uData[cName] and uData[cName] == sVal) or (uData[cName] and uData[cName] == sName) then + matched = matched + 1 + end + end + else + if uData[cName] and uData[cName] == cVal then + matched = matched + 1 + end + end + end + if matched >= num then + if id then + units[uData.unitId] = true + else + + units[uName] = true + end + end + end + + local rtn = {} + for name, _ in pairs(units) do + table.insert(rtn, name) + end + return rtn + +end + +function mist.getGroupsByAttribute(att, rnum, id) + local cEntry = {} + cEntry.typeName = att.type or att.typeName or att.typename + cEntry.country = att.country + cEntry.coalition = att.coalition + cEntry.skill = att.skill + cEntry.categry = att.category + + local num = rnum or 1 + + if cEntry.skill == 'human' then + cEntry.skill = {'Client', 'Player'} + end + local groups = {} + for gName, gData in pairs(mist.DBs.groupsByName) do + local matched = 0 + for cName, cVal in pairs(cEntry) do + if type(cVal) == 'table' then + for sName, sVal in pairs(cVal) do + if cName == 'skill' or cName == 'typeName' then + local lMatch = 0 + for uId, uData in pairs(gData.units) do + if (uData[cName] and uData[cName] == sVal) or (gData[cName] and gData[cName] == sName) then + lMatch = lMatch + 1 + break + end + end + if lMatch > 0 then + matched = matched + 1 + end + end + if (gData[cName] and gData[cName] == sVal) or (gData[cName] and gData[cName] == sName) then + matched = matched + 1 + break + end + end + else + if cName == 'skill' or cName == 'typeName' then + local lMatch = 0 + for uId, uData in pairs(gData.units) do + if (uData[cName] and uData[cName] == sVal) then + lMatch = lMatch + 1 + break + end + end + if lMatch > 0 then + matched = matched + 1 + end + end + if gData[cName] and gData[cName] == cVal then + matched = matched + 1 + end + end + end + if matched >= num then + if id then + groups[gData.groupid] = true + else + groups[gName] = true + end + end + end + local rtn = {} + for name, _ in pairs(groups) do + table.insert(rtn, name) + end + return rtn + +end + function mist.getDeadMapObjsInZones(zone_names) -- zone_names: table of zone names -- returns: table of dead map objects (indexed numerically) @@ -2552,6 +2980,160 @@ function mist.getDeadMapObjsInPolygonZone(zone) end return map_objs end +mist.shape = {} +function mist.shape.insideShape(shape1, shape2, full) + if shape1.radius then -- probably a circle + if shape2.radius then + return mist.shape.circleInCircle(shape1, shape2, full) + elseif shape2[1] then + return mist.shape.circleInPoly(shape1, shape2, full) + end + + elseif shape1[1] then -- shape1 is probably a polygon + if shape2.radius then + return mist.shape.polyInCircle(shape1, shape2, full) + elseif shape2[1] then + return mist.shape.polyInPoly(shape1, shape2, full) + end + end + return false +end + +function mist.shape.circleInCircle(c1, c2, full) + if not full then -- quick partial check + if mist.utils.get2DDist(c1.point, c2.point) <= c2.radius then + return true + end + end + local theta = mist.utils.getHeadingPoints(c2.point, c1.point) -- heading from + if full then + return mist.utils.get2DDist(mist.projectPoint(c1.point, c1.radius, theta), c2.point) <= c2.radius + else + return mist.utils.get2DDist(mist.projectPoint(c1.point, c1.radius, theta + math.pi), c2.point) <= c2.radius + end + return false +end + + +function mist.shape.circleInPoly(circle, poly, full) + + if poly and type(poly) == 'table' and circle and type(circle) == 'table' and circle.radius and circle.point then + if not full then + for i = 1, #poly do + if mist.utils.get2DDist(circle.point, poly[i]) <= circle.radius then + return true + end + end + end + -- no point is inside of the zone, now check if any part is + local count = 0 + for i = 1, #poly do + local theta -- heading of each set of points + if i == #poly then + theta = mist.utils.getHeadingPoints(poly[i],poly[1]) + else + theta = mist.utils.getHeadingPoints(poly[i],poly[i+1]) + end + -- offset + local pPoint = mist.projectPoint(circle.point, circle.radius, theta - (math.pi/180)) + local oPoint = mist.projectPoint(circle.point, circle.radius, theta + (math.pi/180)) + + + if mist.pointInPolygon(pPoint, poly) == true then + if (full and mist.pointInPolygon(oPoint, poly) == true) or not full then + return true + + end + + end + end + + end + return false +end + + +function mist.shape.polyInPoly(p1, p2, full) + local count = 0 + for i = 1, #p1 do + + if mist.pointInPolygon(p1[i], p2) then + count = count + 1 + end + if (not full) and count > 0 then + return true + end + end + if count == #p1 then + return true + end + + return false +end + +function mist.shape.polyInCircle(poly, circle, full) + local count = 0 + for i = 1, #poly do + if mist.utils.get2DDist(circle.point, poly[i]) <= circle.radius then + if full then + count = count + 1 + else + return true + end + end + end + if count == #poly then + return true + end + + return false +end + +function mist.shape.getPointOnSegment(point, seg, isSeg) + local p = mist.utils.makeVec2(point) + local s1 = mist.utils.makeVec2(seg[1]) + local s2 = mist.utils.makeVec2(seg[2]) + + + local cx, cy = p.x - s1.x, p.y - s1.y + local dx, dy = s2.x - s1.x, s2.x - s1.y + local d = (dx*dx + dy*dy) + + if d == 0 then + return {x = s1.x, y = s1.y} + end + local u = (cx*dx + cy*dy)/d + if isSeg then + if u < 0 then + u = 0 + elseif u > 1 then + u = 1 + end + end + return {x = s1.x + u*dx, y = s1.y + u*dy} +end + + +function mist.shape.segmentIntersect(segA, segB) + local dx1, dy1 = segA[2].x - segA[1].x, segA[2] - segA[1].y + local dx2, dy2 = segB[2].x - segB[1].x, segB[2] - segB[1].y + local dx3, dy3 = segA[1].x - segB[1].x, segA[1].y - segB[1].y + local d = dx1*dy2 - dy1*dx2 + if d == 0 then + return false + end + local t1 = (dx2*dy3 - dy2*dx3)/d + if t1 < 0 or t1 > 1 then + return false + end + local t2 = (dx1*dy3 - dy1*dx3)/d + if t2 < 0 or t2 > 1 then + return false + end + -- point of intersection + return true, segA[1].x + t1*dx1, segA[1].y + t1*dy1 +end + function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon. Code from http://softsurfer.com/Archive/algorithm_0103/algorithm_0103.htm --[[local type_tbl = { @@ -2591,17 +3173,23 @@ function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon. end end +function mist.mapValue(val, inMin, inMax, outMin, outMax) + return (val - inMin) * (outMax - outMin) / (inMax - inMin) + outMin +end + function mist.getUnitsInPolygon(unit_names, polyZone, max_alt) local units = {} for i = 1, #unit_names do - units[#units + 1] = Unit.getByName(unit_names[i]) + units[#units + 1] = Unit.getByName(unit_names[i]) or StaticObject.getByName(unit_names[i]) end local inZoneUnits = {} for i =1, #units do - if units[i]:isActive() and mist.pointInPolygon(units[i]:getPosition().p, polyZone, max_alt) then - inZoneUnits[#inZoneUnits + 1] = units[i] + local lUnit = units[i] + local lCat = lUnit:getCategory() + if ((lCat == 1 and lUnit:isActive()) or lCat ~= 1) and mist.pointInPolygon(lUnit:getPosition().p, polyZone, max_alt) then + inZoneUnits[#inZoneUnits + 1] = lUnit end end @@ -2609,8 +3197,7 @@ function mist.getUnitsInPolygon(unit_names, polyZone, max_alt) end function mist.getUnitsInZones(unit_names, zone_names, zone_type) - - zone_type = zone_type or 'cylinder' + zone_type = zone_type or 'cylinder' if zone_type == 'c' or zone_type == 'cylindrical' or zone_type == 'C' then zone_type = 'cylinder' end @@ -2622,9 +3209,13 @@ function mist.getUnitsInZones(unit_names, zone_names, zone_type) local units = {} local zones = {} - + + if zone_names and type(zone_names) == 'string' then + zone_names = {zone_names} + end for k = 1, #unit_names do - local unit = Unit.getByName(unit_names[k]) + + local unit = Unit.getByName(unit_names[k]) or StaticObject.getByName(unit_names[k]) if unit then units[#units + 1] = unit end @@ -2632,31 +3223,40 @@ function mist.getUnitsInZones(unit_names, zone_names, zone_type) for k = 1, #zone_names do - local zone = trigger.misc.getZone(zone_names[k]) + local zone = mist.DBs.zonesByName[zone_names[k]] if zone then - zones[#zones + 1] = {radius = zone.radius, x = zone.point.x, y = zone.point.y, z = zone.point.z} + zones[#zones + 1] = {radius = zone.radius, x = zone.point.x, y = zone.point.y, z = zone.point.z, verts = zone.verticies} end end local in_zone_units = {} - for units_ind = 1, #units do - for zones_ind = 1, #zones do + local lUnit = units[units_ind] + local unit_pos = lUnit:getPosition().p + local lCat = lUnit:getCategory() + for zones_ind = 1, #zones do if zone_type == 'sphere' then --add land height value for sphere zone type local alt = land.getHeight({x = zones[zones_ind].x, y = zones[zones_ind].z}) if alt then zones[zones_ind].y = alt end end - local unit_pos = units[units_ind]:getPosition().p - if unit_pos and units[units_ind]:isActive() == true then - if zone_type == 'cylinder' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then - in_zone_units[#in_zone_units + 1] = units[units_ind] - break - elseif zone_type == 'sphere' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.y - zones[zones_ind].y)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then - in_zone_units[#in_zone_units + 1] = units[units_ind] - break - end + + if unit_pos and ((lCat == 1 and lUnit:isActive() == true) or lCat ~= 1) then -- it is a unit and is active or it is not a unit + if zones[zones_ind].verts then + if mist.pointInPolygon(unit_pos, zones[zones_ind].verts) then + in_zone_units[#in_zone_units + 1] = lUnit + end + + else + if zone_type == 'cylinder' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then + in_zone_units[#in_zone_units + 1] = lUnit + break + elseif zone_type == 'sphere' and (((unit_pos.x - zones[zones_ind].x)^2 + (unit_pos.y - zones[zones_ind].y)^2 + (unit_pos.z - zones[zones_ind].z)^2)^0.5 <= zones[zones_ind].radius) then + in_zone_units[#in_zone_units + 1] = lUnit + break + end + end end end end @@ -2679,14 +3279,14 @@ function mist.getUnitsInMovingZones(unit_names, zone_unit_names, radius, zone_ty local zone_units = {} for k = 1, #unit_names do - local unit = Unit.getByName(unit_names[k]) + local unit = Unit.getByName(unit_names[k]) or StaticObject.getByName(unit_names[k]) if unit then units[#units + 1] = unit end end for k = 1, #zone_unit_names do - local unit = Unit.getByName(zone_unit_names[k]) + local unit = Unit.getByName(zone_unit_names[k]) or StaticObject.getByName(zone_unit_names[k]) if unit then zone_units[#zone_units + 1] = unit end @@ -2695,15 +3295,18 @@ function mist.getUnitsInMovingZones(unit_names, zone_unit_names, radius, zone_ty local in_zone_units = {} for units_ind = 1, #units do + local lUnit = units[units_ind] + local lCat = lUnit:getCategory() + local unit_pos = lUnit:getPosition().p for zone_units_ind = 1, #zone_units do - local unit_pos = units[units_ind]:getPosition().p + local zone_unit_pos = zone_units[zone_units_ind]:getPosition().p - if unit_pos and zone_unit_pos and units[units_ind]:isActive() == true then + if unit_pos and zone_unit_pos and ((lCat == 1 and lUnit:isActive()) or lCat ~= 1) then if zone_type == 'cylinder' and (((unit_pos.x - zone_unit_pos.x)^2 + (unit_pos.z - zone_unit_pos.z)^2)^0.5 <= radius) then - in_zone_units[#in_zone_units + 1] = units[units_ind] + in_zone_units[#in_zone_units + 1] = lUnit break elseif zone_type == 'sphere' and (((unit_pos.x - zone_unit_pos.x)^2 + (unit_pos.y - zone_unit_pos.y)^2 + (unit_pos.z - zone_unit_pos.z)^2)^0.5 <= radius) then - in_zone_units[#in_zone_units + 1] = units[units_ind] + in_zone_units[#in_zone_units + 1] = lUnit break end end @@ -2721,7 +3324,8 @@ function mist.getUnitsLOS(unitset1, altoffset1, unitset2, altoffset2, radius) -- get the positions all in one step, saves execution time. for unitset1_ind = 1, #unitset1 do local unit1 = Unit.getByName(unitset1[unitset1_ind]) - if unit1 and unit1:isActive() == true then + local lCat = unit1:getCategory() + if unit1 and ((lCat == 1 and unit1:isActive()) or lCat ~= 1) then unit_info1[#unit_info1 + 1] = {} unit_info1[#unit_info1].unit = unit1 unit_info1[#unit_info1].pos = unit1:getPosition().p @@ -2730,7 +3334,8 @@ function mist.getUnitsLOS(unitset1, altoffset1, unitset2, altoffset2, radius) for unitset2_ind = 1, #unitset2 do local unit2 = Unit.getByName(unitset2[unitset2_ind]) - if unit2 and unit2:isActive() == true then + local lCat = unit2:getCategory() + if unit2 and ((lCat == 1 and unit2:isActive()) or lCat ~= 1) then unit_info2[#unit_info2 + 1] = {} unit_info2[#unit_info2].unit = unit2 unit_info2[#unit_info2].pos = unit2:getPosition().p @@ -2766,7 +3371,8 @@ end function mist.getAvgPoint(points) local avgX, avgY, avgZ, totNum = 0, 0, 0, 0 for i = 1, #points do - local nPoint = mist.utils.makeVec3(points[i]) + --log:warn(points[i]) + local nPoint = mist.utils.makeVec3(points[i]) if nPoint.z then avgX = avgX + nPoint.x avgY = avgY + nPoint.y @@ -2859,13 +3465,13 @@ function mist.getBRString(vars) local metric = vars.metric local avgPos = mist.getAvgPos(units) if avgPos then - local vec = {x = avgPos.x - ref.x, y = avgPos.y - ref.y, z = avgPos.z - ref.z} - local dir = mist.utils.getDir(vec, ref) - local dist = mist.utils.get2DDist(avgPos, ref) - if alt then - alt = avgPos.y - end - return mist.tostringBR(dir, dist, alt, metric) + local vec = {x = avgPos.x - ref.x, y = avgPos.y - ref.y, z = avgPos.z - ref.z} + local dir = mist.utils.getDir(vec, ref) + local dist = mist.utils.get2DDist(avgPos, ref) + if alt then + alt = avgPos.y + end + return mist.tostringBR(dir, dist, alt, metric) end end @@ -2891,10 +3497,11 @@ function mist.getLeadingPos(vars) unitPosTbl[#unitPosTbl + 1] = unit:getPosition().p end end + if #unitPosTbl > 0 then -- one more more units found. -- first, find the unit most in the heading direction local maxPos = -math.huge - + heading = heading * -1 -- rotated value appears to be opposite of what was expected local maxPosInd -- maxPos - the furthest in direction defined by heading; maxPosInd = for i = 1, #unitPosTbl do local rotatedVec2 = mist.vec.rotateVec2(mist.utils.makeVec2(unitPosTbl[i]), heading) @@ -2985,8 +3592,147 @@ function mist.getLeadingBRString(vars) end end +--[[getPathLength from GSH +-- Returns the length between the defined set of points. Can also return the point index before the cutoff was achieved +p - table of path points, vec2 or vec3 +cutoff - number distance after which to stop at +topo - boolean for if it should get the topographical distance + +]] + +function mist.getPathLength(p, cutoff, topo) + local l = 0 + local cut = 0 or cutOff + local path = {} + + for i = 1, #p do + if topo then + table.insert(path, mist.utils.makeVec3GL(p[i])) + else + table.insert(path, mist.utils.makeVec3(p[i])) + end + end + + for i = 1, #path do + if i + 1 <= #path then + if topo then + l = mist.utils.get3DDist(path[i], path[i+1]) + l + else + l = mist.utils.get2DDist(path[i], path[i+1]) + l + end + end + if cut ~= 0 and l > cut then + return l, i + end + end + return l end +--[[ +Return a series of points to simplify the input table. Best used in conjunction with findPathOnRoads to turn the massive table into a list of X points. +p - table of path points, can be vec2 or vec3 +num - number of segments. +exact - boolean for whether or not it returns the exact distance or uses the first WP to that distance. + + +]] + +function mist.getPathInSegments(p, num, exact) + local tot = mist.getPathLength(p) + local checkDist = tot/num + local typeUsed = 'vec2' + + local points = {[1] = p[1]} + local curDist = 0 + for i = 1, #p do + if i + 1 <= #p then + curDist = mist.utils.get2DDist(p[i], p[i+1]) + curDist + if curDist > checkDist then + curDist = 0 + if exact then + -- get avg point between the two + -- insert into point table + -- need to be accurate... maybe reassign the point for the value it is checking? + -- insert into p table? + else + table.insert(points, p[i]) + end + end + + end + + end + return points + +end + + +function mist.getPointAtDistanceOnPath(p, dist, r, rtn) + log:info('find distance: $1', dist) + local rType = r or 'roads' + local point = {x= 0, y = 0, z = 0} + local path = {} + local ret = rtn or 'vec2' + local l = 0 + if p[1] and #p == 2 then + path = land.findPathOnRoads(rType, p[1].x, p[1].y, p[2].x, p[2].y) + else + path = p + end + for i = 1, #path do + if i + 1 <= #path then + nextPoint = path[i+1] + if topo then + l = mist.utils.get3DDist(path[i], path[i+1]) + l + else + l = mist.utils.get2DDist(path[i], path[i+1]) + l + end + end + if l > dist then + local diff = dist + if i ~= 1 then -- get difference + diff = l - dist + end + local dir = mist.utils.getHeadingPoints(mist.utils.makeVec3(path[i]), mist.utils.makeVec3(path[i+1])) + local x, y + if r then + x, y = land.getClosestPointOnRoads(rType, mist.utils.round((math.cos(dir) * diff) + path[i].x,1), mist.utils.round((math.sin(dir) * diff) + path[i].y,1)) + else + x, y = mist.utils.round((math.cos(dir) * diff) + path[i].x,1), mist.utils.round((math.sin(dir) * diff) + path[i].y,1) + end + + if ret == 'vec2' then + return {x = x, y = y}, dir + elseif ret == 'vec3' then + return {x = x, y = 0, z = y}, dir + end + + return {x = x, y = y}, dir + end + end + log:warn('Find point at distance: $1, path distance $2', dist, l) + return false +end + + +function mist.projectPoint(point, dist, theta) + local newPoint = {} + if point.z then + newPoint.z = mist.utils.round(math.sin(theta) * dist + point.z, 3) + newPoint.y = mist.utils.deepCopy(point.y) + else + newPoint.y = mist.utils.round(math.sin(theta) * dist + point.y, 3) + end + newPoint.x = mist.utils.round(math.cos(theta) * dist + point.x, 3) + + return newPoint +end + +end + + + + --- Group functions. -- @section groups do -- group functions scope @@ -3037,6 +3783,9 @@ do -- group functions scope newData.units = {} local newUnits = newGroup:getUnits() + if #newUnits == 0 then + log:warn('getCurrentGroupData has returned no units for: $1', gpName) + end for unitNum, unitData in pairs(newGroup:getUnits()) do newData.units[unitNum] = {} local uName = unitData:getName() @@ -3074,7 +3823,7 @@ do -- group functions scope end - function mist.getGroupData(gpName) + function mist.getGroupData(gpName, route) local found = false local newData = {} if mist.DBs.groupsByName[gpName] then @@ -3115,14 +3864,17 @@ do -- group functions scope newData.units[unitNum].unitName = unitData.unitName newData.units[unitNum].heading = unitData.heading -- added to DBs newData.units[unitNum].playerCanDrive = unitData.playerCanDrive -- added to DBs - + newData.units[unitNum].livery_id = unitData.livery_id + newData.units[unitNum].AddPropAircraft = unitData.AddPropAircraft + newData.units[unitNum].AddPropVehicle = unitData.AddPropVehicle + if newData.category == 'plane' or newData.category == 'helicopter' then newData.units[unitNum].payload = payloads[unitNum] - newData.units[unitNum].livery_id = unitData.livery_id + newData.units[unitNum].onboard_num = unitData.onboard_num newData.units[unitNum].callsign = unitData.callsign - newData.units[unitNum].AddPropAircraft = unitData.AddPropAircraft + end if newData.category == 'static' then newData.units[unitNum].categoryStatic = unitData.categoryStatic @@ -3132,6 +3884,10 @@ do -- group functions scope end end --log:info(newData) + if route then + newData.route = mist.getGroupRoute(gpName, true) + end + return newData else log:error('$1 not found in MIST database', gpName) @@ -3156,10 +3912,10 @@ do -- group functions scope if (coa_name == 'red' or coa_name == 'blue') and type(coa_data) == 'table' then if coa_data.country then --there is a country table for cntry_id, cntry_data in pairs(coa_data.country) do - for obj_type_name, obj_type_data in pairs(cntry_data) do - if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points - if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group! - for group_num, group_data in pairs(obj_type_data.group) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do if group_data and group_data.groupId == gpId then for unitIndex, unitData in pairs(group_data.units) do --group index if unitData.unitId == unitId then @@ -3198,10 +3954,10 @@ do -- group functions scope if type(coa_data) == 'table' then if coa_data.country then --there is a country table for cntry_id, cntry_data in pairs(coa_data.country) do - for obj_type_name, obj_type_data in pairs(cntry_data) do - if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points - if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group! - for group_num, group_data in pairs(obj_type_data.group) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do if group_data and group_data.groupId == gpId then local payloads = {} for unitIndex, unitData in pairs(group_data.units) do --group index @@ -3223,16 +3979,53 @@ do -- group functions scope end log:warn("Couldn't find payload for group: $1", groupIdent) return - end + function mist.getGroupTable(groupIdent) + local gpId = groupIdent + if type(groupIdent) == 'string' and not tonumber(groupIdent) then + if mist.DBs.MEgroupsByName[groupIdent] then + gpId = mist.DBs.MEgroupsByName[groupIdent].groupId + else + log:error('$1 not found in mist.DBs.MEgroupsByName', groupIdent) + end + end + + if gpId then + for coa_name, coa_data in pairs(env.mission.coalition) do + if type(coa_data) == 'table' then + if coa_data.country then --there is a country table + for cntry_id, cntry_data in pairs(coa_data.country) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do + if group_data and group_data.groupId == gpId then + return group_data + end + end + end + end + end + end + end + end + end + else + log:error('Need string or number. Got: $1', type(groupIdent)) + return false + end + log:warn("Couldn't find table for group: $1", groupIdent) + + end + function mist.getValidRandomPoint(vars) end function mist.teleportToPoint(vars) -- main teleport function that all of teleport/respawn functions call - --log:info(vars) + --log:warn(vars) local point = vars.point local gpName if vars.gpName then @@ -3243,6 +4036,14 @@ do -- group functions scope log:error('Missing field groupName or gpName in variable table') end + --[[New vars to add, mostly for when called via inZone functions + anyTerrain + offsetWP1 + offsetRoute + initTasks + + ]] + local action = vars.action local disperse = vars.disperse or false @@ -3250,8 +4051,9 @@ do -- group functions scope local radius = vars.radius or 0 local innerRadius = vars.innerRadius - local route = vars.route local dbData = false + + local newGroupData if gpName and not vars.groupData then @@ -3272,18 +4074,33 @@ do -- group functions scope action = 'tele' newGroupData = vars.groupData end + + if vars.newGroupName then + newGroupData.groupName = vars.newGroupName + end + if #newGroupData.units == 0 then + log:warn('$1 has no units in group table', gpName) + return + end + --log:info('get Randomized Point') local diff = {x = 0, y = 0} local newCoord, origCoord local validTerrain = {'LAND', 'ROAD', 'SHALLOW_WATER', 'WATER', 'RUNWAY'} - if string.lower(newGroupData.category) == 'ship' then - validTerrain = {'SHALLOW_WATER' , 'WATER'} - elseif string.lower(newGroupData.category) == 'vehicle' then - validTerrain = {'LAND', 'ROAD'} + if vars.anyTerrain then + -- do nothing + elseif vars.validTerrain then + validTerrain = vars.validTerrain + else + if string.lower(newGroupData.category) == 'ship' then + validTerrain = {'SHALLOW_WATER' , 'WATER'} + elseif string.lower(newGroupData.category) == 'vehicle' then + validTerrain = {'LAND', 'ROAD'} + end end - local offsets = {} + if point and radius >= 0 then local valid = false -- new thoughts @@ -3303,7 +4120,7 @@ do -- group functions scope ---- old for i = 1, 100 do newCoord = mist.getRandPointInCircle(point, radius, innerRadius) - if mist.isTerrainValid(newCoord, validTerrain) then + if vars.anyTerrain or mist.isTerrainValid(newCoord, validTerrain) then origCoord = mist.utils.deepCopy(newCoord) diff = {x = (newCoord.x - newGroupData.units[1].x), y = (newCoord.y - newGroupData.units[1].y)} valid = true @@ -3381,10 +4198,36 @@ do -- group functions scope end - if route then - newGroupData.route = route - end - --log:info(newGroupData) + + local tempRoute + + if mist.DBs.MEgroupsByName[gpName] and not vars.route then + -- log:warn('getRoute') + tempRoute = mist.getGroupRoute(gpName, true) + elseif vars.route then + -- log:warn('routeExist') + tempRoute = mist.utils.deepCopy(vars.route) + end + -- log:warn(tempRoute) + if tempRoute then + if (vars.offsetRoute or vars.offsetWP1 or vars.initTasks) then + for i = 1, #tempRoute do + -- log:warn(i) + if (vars.offsetRoute) or (i == 1 and vars.offsetWP1) or (i == 1 and vars.initTasks) then + -- log:warn('update offset') + tempRoute[i].x = tempRoute[i].x + diff.x + tempRoute[i].y = tempRoute[i].y + diff.y + elseif vars.initTasks and i > 1 then + --log:warn('deleteWP') + tempRoute[i] = nil + end + end + end + newGroupData.route = tempRoute + end + + + --log:warn(newGroupData) --mist.debug.writeData(mist.utils.serialize,{'teleportToPoint', newGroupData}, 'newGroupData.lua') if string.lower(newGroupData.category) == 'static' then --log:info(newGroupData) @@ -3394,7 +4237,7 @@ do -- group functions scope end - function mist.respawnInZone(gpName, zone, disperse, maxDisp) + function mist.respawnInZone(gpName, zone, disperse, maxDisp, v) if type(gpName) == 'table' and gpName:getName() then gpName = gpName:getName() @@ -3405,9 +4248,9 @@ do -- group functions scope end if type(zone) == 'string' then - zone = trigger.misc.getZone(zone) - elseif type(zone) == 'table' and not zone.radius then - zone = trigger.misc.getZone(zone[math.random(1, #zone)]) + zone = mist.DBs.zonesByName[zone] + elseif type(zone) == 'table' and not zone.radius then + zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]] end local vars = {} vars.gpName = gpName @@ -3416,10 +4259,17 @@ do -- group functions scope vars.radius = zone.radius vars.disperse = disperse vars.maxDisp = maxDisp + + if v and type(v) == 'table' then + for index, val in pairs(v) do + vars[index] = val + end + end + return mist.teleportToPoint(vars) end - function mist.cloneInZone(gpName, zone, disperse, maxDisp) + function mist.cloneInZone(gpName, zone, disperse, maxDisp, v) --log:info('cloneInZone') if type(gpName) == 'table' then gpName = gpName:getName() @@ -3428,9 +4278,9 @@ do -- group functions scope end if type(zone) == 'string' then - zone = trigger.misc.getZone(zone) - elseif type(zone) == 'table' and not zone.radius then - zone = trigger.misc.getZone(zone[math.random(1, #zone)]) + zone = mist.DBs.zonesByName[zone] + elseif type(zone) == 'table' and not zone.radius then + zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]] end local vars = {} vars.gpName = gpName @@ -3440,10 +4290,15 @@ do -- group functions scope vars.disperse = disperse vars.maxDisp = maxDisp --log:info('do teleport') + if v and type(v) == 'table' then + for index, val in pairs(v) do + vars[index] = val + end + end return mist.teleportToPoint(vars) end - function mist.teleportInZone(gpName, zone, disperse, maxDisp) -- groupName, zoneName or table of Zone Names, keepForm is a boolean + function mist.teleportInZone(gpName, zone, disperse, maxDisp, v) -- groupName, zoneName or table of Zone Names, keepForm is a boolean if type(gpName) == 'table' and gpName:getName() then gpName = gpName:getName() else @@ -3451,9 +4306,9 @@ do -- group functions scope end if type(zone) == 'string' then - zone = trigger.misc.getZone(zone) - elseif type(zone) == 'table' and not zone.radius then - zone = trigger.misc.getZone(zone[math.random(1, #zone)]) + zone = mist.DBs.zonesByName[zone] + elseif type(zone) == 'table' and not zone.radius then + zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]] end local vars = {} @@ -3463,6 +4318,11 @@ do -- group functions scope vars.radius = zone.radius vars.disperse = disperse vars.maxDisp = maxDisp + if v and type(v) == 'table' then + for index, val in pairs(v) do + vars[index] = val + end + end return mist.teleportToPoint(vars) end @@ -3688,14 +4548,20 @@ do -- group functions scope end return choices[rtnVal] end + + function mist.stringCondense(s) + local exclude = {'%-', '%(', '%)', '%_', '%[', '%]', '%.', '%#', '% ', '%{', '%}', '%$', '%%', '%?', '%+', '%^'} + for i , str in pairs(exclude) do + s = string.gsub(s, str, '') + end + return s + end function mist.stringMatch(s1, s2, bool) - local exclude = {'%-', '%(', '%)', '%_', '%[', '%]', '%.', '%#', '% ', '%{', '%}', '%$', '%%', '%?', '%+', '%^'} + if type(s1) == 'string' and type(s2) == 'string' then - for i , str in pairs(exclude) do - s1 = string.gsub(s1, str, '') - s2 = string.gsub(s2, str, '') - end + s1 = mist.stringCondense(s1) + s2 = mist.stringCondense(s2) if not bool then s1 = string.lower(s1) s2 = string.lower(s2) @@ -3823,6 +4689,25 @@ do -- mist.util scope function mist.utils.celsiusToFahrenheit(c) return c*(9/5)+32 end + + function mist.utils.hexToRGB(hex, l) -- because for some reason the draw tools use hex when everything is rgba 0 - 1 + local int = 255 + if l then + int = 1 + end + if hex and type(hex) == 'string' then + local val = {} + hex = string.gsub(hex, '0x', '') + if string.len(hex) == 8 then + val[1] = tonumber("0x"..hex:sub(1,2)) / int + val[2] = tonumber("0x"..hex:sub(3,4)) / int + val[3] = tonumber("0x"..hex:sub(5,6)) / int + val[4] = tonumber("0x"..hex:sub(7,8)) / int + + return val + end + end + end function mist.utils.converter(t1, t2, val) if type(t1) == 'string' then @@ -4024,7 +4909,7 @@ do -- mist.util scope --- Returns the center of a zone as Vec3. -- @tparam string|table zone trigger zone name or table -- @treturn Vec3 center of the zone - function mist.utils.zoneToVec3(zone) + function mist.utils.zoneToVec3(zone, gl) local new = {} if type(zone) == 'table' then if zone.point then @@ -4032,7 +4917,7 @@ do -- mist.util scope new.y = zone.point.y new.z = zone.point.z elseif zone.x and zone.y and zone.z then - return zone + new = mist.utils.deepCopy(zone) end return new elseif type(zone) == 'string' then @@ -4041,11 +4926,21 @@ do -- mist.util scope new.x = zone.point.x new.y = zone.point.y new.z = zone.point.z - return new end end + if new.x and gl then + new.y = land.getHeight({x = new.x, y = new.z}) + end + return new end + function mist.utils.getHeadingPoints(point1, point2, north) -- sick of writing this out. + if north then + return mist.utils.getDir(mist.vec.sub(mist.utils.makeVec3(point2), mist.utils.makeVec3(point1)), (mist.utils.makeVec3(point1))) + else + return mist.utils.getDir(mist.vec.sub(mist.utils.makeVec3(point2), mist.utils.makeVec3(point1))) + end + end --- Returns heading-error corrected direction. -- True-north corrected direction from point along vector vec. -- @tparam Vec3 vec @@ -4067,6 +4962,12 @@ do -- mist.util scope -- @tparam Vec2|Vec3 point2 second point -- @treturn number distance between given points. function mist.utils.get2DDist(point1, point2) + if not point1 then + log:warn("mist.utils.get2DDist 1st input value is nil") + end + if not point2 then + log:warn("mist.utils.get2DDist 2nd input value is nil") + end point1 = mist.utils.makeVec3(point1) point2 = mist.utils.makeVec3(point2) return mist.vec.mag({x = point1.x - point2.x, y = 0, z = point1.z - point2.z}) @@ -4077,6 +4978,12 @@ do -- mist.util scope -- @tparam Vec3 point2 second point -- @treturn number distancen between given points in 3D space. function mist.utils.get3DDist(point1, point2) + if not point1 then + log:warn("mist.utils.get2DDist 1st input value is nil") + end + if not point2 then + log:warn("mist.utils.get2DDist 2nd input value is nil") + end return mist.vec.mag({x = point1.x - point2.x, y = point1.y - point2.y, z = point1.z - point2.z}) end @@ -4507,6 +5414,23 @@ end do -- mist.debug scope mist.debug = {} + function mist.debug.changeSetting(s) + if type(s) == 'table' then + for sName, sVal in pairs(s) do + if type(sVal) == 'string' or type(sVal) == 'number' then + if sName == 'log' then + mistSettings[sName] = sVal + mist.log:setLevel(sVal) + elseif sName == 'dbLog' then + mistSettings[sName] = sVal + dblog:setLevel(sVal) + end + else + mistSettings[sName] = sVal + end + end + end + end --- Dumps the global table _G. -- This dumps the global table _G to a file in -- the DCS\Logs directory. @@ -4514,11 +5438,24 @@ do -- mist.debug scope -- in $DCS_ROOT\Scripts\MissionScripting.lua to access lfs and io -- libraries. -- @param fname - function mist.debug.dump_G(fname) + function mist.debug.dump_G(fname, simp) if lfs and io then local fdir = lfs.writedir() .. [[Logs\]] .. fname local f = io.open(fdir, 'w') - f:write(mist.utils.tableShow(_G)) + if simp then + local g = mist.utils.deepCopy(_G) + g.mist = nil + g.slmod = nil + g.env.mission = nil + g.env.warehouses = nil + g.country.by_idx = nil + g.country.by_country = nil + + f:write(mist.utils.tableShow(g)) + else + + f:write(mist.utils.tableShow(_G)) + end f:close() log:info('Wrote debug data to $1', fdir) --trigger.action.outText(errmsg, 10) @@ -4562,6 +5499,141 @@ do -- mist.debug scope end end end + + -- write group table + function mist.debug.writeGroup(gName, data) + if gName and mist.DBs.groupsByName[gName] then + local dat + if data then + dat = mist.getGroupData(gName) + else + dat = mist.getGroupTable(gName) + end + if dat then + dat.route = {points = mist.getGroupRoute(gName, true)} + end + + if io and lfs and dat then + mist.debug.writeData(mist.utils.serialize, {gName, dat}, gName .. '_table.lua') + else + if dat then + trigger.action.outText('Error: insufficient libraries to run mist.debug.writeGroup, you must disable the sanitization of the io and lfs libraries in ./Scripts/MissionScripting.lua \nGroup table written to DCS.log file instead.', 10) + log:warn('$1 dataTable: $2', gName, dat) + else + trigger.action.outText('Unable to write group table for: ' .. gName .. '\n Error: insufficient libraries to run mist.debug.writeGroup, you must disable the sanitization of the io and lfs libraries in ./Scripts/MissionScripting.lua', 10) + end + end + end + end + + + + -- write all object types in mission. + function mist.debug.writeTypes(fName) + local wt = 'mistDebugWriteTypes.lua' + if fName and type(fName) == 'string' and string.find(fName, '.lua') then + wt = fName + end + local output = {units = {}, countries = {}} + for coa_name_miz, coa_data in pairs(env.mission.coalition) do + if type(coa_data) == 'table' then + if coa_data.country then --there is a country table + for cntry_id, cntry_data in pairs(coa_data.country) do + local countryName = string.lower(cntry_data.name) + if cntry_data.id and country.names[cntry_data.id] then + countryName = string.lower(country.names[cntry_data.id]) + end + output.countries[countryName] = {} + if type(cntry_data) == 'table' then --just making sure + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then --should be an unncessary check + local category = obj_cat_name + if not output.countries[countryName][category] then + -- log:warn('Create: $1', category) + output.countries[countryName][category] = {} + end + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do + if group_data and group_data.units and type(group_data.units) == 'table' then --making sure again- this is a valid group + for i = 1, #group_data.units do + if group_data.units[i] then + local u = group_data.units[i] + local liv = u.livery_id or 'default' + if not output.units[u.type] then -- create unit table + -- log:warn('Create: $1', u.type) + output.units[u.type] = {count = 0, livery_id = {}} + end + + if not output.countries[countryName][category][u.type] then + -- log:warn('Create country, category, unit: $1', u.type) + output.countries[countryName][category][u.type] = 0 + end + -- add to count + output.countries[countryName][category][u.type] = output.countries[countryName][category][u.type] + 1 + output.units[u.type].count = output.units[u.type].count + 1 + + if liv and not output.units[u.type].livery_id[countryName] then + -- log:warn('Create livery country: $1', countryName) + output.units[u.type].livery_id[countryName] = {} + end + if liv and not output.units[u.type].livery_id[countryName][liv] then + --log:warn('Create Livery: $1', liv) + output.units[u.type].livery_id[countryName][liv] = 0 + end + if liv then + output.units[u.type].livery_id[countryName][liv] = output.units[u.type].livery_id[countryName][liv] + 1 + end + if u.payload and u.payload.pylons then + if not output.units[u.type].CLSID then + output.units[u.type].CLSID = {} + output.units[u.type].pylons = {} + end + + for pyIndex, pData in pairs(u.payload.pylons) do + if not output.units[u.type].CLSID[pData.CLSID] then + output.units[u.type].CLSID[pData.CLSID] = 0 + end + output.units[u.type].CLSID[pData.CLSID] = output.units[u.type].CLSID[pData.CLSID] + 1 + + if not output.units[u.type].pylons[pyIndex] then + output.units[u.type].pylons[pyIndex] = {} + end + if not output.units[u.type].pylons[pyIndex][pData.CLSID] then + output.units[u.type].pylons[pyIndex][pData.CLSID] = 0 + end + output.units[u.type].pylons[pyIndex][pData.CLSID] = output.units[u.type].pylons[pyIndex][pData.CLSID] + 1 + end + + end + end + end + end + end + end + end + end + end + end + end + end + end + if io and lfs then + mist.debug.writeData(mist.utils.serialize, {'mistDebugWriteTypes', output}, wt) + else + trigger.action.outText('Error: insufficient libraries to run mist.debug.writeTypes, you must disable the sanitization of the io and lfs libraries in ./Scripts/MissionScripting.lua \n writeTypes table written to DCS.log file instead.', 10) + log:warn('mist.debug.writeTypes: $1', output) + end + return output + end + function mist.debug.writeWeapons(unit) + + end + + function mist.debug.mark(msg, coord) + + mist.marker.add({point = coord, text = msg}) + log:warn('debug.mark: $1 $2', msg, coord) + end end --- 3D Vector functions @@ -4633,6 +5705,13 @@ do -- mist.vec scope function mist.vec.rotateVec2(vec2, theta) return { x = vec2.x*math.cos(theta) - vec2.y*math.sin(theta), y = vec2.x*math.sin(theta) + vec2.y*math.cos(theta)} end + + function mist.vec.normalize(vec3) + local mag = mist.vec.mag(vec3) + if mag ~= 0 then + return mist.vec.scalar_mult(vec3, 1.0 / mag) + end + end end --- Flag functions. @@ -4826,7 +5905,7 @@ unitTableDef = table or nil if stopflag == -1 or (type(trigger.misc.getUserFlag(stopflag)) == 'number' and trigger.misc.getUserFlag(stopflag) == 0) or (type(trigger.misc.getUserFlag(stopflag)) == 'boolean' and trigger.misc.getUserFlag(stopflag) == 0) then local num_in_zone = 0 for i = 1, #units do - local unit = Unit.getByName(units[i]) + local unit = Unit.getByName(units[i]) or StaticObject.getByName(units[i]) if unit then local pos = unit:getPosition().p if mist.pointInPolygon(pos, zone, maxalt) then @@ -4913,7 +5992,13 @@ unitTableDef = table or nil end end - + --[[ + function mist.flagFunc.weapon_in_zones(vars) + -- borrow from suchoi surprise. While running enabled event handler that checks for weapons in zone. + -- Choice is weapon category or weapon strings. + + end +]] --- Sets a flag if unit(s) is/are inside a moving zone. -- @todo document function mist.flagFunc.units_in_moving_zones(vars) @@ -5282,13 +6367,15 @@ do -- mist.msg scope local caSlots = false local caMSGtoGroup = false + local anyUpdate = false + local lastMessageTime = nil if env.mission.groundControl then -- just to be sure? for index, value in pairs(env.mission.groundControl) do if type(value) == 'table' then for roleName, roleVal in pairs(value) do for rIndex, rVal in pairs(roleVal) do - if env.mission.groundControl[index][roleName][rIndex] > 0 then + if type(rVal) == 'number' and rVal > 0 then caSlots = true break end @@ -5303,11 +6390,123 @@ do -- mist.msg scope end local function mistdisplayV5() - --[[thoughts to improve upon - event handler based activeClients table. - display messages only when there is an update - possibly co-routine it. - ]] + --log:warn("mistdisplayV5: $1", timer.getTime()) + + local clearView = true + if #messageList > 0 then + --log:warn('Updates: $1', anyUpdate) + if anyUpdate == true then + local activeClients = {} + + for clientId, clientData in pairs(mist.DBs.humansById) do + if Unit.getByName(clientData.unitName) and Unit.getByName(clientData.unitName):isExist() == true then + activeClients[clientData.groupId] = clientData.groupName + end + end + anyUpdate = false + if displayActive == false then + displayActive = true + end + --mist.debug.writeData(mist.utils.serialize,{'msg', messageList}, 'messageList.lua') + local msgTableText = {} + local msgTableSound = {} + + for mInd, messageData in pairs(messageList) do + if messageData.displayedFor > messageData.displayTime then + messageData:remove() -- now using the remove/destroy function. + else + if messageData.displayedFor then + messageData.displayedFor = messageData.displayedFor + messageDisplayRate + end + local nextSound = 1000 + local soundIndex = 0 + + if messageData.multSound and #messageData.multSound > 0 then + for index, sData in pairs(messageData.multSound) do + if sData.time <= messageData.displayedFor and sData.played == false and sData.time < nextSound then -- find index of the next sound to be played + nextSound = sData.time + soundIndex = index + end + end + if soundIndex ~= 0 then + messageData.multSound[soundIndex].played = true + end + end + + for recIndex, recData in pairs(messageData.msgFor) do -- iterate recipiants + if recData == 'RED' or recData == 'BLUE' or activeClients[recData] then -- rec exists + if messageData.text then -- text + if not msgTableText[recData] then -- create table entry for text + msgTableText[recData] = {} + msgTableText[recData].text = {} + if recData == 'RED' or recData == 'BLUE' then + msgTableText[recData].text[1] = '-------Combined Arms Message-------- \n' + end + msgTableText[recData].text[#msgTableText[recData].text + 1] = messageData.text + msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor + else -- add to table entry and adjust display time if needed + if recData == 'RED' or recData == 'BLUE' then + msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- Combined Arms Message: \n' + else + msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- \n' + end + table.insert(msgTableText[recData].text, messageData.text) + if msgTableText[recData].displayTime < messageData.displayTime - messageData.displayedFor then + msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor + else + --msgTableText[recData].displayTime = 10 + end + end + end + if soundIndex ~= 0 then + msgTableSound[recData] = messageData.multSound[soundIndex].file + end + end + + end + messageData.update = nil + + end + + end + ------- new display + + if caSlots == true and caMSGtoGroup == false then + if msgTableText.RED then + trigger.action.outTextForCoalition(coalition.side.RED, table.concat(msgTableText.RED.text), msgTableText.RED.displayTime, clearView) + + end + if msgTableText.BLUE then + trigger.action.outTextForCoalition(coalition.side.BLUE, table.concat(msgTableText.BLUE.text), msgTableText.BLUE.displayTime, clearView) + end + end + + for index, msgData in pairs(msgTableText) do + if type(index) == 'number' then -- its a groupNumber + trigger.action.outTextForGroup(index, table.concat(msgData.text), msgData.displayTime, clearView) + end + end + --- new audio + if msgTableSound.RED then + trigger.action.outSoundForCoalition(coalition.side.RED, msgTableSound.RED) + end + if msgTableSound.BLUE then + trigger.action.outSoundForCoalition(coalition.side.BLUE, msgTableSound.BLUE) + end + + + for index, file in pairs(msgTableSound) do + if type(index) == 'number' then -- its a groupNumber + trigger.action.outSoundForGroup(index, file) + end + end + + end + + else + mist.removeFunction(displayFuncId) + displayActive = false + end end local function mistdisplayV4() @@ -5468,14 +6667,14 @@ end]] ]] - + local new = {} new.text = vars.text -- The actual message new.displayTime = vars.displayTime -- How long will the message appear for new.displayedFor = 0 -- how long the message has been displayed so far new.name = vars.name -- ID to overwrite the older message (if it exists) Basically it replaces a message that is displayed with new text. new.addedAt = timer.getTime() - new.update = true + --log:warn('New Message: $1', new.text) if vars.multSound and vars.multSound[1] then new.multSound = vars.multSound @@ -5566,13 +6765,14 @@ end]] messageList[i].text = new.text messageList[i].msgFor = new.msgFor messageList[i].multSound = new.multSound - messageList[i].update = true + anyUpdate = true + --log:warn('Message updated: $1', new.messageID) return messageList[i].messageID end end end end - + anyUpdate = true messageID = messageID + 1 new.messageID = messageID @@ -5586,7 +6786,7 @@ end]] if displayActive == false then displayActive = true - displayFuncId = mist.scheduleFunction(mistdisplayV4, {}, timer.getTime() + messageDisplayRate, messageDisplayRate) + displayFuncId = mist.scheduleFunction(mistdisplayV5, {}, timer.getTime() + messageDisplayRate, messageDisplayRate) end return messageID @@ -5597,6 +6797,7 @@ end]] for i, msgData in pairs(messageList) do if messageList[i] == self then table.remove(messageList, i) + anyUpdate = true return true --removal successful end end @@ -5607,6 +6808,7 @@ end]] for i, msgData in pairs(messageList) do if messageList[i].messageID == id then table.remove(messageList, i) + anyUpdate = true return true --removal successful end end @@ -6007,6 +7209,9 @@ do -- mist.demos scope end end + + + do --[[ stuff for marker panels marker.add() add marker. Point of these functions is to simplify process and to store all mark panels added. @@ -6026,98 +7231,364 @@ do If mark added to a group before a client joins slot is synced. Mark made for cliet A in Slot A. Client A leaves, Client B joins in slot A. What do they see? + May need to automate process... + + + Could release this. But things I might need to add/change before doing so. + - removing marks and re-adding in same sequence doesn't appear to work. May need to schedule adding mark if updating an entry. + - I really dont like the old message style code for which groups get the message. Perhaps change to unitsTable and create function for getting humanUnitsTable. + = Event Handler, and check it, for marks added via script or user to deconflict Ids. + - Full validation of passed values for a specific shape type. ]] - --[[ - local typeBase = { - ['Mi-8MT'] = {'Mi-8MTV2', 'Mi-8MTV', 'Mi-8'}, - ['MiG-21Bis'] = {'Mig-21'}, - ['MiG-15bis'] = {'Mig-15'}, - ['FW-190D9'] = {'FW-190'}, - ['Bf-109K-4'] = {'Bf-109'}, - } - - - local mId = 1337 + + local usedMarks = {} + + local mDefs = { + coa = { + ['red'] = {fillColor = {.8, 0 , 0, .5}, color = {.8, 0 , 0, .5}, lineType = 2, fontSize = 16}, + ['blue'] = {fillColor = {0, 0 , 0.8, .5}, color = {0, 0 , 0.8, .5}, lineType = 2, fontSize = 16}, + ['all'] = {fillColor = {.1, .1 , .1, .5}, color = {.9, .9 , .9, .5}, lineType = 2, fontSize = 16}, + ['neutral'] = {fillColor = {.1, .1 , .1, .5}, color = {.2, .2 , .2, .5}, lineType = 2, fontSize = 16}, + }, + } + + local userDefs = {['red'] = {},['blue'] = {},['all'] = {},['neutral'] = {}} + local mId = 1000 + + local tNames = {'line', 'circle','rect', 'arrow', 'text', 'quad', 'freeform'} + local tLines = {[0] = 'no line', [1] = 'solid', [2] = 'dashed',[3] = 'dotted', [4] = 'dot dash' ,[5] = 'long dash', [6] = 'two dash'} + local coas = {[-1] = 'all', [0] = 'neutral', [1] = 'red', [2] = 'blue'} + + local altNames = {['poly'] = 7, ['lines'] = 1, ['polygon'] = 7 } + + local function draw(s) + --log:warn(s) + if type(s) == 'table' then + local mType = s.markType + if mType == 'panel' then + if markScope == 'coa' then + trigger.action.markToCoalition(s.markId, s.text, s.pos, s.markFor, s.readOnly) + elseif markScope == 'group' then + trigger.action.markToGroup(s.markId, s.text, s.pos, s.markFor, s.readOnly) + else + trigger.action.markToAll(s.markId, s.text, s.pos, s.readOnly) + end + elseif mType == 'line' then + trigger.action.lineToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message) + elseif mType == 'circle' then + trigger.action.circleToAll(s.coa, s.markId, s.pos[1], s.radius, s.color, s.fillColor, s.lineType, s.readOnly, s.message) + elseif mType == 'rect' then + trigger.action.rectToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message) + elseif mType == 'arrow' then + trigger.action.arrowToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message) + elseif mType == 'text' then + trigger.action.textToAll(s.coa, s.markId, s.pos[1], s.color, s.fillColor, s.fontSize, s.readOnly, s.text) + elseif mType == 'quad' then + trigger.action.quadToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.pos[3], s.pos[4], s.color, s.fillColor, s.lineType, s.readOnly, s.message) + end + if s.name and not usedMarks[s.name] then + usedMarks[s.name] = s.markId + end + elseif type(s) == 'string' then + --log:warn(s) + mist.utils.dostring(s) + end + end + mist.marker = {} - mist.marker.list = {} + local function markSpamFilter(recList, spamBlockOn) for id, name in pairs(recList) do if name == spamBlockOn then - log:info('already on recList') + --log:info('already on recList') return recList end end - log:info('add to recList') + --log:info('add to recList') table.insert(recList, spamBlockOn) return recList end local function iterate() - mId = mId + 1 - return mId + while mId < 10000000 do + if usedMarks[mId] then + mId = mId + 1 + else + return mist.utils.deepCopy(mId) + end + end + return mist.utils.deepCopy(mId) end + + local function validateColor(val) + if type(val) == 'table' then + for i = 1, #val do + if type(val[i]) == 'number' and val[i] > 1 then + val[i] = val[i]/255 -- convert RGB values from 0-255 to 0-1 equivilent. + end + end + elseif type(val) == 'string' then + val = mist.utils.hexToRGB(val) + + end + return val + end + + local function checkDefs(vName, coa) + --log:warn('CheckDefs: $1 $2', vName, coa) + local coaName + if type(coa) == 'number' then + if coas[coa] then + coaName = coas[coa] + end + elseif type(coa) == 'string' then + coaName = coa + end + + -- log:warn(coaName) + if userDefs[coaName] and userDefs[coaName][vName] then + return userDefs[coaName][vName] + elseif mDefs.coa[coaName] and mDefs.coa[coaName][vName] then + return mDefs.coa[coaName][vName] + end + + end + + function mist.marker.getNextId() + return iterate() + end + + local handle = {} + function handle:onEvent(e) + if world.event.S_EVENT_MARK_ADDED == e.id and e.idx then + usedMarks[e.idx] = e.idx + if not mist.DBs.markList[e.idx] then + --log:info('create maker DB: $1', e.idx) + mist.DBs.markList[e.idx] = {time = e.time, pos = e.pos, groupId = e.groupId, mType = 'panel', text = e.text, markId = e.idx, coalition = e.coalition} + if e.unit then + mist.DBs.markList[e.idx].unit = e.initiaor:getName() + end + --log:info(mist.marker.list[e.idx]) + end + + elseif world.event.S_EVENT_MARK_CHANGE == e.id and e.idx then + if mist.DBs.markList[e.idx] then + mist.DBs.markList[e.idx].text = e.text + end + elseif world.event.S_EVENT_MARK_REMOVE == e.id and e.idx then + if mist.DBs.markList[e.idx] then + mist.DBs.markList[e.idx] = nil + end + end + + end + + local function removeMark(id) + --log:info("Removing Mark: $1", id + local removed = false + if type(id) == 'table' then + for ind, val in pairs(id) do + if type(val) == 'number' then + trigger.action.removeMark(val) + mist.DBs.markList[val] = nil + removed = true + end + end + else + trigger.action.removeMark(id) + mist.DBs.markList[id] = nil + removed = true + end + return removed + end + + world.addEventHandler(handle) + function mist.marker.setDefault(vars) + local anyChange = false + if vars and type(vars) == 'table' then + for l1, l1Data in pairs(vars) do + if type(l1Data) == 'table' then + if not userDefs[l1] then + userDefs[l1] = {} + end + + for l2, l2Data in pairs(l1Data) do + userDefs[l1][l2] = l2Data + anyChange = true + end + else + userDefs[l1] = l1Data + anyChange = true + end + end + + end + return anyChange + end - function mist.marker.add(pos, text, markFor, id) - log:warn('markerFunc') - log:info('Pos: $1, Text: $2, markFor: $3, id: $4', pos, text, markFor, id) - if not id then - - else + function mist.marker.add(vars) + --log:warn('markerFunc') + --log:warn(vars) + local pos = vars.point or vars.points or vars.pos + local text = vars.text or '' + local markFor = vars.markFor + local markForCoa = vars.markForCoa or vars.coa -- optional, can be used if you just want to mark to a specific coa/all + local id = vars.id or vars.markId or vars.markid + local mType = vars.mType or vars.markType or vars.type or 0 + local color = vars.color + local fillColor = vars.fillColor + local lineType = vars.lineType or 2 + local readOnly = vars.readOnly or true + local message = vars.message + local fontSize = vars.fontSize + local name = vars.name + local radius = vars.radius or 500 + + local coa = -1 + local usedId = 0 + + + if id then + if type(id) ~= 'number' then + name = id + usedId = iterate() + end + --log:info('checkIfIdExist: $1', id) + --[[ + Maybe it should treat id or name as the same thing/single value. + + If passed number it will use that as the first Id used and will delete/update any marks associated with that same value. + + + ]] + + local lId = id or name + if mist.DBs.markList[id] then ---------- NEED A BETTER WAY TO ASSOCIATE THE ID VALUE. CUrrnetly deleting from table and checking if that deleted entry exists which it wont. + --log:warn('active mark to be removed: $1', id) + name = mist.DBs.markList[id].name or id + removeMark(id) + elseif usedMarks[id] then + --log:info('exists in usedMarks: $1', id) + removeMark(usedMarks[id]) + elseif name and usedMarks[name] then + --log:info('exists in usedMarks: $1', name) + removeMark(usedMarks[name]) + end + usedId = iterate() + usedMarks[id] = usedId -- redefine the value used end - local markType = 'all' + if name then + usedMarks[name] = usedId + end + + if usedId == 0 then + usedId = iterate() + end + if mType then + if type(mType) == 'string' then + for i = 1, #tNames do + --log:warn(tNames[i]) + if mist.stringMatch(mType, tNames[i]) then + mType = i + break + end + end + elseif type(mType) == 'number' and mType > #tNames then + mType = 0 + end + end + --log:warn(mType) + local markScope = 'all' local markForTable = {} - if pos then - pos = mist.utils.makeVec3(pos) + + if pos then + if pos[1] then + for i = 1, #pos do + pos[i] = mist.utils.makeVec3(pos[i]) + end + + else + pos[1] = mist.utils.makeVec3(pos) + end + end if text and type(text) ~= string then text = tostring(text) - else - text = '' end - - if markFor then + + if markForCoa then + if type(markForCoa) == 'string' then + if tonumber(markForCoa) then + coa = coas[tonumber(markForCoa)] + markScope = 'coa' + else + for ind, cName in pairs(coas) do + if mist.stringMatch(cName, markForCoa) then + coa = ind + markScope = 'coa' + break + end + end + end + elseif type(markForCoa) == 'number' and markForCoa >=-1 and markForCoa <= #coas then + coa = markForCoa + markScore = 'coa' + end + + + + elseif markFor then if type(markFor) == 'number' then -- groupId if mist.DBs.groupsById[markFor] then - markType = 'group' + markScope = 'group' end elseif type(markFor) == 'string' then -- groupName if mist.DBs.groupsByName[markFor] then - markType = 'group' + markScope = 'group' markFor = mist.DBs.groupsByName[markFor].groupId end elseif type(markFor) == 'table' then -- multiple groupName, country, coalition, all - markType = 'table' - log:info(markFor) + markScope = 'table' + --log:warn(markFor) for forIndex, forData in pairs(markFor) do -- need to rethink this part and organization. Gotta be a more logical way to send messages to coa, groups, or all. - log:info(forIndex) - log:info(forData) for list, listData in pairs(forData) do - log:info(listData) + --log:warn(listData) forIndex = string.lower(forIndex) if type(listData) == 'string' then listData = string.lower(listData) end if listData == 'all' then - markType = 'all' + markScope = 'all' break elseif (forIndex == 'coa' or forIndex == 'ca') then -- mark for coa or CA. - for name, index in pairs (coalition.side) do + local matches = 0 + for name, index in pairs (coalition.side) do if listData == string.lower(name) then - markType = 'coalition' + markScope = 'coa' + markFor = index + coa = index + matches = matches + 1 end end - elseif (forIndex == 'countries' and string.lower(clientData.country) == listData) or (forIndex == 'units' and string.lower(clientData.unitName) == listData) then - markForTable = markSpamFilter(markForTable, clientData.groupId) + if matches > 1 then + markScope = 'all' + end + elseif forIndex == 'countries' then + for clienId, clientData in pairs(mist.DBs.humansById) do + if (string.lower(clientData.country) == listData) or (forIndex == 'units' and string.lower(clientData.unitName) == listData) then + markForTable = markSpamFilter(markForTable, clientData.groupId) + end + end elseif forIndex == 'unittypes' then -- mark to group -- iterate play units for clientId, clientData in pairs(mist.DBs.humansById) do for typeId, typeData in pairs(listData) do - log:info(typeData) + --log:warn(typeData) local found = false if list == 'all' or clientData.coalition and type(clientData.coalition) == 'string' and mist.stringMatch(clientData.coalition, list) then if mist.matchString(typeData, clientData.type) then @@ -6160,61 +7631,244 @@ do end end else - markType = 'all' + markScope = 'all' end + if mType == 0 then + local data = {markId = usedId, text = text, pos = pos[1], markScope = markScope, markFor = markFor, markType = 'panel', name = name, time = timer.getTime()} + if markScope ~= 'table' then + -- create marks + + mist.DBs.markList[usedId] = data-- add to the DB + + else + if #markForTable > 0 then + --log:info('iterate') + local list = {} + if id and not name then + name = id + end + for i = 1, #markForTable do + local newId = iterate() + local data = {markId = newId, text = text, pos = pos[i], markFor = markForTable[i], markType = 'panel', name = name, readOnly = readOnly, time = timer.getTime()} + mist.DBs.markList[newId] = data + table.insert(list, data) - + draw(data) + + end + return list + end + end - - - if markType ~= 'table' then - local newId = iterate() - local data = {markId = newId, text = text, pos = pos, markType = markType, markFor = markFor} + draw(data) + + return data + elseif mType > 0 then + local newId = iterate() + local fCal = {} + fCal[#fCal+1] = mType + fCal[#fCal+1] = coa + fCal[#fCal+1] = usedId + for i = 1, #pos do + fCal[#fCal+1] = pos[i] + end + + if radius and mType == 2 then + fCal[#fCal+1] = radius + end + + if not color then + color = checkDefs('color', coa) + else + color = validateColor(color) + end + fCal[#fCal+1] = color + + + if not fillColor then + fillColor = checkDefs('fillColor', coa) + else + fillColor = validateColor(fillColor) + end + fCal[#fCal+1] = fillColor + + if mType == 5 then -- text to all + if not fontSize then + fontSize = checkDefs('fontSize', coa) or 16 + end + fCal[#fCal+1] = fontSize + else + if not lineType then + lineType = checkDefs('lineType', coa) or 2 + end + end + fCal[#fCal+1] = lineType + if not readOnly then + readOnly = true + end + fCal[#fCal+1] = readOnly + if mType == 5 then + fCal[#fCal+1] = text + else + + fCal[#fCal+1] = message + end + local data = {coa = coa, markId = usedId, pos = pos, markFor = markFor, color = color, readOnly = readOnly, message = message, fillColor = fillColor, lineType = lineType, markType = tNames[mType], name = name, radius = radius, text = text, fontSize = fontSize, time = timer.getTime()} + mist.DBs.markList[usedId] = data + + if mType == 7 or mType == 1 then + local s = "trigger.action.markupToAll(" + + for i = 1, #fCal do + --log:warn(fCal[i]) + if type(fCal[i]) == 'table' or type(fCal[i]) == 'boolean' then + s = s .. mist.utils.oneLineSerialize(fCal[i]) + else + s = s .. fCal[i] + end + if i < #fCal then + s = s .. ',' + end + end + + s = s .. ')' + if name then + usedMarks[name] = usedId + end + draw(s) + + else - -- create marks - if markType == 'coa' then - trigger.action.markToCoalition(newId, text, pos, markFor) - elseif markType == 'group' then - trigger.action.markToGroup(newId, text, pos, markFor) - else - trigger.action.markToAll(iterate(), text, pos) - end - table.insert(mist.marker.list, data) -- add to the DB - else - if #markForTable > 0 then - log:info('iterate') - for i = 1, #markForTable do - local newId = iterate() - local data = {markId = newId, text = text, pos = pos, markFor = markFor} - log:info(data) - table.insert(mist.marker.list, data) - trigger.action.markToGroup(newId, text, pos, markForTable[i]) - end - end - end - + draw(data) + + end + return data + end end function mist.marker.remove(id) - for i, data in pairs(mist.marker.list) do - if id == data.markId then - trigger.action.removeMark(id) - end - end + return removeMark(id) end function mist.marker.get(id) - + if mist.DBs.markList[id] then + return mist.DBs.markList[id] + end + local names = {} + for markId, data in pairs(mist.DBs.markList) do + if data.name and data.name == id then + table.insert(names, data) + end + end + if #names > 1 then + return names + end end - function mist.marker.coords(pos, cType, markFor, id) -- wrapper function to just display coordinates of a specific format at location - - - end - ]] + function mist.marker.drawZone(name, v) + if mist.DBs.zonesByName[name] then + --log:warn(mist.DBs.zonesByName[name]) + local vars = v or {} + local ref = mist.utils.deepCopy(mist.DBs.zonesByName[name]) + + if ref.type == 2 then -- it is a quad, but use freeform cause it isnt as bugged + vars.mType = 6 + vars.point = ref.verticies + else + vars.mType = 2 + vars.radius = ref.radius + vars.point = ref.point + end + + + if not (vars.ignoreColor and vars.ignoreColor == true) and not vars.fillColor then + vars.fillColor = ref.color + end + + --log:warn(vars) + return mist.marker.add(vars) + end + end + + function mist.marker.drawShape(name, v) + if mist.DBs.drawingByName[name] then + + local d = v or {} + local o = mist.utils.deepCopy(mist.DBs.drawingByName[name]) + mist.marker.add({point = {x = o.mapX, z = o.mapY}, text = name}) + --log:warn(o) + d.points = o.points or {} + if o.primitiveType == "Polygon" then + d.mType = 7 + + if o.polygonMode == "rect" then + d.mType = 6 + elseif o.polygonMode == "circle" then + d.mType = 2 + d.points = {x = o.mapX, y = o.mapY} + d.radius = o.radius + end + elseif o.primitiveType == "TextBox" then + d.mType = 5 + d.points = {x = o.mapX, y = o.mapY} + d.text = o.text or d.text + d.fontSize = d.fontSize or o.fontSize + end + -- NOTE TO SELF. FIGURE OUT WHICH SHAPES NEED TO BE OFFSET. OVAL YES. + + if o.fillColorString and not d.fillColor then + d.fillColor = mist.utils.hexToRGB(o.fillColorString) + end + if o.colorString then + d.color = mist.utils.hexToRGB(o.colorString) + end + + + if o.thickness == 0 then + d.lineType = 0 + elseif o.style == 'solid' then + d.lineType = 1 + elseif o.style == 'dot' then + d.lineType = 2 + elseif o.style == 'dash' then + d.lineType = 3 + else + d.lineType = 1 + end + + + if o.primitiveType == "Line" and #d.points >= 2 then + d.mType = 1 + local rtn = {} + for i = 1, #d.points -1 do + local var = mist.utils.deepCopy(d) + var.points = {} + var.points[1] = d.points[i] + var.points[2] = d.points[i+1] + table.insert(rtn, mist.marker.add(var)) + end + return rtn + else + if d.mType then + --log:warn(d) + return mist.marker.add(d) + end + end + end + + + end + + + --[[ + function mist.marker.circle(v) + + + end +]] end --- Time conversion functions. -- @section mist.time @@ -6430,6 +8084,7 @@ do -- group tasks scope mist.air = {} mist.air.fixedWing = {} mist.air.heli = {} + mist.ship = {} --- Tasks group to follow a route. -- This sets the mission task for the given group. @@ -6453,7 +8108,7 @@ do -- group tasks scope if group then local groupCon = group:getController() if groupCon then - log:warn(misTask) + --log:warn(misTask) groupCon:setTask(misTask) return true end @@ -6475,17 +8130,17 @@ do -- group tasks scope if type(coa_data) == 'table' then if coa_data.country then --there is a country table for cntry_id, cntry_data in pairs(coa_data.country) do - for obj_type_name, obj_type_data in pairs(cntry_data) do - if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" then -- only these types have points - if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then --there's a group! - for group_num, group_data in pairs(obj_type_data.group) do + for obj_cat_name, obj_cat_data in pairs(cntry_data) do + if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" then -- only these types have points + if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then --there's a group! + for group_num, group_data in pairs(obj_cat_data.group) do if group_data and group_data.groupId == gpId then -- this is the group we are looking for if group_data.route and group_data.route.points and #group_data.route.points > 0 then local points = {} for point_num, point in pairs(group_data.route.points) do local routeData = {} - if env.mission.version > 7 then + if env.mission.version > 7 and env.mission.version < 19 then routeData.name = env.getValueDictByKey(point.name) else routeData.name = point.name @@ -6515,10 +8170,10 @@ do -- group tasks scope log:error('Group route not defined in mission editor for groupId: $1', gpId) return end --if group_data and group_data.name and group_data.name == 'groupname' - end --for group_num, group_data in pairs(obj_type_data.group) do - end --if ((type(obj_type_data) == 'table') and obj_type_data.group and (type(obj_type_data.group) == 'table') and (#obj_type_data.group > 0)) then - end --if obj_type_name == "helicopter" or obj_type_name == "ship" or obj_type_name == "plane" or obj_type_name == "vehicle" or obj_type_name == "static" then - end --for obj_type_name, obj_type_data in pairs(cntry_data) do + end --for group_num, group_data in pairs(obj_cat_data.group) do + end --if ((type(obj_cat_data) == 'table') and obj_cat_data.group and (type(obj_cat_data.group) == 'table') and (#obj_cat_data.group > 0)) then + end --if obj_cat_name == "helicopter" or obj_cat_name == "ship" or obj_cat_name == "plane" or obj_cat_name == "vehicle" or obj_cat_name == "static" then + end --for obj_cat_name, obj_cat_data in pairs(cntry_data) do end --for cntry_id, cntry_data in pairs(coa_data.country) do end --if coa_data.country then --there is a country table end --if coa_name == 'red' or coa_name == 'blue' and type(coa_data) == 'table' then @@ -6822,14 +8477,19 @@ do -- group tasks scope end -- need to return a Vec3 or Vec2? - function mist.getRandPointInCircle(p, radius, innerRadius, maxA, minA) + function mist.getRandPointInCircle(p, r, innerRadius, maxA, minA) local point = mist.utils.makeVec3(p) local theta = 2*math.pi*math.random() + local radius = r or 1000 local minR = innerRadius or 0 if maxA and not minA then theta = math.rad(math.random(0, maxA - math.random())) - elseif maxA and minA and minA < maxA then - theta = math.rad(math.random(minA, maxA) - math.random()) + elseif maxA and minA then + if minA < maxA then + theta = math.rad(math.random(minA, maxA) - math.random()) + else + theta = math.rad(math.random(maxA, minA) - math.random()) + end end local rad = math.random() + math.random() if rad > 1 then @@ -6854,14 +8514,21 @@ do -- group tasks scope end function mist.getRandomPointInZone(zoneName, innerRadius, maxA, minA) - if type(zoneName) == 'string' and type(trigger.misc.getZone(zoneName)) == 'table' then - return mist.getRandPointInCircle(trigger.misc.getZone(zoneName).point, trigger.misc.getZone(zoneName).radius, innerRadius, maxA, minA) - end + if type(zoneName) == 'string' then + local zone = mist.DBs.zonesByName[zoneName] + if zone.type and zone.type == 2 then + return mist.getRandomPointInPoly(zone.verticies) + else + return mist.getRandPointInCircle(zone.point, zone.radius, innerRadius, maxA, minA) + end + end return false end function mist.getRandomPointInPoly(zone) - local avg = mist.getAvgPoint(zone) + --env.info('Zone Size: '.. #zone) + local avg = mist.getAvgPoint(zone) + --log:warn(avg) local radius = 0 local minR = math.huge local newCoord = {} @@ -6873,6 +8540,8 @@ do -- group tasks scope minR = mist.utils.get2DDist(avg, zone[i]) end end + --log:warn('Radius: $1', radius) + --log:warn('minR: $1', minR) local lSpawnPos = {} for j = 1, 100 do newCoord = mist.getRandPointInCircle(avg, radius) @@ -6886,6 +8555,19 @@ do -- group tasks scope end return newCoord end + + function mist.getWindBearingAndVel(p) + local point = mist.utils.makeVec3(o) + local gLevel = land.getHeight({x = point.x, y = point.z}) + if point.y <= gLevel then + point.y = gLevel + 10 + end + local t = atmosphere.getWind(point) + local bearing = math.tan(t.z/t.x) + local vel = math.sqrt(t.x^2 + t.z^2) + return bearing, vel + + end function mist.groupToRandomPoint(vars) local group = vars.group --Required @@ -6941,25 +8623,25 @@ do -- group tasks scope return end - function mist.groupRandomDistSelf(gpData, dist, form, heading, speed) + function mist.groupRandomDistSelf(gpData, dist, form, heading, speed, disableRoads) local pos = mist.getLeadPos(gpData) local fakeZone = {} fakeZone.radius = dist or math.random(300, 1000) fakeZone.point = {x = pos.x, y = pos.y, z = pos.z} - mist.groupToRandomZone(gpData, fakeZone, form, heading, speed) + mist.groupToRandomZone(gpData, fakeZone, form, heading, speed, disableRoads) return end - function mist.groupToRandomZone(gpData, zone, form, heading, speed) + function mist.groupToRandomZone(gpData, zone, form, heading, speed, disableRoads) if type(gpData) == 'string' then gpData = Group.getByName(gpData) end if type(zone) == 'string' then - zone = trigger.misc.getZone(zone) + zone = mist.DBs.zonesByName[zone] elseif type(zone) == 'table' and not zone.radius then - zone = trigger.misc.getZone(zone[math.random(1, #zone)]) + zone = mist.DBs.zonesByName[zone[math.random(1, #zone)]] end if speed then @@ -6973,7 +8655,7 @@ do -- group tasks scope vars.headingDegrees = heading vars.speed = speed vars.point = mist.utils.zoneToVec3(zone) - + vars.disableRoads = disableRoads mist.groupToRandomPoint(vars) return @@ -7042,7 +8724,7 @@ do -- group tasks scope function mist.groupToPoint(gpData, point, form, heading, speed, useRoads) if type(point) == 'string' then - point = trigger.misc.getZone(point) + point = mist.DBs.zonesByName[point] end if speed then speed = mist.utils.kmphToMps(speed) @@ -7081,6 +8763,16 @@ do -- group tasks scope return leader:getPosition().p end end + + function mist.groupIsDead(groupName) -- copy more or less from on station + if Group.getByName(groupName) then + local gp = Group.getByName(groupName) + if #gp:getUnits() > 0 or gp:isExist() == true then + return false + end + end + return true + end end @@ -7200,7 +8892,7 @@ do -- mist.Logger scope -- @usage -- log everything --myLogger:setLevel(3) function mist.Logger:setLevel(level) - if not level then + if not level then self.level = 2 else if type(level) == 'string' then