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

[+] New Feature in Wanted System

Browse Source 
+ Autowanted System (only cop murder)
  * Fix: rejail after breakout

  * Fix: typo in /wa Command
This commit is contained in:
Lukas Moungos
2019-07-19 20:29:09 +02:00
parent fddc0d3730
commit 80a04a2ee4
4 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,7 +211,7 @@ namespace ReallifeGamemode.Server.Commands
User targetCop = target.GetUser();
if(targetCop.FactionId == 1 || targetCop.FactionId == 2)
{
ChatService.ErrorMessage(player, "Du kannst dieser Person keine Wanteds geben.");
ChatService.ErrorMessage(player, "Du kannst dieser Person keine Wanteds geben");
return;
}
User targetUser = target.GetUser();

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

@@ -70,6 +70,7 @@ namespace ReallifeGamemode.Server.Events
killerHeading = killer.Heading;
if (player != killer)
{
Autowanted.Check_AutoWanted(killer, player);
string message = "~y~[HINWEIS]: " + killer.Name + " hat " + player.Name + " getötet (" + NAPI.Player.GetPlayerCurrentWeapon(killer) + ")";
ChatService.BroadcastAdmin(message, AdminLevel.ADMIN);
}

31
ReallifeGamemode.Server/Wanted/Autowanted.cs Normal file
View File

@@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using System.Text;
using GTANetworkAPI;
using ReallifeGamemode.Server.Entities;
using ReallifeGamemode.Server.Extensions;
using ReallifeGamemode.Server.Models;
namespace ReallifeGamemode.Server.Wanted
{
public class Autowanted
{
public static void Check_AutoWanted(Client killerPlayer, Client copPlayer)
{
User killer = killerPlayer.GetUser();
if(killer.FactionId != 1 || killer.FactionId != 3)
{
User cop = copPlayer.GetUser();
if(cop.FactionId == 1 || cop.FactionId == 3)
{
using (var dbContext = new DatabaseContext())
{
killer = killerPlayer.GetUser(dbContext);
killer.GiveWanteds(copPlayer, 10, "Beamten-Mord");
dbContext.SaveChanges();
}
}
}
}
}
}

3
ReallifeGamemode.Server/Wanted/Jail.cs
View File

@@ -112,8 +112,9 @@ namespace ReallifeGamemode.Server.Wanted
if (player.Position.DistanceTo2D(new Vector3(458.9842, -997.2126, 24.91485)) > 7 && Jailtime.ContainsKey(user.Id))
{
using (var dbContext = new DatabaseContext())
{
{
user = player.GetUser(dbContext);
user.JailTime = 0;
user.GiveWanteds(null, 50, "Knast-Ausbruch");
dbContext.SaveChanges();
Jailtime.Remove(user.Id);