Build 106

- Added mist.DBs.drawingsByName and mist.DBs.drawingIndexed. They are a table of points

-Added new callsigns to mist.DBs.const.callsigns
-Added mist.marker.drawShape.
mist.shape.getPointOnSegment
-Added mist.shape.segmentInsersect
-Added mist.mapValue
-Added mist.utils.hexToRGB
-Added mist.getWindBearingAndVel

-Updated mist.messages to only display a message if the messages has been updated. This should prevent spamming the message log.

Fixed: Bug with mist.marker.add() associated with text boxes
Fixed: Zone radius value of verticies present
Updated: DB Sample Files
This commit is contained in:
mrSkortch 2022-02-11 01:58:17 -07:00
parent d1e57e4107
commit 45fd759aae
27 changed files with 5010 additions and 3659 deletions

View File

@ -1414,25 +1414,25 @@ MEgroupsById =
[1] = [1] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 675199.99999999, ["y"] = 675199.99999999,
["x"] = -292007.14285714, ["x"] = -292007.14285714,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 45,
["groupId"] = 31, ["groupId"] = 31,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cargoBob", ["groupName"] = "cargoBob",
["x"] = -292007.14285714, ["x"] = -292007.14285714,
["y"] = 675199.99999999, ["coalition"] = "blue",
["mass"] = 371, ["mass"] = 371,
["unitId"] = 45, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cargoBob", ["unitName"] = "cargoBob",
["y"] = 675199.99999999,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [31] }, -- end of [31]
@ -1449,25 +1449,25 @@ MEgroupsById =
[1] = [1] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 674842.85714285, ["y"] = 674842.85714285,
["x"] = -291678.57142856, ["x"] = -291678.57142856,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 46,
["groupId"] = 32, ["groupId"] = 32,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cloneCargoBase", ["groupName"] = "cloneCargoBase",
["x"] = -291678.57142856, ["x"] = -291678.57142856,
["y"] = 674842.85714285, ["coalition"] = "blue",
["mass"] = 1337, ["mass"] = 1337,
["unitId"] = 46, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cloneCargoBase", ["unitName"] = "cloneCargoBase",
["y"] = 674842.85714285,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [32] }, -- end of [32]
@ -1832,25 +1832,25 @@ MEgroupsById =
{ {
[1] = [1] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 41, ["unitId"] = 64,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1 #001", ["groupName"] = "static_on_ship1 #001",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1 #001", ["unitName"] = "static_on_ship1 #001",
["unitId"] = 64, ["groupId"] = 41,
["coalition"] = "blue",
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["countryId"] = 2,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [41] }, -- end of [41]
@ -2113,25 +2113,25 @@ MEgroupsById =
{ {
[1] = [1] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 40, ["unitId"] = 63,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1", ["groupName"] = "static_on_ship1",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1", ["unitName"] = "static_on_ship1",
["unitId"] = 63, ["groupId"] = 40,
["coalition"] = "blue",
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["countryId"] = 2,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [40] }, -- end of [40]

View File

@ -488,25 +488,25 @@ MEgroupsByName =
[1] = [1] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 674842.85714285, ["y"] = 674842.85714285,
["x"] = -291678.57142856, ["x"] = -291678.57142856,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 46,
["groupId"] = 32, ["groupId"] = 32,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cloneCargoBase", ["groupName"] = "cloneCargoBase",
["x"] = -291678.57142856, ["x"] = -291678.57142856,
["y"] = 674842.85714285, ["coalition"] = "blue",
["mass"] = 1337, ["mass"] = 1337,
["unitId"] = 46, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cloneCargoBase", ["unitName"] = "cloneCargoBase",
["y"] = 674842.85714285,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of ["cloneCargoBase"] }, -- end of ["cloneCargoBase"]
@ -1052,25 +1052,25 @@ MEgroupsByName =
{ {
[1] = [1] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 41, ["unitId"] = 64,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1 #001", ["groupName"] = "static_on_ship1 #001",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1 #001", ["unitName"] = "static_on_ship1 #001",
["unitId"] = 64, ["groupId"] = 41,
["coalition"] = "blue",
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["countryId"] = 2,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of ["static_on_ship1 #001"] }, -- end of ["static_on_ship1 #001"]
@ -1086,25 +1086,25 @@ MEgroupsByName =
{ {
[1] = [1] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 40, ["unitId"] = 63,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1", ["groupName"] = "static_on_ship1",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1", ["unitName"] = "static_on_ship1",
["unitId"] = 63, ["groupId"] = 40,
["coalition"] = "blue",
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["countryId"] = 2,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of ["static_on_ship1"] }, -- end of ["static_on_ship1"]
@ -1121,25 +1121,25 @@ MEgroupsByName =
[1] = [1] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 675199.99999999, ["y"] = 675199.99999999,
["x"] = -292007.14285714, ["x"] = -292007.14285714,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 45,
["groupId"] = 31, ["groupId"] = 31,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cargoBob", ["groupName"] = "cargoBob",
["x"] = -292007.14285714, ["x"] = -292007.14285714,
["y"] = 675199.99999999, ["coalition"] = "blue",
["mass"] = 371, ["mass"] = 371,
["unitId"] = 45, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cargoBob", ["unitName"] = "cargoBob",
["y"] = 675199.99999999,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of ["cargoBob"] }, -- end of ["cargoBob"]

View File

@ -1311,25 +1311,25 @@ MEunits =
[1] = [1] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 675199.99999999, ["y"] = 675199.99999999,
["x"] = -292007.14285714, ["x"] = -292007.14285714,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Cargos", ["country"] = "usa",
["y"] = 675199.99999999,
["coalition"] = "blue", ["coalition"] = "blue",
["groupName"] = "cargoBob",
["groupId"] = 31,
["countryId"] = 2,
["mass"] = 371,
["unitId"] = 45, ["unitId"] = 45,
["groupName"] = "cargoBob",
["countryId"] = 2,
["y"] = 675199.99999999,
["mass"] = 371,
["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cargoBob", ["unitName"] = "cargoBob",
["x"] = -292007.14285714, ["x"] = -292007.14285714,
["heading"] = 0, ["type"] = "uh1h_cargo",
["country"] = "usa", ["groupId"] = 31,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [4] }, -- end of [4]
@ -1346,25 +1346,25 @@ MEunits =
[1] = [1] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 674842.85714285, ["y"] = 674842.85714285,
["x"] = -291678.57142856, ["x"] = -291678.57142856,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Cargos", ["country"] = "usa",
["y"] = 674842.85714285,
["coalition"] = "blue", ["coalition"] = "blue",
["groupName"] = "cloneCargoBase",
["groupId"] = 32,
["countryId"] = 2,
["mass"] = 1337,
["unitId"] = 46, ["unitId"] = 46,
["groupName"] = "cloneCargoBase",
["countryId"] = 2,
["y"] = 674842.85714285,
["mass"] = 1337,
["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cloneCargoBase", ["unitName"] = "cloneCargoBase",
["x"] = -291678.57142856, ["x"] = -291678.57142856,
["heading"] = 0, ["type"] = "uh1h_cargo",
["country"] = "usa", ["groupId"] = 32,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [5] }, -- end of [5]
@ -1380,25 +1380,25 @@ MEunits =
{ {
[1] = [1] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["y"] = 443856.28948724, ["coalition"] = "blue",
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1", ["groupName"] = "static_on_ship1",
["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
["y"] = 443856.28948724,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
["unitId"] = 63, ["groupId"] = 40,
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1", ["unitName"] = "static_on_ship1",
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["country"] = "usa", ["heading"] = 0,
["groupId"] = 40, ["unitId"] = 63,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [6] }, -- end of [6]
@ -1414,25 +1414,25 @@ MEunits =
{ {
[1] = [1] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["y"] = 443849.03844635, ["coalition"] = "blue",
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1 #001", ["groupName"] = "static_on_ship1 #001",
["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
["y"] = 443849.03844635,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
["unitId"] = 64, ["groupId"] = 41,
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1 #001", ["unitName"] = "static_on_ship1 #001",
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["country"] = "usa", ["heading"] = 0,
["groupId"] = 41, ["unitId"] = 64,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [7] }, -- end of [7]

View File

@ -477,92 +477,92 @@ MEunitsByCat =
[5] = [5] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 675199.99999999, ["y"] = 675199.99999999,
["x"] = -292007.14285714, ["x"] = -292007.14285714,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 45,
["groupId"] = 31, ["groupId"] = 31,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cargoBob", ["groupName"] = "cargoBob",
["x"] = -292007.14285714, ["x"] = -292007.14285714,
["y"] = 675199.99999999, ["coalition"] = "blue",
["mass"] = 371, ["mass"] = 371,
["unitId"] = 45, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cargoBob", ["unitName"] = "cargoBob",
["y"] = 675199.99999999,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of [5] }, -- end of [5]
[6] = [6] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 674842.85714285, ["y"] = 674842.85714285,
["x"] = -291678.57142856, ["x"] = -291678.57142856,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 46,
["groupId"] = 32, ["groupId"] = 32,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cloneCargoBase", ["groupName"] = "cloneCargoBase",
["x"] = -291678.57142856, ["x"] = -291678.57142856,
["y"] = 674842.85714285, ["coalition"] = "blue",
["mass"] = 1337, ["mass"] = 1337,
["unitId"] = 46, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cloneCargoBase", ["unitName"] = "cloneCargoBase",
["y"] = 674842.85714285,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of [6] }, -- end of [6]
[7] = [7] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 40, ["unitId"] = 63,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1", ["groupName"] = "static_on_ship1",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1", ["unitName"] = "static_on_ship1",
["unitId"] = 63, ["groupId"] = 40,
["coalition"] = "blue",
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["countryId"] = 2,
}, -- end of [7] }, -- end of [7]
[8] = [8] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 41, ["unitId"] = 64,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1 #001", ["groupName"] = "static_on_ship1 #001",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1 #001", ["unitName"] = "static_on_ship1 #001",
["unitId"] = 64, ["groupId"] = 41,
["coalition"] = "blue",
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["countryId"] = 2,
}, -- end of [8] }, -- end of [8]
[9] = [9] =
{ {

View File

@ -1022,48 +1022,48 @@ MEunitsById =
[45] = [45] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 675199.99999999, ["y"] = 675199.99999999,
["x"] = -292007.14285714, ["x"] = -292007.14285714,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 45,
["groupId"] = 31, ["groupId"] = 31,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cargoBob", ["groupName"] = "cargoBob",
["x"] = -292007.14285714, ["x"] = -292007.14285714,
["y"] = 675199.99999999, ["coalition"] = "blue",
["mass"] = 371, ["mass"] = 371,
["unitId"] = 45, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cargoBob", ["unitName"] = "cargoBob",
["y"] = 675199.99999999,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of [45] }, -- end of [45]
[46] = [46] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 674842.85714285, ["y"] = 674842.85714285,
["x"] = -291678.57142856, ["x"] = -291678.57142856,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 46,
["groupId"] = 32, ["groupId"] = 32,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cloneCargoBase", ["groupName"] = "cloneCargoBase",
["x"] = -291678.57142856, ["x"] = -291678.57142856,
["y"] = 674842.85714285, ["coalition"] = "blue",
["mass"] = 1337, ["mass"] = 1337,
["unitId"] = 46, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cloneCargoBase", ["unitName"] = "cloneCargoBase",
["y"] = 674842.85714285,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of [46] }, -- end of [46]
[47] = [47] =
{ {
@ -1454,47 +1454,47 @@ MEunitsById =
}, -- end of [62] }, -- end of [62]
[63] = [63] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 40, ["unitId"] = 63,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1", ["groupName"] = "static_on_ship1",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1", ["unitName"] = "static_on_ship1",
["unitId"] = 63, ["groupId"] = 40,
["coalition"] = "blue",
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["countryId"] = 2,
}, -- end of [63] }, -- end of [63]
[64] = [64] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 41, ["unitId"] = 64,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1 #001", ["groupName"] = "static_on_ship1 #001",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1 #001", ["unitName"] = "static_on_ship1 #001",
["unitId"] = 64, ["groupId"] = 41,
["coalition"] = "blue",
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["countryId"] = 2,
}, -- end of [64] }, -- end of [64]
[65] = [65] =
{ {

View File

@ -365,25 +365,25 @@ MEunitsByName =
["cloneCargoBase"] = ["cloneCargoBase"] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 674842.85714285, ["y"] = 674842.85714285,
["x"] = -291678.57142856, ["x"] = -291678.57142856,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 46,
["groupId"] = 32, ["groupId"] = 32,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cloneCargoBase", ["groupName"] = "cloneCargoBase",
["x"] = -291678.57142856, ["x"] = -291678.57142856,
["y"] = 674842.85714285, ["coalition"] = "blue",
["mass"] = 1337, ["mass"] = 1337,
["unitId"] = 46, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cloneCargoBase", ["unitName"] = "cloneCargoBase",
["y"] = 674842.85714285,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of ["cloneCargoBase"] }, -- end of ["cloneCargoBase"]
["USTanks2_1"] = ["USTanks2_1"] =
{ {
@ -512,25 +512,25 @@ MEunitsByName =
}, -- end of ["Unit #006"] }, -- end of ["Unit #006"]
["static_on_ship1"] = ["static_on_ship1"] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 40, ["unitId"] = 63,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1", ["groupName"] = "static_on_ship1",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1", ["unitName"] = "static_on_ship1",
["unitId"] = 63, ["groupId"] = 40,
["coalition"] = "blue",
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["countryId"] = 2,
}, -- end of ["static_on_ship1"] }, -- end of ["static_on_ship1"]
["tent"] = ["tent"] =
{ {
@ -1226,25 +1226,25 @@ MEunitsByName =
}, -- end of ["Ground-1-1"] }, -- end of ["Ground-1-1"]
["static_on_ship1 #001"] = ["static_on_ship1 #001"] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 41, ["unitId"] = 64,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1 #001", ["groupName"] = "static_on_ship1 #001",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1 #001", ["unitName"] = "static_on_ship1 #001",
["unitId"] = 64, ["groupId"] = 41,
["coalition"] = "blue",
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["countryId"] = 2,
}, -- end of ["static_on_ship1 #001"] }, -- end of ["static_on_ship1 #001"]
["RuTent1"] = ["RuTent1"] =
{ {
@ -1643,25 +1643,25 @@ MEunitsByName =
["cargoBob"] = ["cargoBob"] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 675199.99999999, ["y"] = 675199.99999999,
["x"] = -292007.14285714, ["x"] = -292007.14285714,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 45,
["groupId"] = 31, ["groupId"] = 31,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cargoBob", ["groupName"] = "cargoBob",
["x"] = -292007.14285714, ["x"] = -292007.14285714,
["y"] = 675199.99999999, ["coalition"] = "blue",
["mass"] = 371, ["mass"] = 371,
["unitId"] = 45, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cargoBob", ["unitName"] = "cargoBob",
["y"] = 675199.99999999,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of ["cargoBob"] }, -- end of ["cargoBob"]
["USTanks2_4"] = ["USTanks2_4"] =
{ {

View File

@ -247,92 +247,92 @@ MEunitsByNum =
[11] = [11] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 675199.99999999, ["y"] = 675199.99999999,
["x"] = -292007.14285714, ["x"] = -292007.14285714,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 45,
["groupId"] = 31, ["groupId"] = 31,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cargoBob", ["groupName"] = "cargoBob",
["x"] = -292007.14285714, ["x"] = -292007.14285714,
["y"] = 675199.99999999, ["coalition"] = "blue",
["mass"] = 371, ["mass"] = 371,
["unitId"] = 45, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cargoBob", ["unitName"] = "cargoBob",
["y"] = 675199.99999999,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of [11] }, -- end of [11]
[12] = [12] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 674842.85714285, ["y"] = 674842.85714285,
["x"] = -291678.57142856, ["x"] = -291678.57142856,
}, -- end of ["point"] }, -- end of ["point"]
["unitId"] = 46,
["groupId"] = 32, ["groupId"] = 32,
["country"] = "usa", ["type"] = "uh1h_cargo",
["heading"] = 0,
["groupName"] = "cloneCargoBase", ["groupName"] = "cloneCargoBase",
["x"] = -291678.57142856, ["x"] = -291678.57142856,
["y"] = 674842.85714285, ["coalition"] = "blue",
["mass"] = 1337, ["mass"] = 1337,
["unitId"] = 46, ["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cloneCargoBase", ["unitName"] = "cloneCargoBase",
["y"] = 674842.85714285,
["country"] = "usa",
["countryId"] = 2, ["countryId"] = 2,
["categoryStatic"] = "Cargos",
["coalition"] = "blue",
}, -- end of [12] }, -- end of [12]
[13] = [13] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 40, ["unitId"] = 63,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1", ["groupName"] = "static_on_ship1",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1", ["unitName"] = "static_on_ship1",
["unitId"] = 63, ["groupId"] = 40,
["coalition"] = "blue",
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["countryId"] = 2,
}, -- end of [13] }, -- end of [13]
[14] = [14] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["groupId"] = 41, ["unitId"] = 64,
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1 #001", ["groupName"] = "static_on_ship1 #001",
["country"] = "usa", ["heading"] = 0,
["coalition"] = "blue", ["countryId"] = 2,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1 #001", ["unitName"] = "static_on_ship1 #001",
["unitId"] = 64, ["groupId"] = 41,
["coalition"] = "blue",
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["countryId"] = 2,
}, -- end of [14] }, -- end of [14]
[15] = [15] =
{ {

File diff suppressed because it is too large Load Diff

View File

@ -141,58 +141,166 @@ const =
{ {
["groupLimit"] = 9, ["groupLimit"] = 9,
}, -- end of ["rules"] }, -- end of ["rules"]
["aircraft"] = ["TRANSPORT"] =
{ {
["Uzi"] = 3, ["unique"] =
["Pontiac"] = 8,
["Chevy"] = 7,
["Dodge"] = 5,
["Ford"] = 6,
["Enfield"] = 1,
["Colt"] = 4,
["Springfield"] = 2,
}, -- end of ["aircraft"]
["unique"] =
{
["A10"] =
{ {
["Boar"] = 10, ["b52"] =
["Pig"] = 11,
["rules"] =
{ {
["canUseAircraft"] = true, ["rules"] =
["appliesTo"] =
{ {
[1] = "A-10C", ["canUseAircraft"] = true,
[2] = "A-10A", ["appliesTo"] =
}, -- end of ["appliesTo"] {
}, -- end of ["rules"] [1] = "B-52H",
["Tusk"] = 12, }, -- end of ["appliesTo"]
["Hawg"] = 9, }, -- end of ["rules"]
}, -- end of ["A10"] ["Dump"] = 10,
}, -- end of ["unique"] ["Kenworth"] = 11,
["JTAC"] = ["Buff"] = 9,
{ }, -- end of ["b52"]
["Ferret"] = 10, ["f15e"] =
["Finger"] = 8, {
["Deathstar"] = 15, ["Rage"] = 17,
["Pointer"] = 4, ["rules"] =
["Anvil"] = 16, {
["Darknight"] = 2, ["canUseAircraft"] = true,
["Whiplash"] = 7, ["appliesTo"] =
["Warrior"] = 3, {
["Eyeball"] = 5, [1] = "F-15E",
["Mantis"] = 18, }, -- end of ["appliesTo"]
["Playboy"] = 12, }, -- end of ["rules"]
["Axeman"] = 1, ["Trek"] = 12,
["Moonbeam"] = 6, ["Thud"] = 10,
["Hammer"] = 13, ["Sled"] = 14,
["Shaba"] = 11, ["Gunny"] = 11,
["Badger"] = 19, ["Dude"] = 9,
["Jaguar"] = 14, ["Tahoe"] = 18,
["Firefly"] = 17, ["Jazz"] = 16,
["Pinpoint"] = 9, ["Best"] = 15,
}, -- end of ["JTAC"] ["Sniper"] = 13,
}, -- end of ["f15e"]
["A10"] =
{
["Boar"] = 10,
["Pig"] = 11,
["rules"] =
{
["canUseAircraft"] = true,
["appliesTo"] =
{
[1] = "A-10C_2",
[2] = "A-10C",
[3] = "A-10A",
}, -- end of ["appliesTo"]
}, -- end of ["rules"]
["Tusk"] = 12,
["Hawg"] = 9,
}, -- end of ["A10"]
["f16"] =
{
["rules"] =
{
["canUseAircraft"] = true,
["appliesTo"] =
{
[1] = "F-16C_50",
[2] = "F-16C bl.52d",
[3] = "F-16C bl.50",
[4] = "F-16A MLU",
[5] = "F-16A",
}, -- end of ["appliesTo"]
}, -- end of ["rules"]
["Panther"] = 15,
["Weasel"] = 17,
["Viper"] = 9,
["Lobo"] = 11,
["Jedi"] = 20,
["Ninja"] = 19,
["Python"] = 13,
["Wild"] = 18,
["Rattler"] = 14,
["Wolf"] = 16,
["Cowboy"] = 12,
["Venom"] = 10,
}, -- end of ["f16"]
["b1"] =
{
["Dark"] = 10,
["rules"] =
{
["canUseAircraft"] = true,
["appliesTo"] =
{
[1] = "B-1B",
}, -- end of ["appliesTo"]
}, -- end of ["rules"]
["Vader"] = 11,
["Bone"] = 9,
}, -- end of ["b1"]
["f18"] =
{
["Jury"] = 14,
["rules"] =
{
["canUseAircraft"] = true,
["appliesTo"] =
{
[1] = "FA-18C_hornet",
[2] = "F/A-18C",
}, -- end of ["appliesTo"]
}, -- end of ["rules"]
["Ram"] = 16,
["Roman"] = 12,
["Hornet"] = 9,
["Squid"] = 10,
["Snake"] = 20,
["Hawk"] = 17,
["Devil"] = 18,
["Check"] = 19,
["Ragin"] = 11,
["Jokey"] = 15,
["Sting"] = 13,
}, -- end of ["f18"]
}, -- end of ["unique"]
["Trash"] = 10,
["aircraft"] =
{
["Uzi"] = 3,
["Pontiac"] = 8,
["Chevy"] = 7,
["Dodge"] = 5,
["Ford"] = 6,
["Enfield"] = 1,
["Colt"] = 4,
["Springfield"] = 2,
}, -- end of ["aircraft"]
["JTAC"] =
{
["Ferret"] = 10,
["Finger"] = 8,
["Deathstar"] = 15,
["Pointer"] = 4,
["Anvil"] = 16,
["Darknight"] = 2,
["Whiplash"] = 7,
["Warrior"] = 3,
["Eyeball"] = 5,
["Mantis"] = 18,
["Playboy"] = 12,
["Axeman"] = 1,
["Moonbeam"] = 6,
["Hammer"] = 13,
["Shaba"] = 11,
["Badger"] = 19,
["Jaguar"] = 14,
["Firefly"] = 17,
["Pinpoint"] = 9,
}, -- end of ["JTAC"]
["Ascot"] = 12,
["Cargo"] = 11,
["Heavy"] = 9,
}, -- end of ["TRANSPORT"]
["TANKER"] = ["TANKER"] =
{ {
["Texaco"] = 1, ["Texaco"] = 1,

View File

@ -1,58 +1,12 @@
deadObjects = deadObjects =
{ {
[16783360] =
{
["objectPos"] =
{
["y"] = 11.949347758943,
["x"] = -293002.76155801,
["z"] = 654661.93956923,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654665.71428571,
["x"] = -292962.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16783360,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs4",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -292962.85714286,
["y"] = 654665.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 30,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 11.942705180761,
["x"] = -292999.01167319,
["z"] = 654661.6137778,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16783360,
}, -- end of ["object"]
}, -- end of [16783360]
[16782592] = [16782592] =
{ {
["objectPos"] = ["objectPos"] =
{ {
["y"] = 11.745858960922, ["y"] = 11.75361563721,
["x"] = -292853.03376572, ["x"] = -292856.39553252,
["z"] = 654539.31845625, ["z"] = 654542.61205442,
}, -- end of ["objectPos"] }, -- end of ["objectPos"]
["objectType"] = "vehicle", ["objectType"] = "vehicle",
["objectData"] = ["objectData"] =
@ -82,9 +36,9 @@ deadObjects =
["country"] = "russia", ["country"] = "russia",
["pos"] = ["pos"] =
{ {
["y"] = 11.750308354347, ["y"] = 11.754341371009,
["x"] = -292852.11861931, ["x"] = -292856.19491841,
["z"] = 654539.33966137, ["z"] = 654542.5822736,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of ["objectData"] }, -- end of ["objectData"]
["object"] = ["object"] =
@ -92,59 +46,13 @@ deadObjects =
["id_"] = 16782592, ["id_"] = 16782592,
}, -- end of ["object"] }, -- end of ["object"]
}, -- end of [16782592] }, -- end of [16782592]
[16783616] =
{
["objectPos"] =
{
["y"] = 12.114658336158,
["x"] = -293052.09177348,
["z"] = 654688.79118826,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654705.71428571,
["x"] = -293002.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16783616,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs5",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -293002.85714286,
["y"] = 654705.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 31,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 12.108674123943,
["x"] = -293049.90666016,
["z"] = 654690.7394103,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16783616,
}, -- end of ["object"]
}, -- end of [16783616]
[16782848] = [16782848] =
{ {
["objectPos"] = ["objectPos"] =
{ {
["y"] = 11.895307197448, ["y"] = 11.829393615855,
["x"] = -292885.90343864, ["x"] = -292900.70531913,
["z"] = 654581.74191148, ["z"] = 654582.31756955,
}, -- end of ["objectPos"] }, -- end of ["objectPos"]
["objectType"] = "vehicle", ["objectType"] = "vehicle",
["objectData"] = ["objectData"] =
@ -174,9 +82,9 @@ deadObjects =
["country"] = "russia", ["country"] = "russia",
["pos"] = ["pos"] =
{ {
["y"] = 11.896243705612, ["y"] = 11.835539878247,
["x"] = -292885.8154643, ["x"] = -292898.99755273,
["z"] = 654581.81480703, ["z"] = 654582.04906262,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of ["objectData"] }, -- end of ["objectData"]
["object"] = ["object"] =
@ -184,59 +92,13 @@ deadObjects =
["id_"] = 16782848, ["id_"] = 16782848,
}, -- end of ["object"] }, -- end of ["object"]
}, -- end of [16782848] }, -- end of [16782848]
[16783872] =
{
["objectPos"] =
{
["y"] = 12.083325901948,
["x"] = -293047.96598556,
["z"] = 654725.0984902,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654745.71428571,
["x"] = -293042.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16783872,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs6",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -293042.85714286,
["y"] = 654745.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 32,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 12.084689792163,
["x"] = -293047.55373527,
["z"] = 654726.74612589,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16783872,
}, -- end of ["object"]
}, -- end of [16783872]
[16783104] = [16783104] =
{ {
["objectPos"] = ["objectPos"] =
{ {
["y"] = 11.916789886161, ["y"] = 11.923311694265,
["x"] = -292939.16858087, ["x"] = -292943.35378497,
["z"] = 654619.78649539, ["z"] = 654623.45115955,
}, -- end of ["objectPos"] }, -- end of ["objectPos"]
["objectType"] = "vehicle", ["objectType"] = "vehicle",
["objectData"] = ["objectData"] =
@ -266,9 +128,9 @@ deadObjects =
["country"] = "russia", ["country"] = "russia",
["pos"] = ["pos"] =
{ {
["y"] = 11.927206059256, ["y"] = 11.931074299111,
["x"] = -292936.5144784, ["x"] = -292941.20047403,
["z"] = 654619.49063824, ["z"] = 654623.11353253,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of ["objectData"] }, -- end of ["objectData"]
["object"] = ["object"] =
@ -276,4 +138,50 @@ deadObjects =
["id_"] = 16783104, ["id_"] = 16783104,
}, -- end of ["object"] }, -- end of ["object"]
}, -- end of [16783104] }, -- end of [16783104]
[16783616] =
{
["objectPos"] =
{
["y"] = 12.057971873824,
["x"] = -293013.37808746,
["z"] = 654700.95592945,
}, -- end of ["objectPos"]
["objectType"] = "vehicle",
["objectData"] =
{
["point"] =
{
["y"] = 654705.71428571,
["x"] = -293002.85714286,
}, -- end of ["point"]
["skill"] = "Average",
["unit"] =
{
["id_"] = 16783616,
}, -- end of ["unit"]
["category"] = "vehicle",
["unitName"] = "RuBTRs5",
["type"] = "BTR-80",
["groupId"] = 13,
["groupName"] = "RuBTRs",
["countryId"] = 0,
["coalition"] = "red",
["x"] = -293002.85714286,
["y"] = 654705.71428571,
["heading"] = -1.7994767003775,
["unitId"] = 31,
["playerCanDrive"] = true,
["country"] = "russia",
["pos"] =
{
["y"] = 12.057955079325,
["x"] = -293012.83464525,
["z"] = 654701.02104299,
}, -- end of ["pos"]
}, -- end of ["objectData"]
["object"] =
{
["id_"] = 16783616,
}, -- end of ["object"]
}, -- end of [16783616]
} -- end of deadObjects } -- end of deadObjects

View File

@ -0,0 +1,232 @@
drawingByName =
{
["Blue Line"] =
{
["visible"] = true,
["mapY"] = 653204.31828899,
["primitiveType"] = "Line",
["layer"] = "Author",
["closed"] = false,
["thickness"] = 8,
["lineMode"] = "segments",
["style"] = "solid",
["layerName"] = "Author",
["name"] = "Blue Line",
["points"] =
{
[1] =
{
["y"] = 653204.31828899,
["x"] = -91302.340018104,
}, -- end of [1]
[2] =
{
["y"] = 723491.4290735,
["x"] = -90143.761268909,
}, -- end of [2]
[3] =
{
["y"] = 725036.2007391,
["x"] = -129921.63165795,
}, -- end of [3]
[4] =
{
["y"] = 669810.61369412,
["x"] = -127604.47415956,
}, -- end of [4]
[5] =
{
["y"] = 707271.32658477,
["x"] = -161203.25788622,
}, -- end of [5]
}, -- end of ["points"]
["mapX"] = -91302.340018104,
["colorString"] = "0x0000ffff",
}, -- end of ["Blue Line"]
["Text Box 1"] =
{
["visible"] = true,
["fontSize"] = 24,
["mapY"] = 821584.42983871,
["primitiveType"] = "TextBox",
["layer"] = "Author",
["font"] = "DejaVuLGCSansCondensed.ttf",
["mapX"] = -217973.61659679,
["colorString"] = "0x004040ff",
["name"] = "Text Box 1",
["angle"] = 0,
["text"] = "Objective HERE",
["fillColorString"] = "0x00000080",
["borderThickness"] = 4,
["layerName"] = "Author",
}, -- end of ["Text Box 1"]
["Red Line"] =
{
["visible"] = true,
["mapY"] = 624626.04247551,
["primitiveType"] = "Line",
["layer"] = "Author",
["closed"] = false,
["thickness"] = 8,
["lineMode"] = "segment",
["style"] = "solid",
["layerName"] = "Author",
["name"] = "Red Line",
["points"] =
{
[1] =
{
["y"] = 624626.04247551,
["x"] = -35304.367140331,
}, -- end of [1]
[2] =
{
["y"] = 650887.1607906,
["x"] = -87440.410854119,
}, -- end of [2]
}, -- end of ["points"]
["mapX"] = -35304.367140331,
["colorString"] = "0xff0000ff",
}, -- end of ["Red Line"]
["ellipse"] =
{
["visible"] = true,
["points"] =
{
[1] =
{
["y"] = 830250.78116076,
["x"] = 11345.221862616,
}, -- end of [1]
[2] =
{
["y"] = 830744.08029641,
["x"] = 5911.6635979767,
}, -- end of [2]
[3] =
{
["y"] = 829981.52257348,
["x"] = -2199.1070035738,
}, -- end of [3]
[4] =
{
["y"] = 828015.0750406,
["x"] = -12434.354329222,
}, -- end of [4]
[5] =
{
["y"] = 824978.74784743,
["x"] = -24096.563188272,
}, -- end of [5]
[6] =
{
["y"] = 821079.46167442,
["x"] = -36390.973319689,
}, -- end of [6]
[7] =
{
["y"] = 816582.94643038,
["x"] = -48479.740990492,
}, -- end of [7]
[8] =
{
["y"] = 811795.63219835,
["x"] = -59539.036661549,
}, -- end of [8]
[9] =
{
["y"] = 807043.76653182,
["x"] = -68815.187609226,
}, -- end of [9]
[10] =
{
["y"] = 802651.18122316,
["x"] = -75676.039476005,
}, -- end of [10]
[11] =
{
["y"] = 798917.22370205,
["x"] = -79654.036545258,
}, -- end of [11]
[12] =
{
["y"] = 796096.35700289,
["x"] = -80478.084890666,
}, -- end of [12]
[13] =
{
["y"] = 794380.81852954,
["x"] = -78092.026979294,
}, -- end of [13]
[14] =
{
["y"] = 793887.51939389,
["x"] = -72658.468714655,
}, -- end of [14]
[15] =
{
["y"] = 794650.07711682,
["x"] = -64547.698113104,
}, -- end of [15]
[16] =
{
["y"] = 796616.5246497,
["x"] = -54312.450787456,
}, -- end of [16]
[17] =
{
["y"] = 799652.85184287,
["x"] = -42650.241928406,
}, -- end of [17]
[18] =
{
["y"] = 803552.13801588,
["x"] = -30355.831796989,
}, -- end of [18]
[19] =
{
["y"] = 808048.65325992,
["x"] = -18267.064126186,
}, -- end of [19]
[20] =
{
["y"] = 812835.96749195,
["x"] = -7207.7684551292,
}, -- end of [20]
[21] =
{
["y"] = 817587.83315848,
["x"] = 2068.3824925484,
}, -- end of [21]
[22] =
{
["y"] = 821980.41846714,
["x"] = 8929.234359327,
}, -- end of [22]
[23] =
{
["y"] = 825714.37598825,
["x"] = 12907.23142858,
}, -- end of [23]
[24] =
{
["y"] = 828535.24268741,
["x"] = 13731.279773988,
}, -- end of [24]
}, -- end of ["points"]
["layer"] = "Author",
["r1"] = 49818.886215397,
["mapY"] = 812315.79984515,
["layerName"] = "Author",
["name"] = "ellipse",
["fillColorString"] = "0xffffff80",
["thickness"] = 8,
["polygonMode"] = "oval",
["style"] = "solid",
["colorString"] = "0x008000ff",
["mapX"] = -33373.402558339,
["angle"] = 19,
["r2"] = 9268.6299935624,
["primitiveType"] = "Polygon",
}, -- end of ["ellipse"]
} -- end of drawingByName

View File

@ -0,0 +1,266 @@
drawingIndexed =
{
[1] =
{
["visible"] = true,
["hiddenOnPlanner"] = false,
["mapY"] = 687961.68076485,
["primitiveType"] = "Line",
["layer"] = "Author",
["closed"] = false,
["thickness"] = 8,
["colorString"] = "0xff0000ff",
["style"] = "solid",
["layerName"] = "Author",
["name"] = "Red Line",
["points"] =
{
[1] =
{
["y"] = 687961.68076485,
["x"] = -129535.43874155,
}, -- end of [1]
[2] =
{
["y"] = 687961.68076485,
["x"] = -129535.43874155,
}, -- end of [2]
[3] =
{
["y"] = 686803.10201565,
["x"] = -126832.08832676,
}, -- end of [3]
}, -- end of ["points"]
["mapX"] = -129535.43874155,
["lineMode"] = "segments",
}, -- end of [1]
[2] =
{
["visible"] = true,
["mapY"] = 624626.04247551,
["primitiveType"] = "Line",
["layer"] = "Author",
["closed"] = false,
["thickness"] = 8,
["lineMode"] = "segment",
["style"] = "solid",
["layerName"] = "Author",
["name"] = "Red Line",
["points"] =
{
[1] =
{
["y"] = 624626.04247551,
["x"] = -35304.367140331,
}, -- end of [1]
[2] =
{
["y"] = 650887.1607906,
["x"] = -87440.410854119,
}, -- end of [2]
}, -- end of ["points"]
["mapX"] = -35304.367140331,
["colorString"] = "0xff0000ff",
}, -- end of [2]
[3] =
{
["visible"] = true,
["mapY"] = 653204.31828899,
["primitiveType"] = "Line",
["layer"] = "Author",
["closed"] = false,
["thickness"] = 8,
["lineMode"] = "segments",
["style"] = "solid",
["layerName"] = "Author",
["name"] = "Blue Line",
["points"] =
{
[1] =
{
["y"] = 653204.31828899,
["x"] = -91302.340018104,
}, -- end of [1]
[2] =
{
["y"] = 723491.4290735,
["x"] = -90143.761268909,
}, -- end of [2]
[3] =
{
["y"] = 725036.2007391,
["x"] = -129921.63165795,
}, -- end of [3]
[4] =
{
["y"] = 669810.61369412,
["x"] = -127604.47415956,
}, -- end of [4]
[5] =
{
["y"] = 707271.32658477,
["x"] = -161203.25788622,
}, -- end of [5]
}, -- end of ["points"]
["mapX"] = -91302.340018104,
["colorString"] = "0x0000ffff",
}, -- end of [3]
[4] =
{
["visible"] = true,
["points"] =
{
[1] =
{
["y"] = 830250.78116076,
["x"] = 11345.221862616,
}, -- end of [1]
[2] =
{
["y"] = 830744.08029641,
["x"] = 5911.6635979767,
}, -- end of [2]
[3] =
{
["y"] = 829981.52257348,
["x"] = -2199.1070035738,
}, -- end of [3]
[4] =
{
["y"] = 828015.0750406,
["x"] = -12434.354329222,
}, -- end of [4]
[5] =
{
["y"] = 824978.74784743,
["x"] = -24096.563188272,
}, -- end of [5]
[6] =
{
["y"] = 821079.46167442,
["x"] = -36390.973319689,
}, -- end of [6]
[7] =
{
["y"] = 816582.94643038,
["x"] = -48479.740990492,
}, -- end of [7]
[8] =
{
["y"] = 811795.63219835,
["x"] = -59539.036661549,
}, -- end of [8]
[9] =
{
["y"] = 807043.76653182,
["x"] = -68815.187609226,
}, -- end of [9]
[10] =
{
["y"] = 802651.18122316,
["x"] = -75676.039476005,
}, -- end of [10]
[11] =
{
["y"] = 798917.22370205,
["x"] = -79654.036545258,
}, -- end of [11]
[12] =
{
["y"] = 796096.35700289,
["x"] = -80478.084890666,
}, -- end of [12]
[13] =
{
["y"] = 794380.81852954,
["x"] = -78092.026979294,
}, -- end of [13]
[14] =
{
["y"] = 793887.51939389,
["x"] = -72658.468714655,
}, -- end of [14]
[15] =
{
["y"] = 794650.07711682,
["x"] = -64547.698113104,
}, -- end of [15]
[16] =
{
["y"] = 796616.5246497,
["x"] = -54312.450787456,
}, -- end of [16]
[17] =
{
["y"] = 799652.85184287,
["x"] = -42650.241928406,
}, -- end of [17]
[18] =
{
["y"] = 803552.13801588,
["x"] = -30355.831796989,
}, -- end of [18]
[19] =
{
["y"] = 808048.65325992,
["x"] = -18267.064126186,
}, -- end of [19]
[20] =
{
["y"] = 812835.96749195,
["x"] = -7207.7684551292,
}, -- end of [20]
[21] =
{
["y"] = 817587.83315848,
["x"] = 2068.3824925484,
}, -- end of [21]
[22] =
{
["y"] = 821980.41846714,
["x"] = 8929.234359327,
}, -- end of [22]
[23] =
{
["y"] = 825714.37598825,
["x"] = 12907.23142858,
}, -- end of [23]
[24] =
{
["y"] = 828535.24268741,
["x"] = 13731.279773988,
}, -- end of [24]
}, -- end of ["points"]
["layer"] = "Author",
["r1"] = 49818.886215397,
["mapY"] = 812315.79984515,
["layerName"] = "Author",
["name"] = "ellipse",
["fillColorString"] = "0xffffff80",
["thickness"] = 8,
["polygonMode"] = "oval",
["style"] = "solid",
["colorString"] = "0x008000ff",
["mapX"] = -33373.402558339,
["angle"] = 19,
["r2"] = 9268.6299935624,
["primitiveType"] = "Polygon",
}, -- end of [4]
[5] =
{
["visible"] = true,
["fontSize"] = 24,
["mapY"] = 821584.42983871,
["primitiveType"] = "TextBox",
["layer"] = "Author",
["font"] = "DejaVuLGCSansCondensed.ttf",
["mapX"] = -217973.61659679,
["colorString"] = "0x004040ff",
["name"] = "Text Box 1",
["angle"] = 0,
["text"] = "Objective HERE",
["fillColorString"] = "0x00000080",
["borderThickness"] = 4,
["layerName"] = "Author",
}, -- end of [5]
} -- end of drawingIndexed

View File

@ -9,11 +9,11 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 60, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 689785, ["y"] = 694968,
["x"] = -285145, ["x"] = -285046,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -23,8 +23,8 @@ dynGroupsAdded =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285145, ["x"] = -285046,
["y"] = 689785, ["y"] = 694968,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #002", ["unitName"] = "Unit #002",
@ -33,11 +33,11 @@ dynGroupsAdded =
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["alt"] = 61, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 689948, ["y"] = 695126,
["x"] = -285166, ["x"] = -285098,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -47,8 +47,8 @@ dynGroupsAdded =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285166, ["x"] = -285098,
["y"] = 689948, ["y"] = 695126,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #003", ["unitName"] = "Unit #003",
@ -57,11 +57,11 @@ dynGroupsAdded =
}, -- end of [2] }, -- end of [2]
[3] = [3] =
{ {
["alt"] = 60, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 689856, ["y"] = 694892,
["x"] = -285298, ["x"] = -285039,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -71,8 +71,8 @@ dynGroupsAdded =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285298, ["x"] = -285039,
["y"] = 689856, ["y"] = 694892,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #004", ["unitName"] = "Unit #004",
@ -81,11 +81,11 @@ dynGroupsAdded =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["alt"] = 61, ["alt"] = 75,
["point"] = ["point"] =
{ {
["y"] = 689796, ["y"] = 695084,
["x"] = -285058, ["x"] = -284914,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -95,8 +95,8 @@ dynGroupsAdded =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285058, ["x"] = -284914,
["y"] = 689796, ["y"] = 695084,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #005", ["unitName"] = "Unit #005",
@ -105,11 +105,11 @@ dynGroupsAdded =
}, -- end of [4] }, -- end of [4]
[5] = [5] =
{ {
["alt"] = 61, ["alt"] = 73,
["point"] = ["point"] =
{ {
["y"] = 689973, ["y"] = 694985,
["x"] = -285191, ["x"] = -285104,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -119,8 +119,8 @@ dynGroupsAdded =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285191, ["x"] = -285104,
["y"] = 689973, ["y"] = 694985,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #006", ["unitName"] = "Unit #006",
@ -129,11 +129,11 @@ dynGroupsAdded =
}, -- end of [5] }, -- end of [5]
[6] = [6] =
{ {
["alt"] = 60, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 689860, ["y"] = 694877,
["x"] = -285149, ["x"] = -285009,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -143,8 +143,8 @@ dynGroupsAdded =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285149, ["x"] = -285009,
["y"] = 689860, ["y"] = 694877,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #007", ["unitName"] = "Unit #007",
@ -153,11 +153,11 @@ dynGroupsAdded =
}, -- end of [6] }, -- end of [6]
[7] = [7] =
{ {
["alt"] = 60, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 689799, ["y"] = 694952,
["x"] = -285216, ["x"] = -284964,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -167,8 +167,8 @@ dynGroupsAdded =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285216, ["x"] = -284964,
["y"] = 689799, ["y"] = 694952,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #008", ["unitName"] = "Unit #008",
@ -197,8 +197,8 @@ dynGroupsAdded =
["alt"] = 0, ["alt"] = 0,
["point"] = ["point"] =
{ {
["y"] = 265153, ["y"] = 267081,
["x"] = -163065, ["x"] = -164471,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 0, ["coalitionId"] = 0,
["livery_id"] = "ReubenJames", ["livery_id"] = "ReubenJames",
@ -209,12 +209,12 @@ dynGroupsAdded =
["unitId"] = 7011, ["unitId"] = 7011,
["groupName"] = "AUSTRALIA shp 1", ["groupName"] = "AUSTRALIA shp 1",
["countryId"] = 21, ["countryId"] = 21,
["x"] = -163065, ["x"] = -164471,
["speed"] = 0, ["speed"] = 0,
["coalition"] = "neutral", ["coalition"] = "neutral",
["type"] = "PERRY", ["type"] = "PERRY",
["groupId"] = 7007, ["groupId"] = 7007,
["y"] = 265153, ["y"] = 267081,
["country"] = "australia", ["country"] = "australia",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
@ -237,26 +237,26 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 65, ["alt"] = 62,
["type"] = "Sandbox", ["type"] = "Sandbox",
["point"] = ["point"] =
{ {
["y"] = 693778, ["y"] = 693698,
["x"] = -286660, ["x"] = -287512,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Fortifications",
["coalitionId"] = 2,
["y"] = 693778,
["groupName"] = "USA static 1",
["country"] = "usa", ["country"] = "usa",
["countryId"] = 2, ["coalitionId"] = 2,
["x"] = -286660,
["coalition"] = "blue", ["coalition"] = "blue",
["groupName"] = "USA static 1",
["unitId"] = 7005,
["y"] = 693698,
["x"] = -287512,
["countryId"] = 2,
["category"] = "static", ["category"] = "static",
["unitName"] = "USA static 1", ["unitName"] = "USA static 1",
["unitId"] = 7005,
["heading"] = 0,
["groupId"] = 7005, ["groupId"] = 7005,
["heading"] = 0,
["categoryStatic"] = "Fortifications",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 2, ["countryId"] = 2,
@ -278,11 +278,11 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 72, ["alt"] = 67,
["point"] = ["point"] =
{ {
["y"] = 693761, ["y"] = 692292,
["x"] = -284648, ["x"] = -284982,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -292,9 +292,9 @@ dynGroupsAdded =
["groupId"] = 7001, ["groupId"] = 7001,
["groupName"] = "USA gnd 1", ["groupName"] = "USA gnd 1",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284648, ["x"] = -284982,
["y"] = 693761, ["y"] = 692292,
["heading"] = 1.4977557542423, ["heading"] = 1.4977557593169,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 1 unit1", ["unitName"] = "USA gnd 1 unit1",
["unitId"] = 7001, ["unitId"] = 7001,
@ -302,11 +302,11 @@ dynGroupsAdded =
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["alt"] = 73, ["alt"] = 67,
["point"] = ["point"] =
{ {
["y"] = 693771, ["y"] = 692208,
["x"] = -284456, ["x"] = -284870,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -316,9 +316,9 @@ dynGroupsAdded =
["groupId"] = 7001, ["groupId"] = 7001,
["groupName"] = "USA gnd 1", ["groupName"] = "USA gnd 1",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284456, ["x"] = -284870,
["y"] = 693771, ["y"] = 692208,
["heading"] = 1.4977557542423, ["heading"] = 1.4977557696476,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 1 unit2", ["unitName"] = "USA gnd 1 unit2",
["unitId"] = 7002, ["unitId"] = 7002,
@ -326,11 +326,11 @@ dynGroupsAdded =
}, -- end of [2] }, -- end of [2]
[3] = [3] =
{ {
["alt"] = 72, ["alt"] = 68,
["point"] = ["point"] =
{ {
["y"] = 693781, ["y"] = 692374,
["x"] = -284639, ["x"] = -284971,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -340,9 +340,9 @@ dynGroupsAdded =
["groupId"] = 7001, ["groupId"] = 7001,
["groupName"] = "USA gnd 1", ["groupName"] = "USA gnd 1",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284639, ["x"] = -284971,
["y"] = 693781, ["y"] = 692374,
["heading"] = 1.4977557542423, ["heading"] = 1.4977557676538,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 1 unit3", ["unitName"] = "USA gnd 1 unit3",
["unitId"] = 7003, ["unitId"] = 7003,
@ -350,11 +350,11 @@ dynGroupsAdded =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["alt"] = 72, ["alt"] = 68,
["point"] = ["point"] =
{ {
["y"] = 693653, ["y"] = 692388,
["x"] = -284699, ["x"] = -284932,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -364,9 +364,9 @@ dynGroupsAdded =
["groupId"] = 7001, ["groupId"] = 7001,
["groupName"] = "USA gnd 1", ["groupName"] = "USA gnd 1",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284699, ["x"] = -284932,
["y"] = 693653, ["y"] = 692388,
["heading"] = 1.4977557629417, ["heading"] = 1.4977557602231,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 1 unit4", ["unitName"] = "USA gnd 1 unit4",
["unitId"] = 7004, ["unitId"] = 7004,
@ -566,11 +566,11 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 70, ["alt"] = 57,
["point"] = ["point"] =
{ {
["y"] = 691224, ["y"] = 691173,
["x"] = -283405, ["x"] = -286924,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Cargos", ["categoryStatic"] = "Cargos",
["coalitionId"] = 2, ["coalitionId"] = 2,
@ -581,8 +581,8 @@ dynGroupsAdded =
["type"] = "uh1h_cargo", ["type"] = "uh1h_cargo",
["country"] = "usa", ["country"] = "usa",
["groupName"] = "USA static 2", ["groupName"] = "USA static 2",
["y"] = 691224, ["y"] = 691173,
["x"] = -283405, ["x"] = -286924,
["coalition"] = "blue", ["coalition"] = "blue",
["unitId"] = 7006, ["unitId"] = 7006,
["heading"] = 0, ["heading"] = 0,
@ -609,11 +609,11 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 65, ["alt"] = 63,
["point"] = ["point"] =
{ {
["y"] = 693655, ["y"] = 694197,
["x"] = -286667, ["x"] = -287544,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Cargos", ["categoryStatic"] = "Cargos",
["coalitionId"] = 2, ["coalitionId"] = 2,
@ -624,8 +624,8 @@ dynGroupsAdded =
["type"] = "uh1h_cargo", ["type"] = "uh1h_cargo",
["country"] = "usa", ["country"] = "usa",
["groupName"] = "USA static 4", ["groupName"] = "USA static 4",
["y"] = 693655, ["y"] = 694197,
["x"] = -286667, ["x"] = -287544,
["coalition"] = "blue", ["coalition"] = "blue",
["unitId"] = 7017, ["unitId"] = 7017,
["heading"] = 0, ["heading"] = 0,
@ -710,22 +710,22 @@ dynGroupsAdded =
["type"] = "Sandbox", ["type"] = "Sandbox",
["point"] = ["point"] =
{ {
["y"] = 693960, ["y"] = 692858,
["x"] = -287585, ["x"] = -286636,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Fortifications",
["coalitionId"] = 2,
["y"] = 693960,
["groupName"] = "USA static 3",
["country"] = "usa", ["country"] = "usa",
["countryId"] = 2, ["coalitionId"] = 2,
["x"] = -287585,
["coalition"] = "blue", ["coalition"] = "blue",
["groupName"] = "USA static 3",
["unitId"] = 7016,
["y"] = 692858,
["x"] = -286636,
["countryId"] = 2,
["category"] = "static", ["category"] = "static",
["unitName"] = "USA static 3", ["unitName"] = "USA static 3",
["unitId"] = 7016,
["heading"] = 0,
["groupId"] = 7016, ["groupId"] = 7016,
["heading"] = 0,
["categoryStatic"] = "Fortifications",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 2, ["countryId"] = 2,
@ -803,8 +803,8 @@ dynGroupsAdded =
["alt"] = 0, ["alt"] = 0,
["point"] = ["point"] =
{ {
["y"] = 267048, ["y"] = 267810,
["x"] = -161099, ["x"] = -162283,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 0, ["coalitionId"] = 0,
["livery_id"] = "ReubenJames", ["livery_id"] = "ReubenJames",
@ -815,12 +815,12 @@ dynGroupsAdded =
["unitId"] = 7022, ["unitId"] = 7022,
["groupName"] = "AUSTRALIA shp 2", ["groupName"] = "AUSTRALIA shp 2",
["countryId"] = 21, ["countryId"] = 21,
["x"] = -161099, ["x"] = -162283,
["speed"] = 0, ["speed"] = 0,
["coalition"] = "neutral", ["coalition"] = "neutral",
["type"] = "PERRY", ["type"] = "PERRY",
["groupId"] = 7014, ["groupId"] = 7014,
["y"] = 267048, ["y"] = 267810,
["country"] = "australia", ["country"] = "australia",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
@ -843,11 +843,11 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 66, ["alt"] = 62,
["point"] = ["point"] =
{ {
["y"] = 691761, ["y"] = 690419,
["x"] = -284967, ["x"] = -284972,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -857,9 +857,9 @@ dynGroupsAdded =
["groupId"] = 7008, ["groupId"] = 7008,
["groupName"] = "USA gnd 3", ["groupName"] = "USA gnd 3",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284967, ["x"] = -284972,
["y"] = 691761, ["y"] = 690419,
["heading"] = 1.4977557594982, ["heading"] = 1.4977557640291,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 3 unit1", ["unitName"] = "USA gnd 3 unit1",
["unitId"] = 7012, ["unitId"] = 7012,
@ -867,11 +867,11 @@ dynGroupsAdded =
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["alt"] = 66, ["alt"] = 63,
["point"] = ["point"] =
{ {
["y"] = 691809, ["y"] = 690558,
["x"] = -284861, ["x"] = -284846,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -881,9 +881,9 @@ dynGroupsAdded =
["groupId"] = 7008, ["groupId"] = 7008,
["groupName"] = "USA gnd 3", ["groupName"] = "USA gnd 3",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284861, ["x"] = -284846,
["y"] = 691809, ["y"] = 690558,
["heading"] = 1.4977557625792, ["heading"] = 1.4977557580482,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 3 unit2", ["unitName"] = "USA gnd 3 unit2",
["unitId"] = 7013, ["unitId"] = 7013,
@ -891,11 +891,11 @@ dynGroupsAdded =
}, -- end of [2] }, -- end of [2]
[3] = [3] =
{ {
["alt"] = 66, ["alt"] = 62,
["point"] = ["point"] =
{ {
["y"] = 691744, ["y"] = 690360,
["x"] = -284982, ["x"] = -285032,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -905,9 +905,9 @@ dynGroupsAdded =
["groupId"] = 7008, ["groupId"] = 7008,
["groupName"] = "USA gnd 3", ["groupName"] = "USA gnd 3",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284982, ["x"] = -285032,
["y"] = 691744, ["y"] = 690360,
["heading"] = 1.4977557573233, ["heading"] = 1.4977557565984,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 3 unit3", ["unitName"] = "USA gnd 3 unit3",
["unitId"] = 7014, ["unitId"] = 7014,
@ -915,11 +915,11 @@ dynGroupsAdded =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["alt"] = 65, ["alt"] = 62,
["point"] = ["point"] =
{ {
["y"] = 691757, ["y"] = 690314,
["x"] = -285098, ["x"] = -284956,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -929,9 +929,9 @@ dynGroupsAdded =
["groupId"] = 7008, ["groupId"] = 7008,
["groupName"] = "USA gnd 3", ["groupName"] = "USA gnd 3",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285098, ["x"] = -284956,
["y"] = 691757, ["y"] = 690314,
["heading"] = 1.4977557640291, ["heading"] = 1.497755755511,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 3 unit4", ["unitName"] = "USA gnd 3 unit4",
["unitId"] = 7015, ["unitId"] = 7015,
@ -1023,11 +1023,11 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 69, ["alt"] = 73,
["point"] = ["point"] =
{ {
["y"] = 695073, ["y"] = 691751,
["x"] = -287442, ["x"] = -283221,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1037,9 +1037,9 @@ dynGroupsAdded =
["groupId"] = 7015, ["groupId"] = 7015,
["groupName"] = "USA gnd 5", ["groupName"] = "USA gnd 5",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -287442, ["x"] = -283221,
["y"] = 695073, ["y"] = 691751,
["heading"] = 1.4977557701918, ["heading"] = 1.4977557703725,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 5 unit1", ["unitName"] = "USA gnd 5 unit1",
["unitId"] = 7023, ["unitId"] = 7023,
@ -1047,11 +1047,11 @@ dynGroupsAdded =
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["alt"] = 68, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 695090, ["y"] = 691898,
["x"] = -287590, ["x"] = -283194,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1061,9 +1061,9 @@ dynGroupsAdded =
["groupId"] = 7015, ["groupId"] = 7015,
["groupName"] = "USA gnd 5", ["groupName"] = "USA gnd 5",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -287590, ["x"] = -283194,
["y"] = 695090, ["y"] = 691898,
["heading"] = 1.4977557591357, ["heading"] = 1.4977557634854,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 5 unit2", ["unitName"] = "USA gnd 5 unit2",
["unitId"] = 7024, ["unitId"] = 7024,
@ -1071,11 +1071,11 @@ dynGroupsAdded =
}, -- end of [2] }, -- end of [2]
[3] = [3] =
{ {
["alt"] = 69, ["alt"] = 72,
["point"] = ["point"] =
{ {
["y"] = 695151, ["y"] = 691826,
["x"] = -287518, ["x"] = -283357,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1085,9 +1085,9 @@ dynGroupsAdded =
["groupId"] = 7015, ["groupId"] = 7015,
["groupName"] = "USA gnd 5", ["groupName"] = "USA gnd 5",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -287518, ["x"] = -283357,
["y"] = 695151, ["y"] = 691826,
["heading"] = 1.4977557660229, ["heading"] = 1.4977557538798,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 5 unit3", ["unitName"] = "USA gnd 5 unit3",
["unitId"] = 7025, ["unitId"] = 7025,
@ -1095,11 +1095,11 @@ dynGroupsAdded =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["alt"] = 68, ["alt"] = 72,
["point"] = ["point"] =
{ {
["y"] = 694882, ["y"] = 691852,
["x"] = -287479, ["x"] = -283362,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1109,9 +1109,9 @@ dynGroupsAdded =
["groupId"] = 7015, ["groupId"] = 7015,
["groupName"] = "USA gnd 5", ["groupName"] = "USA gnd 5",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -287479, ["x"] = -283362,
["y"] = 694882, ["y"] = 691852,
["heading"] = 1.4977557575044, ["heading"] = 1.4977557720036,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 5 unit4", ["unitName"] = "USA gnd 5 unit4",
["unitId"] = 7026, ["unitId"] = 7026,
@ -1257,11 +1257,11 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 73, ["alt"] = 62,
["point"] = ["point"] =
{ {
["y"] = 695241, ["y"] = 691602,
["x"] = -285338, ["x"] = -285948,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Cargos", ["categoryStatic"] = "Cargos",
["coalitionId"] = 2, ["coalitionId"] = 2,
@ -1272,8 +1272,8 @@ dynGroupsAdded =
["type"] = "uh1h_cargo", ["type"] = "uh1h_cargo",
["country"] = "usa", ["country"] = "usa",
["groupName"] = "USA static 6", ["groupName"] = "USA static 6",
["y"] = 695241, ["y"] = 691602,
["x"] = -285338, ["x"] = -285948,
["coalition"] = "blue", ["coalition"] = "blue",
["unitId"] = 7028, ["unitId"] = 7028,
["heading"] = 0, ["heading"] = 0,
@ -1354,26 +1354,26 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 68, ["alt"] = 63,
["type"] = "Sandbox", ["type"] = "Sandbox",
["point"] = ["point"] =
{ {
["y"] = 693480, ["y"] = 692897,
["x"] = -285622, ["x"] = -286503,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Fortifications",
["coalitionId"] = 2,
["y"] = 693480,
["groupName"] = "USA static 5",
["country"] = "usa", ["country"] = "usa",
["countryId"] = 2, ["coalitionId"] = 2,
["x"] = -285622,
["coalition"] = "blue", ["coalition"] = "blue",
["groupName"] = "USA static 5",
["unitId"] = 7027,
["y"] = 692897,
["x"] = -286503,
["countryId"] = 2,
["category"] = "static", ["category"] = "static",
["unitName"] = "USA static 5", ["unitName"] = "USA static 5",
["unitId"] = 7027,
["heading"] = 0,
["groupId"] = 7027, ["groupId"] = 7027,
["heading"] = 0,
["categoryStatic"] = "Fortifications",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 2, ["countryId"] = 2,
@ -1397,8 +1397,8 @@ dynGroupsAdded =
["alt"] = 0, ["alt"] = 0,
["point"] = ["point"] =
{ {
["y"] = 268869, ["y"] = 268107,
["x"] = -163156, ["x"] = -163693,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 0, ["coalitionId"] = 0,
["livery_id"] = "ReubenJames", ["livery_id"] = "ReubenJames",
@ -1409,12 +1409,12 @@ dynGroupsAdded =
["unitId"] = 7033, ["unitId"] = 7033,
["groupName"] = "AUSTRALIA shp 3", ["groupName"] = "AUSTRALIA shp 3",
["countryId"] = 21, ["countryId"] = 21,
["x"] = -163156, ["x"] = -163693,
["speed"] = 0, ["speed"] = 0,
["coalition"] = "neutral", ["coalition"] = "neutral",
["type"] = "PERRY", ["type"] = "PERRY",
["groupId"] = 7021, ["groupId"] = 7021,
["y"] = 268869, ["y"] = 268107,
["country"] = "australia", ["country"] = "australia",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
@ -1557,11 +1557,11 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 73, ["alt"] = 59,
["point"] = ["point"] =
{ {
["y"] = 693098, ["y"] = 692769,
["x"] = -284021, ["x"] = -287355,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1571,9 +1571,9 @@ dynGroupsAdded =
["groupId"] = 7022, ["groupId"] = 7022,
["groupName"] = "USA gnd 7", ["groupName"] = "USA gnd 7",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284021, ["x"] = -287355,
["y"] = 693098, ["y"] = 692769,
["heading"] = 1.4977557645728, ["heading"] = 1.4977557591357,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 7 unit1", ["unitName"] = "USA gnd 7 unit1",
["unitId"] = 7034, ["unitId"] = 7034,
@ -1581,23 +1581,23 @@ dynGroupsAdded =
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["alt"] = 73, ["alt"] = 59,
["point"] = ["point"] =
{ {
["y"] = 693012, ["y"] = 692754,
["x"] = -284053, ["x"] = -287476,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
["category"] = "vehicle", ["category"] = "vehicle",
["speed"] = 5.0056692998623e-05, ["speed"] = 0,
["type"] = "M-1 Abrams", ["type"] = "M-1 Abrams",
["groupId"] = 7022, ["groupId"] = 7022,
["groupName"] = "USA gnd 7", ["groupName"] = "USA gnd 7",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284053, ["x"] = -287476,
["y"] = 693012, ["y"] = 692754,
["heading"] = 1.4877557641795, ["heading"] = 1.4977557605856,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 7 unit2", ["unitName"] = "USA gnd 7 unit2",
["unitId"] = 7035, ["unitId"] = 7035,
@ -1605,23 +1605,23 @@ dynGroupsAdded =
}, -- end of [2] }, -- end of [2]
[3] = [3] =
{ {
["alt"] = 74, ["alt"] = 59,
["point"] = ["point"] =
{ {
["y"] = 693026, ["y"] = 692726,
["x"] = -283898, ["x"] = -287538,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
["category"] = "vehicle", ["category"] = "vehicle",
["speed"] = 0.00018869274936151, ["speed"] = 0,
["type"] = "M-1 Abrams", ["type"] = "M-1 Abrams",
["groupId"] = 7022, ["groupId"] = 7022,
["groupName"] = "USA gnd 7", ["groupName"] = "USA gnd 7",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -283898, ["x"] = -287538,
["y"] = 693026, ["y"] = 692726,
["heading"] = 1.5077557625432, ["heading"] = 1.4977557605856,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 7 unit3", ["unitName"] = "USA gnd 7 unit3",
["unitId"] = 7036, ["unitId"] = 7036,
@ -1629,23 +1629,23 @@ dynGroupsAdded =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["alt"] = 73, ["alt"] = 59,
["point"] = ["point"] =
{ {
["y"] = 693093, ["y"] = 692766,
["x"] = -284127, ["x"] = -287511,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
["category"] = "vehicle", ["category"] = "vehicle",
["speed"] = 0.0040063578450385, ["speed"] = 0,
["type"] = "M-1 Abrams", ["type"] = "M-1 Abrams",
["groupId"] = 7022, ["groupId"] = 7022,
["groupName"] = "USA gnd 7", ["groupName"] = "USA gnd 7",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284127, ["x"] = -287511,
["y"] = 693093, ["y"] = 692766,
["heading"] = 1.4877557641795, ["heading"] = 1.4977557605856,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 7 unit4", ["unitName"] = "USA gnd 7 unit4",
["unitId"] = 7037, ["unitId"] = 7037,
@ -1727,8 +1727,8 @@ dynGroupsAdded =
["alt"] = 0, ["alt"] = 0,
["point"] = ["point"] =
{ {
["y"] = 266075, ["y"] = 265427,
["x"] = -162226, ["x"] = -164284,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 0, ["coalitionId"] = 0,
["livery_id"] = "ReubenJames", ["livery_id"] = "ReubenJames",
@ -1739,12 +1739,12 @@ dynGroupsAdded =
["unitId"] = 7044, ["unitId"] = 7044,
["groupName"] = "AUSTRALIA shp 4", ["groupName"] = "AUSTRALIA shp 4",
["countryId"] = 21, ["countryId"] = 21,
["x"] = -162226, ["x"] = -164284,
["speed"] = 0, ["speed"] = 0,
["coalition"] = "neutral", ["coalition"] = "neutral",
["type"] = "PERRY", ["type"] = "PERRY",
["groupId"] = 7028, ["groupId"] = 7028,
["y"] = 266075, ["y"] = 265427,
["country"] = "australia", ["country"] = "australia",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
@ -1767,11 +1767,11 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 55, ["alt"] = 63,
["point"] = ["point"] =
{ {
["y"] = 689703, ["y"] = 693814,
["x"] = -286460, ["x"] = -287262,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Cargos", ["categoryStatic"] = "Cargos",
["coalitionId"] = 2, ["coalitionId"] = 2,
@ -1782,8 +1782,8 @@ dynGroupsAdded =
["type"] = "uh1h_cargo", ["type"] = "uh1h_cargo",
["country"] = "usa", ["country"] = "usa",
["groupName"] = "USA static 8", ["groupName"] = "USA static 8",
["y"] = 689703, ["y"] = 693814,
["x"] = -286460, ["x"] = -287262,
["coalition"] = "blue", ["coalition"] = "blue",
["unitId"] = 7039, ["unitId"] = 7039,
["heading"] = 0, ["heading"] = 0,
@ -1810,26 +1810,26 @@ dynGroupsAdded =
{ {
[1] = [1] =
{ {
["alt"] = 70, ["alt"] = 56,
["type"] = "Sandbox", ["type"] = "Sandbox",
["point"] = ["point"] =
{ {
["y"] = 694696, ["y"] = 691971,
["x"] = -287053, ["x"] = -288088,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Fortifications",
["coalitionId"] = 2,
["y"] = 694696,
["groupName"] = "USA static 7",
["country"] = "usa", ["country"] = "usa",
["countryId"] = 2, ["coalitionId"] = 2,
["x"] = -287053,
["coalition"] = "blue", ["coalition"] = "blue",
["groupName"] = "USA static 7",
["unitId"] = 7038,
["y"] = 691971,
["x"] = -288088,
["countryId"] = 2,
["category"] = "static", ["category"] = "static",
["unitName"] = "USA static 7", ["unitName"] = "USA static 7",
["unitId"] = 7038,
["heading"] = 0,
["groupId"] = 7038, ["groupId"] = 7038,
["heading"] = 0,
["categoryStatic"] = "Fortifications",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 2, ["countryId"] = 2,

View File

@ -1414,25 +1414,25 @@ groupsById =
[1] = [1] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 675199.99999999, ["y"] = 675199.99999999,
["x"] = -292007.14285714, ["x"] = -292007.14285714,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Cargos", ["country"] = "usa",
["y"] = 675199.99999999,
["coalition"] = "blue", ["coalition"] = "blue",
["groupName"] = "cargoBob",
["groupId"] = 31,
["countryId"] = 2,
["mass"] = 371,
["unitId"] = 45, ["unitId"] = 45,
["groupName"] = "cargoBob",
["countryId"] = 2,
["y"] = 675199.99999999,
["mass"] = 371,
["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cargoBob", ["unitName"] = "cargoBob",
["x"] = -292007.14285714, ["x"] = -292007.14285714,
["heading"] = 0, ["type"] = "uh1h_cargo",
["country"] = "usa", ["groupId"] = 31,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [31] }, -- end of [31]
@ -1449,25 +1449,25 @@ groupsById =
[1] = [1] =
{ {
["shape_name"] = "ab-212_cargo", ["shape_name"] = "ab-212_cargo",
["type"] = "uh1h_cargo", ["heading"] = 0,
["point"] = ["point"] =
{ {
["y"] = 674842.85714285, ["y"] = 674842.85714285,
["x"] = -291678.57142856, ["x"] = -291678.57142856,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Cargos", ["country"] = "usa",
["y"] = 674842.85714285,
["coalition"] = "blue", ["coalition"] = "blue",
["groupName"] = "cloneCargoBase",
["groupId"] = 32,
["countryId"] = 2,
["mass"] = 1337,
["unitId"] = 46, ["unitId"] = 46,
["groupName"] = "cloneCargoBase",
["countryId"] = 2,
["y"] = 674842.85714285,
["mass"] = 1337,
["categoryStatic"] = "Cargos",
["category"] = "static", ["category"] = "static",
["unitName"] = "cloneCargoBase", ["unitName"] = "cloneCargoBase",
["x"] = -291678.57142856, ["x"] = -291678.57142856,
["heading"] = 0, ["type"] = "uh1h_cargo",
["country"] = "usa", ["groupId"] = 32,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [32] }, -- end of [32]
@ -1592,11 +1592,11 @@ groupsById =
{ {
[1] = [1] =
{ {
["alt"] = 60, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 689785, ["y"] = 694968,
["x"] = -285145, ["x"] = -285046,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1606,8 +1606,8 @@ groupsById =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285145, ["x"] = -285046,
["y"] = 689785, ["y"] = 694968,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #002", ["unitName"] = "Unit #002",
@ -1616,11 +1616,11 @@ groupsById =
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["alt"] = 61, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 689948, ["y"] = 695126,
["x"] = -285166, ["x"] = -285098,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1630,8 +1630,8 @@ groupsById =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285166, ["x"] = -285098,
["y"] = 689948, ["y"] = 695126,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #003", ["unitName"] = "Unit #003",
@ -1640,11 +1640,11 @@ groupsById =
}, -- end of [2] }, -- end of [2]
[3] = [3] =
{ {
["alt"] = 60, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 689856, ["y"] = 694892,
["x"] = -285298, ["x"] = -285039,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1654,8 +1654,8 @@ groupsById =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285298, ["x"] = -285039,
["y"] = 689856, ["y"] = 694892,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #004", ["unitName"] = "Unit #004",
@ -1664,11 +1664,11 @@ groupsById =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["alt"] = 61, ["alt"] = 75,
["point"] = ["point"] =
{ {
["y"] = 689796, ["y"] = 695084,
["x"] = -285058, ["x"] = -284914,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1678,8 +1678,8 @@ groupsById =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285058, ["x"] = -284914,
["y"] = 689796, ["y"] = 695084,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #005", ["unitName"] = "Unit #005",
@ -1688,11 +1688,11 @@ groupsById =
}, -- end of [4] }, -- end of [4]
[5] = [5] =
{ {
["alt"] = 61, ["alt"] = 73,
["point"] = ["point"] =
{ {
["y"] = 689973, ["y"] = 694985,
["x"] = -285191, ["x"] = -285104,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1702,8 +1702,8 @@ groupsById =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285191, ["x"] = -285104,
["y"] = 689973, ["y"] = 694985,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #006", ["unitName"] = "Unit #006",
@ -1712,11 +1712,11 @@ groupsById =
}, -- end of [5] }, -- end of [5]
[6] = [6] =
{ {
["alt"] = 60, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 689860, ["y"] = 694877,
["x"] = -285149, ["x"] = -285009,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1726,8 +1726,8 @@ groupsById =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285149, ["x"] = -285009,
["y"] = 689860, ["y"] = 694877,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #007", ["unitName"] = "Unit #007",
@ -1736,11 +1736,11 @@ groupsById =
}, -- end of [6] }, -- end of [6]
[7] = [7] =
{ {
["alt"] = 60, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 689799, ["y"] = 694952,
["x"] = -285216, ["x"] = -284964,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -1750,8 +1750,8 @@ groupsById =
["groupId"] = 35, ["groupId"] = 35,
["groupName"] = "teleGroup", ["groupName"] = "teleGroup",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285216, ["x"] = -284964,
["y"] = 689799, ["y"] = 694952,
["heading"] = 0, ["heading"] = 0,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "Unit #008", ["unitName"] = "Unit #008",
@ -1934,25 +1934,25 @@ groupsById =
{ {
[1] = [1] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443856.28948724, ["y"] = 443856.28948724,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["y"] = 443856.28948724, ["coalition"] = "blue",
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1", ["groupName"] = "static_on_ship1",
["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
["y"] = 443856.28948724,
["x"] = -355322.45423175, ["x"] = -355322.45423175,
["unitId"] = 63, ["groupId"] = 40,
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1", ["unitName"] = "static_on_ship1",
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["country"] = "usa", ["heading"] = 0,
["groupId"] = 40, ["unitId"] = 63,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [40] }, -- end of [40]
@ -1968,25 +1968,25 @@ groupsById =
{ {
[1] = [1] =
{ {
["heading"] = 0, ["type"] = "AH-1W",
["point"] = ["point"] =
{ {
["y"] = 443849.03844635, ["y"] = 443849.03844635,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Helicopters", ["country"] = "usa",
["y"] = 443849.03844635, ["coalition"] = "blue",
["livery_id"] = "USA Marines", ["livery_id"] = "USA Marines",
["groupName"] = "static_on_ship1 #001", ["groupName"] = "static_on_ship1 #001",
["coalition"] = "blue",
["countryId"] = 2, ["countryId"] = 2,
["y"] = 443849.03844635,
["x"] = -355322.27295572, ["x"] = -355322.27295572,
["unitId"] = 64, ["groupId"] = 41,
["category"] = "static", ["category"] = "static",
["unitName"] = "static_on_ship1 #001", ["unitName"] = "static_on_ship1 #001",
["type"] = "AH-1W", ["categoryStatic"] = "Helicopters",
["country"] = "usa", ["heading"] = 0,
["groupId"] = 41, ["unitId"] = 64,
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
}, -- end of [41] }, -- end of [41]
@ -2255,8 +2255,8 @@ groupsById =
["alt"] = 0, ["alt"] = 0,
["point"] = ["point"] =
{ {
["y"] = 266075, ["y"] = 265427,
["x"] = -162226, ["x"] = -164284,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 0, ["coalitionId"] = 0,
["livery_id"] = "ReubenJames", ["livery_id"] = "ReubenJames",
@ -2267,12 +2267,12 @@ groupsById =
["unitId"] = 7044, ["unitId"] = 7044,
["groupName"] = "AUSTRALIA shp 4", ["groupName"] = "AUSTRALIA shp 4",
["countryId"] = 21, ["countryId"] = 21,
["x"] = -162226, ["x"] = -164284,
["speed"] = 0, ["speed"] = 0,
["coalition"] = "neutral", ["coalition"] = "neutral",
["type"] = "PERRY", ["type"] = "PERRY",
["groupId"] = 7028, ["groupId"] = 7028,
["y"] = 266075, ["y"] = 265427,
["country"] = "australia", ["country"] = "australia",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
@ -2295,11 +2295,11 @@ groupsById =
{ {
[1] = [1] =
{ {
["alt"] = 72, ["alt"] = 67,
["point"] = ["point"] =
{ {
["y"] = 693761, ["y"] = 692292,
["x"] = -284648, ["x"] = -284982,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -2309,9 +2309,9 @@ groupsById =
["groupId"] = 7001, ["groupId"] = 7001,
["groupName"] = "USA gnd 1", ["groupName"] = "USA gnd 1",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284648, ["x"] = -284982,
["y"] = 693761, ["y"] = 692292,
["heading"] = 1.4977557542423, ["heading"] = 1.4977557593169,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 1 unit1", ["unitName"] = "USA gnd 1 unit1",
["unitId"] = 7001, ["unitId"] = 7001,
@ -2319,11 +2319,11 @@ groupsById =
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["alt"] = 73, ["alt"] = 67,
["point"] = ["point"] =
{ {
["y"] = 693771, ["y"] = 692208,
["x"] = -284456, ["x"] = -284870,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -2333,9 +2333,9 @@ groupsById =
["groupId"] = 7001, ["groupId"] = 7001,
["groupName"] = "USA gnd 1", ["groupName"] = "USA gnd 1",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284456, ["x"] = -284870,
["y"] = 693771, ["y"] = 692208,
["heading"] = 1.4977557542423, ["heading"] = 1.4977557696476,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 1 unit2", ["unitName"] = "USA gnd 1 unit2",
["unitId"] = 7002, ["unitId"] = 7002,
@ -2343,11 +2343,11 @@ groupsById =
}, -- end of [2] }, -- end of [2]
[3] = [3] =
{ {
["alt"] = 72, ["alt"] = 68,
["point"] = ["point"] =
{ {
["y"] = 693781, ["y"] = 692374,
["x"] = -284639, ["x"] = -284971,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -2357,9 +2357,9 @@ groupsById =
["groupId"] = 7001, ["groupId"] = 7001,
["groupName"] = "USA gnd 1", ["groupName"] = "USA gnd 1",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284639, ["x"] = -284971,
["y"] = 693781, ["y"] = 692374,
["heading"] = 1.4977557542423, ["heading"] = 1.4977557676538,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 1 unit3", ["unitName"] = "USA gnd 1 unit3",
["unitId"] = 7003, ["unitId"] = 7003,
@ -2367,11 +2367,11 @@ groupsById =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["alt"] = 72, ["alt"] = 68,
["point"] = ["point"] =
{ {
["y"] = 693653, ["y"] = 692388,
["x"] = -284699, ["x"] = -284932,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -2381,9 +2381,9 @@ groupsById =
["groupId"] = 7001, ["groupId"] = 7001,
["groupName"] = "USA gnd 1", ["groupName"] = "USA gnd 1",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284699, ["x"] = -284932,
["y"] = 693653, ["y"] = 692388,
["heading"] = 1.4977557629417, ["heading"] = 1.4977557602231,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 1 unit4", ["unitName"] = "USA gnd 1 unit4",
["unitId"] = 7004, ["unitId"] = 7004,
@ -2517,11 +2517,11 @@ groupsById =
{ {
[1] = [1] =
{ {
["alt"] = 65, ["alt"] = 63,
["point"] = ["point"] =
{ {
["y"] = 693655, ["y"] = 694197,
["x"] = -286667, ["x"] = -287544,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Cargos", ["categoryStatic"] = "Cargos",
["coalitionId"] = 2, ["coalitionId"] = 2,
@ -2532,8 +2532,8 @@ groupsById =
["type"] = "uh1h_cargo", ["type"] = "uh1h_cargo",
["country"] = "usa", ["country"] = "usa",
["groupName"] = "USA static 4", ["groupName"] = "USA static 4",
["y"] = 693655, ["y"] = 694197,
["x"] = -286667, ["x"] = -287544,
["coalition"] = "blue", ["coalition"] = "blue",
["unitId"] = 7017, ["unitId"] = 7017,
["heading"] = 0, ["heading"] = 0,
@ -2562,8 +2562,8 @@ groupsById =
["alt"] = 0, ["alt"] = 0,
["point"] = ["point"] =
{ {
["y"] = 268869, ["y"] = 268107,
["x"] = -163156, ["x"] = -163693,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 0, ["coalitionId"] = 0,
["livery_id"] = "ReubenJames", ["livery_id"] = "ReubenJames",
@ -2574,12 +2574,12 @@ groupsById =
["unitId"] = 7033, ["unitId"] = 7033,
["groupName"] = "AUSTRALIA shp 3", ["groupName"] = "AUSTRALIA shp 3",
["countryId"] = 21, ["countryId"] = 21,
["x"] = -163156, ["x"] = -163693,
["speed"] = 0, ["speed"] = 0,
["coalition"] = "neutral", ["coalition"] = "neutral",
["type"] = "PERRY", ["type"] = "PERRY",
["groupId"] = 7021, ["groupId"] = 7021,
["y"] = 268869, ["y"] = 268107,
["country"] = "australia", ["country"] = "australia",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
@ -2668,11 +2668,11 @@ groupsById =
{ {
[1] = [1] =
{ {
["alt"] = 70, ["alt"] = 57,
["point"] = ["point"] =
{ {
["y"] = 691224, ["y"] = 691173,
["x"] = -283405, ["x"] = -286924,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Cargos", ["categoryStatic"] = "Cargos",
["coalitionId"] = 2, ["coalitionId"] = 2,
@ -2683,8 +2683,8 @@ groupsById =
["type"] = "uh1h_cargo", ["type"] = "uh1h_cargo",
["country"] = "usa", ["country"] = "usa",
["groupName"] = "USA static 2", ["groupName"] = "USA static 2",
["y"] = 691224, ["y"] = 691173,
["x"] = -283405, ["x"] = -286924,
["coalition"] = "blue", ["coalition"] = "blue",
["unitId"] = 7006, ["unitId"] = 7006,
["heading"] = 0, ["heading"] = 0,
@ -2713,8 +2713,8 @@ groupsById =
["alt"] = 0, ["alt"] = 0,
["point"] = ["point"] =
{ {
["y"] = 267048, ["y"] = 267810,
["x"] = -161099, ["x"] = -162283,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 0, ["coalitionId"] = 0,
["livery_id"] = "ReubenJames", ["livery_id"] = "ReubenJames",
@ -2725,12 +2725,12 @@ groupsById =
["unitId"] = 7022, ["unitId"] = 7022,
["groupName"] = "AUSTRALIA shp 2", ["groupName"] = "AUSTRALIA shp 2",
["countryId"] = 21, ["countryId"] = 21,
["x"] = -161099, ["x"] = -162283,
["speed"] = 0, ["speed"] = 0,
["coalition"] = "neutral", ["coalition"] = "neutral",
["type"] = "PERRY", ["type"] = "PERRY",
["groupId"] = 7014, ["groupId"] = 7014,
["y"] = 267048, ["y"] = 267810,
["country"] = "australia", ["country"] = "australia",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
@ -2819,11 +2819,11 @@ groupsById =
{ {
[1] = [1] =
{ {
["alt"] = 73, ["alt"] = 59,
["point"] = ["point"] =
{ {
["y"] = 693098, ["y"] = 692769,
["x"] = -284021, ["x"] = -287355,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -2833,9 +2833,9 @@ groupsById =
["groupId"] = 7022, ["groupId"] = 7022,
["groupName"] = "USA gnd 7", ["groupName"] = "USA gnd 7",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284021, ["x"] = -287355,
["y"] = 693098, ["y"] = 692769,
["heading"] = 1.4977557645728, ["heading"] = 1.4977557591357,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 7 unit1", ["unitName"] = "USA gnd 7 unit1",
["unitId"] = 7034, ["unitId"] = 7034,
@ -2843,23 +2843,23 @@ groupsById =
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["alt"] = 73, ["alt"] = 59,
["point"] = ["point"] =
{ {
["y"] = 693012, ["y"] = 692754,
["x"] = -284053, ["x"] = -287476,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
["category"] = "vehicle", ["category"] = "vehicle",
["speed"] = 5.0056692998623e-05, ["speed"] = 0,
["type"] = "M-1 Abrams", ["type"] = "M-1 Abrams",
["groupId"] = 7022, ["groupId"] = 7022,
["groupName"] = "USA gnd 7", ["groupName"] = "USA gnd 7",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284053, ["x"] = -287476,
["y"] = 693012, ["y"] = 692754,
["heading"] = 1.4877557641795, ["heading"] = 1.4977557605856,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 7 unit2", ["unitName"] = "USA gnd 7 unit2",
["unitId"] = 7035, ["unitId"] = 7035,
@ -2867,23 +2867,23 @@ groupsById =
}, -- end of [2] }, -- end of [2]
[3] = [3] =
{ {
["alt"] = 74, ["alt"] = 59,
["point"] = ["point"] =
{ {
["y"] = 693026, ["y"] = 692726,
["x"] = -283898, ["x"] = -287538,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
["category"] = "vehicle", ["category"] = "vehicle",
["speed"] = 0.00018869274936151, ["speed"] = 0,
["type"] = "M-1 Abrams", ["type"] = "M-1 Abrams",
["groupId"] = 7022, ["groupId"] = 7022,
["groupName"] = "USA gnd 7", ["groupName"] = "USA gnd 7",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -283898, ["x"] = -287538,
["y"] = 693026, ["y"] = 692726,
["heading"] = 1.5077557625432, ["heading"] = 1.4977557605856,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 7 unit3", ["unitName"] = "USA gnd 7 unit3",
["unitId"] = 7036, ["unitId"] = 7036,
@ -2891,23 +2891,23 @@ groupsById =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["alt"] = 73, ["alt"] = 59,
["point"] = ["point"] =
{ {
["y"] = 693093, ["y"] = 692766,
["x"] = -284127, ["x"] = -287511,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
["category"] = "vehicle", ["category"] = "vehicle",
["speed"] = 0.0040063578450385, ["speed"] = 0,
["type"] = "M-1 Abrams", ["type"] = "M-1 Abrams",
["groupId"] = 7022, ["groupId"] = 7022,
["groupName"] = "USA gnd 7", ["groupName"] = "USA gnd 7",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284127, ["x"] = -287511,
["y"] = 693093, ["y"] = 692766,
["heading"] = 1.4877557641795, ["heading"] = 1.4977557605856,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 7 unit4", ["unitName"] = "USA gnd 7 unit4",
["unitId"] = 7037, ["unitId"] = 7037,
@ -2989,8 +2989,8 @@ groupsById =
["alt"] = 0, ["alt"] = 0,
["point"] = ["point"] =
{ {
["y"] = 265153, ["y"] = 267081,
["x"] = -163065, ["x"] = -164471,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 0, ["coalitionId"] = 0,
["livery_id"] = "ReubenJames", ["livery_id"] = "ReubenJames",
@ -3001,12 +3001,12 @@ groupsById =
["unitId"] = 7011, ["unitId"] = 7011,
["groupName"] = "AUSTRALIA shp 1", ["groupName"] = "AUSTRALIA shp 1",
["countryId"] = 21, ["countryId"] = 21,
["x"] = -163065, ["x"] = -164471,
["speed"] = 0, ["speed"] = 0,
["coalition"] = "neutral", ["coalition"] = "neutral",
["type"] = "PERRY", ["type"] = "PERRY",
["groupId"] = 7007, ["groupId"] = 7007,
["y"] = 265153, ["y"] = 267081,
["country"] = "australia", ["country"] = "australia",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
@ -3095,11 +3095,11 @@ groupsById =
{ {
[1] = [1] =
{ {
["alt"] = 69, ["alt"] = 73,
["point"] = ["point"] =
{ {
["y"] = 695073, ["y"] = 691751,
["x"] = -287442, ["x"] = -283221,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -3109,9 +3109,9 @@ groupsById =
["groupId"] = 7015, ["groupId"] = 7015,
["groupName"] = "USA gnd 5", ["groupName"] = "USA gnd 5",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -287442, ["x"] = -283221,
["y"] = 695073, ["y"] = 691751,
["heading"] = 1.4977557701918, ["heading"] = 1.4977557703725,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 5 unit1", ["unitName"] = "USA gnd 5 unit1",
["unitId"] = 7023, ["unitId"] = 7023,
@ -3119,11 +3119,11 @@ groupsById =
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["alt"] = 68, ["alt"] = 74,
["point"] = ["point"] =
{ {
["y"] = 695090, ["y"] = 691898,
["x"] = -287590, ["x"] = -283194,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -3133,9 +3133,9 @@ groupsById =
["groupId"] = 7015, ["groupId"] = 7015,
["groupName"] = "USA gnd 5", ["groupName"] = "USA gnd 5",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -287590, ["x"] = -283194,
["y"] = 695090, ["y"] = 691898,
["heading"] = 1.4977557591357, ["heading"] = 1.4977557634854,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 5 unit2", ["unitName"] = "USA gnd 5 unit2",
["unitId"] = 7024, ["unitId"] = 7024,
@ -3143,11 +3143,11 @@ groupsById =
}, -- end of [2] }, -- end of [2]
[3] = [3] =
{ {
["alt"] = 69, ["alt"] = 72,
["point"] = ["point"] =
{ {
["y"] = 695151, ["y"] = 691826,
["x"] = -287518, ["x"] = -283357,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -3157,9 +3157,9 @@ groupsById =
["groupId"] = 7015, ["groupId"] = 7015,
["groupName"] = "USA gnd 5", ["groupName"] = "USA gnd 5",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -287518, ["x"] = -283357,
["y"] = 695151, ["y"] = 691826,
["heading"] = 1.4977557660229, ["heading"] = 1.4977557538798,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 5 unit3", ["unitName"] = "USA gnd 5 unit3",
["unitId"] = 7025, ["unitId"] = 7025,
@ -3167,11 +3167,11 @@ groupsById =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["alt"] = 68, ["alt"] = 72,
["point"] = ["point"] =
{ {
["y"] = 694882, ["y"] = 691852,
["x"] = -287479, ["x"] = -283362,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -3181,9 +3181,9 @@ groupsById =
["groupId"] = 7015, ["groupId"] = 7015,
["groupName"] = "USA gnd 5", ["groupName"] = "USA gnd 5",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -287479, ["x"] = -283362,
["y"] = 694882, ["y"] = 691852,
["heading"] = 1.4977557575044, ["heading"] = 1.4977557720036,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 5 unit4", ["unitName"] = "USA gnd 5 unit4",
["unitId"] = 7026, ["unitId"] = 7026,
@ -3317,26 +3317,26 @@ groupsById =
{ {
[1] = [1] =
{ {
["alt"] = 70, ["alt"] = 56,
["type"] = "Sandbox", ["type"] = "Sandbox",
["point"] = ["point"] =
{ {
["y"] = 694696, ["y"] = 691971,
["x"] = -287053, ["x"] = -288088,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Fortifications",
["coalitionId"] = 2,
["y"] = 694696,
["groupName"] = "USA static 7",
["country"] = "usa", ["country"] = "usa",
["countryId"] = 2, ["coalitionId"] = 2,
["x"] = -287053,
["coalition"] = "blue", ["coalition"] = "blue",
["groupName"] = "USA static 7",
["unitId"] = 7038,
["y"] = 691971,
["x"] = -288088,
["countryId"] = 2,
["category"] = "static", ["category"] = "static",
["unitName"] = "USA static 7", ["unitName"] = "USA static 7",
["unitId"] = 7038,
["heading"] = 0,
["groupId"] = 7038, ["groupId"] = 7038,
["heading"] = 0,
["categoryStatic"] = "Fortifications",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 2, ["countryId"] = 2,
@ -3424,11 +3424,11 @@ groupsById =
{ {
[1] = [1] =
{ {
["alt"] = 66, ["alt"] = 62,
["point"] = ["point"] =
{ {
["y"] = 691761, ["y"] = 690419,
["x"] = -284967, ["x"] = -284972,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -3438,9 +3438,9 @@ groupsById =
["groupId"] = 7008, ["groupId"] = 7008,
["groupName"] = "USA gnd 3", ["groupName"] = "USA gnd 3",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284967, ["x"] = -284972,
["y"] = 691761, ["y"] = 690419,
["heading"] = 1.4977557594982, ["heading"] = 1.4977557640291,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 3 unit1", ["unitName"] = "USA gnd 3 unit1",
["unitId"] = 7012, ["unitId"] = 7012,
@ -3448,11 +3448,11 @@ groupsById =
}, -- end of [1] }, -- end of [1]
[2] = [2] =
{ {
["alt"] = 66, ["alt"] = 63,
["point"] = ["point"] =
{ {
["y"] = 691809, ["y"] = 690558,
["x"] = -284861, ["x"] = -284846,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -3462,9 +3462,9 @@ groupsById =
["groupId"] = 7008, ["groupId"] = 7008,
["groupName"] = "USA gnd 3", ["groupName"] = "USA gnd 3",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284861, ["x"] = -284846,
["y"] = 691809, ["y"] = 690558,
["heading"] = 1.4977557625792, ["heading"] = 1.4977557580482,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 3 unit2", ["unitName"] = "USA gnd 3 unit2",
["unitId"] = 7013, ["unitId"] = 7013,
@ -3472,11 +3472,11 @@ groupsById =
}, -- end of [2] }, -- end of [2]
[3] = [3] =
{ {
["alt"] = 66, ["alt"] = 62,
["point"] = ["point"] =
{ {
["y"] = 691744, ["y"] = 690360,
["x"] = -284982, ["x"] = -285032,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -3486,9 +3486,9 @@ groupsById =
["groupId"] = 7008, ["groupId"] = 7008,
["groupName"] = "USA gnd 3", ["groupName"] = "USA gnd 3",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -284982, ["x"] = -285032,
["y"] = 691744, ["y"] = 690360,
["heading"] = 1.4977557573233, ["heading"] = 1.4977557565984,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 3 unit3", ["unitName"] = "USA gnd 3 unit3",
["unitId"] = 7014, ["unitId"] = 7014,
@ -3496,11 +3496,11 @@ groupsById =
}, -- end of [3] }, -- end of [3]
[4] = [4] =
{ {
["alt"] = 65, ["alt"] = 62,
["point"] = ["point"] =
{ {
["y"] = 691757, ["y"] = 690314,
["x"] = -285098, ["x"] = -284956,
}, -- end of ["point"] }, -- end of ["point"]
["coalitionId"] = 2, ["coalitionId"] = 2,
["skill"] = "Average", ["skill"] = "Average",
@ -3510,9 +3510,9 @@ groupsById =
["groupId"] = 7008, ["groupId"] = 7008,
["groupName"] = "USA gnd 3", ["groupName"] = "USA gnd 3",
["countryId"] = 2, ["countryId"] = 2,
["x"] = -285098, ["x"] = -284956,
["y"] = 691757, ["y"] = 690314,
["heading"] = 1.4977557640291, ["heading"] = 1.497755755511,
["country"] = "usa", ["country"] = "usa",
["unitName"] = "USA gnd 3 unit4", ["unitName"] = "USA gnd 3 unit4",
["unitId"] = 7015, ["unitId"] = 7015,
@ -3596,22 +3596,22 @@ groupsById =
["type"] = "Sandbox", ["type"] = "Sandbox",
["point"] = ["point"] =
{ {
["y"] = 693960, ["y"] = 692858,
["x"] = -287585, ["x"] = -286636,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Fortifications",
["coalitionId"] = 2,
["y"] = 693960,
["groupName"] = "USA static 3",
["country"] = "usa", ["country"] = "usa",
["countryId"] = 2, ["coalitionId"] = 2,
["x"] = -287585,
["coalition"] = "blue", ["coalition"] = "blue",
["groupName"] = "USA static 3",
["unitId"] = 7016,
["y"] = 692858,
["x"] = -286636,
["countryId"] = 2,
["category"] = "static", ["category"] = "static",
["unitName"] = "USA static 3", ["unitName"] = "USA static 3",
["unitId"] = 7016,
["heading"] = 0,
["groupId"] = 7016, ["groupId"] = 7016,
["heading"] = 0,
["categoryStatic"] = "Fortifications",
}, -- end of [1] }, -- end of [1]
}, -- end of ["units"] }, -- end of ["units"]
["countryId"] = 2, ["countryId"] = 2,
@ -3687,11 +3687,11 @@ groupsById =
{ {
[1] = [1] =
{ {
["alt"] = 55, ["alt"] = 63,
["point"] = ["point"] =
{ {
["y"] = 689703, ["y"] = 693814,
["x"] = -286460, ["x"] = -287262,
}, -- end of ["point"] }, -- end of ["point"]
["categoryStatic"] = "Cargos", ["categoryStatic"] = "Cargos",
["coalitionId"] = 2, ["coalitionId"] = 2,
@ -3702,8 +3702,8 @@ groupsById =
["type"] = "uh1h_cargo", ["type"] = "uh1h_cargo",
["country"] = "usa", ["country"] = "usa",
["groupName"] = "USA static 8", ["groupName"] = "USA static 8",
["y"] = 689703, ["y"] = 693814,
["x"] = -286460, ["x"] = -287262,
["coalition"] = "blue", ["coalition"] = "blue",
["unitId"] = 7039, ["unitId"] = 7039,
["heading"] = 0, ["heading"] = 0,

File diff suppressed because it is too large Load Diff

View File

@ -140,11 +140,11 @@ markList =
["pos"] = ["pos"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -355263.93360573, ["x"] = -355264.17692343,
[1] = [1] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -355263.93360573, ["x"] = -355264.17692343,
["z"] = 443853.03125, ["z"] = 443853.03125,
}, -- end of [1] }, -- end of [1]
["z"] = 443853.03125, ["z"] = 443853.03125,
@ -293,11 +293,11 @@ markList =
["pos"] = ["pos"] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -356064.09419542, ["x"] = -356063.91153006,
[1] = [1] =
{ {
["y"] = 0, ["y"] = 0,
["x"] = -356064.09419542, ["x"] = -356063.91153006,
["z"] = 444653.03125, ["z"] = 444653.03125,
}, -- end of [1] }, -- end of [1]
["z"] = 444653.03125, ["z"] = 444653.03125,

View File

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

View File

@ -96,38 +96,38 @@ removedAliveUnits =
["z"] = 681535.125, ["z"] = 681535.125,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16790016] }, -- end of [16790016]
[16790272] = [16782592] =
{ {
["point"] = ["point"] =
{ {
["y"] = 681535.14285714, ["y"] = 654545.71428571,
["x"] = -287156.85714286, ["x"] = -292842.85714286,
}, -- end of ["point"] }, -- end of ["point"]
["skill"] = "Average", ["skill"] = "Average",
["unit"] = ["unit"] =
{ {
["id_"] = 16790272, ["id_"] = 16782592,
}, -- end of ["unit"] }, -- end of ["unit"]
["category"] = "vehicle", ["category"] = "vehicle",
["unitName"] = "Unit #008", ["unitName"] = "RuBTRs1",
["heading"] = 0, ["heading"] = -1.7994767003775,
["unitId"] = 58, ["unitId"] = 27,
["groupName"] = "teleGroup", ["groupName"] = "RuBTRs",
["countryId"] = 2, ["countryId"] = 0,
["coalition"] = "blue", ["coalition"] = "red",
["x"] = -287156.85714286, ["x"] = -292842.85714286,
["type"] = "Hawk cwar", ["type"] = "BTR-80",
["groupId"] = 35, ["groupId"] = 13,
["country"] = "usa", ["country"] = "russia",
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["y"] = 681535.14285714, ["y"] = 654545.71428571,
["pos"] = ["pos"] =
{ {
["y"] = 34.752384185791, ["y"] = 11.754341371009,
["x"] = -287156.84375, ["x"] = -292856.19491841,
["z"] = 681535.125, ["z"] = 654542.5822736,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16790272] }, -- end of [16782592]
[16782848] = [16782848] =
{ {
["point"] = ["point"] =
@ -155,9 +155,9 @@ removedAliveUnits =
["y"] = 654585.71428571, ["y"] = 654585.71428571,
["pos"] = ["pos"] =
{ {
["y"] = 11.896243705612, ["y"] = 11.835539878247,
["x"] = -292885.8154643, ["x"] = -292898.99755273,
["z"] = 654581.81480703, ["z"] = 654582.04906262,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16782848] }, -- end of [16782848]
[16783104] = [16783104] =
@ -187,43 +187,43 @@ removedAliveUnits =
["y"] = 654625.71428571, ["y"] = 654625.71428571,
["pos"] = ["pos"] =
{ {
["y"] = 11.927206059256, ["y"] = 11.931074299111,
["x"] = -292936.5144784, ["x"] = -292941.20047403,
["z"] = 654619.49063824, ["z"] = 654623.11353253,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16783104] }, -- end of [16783104]
[16783360] = [16783616] =
{ {
["point"] = ["point"] =
{ {
["y"] = 654665.71428571, ["y"] = 654705.71428571,
["x"] = -292962.85714286, ["x"] = -293002.85714286,
}, -- end of ["point"] }, -- end of ["point"]
["skill"] = "Average", ["skill"] = "Average",
["unit"] = ["unit"] =
{ {
["id_"] = 16783360, ["id_"] = 16783616,
}, -- end of ["unit"] }, -- end of ["unit"]
["category"] = "vehicle", ["category"] = "vehicle",
["unitName"] = "RuBTRs4", ["unitName"] = "RuBTRs5",
["heading"] = -1.7994767003775, ["heading"] = -1.7994767003775,
["unitId"] = 30, ["unitId"] = 31,
["groupName"] = "RuBTRs", ["groupName"] = "RuBTRs",
["countryId"] = 0, ["countryId"] = 0,
["coalition"] = "red", ["coalition"] = "red",
["x"] = -292962.85714286, ["x"] = -293002.85714286,
["type"] = "BTR-80", ["type"] = "BTR-80",
["groupId"] = 13, ["groupId"] = 13,
["country"] = "russia", ["country"] = "russia",
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["y"] = 654665.71428571, ["y"] = 654705.71428571,
["pos"] = ["pos"] =
{ {
["y"] = 11.942705180761, ["y"] = 12.057955079325,
["x"] = -292999.01167319, ["x"] = -293012.83464525,
["z"] = 654661.6137778, ["z"] = 654701.02104299,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16783360] }, -- end of [16783616]
[16788736] = [16788736] =
{ {
["point"] = ["point"] =
@ -320,36 +320,36 @@ removedAliveUnits =
["z"] = 681535.125, ["z"] = 681535.125,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16789248] }, -- end of [16789248]
[16782592] = [16790272] =
{ {
["point"] = ["point"] =
{ {
["y"] = 654545.71428571, ["y"] = 681535.14285714,
["x"] = -292842.85714286, ["x"] = -287156.85714286,
}, -- end of ["point"] }, -- end of ["point"]
["skill"] = "Average", ["skill"] = "Average",
["unit"] = ["unit"] =
{ {
["id_"] = 16782592, ["id_"] = 16790272,
}, -- end of ["unit"] }, -- end of ["unit"]
["category"] = "vehicle", ["category"] = "vehicle",
["unitName"] = "RuBTRs1", ["unitName"] = "Unit #008",
["heading"] = -1.7994767003775, ["heading"] = 0,
["unitId"] = 27, ["unitId"] = 58,
["groupName"] = "RuBTRs", ["groupName"] = "teleGroup",
["countryId"] = 0, ["countryId"] = 2,
["coalition"] = "red", ["coalition"] = "blue",
["x"] = -292842.85714286, ["x"] = -287156.85714286,
["type"] = "BTR-80", ["type"] = "Hawk cwar",
["groupId"] = 13, ["groupId"] = 35,
["country"] = "russia", ["country"] = "usa",
["playerCanDrive"] = true, ["playerCanDrive"] = true,
["y"] = 654545.71428571, ["y"] = 681535.14285714,
["pos"] = ["pos"] =
{ {
["y"] = 11.750308354347, ["y"] = 34.752384185791,
["x"] = -292852.11861931, ["x"] = -287156.84375,
["z"] = 654539.33966137, ["z"] = 681535.125,
}, -- end of ["pos"] }, -- end of ["pos"]
}, -- end of [16782592] }, -- end of [16790272]
} -- end of removedAliveUnits } -- end of removedAliveUnits

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,83 +1,5 @@
zonesByName = zonesByName =
{ {
["LZ zone"] =
{
["radius"] = 3000,
["zoneId"] = 2,
["color"] =
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.14901960784314,
}, -- end of ["color"]
["properties"] =
{
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 614105.71428571,
["x"] = -245328.57142857,
["name"] = "LZ zone",
["point"] =
{
["y"] = 0,
["x"] = -245328.57142857,
["z"] = 614105.71428571,
}, -- end of ["point"]
["type"] = 0,
}, -- end of ["LZ zone"]
["explosion zone"] =
{
["radius"] = 3000,
["zoneId"] = 1,
["color"] =
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.14901960784314,
}, -- end of ["color"]
["properties"] =
{
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 673819.99999999,
["x"] = -271900,
["name"] = "explosion zone",
["point"] =
{
["y"] = 0,
["x"] = -271900,
["z"] = 673819.99999999,
}, -- end of ["point"]
["type"] = 0,
}, -- end of ["explosion zone"]
["cloneZone"] =
{
["radius"] = 3000,
["zoneId"] = 3,
["color"] =
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.14901960784314,
}, -- end of ["color"]
["properties"] =
{
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 692534.28571428,
["x"] = -285971.42857143,
["name"] = "cloneZone",
["point"] =
{
["y"] = 0,
["x"] = -285971.42857143,
["z"] = 692534.28571428,
}, -- end of ["point"]
["type"] = 0,
}, -- end of ["cloneZone"]
["shipZone"] = ["shipZone"] =
{ {
["radius"] = 3000, ["radius"] = 3000,
@ -104,4 +26,133 @@ zonesByName =
}, -- end of ["point"] }, -- end of ["point"]
["type"] = 0, ["type"] = 0,
}, -- end of ["shipZone"] }, -- end of ["shipZone"]
["LZ zone"] =
{
["radius"] = 3000,
["zoneId"] = 2,
["color"] =
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.14901960784314,
}, -- end of ["color"]
["properties"] =
{
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 614105.71428571,
["x"] = -245328.57142857,
["name"] = "LZ zone",
["point"] =
{
["y"] = 0,
["x"] = -245328.57142857,
["z"] = 614105.71428571,
}, -- end of ["point"]
["type"] = 0,
}, -- end of ["LZ zone"]
["quad"] =
{
["radius"] = 13592.958647037,
["zoneId"] = 339,
["color"] =
{
[1] = 1,
[2] = 0,
[3] = 0,
[4] = 0.14901960784314,
}, -- end of ["color"]
["properties"] =
{
["Property Value "] = "Eyyyyyyyy",
["Prop 2 is an"] = "empty string",
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 590545.61946051,
["x"] = -151821.41786062,
["name"] = "quad",
["point"] =
{
["y"] = 0,
["x"] = -151821.41786062,
["z"] = 590545.61946051,
}, -- end of ["point"]
["type"] = 2,
["verticies"] =
{
[1] =
{
["y"] = 583845.85427019,
["x"] = -156926.00086276,
}, -- end of [1]
[2] =
{
["y"] = 594153.18533222,
["x"] = -161637.92363397,
}, -- end of [2]
[3] =
{
["y"] = 601908.22489317,
["x"] = -144360.87347286,
}, -- end of [3]
[4] =
{
["y"] = 582275.21334645,
["x"] = -144360.87347286,
}, -- end of [4]
}, -- end of ["verticies"]
}, -- end of ["quad"]
["cloneZone"] =
{
["radius"] = 3000,
["zoneId"] = 3,
["color"] =
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.14901960784314,
}, -- end of ["color"]
["properties"] =
{
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 692534.28571428,
["x"] = -285971.42857143,
["name"] = "cloneZone",
["point"] =
{
["y"] = 0,
["x"] = -285971.42857143,
["z"] = 692534.28571428,
}, -- end of ["point"]
["type"] = 0,
}, -- end of ["cloneZone"]
["explosion zone"] =
{
["radius"] = 3000,
["zoneId"] = 1,
["color"] =
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.14901960784314,
}, -- end of ["color"]
["properties"] =
{
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 673819.99999999,
["x"] = -271900,
["name"] = "explosion zone",
["point"] =
{
["y"] = 0,
["x"] = -271900,
["z"] = 673819.99999999,
}, -- end of ["point"]
["type"] = 0,
}, -- end of ["explosion zone"]
} -- end of zonesByName } -- end of zonesByName

View File

@ -1,32 +1,6 @@
zonesByNum = zonesByNum =
{ {
[1] = [1] =
{
["radius"] = 3000,
["zoneId"] = 2,
["color"] =
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.14901960784314,
}, -- end of ["color"]
["properties"] =
{
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 614105.71428571,
["x"] = -245328.57142857,
["name"] = "LZ zone",
["type"] = 0,
["point"] =
{
["y"] = 0,
["x"] = -245328.57142857,
["z"] = 614105.71428571,
}, -- end of ["point"]
}, -- end of [1]
[2] =
{ {
["radius"] = 3000, ["radius"] = 3000,
["zoneId"] = 3, ["zoneId"] = 3,
@ -51,34 +25,8 @@ zonesByNum =
["x"] = -285971.42857143, ["x"] = -285971.42857143,
["z"] = 692534.28571428, ["z"] = 692534.28571428,
}, -- end of ["point"] }, -- end of ["point"]
}, -- end of [2] }, -- end of [1]
[3] = [2] =
{
["radius"] = 3000,
["zoneId"] = 174,
["color"] =
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.15,
}, -- end of ["color"]
["properties"] =
{
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 267139.69375223,
["x"] = -163182.90396786,
["name"] = "shipZone",
["type"] = 0,
["point"] =
{
["y"] = 0,
["x"] = -163182.90396786,
["z"] = 267139.69375223,
}, -- end of ["point"]
}, -- end of [3]
[4] =
{ {
["radius"] = 3000, ["radius"] = 3000,
["zoneId"] = 1, ["zoneId"] = 1,
@ -103,5 +51,108 @@ zonesByNum =
["x"] = -271900, ["x"] = -271900,
["z"] = 673819.99999999, ["z"] = 673819.99999999,
}, -- end of ["point"] }, -- end of ["point"]
}, -- end of [2]
[3] =
{
["radius"] = 3000,
["zoneId"] = 2,
["color"] =
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.14901960784314,
}, -- end of ["color"]
["properties"] =
{
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 614105.71428571,
["x"] = -245328.57142857,
["name"] = "LZ zone",
["type"] = 0,
["point"] =
{
["y"] = 0,
["x"] = -245328.57142857,
["z"] = 614105.71428571,
}, -- end of ["point"]
}, -- end of [3]
[4] =
{
["radius"] = 3000,
["zoneId"] = 174,
["color"] =
{
[1] = 1,
[2] = 1,
[3] = 1,
[4] = 0.15,
}, -- end of ["color"]
["properties"] =
{
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 267139.69375223,
["x"] = -163182.90396786,
["name"] = "shipZone",
["type"] = 0,
["point"] =
{
["y"] = 0,
["x"] = -163182.90396786,
["z"] = 267139.69375223,
}, -- end of ["point"]
}, -- end of [4] }, -- end of [4]
[5] =
{
["radius"] = 13592.958647037,
["zoneId"] = 339,
["color"] =
{
[1] = 1,
[2] = 0,
[3] = 0,
[4] = 0.14901960784314,
}, -- end of ["color"]
["properties"] =
{
["Property Value "] = "Eyyyyyyyy",
["Prop 2 is an"] = "empty string",
}, -- end of ["properties"]
["hidden"] = false,
["y"] = 590545.61946051,
["x"] = -151821.41786062,
["name"] = "quad",
["point"] =
{
["y"] = 0,
["x"] = -151821.41786062,
["z"] = 590545.61946051,
}, -- end of ["point"]
["type"] = 2,
["verticies"] =
{
[1] =
{
["y"] = 583845.85427019,
["x"] = -156926.00086276,
}, -- end of [1]
[2] =
{
["y"] = 594153.18533222,
["x"] = -161637.92363397,
}, -- end of [2]
[3] =
{
["y"] = 601908.22489317,
["x"] = -144360.87347286,
}, -- end of [3]
[4] =
{
["y"] = 582275.21334645,
["x"] = -144360.87347286,
}, -- end of [4]
}, -- end of ["verticies"]
}, -- end of [5]
} -- end of zonesByNum } -- end of zonesByNum

646
mist.lua
View File

@ -35,7 +35,7 @@ mist = {}
-- don't change these -- don't change these
mist.majorVersion = 4 mist.majorVersion = 4
mist.minorVersion = 5 mist.minorVersion = 5
mist.build = 104 mist.build = 106
-- forward declaration of log shorthand -- forward declaration of log shorthand
local log local log
@ -115,6 +115,17 @@ do -- the main scope
zone.properties[prop.key] = prop.value zone.properties[prop.key] = prop.value
end end
end end
end
if zone.verticies then -- trust but verify
local r = 0
for i = 1, #zone.verticies do
local dist = mist.utils.get2DDist(zone.point, zone.verticies[i])
if dist > r then
r = mist.utils.deepCopy(dist)
end
end
zone.radius = r
end end
mist.DBs.zonesByName[zone_data.name] = zone mist.DBs.zonesByName[zone_data.name] = zone
@ -124,6 +135,85 @@ do -- the main scope
end end
end end
mist.DBs.drawingByName = {}
mist.DBs.drawingIndexed = {}
if env.mission.drawings and env.mission.drawings.layers then
for i = 1, #env.mission.drawings.layers do
local l = env.mission.drawings.layers[i]
for j = 1, #l.objects do
local copy = mist.utils.deepCopy(l.objects[j])
--log:warn(copy)
local doOffset = false
copy.layer = l.name
local theta = copy.angle or 0
theta = math.rad(theta)
if copy.primitiveType == "Polygon" then
if copy.polygonMode == 'rect' then
local h, w = copy.height, copy.width
copy.points = {}
copy.points[1] = {x = h/2, y = w/2}
copy.points[2] = {x = -h/2, y = w/2}
copy.points[3] = {x = -h/2, y = -w/2}
copy.points[4] = {x = h/2, y = -w/2}
doOffset = true
elseif copy.polygonMode == "circle" then
copy.points = {x = copy.mapX, y = copy.mapY}
elseif copy.polygonMode == 'oval' then
-- oval bugs. Scale and rotation are off.
copy.points = {}
local numPoints = 24
local angleStep = (math.pi*2)/numPoints
doOffset = true
for v = 1, numPoints do
local pointAngle = v * angleStep
local x = copy.r1 * math.cos(pointAngle)
local y = copy.r2 * math.sin(pointAngle)
table.insert(copy.points,{x=x,y=y})
end
elseif copy.polygonMode == "arrow" then
doOffset = true
end
-- NOTE TO SELF. FIGURE OUT WHICH SHAPES NEED TO BE OFFSET. OVAL YES.
--log:warn('check offset')
if theta ~= 0 and copy.points and doOffset == true then
--log:warn('offsetting Values')
for p = 1, #copy.points do
local offset = mist.vec.rotateVec2(copy.points[p], theta)
copy.points[p] = offset
end
--log:warn(copy.points[1])
end
end
if copy.points and #copy.points > 1 then
for u = 1, #copy.points do
copy.points[u].x = copy.points[u].x + copy.mapX
copy.points[u].y = copy.points[u].y + copy.mapY
end
end
if mist.DBs.drawingByName[copy.name] then
log:warn("Drawing by the name of [ $1 ] already exists in DB. Failed to add to mist.DBs.drawingByName.", copy.name)
else
mist.DBs.drawingByName[copy.name] = copy
end
table.insert(mist.DBs.drawingIndexed, copy)
end
end
end
mist.DBs.navPoints = {} mist.DBs.navPoints = {}
mist.DBs.units = {} mist.DBs.units = {}
--Build mist.db.units and mist.DBs.navPoints --Build mist.db.units and mist.DBs.navPoints
@ -319,6 +409,11 @@ do -- the main scope
['Arco'] = 2, ['Arco'] = 2,
['Shell'] = 3, ['Shell'] = 3,
}, },
['TRANSPORT'] = {
['Heavy'] = 9,
['Trash'] = 10,
['Cargo'] = 11,
['Ascot'] = 12,
['JTAC'] = { ['JTAC'] = {
['Axeman'] = 1, ['Axeman'] = 1,
['Darknight'] = 2, ['Darknight'] = 2,
@ -360,14 +455,105 @@ do -- the main scope
['rules'] = { ['rules'] = {
['canUseAircraft'] = true, ['canUseAircraft'] = true,
['appliesTo'] = { ['appliesTo'] = {
'A-10C', 'A-10C_2',
'A-10C',
'A-10A', 'A-10A',
}, },
}, },
}, },
}, ['f16'] = {
}, Viper = 9,
} Venom = 10,
Lobo = 11,
Cowboy = 12,
Python = 13,
Rattler =14,
Panther = 15,
Wolf = 16,
Weasel = 17,
Wild = 18,
Ninja = 19,
Jedi = 20,
rules = {
['canUseAircraft'] = true,
['appliesTo'] = {
'F-16C_50',
'F-16C bl.52d',
'F-16C bl.50',
'F-16A MLU',
'F-16A',
},
},
},
['f18'] = {
['Hornet'] = 9,
['Squid'] = 10,
['Ragin'] = 11,
['Roman'] = 12,
Sting = 13,
Jury =14,
Jokey = 15,
Ram = 16,
Hawk = 17,
Devil = 18,
Check = 19,
Snake = 20,
['rules'] = {
['canUseAircraft'] = true,
['appliesTo'] = {
"FA-18C_hornet",
'F/A-18C',
},
},
},
['b1'] = {
['Bone'] = 9,
['Dark'] = 10,
['Vader'] = 11,
['rules'] = {
['canUseAircraft'] = true,
['appliesTo'] = {
'B-1B',
},
},
},
['b52'] = {
['Buff'] = 9,
['Dump'] = 10,
['Kenworth'] = 11,
['rules'] = {
['canUseAircraft'] = true,
['appliesTo'] = {
'B-52H',
},
},
},
['f15e'] = {
['Dude'] = 9,
['Thud'] = 10,
['Gunny'] = 11,
['Trek'] = 12,
Sniper = 13,
Sled =14,
Best = 15,
Jazz = 16,
Rage = 17,
Tahoe = 18,
['rules'] = {
['canUseAircraft'] = true,
['appliesTo'] = {
'F-15E',
--'F-15ERAZBAM',
},
},
},
},
},
},
}
mist.DBs.const.shapeNames = { mist.DBs.const.shapeNames = {
["Landmine"] = "landmine", ["Landmine"] = "landmine",
["FARP CP Blindage"] = "kp_ug", ["FARP CP Blindage"] = "kp_ug",
@ -555,7 +741,7 @@ do -- the main scope
mist.DBs.deadObjects = {} mist.DBs.deadObjects = {}
do do
local mt = {} local mt = {}
function mt.__newindex(t, key, val) function mt.__newindex(t, key, val)
@ -875,6 +1061,7 @@ do -- the main scope
--dbLog:info('iterate') --dbLog:info('iterate')
for name, gData in pairs(tempSpawnedGroups) do for name, gData in pairs(tempSpawnedGroups) do
--env.info(name) --env.info(name)
--dbLog:info(gData)
local updated = false local updated = false
local stillExists = false local stillExists = false
if not gData.checked then if not gData.checked then
@ -882,9 +1069,9 @@ do -- the main scope
local _g = gData.gp or Group.getByName(name) local _g = gData.gp or Group.getByName(name)
if mist.DBs.groupsByName[name] then if mist.DBs.groupsByName[name] then
-- first check group level properties, groupId, countryId, coalition -- first check group level properties, groupId, countryId, coalition
-- dbLog:info('Found in DBs, check if updated') --dbLog:info('Found in DBs, check if updated')
local dbTable = mist.DBs.groupsByName[name] local dbTable = mist.DBs.groupsByName[name]
-- dbLog:info(dbTable) --dbLog:info(dbTable)
if gData.type ~= 'static' then if gData.type ~= 'static' then
-- dbLog:info('Not static') -- dbLog:info('Not static')
@ -905,11 +1092,11 @@ do -- the main scope
end end
--dbLog:info('Updated: $1', updated) --dbLog:info('Updated: $1', updated)
if updated == false and gData.type ~= 'static' then -- time to check units if updated == false and gData.type ~= 'static' then -- time to check units
--dbLog:info('No Group Mismatch, Check Units') --dbLog:info('No Group Mismatch, Check Units')
if _g and _g:isExist() == true then if _g and _g:isExist() == true then
stillExists = true stillExists = true
for index, uObject in pairs(_g:getUnits()) do for index, uObject in pairs(_g:getUnits()) do
--dbLog:info(index) --dbLog:info(index)
if mist.DBs.unitsByName[uObject:getName()] then if mist.DBs.unitsByName[uObject:getName()] then
--dbLog:info('UnitByName table exists') --dbLog:info('UnitByName table exists')
local uTable = mist.DBs.unitsByName[uObject:getName()] local uTable = mist.DBs.unitsByName[uObject:getName()]
@ -931,7 +1118,6 @@ do -- the main scope
if dbData and type(dbData) == 'table' then if dbData and type(dbData) == 'table' then
writeGroups[#writeGroups+1] = {data = dbData, isUpdated = updated} writeGroups[#writeGroups+1] = {data = dbData, isUpdated = updated}
end end
end end
-- Work done, so remove -- Work done, so remove
end end
@ -1058,19 +1244,20 @@ do -- the main scope
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
--dbLog:info('unitSpawnEvent') --log:info('unitSpawnEvent')
--log:info(event)
--log:info(event.initiator:getTypeName())
--table.insert(tempSpawnedUnits,(event.initiator)) --table.insert(tempSpawnedUnits,(event.initiator))
------- -------
-- New functionality below. -- 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 if Object.getCategory(event.initiator) == 1 and not Unit.getPlayerName(event.initiator) then -- simple player check, will need to later check to see if unit was spawned with a player in a flight
--dbLog:info('Object is a Unit') --log:info('Object is a Unit')
if Unit.getGroup(event.initiator) then if Unit.getGroup(event.initiator) then
--dbLog:info(Unit.getGroup(event.initiator):getName()) -- log:info(Unit.getGroup(event.initiator):getName())
local g = Unit.getGroup(event.initiator) local g = Unit.getGroup(event.initiator)
if not tempSpawnedGroups[g:getName()] then if not tempSpawnedGroups[g:getName()] then
--dbLog:info('added') --log:info('added')
tempSpawnedGroups[g:getName()] = {type = 'group', gp = g} tempSpawnedGroups[g:getName()] = {type = 'group', gp = g}
tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
end end
@ -1078,7 +1265,7 @@ do -- the main scope
log:error('Group not accessible by unit in event handler. This is a DCS bug') log:error('Group not accessible by unit in event handler. This is a DCS bug')
end end
elseif Object.getCategory(event.initiator) == 3 or Object.getCategory(event.initiator) == 6 then elseif Object.getCategory(event.initiator) == 3 or Object.getCategory(event.initiator) == 6 then
--dbLog:info('Object is Static') --log:info('Object is Static')
tempSpawnedGroups[StaticObject.getName(event.initiator)] = {type = 'static'} tempSpawnedGroups[StaticObject.getName(event.initiator)] = {type = 'static'}
tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
end end
@ -1236,8 +1423,8 @@ do -- the main scope
tempSpawnedGroups[s:getName()] = {type = 'static'} tempSpawnedGroups[s:getName()] = {type = 'static'}
tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
end end
end end
end end
end end
end end
@ -1519,7 +1706,11 @@ 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(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName]) --if newGroup.baseName then
-- idea of later. So custmozed naming can be created
-- else
newGroup.name = tostring(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName])
--end
end end
if not newGroup.hidden then if not newGroup.hidden then
@ -1604,11 +1795,11 @@ do -- the main scope
end end
end end
else -- if aircraft and no route assigned. make a quick and stupid route so AI doesnt RTB immediately else -- if aircraft and no route assigned. make a quick and stupid route so AI doesnt RTB immediately
if newCat == 'AIRPLANE' or newCat == 'HELICOPTER' then --if newCat == 'AIRPLANE' or newCat == 'HELICOPTER' then
newGroup.route = {} newGroup.route = {}
newGroup.route.points = {} newGroup.route.points = {}
newGroup.route.points[1] = {} newGroup.route.points[1] = {}
end --end
end end
newGroup.country = newCountry newGroup.country = newCountry
@ -1629,7 +1820,7 @@ do -- the main scope
end end
end end
--mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroup.lua') --mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroupPushedToAddGroup.lua')
--log:warn(newGroup) --log:warn(newGroup)
-- sanitize table -- sanitize table
newGroup.groupName = nil newGroup.groupName = nil
@ -2898,6 +3089,52 @@ function mist.shape.polyInCircle(poly, circle, full)
return false return false
end end
function mist.shape.getPointOnSegment(point, seg, isSeg)
local p = mist.utils.makeVec2(point)
local s1 = mist.utils.makeVec2(seg[1])
local s2 = mist.utils.makeVec2(seg[2])
local cx, cy = p.x - s1.x, p.y - s1.y
local dx, dy = s2.x - s1.x, s2.x - s1.y
local d = (dx*dx + dy*dy)
if d == 0 then
return {x = s1.x, y = s1.y}
end
local u = (cx*dx + cy*dy)/d
if isSeg then
if u < 0 then
u = 0
elseif u > 1 then
u = 1
end
end
return {x = s1.x + u*dx, y = s1.y + u*dy}
end
function mist.shape.segmentIntersect(segA, segB)
local dx1, dy1 = segA[2].x - segA[1].x, segA[2] - segA[1].y
local dx2, dy2 = segB[2].x - segB[1].x, segB[2] - segB[1].y
local dx3, dy3 = segA[1].x - segB[1].x, segA[1].y - segB[1].y
local d = dx1*dy2 - dy1*dx2
if d == 0 then
return false
end
local t1 = (dx2*dy3 - dy2*dx3)/d
if t1 < 0 or t1 > 1 then
return false
end
local t2 = (dx1*dy3 - dy1*dx3)/d
if t2 < 0 or t2 > 1 then
return false
end
-- point of intersection
return true, segA[1].x + t1*dx1, segA[1].y + t1*dy1
end
function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon. Code from http://softsurfer.com/Archive/algorithm_0103/algorithm_0103.htm function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon. Code from http://softsurfer.com/Archive/algorithm_0103/algorithm_0103.htm
--[[local type_tbl = { --[[local type_tbl = {
point = {'table'}, point = {'table'},
@ -2936,6 +3173,10 @@ function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon.
end end
end end
function mist.mapValue(val, inMin, inMax, outMin, outMax)
return (val - inMin) * (outMax - outMin) / (inMax - inMin) + outMin
end
function mist.getUnitsInPolygon(unit_names, polyZone, max_alt) function mist.getUnitsInPolygon(unit_names, polyZone, max_alt)
local units = {} local units = {}
@ -2989,7 +3230,6 @@ function mist.getUnitsInZones(unit_names, zone_names, zone_type)
end end
local in_zone_units = {} local in_zone_units = {}
for units_ind = 1, #units do for units_ind = 1, #units do
local lUnit = units[units_ind] local lUnit = units[units_ind]
local unit_pos = lUnit:getPosition().p local unit_pos = lUnit:getPosition().p
@ -4450,6 +4690,25 @@ do -- mist.util scope
return c*(9/5)+32 return c*(9/5)+32
end end
function mist.utils.hexToRGB(hex, l) -- because for some reason the draw tools use hex when everything is rgba 0 - 1
local int = 255
if l then
int = 1
end
if hex and type(hex) == 'string' then
local val = {}
hex = string.gsub(hex, '0x', '')
if string.len(hex) == 8 then
val[1] = tonumber("0x"..hex:sub(1,2)) / int
val[2] = tonumber("0x"..hex:sub(3,4)) / int
val[3] = tonumber("0x"..hex:sub(5,6)) / int
val[4] = tonumber("0x"..hex:sub(7,8)) / int
return val
end
end
end
function mist.utils.converter(t1, t2, val) function mist.utils.converter(t1, t2, val)
if type(t1) == 'string' then if type(t1) == 'string' then
t1 = string.lower(t1) t1 = string.lower(t1)
@ -6108,6 +6367,8 @@ do -- mist.msg scope
local caSlots = false local caSlots = false
local caMSGtoGroup = false local caMSGtoGroup = false
local anyUpdate = false
local lastMessageTime = nil
if env.mission.groundControl then -- just to be sure? if env.mission.groundControl then -- just to be sure?
for index, value in pairs(env.mission.groundControl) do for index, value in pairs(env.mission.groundControl) do
@ -6127,130 +6388,127 @@ do -- mist.msg scope
end end
end end
end end
--[[
local function mistdisplayV5() local function mistdisplayV5()
--thoughts to improve upon --log:warn("mistdisplayV5: $1", timer.getTime())
--event handler based activeClients table.
--display messages only when there is an update
--possibly co-routine it.
local activeClients = {}
for clientId, clientData in pairs(mist.DBs.humansById) do
if Unit.getByName(clientData.unitName) and Unit.getByName(clientData.unitName):isExist() == true then
activeClients[clientData.groupId] = clientData.groupName
end
end
--[f caSlots == true and caMSGtoGroup == true then
--end
local clearView = true
if #messageList > 0 then if #messageList > 0 then
if displayActive == false then --log:warn('Updates: $1', anyUpdate)
displayActive = true if anyUpdate == true then
end local activeClients = {}
--mist.debug.writeData(mist.utils.serialize,{'msg', messageList}, 'messageList.lua')
local msgTableText = {}
local msgTableSound = {}
for messageId, messageData in pairs(messageList) do for clientId, clientData in pairs(mist.DBs.humansById) do
if messageData.displayedFor > messageData.displayTime then if Unit.getByName(clientData.unitName) and Unit.getByName(clientData.unitName):isExist() == true then
messageData:remove() -- now using the remove/destroy function. activeClients[clientData.groupId] = clientData.groupName
else end
if messageData.displayedFor then end
messageData.displayedFor = messageData.displayedFor + messageDisplayRate anyUpdate = false
end if displayActive == false then
local nextSound = 1000 displayActive = true
local soundIndex = 0 end
--mist.debug.writeData(mist.utils.serialize,{'msg', messageList}, 'messageList.lua')
local msgTableText = {}
local msgTableSound = {}
if messageData.multSound and #messageData.multSound > 0 then for mInd, messageData in pairs(messageList) do
for index, sData in pairs(messageData.multSound) do if messageData.displayedFor > messageData.displayTime then
if sData.time <= messageData.displayedFor and sData.played == false and sData.time < nextSound then -- find index of the next sound to be played messageData:remove() -- now using the remove/destroy function.
nextSound = sData.time else
soundIndex = index if messageData.displayedFor then
end messageData.displayedFor = messageData.displayedFor + messageDisplayRate
end end
if soundIndex ~= 0 then local nextSound = 1000
messageData.multSound[soundIndex].played = true local soundIndex = 0
end
end
for recIndex, recData in pairs(messageData.msgFor) do -- iterate recipiants if messageData.multSound and #messageData.multSound > 0 then
if recData == 'RED' or recData == 'BLUE' or activeClients[recData] then -- rec exists for index, sData in pairs(messageData.multSound) do
if messageData.text and messageData.update then -- text if sData.time <= messageData.displayedFor and sData.played == false and sData.time < nextSound then -- find index of the next sound to be played
if not msgTableText[recData] then -- create table entry for text nextSound = sData.time
msgTableText[recData] = {} soundIndex = index
msgTableText[recData].text = {} end
if recData == 'RED' or recData == 'BLUE' then end
msgTableText[recData].text[1] = '-------Combined Arms Message-------- \n' if soundIndex ~= 0 then
end messageData.multSound[soundIndex].played = true
msgTableText[recData].text[#msgTableText[recData].text + 1] = messageData.text end
msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor end
else -- add to table entry and adjust display time if needed
if recData == 'RED' or recData == 'BLUE' then
msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- Combined Arms Message: \n'
else
msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- \n'
end
msgTableText[recData].text[#msgTableText[recData].text + 1] = messageData.text
if msgTableText[recData].displayTime < messageData.displayTime - messageData.displayedFor then
msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor
else
msgTableText[recData].displayTime = 1
end
end
end
if soundIndex ~= 0 then
msgTableSound[recData] = messageData.multSound[soundIndex].file
end
end
end for recIndex, recData in pairs(messageData.msgFor) do -- iterate recipiants
messageData.update = nil if recData == 'RED' or recData == 'BLUE' or activeClients[recData] then -- rec exists
if messageData.text then -- text
if not msgTableText[recData] then -- create table entry for text
msgTableText[recData] = {}
msgTableText[recData].text = {}
if recData == 'RED' or recData == 'BLUE' then
msgTableText[recData].text[1] = '-------Combined Arms Message-------- \n'
end
msgTableText[recData].text[#msgTableText[recData].text + 1] = messageData.text
msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor
else -- add to table entry and adjust display time if needed
if recData == 'RED' or recData == 'BLUE' then
msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- Combined Arms Message: \n'
else
msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- \n'
end
table.insert(msgTableText[recData].text, messageData.text)
if msgTableText[recData].displayTime < messageData.displayTime - messageData.displayedFor then
msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor
else
--msgTableText[recData].displayTime = 10
end
end
end
if soundIndex ~= 0 then
msgTableSound[recData] = messageData.multSound[soundIndex].file
end
end
end end
end messageData.update = nil
------- new display
if caSlots == true and caMSGtoGroup == false then end
if msgTableText.RED then
trigger.action.outTextForCoalition(coalition.side.RED, table.concat(msgTableText.RED.text), msgTableText.RED.displayTime, true)
end end
if msgTableText.BLUE then ------- new display
trigger.action.outTextForCoalition(coalition.side.BLUE, table.concat(msgTableText.BLUE.text), msgTableText.BLUE.displayTime, true)
end
end
for index, msgData in pairs(msgTableText) do if caSlots == true and caMSGtoGroup == false then
if type(index) == 'number' then -- its a groupNumber if msgTableText.RED then
trigger.action.outTextForGroup(index, table.concat(msgData.text), msgData.displayTime, true) trigger.action.outTextForCoalition(coalition.side.RED, table.concat(msgTableText.RED.text), msgTableText.RED.displayTime, clearView)
end
end end
--- new audio if msgTableText.BLUE then
if msgTableSound.RED then trigger.action.outTextForCoalition(coalition.side.BLUE, table.concat(msgTableText.BLUE.text), msgTableText.BLUE.displayTime, clearView)
trigger.action.outSoundForCoalition(coalition.side.RED, msgTableSound.RED) end
end end
if msgTableSound.BLUE then
trigger.action.outSoundForCoalition(coalition.side.BLUE, msgTableSound.BLUE) for index, msgData in pairs(msgTableText) do
end if type(index) == 'number' then -- its a groupNumber
trigger.action.outTextForGroup(index, table.concat(msgData.text), msgData.displayTime, clearView)
end
end
--- new audio
if msgTableSound.RED then
trigger.action.outSoundForCoalition(coalition.side.RED, msgTableSound.RED)
end
if msgTableSound.BLUE then
trigger.action.outSoundForCoalition(coalition.side.BLUE, msgTableSound.BLUE)
end
for index, file in pairs(msgTableSound) do for index, file in pairs(msgTableSound) do
if type(index) == 'number' then -- its a groupNumber if type(index) == 'number' then -- its a groupNumber
trigger.action.outSoundForGroup(index, file) trigger.action.outSoundForGroup(index, file)
end end
end end
end
else else
mist.removeFunction(displayFuncId) mist.removeFunction(displayFuncId)
displayActive = false displayActive = false
end end
end end
]]
local function mistdisplayV4() local function mistdisplayV4()
local activeClients = {} local activeClients = {}
@ -6416,7 +6674,7 @@ end]]
new.displayedFor = 0 -- how long the message has been displayed so far new.displayedFor = 0 -- how long the message has been displayed so far
new.name = vars.name -- ID to overwrite the older message (if it exists) Basically it replaces a message that is displayed with new text. new.name = vars.name -- ID to overwrite the older message (if it exists) Basically it replaces a message that is displayed with new text.
new.addedAt = timer.getTime() new.addedAt = timer.getTime()
new.update = true --log:warn('New Message: $1', new.text)
if vars.multSound and vars.multSound[1] then if vars.multSound and vars.multSound[1] then
new.multSound = vars.multSound new.multSound = vars.multSound
@ -6507,13 +6765,14 @@ end]]
messageList[i].text = new.text messageList[i].text = new.text
messageList[i].msgFor = new.msgFor messageList[i].msgFor = new.msgFor
messageList[i].multSound = new.multSound messageList[i].multSound = new.multSound
messageList[i].update = true anyUpdate = true
--log:warn('Message updated: $1', new.messageID)
return messageList[i].messageID return messageList[i].messageID
end end
end end
end end
end end
anyUpdate = true
messageID = messageID + 1 messageID = messageID + 1
new.messageID = messageID new.messageID = messageID
@ -6527,7 +6786,7 @@ end]]
if displayActive == false then if displayActive == false then
displayActive = true displayActive = true
displayFuncId = mist.scheduleFunction(mistdisplayV4, {}, timer.getTime() + messageDisplayRate, messageDisplayRate) displayFuncId = mist.scheduleFunction(mistdisplayV5, {}, timer.getTime() + messageDisplayRate, messageDisplayRate)
end end
return messageID return messageID
@ -6538,6 +6797,7 @@ end]]
for i, msgData in pairs(messageList) do for i, msgData in pairs(messageList) do
if messageList[i] == self then if messageList[i] == self then
table.remove(messageList, i) table.remove(messageList, i)
anyUpdate = true
return true --removal successful return true --removal successful
end end
end end
@ -6548,6 +6808,7 @@ end]]
for i, msgData in pairs(messageList) do for i, msgData in pairs(messageList) do
if messageList[i].messageID == id then if messageList[i].messageID == id then
table.remove(messageList, i) table.remove(messageList, i)
anyUpdate = true
return true --removal successful return true --removal successful
end end
end end
@ -6984,14 +7245,6 @@ do
local usedMarks = {} local usedMarks = {}
local typeBase = {
['Mi-8MT'] = {'Mi-8MTV2', 'Mi-8MTV', 'Mi-8'},
['MiG-21Bis'] = {'Mig-21'},
['MiG-15bis'] = {'Mig-15'},
['FW-190D9'] = {'FW-190'},
['Bf-109K-4'] = {'Bf-109'},
}
local mDefs = { local mDefs = {
coa = { coa = {
['red'] = {fillColor = {.8, 0 , 0, .5}, color = {.8, 0 , 0, .5}, lineType = 2, fontSize = 16}, ['red'] = {fillColor = {.8, 0 , 0, .5}, color = {.8, 0 , 0, .5}, lineType = 2, fontSize = 16},
@ -7012,7 +7265,7 @@ do
local altNames = {['poly'] = 7, ['lines'] = 1, ['polygon'] = 7 } local altNames = {['poly'] = 7, ['lines'] = 1, ['polygon'] = 7 }
local function draw(s) local function draw(s)
--log:warn(s) --log:warn(s)
if type(s) == 'table' then if type(s) == 'table' then
local mType = s.markType local mType = s.markType
if mType == 'panel' then if mType == 'panel' then
@ -7032,7 +7285,7 @@ do
elseif mType == 'arrow' then elseif mType == 'arrow' then
trigger.action.arrowToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message) trigger.action.arrowToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message)
elseif mType == 'text' then elseif mType == 'text' then
trigger.action.textToAll(s.coa, s.markId, s.pos[1], s.color, s.fillColor, fontSize, s.readOnly, s.text) trigger.action.textToAll(s.coa, s.markId, s.pos[1], s.color, s.fillColor, s.fontSize, s.readOnly, s.text)
elseif mType == 'quad' then elseif mType == 'quad' then
trigger.action.quadToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.pos[3], s.pos[4], s.color, s.fillColor, s.lineType, s.readOnly, s.message) trigger.action.quadToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.pos[3], s.pos[4], s.color, s.fillColor, s.lineType, s.readOnly, s.message)
end end
@ -7078,6 +7331,9 @@ do
val[i] = val[i]/255 -- convert RGB values from 0-255 to 0-1 equivilent. val[i] = val[i]/255 -- convert RGB values from 0-255 to 0-1 equivilent.
end end
end end
elseif type(val) == 'string' then
val = mist.utils.hexToRGB(val)
end end
return val return val
end end
@ -7136,12 +7392,14 @@ do
local removed = false local removed = false
if type(id) == 'table' then if type(id) == 'table' then
for ind, val in pairs(id) do for ind, val in pairs(id) do
trigger.action.removeMark(val) if type(val) == 'number' then
mist.DBs.markList[val] = nil trigger.action.removeMark(val)
removed = true mist.DBs.markList[val] = nil
removed = true
end
end end
else else
trigger.action.removeMark(id) trigger.action.removeMark(id)
mist.DBs.markList[id] = nil mist.DBs.markList[id] = nil
removed = true removed = true
end end
@ -7437,7 +7695,7 @@ do
if mType == 5 then -- text to all if mType == 5 then -- text to all
if not fontSize then if not fontSize then
fontSize = checkDefs('fondSize', coa) or 16 fontSize = checkDefs('fontSize', coa) or 16
end end
fCal[#fCal+1] = fontSize fCal[#fCal+1] = fontSize
else else
@ -7450,8 +7708,12 @@ do
readOnly = true readOnly = true
end end
fCal[#fCal+1] = readOnly fCal[#fCal+1] = readOnly
fCal[#fCal+1] = message if mType == 5 then
fCal[#fCal+1] = text
else
fCal[#fCal+1] = message
end
local data = {coa = coa, markId = usedId, pos = pos, markFor = markFor, color = color, readOnly = readOnly, message = message, fillColor = fillColor, lineType = lineType, markType = tNames[mType], name = name, radius = radius, text = text, fontSize = fontSize, time = timer.getTime()} local data = {coa = coa, markId = usedId, pos = pos, markFor = markFor, color = color, readOnly = readOnly, message = message, fillColor = fillColor, lineType = lineType, markType = tNames[mType], name = name, radius = radius, text = text, fontSize = fontSize, time = timer.getTime()}
mist.DBs.markList[usedId] = data mist.DBs.markList[usedId] = data
@ -7531,6 +7793,75 @@ do
end end
end end
function mist.marker.drawShape(name, v)
if mist.DBs.drawingByName[name] then
local d = v or {}
local o = mist.utils.deepCopy(mist.DBs.drawingByName[name])
mist.marker.add({point = {x = o.mapX, z = o.mapY}, text = name})
--log:warn(o)
d.points = o.points or {}
if o.primitiveType == "Polygon" then
d.mType = 7
if o.polygonMode == "rect" then
d.mType = 6
elseif o.polygonMode == "circle" then
d.mType = 2
d.points = {x = o.mapX, y = o.mapY}
d.radius = o.radius
end
elseif o.primitiveType == "TextBox" then
d.mType = 5
d.points = {x = o.mapX, y = o.mapY}
d.text = o.text or d.text
d.fontSize = d.fontSize or o.fontSize
end
-- NOTE TO SELF. FIGURE OUT WHICH SHAPES NEED TO BE OFFSET. OVAL YES.
if o.fillColorString and not d.fillColor then
d.fillColor = mist.utils.hexToRGB(o.fillColorString)
end
if o.colorString then
d.color = mist.utils.hexToRGB(o.colorString)
end
if o.thickness == 0 then
d.lineType = 0
elseif o.style == 'solid' then
d.lineType = 1
elseif o.style == 'dot' then
d.lineType = 2
elseif o.style == 'dash' then
d.lineType = 3
else
d.lineType = 1
end
if o.primitiveType == "Line" and #d.points >= 2 then
d.mType = 1
local rtn = {}
for i = 1, #d.points -1 do
local var = mist.utils.deepCopy(d)
var.points = {}
var.points[1] = d.points[i]
var.points[2] = d.points[i+1]
table.insert(rtn, mist.marker.add(var))
end
return rtn
else
if d.mType then
--log:warn(d)
return mist.marker.add(d)
end
end
end
end
--[[ --[[
function mist.marker.circle(v) function mist.marker.circle(v)
@ -8225,6 +8556,19 @@ do -- group tasks scope
return newCoord return newCoord
end end
function mist.getWindBearingAndVel(p)
local point = mist.utils.makeVec3(o)
local gLevel = land.getHeight({x = point.x, y = point.z})
if point.y <= gLevel then
point.y = gLevel + 10
end
local t = atmosphere.getWind(point)
local bearing = math.tan(t.z/t.x)
local vel = math.sqrt(t.x^2 + t.z^2)
return bearing, vel
end
function mist.groupToRandomPoint(vars) function mist.groupToRandomPoint(vars)
local group = vars.group --Required local group = vars.group --Required
local point = vars.point --required local point = vars.point --required

View File

@ -35,7 +35,7 @@ mist = {}
-- don't change these -- don't change these
mist.majorVersion = 4 mist.majorVersion = 4
mist.minorVersion = 5 mist.minorVersion = 5
mist.build = 104 mist.build = 106
-- forward declaration of log shorthand -- forward declaration of log shorthand
local log local log
@ -115,6 +115,17 @@ do -- the main scope
zone.properties[prop.key] = prop.value zone.properties[prop.key] = prop.value
end end
end end
end
if zone.verticies then -- trust but verify
local r = 0
for i = 1, #zone.verticies do
local dist = mist.utils.get2DDist(zone.point, zone.verticies[i])
if dist > r then
r = mist.utils.deepCopy(dist)
end
end
zone.radius = r
end end
mist.DBs.zonesByName[zone_data.name] = zone mist.DBs.zonesByName[zone_data.name] = zone
@ -124,6 +135,85 @@ do -- the main scope
end end
end end
mist.DBs.drawingByName = {}
mist.DBs.drawingIndexed = {}
if env.mission.drawings and env.mission.drawings.layers then
for i = 1, #env.mission.drawings.layers do
local l = env.mission.drawings.layers[i]
for j = 1, #l.objects do
local copy = mist.utils.deepCopy(l.objects[j])
--log:warn(copy)
local doOffset = false
copy.layer = l.name
local theta = copy.angle or 0
theta = math.rad(theta)
if copy.primitiveType == "Polygon" then
if copy.polygonMode == 'rect' then
local h, w = copy.height, copy.width
copy.points = {}
copy.points[1] = {x = h/2, y = w/2}
copy.points[2] = {x = -h/2, y = w/2}
copy.points[3] = {x = -h/2, y = -w/2}
copy.points[4] = {x = h/2, y = -w/2}
doOffset = true
elseif copy.polygonMode == "circle" then
copy.points = {x = copy.mapX, y = copy.mapY}
elseif copy.polygonMode == 'oval' then
-- oval bugs. Scale and rotation are off.
copy.points = {}
local numPoints = 24
local angleStep = (math.pi*2)/numPoints
doOffset = true
for v = 1, numPoints do
local pointAngle = v * angleStep
local x = copy.r1 * math.cos(pointAngle)
local y = copy.r2 * math.sin(pointAngle)
table.insert(copy.points,{x=x,y=y})
end
elseif copy.polygonMode == "arrow" then
doOffset = true
end
-- NOTE TO SELF. FIGURE OUT WHICH SHAPES NEED TO BE OFFSET. OVAL YES.
--log:warn('check offset')
if theta ~= 0 and copy.points and doOffset == true then
--log:warn('offsetting Values')
for p = 1, #copy.points do
local offset = mist.vec.rotateVec2(copy.points[p], theta)
copy.points[p] = offset
end
--log:warn(copy.points[1])
end
end
if copy.points and #copy.points > 1 then
for u = 1, #copy.points do
copy.points[u].x = copy.points[u].x + copy.mapX
copy.points[u].y = copy.points[u].y + copy.mapY
end
end
if mist.DBs.drawingByName[copy.name] then
log:warn("Drawing by the name of [ $1 ] already exists in DB. Failed to add to mist.DBs.drawingByName.", copy.name)
else
mist.DBs.drawingByName[copy.name] = copy
end
table.insert(mist.DBs.drawingIndexed, copy)
end
end
end
mist.DBs.navPoints = {} mist.DBs.navPoints = {}
mist.DBs.units = {} mist.DBs.units = {}
--Build mist.db.units and mist.DBs.navPoints --Build mist.db.units and mist.DBs.navPoints
@ -319,6 +409,11 @@ do -- the main scope
['Arco'] = 2, ['Arco'] = 2,
['Shell'] = 3, ['Shell'] = 3,
}, },
['TRANSPORT'] = {
['Heavy'] = 9,
['Trash'] = 10,
['Cargo'] = 11,
['Ascot'] = 12,
['JTAC'] = { ['JTAC'] = {
['Axeman'] = 1, ['Axeman'] = 1,
['Darknight'] = 2, ['Darknight'] = 2,
@ -360,14 +455,105 @@ do -- the main scope
['rules'] = { ['rules'] = {
['canUseAircraft'] = true, ['canUseAircraft'] = true,
['appliesTo'] = { ['appliesTo'] = {
'A-10C', 'A-10C_2',
'A-10C',
'A-10A', 'A-10A',
}, },
}, },
}, },
}, ['f16'] = {
}, Viper = 9,
} Venom = 10,
Lobo = 11,
Cowboy = 12,
Python = 13,
Rattler =14,
Panther = 15,
Wolf = 16,
Weasel = 17,
Wild = 18,
Ninja = 19,
Jedi = 20,
rules = {
['canUseAircraft'] = true,
['appliesTo'] = {
'F-16C_50',
'F-16C bl.52d',
'F-16C bl.50',
'F-16A MLU',
'F-16A',
},
},
},
['f18'] = {
['Hornet'] = 9,
['Squid'] = 10,
['Ragin'] = 11,
['Roman'] = 12,
Sting = 13,
Jury =14,
Jokey = 15,
Ram = 16,
Hawk = 17,
Devil = 18,
Check = 19,
Snake = 20,
['rules'] = {
['canUseAircraft'] = true,
['appliesTo'] = {
"FA-18C_hornet",
'F/A-18C',
},
},
},
['b1'] = {
['Bone'] = 9,
['Dark'] = 10,
['Vader'] = 11,
['rules'] = {
['canUseAircraft'] = true,
['appliesTo'] = {
'B-1B',
},
},
},
['b52'] = {
['Buff'] = 9,
['Dump'] = 10,
['Kenworth'] = 11,
['rules'] = {
['canUseAircraft'] = true,
['appliesTo'] = {
'B-52H',
},
},
},
['f15e'] = {
['Dude'] = 9,
['Thud'] = 10,
['Gunny'] = 11,
['Trek'] = 12,
Sniper = 13,
Sled =14,
Best = 15,
Jazz = 16,
Rage = 17,
Tahoe = 18,
['rules'] = {
['canUseAircraft'] = true,
['appliesTo'] = {
'F-15E',
--'F-15ERAZBAM',
},
},
},
},
},
},
}
mist.DBs.const.shapeNames = { mist.DBs.const.shapeNames = {
["Landmine"] = "landmine", ["Landmine"] = "landmine",
["FARP CP Blindage"] = "kp_ug", ["FARP CP Blindage"] = "kp_ug",
@ -555,7 +741,7 @@ do -- the main scope
mist.DBs.deadObjects = {} mist.DBs.deadObjects = {}
do do
local mt = {} local mt = {}
function mt.__newindex(t, key, val) function mt.__newindex(t, key, val)
@ -875,6 +1061,7 @@ do -- the main scope
--dbLog:info('iterate') --dbLog:info('iterate')
for name, gData in pairs(tempSpawnedGroups) do for name, gData in pairs(tempSpawnedGroups) do
--env.info(name) --env.info(name)
--dbLog:info(gData)
local updated = false local updated = false
local stillExists = false local stillExists = false
if not gData.checked then if not gData.checked then
@ -882,9 +1069,9 @@ do -- the main scope
local _g = gData.gp or Group.getByName(name) local _g = gData.gp or Group.getByName(name)
if mist.DBs.groupsByName[name] then if mist.DBs.groupsByName[name] then
-- first check group level properties, groupId, countryId, coalition -- first check group level properties, groupId, countryId, coalition
-- dbLog:info('Found in DBs, check if updated') --dbLog:info('Found in DBs, check if updated')
local dbTable = mist.DBs.groupsByName[name] local dbTable = mist.DBs.groupsByName[name]
-- dbLog:info(dbTable) --dbLog:info(dbTable)
if gData.type ~= 'static' then if gData.type ~= 'static' then
-- dbLog:info('Not static') -- dbLog:info('Not static')
@ -905,11 +1092,11 @@ do -- the main scope
end end
--dbLog:info('Updated: $1', updated) --dbLog:info('Updated: $1', updated)
if updated == false and gData.type ~= 'static' then -- time to check units if updated == false and gData.type ~= 'static' then -- time to check units
--dbLog:info('No Group Mismatch, Check Units') --dbLog:info('No Group Mismatch, Check Units')
if _g and _g:isExist() == true then if _g and _g:isExist() == true then
stillExists = true stillExists = true
for index, uObject in pairs(_g:getUnits()) do for index, uObject in pairs(_g:getUnits()) do
--dbLog:info(index) --dbLog:info(index)
if mist.DBs.unitsByName[uObject:getName()] then if mist.DBs.unitsByName[uObject:getName()] then
--dbLog:info('UnitByName table exists') --dbLog:info('UnitByName table exists')
local uTable = mist.DBs.unitsByName[uObject:getName()] local uTable = mist.DBs.unitsByName[uObject:getName()]
@ -931,7 +1118,6 @@ do -- the main scope
if dbData and type(dbData) == 'table' then if dbData and type(dbData) == 'table' then
writeGroups[#writeGroups+1] = {data = dbData, isUpdated = updated} writeGroups[#writeGroups+1] = {data = dbData, isUpdated = updated}
end end
end end
-- Work done, so remove -- Work done, so remove
end end
@ -1058,19 +1244,20 @@ do -- the main scope
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
--dbLog:info('unitSpawnEvent') --log:info('unitSpawnEvent')
--log:info(event)
--log:info(event.initiator:getTypeName())
--table.insert(tempSpawnedUnits,(event.initiator)) --table.insert(tempSpawnedUnits,(event.initiator))
------- -------
-- New functionality below. -- 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 if Object.getCategory(event.initiator) == 1 and not Unit.getPlayerName(event.initiator) then -- simple player check, will need to later check to see if unit was spawned with a player in a flight
--dbLog:info('Object is a Unit') --log:info('Object is a Unit')
if Unit.getGroup(event.initiator) then if Unit.getGroup(event.initiator) then
--dbLog:info(Unit.getGroup(event.initiator):getName()) -- log:info(Unit.getGroup(event.initiator):getName())
local g = Unit.getGroup(event.initiator) local g = Unit.getGroup(event.initiator)
if not tempSpawnedGroups[g:getName()] then if not tempSpawnedGroups[g:getName()] then
--dbLog:info('added') --log:info('added')
tempSpawnedGroups[g:getName()] = {type = 'group', gp = g} tempSpawnedGroups[g:getName()] = {type = 'group', gp = g}
tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
end end
@ -1078,7 +1265,7 @@ do -- the main scope
log:error('Group not accessible by unit in event handler. This is a DCS bug') log:error('Group not accessible by unit in event handler. This is a DCS bug')
end end
elseif Object.getCategory(event.initiator) == 3 or Object.getCategory(event.initiator) == 6 then elseif Object.getCategory(event.initiator) == 3 or Object.getCategory(event.initiator) == 6 then
--dbLog:info('Object is Static') --log:info('Object is Static')
tempSpawnedGroups[StaticObject.getName(event.initiator)] = {type = 'static'} tempSpawnedGroups[StaticObject.getName(event.initiator)] = {type = 'static'}
tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
end end
@ -1236,8 +1423,8 @@ do -- the main scope
tempSpawnedGroups[s:getName()] = {type = 'static'} tempSpawnedGroups[s:getName()] = {type = 'static'}
tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1 tempSpawnGroupsCounter = tempSpawnGroupsCounter + 1
end end
end end
end end
end end
end end
@ -1519,7 +1706,11 @@ 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(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName]) --if newGroup.baseName then
-- idea of later. So custmozed naming can be created
-- else
newGroup.name = tostring(newCountry .. tostring(typeName) .. mistDynAddIndex[typeName])
--end
end end
if not newGroup.hidden then if not newGroup.hidden then
@ -1604,11 +1795,11 @@ do -- the main scope
end end
end end
else -- if aircraft and no route assigned. make a quick and stupid route so AI doesnt RTB immediately else -- if aircraft and no route assigned. make a quick and stupid route so AI doesnt RTB immediately
if newCat == 'AIRPLANE' or newCat == 'HELICOPTER' then --if newCat == 'AIRPLANE' or newCat == 'HELICOPTER' then
newGroup.route = {} newGroup.route = {}
newGroup.route.points = {} newGroup.route.points = {}
newGroup.route.points[1] = {} newGroup.route.points[1] = {}
end --end
end end
newGroup.country = newCountry newGroup.country = newCountry
@ -1629,7 +1820,7 @@ do -- the main scope
end end
end end
--mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroup.lua') --mist.debug.writeData(mist.utils.serialize,{'msg', newGroup}, 'newGroupPushedToAddGroup.lua')
--log:warn(newGroup) --log:warn(newGroup)
-- sanitize table -- sanitize table
newGroup.groupName = nil newGroup.groupName = nil
@ -2898,6 +3089,52 @@ function mist.shape.polyInCircle(poly, circle, full)
return false return false
end end
function mist.shape.getPointOnSegment(point, seg, isSeg)
local p = mist.utils.makeVec2(point)
local s1 = mist.utils.makeVec2(seg[1])
local s2 = mist.utils.makeVec2(seg[2])
local cx, cy = p.x - s1.x, p.y - s1.y
local dx, dy = s2.x - s1.x, s2.x - s1.y
local d = (dx*dx + dy*dy)
if d == 0 then
return {x = s1.x, y = s1.y}
end
local u = (cx*dx + cy*dy)/d
if isSeg then
if u < 0 then
u = 0
elseif u > 1 then
u = 1
end
end
return {x = s1.x + u*dx, y = s1.y + u*dy}
end
function mist.shape.segmentIntersect(segA, segB)
local dx1, dy1 = segA[2].x - segA[1].x, segA[2] - segA[1].y
local dx2, dy2 = segB[2].x - segB[1].x, segB[2] - segB[1].y
local dx3, dy3 = segA[1].x - segB[1].x, segA[1].y - segB[1].y
local d = dx1*dy2 - dy1*dx2
if d == 0 then
return false
end
local t1 = (dx2*dy3 - dy2*dx3)/d
if t1 < 0 or t1 > 1 then
return false
end
local t2 = (dx1*dy3 - dy1*dx3)/d
if t2 < 0 or t2 > 1 then
return false
end
-- point of intersection
return true, segA[1].x + t1*dx1, segA[1].y + t1*dy1
end
function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon. Code from http://softsurfer.com/Archive/algorithm_0103/algorithm_0103.htm function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon. Code from http://softsurfer.com/Archive/algorithm_0103/algorithm_0103.htm
--[[local type_tbl = { --[[local type_tbl = {
point = {'table'}, point = {'table'},
@ -2936,6 +3173,10 @@ function mist.pointInPolygon(point, poly, maxalt) --raycasting point in polygon.
end end
end end
function mist.mapValue(val, inMin, inMax, outMin, outMax)
return (val - inMin) * (outMax - outMin) / (inMax - inMin) + outMin
end
function mist.getUnitsInPolygon(unit_names, polyZone, max_alt) function mist.getUnitsInPolygon(unit_names, polyZone, max_alt)
local units = {} local units = {}
@ -2989,7 +3230,6 @@ function mist.getUnitsInZones(unit_names, zone_names, zone_type)
end end
local in_zone_units = {} local in_zone_units = {}
for units_ind = 1, #units do for units_ind = 1, #units do
local lUnit = units[units_ind] local lUnit = units[units_ind]
local unit_pos = lUnit:getPosition().p local unit_pos = lUnit:getPosition().p
@ -4450,6 +4690,25 @@ do -- mist.util scope
return c*(9/5)+32 return c*(9/5)+32
end end
function mist.utils.hexToRGB(hex, l) -- because for some reason the draw tools use hex when everything is rgba 0 - 1
local int = 255
if l then
int = 1
end
if hex and type(hex) == 'string' then
local val = {}
hex = string.gsub(hex, '0x', '')
if string.len(hex) == 8 then
val[1] = tonumber("0x"..hex:sub(1,2)) / int
val[2] = tonumber("0x"..hex:sub(3,4)) / int
val[3] = tonumber("0x"..hex:sub(5,6)) / int
val[4] = tonumber("0x"..hex:sub(7,8)) / int
return val
end
end
end
function mist.utils.converter(t1, t2, val) function mist.utils.converter(t1, t2, val)
if type(t1) == 'string' then if type(t1) == 'string' then
t1 = string.lower(t1) t1 = string.lower(t1)
@ -6108,6 +6367,8 @@ do -- mist.msg scope
local caSlots = false local caSlots = false
local caMSGtoGroup = false local caMSGtoGroup = false
local anyUpdate = false
local lastMessageTime = nil
if env.mission.groundControl then -- just to be sure? if env.mission.groundControl then -- just to be sure?
for index, value in pairs(env.mission.groundControl) do for index, value in pairs(env.mission.groundControl) do
@ -6127,130 +6388,127 @@ do -- mist.msg scope
end end
end end
end end
--[[
local function mistdisplayV5() local function mistdisplayV5()
--thoughts to improve upon --log:warn("mistdisplayV5: $1", timer.getTime())
--event handler based activeClients table.
--display messages only when there is an update
--possibly co-routine it.
local activeClients = {}
for clientId, clientData in pairs(mist.DBs.humansById) do
if Unit.getByName(clientData.unitName) and Unit.getByName(clientData.unitName):isExist() == true then
activeClients[clientData.groupId] = clientData.groupName
end
end
--[f caSlots == true and caMSGtoGroup == true then
--end
local clearView = true
if #messageList > 0 then if #messageList > 0 then
if displayActive == false then --log:warn('Updates: $1', anyUpdate)
displayActive = true if anyUpdate == true then
end local activeClients = {}
--mist.debug.writeData(mist.utils.serialize,{'msg', messageList}, 'messageList.lua')
local msgTableText = {}
local msgTableSound = {}
for messageId, messageData in pairs(messageList) do for clientId, clientData in pairs(mist.DBs.humansById) do
if messageData.displayedFor > messageData.displayTime then if Unit.getByName(clientData.unitName) and Unit.getByName(clientData.unitName):isExist() == true then
messageData:remove() -- now using the remove/destroy function. activeClients[clientData.groupId] = clientData.groupName
else end
if messageData.displayedFor then end
messageData.displayedFor = messageData.displayedFor + messageDisplayRate anyUpdate = false
end if displayActive == false then
local nextSound = 1000 displayActive = true
local soundIndex = 0 end
--mist.debug.writeData(mist.utils.serialize,{'msg', messageList}, 'messageList.lua')
local msgTableText = {}
local msgTableSound = {}
if messageData.multSound and #messageData.multSound > 0 then for mInd, messageData in pairs(messageList) do
for index, sData in pairs(messageData.multSound) do if messageData.displayedFor > messageData.displayTime then
if sData.time <= messageData.displayedFor and sData.played == false and sData.time < nextSound then -- find index of the next sound to be played messageData:remove() -- now using the remove/destroy function.
nextSound = sData.time else
soundIndex = index if messageData.displayedFor then
end messageData.displayedFor = messageData.displayedFor + messageDisplayRate
end end
if soundIndex ~= 0 then local nextSound = 1000
messageData.multSound[soundIndex].played = true local soundIndex = 0
end
end
for recIndex, recData in pairs(messageData.msgFor) do -- iterate recipiants if messageData.multSound and #messageData.multSound > 0 then
if recData == 'RED' or recData == 'BLUE' or activeClients[recData] then -- rec exists for index, sData in pairs(messageData.multSound) do
if messageData.text and messageData.update then -- text if sData.time <= messageData.displayedFor and sData.played == false and sData.time < nextSound then -- find index of the next sound to be played
if not msgTableText[recData] then -- create table entry for text nextSound = sData.time
msgTableText[recData] = {} soundIndex = index
msgTableText[recData].text = {} end
if recData == 'RED' or recData == 'BLUE' then end
msgTableText[recData].text[1] = '-------Combined Arms Message-------- \n' if soundIndex ~= 0 then
end messageData.multSound[soundIndex].played = true
msgTableText[recData].text[#msgTableText[recData].text + 1] = messageData.text end
msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor end
else -- add to table entry and adjust display time if needed
if recData == 'RED' or recData == 'BLUE' then
msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- Combined Arms Message: \n'
else
msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- \n'
end
msgTableText[recData].text[#msgTableText[recData].text + 1] = messageData.text
if msgTableText[recData].displayTime < messageData.displayTime - messageData.displayedFor then
msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor
else
msgTableText[recData].displayTime = 1
end
end
end
if soundIndex ~= 0 then
msgTableSound[recData] = messageData.multSound[soundIndex].file
end
end
end for recIndex, recData in pairs(messageData.msgFor) do -- iterate recipiants
messageData.update = nil if recData == 'RED' or recData == 'BLUE' or activeClients[recData] then -- rec exists
if messageData.text then -- text
if not msgTableText[recData] then -- create table entry for text
msgTableText[recData] = {}
msgTableText[recData].text = {}
if recData == 'RED' or recData == 'BLUE' then
msgTableText[recData].text[1] = '-------Combined Arms Message-------- \n'
end
msgTableText[recData].text[#msgTableText[recData].text + 1] = messageData.text
msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor
else -- add to table entry and adjust display time if needed
if recData == 'RED' or recData == 'BLUE' then
msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- Combined Arms Message: \n'
else
msgTableText[recData].text[#msgTableText[recData].text + 1] = '\n ---------------- \n'
end
table.insert(msgTableText[recData].text, messageData.text)
if msgTableText[recData].displayTime < messageData.displayTime - messageData.displayedFor then
msgTableText[recData].displayTime = messageData.displayTime - messageData.displayedFor
else
--msgTableText[recData].displayTime = 10
end
end
end
if soundIndex ~= 0 then
msgTableSound[recData] = messageData.multSound[soundIndex].file
end
end
end end
end messageData.update = nil
------- new display
if caSlots == true and caMSGtoGroup == false then end
if msgTableText.RED then
trigger.action.outTextForCoalition(coalition.side.RED, table.concat(msgTableText.RED.text), msgTableText.RED.displayTime, true)
end end
if msgTableText.BLUE then ------- new display
trigger.action.outTextForCoalition(coalition.side.BLUE, table.concat(msgTableText.BLUE.text), msgTableText.BLUE.displayTime, true)
end
end
for index, msgData in pairs(msgTableText) do if caSlots == true and caMSGtoGroup == false then
if type(index) == 'number' then -- its a groupNumber if msgTableText.RED then
trigger.action.outTextForGroup(index, table.concat(msgData.text), msgData.displayTime, true) trigger.action.outTextForCoalition(coalition.side.RED, table.concat(msgTableText.RED.text), msgTableText.RED.displayTime, clearView)
end
end end
--- new audio if msgTableText.BLUE then
if msgTableSound.RED then trigger.action.outTextForCoalition(coalition.side.BLUE, table.concat(msgTableText.BLUE.text), msgTableText.BLUE.displayTime, clearView)
trigger.action.outSoundForCoalition(coalition.side.RED, msgTableSound.RED) end
end end
if msgTableSound.BLUE then
trigger.action.outSoundForCoalition(coalition.side.BLUE, msgTableSound.BLUE) for index, msgData in pairs(msgTableText) do
end if type(index) == 'number' then -- its a groupNumber
trigger.action.outTextForGroup(index, table.concat(msgData.text), msgData.displayTime, clearView)
end
end
--- new audio
if msgTableSound.RED then
trigger.action.outSoundForCoalition(coalition.side.RED, msgTableSound.RED)
end
if msgTableSound.BLUE then
trigger.action.outSoundForCoalition(coalition.side.BLUE, msgTableSound.BLUE)
end
for index, file in pairs(msgTableSound) do for index, file in pairs(msgTableSound) do
if type(index) == 'number' then -- its a groupNumber if type(index) == 'number' then -- its a groupNumber
trigger.action.outSoundForGroup(index, file) trigger.action.outSoundForGroup(index, file)
end end
end end
end
else else
mist.removeFunction(displayFuncId) mist.removeFunction(displayFuncId)
displayActive = false displayActive = false
end end
end end
]]
local function mistdisplayV4() local function mistdisplayV4()
local activeClients = {} local activeClients = {}
@ -6416,7 +6674,7 @@ end]]
new.displayedFor = 0 -- how long the message has been displayed so far new.displayedFor = 0 -- how long the message has been displayed so far
new.name = vars.name -- ID to overwrite the older message (if it exists) Basically it replaces a message that is displayed with new text. new.name = vars.name -- ID to overwrite the older message (if it exists) Basically it replaces a message that is displayed with new text.
new.addedAt = timer.getTime() new.addedAt = timer.getTime()
new.update = true --log:warn('New Message: $1', new.text)
if vars.multSound and vars.multSound[1] then if vars.multSound and vars.multSound[1] then
new.multSound = vars.multSound new.multSound = vars.multSound
@ -6507,13 +6765,14 @@ end]]
messageList[i].text = new.text messageList[i].text = new.text
messageList[i].msgFor = new.msgFor messageList[i].msgFor = new.msgFor
messageList[i].multSound = new.multSound messageList[i].multSound = new.multSound
messageList[i].update = true anyUpdate = true
--log:warn('Message updated: $1', new.messageID)
return messageList[i].messageID return messageList[i].messageID
end end
end end
end end
end end
anyUpdate = true
messageID = messageID + 1 messageID = messageID + 1
new.messageID = messageID new.messageID = messageID
@ -6527,7 +6786,7 @@ end]]
if displayActive == false then if displayActive == false then
displayActive = true displayActive = true
displayFuncId = mist.scheduleFunction(mistdisplayV4, {}, timer.getTime() + messageDisplayRate, messageDisplayRate) displayFuncId = mist.scheduleFunction(mistdisplayV5, {}, timer.getTime() + messageDisplayRate, messageDisplayRate)
end end
return messageID return messageID
@ -6538,6 +6797,7 @@ end]]
for i, msgData in pairs(messageList) do for i, msgData in pairs(messageList) do
if messageList[i] == self then if messageList[i] == self then
table.remove(messageList, i) table.remove(messageList, i)
anyUpdate = true
return true --removal successful return true --removal successful
end end
end end
@ -6548,6 +6808,7 @@ end]]
for i, msgData in pairs(messageList) do for i, msgData in pairs(messageList) do
if messageList[i].messageID == id then if messageList[i].messageID == id then
table.remove(messageList, i) table.remove(messageList, i)
anyUpdate = true
return true --removal successful return true --removal successful
end end
end end
@ -6984,14 +7245,6 @@ do
local usedMarks = {} local usedMarks = {}
local typeBase = {
['Mi-8MT'] = {'Mi-8MTV2', 'Mi-8MTV', 'Mi-8'},
['MiG-21Bis'] = {'Mig-21'},
['MiG-15bis'] = {'Mig-15'},
['FW-190D9'] = {'FW-190'},
['Bf-109K-4'] = {'Bf-109'},
}
local mDefs = { local mDefs = {
coa = { coa = {
['red'] = {fillColor = {.8, 0 , 0, .5}, color = {.8, 0 , 0, .5}, lineType = 2, fontSize = 16}, ['red'] = {fillColor = {.8, 0 , 0, .5}, color = {.8, 0 , 0, .5}, lineType = 2, fontSize = 16},
@ -7012,7 +7265,7 @@ do
local altNames = {['poly'] = 7, ['lines'] = 1, ['polygon'] = 7 } local altNames = {['poly'] = 7, ['lines'] = 1, ['polygon'] = 7 }
local function draw(s) local function draw(s)
--log:warn(s) --log:warn(s)
if type(s) == 'table' then if type(s) == 'table' then
local mType = s.markType local mType = s.markType
if mType == 'panel' then if mType == 'panel' then
@ -7032,7 +7285,7 @@ do
elseif mType == 'arrow' then elseif mType == 'arrow' then
trigger.action.arrowToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message) trigger.action.arrowToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.color, s.fillColor, s.lineType, s.readOnly, s.message)
elseif mType == 'text' then elseif mType == 'text' then
trigger.action.textToAll(s.coa, s.markId, s.pos[1], s.color, s.fillColor, fontSize, s.readOnly, s.text) trigger.action.textToAll(s.coa, s.markId, s.pos[1], s.color, s.fillColor, s.fontSize, s.readOnly, s.text)
elseif mType == 'quad' then elseif mType == 'quad' then
trigger.action.quadToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.pos[3], s.pos[4], s.color, s.fillColor, s.lineType, s.readOnly, s.message) trigger.action.quadToAll(s.coa, s.markId, s.pos[1], s.pos[2], s.pos[3], s.pos[4], s.color, s.fillColor, s.lineType, s.readOnly, s.message)
end end
@ -7078,6 +7331,9 @@ do
val[i] = val[i]/255 -- convert RGB values from 0-255 to 0-1 equivilent. val[i] = val[i]/255 -- convert RGB values from 0-255 to 0-1 equivilent.
end end
end end
elseif type(val) == 'string' then
val = mist.utils.hexToRGB(val)
end end
return val return val
end end
@ -7136,12 +7392,14 @@ do
local removed = false local removed = false
if type(id) == 'table' then if type(id) == 'table' then
for ind, val in pairs(id) do for ind, val in pairs(id) do
trigger.action.removeMark(val) if type(val) == 'number' then
mist.DBs.markList[val] = nil trigger.action.removeMark(val)
removed = true mist.DBs.markList[val] = nil
removed = true
end
end end
else else
trigger.action.removeMark(id) trigger.action.removeMark(id)
mist.DBs.markList[id] = nil mist.DBs.markList[id] = nil
removed = true removed = true
end end
@ -7437,7 +7695,7 @@ do
if mType == 5 then -- text to all if mType == 5 then -- text to all
if not fontSize then if not fontSize then
fontSize = checkDefs('fondSize', coa) or 16 fontSize = checkDefs('fontSize', coa) or 16
end end
fCal[#fCal+1] = fontSize fCal[#fCal+1] = fontSize
else else
@ -7450,8 +7708,12 @@ do
readOnly = true readOnly = true
end end
fCal[#fCal+1] = readOnly fCal[#fCal+1] = readOnly
fCal[#fCal+1] = message if mType == 5 then
fCal[#fCal+1] = text
else
fCal[#fCal+1] = message
end
local data = {coa = coa, markId = usedId, pos = pos, markFor = markFor, color = color, readOnly = readOnly, message = message, fillColor = fillColor, lineType = lineType, markType = tNames[mType], name = name, radius = radius, text = text, fontSize = fontSize, time = timer.getTime()} local data = {coa = coa, markId = usedId, pos = pos, markFor = markFor, color = color, readOnly = readOnly, message = message, fillColor = fillColor, lineType = lineType, markType = tNames[mType], name = name, radius = radius, text = text, fontSize = fontSize, time = timer.getTime()}
mist.DBs.markList[usedId] = data mist.DBs.markList[usedId] = data
@ -7531,6 +7793,75 @@ do
end end
end end
function mist.marker.drawShape(name, v)
if mist.DBs.drawingByName[name] then
local d = v or {}
local o = mist.utils.deepCopy(mist.DBs.drawingByName[name])
mist.marker.add({point = {x = o.mapX, z = o.mapY}, text = name})
--log:warn(o)
d.points = o.points or {}
if o.primitiveType == "Polygon" then
d.mType = 7
if o.polygonMode == "rect" then
d.mType = 6
elseif o.polygonMode == "circle" then
d.mType = 2
d.points = {x = o.mapX, y = o.mapY}
d.radius = o.radius
end
elseif o.primitiveType == "TextBox" then
d.mType = 5
d.points = {x = o.mapX, y = o.mapY}
d.text = o.text or d.text
d.fontSize = d.fontSize or o.fontSize
end
-- NOTE TO SELF. FIGURE OUT WHICH SHAPES NEED TO BE OFFSET. OVAL YES.
if o.fillColorString and not d.fillColor then
d.fillColor = mist.utils.hexToRGB(o.fillColorString)
end
if o.colorString then
d.color = mist.utils.hexToRGB(o.colorString)
end
if o.thickness == 0 then
d.lineType = 0
elseif o.style == 'solid' then
d.lineType = 1
elseif o.style == 'dot' then
d.lineType = 2
elseif o.style == 'dash' then
d.lineType = 3
else
d.lineType = 1
end
if o.primitiveType == "Line" and #d.points >= 2 then
d.mType = 1
local rtn = {}
for i = 1, #d.points -1 do
local var = mist.utils.deepCopy(d)
var.points = {}
var.points[1] = d.points[i]
var.points[2] = d.points[i+1]
table.insert(rtn, mist.marker.add(var))
end
return rtn
else
if d.mType then
--log:warn(d)
return mist.marker.add(d)
end
end
end
end
--[[ --[[
function mist.marker.circle(v) function mist.marker.circle(v)
@ -8225,6 +8556,19 @@ do -- group tasks scope
return newCoord return newCoord
end end
function mist.getWindBearingAndVel(p)
local point = mist.utils.makeVec3(o)
local gLevel = land.getHeight({x = point.x, y = point.z})
if point.y <= gLevel then
point.y = gLevel + 10
end
local t = atmosphere.getWind(point)
local bearing = math.tan(t.z/t.x)
local vel = math.sqrt(t.x^2 + t.z^2)
return bearing, vel
end
function mist.groupToRandomPoint(vars) function mist.groupToRandomPoint(vars)
local group = vars.group --Required local group = vars.group --Required
local point = vars.point --required local point = vars.point --required