code quality

This commit is contained in:
2020-08-03 10:38:44 +02:00
parent 044123cdcc
commit 990f8cefd7
2 changed files with 10 additions and 6 deletions

View File

@@ -15,6 +15,8 @@ namespace ReallifeGamemode.Server.DrivingSchool
private static ColShape _colShape1; private static ColShape _colShape1;
public static Vector3 Position { get; } public static Vector3 Position { get; }
private const int CHECKPOINT_MARKER_ID = 26;
private readonly IReadOnlyCollection<Vector3> planeRoute = new List<Vector3> private readonly IReadOnlyCollection<Vector3> planeRoute = new List<Vector3>
{ {
new Vector3(-1114.39, -2333.09, 14.87), new Vector3(-1114.39, -2333.09, 14.87),
@@ -101,7 +103,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{ {
user.TriggerEvent("renderTextOnScreen", "Fahren Sie langsam und sicher zur roten Markierung."); user.TriggerEvent("renderTextOnScreen", "Fahren Sie langsam und sicher zur roten Markierung.");
user.TriggerEvent("stopTimer"); user.TriggerEvent("stopTimer");
CheckPointHandle.StartCheckPointRoute(user, planeRoute, 0, 26, 12, 5, true, "planeSchoolEvent"); CheckPointHandle.StartCheckPointRoute(user, planeRoute, 0, CHECKPOINT_MARKER_ID, 12, 5, true, "planeSchoolEvent");
} }
} }
} }
@@ -169,7 +171,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
case 14: case 14:
user.TriggerEvent("renderTextOnScreen", "Setzen Sie zum Landeanflug an. Drücken Sie 'G', um das Fahrwerk auszufahren."); user.TriggerEvent("renderTextOnScreen", "Setzen Sie zum Landeanflug an. Drücken Sie 'G', um das Fahrwerk auszufahren.");
CheckPointHandle.StartCheckPointRoute(user, planeRouteEnd, 5000, 6, 12, 5, true, "planeSchoolEventEnd"); CheckPointHandle.StartCheckPointRoute(user, planeRouteEnd, 5000, CHECKPOINT_MARKER_ID, 12, 5, true, "planeSchoolEventEnd");
break; break;
} }
} }

View File

@@ -16,6 +16,8 @@ namespace ReallifeGamemode.Server.Job
public override string Name => "Pilot"; public override string Name => "Pilot";
private const int CHECKPOINT_MARKER_ID = 26;
public override bool NeedVehicleToStart => false; public override bool NeedVehicleToStart => false;
private readonly IReadOnlyCollection<Vector3> Skill1Route1 = new List<Vector3>//Pilot_Skill_1_Route_1 private readonly IReadOnlyCollection<Vector3> Skill1Route1 = new List<Vector3>//Pilot_Skill_1_Route_1
@@ -172,14 +174,14 @@ namespace ReallifeGamemode.Server.Job
{ {
case 1: case 1:
{ {
CheckPointHandle.StartCheckPointRoute(player, Skill1Route1, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 CheckPointHandle.StartCheckPointRoute(player, Skill1Route1, 0, CHECKPOINT_MARKER_ID, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 1"); player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 1");
player.SetData("Route", "Skill1Route1"); player.SetData("Route", "Skill1Route1");
break; break;
} }
case 2: case 2:
{ {
CheckPointHandle.StartCheckPointRoute(player, Skill1Route2, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 CheckPointHandle.StartCheckPointRoute(player, Skill1Route2, 0, CHECKPOINT_MARKER_ID, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 2"); player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 2");
player.SetData("Route", "Skill1Route2"); player.SetData("Route", "Skill1Route2");
break; break;
@@ -201,14 +203,14 @@ namespace ReallifeGamemode.Server.Job
{ {
case 1: case 1:
{ {
CheckPointHandle.StartCheckPointRoute(player, Skill2Route1, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 CheckPointHandle.StartCheckPointRoute(player, Skill2Route1, 0, CHECKPOINT_MARKER_ID, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 1"); player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 1");
player.SetData("Route", "Skill2Route1"); player.SetData("Route", "Skill2Route1");
break; break;
} }
case 2: case 2:
{ {
CheckPointHandle.StartCheckPointRoute(player, Skill2Route2, 0, 26, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28 CheckPointHandle.StartCheckPointRoute(player, Skill2Route2, 0, CHECKPOINT_MARKER_ID, 40, 10, true, "pilotJob"); //6, 23, 25, 26, 27, 28
player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 2"); player.SendChatMessage("~y~Job: ~s~Route wurde gesetzt: ~g~Route 2");
player.SetData("Route", "Skill2Route2"); player.SetData("Route", "Skill2Route2");
break; break;