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

set blip color in one function

Browse Source
This commit is contained in:
hydrant
2021-04-05 16:26:12 +02:00
parent 072be07e98
commit f8237c84bb
7 changed files with 134 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -69,32 +69,7 @@ namespace ReallifeGamemode.Server.Managers
ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen.");
ChatService.SendMessage(player, "!{02FCFF}Du hast die Einladung angenommen.");
switch (own.FactionId)
{
default:
player.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0);
break;
case 8:
player.SetSharedData("blipColor", 83);
player.SetSharedData("nameTagColor", 8);
break;
case 7:
player.SetSharedData("blipColor", 52);
player.SetSharedData("nameTagColor", 7);
break;
case 4:
player.SetSharedData("blipColor", 5);
player.SetSharedData("nameTagColor", 4);
break;
case 9:
player.SetSharedData("blipColor", 25);
player.SetSharedData("nameTagColor", 9);
break;
}
own.SetBlipAndNametagColor();
dbContext.SaveChanges();
}
}
@@ -247,8 +222,10 @@ namespace ReallifeGamemode.Server.Managers
return;
}
User targetUser = target.GetUser();
User playerUser = player.GetUser();
using var dbContext = new DatabaseContext();
User targetUser = target.GetUser(dbContext);
User playerUser = player.GetUser(dbContext);
if (type == "Fraktion")
{
@@ -276,21 +253,16 @@ namespace ReallifeGamemode.Server.Managers
return;
}
using (var dbContext = new DatabaseContext())
{
target.SetData("duty", false);
target.TriggerEvent("toggleDutyMode", false);
Medic.UpdateDutyMedics(-1);
target.SetSharedData("blipColor", 0);
UpdateCharacterCloth.LoadCharacterDefaults(target);
target.GetUser(dbContext).FactionRankId = null;
target.GetUser(dbContext).FactionId = null;
ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " aus der Fraktion geworfen.");
ChatService.SendMessage(target, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");
target.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0);
dbContext.SaveChanges();
}
target.SetData("duty", false);
target.TriggerEvent("toggleDutyMode", false);
Medic.UpdateDutyMedics(-1);
UpdateCharacterCloth.LoadCharacterDefaults(target);
target.GetUser(dbContext).FactionRankId = null;
target.GetUser(dbContext).FactionId = null;
ChatService.SendMessage(player, "!{02FCFF}Du hast " + target.Name + " aus der Fraktion geworfen.");
ChatService.SendMessage(target, "!{02FCFF}Du wurdest von " + player.Name + " aus der Fraktion geworfen.");
targetUser.SetBlipAndNametagColor();
dbContext.SaveChanges();
}
else if (type == "Gruppe")
{
@@ -377,7 +349,7 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("CLIENT:InteractionMenu_LeaveGroup")]
public void InteractionMenuGroupLeageGroup(Player player, string type)
{
if (type == "Gruppe")
{
using (var dbContext = new DatabaseContext())
@@ -390,15 +362,15 @@ namespace ReallifeGamemode.Server.Managers
return;
}
if(dbContext.Users.Count(c => c.Group == playerUser.Group) == 1)
if (dbContext.Users.Count(c => c.Group == playerUser.Group) == 1)
{
InteractionMenuGroupDeleteGroup(player,"Gruppe");
InteractionMenuGroupDeleteGroup(player, "Gruppe");
return;
}
var group = player.GetUser().Group;
if(playerUser.GroupRank == GroupRank.OWNER)
if (playerUser.GroupRank == GroupRank.OWNER)
{
var memberList = dbContext.Users.Where(u => u.Group == playerUser.Group && u.GroupRank < GroupRank.OWNER).ToList();
var newOwner = memberList.OrderByDescending(c => c.GroupRank).First();
@@ -406,7 +378,7 @@ namespace ReallifeGamemode.Server.Managers
newOwner.GroupRank = GroupRank.OWNER;
ChatService.BroadcastGroup("~y~" + newOwner.Name + "~s~ wurde zum neuen Besitzer ernannt", playerUser.Group);
}
playerUser.GroupRank = GroupRank.NONE;
playerUser.Group = null;
ChatService.BroadcastGroup("~y~" + player.Name + "~s~ hat die Gruppe verlassen", group);
@@ -422,13 +394,13 @@ namespace ReallifeGamemode.Server.Managers
if (type == "Gruppe")
{
using (var dbContext = new DatabaseContext())
{
{
if (playerUser?.Group == null || playerUser.GroupRank < GroupRank.OWNER)
{
ChatService.NotAuthorized(player);
return;
}
var deletedGroup = dbContext.Groups.FirstOrDefault(g => g.Id == playerUser.Group.Id);
foreach (var user in dbContext.Users.Where(u => u.Group == playerUser.Group).ToList())
@@ -443,12 +415,12 @@ namespace ReallifeGamemode.Server.Managers
}
}
[RemoteEvent("CLIENT:InteractionMenu_CallService_Taxi")]
[RemoteEvent("CLIENT:InteractionMenu_CallService_Taxi")]
public void CallServiceTaxi(Player player, string street, string zone)
{
var taxiJob = JobManager.GetJob<TaxiDriverJob>();
if(taxiJob == null)
if (taxiJob == null)
{
player.SendChatMessage("Aktuell kann kein Taxi gerufen werden.");
return;
@@ -802,20 +774,20 @@ namespace ReallifeGamemode.Server.Managers
{
if (!player.IsLoggedIn()) return;
List<Player> players = NAPI.Pools.GetAllPlayers();
var listPlayers = players.Where(p => p.GetUser().Wanteds > 0)
.Select(p => new
{
Id = p.Handle.Value,
p.Name,
wanted = p.GetUser().Wanteds,
});
if (listPlayers.Count() > 0)
player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers));
else
player.SendNotification("~r~[Fehler] ~w~Es gibt derzeitig keine Verbrecher!");
var listPlayers = players.Where(p => p.GetUser().Wanteds > 0)
.Select(p => new
{
Id = p.Handle.Value,
p.Name,
wanted = p.GetUser().Wanteds,
});
if (listPlayers.Count() > 0)
player.TriggerEvent("showWantedlist", JsonConvert.SerializeObject(listPlayers));
else
player.SendNotification("~r~[Fehler] ~w~Es gibt derzeitig keine Verbrecher!");
}
@@ -854,11 +826,12 @@ namespace ReallifeGamemode.Server.Managers
if (player.GetData<bool>("healauftrag") == true)
{
player.SendNotification("~r~[Fehler] ~w~Du hast bereits ein Sanitäter gerufen.");
}else
{
Medic.AddTaskToList(healTask);
}
else
{
Medic.AddTaskToList(healTask);
player.SetData("healauftrag", true);
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat soeben einen Serviceauftrag beantragt.", new List<int>() { 2 });
ChatService.BroadcastFaction("~y~[MEDIC] ~w~" + player.Name + " hat soeben einen Serviceauftrag beantragt.", new List<int>() { 2 });
}
}