diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs index 44163ae0..15c0d706 100644 --- a/ReallifeGamemode.Server/Job/BusDriverJob.cs +++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs @@ -63,7 +63,7 @@ namespace ReallifeGamemode.Server.Job private readonly Dictionary> ROUTE_BEGINNER = new Dictionary>//Bus_Skill_1_Route_1 { - { 1, + { 0, new List() { //new Vector3(-601.733, -2049.285, 6.090), @@ -79,7 +79,7 @@ namespace ReallifeGamemode.Server.Job new Vector3(-647.2696533203125, -2215.64501953125, 2.989798069000244) } }, - { 2, + { 1, new List() { //new Vector3(-601.733, -2049.285, 6.090), @@ -95,7 +95,7 @@ namespace ReallifeGamemode.Server.Job new Vector3(-660.7366333007812, -2206.03662109375, 2.988998889923096), } }, - { 3, + { 2, new List() { //new Vector3(-601.733, -2049.285, 6.090), @@ -111,7 +111,7 @@ namespace ReallifeGamemode.Server.Job new Vector3(-644.0516967773438, -2218.673828125, 2.991928577423096), } }, - { 4, + { 3, new List() { //new Vector3(-601.733, -2049.285, 6.090), @@ -132,7 +132,7 @@ namespace ReallifeGamemode.Server.Job private readonly Dictionary> ROUTE_INTERMEDIATE = new Dictionary> { - { 1, + { 0, new List() { //new Vector3(-601.733, -2049.285, 6.090), @@ -147,7 +147,7 @@ namespace ReallifeGamemode.Server.Job new Vector3(-647.2696533203125, -2215.64501953125, 2.989798069000244), } }, - { 2, + { 1, new List() { //new Vector3(-601.733, -2049.285, 6.090), @@ -160,7 +160,7 @@ namespace ReallifeGamemode.Server.Job new Vector3(-567.5792846679688, -2212.6533203125, 5.859220504760742), } }, - { 3, + { 2, new List() { //new Vector3(-601.733, -2049.285, 6.090), @@ -173,7 +173,7 @@ namespace ReallifeGamemode.Server.Job new Vector3(-562.68, -2203.85, 4.5), } }, - { 4, + { 3, new List() { //new Vector3(-601.733, -2049.285, 6.090), @@ -192,7 +192,7 @@ namespace ReallifeGamemode.Server.Job private readonly Dictionary> ROUTE_PROFESSIONAL = new Dictionary> { - { 1, + { 0, new List() { //new Vector3(-601.733, -2049.285, 6.090), @@ -216,7 +216,7 @@ namespace ReallifeGamemode.Server.Job new Vector3(-569.0294189453125, -2210.80908203125, 5.571292877197266), } }, - { 2, + { 1, new List() { //new Vector3(-601.733, -2049.285, 6.090), @@ -234,7 +234,7 @@ namespace ReallifeGamemode.Server.Job new Vector3(-605.2278442382812, -2087.974853515625, 5.752280235290527), } }, - { 3, + { 2, new List() { //new Vector3(-601.733, -2049.285, 6.090), @@ -294,11 +294,11 @@ namespace ReallifeGamemode.Server.Job public int getPlayerRouteInex(Player player) { if (!playerRouteCurrent.ContainsKey(player.Name)) - return 0; + return -1; List selectedRoute = playerRouteCurrent[player.Name]; - for (int i = 1; i < 100; i++) + for (int i = 0; i < 100; i++) { if (!ROUTE_BEGINNER.ContainsKey(i) && !ROUTE_INTERMEDIATE.ContainsKey(i) && !ROUTE_PROFESSIONAL.ContainsKey(i)) break; @@ -320,7 +320,7 @@ namespace ReallifeGamemode.Server.Job } } - return 0; + return -1; } private uint getPlayerJobVehicle(Player player) @@ -345,7 +345,7 @@ namespace ReallifeGamemode.Server.Job if (type == PROFESSIONAL && user.BusSkill < SKILL_PROFESSIONAL) { player.TriggerEvent("MenuSelect:Error"); return; } List selectedRoute = new List(); - int index = 0; + int index = -1; if (playerRouteCurrent.ContainsKey(player.Name)) { @@ -354,7 +354,7 @@ namespace ReallifeGamemode.Server.Job else { Random random = new Random(); - index = random.Next(1, 8); + index = random.Next(0, 7); } if (type == BEGINNER) @@ -405,7 +405,7 @@ namespace ReallifeGamemode.Server.Job if (selectedRoute is null || selectedRoute.Count is 0) { - Console.WriteLine($"[ERROR:BUSJOB] Player {player.Name} has empty route Vector3 List."); + Console.WriteLine($"[ERROR:BUSJOB] Player {player.Name} has empty route Vector3 List -BUSDATA TYPE: {type}, INDEX {index}."); return; } @@ -415,7 +415,7 @@ namespace ReallifeGamemode.Server.Job if (vehicle is null) { - Console.WriteLine($"[ERROR:BUSJOB] Player {player.Name} got no Vehicle set."); + Console.WriteLine($"[ERROR:BUSJOB] Player {player.Name} got no Vehicle set -BUSDATA TYPE: {type}, INDEX {index}."); return; } _CHANGING_VEHICLE.Add(player);