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

add massage at job (Du hast diesen job nicht angenommen) & change chackpointid at drivingschool

Browse Source
This commit is contained in:
michael.reiswich
2021-03-23 00:44:41 +01:00
parent c3c2c939a2
commit 87f6aaebfe
2 changed files with 65 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
View File

@@ -19,19 +19,19 @@ namespace ReallifeGamemode.Server.DrivingSchool
private readonly IReadOnlyCollection<Vector3> BikeRoute = new List<Vector3> private readonly IReadOnlyCollection<Vector3> BikeRoute = new List<Vector3>
{ {
new Vector3(-741.98, -1283.46, 4.17), new Vector3(-741.98, -1283.46, 6.17),
new Vector3(-702.49, -1246.57, 8.89), new Vector3(-702.49, -1246.57, 10.89),
new Vector3(-659.88, -1506.23, 9.94), new Vector3(-659.88, -1506.23, 11.94),
new Vector3(-423.72, -1770.7, 19.13), new Vector3(-423.72, -1770.7, 21.13),
new Vector3(-265.74, -1453.66, 29.74), new Vector3(-265.74, -1453.66, 31.74),
new Vector3(51.22, -1370.96, 27.84), new Vector3(51.22, -1370.96, 29.84),
new Vector3(161.51, -1246.64, 36.5), new Vector3(161.51, -1246.64, 38.5),
new Vector3(702.39, -1247.82, 33.98), new Vector3(702.39, -1247.82, 35.98),
new Vector3(779.54, -1245.7, 25.08), new Vector3(779.54, -1245.7, 27.08),
new Vector3(719.58, -1153.01, 31.75), new Vector3(719.58, -1153.01, 33.75),
new Vector3(-233.65, -1133.09, 21.52), new Vector3(-233.65, -1133.09, 23.52),
new Vector3(-511.5, -1079.99, 21.37), new Vector3(-511.5, -1079.99, 23.37),
new Vector3(-707.52, -1239.48, 8.91), new Vector3(-707.52, -1239.48, 10.91),
}.AsReadOnly(); }.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> StopBike = new List<Vector3> private readonly IReadOnlyCollection<Vector3> StopBike = new List<Vector3>
@@ -42,42 +42,42 @@ namespace ReallifeGamemode.Server.DrivingSchool
private readonly IReadOnlyCollection<Vector3> DrivingRoute = new List<Vector3> private readonly IReadOnlyCollection<Vector3> DrivingRoute = new List<Vector3>
{ {
//BEGIN //BEGIN
new Vector3(-745.6191, -1285.735, 3.947221), new Vector3(-745.6191, -1285.735, 5.947221),
new Vector3(-704.5242, -1246.765, 9.385977), new Vector3(-704.5242, -1246.765, 10.385977),
new Vector3(-673.0675, -1266.652, 9.29717), new Vector3(-673.0675, -1266.652, 11.29717),
new Vector3(-646.1747, -1293.238, 9.28384), new Vector3(-646.1747, -1293.238, 11.28384),
new Vector3(-510.7098, -916.9164, 24.10735), new Vector3(-510.7098, -916.9164, 26.10735),
new Vector3(-492.6284, -860.5167, 28.89526), new Vector3(-492.6284, -860.5167, 30.89526),
new Vector3(-450.3232, -841.7007, 29.3698), new Vector3(-450.3232, -841.7007, 31.3698),
new Vector3(17.09636, -973.2763, 28.01929), new Vector3(17.09636, -973.2763, 30.01929),
new Vector3(76.66012, -999.568, 27.97918), new Vector3(76.66012, -999.568, 29.97918),
//SLALOM //SLALOM
new Vector3(-12.64976, -1751.287, 27.91913), new Vector3(-12.64976, -1751.287, 29.91913),
new Vector3(6.008641, -1767.067, 27.91265), new Vector3(6.008641, -1767.067, 29.91265),
new Vector3(12.80635, -1752.094, 27.91877), new Vector3(12.80635, -1752.094, 29.91877),
new Vector3(26.71735, -1747.96, 27.92006), new Vector3(26.71735, -1747.96, 29.92006),
new Vector3(28.67053, -1733.492, 27.91953), new Vector3(28.67053, -1733.492, 29.91953),
new Vector3(42.68731, -1728.767, 27.92002), new Vector3(42.68731, -1728.767, 29.92002),
new Vector3(44.33229, -1714.426, 27.9193), new Vector3(44.33229, -1714.426, 29.9193),
new Vector3(37.25899, -1723.924, 27.92041), new Vector3(37.25899, -1723.924, 29.92041),
new Vector3(34.591, -1738.211, 27.92125), new Vector3(34.591, -1738.211, 29.92125),
new Vector3(21.28996, -1742.563, 27.91987), new Vector3(21.28996, -1742.563, 29.91987),
new Vector3(18.46534, -1756.87, 27.92011), new Vector3(18.46534, -1756.87, 29.92011),
new Vector3(4.841759, -1761.316, 27.91519), new Vector3(4.841759, -1761.316, 29.91519),
new Vector3(44.69115, -1805.247, 24.07369), new Vector3(44.69115, -1805.247, 26.07369),
new Vector3(111.6519, -1822.466, 25.03703), new Vector3(111.6519, -1822.466, 27.03703),
//AUTOBAHN-ENDE //AUTOBAHN-ENDE
new Vector3(-46.37, -1808.27, 26.25), new Vector3(-46.37, -1808.27, 28.25),
new Vector3(-255.55, -1419.48, 30.75), new Vector3(-255.55, -1419.48, 32.75),
new Vector3(-369.08, -1415.37, 27.68), new Vector3(-369.08, -1415.37, 29.68),
new Vector3(-114.48, -1251.43, 35.59), new Vector3(-114.48, -1251.43, 37.59),
new Vector3(59.22, -1261.71, 27.84), new Vector3(59.22, -1261.71, 29.84),
new Vector3(39.12, -1165.28, 27.87), new Vector3(39.12, -1165.28, 29.87),
new Vector3(-307.52, -1200.85, 35.79), new Vector3(-307.52, -1200.85, 37.79),
new Vector3(-441.79, -1251.67, 44.37), new Vector3(-441.79, -1251.67, 46.37),
new Vector3(-463.77, -1405.07, 27.71), new Vector3(-463.77, -1405.07, 29.71),
new Vector3(-617.66, -1259.34, 9.82), new Vector3(-617.66, -1259.34, 11.82),
new Vector3(-758.35, -1285.03, 3.48), new Vector3(-758.35, -1285.03, 5.48),
}.AsReadOnly(); }.AsReadOnly();
private readonly IReadOnlyCollection<Vector3> StopCar = new List<Vector3> private readonly IReadOnlyCollection<Vector3> StopCar = new List<Vector3>
@@ -148,13 +148,13 @@ namespace ReallifeGamemode.Server.DrivingSchool
{ {
user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen."); user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen.");
user.TriggerEvent("stopTimer"); user.TriggerEvent("stopTimer");
CheckPointHandle.StartCheckPointRoute(user, DrivingRoute, 0, 1, 7, 3, true, "drivingSchoolEvent"); CheckPointHandle.StartCheckPointRoute(user, DrivingRoute, 0, 20, 2, 3, true, "drivingSchoolEvent");
} }
if (schoolVehicle.SchoolId == 2 && user.IsInVehicle) if (schoolVehicle.SchoolId == 2 && user.IsInVehicle)
{ {
user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen."); user.TriggerEvent("renderTextOnScreen", "Gut nun kann die Prüfung losgehen.");
user.TriggerEvent("stopTimer"); user.TriggerEvent("stopTimer");
CheckPointHandle.StartCheckPointRoute(user, BikeRoute, 0, 1, 7, 3, true, "bikeSchoolEvent"); CheckPointHandle.StartCheckPointRoute(user, BikeRoute, 0, 20, 2, 3, true, "bikeSchoolEvent");
} }
} }
} }

14
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -546,7 +546,12 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'."); player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
}else
{
player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen.");
return;
} }
if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3) if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3)
{ {
if (nearestJobPoint.Skill < 300 && player.GetUser().PilotSkill >= 0) if (nearestJobPoint.Skill < 300 && player.GetUser().PilotSkill >= 0)
@@ -564,7 +569,12 @@ namespace ReallifeGamemode.Server.Events
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return; return;
} }
}else
{
player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen.");
return;
} }
if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300) if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300)
{ {
if (job.GetUsersInJob().Contains(player)) if (job.GetUsersInJob().Contains(player))
@@ -586,6 +596,10 @@ namespace ReallifeGamemode.Server.Events
player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig."); player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");
return; return;
} }
}else
{
player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen.");
return;
} }
} }
} }