From 7f40b31a34bc1c8b5989c8fc54c78e15f81ade8f Mon Sep 17 00:00:00 2001 From: FateJH Date: Thu, 29 Mar 2018 23:45:11 -0400 Subject: [PATCH] Akna Air Tower, Ceryshen, has its amenities wired. The default spawn point has been moved to allow for the tower at Akna to interfere with the tower at Anguta. --- .../scala/game/DisconnectMessageTest.scala | 4 + pslogin/src/main/scala/Maps.scala | 953 ++++++++++-------- .../src/main/scala/WorldSessionActor.scala | 14 +- pslogin/src/main/scala/Zones.scala | 2 + 4 files changed, 538 insertions(+), 435 deletions(-) diff --git a/common/src/test/scala/game/DisconnectMessageTest.scala b/common/src/test/scala/game/DisconnectMessageTest.scala index 008ee149..6e4f4c3a 100644 --- a/common/src/test/scala/game/DisconnectMessageTest.scala +++ b/common/src/test/scala/game/DisconnectMessageTest.scala @@ -26,4 +26,8 @@ class DisconnectMessageTest extends Specification { pkt mustEqual string } + + "comparison" in { + DisconnectMessage("First") mustEqual DisconnectMessage("First", "", "") + } } diff --git a/pslogin/src/main/scala/Maps.scala b/pslogin/src/main/scala/Maps.scala index 6625e55f..9b64ad92 100644 --- a/pslogin/src/main/scala/Maps.scala +++ b/pslogin/src/main/scala/Maps.scala @@ -23,247 +23,318 @@ object Maps { val map5 = new ZoneMap("map05") val map6 = new ZoneMap("map06") { - LocalBuilding(2, FoundationBuilder(Building.Structure(StructureType.Facility, Vector3(3974.2344f, 4287.914f, 0)))) //Anguta - LocalObject(222, Door.Constructor) //air term building, bay door - LocalObject(370, Door.Constructor) //courtyard - LocalObject(371, Door.Constructor) //courtyard - LocalObject(372, Door.Constructor) //courtyard - LocalObject(373, Door.Constructor) //courtyard - LocalObject(375, Door.Constructor) //2nd level door - LocalObject(376, Door.Constructor) //2nd level door - LocalObject(383, Door.Constructor) //courtyard - LocalObject(384, Door.Constructor) //3rd floor door - LocalObject(385, Door.Constructor) //courtyard - LocalObject(387, Door.Constructor) //2nd level door - LocalObject(391, Door.Constructor) //courtyard - LocalObject(393, Door.Constructor) //air term building, upstairs door - LocalObject(394, Door.Constructor) //air term building, f.door - LocalObject(396, Door.Constructor) //courtyard - LocalObject(398, Door.Constructor) //courtyard - LocalObject(399, Door.Constructor) //courtyard - LocalObject(402, Door.Constructor) //courtyard - LocalObject(403, Door.Constructor) //courtyard - LocalObject(404, Door.Constructor) //b.door - LocalObject(603, Door.Constructor) - LocalObject(604, Door.Constructor) - LocalObject(605, Door.Constructor) - LocalObject(606, Door.Constructor) - LocalObject(607, Door.Constructor) - LocalObject(610, Door.Constructor) - LocalObject(611, Door.Constructor) - LocalObject(614, Door.Constructor) - LocalObject(619, Door.Constructor) - LocalObject(620, Door.Constructor) //generator room door - LocalObject(621, Door.Constructor) - LocalObject(622, Door.Constructor) //spawn room door - LocalObject(623, Door.Constructor) //spawn room door - LocalObject(630, Door.Constructor) //spawn room door - LocalObject(631, Door.Constructor) //spawn room door, kitchen - LocalObject(634, Door.Constructor) //air term building, interior - LocalObject(638, Door.Constructor) //cc door - LocalObject(642, Door.Constructor) //cc door, interior - LocalObject(643, Door.Constructor) //cc door - LocalObject(645, Door.Constructor) //b.door interior - LocalObject(646, Door.Constructor) //b.door interior - LocalObject(715, Door.Constructor) //f.door - LocalObject(1177, Locker.Constructor) - LocalObject(1178, Locker.Constructor) - LocalObject(1179, Locker.Constructor) - LocalObject(1180, Locker.Constructor) - LocalObject(1181, Locker.Constructor) - LocalObject(1182, Locker.Constructor) - LocalObject(1183, Locker.Constructor) - LocalObject(1184, Locker.Constructor) - LocalObject(1185, Locker.Constructor) - LocalObject(1186, Locker.Constructor) - LocalObject(1187, Locker.Constructor) - LocalObject(1188, Locker.Constructor) - LocalObject(1564, Terminal.Constructor(order_terminal)) - LocalObject(1568, Terminal.Constructor(order_terminal)) - LocalObject(1569, Terminal.Constructor(order_terminal)) - LocalObject(1570, Terminal.Constructor(order_terminal)) - LocalObject(1571, Terminal.Constructor(order_terminal)) - LocalObject(1576, Terminal.Constructor(order_terminal)) - LocalObject(1577, Terminal.Constructor(order_terminal)) - LocalObject(1578, Terminal.Constructor(order_terminal)) - LocalObject(2145, SpawnTube.Constructor(Vector3(3980.4062f, 4252.7656f, 257.5625f), Vector3(0, 0, 90))) - LocalObject(2146, SpawnTube.Constructor(Vector3(3980.4062f, 4259.992f, 257.5625f), Vector3(0, 0, 90))) - LocalObject(2147, SpawnTube.Constructor(Vector3(3980.4062f, 4267.3047f, 257.5625f), Vector3(0, 0, 90))) - LocalObject(2239, Terminal.Constructor(spawn_terminal)) - LocalObject(2244, Terminal.Constructor(spawn_terminal)) - LocalObject(2245, Terminal.Constructor(spawn_terminal)) - LocalObject(2246, Terminal.Constructor(spawn_terminal)) - LocalObject(2248, Terminal.Constructor(spawn_terminal)) - LocalObject(2250, Terminal.Constructor(spawn_terminal)) - LocalObject(2251, Terminal.Constructor(spawn_terminal)) - LocalObject(2253, Terminal.Constructor(spawn_terminal)) - LocalObject(2254, Terminal.Constructor(spawn_terminal)) - LocalObject(2322, Door.Constructor) //spawn tube door - LocalObject(2323, Door.Constructor) //spawn tube door - LocalObject(2324, Door.Constructor) //spawn tube door - LocalObject(2419, Terminal.Constructor(ground_vehicle_terminal)) - LocalObject(500, - VehicleSpawnPad.Constructor(Vector3(3962.0f, 4334.0f, 268.0f), Vector3(0f, 0f, 180.0f)) - ) //TODO guid not correct - LocalObject(224, Terminal.Constructor(dropship_vehicle_terminal)) - LocalObject(501, - VehicleSpawnPad.Constructor(Vector3(4012.3594f, 4364.8047f, 271.90625f), Vector3(0f, 0f, 180.0f)) - ) //TODO guid not correct - ObjectToBuilding(222, 2) - ObjectToBuilding(224, 2) - ObjectToBuilding(370, 2) - ObjectToBuilding(371, 2) - ObjectToBuilding(372, 2) - ObjectToBuilding(373, 2) - ObjectToBuilding(375, 2) - ObjectToBuilding(376, 2) - ObjectToBuilding(383, 2) - ObjectToBuilding(384, 2) - ObjectToBuilding(385, 2) - ObjectToBuilding(387, 2) - ObjectToBuilding(391, 2) - ObjectToBuilding(393, 2) - ObjectToBuilding(394, 2) - ObjectToBuilding(396, 2) - ObjectToBuilding(398, 2) - ObjectToBuilding(399, 2) - ObjectToBuilding(402, 2) - ObjectToBuilding(403, 2) - ObjectToBuilding(404, 2) - ObjectToBuilding(603, 2) - ObjectToBuilding(604, 2) - ObjectToBuilding(605, 2) - ObjectToBuilding(606, 2) - ObjectToBuilding(607, 2) - ObjectToBuilding(610, 2) - ObjectToBuilding(611, 2) - ObjectToBuilding(614, 2) - ObjectToBuilding(619, 2) - ObjectToBuilding(620, 2) - ObjectToBuilding(621, 2) - ObjectToBuilding(622, 2) - ObjectToBuilding(623, 2) - ObjectToBuilding(630, 2) - ObjectToBuilding(631, 2) - ObjectToBuilding(634, 2) - ObjectToBuilding(638, 2) - ObjectToBuilding(642, 2) - ObjectToBuilding(643, 2) - ObjectToBuilding(645, 2) - ObjectToBuilding(646, 2) - ObjectToBuilding(715, 2) - ObjectToBuilding(1177, 2) - ObjectToBuilding(1178, 2) - ObjectToBuilding(1179, 2) - ObjectToBuilding(1180, 2) - ObjectToBuilding(1181, 2) - ObjectToBuilding(1182, 2) - ObjectToBuilding(1183, 2) - ObjectToBuilding(1184, 2) - ObjectToBuilding(1185, 2) - ObjectToBuilding(1186, 2) - ObjectToBuilding(1187, 2) - ObjectToBuilding(1188, 2) - ObjectToBuilding(1564, 2) - ObjectToBuilding(1568, 2) - ObjectToBuilding(1569, 2) - ObjectToBuilding(1570, 2) - ObjectToBuilding(1571, 2) - ObjectToBuilding(1576, 2) - ObjectToBuilding(1577, 2) - ObjectToBuilding(1578, 2) - ObjectToBuilding(2145, 2) - ObjectToBuilding(2146, 2) - ObjectToBuilding(2147, 2) - ObjectToBuilding(2239, 2) - ObjectToBuilding(2244, 2) - ObjectToBuilding(2245, 2) - ObjectToBuilding(2246, 2) - ObjectToBuilding(2248, 2) - ObjectToBuilding(2250, 2) - ObjectToBuilding(2251, 2) - ObjectToBuilding(2253, 2) - ObjectToBuilding(2254, 2) - ObjectToBuilding(2322, 2) - ObjectToBuilding(2323, 2) - ObjectToBuilding(2324, 2) - ObjectToBuilding(2419, 2) - ObjectToBuilding(500, 2) - ObjectToBuilding(501, 2) - TerminalToSpawnPad(224, 501) - TerminalToSpawnPad(2419, 500) + Building2() + Building38() + Building42() + Building48() + Building49() - LocalBuilding(38, FoundationBuilder(Building.Structure(StructureType.Bunker))) //Anguta, West Bunker - LocalObject(362, Door.Constructor) - ObjectToBuilding(362, 38) + def Building2() : Unit = { + //Anguta + LocalBuilding(2, FoundationBuilder(Building.Structure(StructureType.Facility, Vector3(3974.2344f, 4287.914f, 0)))) + LocalObject(222, Door.Constructor) //air term building, bay door + LocalObject(370, Door.Constructor) //courtyard + LocalObject(371, Door.Constructor) //courtyard + LocalObject(372, Door.Constructor) //courtyard + LocalObject(373, Door.Constructor) //courtyard + LocalObject(375, Door.Constructor) //2nd level door + LocalObject(376, Door.Constructor) //2nd level door + LocalObject(383, Door.Constructor) //courtyard + LocalObject(384, Door.Constructor) //3rd floor door + LocalObject(385, Door.Constructor) //courtyard + LocalObject(387, Door.Constructor) //2nd level door + LocalObject(391, Door.Constructor) //courtyard + LocalObject(393, Door.Constructor) //air term building, upstairs door + LocalObject(394, Door.Constructor) //air term building, f.door + LocalObject(396, Door.Constructor) //courtyard + LocalObject(398, Door.Constructor) //courtyard + LocalObject(399, Door.Constructor) //courtyard + LocalObject(402, Door.Constructor) //courtyard + LocalObject(403, Door.Constructor) //courtyard + LocalObject(404, Door.Constructor) //b.door + LocalObject(603, Door.Constructor) + LocalObject(604, Door.Constructor) + LocalObject(605, Door.Constructor) + LocalObject(606, Door.Constructor) + LocalObject(607, Door.Constructor) + LocalObject(610, Door.Constructor) + LocalObject(611, Door.Constructor) + LocalObject(614, Door.Constructor) + LocalObject(619, Door.Constructor) + LocalObject(620, Door.Constructor) //generator room door + LocalObject(621, Door.Constructor) + LocalObject(622, Door.Constructor) //spawn room door + LocalObject(623, Door.Constructor) //spawn room door + LocalObject(630, Door.Constructor) //spawn room door + LocalObject(631, Door.Constructor) //spawn room door, kitchen + LocalObject(634, Door.Constructor) //air term building, interior + LocalObject(638, Door.Constructor) //cc door + LocalObject(642, Door.Constructor) //cc door, interior + LocalObject(643, Door.Constructor) //cc door + LocalObject(645, Door.Constructor) //b.door interior + LocalObject(646, Door.Constructor) //b.door interior + LocalObject(715, Door.Constructor) //f.door + LocalObject(1177, Locker.Constructor) + LocalObject(1178, Locker.Constructor) + LocalObject(1179, Locker.Constructor) + LocalObject(1180, Locker.Constructor) + LocalObject(1181, Locker.Constructor) + LocalObject(1182, Locker.Constructor) + LocalObject(1183, Locker.Constructor) + LocalObject(1184, Locker.Constructor) + LocalObject(1185, Locker.Constructor) + LocalObject(1186, Locker.Constructor) + LocalObject(1187, Locker.Constructor) + LocalObject(1188, Locker.Constructor) + LocalObject(1564, Terminal.Constructor(order_terminal)) + LocalObject(1568, Terminal.Constructor(order_terminal)) + LocalObject(1569, Terminal.Constructor(order_terminal)) + LocalObject(1570, Terminal.Constructor(order_terminal)) + LocalObject(1571, Terminal.Constructor(order_terminal)) + LocalObject(1576, Terminal.Constructor(order_terminal)) + LocalObject(1577, Terminal.Constructor(order_terminal)) + LocalObject(1578, Terminal.Constructor(order_terminal)) + LocalObject(2145, SpawnTube.Constructor(Vector3(3980.4062f, 4252.7656f, 257.5625f), Vector3(0, 0, 90))) + LocalObject(2146, SpawnTube.Constructor(Vector3(3980.4062f, 4259.992f, 257.5625f), Vector3(0, 0, 90))) + LocalObject(2147, SpawnTube.Constructor(Vector3(3980.4062f, 4267.3047f, 257.5625f), Vector3(0, 0, 90))) + LocalObject(2239, Terminal.Constructor(spawn_terminal)) + LocalObject(2244, Terminal.Constructor(spawn_terminal)) + LocalObject(2245, Terminal.Constructor(spawn_terminal)) + LocalObject(2246, Terminal.Constructor(spawn_terminal)) + LocalObject(2248, Terminal.Constructor(spawn_terminal)) + LocalObject(2250, Terminal.Constructor(spawn_terminal)) + LocalObject(2251, Terminal.Constructor(spawn_terminal)) + LocalObject(2253, Terminal.Constructor(spawn_terminal)) + LocalObject(2254, Terminal.Constructor(spawn_terminal)) + LocalObject(2322, Door.Constructor) //spawn tube door + LocalObject(2323, Door.Constructor) //spawn tube door + LocalObject(2324, Door.Constructor) //spawn tube door + LocalObject(2419, Terminal.Constructor(ground_vehicle_terminal)) + LocalObject(500, + VehicleSpawnPad.Constructor(Vector3(3962.0f, 4334.0f, 268.0f), Vector3(0f, 0f, 180.0f)) + ) //TODO guid not correct + LocalObject(224, Terminal.Constructor(dropship_vehicle_terminal)) + LocalObject(501, + VehicleSpawnPad.Constructor(Vector3(4012.3594f, 4364.8047f, 271.90625f), Vector3(0f, 0f, 180.0f)) + ) //TODO guid not correct + ObjectToBuilding(222, 2) + ObjectToBuilding(224, 2) + ObjectToBuilding(370, 2) + ObjectToBuilding(371, 2) + ObjectToBuilding(372, 2) + ObjectToBuilding(373, 2) + ObjectToBuilding(375, 2) + ObjectToBuilding(376, 2) + ObjectToBuilding(383, 2) + ObjectToBuilding(384, 2) + ObjectToBuilding(385, 2) + ObjectToBuilding(387, 2) + ObjectToBuilding(391, 2) + ObjectToBuilding(393, 2) + ObjectToBuilding(394, 2) + ObjectToBuilding(396, 2) + ObjectToBuilding(398, 2) + ObjectToBuilding(399, 2) + ObjectToBuilding(402, 2) + ObjectToBuilding(403, 2) + ObjectToBuilding(404, 2) + ObjectToBuilding(603, 2) + ObjectToBuilding(604, 2) + ObjectToBuilding(605, 2) + ObjectToBuilding(606, 2) + ObjectToBuilding(607, 2) + ObjectToBuilding(610, 2) + ObjectToBuilding(611, 2) + ObjectToBuilding(614, 2) + ObjectToBuilding(619, 2) + ObjectToBuilding(620, 2) + ObjectToBuilding(621, 2) + ObjectToBuilding(622, 2) + ObjectToBuilding(623, 2) + ObjectToBuilding(630, 2) + ObjectToBuilding(631, 2) + ObjectToBuilding(634, 2) + ObjectToBuilding(638, 2) + ObjectToBuilding(642, 2) + ObjectToBuilding(643, 2) + ObjectToBuilding(645, 2) + ObjectToBuilding(646, 2) + ObjectToBuilding(715, 2) + ObjectToBuilding(1177, 2) + ObjectToBuilding(1178, 2) + ObjectToBuilding(1179, 2) + ObjectToBuilding(1180, 2) + ObjectToBuilding(1181, 2) + ObjectToBuilding(1182, 2) + ObjectToBuilding(1183, 2) + ObjectToBuilding(1184, 2) + ObjectToBuilding(1185, 2) + ObjectToBuilding(1186, 2) + ObjectToBuilding(1187, 2) + ObjectToBuilding(1188, 2) + ObjectToBuilding(1564, 2) + ObjectToBuilding(1568, 2) + ObjectToBuilding(1569, 2) + ObjectToBuilding(1570, 2) + ObjectToBuilding(1571, 2) + ObjectToBuilding(1576, 2) + ObjectToBuilding(1577, 2) + ObjectToBuilding(1578, 2) + ObjectToBuilding(2145, 2) + ObjectToBuilding(2146, 2) + ObjectToBuilding(2147, 2) + ObjectToBuilding(2239, 2) + ObjectToBuilding(2244, 2) + ObjectToBuilding(2245, 2) + ObjectToBuilding(2246, 2) + ObjectToBuilding(2248, 2) + ObjectToBuilding(2250, 2) + ObjectToBuilding(2251, 2) + ObjectToBuilding(2253, 2) + ObjectToBuilding(2254, 2) + ObjectToBuilding(2322, 2) + ObjectToBuilding(2323, 2) + ObjectToBuilding(2324, 2) + ObjectToBuilding(2419, 2) + ObjectToBuilding(500, 2) + ObjectToBuilding(501, 2) + TerminalToSpawnPad(224, 501) + TerminalToSpawnPad(2419, 500) + } - LocalBuilding(42, FoundationBuilder(Building.Structure(StructureType.Bunker))) //Anguta, East Bunker(s) - LocalObject(407, Door.Constructor) - LocalObject(408, Door.Constructor) - ObjectToBuilding(407, 42) - ObjectToBuilding(408, 42) + def Building38() : Unit = { + //Anguta, West Bunker + LocalBuilding(38, FoundationBuilder(Building.Structure(StructureType.Bunker))) + LocalObject(362, Door.Constructor) + ObjectToBuilding(362, 38) + } - LocalBuilding(48, FoundationBuilder(Building.Structure(StructureType.Tower, Vector3(3864.2266f, 4518.0234f, 0)))) //North Anguta Watchtower - LocalObject(364, Door.Constructor(Vector3(3871.9688f, 4509.992f, 269.65625f), Vector3(0f, 0f, 180f))) //s1 - LocalObject(365, Door.Constructor(Vector3(3871.9688f, 4509.992f, 279.57812f), Vector3(0f, 0f, 180f))) //s2 - LocalObject(366, Door.Constructor(Vector3(3871.9688f, 4509.992f, 299.57812f), Vector3(0f, 0f, 180f))) //s3 - LocalObject(367, Door.Constructor(Vector3(3871.9688f, 4525.9844f, 269.65625f), Vector3(0f, 0f, 0f))) //n1 - LocalObject(368, Door.Constructor(Vector3(3871.9688f, 4525.9844f, 279.57812f), Vector3(0f, 0f, 0f))) //n2 - LocalObject(369, Door.Constructor(Vector3(3871.9688f, 4525.9844f, 299.57812f), Vector3(0f, 0f, 0f))) //n3 - LocalObject(854, IFFLock.Constructor) - LocalObject(855, IFFLock.Constructor) - LocalObject(856, IFFLock.Constructor) - LocalObject(857, IFFLock.Constructor) - LocalObject(858, IFFLock.Constructor) - LocalObject(859, IFFLock.Constructor) - LocalObject(1140, Locker.Constructor) - LocalObject(1141, Locker.Constructor) - LocalObject(1142, Locker.Constructor) - LocalObject(1143, Locker.Constructor) - LocalObject(1144, Locker.Constructor) - LocalObject(1145, Locker.Constructor) - LocalObject(1146, Locker.Constructor) - LocalObject(1147, Locker.Constructor) - LocalObject(1561, Terminal.Constructor(order_terminal)) - LocalObject(1562, Terminal.Constructor(order_terminal)) - LocalObject(1563, Terminal.Constructor(order_terminal)) - LocalObject(2138, SpawnTube.Constructor(respawn_tube_tower, Vector3(3870.9688f, 4505.7266f, 259.875f), Vector3(0, 0, 90))) - LocalObject(2139, SpawnTube.Constructor(respawn_tube_tower, Vector3(3870.9688f, 4522.1562f, 259.875f), Vector3(0, 0, 90))) - LocalObject(2315, Door.Constructor) //spawn tube door - LocalObject(2316, Door.Constructor) //spawn tube door - ObjectToBuilding(364, 48) - ObjectToBuilding(365, 48) - ObjectToBuilding(366, 48) - ObjectToBuilding(367, 48) - ObjectToBuilding(368, 48) - ObjectToBuilding(369, 48) - ObjectToBuilding(854, 48) - ObjectToBuilding(855, 48) - ObjectToBuilding(856, 48) - ObjectToBuilding(857, 48) - ObjectToBuilding(858, 48) - ObjectToBuilding(859, 48) - ObjectToBuilding(1140, 48) - ObjectToBuilding(1141, 48) - ObjectToBuilding(1142, 48) - ObjectToBuilding(1143, 48) - ObjectToBuilding(1144, 48) - ObjectToBuilding(1145, 48) - ObjectToBuilding(1146, 48) - ObjectToBuilding(1147, 48) - ObjectToBuilding(1561, 48) - ObjectToBuilding(1562, 48) - ObjectToBuilding(1563, 48) - ObjectToBuilding(2138, 48) - ObjectToBuilding(2139, 48) - ObjectToBuilding(2315, 48) - ObjectToBuilding(2316, 48) - DoorToLock(364, 857) - DoorToLock(365, 858) - DoorToLock(366, 859) - DoorToLock(367, 854) - DoorToLock(368, 855) - DoorToLock(369, 856) + def Building42() : Unit = { + //Anguta, East Bunker(s) + LocalBuilding(42, FoundationBuilder(Building.Structure(StructureType.Bunker))) + LocalObject(407, Door.Constructor) + LocalObject(408, Door.Constructor) + ObjectToBuilding(407, 42) + ObjectToBuilding(408, 42) + } + + def Building48() : Unit = { + //North Anguta Watchtower + LocalBuilding(48, FoundationBuilder(Building.Structure(StructureType.Tower, Vector3(3864.2266f, 4518.0234f, 0)))) + LocalObject(364, Door.Constructor(Vector3(3871.9688f, 4509.992f, 269.65625f), Vector3(0f, 0f, 180f))) //s1 + LocalObject(365, Door.Constructor(Vector3(3871.9688f, 4509.992f, 279.57812f), Vector3(0f, 0f, 180f))) //s2 + LocalObject(366, Door.Constructor(Vector3(3871.9688f, 4509.992f, 299.57812f), Vector3(0f, 0f, 180f))) //s3 + LocalObject(367, Door.Constructor(Vector3(3871.9688f, 4525.9844f, 269.65625f), Vector3(0f, 0f, 0f))) //n1 + LocalObject(368, Door.Constructor(Vector3(3871.9688f, 4525.9844f, 279.57812f), Vector3(0f, 0f, 0f))) //n2 + LocalObject(369, Door.Constructor(Vector3(3871.9688f, 4525.9844f, 299.57812f), Vector3(0f, 0f, 0f))) //n3 + LocalObject(854, IFFLock.Constructor) + LocalObject(855, IFFLock.Constructor) + LocalObject(856, IFFLock.Constructor) + LocalObject(857, IFFLock.Constructor) + LocalObject(858, IFFLock.Constructor) + LocalObject(859, IFFLock.Constructor) + LocalObject(1140, Locker.Constructor) + LocalObject(1141, Locker.Constructor) + LocalObject(1142, Locker.Constructor) + LocalObject(1143, Locker.Constructor) + LocalObject(1144, Locker.Constructor) + LocalObject(1145, Locker.Constructor) + LocalObject(1146, Locker.Constructor) + LocalObject(1147, Locker.Constructor) + LocalObject(1561, Terminal.Constructor(order_terminal)) + LocalObject(1562, Terminal.Constructor(order_terminal)) + LocalObject(1563, Terminal.Constructor(order_terminal)) + LocalObject(2138, SpawnTube.Constructor(respawn_tube_tower, Vector3(3870.9688f, 4505.7266f, 259.875f), Vector3(0, 0, 90))) + LocalObject(2139, SpawnTube.Constructor(respawn_tube_tower, Vector3(3870.9688f, 4522.1562f, 259.875f), Vector3(0, 0, 90))) + LocalObject(2315, Door.Constructor) //spawn tube door + LocalObject(2316, Door.Constructor) //spawn tube door + ObjectToBuilding(364, 48) + ObjectToBuilding(365, 48) + ObjectToBuilding(366, 48) + ObjectToBuilding(367, 48) + ObjectToBuilding(368, 48) + ObjectToBuilding(369, 48) + ObjectToBuilding(854, 48) + ObjectToBuilding(855, 48) + ObjectToBuilding(856, 48) + ObjectToBuilding(857, 48) + ObjectToBuilding(858, 48) + ObjectToBuilding(859, 48) + ObjectToBuilding(1140, 48) + ObjectToBuilding(1141, 48) + ObjectToBuilding(1142, 48) + ObjectToBuilding(1143, 48) + ObjectToBuilding(1144, 48) + ObjectToBuilding(1145, 48) + ObjectToBuilding(1146, 48) + ObjectToBuilding(1147, 48) + ObjectToBuilding(1561, 48) + ObjectToBuilding(1562, 48) + ObjectToBuilding(1563, 48) + ObjectToBuilding(2138, 48) + ObjectToBuilding(2139, 48) + ObjectToBuilding(2315, 48) + ObjectToBuilding(2316, 48) + DoorToLock(364, 857) + DoorToLock(365, 858) + DoorToLock(366, 859) + DoorToLock(367, 854) + DoorToLock(368, 855) + DoorToLock(369, 856) + } + + def Building49() : Unit = { + //North Akna Air Tower + LocalBuilding(49, FoundationBuilder(Building.Structure(StructureType.Tower, Vector3(3864.2266f, 4518.0234f, 0)))) + LocalObject(430, Door.Constructor(Vector3(4366.0156f, 3981.9922f, 237.96875f), Vector3(0f, 0f, 180f))) //s1 + LocalObject(431, Door.Constructor(Vector3(4366.0156f, 3981.9922f, 257.89062f), Vector3(0f, 0f, 180f))) //s2 + LocalObject(432, Door.Constructor(Vector3(4366.0156f, 3997.9297f, 237.96875f), Vector3(0f, 0f, 0f))) //n1 + LocalObject(433, Door.Constructor(Vector3(4366.0156f, 3997.9297f, 257.89062f), Vector3(0f, 0f, 0f))) //n2 + LocalObject(902, IFFLock.Constructor) + LocalObject(903, IFFLock.Constructor) + LocalObject(906, IFFLock.Constructor) + LocalObject(907, IFFLock.Constructor) + LocalObject(1217, Locker.Constructor) + LocalObject(1218, Locker.Constructor) + LocalObject(1219, Locker.Constructor) + LocalObject(1220, Locker.Constructor) + LocalObject(1225, Locker.Constructor) + LocalObject(1226, Locker.Constructor) + LocalObject(1227, Locker.Constructor) + LocalObject(1228, Locker.Constructor) + LocalObject(1591, Terminal.Constructor(order_terminal)) + LocalObject(1592, Terminal.Constructor(order_terminal)) + LocalObject(1593, Terminal.Constructor(order_terminal)) + LocalObject(2156, SpawnTube.Constructor(respawn_tube_tower, Vector3(4364.633f, 3994.125f, 228.1875f), Vector3(0, 0, 90))) + LocalObject(2157, SpawnTube.Constructor(respawn_tube_tower, Vector3(4364.633f, 3977.7266f, 228.1875f), Vector3(0, 0, 90))) + LocalObject(2333, Door.Constructor) //spawn tube door + LocalObject(2334, Door.Constructor) //spawn tube door + ObjectToBuilding(430, 49) + ObjectToBuilding(431, 49) + ObjectToBuilding(432, 49) + ObjectToBuilding(433, 49) + ObjectToBuilding(902, 49) + ObjectToBuilding(903, 49) + ObjectToBuilding(906, 49) + ObjectToBuilding(907, 49) + ObjectToBuilding(1217, 49) + ObjectToBuilding(1218, 49) + ObjectToBuilding(1219, 49) + ObjectToBuilding(1220, 49) + ObjectToBuilding(1225, 49) + ObjectToBuilding(1226, 49) + ObjectToBuilding(1227, 49) + ObjectToBuilding(1228, 49) + ObjectToBuilding(1591, 49) + ObjectToBuilding(1592, 49) + ObjectToBuilding(1593, 49) + ObjectToBuilding(2333, 49) + ObjectToBuilding(2334, 49) + DoorToLock(430, 906) + DoorToLock(431, 907) + DoorToLock(432, 902) + DoorToLock(433, 903) + } } val map7 = new ZoneMap("map07") @@ -279,203 +350,227 @@ object Maps { val map12 = new ZoneMap("map12") val map13 = new ZoneMap("map13") { - LocalBuilding(1, FoundationBuilder(WarpGate.Structure)) - LocalBuilding(2, FoundationBuilder(WarpGate.Structure)) - LocalBuilding(3, FoundationBuilder(WarpGate.Structure)) + Building1() + Building2() + Building3() + Building29() + Building42() + Building51() + Building77() - LocalObject(520, ImplantTerminalMech.Constructor) //Hart B - LocalObject(1081, Terminal.Constructor(implant_terminal_interface)) //tube 520 - TerminalToInterface(520, 1081) + def Building1() : Unit = { + LocalBuilding(1, FoundationBuilder(WarpGate.Structure)) + } - LocalBuilding(2, FoundationBuilder(Building.Structure(StructureType.Building))) //HART building C - LocalObject(186, Terminal.Constructor(cert_terminal)) - LocalObject(187, Terminal.Constructor(cert_terminal)) - LocalObject(188, Terminal.Constructor(cert_terminal)) - LocalObject(362, Door.Constructor) - LocalObject(370, Door.Constructor) - LocalObject(371, Door.Constructor) - LocalObject(374, Door.Constructor) - LocalObject(375, Door.Constructor) - LocalObject(394, Door.Constructor) - LocalObject(395, Door.Constructor) - LocalObject(396, Door.Constructor) - LocalObject(397, Door.Constructor) - LocalObject(398, Door.Constructor) - LocalObject(462, Door.Constructor) - LocalObject(463, Door.Constructor) - LocalObject(522, ImplantTerminalMech.Constructor) - LocalObject(523, ImplantTerminalMech.Constructor) - LocalObject(524, ImplantTerminalMech.Constructor) - LocalObject(525, ImplantTerminalMech.Constructor) - LocalObject(526, ImplantTerminalMech.Constructor) - LocalObject(527, ImplantTerminalMech.Constructor) - LocalObject(528, ImplantTerminalMech.Constructor) - LocalObject(529, ImplantTerminalMech.Constructor) - LocalObject(686, Locker.Constructor) - LocalObject(687, Locker.Constructor) - LocalObject(688, Locker.Constructor) - LocalObject(689, Locker.Constructor) - LocalObject(690, Locker.Constructor) - LocalObject(691, Locker.Constructor) - LocalObject(692, Locker.Constructor) - LocalObject(693, Locker.Constructor) - LocalObject(842, Terminal.Constructor(order_terminal)) - LocalObject(843, Terminal.Constructor(order_terminal)) - LocalObject(844, Terminal.Constructor(order_terminal)) - LocalObject(845, Terminal.Constructor(order_terminal)) - LocalObject(1082, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct - LocalObject(1083, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct - LocalObject(1084, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct - LocalObject(1085, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct - LocalObject(1086, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct - LocalObject(1087, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct - LocalObject(1088, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct - LocalObject(1089, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct - ObjectToBuilding(186, 2) - ObjectToBuilding(187, 2) - ObjectToBuilding(188, 2) - ObjectToBuilding(362, 2) - ObjectToBuilding(370, 2) - ObjectToBuilding(371, 2) - ObjectToBuilding(374, 2) - ObjectToBuilding(375, 2) - ObjectToBuilding(394, 2) - ObjectToBuilding(395, 2) - ObjectToBuilding(396, 2) - ObjectToBuilding(397, 2) - ObjectToBuilding(398, 2) - ObjectToBuilding(462, 2) - ObjectToBuilding(463, 2) - ObjectToBuilding(522, 2) - ObjectToBuilding(523, 2) - ObjectToBuilding(524, 2) - ObjectToBuilding(525, 2) - ObjectToBuilding(526, 2) - ObjectToBuilding(527, 2) - ObjectToBuilding(528, 2) - ObjectToBuilding(529, 2) - ObjectToBuilding(686, 2) - ObjectToBuilding(687, 2) - ObjectToBuilding(688, 2) - ObjectToBuilding(689, 2) - ObjectToBuilding(690, 2) - ObjectToBuilding(691, 2) - ObjectToBuilding(692, 2) - ObjectToBuilding(693, 2) - ObjectToBuilding(842, 2) - ObjectToBuilding(843, 2) - ObjectToBuilding(844, 2) - ObjectToBuilding(845, 2) - ObjectToBuilding(1082, 2) - ObjectToBuilding(1083, 2) - ObjectToBuilding(1084, 2) - ObjectToBuilding(1085, 2) - ObjectToBuilding(1086, 2) - ObjectToBuilding(1087, 2) - ObjectToBuilding(1088, 2) - ObjectToBuilding(1089, 2) - TerminalToInterface(522, 1082) - TerminalToInterface(523, 1083) - TerminalToInterface(524, 1084) - TerminalToInterface(525, 1085) - TerminalToInterface(526, 1086) - TerminalToInterface(527, 1087) - TerminalToInterface(528, 1088) - TerminalToInterface(529, 1089) + def Building3() : Unit = { + LocalBuilding(3, FoundationBuilder(WarpGate.Structure)) + } - LocalBuilding(29, FoundationBuilder(Building.Structure(StructureType.Tower))) //South Villa Gun Tower - LocalObject(330, Door.Constructor(Vector3(3979.9219f, 2592.0547f, 91.140625f), Vector3(0, 0, 180))) - LocalObject(331, Door.Constructor(Vector3(3979.9219f, 2592.0547f, 111.140625f), Vector3(0, 0, 180))) - LocalObject(332, Door.Constructor(Vector3(3979.9688f, 2608.0625f, 91.140625f), Vector3(0, 0, 0))) - LocalObject(333, Door.Constructor(Vector3(3979.9688f, 2608.0625f, 111.140625f), Vector3(0, 0, 0))) - LocalObject(556, IFFLock.Constructor) - LocalObject(557, IFFLock.Constructor) - LocalObject(558, IFFLock.Constructor) - LocalObject(559, IFFLock.Constructor) - ObjectToBuilding(330, 29) - ObjectToBuilding(331, 29) - ObjectToBuilding(332, 29) - ObjectToBuilding(333, 29) - ObjectToBuilding(556, 29) - ObjectToBuilding(557, 29) - ObjectToBuilding(558, 29) - ObjectToBuilding(559, 29) - DoorToLock(330, 558) - DoorToLock(331, 559) - DoorToLock(332, 556) - DoorToLock(333, 557) +// LocalBuilding(2, FoundationBuilder(WarpGate.Structure)) //TODO might be wrong? - LocalBuilding(42, FoundationBuilder(Building.Structure(StructureType.Building, Vector3(1, 0, 0)))) //spawn building south of HART C - LocalObject(258, Door.Constructor) //spawn tube door - LocalObject(259, Door.Constructor) //spawn tube door - LocalObject(260, Door.Constructor) //spawn tube door - LocalObject(261, Door.Constructor) //spawn tube door - LocalObject(262, Door.Constructor) //spawn tube door - LocalObject(263, Door.Constructor) //spawn tube door - LocalObject(372, Door.Constructor) //entrance - LocalObject(373, Door.Constructor) //entrance - LocalObject(430, Door.Constructor) //vr door - LocalObject(431, Door.Constructor) //vr door - LocalObject(432, Door.Constructor) //vr door - LocalObject(433, Door.Constructor) //vr door - LocalObject(434, Door.Constructor) //vr door - LocalObject(435, Door.Constructor) //vr door - LocalObject(744, SpawnTube.Constructor(Vector3(3684.336f, 2709.0469f, 91.859375f), Vector3(0, 0, 180))) - LocalObject(745, SpawnTube.Constructor(Vector3(3684.336f, 2713.2344f, 91.859375f), Vector3(0, 0, 0))) - LocalObject(746, SpawnTube.Constructor(Vector3(3691.0703f, 2709.0469f, 91.859375f), Vector3(0, 0, 180))) - LocalObject(747, SpawnTube.Constructor(Vector3(3691.0703f, 2713.2344f, 91.859375f), Vector3(0, 0, 0))) - LocalObject(748, SpawnTube.Constructor(Vector3(3697.711f, 2709.0469f, 91.859375f), Vector3(0, 0, 180))) - LocalObject(749, SpawnTube.Constructor(Vector3(3697.711f, 2713.2344f, 91.859375f), Vector3(0, 0, 0))) - LocalObject(852, Terminal.Constructor(order_terminal)) //s. wall - LocalObject(853, Terminal.Constructor(order_terminal)) //n. wall - LocalObject(854, Terminal.Constructor(order_terminal)) //s. wall - LocalObject(855, Terminal.Constructor(order_terminal)) //n. wall - LocalObject(859, Terminal.Constructor(order_terminal)) //s. wall - LocalObject(860, Terminal.Constructor(order_terminal)) //n. wall - ObjectToBuilding(258, 42) - ObjectToBuilding(259, 42) - ObjectToBuilding(260, 42) - ObjectToBuilding(261, 42) - ObjectToBuilding(262, 42) - ObjectToBuilding(263, 42) - ObjectToBuilding(372, 42) - ObjectToBuilding(373, 42) - ObjectToBuilding(430, 42) - ObjectToBuilding(431, 42) - ObjectToBuilding(432, 42) - ObjectToBuilding(433, 42) - ObjectToBuilding(434, 42) - ObjectToBuilding(435, 42) - ObjectToBuilding(744, 42) - ObjectToBuilding(745, 42) - ObjectToBuilding(746, 42) - ObjectToBuilding(747, 42) - ObjectToBuilding(748, 42) - ObjectToBuilding(749, 42) - ObjectToBuilding(852, 42) - ObjectToBuilding(853, 42) - ObjectToBuilding(854, 42) - ObjectToBuilding(855, 42) - ObjectToBuilding(859, 42) - ObjectToBuilding(860, 42) +// LocalObject(520, ImplantTerminalMech.Constructor) //Hart B +// LocalObject(1081, Terminal.Constructor(implant_terminal_interface)) //tube 520 +// TerminalToInterface(520, 1081) - LocalBuilding(51, FoundationBuilder(Building.Structure(StructureType.Platform))) //air terminal west of HART C - LocalObject(304, Terminal.Constructor(dropship_vehicle_terminal)) - LocalObject(292, - VehicleSpawnPad.Constructor(Vector3(3508.9844f, 2895.961f, 92.296875f), Vector3(0f, 0f, 270.0f)) - ) - ObjectToBuilding(304, 51) - ObjectToBuilding(292, 51) - TerminalToSpawnPad(304, 292) + def Building2() : Unit = { + LocalBuilding(2, FoundationBuilder(Building.Structure(StructureType.Building))) //HART building C + LocalObject(186, Terminal.Constructor(cert_terminal)) + LocalObject(187, Terminal.Constructor(cert_terminal)) + LocalObject(188, Terminal.Constructor(cert_terminal)) + LocalObject(362, Door.Constructor) + LocalObject(370, Door.Constructor) + LocalObject(371, Door.Constructor) + LocalObject(374, Door.Constructor) + LocalObject(375, Door.Constructor) + LocalObject(394, Door.Constructor) + LocalObject(395, Door.Constructor) + LocalObject(396, Door.Constructor) + LocalObject(397, Door.Constructor) + LocalObject(398, Door.Constructor) + LocalObject(462, Door.Constructor) + LocalObject(463, Door.Constructor) + LocalObject(522, ImplantTerminalMech.Constructor) + LocalObject(523, ImplantTerminalMech.Constructor) + LocalObject(524, ImplantTerminalMech.Constructor) + LocalObject(525, ImplantTerminalMech.Constructor) + LocalObject(526, ImplantTerminalMech.Constructor) + LocalObject(527, ImplantTerminalMech.Constructor) + LocalObject(528, ImplantTerminalMech.Constructor) + LocalObject(529, ImplantTerminalMech.Constructor) + LocalObject(686, Locker.Constructor) + LocalObject(687, Locker.Constructor) + LocalObject(688, Locker.Constructor) + LocalObject(689, Locker.Constructor) + LocalObject(690, Locker.Constructor) + LocalObject(691, Locker.Constructor) + LocalObject(692, Locker.Constructor) + LocalObject(693, Locker.Constructor) + LocalObject(842, Terminal.Constructor(order_terminal)) + LocalObject(843, Terminal.Constructor(order_terminal)) + LocalObject(844, Terminal.Constructor(order_terminal)) + LocalObject(845, Terminal.Constructor(order_terminal)) + LocalObject(1082, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct + LocalObject(1083, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct + LocalObject(1084, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct + LocalObject(1085, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct + LocalObject(1086, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct + LocalObject(1087, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct + LocalObject(1088, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct + LocalObject(1089, Terminal.Constructor(implant_terminal_interface)) //TODO guid not correct + ObjectToBuilding(186, 2) + ObjectToBuilding(187, 2) + ObjectToBuilding(188, 2) + ObjectToBuilding(362, 2) + ObjectToBuilding(370, 2) + ObjectToBuilding(371, 2) + ObjectToBuilding(374, 2) + ObjectToBuilding(375, 2) + ObjectToBuilding(394, 2) + ObjectToBuilding(395, 2) + ObjectToBuilding(396, 2) + ObjectToBuilding(397, 2) + ObjectToBuilding(398, 2) + ObjectToBuilding(462, 2) + ObjectToBuilding(463, 2) + ObjectToBuilding(522, 2) + ObjectToBuilding(523, 2) + ObjectToBuilding(524, 2) + ObjectToBuilding(525, 2) + ObjectToBuilding(526, 2) + ObjectToBuilding(527, 2) + ObjectToBuilding(528, 2) + ObjectToBuilding(529, 2) + ObjectToBuilding(686, 2) + ObjectToBuilding(687, 2) + ObjectToBuilding(688, 2) + ObjectToBuilding(689, 2) + ObjectToBuilding(690, 2) + ObjectToBuilding(691, 2) + ObjectToBuilding(692, 2) + ObjectToBuilding(693, 2) + ObjectToBuilding(842, 2) + ObjectToBuilding(843, 2) + ObjectToBuilding(844, 2) + ObjectToBuilding(845, 2) + ObjectToBuilding(1082, 2) + ObjectToBuilding(1083, 2) + ObjectToBuilding(1084, 2) + ObjectToBuilding(1085, 2) + ObjectToBuilding(1086, 2) + ObjectToBuilding(1087, 2) + ObjectToBuilding(1088, 2) + ObjectToBuilding(1089, 2) + TerminalToInterface(522, 1082) + TerminalToInterface(523, 1083) + TerminalToInterface(524, 1084) + TerminalToInterface(525, 1085) + TerminalToInterface(526, 1086) + TerminalToInterface(527, 1087) + TerminalToInterface(528, 1088) + TerminalToInterface(529, 1089) + } - LocalBuilding(77, FoundationBuilder(Building.Structure(StructureType.Platform))) //ground terminal west of HART C - LocalObject(1063, Terminal.Constructor(ground_vehicle_terminal)) - LocalObject(706, - VehicleSpawnPad.Constructor(Vector3(3506.0f, 2820.0f, 92.0f), Vector3(0f, 0f, 270.0f)) - ) - ObjectToBuilding(1063, 77) - ObjectToBuilding(706, 77) - TerminalToSpawnPad(1063, 706) + def Building29() : Unit = { + LocalBuilding(29, FoundationBuilder(Building.Structure(StructureType.Tower))) //South Villa Gun Tower + LocalObject(330, Door.Constructor(Vector3(3979.9219f, 2592.0547f, 91.140625f), Vector3(0, 0, 180))) + LocalObject(331, Door.Constructor(Vector3(3979.9219f, 2592.0547f, 111.140625f), Vector3(0, 0, 180))) + LocalObject(332, Door.Constructor(Vector3(3979.9688f, 2608.0625f, 91.140625f), Vector3(0, 0, 0))) + LocalObject(333, Door.Constructor(Vector3(3979.9688f, 2608.0625f, 111.140625f), Vector3(0, 0, 0))) + LocalObject(556, IFFLock.Constructor) + LocalObject(557, IFFLock.Constructor) + LocalObject(558, IFFLock.Constructor) + LocalObject(559, IFFLock.Constructor) + ObjectToBuilding(330, 29) + ObjectToBuilding(331, 29) + ObjectToBuilding(332, 29) + ObjectToBuilding(333, 29) + ObjectToBuilding(556, 29) + ObjectToBuilding(557, 29) + ObjectToBuilding(558, 29) + ObjectToBuilding(559, 29) + DoorToLock(330, 558) + DoorToLock(331, 559) + DoorToLock(332, 556) + DoorToLock(333, 557) + } + + def Building42() : Unit = { + LocalBuilding(42, FoundationBuilder(Building.Structure(StructureType.Building, Vector3(1, 0, 0)))) //spawn building south of HART C + LocalObject(258, Door.Constructor) //spawn tube door + LocalObject(259, Door.Constructor) //spawn tube door + LocalObject(260, Door.Constructor) //spawn tube door + LocalObject(261, Door.Constructor) //spawn tube door + LocalObject(262, Door.Constructor) //spawn tube door + LocalObject(263, Door.Constructor) //spawn tube door + LocalObject(372, Door.Constructor) //entrance + LocalObject(373, Door.Constructor) //entrance + LocalObject(430, Door.Constructor) //vr door + LocalObject(431, Door.Constructor) //vr door + LocalObject(432, Door.Constructor) //vr door + LocalObject(433, Door.Constructor) //vr door + LocalObject(434, Door.Constructor) //vr door + LocalObject(435, Door.Constructor) //vr door + LocalObject(744, SpawnTube.Constructor(Vector3(3684.336f, 2709.0469f, 91.859375f), Vector3(0, 0, 180))) + LocalObject(745, SpawnTube.Constructor(Vector3(3684.336f, 2713.2344f, 91.859375f), Vector3(0, 0, 0))) + LocalObject(746, SpawnTube.Constructor(Vector3(3691.0703f, 2709.0469f, 91.859375f), Vector3(0, 0, 180))) + LocalObject(747, SpawnTube.Constructor(Vector3(3691.0703f, 2713.2344f, 91.859375f), Vector3(0, 0, 0))) + LocalObject(748, SpawnTube.Constructor(Vector3(3697.711f, 2709.0469f, 91.859375f), Vector3(0, 0, 180))) + LocalObject(749, SpawnTube.Constructor(Vector3(3697.711f, 2713.2344f, 91.859375f), Vector3(0, 0, 0))) + LocalObject(852, Terminal.Constructor(order_terminal)) //s. wall + LocalObject(853, Terminal.Constructor(order_terminal)) //n. wall + LocalObject(854, Terminal.Constructor(order_terminal)) //s. wall + LocalObject(855, Terminal.Constructor(order_terminal)) //n. wall + LocalObject(859, Terminal.Constructor(order_terminal)) //s. wall + LocalObject(860, Terminal.Constructor(order_terminal)) //n. wall + ObjectToBuilding(258, 42) + ObjectToBuilding(259, 42) + ObjectToBuilding(260, 42) + ObjectToBuilding(261, 42) + ObjectToBuilding(262, 42) + ObjectToBuilding(263, 42) + ObjectToBuilding(372, 42) + ObjectToBuilding(373, 42) + ObjectToBuilding(430, 42) + ObjectToBuilding(431, 42) + ObjectToBuilding(432, 42) + ObjectToBuilding(433, 42) + ObjectToBuilding(434, 42) + ObjectToBuilding(435, 42) + ObjectToBuilding(744, 42) + ObjectToBuilding(745, 42) + ObjectToBuilding(746, 42) + ObjectToBuilding(747, 42) + ObjectToBuilding(748, 42) + ObjectToBuilding(749, 42) + ObjectToBuilding(852, 42) + ObjectToBuilding(853, 42) + ObjectToBuilding(854, 42) + ObjectToBuilding(855, 42) + ObjectToBuilding(859, 42) + ObjectToBuilding(860, 42) + } + + def Building51() : Unit = { + LocalBuilding(51, FoundationBuilder(Building.Structure(StructureType.Platform))) //air terminal west of HART C + LocalObject(304, Terminal.Constructor(dropship_vehicle_terminal)) + LocalObject(292, + VehicleSpawnPad.Constructor(Vector3(3508.9844f, 2895.961f, 92.296875f), Vector3(0f, 0f, 270.0f)) + ) + ObjectToBuilding(304, 51) + ObjectToBuilding(292, 51) + TerminalToSpawnPad(304, 292) + } + + def Building77() : Unit = { + LocalBuilding(77, FoundationBuilder(Building.Structure(StructureType.Platform))) //ground terminal west of HART C + LocalObject(1063, Terminal.Constructor(ground_vehicle_terminal)) + LocalObject(706, + VehicleSpawnPad.Constructor(Vector3(3506.0f, 2820.0f, 92.0f), Vector3(0f, 0f, 270.0f)) + ) + ObjectToBuilding(1063, 77) + ObjectToBuilding(706, 77) + TerminalToSpawnPad(1063, 706) + } } val map14 = new ZoneMap("map13") diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala index 129afc99..6d24c17c 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -72,8 +72,8 @@ class WorldSessionActor extends Actor with MDCContextAware { override def postStop() = { clientKeepAlive.cancel - progressBarUpdate.cancel reviveTimer.cancel + PlayerActionsToCancel() //progressBarUpdate.cancel localService ! Service.Leave() vehicleService ! Service.Leave() avatarService ! Service.Leave() @@ -102,7 +102,7 @@ class WorldSessionActor extends Actor with MDCContextAware { continent.Population ! Zone.Population.Release(avatar) continent.Population ! Zone.Population.Leave(avatar) avatarService ! AvatarServiceMessage(player.Continent, AvatarAction.ObjectDelete(player_guid, player_guid)) - taskResolver ! GUIDTask.UnregisterAvatar(player)(continent.GUID) + taskResolver ! GUIDTask. UnregisterAvatar(player)(continent.GUID) //TODO normally, the actual player avatar persists a minute or so after the user disconnects } } @@ -1299,8 +1299,9 @@ class WorldSessionActor extends Actor with MDCContextAware { AwardBattleExperiencePoints(avatar, 1000000L) player = new Player(avatar) //player.Position = Vector3(3561.0f, 2854.0f, 90.859375f) //home3, HART C - player.Position = Vector3(3881.9688f, 4432.008f, 267.0f) //z6, Anguta / n.tower - player.Orientation = Vector3(0f, 0f, 90f) + //player.Orientation = Vector3(0f, 0f, 90f) + player.Position = Vector3(4266.0547f, 4046.4844f, 250.23438f) //z6, Akna.tower + player.Orientation = Vector3(0f, 0f, 320f) // player.ExoSuit = ExoSuitType.MAX //TODO strange issue; divide number above by 10 when uncommenting player.Slot(0).Equipment = SimpleItem(remote_electronics_kit) //Tool(GlobalDefinitions.StandardPistol(player.Faction)) player.Slot(2).Equipment = Tool(punisher) //suppressor @@ -1350,7 +1351,7 @@ class WorldSessionActor extends Actor with MDCContextAware { sendResponse(ContinentalLockUpdateMessage(13, PlanetSideEmpire.VS)) // "The VS have captured the VS Sanctuary." sendResponse(ReplicationStreamMessage(5, Some(6), Vector(SquadListing()))) //clear squad list sendResponse(PlanetsideAttributeMessage(PlanetSideGUID(0), 112, 1)) //common - (0 to 255).foreach(i => { sendResponse(SetEmpireMessage(PlanetSideGUID(i), PlanetSideEmpire.VS)) }) + //(0 to 255).foreach(i => { sendResponse(SetEmpireMessage(PlanetSideGUID(i), PlanetSideEmpire.VS)) }) //render Equipment that was dropped into zone before the player arrived continent.EquipmentOnGround.foreach(item => { @@ -1899,7 +1900,8 @@ class WorldSessionActor extends Actor with MDCContextAware { continent.GUID(object_guid) match { case Some(vehicle : Vehicle) => if((player.VehicleOwned.contains(object_guid) && vehicle.Owner.contains(player.GUID)) - || (player.Faction == vehicle.Faction && (vehicle.Owner.isEmpty || vehicle.Health == 0))) { + || (player.Faction == vehicle.Faction + && ((vehicle.Owner.isEmpty || continent.GUID(vehicle.Owner.get).isEmpty) || vehicle.Health == 0))) { vehicleService ! VehicleServiceMessage.UnscheduleDeconstruction(object_guid) vehicleService ! VehicleServiceMessage.RequestDeleteVehicle(vehicle, continent) log.info(s"RequestDestroy: vehicle $object_guid") diff --git a/pslogin/src/main/scala/Zones.scala b/pslogin/src/main/scala/Zones.scala index 6cf61e33..a59db358 100644 --- a/pslogin/src/main/scala/Zones.scala +++ b/pslogin/src/main/scala/Zones.scala @@ -25,6 +25,8 @@ object Zones { Building(42).get.ModelId = 0 Building(48).get.Faction = PlanetSideEmpire.VS Building(48).get.ModelId = 59 + Building(49).get.Faction = PlanetSideEmpire.VS + Building(49).get.ModelId = 69 } }