From 8c2723732bec20f0a96801ff55365f8b0946f505 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Sun, 4 Apr 2021 14:05:47 +0200 Subject: [PATCH 1/2] Fix Bustouren Skill 2/3 Route 3/4 --- ReallifeGamemode.Server/Job/BusDriverJob.cs | 35 ++++++++++++++++----- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs index 7587bf04..b23ac37d 100644 --- a/ReallifeGamemode.Server/Job/BusDriverJob.cs +++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs @@ -100,7 +100,6 @@ namespace ReallifeGamemode.Server.Job }.AsReadOnly(); private readonly IReadOnlyCollection Skill2Route2 = new List//Bus_Skill_2_Route_2 { - new Vector3(1925.767333984375, 2614.566162109375, 46.16560363769531), new Vector3(299.0667419433594, 2642.93798828125, 44.60177993774414), new Vector3(1162.4556884765625, 1806.3663330078125, 74.3133773803711), @@ -111,13 +110,27 @@ namespace ReallifeGamemode.Server.Job }.AsReadOnly(); private readonly IReadOnlyCollection Skill2Route3 = new List//Bus_Skill_2_Route_3 { - + new Vector3(-1855.54,153.604,80.0297), + new Vector3(-1538.72,1375.19,125.3), + new Vector3(-1101.74,2668.48,18.7363), + new Vector3(1964.14,3718.04,32.2255), + new Vector3(2566.1,396.879,108.463), + new Vector3(254.405,-982.937,29.274), + new Vector3(-579.992,-2225.67,5.73425), new Vector3(-562.68, -2203.85, 5.5), }.AsReadOnly(); private readonly IReadOnlyCollection Skill2Route4 = new List//Bus_Skill_2_Route_4 { + new Vector3(-1037.8,-2716.02,13.7963), + new Vector3(1662.69,4849.72,41.9165), + new Vector3(57.8575,3735.46,39.7301), + new Vector3(-1109.48,2681,18.8602), + new Vector3(-2536.35,2322.65,33.0599), + new Vector3(-3232.01,961.997,13.1515), + new Vector3(-3014.22,364.543,14.7242), + new Vector3(-1580.52,-652.24,29.5874), + new Vector3(-578.954,-2224.8,5.75774), - new Vector3(-562.68, -2203.85, 5.5), }.AsReadOnly(); private readonly IReadOnlyCollection Skill3Route1 = new List//Bus_Skill_3_Route_1 { @@ -159,8 +172,16 @@ namespace ReallifeGamemode.Server.Job }.AsReadOnly(); private readonly IReadOnlyCollection Skill3Route3 = new List//Bus_Skill_3_Route_3 { - - new Vector3(-562.68, -2203.85, 5.5), + new Vector3(-146.62071, -2178.8228, 10.194298), + new Vector3(14.580393, -1578.6385, 29.212185), + new Vector3(222.91612, -1098.8556, 29.227453), + new Vector3(246.44946, -648.45496, 39.420746), + new Vector3(102.181, -298.95276, 46.04399), + new Vector3(-104.91002, -606.26013, 36.06103), + new Vector3(-288.1007, -1204.5107, 24.403156), + new Vector3(-166.23526, -1574.4166, 35.152023), + new Vector3(-60.337997, -1976.121, 16.486664), + new Vector3(-599.1891, -2049.2695, 6.14637), //Checkpoint Ende }.AsReadOnly(); private readonly IReadOnlyCollection Skill3Route4 = new List//Bus_Skill_3_Route_4 { @@ -302,7 +323,7 @@ namespace ReallifeGamemode.Server.Job if ((VehicleHash)veh.Model == VehicleHash.Coach) { Random rnd = new Random(); - int rroute = rnd.Next(1, 3); + int rroute = rnd.Next(1, 5); switch (rroute) { case 1: @@ -340,7 +361,7 @@ namespace ReallifeGamemode.Server.Job if ((VehicleHash)veh.Model == VehicleHash.Tourbus) { Random rnd = new Random(); - int rroute = rnd.Next(1, 3); + int rroute = rnd.Next(1, 4); switch (rroute) { case 1: From 3245a9242e68f5d7c39fc303809f443048b4c6c5 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Sun, 4 Apr 2021 14:47:04 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20Bustouren=20Checkpoint=20H=C3=B6hen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReallifeGamemode.Server/Job/BusDriverJob.cs | 53 ++++++++++----------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs index b23ac37d..617978c3 100644 --- a/ReallifeGamemode.Server/Job/BusDriverJob.cs +++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs @@ -110,26 +110,25 @@ namespace ReallifeGamemode.Server.Job }.AsReadOnly(); private readonly IReadOnlyCollection Skill2Route3 = new List//Bus_Skill_2_Route_3 { - new Vector3(-1855.54,153.604,80.0297), - new Vector3(-1538.72,1375.19,125.3), - new Vector3(-1101.74,2668.48,18.7363), - new Vector3(1964.14,3718.04,32.2255), - new Vector3(2566.1,396.879,108.463), - new Vector3(254.405,-982.937,29.274), - new Vector3(-579.992,-2225.67,5.73425), - new Vector3(-562.68, -2203.85, 5.5), + new Vector3(-1855.54,153.604,79.0297), + new Vector3(-1538.72,1375.19,124.3), + new Vector3(-1101.74,2668.48,17.7363), + new Vector3(1964.14,3718.04,31.2255), + new Vector3(2566.1,396.879,107.463), + new Vector3(254.405,-982.937,28.274), + new Vector3(-562.68, -2203.85, 4.5), }.AsReadOnly(); private readonly IReadOnlyCollection Skill2Route4 = new List//Bus_Skill_2_Route_4 { - new Vector3(-1037.8,-2716.02,13.7963), - new Vector3(1662.69,4849.72,41.9165), - new Vector3(57.8575,3735.46,39.7301), - new Vector3(-1109.48,2681,18.8602), - new Vector3(-2536.35,2322.65,33.0599), - new Vector3(-3232.01,961.997,13.1515), - new Vector3(-3014.22,364.543,14.7242), - new Vector3(-1580.52,-652.24,29.5874), - new Vector3(-578.954,-2224.8,5.75774), + new Vector3(-1037.8,-2716.02,12.7963), + new Vector3(1662.69,4849.72,40.9165), + new Vector3(57.8575,3735.46,38.7301), + new Vector3(-1109.48,2681,17.8602), + new Vector3(-2536.35,2322.65,32.0599), + new Vector3(-3232.01,961.997,12.1515), + new Vector3(-3014.22,364.543,13.7242), + new Vector3(-1580.52,-652.24,28.5874), + new Vector3(-578.954,-2224.8,4.75774), }.AsReadOnly(); private readonly IReadOnlyCollection Skill3Route1 = new List//Bus_Skill_3_Route_1 @@ -172,16 +171,16 @@ namespace ReallifeGamemode.Server.Job }.AsReadOnly(); private readonly IReadOnlyCollection Skill3Route3 = new List//Bus_Skill_3_Route_3 { - new Vector3(-146.62071, -2178.8228, 10.194298), - new Vector3(14.580393, -1578.6385, 29.212185), - new Vector3(222.91612, -1098.8556, 29.227453), - new Vector3(246.44946, -648.45496, 39.420746), - new Vector3(102.181, -298.95276, 46.04399), - new Vector3(-104.91002, -606.26013, 36.06103), - new Vector3(-288.1007, -1204.5107, 24.403156), - new Vector3(-166.23526, -1574.4166, 35.152023), - new Vector3(-60.337997, -1976.121, 16.486664), - new Vector3(-599.1891, -2049.2695, 6.14637), //Checkpoint Ende + new Vector3(-146.62071, -2178.8228, 9.194298), + new Vector3(14.580393, -1578.6385, 28.212185), + new Vector3(222.91612, -1098.8556, 28.227453), + new Vector3(246.44946, -648.45496, 38.420746), + new Vector3(102.181, -298.95276, 45.04399), + new Vector3(-104.91002, -606.26013, 35.06103), + new Vector3(-288.1007, -1204.5107, 23.403156), + new Vector3(-166.23526, -1574.4166, 34.152023), + new Vector3(-60.337997, -1976.121, 15.486664), + new Vector3(-599.1891, -2049.2695, 5.14637), }.AsReadOnly(); private readonly IReadOnlyCollection Skill3Route4 = new List//Bus_Skill_3_Route_4 {