Build 101. Bug fixes mostly

Changed mist.marker.list to mist.DBs.markList
Added markType and type as valid in mist.marker.add for the type Id
Added mist.groupIsDead function
Removed a log entry I left in.
Updated DB examples.
This commit is contained in:
mrSkortch 2021-08-23 03:27:26 -06:00
parent d9130cb57a
commit 388d218b4e
28 changed files with 6738 additions and 5843 deletions

View File

@ -382,11 +382,17 @@ MEgroupsById =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #1_unit", ["unitName"] = "A-10C Client #1_unit",
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
["groupId"] = 6, ["groupId"] = 6,
["groupName"] = "A-10C Client #1", ["groupName"] = "A-10C Client #1",
["skill"] = "Client",
["coalition"] = "blue",
["x"] = -318142.85714286,
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -394,13 +400,10 @@ MEgroupsById =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -318142.85714286,
["skill"] = "Client",
["heading"] = -0.67060113146646, ["heading"] = -0.67060113146646,
["unitId"] = 11, ["unitId"] = 11,
["y"] = 636428.57142857, ["y"] = 636428.57142857,
["coalition"] = "blue", ["countryId"] = 2,
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
@ -435,11 +438,17 @@ MEgroupsById =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #2_unit", ["unitName"] = "A-10C Client #2_unit",
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
["groupId"] = 7, ["groupId"] = 7,
["groupName"] = "A-10C Client #2", ["groupName"] = "A-10C Client #2",
["skill"] = "Client",
["coalition"] = "blue",
["x"] = -315857.14285714,
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -447,13 +456,10 @@ MEgroupsById =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -315857.14285714,
["skill"] = "Client",
["heading"] = -0.66079849060746, ["heading"] = -0.66079849060746,
["unitId"] = 12, ["unitId"] = 12,
["y"] = 644428.57142857, ["y"] = 644428.57142857,
["coalition"] = "blue", ["countryId"] = 2,
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
@ -1899,8 +1905,8 @@ MEgroupsById =
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
{ {
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "Australia RAAF", ["livery_id"] = "Australia RAAF",
@ -1909,7 +1915,7 @@ MEgroupsById =
["unitName"] = "Rotary-1-1", ["unitName"] = "Rotary-1-1",
["type"] = "CH-47D", ["type"] = "CH-47D",
["country"] = "australia", ["country"] = "australia",
["psi"] = -2.6461357622286, ["psi"] = -2.6021711998766,
["groupId"] = 45, ["groupId"] = 45,
["groupName"] = "nH", ["groupName"] = "nH",
["callsign"] = ["callsign"] =
@ -1920,11 +1926,11 @@ MEgroupsById =
["name"] = "Springfield11", ["name"] = "Springfield11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 21, ["countryId"] = 21,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
["skill"] = "High", ["skill"] = "High",
["heading"] = 2.6461357622286, ["heading"] = 2.6021711998766,
["unitId"] = 68, ["unitId"] = 68,
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["coalition"] = "neutral", ["coalition"] = "neutral",
["speed"] = 44.444444444444, ["speed"] = 44.444444444444,
}, -- end of [1] }, -- end of [1]
@ -1938,6 +1944,43 @@ MEgroupsById =
["task"] = "Transport", ["task"] = "Transport",
["uncontrolled"] = false, ["uncontrolled"] = false,
}, -- end of [45] }, -- 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] = [34] =
{ {
["modulation"] = 0, ["modulation"] = 0,

View File

@ -259,40 +259,62 @@ MEgroupsByName =
["task"] = "Ground Nothing", ["task"] = "Ground Nothing",
["groupId"] = 35, ["groupId"] = 35,
}, -- end of ["teleGroup"] }, -- end of ["teleGroup"]
["Static Cafe-1"] = ["A-10C Client #1"] =
{ {
["coalition"] = "neutral", ["modulation"] = 0,
["country"] = "australia", ["groupId"] = 6,
["groupId"] = 46, ["frequency"] = 251,
["countryId"] = 21, ["country"] = "usa",
["category"] = "static", ["groupName"] = "A-10C Client #1",
["groupName"] = "Static Cafe-1",
["units"] = ["units"] =
{ {
[1] = [1] =
{ {
["shape_name"] = "stolovaya", ["alt"] = 2000,
["type"] = "Cafe",
["point"] = ["point"] =
{ {
["y"] = 464123.689023, ["y"] = 636428.57142857,
["x"] = -115514.59796101, ["x"] = -318142.85714286,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Fortifications", ["alt_type"] = "BARO",
["country"] = "australia", ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)",
["groupName"] = "Static Cafe-1", ["onboard_num"] = "52",
["heading"] = 0, ["category"] = "plane",
["y"] = 464123.689023, ["unitName"] = "A-10C Client #1_unit",
["x"] = -115514.59796101, ["AddPropAircraft"] =
["unitId"] = 69, {
["category"] = "static", }, -- end of ["AddPropAircraft"]
["unitName"] = "Static Cafe-1", ["type"] = "A-10C",
["groupId"] = 46, ["country"] = "usa",
["countryId"] = 21, ["psi"] = 0.67060113146646,
["coalition"] = "neutral", ["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 [1]
}, -- end of ["units"] }, -- 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"] = ["cloneNeut"] =
{ {
["modulation"] = 0, ["modulation"] = 0,
@ -524,6 +546,43 @@ MEgroupsByName =
["countryId"] = 21, ["countryId"] = 21,
["hidden"] = false, ["hidden"] = false,
}, -- end of ["perry"] }, -- 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"] = ["nH"] =
{ {
["modulation"] = 0, ["modulation"] = 0,
@ -538,8 +597,8 @@ MEgroupsByName =
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
{ {
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "Australia RAAF", ["livery_id"] = "Australia RAAF",
@ -548,7 +607,7 @@ MEgroupsByName =
["unitName"] = "Rotary-1-1", ["unitName"] = "Rotary-1-1",
["type"] = "CH-47D", ["type"] = "CH-47D",
["country"] = "australia", ["country"] = "australia",
["psi"] = -2.6461357622286, ["psi"] = -2.6021711998766,
["groupId"] = 45, ["groupId"] = 45,
["groupName"] = "nH", ["groupName"] = "nH",
["callsign"] = ["callsign"] =
@ -559,11 +618,11 @@ MEgroupsByName =
["name"] = "Springfield11", ["name"] = "Springfield11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 21, ["countryId"] = 21,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
["skill"] = "High", ["skill"] = "High",
["heading"] = 2.6461357622286, ["heading"] = 2.6021711998766,
["unitId"] = 68, ["unitId"] = 68,
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["coalition"] = "neutral", ["coalition"] = "neutral",
["speed"] = 44.444444444444, ["speed"] = 44.444444444444,
}, -- end of [1] }, -- end of [1]
@ -1525,59 +1584,6 @@ MEgroupsByName =
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of ["tent #001"] }, -- 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"] = ["RuTent2"] =
{ {
["coalition"] = "red", ["coalition"] = "red",
@ -1612,6 +1618,62 @@ MEgroupsByName =
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of ["RuTent2"] }, -- 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"] = ["Rus Ships #1"] =
{ {
["groupId"] = 9, ["groupId"] = 9,
@ -1668,6 +1730,40 @@ MEgroupsByName =
["countryId"] = 0, ["countryId"] = 0,
["hidden"] = false, ["hidden"] = false,
}, -- end of ["Rus Ships #1"] }, -- 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"] = ["F-15C Client #2"] =
{ {
["modulation"] = 0, ["modulation"] = 0,
@ -1755,59 +1851,6 @@ MEgroupsByName =
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of ["tent"] }, -- 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"] = ["USTanks1"] =
{ {
["country"] = "usa", ["country"] = "usa",
@ -1911,39 +1954,6 @@ MEgroupsByName =
["task"] = "Ground Nothing", ["task"] = "Ground Nothing",
["groupId"] = 11, ["groupId"] = 11,
}, -- end of ["USTanks1"] }, -- 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"] = ["tent2"] =
{ {
["coalition"] = "blue", ["coalition"] = "blue",
@ -1978,6 +1988,39 @@ MEgroupsByName =
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of ["tent2"] }, -- 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"] = ["RuTanks"] =
{ {
["country"] = "russia", ["country"] = "russia",

View File

@ -60,8 +60,8 @@ MEunits =
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
{ {
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "Australia RAAF", ["livery_id"] = "Australia RAAF",
@ -70,15 +70,15 @@ MEunits =
["speed"] = 44.444444444444, ["speed"] = 44.444444444444,
["type"] = "CH-47D", ["type"] = "CH-47D",
["country"] = "australia", ["country"] = "australia",
["psi"] = -2.6461357622286, ["psi"] = -2.6021711998766,
["unitName"] = "Rotary-1-1", ["unitName"] = "Rotary-1-1",
["groupName"] = "nH", ["groupName"] = "nH",
["coalition"] = "neutral", ["coalition"] = "neutral",
["countryId"] = 21, ["countryId"] = 21,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["unitId"] = 68, ["unitId"] = 68,
["heading"] = 2.6461357622286, ["heading"] = 2.6021711998766,
["skill"] = "High", ["skill"] = "High",
["callsign"] = ["callsign"] =
{ {
@ -829,6 +829,43 @@ MEunits =
["task"] = "Ground Nothing", ["task"] = "Ground Nothing",
["hidden"] = false, ["hidden"] = false,
}, -- end of [4] }, -- 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"] }, -- end of ["vehicle"]
["plane"] = ["plane"] =
{ {
@ -960,6 +997,9 @@ MEunits =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
@ -971,7 +1011,6 @@ MEunits =
["y"] = 636428.57142857, ["y"] = 636428.57142857,
["unitId"] = 11, ["unitId"] = 11,
["heading"] = -0.67060113146646, ["heading"] = -0.67060113146646,
["skill"] = "Client",
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -979,6 +1018,7 @@ MEunits =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["skill"] = "Client",
["groupId"] = 6, ["groupId"] = 6,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
@ -1013,6 +1053,9 @@ MEunits =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
@ -1024,7 +1067,6 @@ MEunits =
["y"] = 644428.57142857, ["y"] = 644428.57142857,
["unitId"] = 12, ["unitId"] = 12,
["heading"] = -0.66079849060746, ["heading"] = -0.66079849060746,
["skill"] = "Client",
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -1032,6 +1074,7 @@ MEunits =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["skill"] = "Client",
["groupId"] = 7, ["groupId"] = 7,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]

View File

@ -7,8 +7,8 @@ MEunitsByCat =
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
{ {
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "Australia RAAF", ["livery_id"] = "Australia RAAF",
@ -17,7 +17,7 @@ MEunitsByCat =
["unitName"] = "Rotary-1-1", ["unitName"] = "Rotary-1-1",
["type"] = "CH-47D", ["type"] = "CH-47D",
["country"] = "australia", ["country"] = "australia",
["psi"] = -2.6461357622286, ["psi"] = -2.6021711998766,
["groupId"] = 45, ["groupId"] = 45,
["groupName"] = "nH", ["groupName"] = "nH",
["callsign"] = ["callsign"] =
@ -28,11 +28,11 @@ MEunitsByCat =
["name"] = "Springfield11", ["name"] = "Springfield11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 21, ["countryId"] = 21,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
["skill"] = "High", ["skill"] = "High",
["heading"] = 2.6461357622286, ["heading"] = 2.6021711998766,
["unitId"] = 68, ["unitId"] = 68,
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["coalition"] = "neutral", ["coalition"] = "neutral",
["speed"] = 44.444444444444, ["speed"] = 44.444444444444,
}, -- end of [1] }, -- end of [1]
@ -814,11 +814,17 @@ MEunitsByCat =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #1_unit", ["unitName"] = "A-10C Client #1_unit",
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
["groupId"] = 6, ["groupId"] = 6,
["groupName"] = "A-10C Client #1", ["groupName"] = "A-10C Client #1",
["skill"] = "Client",
["coalition"] = "blue",
["x"] = -318142.85714286,
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -826,13 +832,10 @@ MEunitsByCat =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -318142.85714286,
["skill"] = "Client",
["heading"] = -0.67060113146646, ["heading"] = -0.67060113146646,
["unitId"] = 11, ["unitId"] = 11,
["y"] = 636428.57142857, ["y"] = 636428.57142857,
["coalition"] = "blue", ["countryId"] = 2,
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [4] }, -- end of [4]
[5] = [5] =
@ -848,11 +851,17 @@ MEunitsByCat =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #2_unit", ["unitName"] = "A-10C Client #2_unit",
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
["groupId"] = 7, ["groupId"] = 7,
["groupName"] = "A-10C Client #2", ["groupName"] = "A-10C Client #2",
["skill"] = "Client",
["coalition"] = "blue",
["x"] = -315857.14285714,
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -860,13 +869,10 @@ MEunitsByCat =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -315857.14285714,
["skill"] = "Client",
["heading"] = -0.66079849060746, ["heading"] = -0.66079849060746,
["unitId"] = 12, ["unitId"] = 12,
["y"] = 644428.57142857, ["y"] = 644428.57142857,
["coalition"] = "blue", ["countryId"] = 2,
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [5] }, -- end of [5]
[6] = [6] =
@ -1422,6 +1428,28 @@ MEunitsByCat =
["countryId"] = 2, ["countryId"] = 2,
}, -- end of [18] }, -- end of [18]
[19] = [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", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1442,8 +1470,8 @@ MEunitsByCat =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [19] }, -- end of [20]
[20] = [21] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1464,8 +1492,8 @@ MEunitsByCat =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [20] }, -- end of [21]
[21] = [22] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1486,8 +1514,8 @@ MEunitsByCat =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [21] }, -- end of [22]
[22] = [23] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1508,8 +1536,8 @@ MEunitsByCat =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [22] }, -- end of [23]
[23] = [24] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1530,8 +1558,8 @@ MEunitsByCat =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [23] }, -- end of [24]
[24] = [25] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1552,8 +1580,8 @@ MEunitsByCat =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [24] }, -- end of [25]
[25] = [26] =
{ {
["type"] = "T-55", ["type"] = "T-55",
["point"] = ["point"] =
@ -1574,8 +1602,8 @@ MEunitsByCat =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = 0, ["heading"] = 0,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [25] }, -- end of [26]
[26] = [27] =
{ {
["type"] = "T-55", ["type"] = "T-55",
["point"] = ["point"] =
@ -1596,8 +1624,8 @@ MEunitsByCat =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = 0, ["heading"] = 0,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [26] }, -- end of [27]
[27] = [28] =
{ {
["type"] = "T-55", ["type"] = "T-55",
["point"] = ["point"] =
@ -1618,8 +1646,8 @@ MEunitsByCat =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = 0, ["heading"] = 0,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [27] }, -- end of [28]
[28] = [29] =
{ {
["type"] = "T-55", ["type"] = "T-55",
["point"] = ["point"] =
@ -1640,6 +1668,6 @@ MEunitsByCat =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = 0, ["heading"] = 0,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [28] }, -- end of [29]
}, -- end of ["vehicle"] }, -- end of ["vehicle"]
} -- end of MEunitsByCat } -- end of MEunitsByCat

View File

@ -278,11 +278,17 @@ MEunitsById =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #1_unit", ["unitName"] = "A-10C Client #1_unit",
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
["groupId"] = 6, ["groupId"] = 6,
["groupName"] = "A-10C Client #1", ["groupName"] = "A-10C Client #1",
["skill"] = "Client",
["coalition"] = "blue",
["x"] = -318142.85714286,
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -290,13 +296,10 @@ MEunitsById =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -318142.85714286,
["skill"] = "Client",
["heading"] = -0.67060113146646, ["heading"] = -0.67060113146646,
["unitId"] = 11, ["unitId"] = 11,
["y"] = 636428.57142857, ["y"] = 636428.57142857,
["coalition"] = "blue", ["countryId"] = 2,
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [11] }, -- end of [11]
[12] = [12] =
@ -312,11 +315,17 @@ MEunitsById =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #2_unit", ["unitName"] = "A-10C Client #2_unit",
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
["groupId"] = 7, ["groupId"] = 7,
["groupName"] = "A-10C Client #2", ["groupName"] = "A-10C Client #2",
["skill"] = "Client",
["coalition"] = "blue",
["x"] = -315857.14285714,
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -324,13 +333,10 @@ MEunitsById =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -315857.14285714,
["skill"] = "Client",
["heading"] = -0.66079849060746, ["heading"] = -0.66079849060746,
["unitId"] = 12, ["unitId"] = 12,
["y"] = 644428.57142857, ["y"] = 644428.57142857,
["coalition"] = "blue", ["countryId"] = 2,
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [12] }, -- end of [12]
[13] = [13] =
@ -1576,8 +1582,8 @@ MEunitsById =
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
{ {
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "Australia RAAF", ["livery_id"] = "Australia RAAF",
@ -1586,7 +1592,7 @@ MEunitsById =
["unitName"] = "Rotary-1-1", ["unitName"] = "Rotary-1-1",
["type"] = "CH-47D", ["type"] = "CH-47D",
["country"] = "australia", ["country"] = "australia",
["psi"] = -2.6461357622286, ["psi"] = -2.6021711998766,
["groupId"] = 45, ["groupId"] = 45,
["groupName"] = "nH", ["groupName"] = "nH",
["callsign"] = ["callsign"] =
@ -1597,11 +1603,11 @@ MEunitsById =
["name"] = "Springfield11", ["name"] = "Springfield11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 21, ["countryId"] = 21,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
["skill"] = "High", ["skill"] = "High",
["heading"] = 2.6461357622286, ["heading"] = 2.6021711998766,
["unitId"] = 68, ["unitId"] = 68,
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["coalition"] = "neutral", ["coalition"] = "neutral",
["speed"] = 44.444444444444, ["speed"] = 44.444444444444,
}, -- end of [68] }, -- end of [68]
@ -1627,4 +1633,26 @@ MEunitsById =
["countryId"] = 21, ["countryId"] = 21,
["coalition"] = "neutral", ["coalition"] = "neutral",
}, -- end of [69] }, -- 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 } -- end of MEunitsById

View File

@ -141,6 +141,12 @@ MEunitsByName =
["type"] = "Cafe", ["type"] = "Cafe",
["point"] = ["point"] =
{ {
[1] =
{
["y"] = 0,
["x"] = -115514.59796101,
["z"] = 464123.689023,
}, -- end of [1]
["y"] = 464123.689023, ["y"] = 464123.689023,
["x"] = -115514.59796101, ["x"] = -115514.59796101,
}, -- end of ["point"] }, -- end of ["point"]
@ -414,11 +420,17 @@ MEunitsByName =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #2_unit", ["unitName"] = "A-10C Client #2_unit",
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
["groupId"] = 7, ["groupId"] = 7,
["groupName"] = "A-10C Client #2", ["groupName"] = "A-10C Client #2",
["skill"] = "Client",
["coalition"] = "blue",
["x"] = -315857.14285714,
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -426,13 +438,10 @@ MEunitsByName =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -315857.14285714,
["skill"] = "Client",
["heading"] = -0.66079849060746, ["heading"] = -0.66079849060746,
["unitId"] = 12, ["unitId"] = 12,
["y"] = 644428.57142857, ["y"] = 644428.57142857,
["coalition"] = "blue", ["countryId"] = 2,
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of ["A-10C Client #2_unit"] }, -- end of ["A-10C Client #2_unit"]
["USTanks1_3"] = ["USTanks1_3"] =
@ -457,28 +466,28 @@ MEunitsByName =
["heading"] = 0, ["heading"] = 0,
["countryId"] = 2, ["countryId"] = 2,
}, -- end of ["USTanks1_3"] }, -- end of ["USTanks1_3"]
["static_on_ship1 #001"] = ["RuTent2"] =
{ {
["heading"] = 0, ["shape_name"] = "PalatkaB",
["type"] = "FARP Tent",
["point"] = ["point"] =
{ {
["y"] = 443849.03844635, ["y"] = 617319.42857142,
["x"] = -355322.27295572, ["x"] = -259804,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["categoryStatic"] = "Fortifications",
["groupId"] = 41, ["country"] = "russia",
["livery_id"] = "USA Marines", ["groupName"] = "RuTent2",
["groupName"] = "static_on_ship1 #001", ["heading"] = 0,
["country"] = "usa", ["y"] = 617319.42857142,
["coalition"] = "blue", ["x"] = -259804,
["x"] = -355322.27295572, ["unitId"] = 41,
["type"] = "AH-1W",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1 #001", ["unitName"] = "RuTent2",
["unitId"] = 64, ["groupId"] = 19,
["y"] = 443849.03844635, ["countryId"] = 0,
["countryId"] = 2, ["coalition"] = "red",
}, -- end of ["static_on_ship1 #001"] }, -- end of ["RuTent2"]
["Unit #006"] = ["Unit #006"] =
{ {
["type"] = "Hawk ln", ["type"] = "Hawk ln",
@ -501,28 +510,28 @@ MEunitsByName =
["heading"] = 0, ["heading"] = 0,
["countryId"] = 2, ["countryId"] = 2,
}, -- end of ["Unit #006"] }, -- end of ["Unit #006"]
["Naval-1-1"] = ["static_on_ship1"] =
{ {
["type"] = "PERRY", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 342754.30716193, ["y"] = 443856.28948724,
["x"] = -153426.17965693, ["x"] = -355322.45423175,
}, -- end of ["point"] }, -- end of ["point"]
["groupId"] = 44, ["categoryStatic"] = "Helicopters",
["groupName"] = "perry", ["groupId"] = 40,
["livery_id"] = "ReubenJames", ["livery_id"] = "USA Marines",
["skill"] = "Average", ["groupName"] = "static_on_ship1",
["country"] = "australia", ["country"] = "usa",
["coalition"] = "neutral", ["coalition"] = "blue",
["x"] = -153426.17965693, ["x"] = -355322.45423175,
["heading"] = 0, ["type"] = "AH-1W",
["category"] = "ship", ["category"] = "static",
["unitName"] = "Naval-1-1", ["unitName"] = "static_on_ship1",
["unitId"] = 67, ["unitId"] = 63,
["y"] = 342754.30716193, ["y"] = 443856.28948724,
["countryId"] = 21, ["countryId"] = 2,
}, -- end of ["Naval-1-1"] }, -- end of ["static_on_ship1"]
["tent"] = ["tent"] =
{ {
["shape_name"] = "PalatkaB", ["shape_name"] = "PalatkaB",
@ -685,11 +694,17 @@ MEunitsByName =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #1_unit", ["unitName"] = "A-10C Client #1_unit",
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
["groupId"] = 6, ["groupId"] = 6,
["groupName"] = "A-10C Client #1", ["groupName"] = "A-10C Client #1",
["skill"] = "Client",
["coalition"] = "blue",
["x"] = -318142.85714286,
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -697,13 +712,10 @@ MEunitsByName =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -318142.85714286,
["skill"] = "Client",
["heading"] = -0.67060113146646, ["heading"] = -0.67060113146646,
["unitId"] = 11, ["unitId"] = 11,
["y"] = 636428.57142857, ["y"] = 636428.57142857,
["coalition"] = "blue", ["countryId"] = 2,
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of ["A-10C Client #1_unit"] }, -- end of ["A-10C Client #1_unit"]
["Su-33 Client #2Unit"] = ["Su-33 Client #2Unit"] =
@ -950,50 +962,70 @@ MEunitsByName =
["y"] = 684605.71428571, ["y"] = 684605.71428571,
["countryId"] = 2, ["countryId"] = 2,
}, -- end of ["static"] }, -- end of ["static"]
["Unit #008"] = ["tent #001"] =
{ {
["type"] = "Hawk cwar", ["shape_name"] = "teplowoz",
["type"] = "Locomotive",
["point"] = ["point"] =
{ {
["y"] = 681535.14285714, ["y"] = 652535.98623348,
["x"] = -287156.85714286, ["x"] = -295992.90575084,
}, -- end of ["point"] }, -- end of ["point"]
["groupId"] = 35, ["groupId"] = 38,
["skill"] = "Average", ["groupName"] = "tent #001",
["country"] = "usa", ["unitId"] = 61,
["groupName"] = "teleGroup", ["countryId"] = 0,
["y"] = 681535.14285714, ["x"] = -295992.90575084,
["coalition"] = "blue",
["x"] = -287156.85714286,
["unitId"] = 58,
["category"] = "vehicle",
["unitName"] = "Unit #008",
["playerCanDrive"] = true,
["heading"] = 0, ["heading"] = 0,
["countryId"] = 2, ["category"] = "static",
}, -- end of ["Unit #008"] ["unitName"] = "tent #001",
["USTanks1_2"] = ["country"] = "russia",
["y"] = 652535.98623348,
["coalition"] = "red",
}, -- end of ["tent #001"]
["Aerial-1-1"] =
{ {
["type"] = "M-1 Abrams", ["alt"] = 2000,
["point"] = ["point"] =
{ {
["y"] = 639840, [1] =
["x"] = -294725.71428571, {
["y"] = 0,
["x"] = -198551.02959497,
["z"] = 319582.08692347,
}, -- end of [1]
["y"] = 319582.08692347,
["x"] = -198551.02959497,
}, -- end of ["point"] }, -- end of ["point"]
["groupId"] = 11, ["alt_type"] = "BARO",
["skill"] = "Average", ["livery_id"] = "Australian 75th Squadron",
["country"] = "usa", ["onboard_num"] = "010",
["groupName"] = "USTanks1", ["category"] = "plane",
["y"] = 639840, ["unitName"] = "Aerial-1-1",
["coalition"] = "blue", ["AddPropAircraft"] =
["x"] = -294725.71428571, {
["unitId"] = 20, }, -- end of ["AddPropAircraft"]
["category"] = "vehicle", ["type"] = "FA-18C_hornet",
["unitName"] = "USTanks1_2", ["country"] = "australia",
["playerCanDrive"] = true, ["psi"] = -2.1995926132104,
["heading"] = 0, ["groupId"] = 42,
["countryId"] = 2, ["groupName"] = "cloneNeut",
}, -- end of ["USTanks1_2"] ["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"] = ["Pilot #001"] =
{ {
["alt"] = 2000, ["alt"] = 2000,
@ -1169,6 +1201,12 @@ MEunitsByName =
["type"] = "M-113", ["type"] = "M-113",
["point"] = ["point"] =
{ {
[1] =
{
["y"] = 0,
["x"] = -146108.63642373,
["z"] = 445199.91242668,
}, -- end of [1]
["y"] = 445199.91242668, ["y"] = 445199.91242668,
["x"] = -146108.63642373, ["x"] = -146108.63642373,
}, -- end of ["point"] }, -- end of ["point"]
@ -1186,6 +1224,28 @@ MEunitsByName =
["heading"] = 0, ["heading"] = 0,
["countryId"] = 21, ["countryId"] = 21,
}, -- end of ["Ground-1-1"] }, -- end of ["Ground-1-1"]
["static_on_ship1 #001"] =
{
["heading"] = 0,
["point"] =
{
["y"] = 443849.03844635,
["x"] = -355322.27295572,
}, -- 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",
["category"] = "static",
["unitName"] = "static_on_ship1 #001",
["unitId"] = 64,
["y"] = 443849.03844635,
["countryId"] = 2,
}, -- end of ["static_on_ship1 #001"]
["RuTent1"] = ["RuTent1"] =
{ {
["shape_name"] = "PalatkaB", ["shape_name"] = "PalatkaB",
@ -1208,50 +1268,6 @@ MEunitsByName =
["countryId"] = 0, ["countryId"] = 0,
["coalition"] = "red", ["coalition"] = "red",
}, -- end of ["RuTent1"] }, -- 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"] = ["RuBTRs4"] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
@ -1274,6 +1290,49 @@ MEunitsByName =
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of ["RuBTRs4"] }, -- 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"] = ["Mi-8s_1_1"] =
{ {
["alt"] = 500, ["alt"] = 500,
@ -1310,49 +1369,28 @@ MEunitsByName =
["countryId"] = 0, ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of ["Mi-8s_1_1"] }, -- end of ["Mi-8s_1_1"]
["RuTanks1"] = ["Ground-2-1"] =
{ {
["type"] = "T-55", ["type"] = "AAV7",
["point"] = ["point"] =
{ {
["y"] = 628677.14285714, ["y"] = 185783.38833846,
["x"] = -273442.85714286, ["x"] = -244729.2581753,
}, -- end of ["point"] }, -- end of ["point"]
["groupId"] = 14, ["groupId"] = 47,
["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",
["skill"] = "Average", ["skill"] = "Average",
["country"] = "russia", ["country"] = "usa",
["coalition"] = "red", ["groupName"] = "poly",
["x"] = -87228.571428571, ["y"] = 185783.38833846,
["heading"] = 1.1755995276042, ["coalition"] = "blue",
["category"] = "ship", ["x"] = -244729.2581753,
["unitName"] = "2ship2", ["unitId"] = 70,
["unitId"] = 18, ["category"] = "vehicle",
["y"] = 74371.428571428, ["unitName"] = "Ground-2-1",
["countryId"] = 0, ["playerCanDrive"] = true,
}, -- end of ["2ship2"] ["heading"] = 2.3261877017598,
["countryId"] = 2,
}, -- end of ["Ground-2-1"]
["Unit #003"] = ["Unit #003"] =
{ {
["type"] = "Hawk sr", ["type"] = "Hawk sr",
@ -1375,6 +1413,28 @@ MEunitsByName =
["heading"] = 0, ["heading"] = 0,
["countryId"] = 2, ["countryId"] = 2,
}, -- end of ["Unit #003"] }, -- 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"] = ["2ship1"] =
{ {
["type"] = "MOSCOW", ["type"] = "MOSCOW",
@ -1424,93 +1484,85 @@ MEunitsByName =
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of ["Su-33 Client #1Unit"] }, -- end of ["Su-33 Client #1Unit"]
["RuBTRs6"] = ["RuTanks1"] =
{ {
["type"] = "BTR-80", ["type"] = "T-55",
["point"] = ["point"] =
{ {
["y"] = 654745.71428571, ["y"] = 628677.14285714,
["x"] = -293042.85714286, ["x"] = -273442.85714286,
}, -- end of ["point"] }, -- end of ["point"]
["groupId"] = 13, ["groupId"] = 14,
["skill"] = "Average", ["skill"] = "Excellent",
["country"] = "russia", ["country"] = "russia",
["groupName"] = "RuBTRs", ["groupName"] = "RuTanks",
["y"] = 654745.71428571, ["y"] = 628677.14285714,
["coalition"] = "red", ["coalition"] = "red",
["x"] = -293042.85714286, ["x"] = -273442.85714286,
["unitId"] = 32, ["unitId"] = 33,
["category"] = "vehicle", ["category"] = "vehicle",
["unitName"] = "RuBTRs6", ["unitName"] = "RuTanks1",
["playerCanDrive"] = true, ["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, ["heading"] = 0,
["category"] = "static", ["countryId"] = 0,
["unitName"] = "tent #001", }, -- end of ["RuTanks1"]
["country"] = "russia", ["Unit #008"] =
["y"] = 652535.98623348, {
["coalition"] = "red", ["type"] = "Hawk cwar",
}, -- end of ["tent #001"] ["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"] = ["Rotary-1-1"] =
{ {
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
{ {
["y"] = 405888.85058741, [1] =
["x"] = -155967.80633993, {
["y"] = 0,
["x"] = -158700.87914814,
["z"] = 404406.46136648,
}, -- end of [1]
["y"] = 404406.46136648,
["x"] = -158700.87914814,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "Australia RAAF", ["livery_id"] = "Australia RAAF",
@ -1519,7 +1571,7 @@ MEunitsByName =
["unitName"] = "Rotary-1-1", ["unitName"] = "Rotary-1-1",
["type"] = "CH-47D", ["type"] = "CH-47D",
["country"] = "australia", ["country"] = "australia",
["psi"] = -2.6461357622286, ["psi"] = -2.6021711998766,
["groupId"] = 45, ["groupId"] = 45,
["groupName"] = "nH", ["groupName"] = "nH",
["callsign"] = ["callsign"] =
@ -1530,36 +1582,64 @@ MEunitsByName =
["name"] = "Springfield11", ["name"] = "Springfield11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 21, ["countryId"] = 21,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
["skill"] = "High", ["skill"] = "High",
["heading"] = 2.6461357622286, ["heading"] = 2.6021711998766,
["unitId"] = 68, ["unitId"] = 68,
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["coalition"] = "neutral", ["coalition"] = "neutral",
["speed"] = 44.444444444444, ["speed"] = 44.444444444444,
}, -- end of ["Rotary-1-1"] }, -- end of ["Rotary-1-1"]
["static_on_ship1"] = ["RuBTRs1"] =
{ {
["heading"] = 0, ["type"] = "BTR-80",
["point"] = ["point"] =
{ {
["y"] = 443856.28948724, ["y"] = 654545.71428571,
["x"] = -355322.45423175, ["x"] = -292842.85714286,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["groupId"] = 13,
["groupId"] = 40, ["skill"] = "Average",
["livery_id"] = "USA Marines", ["country"] = "russia",
["groupName"] = "static_on_ship1", ["groupName"] = "RuBTRs",
["country"] = "usa", ["y"] = 654545.71428571,
["coalition"] = "blue", ["coalition"] = "red",
["x"] = -355322.45423175, ["x"] = -292842.85714286,
["type"] = "AH-1W", ["unitId"] = 27,
["category"] = "static", ["category"] = "vehicle",
["unitName"] = "static_on_ship1", ["unitName"] = "RuBTRs1",
["unitId"] = 63, ["playerCanDrive"] = true,
["y"] = 443856.28948724, ["heading"] = -1.7994767003775,
["countryId"] = 2, ["countryId"] = 0,
}, -- end of ["static_on_ship1"] }, -- 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"] = ["cargoBob"] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
@ -1605,26 +1685,4 @@ MEunitsByName =
["heading"] = 1.4977557614926, ["heading"] = 1.4977557614926,
["countryId"] = 2, ["countryId"] = 2,
}, -- end of ["USTanks2_4"] }, -- 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 } -- end of MEunitsByName

View File

@ -108,8 +108,8 @@ MEunitsByNum =
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
{ {
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "Australia RAAF", ["livery_id"] = "Australia RAAF",
@ -118,7 +118,7 @@ MEunitsByNum =
["unitName"] = "Rotary-1-1", ["unitName"] = "Rotary-1-1",
["type"] = "CH-47D", ["type"] = "CH-47D",
["country"] = "australia", ["country"] = "australia",
["psi"] = -2.6461357622286, ["psi"] = -2.6021711998766,
["groupId"] = 45, ["groupId"] = 45,
["groupName"] = "nH", ["groupName"] = "nH",
["callsign"] = ["callsign"] =
@ -129,11 +129,11 @@ MEunitsByNum =
["name"] = "Springfield11", ["name"] = "Springfield11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 21, ["countryId"] = 21,
["x"] = -155967.80633993, ["x"] = -158700.87914814,
["skill"] = "High", ["skill"] = "High",
["heading"] = 2.6461357622286, ["heading"] = 2.6021711998766,
["unitId"] = 68, ["unitId"] = 68,
["y"] = 405888.85058741, ["y"] = 404406.46136648,
["coalition"] = "neutral", ["coalition"] = "neutral",
["speed"] = 44.444444444444, ["speed"] = 44.444444444444,
}, -- end of [5] }, -- end of [5]
@ -709,6 +709,28 @@ MEunitsByNum =
["countryId"] = 2, ["countryId"] = 2,
}, -- end of [31] }, -- end of [31]
[32] = [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, ["alt"] = 2000,
["point"] = ["point"] =
@ -741,8 +763,8 @@ MEunitsByNum =
["y"] = 662142.85714286, ["y"] = 662142.85714286,
["coalition"] = "blue", ["coalition"] = "blue",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [32] }, -- end of [33]
[33] = [34] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
@ -775,8 +797,8 @@ MEunitsByNum =
["y"] = 668428.57142857, ["y"] = 668428.57142857,
["coalition"] = "blue", ["coalition"] = "blue",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [33] }, -- end of [34]
[34] = [35] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
@ -789,11 +811,17 @@ MEunitsByNum =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #1_unit", ["unitName"] = "A-10C Client #1_unit",
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
["groupId"] = 6, ["groupId"] = 6,
["groupName"] = "A-10C Client #1", ["groupName"] = "A-10C Client #1",
["skill"] = "Client",
["coalition"] = "blue",
["x"] = -318142.85714286,
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -801,16 +829,13 @@ MEunitsByNum =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -318142.85714286,
["skill"] = "Client",
["heading"] = -0.67060113146646, ["heading"] = -0.67060113146646,
["unitId"] = 11, ["unitId"] = 11,
["y"] = 636428.57142857, ["y"] = 636428.57142857,
["coalition"] = "blue", ["countryId"] = 2,
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [34] }, -- end of [35]
[35] = [36] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
@ -823,11 +848,17 @@ MEunitsByNum =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #2_unit", ["unitName"] = "A-10C Client #2_unit",
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
["groupId"] = 7, ["groupId"] = 7,
["groupName"] = "A-10C Client #2", ["groupName"] = "A-10C Client #2",
["skill"] = "Client",
["coalition"] = "blue",
["x"] = -315857.14285714,
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -835,16 +866,13 @@ MEunitsByNum =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -315857.14285714,
["skill"] = "Client",
["heading"] = -0.66079849060746, ["heading"] = -0.66079849060746,
["unitId"] = 12, ["unitId"] = 12,
["y"] = 644428.57142857, ["y"] = 644428.57142857,
["coalition"] = "blue", ["countryId"] = 2,
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [35] }, -- end of [36]
[36] = [37] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
@ -877,8 +905,8 @@ MEunitsByNum =
["y"] = 682714.28571429, ["y"] = 682714.28571429,
["coalition"] = "blue", ["coalition"] = "blue",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [36] }, -- end of [37]
[37] = [38] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["hardpoint_racks"] = true, ["hardpoint_racks"] = true,
@ -912,8 +940,8 @@ MEunitsByNum =
["countryId"] = 2, ["countryId"] = 2,
["coalition"] = "blue", ["coalition"] = "blue",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [37] }, -- end of [38]
[38] = [39] =
{ {
["alt"] = 500, ["alt"] = 500,
["hardpoint_racks"] = true, ["hardpoint_racks"] = true,
@ -947,8 +975,8 @@ MEunitsByNum =
["countryId"] = 2, ["countryId"] = 2,
["coalition"] = "blue", ["coalition"] = "blue",
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [38] }, -- end of [39]
[39] = [40] =
{ {
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
@ -981,8 +1009,8 @@ MEunitsByNum =
["y"] = 631695.14285713, ["y"] = 631695.14285713,
["coalition"] = "blue", ["coalition"] = "blue",
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [39] }, -- end of [40]
[40] = [41] =
{ {
["type"] = "MOSCOW", ["type"] = "MOSCOW",
["point"] = ["point"] =
@ -1002,8 +1030,8 @@ MEunitsByNum =
["unitId"] = 15, ["unitId"] = 15,
["y"] = 200000, ["y"] = 200000,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [40] }, -- end of [41]
[41] = [42] =
{ {
["type"] = "MOSCOW", ["type"] = "MOSCOW",
["point"] = ["point"] =
@ -1023,8 +1051,8 @@ MEunitsByNum =
["unitId"] = 16, ["unitId"] = 16,
["y"] = 200800, ["y"] = 200800,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [41] }, -- end of [42]
[42] = [43] =
{ {
["type"] = "MOSCOW", ["type"] = "MOSCOW",
["point"] = ["point"] =
@ -1044,8 +1072,8 @@ MEunitsByNum =
["unitId"] = 17, ["unitId"] = 17,
["y"] = 73571.428571428, ["y"] = 73571.428571428,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [42] }, -- end of [43]
[43] = [44] =
{ {
["type"] = "MOSCOW", ["type"] = "MOSCOW",
["point"] = ["point"] =
@ -1065,8 +1093,8 @@ MEunitsByNum =
["unitId"] = 18, ["unitId"] = 18,
["y"] = 74371.428571428, ["y"] = 74371.428571428,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [43] }, -- end of [44]
[44] = [45] =
{ {
["type"] = "FARP", ["type"] = "FARP",
["point"] = ["point"] =
@ -1086,8 +1114,8 @@ MEunitsByNum =
["groupId"] = 17, ["groupId"] = 17,
["y"] = 617591.42857143, ["y"] = 617591.42857143,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [44] }, -- end of [45]
[45] = [46] =
{ {
["shape_name"] = "PalatkaB", ["shape_name"] = "PalatkaB",
["type"] = "FARP Tent", ["type"] = "FARP Tent",
@ -1108,8 +1136,8 @@ MEunitsByNum =
["groupId"] = 18, ["groupId"] = 18,
["countryId"] = 0, ["countryId"] = 0,
["coalition"] = "red", ["coalition"] = "red",
}, -- end of [45] }, -- end of [46]
[46] = [47] =
{ {
["shape_name"] = "PalatkaB", ["shape_name"] = "PalatkaB",
["type"] = "FARP Tent", ["type"] = "FARP Tent",
@ -1130,8 +1158,8 @@ MEunitsByNum =
["groupId"] = 19, ["groupId"] = 19,
["countryId"] = 0, ["countryId"] = 0,
["coalition"] = "red", ["coalition"] = "red",
}, -- end of [46] }, -- end of [47]
[47] = [48] =
{ {
["shape_name"] = "PalatkaB", ["shape_name"] = "PalatkaB",
["type"] = "FARP Tent", ["type"] = "FARP Tent",
@ -1152,8 +1180,8 @@ MEunitsByNum =
["groupId"] = 36, ["groupId"] = 36,
["countryId"] = 0, ["countryId"] = 0,
["coalition"] = "red", ["coalition"] = "red",
}, -- end of [47] }, -- end of [48]
[48] = [49] =
{ {
["shape_name"] = "teplowoz", ["shape_name"] = "teplowoz",
["type"] = "Locomotive", ["type"] = "Locomotive",
@ -1173,8 +1201,8 @@ MEunitsByNum =
["country"] = "russia", ["country"] = "russia",
["y"] = 652535.98623348, ["y"] = 652535.98623348,
["coalition"] = "red", ["coalition"] = "red",
}, -- end of [48] }, -- end of [49]
[49] = [50] =
{ {
["shape_name"] = "elektrowoz", ["shape_name"] = "elektrowoz",
["type"] = "Electric locomotive", ["type"] = "Electric locomotive",
@ -1194,8 +1222,8 @@ MEunitsByNum =
["country"] = "russia", ["country"] = "russia",
["y"] = 652535.98623348, ["y"] = 652535.98623348,
["coalition"] = "red", ["coalition"] = "red",
}, -- end of [49] }, -- end of [50]
[50] = [51] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1216,8 +1244,8 @@ MEunitsByNum =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [50] }, -- end of [51]
[51] = [52] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1238,8 +1266,8 @@ MEunitsByNum =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [51] }, -- end of [52]
[52] = [53] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1260,8 +1288,8 @@ MEunitsByNum =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [52] }, -- end of [53]
[53] = [54] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1282,8 +1310,8 @@ MEunitsByNum =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [53] }, -- end of [54]
[54] = [55] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1304,8 +1332,8 @@ MEunitsByNum =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [54] }, -- end of [55]
[55] = [56] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
["point"] = ["point"] =
@ -1326,8 +1354,8 @@ MEunitsByNum =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [55] }, -- end of [56]
[56] = [57] =
{ {
["type"] = "T-55", ["type"] = "T-55",
["point"] = ["point"] =
@ -1348,8 +1376,8 @@ MEunitsByNum =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = 0, ["heading"] = 0,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [56] }, -- end of [57]
[57] = [58] =
{ {
["type"] = "T-55", ["type"] = "T-55",
["point"] = ["point"] =
@ -1370,8 +1398,8 @@ MEunitsByNum =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = 0, ["heading"] = 0,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [57] }, -- end of [58]
[58] = [59] =
{ {
["type"] = "T-55", ["type"] = "T-55",
["point"] = ["point"] =
@ -1392,8 +1420,8 @@ MEunitsByNum =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = 0, ["heading"] = 0,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [58] }, -- end of [59]
[59] = [60] =
{ {
["type"] = "T-55", ["type"] = "T-55",
["point"] = ["point"] =
@ -1414,8 +1442,8 @@ MEunitsByNum =
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = 0, ["heading"] = 0,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of [59] }, -- end of [60]
[60] = [61] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
@ -1442,8 +1470,8 @@ MEunitsByNum =
["y"] = 590391.42857142, ["y"] = 590391.42857142,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [60] }, -- end of [61]
[61] = [62] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
@ -1470,8 +1498,8 @@ MEunitsByNum =
["y"] = 590431.42857142, ["y"] = 590431.42857142,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [61] }, -- end of [62]
[62] = [63] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
@ -1498,8 +1526,8 @@ MEunitsByNum =
["y"] = 590471.42857142, ["y"] = 590471.42857142,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [62] }, -- end of [63]
[63] = [64] =
{ {
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
@ -1526,8 +1554,8 @@ MEunitsByNum =
["y"] = 615000, ["y"] = 615000,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [63] }, -- end of [64]
[64] = [65] =
{ {
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
@ -1554,8 +1582,8 @@ MEunitsByNum =
["y"] = 615040, ["y"] = 615040,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [64] }, -- end of [65]
[65] = [66] =
{ {
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
@ -1590,8 +1618,8 @@ MEunitsByNum =
["y"] = 603285.71428571, ["y"] = 603285.71428571,
["countryId"] = 0, ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [65] }, -- end of [66]
[66] = [67] =
{ {
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
@ -1626,5 +1654,5 @@ MEunitsByNum =
["y"] = 603325.71428571, ["y"] = 603325.71428571,
["countryId"] = 0, ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [66] }, -- end of [67]
} -- end of MEunitsByNum } -- end of MEunitsByNum

File diff suppressed because it is too large Load Diff

View File

@ -8,67 +8,101 @@ const =
["Barracks 2"] = "kazarma2", ["Barracks 2"] = "kazarma2",
["Small house 2C"] = "dom2c", ["Small house 2C"] = "dom2c",
["Military staff"] = "aviashtab", ["Military staff"] = "aviashtab",
["Container 20ft"] = "container_20ft",
["Tanker Elnya 160"] = "elnya",
["Pipes big"] = "pipes_big_cargo",
["Tech hangar A"] = "ceh_ang_a", ["Tech hangar A"] = "ceh_ang_a",
["Oil derrick"] = "neftevyshka", ["Oil derrick"] = "neftevyshka",
["Tech combine"] = "kombinat", ["Tech combine"] = "kombinat",
["Garage B"] = "garage_b", ["Garage B"] = "garage_b",
["Pilot standing"] = "pilot_parashut",
["Airshow_Crowd"] = "Crowd1", ["Airshow_Crowd"] = "Crowd1",
["Airshow_Cone"] = "Comp_cone",
["Hangar A"] = "angar_a", ["Hangar A"] = "angar_a",
["Road outpost"] = "block-onroad",
["Repair workshop"] = "tech", ["Repair workshop"] = "tech",
["Subsidiary structure D"] = "saray-d", ["Subsidiary structure D"] = "saray-d",
["Outpost"] = "block",
["FARP Ammo Dump Coating"] = "SetkaKP", ["FARP Ammo Dump Coating"] = "SetkaKP",
["Small house 1C area"] = "dom2c-all", ["Small house 1C area"] = "dom2c-all",
["Tank 2"] = "airbase_tbilisi_tank_01", ["Tank 2"] = "airbase_tbilisi_tank_01",
["Boiler-house A"] = "kotelnaya_a", ["Boiler-house A"] = "kotelnaya_a",
["Parachute"] = "parash",
["Workshop A"] = "tec_a", ["Workshop A"] = "tec_a",
["Downed pilot"] = "cadaver",
["Small werehouse 1"] = "s1", ["Small werehouse 1"] = "s1",
["Bulk Cargo Ship Ivanov"] = "barge-1",
["Fueltank"] = "fueltank_cargo",
["Garage small B"] = "garagh-small-b", ["Garage small B"] = "garagh-small-b",
["Small werehouse 4"] = "s4", ["Small werehouse 4"] = "s4",
["Oiltank"] = "oiltank_cargo",
["Container 40ft"] = "container_40ft",
["Shop"] = "magazin", ["Shop"] = "magazin",
["Bunker 2"] = "dot2",
["Subsidiary structure B"] = "saray-b", ["Subsidiary structure B"] = "saray-b",
["FARP Fuel Depot"] = "GSM Rus", ["FARP Fuel Depot"] = "gsm rus",
["White_Flag"] = "H-Flag_W",
["Coach cargo"] = "wagon-gruz", ["Coach cargo"] = "wagon-gruz",
["Oil rig"] = "oil_platform",
["Helipad Single"] = "farp",
["Electric power box"] = "tr_budka", ["Electric power box"] = "tr_budka",
["Tank 3"] = "airbase_tbilisi_tank_02", ["Tank 3"] = "airbase_tbilisi_tank_02",
["Red_Flag"] = "H-flag_R", ["Red_Flag"] = "H-flag_R",
["Gas platform"] = "gas_platform",
["Container red 3"] = "konteiner_red3", ["Container red 3"] = "konteiner_red3",
["Garage A"] = "garage_a", ["Garage A"] = "garage_a",
["Hangar B"] = "angar_b", ["Hangar B"] = "angar_b",
["Trunks small"] = "trunks_small_cargo",
["Black_Tyre"] = "H-tyre_B", ["Black_Tyre"] = "H-tyre_B",
["Cafe"] = "stolovaya", ["Cafe"] = "stolovaya",
["Restaurant 1"] = "restoran1", ["Restaurant 1"] = "restoran1",
["Trunks long"] = "trunks_long_cargo",
["Subsidiary structure A"] = "saray-a", ["Subsidiary structure A"] = "saray-a",
["Tetrapod"] = "tetrapod_cargo",
["Container white"] = "konteiner_white", ["Container white"] = "konteiner_white",
["Warehouse"] = "sklad", ["Warehouse"] = "sklad",
["Tank"] = "bak", ["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 B"] = "pereezd_small",
["Railway crossing A"] = "pereezd_big",
["Subsidiary structure F"] = "saray-f", ["Subsidiary structure F"] = "saray-f",
["Gate"] = "gate",
["Farm A"] = "ferma_a", ["Farm A"] = "ferma_a",
["FARP"] = "farps",
["Small werehouse 3"] = "s3", ["Small werehouse 3"] = "s3",
["Passenger boat"] = "zwezdny",
["Water tower A"] = "wodokachka_a", ["Water tower A"] = "wodokachka_a",
["F-shape barrier"] = "f_bar_cargo",
["Railway station"] = "r_vok_sd", ["Railway station"] = "r_vok_sd",
["Coach a tank blue"] = "wagon-cisterna_blue", ["Coach a tank blue"] = "wagon-cisterna_blue",
["Bunker 1"] = "dot",
["Tech Hangar A"] = "ceh_ang_a",
["Supermarket A"] = "uniwersam_a", ["Supermarket A"] = "uniwersam_a",
["Coach a platform"] = "wagon-platforma", ["Coach a platform"] = "wagon-platforma",
["Garage small A"] = "garagh-small-a", ["Garage small A"] = "garagh-small-a",
["Container brown"] = "konteiner_brown",
["TV tower"] = "tele_bash", ["TV tower"] = "tele_bash",
["Airshow_Cone"] = "Comp_cone", ["Bulk Cargo Ship Yakushev"] = "barge-2",
["Pilot F15 Parachute"] = "pilot_f15_parachute",
["Farm B"] = "ferma_b", ["Farm B"] = "ferma_b",
["GeneratorF"] = "GeneratorF", ["GeneratorF"] = "GeneratorF",
["White_Flag"] = "H-Flag_W", ["Passenger liner"] = "yastrebow",
["Container red 2"] = "konteiner_red2", ["Container red 2"] = "konteiner_red2",
["Coach a passenger"] = "wagon-pass", ["Coach a passenger"] = "wagon-pass",
["WC"] = "WC", ["WC"] = "WC",
["Black_Tyre_WF"] = "H-tyre_B_WF", ["Black_Tyre_WF"] = "H-tyre_B_WF",
["Electric locomotive"] = "elektrowoz", ["Electric locomotive"] = "elektrowoz",
["Railway crossing A"] = "pereezd_big", ["Armed house"] = "home1_a",
["Coach a tank yellow"] = "wagon-cisterna_yellow", ["Coach a tank yellow"] = "wagon-cisterna_yellow",
["Subsidiary structure 2"] = "hozdomik2", ["Subsidiary structure 2"] = "hozdomik2",
[".Ammunition depot"] = "SkladC", [".Ammunition depot"] = "SkladC",
["Small werehouse 2"] = "s2", ["Small werehouse 2"] = "s2",
["Windsock"] = "H-Windsock_RW", ["Windsock"] = "H-Windsock_RW",
["Small house 1B"] = "domik1b", ["Small house 1B"] = "domik1b",
["Container brown"] = "konteiner_brown", ["Container camo"] = "bw_container_cargo",
["Locomotive"] = "teplowoz", ["Locomotive"] = "teplowoz",
["Subsidiary structure 1"] = "hozdomik1", ["Subsidiary structure 1"] = "hozdomik1",
["Pump station"] = "nasos", ["Pump station"] = "nasos",
@ -82,7 +116,7 @@ const =
["Black_Tyre_RF"] = "H-tyre_B_RF", ["Black_Tyre_RF"] = "H-tyre_B_RF",
["Comms tower M"] = "tele_bash_m", ["Comms tower M"] = "tele_bash_m",
[".Command Center"] = "ComCenter", [".Command Center"] = "ComCenter",
["Fuel tank"] = "toplivo-bak", ["Fuel tank"] = "toplivo",
["Cargo1"] = "ab-212_cargo", ["Cargo1"] = "ab-212_cargo",
["Shelter B"] = "ukrytie_b", ["Shelter B"] = "ukrytie_b",
["Chemical tank A"] = "him_bak_a", ["Chemical tank A"] = "him_bak_a",

View File

@ -1,150 +1,12 @@
deadObjects = deadObjects =
{ {
[16782592] =
{
["objectPos"] =
{
["y"] = 11.730595023771,
["x"] = -292856.66347804,
["z"] = 654539.58489607,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654545.71428571,
["x"] = -292842.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16782592,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs1",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -292842.85714286,
["y"] = 654545.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 27,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 11.73456417819,
["x"] = -292855.65589344,
["z"] = 654539.4776362,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16782592,
}, -- end of ["object"]
}, -- end of [16782592]
[16782848] =
{
["objectPos"] =
{
["y"] = 11.73993894825,
["x"] = -292922.02212464,
["z"] = 654583.90753159,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654585.71428571,
["x"] = -292882.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16782848,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs2",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -292882.85714286,
["y"] = 654585.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 28,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 11.750775044011,
["x"] = -292918.85355006,
["z"] = 654583.32898538,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16782848,
}, -- end of ["object"]
}, -- end of [16782848]
[16783104] =
{
["objectPos"] =
{
["y"] = 11.787782375471,
["x"] = -292989.15632544,
["z"] = 654627.05222202,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654625.71428571,
["x"] = -292922.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16783104,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs3",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -292922.85714286,
["y"] = 654625.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 29,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 11.784134667198,
["x"] = -292988.34774035,
["z"] = 654626.95184203,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16783104,
}, -- end of ["object"]
}, -- end of [16783104]
[16783360] = [16783360] =
{ {
["objectPos"] = ["objectPos"] =
{ {
["y"] = 12.117786843734, ["y"] = 11.949347758943,
["x"] = -293044.08971735, ["x"] = -293002.76155801,
["z"] = 654661.12095178, ["z"] = 654661.93956923,
}, -- end of ["objectPos"] }, -- end of ["objectPos"]
["objectType"] = "vehicle", ["objectType"] = "vehicle",
["objectData"] = ["objectData"] =
@ -174,9 +36,9 @@ deadObjects =
["country"] = "russia", ["country"] = "russia",
["pos"] = ["pos"] =
{ {
["y"] = 12.104105100501, ["y"] = 11.942705180761,
["x"] = -293040.29557322, ["x"] = -292999.01167319,
["z"] = 654661.78361224, ["z"] = 654661.6137778,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of ["objectData"] }, -- end of ["objectData"]
["object"] = ["object"] =
@ -184,4 +46,234 @@ deadObjects =
["id_"] = 16783360, ["id_"] = 16783360,
}, -- end of ["object"] }, -- end of ["object"]
}, -- end of [16783360] }, -- end of [16783360]
[16782592] =
{
["objectPos"] =
{
["y"] = 11.745858960922,
["x"] = -292853.03376572,
["z"] = 654539.31845625,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654545.71428571,
["x"] = -292842.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16782592,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs1",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -292842.85714286,
["y"] = 654545.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 27,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 11.750308354347,
["x"] = -292852.11861931,
["z"] = 654539.33966137,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16782592,
}, -- end of ["object"]
}, -- end of [16782592]
[16783616] =
{
["objectPos"] =
{
["y"] = 12.114658336158,
["x"] = -293052.09177348,
["z"] = 654688.79118826,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654705.71428571,
["x"] = -293002.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16783616,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs5",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -293002.85714286,
["y"] = 654705.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 31,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 12.108674123943,
["x"] = -293049.90666016,
["z"] = 654690.7394103,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16783616,
}, -- end of ["object"]
}, -- end of [16783616]
[16782848] =
{
["objectPos"] =
{
["y"] = 11.895307197448,
["x"] = -292885.90343864,
["z"] = 654581.74191148,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654585.71428571,
["x"] = -292882.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16782848,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs2",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -292882.85714286,
["y"] = 654585.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 28,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 11.896243705612,
["x"] = -292885.8154643,
["z"] = 654581.81480703,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16782848,
}, -- end of ["object"]
}, -- end of [16782848]
[16783872] =
{
["objectPos"] =
{
["y"] = 12.083325901948,
["x"] = -293047.96598556,
["z"] = 654725.0984902,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654745.71428571,
["x"] = -293042.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16783872,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs6",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -293042.85714286,
["y"] = 654745.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 32,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 12.084689792163,
["x"] = -293047.55373527,
["z"] = 654726.74612589,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16783872,
}, -- end of ["object"]
}, -- end of [16783872]
[16783104] =
{
["objectPos"] =
{
["y"] = 11.916789886161,
["x"] = -292939.16858087,
["z"] = 654619.78649539,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654625.71428571,
["x"] = -292922.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16783104,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs3",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -292922.85714286,
["y"] = 654625.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 29,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 11.927206059256,
["x"] = -292936.5144784,
["z"] = 654619.49063824,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16783104,
}, -- end of ["object"]
}, -- end of [16783104]
} -- end of deadObjects } -- end of deadObjects

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -13,6 +13,9 @@ humansById =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
@ -24,7 +27,6 @@ humansById =
["y"] = 636428.57142857, ["y"] = 636428.57142857,
["unitId"] = 11, ["unitId"] = 11,
["heading"] = -0.67060113146646, ["heading"] = -0.67060113146646,
["skill"] = "Client",
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -32,6 +34,7 @@ humansById =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["skill"] = "Client",
["groupId"] = 6, ["groupId"] = 6,
}, -- end of [11] }, -- end of [11]
[8] = [8] =
@ -115,6 +118,9 @@ humansById =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
@ -126,7 +132,6 @@ humansById =
["y"] = 644428.57142857, ["y"] = 644428.57142857,
["unitId"] = 12, ["unitId"] = 12,
["heading"] = -0.66079849060746, ["heading"] = -0.66079849060746,
["skill"] = "Client",
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -134,6 +139,7 @@ humansById =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["skill"] = "Client",
["groupId"] = 7, ["groupId"] = 7,
}, -- end of [12] }, -- end of [12]
[48] = [48] =

