mirror of
https://github.com/psforever/PSF-LoginServer.git
synced 2026-01-20 02:54:46 +00:00
Merge branch 'master' into exp-for-kda-3
This commit is contained in:
commit
f7d8e79dd8
|
|
@ -9123,7 +9123,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 723,
|
||||
"MapID": 200015,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 307,
|
||||
|
|
@ -9136,7 +9136,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 724,
|
||||
"MapID": 200016,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 315,
|
||||
|
|
@ -9149,7 +9149,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 725,
|
||||
"MapID": 200024,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 422,
|
||||
|
|
@ -9162,7 +9162,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 726,
|
||||
"MapID": 200066,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 312,
|
||||
|
|
@ -9175,7 +9175,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 727,
|
||||
"MapID": 200021,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 317,
|
||||
|
|
@ -9188,7 +9188,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 728,
|
||||
"MapID": 200026,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 363,
|
||||
|
|
@ -9201,7 +9201,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 729,
|
||||
"MapID": 200062,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 324,
|
||||
|
|
@ -9214,7 +9214,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 730,
|
||||
"MapID": 200033,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 335,
|
||||
|
|
@ -9227,7 +9227,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 731,
|
||||
"MapID": 200044,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 338,
|
||||
|
|
@ -9240,7 +9240,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 732,
|
||||
"MapID": 200047,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 333,
|
||||
|
|
@ -9253,7 +9253,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 733,
|
||||
"MapID": 200042,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 345,
|
||||
|
|
@ -9266,7 +9266,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 734,
|
||||
"MapID": 200054,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 332,
|
||||
|
|
@ -9279,7 +9279,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 735,
|
||||
"MapID": 200041,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 424,
|
||||
|
|
@ -9292,7 +9292,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 736,
|
||||
"MapID": 200068,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 329,
|
||||
|
|
@ -9305,7 +9305,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 737,
|
||||
"MapID": 200038,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 350,
|
||||
|
|
@ -9318,7 +9318,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 738,
|
||||
"MapID": 200059,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 343,
|
||||
|
|
@ -9331,7 +9331,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 739,
|
||||
"MapID": 200052,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 311,
|
||||
|
|
@ -9344,7 +9344,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 740,
|
||||
"MapID": 200020,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 321,
|
||||
|
|
@ -9357,7 +9357,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 741,
|
||||
"MapID": 200030,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 325,
|
||||
|
|
@ -9370,7 +9370,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 742,
|
||||
"MapID": 200034,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 322,
|
||||
|
|
@ -9383,7 +9383,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 743,
|
||||
"MapID": 200031,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 328,
|
||||
|
|
@ -9396,7 +9396,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 744,
|
||||
"MapID": 200037,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 340,
|
||||
|
|
@ -9409,7 +9409,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 745,
|
||||
"MapID": 200049,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 346,
|
||||
|
|
@ -9422,7 +9422,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 746,
|
||||
"MapID": 200055,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 309,
|
||||
|
|
@ -9435,7 +9435,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 747,
|
||||
"MapID": 200018,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 319,
|
||||
|
|
@ -9448,7 +9448,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 748,
|
||||
"MapID": 200028,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 323,
|
||||
|
|
@ -9461,7 +9461,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 749,
|
||||
"MapID": 200032,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 337,
|
||||
|
|
@ -9474,7 +9474,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 750,
|
||||
"MapID": 200046,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 344,
|
||||
|
|
@ -9487,7 +9487,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 751,
|
||||
"MapID": 200053,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 318,
|
||||
|
|
@ -9500,7 +9500,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 752,
|
||||
"MapID": 200027,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 308,
|
||||
|
|
@ -9513,7 +9513,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 753,
|
||||
"MapID": 200017,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 316,
|
||||
|
|
@ -9526,7 +9526,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 754,
|
||||
"MapID": 200025,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 359,
|
||||
|
|
@ -9539,7 +9539,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 755,
|
||||
"MapID": 200061,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 326,
|
||||
|
|
@ -9552,7 +9552,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 756,
|
||||
"MapID": 200035,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 331,
|
||||
|
|
@ -9565,7 +9565,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 757,
|
||||
"MapID": 200040,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 341,
|
||||
|
|
@ -9578,7 +9578,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 758,
|
||||
"MapID": 200050,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 348,
|
||||
|
|
@ -9591,7 +9591,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 759,
|
||||
"MapID": 200057,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 310,
|
||||
|
|
@ -9604,7 +9604,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 760,
|
||||
"MapID": 200019,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 423,
|
||||
|
|
@ -9617,7 +9617,7 @@
|
|||
"Yaw": 79.0,
|
||||
"GUID": 761,
|
||||
"MapID": 200067,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 313,
|
||||
|
|
@ -9630,7 +9630,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 762,
|
||||
"MapID": 200022,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 320,
|
||||
|
|
@ -9643,7 +9643,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 763,
|
||||
"MapID": 200029,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 364,
|
||||
|
|
@ -9656,7 +9656,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 764,
|
||||
"MapID": 200063,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 336,
|
||||
|
|
@ -9669,7 +9669,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 765,
|
||||
"MapID": 200045,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 334,
|
||||
|
|
@ -9682,7 +9682,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 766,
|
||||
"MapID": 200043,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 425,
|
||||
|
|
@ -9695,7 +9695,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 767,
|
||||
"MapID": 200069,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 349,
|
||||
|
|
@ -9708,7 +9708,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 768,
|
||||
"MapID": 200058,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 342,
|
||||
|
|
@ -9721,7 +9721,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 769,
|
||||
"MapID": 200051,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 305,
|
||||
|
|
@ -9734,7 +9734,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 770,
|
||||
"MapID": 200014,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 314,
|
||||
|
|
@ -9747,7 +9747,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 771,
|
||||
"MapID": 200023,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 358,
|
||||
|
|
@ -9760,7 +9760,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 772,
|
||||
"MapID": 200060,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 327,
|
||||
|
|
@ -9773,7 +9773,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 773,
|
||||
"MapID": 200036,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 339,
|
||||
|
|
@ -9786,7 +9786,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 774,
|
||||
"MapID": 200048,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 330,
|
||||
|
|
@ -9799,7 +9799,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 775,
|
||||
"MapID": 200039,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 347,
|
||||
|
|
@ -9812,7 +9812,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 776,
|
||||
"MapID": 200056,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 417,
|
||||
|
|
@ -10598,7 +10598,7 @@
|
|||
"Id": 291,
|
||||
"ObjectName": "vanu_equipment_term_200000",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 788.95,
|
||||
"AbsY": 883.67,
|
||||
"AbsZ": 109.24,
|
||||
|
|
@ -10611,7 +10611,7 @@
|
|||
"Id": 292,
|
||||
"ObjectName": "vanu_equipment_term_200001",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 797.79,
|
||||
"AbsY": 881.34,
|
||||
"AbsZ": 109.24,
|
||||
|
|
@ -10650,7 +10650,7 @@
|
|||
"Id": 293,
|
||||
"ObjectName": "vanu_equipment_term_200002",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 835.0,
|
||||
"AbsY": 1015.28,
|
||||
"AbsZ": 92.77,
|
||||
|
|
@ -10663,7 +10663,7 @@
|
|||
"Id": 294,
|
||||
"ObjectName": "vanu_equipment_term_200003",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 843.21,
|
||||
"AbsY": 1012.32,
|
||||
"AbsZ": 92.77,
|
||||
|
|
@ -10676,7 +10676,7 @@
|
|||
"Id": 897,
|
||||
"ObjectName": "vanu_equipment_term_200134",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 406,
|
||||
"AbsX": 869.22,
|
||||
"AbsY": 1466.66,
|
||||
"AbsZ": 90.84,
|
||||
|
|
@ -10702,7 +10702,7 @@
|
|||
"Id": 899,
|
||||
"ObjectName": "vanu_equipment_term_200136",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 406,
|
||||
"AbsX": 877.77,
|
||||
"AbsY": 1484.74,
|
||||
"AbsZ": 90.84,
|
||||
|
|
@ -10715,7 +10715,7 @@
|
|||
"Id": 898,
|
||||
"ObjectName": "vanu_equipment_term_200135",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 406,
|
||||
"AbsX": 886.94,
|
||||
"AbsY": 1458.3,
|
||||
"AbsZ": 90.84,
|
||||
|
|
@ -10741,7 +10741,7 @@
|
|||
"Id": 896,
|
||||
"ObjectName": "vanu_equipment_term_200133",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 406,
|
||||
"AbsX": 895.74,
|
||||
"AbsY": 1476.22,
|
||||
"AbsZ": 90.84,
|
||||
|
|
@ -10754,7 +10754,7 @@
|
|||
"Id": 366,
|
||||
"ObjectName": "vanu_equipment_term_200065",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 924.69,
|
||||
"AbsY": 1345.47,
|
||||
"AbsZ": 162.79,
|
||||
|
|
@ -10767,7 +10767,7 @@
|
|||
"Id": 365,
|
||||
"ObjectName": "vanu_equipment_term_200064",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 955.27,
|
||||
"AbsY": 1345.54,
|
||||
"AbsZ": 162.79,
|
||||
|
|
@ -10884,7 +10884,7 @@
|
|||
"Id": 295,
|
||||
"ObjectName": "vanu_equipment_term_200004",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 1029.84,
|
||||
"AbsY": 1332.43,
|
||||
"AbsZ": 96.39,
|
||||
|
|
@ -10897,7 +10897,7 @@
|
|||
"Id": 296,
|
||||
"ObjectName": "vanu_equipment_term_200005",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 1042.81,
|
||||
"AbsY": 1333.65,
|
||||
"AbsZ": 96.39,
|
||||
|
|
@ -10910,7 +10910,7 @@
|
|||
"Id": 303,
|
||||
"ObjectName": "vanu_equipment_term_200012",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 1197.72,
|
||||
"AbsY": 1034.24,
|
||||
"AbsZ": 99.62,
|
||||
|
|
@ -10923,7 +10923,7 @@
|
|||
"Id": 304,
|
||||
"ObjectName": "vanu_equipment_term_200013",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 1206.08,
|
||||
"AbsY": 1036.35,
|
||||
"AbsZ": 99.62,
|
||||
|
|
@ -11040,7 +11040,7 @@
|
|||
"Id": 302,
|
||||
"ObjectName": "vanu_equipment_term_200011",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 1369.5,
|
||||
"AbsY": 1032.42,
|
||||
"AbsZ": 165.16,
|
||||
|
|
@ -11053,7 +11053,7 @@
|
|||
"Id": 301,
|
||||
"ObjectName": "vanu_equipment_term_200010",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 1380.5,
|
||||
"AbsY": 1019.15,
|
||||
"AbsZ": 165.16,
|
||||
|
|
@ -11079,7 +11079,7 @@
|
|||
"Id": 903,
|
||||
"ObjectName": "vanu_equipment_term_200140",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 904,
|
||||
"AbsX": 1387.02,
|
||||
"AbsY": 846.09,
|
||||
"AbsZ": 91.74,
|
||||
|
|
@ -11092,7 +11092,7 @@
|
|||
"Id": 902,
|
||||
"ObjectName": "vanu_equipment_term_200139",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 904,
|
||||
"AbsX": 1393.14,
|
||||
"AbsY": 864.93,
|
||||
"AbsZ": 91.74,
|
||||
|
|
@ -11105,7 +11105,7 @@
|
|||
"Id": 900,
|
||||
"ObjectName": "vanu_equipment_term_200137",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 904,
|
||||
"AbsX": 1405.83,
|
||||
"AbsY": 839.8,
|
||||
"AbsZ": 91.74,
|
||||
|
|
@ -11118,7 +11118,7 @@
|
|||
"Id": 901,
|
||||
"ObjectName": "vanu_equipment_term_200138",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 904,
|
||||
"AbsX": 1411.95,
|
||||
"AbsY": 858.67,
|
||||
"AbsZ": 91.74,
|
||||
|
|
@ -11144,7 +11144,7 @@
|
|||
"Id": 300,
|
||||
"ObjectName": "vanu_equipment_term_200009",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 1447.85,
|
||||
"AbsY": 1272.05,
|
||||
"AbsZ": 94.15,
|
||||
|
|
@ -11157,7 +11157,7 @@
|
|||
"Id": 299,
|
||||
"ObjectName": "vanu_equipment_term_200008",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 1451.55,
|
||||
"AbsY": 1282.54,
|
||||
"AbsZ": 94.15,
|
||||
|
|
@ -11196,7 +11196,7 @@
|
|||
"Id": 297,
|
||||
"ObjectName": "vanu_equipment_term_200006",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 1513.39,
|
||||
"AbsY": 1453.92,
|
||||
"AbsZ": 105.26,
|
||||
|
|
@ -11209,7 +11209,7 @@
|
|||
"Id": 298,
|
||||
"ObjectName": "vanu_equipment_term_200007",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 53,
|
||||
"AbsX": 1532.47,
|
||||
"AbsY": 1434.84,
|
||||
"AbsZ": 105.26,
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -11788,7 +11788,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 916,
|
||||
"MapID": 200024,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 410,
|
||||
|
|
@ -11801,7 +11801,7 @@
|
|||
"Yaw": 72.0,
|
||||
"GUID": 917,
|
||||
"MapID": 200055,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 409,
|
||||
|
|
@ -11814,7 +11814,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 918,
|
||||
"MapID": 200054,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 350,
|
||||
|
|
@ -11827,7 +11827,7 @@
|
|||
"Yaw": 126.0,
|
||||
"GUID": 919,
|
||||
"MapID": 200027,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 351,
|
||||
|
|
@ -11840,7 +11840,7 @@
|
|||
"Yaw": 4.0,
|
||||
"GUID": 920,
|
||||
"MapID": 200028,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 280,
|
||||
|
|
@ -11853,7 +11853,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 921,
|
||||
"MapID": 200021,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 408,
|
||||
|
|
@ -11866,7 +11866,7 @@
|
|||
"Yaw": 101.0,
|
||||
"GUID": 922,
|
||||
"MapID": 200053,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 188,
|
||||
|
|
@ -11879,7 +11879,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 923,
|
||||
"MapID": 200002,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 407,
|
||||
|
|
@ -11892,7 +11892,7 @@
|
|||
"Yaw": 180.0,
|
||||
"GUID": 924,
|
||||
"MapID": 200052,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 356,
|
||||
|
|
@ -11905,7 +11905,7 @@
|
|||
"Yaw": 169.0,
|
||||
"GUID": 925,
|
||||
"MapID": 200033,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 358,
|
||||
|
|
@ -11918,7 +11918,7 @@
|
|||
"Yaw": 126.0,
|
||||
"GUID": 926,
|
||||
"MapID": 200035,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 250,
|
||||
|
|
@ -11931,7 +11931,7 @@
|
|||
"Yaw": 281.0,
|
||||
"GUID": 927,
|
||||
"MapID": 200003,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 357,
|
||||
|
|
@ -11944,20 +11944,20 @@
|
|||
"Yaw": 209.0,
|
||||
"GUID": 928,
|
||||
"MapID": 200034,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 81,
|
||||
"ObjectName": "crystals_energy_a",
|
||||
"ObjectType": "crystals_energy_a",
|
||||
"Owner": 78,
|
||||
"Owner": null,
|
||||
"AbsX": 937.108337,
|
||||
"AbsY": 698.1515,
|
||||
"AbsZ": 87.35,
|
||||
"Yaw": 0.0,
|
||||
"GUID": 929,
|
||||
"MapID": null,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 252,
|
||||
|
|
@ -11970,7 +11970,7 @@
|
|||
"Yaw": 115.0,
|
||||
"GUID": 930,
|
||||
"MapID": 200005,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 423,
|
||||
|
|
@ -11983,7 +11983,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 931,
|
||||
"MapID": 200061,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 453,
|
||||
|
|
@ -11996,7 +11996,7 @@
|
|||
"Yaw": 281.0,
|
||||
"GUID": 932,
|
||||
"MapID": 200078,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 454,
|
||||
|
|
@ -12009,7 +12009,7 @@
|
|||
"Yaw": 72.0,
|
||||
"GUID": 933,
|
||||
"MapID": 200079,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 451,
|
||||
|
|
@ -12022,7 +12022,7 @@
|
|||
"Yaw": 162.0,
|
||||
"GUID": 934,
|
||||
"MapID": 200076,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 452,
|
||||
|
|
@ -12035,7 +12035,7 @@
|
|||
"Yaw": 227.0,
|
||||
"GUID": 935,
|
||||
"MapID": 200077,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 411,
|
||||
|
|
@ -12048,7 +12048,7 @@
|
|||
"Yaw": 187.0,
|
||||
"GUID": 936,
|
||||
"MapID": 200056,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 339,
|
||||
|
|
@ -12061,7 +12061,7 @@
|
|||
"Yaw": 58.0,
|
||||
"GUID": 937,
|
||||
"MapID": 200025,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 400,
|
||||
|
|
@ -12074,7 +12074,7 @@
|
|||
"Yaw": 43.0,
|
||||
"GUID": 938,
|
||||
"MapID": 200046,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 401,
|
||||
|
|
@ -12087,7 +12087,7 @@
|
|||
"Yaw": 212.0,
|
||||
"GUID": 939,
|
||||
"MapID": 200047,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 431,
|
||||
|
|
@ -12100,7 +12100,7 @@
|
|||
"Yaw": 270.0,
|
||||
"GUID": 940,
|
||||
"MapID": 200068,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 432,
|
||||
|
|
@ -12113,7 +12113,7 @@
|
|||
"Yaw": 72.0,
|
||||
"GUID": 941,
|
||||
"MapID": 200069,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 450,
|
||||
|
|
@ -12126,7 +12126,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 942,
|
||||
"MapID": 200075,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 430,
|
||||
|
|
@ -12139,7 +12139,7 @@
|
|||
"Yaw": 180.0,
|
||||
"GUID": 943,
|
||||
"MapID": 200067,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 355,
|
||||
|
|
@ -12152,7 +12152,7 @@
|
|||
"Yaw": 356.0,
|
||||
"GUID": 944,
|
||||
"MapID": 200032,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 354,
|
||||
|
|
@ -12165,7 +12165,7 @@
|
|||
"Yaw": 259.0,
|
||||
"GUID": 945,
|
||||
"MapID": 200031,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 366,
|
||||
|
|
@ -12178,7 +12178,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 946,
|
||||
"MapID": 200043,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 364,
|
||||
|
|
@ -12191,7 +12191,7 @@
|
|||
"Yaw": 320.0,
|
||||
"GUID": 947,
|
||||
"MapID": 200041,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 363,
|
||||
|
|
@ -12204,7 +12204,7 @@
|
|||
"Yaw": 263.0,
|
||||
"GUID": 948,
|
||||
"MapID": 200040,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 365,
|
||||
|
|
@ -12217,7 +12217,7 @@
|
|||
"Yaw": 14.0,
|
||||
"GUID": 949,
|
||||
"MapID": 200042,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 187,
|
||||
|
|
@ -12230,7 +12230,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 950,
|
||||
"MapID": 200001,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 422,
|
||||
|
|
@ -12243,7 +12243,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 951,
|
||||
"MapID": 200060,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 254,
|
||||
|
|
@ -12256,7 +12256,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 952,
|
||||
"MapID": 200007,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 255,
|
||||
|
|
@ -12269,7 +12269,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 953,
|
||||
"MapID": 200008,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 412,
|
||||
|
|
@ -12282,7 +12282,7 @@
|
|||
"Yaw": 72.0,
|
||||
"GUID": 954,
|
||||
"MapID": 200057,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 267,
|
||||
|
|
@ -12295,7 +12295,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 955,
|
||||
"MapID": 200012,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 362,
|
||||
|
|
@ -12308,7 +12308,7 @@
|
|||
"Yaw": 86.0,
|
||||
"GUID": 956,
|
||||
"MapID": 200039,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 426,
|
||||
|
|
@ -12321,7 +12321,7 @@
|
|||
"Yaw": 54.0,
|
||||
"GUID": 957,
|
||||
"MapID": 200063,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 425,
|
||||
|
|
@ -12334,7 +12334,7 @@
|
|||
"Yaw": 54.0,
|
||||
"GUID": 958,
|
||||
"MapID": 200062,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 272,
|
||||
|
|
@ -12347,7 +12347,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 959,
|
||||
"MapID": 200017,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 438,
|
||||
|
|
@ -12360,7 +12360,7 @@
|
|||
"Yaw": 274.0,
|
||||
"GUID": 960,
|
||||
"MapID": 200074,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 268,
|
||||
|
|
@ -12373,7 +12373,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 961,
|
||||
"MapID": 200013,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 361,
|
||||
|
|
@ -12386,7 +12386,7 @@
|
|||
"Yaw": 320.0,
|
||||
"GUID": 962,
|
||||
"MapID": 200038,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 274,
|
||||
|
|
@ -12399,7 +12399,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 963,
|
||||
"MapID": 200018,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 340,
|
||||
|
|
@ -12412,7 +12412,7 @@
|
|||
"Yaw": 97.0,
|
||||
"GUID": 964,
|
||||
"MapID": 200026,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 309,
|
||||
|
|
@ -12425,7 +12425,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 965,
|
||||
"MapID": 200023,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 427,
|
||||
|
|
@ -12438,7 +12438,7 @@
|
|||
"Yaw": 36.0,
|
||||
"GUID": 966,
|
||||
"MapID": 200064,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 428,
|
||||
|
|
@ -12451,7 +12451,7 @@
|
|||
"Yaw": 140.0,
|
||||
"GUID": 967,
|
||||
"MapID": 200065,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 281,
|
||||
|
|
@ -12464,7 +12464,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 968,
|
||||
"MapID": 200022,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 269,
|
||||
|
|
@ -12477,7 +12477,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 969,
|
||||
"MapID": 200014,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 429,
|
||||
|
|
@ -12490,7 +12490,7 @@
|
|||
"Yaw": 7.0,
|
||||
"GUID": 970,
|
||||
"MapID": 200066,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 42,
|
||||
|
|
@ -13263,7 +13263,7 @@
|
|||
"Id": 413,
|
||||
"ObjectName": "vanu_equipment_term_200058",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 624.28,
|
||||
"AbsY": 958.12,
|
||||
"AbsZ": 74.56,
|
||||
|
|
@ -13276,7 +13276,7 @@
|
|||
"Id": 414,
|
||||
"ObjectName": "vanu_equipment_term_200059",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 624.38,
|
||||
"AbsY": 975.77,
|
||||
"AbsZ": 74.56,
|
||||
|
|
@ -13289,7 +13289,7 @@
|
|||
"Id": 434,
|
||||
"ObjectName": "vanu_equipment_term_200071",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 634.07,
|
||||
"AbsY": 835.13,
|
||||
"AbsZ": 80.36,
|
||||
|
|
@ -13302,7 +13302,7 @@
|
|||
"Id": 435,
|
||||
"ObjectName": "vanu_equipment_term_200072",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 647.92,
|
||||
"AbsY": 794.89,
|
||||
"AbsZ": 80.36,
|
||||
|
|
@ -13419,7 +13419,7 @@
|
|||
"Id": 275,
|
||||
"ObjectName": "vanu_equipment_term_200019",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 684.98,
|
||||
"AbsY": 878.61,
|
||||
"AbsZ": 107.18,
|
||||
|
|
@ -13432,7 +13432,7 @@
|
|||
"Id": 265,
|
||||
"ObjectName": "vanu_equipment_term_200011",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 689.91,
|
||||
"AbsY": 646.49,
|
||||
"AbsZ": 76.69,
|
||||
|
|
@ -13445,7 +13445,7 @@
|
|||
"Id": 399,
|
||||
"ObjectName": "vanu_equipment_term_200045",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 704.82,
|
||||
"AbsY": 1254.2,
|
||||
"AbsZ": 88.18,
|
||||
|
|
@ -13458,7 +13458,7 @@
|
|||
"Id": 398,
|
||||
"ObjectName": "vanu_equipment_term_200044",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 710.23,
|
||||
"AbsY": 1277.36,
|
||||
"AbsZ": 88.11,
|
||||
|
|
@ -13471,7 +13471,7 @@
|
|||
"Id": 1115,
|
||||
"ObjectName": "vanu_equipment_term_200135",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 326,
|
||||
"AbsX": 711.35,
|
||||
"AbsY": 1221.54,
|
||||
"AbsZ": 43.33,
|
||||
|
|
@ -13497,7 +13497,7 @@
|
|||
"Id": 433,
|
||||
"ObjectName": "vanu_equipment_term_200070",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 719.63,
|
||||
"AbsY": 809.77,
|
||||
"AbsZ": 91.26,
|
||||
|
|
@ -13523,7 +13523,7 @@
|
|||
"Id": 1116,
|
||||
"ObjectName": "vanu_equipment_term_200136",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 326,
|
||||
"AbsX": 725.86,
|
||||
"AbsY": 1196.85,
|
||||
"AbsZ": 43.3,
|
||||
|
|
@ -13536,7 +13536,7 @@
|
|||
"Id": 353,
|
||||
"ObjectName": "vanu_equipment_term_200030",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 769.95,
|
||||
"AbsY": 1078.39,
|
||||
"AbsZ": 99.83,
|
||||
|
|
@ -13549,7 +13549,7 @@
|
|||
"Id": 352,
|
||||
"ObjectName": "vanu_equipment_term_200029",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 788.59,
|
||||
"AbsY": 1093.02,
|
||||
"AbsZ": 99.81,
|
||||
|
|
@ -13588,7 +13588,7 @@
|
|||
"Id": 276,
|
||||
"ObjectName": "vanu_equipment_term_200020",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 844.02,
|
||||
"AbsY": 778.6,
|
||||
"AbsZ": 106.01,
|
||||
|
|
@ -13601,7 +13601,7 @@
|
|||
"Id": 463,
|
||||
"ObjectName": "vanu_equipment_term_200080",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 846.68,
|
||||
"AbsY": 782.07,
|
||||
"AbsZ": 111.52,
|
||||
|
|
@ -13614,7 +13614,7 @@
|
|||
"Id": 402,
|
||||
"ObjectName": "vanu_equipment_term_200048",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 892.74,
|
||||
"AbsY": 1362.69,
|
||||
"AbsZ": 43.29,
|
||||
|
|
@ -13627,7 +13627,7 @@
|
|||
"Id": 360,
|
||||
"ObjectName": "vanu_equipment_term_200037",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 901.96,
|
||||
"AbsY": 911.49,
|
||||
"AbsZ": 110.81,
|
||||
|
|
@ -13640,7 +13640,7 @@
|
|||
"Id": 403,
|
||||
"ObjectName": "vanu_equipment_term_200049",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 913.09,
|
||||
"AbsY": 1382.92,
|
||||
"AbsZ": 43.27,
|
||||
|
|
@ -13653,7 +13653,7 @@
|
|||
"Id": 270,
|
||||
"ObjectName": "vanu_equipment_term_200015",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 931.79,
|
||||
"AbsY": 694.1,
|
||||
"AbsZ": 81.75,
|
||||
|
|
@ -13666,7 +13666,7 @@
|
|||
"Id": 359,
|
||||
"ObjectName": "vanu_equipment_term_200036",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 939.31,
|
||||
"AbsY": 922.44,
|
||||
"AbsZ": 110.81,
|
||||
|
|
@ -13679,7 +13679,7 @@
|
|||
"Id": 251,
|
||||
"ObjectName": "vanu_equipment_term_200004",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 965.76,
|
||||
"AbsY": 756.59,
|
||||
"AbsZ": 85.54,
|
||||
|
|
@ -13692,7 +13692,7 @@
|
|||
"Id": 186,
|
||||
"ObjectName": "vanu_equipment_term_200000",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 970.27,
|
||||
"AbsY": 1330.25,
|
||||
"AbsZ": 72.43,
|
||||
|
|
@ -13705,7 +13705,7 @@
|
|||
"Id": 406,
|
||||
"ObjectName": "vanu_equipment_term_200051",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 1044.21,
|
||||
"AbsY": 1256.84,
|
||||
"AbsZ": 72.9,
|
||||
|
|
@ -13718,7 +13718,7 @@
|
|||
"Id": 405,
|
||||
"ObjectName": "vanu_equipment_term_200050",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 1064.8,
|
||||
"AbsY": 1236.89,
|
||||
"AbsZ": 72.91,
|
||||
|
|
@ -13731,7 +13731,7 @@
|
|||
"Id": 253,
|
||||
"ObjectName": "vanu_equipment_term_200006",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 1134.99,
|
||||
"AbsY": 739.94,
|
||||
"AbsZ": 107.09,
|
||||
|
|
@ -13744,7 +13744,7 @@
|
|||
"Id": 257,
|
||||
"ObjectName": "vanu_equipment_term_200010",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 1226.99,
|
||||
"AbsY": 1239.0,
|
||||
"AbsZ": 96.63,
|
||||
|
|
@ -13757,7 +13757,7 @@
|
|||
"Id": 256,
|
||||
"ObjectName": "vanu_equipment_term_200009",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 1239.95,
|
||||
"AbsY": 1091.6,
|
||||
"AbsZ": 109.43,
|
||||
|
|
@ -13900,7 +13900,7 @@
|
|||
"Id": 437,
|
||||
"ObjectName": "vanu_equipment_term_200073",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 1362.64,
|
||||
"AbsY": 657.92,
|
||||
"AbsZ": 88.17,
|
||||
|
|
@ -13913,7 +13913,7 @@
|
|||
"Id": 1118,
|
||||
"ObjectName": "vanu_equipment_term_200138",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 386,
|
||||
"AbsX": 1387.46,
|
||||
"AbsY": 783.22,
|
||||
"AbsZ": 43.32,
|
||||
|
|
@ -13926,7 +13926,7 @@
|
|||
"Id": 271,
|
||||
"ObjectName": "vanu_equipment_term_200016",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 69,
|
||||
"AbsX": 1388.46,
|
||||
"AbsY": 1124.9,
|
||||
"AbsZ": 122.73,
|
||||
|
|
@ -13965,7 +13965,7 @@
|
|||
"Id": 1117,
|
||||
"ObjectName": "vanu_equipment_term_200137",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 386,
|
||||
"AbsX": 1407.92,
|
||||
"AbsY": 763.14,
|
||||
"AbsZ": 43.3,
|
||||
|
|
|
|||
|
|
@ -9240,7 +9240,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 725,
|
||||
"MapID": 200044,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 162,
|
||||
|
|
@ -9253,20 +9253,20 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 726,
|
||||
"MapID": 200026,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 246,
|
||||
"ObjectName": "crystals_energy_a",
|
||||
"ObjectType": "crystals_energy_a",
|
||||
"Owner": 243,
|
||||
"Owner": null,
|
||||
"AbsX": 875.1611,
|
||||
"AbsY": 874.311035,
|
||||
"AbsZ": 129.5,
|
||||
"Yaw": 0.0,
|
||||
"GUID": 727,
|
||||
"MapID": null,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 158,
|
||||
|
|
@ -9279,7 +9279,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 728,
|
||||
"MapID": 200022,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 339,
|
||||
|
|
@ -9292,20 +9292,20 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 729,
|
||||
"MapID": 200047,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 64,
|
||||
"ObjectName": "crystals_energy_a",
|
||||
"ObjectType": "crystals_energy_a",
|
||||
"Owner": 61,
|
||||
"Owner": null,
|
||||
"AbsX": 1066.2511,
|
||||
"AbsY": 1237.641,
|
||||
"AbsZ": 129.5,
|
||||
"Yaw": 0.0,
|
||||
"GUID": 730,
|
||||
"MapID": null,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 145,
|
||||
|
|
@ -9318,7 +9318,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 731,
|
||||
"MapID": 200009,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 154,
|
||||
|
|
@ -9331,7 +9331,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 732,
|
||||
"MapID": 200018,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 240,
|
||||
|
|
@ -9344,7 +9344,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 733,
|
||||
"MapID": 200028,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 306,
|
||||
|
|
@ -9357,7 +9357,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 734,
|
||||
"MapID": 200042,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 159,
|
||||
|
|
@ -9370,7 +9370,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 735,
|
||||
"MapID": 200023,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 299,
|
||||
|
|
@ -9383,7 +9383,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 736,
|
||||
"MapID": 200039,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 163,
|
||||
|
|
@ -9396,7 +9396,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 737,
|
||||
"MapID": 200027,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 248,
|
||||
|
|
@ -9409,7 +9409,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 738,
|
||||
"MapID": 200032,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 152,
|
||||
|
|
@ -9422,7 +9422,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 739,
|
||||
"MapID": 200016,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 150,
|
||||
|
|
@ -9435,7 +9435,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 740,
|
||||
"MapID": 200014,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 149,
|
||||
|
|
@ -9448,7 +9448,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 741,
|
||||
"MapID": 200013,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 141,
|
||||
|
|
@ -9461,7 +9461,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 742,
|
||||
"MapID": 200005,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 153,
|
||||
|
|
@ -9474,7 +9474,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 743,
|
||||
"MapID": 200017,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 148,
|
||||
|
|
@ -9487,7 +9487,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 744,
|
||||
"MapID": 200012,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 160,
|
||||
|
|
@ -9500,7 +9500,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 745,
|
||||
"MapID": 200024,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 247,
|
||||
|
|
@ -9513,7 +9513,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 746,
|
||||
"MapID": 200031,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 157,
|
||||
|
|
@ -9526,7 +9526,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 747,
|
||||
"MapID": 200021,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 151,
|
||||
|
|
@ -9539,7 +9539,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 748,
|
||||
"MapID": 200015,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 147,
|
||||
|
|
@ -9552,7 +9552,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 749,
|
||||
"MapID": 200011,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 305,
|
||||
|
|
@ -9565,7 +9565,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 750,
|
||||
"MapID": 200041,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 337,
|
||||
|
|
@ -9578,7 +9578,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 751,
|
||||
"MapID": 200045,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 161,
|
||||
|
|
@ -9591,7 +9591,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 752,
|
||||
"MapID": 200025,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 300,
|
||||
|
|
@ -9604,7 +9604,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 753,
|
||||
"MapID": 200040,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 338,
|
||||
|
|
@ -9617,7 +9617,7 @@
|
|||
"Yaw": 335.0,
|
||||
"GUID": 754,
|
||||
"MapID": 200046,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 140,
|
||||
|
|
@ -9630,7 +9630,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 755,
|
||||
"MapID": 200004,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 146,
|
||||
|
|
@ -9643,7 +9643,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 756,
|
||||
"MapID": 200010,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 155,
|
||||
|
|
@ -9656,7 +9656,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 757,
|
||||
"MapID": 200019,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 307,
|
||||
|
|
@ -9669,7 +9669,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 758,
|
||||
"MapID": 200043,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 156,
|
||||
|
|
@ -9682,7 +9682,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 759,
|
||||
"MapID": 200020,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 144,
|
||||
|
|
@ -9695,7 +9695,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 760,
|
||||
"MapID": 200008,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 278,
|
||||
|
|
@ -10611,7 +10611,7 @@
|
|||
"Id": 885,
|
||||
"ObjectName": "vanu_equipment_term_200100",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 309,
|
||||
"AbsX": 768.65,
|
||||
"AbsY": 1172.64,
|
||||
"AbsZ": 109.09,
|
||||
|
|
@ -10624,7 +10624,7 @@
|
|||
"Id": 888,
|
||||
"ObjectName": "vanu_equipment_term_200103",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 309,
|
||||
"AbsX": 778.06,
|
||||
"AbsY": 1189.82,
|
||||
"AbsZ": 109.09,
|
||||
|
|
@ -10637,7 +10637,7 @@
|
|||
"Id": 886,
|
||||
"ObjectName": "vanu_equipment_term_200101",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 309,
|
||||
"AbsX": 785.86,
|
||||
"AbsY": 1163.1,
|
||||
"AbsZ": 109.09,
|
||||
|
|
@ -10650,7 +10650,7 @@
|
|||
"Id": 298,
|
||||
"ObjectName": "vanu_equipment_term_200038",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 791.15,
|
||||
"AbsY": 1304.88,
|
||||
"AbsZ": 162.68,
|
||||
|
|
@ -10663,7 +10663,7 @@
|
|||
"Id": 887,
|
||||
"ObjectName": "vanu_equipment_term_200102",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 309,
|
||||
"AbsX": 795.55,
|
||||
"AbsY": 1180.29,
|
||||
"AbsZ": 109.09,
|
||||
|
|
@ -10689,7 +10689,7 @@
|
|||
"Id": 297,
|
||||
"ObjectName": "vanu_equipment_term_200037",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 799.83,
|
||||
"AbsY": 1295.35,
|
||||
"AbsZ": 162.68,
|
||||
|
|
@ -10702,7 +10702,7 @@
|
|||
"Id": 136,
|
||||
"ObjectName": "vanu_equipment_term_200000",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 835.57,
|
||||
"AbsY": 1094.07,
|
||||
"AbsZ": 193.71,
|
||||
|
|
@ -10715,7 +10715,7 @@
|
|||
"Id": 137,
|
||||
"ObjectName": "vanu_equipment_term_200001",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 845.78,
|
||||
"AbsY": 1062.0,
|
||||
"AbsZ": 193.71,
|
||||
|
|
@ -10728,7 +10728,7 @@
|
|||
"Id": 292,
|
||||
"ObjectName": "vanu_equipment_term_200036",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 891.69,
|
||||
"AbsY": 781.33,
|
||||
"AbsZ": 118.5,
|
||||
|
|
@ -10741,7 +10741,7 @@
|
|||
"Id": 291,
|
||||
"ObjectName": "vanu_equipment_term_200035",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 892.08,
|
||||
"AbsY": 790.5,
|
||||
"AbsZ": 118.5,
|
||||
|
|
@ -10754,7 +10754,7 @@
|
|||
"Id": 883,
|
||||
"ObjectName": "vanu_equipment_term_200098",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 321,
|
||||
"AbsX": 1013.04,
|
||||
"AbsY": 734.64,
|
||||
"AbsZ": 124.36,
|
||||
|
|
@ -10780,7 +10780,7 @@
|
|||
"Id": 882,
|
||||
"ObjectName": "vanu_equipment_term_200097",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 321,
|
||||
"AbsX": 1021.43,
|
||||
"AbsY": 716.77,
|
||||
"AbsZ": 124.36,
|
||||
|
|
@ -10793,7 +10793,7 @@
|
|||
"Id": 884,
|
||||
"ObjectName": "vanu_equipment_term_200099",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 321,
|
||||
"AbsX": 1030.94,
|
||||
"AbsY": 742.92,
|
||||
"AbsZ": 124.36,
|
||||
|
|
@ -10819,7 +10819,7 @@
|
|||
"Id": 881,
|
||||
"ObjectName": "vanu_equipment_term_200096",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 321,
|
||||
"AbsX": 1039.09,
|
||||
"AbsY": 725.04,
|
||||
"AbsZ": 124.36,
|
||||
|
|
@ -10832,7 +10832,7 @@
|
|||
"Id": 138,
|
||||
"ObjectName": "vanu_equipment_term_200002",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1046.56,
|
||||
"AbsY": 1319.12,
|
||||
"AbsZ": 116.4,
|
||||
|
|
@ -10845,7 +10845,7 @@
|
|||
"Id": 139,
|
||||
"ObjectName": "vanu_equipment_term_200003",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1048.6,
|
||||
"AbsY": 1352.78,
|
||||
"AbsZ": 116.4,
|
||||
|
|
@ -10858,7 +10858,7 @@
|
|||
"Id": 348,
|
||||
"ObjectName": "vanu_equipment_term_200049",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1085.88,
|
||||
"AbsY": 680.98,
|
||||
"AbsZ": 116.8,
|
||||
|
|
@ -10871,7 +10871,7 @@
|
|||
"Id": 347,
|
||||
"ObjectName": "vanu_equipment_term_200048",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1088.05,
|
||||
"AbsY": 714.6,
|
||||
"AbsZ": 116.8,
|
||||
|
|
@ -10884,7 +10884,7 @@
|
|||
"Id": 241,
|
||||
"ObjectName": "vanu_equipment_term_200029",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1147.46,
|
||||
"AbsY": 1067.68,
|
||||
"AbsZ": 198.82,
|
||||
|
|
@ -10897,7 +10897,7 @@
|
|||
"Id": 242,
|
||||
"ObjectName": "vanu_equipment_term_200030",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1171.04,
|
||||
"AbsY": 1053.54,
|
||||
"AbsZ": 198.82,
|
||||
|
|
@ -11040,7 +11040,7 @@
|
|||
"Id": 143,
|
||||
"ObjectName": "vanu_equipment_term_200007",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1361.59,
|
||||
"AbsY": 876.44,
|
||||
"AbsZ": 121.5,
|
||||
|
|
@ -11053,7 +11053,7 @@
|
|||
"Id": 142,
|
||||
"ObjectName": "vanu_equipment_term_200006",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1374.98,
|
||||
"AbsY": 865.79,
|
||||
"AbsZ": 121.5,
|
||||
|
|
@ -11066,7 +11066,7 @@
|
|||
"Id": 284,
|
||||
"ObjectName": "vanu_equipment_term_200034",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1421.6,
|
||||
"AbsY": 1202.05,
|
||||
"AbsZ": 130.8,
|
||||
|
|
@ -11079,7 +11079,7 @@
|
|||
"Id": 283,
|
||||
"ObjectName": "vanu_equipment_term_200033",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1430.67,
|
||||
"AbsY": 1192.45,
|
||||
"AbsZ": 130.8,
|
||||
|
|
|
|||
|
|
@ -6237,7 +6237,7 @@
|
|||
"Yaw": 259.0,
|
||||
"GUID": 483,
|
||||
"MapID": 200015,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 270,
|
||||
|
|
@ -6250,7 +6250,7 @@
|
|||
"Yaw": 259.0,
|
||||
"GUID": 484,
|
||||
"MapID": 200016,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 271,
|
||||
|
|
@ -6263,7 +6263,7 @@
|
|||
"Yaw": 220.0,
|
||||
"GUID": 485,
|
||||
"MapID": 200017,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 275,
|
||||
|
|
@ -6276,7 +6276,7 @@
|
|||
"Yaw": 43.0,
|
||||
"GUID": 486,
|
||||
"MapID": 200021,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 274,
|
||||
|
|
@ -6289,7 +6289,7 @@
|
|||
"Yaw": 76.0,
|
||||
"GUID": 487,
|
||||
"MapID": 200020,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 273,
|
||||
|
|
@ -6302,7 +6302,7 @@
|
|||
"Yaw": 104.0,
|
||||
"GUID": 488,
|
||||
"MapID": 200019,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 233,
|
||||
|
|
@ -6315,20 +6315,20 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 489,
|
||||
"MapID": 200004,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 134,
|
||||
"ObjectName": "crystals_energy_a",
|
||||
"ObjectType": "crystals_energy_a",
|
||||
"Owner": 131,
|
||||
"Owner": null,
|
||||
"AbsX": 1235.27588,
|
||||
"AbsY": 1133.46118,
|
||||
"AbsZ": 195.23,
|
||||
"Yaw": 0.0,
|
||||
"GUID": 490,
|
||||
"MapID": null,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 268,
|
||||
|
|
@ -6341,7 +6341,7 @@
|
|||
"Yaw": 50.0,
|
||||
"GUID": 491,
|
||||
"MapID": 200014,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 278,
|
||||
|
|
@ -6354,7 +6354,7 @@
|
|||
"Yaw": 248.0,
|
||||
"GUID": 492,
|
||||
"MapID": 200024,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 272,
|
||||
|
|
@ -6367,7 +6367,7 @@
|
|||
"Yaw": 58.0,
|
||||
"GUID": 493,
|
||||
"MapID": 200018,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 234,
|
||||
|
|
@ -6380,7 +6380,7 @@
|
|||
"Yaw": 83.0,
|
||||
"GUID": 494,
|
||||
"MapID": 200005,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 286,
|
||||
|
|
@ -6393,7 +6393,7 @@
|
|||
"Yaw": 83.0,
|
||||
"GUID": 495,
|
||||
"MapID": 200031,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 261,
|
||||
|
|
@ -6406,7 +6406,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 496,
|
||||
"MapID": 200007,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 164,
|
||||
|
|
@ -6419,7 +6419,7 @@
|
|||
"Yaw": 101.0,
|
||||
"GUID": 497,
|
||||
"MapID": 200001,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 163,
|
||||
|
|
@ -6432,7 +6432,7 @@
|
|||
"Yaw": 61.0,
|
||||
"GUID": 498,
|
||||
"MapID": 200000,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 285,
|
||||
|
|
@ -6445,7 +6445,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 499,
|
||||
"MapID": 200030,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 232,
|
||||
|
|
@ -6458,7 +6458,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 500,
|
||||
"MapID": 200003,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 262,
|
||||
|
|
@ -6471,7 +6471,7 @@
|
|||
"Yaw": 234.0,
|
||||
"GUID": 501,
|
||||
"MapID": 200008,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 235,
|
||||
|
|
@ -6484,7 +6484,7 @@
|
|||
"Yaw": 151.0,
|
||||
"GUID": 502,
|
||||
"MapID": 200006,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 247,
|
||||
|
|
@ -7205,7 +7205,7 @@
|
|||
"Id": 297,
|
||||
"ObjectName": "vanu_equipment_term_200037",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 236,
|
||||
"AbsX": 878.19,
|
||||
"AbsY": 1054.2,
|
||||
"AbsZ": 163.19,
|
||||
|
|
@ -7244,7 +7244,7 @@
|
|||
"Id": 296,
|
||||
"ObjectName": "vanu_equipment_term_200036",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 236,
|
||||
"AbsX": 896.75,
|
||||
"AbsY": 1075.17,
|
||||
"AbsZ": 163.19,
|
||||
|
|
@ -7270,7 +7270,7 @@
|
|||
"Id": 277,
|
||||
"ObjectName": "vanu_equipment_term_200023",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 941.54,
|
||||
"AbsY": 850.15,
|
||||
"AbsZ": 189.36,
|
||||
|
|
@ -7283,7 +7283,7 @@
|
|||
"Id": 267,
|
||||
"ObjectName": "vanu_equipment_term_200013",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 945.16,
|
||||
"AbsY": 843.7,
|
||||
"AbsZ": 183.9,
|
||||
|
|
@ -7296,7 +7296,7 @@
|
|||
"Id": 265,
|
||||
"ObjectName": "vanu_equipment_term_200011",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 950.41,
|
||||
"AbsY": 852.49,
|
||||
"AbsZ": 178.37,
|
||||
|
|
@ -7309,7 +7309,7 @@
|
|||
"Id": 264,
|
||||
"ObjectName": "vanu_equipment_term_200010",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 953.54,
|
||||
"AbsY": 844.73,
|
||||
"AbsZ": 178.41,
|
||||
|
|
@ -7335,7 +7335,7 @@
|
|||
"Id": 263,
|
||||
"ObjectName": "vanu_equipment_term_200009",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 956.79,
|
||||
"AbsY": 837.39,
|
||||
"AbsZ": 178.38,
|
||||
|
|
@ -7348,7 +7348,7 @@
|
|||
"Id": 266,
|
||||
"ObjectName": "vanu_equipment_term_200012",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 963.51,
|
||||
"AbsY": 855.72,
|
||||
"AbsZ": 183.88,
|
||||
|
|
@ -7361,7 +7361,7 @@
|
|||
"Id": 276,
|
||||
"ObjectName": "vanu_equipment_term_200022",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 967.12,
|
||||
"AbsY": 849.74,
|
||||
"AbsZ": 189.34,
|
||||
|
|
@ -7374,7 +7374,7 @@
|
|||
"Id": 281,
|
||||
"ObjectName": "vanu_equipment_term_200026",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 979.19,
|
||||
"AbsY": 862.66,
|
||||
"AbsZ": 241.45,
|
||||
|
|
@ -7387,7 +7387,7 @@
|
|||
"Id": 282,
|
||||
"ObjectName": "vanu_equipment_term_200027",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 979.19,
|
||||
"AbsY": 873.02,
|
||||
"AbsZ": 241.48,
|
||||
|
|
@ -7426,7 +7426,7 @@
|
|||
"Id": 280,
|
||||
"ObjectName": "vanu_equipment_term_200025",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 989.0,
|
||||
"AbsY": 872.94,
|
||||
"AbsZ": 235.95,
|
||||
|
|
@ -7517,7 +7517,7 @@
|
|||
"Id": 231,
|
||||
"ObjectName": "vanu_equipment_term_200002",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1008.85,
|
||||
"AbsY": 1236.36,
|
||||
"AbsZ": 246.4,
|
||||
|
|
@ -7530,7 +7530,7 @@
|
|||
"Id": 284,
|
||||
"ObjectName": "vanu_equipment_term_200029",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1057.9,
|
||||
"AbsY": 849.87,
|
||||
"AbsZ": 253.23,
|
||||
|
|
@ -7543,7 +7543,7 @@
|
|||
"Id": 283,
|
||||
"ObjectName": "vanu_equipment_term_200028",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1076.5,
|
||||
"AbsY": 869.5,
|
||||
"AbsZ": 253.22,
|
||||
|
|
@ -7556,7 +7556,7 @@
|
|||
"Id": 289,
|
||||
"ObjectName": "vanu_equipment_term_200034",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1113.28,
|
||||
"AbsY": 798.92,
|
||||
"AbsZ": 197.92,
|
||||
|
|
@ -7582,7 +7582,7 @@
|
|||
"Id": 299,
|
||||
"ObjectName": "vanu_equipment_term_200039",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 248,
|
||||
"AbsX": 1143.84,
|
||||
"AbsY": 850.5,
|
||||
"AbsZ": 158.69,
|
||||
|
|
@ -7595,7 +7595,7 @@
|
|||
"Id": 290,
|
||||
"ObjectName": "vanu_equipment_term_200035",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1144.35,
|
||||
"AbsY": 798.89,
|
||||
"AbsZ": 197.92,
|
||||
|
|
@ -7608,7 +7608,7 @@
|
|||
"Id": 298,
|
||||
"ObjectName": "vanu_equipment_term_200038",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 248,
|
||||
"AbsX": 1171.79,
|
||||
"AbsY": 847.49,
|
||||
"AbsZ": 158.69,
|
||||
|
|
@ -7634,7 +7634,7 @@
|
|||
"Id": 287,
|
||||
"ObjectName": "vanu_equipment_term_200032",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1187.06,
|
||||
"AbsY": 1054.3,
|
||||
"AbsZ": 230.13,
|
||||
|
|
@ -7647,7 +7647,7 @@
|
|||
"Id": 288,
|
||||
"ObjectName": "vanu_equipment_term_200033",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1207.07,
|
||||
"AbsY": 1027.25,
|
||||
"AbsZ": 230.13,
|
||||
|
|
|
|||
|
|
@ -8811,7 +8811,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 688,
|
||||
"MapID": 200052,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 201,
|
||||
|
|
@ -8824,7 +8824,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 689,
|
||||
"MapID": 200035,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 181,
|
||||
|
|
@ -8837,7 +8837,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 690,
|
||||
"MapID": 200015,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 186,
|
||||
|
|
@ -8850,7 +8850,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 691,
|
||||
"MapID": 200020,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 198,
|
||||
|
|
@ -8863,7 +8863,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 692,
|
||||
"MapID": 200032,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 190,
|
||||
|
|
@ -8876,7 +8876,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 693,
|
||||
"MapID": 200024,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 243,
|
||||
|
|
@ -8889,7 +8889,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 694,
|
||||
"MapID": 200045,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 317,
|
||||
|
|
@ -8902,20 +8902,20 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 695,
|
||||
"MapID": 200050,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 104,
|
||||
"ObjectName": "crystals_energy_a",
|
||||
"ObjectType": "crystals_energy_a",
|
||||
"Owner": 101,
|
||||
"Owner": null,
|
||||
"AbsX": 1353.62036,
|
||||
"AbsY": 1152.7782,
|
||||
"AbsZ": 95.44,
|
||||
"Yaw": 0.0,
|
||||
"GUID": 696,
|
||||
"MapID": null,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 203,
|
||||
|
|
@ -8928,7 +8928,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 697,
|
||||
"MapID": 200037,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 236,
|
||||
|
|
@ -8941,7 +8941,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 698,
|
||||
"MapID": 200042,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 232,
|
||||
|
|
@ -8954,7 +8954,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 699,
|
||||
"MapID": 200040,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 182,
|
||||
|
|
@ -8967,7 +8967,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 700,
|
||||
"MapID": 200016,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 250,
|
||||
|
|
@ -8980,7 +8980,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 701,
|
||||
"MapID": 200048,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 189,
|
||||
|
|
@ -8993,7 +8993,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 702,
|
||||
"MapID": 200023,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 200,
|
||||
|
|
@ -9006,7 +9006,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 703,
|
||||
"MapID": 200034,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 180,
|
||||
|
|
@ -9019,7 +9019,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 704,
|
||||
"MapID": 200014,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 185,
|
||||
|
|
@ -9032,7 +9032,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 705,
|
||||
"MapID": 200019,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 191,
|
||||
|
|
@ -9045,7 +9045,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 706,
|
||||
"MapID": 200025,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 187,
|
||||
|
|
@ -9058,7 +9058,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 707,
|
||||
"MapID": 200021,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 192,
|
||||
|
|
@ -9071,7 +9071,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 708,
|
||||
"MapID": 200026,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 194,
|
||||
|
|
@ -9084,7 +9084,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 709,
|
||||
"MapID": 200028,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 199,
|
||||
|
|
@ -9097,7 +9097,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 710,
|
||||
"MapID": 200033,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 238,
|
||||
|
|
@ -9110,7 +9110,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 711,
|
||||
"MapID": 200044,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 196,
|
||||
|
|
@ -9123,7 +9123,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 712,
|
||||
"MapID": 200030,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 197,
|
||||
|
|
@ -9136,7 +9136,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 713,
|
||||
"MapID": 200031,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 319,
|
||||
|
|
@ -9149,7 +9149,7 @@
|
|||
"Yaw": 241.0,
|
||||
"GUID": 714,
|
||||
"MapID": 200051,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 249,
|
||||
|
|
@ -9162,7 +9162,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 715,
|
||||
"MapID": 200047,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 188,
|
||||
|
|
@ -9175,7 +9175,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 716,
|
||||
"MapID": 200022,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 193,
|
||||
|
|
@ -9188,7 +9188,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 717,
|
||||
"MapID": 200027,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 316,
|
||||
|
|
@ -9201,7 +9201,7 @@
|
|||
"Yaw": 281.0,
|
||||
"GUID": 718,
|
||||
"MapID": 200049,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 195,
|
||||
|
|
@ -9214,7 +9214,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 719,
|
||||
"MapID": 200029,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 202,
|
||||
|
|
@ -9227,7 +9227,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 720,
|
||||
"MapID": 200036,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 237,
|
||||
|
|
@ -9240,7 +9240,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 721,
|
||||
"MapID": 200043,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 233,
|
||||
|
|
@ -9253,7 +9253,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 722,
|
||||
"MapID": 200041,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 183,
|
||||
|
|
@ -9266,7 +9266,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 723,
|
||||
"MapID": 200017,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 184,
|
||||
|
|
@ -9279,7 +9279,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 724,
|
||||
"MapID": 200018,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 244,
|
||||
|
|
@ -9292,7 +9292,7 @@
|
|||
"Yaw": 0.0,
|
||||
"GUID": 725,
|
||||
"MapID": 200046,
|
||||
"IsChildObject": true
|
||||
"IsChildObject": false
|
||||
},
|
||||
{
|
||||
"Id": 303,
|
||||
|
|
@ -10234,7 +10234,7 @@
|
|||
"Id": 345,
|
||||
"ObjectName": "vanu_equipment_term_200058",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 292,
|
||||
"AbsX": 746.59,
|
||||
"AbsY": 1360.06,
|
||||
"AbsZ": 99.58,
|
||||
|
|
@ -10260,7 +10260,7 @@
|
|||
"Id": 344,
|
||||
"ObjectName": "vanu_equipment_term_200057",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 292,
|
||||
"AbsX": 760.13,
|
||||
"AbsY": 1345.53,
|
||||
"AbsZ": 99.58,
|
||||
|
|
@ -10273,7 +10273,7 @@
|
|||
"Id": 346,
|
||||
"ObjectName": "vanu_equipment_term_200059",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 292,
|
||||
"AbsX": 761.34,
|
||||
"AbsY": 1373.51,
|
||||
"AbsZ": 99.58,
|
||||
|
|
@ -10299,7 +10299,7 @@
|
|||
"Id": 347,
|
||||
"ObjectName": "vanu_equipment_term_200060",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 292,
|
||||
"AbsX": 774.88,
|
||||
"AbsY": 1358.94,
|
||||
"AbsZ": 99.58,
|
||||
|
|
@ -10312,7 +10312,7 @@
|
|||
"Id": 174,
|
||||
"ObjectName": "vanu_equipment_term_200008",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 867.18,
|
||||
"AbsY": 1080.28,
|
||||
"AbsZ": 89.45,
|
||||
|
|
@ -10325,7 +10325,7 @@
|
|||
"Id": 175,
|
||||
"ObjectName": "vanu_equipment_term_200009",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 871.23,
|
||||
"AbsY": 1068.0,
|
||||
"AbsZ": 89.45,
|
||||
|
|
@ -10338,7 +10338,7 @@
|
|||
"Id": 343,
|
||||
"ObjectName": "vanu_equipment_term_200056",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 873.46,
|
||||
"AbsY": 1273.87,
|
||||
"AbsZ": 100.52,
|
||||
|
|
@ -10351,7 +10351,7 @@
|
|||
"Id": 342,
|
||||
"ObjectName": "vanu_equipment_term_200055",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 877.77,
|
||||
"AbsY": 1276.37,
|
||||
"AbsZ": 100.52,
|
||||
|
|
@ -10416,7 +10416,7 @@
|
|||
"Id": 172,
|
||||
"ObjectName": "vanu_equipment_term_200006",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 901.33,
|
||||
"AbsY": 949.3,
|
||||
"AbsZ": 176.04,
|
||||
|
|
@ -10481,7 +10481,7 @@
|
|||
"Id": 173,
|
||||
"ObjectName": "vanu_equipment_term_200007",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 919.88,
|
||||
"AbsY": 968.41,
|
||||
"AbsZ": 176.04,
|
||||
|
|
@ -10494,7 +10494,7 @@
|
|||
"Id": 178,
|
||||
"ObjectName": "vanu_equipment_term_200012",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 968.73,
|
||||
"AbsY": 1210.66,
|
||||
"AbsZ": 179.41,
|
||||
|
|
@ -10507,7 +10507,7 @@
|
|||
"Id": 179,
|
||||
"ObjectName": "vanu_equipment_term_200013",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 974.72,
|
||||
"AbsY": 1169.48,
|
||||
"AbsZ": 179.41,
|
||||
|
|
@ -10520,7 +10520,7 @@
|
|||
"Id": 177,
|
||||
"ObjectName": "vanu_equipment_term_200011",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 996.15,
|
||||
"AbsY": 1132.13,
|
||||
"AbsZ": 97.47,
|
||||
|
|
@ -10533,7 +10533,7 @@
|
|||
"Id": 176,
|
||||
"ObjectName": "vanu_equipment_term_200010",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1007.58,
|
||||
"AbsY": 1125.96,
|
||||
"AbsZ": 91.97,
|
||||
|
|
@ -10546,7 +10546,7 @@
|
|||
"Id": 167,
|
||||
"ObjectName": "vanu_equipment_term_200001",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1015.53,
|
||||
"AbsY": 643.92,
|
||||
"AbsZ": 94.56,
|
||||
|
|
@ -10559,7 +10559,7 @@
|
|||
"Id": 168,
|
||||
"ObjectName": "vanu_equipment_term_200002",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1048.62,
|
||||
"AbsY": 890.34,
|
||||
"AbsZ": 92.65,
|
||||
|
|
@ -10572,7 +10572,7 @@
|
|||
"Id": 166,
|
||||
"ObjectName": "vanu_equipment_term_200000",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1050.16,
|
||||
"AbsY": 654.59,
|
||||
"AbsZ": 94.56,
|
||||
|
|
@ -10585,7 +10585,7 @@
|
|||
"Id": 169,
|
||||
"ObjectName": "vanu_equipment_term_200003",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1075.73,
|
||||
"AbsY": 880.84,
|
||||
"AbsZ": 92.65,
|
||||
|
|
@ -10702,7 +10702,7 @@
|
|||
"Id": 219,
|
||||
"ObjectName": "vanu_equipment_term_200039",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1193.54,
|
||||
"AbsY": 969.01,
|
||||
"AbsZ": 167.4,
|
||||
|
|
@ -10715,7 +10715,7 @@
|
|||
"Id": 218,
|
||||
"ObjectName": "vanu_equipment_term_200038",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1198.76,
|
||||
"AbsY": 961.62,
|
||||
"AbsZ": 167.4,
|
||||
|
|
@ -10728,7 +10728,7 @@
|
|||
"Id": 340,
|
||||
"ObjectName": "vanu_equipment_term_200053",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1207.29,
|
||||
"AbsY": 837.52,
|
||||
"AbsZ": 116.64,
|
||||
|
|
@ -10741,7 +10741,7 @@
|
|||
"Id": 341,
|
||||
"ObjectName": "vanu_equipment_term_200054",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1207.35,
|
||||
"AbsY": 868.13,
|
||||
"AbsZ": 116.64,
|
||||
|
|
@ -10754,7 +10754,7 @@
|
|||
"Id": 351,
|
||||
"ObjectName": "vanu_equipment_term_200064",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 304,
|
||||
"AbsX": 1240.36,
|
||||
"AbsY": 801.01,
|
||||
"AbsZ": 85.06,
|
||||
|
|
@ -10780,7 +10780,7 @@
|
|||
"Id": 348,
|
||||
"ObjectName": "vanu_equipment_term_200061",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 304,
|
||||
"AbsX": 1248.79,
|
||||
"AbsY": 818.76,
|
||||
"AbsZ": 85.06,
|
||||
|
|
@ -10793,7 +10793,7 @@
|
|||
"Id": 350,
|
||||
"ObjectName": "vanu_equipment_term_200063",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 304,
|
||||
"AbsX": 1258.22,
|
||||
"AbsY": 792.85,
|
||||
"AbsZ": 85.06,
|
||||
|
|
@ -10819,7 +10819,7 @@
|
|||
"Id": 170,
|
||||
"ObjectName": "vanu_equipment_term_200004",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1263.08,
|
||||
"AbsY": 997.75,
|
||||
"AbsZ": 100.83,
|
||||
|
|
@ -10832,7 +10832,7 @@
|
|||
"Id": 171,
|
||||
"ObjectName": "vanu_equipment_term_200005",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 0,
|
||||
"AbsX": 1263.42,
|
||||
"AbsY": 1014.84,
|
||||
"AbsZ": 100.83,
|
||||
|
|
@ -10845,7 +10845,7 @@
|
|||
"Id": 349,
|
||||
"ObjectName": "vanu_equipment_term_200062",
|
||||
"ObjectType": "vanu_equipment_term",
|
||||
"Owner": null,
|
||||
"Owner": 304,
|
||||
"AbsX": 1266.79,
|
||||
"AbsY": 810.47,
|
||||
"AbsZ": 85.06,
|
||||
|
|
|
|||
|
|
@ -969,11 +969,13 @@ class SessionData(
|
|||
continent
|
||||
.GUID(vehicleGuid)
|
||||
.foreach {
|
||||
case obj: Vehicle if !obj.Destroyed => //vehicle will try to charge even if destroyed
|
||||
case obj: Vehicle if !obj.Destroyed && obj.MountedIn.isEmpty => // vehicle will try to charge even if destroyed & cargo vehicles need to be excluded
|
||||
obj.Actor ! CommonMessages.ChargeShields(
|
||||
15,
|
||||
Some(continent.blockMap.sector(obj).buildingList.maxBy(_.Definition.SOIRadius))
|
||||
)
|
||||
case obj: Vehicle if obj.MountedIn.nonEmpty =>
|
||||
false
|
||||
case _ if vehicleGuid.nonEmpty =>
|
||||
log.warn(
|
||||
s"FacilityBenefitShieldChargeRequest: ${player.Name} can not find vehicle ${vehicleGuid.get.guid} in zone ${continent.id}"
|
||||
|
|
@ -1395,7 +1397,8 @@ class SessionData(
|
|||
case Some(item) =>
|
||||
sendUseGeneralEntityMessage(terminal, item)
|
||||
case None
|
||||
if terminal.Owner == Building.NoBuilding || terminal.Faction == player.Faction || terminal.HackedBy.nonEmpty =>
|
||||
if terminal.Owner == Building.NoBuilding || terminal.Faction == player.Faction ||
|
||||
terminal.HackedBy.nonEmpty || terminal.Faction == PlanetSideEmpire.NEUTRAL =>
|
||||
val tdef = terminal.Definition
|
||||
if (tdef.isInstanceOf[MatrixTerminalDefinition]) {
|
||||
//TODO matrix spawn point; for now, just blindly bind to show work (and hope nothing breaks)
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import net.psforever.actors.session.AvatarActor
|
|||
import net.psforever.actors.zone.ZoneActor
|
||||
import net.psforever.objects.{GlobalDefinitions, PlanetSideGameObject, Player, Vehicle, Vehicles}
|
||||
import net.psforever.objects.definition.{BasicDefinition, ObjectDefinition}
|
||||
import net.psforever.objects.serverobject.hackable.GenericHackables.getTurretUpgradeTime
|
||||
import net.psforever.objects.serverobject.mount.Mountable
|
||||
import net.psforever.objects.serverobject.terminals.implant.ImplantTerminalMech
|
||||
import net.psforever.objects.serverobject.turret.{FacilityTurret, WeaponTurret}
|
||||
|
|
@ -150,7 +151,8 @@ class SessionMountHandlers(
|
|||
MountingAction(tplayer, obj, seatNumber)
|
||||
|
||||
case Mountable.CanMount(obj: FacilityTurret, seatNumber, _)
|
||||
if !obj.isUpgrading =>
|
||||
if !obj.isUpgrading || System.currentTimeMillis() - getTurretUpgradeTime >= 1500L =>
|
||||
obj.setMiddleOfUpgrade(false)
|
||||
sessionData.zoning.CancelZoningProcessWithDescriptiveReason("cancel_mount")
|
||||
log.info(s"${player.Name} mounts the ${obj.Definition.Name}")
|
||||
sendResponse(PlanetsideAttributeMessage(obj.GUID, attribute_type=0, obj.Health))
|
||||
|
|
|
|||
|
|
@ -1171,6 +1171,24 @@ object GlobalDefinitions {
|
|||
|
||||
val crystals_health_b = new MedicalTerminalDefinition(226)
|
||||
|
||||
val crystals_repair_a = new MedicalTerminalDefinition(227)
|
||||
|
||||
val crystals_repair_b = new MedicalTerminalDefinition(228)
|
||||
|
||||
val crystals_energy = new WeaponRechargeTerminalDefinition(222)
|
||||
|
||||
val crystals_energy_a = new WeaponRechargeTerminalDefinition(223)
|
||||
|
||||
val crystals_energy_b = new WeaponRechargeTerminalDefinition(224)
|
||||
|
||||
val crystals_vehicle_a = new MedicalTerminalDefinition(229)
|
||||
|
||||
val crystals_vehicle_b = new MedicalTerminalDefinition(230)
|
||||
|
||||
val crystals_damage_a = new MedicalTerminalDefinition(220)
|
||||
//todo: make these work
|
||||
val crystals_damage_b = new MedicalTerminalDefinition(221)
|
||||
|
||||
val medical_terminal = new MedicalTerminalDefinition(529)
|
||||
|
||||
val portable_med_terminal = new MedicalTerminalDefinition(689)
|
||||
|
|
@ -9678,6 +9696,59 @@ object GlobalDefinitions {
|
|||
crystals_health_b.Damageable = false
|
||||
crystals_health_b.Repairable = false
|
||||
|
||||
crystals_repair_a.Name = "crystals_repair_a"
|
||||
crystals_repair_a.Interval = 500
|
||||
crystals_repair_a.ArmorAmount = 4
|
||||
crystals_repair_a.UseRadius = 5
|
||||
crystals_repair_a.TargetValidation += EffectTarget.Category.Player -> EffectTarget.Validation.RepairCrystal
|
||||
crystals_repair_a.Damageable = false
|
||||
crystals_repair_a.Repairable = false
|
||||
|
||||
crystals_repair_b.Name = "crystals_repair_b"
|
||||
crystals_repair_b.Interval = 500
|
||||
crystals_repair_b.ArmorAmount = 4
|
||||
crystals_repair_b.UseRadius = 5
|
||||
crystals_repair_b.TargetValidation += EffectTarget.Category.Player -> EffectTarget.Validation.RepairCrystal
|
||||
crystals_repair_b.Damageable = false
|
||||
crystals_repair_b.Repairable = false
|
||||
|
||||
crystals_vehicle_a.Name = "crystals_vehicle_a"
|
||||
crystals_vehicle_a.Interval = 1000
|
||||
crystals_vehicle_a.HealAmount = 60
|
||||
crystals_vehicle_a.UseRadius = 15
|
||||
crystals_vehicle_a.TargetValidation += EffectTarget.Category.Vehicle -> EffectTarget.Validation.VehicleCrystal
|
||||
crystals_vehicle_a.Damageable = false
|
||||
crystals_vehicle_a.Repairable = false
|
||||
|
||||
crystals_vehicle_b.Name = "crystals_vehicle_b"
|
||||
crystals_vehicle_b.Interval = 1000
|
||||
crystals_vehicle_b.HealAmount = 60
|
||||
crystals_vehicle_b.UseRadius = 15
|
||||
crystals_vehicle_b.TargetValidation += EffectTarget.Category.Vehicle -> EffectTarget.Validation.VehicleCrystal
|
||||
crystals_vehicle_b.Damageable = false
|
||||
crystals_vehicle_b.Repairable = false
|
||||
|
||||
crystals_energy_a.Name = "crystals_energy_a"
|
||||
crystals_energy_a.Interval = 1000
|
||||
crystals_energy_a.UseRadius = 5
|
||||
crystals_energy_a.TargetValidation += EffectTarget.Category.Player -> EffectTarget.Validation.AncientWeaponRecharge
|
||||
crystals_energy_a.Damageable = false
|
||||
crystals_energy_a.Repairable = false
|
||||
|
||||
crystals_energy_b.Name = "crystals_energy_b"
|
||||
crystals_energy_b.Interval = 1000
|
||||
crystals_energy_b.UseRadius = 5
|
||||
crystals_energy_b.TargetValidation += EffectTarget.Category.Player -> EffectTarget.Validation.AncientWeaponRecharge
|
||||
crystals_energy_b.Damageable = false
|
||||
crystals_energy_b.Repairable = false
|
||||
|
||||
crystals_energy.Name = "crystals_energy"
|
||||
crystals_energy.Interval = 1000
|
||||
crystals_energy.UseRadius = 5
|
||||
crystals_energy.TargetValidation += EffectTarget.Category.Player -> EffectTarget.Validation.AncientWeaponRecharge
|
||||
crystals_energy.Damageable = false
|
||||
crystals_energy.Repairable = false
|
||||
|
||||
portable_med_terminal.Name = "portable_med_terminal"
|
||||
portable_med_terminal.Interval = 500
|
||||
portable_med_terminal.HealAmount = 5
|
||||
|
|
@ -9867,8 +9938,8 @@ object GlobalDefinitions {
|
|||
lodestar_repair_terminal.Name = "lodestar_repair_terminal"
|
||||
lodestar_repair_terminal.Interval = 1000
|
||||
lodestar_repair_terminal.HealAmount = 60
|
||||
lodestar_repair_terminal.UseRadius = 20
|
||||
lodestar_repair_terminal.TargetValidation += EffectTarget.Category.Vehicle -> EffectTarget.Validation.RepairSilo
|
||||
lodestar_repair_terminal.UseRadius = 40
|
||||
lodestar_repair_terminal.TargetValidation += EffectTarget.Category.Vehicle -> EffectTarget.Validation.LodestarRepair
|
||||
lodestar_repair_terminal.Damageable = false
|
||||
lodestar_repair_terminal.Repairable = false
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,26 @@ object EffectTarget {
|
|||
false
|
||||
}
|
||||
|
||||
def RepairCrystal(target: PlanetSideGameObject): Boolean =
|
||||
target match {
|
||||
case p: Player =>
|
||||
p.Health > 0 && p.Armor < p.MaxArmor
|
||||
case _ =>
|
||||
false
|
||||
}
|
||||
|
||||
def VehicleCrystal(target: PlanetSideGameObject): Boolean =
|
||||
target match {
|
||||
case v: Vehicle => RepairSilo(v) || PadLanding(v) || AncientVehicleWeaponRecharge(v)
|
||||
case _ => false
|
||||
}
|
||||
|
||||
def LodestarRepair(target: PlanetSideGameObject): Boolean =
|
||||
target match {
|
||||
case v: Vehicle => RepairSilo(v) || PadLanding(v)
|
||||
case _ => false
|
||||
}
|
||||
|
||||
/**
|
||||
* To repair at this silo, the vehicle:
|
||||
* can not be a flight vehicle,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
// Copyright (c) 2020 PSForever
|
||||
package net.psforever.objects.serverobject.hackable
|
||||
|
||||
import net.psforever.objects.serverobject.turret.FacilityTurret
|
||||
import net.psforever.objects.{Player, Vehicle}
|
||||
import net.psforever.objects.serverobject.{CommonMessages, PlanetSideServerObject}
|
||||
import net.psforever.packet.game.{HackMessage, HackState}
|
||||
|
|
@ -13,7 +14,23 @@ import scala.util.{Failure, Success}
|
|||
|
||||
object GenericHackables {
|
||||
private val log = org.log4s.getLogger("HackableBehavior")
|
||||
private var turretUpgradeTime: Long = System.currentTimeMillis()
|
||||
private var turretUpgradeTimeSet: Boolean = false
|
||||
|
||||
def updateTurretUpgradeTime(): Long = {
|
||||
turretUpgradeTime = System.currentTimeMillis()
|
||||
turretUpgradeTimeSet = true
|
||||
turretUpgradeTime
|
||||
}
|
||||
|
||||
// Used for checking the time without updating it
|
||||
def getTurretUpgradeTime: Long = {
|
||||
if (!turretUpgradeTimeSet) {
|
||||
turretUpgradeTime = System.currentTimeMillis()
|
||||
turretUpgradeTimeSet = true
|
||||
}
|
||||
turretUpgradeTime
|
||||
}
|
||||
/**
|
||||
* na
|
||||
*
|
||||
|
|
@ -91,6 +108,43 @@ object GenericHackables {
|
|||
vis != HackState.Cancelled
|
||||
}
|
||||
|
||||
/**
|
||||
* Evaluate the progress of the user applying a tool to upgrade a facility turret.
|
||||
* This action is using the nano dispenser and requires separate handling from REK hacking.
|
||||
* Largely a copy/paste of the above, but some of it was removed as it doesn't work/apply with upgrading a turret.
|
||||
* @see `HackMessage`
|
||||
* @see `HackState`
|
||||
* @param progressType 1 - remote electronics kit hack (various ...);
|
||||
* 2 - nano dispenser (upgrade canister) turret upgrade
|
||||
* @param tplayer the player performing the action
|
||||
* @param turret the object being affected
|
||||
* @param tool_guid the tool being used to affest the object
|
||||
* @param progress the current progress value
|
||||
* @return `true`, if the next cycle of progress should occur;
|
||||
* `false`, otherwise
|
||||
*/
|
||||
def TurretUpgradingTickAction(progressType: Int, tplayer: Player, turret: FacilityTurret, tool_guid: PlanetSideGUID)(
|
||||
progress: Float
|
||||
): Boolean = {
|
||||
//hack state for progress bar visibility
|
||||
val vis = if (progress <= 0L) {
|
||||
HackState.Start
|
||||
} else if (progress >= 100L) {
|
||||
HackState.Finished
|
||||
} else {
|
||||
updateTurretUpgradeTime()
|
||||
HackState.Ongoing
|
||||
}
|
||||
turret.Zone.AvatarEvents ! AvatarServiceMessage(
|
||||
tplayer.Name,
|
||||
AvatarAction.SendResponse(
|
||||
Service.defaultPlayerGUID,
|
||||
HackMessage(progressType, turret.GUID, tplayer.GUID, progress.toInt, 0L, vis, 8L)
|
||||
)
|
||||
)
|
||||
vis != HackState.Cancelled
|
||||
}
|
||||
|
||||
/**
|
||||
* The process of hacking an object is completed.
|
||||
* Pass the message onto the hackable object and onto the local events system.
|
||||
|
|
|
|||
|
|
@ -363,9 +363,11 @@ object ProximityTerminalControl {
|
|||
unit.Definition.asInstanceOf[WeaponRechargeTerminalDefinition].AmmoAmount,
|
||||
target.Holsters().flatMap { _.Equipment }.toSeq ++ target.Inventory.Items.map { _.obj }
|
||||
)
|
||||
val ancient = result.filter(rechargeMe => rechargeMe._1.Definition == GlobalDefinitions.maelstrom ||
|
||||
rechargeMe._1.Definition == GlobalDefinitions.spiker || rechargeMe._1.Definition == GlobalDefinitions.radiator)
|
||||
val events = unit.Zone.AvatarEvents
|
||||
val channel = target.Name
|
||||
result.foreach { case (weapon, slots) =>
|
||||
ancient.foreach { case (weapon, slots) =>
|
||||
slots.foreach { slot =>
|
||||
events ! AvatarServiceMessage(
|
||||
channel,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import net.psforever.objects.definition.VehicleDefinition
|
|||
import net.psforever.objects.serverobject.hackable.Hackable
|
||||
import net.psforever.objects.serverobject.structures.Amenity
|
||||
import net.psforever.packet.game.{ItemTransactionMessage, TriggeredSound}
|
||||
import net.psforever.types.{PlanetSideGUID, Vector3}
|
||||
import net.psforever.types.{PlanetSideEmpire, Vector3}
|
||||
|
||||
/**
|
||||
* A server object that can be accessed for net.psforever.services and other amenities.
|
||||
|
|
@ -47,7 +47,7 @@ class Terminal(tdef: TerminalDefinition) extends Amenity with Hackable {
|
|||
* @return an actionable message that explains what resulted from interacting with this `Terminal`
|
||||
*/
|
||||
def Request(player: Player, msg: Any): Terminal.Exchange = {
|
||||
if (Faction == player.Faction || HackedBy.isDefined || Owner.GUID == PlanetSideGUID(0)) {
|
||||
if (Faction == player.Faction || HackedBy.isDefined || Owner.Faction == PlanetSideEmpire.NEUTRAL) {
|
||||
tdef.Request(player, msg)
|
||||
} else {
|
||||
Terminal.NoDeal()
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import net.psforever.objects.serverobject.mount.{Mountable, MountableBehavior}
|
|||
import net.psforever.objects.serverobject.affinity.FactionAffinityBehavior
|
||||
import net.psforever.objects.serverobject.damage.{Damageable, DamageableWeaponTurret}
|
||||
import net.psforever.objects.serverobject.hackable.GenericHackables
|
||||
import net.psforever.objects.serverobject.hackable.GenericHackables.getTurretUpgradeTime
|
||||
import net.psforever.objects.serverobject.repair.{AmenityAutoRepair, RepairableWeaponTurret}
|
||||
import net.psforever.objects.serverobject.structures.PoweredAmenityControl
|
||||
import net.psforever.objects.serverobject.terminals.capture.CaptureTerminalAwareBehavior
|
||||
|
|
@ -77,10 +78,11 @@ class FacilityTurretControl(turret: FacilityTurret)
|
|||
if turret.Upgrade != upgrade && turret.Definition.WeaponPaths.values
|
||||
.flatMap(_.keySet)
|
||||
.exists(_ == upgrade) =>
|
||||
turret.setMiddleOfUpgrade(true)
|
||||
sender() ! CommonMessages.Progress(
|
||||
1.25f,
|
||||
WeaponTurrets.FinishUpgradingMannedTurret(turret, player, item, upgrade),
|
||||
GenericHackables.HackingTickAction(progressType = 2, player, turret, item.GUID)
|
||||
GenericHackables.TurretUpgradingTickAction(progressType = 2, player, turret, item.GUID)
|
||||
)
|
||||
case _ => ;
|
||||
}
|
||||
|
|
@ -133,7 +135,8 @@ class FacilityTurretControl(turret: FacilityTurret)
|
|||
obj: PlanetSideServerObject with Mountable,
|
||||
seatNumber: Int,
|
||||
player: Player): Boolean = {
|
||||
(!turret.Definition.FactionLocked || player.Faction == obj.Faction) && !obj.Destroyed
|
||||
(!turret.Definition.FactionLocked || player.Faction == obj.Faction) && !obj.Destroyed && !turret.isUpgrading ||
|
||||
System.currentTimeMillis() - getTurretUpgradeTime >= 1500L
|
||||
}
|
||||
|
||||
override protected def DamageAwareness(target: Damageable.Target, cause: DamageResult, amount: Any) : Unit = {
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ trait WeaponTurret
|
|||
def Upgrade: TurretUpgrade.Value = upgradePath
|
||||
|
||||
def Upgrade_=(upgrade: TurretUpgrade.Value): TurretUpgrade.Value = {
|
||||
middleOfUpgrade = true //blocking flag; block early
|
||||
var updated = false
|
||||
//upgrade each weapon as long as that weapon has a valid option for that upgrade
|
||||
Definition match {
|
||||
|
|
@ -64,8 +63,6 @@ trait WeaponTurret
|
|||
}
|
||||
if (updated) {
|
||||
upgradePath = upgrade
|
||||
} else {
|
||||
middleOfUpgrade = false //reset
|
||||
}
|
||||
Upgrade
|
||||
}
|
||||
|
|
@ -79,6 +76,10 @@ trait WeaponTurret
|
|||
|
||||
def isUpgrading: Boolean = middleOfUpgrade
|
||||
|
||||
def setMiddleOfUpgrade(value: Boolean): Unit = {
|
||||
middleOfUpgrade = value
|
||||
}
|
||||
|
||||
def Definition: TurretDefinition
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import net.psforever.objects.serverobject.terminals.Terminal
|
|||
import net.psforever.objects.sourcing.{PlayerSource, SourceEntry, VehicleSource}
|
||||
import net.psforever.objects.vehicles._
|
||||
import net.psforever.objects.vital.interaction.{DamageInteraction, DamageResult}
|
||||
import net.psforever.objects.vital.{DamagingActivity, InGameActivity, ShieldCharge, VehicleDismountActivity, VehicleMountActivity}
|
||||
import net.psforever.objects.vital.{DamagingActivity, InGameActivity, ShieldCharge, SpawningActivity, VehicleDismountActivity, VehicleMountActivity}
|
||||
import net.psforever.objects.vital.environment.EnvironmentReason
|
||||
import net.psforever.objects.vital.etc.SuicideReason
|
||||
import net.psforever.objects.zones._
|
||||
|
|
@ -128,7 +128,22 @@ class VehicleControl(vehicle: Vehicle)
|
|||
mountBehavior.apply(msg)
|
||||
mountCleanup(mount_point, player)
|
||||
|
||||
case msg @ Mountable.TryDismount(player, seat_num, _) =>
|
||||
// Issue 1133. Todo: There may be a better way to address the issue?
|
||||
case Mountable.TryDismount(user, seat_num, _) if GlobalDefinitions.isFlightVehicle(vehicle.Definition) &&
|
||||
(vehicle.History.find { entry => entry.isInstanceOf[SpawningActivity] } match {
|
||||
case Some(entry) if System.currentTimeMillis() - entry.time < 3000L => true
|
||||
case _ => false
|
||||
}) =>
|
||||
sender() ! Mountable.MountMessages(user, Mountable.CanNotDismount(vehicle, seat_num))
|
||||
|
||||
case Mountable.TryDismount(user, seat_num, _) if !GlobalDefinitions.isFlightVehicle(vehicle.Definition) &&
|
||||
(vehicle.History.find { entry => entry.isInstanceOf[SpawningActivity] } match {
|
||||
case Some(entry) if System.currentTimeMillis() - entry.time < 8500L => true
|
||||
case _ => false
|
||||
}) =>
|
||||
sender() ! Mountable.MountMessages(user, Mountable.CanNotDismount(vehicle, seat_num))
|
||||
|
||||
case msg @ Mountable.TryDismount(_, seat_num, _) =>
|
||||
dismountBehavior.apply(msg)
|
||||
dismountCleanup(seat_num, player)
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import net.psforever.types.Vector3
|
|||
*/
|
||||
case object GroundImpact extends CollisionDamageModifiers.Mod {
|
||||
def calculate(damage: Int, data: DamageInteraction, cause: CollisionReason): Int =
|
||||
CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause)
|
||||
CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) / 3
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -19,7 +19,7 @@ case object GroundImpact extends CollisionDamageModifiers.Mod {
|
|||
*/
|
||||
case object GroundImpactWith extends CollisionWithDamageModifiers.Mod {
|
||||
def calculate(damage: Int, data: DamageInteraction, cause: CollisionWithReason): Int =
|
||||
CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause)
|
||||
CollisionDamageModifierFunctions.calculateGroundImpact(damage, data, cause) / 3
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -33,9 +33,9 @@ case object HeadonImpact extends CollisionDamageModifiers.Mod {
|
|||
if (vel > 0.05f) {
|
||||
val definition = data.target.Definition
|
||||
val xy = definition.collision.xy
|
||||
damage + xy.hp(xy.throttle((vel + 0.5f) / definition.maxForwardSpeed))
|
||||
(damage + xy.hp(xy.throttle((vel + 0.5f) / definition.maxForwardSpeed))) / 2
|
||||
} else {
|
||||
damage
|
||||
damage / 2
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ class InterstellarClusterService(context: ActorContext[InterstellarClusterServic
|
|||
}
|
||||
val hotspotsAndSpawnsInZones: Iterable[(Zone, HotSpotInfo, List[SpawnPoint])] = zones
|
||||
.collect {
|
||||
case zone if !zone.map.cavern && zone.Players.nonEmpty =>
|
||||
case zone if zone.Players.nonEmpty =>
|
||||
zone.HotSpotData
|
||||
.map {
|
||||
info => (zone, info, zone.findNearestSpawnPoints(faction, info.DisplayLocation, spawnTarget))
|
||||
|
|
|
|||
|
|
@ -519,7 +519,8 @@ object Zones {
|
|||
)
|
||||
|
||||
case "adv_med_terminal" | "repair_silo" | "pad_landing_frame" | "pad_landing_tower_frame" | "medical_terminal" |
|
||||
"crystals_health_a" | "crystals_health_b" =>
|
||||
"crystals_health_a" | "crystals_health_b" | "crystals_repair_a" | "crystals_repair_b" | "crystals_vehicle_a" |
|
||||
"crystals_vehicle_b" | "crystals_energy_a" | "crystals_energy_b" =>
|
||||
zoneMap.addLocalObject(
|
||||
obj.guid,
|
||||
ProximityTerminal
|
||||
|
|
@ -569,6 +570,18 @@ object Zones {
|
|||
ProximityTerminal.Constructor(obj.position, GlobalDefinitions.recharge_terminal),
|
||||
owningBuildingGuid = ownerGuid
|
||||
)
|
||||
case "crystals_vehicle_a" | "crystals_vehicle_b" =>
|
||||
zoneMap.addLocalObject(
|
||||
obj.guid + 1,
|
||||
ProximityTerminal.Constructor(obj.position, GlobalDefinitions.recharge_terminal),
|
||||
owningBuildingGuid = ownerGuid
|
||||
)
|
||||
case "crystals_energy_a" | "crystals_energy_b" =>
|
||||
zoneMap.addLocalObject(
|
||||
obj.guid + 2000,
|
||||
ProximityTerminal.Constructor(obj.position, GlobalDefinitions.crystals_energy),
|
||||
owningBuildingGuid = ownerGuid
|
||||
)
|
||||
case _ => ;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue