From d228784e1cdf74a0d5d8b8e4108ee185344a11c9 Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Sun, 29 Oct 2023 21:55:19 -0400 Subject: [PATCH] Cavern crystals (except damage - that needs help) --- src/main/resources/zonemaps/ugd01.json | 112 ++++----- src/main/resources/zonemaps/ugd02.json | 228 +++++++++--------- src/main/resources/zonemaps/ugd03.json | 112 ++++----- src/main/resources/zonemaps/ugd04.json | 76 +++--- src/main/resources/zonemaps/ugd05.json | 42 ++-- src/main/resources/zonemaps/ugd06.json | 78 +++--- .../psforever/objects/GlobalDefinitions.scala | 71 ++++++ .../objects/equipment/EffectTarget.scala | 14 ++ .../scala/net/psforever/zones/Zones.scala | 15 +- 9 files changed, 423 insertions(+), 325 deletions(-) diff --git a/src/main/resources/zonemaps/ugd01.json b/src/main/resources/zonemaps/ugd01.json index d5e480cc..c5011c02 100644 --- a/src/main/resources/zonemaps/ugd01.json +++ b/src/main/resources/zonemaps/ugd01.json @@ -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, @@ -10605,7 +10605,7 @@ "Yaw": 72.0, "GUID": 837, "MapID": 200000, - "IsChildObject": true + "IsChildObject": false }, { "Id": 292, @@ -10618,7 +10618,7 @@ "Yaw": 256.0, "GUID": 838, "MapID": 200001, - "IsChildObject": true + "IsChildObject": false }, { "Id": 35, diff --git a/src/main/resources/zonemaps/ugd02.json b/src/main/resources/zonemaps/ugd02.json index 92435ffb..1fc523f2 100644 --- a/src/main/resources/zonemaps/ugd02.json +++ b/src/main/resources/zonemaps/ugd02.json @@ -15077,7 +15077,7 @@ "Yaw": 18.0, "GUID": 1214, "MapID": 200093, - "IsChildObject": true + "IsChildObject": false }, { "Id": 624, @@ -15090,7 +15090,7 @@ "Yaw": 54.0, "GUID": 1215, "MapID": 200096, - "IsChildObject": true + "IsChildObject": false }, { "Id": 393, @@ -15103,7 +15103,7 @@ "Yaw": 94.0, "GUID": 1216, "MapID": 200027, - "IsChildObject": true + "IsChildObject": false }, { "Id": 392, @@ -15116,7 +15116,7 @@ "Yaw": 0.0, "GUID": 1217, "MapID": 200026, - "IsChildObject": true + "IsChildObject": false }, { "Id": 394, @@ -15129,7 +15129,7 @@ "Yaw": 346.0, "GUID": 1218, "MapID": 200028, - "IsChildObject": true + "IsChildObject": false }, { "Id": 464, @@ -15142,7 +15142,7 @@ "Yaw": 173.0, "GUID": 1219, "MapID": 200040, - "IsChildObject": true + "IsChildObject": false }, { "Id": 676, @@ -15155,7 +15155,7 @@ "Yaw": 86.0, "GUID": 1220, "MapID": 200144, - "IsChildObject": true + "IsChildObject": false }, { "Id": 463, @@ -15168,7 +15168,7 @@ "Yaw": 97.0, "GUID": 1221, "MapID": 200039, - "IsChildObject": true + "IsChildObject": false }, { "Id": 316, @@ -15181,7 +15181,7 @@ "Yaw": 0.0, "GUID": 1222, "MapID": 200003, - "IsChildObject": true + "IsChildObject": false }, { "Id": 440, @@ -15194,7 +15194,7 @@ "Yaw": 198.0, "GUID": 1223, "MapID": 200038, - "IsChildObject": true + "IsChildObject": false }, { "Id": 439, @@ -15207,7 +15207,7 @@ "Yaw": 137.0, "GUID": 1224, "MapID": 200037, - "IsChildObject": true + "IsChildObject": false }, { "Id": 438, @@ -15220,7 +15220,7 @@ "Yaw": 0.0, "GUID": 1225, "MapID": 200036, - "IsChildObject": true + "IsChildObject": false }, { "Id": 400, @@ -15233,7 +15233,7 @@ "Yaw": 90.0, "GUID": 1226, "MapID": 200034, - "IsChildObject": true + "IsChildObject": false }, { "Id": 399, @@ -15246,7 +15246,7 @@ "Yaw": 169.0, "GUID": 1227, "MapID": 200033, - "IsChildObject": true + "IsChildObject": false }, { "Id": 665, @@ -15259,7 +15259,7 @@ "Yaw": 86.0, "GUID": 1228, "MapID": 200135, - "IsChildObject": true + "IsChildObject": false }, { "Id": 666, @@ -15272,7 +15272,7 @@ "Yaw": 115.0, "GUID": 1229, "MapID": 200136, - "IsChildObject": true + "IsChildObject": false }, { "Id": 625, @@ -15285,7 +15285,7 @@ "Yaw": 144.0, "GUID": 1230, "MapID": 200097, - "IsChildObject": true + "IsChildObject": false }, { "Id": 376, @@ -15298,7 +15298,7 @@ "Yaw": 54.0, "GUID": 1231, "MapID": 200019, - "IsChildObject": true + "IsChildObject": false }, { "Id": 377, @@ -15311,7 +15311,7 @@ "Yaw": 292.0, "GUID": 1232, "MapID": 200020, - "IsChildObject": true + "IsChildObject": false }, { "Id": 379, @@ -15324,7 +15324,7 @@ "Yaw": 54.0, "GUID": 1233, "MapID": 200022, - "IsChildObject": true + "IsChildObject": false }, { "Id": 380, @@ -15337,7 +15337,7 @@ "Yaw": 353.0, "GUID": 1234, "MapID": 200023, - "IsChildObject": true + "IsChildObject": false }, { "Id": 378, @@ -15350,7 +15350,7 @@ "Yaw": 292.0, "GUID": 1235, "MapID": 200021, - "IsChildObject": true + "IsChildObject": false }, { "Id": 502, @@ -15363,7 +15363,7 @@ "Yaw": 209.0, "GUID": 1236, "MapID": 200075, - "IsChildObject": true + "IsChildObject": false }, { "Id": 498, @@ -15376,7 +15376,7 @@ "Yaw": 137.0, "GUID": 1237, "MapID": 200071, - "IsChildObject": true + "IsChildObject": false }, { "Id": 499, @@ -15389,7 +15389,7 @@ "Yaw": 65.0, "GUID": 1238, "MapID": 200072, - "IsChildObject": true + "IsChildObject": false }, { "Id": 500, @@ -15402,7 +15402,7 @@ "Yaw": 65.0, "GUID": 1239, "MapID": 200073, - "IsChildObject": true + "IsChildObject": false }, { "Id": 501, @@ -15415,7 +15415,7 @@ "Yaw": 108.0, "GUID": 1240, "MapID": 200074, - "IsChildObject": true + "IsChildObject": false }, { "Id": 480, @@ -15428,7 +15428,7 @@ "Yaw": 0.0, "GUID": 1241, "MapID": 200053, - "IsChildObject": true + "IsChildObject": false }, { "Id": 481, @@ -15441,7 +15441,7 @@ "Yaw": 180.0, "GUID": 1242, "MapID": 200054, - "IsChildObject": true + "IsChildObject": false }, { "Id": 482, @@ -15454,7 +15454,7 @@ "Yaw": 248.0, "GUID": 1243, "MapID": 200055, - "IsChildObject": true + "IsChildObject": false }, { "Id": 651, @@ -15467,7 +15467,7 @@ "Yaw": 79.0, "GUID": 1244, "MapID": 200122, - "IsChildObject": true + "IsChildObject": false }, { "Id": 652, @@ -15480,7 +15480,7 @@ "Yaw": 259.0, "GUID": 1245, "MapID": 200123, - "IsChildObject": true + "IsChildObject": false }, { "Id": 631, @@ -15493,7 +15493,7 @@ "Yaw": 61.0, "GUID": 1246, "MapID": 200103, - "IsChildObject": true + "IsChildObject": false }, { "Id": 484, @@ -15506,7 +15506,7 @@ "Yaw": 94.0, "GUID": 1247, "MapID": 200057, - "IsChildObject": true + "IsChildObject": false }, { "Id": 486, @@ -15519,7 +15519,7 @@ "Yaw": 284.0, "GUID": 1248, "MapID": 200059, - "IsChildObject": true + "IsChildObject": false }, { "Id": 485, @@ -15532,7 +15532,7 @@ "Yaw": 194.0, "GUID": 1249, "MapID": 200058, - "IsChildObject": true + "IsChildObject": false }, { "Id": 648, @@ -15545,7 +15545,7 @@ "Yaw": 259.0, "GUID": 1250, "MapID": 200119, - "IsChildObject": true + "IsChildObject": false }, { "Id": 647, @@ -15558,7 +15558,7 @@ "Yaw": 112.0, "GUID": 1251, "MapID": 200118, - "IsChildObject": true + "IsChildObject": false }, { "Id": 646, @@ -15571,7 +15571,7 @@ "Yaw": 349.0, "GUID": 1252, "MapID": 200117, - "IsChildObject": true + "IsChildObject": false }, { "Id": 645, @@ -15584,7 +15584,7 @@ "Yaw": 184.0, "GUID": 1253, "MapID": 200116, - "IsChildObject": true + "IsChildObject": false }, { "Id": 636, @@ -15597,7 +15597,7 @@ "Yaw": 205.0, "GUID": 1254, "MapID": 200107, - "IsChildObject": true + "IsChildObject": false }, { "Id": 637, @@ -15610,7 +15610,7 @@ "Yaw": 25.0, "GUID": 1255, "MapID": 200108, - "IsChildObject": true + "IsChildObject": false }, { "Id": 634, @@ -15623,7 +15623,7 @@ "Yaw": 328.0, "GUID": 1256, "MapID": 200105, - "IsChildObject": true + "IsChildObject": false }, { "Id": 635, @@ -15636,7 +15636,7 @@ "Yaw": 108.0, "GUID": 1257, "MapID": 200106, - "IsChildObject": true + "IsChildObject": false }, { "Id": 618, @@ -15649,7 +15649,7 @@ "Yaw": 90.0, "GUID": 1258, "MapID": 200090, - "IsChildObject": true + "IsChildObject": false }, { "Id": 398, @@ -15662,7 +15662,7 @@ "Yaw": 0.0, "GUID": 1259, "MapID": 200032, - "IsChildObject": true + "IsChildObject": false }, { "Id": 597, @@ -15675,7 +15675,7 @@ "Yaw": 0.0, "GUID": 1260, "MapID": 200082, - "IsChildObject": true + "IsChildObject": false }, { "Id": 627, @@ -15688,7 +15688,7 @@ "Yaw": 324.0, "GUID": 1261, "MapID": 200099, - "IsChildObject": true + "IsChildObject": false }, { "Id": 628, @@ -15701,7 +15701,7 @@ "Yaw": 4.0, "GUID": 1262, "MapID": 200100, - "IsChildObject": true + "IsChildObject": false }, { "Id": 664, @@ -15714,7 +15714,7 @@ "Yaw": 0.0, "GUID": 1263, "MapID": 200134, - "IsChildObject": true + "IsChildObject": false }, { "Id": 497, @@ -15727,7 +15727,7 @@ "Yaw": 0.0, "GUID": 1264, "MapID": 200070, - "IsChildObject": true + "IsChildObject": false }, { "Id": 614, @@ -15740,7 +15740,7 @@ "Yaw": 68.0, "GUID": 1265, "MapID": 200086, - "IsChildObject": true + "IsChildObject": false }, { "Id": 613, @@ -15753,7 +15753,7 @@ "Yaw": 259.0, "GUID": 1266, "MapID": 200085, - "IsChildObject": true + "IsChildObject": false }, { "Id": 483, @@ -15766,7 +15766,7 @@ "Yaw": 317.0, "GUID": 1267, "MapID": 200056, - "IsChildObject": true + "IsChildObject": false }, { "Id": 623, @@ -15779,7 +15779,7 @@ "Yaw": 0.0, "GUID": 1268, "MapID": 200095, - "IsChildObject": true + "IsChildObject": false }, { "Id": 470, @@ -15792,7 +15792,7 @@ "Yaw": 277.0, "GUID": 1269, "MapID": 200046, - "IsChildObject": true + "IsChildObject": false }, { "Id": 469, @@ -15805,7 +15805,7 @@ "Yaw": 137.0, "GUID": 1270, "MapID": 200045, - "IsChildObject": true + "IsChildObject": false }, { "Id": 616, @@ -15818,7 +15818,7 @@ "Yaw": 0.0, "GUID": 1271, "MapID": 200088, - "IsChildObject": true + "IsChildObject": false }, { "Id": 495, @@ -15831,7 +15831,7 @@ "Yaw": 180.0, "GUID": 1272, "MapID": 200068, - "IsChildObject": true + "IsChildObject": false }, { "Id": 494, @@ -15844,7 +15844,7 @@ "Yaw": 0.0, "GUID": 1273, "MapID": 200067, - "IsChildObject": true + "IsChildObject": false }, { "Id": 496, @@ -15857,7 +15857,7 @@ "Yaw": 356.0, "GUID": 1274, "MapID": 200069, - "IsChildObject": true + "IsChildObject": false }, { "Id": 367, @@ -15870,7 +15870,7 @@ "Yaw": 151.0, "GUID": 1275, "MapID": 200015, - "IsChildObject": true + "IsChildObject": false }, { "Id": 368, @@ -15883,7 +15883,7 @@ "Yaw": 112.0, "GUID": 1276, "MapID": 200016, - "IsChildObject": true + "IsChildObject": false }, { "Id": 699, @@ -15896,7 +15896,7 @@ "Yaw": 68.0, "GUID": 1277, "MapID": 200150, - "IsChildObject": true + "IsChildObject": false }, { "Id": 698, @@ -15909,7 +15909,7 @@ "Yaw": 68.0, "GUID": 1278, "MapID": 200149, - "IsChildObject": true + "IsChildObject": false }, { "Id": 700, @@ -15922,7 +15922,7 @@ "Yaw": 155.0, "GUID": 1279, "MapID": 200151, - "IsChildObject": true + "IsChildObject": false }, { "Id": 511, @@ -15935,7 +15935,7 @@ "Yaw": 180.0, "GUID": 1280, "MapID": 200081, - "IsChildObject": true + "IsChildObject": false }, { "Id": 649, @@ -15948,7 +15948,7 @@ "Yaw": 313.0, "GUID": 1281, "MapID": 200120, - "IsChildObject": true + "IsChildObject": false }, { "Id": 650, @@ -15961,7 +15961,7 @@ "Yaw": 126.0, "GUID": 1282, "MapID": 200121, - "IsChildObject": true + "IsChildObject": false }, { "Id": 657, @@ -15974,7 +15974,7 @@ "Yaw": 25.0, "GUID": 1283, "MapID": 200128, - "IsChildObject": true + "IsChildObject": false }, { "Id": 656, @@ -15987,7 +15987,7 @@ "Yaw": 144.0, "GUID": 1284, "MapID": 200127, - "IsChildObject": true + "IsChildObject": false }, { "Id": 655, @@ -16000,7 +16000,7 @@ "Yaw": 0.0, "GUID": 1285, "MapID": 200126, - "IsChildObject": true + "IsChildObject": false }, { "Id": 617, @@ -16013,7 +16013,7 @@ "Yaw": 0.0, "GUID": 1286, "MapID": 200089, - "IsChildObject": true + "IsChildObject": false }, { "Id": 642, @@ -16026,7 +16026,7 @@ "Yaw": 349.0, "GUID": 1287, "MapID": 200113, - "IsChildObject": true + "IsChildObject": false }, { "Id": 641, @@ -16039,7 +16039,7 @@ "Yaw": 65.0, "GUID": 1288, "MapID": 200112, - "IsChildObject": true + "IsChildObject": false }, { "Id": 640, @@ -16052,7 +16052,7 @@ "Yaw": 281.0, "GUID": 1289, "MapID": 200111, - "IsChildObject": true + "IsChildObject": false }, { "Id": 639, @@ -16065,7 +16065,7 @@ "Yaw": 230.0, "GUID": 1290, "MapID": 200110, - "IsChildObject": true + "IsChildObject": false }, { "Id": 713, @@ -16078,7 +16078,7 @@ "Yaw": 76.0, "GUID": 1291, "MapID": 200152, - "IsChildObject": true + "IsChildObject": false }, { "Id": 622, @@ -16091,7 +16091,7 @@ "Yaw": 169.0, "GUID": 1292, "MapID": 200094, - "IsChildObject": true + "IsChildObject": false }, { "Id": 327, @@ -16104,7 +16104,7 @@ "Yaw": 0.0, "GUID": 1293, "MapID": 200013, - "IsChildObject": true + "IsChildObject": false }, { "Id": 715, @@ -16117,7 +16117,7 @@ "Yaw": 0.0, "GUID": 1294, "MapID": 200154, - "IsChildObject": true + "IsChildObject": false }, { "Id": 626, @@ -16130,7 +16130,7 @@ "Yaw": 43.0, "GUID": 1295, "MapID": 200098, - "IsChildObject": true + "IsChildObject": false }, { "Id": 509, @@ -16143,7 +16143,7 @@ "Yaw": 86.0, "GUID": 1296, "MapID": 200079, - "IsChildObject": true + "IsChildObject": false }, { "Id": 508, @@ -16156,7 +16156,7 @@ "Yaw": 0.0, "GUID": 1297, "MapID": 200078, - "IsChildObject": true + "IsChildObject": false }, { "Id": 510, @@ -16169,7 +16169,7 @@ "Yaw": 162.0, "GUID": 1298, "MapID": 200080, - "IsChildObject": true + "IsChildObject": false }, { "Id": 320, @@ -16182,7 +16182,7 @@ "Yaw": 0.0, "GUID": 1299, "MapID": 200007, - "IsChildObject": true + "IsChildObject": false }, { "Id": 630, @@ -16195,7 +16195,7 @@ "Yaw": 4.0, "GUID": 1300, "MapID": 200102, - "IsChildObject": true + "IsChildObject": false }, { "Id": 638, @@ -16208,7 +16208,7 @@ "Yaw": 0.0, "GUID": 1301, "MapID": 200109, - "IsChildObject": true + "IsChildObject": false }, { "Id": 619, @@ -16221,7 +16221,7 @@ "Yaw": 0.0, "GUID": 1302, "MapID": 200091, - "IsChildObject": true + "IsChildObject": false }, { "Id": 620, @@ -16234,7 +16234,7 @@ "Yaw": 108.0, "GUID": 1303, "MapID": 200092, - "IsChildObject": true + "IsChildObject": false }, { "Id": 317, @@ -16247,7 +16247,7 @@ "Yaw": 0.0, "GUID": 1304, "MapID": 200004, - "IsChildObject": true + "IsChildObject": false }, { "Id": 468, @@ -16260,7 +16260,7 @@ "Yaw": 140.0, "GUID": 1305, "MapID": 200044, - "IsChildObject": true + "IsChildObject": false }, { "Id": 467, @@ -16273,7 +16273,7 @@ "Yaw": 220.0, "GUID": 1306, "MapID": 200043, - "IsChildObject": true + "IsChildObject": false }, { "Id": 491, @@ -16286,7 +16286,7 @@ "Yaw": 47.0, "GUID": 1307, "MapID": 200064, - "IsChildObject": true + "IsChildObject": false }, { "Id": 490, @@ -16299,7 +16299,7 @@ "Yaw": 148.0, "GUID": 1308, "MapID": 200063, - "IsChildObject": true + "IsChildObject": false }, { "Id": 370, @@ -16312,7 +16312,7 @@ "Yaw": 209.0, "GUID": 1309, "MapID": 200018, - "IsChildObject": true + "IsChildObject": false }, { "Id": 318, @@ -16325,7 +16325,7 @@ "Yaw": 0.0, "GUID": 1310, "MapID": 200005, - "IsChildObject": true + "IsChildObject": false }, { "Id": 474, @@ -16338,7 +16338,7 @@ "Yaw": 245.0, "GUID": 1311, "MapID": 200047, - "IsChildObject": true + "IsChildObject": false }, { "Id": 475, @@ -16351,7 +16351,7 @@ "Yaw": 137.0, "GUID": 1312, "MapID": 200048, - "IsChildObject": true + "IsChildObject": false }, { "Id": 507, @@ -16364,7 +16364,7 @@ "Yaw": 47.0, "GUID": 1313, "MapID": 200077, - "IsChildObject": true + "IsChildObject": false }, { "Id": 503, @@ -16377,7 +16377,7 @@ "Yaw": 227.0, "GUID": 1314, "MapID": 200076, - "IsChildObject": true + "IsChildObject": false }, { "Id": 659, @@ -16390,7 +16390,7 @@ "Yaw": 58.0, "GUID": 1315, "MapID": 200130, - "IsChildObject": true + "IsChildObject": false }, { "Id": 658, @@ -16403,7 +16403,7 @@ "Yaw": 238.0, "GUID": 1316, "MapID": 200129, - "IsChildObject": true + "IsChildObject": false }, { "Id": 643, @@ -16416,7 +16416,7 @@ "Yaw": 36.0, "GUID": 1317, "MapID": 200114, - "IsChildObject": true + "IsChildObject": false }, { "Id": 644, @@ -16429,7 +16429,7 @@ "Yaw": 97.0, "GUID": 1318, "MapID": 200115, - "IsChildObject": true + "IsChildObject": false }, { "Id": 714, @@ -16442,7 +16442,7 @@ "Yaw": 119.0, "GUID": 1319, "MapID": 200153, - "IsChildObject": true + "IsChildObject": false }, { "Id": 673, @@ -16455,7 +16455,7 @@ "Yaw": 252.0, "GUID": 1320, "MapID": 200143, - "IsChildObject": true + "IsChildObject": false }, { "Id": 672, @@ -16468,7 +16468,7 @@ "Yaw": 54.0, "GUID": 1321, "MapID": 200142, - "IsChildObject": true + "IsChildObject": false }, { "Id": 599, @@ -16481,7 +16481,7 @@ "Yaw": 83.0, "GUID": 1322, "MapID": 200084, - "IsChildObject": true + "IsChildObject": false }, { "Id": 598, @@ -16494,7 +16494,7 @@ "Yaw": 274.0, "GUID": 1323, "MapID": 200083, - "IsChildObject": true + "IsChildObject": false }, { "Id": 629, @@ -16507,7 +16507,7 @@ "Yaw": 180.0, "GUID": 1324, "MapID": 200101, - "IsChildObject": true + "IsChildObject": false }, { "Id": 489, @@ -16520,7 +16520,7 @@ "Yaw": 79.0, "GUID": 1325, "MapID": 200062, - "IsChildObject": true + "IsChildObject": false }, { "Id": 369, @@ -16533,7 +16533,7 @@ "Yaw": 29.0, "GUID": 1326, "MapID": 200017, - "IsChildObject": true + "IsChildObject": false }, { "Id": 615, @@ -16546,7 +16546,7 @@ "Yaw": 32.0, "GUID": 1327, "MapID": 200087, - "IsChildObject": true + "IsChildObject": false }, { "Id": 596, diff --git a/src/main/resources/zonemaps/ugd03.json b/src/main/resources/zonemaps/ugd03.json index 6c34591c..21fec032 100644 --- a/src/main/resources/zonemaps/ugd03.json +++ b/src/main/resources/zonemaps/ugd03.json @@ -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, diff --git a/src/main/resources/zonemaps/ugd04.json b/src/main/resources/zonemaps/ugd04.json index 6721a897..5191a3c1 100644 --- a/src/main/resources/zonemaps/ugd04.json +++ b/src/main/resources/zonemaps/ugd04.json @@ -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, diff --git a/src/main/resources/zonemaps/ugd05.json b/src/main/resources/zonemaps/ugd05.json index 4333a098..950d14ba 100644 --- a/src/main/resources/zonemaps/ugd05.json +++ b/src/main/resources/zonemaps/ugd05.json @@ -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, diff --git a/src/main/resources/zonemaps/ugd06.json b/src/main/resources/zonemaps/ugd06.json index 8e727589..f1279994 100644 --- a/src/main/resources/zonemaps/ugd06.json +++ b/src/main/resources/zonemaps/ugd06.json @@ -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, diff --git a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala index a5910e79..2db48a94 100644 --- a/src/main/scala/net/psforever/objects/GlobalDefinitions.scala +++ b/src/main/scala/net/psforever/objects/GlobalDefinitions.scala @@ -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 = 1350 + crystals_vehicle_a.HealAmount = 40 + 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 = 1350 + crystals_vehicle_b.HealAmount = 40 + 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 = 500 + 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 diff --git a/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala b/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala index fb602c05..788f2446 100644 --- a/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala +++ b/src/main/scala/net/psforever/objects/equipment/EffectTarget.scala @@ -39,6 +39,20 @@ 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 + } + /** * To repair at this silo, the vehicle: * can not be a flight vehicle, diff --git a/src/main/scala/net/psforever/zones/Zones.scala b/src/main/scala/net/psforever/zones/Zones.scala index f3fba024..b06eaecf 100644 --- a/src/main/scala/net/psforever/zones/Zones.scala +++ b/src/main/scala/net/psforever/zones/Zones.scala @@ -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 + 1, + ProximityTerminal.Constructor(obj.position, GlobalDefinitions.crystals_energy), + owningBuildingGuid = ownerGuid + ) case _ => ; }