View File

@ -109,6 +109,9 @@ humansByName =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
@ -120,7 +123,6 @@ humansByName =
["y"] = 636428.57142857, ["y"] = 636428.57142857,
["unitId"] = 11, ["unitId"] = 11,
["heading"] = -0.67060113146646, ["heading"] = -0.67060113146646,
["skill"] = "Client",
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -128,6 +130,7 @@ humansByName =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["skill"] = "Client",
["groupId"] = 6, ["groupId"] = 6,
}, -- end of ["A-10C Client #1_unit"] }, -- end of ["A-10C Client #1_unit"]
["Su-33 Client #2Unit"] = ["Su-33 Client #2Unit"] =
@ -171,6 +174,9 @@ humansByName =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
["AddPropAircraft"] =
{
}, -- end of ["AddPropAircraft"]
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
@ -182,7 +188,6 @@ humansByName =
["y"] = 644428.57142857, ["y"] = 644428.57142857,
["unitId"] = 12, ["unitId"] = 12,
["heading"] = -0.66079849060746, ["heading"] = -0.66079849060746,
["skill"] = "Client",
["callsign"] = ["callsign"] =
{ {
[1] = 3, [1] = 3,
@ -190,6 +195,7 @@ humansByName =
[3] = 1, [3] = 1,
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["skill"] = "Client",
["groupId"] = 7, ["groupId"] = 7,
}, -- end of ["A-10C Client #2_unit"] }, -- end of ["A-10C Client #2_unit"]
["Su-33 Client #1Unit"] = ["Su-33 Client #1Unit"] =

