4.3 Release Files

Re-export of DBs and updated files needed for release.
This commit is contained in:
mrSkortch 2016-05-27 02:46:43 -06:00
parent e936df61dc
commit 586d374075
30 changed files with 30909 additions and 35998 deletions

View File

@ -184,19 +184,24 @@ MEgroupsById =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1", ["unitName"] = "Mi-8s_1_1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 103,
["countryId"] = 0,
["x"] = -243285.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243285.71428571,
["callsign"] = 103,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 5, ["unitId"] = 5,
["y"] = 603285.71428571, ["y"] = 603285.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [1] }, -- end of [1]
[2] = [2] =
@ -212,19 +217,24 @@ MEgroupsById =
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1 #1", ["unitName"] = "Mi-8s_1_1 #1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 102,
["countryId"] = 0,
["x"] = -243325.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243325.71428571,
["callsign"] = 102,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 6, ["unitId"] = 6,
["y"] = 603325.71428571, ["y"] = 603325.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [2] }, -- end of [2]
}, -- end of ["units"] }, -- end of ["units"]
@ -258,7 +268,7 @@ MEgroupsById =
["livery_id"] = "19th Fighter SQN (AK)", ["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10", ["onboard_num"] = "10",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "F-15C Client #1", ["unitName"] = "F-15C Client #1_unit",
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
@ -311,7 +321,7 @@ MEgroupsById =
["livery_id"] = "19th Fighter SQN (AK)", ["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10", ["onboard_num"] = "10",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "F-15C Client #2", ["unitName"] = "F-15C Client #2_unit",
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
@ -364,7 +374,7 @@ MEgroupsById =
["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)",
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #1", ["unitName"] = "A-10C Client #1_unit",
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
@ -417,7 +427,7 @@ MEgroupsById =
["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)",
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #2", ["unitName"] = "A-10C Client #2_unit",
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
@ -1263,7 +1273,7 @@ MEgroupsById =
["livery_id"] = "279th kiap 1st squad navy", ["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "Su-33 Client #1", ["unitName"] = "Su-33 Client #1Unit",
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
@ -1279,6 +1289,62 @@ MEgroupsById =
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [1] }, -- end of [1]
[2] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590431.42857142,
["x"] = -250225.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "010",
["category"] = "plane",
["unitName"] = "Su-33 Client #2Unit",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 20,
["groupName"] = "Su-33 Client #1",
["callsign"] = 105,
["countryId"] = 0,
["x"] = -250225.71428571,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 47,
["y"] = 590431.42857142,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of [2]
[3] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590471.42857142,
["x"] = -250265.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "054",
["category"] = "plane",
["unitName"] = "Su-33 Client #3Unit",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 20,
["groupName"] = "Su-33 Client #1",
["callsign"] = 106,
["countryId"] = 0,
["x"] = -250265.71428571,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 48,
["y"] = 590471.42857142,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of [3]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 0, ["countryId"] = 0,
["radioSet"] = false, ["radioSet"] = false,
@ -1289,53 +1355,6 @@ MEgroupsById =
["task"] = "CAP", ["task"] = "CAP",
["uncontrolled"] = false, ["uncontrolled"] = false,
}, -- end of [20] }, -- end of [20]
[21] =
{
["modulation"] = 0,
["groupId"] = 21,
["frequency"] = 124,
["country"] = "russia",
["groupName"] = "Su-33 Client #2",
["units"] =
{
[1] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 597819.99999999,
["x"] = -235614.28571428,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53",
["category"] = "plane",
["unitName"] = "Su-33 Client #2",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 21,
["groupName"] = "Su-33 Client #2",
["callsign"] = 104,
["countryId"] = 0,
["x"] = -235614.28571428,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 43,
["y"] = 597819.99999999,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of [1]
}, -- end of ["units"]
["countryId"] = 0,
["radioSet"] = false,
["hidden"] = false,
["category"] = "plane",
["coalition"] = "red",
["startTime"] = 0,
["task"] = "CAP",
["uncontrolled"] = false,
}, -- end of [21]
[30] = [30] =
{ {
["coalition"] = "blue", ["coalition"] = "blue",

View File

@ -55,7 +55,7 @@ MEgroupsByName =
["livery_id"] = "19th Fighter SQN (AK)", ["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10", ["onboard_num"] = "10",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "F-15C Client #1", ["unitName"] = "F-15C Client #1_unit",
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
@ -87,96 +87,115 @@ MEgroupsByName =
["task"] = "CAP", ["task"] = "CAP",
["uncontrolled"] = false, ["uncontrolled"] = false,
}, -- end of ["F-15C Client #1"] }, -- end of ["F-15C Client #1"]
["tent2"] = ["US Ships"] =
{ {
["coalition"] = "blue", ["groupId"] = 8,
["country"] = "usa", ["groupName"] = "US Ships",
["groupId"] = 16,
["countryId"] = 2,
["category"] = "static",
["groupName"] = "tent2",
["units"] = ["units"] =
{ {
[1] = [1] =
{ {
["shape_name"] = "PalatkaB", ["type"] = "TICONDEROG",
["type"] = "FARP Tent",
["point"] = ["point"] =
{ {
["y"] = 638620, ["y"] = 443857.14285714,
["x"] = -299814.28571429, ["x"] = -355285.71428571,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Fortifications", ["groupId"] = 8,
["country"] = "usa", ["groupName"] = "US Ships",
["groupName"] = "tent2",
["heading"] = 0,
["y"] = 638620,
["x"] = -299814.28571429,
["unitId"] = 38,
["category"] = "static",
["unitName"] = "tent2",
["groupId"] = 16,
["countryId"] = 2,
["coalition"] = "blue",
}, -- end of [1]
}, -- end of ["units"]
}, -- end of ["tent2"]
["Rus Ships #2"] =
{
["groupId"] = 10,
["groupName"] = "Rus Ships #2",
["units"] =
{
[1] =
{
["type"] = "MOSCOW",
["point"] =
{
["y"] = 73571.428571428,
["x"] = -86428.571428571,
}, -- end of ["point"]
["groupId"] = 10,
["groupName"] = "Rus Ships #2",
["skill"] = "Average", ["skill"] = "Average",
["country"] = "russia", ["country"] = "usa",
["coalition"] = "red", ["coalition"] = "blue",
["x"] = -86428.571428571, ["x"] = -355285.71428571,
["heading"] = 1.1755995276042, ["heading"] = 0,
["category"] = "ship", ["category"] = "ship",
["unitName"] = "2ship1", ["unitName"] = "US Ship #1",
["unitId"] = 17, ["unitId"] = 13,
["y"] = 73571.428571428, ["y"] = 443857.14285714,
["countryId"] = 0, ["countryId"] = 2,
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["type"] = "MOSCOW", ["type"] = "TICONDEROG",
["point"] = ["point"] =
{ {
["y"] = 74371.428571428, ["y"] = 444657.14285714,
["x"] = -87228.571428571, ["x"] = -356085.71428571,
}, -- end of ["point"] }, -- end of ["point"]
["groupId"] = 10, ["groupId"] = 8,
["groupName"] = "Rus Ships #2", ["groupName"] = "US Ships",
["skill"] = "Average", ["skill"] = "Average",
["country"] = "russia", ["country"] = "usa",
["coalition"] = "red", ["coalition"] = "blue",
["x"] = -87228.571428571, ["x"] = -356085.71428571,
["heading"] = 1.1755995276042, ["heading"] = 0,
["category"] = "ship", ["category"] = "ship",
["unitName"] = "2ship2", ["unitName"] = "US Ship #2",
["unitId"] = 18, ["unitId"] = 14,
["y"] = 74371.428571428, ["y"] = 444657.14285714,
["countryId"] = 0, ["countryId"] = 2,
}, -- end of [2] }, -- end of [2]
}, -- end of ["units"] }, -- end of ["units"]
["coalition"] = "red", ["coalition"] = "blue",
["category"] = "ship", ["category"] = "ship",
["country"] = "russia", ["country"] = "usa",
["startTime"] = 0, ["startTime"] = 0,
["countryId"] = 0, ["countryId"] = 2,
["hidden"] = false, ["hidden"] = false,
}, -- end of ["Rus Ships #2"] }, -- end of ["US Ships"]
["F-15C Client #2"] =
{
["modulation"] = 0,
["groupId"] = 5,
["frequency"] = 124,
["country"] = "usa",
["groupName"] = "F-15C Client #2",
["units"] =
{
[1] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 668428.57142857,
["x"] = -287000,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10",
["category"] = "plane",
["unitName"] = "F-15C Client #2_unit",
["type"] = "F-15C",
["country"] = "usa",
["psi"] = 0.57883789069348,
["groupId"] = 5,
["groupName"] = "F-15C Client #2",
["callsign"] =
{
[1] = 2,
[2] = 1,
[3] = 1,
["name"] = "Springfield11",
}, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -287000,
["skill"] = "Client",
["heading"] = -0.57883789069348,
["unitId"] = 10,
["y"] = 668428.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"] = "CAP",
["uncontrolled"] = false,
}, -- end of ["F-15C Client #2"]
["A-10C Client #1"] = ["A-10C Client #1"] =
{ {
["modulation"] = 0, ["modulation"] = 0,
@ -198,7 +217,7 @@ MEgroupsByName =
["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)",
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #1", ["unitName"] = "A-10C Client #1_unit",
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
@ -408,40 +427,62 @@ MEgroupsByName =
["task"] = "Ground Nothing", ["task"] = "Ground Nothing",
["groupId"] = 12, ["groupId"] = 12,
}, -- end of ["USTanks2"] }, -- end of ["USTanks2"]
["RuTent2"] = ["Rus Ships #2"] =
{ {
["coalition"] = "red", ["groupId"] = 10,
["country"] = "russia", ["groupName"] = "Rus Ships #2",
["groupId"] = 19,
["countryId"] = 0,
["category"] = "static",
["groupName"] = "RuTent2",
["units"] = ["units"] =
{ {
[1] = [1] =
{ {
["shape_name"] = "PalatkaB", ["type"] = "MOSCOW",
["type"] = "FARP Tent",
["point"] = ["point"] =
{ {
["y"] = 617691.42857143, ["y"] = 73571.428571428,
["x"] = -259071.42857143, ["x"] = -86428.571428571,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Fortifications", ["groupId"] = 10,
["groupName"] = "Rus Ships #2",
["skill"] = "Average",
["country"] = "russia", ["country"] = "russia",
["groupName"] = "RuTent2",
["heading"] = 0,
["y"] = 617691.42857143,
["x"] = -259071.42857143,
["unitId"] = 41,
["category"] = "static",
["unitName"] = "RuTent2",
["groupId"] = 19,
["countryId"] = 0,
["coalition"] = "red", ["coalition"] = "red",
["x"] = -86428.571428571,
["heading"] = 1.1755995276042,
["category"] = "ship",
["unitName"] = "2ship1",
["unitId"] = 17,
["y"] = 73571.428571428,
["countryId"] = 0,
}, -- end of [1] }, -- end of [1]
[2] =
{
["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 [2]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of ["RuTent2"] ["coalition"] = "red",
["category"] = "ship",
["country"] = "russia",
["startTime"] = 0,
["countryId"] = 0,
["hidden"] = false,
}, -- end of ["Rus Ships #2"]
["AH-1s_1"] = ["AH-1s_1"] =
{ {
["modulation"] = 0, ["modulation"] = 0,
@ -667,62 +708,6 @@ MEgroupsByName =
["task"] = "Ground Nothing", ["task"] = "Ground Nothing",
["groupId"] = 11, ["groupId"] = 11,
}, -- end of ["USTanks1"] }, -- end of ["USTanks1"]
["US Ships"] =
{
["groupId"] = 8,
["groupName"] = "US Ships",
["units"] =
{
[1] =
{
["type"] = "TICONDEROG",
["point"] =
{
["y"] = 443857.14285714,
["x"] = -355285.71428571,
}, -- end of ["point"]
["groupId"] = 8,
["groupName"] = "US Ships",
["skill"] = "Average",
["country"] = "usa",
["coalition"] = "blue",
["x"] = -355285.71428571,
["heading"] = 0,
["category"] = "ship",
["unitName"] = "US Ship #1",
["unitId"] = 13,
["y"] = 443857.14285714,
["countryId"] = 2,
}, -- end of [1]
[2] =
{
["type"] = "TICONDEROG",
["point"] =
{
["y"] = 444657.14285714,
["x"] = -356085.71428571,
}, -- end of ["point"]
["groupId"] = 8,
["groupName"] = "US Ships",
["skill"] = "Average",
["country"] = "usa",
["coalition"] = "blue",
["x"] = -356085.71428571,
["heading"] = 0,
["category"] = "ship",
["unitName"] = "US Ship #2",
["unitId"] = 14,
["y"] = 444657.14285714,
["countryId"] = 2,
}, -- end of [2]
}, -- end of ["units"]
["coalition"] = "blue",
["category"] = "ship",
["country"] = "usa",
["startTime"] = 0,
["countryId"] = 2,
["hidden"] = false,
}, -- end of ["US Ships"]
["tent1"] = ["tent1"] =
{ {
["coalition"] = "blue", ["coalition"] = "blue",
@ -791,62 +776,59 @@ MEgroupsByName =
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of ["static"] }, -- end of ["static"]
["Rus Ships #1"] = ["A-10C Client #2"] =
{ {
["groupId"] = 9, ["modulation"] = 0,
["groupName"] = "Rus Ships #1", ["groupId"] = 7,
["frequency"] = 251,
["country"] = "usa",
["groupName"] = "A-10C Client #2",
["units"] = ["units"] =
{ {
[1] = [1] =
{ {
["type"] = "MOSCOW", ["alt"] = 2000,
["point"] = ["point"] =
{ {
["y"] = 200000, ["y"] = 644428.57142857,
["x"] = -34285.714285714, ["x"] = -315857.14285714,
}, -- end of ["point"] }, -- end of ["point"]
["groupId"] = 9, ["alt_type"] = "BARO",
["groupName"] = "Rus Ships #1", ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)",
["skill"] = "Average", ["onboard_num"] = "52",
["country"] = "russia", ["category"] = "plane",
["coalition"] = "red", ["unitName"] = "A-10C Client #2_unit",
["x"] = -34285.714285714, ["type"] = "A-10C",
["heading"] = 0, ["country"] = "usa",
["category"] = "ship", ["psi"] = 0.66079849060746,
["unitName"] = "1ship1", ["groupId"] = 7,
["unitId"] = 15, ["groupName"] = "A-10C Client #2",
["y"] = 200000, ["callsign"] =
["countryId"] = 0, {
[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 [1]
[2] =
{
["type"] = "MOSCOW",
["point"] =
{
["y"] = 200800,
["x"] = -35085.714285714,
}, -- end of ["point"]
["groupId"] = 9,
["groupName"] = "Rus Ships #1",
["skill"] = "Average",
["country"] = "russia",
["coalition"] = "red",
["x"] = -35085.714285714,
["heading"] = 0,
["category"] = "ship",
["unitName"] = "1ship2",
["unitId"] = 16,
["y"] = 200800,
["countryId"] = 0,
}, -- end of [2]
}, -- end of ["units"] }, -- end of ["units"]
["coalition"] = "red", ["countryId"] = 2,
["category"] = "ship", ["radioSet"] = false,
["country"] = "russia",
["startTime"] = 0,
["countryId"] = 0,
["hidden"] = false, ["hidden"] = false,
}, -- end of ["Rus Ships #1"] ["category"] = "plane",
["coalition"] = "blue",
["startTime"] = 0,
["task"] = "CAS",
["uncontrolled"] = false,
}, -- end of ["A-10C Client #2"]
["cloneCargoBase"] = ["cloneCargoBase"] =
{ {
["coalition"] = "blue", ["coalition"] = "blue",
@ -903,7 +885,7 @@ MEgroupsByName =
["livery_id"] = "279th kiap 1st squad navy", ["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "Su-33 Client #1", ["unitName"] = "Su-33 Client #1Unit",
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
@ -919,6 +901,62 @@ MEgroupsByName =
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [1] }, -- end of [1]
[2] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590431.42857142,
["x"] = -250225.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "010",
["category"] = "plane",
["unitName"] = "Su-33 Client #2Unit",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 20,
["groupName"] = "Su-33 Client #1",
["callsign"] = 105,
["countryId"] = 0,
["x"] = -250225.71428571,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 47,
["y"] = 590431.42857142,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of [2]
[3] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590471.42857142,
["x"] = -250265.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "054",
["category"] = "plane",
["unitName"] = "Su-33 Client #3Unit",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 20,
["groupName"] = "Su-33 Client #1",
["callsign"] = 106,
["countryId"] = 0,
["x"] = -250265.71428571,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 48,
["y"] = 590471.42857142,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of [3]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 0, ["countryId"] = 0,
["radioSet"] = false, ["radioSet"] = false,
@ -929,59 +967,62 @@ MEgroupsByName =
["task"] = "CAP", ["task"] = "CAP",
["uncontrolled"] = false, ["uncontrolled"] = false,
}, -- end of ["Su-33 Client #1"] }, -- end of ["Su-33 Client #1"]
["A-10C Client #2"] = ["Rus Ships #1"] =
{ {
["modulation"] = 0, ["groupId"] = 9,
["groupId"] = 7, ["groupName"] = "Rus Ships #1",
["frequency"] = 251,
["country"] = "usa",
["groupName"] = "A-10C Client #2",
["units"] = ["units"] =
{ {
[1] = [1] =
{ {
["alt"] = 2000, ["type"] = "MOSCOW",
["point"] = ["point"] =
{ {
["y"] = 644428.57142857, ["y"] = 200000,
["x"] = -315857.14285714, ["x"] = -34285.714285714,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["groupId"] = 9,
["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", ["groupName"] = "Rus Ships #1",
["onboard_num"] = "52", ["skill"] = "Average",
["category"] = "plane", ["country"] = "russia",
["unitName"] = "A-10C Client #2", ["coalition"] = "red",
["type"] = "A-10C", ["x"] = -34285.714285714,
["country"] = "usa", ["heading"] = 0,
["psi"] = 0.66079849060746, ["category"] = "ship",
["groupId"] = 7, ["unitName"] = "1ship1",
["groupName"] = "A-10C Client #2", ["unitId"] = 15,
["callsign"] = ["y"] = 200000,
{ ["countryId"] = 0,
[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 [1]
[2] =
{
["type"] = "MOSCOW",
["point"] =
{
["y"] = 200800,
["x"] = -35085.714285714,
}, -- end of ["point"]
["groupId"] = 9,
["groupName"] = "Rus Ships #1",
["skill"] = "Average",
["country"] = "russia",
["coalition"] = "red",
["x"] = -35085.714285714,
["heading"] = 0,
["category"] = "ship",
["unitName"] = "1ship2",
["unitId"] = 16,
["y"] = 200800,
["countryId"] = 0,
}, -- end of [2]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 2, ["coalition"] = "red",
["radioSet"] = false, ["category"] = "ship",
["hidden"] = false, ["country"] = "russia",
["category"] = "plane",
["coalition"] = "blue",
["startTime"] = 0, ["startTime"] = 0,
["task"] = "CAS", ["countryId"] = 0,
["uncontrolled"] = false, ["hidden"] = false,
}, -- end of ["A-10C Client #2"] }, -- end of ["Rus Ships #1"]
["RU Farp"] = ["RU Farp"] =
{ {
["coalition"] = "red", ["coalition"] = "red",
@ -1118,59 +1159,40 @@ MEgroupsByName =
["task"] = "Ground Nothing", ["task"] = "Ground Nothing",
["groupId"] = 14, ["groupId"] = 14,
}, -- end of ["RuTanks"] }, -- end of ["RuTanks"]
["F-15C Client #2"] = ["tent2"] =
{ {
["modulation"] = 0, ["coalition"] = "blue",
["groupId"] = 5,
["frequency"] = 124,
["country"] = "usa", ["country"] = "usa",
["groupName"] = "F-15C Client #2", ["groupId"] = 16,
["countryId"] = 2,
["category"] = "static",
["groupName"] = "tent2",
["units"] = ["units"] =
{ {
[1] = [1] =
{ {
["alt"] = 2000, ["shape_name"] = "PalatkaB",
["type"] = "FARP Tent",
["point"] = ["point"] =
{ {
["y"] = 668428.57142857, ["y"] = 638620,
["x"] = -287000, ["x"] = -299814.28571429,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["categoryStatic"] = "Fortifications",
["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10",
["category"] = "plane",
["unitName"] = "F-15C Client #2",
["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["groupName"] = "tent2",
["groupId"] = 5, ["heading"] = 0,
["groupName"] = "F-15C Client #2", ["y"] = 638620,
["callsign"] = ["x"] = -299814.28571429,
{ ["unitId"] = 38,
[1] = 2, ["category"] = "static",
[2] = 1, ["unitName"] = "tent2",
[3] = 1, ["groupId"] = 16,
["name"] = "Springfield11",
}, -- end of ["callsign"]
["countryId"] = 2, ["countryId"] = 2,
["x"] = -287000,
["skill"] = "Client",
["heading"] = -0.57883789069348,
["unitId"] = 10,
["y"] = 668428.57142857,
["coalition"] = "blue", ["coalition"] = "blue",
["speed"] = 138.88888888889,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 2, }, -- end of ["tent2"]
["radioSet"] = false,
["hidden"] = false,
["category"] = "plane",
["coalition"] = "blue",
["startTime"] = 0,
["task"] = "CAP",
["uncontrolled"] = false,
}, -- end of ["F-15C Client #2"]
["Mi-8s_1"] = ["Mi-8s_1"] =
{ {
["modulation"] = 1, ["modulation"] = 1,
@ -1193,19 +1215,24 @@ MEgroupsByName =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1", ["unitName"] = "Mi-8s_1_1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 103,
["countryId"] = 0,
["x"] = -243285.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243285.71428571,
["callsign"] = 103,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 5, ["unitId"] = 5,
["y"] = 603285.71428571, ["y"] = 603285.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [1] }, -- end of [1]
[2] = [2] =
@ -1221,19 +1248,24 @@ MEgroupsByName =
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1 #1", ["unitName"] = "Mi-8s_1_1 #1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 102,
["countryId"] = 0,
["x"] = -243325.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243325.71428571,
["callsign"] = 102,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 6, ["unitId"] = 6,
["y"] = 603325.71428571, ["y"] = 603325.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [2] }, -- end of [2]
}, -- end of ["units"] }, -- end of ["units"]
@ -1246,53 +1278,40 @@ MEgroupsByName =
["task"] = "Transport", ["task"] = "Transport",
["uncontrolled"] = false, ["uncontrolled"] = false,
}, -- end of ["Mi-8s_1"] }, -- end of ["Mi-8s_1"]
["Su-33 Client #2"] = ["RuTent2"] =
{ {
["modulation"] = 0, ["coalition"] = "red",
["groupId"] = 21,
["frequency"] = 124,
["country"] = "russia", ["country"] = "russia",
["groupName"] = "Su-33 Client #2", ["groupId"] = 19,
["countryId"] = 0,
["category"] = "static",
["groupName"] = "RuTent2",
["units"] = ["units"] =
{ {
[1] = [1] =
{ {
["alt"] = 2000, ["shape_name"] = "PalatkaB",
["type"] = "FARP Tent",
["point"] = ["point"] =
{ {
["y"] = 597819.99999999, ["y"] = 617691.42857143,
["x"] = -235614.28571428, ["x"] = -259071.42857143,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["categoryStatic"] = "Fortifications",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53",
["category"] = "plane",
["unitName"] = "Su-33 Client #2",
["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["groupName"] = "RuTent2",
["groupId"] = 21,
["groupName"] = "Su-33 Client #2",
["callsign"] = 104,
["countryId"] = 0,
["x"] = -235614.28571428,
["skill"] = "Client",
["heading"] = 0, ["heading"] = 0,
["unitId"] = 43, ["y"] = 617691.42857143,
["y"] = 597819.99999999, ["x"] = -259071.42857143,
["unitId"] = 41,
["category"] = "static",
["unitName"] = "RuTent2",
["groupId"] = 19,
["countryId"] = 0,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 0, }, -- end of ["RuTent2"]
["radioSet"] = false,
["hidden"] = false,
["category"] = "plane",
["coalition"] = "red",
["startTime"] = 0,
["task"] = "CAP",
["uncontrolled"] = false,
}, -- end of ["Su-33 Client #2"]
["RuBTRs"] = ["RuBTRs"] =
{ {
["country"] = "russia", ["country"] = "russia",

View File

@ -434,7 +434,7 @@ MEunits =
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
["unitName"] = "F-15C Client #1", ["unitName"] = "F-15C Client #1_unit",
["groupName"] = "F-15C Client #1", ["groupName"] = "F-15C Client #1",
["coalition"] = "blue", ["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
@ -487,7 +487,7 @@ MEunits =
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
["unitName"] = "F-15C Client #2", ["unitName"] = "F-15C Client #2_unit",
["groupName"] = "F-15C Client #2", ["groupName"] = "F-15C Client #2",
["coalition"] = "blue", ["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
@ -540,7 +540,7 @@ MEunits =
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
["unitName"] = "A-10C Client #1", ["unitName"] = "A-10C Client #1_unit",
["groupName"] = "A-10C Client #1", ["groupName"] = "A-10C Client #1",
["coalition"] = "blue", ["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
@ -593,7 +593,7 @@ MEunits =
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
["unitName"] = "A-10C Client #2", ["unitName"] = "A-10C Client #2_unit",
["groupName"] = "A-10C Client #2", ["groupName"] = "A-10C Client #2",
["coalition"] = "blue", ["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
@ -1030,6 +1030,11 @@ MEunits =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "helicopter", ["category"] = "helicopter",
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
@ -1041,8 +1046,8 @@ MEunits =
["y"] = 603285.71428571, ["y"] = 603285.71428571,
["unitId"] = 5, ["unitId"] = 5,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["skill"] = "Random",
["callsign"] = 103, ["callsign"] = 103,
["skill"] = "Random",
["groupId"] = 3, ["groupId"] = 3,
}, -- end of [1] }, -- end of [1]
[2] = [2] =
@ -1058,6 +1063,11 @@ MEunits =
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "helicopter", ["category"] = "helicopter",
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
@ -1069,8 +1079,8 @@ MEunits =
["y"] = 603325.71428571, ["y"] = 603325.71428571,
["unitId"] = 6, ["unitId"] = 6,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["skill"] = "Random",
["callsign"] = 102, ["callsign"] = 102,
["skill"] = "Random",
["groupId"] = 3, ["groupId"] = 3,
}, -- end of [2] }, -- end of [2]
}, -- end of ["units"] }, -- end of ["units"]
@ -1364,7 +1374,7 @@ MEunits =
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
["unitName"] = "Su-33 Client #1", ["unitName"] = "Su-33 Client #1Unit",
["groupName"] = "Su-33 Client #1", ["groupName"] = "Su-33 Client #1",
["coalition"] = "red", ["coalition"] = "red",
["countryId"] = 0, ["countryId"] = 0,
@ -1376,53 +1386,62 @@ MEunits =
["callsign"] = 104, ["callsign"] = 104,
["groupId"] = 20, ["groupId"] = 20,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"]
["countryId"] = 0,
["radioSet"] = false,
["hidden"] = false,
["category"] = "plane",
["coalition"] = "red",
["startTime"] = 0,
["task"] = "CAP",
["frequency"] = 124,
}, -- end of [1]
[2] = [2] =
{
["modulation"] = 0,
["country"] = "russia",
["uncontrolled"] = false,
["groupId"] = 21,
["groupName"] = "Su-33 Client #2",
["units"] =
{
[1] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
{ {
["y"] = 597819.99999999, ["y"] = 590431.42857142,
["x"] = -235614.28571428, ["x"] = -250225.71428571,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy", ["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53", ["onboard_num"] = "010",
["category"] = "plane", ["category"] = "plane",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
["unitName"] = "Su-33 Client #2", ["unitName"] = "Su-33 Client #2Unit",
["groupName"] = "Su-33 Client #2", ["groupName"] = "Su-33 Client #1",
["coalition"] = "red", ["coalition"] = "red",
["countryId"] = 0, ["countryId"] = 0,
["x"] = -235614.28571428, ["x"] = -250225.71428571,
["y"] = 597819.99999999, ["y"] = 590431.42857142,
["unitId"] = 43, ["unitId"] = 47,
["heading"] = 0, ["heading"] = 0,
["skill"] = "Client", ["skill"] = "Client",
["callsign"] = 104, ["callsign"] = 105,
["groupId"] = 21, ["groupId"] = 20,
}, -- end of [1] }, -- end of [2]
[3] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590471.42857142,
["x"] = -250265.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "054",
["category"] = "plane",
["speed"] = 138.88888888889,
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["unitName"] = "Su-33 Client #3Unit",
["groupName"] = "Su-33 Client #1",
["coalition"] = "red",
["countryId"] = 0,
["x"] = -250265.71428571,
["y"] = 590471.42857142,
["unitId"] = 48,
["heading"] = 0,
["skill"] = "Client",
["callsign"] = 106,
["groupId"] = 20,
}, -- end of [3]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 0, ["countryId"] = 0,
["radioSet"] = false, ["radioSet"] = false,
@ -1432,7 +1451,7 @@ MEunits =
["startTime"] = 0, ["startTime"] = 0,
["task"] = "CAP", ["task"] = "CAP",
["frequency"] = 124, ["frequency"] = 124,
}, -- end of [2] }, -- end of [1]
}, -- end of ["plane"] }, -- end of ["plane"]
["static"] = ["static"] =
{ {

View File

@ -139,19 +139,24 @@ MEunitsByCat =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1", ["unitName"] = "Mi-8s_1_1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 103,
["countryId"] = 0,
["x"] = -243285.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243285.71428571,
["callsign"] = 103,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 5, ["unitId"] = 5,
["y"] = 603285.71428571, ["y"] = 603285.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [5] }, -- end of [5]
[6] = [6] =
@ -167,19 +172,24 @@ MEunitsByCat =
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1 #1", ["unitName"] = "Mi-8s_1_1 #1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 102,
["countryId"] = 0,
["x"] = -243325.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243325.71428571,
["callsign"] = 102,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 6, ["unitId"] = 6,
["y"] = 603325.71428571, ["y"] = 603325.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [6] }, -- end of [6]
}, -- end of ["helicopter"] }, -- end of ["helicopter"]
@ -506,7 +516,7 @@ MEunitsByCat =
["livery_id"] = "19th Fighter SQN (AK)", ["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10", ["onboard_num"] = "10",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "F-15C Client #1", ["unitName"] = "F-15C Client #1_unit",
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
@ -540,7 +550,7 @@ MEunitsByCat =
["livery_id"] = "19th Fighter SQN (AK)", ["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10", ["onboard_num"] = "10",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "F-15C Client #2", ["unitName"] = "F-15C Client #2_unit",
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
@ -574,7 +584,7 @@ MEunitsByCat =
["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)",
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #1", ["unitName"] = "A-10C Client #1_unit",
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
@ -608,7 +618,7 @@ MEunitsByCat =
["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)",
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #2", ["unitName"] = "A-10C Client #2_unit",
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
@ -642,7 +652,7 @@ MEunitsByCat =
["livery_id"] = "279th kiap 1st squad navy", ["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "Su-33 Client #1", ["unitName"] = "Su-33 Client #1Unit",
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
@ -663,29 +673,57 @@ MEunitsByCat =
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
{ {
["y"] = 597819.99999999, ["y"] = 590431.42857142,
["x"] = -235614.28571428, ["x"] = -250225.71428571,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy", ["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53", ["onboard_num"] = "010",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "Su-33 Client #2", ["unitName"] = "Su-33 Client #2Unit",
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
["groupId"] = 21, ["groupId"] = 20,
["groupName"] = "Su-33 Client #2", ["groupName"] = "Su-33 Client #1",
["callsign"] = 104, ["callsign"] = 105,
["countryId"] = 0, ["countryId"] = 0,
["x"] = -235614.28571428, ["x"] = -250225.71428571,
["skill"] = "Client", ["skill"] = "Client",
["heading"] = 0, ["heading"] = 0,
["unitId"] = 43, ["unitId"] = 47,
["y"] = 597819.99999999, ["y"] = 590431.42857142,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [6] }, -- end of [6]
[7] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590471.42857142,
["x"] = -250265.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "054",
["category"] = "plane",
["unitName"] = "Su-33 Client #3Unit",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 20,
["groupName"] = "Su-33 Client #1",
["callsign"] = 106,
["countryId"] = 0,
["x"] = -250265.71428571,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 48,
["y"] = 590471.42857142,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of [7]
}, -- end of ["plane"] }, -- end of ["plane"]
["vehicle"] = ["vehicle"] =
{ {

View File

@ -137,19 +137,24 @@ MEunitsById =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1", ["unitName"] = "Mi-8s_1_1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 103,
["countryId"] = 0,
["x"] = -243285.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243285.71428571,
["callsign"] = 103,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 5, ["unitId"] = 5,
["y"] = 603285.71428571, ["y"] = 603285.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [5] }, -- end of [5]
[6] = [6] =
@ -165,19 +170,24 @@ MEunitsById =
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1 #1", ["unitName"] = "Mi-8s_1_1 #1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 102,
["countryId"] = 0,
["x"] = -243325.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243325.71428571,
["callsign"] = 102,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 6, ["unitId"] = 6,
["y"] = 603325.71428571, ["y"] = 603325.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [6] }, -- end of [6]
[8] = [8] =
@ -192,7 +202,7 @@ MEunitsById =
["livery_id"] = "19th Fighter SQN (AK)", ["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10", ["onboard_num"] = "10",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "F-15C Client #1", ["unitName"] = "F-15C Client #1_unit",
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
@ -226,7 +236,7 @@ MEunitsById =
["livery_id"] = "19th Fighter SQN (AK)", ["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10", ["onboard_num"] = "10",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "F-15C Client #2", ["unitName"] = "F-15C Client #2_unit",
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
@ -260,7 +270,7 @@ MEunitsById =
["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)",
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #1", ["unitName"] = "A-10C Client #1_unit",
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
@ -294,7 +304,7 @@ MEunitsById =
["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)",
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #2", ["unitName"] = "A-10C Client #2_unit",
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
@ -959,7 +969,7 @@ MEunitsById =
["livery_id"] = "279th kiap 1st squad navy", ["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "Su-33 Client #1", ["unitName"] = "Su-33 Client #1Unit",
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
@ -975,34 +985,6 @@ MEunitsById =
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [42] }, -- end of [42]
[43] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 597819.99999999,
["x"] = -235614.28571428,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53",
["category"] = "plane",
["unitName"] = "Su-33 Client #2",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 21,
["groupName"] = "Su-33 Client #2",
["callsign"] = 104,
["countryId"] = 0,
["x"] = -235614.28571428,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 43,
["y"] = 597819.99999999,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of [43]
[44] = [44] =
{ {
["type"] = "Sandbox", ["type"] = "Sandbox",
@ -1071,4 +1053,60 @@ MEunitsById =
["categoryStatic"] = "Cargos", ["categoryStatic"] = "Cargos",
["coalition"] = "blue", ["coalition"] = "blue",
}, -- end of [46] }, -- end of [46]
[47] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590431.42857142,
["x"] = -250225.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "010",
["category"] = "plane",
["unitName"] = "Su-33 Client #2Unit",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 20,
["groupName"] = "Su-33 Client #1",
["callsign"] = 105,
["countryId"] = 0,
["x"] = -250225.71428571,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 47,
["y"] = 590431.42857142,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of [47]
[48] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590471.42857142,
["x"] = -250265.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "054",
["category"] = "plane",
["unitName"] = "Su-33 Client #3Unit",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 20,
["groupName"] = "Su-33 Client #1",
["callsign"] = 106,
["countryId"] = 0,
["x"] = -250265.71428571,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 48,
["y"] = 590471.42857142,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of [48]
} -- end of MEunitsById } -- end of MEunitsById

View File

@ -44,6 +44,34 @@ MEunitsByName =
["heading"] = 0, ["heading"] = 0,
["countryId"] = 2, ["countryId"] = 2,
}, -- end of ["USTanks1_1"] }, -- end of ["USTanks1_1"]
["Su-33 Client #3Unit"] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590471.42857142,
["x"] = -250265.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "054",
["category"] = "plane",
["unitName"] = "Su-33 Client #3Unit",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 20,
["groupName"] = "Su-33 Client #1",
["callsign"] = 106,
["countryId"] = 0,
["x"] = -250265.71428571,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 48,
["y"] = 590471.42857142,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of ["Su-33 Client #3Unit"]
["RuTanks4"] = ["RuTanks4"] =
{ {
["type"] = "T-55", ["type"] = "T-55",
@ -232,19 +260,24 @@ MEunitsByName =
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1 #1", ["unitName"] = "Mi-8s_1_1 #1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 102,
["countryId"] = 0,
["x"] = -243325.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243325.71428571,
["callsign"] = 102,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 6, ["unitId"] = 6,
["y"] = 603325.71428571, ["y"] = 603325.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of ["Mi-8s_1_1 #1"] }, -- end of ["Mi-8s_1_1 #1"]
["tent1"] = ["tent1"] =
@ -380,6 +413,40 @@ MEunitsByName =
["heading"] = 0, ["heading"] = 0,
["countryId"] = 2, ["countryId"] = 2,
}, -- end of ["USTanks1_2"] }, -- end of ["USTanks1_2"]
["A-10C Client #2_unit"] =
{
["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 ["A-10C Client #2_unit"]
["US Ship #2"] = ["US Ship #2"] =
{ {
["type"] = "TICONDEROG", ["type"] = "TICONDEROG",
@ -401,40 +468,6 @@ MEunitsByName =
["y"] = 444657.14285714, ["y"] = 444657.14285714,
["countryId"] = 2, ["countryId"] = 2,
}, -- end of ["US Ship #2"] }, -- end of ["US Ship #2"]
["A-10C Client #2"] =
{
["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",
["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 ["A-10C Client #2"]
["USTanks1_3"] = ["USTanks1_3"] =
{ {
["type"] = "M-1 Abrams", ["type"] = "M-1 Abrams",
@ -622,84 +655,28 @@ MEunitsByName =
["countryId"] = 0, ["countryId"] = 0,
["coalition"] = "red", ["coalition"] = "red",
}, -- end of ["RuTent2"] }, -- end of ["RuTent2"]
["RuBTRs1"] = ["USTanks2_4"] =
{
["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"]
["A-10C Client #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",
["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 ["A-10C Client #1"]
["USTanks1_4"] =
{ {
["type"] = "M-1 Abrams", ["type"] = "M-1 Abrams",
["point"] = ["point"] =
{ {
["y"] = 639920, ["y"] = 653291.42857143,
["x"] = -294805.71428571, ["x"] = -293205.71428571,
}, -- end of ["point"] }, -- end of ["point"]
["groupId"] = 11, ["groupId"] = 12,
["skill"] = "Average", ["skill"] = "Average",
["country"] = "usa", ["country"] = "usa",
["groupName"] = "USTanks1", ["groupName"] = "USTanks2",
["y"] = 639920, ["y"] = 653291.42857143,
["coalition"] = "blue", ["coalition"] = "blue",
["x"] = -294805.71428571, ["x"] = -293205.71428571,
["unitId"] = 22, ["unitId"] = 26,
["category"] = "vehicle", ["category"] = "vehicle",
["unitName"] = "USTanks1_4", ["unitName"] = "USTanks2_4",
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["heading"] = 0, ["heading"] = 1.4977557614926,
["countryId"] = 2, ["countryId"] = 2,
}, -- end of ["USTanks1_4"] }, -- end of ["USTanks2_4"]
["cargoBob"] = ["cargoBob"] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
@ -723,6 +700,50 @@ MEunitsByName =
["categoryStatic"] = "Cargos", ["categoryStatic"] = "Cargos",
["coalition"] = "blue", ["coalition"] = "blue",
}, -- end of ["cargoBob"] }, -- end of ["cargoBob"]
["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"]
["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"]
["Mi-8s_1_1"] = ["Mi-8s_1_1"] =
{ {
["alt"] = 500, ["alt"] = 500,
@ -736,19 +757,24 @@ MEunitsByName =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1", ["unitName"] = "Mi-8s_1_1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 103,
["countryId"] = 0,
["x"] = -243285.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243285.71428571,
["callsign"] = 103,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 5, ["unitId"] = 5,
["y"] = 603285.71428571, ["y"] = 603285.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of ["Mi-8s_1_1"] }, -- end of ["Mi-8s_1_1"]
["US Ship #1"] = ["US Ship #1"] =
@ -772,45 +798,24 @@ MEunitsByName =
["y"] = 443857.14285714, ["y"] = 443857.14285714,
["countryId"] = 2, ["countryId"] = 2,
}, -- end of ["US Ship #1"] }, -- end of ["US Ship #1"]
["2ship1"] = ["F-15C Client #2_unit"] =
{
["type"] = "MOSCOW",
["point"] =
{
["y"] = 73571.428571428,
["x"] = -86428.571428571,
}, -- end of ["point"]
["groupId"] = 10,
["groupName"] = "Rus Ships #2",
["skill"] = "Average",
["country"] = "russia",
["coalition"] = "red",
["x"] = -86428.571428571,
["heading"] = 1.1755995276042,
["category"] = "ship",
["unitName"] = "2ship1",
["unitId"] = 17,
["y"] = 73571.428571428,
["countryId"] = 0,
}, -- end of ["2ship1"]
["F-15C Client #1"] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
{ {
["y"] = 662142.85714286, ["y"] = 668428.57142857,
["x"] = -288142.85714286, ["x"] = -287000,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "19th Fighter SQN (AK)", ["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10", ["onboard_num"] = "10",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "F-15C Client #1", ["unitName"] = "F-15C Client #2_unit",
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
["groupId"] = 4, ["groupId"] = 5,
["groupName"] = "F-15C Client #1", ["groupName"] = "F-15C Client #2",
["callsign"] = ["callsign"] =
{ {
[1] = 2, [1] = 2,
@ -819,14 +824,14 @@ MEunitsByName =
["name"] = "Springfield11", ["name"] = "Springfield11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["countryId"] = 2, ["countryId"] = 2,
["x"] = -288142.85714286, ["x"] = -287000,
["skill"] = "Client", ["skill"] = "Client",
["heading"] = -0.57883789069348, ["heading"] = -0.57883789069348,
["unitId"] = 8, ["unitId"] = 10,
["y"] = 662142.85714286, ["y"] = 668428.57142857,
["coalition"] = "blue", ["coalition"] = "blue",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of ["F-15C Client #1"] }, -- end of ["F-15C Client #2_unit"]
["RuBTRs5"] = ["RuBTRs5"] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
@ -871,6 +876,68 @@ MEunitsByName =
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of ["RuBTRs3"] }, -- end of ["RuBTRs3"]
["Su-33 Client #1Unit"] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590391.42857142,
["x"] = -250185.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53",
["category"] = "plane",
["unitName"] = "Su-33 Client #1Unit",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 20,
["groupName"] = "Su-33 Client #1",
["callsign"] = 104,
["countryId"] = 0,
["x"] = -250185.71428571,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 42,
["y"] = 590391.42857142,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of ["Su-33 Client #1Unit"]
["F-15C Client #1_unit"] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 662142.85714286,
["x"] = -288142.85714286,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10",
["category"] = "plane",
["unitName"] = "F-15C Client #1_unit",
["type"] = "F-15C",
["country"] = "usa",
["psi"] = 0.57883789069348,
["groupId"] = 4,
["groupName"] = "F-15C Client #1",
["callsign"] =
{
[1] = 2,
[2] = 1,
[3] = 1,
["name"] = "Springfield11",
}, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -288142.85714286,
["skill"] = "Client",
["heading"] = -0.57883789069348,
["unitId"] = 8,
["y"] = 662142.85714286,
["coalition"] = "blue",
["speed"] = 138.88888888889,
}, -- end of ["F-15C Client #1_unit"]
["RuBTRs6"] = ["RuBTRs6"] =
{ {
["type"] = "BTR-80", ["type"] = "BTR-80",
@ -937,118 +1004,89 @@ MEunitsByName =
["heading"] = 0, ["heading"] = 0,
["countryId"] = 0, ["countryId"] = 0,
}, -- end of ["RuTanks2"] }, -- end of ["RuTanks2"]
["Su-33 Client #1"] = ["A-10C Client #1_unit"] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
{ {
["y"] = 590391.42857142, ["y"] = 636428.57142857,
["x"] = -250185.71428571, ["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 ["A-10C Client #1_unit"]
["Su-33 Client #2Unit"] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590431.42857142,
["x"] = -250225.71428571,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy", ["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53", ["onboard_num"] = "010",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "Su-33 Client #1", ["unitName"] = "Su-33 Client #2Unit",
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
["groupId"] = 20, ["groupId"] = 20,
["groupName"] = "Su-33 Client #1", ["groupName"] = "Su-33 Client #1",
["callsign"] = 104, ["callsign"] = 105,
["countryId"] = 0, ["countryId"] = 0,
["x"] = -250185.71428571, ["x"] = -250225.71428571,
["skill"] = "Client", ["skill"] = "Client",
["heading"] = 0, ["heading"] = 0,
["unitId"] = 42, ["unitId"] = 47,
["y"] = 590391.42857142, ["y"] = 590431.42857142,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of ["Su-33 Client #1"] }, -- end of ["Su-33 Client #2Unit"]
["F-15C Client #2"] = ["2ship1"] =
{ {
["alt"] = 2000, ["type"] = "MOSCOW",
["point"] = ["point"] =
{ {
["y"] = 668428.57142857, ["y"] = 73571.428571428,
["x"] = -287000, ["x"] = -86428.571428571,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["groupId"] = 10,
["livery_id"] = "19th Fighter SQN (AK)", ["groupName"] = "Rus Ships #2",
["onboard_num"] = "10",
["category"] = "plane",
["unitName"] = "F-15C Client #2",
["type"] = "F-15C",
["country"] = "usa",
["psi"] = 0.57883789069348,
["groupId"] = 5,
["groupName"] = "F-15C Client #2",
["callsign"] =
{
[1] = 2,
[2] = 1,
[3] = 1,
["name"] = "Springfield11",
}, -- end of ["callsign"]
["countryId"] = 2,
["x"] = -287000,
["skill"] = "Client",
["heading"] = -0.57883789069348,
["unitId"] = 10,
["y"] = 668428.57142857,
["coalition"] = "blue",
["speed"] = 138.88888888889,
}, -- end of ["F-15C Client #2"]
["USTanks2_4"] =
{
["type"] = "M-1 Abrams",
["point"] =
{
["y"] = 653291.42857143,
["x"] = -293205.71428571,
}, -- end of ["point"]
["groupId"] = 12,
["skill"] = "Average", ["skill"] = "Average",
["country"] = "usa",
["groupName"] = "USTanks2",
["y"] = 653291.42857143,
["coalition"] = "blue",
["x"] = -293205.71428571,
["unitId"] = 26,
["category"] = "vehicle",
["unitName"] = "USTanks2_4",
["playerCanDrive"] = true,
["heading"] = 1.4977557614926,
["countryId"] = 2,
}, -- end of ["USTanks2_4"]
["Su-33 Client #2"] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 597819.99999999,
["x"] = -235614.28571428,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53",
["category"] = "plane",
["unitName"] = "Su-33 Client #2",
["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0,
["groupId"] = 21,
["groupName"] = "Su-33 Client #2",
["callsign"] = 104,
["countryId"] = 0,
["x"] = -235614.28571428,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 43,
["y"] = 597819.99999999,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889, ["x"] = -86428.571428571,
}, -- end of ["Su-33 Client #2"] ["heading"] = 1.1755995276042,
["category"] = "ship",
["unitName"] = "2ship1",
["unitId"] = 17,
["y"] = 73571.428571428,
["countryId"] = 0,
}, -- end of ["2ship1"]
["USTanks2_3"] = ["USTanks2_3"] =
{ {
["type"] = "M-1 Abrams", ["type"] = "M-1 Abrams",

View File

@ -342,7 +342,7 @@ MEunitsByNum =
["livery_id"] = "19th Fighter SQN (AK)", ["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10", ["onboard_num"] = "10",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "F-15C Client #1", ["unitName"] = "F-15C Client #1_unit",
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
@ -376,7 +376,7 @@ MEunitsByNum =
["livery_id"] = "19th Fighter SQN (AK)", ["livery_id"] = "19th Fighter SQN (AK)",
["onboard_num"] = "10", ["onboard_num"] = "10",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "F-15C Client #2", ["unitName"] = "F-15C Client #2_unit",
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
@ -410,7 +410,7 @@ MEunitsByNum =
["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)",
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #1", ["unitName"] = "A-10C Client #1_unit",
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
@ -444,7 +444,7 @@ MEunitsByNum =
["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)", ["livery_id"] = "104th FS Maryland ANG, Baltimore (MD)",
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "A-10C Client #2", ["unitName"] = "A-10C Client #2_unit",
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
@ -915,7 +915,7 @@ MEunitsByNum =
["livery_id"] = "279th kiap 1st squad navy", ["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "Su-33 Client #1", ["unitName"] = "Su-33 Client #1Unit",
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
@ -936,30 +936,58 @@ MEunitsByNum =
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
{ {
["y"] = 597819.99999999, ["y"] = 590431.42857142,
["x"] = -235614.28571428, ["x"] = -250225.71428571,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy", ["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53", ["onboard_num"] = "010",
["category"] = "plane", ["category"] = "plane",
["unitName"] = "Su-33 Client #2", ["unitName"] = "Su-33 Client #2Unit",
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
["groupId"] = 21, ["groupId"] = 20,
["groupName"] = "Su-33 Client #2", ["groupName"] = "Su-33 Client #1",
["callsign"] = 104, ["callsign"] = 105,
["countryId"] = 0, ["countryId"] = 0,
["x"] = -235614.28571428, ["x"] = -250225.71428571,
["skill"] = "Client", ["skill"] = "Client",
["heading"] = 0, ["heading"] = 0,
["unitId"] = 43, ["unitId"] = 47,
["y"] = 597819.99999999, ["y"] = 590431.42857142,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
}, -- end of [40] }, -- end of [40]
[41] = [41] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590471.42857142,
["x"] = -250265.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "054",
["category"] = "plane",
["unitName"] = "Su-33 Client #3Unit",
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["groupId"] = 20,
["groupName"] = "Su-33 Client #1",
["callsign"] = 106,
["countryId"] = 0,
["x"] = -250265.71428571,
["skill"] = "Client",
["heading"] = 0,
["unitId"] = 48,
["y"] = 590471.42857142,
["coalition"] = "red",
["speed"] = 138.88888888889,
}, -- end of [41]
[42] =
{ {
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
@ -986,8 +1014,8 @@ MEunitsByNum =
["y"] = 615000, ["y"] = 615000,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [41] }, -- end of [42]
[42] = [43] =
{ {
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
@ -1014,8 +1042,8 @@ MEunitsByNum =
["y"] = 615040, ["y"] = 615040,
["coalition"] = "red", ["coalition"] = "red",
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [42] }, -- end of [43]
[43] = [44] =
{ {
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
@ -1028,22 +1056,27 @@ MEunitsByNum =
["onboard_num"] = "52", ["onboard_num"] = "52",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1", ["unitName"] = "Mi-8s_1_1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 103,
["countryId"] = 0,
["x"] = -243285.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243285.71428571,
["callsign"] = 103,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 5, ["unitId"] = 5,
["y"] = 603285.71428571, ["y"] = 603285.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [43] }, -- end of [44]
[44] = [45] =
{ {
["alt"] = 500, ["alt"] = 500,
["point"] = ["point"] =
@ -1056,19 +1089,24 @@ MEunitsByNum =
["onboard_num"] = "53", ["onboard_num"] = "53",
["category"] = "helicopter", ["category"] = "helicopter",
["unitName"] = "Mi-8s_1_1 #1", ["unitName"] = "Mi-8s_1_1 #1",
["AddPropAircraft"] =
{
["AdditionalArmor"] = true,
["ExhaustScreen"] = true,
}, -- end of ["AddPropAircraft"]
["type"] = "Mi-8MT", ["type"] = "Mi-8MT",
["country"] = "russia", ["country"] = "russia",
["psi"] = -2.6119254271103, ["psi"] = -2.6119254271103,
["groupId"] = 3, ["groupId"] = 3,
["groupName"] = "Mi-8s_1", ["groupName"] = "Mi-8s_1",
["callsign"] = 102,
["countryId"] = 0,
["x"] = -243325.71428571,
["skill"] = "Random", ["skill"] = "Random",
["coalition"] = "red",
["x"] = -243325.71428571,
["callsign"] = 102,
["heading"] = 2.6119254271103, ["heading"] = 2.6119254271103,
["unitId"] = 6, ["unitId"] = 6,
["y"] = 603325.71428571, ["y"] = 603325.71428571,
["coalition"] = "red", ["countryId"] = 0,
["speed"] = 55.555555555556, ["speed"] = 55.555555555556,
}, -- end of [44] }, -- end of [45]
} -- end of MEunitsByNum } -- end of MEunitsByNum

View File

@ -0,0 +1,3 @@
activeHumans =
{
} -- end of activeHumans

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,96 @@
const = const =
{ {
["shapeNames"] =
{
["Landmine"] = "landmine",
["FARP CP Blindage"] = "kp_ug",
["Subsidiary structure C"] = "saray-c",
["Barracks 2"] = "kazarma2",
["Small house 2C"] = "dom2c",
["Military staff"] = "aviashtab",
["Tech hangar A"] = "ceh_ang_a",
["Oil derrick"] = "neftevyshka",
["Tech combine"] = "kombinat",
["Garage B"] = "garage_b",
["Airshow_Crowd"] = "Crowd1",
["Hangar A"] = "angar_a",
["Repair workshop"] = "tech",
["Subsidiary structure D"] = "saray-d",
["FARP Ammo Dump Coating"] = "SetkaKP",
["Small house 1C area"] = "dom2c-all",
["Tank 2"] = "airbase_tbilisi_tank_01",
["Boiler-house A"] = "kotelnaya_a",
["Workshop A"] = "tec_a",
["Small werehouse 1"] = "s1",
["Garage small B"] = "garagh-small-b",
["Small werehouse 4"] = "s4",
["Shop"] = "magazin",
["Subsidiary structure B"] = "saray-b",
["FARP Fuel Depot"] = "GSM Rus",
["Coach cargo"] = "wagon-gruz",
["Electric power box"] = "tr_budka",
["Tank 3"] = "airbase_tbilisi_tank_02",
["Red_Flag"] = "H-flag_R",
["Container red 3"] = "konteiner_red3",
["Garage A"] = "garage_a",
["Hangar B"] = "angar_b",
["Black_Tyre"] = "H-tyre_B",
["Cafe"] = "stolovaya",
["Restaurant 1"] = "restoran1",
["Subsidiary structure A"] = "saray-a",
["Container white"] = "konteiner_white",
["Warehouse"] = "sklad",
["Tank"] = "bak",
["Railway crossing B"] = "pereezd_small",
["Subsidiary structure F"] = "saray-f",
["Farm A"] = "ferma_a",
["Small werehouse 3"] = "s3",
["Water tower A"] = "wodokachka_a",
["Railway station"] = "r_vok_sd",
["Coach a tank blue"] = "wagon-cisterna_blue",
["Supermarket A"] = "uniwersam_a",
["Coach a platform"] = "wagon-platforma",
["Garage small A"] = "garagh-small-a",
["TV tower"] = "tele_bash",
["Airshow_Cone"] = "Comp_cone",
["Farm B"] = "ferma_b",
["GeneratorF"] = "GeneratorF",
["White_Flag"] = "H-Flag_W",
["Container red 2"] = "konteiner_red2",
["Coach a passenger"] = "wagon-pass",
["WC"] = "WC",
["Black_Tyre_WF"] = "H-tyre_B_WF",
["Electric locomotive"] = "elektrowoz",
["Railway crossing A"] = "pereezd_big",
["Coach a tank yellow"] = "wagon-cisterna_yellow",
["Subsidiary structure 2"] = "hozdomik2",
[".Ammunition depot"] = "SkladC",
["Small werehouse 2"] = "s2",
["Windsock"] = "H-Windsock_RW",
["Small house 1B"] = "domik1b",
["Container brown"] = "konteiner_brown",
["Locomotive"] = "teplowoz",
["Subsidiary structure 1"] = "hozdomik1",
["Pump station"] = "nasos",
["Small house 1B area"] = "domik1b-all",
["Coach cargo open"] = "wagon-gruz-otkr",
["Container red 1"] = "konteiner_red1",
["Subsidiary structure G"] = "saray-g",
["White_Tyre"] = "H-tyre_W",
["FARP Tent"] = "PalatkaB",
["Subsidiary structure 3"] = "hozdomik3",
["Black_Tyre_RF"] = "H-tyre_B_RF",
["Comms tower M"] = "tele_bash_m",
[".Command Center"] = "ComCenter",
["Fuel tank"] = "toplivo-bak",
["Cargo1"] = "ab-212_cargo",
["Shelter B"] = "ukrytie_b",
["Chemical tank A"] = "him_bak_a",
["Shelter"] = "ukrytie",
["Small house 1A area"] = "domik1a-all",
["Subsidiary structure E"] = "saray-e",
["Small house 1A"] = "domik1a",
}, -- end of ["shapeNames"]
["callsigns"] = ["callsigns"] =
{ {
["NATO"] = ["NATO"] =

View File

@ -1,104 +1,12 @@
deadObjects = deadObjects =
{ {
[16781056] =
{
["objectPos"] =
{
["y"] = 22.249711990356,
["x"] = -292852.15625,
["z"] = 654502.0625,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654625.71428571,
["x"] = -292922.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16781056,
}, -- 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"] = 22.240369796753,
["x"] = -292851.09375,
["z"] = 654504.5,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16781056,
}, -- end of ["object"]
}, -- end of [16781056]
[16780544] =
{
["objectPos"] =
{
["y"] = 22.431118011475,
["x"] = -292867.15625,
["z"] = 654441.25,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654545.71428571,
["x"] = -292842.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16780544,
}, -- 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"] = 22.417558670044,
["x"] = -292866.03125,
["z"] = 654446.125,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16780544,
}, -- end of ["object"]
}, -- end of [16780544]
[16780800] = [16780800] =
{ {
["objectPos"] = ["objectPos"] =
{ {
["y"] = 22.133636474609, ["y"] = 22.192852020264,
["x"] = -292848, ["x"] = -292849.34375,
["z"] = 654535.5, ["z"] = 654519.625,
}, -- end of ["objectPos"] }, -- end of ["objectPos"]
["objectType"] = "vehicle", ["objectType"] = "vehicle",
["objectData"] = ["objectData"] =
@ -128,9 +36,9 @@ deadObjects =
["country"] = "russia", ["country"] = "russia",
["pos"] = ["pos"] =
{ {
["y"] = 22.13184928894, ["y"] = 22.182994842529,
["x"] = -292848.1875, ["x"] = -292848.875,
["z"] = 654536.1875, ["z"] = 654522.0625,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of ["objectData"] }, -- end of ["objectData"]
["object"] = ["object"] =
@ -138,50 +46,50 @@ deadObjects =
["id_"] = 16780800, ["id_"] = 16780800,
}, -- end of ["object"] }, -- end of ["object"]
}, -- end of [16780800] }, -- end of [16780800]
[16781568] = [16780544] =
{ {
["objectPos"] = ["objectPos"] =
{ {
["y"] = 22.361310958862, ["y"] = 22.386783599854,
["x"] = -292856.28125, ["x"] = -292863.46875,
["z"] = 654460.375, ["z"] = 654457.125,
}, -- end of ["objectPos"] }, -- end of ["objectPos"]
["objectType"] = "vehicle", ["objectType"] = "vehicle",
["objectData"] = ["objectData"] =
{ {
["point"] = ["point"] =
{ {
["y"] = 654705.71428571, ["y"] = 654545.71428571,
["x"] = -293002.85714286, ["x"] = -292842.85714286,
}, -- end of ["point"] }, -- end of ["point"]
["skill"] = "Average", ["skill"] = "Average",
["unit"] = ["unit"] =
{ {
["id_"] = 16781568, ["id_"] = 16780544,
}, -- end of ["unit"] }, -- end of ["unit"]
["category"] = "vehicle", ["category"] = "vehicle",
["unitName"] = "RuBTRs5", ["unitName"] = "RuBTRs1",
["type"] = "BTR-80", ["type"] = "BTR-80",
["groupId"] = 13, ["groupId"] = 13,
["groupName"] = "RuBTRs", ["groupName"] = "RuBTRs",
["countryId"] = 0, ["countryId"] = 0,
["coalition"] = "red", ["coalition"] = "red",
["x"] = -293002.85714286, ["x"] = -292842.85714286,
["y"] = 654705.71428571, ["y"] = 654545.71428571,
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["unitId"] = 31, ["unitId"] = 27,
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["country"] = "russia", ["country"] = "russia",
["pos"] = ["pos"] =
{ {
["y"] = 22.360494613647, ["y"] = 22.385175704956,
["x"] = -292856.3125, ["x"] = -292863.3125,
["z"] = 654460.8125, ["z"] = 654457.6875,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of ["objectData"] }, -- end of ["objectData"]
["object"] = ["object"] =
{ {
["id_"] = 16781568, ["id_"] = 16780544,
}, -- end of ["object"] }, -- end of ["object"]
}, -- end of [16781568] }, -- end of [16780544]
} -- 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

@ -16,7 +16,7 @@ humansById =
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
["unitName"] = "A-10C Client #1", ["unitName"] = "A-10C Client #1_unit",
["groupName"] = "A-10C Client #1", ["groupName"] = "A-10C Client #1",
["coalition"] = "blue", ["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
@ -50,7 +50,7 @@ humansById =
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
["unitName"] = "F-15C Client #1", ["unitName"] = "F-15C Client #1_unit",
["groupName"] = "F-15C Client #1", ["groupName"] = "F-15C Client #1",
["coalition"] = "blue", ["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
@ -84,7 +84,7 @@ humansById =
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
["unitName"] = "F-15C Client #2", ["unitName"] = "F-15C Client #2_unit",
["groupName"] = "F-15C Client #2", ["groupName"] = "F-15C Client #2",
["coalition"] = "blue", ["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
@ -118,7 +118,7 @@ humansById =
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.66079849060746, ["psi"] = 0.66079849060746,
["unitName"] = "A-10C Client #2", ["unitName"] = "A-10C Client #2_unit",
["groupName"] = "A-10C Client #2", ["groupName"] = "A-10C Client #2",
["coalition"] = "blue", ["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
@ -136,6 +136,34 @@ humansById =
}, -- end of ["callsign"] }, -- end of ["callsign"]
["groupId"] = 7, ["groupId"] = 7,
}, -- end of [12] }, -- end of [12]
[48] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590471.42857142,
["x"] = -250265.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "054",
["category"] = "plane",
["speed"] = 138.88888888889,
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["unitName"] = "Su-33 Client #3Unit",
["groupName"] = "Su-33 Client #1",
["coalition"] = "red",
["countryId"] = 0,
["x"] = -250265.71428571,
["y"] = 590471.42857142,
["unitId"] = 48,
["heading"] = 0,
["skill"] = "Client",
["callsign"] = 106,
["groupId"] = 20,
}, -- end of [48]
[42] = [42] =
{ {
["alt"] = 2000, ["alt"] = 2000,
@ -152,7 +180,7 @@ humansById =
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
["unitName"] = "Su-33 Client #1", ["unitName"] = "Su-33 Client #1Unit",
["groupName"] = "Su-33 Client #1", ["groupName"] = "Su-33 Client #1",
["coalition"] = "red", ["coalition"] = "red",
["countryId"] = 0, ["countryId"] = 0,
@ -164,32 +192,32 @@ humansById =
["callsign"] = 104, ["callsign"] = 104,
["groupId"] = 20, ["groupId"] = 20,
}, -- end of [42] }, -- end of [42]
[43] = [47] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
{ {
["y"] = 597819.99999999, ["y"] = 590431.42857142,
["x"] = -235614.28571428, ["x"] = -250225.71428571,
}, -- end of ["point"] }, -- end of ["point"]
["alt_type"] = "BARO", ["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy", ["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53", ["onboard_num"] = "010",
["category"] = "plane", ["category"] = "plane",
["speed"] = 138.88888888889, ["speed"] = 138.88888888889,
["type"] = "Su-33", ["type"] = "Su-33",
["country"] = "russia", ["country"] = "russia",
["psi"] = 0, ["psi"] = 0,
["unitName"] = "Su-33 Client #2", ["unitName"] = "Su-33 Client #2Unit",
["groupName"] = "Su-33 Client #2", ["groupName"] = "Su-33 Client #1",
["coalition"] = "red", ["coalition"] = "red",
["countryId"] = 0, ["countryId"] = 0,
["x"] = -235614.28571428, ["x"] = -250225.71428571,
["y"] = 597819.99999999, ["y"] = 590431.42857142,
["unitId"] = 43, ["unitId"] = 47,
["heading"] = 0, ["heading"] = 0,
["skill"] = "Client", ["skill"] = "Client",
["callsign"] = 104, ["callsign"] = 105,
["groupId"] = 21, ["groupId"] = 20,
}, -- end of [43] }, -- end of [47]
} -- end of humansById } -- end of humansById

View File

@ -1,40 +1,6 @@
humansByName = humansByName =
{ {
["A-10C Client #2"] = ["F-15C Client #1_unit"] =
{
["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",
["speed"] = 138.88888888889,
["type"] = "A-10C",
["country"] = "usa",
["psi"] = 0.66079849060746,
["unitName"] = "A-10C Client #2",
["groupName"] = "A-10C Client #2",
["coalition"] = "blue",
["countryId"] = 2,
["x"] = -315857.14285714,
["y"] = 644428.57142857,
["unitId"] = 12,
["heading"] = -0.66079849060746,
["skill"] = "Client",
["callsign"] =
{
[1] = 3,
[2] = 1,
[3] = 1,
["name"] = "Uzi11",
}, -- end of ["callsign"]
["groupId"] = 7,
}, -- end of ["A-10C Client #2"]
["F-15C Client #1"] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
@ -50,7 +16,7 @@ humansByName =
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
["unitName"] = "F-15C Client #1", ["unitName"] = "F-15C Client #1_unit",
["groupName"] = "F-15C Client #1", ["groupName"] = "F-15C Client #1",
["coalition"] = "blue", ["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
@ -67,64 +33,8 @@ humansByName =
["name"] = "Springfield11", ["name"] = "Springfield11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["groupId"] = 4, ["groupId"] = 4,
}, -- end of ["F-15C Client #1"] }, -- end of ["F-15C Client #1_unit"]
["Su-33 Client #2"] = ["F-15C Client #2_unit"] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 597819.99999999,
["x"] = -235614.28571428,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53",
["category"] = "plane",
["speed"] = 138.88888888889,
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["unitName"] = "Su-33 Client #2",
["groupName"] = "Su-33 Client #2",
["coalition"] = "red",
["countryId"] = 0,
["x"] = -235614.28571428,
["y"] = 597819.99999999,
["unitId"] = 43,
["heading"] = 0,
["skill"] = "Client",
["callsign"] = 104,
["groupId"] = 21,
}, -- end of ["Su-33 Client #2"]
["Su-33 Client #1"] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590391.42857142,
["x"] = -250185.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53",
["category"] = "plane",
["speed"] = 138.88888888889,
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["unitName"] = "Su-33 Client #1",
["groupName"] = "Su-33 Client #1",
["coalition"] = "red",
["countryId"] = 0,
["x"] = -250185.71428571,
["y"] = 590391.42857142,
["unitId"] = 42,
["heading"] = 0,
["skill"] = "Client",
["callsign"] = 104,
["groupId"] = 20,
}, -- end of ["Su-33 Client #1"]
["F-15C Client #2"] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
@ -140,7 +50,7 @@ humansByName =
["type"] = "F-15C", ["type"] = "F-15C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.57883789069348, ["psi"] = 0.57883789069348,
["unitName"] = "F-15C Client #2", ["unitName"] = "F-15C Client #2_unit",
["groupName"] = "F-15C Client #2", ["groupName"] = "F-15C Client #2",
["coalition"] = "blue", ["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
@ -157,8 +67,36 @@ humansByName =
["name"] = "Springfield11", ["name"] = "Springfield11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["groupId"] = 5, ["groupId"] = 5,
}, -- end of ["F-15C Client #2"] }, -- end of ["F-15C Client #2_unit"]
["A-10C Client #1"] = ["Su-33 Client #3Unit"] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590471.42857142,
["x"] = -250265.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "054",
["category"] = "plane",
["speed"] = 138.88888888889,
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["unitName"] = "Su-33 Client #3Unit",
["groupName"] = "Su-33 Client #1",
["coalition"] = "red",
["countryId"] = 0,
["x"] = -250265.71428571,
["y"] = 590471.42857142,
["unitId"] = 48,
["heading"] = 0,
["skill"] = "Client",
["callsign"] = 106,
["groupId"] = 20,
}, -- end of ["Su-33 Client #3Unit"]
["A-10C Client #1_unit"] =
{ {
["alt"] = 2000, ["alt"] = 2000,
["point"] = ["point"] =
@ -174,7 +112,7 @@ humansByName =
["type"] = "A-10C", ["type"] = "A-10C",
["country"] = "usa", ["country"] = "usa",
["psi"] = 0.67060113146646, ["psi"] = 0.67060113146646,
["unitName"] = "A-10C Client #1", ["unitName"] = "A-10C Client #1_unit",
["groupName"] = "A-10C Client #1", ["groupName"] = "A-10C Client #1",
["coalition"] = "blue", ["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
@ -191,5 +129,95 @@ humansByName =
["name"] = "Uzi11", ["name"] = "Uzi11",
}, -- end of ["callsign"] }, -- end of ["callsign"]
["groupId"] = 6, ["groupId"] = 6,
}, -- end of ["A-10C Client #1"] }, -- end of ["A-10C Client #1_unit"]
["Su-33 Client #2Unit"] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590431.42857142,
["x"] = -250225.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "010",
["category"] = "plane",
["speed"] = 138.88888888889,
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["unitName"] = "Su-33 Client #2Unit",
["groupName"] = "Su-33 Client #1",
["coalition"] = "red",
["countryId"] = 0,
["x"] = -250225.71428571,
["y"] = 590431.42857142,
["unitId"] = 47,
["heading"] = 0,
["skill"] = "Client",
["callsign"] = 105,
["groupId"] = 20,
}, -- end of ["Su-33 Client #2Unit"]
["A-10C Client #2_unit"] =
{
["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",
["speed"] = 138.88888888889,
["type"] = "A-10C",
["country"] = "usa",
["psi"] = 0.66079849060746,
["unitName"] = "A-10C Client #2_unit",
["groupName"] = "A-10C Client #2",
["coalition"] = "blue",
["countryId"] = 2,
["x"] = -315857.14285714,
["y"] = 644428.57142857,
["unitId"] = 12,
["heading"] = -0.66079849060746,
["skill"] = "Client",
["callsign"] =
{
[1] = 3,
[2] = 1,
[3] = 1,
["name"] = "Uzi11",
}, -- end of ["callsign"]
["groupId"] = 7,
}, -- end of ["A-10C Client #2_unit"]
["Su-33 Client #1Unit"] =
{
["alt"] = 2000,
["point"] =
{
["y"] = 590391.42857142,
["x"] = -250185.71428571,
}, -- end of ["point"]
["alt_type"] = "BARO",
["livery_id"] = "279th kiap 1st squad navy",
["onboard_num"] = "53",
["category"] = "plane",
["speed"] = 138.88888888889,
["type"] = "Su-33",
["country"] = "russia",
["psi"] = 0,
["unitName"] = "Su-33 Client #1Unit",
["groupName"] = "Su-33 Client #1",
["coalition"] = "red",
["countryId"] = 0,
["x"] = -250185.71428571,
["y"] = 590391.42857142,
["unitId"] = 42,
["heading"] = 0,
["skill"] = "Client",
["callsign"] = 104,
["groupId"] = 20,
}, -- end of ["Su-33 Client #1Unit"]
} -- end of humansByName } -- end of humansByName

View File

@ -1,13 +1,8 @@
missionData = missionData =
{ {
["version"] = 7, ["version"] = 11,
["files"] = ["files"] =
{ {
[1] = "Thunder2.wav",
[2] = "Briefing-01{225F004F-92E4-4c3e-A5F0-2BA49929055A}.jpg",
[3] = "mist.lua",
[4] = "ExplodeGround0.ogg",
[5] = "Rain.ogg",
}, -- end of ["files"] }, -- end of ["files"]
["startTime"] = 43200, ["startTime"] = 43200,
["theatre"] = "Caucasus", ["theatre"] = "Caucasus",

View File

@ -3,84 +3,18 @@ navPoints =
["blue"] = ["blue"] =
{ {
[1] = [1] =
{
["y"] = 670391.42857142,
["x"] = -260757.14285714,
["name"] = "DODGE",
["callsignStr"] = "DODGE",
["point"] =
{
["y"] = 0,
["x"] = -260757.14285714,
["z"] = 670391.42857142,
}, -- end of ["point"]
["properties"] =
{
["vnav"] = 1,
["scale"] = 0,
["vangle"] = 0,
["angle"] = 0,
["steer"] = 2,
}, -- end of ["properties"]
["groupId"] = 22,
["callsign"] = 3,
}, -- end of [1]
[2] =
{
["y"] = 659819.99999999,
["x"] = -257614.28571428,
["name"] = "KB1SE",
["callsignStr"] = "KB1SE",
["properties"] =
{
["vnav"] = 1,
["scale"] = 0,
["vangle"] = 0,
["angle"] = 0,
["steer"] = 2,
}, -- end of ["properties"]
["point"] =
{
["y"] = 0,
["x"] = -257614.28571428,
["z"] = 659819.99999999,
}, -- end of ["point"]
["groupId"] = 23,
}, -- end of [2]
[3] =
{
["y"] = 643534.28571428,
["x"] = -257900,
["name"] = "KB1SW",
["callsignStr"] = "KB1SW",
["properties"] =
{
["vnav"] = 1,
["scale"] = 0,
["vangle"] = 0,
["angle"] = 0,
["steer"] = 2,
}, -- end of ["properties"]
["point"] =
{
["y"] = 0,
["x"] = -257900,
["z"] = 643534.28571428,
}, -- end of ["point"]
["groupId"] = 24,
}, -- end of [3]
[4] =
{ {
["y"] = 643248.57142856, ["y"] = 643248.57142856,
["x"] = -242471.42857143, ["x"] = -242471.42857143,
["name"] = "KB1NW", ["name"] = "KB1NW",
["callsignStr"] = "KB1NW", ["callsignStr"] = "KB1NW",
["id"] = 3,
["properties"] = ["properties"] =
{ {
["vnav"] = 1, ["vnav"] = 1,
["scale"] = 0, ["scale"] = 0,
["vangle"] = 0,
["angle"] = 0, ["angle"] = 0,
["vangle"] = 0,
["steer"] = 2, ["steer"] = 2,
}, -- end of ["properties"] }, -- end of ["properties"]
["point"] = ["point"] =
@ -89,20 +23,64 @@ navPoints =
["x"] = -242471.42857143, ["x"] = -242471.42857143,
["z"] = 643248.57142856, ["z"] = 643248.57142856,
}, -- end of ["point"] }, -- end of ["point"]
["groupId"] = 25, }, -- end of [1]
}, -- end of [4] [2] =
[5] = {
["y"] = 659819.99999999,
["x"] = -257614.28571428,
["name"] = "KB1SE",
["callsignStr"] = "KB1SE",
["id"] = 4,
["properties"] =
{
["vnav"] = 1,
["scale"] = 0,
["angle"] = 0,
["vangle"] = 0,
["steer"] = 2,
}, -- end of ["properties"]
["point"] =
{
["y"] = 0,
["x"] = -257614.28571428,
["z"] = 659819.99999999,
}, -- end of ["point"]
}, -- end of [2]
[3] =
{
["y"] = 643534.28571428,
["x"] = -257900,
["name"] = "KB1SW",
["callsignStr"] = "KB1SW",
["id"] = 5,
["properties"] =
{
["vnav"] = 1,
["scale"] = 0,
["angle"] = 0,
["vangle"] = 0,
["steer"] = 2,
}, -- end of ["properties"]
["point"] =
{
["y"] = 0,
["x"] = -257900,
["z"] = 643534.28571428,
}, -- end of ["point"]
}, -- end of [3]
[4] =
{ {
["y"] = 659248.57142856, ["y"] = 659248.57142856,
["x"] = -243614.28571428, ["x"] = -243614.28571428,
["name"] = "KB1NE", ["name"] = "KB1NE",
["callsignStr"] = "KB1NE", ["callsignStr"] = "KB1NE",
["id"] = 6,
["properties"] = ["properties"] =
{ {
["vnav"] = 1, ["vnav"] = 1,
["scale"] = 0, ["scale"] = 0,
["vangle"] = 0,
["angle"] = 0, ["angle"] = 0,
["vangle"] = 0,
["steer"] = 2, ["steer"] = 2,
}, -- end of ["properties"] }, -- end of ["properties"]
["point"] = ["point"] =
@ -111,30 +89,52 @@ navPoints =
["x"] = -243614.28571428, ["x"] = -243614.28571428,
["z"] = 659248.57142856, ["z"] = 659248.57142856,
}, -- end of ["point"] }, -- end of ["point"]
["groupId"] = 26, }, -- end of [4]
}, -- end of [5] [5] =
[6] =
{ {
["y"] = 625534.28571428, ["y"] = 625534.28571428,
["x"] = -309328.57142857, ["x"] = -309328.57142857,
["name"] = "MAZDA", ["name"] = "MAZDA",
["callsignStr"] = "MAZDA", ["callsignStr"] = "MAZDA",
["id"] = 7,
["properties"] =
{
["vnav"] = 1,
["scale"] = 0,
["angle"] = 0,
["vangle"] = 0,
["steer"] = 2,
}, -- end of ["properties"]
["point"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -309328.57142857, ["x"] = -309328.57142857,
["z"] = 625534.28571428, ["z"] = 625534.28571428,
}, -- end of ["point"] }, -- end of ["point"]
["callsign"] = 4,
}, -- end of [5]
[6] =
{
["y"] = 670391.42857142,
["x"] = -260757.14285714,
["name"] = "DODGE",
["callsignStr"] = "DODGE",
["id"] = 8,
["properties"] = ["properties"] =
{ {
["vnav"] = 1, ["vnav"] = 1,
["scale"] = 0, ["scale"] = 0,
["vangle"] = 0,
["angle"] = 0, ["angle"] = 0,
["vangle"] = 0,
["steer"] = 2, ["steer"] = 2,
}, -- end of ["properties"] }, -- end of ["properties"]
["groupId"] = 27, ["point"] =
["callsign"] = 4, {
["y"] = 0,
["x"] = -260757.14285714,
["z"] = 670391.42857142,
}, -- end of ["point"]
["callsign"] = 3,
}, -- end of [6] }, -- end of [6]
}, -- end of ["blue"] }, -- end of ["blue"]
["red"] = ["red"] =
@ -145,21 +145,21 @@ navPoints =
["x"] = -295042.85714285, ["x"] = -295042.85714285,
["name"] = "ADDER", ["name"] = "ADDER",
["callsignStr"] = "ADDER", ["callsignStr"] = "ADDER",
["id"] = 1,
["properties"] =
{
["vnav"] = 1,
["scale"] = 0,
["angle"] = 0,
["vangle"] = 0,
["steer"] = 2,
}, -- end of ["properties"]
["point"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -295042.85714285, ["x"] = -295042.85714285,
["z"] = 587534.28571428, ["z"] = 587534.28571428,
}, -- end of ["point"] }, -- end of ["point"]
["properties"] =
{
["vnav"] = 1,
["scale"] = 0,
["vangle"] = 0,
["angle"] = 0,
["steer"] = 2,
}, -- end of ["properties"]
["groupId"] = 28,
["callsign"] = 8, ["callsign"] = 8,
}, -- end of [1] }, -- end of [1]
[2] = [2] =
@ -168,21 +168,21 @@ navPoints =
["x"] = -276757.14285714, ["x"] = -276757.14285714,
["name"] = "MAZDA", ["name"] = "MAZDA",
["callsignStr"] = "MAZDA", ["callsignStr"] = "MAZDA",
["id"] = 2,
["properties"] =
{
["vnav"] = 1,
["scale"] = 0,
["angle"] = 0,
["vangle"] = 0,
["steer"] = 2,
}, -- end of ["properties"]
["point"] = ["point"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -276757.14285714, ["x"] = -276757.14285714,
["z"] = 595248.57142856, ["z"] = 595248.57142856,
}, -- end of ["point"] }, -- end of ["point"]
["properties"] =
{
["vnav"] = 1,
["scale"] = 0,
["vangle"] = 0,
["angle"] = 0,
["steer"] = 2,
}, -- end of ["properties"]
["groupId"] = 29,
["callsign"] = 4, ["callsign"] = 4,
}, -- end of [2] }, -- end of [2]
}, -- end of ["red"] }, -- end of ["red"]

View File

@ -1,69 +1,5 @@
removedAliveUnits = removedAliveUnits =
{ {
[16781056] =
{
["point"] =
{
["y"] = 654625.71428571,
["x"] = -292922.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16781056,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs3",
["heading"] = -1.7994767003775,
["unitId"] = 29,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -292922.85714286,
["type"] = "BTR-80",
["groupId"] = 13,
["country"] = "russia",
["playerCanDrive"] = true,
["y"] = 654625.71428571,
["pos"] =
{
["y"] = 22.240369796753,
["x"] = -292851.09375,
["z"] = 654504.5,
}, -- end of ["pos"]
}, -- end of [16781056]
[16780544] =
{
["point"] =
{
["y"] = 654545.71428571,
["x"] = -292842.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16780544,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs1",
["heading"] = -1.7994767003775,
["unitId"] = 27,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -292842.85714286,
["type"] = "BTR-80",
["groupId"] = 13,
["country"] = "russia",
["playerCanDrive"] = true,
["y"] = 654545.71428571,
["pos"] =
{
["y"] = 22.417558670044,
["x"] = -292866.03125,
["z"] = 654446.125,
}, -- end of ["pos"]
}, -- end of [16780544]
[16780800] = [16780800] =
{ {
["point"] = ["point"] =
@ -91,9 +27,41 @@ removedAliveUnits =
["y"] = 654585.71428571, ["y"] = 654585.71428571,
["pos"] = ["pos"] =
{ {
["y"] = 22.13184928894, ["y"] = 22.182994842529,
["x"] = -292848.1875, ["x"] = -292848.875,
["z"] = 654536.1875, ["z"] = 654522.0625,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16780800] }, -- end of [16780800]
[16780544] =
{
["point"] =
{
["y"] = 654545.71428571,
["x"] = -292842.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16780544,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs1",
["heading"] = -1.7994767003775,
["unitId"] = 27,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -292842.85714286,
["type"] = "BTR-80",
["groupId"] = 13,
["country"] = "russia",
["playerCanDrive"] = true,
["y"] = 654545.71428571,
["pos"] =
{
["y"] = 22.385175704956,
["x"] = -292863.3125,
["z"] = 654457.6875,
}, -- end of ["pos"]
}, -- end of [16780544]
} -- 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

Binary file not shown.

View File

@ -34,7 +34,7 @@ mist = {}
-- don't change these -- don't change these
mist.majorVersion = 4 mist.majorVersion = 4
mist.minorVersion = 2 mist.minorVersion = 3
mist.build = 71 mist.build = 71
-- forward declaration of log shorthand -- forward declaration of log shorthand
@ -1257,7 +1257,7 @@ do -- the main scope
if newObj.clone or not newObj.name then if newObj.clone or not newObj.name then
mistDynAddIndex[' static '] = mistDynAddIndex[' static '] + 1 mistDynAddIndex[' static '] = mistDynAddIndex[' static '] + 1
newObj.name = (country.name[cntry] .. ' static ' .. mistDynAddIndex[' static ']) newObj.name = (newCountry .. ' static ' .. mistDynAddIndex[' static '])
end end
if not newObj.dead then if not newObj.dead then
@ -1275,7 +1275,12 @@ do -- the main scope
newObj.category = 'Cargos' newObj.category = 'Cargos'
end end
if newObj.shapeName then
newObj.shape_name = newObj.shapeName
end
if not newObj.shape_name then if not newObj.shape_name then
log:info('shape_name not present')
if mist.DBs.const.shapeNames[newObj.type] then if mist.DBs.const.shapeNames[newObj.type] then
newObj.shape_name = mist.DBs.const.shapeNames[newObj.type] newObj.shape_name = mist.DBs.const.shapeNames[newObj.type]
end end
@ -1369,7 +1374,7 @@ do -- the main scope
end end
if newGroup.clone and mist.DBs.groupsByName[newGroup.name] or not newGroup.name then if newGroup.clone and mist.DBs.groupsByName[newGroup.name] or not newGroup.name then
newGroup.name = tostring(tostring(country.name[cntry]) .. tostring(typeName) .. mistDynAddIndex[typeName]) newGroup.name = tostring(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName])
end end
if not newGroup.hidden then if not newGroup.hidden then

View File

@ -34,8 +34,8 @@ mist = {}
-- don't change these -- don't change these
mist.majorVersion = 4 mist.majorVersion = 4
mist.minorVersion = 2 mist.minorVersion = 3
mist.build = 66 mist.build = 71
-- forward declaration of log shorthand -- forward declaration of log shorthand
local log local log
@ -44,18 +44,20 @@ do -- the main scope
local coroutines = {} local coroutines = {}
local tempSpawnedUnits = {} -- birth events added here local tempSpawnedUnits = {} -- birth events added here
local tempSpawnedGroups = {}
local tempSpawnGroupsCounter = 0
local mistAddedObjects = {} -- mist.dynAdd unit data added here local mistAddedObjects = {} -- mist.dynAdd unit data added here
local mistAddedGroups = {} -- mist.dynAdd groupdata added here local mistAddedGroups = {} -- mist.dynAdd groupdata added here
local writeGroups = {} local writeGroups = {}
local lastUpdateTime = 0 local lastUpdateTime = 0
local updateAliveUnitsCounter = 0 local updateAliveUnitsCounter = 0
local writeDbTableCounter = 0 local updateTenthSecond = 0
local checkSpawnEventsCounter = 0
local mistGpId = 7000 local mistGpId = 7000
local mistUnitId = 7000 local mistUnitId = 7000
local mistDynAddIndex = 1 local mistDynAddIndex = {[' air '] = 0, [' hel '] = 0, [' gnd '] = 0, [' bld '] = 0, [' static '] = 0, [' shp '] = 0}
local scheduledTasks = {} local scheduledTasks = {}
local taskId = 0 local taskId = 0
@ -64,6 +66,8 @@ do -- the main scope
mist.nextGroupId = 1 mist.nextGroupId = 1
mist.nextUnitId = 1 mist.nextUnitId = 1
local dbLog
local function initDBs() -- mist.DBs scope local function initDBs() -- mist.DBs scope
mist.DBs = {} mist.DBs = {}
@ -339,6 +343,98 @@ do -- the main scope
}, },
}, },
} }
mist.DBs.const.shapeNames = {
["Landmine"] = "landmine",
["FARP CP Blindage"] = "kp_ug",
["Subsidiary structure C"] = "saray-c",
["Barracks 2"] = "kazarma2",
["Small house 2C"] = "dom2c",
["Military staff"] = "aviashtab",
["Tech hangar A"] = "ceh_ang_a",
["Oil derrick"] = "neftevyshka",
["Tech combine"] = "kombinat",
["Garage B"] = "garage_b",
["Airshow_Crowd"] = "Crowd1",
["Hangar A"] = "angar_a",
["Repair workshop"] = "tech",
["Subsidiary structure D"] = "saray-d",
["FARP Ammo Dump Coating"] = "SetkaKP",
["Small house 1C area"] = "dom2c-all",
["Tank 2"] = "airbase_tbilisi_tank_01",
["Boiler-house A"] = "kotelnaya_a",
["Workshop A"] = "tec_a",
["Small werehouse 1"] = "s1",
["Garage small B"] = "garagh-small-b",
["Small werehouse 4"] = "s4",
["Shop"] = "magazin",
["Subsidiary structure B"] = "saray-b",
["FARP Fuel Depot"] = "GSM Rus",
["Coach cargo"] = "wagon-gruz",
["Electric power box"] = "tr_budka",
["Tank 3"] = "airbase_tbilisi_tank_02",
["Red_Flag"] = "H-flag_R",
["Container red 3"] = "konteiner_red3",
["Garage A"] = "garage_a",
["Hangar B"] = "angar_b",
["Black_Tyre"] = "H-tyre_B",
["Cafe"] = "stolovaya",
["Restaurant 1"] = "restoran1",
["Subsidiary structure A"] = "saray-a",
["Container white"] = "konteiner_white",
["Warehouse"] = "sklad",
["Tank"] = "bak",
["Railway crossing B"] = "pereezd_small",
["Subsidiary structure F"] = "saray-f",
["Farm A"] = "ferma_a",
["Small werehouse 3"] = "s3",
["Water tower A"] = "wodokachka_a",
["Railway station"] = "r_vok_sd",
["Coach a tank blue"] = "wagon-cisterna_blue",
["Supermarket A"] = "uniwersam_a",
["Coach a platform"] = "wagon-platforma",
["Garage small A"] = "garagh-small-a",
["TV tower"] = "tele_bash",
["Comms tower M"] = "tele_bash_m",
["Small house 1A"] = "domik1a",
["Farm B"] = "ferma_b",
["GeneratorF"] = "GeneratorF",
["Cargo1"] = "ab-212_cargo",
["Container red 2"] = "konteiner_red2",
["Subsidiary structure E"] = "saray-e",
["Coach a passenger"] = "wagon-pass",
["Black_Tyre_WF"] = "H-tyre_B_WF",
["Electric locomotive"] = "elektrowoz",
["Shelter"] = "ukrytie",
["Coach a tank yellow"] = "wagon-cisterna_yellow",
["Railway crossing A"] = "pereezd_big",
[".Ammunition depot"] = "SkladC",
["Small werehouse 2"] = "s2",
["Windsock"] = "H-Windsock_RW",
["Shelter B"] = "ukrytie_b",
["Fuel tank"] = "toplivo-bak",
["Locomotive"] = "teplowoz",
[".Command Center"] = "ComCenter",
["Pump station"] = "nasos",
["Black_Tyre_RF"] = "H-tyre_B_RF",
["Coach cargo open"] = "wagon-gruz-otkr",
["Subsidiary structure 3"] = "hozdomik3",
["FARP Tent"] = "PalatkaB",
["White_Tyre"] = "H-tyre_W",
["Subsidiary structure G"] = "saray-g",
["Container red 1"] = "konteiner_red1",
["Small house 1B area"] = "domik1b-all",
["Subsidiary structure 1"] = "hozdomik1",
["Container brown"] = "konteiner_brown",
["Small house 1B"] = "domik1b",
["Subsidiary structure 2"] = "hozdomik2",
["Chemical tank A"] = "him_bak_a",
["WC"] = "WC",
["Small house 1A area"] = "domik1a-all",
["White_Flag"] = "H-Flag_W",
["Airshow_Cone"] = "Comp_cone",
}
-- create mist.DBs.oldAliveUnits -- create mist.DBs.oldAliveUnits
-- do -- do
-- local intermediate_alive_units = {} -- between 0 and 0.5 secs old -- local intermediate_alive_units = {} -- between 0 and 0.5 secs old
@ -368,7 +464,7 @@ do -- the main scope
mist.DBs.unitsByCat[unit_data.category] = mist.DBs.unitsByCat[unit_data.category] or {} -- future-proofing against new categories... mist.DBs.unitsByCat[unit_data.category] = mist.DBs.unitsByCat[unit_data.category] or {} -- future-proofing against new categories...
table.insert(mist.DBs.unitsByCat[unit_data.category], mist.utils.deepCopy(unit_data)) table.insert(mist.DBs.unitsByCat[unit_data.category], mist.utils.deepCopy(unit_data))
--log:info('inserting $1', unit_data.unitName) dbLog:info('inserting $1', unit_data.unitName)
table.insert(mist.DBs.unitsByNum, mist.utils.deepCopy(unit_data)) table.insert(mist.DBs.unitsByNum, mist.utils.deepCopy(unit_data))
if unit_data.skill and (unit_data.skill == "Client" or unit_data.skill == "Player") then if unit_data.skill and (unit_data.skill == "Client" or unit_data.skill == "Player") then
@ -405,13 +501,13 @@ do -- the main scope
local original_key = key --only for duplicate runtime IDs. local original_key = key --only for duplicate runtime IDs.
local key_ind = 1 local key_ind = 1
while mist.DBs.deadObjects[key] do while mist.DBs.deadObjects[key] do
--log:warn('duplicate runtime id of previously dead object key: $1', key) dbLog:warn('duplicate runtime id of previously dead object key: $1', key)
key = tostring(original_key) .. ' #' .. tostring(key_ind) key = tostring(original_key) .. ' #' .. tostring(key_ind)
key_ind = key_ind + 1 key_ind = key_ind + 1
end end
if mist.DBs.aliveUnits and mist.DBs.aliveUnits[val.object.id_] then if mist.DBs.aliveUnits and mist.DBs.aliveUnits[val.object.id_] then
--log:info('object found in alive_units') --dbLog:info('object found in alive_units')
val.objectData = mist.utils.deepCopy(mist.DBs.aliveUnits[val.object.id_]) val.objectData = mist.utils.deepCopy(mist.DBs.aliveUnits[val.object.id_])
local pos = Object.getPosition(val.object) local pos = Object.getPosition(val.object)
if pos then if pos then
@ -420,7 +516,7 @@ do -- the main scope
val.objectType = mist.DBs.aliveUnits[val.object.id_].category val.objectType = mist.DBs.aliveUnits[val.object.id_].category
elseif mist.DBs.removedAliveUnits and mist.DBs.removedAliveUnits[val.object.id_] then -- it didn't exist in alive_units, check old_alive_units elseif mist.DBs.removedAliveUnits and mist.DBs.removedAliveUnits[val.object.id_] then -- it didn't exist in alive_units, check old_alive_units
--log:info('object found in old_alive_units') --dbLog:info('object found in old_alive_units')
val.objectData = mist.utils.deepCopy(mist.DBs.removedAliveUnits[val.object.id_]) val.objectData = mist.utils.deepCopy(mist.DBs.removedAliveUnits[val.object.id_])
local pos = Object.getPosition(val.object) local pos = Object.getPosition(val.object)
if pos then if pos then
@ -429,13 +525,13 @@ do -- the main scope
val.objectType = mist.DBs.removedAliveUnits[val.object.id_].category val.objectType = mist.DBs.removedAliveUnits[val.object.id_].category
else --attempt to determine if static object... else --attempt to determine if static object...
--log:info('object not found in alive units or old alive units') --dbLog:info('object not found in alive units or old alive units')
local pos = Object.getPosition(val.object) local pos = Object.getPosition(val.object)
if pos then if pos then
local static_found = false local static_found = false
for ind, static in pairs(mist.DBs.unitsByCat.static) do for ind, static in pairs(mist.DBs.unitsByCat.static) do
if ((pos.p.x - static.point.x)^2 + (pos.p.z - static.point.y)^2)^0.5 < 0.1 then --really, it should be zero... if ((pos.p.x - static.point.x)^2 + (pos.p.z - static.point.y)^2)^0.5 < 0.1 then --really, it should be zero...
--log:info('correlated dead static object to position') dbLog:info('correlated dead static object to position')
val.objectData = static val.objectData = static
val.objectPos = pos.p val.objectPos = pos.p
val.objectType = 'static' val.objectType = 'static'
@ -489,7 +585,7 @@ do -- the main scope
if lunits[i].category ~= 'static' then -- can't get statics with Unit.getByName :( if lunits[i].category ~= 'static' then -- can't get statics with Unit.getByName :(
local unit = lUnit.getByName(lunits[i].unitName) local unit = lUnit.getByName(lunits[i].unitName)
if unit then if unit then
--log:info("unit named $1 alive!", lunits[i].unitName) -- spammy --dbLog:info("unit named $1 alive!", lunits[i].unitName) -- spammy
local pos = unit:getPosition() local pos = unit:getPosition()
local newtbl = ldeepcopy(lunits[i]) local newtbl = ldeepcopy(lunits[i])
if pos then if pos then
@ -515,22 +611,19 @@ do -- the main scope
end end
end end
local function dbUpdate(event) local function dbUpdate(event, objType)
dbLog:info('dbUpdate')
local newTable = {} local newTable = {}
newTable.startTime = 0 newTable.startTime = 0
if type(event) == 'string' then -- if name of an object. if type(event) == 'string' then -- if name of an object.
local newObject local newObject
local newType = 'group'
if Group.getByName(event) then if Group.getByName(event) then
newObject = Group.getByName(event) newObject = Group.getByName(event)
elseif StaticObject.getByName(event) then elseif StaticObject.getByName(event) then
newObject = StaticObject.getByName(event) newObject = StaticObject.getByName(event)
newType = 'static'
-- log:info('its static') -- log:info('its static')
else else
log:info('WTF') log:warn('$1 is not a Unit or Static Object. This should not be possible', event)
return false return false
end end
@ -538,7 +631,7 @@ do -- the main scope
newTable.groupId = tonumber(newObject:getID()) newTable.groupId = tonumber(newObject:getID())
newTable.groupName = newObject:getName() newTable.groupName = newObject:getName()
local unitOneRef local unitOneRef
if newType == 'static' then if objType == 'static' then
unitOneRef = newObject unitOneRef = newObject
newTable.countryId = tonumber(newObject:getCountry()) newTable.countryId = tonumber(newObject:getCountry())
newTable.coalitionId = tonumber(newObject:getCoalition()) newTable.coalitionId = tonumber(newObject:getCoalition())
@ -561,11 +654,11 @@ do -- the main scope
end end
end end
for catData, catId in pairs(Unit.Category) do for catData, catId in pairs(Unit.Category) do
if newType == 'group' and Group.getByName(newTable.groupName):isExist() then if objType == 'group' and Group.getByName(newTable.groupName):isExist() then
if catId == Group.getByName(newTable.groupName):getCategory() then if catId == Group.getByName(newTable.groupName):getCategory() then
newTable.category = string.lower(catData) newTable.category = string.lower(catData)
end end
elseif newType == 'static' and StaticObject.getByName(newTable.groupName):isExist() then elseif objType == 'static' and StaticObject.getByName(newTable.groupName):isExist() then
if catId == StaticObject.getByName(newTable.groupName):getCategory() then if catId == StaticObject.getByName(newTable.groupName):getCategory() then
newTable.category = string.lower(catData) newTable.category = string.lower(catData)
end end
@ -592,7 +685,7 @@ do -- the main scope
end end
newTable.units = {} newTable.units = {}
if newType == 'group' then if objType == 'group' then
for unitId, unitData in pairs(unitOneRef) do for unitId, unitData in pairs(unitOneRef) do
newTable.units[unitId] = {} newTable.units[unitId] = {}
newTable.units[unitId].unitName = unitData:getName() newTable.units[unitId].unitName = unitData:getName()
@ -684,91 +777,92 @@ do -- the main scope
newTable.timeAdded = timer.getAbsTime() -- only on the dynGroupsAdded table. For other reference, see start time newTable.timeAdded = timer.getAbsTime() -- only on the dynGroupsAdded table. For other reference, see start time
--mist.debug.dumpDBs() --mist.debug.dumpDBs()
--end --end
dbLog:info('endDbUpdate')
return newTable return newTable
end end
local function checkSpawnedEvents() --[[DB update code... FRACK. I need to refactor some of it.
if #tempSpawnedUnits > 0 then
local groupsToAdd = {}
local added = false
local ltemp = tempSpawnedUnits
local ltable = table
local updatesPerRun = math.ceil(#tempSpawnedUnits/20) The problem is that the DBs need to account better for shared object names. Needs to write over some data and outright remove other.
If groupName is used then entire group needs to be rewritten
what to do with old groups units DB entries?. Names cant be assumed to be the same.
-- new spawn event check.
-- event handler filters everything into groups: tempSpawnedGroups
-- this function then checks DBs to see if data has changed
]]
local function checkSpawnedEventsNew()
if tempSpawnGroupsCounter > 0 then
--[[local updatesPerRun = math.ceil(#tempSpawnedGroupsCounter/20)
if updatesPerRun < 5 then if updatesPerRun < 5 then
updatesPerRun = 5 updatesPerRun = 5
end end]]
for x = 1, #tempSpawnedUnits do
local spawnedObj = ltemp[x] dbLog:info('iterate')
if spawnedObj and spawnedObj:isExist() then for name, gType in pairs(tempSpawnedGroups) do
local found = false dbLog:info(name)
for name, val in pairs(groupsToAdd) do local updated = false
if spawnedObj:getCategory() == 1 then -- normal groups
if mist.stringMatch(spawnedObj:getGroup():getName(), name) == true then if mist.DBs.groupsByName[name] then
found = true -- first check group level properties, groupId, countryId, coalition
break dbLog:info('Found in DBs, check if updated')
end local dbTable = mist.DBs.groupsByName[name]
elseif spawnedObj:getCategory() == 3 or spawnedObj:getCategory() == 6 then -- static objects local _u
if mist.stringMatch(spawnedObj:getName(), name) == true then if gType ~= 'static' then
found = true local _g = Group.getByName(name)
break _u = _g:getUnit(1)
end if dbTable.groupId ~= _g:getID() or _u:getCountry() ~= dbTable.countryId or _u:getCoalition() ~= coalition.side[string.upper(dbTable.coaltionId)] then
end dbLog:info('Group Data mismatch')
end updated = true
-- for some reason cargo objects are returning as category == 6.
if found == false then
added = true
if spawnedObj:getCategory() == 1 then -- normal groups
groupsToAdd[spawnedObj:getGroup():getName()] = true
elseif spawnedObj:getCategory() == 3 or spawnedObj:getCategory() == 6 then -- static objects
groupsToAdd[spawnedObj:getName()] = true
end end
end end
end end
table.remove(ltemp, x) if updated == false and gType ~= 'static' then -- time to check units
if x%updatesPerRun == 0 then dbLog:info('No Group Mismatch, Check Units')
coroutine.yield() for index, uObject in pairs(Group.getByName(name):getUnits()) do
end dbLog:info(index)
end if mist.DBs.unitsByName[uObject:getName()] then
dbLog:info('UnitByName table exists')
if added == true then local uTable = mist.DBs.unitsByName[uObject:getName()]
for groupName, val in pairs(groupsToAdd) do if uObject:getID() ~= uTable.unitId or uObject:getTypeName() ~= uTable.type then
local dataChanged = false dbLog:info('Unit Data mismatch')
if mist.DBs.groupsByName[groupName] then updated = true
for _index, data in pairs(mist.DBs.groupsByName[groupName]) do
if data.unitName ~= spawnedObj:getName() and data.unitId ~= spawnedObj:getID() and data.type ~= spawnedObj:getTypeName() then
dataChanged = true
break break
end end
end end
if dataChanged == false then
groupsToAdd[groupName] = false
end end
end end
if groupsToAdd[groupName] == true or not mist.DBs.groupsByName[groupName] then
writeGroups[#writeGroups + 1] = dbUpdate(groupName) if updated == true or not mist.DBs.groupsByName[name] then
end dbLog:info('Get Table')
writeGroups[#writeGroups+1] = {data = dbUpdate(name, gType), isUpdated = updated}
end end
-- Work done, so remove
tempSpawnedGroups[name] = nil
tempSpawnGroupsCounter = tempSpawnGroupsCounter - 1
end end
end end
end end
local function updateDBTables() local function updateDBTables()
local i = 0 local i = #writeGroups
for index, newTable in pairs(writeGroups) do
i = i + 1
end
local savesPerRun = math.ceil(i/10) local savesPerRun = math.ceil(i/10)
if savesPerRun < 5 then if savesPerRun < 5 then
savesPerRun = 5 savesPerRun = 5
end end
if i > 0 then if i > 0 then
dbLog:info('updateDBTables')
local ldeepCopy = mist.utils.deepCopy local ldeepCopy = mist.utils.deepCopy
for x = 1, i do for x = 1, i do
local newTable = writeGroups[x] dbLog:info(writeGroups[x])
local newTable = writeGroups[x].data
local updated = writeGroups[x].isUpdated
local mistCategory local mistCategory
if type(newTable.category) == 'string' then if type(newTable.category) == 'string' then
mistCategory = string.lower(newTable.category) mistCategory = string.lower(newTable.category)
@ -787,17 +881,43 @@ do -- the main scope
mistCategory = 'ship' mistCategory = 'ship'
newTable.category = mistCategory newTable.category = mistCategory
end end
dbLog:info('Update unitsBy')
for newId, newUnitData in pairs(newTable.units) do for newId, newUnitData in pairs(newTable.units) do
dbLog:info(newId)
newUnitData.category = mistCategory newUnitData.category = mistCategory
if newUnitData.unitId then if newUnitData.unitId then
dbLog:info('byId')
mist.DBs.unitsById[tonumber(newUnitData.unitId)] = ldeepCopy(newUnitData) mist.DBs.unitsById[tonumber(newUnitData.unitId)] = ldeepCopy(newUnitData)
end end
dbLog:info(updated)
if mist.DBs.unitsByName[newUnitData.unitName] and updated == true then--if unit existed before and something was updated, write over the entry for a given unit name just in case.
dbLog:info('Updating Unit Tables')
for i = 1, #mist.DBs.unitsByCat[mistCategory] do
if mist.DBs.unitsByCat[mistCategory][i].unitName == newUnitData.unitName then
dbLog:info('Entry Found, Rewriting for unitsByCat')
mist.DBs.unitsByCat[mistCategory][i] = ldeepCopy(newUnitData)
break
end
end
for i = 1, #mist.DBs.unitsByNum do
if mist.DBs.unitsByNum[i].unitName == newUnitData.unitName then
dbLog:info('Entry Found, Rewriting for unitsByNum')
mist.DBs.unitsByNum[i] = ldeepCopy(newUnitData)
break
end
end
mist.DBs.unitsByName[newUnitData.unitName] = ldeepCopy(newUnitData) else
dbLog:info('Unitname not in use, add as normal')
mist.DBs.unitsByCat[mistCategory][#mist.DBs.unitsByCat[mistCategory] + 1] = ldeepCopy(newUnitData) mist.DBs.unitsByCat[mistCategory][#mist.DBs.unitsByCat[mistCategory] + 1] = ldeepCopy(newUnitData)
mist.DBs.unitsByNum[#mist.DBs.unitsByNum + 1] = ldeepCopy(newUnitData) mist.DBs.unitsByNum[#mist.DBs.unitsByNum + 1] = ldeepCopy(newUnitData)
end
mist.DBs.unitsByName[newUnitData.unitName] = ldeepCopy(newUnitData)
end end
-- this is a really annoying DB to populate. Gotta create new tables in case its missing -- this is a really annoying DB to populate. Gotta create new tables in case its missing
dbLog:info('write mist.DBs.units')
if not mist.DBs.units[newTable.coalition] then if not mist.DBs.units[newTable.coalition] then
mist.DBs.units[newTable.coalition] = {} mist.DBs.units[newTable.coalition] = {}
end end
@ -809,7 +929,20 @@ do -- the main scope
if not mist.DBs.units[newTable.coalition][newTable.country][mistCategory] then if not mist.DBs.units[newTable.coalition][newTable.country][mistCategory] then
mist.DBs.units[newTable.coalition][(newTable.country)][mistCategory] = {} mist.DBs.units[newTable.coalition][(newTable.country)][mistCategory] = {}
end end
if updated == true then
dbLog:info('Updating DBsUnits')
for i = 1, #mist.DBs.units[newTable.coalition][(newTable.country)][mistCategory] do
if mist.DBs.units[newTable.coalition][(newTable.country)][mistCategory][i].groupName == newTable.groupName then
dbLog:info('Entry Found, Rewriting')
mist.DBs.units[newTable.coalition][(newTable.country)][mistCategory][i] = ldeepCopy(newTable)
break
end
end
else
mist.DBs.units[newTable.coalition][(newTable.country)][mistCategory][#mist.DBs.units[newTable.coalition][(newTable.country)][mistCategory] + 1] = ldeepCopy(newTable) mist.DBs.units[newTable.coalition][(newTable.country)][mistCategory][#mist.DBs.units[newTable.coalition][(newTable.country)][mistCategory] + 1] = ldeepCopy(newTable)
end
if newTable.groupId then if newTable.groupId then
mist.DBs.groupsById[newTable.groupId] = ldeepCopy(newTable) mist.DBs.groupsById[newTable.groupId] = ldeepCopy(newTable)
@ -826,13 +959,34 @@ do -- the main scope
if timer.getTime() > lastUpdateTime then if timer.getTime() > lastUpdateTime then
lastUpdateTime = timer.getTime() lastUpdateTime = timer.getTime()
end end
dbLog:info('endUpdateTables')
end end
end end
local function groupSpawned(event) local function groupSpawned(event)
-- dont need to add units spawned in at the start of the mission if mist is loaded in init line -- dont need to add units spawned in at the start of the mission if mist is loaded in init line
if event.id == world.event.S_EVENT_BIRTH and timer.getTime0() < timer.getAbsTime() then if event.id == world.event.S_EVENT_BIRTH and timer.getTime0() < timer.getAbsTime() then
table.insert(tempSpawnedUnits,(event.initiator)) dbLog:info('unitSpawnEvent')
--table.insert(tempSpawnedUnits,(event.initiator))
-------
-- New functionality below.
-------
if Object.getCategory(event.initiator) == 1 and not Unit.getPlayerName(event.initiator) then -- simple player check, will need to later check to see if unit was spawned with a player in a flight
dbLog:info('Object is a Unit')
dbLog:info(Unit.getGroup(event.initiator):getName())
if not tempSpawnedGroups[Unit.getGroup(event.initiator):getName()] then
dbLog:info('added')
tempSpawnedGroups[Unit.getGroup(event.initiator):getName()] = 'group'
tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
end
elseif Object.getCategory(event.initiator) == 3 or Object.getCategory(event.initiator) == 6 then
dbLog:info('Object is Static')
tempSpawnedGroups[StaticObject.getName(event.initiator)] = 'static'
tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
end
end end
end end
@ -938,7 +1092,7 @@ do -- the main scope
--[[ --[[
local function addClientsToActive(event) local function addClientsToActive(event)
if event.id == world.event.S_EVENT_PLAYER_ENTER_UNIT or event.id == world.event.S_EVENT_BIRTH then if event.id == world.event.S_EVENT_PLAYER_ENTER_UNIT or event.id == world.event.S_EVENT_BIRTH then
log:info(mist.utils.tableShow(event)) log:info(event)
if Unit.getPlayerName(event.initiator) then if Unit.getPlayerName(event.initiator) then
log:info(Unit.getPlayerName(event.initiator)) log:info(Unit.getPlayerName(event.initiator))
local newU = mist.utils.deepCopy(mist.DBs.unitsByName[Unit.getName(event.initiator)]) local newU = mist.utils.deepCopy(mist.DBs.unitsByName[Unit.getName(event.initiator)])
@ -964,6 +1118,8 @@ do -- the main scope
function mist.init() function mist.init()
-- create logger -- create logger
mist.log = mist.Logger:new("MIST") mist.log = mist.Logger:new("MIST")
dbLog = mist.Logger:new('MISTDB', 'warning')
log = mist.log -- log shorthand log = mist.log -- log shorthand
-- set warning log level, showing only -- set warning log level, showing only
-- warnings and errors -- warnings and errors
@ -988,9 +1144,11 @@ do -- the main scope
function mist.main() function mist.main()
timer.scheduleFunction(mist.main, {}, timer.getTime() + 0.01) --reschedule first in case of Lua error timer.scheduleFunction(mist.main, {}, timer.getTime() + 0.01) --reschedule first in case of Lua error
writeDbTableCounter = writeDbTableCounter + 1 updateTenthSecond = updateTenthSecond + 1
if writeDbTableCounter == 10 then if updateTenthSecond == 10 then
writeDbTableCounter = 0 updateTenthSecond = 0
checkSpawnedEventsNew()
if not coroutines.updateDBTables then if not coroutines.updateDBTables then
coroutines.updateDBTables = coroutine.create(updateDBTables) coroutines.updateDBTables = coroutine.create(updateDBTables)
@ -1003,21 +1161,6 @@ do -- the main scope
end end
end end
checkSpawnEventsCounter = checkSpawnEventsCounter + 1
if checkSpawnEventsCounter == 10 then
checkSpawnEventsCounter = 0
if not coroutines.checkSpawnedEvents then
coroutines.checkSpawnedEvents = coroutine.create(checkSpawnedEvents)
end
coroutine.resume(coroutines.checkSpawnedEvents)
if coroutine.status(coroutines.checkSpawnedEvents) == 'dead' then
coroutines.checkSpawnedEvents = nil
end
end
--updating alive units --updating alive units
updateAliveUnitsCounter = updateAliveUnitsCounter + 1 updateAliveUnitsCounter = updateAliveUnitsCounter + 1
if updateAliveUnitsCounter == 5 then if updateAliveUnitsCounter == 5 then
@ -1066,62 +1209,42 @@ do -- the main scope
--- Spawns a static object to the game world. --- Spawns a static object to the game world.
-- @todo write good docs -- @todo write good docs
-- @tparam table staticObj table containing data needed for the object creation -- @tparam table staticObj table containing data needed for the object creation
function mist.dynAddStatic(staticObj) function mist.dynAddStatic(newObj)
local newObj = {}
newObj.groupId = staticObj.groupId
newObj.category = staticObj.category
newObj.type = staticObj.type
newObj.unitId = staticObj.unitId
newObj.y = staticObj.y
newObj.x = staticObj.x
newObj.heading = staticObj.heading
newObj.name = staticObj.name
newObj.dead = staticObj.dead
newObj.country = staticObj.country
newObj.countryId = staticObj.countryId
newObj.clone = staticObj.clone
newObj.shape_name = staticObj.shape_name
newObj.canCargo = staticObj.canCargo
newObj.mass = staticObj.mass
newObj.categoryStatic = staticObj.categoryStatic
if staticObj.units then -- if its mist format
newObj.groupId = staticObj.units[1].groupId
newObj.category = staticObj.units[1].category
newObj.type = staticObj.units[1].type
newObj.unitId = staticObj.units[1].unitId
newObj.y = staticObj.units[1].y
newObj.x = staticObj.units[1].x
newObj.heading = staticObj.units[1].heading
newObj.name = staticObj.units[1].name
newObj.dead = staticObj.units[1].dead
newObj.country = staticObj.units[1].country
newObj.countryId = staticObj.units[1].countryId
newObj.shape_name = staticObj.units[1].shape_name
newObj.canCargo = staticObj.units[1].canCargo
newObj.mass = staticObj.units[1].mass
newObj.categoryStatic = staticObj.units[1].categoryStatic
end
if not newObj.country then if newObj.units and newObj.units[1] then -- if its mist format
return false for entry, val in pairs(newObj.units[1]) do
if newObj[entry] and newObj[entry] ~= val or not newObj[entry] then
newObj[entry] = val
end end
end
end
--log:info(newObj)
local newCountry = newObj.country local cntry = newObj.country
if newObj.countryId then if newObj.countryId then
newCountry = newObj.countryId cntry = newObj.countryId
end end
local newCountry = ''
for countryId, countryName in pairs(country.name) do for countryId, countryName in pairs(country.name) do
if type(newObj.country) == 'string' then if type(cntry) == 'string' then
if tostring(countryName) == string.upper(newObj.country) then cntry = cntry:gsub("%s+", "_")
if tostring(countryName) == string.upper(cntry) then
newCountry = countryName newCountry = countryName
end end
elseif type(newObj.country) == 'number' then elseif type(cntry) == 'number' then
if countryId == newObj.country then if countryId == cntry then
newCountry = countryName newCountry = countryName
end end
end end
end end
if newCountry == '' then
log:error("Country not found: $1", cntry)
return false
end
if newObj.clone or not newObj.groupId then if newObj.clone or not newObj.groupId then
mistGpId = mistGpId + 1 mistGpId = mistGpId + 1
newObj.groupId = mistGpId newObj.groupId = mistGpId
@ -1133,8 +1256,8 @@ do -- the main scope
end end
if newObj.clone or not newObj.name then if newObj.clone or not newObj.name then
mistDynAddIndex = mistDynAddIndex + 1 mistDynAddIndex[' static '] = mistDynAddIndex[' static '] + 1
newObj.name = (country.name[newCountry] .. ' static ' .. mistDynAddIndex) newObj.name = (newCountry .. ' static ' .. mistDynAddIndex[' static '])
end end
if not newObj.dead then if not newObj.dead then
@ -1151,12 +1274,26 @@ do -- the main scope
if newObj.mass then if newObj.mass then
newObj.category = 'Cargos' newObj.category = 'Cargos'
end end
if newObj.shapeName then
newObj.shape_name = newObj.shapeName
end
if not newObj.shape_name then
log:info('shape_name not present')
if mist.DBs.const.shapeNames[newObj.type] then
newObj.shape_name = mist.DBs.const.shapeNames[newObj.type]
end
end
mistAddedObjects[#mistAddedObjects + 1] = mist.utils.deepCopy(newObj) mistAddedObjects[#mistAddedObjects + 1] = mist.utils.deepCopy(newObj)
if newObj.x and newObj.y and newObj.type and type(newObj.x) == 'number' and type(newObj.y) == 'number' and type(newObj.type) == 'string' then if newObj.x and newObj.y and newObj.type and type(newObj.x) == 'number' and type(newObj.y) == 'number' and type(newObj.type) == 'string' then
--log:info('addStaticObject')
coalition.addStaticObject(country.id[newCountry], newObj) coalition.addStaticObject(country.id[newCountry], newObj)
return newObj return newObj
end end
log:error("Failed to add static object due to missing or incorrect value. X: $1, Y: $2, Type: $3", newObj.x, newObj.y, newObj.type)
return false return false
end end
@ -1189,6 +1326,7 @@ do -- the main scope
end end
if newCountry == '' then if newCountry == '' then
log:error("Country not found: $1", cntry)
return false return false
end end
@ -1223,7 +1361,7 @@ do -- the main scope
typeName = ' bld ' typeName = ' bld '
end end
if newGroup.clone or not newGroup.groupId then if newGroup.clone or not newGroup.groupId then
mistDynAddIndex = mistDynAddIndex + 1 mistDynAddIndex[typeName] = mistDynAddIndex[typeName] + 1
mistGpId = mistGpId + 1 mistGpId = mistGpId + 1
newGroup.groupId = mistGpId newGroup.groupId = mistGpId
end end
@ -1236,7 +1374,7 @@ do -- the main scope
end end
if newGroup.clone and mist.DBs.groupsByName[newGroup.name] or not newGroup.name then if newGroup.clone and mist.DBs.groupsByName[newGroup.name] or not newGroup.name then
newGroup.name = tostring(tostring(country.name[cntry]) .. tostring(typeName) .. mistDynAddIndex) newGroup.name = tostring(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName])
end end
if not newGroup.hidden then if not newGroup.hidden then
@ -1408,7 +1546,10 @@ do -- the main scope
end end
return false return false
end end
end
-- Begin common funcs
do
--- Returns MGRS coordinates as string. --- Returns MGRS coordinates as string.
-- @tparam string MGRS MGRS coordinates -- @tparam string MGRS MGRS coordinates
-- @tparam number acc the accuracy of each easting/northing. -- @tparam number acc the accuracy of each easting/northing.
@ -1560,6 +1701,7 @@ do -- the main scope
end end
end end
end end
log:error("Unit not found in DB: $1", unitName)
return false return false
end end
@ -1575,7 +1717,11 @@ do -- the main scope
-- search by groupId and allow groupId and groupName as inputs -- search by groupId and allow groupId and groupName as inputs
local gpId = groupIdent local gpId = groupIdent
if type(groupIdent) == 'string' and not tonumber(groupIdent) then if type(groupIdent) == 'string' and not tonumber(groupIdent) then
if mist.DBs.MEgroupsByName[groupIdent] then
gpId = mist.DBs.MEgroupsByName[groupIdent].groupId gpId = mist.DBs.MEgroupsByName[groupIdent].groupId
else
log:error("Group not found in mist.DBs.MEgroupsByName: $1", groupIdent)
end
end end
for coa_name, coa_data in pairs(env.mission.coalition) do for coa_name, coa_data in pairs(env.mission.coalition) do
@ -2889,7 +3035,7 @@ do -- group functions scope
newData.units[unitNum].shape_name = unitData.shape_name newData.units[unitNum].shape_name = unitData.shape_name
end end
end end
--log:info(newData)
return newData return newData
else else
log:error('$1 not found in MIST database', gpName) log:error('$1 not found in MIST database', gpName)
@ -2901,7 +3047,11 @@ do -- group functions scope
-- refactor to search by groupId and allow groupId and groupName as inputs -- refactor to search by groupId and allow groupId and groupName as inputs
local unitId = unitIdent local unitId = unitIdent
if type(unitIdent) == 'string' and not tonumber(unitIdent) then if type(unitIdent) == 'string' and not tonumber(unitIdent) then
if mist.DBs.MEunitsByName[unitIdent] then
unitId = mist.DBs.MEunitsByName[unitIdent].unitId unitId = mist.DBs.MEunitsByName[unitIdent].unitId
else
log:error("Unit not found in mist.DBs.MEunitsByName: $1", unitIdent)
end
end end
local gpId = mist.DBs.MEunitsById[unitId].groupId local gpId = mist.DBs.MEunitsById[unitId].groupId
@ -2940,7 +3090,11 @@ do -- group functions scope
function mist.getGroupPayload(groupIdent) function mist.getGroupPayload(groupIdent)
local gpId = groupIdent local gpId = groupIdent
if type(groupIdent) == 'string' and not tonumber(groupIdent) then if type(groupIdent) == 'string' and not tonumber(groupIdent) then
if mist.DBs.MEgroupsByName[groupIdent] then
gpId = mist.DBs.MEgroupsByName[groupIdent].groupId gpId = mist.DBs.MEgroupsByName[groupIdent].groupId
else
log:error('$1 not found in mist.DBs.MEgroupsByName', groupIdent)
end
end end
if gpId then if gpId then
@ -3023,6 +3177,7 @@ do -- group functions scope
newGroupData = vars.groupData newGroupData = vars.groupData
end end
--log:info('get Randomized Point')
local diff = {x = 0, y = 0} local diff = {x = 0, y = 0}
local newCoord, origCoord local newCoord, origCoord
if point then if point then
@ -3047,7 +3202,7 @@ do -- group functions scope
end end
end end
if valid == false then if valid == false then
log:error('point supplied in variable table is not a valid coordinate.') log:error('Point supplied in variable table is not a valid coordinate. Valid coords: $1', validTerrain)
return false return false
end end
end end
@ -3106,6 +3261,7 @@ do -- group functions scope
end end
--mist.debug.writeData(mist.utils.serialize,{'teleportToPoint', newGroupData}, 'newGroupData.lua') --mist.debug.writeData(mist.utils.serialize,{'teleportToPoint', newGroupData}, 'newGroupData.lua')
if string.lower(newGroupData.category) == 'static' then if string.lower(newGroupData.category) == 'static' then
--log:info(newGroupData)
return mist.dynAddStatic(newGroupData) return mist.dynAddStatic(newGroupData)
end end
return mist.dynAdd(newGroupData) return mist.dynAdd(newGroupData)
@ -3138,7 +3294,7 @@ do -- group functions scope
end end
function mist.cloneInZone(gpName, zone, disperse, maxDisp) function mist.cloneInZone(gpName, zone, disperse, maxDisp)
--log:info('cloneInZone')
if type(gpName) == 'table' then if type(gpName) == 'table' then
gpName = gpName:getName() gpName = gpName:getName()
else else
@ -3157,6 +3313,7 @@ do -- group functions scope
vars.radius = zone.radius vars.radius = zone.radius
vars.disperse = disperse vars.disperse = disperse
vars.maxDisp = maxDisp vars.maxDisp = maxDisp
--log:info('do teleport')
return mist.teleportToPoint(vars) return mist.teleportToPoint(vars)
end end
@ -3462,70 +3619,70 @@ do -- mist.util scope
--- Converts angle in radians to degrees. --- Converts angle in radians to degrees.
-- @param angle angle in radians -- @param angle angle in radians
-- @return angle in degrees -- @return angle in degrees
function mist.utils.toDegree (angle) function mist.utils.toDegree(angle)
return angle*180/math.pi return angle*180/math.pi
end end
--- Converts angle in degrees to radians. --- Converts angle in degrees to radians.
-- @param angle angle in degrees -- @param angle angle in degrees
-- @return angle in degrees -- @return angle in degrees
function mist.utils.toRadian (angle) function mist.utils.toRadian(angle)
return angle*math.pi/180 return angle*math.pi/180
end end
--- Converts meters to nautical miles. --- Converts meters to nautical miles.
-- @param meters distance in meters -- @param meters distance in meters
-- @return distance in nautical miles -- @return distance in nautical miles
function mist.utils.metersToNM (meters) function mist.utils.metersToNM(meters)
return meters/1852 return meters/1852
end end
--- Converts meters to feet. --- Converts meters to feet.
-- @param meters distance in meters -- @param meters distance in meters
-- @return distance in feet -- @return distance in feet
function mist.utils.metersToFeet (meters) function mist.utils.metersToFeet(meters)
return meters/0.3048 return meters/0.3048
end end
--- Converts nautical miles to meters. --- Converts nautical miles to meters.
-- @param nm distance in nautical miles -- @param nm distance in nautical miles
-- @return distance in meters -- @return distance in meters
function mist.utils.NMToMeters (nm) function mist.utils.NMToMeters(nm)
return NM*1852 return nm*1852
end end
--- Converts feet to meters. --- Converts feet to meters.
-- @param feet distance in feet -- @param feet distance in feet
-- @return distance in meters -- @return distance in meters
function mist.utils.feetToMeters (feet) function mist.utils.feetToMeters(feet)
return feet*0.3048 return feet*0.3048
end end
--- Converts meters per second to knots. --- Converts meters per second to knots.
-- @param mps speed in m/s -- @param mps speed in m/s
-- @return speed in knots -- @return speed in knots
function mist.utils.mpsToKnots (mps) function mist.utils.mpsToKnots(mps)
return mps*3600/1852 return mps*3600/1852
end end
--- Converts meters per second to kilometers per hour. --- Converts meters per second to kilometers per hour.
-- @param mps speed in m/s -- @param mps speed in m/s
-- @return speed in km/h -- @return speed in km/h
function mist.utils.mpsToKmph (mps) function mist.utils.mpsToKmph(mps)
return mps*3.6 return mps*3.6
end end
--- Converts knots to meters per second. --- Converts knots to meters per second.
-- @param knots speed in knots -- @param knots speed in knots
-- @return speed in m/s -- @return speed in m/s
function mist.utils.knotsToMps (knots) function mist.utils.knotsToMps(knots)
return knots*1852/3600 return knots*1852/3600
end end
--- Converts kilometers per hour to meters per second. --- Converts kilometers per hour to meters per second.
-- @param kmph speed in km/h -- @param kmph speed in km/h
-- @return speed in m/s -- @return speed in m/s
function mist.utils.kmphToMps (kmph) function mist.utils.kmphToMps(kmph)
return kmph/3.6 return kmph/3.6
end end
@ -3575,12 +3732,16 @@ do -- mist.util scope
--- Returns the center of a zone as Vec3. --- Returns the center of a zone as Vec3.
-- @tparam string|table zone trigger zone name or table -- @tparam string|table zone trigger zone name or table
-- @treturn Vec3 center of the zone -- @treturn Vec3 center of the zone
function mist.utils.zoneToVec3 (zone) function mist.utils.zoneToVec3(zone)
local new = {} local new = {}
if type(zone) == 'table' and zone.point then if type(zone) == 'table' then
if zone.point then
new.x = zone.point.x new.x = zone.point.x
new.y = zone.point.y new.y = zone.point.y
new.z = zone.point.z new.z = zone.point.z
elseif zone.x and zone.y and zone.z then
return zone
end
return new return new
elseif type(zone) == 'string' then elseif type(zone) == 'string' then
zone = trigger.misc.getZone(zone) zone = trigger.misc.getZone(zone)
@ -3662,6 +3823,7 @@ do -- mist.util scope
return new return new
end end
log:error("$1 not found or doesn't exist", pUnit)
return false return false
end end
@ -5778,8 +5940,10 @@ do -- group tasks scope
function mist.getGroupRoute(groupIdent, task) function mist.getGroupRoute(groupIdent, task)
-- refactor to search by groupId and allow groupId and groupName as inputs -- refactor to search by groupId and allow groupId and groupName as inputs
local gpId = groupIdent local gpId = groupIdent
if type(groupIdent) == 'string' and not tonumber(groupIdent) then if mist.DBs.MEgroupsByName[groupIdent] then
gpId = mist.DBs.MEgroupsByName[groupIdent].groupId gpId = mist.DBs.MEgroupsByName[groupIdent].groupId
else
log:error('$1 not found in mist.DBs.MEgroupsByName', groupIdent)
end end
for coa_name, coa_data in pairs(env.mission.coalition) do for coa_name, coa_data in pairs(env.mission.coalition) do
@ -5818,6 +5982,7 @@ do -- group tasks scope
return points return points
end end
log:error('Group route not defined in mission editor for groupId: $1', gpId)
return return
end --if group_data and group_data.name and group_data.name == 'groupname' end --if group_data and group_data.name and group_data.name == 'groupname'
end --for group_num, group_data in pairs(obj_type_data.group) do end --for group_num, group_data in pairs(obj_type_data.group) do
@ -6482,7 +6647,7 @@ do -- mist.Logger scope
self.level = 0 self.level = 0
elseif level == 'error' then elseif level == 'error' then
self.level = 1 self.level = 1
elseif level == 'warning' then elseif level == 'warning' or level == 'warn' then
self.level = 2 self.level = 2
elseif level == 'info' then elseif level == 'info' then
self.level = 3 self.level = 3

Binary file not shown.