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

Fix Pilot-Job, Fix GangWar

Browse Source
This commit is contained in:
VegaZ
2021-04-02 16:34:03 +02:00
parent 04e4e9dc86
commit 2cb74a3da9
3 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Client/util/Gangwar.ts
View File

@@ -265,7 +265,7 @@
mp.game.invoke(Natives.SET_BLIP_FLASHES, self.blip, false); mp.game.invoke(Natives.SET_BLIP_FLASHES, self.blip, false);
//self.blip.destroy(); //self.blip.destroy();
self.setColor(self.owner); self.setColor(self.owner);
self.blip.setColour(self.color); //self.blip.setColour(self.color);
mp.game.invoke(Natives.SET_BLIP_COLOUR, self.blip, self.color); mp.game.invoke(Natives.SET_BLIP_COLOUR, self.blip, self.color);
self.setLeaderColShape(); self.setLeaderColShape();
return; return;

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

@@ -546,12 +546,7 @@ 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 { } else if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3)
player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen.");
return;
}
if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3)
{ {
if (nearestJobPoint.Skill < 300 && player.GetUser().PilotSkill >= 0) if (nearestJobPoint.Skill < 300 && player.GetUser().PilotSkill >= 0)
{ {
@@ -571,35 +566,38 @@ namespace ReallifeGamemode.Server.Events
} }
else else
{ {
player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");
return; return;
} }
if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300)
if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300) {
if (job.GetUsersInJob().Contains(player))
{
player.SetData("PilotenBase", 2);
jobb.StopJob(player);
return;
}
if (!job.GetUsersInJob().Contains(player))
{
player.SetData("PilotenBase", 2);
jobb.StartJobEvent(player);
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return;
}
}
else
{
player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");
return;
}
}
else
{ {
if (job.GetUsersInJob().Contains(player)) player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen.");
{
player.SetData("PilotenBase", 2);
jobb.StopJob(player);
return;
}
if (!job.GetUsersInJob().Contains(player))
{
player.SetData("PilotenBase", 2);
jobb.StartJobEvent(player);
player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'.");
return;
}
} else {
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;
} }
} }
}
[RemoteEvent("keyPress:I")] [RemoteEvent("keyPress:I")]
public void KeyPressI(Player player) public void KeyPressI(Player player)

2
ReallifeGamemode.Server/Main.cs
View File

@@ -164,7 +164,7 @@ namespace ReallifeGamemode.Server
PlayerService.GetPlayerByNameOrId(user).TriggerEvent("updateMoney", account.Balance); PlayerService.GetPlayerByNameOrId(user).TriggerEvent("updateMoney", account.Balance);
} }
}; };
User.HandMoneyChanged += (user) => User.HandMoneyChanged += (user) =>
{ {
user.Player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); user.Player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);