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

Adjust chat messages

Browse Source
This commit is contained in:
Luke
2020-08-02 16:45:18 +02:00
parent 71e91e9275
commit 973d4df926
4 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using GTANetworkAPI;
@@ -166,7 +166,7 @@ namespace ReallifeGamemode.Server.Job
{
if (data.getDataFromClient(player) == null) continue;
veh = data.vehicle;
ChatService.SendMessage((Player)player, "~g~Du hast den Müllmann-Job gestartet!");
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Du hast deinen Job (~o~{job.Name}~s~) gestartet.");
player.TriggerEvent("SERVER:MuellmannStatusTrue");
player.TriggerEvent("SERVER:MuellmannBCSErstellen", JsonConvert.SerializeObject(vector3s.ToArray()), veh);
return;
@@ -176,7 +176,7 @@ namespace ReallifeGamemode.Server.Job
public void MuellmannJobBeenden(Player player)
{
ChatService.SendMessage((Player)player, "~g~Du hast den Müllmann-Job beendet!");
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Du hast deinen Job (~o~{job.Name}~s~) beendet.");
player.TriggerEvent("SERVER:MuellmannStatusFalse");
player.TriggerEvent("SERVER:MuellmannBCSEntfernen");
@@ -204,7 +204,7 @@ namespace ReallifeGamemode.Server.Job
if (data.getDataFromClient(player) == null) continue;
Player target = data.getPartnerClient(player);
if (target != null) target.TriggerEvent("MuellmannUpdateColshape", colshapeIndex);
ChatService.SendMessage((Player)player, "Wirf den müllsack in den Müllwagen.");
ChatService.SendMessage((Player)player, "~y~Job: ~s~Wirf den Müllsack in den Müllwagen.");
player.AddAttachment("binbag", false);
return;
}
@@ -226,8 +226,8 @@ namespace ReallifeGamemode.Server.Job
user1.trashcount += 1;
player.SendNotification("Müllsack: " + user1.trashcount + " von 20.");
if (target != null) {
target.SendNotification("Müllsack: " + user2.trashcount + " von 20.");
user2.trashcount += 1;
target.SendNotification("Müllsack: " + user2.trashcount + " von 20.");
user2.trashcount += 1;
}
dbContext.SaveChanges();
}
@@ -235,8 +235,11 @@ namespace ReallifeGamemode.Server.Job
if (target != null)
if (player.GetUser().trashcount >= 20)
{
ChatService.SendMessage((Player)player, "Auto ist voll fahre nun zu Base.");
if (target != null) { ChatService.SendMessage((Player)target, "Auto ist voll fahre nun zu Base."); target.TriggerEvent("SERVER:MuellmannZuBase"); }
ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!");
if (target != null) {
ChatService.SendMessage((Player)target, "~y~Job: ~s~Der Müllwagen ist voll! Er muss wieder entleert werden.");
target.TriggerEvent("SERVER:MuellmannZuBase");
}
player.TriggerEvent("SERVER:MuellmannZuBase");
}
else
@@ -266,8 +269,8 @@ namespace ReallifeGamemode.Server.Job
if (data.getDataFromClient(player) == null) continue;
Player target = data.getPartnerClient(player);
if (target != null) ChatService.SendMessage((Player)target, $"Fahrzeug wurde entleert. Säcke: {target.GetUser().trashcount}");
ChatService.SendMessage((Player)player, $"Fahrzeug wurde entleert. Säcke: {player.GetUser().trashcount}");
if (target != null) ChatService.SendMessage((Player)target, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {target.GetUser().trashcount}");
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {player.GetUser().trashcount}");
//bonus pro sack
if (target != null)
{
@@ -379,8 +382,8 @@ namespace ReallifeGamemode.Server.Job
if (target == null)
return;
ChatService.SendMessage((Player)player, $"Dein Partner ist {target.Name} !");
ChatService.SendMessage((Player)target, $"Dein Partner ist {player.Name} !");
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Dein Partner ist {target.Name}!");
ChatService.SendMessage((Player)target, $"~y~Job: ~s~Dein Partner ist {player.Name}!");
return;
}
}
@@ -396,8 +399,8 @@ namespace ReallifeGamemode.Server.Job
if (target == null)
return;
ChatService.SendMessage((Player)player, $"Dein Partner ist {target.Name} !");
ChatService.SendMessage((Player)target, $"Dein Partner ist {player.Name} !");
ChatService.SendMessage((Player)player, $"~y~Job: ~s~Dein Partner ist {target.Name}!");
ChatService.SendMessage((Player)target, $"~y~Job: ~s~Dein Partner ist {player.Name}!");
}
}