View File

@ -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"] = -355263.93360573,
[1] =
{
["y"] = 0,
["x"] = -355263.93360573,
["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"] = -356064.09419542,
[1] =
{
["y"] = 0,
["x"] = -356064.09419542,
["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

View File

@ -1,6 +1,6 @@
missionData = missionData =
{ {
["version"] = 18, ["version"] = 19,
["files"] = ["files"] =
{ {
}, -- end of ["files"] }, -- end of ["files"]

View File

@ -29,8 +29,8 @@ navPoints =
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["y"] = 659819.99999999, ["y"] = 663781.15649176,
["x"] = -257614.28571428, ["x"] = -260714.32122958,
["name"] = "KB1SE", ["name"] = "KB1SE",
["callsignStr"] = "KB1SE", ["callsignStr"] = "KB1SE",
["id"] = 4, ["id"] = 4,
@ -45,8 +45,8 @@ navPoints =
["point"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -257614.28571428, ["x"] = -260714.32122958,
["z"] = 659819.99999999, ["z"] = 663781.15649176,
}, -- end of ["point"] }, -- end of ["point"]
}, -- end of [2] }, -- end of [2]
[3] = [3] =
@ -73,8 +73,8 @@ navPoints =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["y"] = 659248.57142856, ["y"] = 660970.8133815,
["x"] = -243614.28571428, ["x"] = -244130.95830016,
["name"] = "KB1NE", ["name"] = "KB1NE",
["callsignStr"] = "KB1NE", ["callsignStr"] = "KB1NE",
["id"] = 6, ["id"] = 6,
@ -89,8 +89,8 @@ navPoints =
["point"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -243614.28571428, ["x"] = -244130.95830016,
["z"] = 659248.57142856, ["z"] = 660970.8133815,
}, -- end of ["point"] }, -- end of ["point"]
}, -- end of [4] }, -- end of [4]
[5] = [5] =
@ -118,8 +118,8 @@ navPoints =
}, -- end of [5] }, -- end of [5]
[6] = [6] =
{ {
["y"] = 670391.42857142, ["y"] = 674352.58506319,
["x"] = -260757.14285714, ["x"] = -267473.88647362,
["name"] = "DODGE", ["name"] = "DODGE",
["callsignStr"] = "DODGE", ["callsignStr"] = "DODGE",
["id"] = 8, ["id"] = 8,
@ -134,8 +134,8 @@ navPoints =
["point"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -260757.14285714, ["x"] = -267473.88647362,
["z"] = 670391.42857142, ["z"] = 674352.58506319,
}, -- end of ["point"] }, -- end of ["point"]
["callsign"] = 3, ["callsign"] = 3,
}, -- end of [6] }, -- end of [6]

