aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
kookroach
2021-04-04 14:49:17 +02:00
parent 0b64eef183 3245a9242e
commit b452293832
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ReallifeGamemode.Server/Job/BusDriverJob.cs
View File

@@ -100,7 +100,6 @@ namespace ReallifeGamemode.Server.Job
}.AsReadOnly(); }.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> Skill2Route2 = new List<Vector3>//Bus_Skill_2_Route_2 private readonly IReadOnlyCollection<Vector3> Skill2Route2 = new List<Vector3>//Bus_Skill_2_Route_2
{ {
new Vector3(1925.767333984375, 2614.566162109375, 46.16560363769531), new Vector3(1925.767333984375, 2614.566162109375, 46.16560363769531),
new Vector3(299.0667419433594, 2642.93798828125, 44.60177993774414), new Vector3(299.0667419433594, 2642.93798828125, 44.60177993774414),
new Vector3(1162.4556884765625, 1806.3663330078125, 74.3133773803711), new Vector3(1162.4556884765625, 1806.3663330078125, 74.3133773803711),
@@ -111,13 +110,26 @@ namespace ReallifeGamemode.Server.Job
}.AsReadOnly(); }.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> Skill2Route3 = new List<Vector3>//Bus_Skill_2_Route_3 private readonly IReadOnlyCollection<Vector3> Skill2Route3 = new List<Vector3>//Bus_Skill_2_Route_3
{ {
new Vector3(-1855.54,153.604,79.0297),
new Vector3(-562.68, -2203.85, 5.5), 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(); }.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> Skill2Route4 = new List<Vector3>//Bus_Skill_2_Route_4 private readonly IReadOnlyCollection<Vector3> Skill2Route4 = new List<Vector3>//Bus_Skill_2_Route_4
{ {
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),
new Vector3(-562.68, -2203.85, 5.5),
}.AsReadOnly(); }.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> Skill3Route1 = new List<Vector3>//Bus_Skill_3_Route_1 private readonly IReadOnlyCollection<Vector3> Skill3Route1 = new List<Vector3>//Bus_Skill_3_Route_1
{ {
@@ -159,8 +171,16 @@ namespace ReallifeGamemode.Server.Job
}.AsReadOnly(); }.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> Skill3Route3 = new List<Vector3>//Bus_Skill_3_Route_3 private readonly IReadOnlyCollection<Vector3> Skill3Route3 = new List<Vector3>//Bus_Skill_3_Route_3
{ {
new Vector3(-146.62071, -2178.8228, 9.194298),
new Vector3(-562.68, -2203.85, 5.5), 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(); }.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> Skill3Route4 = new List<Vector3>//Bus_Skill_3_Route_4 private readonly IReadOnlyCollection<Vector3> Skill3Route4 = new List<Vector3>//Bus_Skill_3_Route_4
{ {
@@ -302,7 +322,7 @@ namespace ReallifeGamemode.Server.Job
if ((VehicleHash)veh.Model == VehicleHash.Coach) if ((VehicleHash)veh.Model == VehicleHash.Coach)
{ {
Random rnd = new Random(); Random rnd = new Random();
int rroute = rnd.Next(1, 3); int rroute = rnd.Next(1, 5);
switch (rroute) switch (rroute)
{ {
case 1: case 1:
@@ -340,7 +360,7 @@ namespace ReallifeGamemode.Server.Job
if ((VehicleHash)veh.Model == VehicleHash.Tourbus) if ((VehicleHash)veh.Model == VehicleHash.Tourbus)
{ {
Random rnd = new Random(); Random rnd = new Random();
int rroute = rnd.Next(1, 3); int rroute = rnd.Next(1, 4);
switch (rroute) switch (rroute)
{ {
case 1: case 1: