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

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
kookroach
2021-04-05 01:24:46 +02:00
parent 458c817284 a0ec2ca6ac
commit fa53229f51
4 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -309,24 +309,28 @@ namespace ReallifeGamemode.Server.Commands
break;
case 0:
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;
}
player.SetSharedData("nameTagColor", targetUser.FactionId);
if (targetUser.FactionId != null) player.SetSharedData("nameTagColor", targetUser.FactionId);
}
}
@@ -1495,28 +1499,30 @@ namespace ReallifeGamemode.Server.Commands
target.SetSharedData("blipColor", 0);
target.SetSharedData("nameTagColor", 0);
break;
case 0:
target.SetSharedData("blipColor", 0);
target.SetSharedData("nameTagColor", 0);
break;
case 8:
target.SetSharedData("blipColor", 83);
target.SetSharedData("nameTagColor", 8);
break;
case 7:
target.SetSharedData("blipColor", 52);
target.SetSharedData("nameTagColor", 7);
break;
case 4:
target.SetSharedData("blipColor", 5);
target.SetSharedData("nameTagColor", 4);
break;
case 9:
target.SetSharedData("blipColor", 25);
target.SetSharedData("nameTagColor", 9);
break;
}
target.TriggerEvent("jailTime", 0);
if (targetUser.FactionId != null) target.SetSharedData("nameTagColor", targetUser.FactionId);
targetUser.Wanteds = 0;
dbContext.SaveChanges();
}
@@ -2457,25 +2463,29 @@ namespace ReallifeGamemode.Server.Commands
case 0:
target.SetSharedData("blipColor", 0);
target.SetSharedData("nameTagColor", 0);
break;
case 8:
target.SetSharedData("blipColor", 83);
target.SetSharedData("nameTagColor", 8);
break;
case 7:
target.SetSharedData("blipColor", 52);
target.SetSharedData("nameTagColor", 7);
break;
case 4:
target.SetSharedData("blipColor", 5);
target.SetSharedData("nameTagColor", 4);
break;
case 9:
target.SetSharedData("blipColor", 25);
target.SetSharedData("nameTagColor", 9);
break;
}
if (u.FactionId != null) target.SetSharedData("nameTagColor", u.FactionId);
dbContext.SaveChanges();
}
}
@@ -2524,23 +2534,30 @@ namespace ReallifeGamemode.Server.Commands
target.SetSharedData("blipColor", 0);
target.SetSharedData("nameTagColor", 0);
break;
case 0:
target.SetSharedData("blipColor", 0);
target.SetSharedData("nameTagColor", 0);
break;
case 8:
target.SetSharedData("blipColor", 83);
target.SetSharedData("nameTagColor", 8);
break;
case 7:
target.SetSharedData("blipColor", 52);
target.SetSharedData("nameTagColor", 7);
break;
case 4:
target.SetSharedData("blipColor", 5);
target.SetSharedData("nameTagColor", 4);
break;
case 9:
target.SetSharedData("blipColor", 25);
target.SetSharedData("nameTagColor", 9);
break;
}
if (u.FactionId != null) target.SetSharedData("nameTagColor", u.FactionId);
dbContext.SaveChanges();
}
}

14
ReallifeGamemode.Server/Commands/FactionCommands.cs
View File

@@ -285,7 +285,7 @@ namespace ReallifeGamemode.Server.Commands
}
using var dbContext = new DatabaseContext();
var nearPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player);
var nearPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(4, player);
var deadPlayer = nearPlayers.Where(i => i.GetData<bool>("isDead") == true).FirstOrDefault();
if (player == deadPlayer)
{
@@ -486,31 +486,35 @@ namespace ReallifeGamemode.Server.Commands
switch (targetUser.FactionId)
{
case null:
player.SetSharedData("blipColor", 0);
player.SetSharedData("nameTagColor", 0);
target.SetSharedData("blipColor", 0);
target.SetSharedData("nameTagColor", 0);
break;
case 0:
player.SetSharedData("blipColor", 0);
target.SetSharedData("blipColor", 0);
target.SetSharedData("nameTagColor", 0);
break;
case 8:
target.SetSharedData("blipColor", 83);
target.SetSharedData("nameTagColor", 8);
break;
case 7:
target.SetSharedData("blipColor", 52);
target.SetSharedData("nameTagColor", 7);
break;
case 4:
target.SetSharedData("blipColor", 5);
target.SetSharedData("nameTagColor", 4);
break;
case 9:
target.SetSharedData("blipColor", 25);
target.SetSharedData("nameTagColor", 9);
break;
}
target.TriggerEvent("jailTime", 0);
if (targetUser.FactionId != null) player.SetSharedData("nameTagColor", targetUser.FactionId);
targetUser.Wanteds = 0;
dbContext.SaveChanges();
}

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

@@ -595,7 +595,6 @@ namespace ReallifeGamemode.Server.Events
return;
}
}
else
{
player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig.");
return;

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

@@ -78,20 +78,23 @@ namespace ReallifeGamemode.Server.Managers
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;
}
if (own.FactionId != null) player.SetSharedData("nameTagColor", own.FactionId);
dbContext.SaveChanges();
}
}