diff --git a/scripts/gcwzones.py b/scripts/gcwzones.py index bd96b3a6..5393ce01 100644 --- a/scripts/gcwzones.py +++ b/scripts/gcwzones.py @@ -4,413 +4,413 @@ def addZones(core): gcwService = core.gcwService - gcwService.addZone('corellia', 'corellia_airspace', 0, 0, 0, 0xEEF42002, 0) - gcwService.addZone('corellia', 'corellia_pve', 0, 0, 0, 0x53645205, 0) - gcwService.addZone('corellia', 'corellia_pvp', 0, 0, 0, 0x53645205, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_1', -5880, 5200, 1500, 0xEEF42002, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_10', -142, -4482, 1750, 0x53645205, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_11', 3338, -5382, 1750, 0xEEF42002, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_12', 6618, -5602, 1382, 0xEEF42002, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_13', 0, 0, 0, 0xEEF42002, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_14', 0, 0, 0, 0x53645205, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_2', -3472, 3228, 1500, 0xEEF42002, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_3', -1032, 5708, 1750, 0xEEF42002, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_4', -302, 2178, 1750, 0xEDF42002, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_5', 2718, 5038, 2000, 0xEDF42002, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_6', -5312, -2232, 2000, 0xEDF42002, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_7', -1592, -1172, 1750, 0xEDF42002, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_8', 2708, -1092, 2500, 0xEDF42002, 0) - gcwService.addZone('corellia', 'gcw_region_corellia_9', -5612, -6472, 1500, 0xEDF42002, 0) - gcwService.addZone('corellia', 'space_corellia_space_pve', 0, 0, 0, 0x52645205, 0) - gcwService.addZone('corellia', 'space_corellia_space_pvp', 0, 0, 0, 0x52645205, 0) + gcwService.addZone('corellia', 'corellia_airspace', 0, 0, 0, 35714286, 0) + gcwService.addZone('corellia', 'corellia_pve', 0, 0, 0, 89285715, 0) + gcwService.addZone('corellia', 'corellia_pvp', 0, 0, 0, 89285715, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_1', -5880, 5200, 1500, 35714286, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_10', -142, -4482, 1750, 89285715, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_11', 3338, -5382, 1750, 35714286, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_12', 6618, -5602, 1382, 35714286, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_13', 0, 0, 0, 35714286, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_14', 0, 0, 0, 89285715, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_2', -3472, 3228, 1500, 35714286, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_3', -1032, 5708, 1750, 35714286, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_4', -302, 2178, 1750, 35714285, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_5', 2718, 5038, 2000, 35714285, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_6', -5312, -2232, 2000, 35714285, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_7', -1592, -1172, 1750, 35714285, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_8', 2708, -1092, 2500, 35714285, 0) + gcwService.addZone('corellia', 'gcw_region_corellia_9', -5612, -6472, 1500, 35714285, 0) + gcwService.addZone('corellia', 'space_corellia_space_pve', 0, 0, 0, 89285714, 0) + gcwService.addZone('corellia', 'space_corellia_space_pvp', 0, 0, 0, 89285714, 0) - gcwService.addZone('dantooine', 'dantooine_airspace', 0, 0, 0, 0x423F0502, 0) - gcwService.addZone('dantooine', 'dantooine_pve', 0, 0, 0, 0x231E0D05, 0) - gcwService.addZone('dantooine', 'dantooine_pvp', 0, 0, 0, 0x231E0D05, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_1', -5320, 4440, 2500, 0x423F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_10', 6388, 2248, 1500, 0x423F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_11', -5972, -5532, 1750, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_12', -2692, -6172, 1500, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_13', 1588, -6552, 1400, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_14', 4439, -4461, 2011, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_15', 6839, -2161, 1161, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_16', 0, 0, 0, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_17', 0, 0, 0, 0x221E0D05, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_2', -932, 5708, 2000, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_3', -6532, -252, 1468, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_4', -3352, 628, 1750, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_5', -522, 2238, 1350, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_6', 2878, 3678, 2250, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_7', -4462, -2482, 1500, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_8', -112, -2652, 2800, 0x413F0502, 0) - gcwService.addZone('dantooine', 'gcw_region_dantooine_9', 4108, -352, 1900, 0x413F0502, 0) - gcwService.addZone('dantooine', 'space_dantooine_space_pve', 0, 0, 0, 0x221E0D05, 0) - gcwService.addZone('dantooine', 'space_dantooine_space_pvp', 0, 0, 0, 0x221E0D05, 0) + gcwService.addZone('dantooine', 'dantooine_airspace', 0, 0, 0, 33898306, 0) + gcwService.addZone('dantooine', 'dantooine_pve', 0, 0, 0, 84745763, 0) + gcwService.addZone('dantooine', 'dantooine_pvp', 0, 0, 0, 84745763, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_1', -5320, 4440, 2500, 33898306, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_10', 6388, 2248, 1500, 33898306, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_11', -5972, -5532, 1750, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_12', -2692, -6172, 1500, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_13', 1588, -6552, 1400, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_14', 4439, -4461, 2011, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_15', 6839, -2161, 1161, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_16', 0, 0, 0, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_17', 0, 0, 0, 84745762, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_2', -932, 5708, 2000, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_3', -6532, -252, 1468, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_4', -3352, 628, 1750, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_5', -522, 2238, 1350, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_6', 2878, 3678, 2250, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_7', -4462, -2482, 1500, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_8', -112, -2652, 2800, 33898305, 0) + gcwService.addZone('dantooine', 'gcw_region_dantooine_9', 4108, -352, 1900, 33898305, 0) + gcwService.addZone('dantooine', 'space_dantooine_space_pve', 0, 0, 0, 84745762, 0) + gcwService.addZone('dantooine', 'space_dantooine_space_pvp', 0, 0, 0, 84745762, 0) - gcwService.addZone('dathomir', 'dathomir_airspace', 0, 0, 0, 0x47625602, 0) - gcwService.addZone('dathomir', 'dathomir_pve', 0, 0, 0, 0xB0F5D705, 0) - gcwService.addZone('dathomir', 'dathomir_pvp', 0, 0, 0, 0xB0F5D705, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_1', -6400, 940, 1250, 0x47625602, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_10', 4458, -942, 1750, 0x47625602, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_11', 6918, 838, 1082, 0x47625602, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_12', 0, 0, 0, 0xB0F5D705, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_13', 0, 0, 0, 0x46625602, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_2', -3922, 2698, 1750, 0x46625602, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_3', -1432, 4908, 1500, 0x46625602, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_4', 1958, 4878, 1500, 0x46625602, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_5', -3922, -882, 1750, 0x46625602, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_6', 238, 898, 2750, 0x46625602, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_7', 4478, 2658, 1750, 0x46625602, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_8', -1432, -3102, 1500, 0x46625602, 0) - gcwService.addZone('dathomir', 'gcw_region_dathomir_9', 1958, -3132, 1500, 0x46625602, 0) - gcwService.addZone('dathomir', 'space_dathomir_space_pve', 0, 0, 0, 0xAFF5D705, 0) - gcwService.addZone('dathomir', 'space_dathomir_space_pvp', 0, 0, 0, 0xAFF5D705, 0) + gcwService.addZone('dathomir', 'dathomir_airspace', 0, 0, 0, 39215687, 0) + gcwService.addZone('dathomir', 'dathomir_pve', 0, 0, 0, 98039216, 0) + gcwService.addZone('dathomir', 'dathomir_pvp', 0, 0, 0, 98039216, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_1', -6400, 940, 1250, 39215687, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_10', 4458, -942, 1750, 39215687, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_11', 6918, 838, 1082, 39215687, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_12', 0, 0, 0, 98039216, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_13', 0, 0, 0, 39215686, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_2', -3922, 2698, 1750, 39215686, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_3', -1432, 4908, 1500, 39215686, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_4', 1958, 4878, 1500, 39215686, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_5', -3922, -882, 1750, 39215686, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_6', 238, 898, 2750, 39215686, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_7', 4478, 2658, 1750, 39215686, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_8', -1432, -3102, 1500, 39215686, 0) + gcwService.addZone('dathomir', 'gcw_region_dathomir_9', 1958, -3132, 1500, 39215686, 0) + gcwService.addZone('dathomir', 'space_dathomir_space_pve', 0, 0, 0, 98039215, 0) + gcwService.addZone('dathomir', 'space_dathomir_space_pvp', 0, 0, 0, 98039215, 0) - gcwService.addZone('endor', 'endor_airspace', 0, 0, 0, 0x4F80D501, 0) - gcwService.addZone('endor', 'endor_pve', 0, 0, 0, 0xC5C09504, 0) - gcwService.addZone('endor', 'endor_pvp', 0, 0, 0, 0xC5C09504, 0) - gcwService.addZone('endor', 'endor_pvp_battlefield', 0, 0, 0, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_1', -7100, 7080, 750, 0xC5C09504, 0) - gcwService.addZone('endor', 'gcw_region_endor_10', -6502, -6982, 750, 0xC5C09504, 0) - gcwService.addZone('endor', 'gcw_region_endor_11', -1932, -5432, 2000, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_12', 1398, -4842, 1250, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_13', 3368, -3552, 1000, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_14', 5848, -5352, 2000, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_15', 0, 0, 0, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_16', 0, 0, 0, 0xC5C09504, 0) - gcwService.addZone('endor', 'gcw_region_endor_2', -3542, 3258, 2000, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_3', -882, 1578, 1000, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_4', 1058, 2918, 1250, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_5', 4268, 3688, 2000, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_6', -1812, -1372, 2000, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_7', 1038, 318, 1250, 0x4F80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_8', 4268, -352, 2000, 0x4E80D501, 0) - gcwService.addZone('endor', 'gcw_region_endor_9', 1438, -2242, 1250, 0x4E80D501, 0) - gcwService.addZone('endor', 'space_endor_space_pve', 0, 0, 0, 0xC4C09504, 0) - gcwService.addZone('endor', 'space_endor_space_pvp', 0, 0, 0, 0xC4C09504, 0) + gcwService.addZone('endor', 'endor_airspace', 0, 0, 0, 30769231, 0) + gcwService.addZone('endor', 'endor_pve', 0, 0, 0, 76923077, 0) + gcwService.addZone('endor', 'endor_pvp', 0, 0, 0, 76923077, 0) + gcwService.addZone('endor', 'endor_pvp_battlefield', 0, 0, 0, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_1', -7100, 7080, 750, 76923077, 0) + gcwService.addZone('endor', 'gcw_region_endor_10', -6502, -6982, 750, 76923077, 0) + gcwService.addZone('endor', 'gcw_region_endor_11', -1932, -5432, 2000, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_12', 1398, -4842, 1250, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_13', 3368, -3552, 1000, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_14', 5848, -5352, 2000, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_15', 0, 0, 0, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_16', 0, 0, 0, 76923077, 0) + gcwService.addZone('endor', 'gcw_region_endor_2', -3542, 3258, 2000, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_3', -882, 1578, 1000, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_4', 1058, 2918, 1250, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_5', 4268, 3688, 2000, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_6', -1812, -1372, 2000, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_7', 1038, 318, 1250, 30769231, 0) + gcwService.addZone('endor', 'gcw_region_endor_8', 4268, -352, 2000, 30769230, 0) + gcwService.addZone('endor', 'gcw_region_endor_9', 1438, -2242, 1250, 30769230, 0) + gcwService.addZone('endor', 'space_endor_space_pve', 0, 0, 0, 76923076, 0) + gcwService.addZone('endor', 'space_endor_space_pvp', 0, 0, 0, 76923076, 0) - gcwService.addZone('galaxy', 'corellia_airspace', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'corellia_pve', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'corellia_pvp', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'dantooine_airspace', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'dantooine_pve', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'dantooine_pvp', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'dathomir_airspace', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'dathomir_pve', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'dathomir_pvp', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'endor_airspace', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'endor_pve', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'endor_pvp', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'endor_pvp_battlefield', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_1', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_10', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_11', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_12', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_13', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_14', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_2', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_3', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_4', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_5', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_6', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_7', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_8', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_corellia_9', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_1', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_10', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_11', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_12', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_13', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_14', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_15', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_16', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_17', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_2', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_3', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_4', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_5', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_6', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_7', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_8', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dantooine_9', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_1', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_10', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_11', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_12', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_13', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_2', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_3', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_4', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_5', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_6', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_7', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_8', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_dathomir_9', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_1', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_10', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_11', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_12', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_13', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_14', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_15', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_16', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_2', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_3', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_4', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_5', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_6', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_7', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_8', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_endor_9', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_1', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_10', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_11', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_12', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_13', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_14', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_2', 0, 0, 0, 0x93158600, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_3', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_4', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_5', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_6', 0, 0, 0, 0x3BA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_7', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_8', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_lok_9', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_1', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_10', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_11', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_12', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_13', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_14', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_2', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_3', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_4', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_5', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_6', 0, 0, 0, 0xE988D600, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_7', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_8', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_naboo_9', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_1', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_10', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_11', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_12', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_13', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_2', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_3', 0, 0, 0, 0xE988D600, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_4', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_5', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_6', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_7', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_8', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_rori_9', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_1', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_10', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_11', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_12', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_13', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_14', 0, 0, 0, 0xE988D600, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_15', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_16', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_2', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_3', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_4', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_5', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_6', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_7', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_8', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_talus_9', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_1', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_10', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_11', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_12', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_13', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_2', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_3', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_4', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_5', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_6', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_7', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_8', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_tatooine_9', 0, 0, 0, 0xE988D600, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_1', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_10', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_11', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_12', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_13', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_14', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_15', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_16', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_17', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_18', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_2', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_3', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_4', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_5', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_6', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_7', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_8', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'gcw_region_yavin4_9', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'lok_airspace', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'lok_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'lok_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'naboo_airspace', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'naboo_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'naboo_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'rori_airspace', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'rori_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'rori_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_corellia_space_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_corellia_space_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_dantooine_space_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_dantooine_space_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_dathomir_space_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_dathomir_space_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_endor_space_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_endor_space_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_lok_space_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_lok_space_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_naboo_space_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_naboo_space_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_tatooine_space_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_tatooine_space_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_yavin4_space_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'space_yavin4_space_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'talus_airspace', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'talus_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'talus_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'tatooine_airspace', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'tatooine_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'tatooine_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'yavin4_airspace', 0, 0, 0, 0x3AA23500, 0) - gcwService.addZone('galaxy', 'yavin4_pve', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'yavin4_pvp', 0, 0, 0, 0x92158600, 0) - gcwService.addZone('galaxy', 'yavin4_pvp_battlefield', 0, 0, 0, 0x3AA23500, 0) + gcwService.addZone('galaxy', 'corellia_airspace', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'corellia_pve', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'corellia_pvp', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'dantooine_airspace', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'dantooine_pve', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'dantooine_pvp', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'dathomir_airspace', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'dathomir_pve', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'dathomir_pvp', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'endor_airspace', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'endor_pve', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'endor_pvp', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'endor_pvp_battlefield', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_1', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_10', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_11', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_12', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_13', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_14', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_2', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_3', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_4', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_5', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_6', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_7', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_8', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_corellia_9', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_1', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_10', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_11', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_12', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_13', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_14', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_15', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_16', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_17', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_2', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_3', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_4', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_5', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_6', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_7', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_8', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dantooine_9', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_1', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_10', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_11', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_12', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_13', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_2', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_3', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_4', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_5', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_6', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_7', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_8', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_dathomir_9', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_1', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_10', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_11', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_12', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_13', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_14', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_15', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_16', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_2', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_3', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_4', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_5', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_6', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_7', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_8', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_endor_9', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_1', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_10', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_11', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_12', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_13', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_14', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_2', 0, 0, 0, 8787347, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_3', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_4', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_5', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_6', 0, 0, 0, 3514939, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_7', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_8', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_lok_9', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_1', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_10', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_11', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_12', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_13', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_14', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_2', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_3', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_4', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_5', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_6', 0, 0, 0, 14059753, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_7', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_8', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_naboo_9', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_1', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_10', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_11', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_12', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_13', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_2', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_3', 0, 0, 0, 14059753, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_4', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_5', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_6', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_7', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_8', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_rori_9', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_1', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_10', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_11', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_12', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_13', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_14', 0, 0, 0, 14059753, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_15', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_16', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_2', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_3', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_4', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_5', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_6', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_7', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_8', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_talus_9', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_1', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_10', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_11', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_12', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_13', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_2', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_3', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_4', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_5', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_6', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_7', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_8', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_tatooine_9', 0, 0, 0, 14059753, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_1', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_10', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_11', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_12', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_13', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_14', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_15', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_16', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_17', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_18', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_2', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_3', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_4', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_5', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_6', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_7', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_8', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'gcw_region_yavin4_9', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'lok_airspace', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'lok_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'lok_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'naboo_airspace', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'naboo_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'naboo_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'rori_airspace', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'rori_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'rori_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_corellia_space_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_corellia_space_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_dantooine_space_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_dantooine_space_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_dathomir_space_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_dathomir_space_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_endor_space_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_endor_space_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_lok_space_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_lok_space_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_naboo_space_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_naboo_space_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_tatooine_space_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_tatooine_space_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_yavin4_space_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'space_yavin4_space_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'talus_airspace', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'talus_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'talus_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'tatooine_airspace', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'tatooine_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'tatooine_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'yavin4_airspace', 0, 0, 0, 3514938, 0) + gcwService.addZone('galaxy', 'yavin4_pve', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'yavin4_pvp', 0, 0, 0, 8787346, 0) + gcwService.addZone('galaxy', 'yavin4_pvp_battlefield', 0, 0, 0, 3514938, 0) - gcwService.addZone('lok', 'gcw_region_lok_1', -4780, 3560, 2000, 0xEEF42002, 0) - gcwService.addZone('lok', 'gcw_region_lok_10', 5268, 588, 2000, 0xEEF42002, 0) - gcwService.addZone('lok', 'gcw_region_lok_11', 1588, -5412, 2000, 0xEEF42002, 0) - gcwService.addZone('lok', 'gcw_region_lok_12', 5188, -3452, 2000, 0xEEF42002, 0) - gcwService.addZone('lok', 'gcw_region_lok_13', 0, 0, 0, 0xEEF42002, 0) - gcwService.addZone('lok', 'gcw_region_lok_14', 0, 0, 0, 0x53645205, 0) - gcwService.addZone('lok', 'gcw_region_lok_2', -1192, 5428, 2000, 0x53645205, 0) - gcwService.addZone('lok', 'gcw_region_lok_3', -4832, -472, 2000, 0xEEF42002, 0) - gcwService.addZone('lok', 'gcw_region_lok_4', -1272, 1408, 2000, 0xEEF42002, 0) - gcwService.addZone('lok', 'gcw_region_lok_5', 2288, 3348, 2000, 0xEEF42002, 0) - gcwService.addZone('lok', 'gcw_region_lok_6', 5948, 5008, 2000, 0xEEF42002, 0) - gcwService.addZone('lok', 'gcw_region_lok_7', -5652, -4732, 2000, 0xEDF42002, 0) - gcwService.addZone('lok', 'gcw_region_lok_8', -1892, -3252, 2000, 0xEDF42002, 0) - gcwService.addZone('lok', 'gcw_region_lok_9', 1728, -1372, 2000, 0xEDF42002, 0) - gcwService.addZone('lok', 'lok_airspace', 0, 0, 0, 0xEDF42002, 0) - gcwService.addZone('lok', 'lok_pve', 0, 0, 0, 0x52645205, 0) - gcwService.addZone('lok', 'lok_pvp', 0, 0, 0, 0x52645205, 0) - gcwService.addZone('lok', 'space_lok_space_pve', 0, 0, 0, 0x52645205, 0) - gcwService.addZone('lok', 'space_lok_space_pvp', 0, 0, 0, 0x52645205, 0) + gcwService.addZone('lok', 'gcw_region_lok_1', -4780, 3560, 2000, 35714286, 0) + gcwService.addZone('lok', 'gcw_region_lok_10', 5268, 588, 2000, 35714286, 0) + gcwService.addZone('lok', 'gcw_region_lok_11', 1588, -5412, 2000, 35714286, 0) + gcwService.addZone('lok', 'gcw_region_lok_12', 5188, -3452, 2000, 35714286, 0) + gcwService.addZone('lok', 'gcw_region_lok_13', 0, 0, 0, 35714286, 0) + gcwService.addZone('lok', 'gcw_region_lok_14', 0, 0, 0, 89285715, 0) + gcwService.addZone('lok', 'gcw_region_lok_2', -1192, 5428, 2000, 89285715, 0) + gcwService.addZone('lok', 'gcw_region_lok_3', -4832, -472, 2000, 35714286, 0) + gcwService.addZone('lok', 'gcw_region_lok_4', -1272, 1408, 2000, 35714286, 0) + gcwService.addZone('lok', 'gcw_region_lok_5', 2288, 3348, 2000, 35714286, 0) + gcwService.addZone('lok', 'gcw_region_lok_6', 5948, 5008, 2000, 35714286, 0) + gcwService.addZone('lok', 'gcw_region_lok_7', -5652, -4732, 2000, 35714285, 0) + gcwService.addZone('lok', 'gcw_region_lok_8', -1892, -3252, 2000, 35714285, 0) + gcwService.addZone('lok', 'gcw_region_lok_9', 1728, -1372, 2000, 35714285, 0) + gcwService.addZone('lok', 'lok_airspace', 0, 0, 0, 35714285, 0) + gcwService.addZone('lok', 'lok_pve', 0, 0, 0, 89285714, 0) + gcwService.addZone('lok', 'lok_pvp', 0, 0, 0, 89285714, 0) + gcwService.addZone('lok', 'space_lok_space_pve', 0, 0, 0, 89285714, 0) + gcwService.addZone('lok', 'space_lok_space_pvp', 0, 0, 0, 89285714, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_1', -5340, 4380, 2250, 0x2A8CCE04, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_10', 1118, -3342, 2250, 0x1138EC01, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_11', 4868, -1852, 1700, 0x1138EC01, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_12', 4638, -5342, 1750, 0x1138EC01, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_13', 0, 0, 0, 0x1138EC01, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_14', 0, 0, 0, 0x2A8CCE04, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_2', -1682, 5658, 1650, 0x1138EC01, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_3', 1978, 6734, 1266, 0x1138EC01, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_4', 5378, 5678, 2000, 0x1038EC01, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_5', -2442, 518, 2250, 0x1038EC01, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_6', 1358, 3018, 2250, 0x42E0B007, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_7', 5358, 1738, 1850, 0x1038EC01, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_8', -4752, -3392, 2000, 0x1038EC01, 0) - gcwService.addZone('naboo', 'gcw_region_naboo_9', -1972, -5612, 1500, 0x1038EC01, 0) - gcwService.addZone('naboo', 'naboo_airspace', 0, 0, 0, 0x1038EC01, 0) - gcwService.addZone('naboo', 'naboo_pve', 0, 0, 0, 0x298CCE04, 0) - gcwService.addZone('naboo', 'naboo_pvp', 0, 0, 0, 0x298CCE04, 0) - gcwService.addZone('naboo', 'space_naboo_space_pve', 0, 0, 0, 0x298CCE04, 0) - gcwService.addZone('naboo', 'space_naboo_space_pvp', 0, 0, 0, 0x298CCE04, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_1', -5340, 4380, 2250, 80645162, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_10', 1118, -3342, 2250, 32258065, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_11', 4868, -1852, 1700, 32258065, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_12', 4638, -5342, 1750, 32258065, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_13', 0, 0, 0, 32258065, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_14', 0, 0, 0, 80645162, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_2', -1682, 5658, 1650, 32258065, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_3', 1978, 6734, 1266, 32258065, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_4', 5378, 5678, 2000, 32258064, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_5', -2442, 518, 2250, 32258064, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_6', 1358, 3018, 2250, 129032258, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_7', 5358, 1738, 1850, 32258064, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_8', -4752, -3392, 2000, 32258064, 0) + gcwService.addZone('naboo', 'gcw_region_naboo_9', -1972, -5612, 1500, 32258064, 0) + gcwService.addZone('naboo', 'naboo_airspace', 0, 0, 0, 32258064, 0) + gcwService.addZone('naboo', 'naboo_pve', 0, 0, 0, 80645161, 0) + gcwService.addZone('naboo', 'naboo_pvp', 0, 0, 0, 80645161, 0) + gcwService.addZone('naboo', 'space_naboo_space_pve', 0, 0, 0, 80645161, 0) + gcwService.addZone('naboo', 'space_naboo_space_pvp', 0, 0, 0, 80645161, 0) - gcwService.addZone('rori', 'gcw_region_naboo_14', 0, 0, 0, 0x231E0D05, 0) - gcwService.addZone('rori', 'gcw_region_rori_1', -4780, 6000, 1900, 0x423F0502, 0) - gcwService.addZone('rori', 'gcw_region_rori_10', 4648, -1852, 1900, 0x423F0502, 0) - gcwService.addZone('rori', 'gcw_region_rori_11', -4772, -5512, 1900, 0x423F0502, 0) - gcwService.addZone('rori', 'gcw_region_rori_12', 5128, -5792, 2000, 0x423F0502, 0) - gcwService.addZone('rori', 'gcw_region_rori_13', 0, 0, 0, 0x413F0502, 0) - gcwService.addZone('rori', 'gcw_region_rori_2', 168, 4588, 3100, 0x413F0502, 0) - gcwService.addZone('rori', 'gcw_region_rori_3', 5088, 5808, 1900, 0x04FD1408, 0) - gcwService.addZone('rori', 'gcw_region_rori_4', -4312, 2188, 1900, 0x413F0502, 0) - gcwService.addZone('rori', 'gcw_region_rori_5', -1522, 198, 1300, 0x413F0502, 0) - gcwService.addZone('rori', 'gcw_region_rori_6', 1378, 138, 1300, 0x413F0502, 0) - gcwService.addZone('rori', 'gcw_region_rori_7', 4508, 2008, 1900, 0x413F0502, 0) - gcwService.addZone('rori', 'gcw_region_rori_8', -4292, -1652, 1900, 0x413F0502, 0) - gcwService.addZone('rori', 'gcw_region_rori_9', 148, -4192, 3100, 0x413F0502, 0) - gcwService.addZone('rori', 'rori_airspace', 0, 0, 0, 0x413F0502, 0) - gcwService.addZone('rori', 'rori_pve', 0, 0, 0, 0x221E0D05, 0) - gcwService.addZone('rori', 'rori_pvp', 0, 0, 0, 0x221E0D05, 0) - gcwService.addZone('rori', 'space_naboo_space_pve', 0, 0, 0, 0x221E0D05, 0) - gcwService.addZone('rori', 'space_naboo_space_pvp', 0, 0, 0, 0x221E0D05, 0) + gcwService.addZone('rori', 'gcw_region_naboo_14', 0, 0, 0, 84745763, 0) + gcwService.addZone('rori', 'gcw_region_rori_1', -4780, 6000, 1900, 33898306, 0) + gcwService.addZone('rori', 'gcw_region_rori_10', 4648, -1852, 1900, 33898306, 0) + gcwService.addZone('rori', 'gcw_region_rori_11', -4772, -5512, 1900, 33898306, 0) + gcwService.addZone('rori', 'gcw_region_rori_12', 5128, -5792, 2000, 33898306, 0) + gcwService.addZone('rori', 'gcw_region_rori_13', 0, 0, 0, 33898305, 0) + gcwService.addZone('rori', 'gcw_region_rori_2', 168, 4588, 3100, 33898305, 0) + gcwService.addZone('rori', 'gcw_region_rori_3', 5088, 5808, 1900, 135593220, 0) + gcwService.addZone('rori', 'gcw_region_rori_4', -4312, 2188, 1900, 33898305, 0) + gcwService.addZone('rori', 'gcw_region_rori_5', -1522, 198, 1300, 33898305, 0) + gcwService.addZone('rori', 'gcw_region_rori_6', 1378, 138, 1300, 33898305, 0) + gcwService.addZone('rori', 'gcw_region_rori_7', 4508, 2008, 1900, 33898305, 0) + gcwService.addZone('rori', 'gcw_region_rori_8', -4292, -1652, 1900, 33898305, 0) + gcwService.addZone('rori', 'gcw_region_rori_9', 148, -4192, 3100, 33898305, 0) + gcwService.addZone('rori', 'rori_airspace', 0, 0, 0, 33898305, 0) + gcwService.addZone('rori', 'rori_pve', 0, 0, 0, 84745762, 0) + gcwService.addZone('rori', 'rori_pvp', 0, 0, 0, 84745762, 0) + gcwService.addZone('rori', 'space_naboo_space_pve', 0, 0, 0, 84745762, 0) + gcwService.addZone('rori', 'space_naboo_space_pvp', 0, 0, 0, 84745762, 0) - gcwService.addZone('talus', 'gcw_region_corellia_14', 0, 0, 0, 0xC5C09504, 0) - gcwService.addZone('talus', 'gcw_region_talus_1', -3280, 5480, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_10', 528, 508, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_11', 3548, -772, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_12', 6448, -1992, 1500, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_13', -2812, -4052, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_14', 558, -3002, 1850, 0x3C015607, 0) - gcwService.addZone('talus', 'gcw_region_talus_15', 3968, -3972, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_16', 0, 0, 0, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_2', 468, 5488, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_3', 4368, 5488, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_4', -5072, 1108, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_5', -2112, 2448, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_6', 3108, 2488, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_7', 6108, 1268, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_8', -5432, -2132, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'gcw_region_talus_9', -2412, -812, 1600, 0x4F80D501, 0) - gcwService.addZone('talus', 'space_corellia_space_pve', 0, 0, 0, 0xC4C09504, 0) - gcwService.addZone('talus', 'space_corellia_space_pvp', 0, 0, 0, 0xC4C09504, 0) - gcwService.addZone('talus', 'talus_airspace', 0, 0, 0, 0x4E80D501, 0) - gcwService.addZone('talus', 'talus_pve', 0, 0, 0, 0xC4C09504, 0) - gcwService.addZone('talus', 'talus_pvp', 0, 0, 0, 0xC4C09504, 0) + gcwService.addZone('talus', 'gcw_region_corellia_14', 0, 0, 0, 76923077, 0) + gcwService.addZone('talus', 'gcw_region_talus_1', -3280, 5480, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_10', 528, 508, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_11', 3548, -772, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_12', 6448, -1992, 1500, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_13', -2812, -4052, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_14', 558, -3002, 1850, 123076924, 0) + gcwService.addZone('talus', 'gcw_region_talus_15', 3968, -3972, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_16', 0, 0, 0, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_2', 468, 5488, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_3', 4368, 5488, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_4', -5072, 1108, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_5', -2112, 2448, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_6', 3108, 2488, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_7', 6108, 1268, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_8', -5432, -2132, 1600, 30769231, 0) + gcwService.addZone('talus', 'gcw_region_talus_9', -2412, -812, 1600, 30769231, 0) + gcwService.addZone('talus', 'space_corellia_space_pve', 0, 0, 0, 76923076, 0) + gcwService.addZone('talus', 'space_corellia_space_pvp', 0, 0, 0, 76923076, 0) + gcwService.addZone('talus', 'talus_airspace', 0, 0, 0, 30769230, 0) + gcwService.addZone('talus', 'talus_pve', 0, 0, 0, 76923076, 0) + gcwService.addZone('talus', 'talus_pvp', 0, 0, 0, 76923076, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_1', -5320, 5200, 2500, 0x56A0FC01, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_10', 108, -5332, 1000, 0x56A0FC01, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_11', 3460, -4768, 1750, 0xD690F704, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_12', 0, 0, 0, 0xD690F704, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_13', 0, 0, 0, 0x56A0FC01, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_2', -2960, 2200, 1250, 0x56A0FC01, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_3', 1480, 3240, 1200, 0x55A0FC01, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_4', 3840, 2420, 1200, 0x55A0FC01, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_5', -4252, -2112, 2200, 0x55A0FC01, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_6', -132, 28, 2200, 0x55A0FC01, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_7', 4140, -940, 2100, 0x55A0FC01, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_8', -5192, -5952, 1700, 0x55A0FC01, 0) - gcwService.addZone('tatooine', 'gcw_region_tatooine_9', -1232, -3652, 1100, 0x55A0FC01, 0) - gcwService.addZone('tatooine', 'space_tatooine_space_pve', 0, 0, 0, 0xD590F704, 0) - gcwService.addZone('tatooine', 'space_tatooine_space_pvp', 0, 0, 0, 0xD590F704, 0) - gcwService.addZone('tatooine', 'tatooine_airspace', 0, 0, 0, 0x55A0FC01, 0) - gcwService.addZone('tatooine', 'tatooine_pve', 0, 0, 0, 0xD590F704, 0) - gcwService.addZone('tatooine', 'tatooine_pvp', 0, 0, 0, 0xD590F704, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_1', -5320, 5200, 2500, 33333334, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_10', 108, -5332, 1000, 33333334, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_11', 3460, -4768, 1750, 83333334, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_12', 0, 0, 0, 83333334, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_13', 0, 0, 0, 33333334, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_2', -2960, 2200, 1250, 33333334, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_3', 1480, 3240, 1200, 33333333, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_4', 3840, 2420, 1200, 33333333, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_5', -4252, -2112, 2200, 33333333, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_6', -132, 28, 2200, 33333333, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_7', 4140, -940, 2100, 33333333, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_8', -5192, -5952, 1700, 33333333, 0) + gcwService.addZone('tatooine', 'gcw_region_tatooine_9', -1232, -3652, 1100, 33333333, 0) + gcwService.addZone('tatooine', 'space_tatooine_space_pve', 0, 0, 0, 83333333, 0) + gcwService.addZone('tatooine', 'space_tatooine_space_pvp', 0, 0, 0, 83333333, 0) + gcwService.addZone('tatooine', 'tatooine_airspace', 0, 0, 0, 33333333, 0) + gcwService.addZone('tatooine', 'tatooine_pve', 0, 0, 0, 83333333, 0) + gcwService.addZone('tatooine', 'tatooine_pvp', 0, 0, 0, 83333333, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_1', -5562, 5578, 2250, 0x3763CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_10', -4662, -4082, 2800, 0x3763CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_11', -532, -2432, 1500, 0x3763CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_12', 3148, -3112, 1900, 0x3763CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_13', 6208, -4692, 1500, 0x3763CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_14', -2502, -7022, 750, 0x3763CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_15', -552, -5512, 1500, 0x3763CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_16', 3998, -6242, 1150, 0x3763CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_17', 0, 0, 0, 0x3763CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_18', 0, 0, 0, 0x08F88304, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_2', -2482, 3698, 1300, 0x3663CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_3', -312, 4908, 1150, 0x3663CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_4', 2618, 2718, 1700, 0x3663CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_5', 5168, 5708, 2000, 0x3663CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_6', -5142, 1038, 2250, 0x3663CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_7', -1352, 1068, 1500, 0x3663CE01, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_8', 1198, 158, 1150, 0x07F88304, 0) - gcwService.addZone('yavin4', 'gcw_region_yavin4_9', 5448, 468, 1900, 0x3663CE01, 0) - gcwService.addZone('yavin4', 'space_yavin4_space_pve', 0, 0, 0, 0x07F88304, 0) - gcwService.addZone('yavin4', 'space_yavin4_space_pvp', 0, 0, 0, 0x07F88304, 0) - gcwService.addZone('yavin4', 'yavin4_airspace', 0, 0, 0, 0x3663CE01, 0) - gcwService.addZone('yavin4', 'yavin4_pve', 0, 0, 0, 0x07F88304, 0) - gcwService.addZone('yavin4', 'yavin4_pvp', 0, 0, 0, 0x07F88304, 0) - gcwService.addZone('yavin4', 'yavin4_pvp_battlefield', 0, 0, 0, 0x3663CE01, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_1', -5562, 5578, 2250, 30303031, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_10', -4662, -4082, 2800, 30303031, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_11', -532, -2432, 1500, 30303031, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_12', 3148, -3112, 1900, 30303031, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_13', 6208, -4692, 1500, 30303031, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_14', -2502, -7022, 750, 30303031, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_15', -552, -5512, 1500, 30303031, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_16', 3998, -6242, 1150, 30303031, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_17', 0, 0, 0, 30303031, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_18', 0, 0, 0, 75757576, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_2', -2482, 3698, 1300, 30303030, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_3', -312, 4908, 1150, 30303030, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_4', 2618, 2718, 1700, 30303030, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_5', 5168, 5708, 2000, 30303030, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_6', -5142, 1038, 2250, 30303030, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_7', -1352, 1068, 1500, 30303030, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_8', 1198, 158, 1150, 75757575, 0) + gcwService.addZone('yavin4', 'gcw_region_yavin4_9', 5448, 468, 1900, 30303030, 0) + gcwService.addZone('yavin4', 'space_yavin4_space_pve', 0, 0, 0, 75757575, 0) + gcwService.addZone('yavin4', 'space_yavin4_space_pvp', 0, 0, 0, 75757575, 0) + gcwService.addZone('yavin4', 'yavin4_airspace', 0, 0, 0, 30303030, 0) + gcwService.addZone('yavin4', 'yavin4_pve', 0, 0, 0, 75757575, 0) + gcwService.addZone('yavin4', 'yavin4_pvp', 0, 0, 0, 75757575, 0) + gcwService.addZone('yavin4', 'yavin4_pvp_battlefield', 0, 0, 0, 30303030, 0) \ No newline at end of file diff --git a/src/resources/objects/SWGList.java b/src/resources/objects/SWGList.java index 57a09ae2..7f979e4c 100644 --- a/src/resources/objects/SWGList.java +++ b/src/resources/objects/SWGList.java @@ -34,6 +34,7 @@ import com.sleepycat.persist.model.NotPersistent; import com.sleepycat.persist.model.Persistent; /* A SWGList element MUST implement IListObject, or it will refuse to work with it */ + @Persistent public class SWGList implements List { @@ -315,6 +316,10 @@ public class SWGList implements List { return updateCounter; } + public Object getMutex() { + return objectMutex; + } + private byte[] item(int type, int index, byte[] data, boolean useIndex, boolean useData) { int size = 1 + ((useIndex) ? 2 : 0) + ((useData) ? data.length : 0); @@ -350,7 +355,5 @@ public class SWGList implements List { messageBuilder.sendListDelta(viewType, updateType, buffer); } - - public Object getMutex() { return objectMutex; } } diff --git a/src/resources/objects/guild/GuildMessageBuilder.java b/src/resources/objects/guild/GuildMessageBuilder.java index 8470f866..487a30dc 100644 --- a/src/resources/objects/guild/GuildMessageBuilder.java +++ b/src/resources/objects/guild/GuildMessageBuilder.java @@ -22,12 +22,14 @@ package resources.objects.guild; import java.nio.ByteOrder; +import java.util.Map.Entry; import org.apache.mina.core.buffer.IoBuffer; import engine.clients.Client; import resources.gcw.CurrentServerGCWZoneHistory; +import resources.gcw.CurrentServerGCWZonePercent; import resources.gcw.OtherServerGCWZonePercent; import resources.guild.Guild; import resources.objects.ObjectMessageBuilder; @@ -66,13 +68,13 @@ public class GuildMessageBuilder extends ObjectMessageBuilder { public IoBuffer buildBaseline6() { GuildObject guilds = (GuildObject) object; - int capacity = 82; - capacity += (guilds.getCurrentServerGCWZonePercentMap().size() * 30); - capacity += (guilds.getCurrentServerGCWTotalPercentMap().size() * 14); - capacity += (guilds.getCurrentServerGCWZoneHistoryMap().size() * 34); - capacity += (guilds.getCurrentServerGCWTotalHistoryMap().size() * 18); - capacity += (guilds.getOtherServerGCWZonePercentMap().size() * 45); - capacity += (guilds.getOtherServerGCWTotalPercentMap().size() * 29); + int capacity = 16 + getAsciiString(guilds.getSTFFile()).length; + for (Entry entry : guilds.getCurrentServerGCWZonePercentMap().entrySet()) capacity += (11 + entry.getKey().length() + entry.getValue().getBytes().length); + for (Entry entry : guilds.getCurrentServerGCWTotalPercentMap().entrySet()) capacity += (11 + entry.getKey().length() + entry.getValue().getBytes().length); + for (Entry entry : guilds.getCurrentServerGCWZoneHistoryMap().entries()) capacity += (11 + entry.getKey().length() + entry.getValue().getBytes().length); + for (Entry entry : guilds.getCurrentServerGCWTotalHistoryMap().entries()) capacity += (11 + entry.getKey().length() + entry.getValue().getBytes().length); + for (Entry entry : guilds.getOtherServerGCWZonePercentMap().entries()) capacity += (11 + entry.getKey().length() + entry.getValue().getBytes().length); + for (Entry entry : guilds.getOtherServerGCWTotalPercentMap().entries()) capacity += (11 + entry.getKey().length() + entry.getValue().getBytes().length); IoBuffer buffer = bufferPool.allocate(capacity, false).order(ByteOrder.LITTLE_ENDIAN); buffer.putShort((short) 9); // Object Count @@ -82,57 +84,45 @@ public class GuildMessageBuilder extends ObjectMessageBuilder { buffer.putShort(guilds.getUnknown2()); buffer.putInt(guilds.getCurrentServerGCWZonePercentMap().size()); buffer.putInt(guilds.getCurrentServerGCWZonePercentMap().getUpdateCounter()); - for (String key : guilds.getCurrentServerGCWZonePercentMap().keySet()) { + for (Entry entry : guilds.getCurrentServerGCWZonePercentMap().entrySet()) { buffer.put((byte) 0); - buffer.put(getAsciiString(key)); - buffer.put(guilds.getCurrentServerGCWZonePercentMap().get(key).getBytes()); + buffer.put(getAsciiString(entry.getKey())); + buffer.put(entry.getValue().getBytes()); } buffer.putInt(guilds.getCurrentServerGCWTotalPercentMap().size()); buffer.putInt(guilds.getCurrentServerGCWTotalPercentMap().getUpdateCounter()); - for (String key : guilds.getCurrentServerGCWTotalPercentMap().keySet()) { + for (Entry entry : guilds.getCurrentServerGCWTotalPercentMap().entrySet()) { buffer.put((byte) 0); - buffer.put(getAsciiString(key)); - buffer.put(guilds.getCurrentServerGCWTotalPercentMap().get(key).getBytes()); + buffer.put(getAsciiString(entry.getKey())); + buffer.put(entry.getValue().getBytes()); } buffer.putInt(guilds.getCurrentServerGCWZoneHistoryMap().size()); buffer.putInt(guilds.getCurrentServerGCWZoneHistoryMap().getUpdateCounter()); - for (String key : guilds.getCurrentServerGCWZoneHistoryMap().keySet()) { - for (CurrentServerGCWZoneHistory historicZone : guilds.getCurrentServerGCWZoneHistoryMap().get(key)) { - buffer.put((byte) 0); - buffer.put(getAsciiString(key)); - buffer.putInt(historicZone.getLastUpdateTime()); - buffer.putInt(historicZone.getPercent()); - } + for (Entry entry : guilds.getCurrentServerGCWZoneHistoryMap().entries()) { + buffer.put((byte) 0); + buffer.put(getAsciiString(entry.getKey())); + buffer.put(entry.getValue().getBytes()); } buffer.putInt(guilds.getCurrentServerGCWTotalHistoryMap().size()); buffer.putInt(guilds.getCurrentServerGCWTotalHistoryMap().getUpdateCounter()); - for (String key : guilds.getCurrentServerGCWTotalHistoryMap().keySet()) { - for (CurrentServerGCWZoneHistory historicTotal : guilds.getCurrentServerGCWZoneHistoryMap().get(key)) { - buffer.put((byte) 0); - buffer.put(getAsciiString(key)); - buffer.putInt(historicTotal.getLastUpdateTime()); - buffer.putInt(historicTotal.getPercent()); - } + for (Entry entry : guilds.getCurrentServerGCWTotalHistoryMap().entries()) { + buffer.put((byte) 0); + buffer.put(getAsciiString(entry.getKey())); + buffer.put(entry.getValue().getBytes()); } buffer.putInt(guilds.getOtherServerGCWZonePercentMap().size()); buffer.putInt(guilds.getOtherServerGCWZonePercentMap().getUpdateCounter()); - for (String key : guilds.getOtherServerGCWZonePercentMap().keySet()) { - for (OtherServerGCWZonePercent server : guilds.getOtherServerGCWZonePercentMap().get(key)) { - buffer.put((byte) 0); - buffer.put(getAsciiString(key)); - buffer.put(getAsciiString(server.getZone())); - buffer.putInt(server.getPercent()); - } + for (Entry entry : guilds.getOtherServerGCWZonePercentMap().entries()) { + buffer.put((byte) 0); + buffer.put(getAsciiString(entry.getKey())); + buffer.put(entry.getValue().getBytes()); } buffer.putInt(guilds.getOtherServerGCWTotalPercentMap().size()); buffer.putInt(guilds.getOtherServerGCWTotalPercentMap().getUpdateCounter()); - for (String key : guilds.getOtherServerGCWTotalPercentMap().keySet()) { - for (OtherServerGCWZonePercent server : guilds.getOtherServerGCWZonePercentMap().get(key)) { - buffer.put((byte) 0); - buffer.put(getAsciiString(key)); - buffer.put(getAsciiString(server.getZone())); - buffer.putInt(server.getPercent()); - } + for (Entry entry : guilds.getOtherServerGCWTotalPercentMap().entries()) { + buffer.put((byte) 0); + buffer.put(getAsciiString(entry.getKey())); + buffer.put(entry.getValue().getBytes()); } buffer.putInt(guilds.getUnknown3()); @@ -254,7 +244,7 @@ public class GuildMessageBuilder extends ObjectMessageBuilder { case 7: { buffer = createDelta("GILD", (byte) 6, (short) 1, (short) updateType, buffer.flip(), buffer.array().length + 4); - + for (Client client : ((GuildObject) object).core.getActiveConnectionsMap().values()) { client.getSession().write(buffer); } diff --git a/src/services/gcw/GCWService.java b/src/services/gcw/GCWService.java index c6ee30f4..0bd34d86 100644 --- a/src/services/gcw/GCWService.java +++ b/src/services/gcw/GCWService.java @@ -84,7 +84,11 @@ public class GCWService implements INetworkDispatch { @Override public void run() { afterInitialisation(); } private void afterInitialisation() { - core.scriptService.callScript("scripts/", "gcwzones", "addZones"); + try { + core.scriptService.callScript("scripts/", "gcwzones", "addZones"); + } catch (Exception e) { + e.printStackTrace(); + } } }, 1, TimeUnit.SECONDS); @@ -93,24 +97,30 @@ public class GCWService implements INetworkDispatch { @Override public void run() { checkFactionalPresence(); } private void checkFactionalPresence() { - for (String planet : zoneMap.keySet()) { - for (String zoneName : zoneMap.get(planet).keySet()) { - CurrentServerGCWZonePercent zone = zoneMap.get(planet).get(zoneName); - - if (zone.getRadius() > 0) { - List players = core.simulationService.get(core.terrainService.getPlanetByName(planet), zone.getPosition().x, zone.getPosition().z, (int) zone.getRadius()); + try { + for (String planet : zoneMap.keySet()) { + for (String zoneName : zoneMap.get(planet).keySet()) { + CurrentServerGCWZonePercent zone = zoneMap.get(planet).get(zoneName); - for (SWGObject player : players) { - if (!core.terrainService.isWater(player.getPlanetId(), player.getPosition().x, player.getPosition().z)) { - if ((player instanceof CreatureObject)) { - if ((((CreatureObject) player).getFactionStatus() & PvpStatus.Overt) != 0) { - adjustZone(planet, zoneName, ((CreatureObject) player).getFaction(), 1); + if (zone.getRadius() > 0) { + List players = core.simulationService.get(core.terrainService.getPlanetByName(planet), zone.getPosition().x, zone.getPosition().z, (int) zone.getRadius()); + + for (SWGObject player : players) { + if (!core.terrainService.isWater(player.getPlanetId(), player.getPosition().x, player.getPosition().z)) { + if ((player instanceof CreatureObject)) { + if (((CreatureObject) player).getParentId() > 0) { + if (((CreatureObject) player).getFactionStatus() == 2) { + adjustZone(planet, zoneName, ((CreatureObject) player).getFaction(), 1); + } + } } } } } } } + } catch (Exception e) { + e.printStackTrace(); } } }, 3, 3, TimeUnit.SECONDS); @@ -119,56 +129,60 @@ public class GCWService implements INetworkDispatch { @Override public void run() { updateGCWZones(); } private void updateGCWZones() { - Map zoneUpdates = new TreeMap(); - Map totalUpdates = new TreeMap(); - Multimap zoneHistoryUpdates = ArrayListMultimap.create(); - Multimap totalHistoryUpdates = ArrayListMultimap.create(); - - int galaxyPercent = 0; - - for (String planet : zoneMap.keySet()) { - if (!planet.equals("galaxy")) { - int planetPercent = 0; - - for (String zone : zoneMap.get(planet).keySet()) { - planetPercent += zoneMap.get(planet).get(zone).getPercent(); - - if (zoneMap.get(planet).get(zone).getPercent() != object.getCurrentServerGCWZonePercentMap().get(zone).getPercent()) { - zoneUpdates.put(zone, zoneMap.get(planet).get(zone)); - zoneHistoryUpdates.put(zone, new CurrentServerGCWZoneHistory(object.getCurrentServerGCWZonePercentMap().get(zone))); - } - } - - planetPercent = ((planetPercent / (zoneMap.get(planet).size() * 100)) * 100); - - if (planetPercent != object.getCurrentServerGCWTotalPercentMap().get(planet).getPercent()) { - CurrentServerGCWZonePercent planetObject = object.getCurrentServerGCWTotalPercentMap().get(planet); - planetObject.setPercent(planetPercent); - totalUpdates.put(planet, planetObject); - totalHistoryUpdates.put(planet, new CurrentServerGCWZoneHistory(object.getCurrentServerGCWTotalPercentMap().get(planet))); - } - - galaxyPercent += planetPercent; - } - } - - galaxyPercent = ((galaxyPercent / ((object.getCurrentServerGCWTotalPercentMap().size() - 1) * 100)) * 100); - - if (galaxyPercent != object.getCurrentServerGCWTotalPercentMap().get("galaxy").getPercent()) { - CurrentServerGCWZonePercent galaxyObject = object.getCurrentServerGCWTotalPercentMap().get("galaxy"); - galaxyObject.setPercent(galaxyPercent); - totalUpdates.put("galaxy", galaxyObject); - totalHistoryUpdates.put("galaxy", new CurrentServerGCWZoneHistory(object.getCurrentServerGCWTotalPercentMap().get("galaxy"))); - } - - if (zoneUpdates.size() > 0) { - object.getCurrentServerGCWZonePercentMap().putAll(zoneUpdates); - object.getCurrentServerGCWZoneHistoryMap().putAll(zoneHistoryUpdates); + try { + Map zoneUpdates = new TreeMap(); + Map totalUpdates = new TreeMap(); + Multimap zoneHistoryUpdates = ArrayListMultimap.create(); + Multimap totalHistoryUpdates = ArrayListMultimap.create(); - if (totalUpdates.size() > 0) { - object.getCurrentServerGCWTotalPercentMap().putAll(totalUpdates); - object.getCurrentServerGCWTotalHistoryMap().putAll(totalHistoryUpdates); + int galaxyPercent = 0; + + for (String planet : zoneMap.keySet()) { + if (!planet.equals("galaxy")) { + int planetPercent = 0; + + for (String zone : zoneMap.get(planet).keySet()) { + planetPercent += zoneMap.get(planet).get(zone).getPercent(); + + if (zoneMap.get(planet).get(zone).getPercent() != object.getCurrentServerGCWZonePercentMap().get(zone).getPercent()) { + zoneUpdates.put(zone, zoneMap.get(planet).get(zone)); + zoneHistoryUpdates.put(zone, new CurrentServerGCWZoneHistory(object.getCurrentServerGCWZonePercentMap().get(zone))); + } + } + + planetPercent = ((planetPercent / (zoneMap.get(planet).size() * 100)) * 100); + + if (planetPercent != object.getCurrentServerGCWTotalPercentMap().get(planet).getPercent()) { + CurrentServerGCWZonePercent planetObject = object.getCurrentServerGCWTotalPercentMap().get(planet); + planetObject.setPercent(planetPercent); + totalUpdates.put(planet, planetObject); + totalHistoryUpdates.put(planet, new CurrentServerGCWZoneHistory(object.getCurrentServerGCWTotalPercentMap().get(planet))); + } + + galaxyPercent += planetPercent; + } } + + galaxyPercent = ((galaxyPercent / ((object.getCurrentServerGCWTotalPercentMap().size() - 1) * 100)) * 100); + + if (galaxyPercent != object.getCurrentServerGCWTotalPercentMap().get("galaxy").getPercent()) { + CurrentServerGCWZonePercent galaxyObject = object.getCurrentServerGCWTotalPercentMap().get("galaxy"); + galaxyObject.setPercent(galaxyPercent); + totalUpdates.put("galaxy", galaxyObject); + totalHistoryUpdates.put("galaxy", new CurrentServerGCWZoneHistory(object.getCurrentServerGCWTotalPercentMap().get("galaxy"))); + } + + if (zoneUpdates.size() > 0) { + object.getCurrentServerGCWZonePercentMap().putAll(zoneUpdates); + object.getCurrentServerGCWZoneHistoryMap().putAll(zoneHistoryUpdates); + + if (totalUpdates.size() > 0) { + object.getCurrentServerGCWTotalPercentMap().putAll(totalUpdates); + object.getCurrentServerGCWTotalHistoryMap().putAll(totalHistoryUpdates); + } + } + } catch (Exception e) { + e.printStackTrace(); } } }, 1, 1, TimeUnit.MINUTES); @@ -181,21 +195,25 @@ public class GCWService implements INetworkDispatch { } private void updateGalaxiesWideGCWZones() { - List galaxyWideZones = new ArrayList(); - galaxyWideZones.addAll(object.getOtherServerGCWZonePercentMap().get("SWG")); - - for (int i = 0; i < galaxyWideZones.size(); i++) { - OtherServerGCWZonePercent zone = galaxyWideZones.get(i); - int percent = object.getCurrentServerGCWZonePercentMap().get(zone.getZone()).getPercent(); + try { + List galaxyWideZones = new ArrayList(); + galaxyWideZones.addAll(object.getOtherServerGCWZonePercentMap().get("SWG")); - if (zone.getPercent() != percent) { - zone.setPercent(percent); - galaxyWideZones.set(i, zone); + for (int i = 0; i < galaxyWideZones.size(); i++) { + OtherServerGCWZonePercent zone = galaxyWideZones.get(i); + int percent = object.getCurrentServerGCWZonePercentMap().get(zone.getZone()).getPercent(); + + if (zone.getPercent() != percent) { + zone.setPercent(percent); + galaxyWideZones.set(i, zone); + } } - } - - if (!galaxyWideZones.equals(object.getOtherServerGCWZonePercentMap().get("SWG"))) { - object.getOtherServerGCWZonePercentMap().replaceValues("SWG", galaxyWideZones); + + if (!galaxyWideZones.equals(object.getOtherServerGCWZonePercentMap().get("SWG"))) { + object.getOtherServerGCWZonePercentMap().replaceValues("SWG", galaxyWideZones); + } + } catch (Exception e) { + e.printStackTrace(); } } }, 15, 15, TimeUnit.MINUTES); @@ -204,13 +222,17 @@ public class GCWService implements INetworkDispatch { @Override public void run() { decrementZoneStrength(); } private void decrementZoneStrength() { - for (String planet : zoneMap.keySet()) { - if (!planet.equals("galaxy")) { - for (String zone : zoneMap.get(planet).keySet()) { - zoneMap.get(planet).get(zone).removeGCWPoints(1); - object.getCurrentServerGCWZonePercentMap().get(zone).removeGCWPoints(1); + try { + for (String planet : zoneMap.keySet()) { + if (!planet.equals("galaxy")) { + for (String zone : zoneMap.get(planet).keySet()) { + zoneMap.get(planet).get(zone).removeGCWPoints(1); + object.getCurrentServerGCWZonePercentMap().get(zone).removeGCWPoints(1); + } } } + } catch (Exception e) { + e.printStackTrace(); } } }, 1, 1, TimeUnit.MINUTES); @@ -219,15 +241,19 @@ public class GCWService implements INetworkDispatch { @Override public void run() { resetWeakGCWZones(); } private void resetWeakGCWZones() { - for (String planet : zoneMap.keySet()) { - for (String zoneName : zoneMap.get(planet).keySet()) { - CurrentServerGCWZonePercent zone = zoneMap.get(planet).get(zoneName); - - if (zone.getGCWPoints() == 0 && zone.getPercent() != 50) { - zone.setPercent(50); - zoneMap.get(planet).put(zoneName, zone); + try { + for (String planet : zoneMap.keySet()) { + for (String zoneName : zoneMap.get(planet).keySet()) { + CurrentServerGCWZonePercent zone = zoneMap.get(planet).get(zoneName); + + if (zone.getGCWPoints() == 0 && zone.getPercent() != 50) { + zone.setPercent(50); + zoneMap.get(planet).put(zoneName, zone); + } } } + } catch (Exception e) { + e.printStackTrace(); } } }, 2, 2, TimeUnit.DAYS); @@ -238,7 +264,7 @@ public class GCWService implements INetworkDispatch { zoneMap.put(planet, new TreeMap()); } - zoneMap.get(planet).put(zone, new CurrentServerGCWZonePercent(new Point2D(x, y), radius, ((new SimpleBufferAllocator()).allocate(4, false).order(ByteOrder.BIG_ENDIAN).putInt(group).flip().getInt()), weight)); + zoneMap.get(planet).put(zone, new CurrentServerGCWZonePercent(new Point2D(x, y), radius, group, weight)); if (planet != "galaxy") { object.getCurrentServerGCWZonePercentMap().put(zone, zoneMap.get(planet).get(zone)); diff --git a/src/services/guild/GuildService.java b/src/services/guild/GuildService.java index ffac00b1..80163d63 100644 --- a/src/services/guild/GuildService.java +++ b/src/services/guild/GuildService.java @@ -23,17 +23,12 @@ package services.guild; import java.util.Map; -import org.apache.mina.core.buffer.IoBuffer; -import org.apache.mina.core.session.IoSession; - -import resources.common.Opcodes; import resources.guild.Guild; import resources.objects.SWGList; import resources.objects.guild.GuildObject; import main.NGECore; -import engine.clients.Client; import engine.resources.objects.SWGObject; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; @@ -121,31 +116,6 @@ public class GuildService implements INetworkDispatch { @Override public void insertOpcodes(Map swgOpcodes, Map objControllerOpcodes) { - /* - swgOpcodes.put(Opcodes.CmdSceneReady, new INetworkRemoteEvent() { - - @Override - public void handlePacket(IoSession session, IoBuffer data) throws Exception { - Client client = core.getClient((Integer) session.getAttribute("connectionId")); - - if (client == null || client.getSession() == null) { - return; - } - - SWGObject object = client.getParent(); - - if (object == null) { - return; - } - - object.sendCreate(client); - object.sendBaselines(client); - object.sendDestroy(client); - } - - }); - */ - } @Override