View File

@ -155,9 +155,9 @@ removedAliveUnits =
["y"] = 654585.71428571, ["y"] = 654585.71428571,
["pos"] = ["pos"] =
{ {
["y"] = 11.750775044011, ["y"] = 11.896243705612,
["x"] = -292918.85355006, ["x"] = -292885.8154643,
["z"] = 654583.32898538, ["z"] = 654581.81480703,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16782848] }, -- end of [16782848]
[16783104] = [16783104] =
@ -187,9 +187,9 @@ removedAliveUnits =
["y"] = 654625.71428571, ["y"] = 654625.71428571,
["pos"] = ["pos"] =
{ {
["y"] = 11.784134667198, ["y"] = 11.927206059256,
["x"] = -292988.34774035, ["x"] = -292936.5144784,
["z"] = 654626.95184203, ["z"] = 654619.49063824,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16783104] }, -- end of [16783104]
[16783360] = [16783360] =
@ -219,9 +219,9 @@ removedAliveUnits =
["y"] = 654665.71428571, ["y"] = 654665.71428571,
["pos"] = ["pos"] =
{ {
["y"] = 12.104105100501, ["y"] = 11.942705180761,
["x"] = -293040.29557322, ["x"] = -292999.01167319,
["z"] = 654661.78361224, ["z"] = 654661.6137778,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16783360] }, -- end of [16783360]
[16788736] = [16788736] =
@ -347,9 +347,9 @@ removedAliveUnits =
["y"] = 654545.71428571, ["y"] = 654545.71428571,
["pos"] = ["pos"] =
{ {
["y"] = 11.73456417819, ["y"] = 11.750308354347,
["x"] = -292855.65589344, ["x"] = -292852.11861931,
["z"] = 654539.4776362, ["z"] = 654539.33966137,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16782592] }, -- end of [16782592]
} -- end of removedAliveUnits } -- end of removedAliveUnits

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -2,15 +2,34 @@ zonesByName =
{ {
["LZ zone"] = ["LZ zone"] =
{ {
["y"] = 614105.71428571,
["radius"] = 3000, ["radius"] = 3000,
["zoneId"] = 2, ["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"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -245328.57142857, ["x"] = -245328.57142857,
["z"] = 614105.71428571, ["z"] = 614105.71428571,
}, -- end of ["point"] }, -- end of ["point"]
["type"] = 0,
}, -- end of ["LZ zone"]
["explosion zone"] =
{
["radius"] = 3000,
["zoneId"] = 1,
["color"] = ["color"] =
{ {
[1] = 1, [1] = 1,
@ -18,21 +37,25 @@ zonesByName =
[3] = 1, [3] = 1,
[4] = 0.14901960784314, [4] = 0.14901960784314,
}, -- end of ["color"] }, -- end of ["color"]
["x"] = -245328.57142857, ["properties"] =
["hidden"] = false,
["name"] = "LZ zone",
}, -- end of ["LZ zone"]
["explosion zone"] =
{ {
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 673819.99999999, ["y"] = 673819.99999999,
["radius"] = 3000, ["x"] = -271900,
["zoneId"] = 1, ["name"] = "explosion zone",
["point"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -271900, ["x"] = -271900,
["z"] = 673819.99999999, ["z"] = 673819.99999999,
}, -- end of ["point"] }, -- end of ["point"]
["type"] = 0,
}, -- end of ["explosion zone"]
["cloneZone"] =
{
["radius"] = 3000,
["zoneId"] = 3,
["color"] = ["color"] =
{ {
[1] = 1, [1] = 1,
@ -40,31 +63,20 @@ zonesByName =
[3] = 1, [3] = 1,
[4] = 0.14901960784314, [4] = 0.14901960784314,
}, -- end of ["color"] }, -- end of ["color"]
["x"] = -271900, ["properties"] =
["hidden"] = false,
["name"] = "explosion zone",
}, -- end of ["explosion zone"]
["cloneZone"] =
{ {
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 692534.28571428, ["y"] = 692534.28571428,
["radius"] = 3000, ["x"] = -285971.42857143,
["zoneId"] = 3, ["name"] = "cloneZone",
["point"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -285971.42857143, ["x"] = -285971.42857143,
["z"] = 692534.28571428, ["z"] = 692534.28571428,
}, -- end of ["point"] }, -- end of ["point"]
["color"] = ["type"] = 0,
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.14901960784314,
}, -- end of ["color"]
["x"] = -285971.42857143,
["hidden"] = false,
["name"] = "cloneZone",
}, -- end of ["cloneZone"] }, -- end of ["cloneZone"]
["shipZone"] = ["shipZone"] =
{ {
@ -90,5 +102,6 @@ zonesByName =
["x"] = -163182.90396786, ["x"] = -163182.90396786,
["z"] = 267139.69375223, ["z"] = 267139.69375223,
}, -- end of ["point"] }, -- end of ["point"]
["type"] = 0,
}, -- end of ["shipZone"] }, -- end of ["shipZone"]
} -- end of zonesByName } -- end of zonesByName

