diff --git a/ReallifeGamemode.Client/assets/sound/music/login.mp3 b/ReallifeGamemode.Client/assets/sound/music/login.mp3 index 724d2fb2..9d55fce6 100644 Binary files a/ReallifeGamemode.Client/assets/sound/music/login.mp3 and b/ReallifeGamemode.Client/assets/sound/music/login.mp3 differ diff --git a/ReallifeGamemode.Server/Job/PilotJob.cs b/ReallifeGamemode.Server/Job/PilotJob.cs index 8770567c..b40c6e8f 100644 --- a/ReallifeGamemode.Server/Job/PilotJob.cs +++ b/ReallifeGamemode.Server/Job/PilotJob.cs @@ -33,7 +33,8 @@ namespace ReallifeGamemode.Server.Job public static Dictionary> playerRouteCurrent = new Dictionary>(); - public static int spawnIndex = 0; + public static int spawnIndexBeginner = 0; + public static int spawnIndexIntermediate = 0; public const int SKILL_BEGINNER = 0; public const int SKILL_INTERMEDIATE = 300; @@ -42,20 +43,22 @@ namespace ReallifeGamemode.Server.Job private readonly Dictionary BEGINNER_SPAWNS = new Dictionary { - { new Vector3(1698.0226, 3261.829, 41.625206), -170}, - { new Vector3(1673.5715, 3255.3167, 41.385006), -170}, - { new Vector3(1652.0725, 3249.6987, 41.194054), -170}, - { new Vector3(1705.3207, 3236.8796, 41.563965), 15}, - { new Vector3(1680.5709, 3230.2217, 41.563965), 52}, + { new Vector3(1683.6611, 3267.7104, 41.625206), -162}, + { new Vector3(1696.7466, 3271.403, 41.385006), -161}, + { new Vector3(1722.8834, 3278.6873, 41.194054), -160}, + { new Vector3(1723.9468, 3233.8052, 41.563965), 17}, + { new Vector3(1736.5269, 3236.5996, 41.563965), 17}, + { new Vector3(1750.1774, 3240.3157, 41.563965), 17}, }; private readonly Dictionary INTERMEDIATE_SPAWNS = new Dictionary() { - { new Vector3(-1593.1952, -3081.4019, 15), 153}, - { new Vector3(-1573.7805, -3092.615, 15), 153}, - { new Vector3(-1555-9386, -3102-4492, 15), 150}, - { new Vector3(-1536-6404, -3113-7183, 15), 150}, - { new Vector3(-1517-0101, -3125-2798, 15), 150}, + { new Vector3(-1650.7899, -3178.5798, 15), 60}, + { new Vector3(-1643.098, -3165.7114, 15), 60}, + { new Vector3(-1635.0903, -3152.7354, 15), 60}, + { new Vector3(-1627.0435, -3138.8354, 15), 60}, + { new Vector3(-1517-0101, -3125-2798, 15), -118}, + { new Vector3(-1670.9293, -3116.0898, 15), -118}, }; //124 0 Velum @@ -192,15 +195,15 @@ namespace ReallifeGamemode.Server.Job if (type == BEGINNER) { - spawnPoint = BEGINNER_SPAWNS.Keys.ToList()[spawnIndex++ % BEGINNER_SPAWNS.Count]; + spawnPoint = BEGINNER_SPAWNS.Keys.ToList()[spawnIndexBeginner++ % BEGINNER_SPAWNS.Count]; heading = BEGINNER_SPAWNS[spawnPoint]; - selectedRoute = ROUTE_BEGINNER.GetValueOrDefault(random.Next(1, ROUTE_BEGINNER.Count)); + selectedRoute = ROUTE_BEGINNER.GetValueOrDefault(random.Next(0, ROUTE_BEGINNER.Count)); } else if (type == INTERMEDIATE) { - spawnPoint = INTERMEDIATE_SPAWNS.Keys.ToList()[spawnIndex++ % INTERMEDIATE_SPAWNS.Count]; + spawnPoint = INTERMEDIATE_SPAWNS.Keys.ToList()[spawnIndexIntermediate++ % INTERMEDIATE_SPAWNS.Count]; heading = INTERMEDIATE_SPAWNS[spawnPoint]; - selectedRoute = ROUTE_INTERMEDIATE.GetValueOrDefault(random.Next(1, ROUTE_INTERMEDIATE.Count)); + selectedRoute = ROUTE_INTERMEDIATE.GetValueOrDefault(random.Next(0, ROUTE_INTERMEDIATE.Count)); } if (selectedRoute is null || selectedRoute.Count is 0)