View File

@ -2,15 +2,34 @@ zonesByNum =
{ {
[1] = [1] =
{ {
["y"] = 614105.71428571,
["radius"] = 3000, ["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"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -245328.57142857, ["x"] = -245328.57142857,
["z"] = 614105.71428571, ["z"] = 614105.71428571,
}, -- end of ["point"] }, -- end of ["point"]
["name"] = "LZ zone", }, -- end of [1]
[2] =
{
["radius"] = 3000,
["zoneId"] = 3,
["color"] = ["color"] =
{ {
[1] = 1, [1] = 1,
@ -18,31 +37,20 @@ zonesByNum =
[3] = 1, [3] = 1,
[4] = 0.14901960784314, [4] = 0.14901960784314,
}, -- end of ["color"] }, -- end of ["color"]
["x"] = -245328.57142857, ["properties"] =
["hidden"] = false,
["zoneId"] = 2,
}, -- end of [1]
[2] =
{ {
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 692534.28571428, ["y"] = 692534.28571428,
["radius"] = 3000, ["x"] = -285971.42857143,
["name"] = "cloneZone",
["type"] = 0,
["point"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -285971.42857143, ["x"] = -285971.42857143,
["z"] = 692534.28571428, ["z"] = 692534.28571428,
}, -- end of ["point"] }, -- end of ["point"]
["name"] = "cloneZone",
["color"] =
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.14901960784314,
}, -- end of ["color"]
["x"] = -285971.42857143,
["hidden"] = false,
["zoneId"] = 3,
}, -- end of [2] }, -- end of [2]
[3] = [3] =
{ {
@ -62,6 +70,7 @@ zonesByNum =
["y"] = 267139.69375223, ["y"] = 267139.69375223,
["x"] = -163182.90396786, ["x"] = -163182.90396786,
["name"] = "shipZone", ["name"] = "shipZone",
["type"] = 0,
["point"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
@ -71,15 +80,8 @@ zonesByNum =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["y"] = 673819.99999999,
["radius"] = 3000, ["radius"] = 3000,
["point"] = ["zoneId"] = 1,
{
["y"] = 0,
["x"] = -271900,
["z"] = 673819.99999999,
}, -- end of ["point"]
["name"] = "explosion zone",
["color"] = ["color"] =
{ {
[1] = 1, [1] = 1,
@ -87,8 +89,19 @@ zonesByNum =
[3] = 1, [3] = 1,
[4] = 0.14901960784314, [4] = 0.14901960784314,
}, -- end of ["color"] }, -- end of ["color"]
["x"] = -271900, ["properties"] =
{
}, -- end of ["properties"]
["hidden"] = false, ["hidden"] = false,
["zoneId"] = 1, ["y"] = 673819.99999999,
["x"] = -271900,
["name"] = "explosion zone",
["type"] = 0,
["point"] =
{
["y"] = 0,
["x"] = -271900,
["z"] = 673819.99999999,
}, -- end of ["point"]
}, -- end of [4] }, -- end of [4]
} -- end of zonesByNum } -- end of zonesByNum

View File

@ -35,7 +35,7 @@ mist = {}
-- don't change these -- don't change these
mist.majorVersion = 4 mist.majorVersion = 4
mist.minorVersion = 5 mist.minorVersion = 5
mist.build = 100 mist.build = 101
-- forward declaration of log shorthand -- forward declaration of log shorthand
local log local log
@ -79,7 +79,7 @@ do -- the main scope
local function initDBs() -- mist.DBs scope local function initDBs() -- mist.DBs scope
mist.DBs = {} mist.DBs = {}
mist.DBs.markList = {}
mist.DBs.missionData = {} mist.DBs.missionData = {}
if env.mission then if env.mission then
@ -5030,7 +5030,7 @@ do -- mist.debug scope
if type(sVal) == 'string' or type(sVal) == 'number' then if type(sVal) == 'string' or type(sVal) == 'number' then
if sName == 'log' then if sName == 'log' then
mistSettings[sName] = sVal mistSettings[sName] = sVal
log:setLevel(sVal) mist.log:setLevel(sVal)
elseif sName == 'dbLog' then elseif sName == 'dbLog' then
mistSettings[sName] = sVal mistSettings[sName] = sVal
dblog:setLevel(sVal) dblog:setLevel(sVal)
@ -5230,6 +5230,7 @@ do -- mist.debug scope
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) 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) log:warn('mist.debug.writeTypes: $1', output)
end end
return output
end end
-- write CLSIDs -- write CLSIDs
-- write livery names -- write livery names
@ -6692,6 +6693,8 @@ do -- mist.demos scope
end end
do do
--[[ stuff for marker panels --[[ stuff for marker panels
marker.add() add marker. Point of these functions is to simplify process and to store all mark panels added. marker.add() add marker. Point of these functions is to simplify process and to store all mark panels added.
@ -6787,7 +6790,7 @@ do
end end
mist.marker = {} mist.marker = {}
mist.marker.list = {}
local function markSpamFilter(recList, spamBlockOn) local function markSpamFilter(recList, spamBlockOn)
for id, name in pairs(recList) do for id, name in pairs(recList) do
@ -6851,42 +6854,47 @@ do
function handle:onEvent(e) function handle:onEvent(e)
if world.event.S_EVENT_MARK_ADDED == e.id and e.idx then if world.event.S_EVENT_MARK_ADDED == e.id and e.idx then
usedMarks[e.idx] = e.idx usedMarks[e.idx] = e.idx
if not mist.marker.list[e.idx] then if not mist.DBs.markList[e.idx] then
--log:info('create maker DB: $1', e.idx) --log:info('create maker DB: $1', e.idx)
mist.marker.list[e.idx] = {time = e.time, pos = e.pos, groupId = e.groupId, mType = 'panel', text = e.text, markId = e.idx, coalition = e.coalition} 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 if e.unit then
mist.marker.list[e.idx].unit = e.initiaor:getName() mist.DBs.markList[e.idx].unit = e.initiaor:getName()
end end
--log:info(mist.marker.list[e.idx]) --log:info(mist.marker.list[e.idx])
end end
elseif world.event.S_EVENT_MARK_CHANGE == e.id and e.idx then elseif world.event.S_EVENT_MARK_CHANGE == e.id and e.idx then
if mist.marker.list[e.idx] then if mist.DBs.markList[e.idx] then
mist.marker.list[e.idx].text = e.text mist.DBs.markList[e.idx].text = e.text
end end
elseif world.event.S_EVENT_MARK_REMOVE == e.id and e.idx then elseif world.event.S_EVENT_MARK_REMOVE == e.id and e.idx then
if mist.marker.list[e.idx] then if mist.DBs.markList[e.idx] then
mist.marker.list[e.idx] = nil mist.DBs.markList[e.idx] = nil
end end
end end
end end
local function removeMark(id) local function removeMark(id)
--log:info("Removing Mark: $1", id) --log:info("Removing Mark: $1", id
local removed = false
if type(id) == 'table' then if type(id) == 'table' then
for ind, val in pairs(id) do for ind, val in pairs(id) do
trigger.action.removeMark(val) trigger.action.removeMark(val)
mist.marker.list[val] = nil mist.DBs.markList[val] = nil
removed = true
end end
else else
trigger.action.removeMark(id) trigger.action.removeMark(id)
mist.marker.list[id] = nil mist.DBs.markList[id] = nil
removed = true
end end
return removed
end end
world.addEventHandler(handle) world.addEventHandler(handle)
function mist.marker.setDefault(vars) function mist.marker.setDefault(vars)
local anyChange = false
if vars and type(vars) == 'table' then if vars and type(vars) == 'table' then
for l1, l1Data in pairs(vars) do for l1, l1Data in pairs(vars) do
if type(l1Data) == 'table' then if type(l1Data) == 'table' then
@ -6896,13 +6904,16 @@ do
for l2, l2Data in pairs(l1Data) do for l2, l2Data in pairs(l1Data) do
userDefs[l1][l2] = l2Data userDefs[l1][l2] = l2Data
anyChange = true
end end
else else
userDefs[l1] = l1Data userDefs[l1] = l1Data
anyChange = true
end end
end end
end end
return anyChange
end end
function mist.marker.add(vars) function mist.marker.add(vars)
@ -6913,7 +6924,7 @@ do
local markFor = vars.markFor local markFor = vars.markFor
local markForCoa = vars.markForCoa -- optional, can be used if you just want to mark to a specific coa/all local markForCoa = vars.markForCoa -- 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 id = vars.id or vars.markId or vars.markid
local mType = vars.mType or 0 local mType = vars.mType or vars.markType or vars.type or 0
local color = vars.color local color = vars.color
local fillColor = vars.fillColor local fillColor = vars.fillColor
local lineType = vars.lineType or 2 local lineType = vars.lineType or 2
@ -6943,9 +6954,9 @@ do
]] ]]
local lId = id or name local lId = id or name
if mist.marker.list[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. 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) --log:warn('active mark to be removed: $1', id)
name = mist.marker.list[id].name or id name = mist.DBs.markList[id].name or id
removeMark(id) removeMark(id)
elseif usedMarks[id] then elseif usedMarks[id] then
--log:info('exists in usedMarks: $1', id) --log:info('exists in usedMarks: $1', id)
@ -6958,13 +6969,12 @@ do
usedMarks[id] = usedId -- redefine the value used usedMarks[id] = usedId -- redefine the value used
end end
if name then if name then
if usedId == 0 then
usedId = iterate()
end
usedMarks[name] = usedId usedMarks[name] = usedId
end end
if usedId == 0 then
usedId = iterate()
end
if mType then if mType then
if type(mType) == 'string' then if type(mType) == 'string' then
for i = 1, #tNames do for i = 1, #tNames do
@ -7112,7 +7122,7 @@ do
if markScope ~= 'table' then if markScope ~= 'table' then
-- create marks -- create marks
mist.marker.list[usedId] = data-- add to the DB mist.DBs.markList[usedId] = data-- add to the DB
else else
if #markForTable > 0 then if #markForTable > 0 then
@ -7124,7 +7134,7 @@ do
for i = 1, #markForTable do for i = 1, #markForTable do
local newId = iterate() local newId = iterate()
local data = {markId = newId, text = text, pos = pos[i], markFor = markForTable[i], markType = 'panel', name = name, readOnly = readOnly, time = timer.getTime()} local data = {markId = newId, text = text, pos = pos[i], markFor = markForTable[i], markType = 'panel', name = name, readOnly = readOnly, time = timer.getTime()}
mist.marker.list[newId] = data mist.DBs.markList[newId] = data
table.insert(list, data) table.insert(list, data)
draw(data) draw(data)
@ -7184,7 +7194,7 @@ do
fCal[#fCal+1] = message fCal[#fCal+1] = message
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()} 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.marker.list[usedId] = data mist.DBs.markList[usedId] = data
if mType == 7 or mType == 1 then if mType == 7 or mType == 1 then
local s = "trigger.action.markupToAll(" local s = "trigger.action.markupToAll("
@ -7219,29 +7229,30 @@ do
end end
function mist.marker.remove(id) function mist.marker.remove(id)
removeMark(id) return removeMark(id)
end end
function mist.marker.get(id) function mist.marker.get(id)
if mist.marker.lis[id] then if mist.DBs.markList[id] then
return mist.marker.lis[id] return mist.DBs.markList[id]
end end
local names = {} local names = {}
for markId, data in pairs(mist.marker.list) do for markId, data in pairs(mist.DBs.markList) do
if data.name and data.name == id then if data.name and data.name == id then
table.insert(names, data) table.insert(names, data)
end end
end end
if #names > 0 then if #names > 1 then
return names return names
end end
end end
--function mist.marker.coords(pos, cType, markFor, id) -- wrapper function to just display coordinates of a specific format at location --[[
function mist.marker.circle(v)
--end end
]]
end end
--- Time conversion functions. --- Time conversion functions.
-- @section mist.time -- @section mist.time
@ -8124,6 +8135,16 @@ do -- group tasks scope
end end
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 end
--- Database tables. --- Database tables.
@ -8242,7 +8263,6 @@ do -- mist.Logger scope
-- @usage -- log everything -- @usage -- log everything
--myLogger:setLevel(3) --myLogger:setLevel(3)
function mist.Logger:setLevel(level) function mist.Logger:setLevel(level)
env.info('set Level ' .. level)
if not level then if not level then
self.level = 2 self.level = 2
else else

View File

@ -35,7 +35,7 @@ mist = {}
-- don't change these -- don't change these
mist.majorVersion = 4 mist.majorVersion = 4
mist.minorVersion = 5 mist.minorVersion = 5
mist.build = 100 mist.build = 101
-- forward declaration of log shorthand -- forward declaration of log shorthand
local log local log
@ -79,7 +79,7 @@ do -- the main scope
local function initDBs() -- mist.DBs scope local function initDBs() -- mist.DBs scope
mist.DBs = {} mist.DBs = {}
mist.DBs.markList = {}
mist.DBs.missionData = {} mist.DBs.missionData = {}
if env.mission then if env.mission then
@ -5030,7 +5030,7 @@ do -- mist.debug scope
if type(sVal) == 'string' or type(sVal) == 'number' then if type(sVal) == 'string' or type(sVal) == 'number' then
if sName == 'log' then if sName == 'log' then
mistSettings[sName] = sVal mistSettings[sName] = sVal
log:setLevel(sVal) mist.log:setLevel(sVal)
elseif sName == 'dbLog' then elseif sName == 'dbLog' then
mistSettings[sName] = sVal mistSettings[sName] = sVal
dblog:setLevel(sVal) dblog:setLevel(sVal)
@ -5230,6 +5230,7 @@ do -- mist.debug scope
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) 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) log:warn('mist.debug.writeTypes: $1', output)
end end
return output
end end
-- write CLSIDs -- write CLSIDs
-- write livery names -- write livery names
@ -6692,6 +6693,8 @@ do -- mist.demos scope
end end
do do
--[[ stuff for marker panels --[[ stuff for marker panels
marker.add() add marker. Point of these functions is to simplify process and to store all mark panels added. marker.add() add marker. Point of these functions is to simplify process and to store all mark panels added.
@ -6787,7 +6790,7 @@ do
end end
mist.marker = {} mist.marker = {}
mist.marker.list = {}
local function markSpamFilter(recList, spamBlockOn) local function markSpamFilter(recList, spamBlockOn)
for id, name in pairs(recList) do for id, name in pairs(recList) do
@ -6851,42 +6854,47 @@ do
function handle:onEvent(e) function handle:onEvent(e)
if world.event.S_EVENT_MARK_ADDED == e.id and e.idx then if world.event.S_EVENT_MARK_ADDED == e.id and e.idx then
usedMarks[e.idx] = e.idx usedMarks[e.idx] = e.idx
if not mist.marker.list[e.idx] then if not mist.DBs.markList[e.idx] then
--log:info('create maker DB: $1', e.idx) --log:info('create maker DB: $1', e.idx)
mist.marker.list[e.idx] = {time = e.time, pos = e.pos, groupId = e.groupId, mType = 'panel', text = e.text, markId = e.idx, coalition = e.coalition} 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 if e.unit then
mist.marker.list[e.idx].unit = e.initiaor:getName() mist.DBs.markList[e.idx].unit = e.initiaor:getName()
end end
--log:info(mist.marker.list[e.idx]) --log:info(mist.marker.list[e.idx])
end end
elseif world.event.S_EVENT_MARK_CHANGE == e.id and e.idx then elseif world.event.S_EVENT_MARK_CHANGE == e.id and e.idx then
if mist.marker.list[e.idx] then if mist.DBs.markList[e.idx] then
mist.marker.list[e.idx].text = e.text mist.DBs.markList[e.idx].text = e.text
end end
elseif world.event.S_EVENT_MARK_REMOVE == e.id and e.idx then elseif world.event.S_EVENT_MARK_REMOVE == e.id and e.idx then
if mist.marker.list[e.idx] then if mist.DBs.markList[e.idx] then
mist.marker.list[e.idx] = nil mist.DBs.markList[e.idx] = nil
end end
end end
end end
local function removeMark(id) local function removeMark(id)
--log:info("Removing Mark: $1", id) --log:info("Removing Mark: $1", id
local removed = false
if type(id) == 'table' then if type(id) == 'table' then
for ind, val in pairs(id) do for ind, val in pairs(id) do
trigger.action.removeMark(val) trigger.action.removeMark(val)
mist.marker.list[val] = nil mist.DBs.markList[val] = nil
removed = true
end end
else else
trigger.action.removeMark(id) trigger.action.removeMark(id)
mist.marker.list[id] = nil mist.DBs.markList[id] = nil
removed = true
end end
return removed
end end
world.addEventHandler(handle) world.addEventHandler(handle)
function mist.marker.setDefault(vars) function mist.marker.setDefault(vars)
local anyChange = false
if vars and type(vars) == 'table' then if vars and type(vars) == 'table' then
for l1, l1Data in pairs(vars) do for l1, l1Data in pairs(vars) do
if type(l1Data) == 'table' then if type(l1Data) == 'table' then
@ -6896,13 +6904,16 @@ do
for l2, l2Data in pairs(l1Data) do for l2, l2Data in pairs(l1Data) do
userDefs[l1][l2] = l2Data userDefs[l1][l2] = l2Data
anyChange = true
end end
else else
userDefs[l1] = l1Data userDefs[l1] = l1Data
anyChange = true
end end
end end
end end
return anyChange
end end
function mist.marker.add(vars) function mist.marker.add(vars)
@ -6913,7 +6924,7 @@ do
local markFor = vars.markFor local markFor = vars.markFor
local markForCoa = vars.markForCoa -- optional, can be used if you just want to mark to a specific coa/all local markForCoa = vars.markForCoa -- 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 id = vars.id or vars.markId or vars.markid
local mType = vars.mType or 0 local mType = vars.mType or vars.markType or vars.type or 0
local color = vars.color local color = vars.color
local fillColor = vars.fillColor local fillColor = vars.fillColor
local lineType = vars.lineType or 2 local lineType = vars.lineType or 2
@ -6943,9 +6954,9 @@ do
]] ]]
local lId = id or name local lId = id or name
if mist.marker.list[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. 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) --log:warn('active mark to be removed: $1', id)
name = mist.marker.list[id].name or id name = mist.DBs.markList[id].name or id
removeMark(id) removeMark(id)
elseif usedMarks[id] then elseif usedMarks[id] then
--log:info('exists in usedMarks: $1', id) --log:info('exists in usedMarks: $1', id)
@ -6958,13 +6969,12 @@ do
usedMarks[id] = usedId -- redefine the value used usedMarks[id] = usedId -- redefine the value used
end end
if name then if name then
if usedId == 0 then
usedId = iterate()
end
usedMarks[name] = usedId usedMarks[name] = usedId
end end
if usedId == 0 then
usedId = iterate()
end
if mType then if mType then
if type(mType) == 'string' then if type(mType) == 'string' then
for i = 1, #tNames do for i = 1, #tNames do
@ -7112,7 +7122,7 @@ do
if markScope ~= 'table' then if markScope ~= 'table' then
-- create marks -- create marks
mist.marker.list[usedId] = data-- add to the DB mist.DBs.markList[usedId] = data-- add to the DB
else else
if #markForTable > 0 then if #markForTable > 0 then
@ -7124,7 +7134,7 @@ do
for i = 1, #markForTable do for i = 1, #markForTable do
local newId = iterate() local newId = iterate()
local data = {markId = newId, text = text, pos = pos[i], markFor = markForTable[i], markType = 'panel', name = name, readOnly = readOnly, time = timer.getTime()} local data = {markId = newId, text = text, pos = pos[i], markFor = markForTable[i], markType = 'panel', name = name, readOnly = readOnly, time = timer.getTime()}
mist.marker.list[newId] = data mist.DBs.markList[newId] = data
table.insert(list, data) table.insert(list, data)
draw(data) draw(data)
@ -7184,7 +7194,7 @@ do
fCal[#fCal+1] = message fCal[#fCal+1] = message
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()} 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.marker.list[usedId] = data mist.DBs.markList[usedId] = data
if mType == 7 or mType == 1 then if mType == 7 or mType == 1 then
local s = "trigger.action.markupToAll(" local s = "trigger.action.markupToAll("
@ -7219,29 +7229,30 @@ do
end end
function mist.marker.remove(id) function mist.marker.remove(id)
removeMark(id) return removeMark(id)
end end
function mist.marker.get(id) function mist.marker.get(id)
if mist.marker.lis[id] then if mist.DBs.markList[id] then
return mist.marker.lis[id] return mist.DBs.markList[id]
end end
local names = {} local names = {}
for markId, data in pairs(mist.marker.list) do for markId, data in pairs(mist.DBs.markList) do
if data.name and data.name == id then if data.name and data.name == id then
table.insert(names, data) table.insert(names, data)
end end
end end
if #names > 0 then if #names > 1 then
return names return names
end end
end end
--function mist.marker.coords(pos, cType, markFor, id) -- wrapper function to just display coordinates of a specific format at location --[[
function mist.marker.circle(v)
--end end
]]
end end
--- Time conversion functions. --- Time conversion functions.
-- @section mist.time -- @section mist.time
@ -8124,6 +8135,16 @@ do -- group tasks scope
end end
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 end
--- Database tables. --- Database tables.
@ -8242,7 +8263,6 @@ do -- mist.Logger scope
-- @usage -- log everything -- @usage -- log everything
--myLogger:setLevel(3) --myLogger:setLevel(3)
function mist.Logger:setLevel(level) function mist.Logger:setLevel(level)
env.info('set Level ' .. level)
if not level then if not level then
self.level = 2 self.level = 2
else else